summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdebase/locale-dont-show-flag.diff
blob: 2c0a5745462e62bbf203a652bffa743248211804 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
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 );
   }