diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-24 17:26:04 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-24 17:26:04 -0400 |
| commit | 93c66bf8bb8ac0124ae1800cbaaeb814742bfac5 (patch) | |
| tree | 2551422a7981b35684110fae090223b7a1b6d73f /opensuse/tdebase/locale-dont-show-flag.diff | |
| parent | 425774d7d1d663e08bb06050924f2eeca9147bba (diff) | |
| download | tde-packaging-93c66bf8bb8ac0124ae1800cbaaeb814742bfac5.tar.gz tde-packaging-93c66bf8bb8ac0124ae1800cbaaeb814742bfac5.zip | |
dbus-1-tqt -> libdbus-tqt-1-0 AND tdelibs import (unchanged)
Diffstat (limited to 'opensuse/tdebase/locale-dont-show-flag.diff')
| -rw-r--r-- | opensuse/tdebase/locale-dont-show-flag.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/opensuse/tdebase/locale-dont-show-flag.diff b/opensuse/tdebase/locale-dont-show-flag.diff new file mode 100644 index 000000000..2c0a57454 --- /dev/null +++ b/opensuse/tdebase/locale-dont-show-flag.diff @@ -0,0 +1,33 @@ +Index: kcontrol/locale/kcmlocale.cpp +=================================================================== +--- kcontrol/locale/kcmlocale.cpp.orig ++++ kcontrol/locale/kcmlocale.cpp +@@ -292,9 +292,13 @@ void KLocaleConfig::loadCountryList() + QString map( locate( "locale", + QString::fromLatin1( "l10n/%1.png" ) + .arg(tag) ) ); ++#if 0 + QIconSet icon; + if ( !map.isNull() ) + icon = KGlobal::iconLoader()->loadIconSet(map, KIcon::Small); ++#else ++ QIconSet icon; ++#endif + m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 ); + } + +@@ -318,10 +322,14 @@ void KLocaleConfig::loadCountryList() + tag = tag.mid(index + 1); + int menu_index = submenu.isEmpty() ? -1 : -2; + ++#if 0 + QString flag( locate( "locale", + QString::fromLatin1( "l10n/%1/flag.png" ) + .arg(tag) ) ); + QIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); ++#else ++ QIconSet icon; ++#endif + m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); + } + |