April 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56536 - in /branches/SuSE-Code-11-Branch/sound: VERSION package/yast2-sound.changes
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:26:31 2009 New Revision: 56536 URL: http://svn.opensuse.org/viewcvs/yast?rev=56536&view=rev Log: - 2.17.16 Modified: branches/SuSE-Code-11-Branch/sound/VERSION branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Modified: branches/SuSE-Code-11-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/VERSION (original) +++ branches/SuSE-Code-11-Branch/sound/VERSION Wed Apr 1 14:26:31 2009 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Wed Apr 1 14:26:31 2009 @@ -4,6 +4,7 @@ - make channel names unique - add channel index to channel name if more channels have the same name, fixes UI syntax error for some sound cards (bnc#484073) +- 2.17.16 ------------------------------------------------------------------- Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56535 - /branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:25:30 2009 New Revision: 56535 URL: http://svn.opensuse.org/viewcvs/yast?rev=56535&view=rev Log: - improved logging in alsa-agent when a requested volume setting failed due to an unsupported operation (e.g. missing mute switch) Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc (original) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc Wed Apr 1 14:25:30 2009 @@ -80,18 +80,30 @@ // is it the required channel? if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_volume(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_volume(elem)) + { + y2warning("Channel %s has no volume control", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + snd_mixer_selem_get_playback_volume_range(elem, &from, &to); for (chn = (snd_mixer_selem_channel_id_t)0; - chn <= SND_MIXER_SCHN_LAST; - chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) - { + chn <= SND_MIXER_SCHN_LAST; + chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) + { if (!snd_mixer_selem_has_playback_channel(elem, chn)) - continue; - snd_mixer_selem_get_playback_volume(elem, chn, &left); + continue; + snd_mixer_selem_get_playback_volume(elem, chn, &left); if (to - from == 0) { @@ -101,7 +113,7 @@ value = (long long)(100.0 * ((double)(left - from) / (double)(to - from))); snd_mixer_close(handle); return YCPInteger(value); - } + } } } @@ -129,20 +141,31 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_switch(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { - for (chn = (snd_mixer_selem_channel_id_t)0; - chn <= SND_MIXER_SCHN_LAST; - chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) - { - // if ( - snd_mixer_selem_get_playback_switch(elem, chn, &left); + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_switch(elem)) + { + y2warning("Channel %s has no mute switch", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + for (chn = (snd_mixer_selem_channel_id_t)0; + chn <= SND_MIXER_SCHN_LAST; + chn=(snd_mixer_selem_channel_id_t)((int)chn+(snd_mixer_selem_channel_id_t)1)) + { + snd_mixer_selem_get_playback_switch(elem, chn, &left); snd_mixer_close(handle); - return left ? YCPBoolean(false) : YCPBoolean(true); - } + return left ? YCPBoolean(false) : YCPBoolean(true); + } } } @@ -168,11 +191,23 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_volume(elem)) + && snd_mixer_selem_get_index(elem) == ch_index) { - snd_mixer_selem_get_playback_volume_range(elem, &from, &to); + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_volume(elem)) + { + y2warning("Channel %s has no volume control", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + snd_mixer_selem_get_playback_volume_range(elem, &from, &to); val = (long)( (double)(value * (to - from)) / 100.0 ); @@ -203,14 +238,26 @@ { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel - && snd_mixer_selem_get_index(elem) == ch_index - && snd_mixer_selem_is_active(elem) - && snd_mixer_selem_has_playback_switch(elem)) - { + && snd_mixer_selem_get_index(elem) == ch_index) + { + if (!snd_mixer_selem_is_active(elem)) + { + y2warning("Channel %s is not active", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + + if (!snd_mixer_selem_has_playback_switch(elem)) + { + y2warning("Channel %s has no mute switch", channel_name.c_str()); + snd_mixer_close(handle); + return YCPBoolean(false); + } + snd_mixer_selem_set_playback_switch_all(elem, value ? 0 : 1); snd_mixer_close(handle); return YCPBoolean(true); - } + } } y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56534 - in /trunk/storage/libstorage/src: Md.cc MdCo.cc
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 14:25:10 2009 New Revision: 56534 URL: http://svn.opensuse.org/viewcvs/yast?rev=56534&view=rev Log: - even more improved used-by handling during detection Modified: trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/MdCo.cc Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Wed Apr 1 14:25:10 2009 @@ -21,8 +21,8 @@ using namespace std; -Md::Md( const MdCo& d, unsigned PNr, MdType Type, - const list<string>& devices ) : Volume( d, PNr, 0 ) +Md::Md( const MdCo& d, unsigned PNr, MdType Type, const list<string>& devices ) + : Volume( d, PNr, 0 ) { y2deb("constructed md " << dev << " on container " << cont->name()); if( d.type() != MD ) @@ -34,6 +34,7 @@ computeSize(); } + Md::Md( const MdCo& d, const string& line1, const string& line2 ) : Volume( d, 0, 0 ) { @@ -46,6 +47,7 @@ nm.clear(); setNameDev(); getMajorMinor( dev, mjr, mnr ); + getContainer()->getStorage()->fetchDanglingUsedBy(dev, uby); } SystemCmd c(MDADMBIN " --detail " + quote(device())); c.select( "UUID : " ); @@ -160,8 +162,12 @@ break; } } + + for (list<string>::iterator it = devs.begin(); it != devs.end(); ++it) + getContainer()->getStorage()->setUsedBy(*it, UB_MD, dev.substr(5)); } + Md::~Md() { y2deb("destructed md " << dev); Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Apr 1 14:25:10 2009 @@ -145,15 +145,6 @@ } getline( file, line ); } - MdPair p=mdPair(Md::notDeleted); - for( MdIter i=p.begin(); i!=p.end(); ++i ) - { - string num = "md"+decString(i->nr()); - list<string> devs; - i->getDevs( devs ); - for( list<string>::iterator s=devs.begin(); s!=devs.end(); ++s ) - getStorage()->setUsedBy( *s, UB_MD, num ); - } } void -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56533 - in /branches/SuSE-Code-11-Branch/sound: agent-audio/src/ package/ sound/src/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:23:17 2009 New Revision: 56533 URL: http://svn.opensuse.org/viewcvs/yast?rev=56533&view=rev Log: - make channel names unique - add channel index to channel name if more channels have the same name, fixes UI syntax error for some sound cards (bnc#484073) Added: branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.cc branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.h Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.h branches/SuSE-Code-11-Branch/sound/agent-audio/src/Makefile.am branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-Branch/sound/sound/src/mixer.ycp Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc (original) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.cc Wed Apr 1 14:23:17 2009 @@ -57,8 +57,9 @@ return YCPNull(); \ } +#include "YastChannelId.h" -YCPValue alsaGetVolume(int card_id, const string& channel) +YCPValue alsaGetVolume(int card_id, const string& channel_name) { INIT_MIXER @@ -67,11 +68,19 @@ snd_mixer_selem_channel_id_t chn; + YastChannelId ch_id(channel_name); + std::string channel(ch_id.name()); + unsigned ch_index = ch_id.index(); + + y2debug("Channel Id: '%s' => name: '%s', index: %u", channel_name.c_str(), channel.c_str(), ch_index); for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { snd_mixer_selem_get_id(elem, sid); + + // is it the required channel? if (snd_mixer_selem_id_get_name(sid) == channel + && snd_mixer_selem_get_index(elem) == ch_index && snd_mixer_selem_is_active(elem) && snd_mixer_selem_has_playback_volume(elem)) { @@ -96,11 +105,13 @@ } } + y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); + snd_mixer_close(handle); return YCPInteger((long long)0); } -YCPValue alsaGetMute(int card_id, const string& channel) +YCPValue alsaGetMute(int card_id, const string& channel_name) { INIT_MIXER @@ -108,10 +119,17 @@ snd_mixer_selem_channel_id_t chn; + YastChannelId ch_id(channel_name); + std::string channel(ch_id.name()); + unsigned ch_index = ch_id.index(); + + y2debug("Channel Id: '%s' => name: '%s', index: %u", channel_name.c_str(), channel.c_str(), ch_index); + for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel + && snd_mixer_selem_get_index(elem) == ch_index && snd_mixer_selem_is_active(elem) && snd_mixer_selem_has_playback_switch(elem)) { @@ -128,21 +146,29 @@ } } + y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); + snd_mixer_close(handle); return YCPBoolean(false); } -YCPBoolean alsaSetVolume(int card_id, const string& channel, int value) +YCPBoolean alsaSetVolume(int card_id, const string& channel_name, int value) { INIT_MIXER long from, to, val; + YastChannelId ch_id(channel_name); + std::string channel(ch_id.name()); + unsigned ch_index = ch_id.index(); + + y2debug("Channel Id: '%s' => name: '%s', index: %u", channel_name.c_str(), channel.c_str(), ch_index); for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel + && snd_mixer_selem_get_index(elem) == ch_index && snd_mixer_selem_is_active(elem) && snd_mixer_selem_has_playback_volume(elem)) { @@ -157,20 +183,27 @@ } } + y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); snd_mixer_close(handle); return YCPBoolean(false); } -YCPBoolean alsaSetMute(int card_id, const string& channel, bool value) +YCPBoolean alsaSetMute(int card_id, const string& channel_name, bool value) { INIT_MIXER + YastChannelId ch_id(channel_name); + std::string channel(ch_id.name()); + unsigned ch_index = ch_id.index(); + + y2debug("Channel Id: '%s' => name: '%s', index: %u", channel_name.c_str(), channel.c_str(), ch_index); for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { snd_mixer_selem_get_id(elem, sid); if (snd_mixer_selem_id_get_name(sid) == channel + && snd_mixer_selem_get_index(elem) == ch_index && snd_mixer_selem_is_active(elem) && snd_mixer_selem_has_playback_switch(elem)) { @@ -180,6 +213,8 @@ } } + y2warning("Card %d: channel '%s' not found", card_id, channel_name.c_str()); + snd_mixer_close(handle); return YCPBoolean(false); } @@ -190,9 +225,10 @@ INIT_MIXER // well, this doesn't look like a c++ code... i'm sorry for that... see definition above + y2milestone("Sound card %d: reading channels", card_id); + for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { - snd_mixer_selem_get_id(elem, sid); if (!snd_mixer_selem_is_active(elem)) { continue; @@ -203,8 +239,12 @@ continue; } - outlist->add(YCPString(snd_mixer_selem_id_get_name(sid))); + YastChannelId ch_id(snd_mixer_selem_get_name(elem), snd_mixer_selem_get_index(elem)); + + y2milestone("Found channel: name: '%s', index: %u, id: '%s'", + ch_id.name().c_str(), ch_id.index(), ch_id.asString().c_str()); + outlist->add(YCPString(ch_id.asString())); } snd_mixer_close(handle); @@ -241,7 +281,7 @@ cmd+=tmp; } cmd+=" > /dev/null 2>&1"; - y2debug("executing '%s'", cmd.c_str()); + y2milestone("executing '%s'", cmd.c_str()); if(system(cmd.c_str())!=-1) { return YCPBoolean(true); @@ -263,7 +303,7 @@ cmd+=tmp; } cmd+=" > /dev/null 2>&1"; - y2debug("executing '%s'", cmd.c_str()); + y2milestone("executing '%s'", cmd.c_str()); if(system(cmd.c_str())) { return YCPBoolean(true); Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.h (original) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/AlsaAudio.h Wed Apr 1 14:23:17 2009 @@ -32,29 +32,29 @@ /** * volume setting * @param card card id - * @param channel name eg. "Master" + * @param channel_name name eg. "Master" * @param value volume 0..100 */ -YCPBoolean alsaSetVolume(int card, const string& channel, int value); +YCPBoolean alsaSetVolume(int card, const string& channel_name, int value); /** * volume reading * @param card card id - * @param channel channel name + * @param channel_name channel name */ -YCPValue alsaGetVolume(int card, const string& channel); +YCPValue alsaGetVolume(int card, const string& channel_name); /** * setMute * @param card card id - * @param channel channel name + * @param channel_name channel name * @param value boolean mute/unmute */ -YCPBoolean alsaSetMute(int card, const string& channel, bool value); -YCPValue alsaGetMute(int card, const string& channel); +YCPBoolean alsaSetMute(int card, const string& channel_name, bool value); +YCPValue alsaGetMute(int card, const string& channel_name); /** * getChannels- list of available channels for card #id Modified: branches/SuSE-Code-11-Branch/sound/agent-audio/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/Makefile.am (original) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/Makefile.am Wed Apr 1 14:23:17 2009 @@ -8,6 +8,7 @@ noinst_LTLIBRARIES = liby2ag_audio.la liby2ag_audio_la_SOURCES = \ + YastChannelId.cc YastChannelId.h \ OSSAudio.cc OSSAudio.h \ AudioAgent.cc AudioAgent.h \ AlsaAudio.cc AlsaAudio.h Added: branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.cc (added) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.cc Wed Apr 1 14:23:17 2009 @@ -0,0 +1,141 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2009 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/* + File: $Id:$ + Author: Ladislav SlezÃ¡k <lslezak(a)novell.com> + Summary: Class for converting Alsa channel name to Yast channel ID and vice versea. +*/ + +#include "YastChannelId.h" + +// ::snprintf +#include <cstdio> +// ::atoi +#include <cstdlib> + +// parse "<channel_name>_#<index>#" string +YastChannelId::YastChannelId(const std::string &yastID) +{ + channel_name = yastID; + channel_index = 0; + + if (yastID.empty()) + { + return; + } + + std::string::const_iterator it = yastID.end(); + + std::string::const_iterator number_end_it = yastID.end(); + std::string::const_iterator number_begin_it = yastID.end(); + + --it; + + if (it == yastID.begin()) + { + return; + } + + // no channel index appended + if (*it != '#') + { + return; + } + else + { + number_end_it = it; + --it; + + if (it == yastID.begin()) + { + return; + } + + bool digitfound = false; + + for(;it != yastID.begin(); --it) + { + if (!isdigit(*it)) + { + break; + } + else + { + digitfound = true; + } + } + + if (!digitfound) + { + // channel name end with # but no valid index is there + return; + } + else + { + // no name found + if (it == yastID.begin()) + { + return; + } + + if (*it == '#') + { + number_begin_it = it; + number_begin_it++; + + --it; + + if (it == yastID.begin()) + { + return; + } + + if (*it == '_') + { + channel_name = std::string(yastID.begin(), it); + + std::string channel_index_str(number_begin_it, number_end_it); + channel_index = atoi(channel_index_str.c_str()); + } + } + } + } +} + +std::string YastChannelId::asString() +{ + if (channel_index == 0) + { + return channel_name; + } + + // add channel index if it's greater than zero + std::string ret(channel_name); + + // add index + char buffer[16]; + ::snprintf(buffer, sizeof(buffer), "_#%u#", channel_index); + + ret += buffer; + + return ret; +} + Added: branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/age… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.h (added) +++ branches/SuSE-Code-11-Branch/sound/agent-audio/src/YastChannelId.h Wed Apr 1 14:23:17 2009 @@ -0,0 +1,47 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2009 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/* + File: $Id:$ + Author: Ladislav SlezÃ¡k <lslezak(a)novell.com> + Summary: Class for converting Alsa channel name to Yast channel ID and vice versea. +*/ + +#include <string> + +class YastChannelId +{ + public: + + YastChannelId() : channel_name(), channel_index(0) {} + YastChannelId(const char* alsa_name, unsigned alsa_index) : channel_name(alsa_name), channel_index(alsa_index) {} + YastChannelId(const std::string &YastID); + + std::string name() {return channel_name;} + unsigned index() {return channel_index;} + + std::string asString(); + + private: + + std::string channel_name; + unsigned channel_index; +}; + Modified: branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Wed Apr 1 14:23:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 1 14:19:56 CEST 2009 - lslezak(a)suse.cz + +- make channel names unique - add channel index to channel name + if more channels have the same name, fixes UI syntax error + for some sound cards (bnc#484073) + +------------------------------------------------------------------- Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz - set 100% volume for snd-hda-intel driver (bnc#477853), Modified: branches/SuSE-Code-11-Branch/sound/sound/src/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/sou… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/mixer.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/mixer.ycp Wed Apr 1 14:23:17 2009 @@ -101,14 +101,32 @@ * @param spec true-slider false-intfield * @return term widget */ - define term volElement(string label, integer value, boolean spec) ``{ + define term volElement(string channel_id, integer value, boolean spec) + { + string label = channel_id; + + // remove the index from the channel ID if it's there + if (regexpmatch(channel_id, "^.*_#[0-9]+#$")) + { + label = regexpsub(channel_id, "^(.*)_#[0-9]+#$", "\\1"); + string index_str = regexpsub(channel_id, "^.*_#([0-9]+)#$", "\\1"); + integer index = tointeger(index_str); + + if (index != nil) + { + // add index + 1 to the channel label + // so there are channels "Speaker", "Speaker 2", "Speaker 3", ... + label = sformat("%1 %2", label, index + 1); + } + } + if (UI::HasSpecialWidget(`Slider)) { - return `Slider(`id(label), `opt(`notify), translateChannelName(label), 0, 100, value); + return `Slider(`id(channel_id), `opt(`notify), translateChannelName(label), 0, 100, value); } else { - return `IntField(`id(label), `opt(`notify), translateChannelName(label), 0, 100, value); + return `IntField(`id(channel_id), `opt(`notify), translateChannelName(label), 0, 100, value); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56532 - /tags/branch-SLE-10-SP3-2_13_213/installation/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:03:31 2009 New Revision: 56532 URL: http://svn.opensuse.org/viewcvs/yast?rev=56532&view=rev Log: Created tag branch-SLE-10-SP3-2_13_213 for installation Added: tags/branch-SLE-10-SP3-2_13_213/installation/ - copied from r56531, branches/SuSE-SLE-10-SP3-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56531 - /tags/branch-SLE-10-SP3-2_13_213/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 14:03:29 2009 New Revision: 56531 URL: http://svn.opensuse.org/viewcvs/yast?rev=56531&view=rev Log: Created tag branch-SLE-10-SP3-2_13_213 Added: tags/branch-SLE-10-SP3-2_13_213/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56530 - in /branches/SuSE-SLE-10-SP3-Branch/installation: VERSION package/yast2-installation.changes
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 13:59:35 2009 New Revision: 56530 URL: http://svn.opensuse.org/viewcvs/yast?rev=56530&view=rev Log: - 2.13.213 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Wed Apr 1 13:59:35 2009 @@ -1 +1 @@ -2.13.212 +2.13.213 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Wed Apr 1 13:59:35 2009 @@ -2,6 +2,7 @@ Wed Apr 1 11:41:24 CEST 2009 - lslezak(a)suse.cz - do not log password in URL into y2log (bnc#441944) +- 2.13.213 ------------------------------------------------------------------- Wed Feb 4 12:30:40 CET 2009 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56529 - /tags/stable-2_18_1/theme/
by locilka＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: locilka Date: Wed Apr 1 13:54:40 2009 New Revision: 56529 URL: http://svn.opensuse.org/viewcvs/yast?rev=56529&view=rev Log: Created tag stable-2_18_1 for theme Added: tags/stable-2_18_1/theme/ - copied from r56528, trunk/theme/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56528 - in /trunk/theme: ./ openSUSE-Crystal/icons/22x22/apps/ openSUSE-Crystal/icons/32x32/apps/ openSUSE-Crystal/icons/48x48/apps/ openSUSE-Oxygen/icons/22x22/apps/ openSUSE-Oxygen/icons/32x32/a...
by locilka＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: locilka Date: Wed Apr 1 13:53:13 2009 New Revision: 56528 URL: http://svn.opensuse.org/viewcvs/yast?rev=56528&view=rev Log: - New YaST icon based on new YaST Mascot: Aardvark. - 2.18.1 Added: trunk/theme/openSUSE/icons/64x64/apps/yast.png (with props) Modified: trunk/theme/VERSION trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast.png trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast.png trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast.png trunk/theme/openSUSE-Oxygen/icons/22x22/apps/yast.png trunk/theme/openSUSE-Oxygen/icons/32x32/apps/yast.png trunk/theme/openSUSE-Oxygen/icons/48x48/apps/yast.png trunk/theme/openSUSE/icons/22x22/apps/yast.png trunk/theme/openSUSE/icons/32x32/apps/yast.png trunk/theme/openSUSE/icons/48x48/apps/yast.png trunk/theme/openSUSE/icons/scalable/apps/yast.svg trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=56528&r1=56527… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Wed Apr 1 13:53:13 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/theme/openSUSE-Crystal/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/22x… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE-Crystal/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/32x… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE-Crystal/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/48x… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE-Oxygen/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/22x2… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE-Oxygen/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/32x3… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE-Oxygen/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/48x4… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/64x64/apps/yast.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/scalable/apps/yast.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/scalable/ap… ============================================================================== --- trunk/theme/openSUSE/icons/scalable/apps/yast.svg (original) +++ trunk/theme/openSUSE/icons/scalable/apps/yast.svg Wed Apr 1 13:53:13 2009 @@ -1,424 +1,422 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg + +<svg:svg + xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" + xmlns:xap="http://ns.adobe.com/xap/1.0/" + xmlns:ns0="http://ns.adobe.com/SaveForWeb/1.0/" + xmlns:ns="http://ns.adobe.com/Variables/1.0/" + xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" + xmlns:x="adobe:ns:meta/" xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" + xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48" - height="48" - id="svg7854" + i:viewOrigin="250.2544 450.7109" + i:rulerOrigin="0 -1" + i:pageBounds="0 842.8896 595.2754 1" + width="97.443" + height="60.973" + viewBox="0 0 97.443 60.973" + overflow="visible" + enable-background="new 0 0 97.443 60.973" + xml:space="preserve" + id="svg2" sodipodi:version="0.32" - inkscape:version="0.45+devel" - version="1.0" - sodipodi:docname="yast-shell.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs7856"> - <linearGradient - inkscape:collect="always" - id="linearGradient5529"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop5531" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop5533" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5519"> - <stop - style="stop-color:#fff345;stop-opacity:1;" - offset="0" - id="stop5521" /> - <stop - style="stop-color:#fff345;stop-opacity:0;" - offset="1" - id="stop5523" /> - </linearGradient> - <linearGradient - id="linearGradient5509"> - <stop - id="stop5511" - offset="0" - style="stop-color:#fff9a4;stop-opacity:1" /> - <stop - id="stop5513" - offset="1" - style="stop-color:#ff7100;stop-opacity:1" /> - </linearGradient> - <linearGradient - id="linearGradient5499"> - <stop - style="stop-color:#fff9a4;stop-opacity:1" - offset="0" - id="stop5501" /> - <stop - style="stop-color:#ffb720;stop-opacity:1;" - offset="1" - id="stop5503" /> - </linearGradient> - <linearGradient - id="linearGradient5485"> - <stop - id="stop5489" - offset="0" - style="stop-color:#ffe9bb;stop-opacity:1;" /> - <stop - id="stop5487" - offset="1" - style="stop-color:#ff8f08;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5475"> - <stop - style="stop-color:#fce94f;stop-opacity:1;" - offset="0" - id="stop5477" /> - <stop - style="stop-color:#fce94f;stop-opacity:0;" - offset="1" - id="stop5479" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5443"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop5445" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop5447" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5425"> - <stop - style="stop-color:#3465a4;stop-opacity:1;" - offset="0" - id="stop5427" /> - <stop - style="stop-color:#3465a4;stop-opacity:0;" - offset="1" - id="stop5429" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5415"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop5417" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop5419" /> - </linearGradient> - <linearGradient - id="linearGradient5403"> - <stop - id="stop5407" - offset="0" - style="stop-color:#e2ecf6;stop-opacity:1;" /> - <stop - style="stop-color:#cadbed;stop-opacity:1;" - offset="0.58286089" - id="stop5469" /> - <stop - id="stop5405" - offset="1" - style="stop-color:#729fcf;stop-opacity:1;" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5415" - id="radialGradient5421" - cx="21.522562" - cy="27.096155" - fx="21.522562" - fy="27.096155" - r="8.352699" - gradientTransform="matrix(1.7745072,0,0,0.516391,-16.66938,13.103945)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5425" - id="linearGradient5431" - x1="24.35099" - y1="23.207069" - x2="26.870058" - y2="26.123884" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5403" - id="radialGradient5441" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.3714339,0,0,1.4504842,-6.6468827,-2.7059689)" - cx="17.895197" - cy="6.5830007" - fx="17.895197" - fy="6.5830007" - r="15.182886" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5443" - id="radialGradient5449" - cx="19.1875" - cy="14.347643" - fx="19.1875" - fy="14.347643" - r="13.9375" - gradientTransform="matrix(1,0,0,0.9764574,0,0.443263)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5475" - id="linearGradient5481" - x1="26.277246" - y1="28.12495" - x2="36.78125" - y2="42.12495" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5485" - id="radialGradient5491" - cx="32.5" - cy="32.277779" - fx="32.5" - fy="32.277779" - r="5" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5499" - id="radialGradient5497" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" - cx="33.727859" - cy="37.091766" - fx="33.727859" - fy="37.091766" - r="5" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5509" - id="radialGradient5507" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.5002572,0,0,1.5002572,-16.258358,-16.147191)" - cx="32.5" - cy="30.426243" - fx="32.5" - fy="30.426243" - r="5" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5519" - id="linearGradient5525" - x1="35.090176" - y1="36.200157" - x2="29.786875" - y2="31.073631" - gradientUnits="userSpaceOnUse" /> - <filter - inkscape:collect="always" - x="-0.13981191" - width="1.2796238" - y="-0.31204399" - height="1.624088" - id="filter5597"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.5859105" - id="feGaussianBlur5599" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5529" - id="radialGradient5609" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.4480519,0,21.858859)" - cx="31.643028" - cy="39.603107" - fx="31.643028" - fy="39.603107" - r="13.611806" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5529" - id="radialGradient5611" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.4480519,0,21.858859)" - cx="31.643028" - cy="39.603107" - fx="31.643028" - fy="39.603107" - r="13.611806" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#e0e0e0" - borderopacity="1" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="40.508636" - inkscape:cy="26.050499" - inkscape:document-units="px" - inkscape:current-layer="layer1" - width="48px" - height="48px" - inkscape:showpageshadow="false" - inkscape:window-width="754" - inkscape:window-height="733" - inkscape:window-x="588" - inkscape:window-y="293"> - <inkscape:grid - type="xygrid" - id="grid5433" /> - </sodipodi:namedview> - <metadata - id="metadata7859"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title>Jakub Steiner</dc:title> - </cc:Agent> - </dc:creator> - <dc:source>http://jimmac.musichall.cz</dc:source> - <cc:license - rdf:resource="" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g5605" - transform="matrix(1,0,0,0.7101449,1.2374369,13.600483)" - style="opacity:0.75862069"> - <path - transform="matrix(1.5844156,0,0,1,-26.44763,0)" - sodipodi:type="arc" - style="opacity:0.25862067999999999;color:#000000;fill:url(#radialGradient5609);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter5597);enable-background:accumulate" - id="path5601" - sodipodi:cx="31.643028" - sodipodi:cy="39.603107" - sodipodi:rx="13.611806" - sodipodi:ry="6.0987959" - d="M 45.254834,39.603107 A 13.611806,6.0987959 0 1 1 18.031222,39.603107 A 13.611806,6.0987959 0 1 1 45.254834,39.603107 z" /> - <path - d="M 45.254834,39.603107 A 13.611806,6.0987959 0 1 1 18.031222,39.603107 A 13.611806,6.0987959 0 1 1 45.254834,39.603107 z" - sodipodi:ry="6.0987959" - sodipodi:rx="13.611806" - sodipodi:cy="39.603107" - sodipodi:cx="31.643028" - id="path5527" - style="opacity:0.40804599000000003;color:#000000;fill:url(#radialGradient5611);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter5597);enable-background:accumulate" - sodipodi:type="arc" /> - </g> - <path - style="opacity:1;color:#000000;fill:url(#radialGradient5441);fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 15.526989,4.4861407 C 14.214475,4.4861407 12.724366,4.6582799 11.670421,5.2158998 L 18.789853,12.777832 L 11.632604,20.145279 L 4.2911607,12.198961 C 3.4837118,13.837682 3.2123107,15.038566 3.2123107,16.987801 C 3.2123107,23.785218 8.7292866,29.301962 15.526989,29.301962 C 17.422204,29.301962 19.21168,28.857435 20.815986,28.091596 L 26.052355,33.406683 L 32.578082,26.670731 L 27.157519,20.987273 C 27.590619,19.730271 27.841668,18.391282 27.841668,16.987801 C 27.841668,10.190385 22.324692,4.4861407 15.526989,4.4861407 z" - id="path4818" - sodipodi:nodetypes="cccccssccccsc" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="-1.0185251" - inkscape:original="M 15.53125 4.5 C 14.218736 4.5 12.710195 4.6611301 11.65625 5.21875 L 18.78125 12.78125 L 11.625 20.15625 L 4.28125 12.1875 C 3.4738012 13.826221 3.21875 15.050765 3.21875 17 C 3.2187499 23.797417 8.7335476 29.3125 15.53125 29.3125 C 17.426465 29.3125 19.208194 28.859589 20.8125 28.09375 L 26.0625 33.40625 L 32.5625 26.65625 L 27.15625 21 C 27.589351 19.742999 27.84375 18.403481 27.84375 17 C 27.843751 10.202584 22.328953 4.5 15.53125 4.5 z " - xlink:href="#path4818" - style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5449);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5439" - inkscape:href="#path4818" - d="M 15.53125,5.71875 C 14.927359,5.71875 14.388746,5.8848635 13.8125,5.96875 L 19.53125,12.09375 C 19.898093,12.495611 19.884333,13.114832 19.5,13.5 L 12.34375,20.875 C 12.147474,21.070778 11.879881,21.178102 11.602719,21.172204 C 11.325557,21.166307 11.062771,21.0477 10.875,20.84375 L 4.65625,14.09375 C 4.3946449,14.941336 4.25,15.801611 4.25,17 C 4.2499999,23.246525 9.2844446,28.28125 15.53125,28.28125 C 17.264196,28.28125 18.894384,27.894294 20.375,27.1875 C 20.761403,26.999987 21.223905,27.074987 21.53125,27.375 L 26.0625,31.9375 L 31.125,26.65625 L 26.40625,21.71875 C 26.13513,21.436092 26.050085,21.023019 26.1875,20.65625 C 26.58802,19.493811 26.8125,18.2804 26.8125,17 C 26.812501,10.753476 21.778056,5.71875 15.53125,5.71875 z" /> - <path - style="opacity:0.42528736;color:#000000;fill:url(#linearGradient5431);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 25,22 L 28,25 L 24,29 L 21,26 L 25,22 z" - id="path5423" - sodipodi:nodetypes="ccccc" /> - <path - style="opacity:1;color:#000000;fill:url(#radialGradient5421);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 7.6013979,24.665476 C 9.3876872,26.566177 14.041294,29.675182 20.948038,26.963573 L 23.599689,29.526835 L 24.306796,28.73134 L 21.566757,25.991301 C 15.650995,28.070644 11.413761,26.792931 7.6013979,24.665476 z" - id="path5413" - sodipodi:nodetypes="cccccc" /> - <path - style="color:#000000;fill:#fcaf3e;fill-opacity:1;fill-rule:evenodd;stroke:#f57900;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 30.367756,23.197506 C 29.910434,23.190018 29.460873,23.35277 29.104712,23.69744 L 22.973686,29.61771 C 22.261363,30.30705 22.231691,31.431398 22.921059,32.143692 C 25.608353,34.949847 31.025591,40.537318 31.025591,40.537318 C 32.454889,42.147332 34.148441,43.826357 36.525095,43.826357 C 39.982046,43.826357 42.787688,41.020833 42.787688,37.564027 C 42.787688,35.403524 41.585473,33.822002 40.024779,32.380502 L 31.6308,23.723753 C 31.286116,23.367606 30.825077,23.204995 30.367756,23.197506 z" - id="path4809" - sodipodi:nodetypes="cccccssccc" /> - <path - style="opacity:0.42528734000000001;color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 21.0625,26.03125 L 24.96875,22 L 27.40625,24.4375 L 25.09375,22.4375 L 21.5625,26.09375 L 21.0625,26.03125 z" - id="path5471" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="-1.1187773" - inkscape:original="M 30.375 23.1875 C 29.917678 23.180012 29.449911 23.34283 29.09375 23.6875 L 22.96875 29.625 C 22.256427 30.31434 22.216882 31.443956 22.90625 32.15625 C 25.593544 34.962405 31.03125 40.53125 31.03125 40.53125 C 32.460548 42.141263 34.154596 43.8125 36.53125 43.8125 C 39.988199 43.812498 42.78125 41.019306 42.78125 37.5625 C 42.781249 35.401998 41.591944 33.8165 40.03125 32.375 L 31.625 23.71875 C 31.280316 23.362603 30.832321 23.194989 30.375 23.1875 z " - xlink:href="#path4809" - style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5481);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5473" - inkscape:href="#path4809" - d="M 30.34375,24.3125 C 30.164349,24.309563 30.005914,24.37331 29.875,24.5 L 23.75,30.4375 C 23.461718,30.71648 23.455331,31.102821 23.71875,31.375 C 26.396,34.170667 31.84375,39.75 31.84375,39.75 C 31.854371,39.76021 31.86479,39.770629 31.875,39.78125 C 33.26811,41.350499 34.679071,42.6875 36.53125,42.6875 C 39.385556,42.687498 41.65625,40.416668 41.65625,37.5625 C 41.656249,35.812571 40.749678,34.543781 39.28125,33.1875 C 39.260096,33.177737 39.239253,33.167315 39.21875,33.15625 L 30.8125,24.5 C 30.682727,24.365911 30.539777,24.31571 30.34375,24.3125 z" /> - <path - style="opacity:1;color:#000000;fill:url(#linearGradient5525);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 30.317203,25.814525 L 25.013902,31.029437 L 33.852737,40.045049 L 38.802485,35.448855 L 30.317203,25.814525 z" - id="path5517" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:url(#radialGradient5491);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5483" - sodipodi:cx="32.5" - sodipodi:cy="34.5" - sodipodi:rx="5" - sodipodi:ry="5" - d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" - transform="matrix(0.9,0,0,0.9,7.25,6.45)" /> - <path - transform="matrix(0.5,0,0,0.5,20.25,20.25)" - d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" - sodipodi:ry="5" - sodipodi:rx="5" - sodipodi:cy="34.5" - sodipodi:cx="32.5" - id="path5495" - style="opacity:1;color:#000000;fill:url(#radialGradient5497);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:url(#radialGradient5507);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.11111116;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5505" - sodipodi:cx="32.5" - sodipodi:cy="34.5" - sodipodi:rx="5" - sodipodi:ry="5" - d="M 37.5,34.5 A 5,5 0 1 1 27.5,34.5 A 5,5 0 1 1 37.5,34.5 z" - transform="matrix(0.3,0,0,0.3,26.75,27.15)" /> - <path - style="opacity:1;color:#000000;fill:#ff8f08;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 25,31 L 30,26 L 36,32 L 30,27 L 25.8125,31.25 L 25,31 z" - id="path5515" /> - </g> -</svg> + inkscape:version="0.46" + sodipodi:docname="fixme-x.svg" + sodipodi:docbase="/home/cihlarov" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/nfshome/cihlarov/Export/brand/loga/fixme.png" + inkscape:export-xdpi="858.9115" + inkscape:export-ydpi="858.9115"><svg:defs + id="defs48"><inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 30.4865 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="97.443001 : 30.4865 : 1" + inkscape:persp3d-origin="48.7215 : 20.324333 : 1" + id="perspective19" /> + <svg:foreignObject + id="foreignObject8" + height="1" + width="1" + y="0" + x="0" + requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"> + <i:pgfRef + xlink:href="#adobe_illustrator_pgf"> + </i:pgfRef> + </svg:foreignObject> + + + + + + + + + + + + + + + </svg:defs><sodipodi:namedview + inkscape:window-height="1015" + inkscape:window-width="1518" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="11.186027" + inkscape:cx="48.7215" + inkscape:cy="30.4865" + inkscape:window-x="24" + inkscape:window-y="1" + inkscape:current-layer="svg2" + showgrid="false" /> + <svg:metadata + id="metadata4"> + <ns:variableSets> + <ns:variableSet + varSetName="binding1" + locked="none"> + <ns:variables /> + <ns:sampleDataSets /> + </ns:variableSet> + </ns:variableSets> + <ns0:sfw> + <ns0:slices /> + <ns0:sliceSourceBounds + y="389.738" + x="250.254" + width="97.443" + height="60.973" + bottomLeftOrigin="true" /> + </ns0:sfw> +<xpacket /><x:xmpmeta + x:xmptk="XMP toolkit 3.0-29, framework 1.6"> + +<svg:metadata + id="metadata50"><rdf:RDF> + + <rdf:Description + rdf:about=""> + </rdf:Description> + + <rdf:Description + rdf:about=""> + </rdf:Description> + + <rdf:Description + rdf:about=""> + <xap:CreateDate>2005-08-02T10:05:50Z</xap:CreateDate> + <xap:ModifyDate>2005-08-02T10:05:50Z</xap:ModifyDate> + <xap:CreatorTool>Illustrator</xap:CreatorTool> + <xap:Thumbnails> + <rdf:Alt> + <rdf:li + rdf:parseType="Resource"> + <xapGImg:format>JPEG</xapGImg:format> + <xapGImg:width>256</xapGImg:width> + <xapGImg:height>160</xapGImg:height> + <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA +AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK +DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f +Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAoAEAAwER +AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA +AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB +UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE +1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ +qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy +obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp +0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo ++DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 +FXYqgNW13RtIh9bU72G0Q/Z9Vwpan8q/ab6BleTLGAuRppzanHiFzkI+9gWs/nx5ZtSyaZbT6jIO +jn9xEf8AZMC//CZgZO1ID6QS6TP7R4Y7QBn9g/X9jC9T/PXzfckiyitrBP2SqGVx82kJX/hcwp9q +ZDyoOpze0WeX0iMft+/9TGr38w/O96T62tXQr1ET+iPui4DMaWryy5yLrsnaepnznL4bfck8+q6p +cGtxeTzHfeSR269epOUmcjzJcWWacuZJ+KFyDW7FVSOeeMERyMgPUKSP1YQSEiRHIomHWtZgp6N/ +cRcenCV1pX5HJDJIciWyOoyDlIj4lM7Tz/52tSDFrd4adBJK0o+6TkO2Wx1eUfxFyIdpaiPKcvnf +3p7YfnZ57tiPWngvQO08Kj8YvSy+PaWUc6Lm4+39THmRL3j9VMm03/nIJqhdT0gU/altpf1RuP8A +jfMqHa386Pydhi9pv58Pkf0ftZbpX5xeRb+ivdvYyN+xdRlf+HXmn/DZl4+0MUute92mHt3TT68P +v/FMvstQsL6ET2VzFdQnpJC6yL96kjMyMxIWDbtceWMxcSCPJ5r+an5h+YfLGv2drpjwmGW1E0sM +qB6sZHWtQVYbL45rddq54pgR7nn+2O1MunyxjCqMb395SSw/5yC1NSBqGkwzDubeR4vwcS/ryiHa +0usXDx+00x9cAfca/WybTfz18n3NFvI7mxbuzoJEH0xlm/4XMmHamM87DsMXtFgl9QlH7fu/Uy3S +/OnlTVeIsNVtpXb7MRcJIf8Anm/F/wAMzIanHPlIO0w6/Bk+mcT+O5Osuct2KuxV2KuxV2KuxV2K +uxV2KuxV2Kse8z+e/LXltCNRuh9ZpVLOL45m8PhH2a+LEDMfPqoY/qO/c4Or7Rw6f6zv3Dm8h8zf +nf5j1EvDpKLpdqagOKSTkf65HFf9iK++afN2nOW0fSPteW1ftBlybY/QPteeXV1dXc7XF1M887mr +yysXdj7sxJOa+UiTZdFOcpG5GypZFi7FXYq7FXYq7FXYq7FXYq7FXYq7FVe0vbyzmE9nPJbTDpLC +7RsP9kpByUZGJsGmUMkoG4kg+SI1jXdX1meK41S5a7nhiEMcr05emrFgCQBXdzud8lkyymbkbbM+ +oyZSDM8RApAZW0uxV2Kp5o/nXzXoxH6P1OeKNekLN6kX/It+Sfhl+PU5IfSS5eDtDPi+iRH3fIvQ +NA/P28jKxa9YLMmwNzafA9PExueLH5MubDF2qf4x8ne6b2kkNssb8x+r+x6n5e82eX/MMHq6VeJO +VFZIfsyp/rRn4h8+mbXDnhkHpL0ml1uLOLgb+/5JxlzlOxV2KuxV2KuxV2KoPVtY0zSLJ73UrlLa +2j6yOep8FHVifAZDJkjAXI0GrNnhijxTNB4t5z/O7Ur4yWfl5WsbTobxv96HH+T2jH4+4zS6jtKU +tobDv6vI6/2gnP04vTHv6/seYSyyyyNLK7SSOSzuxJYk9SSeuasm3nSSTZWYEOxV2KuxV2KuxV2K +uxV2KuxV2KuxV2KuxV2KuxV2KuxVknkXyVe+bNX+qQt6NpCA95dUqEU9ABtVmpsPp7Zk6XTHLKhy +6uf2doJanJwjaI5l6Pea9+VHkmQ6dZaauqahCeM8vFJmVh1DzSbBvEIKfLNlLLp8HpA4j+Orv8mp +0OkPBGPHIc+v2n9C2181/lP5vlGn6npS6ZdTHjDcMiRVY7KBPFQg/wCv8OMc+nzbSjwn8dUQ1mh1 +R4Jw4CevL7R+nZhfmzyxrf5feYre7sbh/QZjJp16NiQPtRyDpUA0I6MPuzBz4JaeYIPuLqNbpMmh +yiUTt/Cf0H8bvc/I/mqHzP5eg1JAEnqYruFeiTJTkBXsQQw9jm902cZYCT2XZ+sGoxCfXr70/wAy +HOdirsVdirsVYp55/MLSPKlrSUi41OVa29ipox7B5D+yn6+2Ymq1ccQ75dzre0e08emjvvM8h+vy +fPXmXzVrfmO+N5qk5kIr6UK7RRqf2UTt8+p75z2bPLIbkXhdXrMmeXFM/qHuSjKXFdirsVdirsVd +irsVdirsVdirsVdirsVdirsVdirsVdirsVdir2fyVKdC/JrVNYtPhvbgzN6oHxK3IW6b/wCR9oZu +tMfD0xkOZ/ses0B8Hs+WSP1G/wBTy3yzFotx5gs49dlaLS5JP9KlUmtKGlT1ALUDHwzVYREzHH9L +zmkGOWWIymoXu9I/MPQvyntPLck2kTW6an8Js1tLgzs9WFQ683HHjX4j/Ydnq8WnELjXF0o27/tP +T6GOEnGRx9KN/pRWpyvr/wCRUV7en1Luw4lJW3JMM/oA161MTUPvkpnxNLZ5j9dNmaXj9miUvqj+ +g19ySfkX5iNl5im0eV6W+poTGD0E8QLD/gk5D7so7MzcM+H+c4fs7quDKcZ5T+8Pe8372zsVdirs +VYT+Y/5jWnlaz+rW3GfWp1rBAd1jU7epJ7eA75hazWDEKH1Oo7V7Ujpo0N8h5eXmXztfX15f3ct5 +eTNPczsXllc1JJznJSMjZ5vB5MkpyMpGyUPkWDsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd +irsVdiqcp5T1ibQF120i+tWAZo7loas8Dp1Eq0qBxo3Ibb5d4EjDjG4+5yhoshxeLEcUetdPek2U +uK9h/KDUrDWvLOqeS79+DyLI9v4mKUUbh/lRv8X0+2bns+YnA4i9V2Jljmwz08vOvcf1Hd5t5m8q +615cv3tNSgZAGIhuAD6UqjoyN0Py6jvmszYJYzUg8/q9HkwS4Zj49Co6D5d1jXr9LLTLdp5WI5sA +eEYP7UjdFXBiwyyGohhptLkzS4YCz+Ob1P8AMq4svK3kDT/JltKJLudUM9Nj6aP6ryEduc32fp8M +2usIxYRiHP8AH6XpO1pR02ljpwfUef338S8l0nUp9M1S01GD+9tJkmT3KMDQ+x6ZqMczGQkOjzGD +KccxMc4m31vaXMN1aw3UJ5QzossbeKuAyn7jnXRkCLD6hCYlESHIquFk7FWO+efOFp5W0OS+lAku +pP3dlb/zykd/8lerf1zH1WoGKF9ejgdo66Omx8R59B5vmTU9SvdTv57++lM11cMXlkbuT4eAHQDs +M5iczI2eZfPMuWWSRlI3IoXINbsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVeg/ +lF55sfLmo3Vpqkhj0y+VT6lCwjmQ0BIFTRlYg0Hhmw7P1QxkiX0l3nYnaMcEzGZ9Evveg+Yvys8o +earf9J6JNHaXE3xLc2vF7eQ/5SKQK+JWnvXNjm0OPKOKOx8uTvNV2Pg1I48ZESeo5H4PKtY8jed/ +KN2t96MirbNzi1KzJdFp+0SvxJ/swM1OTTZcJvu6h5rP2dqdLLio7fxR/G3xZZpH58T/AFQW2v6W +l6eNGniITn/rRMCu/sR8szMfahqpi3Z4PaM8NZYcXu/Uv1L8+BHaG30HR0tGINJZmBVSdqiNAoJ+ +bfRjPtTaoRpOX2jqNYocPv8A1B5bqWp3+p3st9fztc3cxrJK5qT/AAAHYDpmrnMyNk2XnMuWWSRl +I3Ip15S8g+YfM84FjAY7MGkt9KCsK06gH9tv8lfwy7T6WeU7cu9y9F2bl1B9I9PeeT6T0DSv0Rot +lpnrG4FnCsImYcSwQUGwrTOlxY+CIj3PoGmw+FjjC74RSYZY3tMyopdyFVRVmOwAHUk4oJp8xfmL +5wk8z+YpblGP6Pt6w2EZ7Rg7vTxc7n6B2zl9ZqPFnfQcnzvtTXHUZSf4RsPx5sWzFdc7FUTZadqF +/L6VjazXUv8AvuCNpG+5QTkowMuQtnjxTmaiDI+W6dx/lz55dQy6LdAH+ZOJ+5iDl40eX+aXMHZe +pP8ABJCXvkzzZZKWutHu40X7UnouUH+yUFfxyMtPkjziWrJoM8PqhL5JPlDitYq7FXYq7FXYq7FX +Yq7FXYq7FXYq7FXYq7FXYq7FUy0XzFreiXHr6VeS2sn7QQ/A3+uhqrfSMtx5pQNxNN+n1WTCbhIx +em+Xvz9nQLFr9h6oFAbq0orfNonPEn5MPlmzw9qnlMfJ6LS+0hG2WN+Y/UyH1PyZ83fHJ9Ujun68 +ibKfl7kGPmfvzIvTZu6/k519n6rnw8X+lP6L+1Tl/JHyE6i4W8u4oK9VniKeP2mjb9eA9m4edn5s +Zez+lO/FID3j9SGOjfkl5Yb1bqeC9uEOySSG7ao7GKOqf8EuR8PS4ue5+bX4HZ2n3kRI+/i+wbJT +rv533dxw07ynY/VeZEUNxMqmSp2URwisa79Kk/LKcvaZPpxinG1HtBKXowRrzP6By+97LbJMlvEk +7iSZUUSyAUDMB8Rp7nN0Lrd6yAIAvmq4WTAfzm8yvpHlRrOB+N1qrG3UjqIgKzH7iF/2WYHaObgx +0OcnSdvavwsHCPqnt8Ov6vi+ds5x4RvFXsH5ffkxHNBFqnmdGo4DwaYDxPE7gzEb7/yD6fDNzpOz +rHFk+X63quzOwQQJ5vhH9f6nr1lYWNjbrb2VvHbQJ9mKJQij6FAzbxgIigKepx44wFRAA8lK51nR +7V+F1fW8D9OMsqIfuYjBLJEcyGM8+OP1SA+KvbXtndKXtZ451HVonVxv7qThjIHkWUMkZfSQUm8x +eRfK/mBG/SNihnI2u4h6cw/2a9fk1RlObS48n1BxdV2dhz/XHfv6vFPPH5Saz5eWS+sidQ0lalpV +FJYh/wAWIOw/mXbxpml1Oglj3G8XkO0OxcmD1R9UPtHv/X9zAs17pXYq7FXYq7FXYq7FXYq7FXYq +7FXYq7FXYq7FXYq7FXYq7FU40Dyl5i1+XhpVjJOtaNNTjEv+tI1F+itcuxaeeT6Q5Wm0WXOahEn7 +vm9l8ifk3aaHdw6pq84vNRhIeCGMEQxOOjVNGdh2NAB4ZudL2cIHikbL1nZ3YUcMhPIeKY5dw/W9 +KzZvQOxV4D+e+ptcebILEH93Y2yjj/xZKS7H/geOaDtSd5AO4PEe0ebiziP82P3/AIDzbNY6B6Z+ +Snk2LVdVk1u9j52emsBboR8L3NOQP/PMUb5kZs+zdPxy4jyj970PYGhGSZyS+mHL3/s/U9p8xeYN +O0DSZtT1B+MEI2UU5O5+yiA9WObrNljjjxF63VamGCBnLkHz15t/NDzN5gmkQXDWOnEkR2UDFRx7 +eo4oznxrt7Zz2o1s8h50O54XW9r5s5O/DDuH6e9iGYbq1S3ubm2mWa2leGZd1kjYow+RFDhEiNwm +MzE2DRej+Tfzr1nT5Y7XXidRsCQpuNvrEY8a/wC7P9lv75stP2lKO09x9r0Gg7fyQIjl9Ue/qP1v +ctO1Gx1KxhvbKZbi0uF5RSruCD+ojoQemb2ExIWOT2OLLHJESibiXkH5q/lWluk2v6BCFgUF76wQ +bIO8sQH7P8y9uo2zT67Q164fEPLds9j8N5cQ26j9IeQZp3lnYq7FW1VmYKoJYmgA3JJwqyrTfyu8 +96hEssOlSRxMKhp2SE0/1ZGVvwzKhocsuUXZYux9TMWIbee33o24/Jnz/EnJbKOfapWOeKv/AAzL +kz2dmHT7W6XYOqH8IPxDFtV0LWdIl9LU7Ka0c/Z9VCob/VY7N9GYuTFKH1CnW5tNkxGpxMfegMra +XYq7FV8MMs0yQwoZJZWCRooqWZjQAD3OECzQTGJJoc3tHl/8hLH6pHLr17MbpgGe2tSiohP7Jdlf +l9FM3WLsoV6zv5PW6b2bjw3lkeLuCZzfkL5Ocfu7m+ibsRJEw+kGPLT2Xj7y5EvZzTnkZD4j9SWX +P/OPdix/0bWpYh4SQLJ/xF48qPZI6S+xx5+zMekz8r/SEuk/5x81IU9PWIW8eULr+pmys9ky/nNB +9mZ9Jj5K0f8Azj1OW/ea4qr4rbFj+Mq4R2Sf532ftZD2YPXJ/sf2ppZ/kB5fQg3mpXU9OojEcQP3 +iTLY9lQ6kuTj9msQ+qUj8h+tk+lflb5F01g8WlpPKP8AdlyWn/4VyU+5cysehxR6fN2OHsfTY+Ub +Pnv+xlUcccUaxxIEjQURFAAAHYAZlAU7IAAUF2FLsVdir5m/NiRn/MHVyxqQ8Sj5LCgH6s5nXn99 +L8dHzztk3qp/D7gxHMN1j6X/ACmsY7TyFpgUDlOrzyEdzJIxH/C0GdNoI1hD6D2LjEdLHz3+15x+ +fGuzXGv22jK3+jWMQldB3ml3qfklKfM5re1MpMxHoHQe0eoMsox9Ij7T+x53o+k3ur6nb6bYp6l1 +dOEjU7DxJJ7BQKn2zXY8ZnIRHMuiwYZZZiEfqL2TTv8AnH/R1tx+ktTuJbgjf6sEjQN/s1kJA+jN +zDsqNeom3q8Xs1jr1yJPlt+tJPM/5E6jZ28l1od0b9UBY2cqhJqD+Rh8Ln2oMoz9lyiLgbcPV+zs +4DixHi8uv7fseWMrIxRwVZTRlOxBHUEZq3myKeh/k551l0jW00a6k/3Gak4VQx2juDsjD/X2U/R4 +ZseztTwS4T9J+93vYWvOLJ4cvon9h/a+gSARQ7g9RnQPcvnP82fJSeXddFxZpx0vUeUkCjpHIP7y +P5b1X2NO2c5r9N4c7H0l4LtrQeBluP0S5eXeGC5gOmdir6D/ACp/Lyx0fS7fWL6ESazdoJVLivoI +4qqoD0YqfiPXtnQ6HSCERI/Ufse57G7MjigMkh+8l9j0TNi712KqF7Y2V9bPa3sEdzbyCjxSqHU/ +QcjKIkKIsMMmOMxwyFh4x+Yf5NtZRy6r5bVpbZavPpxJZ0Ubloid2Ufynf55ptX2dw+qHLueS7T7 +C4AZ4eXWP6nk2ah5l2Kss/Kq1iuvzA0eOUVVZJJRX+aGF5F/4ZBmXoY3mi7PsaAlqoA99/IEvpvO +nfQ3Yq7FXYq7FXYq7FXYq7FXYq7FXzV+bts8H5gany+zL6MqHxDQp/EEZzXaEazF8+7bhWql519w +YbmE6p9L/lLfpd+QtM4kF7cSQSAdikjU/wCFIOdNoJXhD6D2LkEtLHy2+15P+d1nNB55lmcfBdW8 +MkR9lX0z+KZqe0okZb7w8z7QQI1JPeB+pj/kTzFD5e802WqzoZLeEss6r9rhIhQlfdeVcx9LmGPI +JHk4PZ2qGDNGZ5D9L3i5/NryDBbrN+lBLyFViijkZ/pXiOP+ypm+lr8IF29pPtrSxF8V/Ap15d80 +aH5itGutJuROiELKtCroT0DIwBFabeOX4c8MguJczS6zHnjxQNvIPz08rQWOqW2uWqBI9R5JdKBQ +eugBD/7NevuK980/aeARkJjq8r7RaMQmMkf4ufv/AGvL0dkdXQlXUgqw2II6HNW84DT6z8t6mdU8 +v6dqJpzuraKV6dnZAWH0NXOtwz4oCXeH07S5fExRn/OiEm/M7QE1rybfxBeVxaobu2PcPCCxA/1k +5L9OUa3Fx4j3jdxO19N4unkOo3HwfMecw+eI7QrJb7W9PsmFVurmGEj2kkC/xyzFHikB3lu0+Pjy +Rj3yA+19cAACg2A6DOufUG8VdirsVdirxP8AN78tfqzy+Y9Gi/0ZiX1G1Qf3bHczKP5T+0O3Xp00 +naGjr1x5df1vIdt9k8N5sY2/iH6f1vJM1DzCdeTNVTSfNel6hIaRQ3Cesx7RueDn6FY5fpsnBkB8 +3L0Gbws8JnkC+rc6t9LdirsVdirsVdirsVdirsVdirsVeMfn9oLCbTtdjX4GU2dwR2IJki++r/dm +l7VxbifweS9pdNvHKP6p+8fpeP5p3lnqP5HebY7DU5tBu3CW+osHtGOwFwBx4/8APRRT5gDvm17M +1HDLgPI/e9H7Pa0QmcUuUuXv/a9F/MzyKPNWjr9WKpqtmWezZtg4b7UTHsGoKHsfpzY63S+LHb6g +77tbs78zj2+uPL9T5y1DTr/TbySzv4HtrqI0kikFCP7PA5zc4GJoii8DlxSxyMZCiENkWD1v8gdM +1MalqGpFWTTGg9DkQQsk3qKw4+PBVavhXNv2VCXEZfw09P7NYZ8cp/wVXxv9Cdf85AXUK+XdNtTT +1pbz1U8eMUTK34yrl/ashwAebl+0sx4UY9TL7h+14VmheNfUX5bqy+RdFDCh+rKd/AkkZ1Oj/uo+ +59G7KH+DQ/qsjdFdGRhVWBDA9wcyXPIt4N5q/JDXdPZ7jRHGp2la+jslwo/1SeL/AEGvtmgz9mTj +vH1D7XitZ7P5Yb4/XH7f2sM8uLNYebtKFzE0Mttf2xlilBRlKzKSGB3GYWG45I30IdTpQYZ4cQoi +cfvfV2dY+mOxV2KuxV2KtMqupRwGVhRlO4IPUEYoIt4b+YP5O6jbXkuo+W7c3NhKS8lilPUhJ3Ij +X9tPADcZotX2fIHigLHc8d2n2FOMjPCLienUe7yeXSxSwyNFKjRyIaOjgqwI7EHNWRTzhiQaL6T/ +ACr80pr/AJUtxI/K/sALa7B6niP3b/7NB99c6XQ5/ExjvGz6B2PrPGwC/qjsf0MxzMdq7FXYq7FX +Yq7FXYq7FXYq7FUr8zaBaa/od3pVzslwlEkpUpIN0cf6rb5VmxDJExPVxtXpo58Zger5Y1jSb3SN +TuNNvozHdWzlJF7eIYeIYbg+GcrkxmEjE8w+b58MsUzCXMIVWZGDoSrKaqw2II6EHItQNPa/IH5z +2s0MWm+ZpPRuVASLUj/dyDoPVp9lv8roe9M3Wk7RBHDPn3vX9m9vRIEM2x/nfrej3uk+XfMFrG93 +bW2pW7CsMrBJRQ90cVp9BzZSxwyDcAh3+TDizx9QjMfNLLX8tfIltIJI9Gtyw6eoGlH/AAMhYZXH +R4h/CHHh2TpomxAff96a6prGi6Dp5uL6eKytIhRAaLWnRUQbk+yjLZ5I4xZ2Dk5s+PDC5ERiPxs+ +cPzB85S+atea8CmOygHpWULdRGDXk1NuTnc/d2zm9XqPFnfTo8B2nrzqcvF/CNgkWl6dc6nqNtp9 +qvK4upFijHuxpU+w6nKIQMpADmXDw4jkmIR5k0+tdOsYbDT7axg/ubWJIY/9WNQo/AZ1sIiIAHR9 +OxYxCIiOQFIjJNjsVSjXfKmga4EOpWiSzREGG5X4JkKmo4yLRqV7dMpy4IT+oOLqNFizfWLI69fm +m+XOU7FXYq7FXYq7FXYqknmLyb5b8wxFdUskllpRLlfgmXwpIu/0HbKM2nhk+oOHqtBhzj1xs9/X +5sN0T8t9d8neYk1HQLkahpc5EV9YzERzeix+0rGkbsn2h9nw75h4tHPDPigbj1DqtP2Vk0uXjxHi +gdiDsa+418HpubN6F2KuxV2KuxV2KuxV2KuxV2KuxVhX5j/lzaearQXFuVg1m3WlvOdldRv6clO3 +ge2YWs0Yyix9TqO1ey46mNjbIOR/QXzxqmlajpV7JZahbvbXURo8bih+Y7EHsRnOzhKBoii8Jmwz +xyMZiiEJkGtGafrGracxbT72ezYmpMErx1+fEjJwySjyJDbizzx/RIx9xpND5/8AOxTh+m7ym52m +YHf3rXLfzeX+cXI/lLUfz5fNJry+vr2YzXlxLczHrJM7SN/wTEnKZSMjZNuLPJKZuRJPmoZFg9x/ +Jz8u59NA8xatF6d5KlLC3cfFGjjeRh2ZhsB2Hz23vZ+kMfXLn0ex7C7LOP8AezHqPId3m9WzavSu +xV2KqEt7ZxOUlnjjcdVZ1B+4nFFhb+ktO/5aof8AkYv9cV4gqQ3VrMSIZklI3IRg1PuOK2q4pWGW +ISLGXUSMKqhI5EDwGKr8VdiqySaKPj6jqnI8V5ECpPYVxVfirsVQ739gjFHuYlZTRlLqCD7gnFFh +r9Jad/y1Q/8AIxf64rxBVhuLeYEwypKBsSjBqfdim1TFVCW9s4nKSzxxuOqs6g/cTiiwt/SWnf8A +LVD/AMjF/rivEHfpLTv+WqH/AJGL/XFeIKsNxbzAmGVJQNiUYNT7sU2qYq7FXYq7FUo8xeVdB8w2 +v1fVbVZwtfSlHwyxk90cbj5dPHKc2CGQVIOLqtHizxqYv73lGv8A5B6lE7S6FfJcxbkW9z+7kA8A +6gox+YXNTl7KkPoN+95nU+zcxvilY7jz/HyYbe/lp57s2Ky6NcPTvCBMP+SRfMOWjyj+Eupydk6m +POB+G/3INPJPnJ2CjQr8E+NtMo+8qBkPy2T+bL5NQ7P1B/yc/wDSlPNK/J3z1fuPUs1sYid5bmRV +p/sF5v8A8Ll+Ps/LLpXvczD2HqZ848I8/wAW9R8m/k9oOgype3rfpPUUIaN5FCwxsO6R71I8WPyp +m00/Z8Me59Rek0HYeLCeKXrn9g+DP82Du3Yq7FXzJ/zkT+b+tHXrjyfody9lY2QVdSuIWKSTSsoY +x81NRGgahA6mtdssjF1es1BvhDxOx8u+YtSiNxYaZeXsVSGmggllXl3HJFYVyduCISPIIn/BHnP/ +AKsGo/8ASJP/AM0Y2nwpdxZH+XXk38xIvO+izWGk6hZzRXcTvcvBNDGkQceoZHYKOHCoYE7jbvgJ +FNuHHPjFAvtvKXePgXzZrWrXHnXVNUlu5TqC30rpdByJEKSEJwYbrwAAWnTtl45PP5JHiJ62+7dE +uJrnRbC5mblNNbQySN0qzxgk7e5yh30TYCNxZPjX/nI/UL65/NjVbWed5LexS2jtImNVjR7WKVgo +7cncscthydLrCTkL6N/InUr3Ufyo0C6vZmnuDHPEZXJZisNzLFGCTvsiAZCXN2WlkTjFvn/88vzf +1zzD5ivtD066e18vafK9sIoWKfWXjPF5JSp+JSwPBelN+uTjF12q1BlIgcg84tPKvmi9t1ubPR72 +5t33SaG2lkRvkyqQclbjDHI8gVb/AAR5z/6sGo/9Ik//ADRjafCl3F6F+Q3lTz9Z/mTpt0mm31hY +x8/0lPNDLDEYCjVRy4UNyanEeO/bIyIpydLjmJjYvq7XLiW20XULiFuM0NtNJG3gyxkg/eMqdtI0 +C/PqSS6vLppJGe4urh6szEvI7ufpJJOXvO801/wR5z/6sGo/9Ik//NGNs/Cl3F3+CPOf/Vg1H/pE +n/5oxtfCl3F6N+QPlPz3ZfmXp13+jL6x0+JZf0jNNDLDEYmiYBHLhVar8eK+O/auRkRTk6THMTBo +09c1n8tfP7m8/QvmDUbKr6ibVm1O7nrE9vGLKJhcPKF/e+pycfGtag9MhYcyWGfQnr1+T0nU/M3l +7S5RFqOpW1pKRURSyor0PfiTWmUTzQj9RAbMurxYzU5RifMoWLz15NlkWNNbsi7Gij10FT9JyI1W +I/xD5tY7R05NCcfmE8BBFRuD0OXuYhrXVdMuzcC1uopzauY7kRurem46q9D8J+eQjOJujya4ZoSv +hIPDz8kufzv5OSYwPrdkJAeJHrx7HwJrTKzqcd1xD5uOe0NODXHH5hOUdJEV0YOjgMrKagg7ggjL +wXLBvcIHVNf0PSuP6Sv7ezL7os0iozDxAJqcrnlhD6iA05tTjx/XIR95QK+ffJTMFGuWVTtvOgH3 +k5X+axfzh82kdpaf/VI/NPI5I5Y1kicPG4DI6kFSDuCCOuXg25gIIsIa11XTLsTta3cM4tWaO5Mb +q3psv2g9D8NKd8jHJE3R5MIZoSvhINc/JL287+TlmMB1uyEgPEj14+vhWtMr/M47riHzcf8AlDT3 +XHH5hOlZWUMpDKwqCNwQcvcwF8K/m4jp+ZvmYOKE6hOw+TNVfwOXR5Oh1H94fe+nvye87eSI/wAt +tBthq9jaTWtssNzbTTxQyJMtfU5I7A/E1Wr3rXK5A27TT5YcA3DMv8b+S/8Aq/6b/wBJcH/NeCm/ +xY94Ren+YdA1KQxadqVreyKKslvPHKwHiQjHBSRMHkUwxZPz48yf8pFqv/MZP/ydbLw87P6i+9fL +X/KO6V/zB2//ACaXKC9BD6QmWLJ8W/8AOQ//AJOHzB/0af8AUFBl0eTpNZ/en8dH0Z/zjx/5J7y/ +/wBHf/UbPlcubstH/dD8dXxxrEcser30coIlS4lWQHc8g5B/HLXSy5l9weWfPvkKby9pr2ut6fDb +/VohHA9xDE0YVAODRswKlaUIPTKSC72GWHCNwmX+N/Jf/V/03/pLg/5rxpn4se8I7Tta0fUw502/ +t70J9s28qSha+PAtTAkSB5FS8y/8o7qv/MHcf8mmxCz+kvgjy86R6/pkkjBES7gZ3Y0AAkUkknLy +8/DmH3d/jfyX/wBX/Tf+kuD/AJrymnf+LHvDY87eTCQBr2nEnYAXcH/NeNL4se8JyrKyhlIKkVBG +4IOBm3ir55/LjynaeedZ1W61y4mZowsz+kQrPJMzblmDbDj0pnPaPAM8pGZeF7K0UdZknLIT3/Nk +3nX8nfLOk+WL7U7Ca6W5tE9VRI6ujAEAggIp6HxzJ1PZ8IQMhdh2Gv7Dw4sMpxMriyT8ldQu7zyR +ELmQyfVZ5IISxqRGoVlWp8OVB7Zk9mzJxb9C7DsDLKWmF9CR8Hmf5b+UrfzNr2q2l5dTwWMSl5ob +duBlJkIUMTUUXc9M1mj04yzkCTTz3ZWiGoyzjIkRHd13Zf5p/JbyvY+XdRv7Ge6S5sreS5T1HV0P +ooXKkBV+0Fp1zMz9m44wJBNgO01nYGGGKUomVxBPyTD8iL+6uPKVxbzOXjtLpo7eprxRkV+I9uRJ ++nLOy5k4yD0Lf7OZJSwEH+GWzCtG0CPzv+Zus2+s3MvpQG4k/dkBisMywxxqWDcVAcdu2YOPF4+e +Qke/73UYNMNZrJjITQ4vsNAMt1n8j/KcOk3k1rPdx3MULyRM8iOvJFLDkvAVG3jmZk7MxiJIu3aZ +/Z7AIExMrA/HRZ+QOo3c2i6lZSuXgtJka3U78fVViwHtVK08a4OypkxI7mPs1lkcconlE7fFhH5U ++TrbzRd6jBfXU8NjBHG8sED8PVdiwTlUMCFo3bvmDodOMpIJNOo7G0I1EpCRIiK5dWXecPya8s6b +5bv9RsJ7lLmziadfUdXRggqVICqdx75majs6EYGQuw7TXdhYceGU4mVxFp1+Rl9c3Pkp453LraXk +kEFf2Y/Tjk4/8FIcu7MkTi36Fy/Z3IZaej/DIgfIH9LDfzy/IbUfM2qN5l8scG1OVVW/0+RljExQ +BVkjdqKH4gBgxANOteu0jJztVpTI8Uebxn/lRH5tf9S7N/yNt/8Aqpk+IOF+Vydzv+VEfm1/1Ls3 +/I23/wCqmPEF/K5O5id9Y695a1tra6jm0zWLB1YrUxyxPQMrKynbYggg4WkgxPcX2v8AlJ5ruvNP +5e6RrN6eV9LG8V21KcpYJGiZ9qD4+HLbxymQou80+TjgCXxR5k/5SLVf+Yyf/k62XB0c/qL718tf +8o7pX/MHb/8AJpcoL0EPpCZYsnxb/wA5D/8Ak4fMH/Rp/wBQUGXR5Ok1n96fx0fRn/OPH/knvL// +AEd/9Rs+Vy5uy0f90Px1ea/nF/zjvrl7r115h8oRpdR37tPeaYXSORJmPJ3iLlUZWO/GtQele0oy +cXU6Mk8UXmn/ACoj82v+pdm/5G2//VTJcQcb8rk7mj+RP5sgE/4dm28JID/zMx4gv5XJ3MWsNQ17 +yxrouLWSXTdX06Uq1Ko6SRtR0dfmKMp2PQ4WkExPcQ+3oNbGu/lsNZ4hDqOkG5ZBWitLblmXf+Vj +TKervRLihfeHwhDFLNKkMSl5ZGCRooqWZjQAD3OXOgZT/wAqn/Mz/qWNS/6R5P6YOINv5fJ3Fsfl +N+ZhIH+GNR38bdx/DHiC/l8ncX2B+VWi61on5e6JpWtE/pK1gKzIWDFAXZo4qgkfu4yqbHtlUubu +cETGAB5sswNzxX/nHv8A3s1v/jHb/wDEnzS9k85fB5H2Z+qfuH6Xov5k/wDKCa1/zDn9YzY6z+6l +7nfdq/4tP3JB+RX/AChMn/MZL/xBMx+y/wC6+Lg+zv8Ai/8AnH9DGfyK/wCUk13/AIxj/k6cxuy/ +rk6/2d/vsnu/S9R86f8AKHa7/wBs67/5MPm01P8Ady/qn7no9f8A4vk/qS+4sH/ID/lG9R/5jP8A +mUmYPZX0H3un9mv7mX9b9AYHonle+8yeftcsbO/bTpY5LqczqGJKrcheHwsh3L1+jMDFgOTNIA1z ++90un0ctRqskYy4D6j/smXt+SfmNlKt5okKkUIKSkEH/AJ65l/ybP+f+Pm7T+QMv+q/f+tmX5e+Q +4vKFhcw/Wjd3F26vNLx9NQEFFVVq3Sp3rmbpNL4IIuyXbdmdmjSxIviMmA/849/72a3/AMY7f/iT +5gdk85fB0nsz9U/cP0vS/P8A/wAoTrf/ADBzf8QObLVf3Uvc9B2l/i8/6pYn+QX/ACh15/20ZP8A +kxDmJ2V/dn+t+gOt9m/8Xl/XP3RZPrv5keRNBvjp+r63a2l6oDPbu9XUMKjkFrxqN982lF3cs0Im +iUu/5XR+Vn/UyWf/AATf8048JY/mcfe7/ldH5Wf9TJZ/8E3/ADTjwlfzOPvfKv52eZdJ8x/mRqmp +6TL9Y09hDFDcAEB/ShVGYAgGnIGmWxGzqdTMSmSOT6T/AOccoZI/yk0guvESyXTpXuv1mQV/DK5c +3Z6Mfuw+SPNkEtv5p1mCZSksV9cpIh6hlmYEZaHT5BUj731r5N/PD8tJ/K+mfWdZisLqK3ihuLS4 +5K6SRoFYdKMKjZh/ZlRiXcY9VDhG6cn86fysAJ/xJabeBY/8a4OEs/zOPvfJP5s+aNP80/mFrGua +dyNjdPGtuzgqWSCFIQ/E7jl6fIA75bEUHUaiYnMkPqr8gbaa2/KLy9HKOLMlxKBv9mW6lkQ7+KsM +rlzdtpBWMJtqf5q/l1pd9NYX3mCzhvLdik8PPkUYdVbiCAR3HbBRZSzwBolC/wDK6Pys/wCpks/+ +Cb/mnHhKPzOPvcfzo/KwCv8AiS0/4Jv+aceEr+Zx97468+6vZ6z5213VbIlrO9vp5rZyCC0bSEo1 +DQiq70y4cnTZZCUiR3vsDyjDJD+SmmxyLxf9AqSp6jla8h+Byo83cYx+6H9V8X6DNFBrmnTzMEii +uYXkc9AqyAkn5DLS6WB3D7V/5XR+Vn/UyWf/AATf805Twl3f5nH3u/5XR+Vn/UyWf/BN/wA048JX +8zj70ZpH5ofl9rF/Fp+m69aXF7MaQwB6M58F5AVPsMaLKOeEjQLKcDa8Rb8u/wAyvKutXM/lCQS2 +k9Qjq8APp1qqyR3BCll8RXNJ+Uz4pE4+Xw/S8f8AyXrNNkJwG4n3cvMSdqei/nxrVm2m6kK2U5Al +HOxjBANfiMJD09sZ49XMcMuX+b+hc2n7TzR4J/Sf6n6N3pvkPyr/AIY8uQaY0gluOTS3Mi14mR+v +GvYAAZs9Lg8KHC9F2do/y+IQuzzPveLfl1pPma+17VZfLupLpt/bIxrIvJJFeSnBgQ46iu6nNJo8 +c5TlwGiHkey8GaeWZxS4JD7d/wAdE/1jRvz51O2m0y9YT2U3wStG9lErLXxT05OPiMyMmPVyHCeX ++a52fB2nkBhLeJ/qD9Reg/lv5Ok8q+XvqVxIst7PKZ7lkqUDEBQqkgVAVR9ObDR6fwoUebvOytCd +Ni4SbkTZYNr/AOXXnrR/Nlzrnk6TmLt3koHiR09VuTxss5COvLcdfwzBy6TLDIZ4+v46um1PZepx +Zzl0/wDF7uvTfYojTR/zkCb+3FyYxb+ovqmf6j6fGu/P0f3tP9XfJQ/OWL5f5v6GzF/KnELqvPgr +7N/k9bzbvTvOfyo8h635Xu9XfUvT9OcxxWzRty9RYyx9Sg+yDy2B3zXaDSyxGXE6Hsbs3JppT463 +qvh1Zn5l0uXVfL+o6bC6pLd28kMbvXiGdSBWnbMzNDjgYjqHbavCcmKUBzkCGP8A5UeVtV8t+WZb +PVFWO6nupLj0lYPxUokYBK1Wv7uuxzH0GCWOFS524PY2jnp8JjPmZX9w/Q8M/NP8hvzI1Lz1q2q6 +PZLqdhqM7XMUouIImTnQmN1neM/CdhSop92bESFJz6WZmSN7Yn/0Lx+cP/Uv/wDT3Zf9V8lxBp/J +5e77nf8AQvH5w/8AUv8A/T3Zf9V8eIL+Ty933J15Z/5xi/MLUL6JdbSHRrEEGeRpY55eNdxGkLSK +W/1mAwGYZw0Myd9n1Xouj2GjaTZ6Tp8fpWVjEkECdTxQUFT3J6k9zlTtoxERQeOfnL/zj5L5o1SX +zF5alig1WcD69ZTEpFOyinqI4B4OQACCKHrUGtZxk4Wp0nEeKPN4vN+QX5uRSFG8vyMR3Se2cH6V +lOT4g4R0mTuWf8qI/Nr/AKl2b/kbb/8AVTHiC/lcnczLyP8A84v+a73UYpvNhj0vTI2DTW8cqTXM +gB+wpiLxoD/NyqPDImbdi0MifVsH1FZWVrY2cFlaRLDa20awwQpsqRoAqqPYAZW7UChQfI3mT/nH +X81E12+NjpyalaSTSSQ3iXNunNXckFlmkjcNTrt9Jy0SDp56PJZoWlv/AELx+cP/AFL/AP092X/V +fDxBj+Ty933O/wChePzh/wCpf/6e7L/qvjxBfyeXu+5lXkb/AJxg813WqQT+bPS07S4mV57ZJVmu +JQN/TUxFkUHoW5bdhkTNtxaGRPq2D6cvNOin0mfTYqQwy27WycRsishQUHsMrdqRtT4+uv8AnHL8 +3YbmSKLRkuY0YhbiK7tQjj+ZRJLG9P8AWUZbxB0p0eTuUv8AoXj84f8AqX/+nuy/6r4eIL+Ty933 +O/6F4/OH/qX/APp7sv8AqvjxBfyeXu+5PfI3/OPv5oQebtIu9S05NNsrO7huZrp7i3kosMgkIVYZ +JHLHjQbU98BkGzFpMnECRT61yp27sVdirsVeN/khZ3cPmTzAZoXjEYEUhZSOL+oTxNe/tmm7MiRO +VvKez8JDNksfi3smbl6t2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2 +KuxV2KuxV2Kv/9k=</xapGImg:image> + </rdf:li> + </rdf:Alt> + </xap:Thumbnails> + </rdf:Description> + + <rdf:Description + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + </rdf:Description> + +<cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></svg:metadata></x:xmpmeta> + <xpacket /> + </svg:metadata> + <svg:path + i:knockout="Off" + d="M 66.611196,30.730335 L 66.611196,30.730335 C 64.96161,30.670625 63.667896,29.279782 63.720441,27.626216 C 63.746713,26.826899 64.08905,26.088089 64.670226,25.541942 C 65.251403,24.998184 66.014893,24.713965 66.81421,24.744218 C 68.465387,24.80154 69.760694,26.188402 69.706557,27.84356 C 69.680285,28.64208 69.344317,29.378503 68.760752,29.927037 C 68.175595,30.472388 67.413697,30.755015 66.611196,30.730335 L 66.611196,30.730335 z M 67.304627,28.017117 C 68.040253,28.017117 68.63576,27.619847 68.63576,27.130226 C 68.63576,26.641401 68.040253,26.244927 67.304627,26.244927 C 66.572186,26.244927 65.976679,26.641401 65.976679,27.130226 C 65.976679,27.619051 66.572186,28.017117 67.304627,28.017117" + id="path19" + style="fill:#f0811e;fill-opacity:1;stroke:#000000;stroke-width:0.396;stroke-miterlimit:4;stroke-dasharray:none;opacity:1" /><svg:path + i:knockout="Off" + clip-rule="evenodd" + d="M 31.930882,48.469587 L 32.789503,48.603277 L 36.864002,49.068571 C 36.835341,48.969055 32.617348,47.2965 32.41653,46.740549 C 32.040274,45.698904 32.158584,42.610216 33.68238,41.107915 C 34.272314,40.522758 35.17672,40.000496 35.88687,39.833308 C 38.806286,39.119974 42.229653,39.613576 45.464338,43.355396 C 47.137807,45.289997 47.955435,46.171315 48.366239,46.566992 L 49.694894,50.751356 L 50.952502,47.711166 C 51.087845,47.786003 54.240897,49.394057 54.240897,49.394057 L 53.263528,46.696365 L 55.540095,46.876866 C 55.505862,46.836263 50.913861,44.810725 51.517329,41.187528 C 51.996601,38.30155 53.545183,35.11544 56.720954,35.475292 C 57.758314,35.593915 59.458035,35.870435 60.678506,35.896707 C 64.091523,35.917407 78.038567,34.391566 80.305948,33.400381 C 81.770831,32.761087 86.835926,33.132509 87.497401,36.060258 L 90.514319,34.645971 C 89.522338,35.243867 87.889798,32.622737 85.797205,31.601864 C 85.776354,31.591692 85.077764,31.021682 85.796194,31.041776 C 87.636437,31.051148 92.205884,37.752304 94.661769,31.736783 L 96.073756,25.491043 C 95.910549,24.452887 74.016102,24.682369 73.233123,24.630131 C 72.48739,24.580377 64.744641,20.4182 64.221583,20.112485 C 59.993326,17.64766 63.74579,5.9631243 59.079777,7.2429543 L 59.749217,19.399922 C 59.749217,19.399922 51.086772,8.7520129 46.536409,8.9848171 C 36.029684,9.5146931 56.533131,19.904744 55.481271,21.63373 C 54.452668,21.29219 47.001669,18.885483 40.017203,18.643459 C 34.094777,18.434076 25.470279,17.669789 14.039415,24.695654 L 13.701059,24.907425 C 8.3239839,28.263122 4.6124165,32.397435 2.6714467,37.20448 C 2.0632018,38.715539 1.2431859,42.129353 2.052056,45.339357 C 2.4039463,46.742938 3.0567746,48.151295 3.9349082,49.415553 C 5.9196652,52.267298 9.2501585,54.802843 12.840441,54.479748 C 18.334559,53.985326 21.479573,51.065697 23.106563,48.396504 C 24.712517,45.76182 22.09272,48.681749 18.956702,50.328157 C 17.417479,51.136248 14.865096,52.513118 12.344542,52.240045 C 9.8040848,51.960603 7.0659026,50.336665 5.5702897,46.520451 C 4.1558382,42.911329 5.6919601,40.511585 6.6815499,39.260086 C 10.087992,34.952079 14.624573,34.716568 17.287634,35.173547 C 21.23008,35.857425 25.711507,39.494952 27.303771,43.69216 C 27.559329,44.360911 27.689895,47.139093 27.800557,47.620753 L 30.613243,51.88641 L 30.447049,48.670344 L 33.344507,51.10374 L 31.930882,48.469587 z M 63.771393,24.627983 L 63.771393,24.627983 C 62.931474,25.408988 62.452999,26.473417 62.412396,27.619847 C 62.334375,29.984359 64.189362,31.974689 66.551486,32.063856 C 67.705081,32.10207 68.794986,31.696839 69.633313,30.911853 C 70.47164,30.130847 70.950115,29.068011 70.993903,27.923969 C 71.073516,25.558661 69.218528,23.563554 66.850036,23.477572 C 65.704402,23.439358 64.60972,23.845385 63.771393,24.627983" + id="path21" + style="fill:#f0811e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.496;stroke-miterlimit:4;stroke-dasharray:none" + sodipodi:nodetypes="cccsscsccccccsscsccscccssccsccccsssssscsscscccccccscscsc" /><svg:g + style="fill:#f0811e;fill-opacity:1;stroke:#000000" + id="g23" + transform="matrix(0.796132,0,0,0.796132,-1.2463189,18.512893)"> + <svg:g + style="fill:#f0811e;fill-opacity:1;stroke:#000000" + id="g25" + i:knockout="Off"> + + </svg:g> + + + + + </svg:g><svg:g + i:knockout="Off" + id="g37" + style="fill:#f0811e;fill-opacity:1;stroke:#000000" + transform="matrix(0.796132,0,0,0.796132,-1.2463189,18.512893)"> + + + + + </svg:g> + <svg:path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.398;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 91.816789,29.154259 C 91.138006,29.212187 90.223036,30.029648 90.210418,30.674533 C 90.194186,31.50424 91.248471,32.475391 92.122772,32.411984 C 92.979505,32.349853 93.912561,31.256688 93.754588,30.45735 C 93.62115,29.782274 92.539545,29.09258 91.816789,29.154259 z" + id="path3188" + sodipodi:nodetypes="cssss" /><svg:path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 93.387198,25.857669 C 92.959729,25.897534 92.383342,26.460017 92.375468,26.903759 C 92.365234,27.474664 93.029188,28.142899 93.579957,28.099271 C 94.119555,28.056522 94.707244,27.304322 94.607826,26.754308 C 94.523767,26.289805 93.842488,25.815236 93.387198,25.857669 z" + id="path3192" + sodipodi:nodetypes="cssss" /></svg:svg> \ No newline at end of file Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed Apr 1 13:53:13 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 1 13:47:29 CEST 2009 - locilka(a)suse.cz + +- New YaST icon based on new YaST Mascot: Aardvark. +- 2.18.1 + +------------------------------------------------------------------- Thu Jan 22 12:24:56 CET 2009 - jimmac(a)novell.com - set the SLE green for links (a) as well. bug #446588 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56527 - /trunk/autoinstallation/src/modules/AutoInstallRules.ycp
by ug＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: ug Date: Wed Apr 1 13:27:30 2009 New Revision: 56527 URL: http://svn.opensuse.org/viewcvs/yast?rev=56527&view=rev Log: more verbose Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp Modified: trunk/autoinstallation/src/modules/AutoInstallRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstallRules.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstallRules.ycp Wed Apr 1 13:27:30 2009 @@ -708,6 +708,7 @@ MergeCommand = MergeCommand + " /usr/share/autoinstall/xslt/merge.xslt "; MergeCommand = MergeCommand + base_profile + " "; + y2milestone("Merge command: %1", MergeCommand); map xsltret = (map)SCR::Execute(.target.bash_output, MergeCommand); y2milestone("Merge result: %1", xsltret); if (xsltret["exit"]:-1 != 0 || xsltret["stderr"]:"" != "") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56526 - in /branches/SuSE-SLE-10-SP3-Branch/installation: package/yast2-installation.changes src/include/add-on-workflow.ycp src/modules/AddOnProduct.ycp
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 13:13:09 2009 New Revision: 56526 URL: http://svn.opensuse.org/viewcvs/yast?rev=56526&view=rev Log: - do not log password in URL into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp branches/SuSE-SLE-10-SP3-Branch/installation/src/modules/AddOnProduct.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Wed Apr 1 13:13:09 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 1 11:41:24 CEST 2009 - lslezak(a)suse.cz + +- do not log password in URL into y2log (bnc#441944) + +------------------------------------------------------------------- Wed Feb 4 12:30:40 CET 2009 - locilka(a)suse.cz - Removing old additional control files during update. Writing new Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp Wed Apr 1 13:13:09 2009 @@ -31,6 +31,7 @@ import "SuSEFirewall"; import "Stage"; import "Wizard"; +import "InstURL"; include "packager/inst_source_dialogs.ycp"; @@ -286,7 +287,7 @@ { do { url = editUrl( url ); - y2milestone ("New url: '%1'", url); + y2milestone ("New url: '%1'", InstURL::HidePassword(url)); if (url == nil || url == "") { break; } else { Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/instal… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/modules/AddOnProduct.ycp Wed Apr 1 13:13:09 2009 @@ -33,6 +33,7 @@ import "Directory"; import "Installation"; import "String"; +import "InstURL"; // variables for installation with product /** @@ -109,7 +110,7 @@ y2warning ("Empty base url"); base_product_url = url; - y2milestone ("New base URL: %1", base_product_url); + y2milestone ("New base URL: %1", InstURL::HidePassword(base_product_url)); } global string GetBaseProductURL () { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56525 - in /trunk/storage: ./ libstorage/src/ package/
by aschnell＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: aschnell Date: Wed Apr 1 12:22:44 2009 New Revision: 56525 URL: http://svn.opensuse.org/viewcvs/yast?rev=56525&view=rev Log: - improved used-by handling during detection (fixes bnc #472803) Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageTypes.cc trunk/storage/libstorage/src/StorageTypes.h trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=56525&r1=565… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Apr 1 12:22:44 2009 @@ -1 +1 @@ -2.18.9 +2.18.10 Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container… ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Wed Apr 1 12:22:44 2009 @@ -356,7 +356,7 @@ { std::ostringstream b; classic(b); - b << uby << "-->" << string(c.uby); + b << uby << "-->" << c.uby; ret += b.str(); } return( ret ); Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Wed Apr 1 12:22:44 2009 @@ -39,6 +39,10 @@ nm = tn; init(); getTableInfo(); + + getContainer()->getStorage()->fetchDanglingUsedBy(dev, uby); + for (list<string>::const_iterator it = alt_names.begin(); it != alt_names.end(); ++it) + getContainer()->getStorage()->fetchDanglingUsedBy(*it, uby); } Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Apr 1 12:22:44 2009 @@ -198,8 +198,11 @@ y2mil("DETECTED OBJECTS END"); } + void Storage::detectObjects() { + danglingUsedBy.clear(); + ProcPart ppart; detectDisks(ppart); if( instsys() ) @@ -215,6 +218,9 @@ detectLvmVgs(); detectDm(ppart); + if (!danglingUsedBy.empty()) + y2err("dangling used-by left after detection: " << danglingUsedBy); + LvmVgPair p = lvgPair(); y2mil( "p length:" << p.length() ); for( LvmVgIterator i=p.begin(); i!=p.end(); ++i ) @@ -4813,8 +4819,9 @@ else { ret = false; - y2err("could not set ub_type:" << ub_type << " ub_name:" << ub_name << - " for dev: " << dev); + danglingUsedBy[dev] = storage::usedBy(ub_type, ub_name); + y2mil("adding ub_type:" << ub_type << " ub_name:" << ub_name << + " for dev: " << dev << " to dangling usedby"); } } else @@ -4826,6 +4833,23 @@ } +void +Storage::fetchDanglingUsedBy(const string& dev, storage::usedBy& uby) +{ + map<string, storage::usedBy>::iterator pos = danglingUsedBy.find(dev); + if (pos != danglingUsedBy.end()) + { + uby = pos->second; + danglingUsedBy.erase(pos); + y2mil("dev:" << dev << " usedby:" << uby); + } + else + { + y2mil("dev:" << dev << " not found"); + } +} + + bool Storage::usedBy( const string& dev, storage::usedBy& ub ) { ub.clear(); Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Wed Apr 1 12:22:44 2009 @@ -235,6 +235,7 @@ bool clearUsedBy(const string& dev); bool setUsedBy(const string& dev, storage::UsedByType ub_type, const string& ub_name); + void fetchDanglingUsedBy(const string& dev, storage::usedBy& uby); bool canUseDevice( const string& dev, bool disks_allowed=false ); bool knownDevice( const string& dev, bool disks_allowed=false ); bool setDmcryptData( const string& dev, const string& dm, @@ -1742,6 +1743,8 @@ static storage::CallbackYesNoPopup yesno_popup_cb_ycp; friend std::ostream& operator<< (std::ostream& s, Storage &v ); + map<string, storage::usedBy> danglingUsedBy; + unsigned max_log_num; string lastAction; string extendedError; Modified: trunk/storage/libstorage/src/StorageTypes.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.cc (original) +++ trunk/storage/libstorage/src/StorageTypes.cc Wed Apr 1 12:22:44 2009 @@ -98,7 +98,7 @@ st = "UNKNOWN"; break; } - st += "[" + name() + "]"; + st += "[" + device() + "]"; } return st; } @@ -107,9 +107,7 @@ std::ostream& operator<<(std::ostream& s, const usedBy& d) { if (d.type() != storage::UB_NONE) - { - s << " UsedBy:" << string(d); - } + s << string(d); return s; } Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Wed Apr 1 12:22:44 2009 @@ -142,8 +142,6 @@ bool operator!=(const usedBy& rhs) const { return !(*this == rhs); } - operator string() const; - storage::UsedByType type() const { return ub_type; } const string& name() const { return ub_name; } const string device() const; @@ -151,6 +149,7 @@ friend std::ostream& operator<<(std::ostream&, const usedBy&); private: + operator string() const; storage::UsedByType ub_type; string ub_name; }; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed Apr 1 12:22:44 2009 @@ -2949,7 +2949,7 @@ { std::ostringstream b; classic(b); - b << uby << "-->" << string(rhs.uby); + b << uby << "-->" << rhs.uby; ret += b.str(); } if( fs!=rhs.fs ) Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Apr 1 12:22:44 2009 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Wed Apr 01 12:11:44 CEST 2009 - aschnell(a)suse.de + +- improved used-by handling during detection (fixes bnc #472803) +- 2.18.10 + +------------------------------------------------------------------- Fri Mar 27 17:55:41 CET 2009 - kmachalkova(a)suse.cz - Avoid throwing 'no widget with ID foo' exceptions in format/mount - dialog (bnc#483789) + dialog (bnc#483789) ------------------------------------------------------------------- Wed Mar 25 16:58:10 CET 2009 - aschnell(a)suse.de @@ -25,7 +31,7 @@ ------------------------------------------------------------------- Fri Mar 13 15:49:50 CET 2009 - kmachalkova(a)suse.cz -- Added graphical representation of partitions on disk +- Added graphical representation of partitions on disk ------------------------------------------------------------------- Wed Mar 11 12:13:56 CET 2009 - aschnell(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56524 - /tags/branch-SLE-10-SP3-2_13_180/packager/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 11:55:53 2009 New Revision: 56524 URL: http://svn.opensuse.org/viewcvs/yast?rev=56524&view=rev Log: Created tag branch-SLE-10-SP3-2_13_180 for packager Added: tags/branch-SLE-10-SP3-2_13_180/packager/ - copied from r56523, branches/SuSE-SLE-10-SP3-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56523 - /tags/branch-SLE-10-SP3-2_13_180/
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 11:55:52 2009 New Revision: 56523 URL: http://svn.opensuse.org/viewcvs/yast?rev=56523&view=rev Log: Created tag branch-SLE-10-SP3-2_13_180 Added: tags/branch-SLE-10-SP3-2_13_180/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56522 - /branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 11:54:51 2009 New Revision: 56522 URL: http://svn.opensuse.org/viewcvs/yast?rev=56522&view=rev Log: - added missing import "InstURL" statement Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Wed Apr 1 11:54:51 2009 @@ -23,6 +23,7 @@ import "Popup"; import "CWM"; import "SourceManager"; +import "InstURL"; // common functions / data -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56521 - in /branches/SuSE-SLE-10-SP3-Branch/packager: VERSION package/yast2-packager.changes src/modules/InstURL.ycp src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 11:34:46 2009 New Revision: 56521 URL: http://svn.opensuse.org/viewcvs/yast?rev=56521&view=rev Log: - do not log password in URL into y2log (bnc#441944) - 2.13.180 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/VERSION Wed Apr 1 11:34:46 2009 @@ -1 +1 @@ -2.13.179 +2.13.180 Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Apr 1 11:34:46 2009 @@ -3,6 +3,8 @@ - fixed ZMD repository sychronization - properly synchronize repositories with password in the URL (bnc#410417) +- do not log password in URL into y2log (bnc#441944) +- 2.13.180 ------------------------------------------------------------------- Wed Jun 11 09:59:53 CEST 2008 - lslezak(a)suse.cz Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/InstURL.ycp Wed Apr 1 11:34:46 2009 @@ -29,7 +29,7 @@ global string HidePassword(string url) { // Url::Build(Url::Parse) transforms the URL too much, see #247249#c41 // replace ://user:password@ by ://user:PASSWORD@ - string subd = regexpsub (url, "(://[^/:]*):[^/@]*@,", "://\\1:PASSWORD@"); + string subd = regexpsub (url, "(.*)(://[^/:]*):[^/@]*@(.*)", "\\1\\2:PASSWORD@\\3"); return subd == nil? url: subd; } Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceDialogs.ycp Wed Apr 1 11:34:46 2009 @@ -710,9 +710,16 @@ directory = directory + ";workgroup=" + workgroup; } parsed["path"] = directory; - y2milestone("Entered URL: %1", parsed); + + map log_parsed = parsed; + if (haskey(log_parsed, "pass") && size(log_parsed["pass"]:"") > 0) + { + log_parsed["pass"] = "PASSWORD"; + } + y2milestone("Entered URL: %1", log_parsed); + _url = URL::Build (parsed); - y2milestone("URL::Build: %1", _url); + y2milestone("URL::Build: %1", InstURL::HidePassword(_url)); if (UI::WidgetExists (`id (`ch_iso))) { boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56520 - in /branches/SuSE-SLE-10-SP3-Branch/packager: package/yast2-packager.changes src/modules/SourceManager.ycp
by lslezak＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: lslezak Date: Wed Apr 1 11:30:18 2009 New Revision: 56520 URL: http://svn.opensuse.org/viewcvs/yast?rev=56520&view=rev Log: - fixed ZMD repository sychronization - properly synchronize repositories with password in the URL (bnc#410417) Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/package/yast2-packager.changes Wed Apr 1 11:30:18 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 1 11:28:41 CEST 2009 - lslezak(a)suse.cz + +- fixed ZMD repository sychronization - properly synchronize + repositories with password in the URL (bnc#410417) + +------------------------------------------------------------------- Wed Jun 11 09:59:53 CEST 2008 - lslezak(a)suse.cz - added options for sw_single client, display proper workflow for Modified: branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/packag… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/packager/src/modules/SourceManager.ycp Wed Apr 1 11:30:18 2009 @@ -916,7 +916,8 @@ map gendata = Pkg::SourceGeneralData (src_id); string stype = gendata["type"]:""; // metadata type if (stype == "YaST") stype = "zypp"; /* 'rug' only accepts yum or zypp */ - string url = gendata["url"]:""; + // URL including password + string url = Pkg::SourceURL(src_id); string log_url = InstURL::HidePassword (url); // ZMD must have unique URIs, so we append the alias string alias = gendata["alias"]:""; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56519 - in /trunk/product-creator: MAINTAINER package/yast2-product-creator.changes src/complex.ycp
by jsuchome＠svn.opensuse.org 01 Apr '09

01 Apr '09

Author: jsuchome Date: Wed Apr 1 11:10:48 2009 New Revision: 56519 URL: http://svn.opensuse.org/viewcvs/yast?rev=56519&view=rev Log: - read the configured architecture with GetArch, which merges i586 and i686 to i386 (bnc#464727) - 2.18.2 Modified: trunk/product-creator/MAINTAINER trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp Modified: trunk/product-creator/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/MAINTAINER?rev=5… ============================================================================== --- trunk/product-creator/MAINTAINER (original) +++ trunk/product-creator/MAINTAINER Wed Apr 1 11:10:48 2009 @@ -1 +1 @@ -Ladislav Slezak <lslezak(a)suse.cz> +Jiri Suchomel <jsuchome(a)suse.cz> Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Apr 1 11:10:48 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 1 11:08:58 CEST 2009 - jsuchome(a)suse.cz + +- read the configured architecture with GetArch, which merges + i586 and i686 to i386 (bnc#464727) +- 2.18.2 + +------------------------------------------------------------------- Mon Mar 16 14:55:45 CET 2009 - jsuchome(a)suse.cz - escape URL of base product when saving to XML (bnc#482395) Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Wed Apr 1 11:10:48 2009 @@ -64,7 +64,7 @@ // needed for creating kiwi images because kiwi cannot create cross-architecture images boolean SameArchitecture() { - string arch = ProductCreator::Config["arch"]:""; + string arch = ProductCreator::GetArch (); string sysarch = Arch::architecture(); // is the target architecture different than the machine architecture? -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0