rev 15607 - trunk/packages/kdeadmin/debian/patches

[Didier Raboud]

Author: odyx-guest
Date: 2009-08-10 16:01:08 +0000 (Mon, 10 Aug 2009)
New Revision: 15607

Modified:
   trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff
Log:
kdeadmin: Update patch 04_fix_runtime_fail_type_mismatch.diff, thanks to Riddell



Modified: trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff	2009-08-10 15:41:13 UTC (rev 15606)
+++ trunk/packages/kdeadmin/debian/patches/04_fix_runtime_fail_type_mismatch.diff	2009-08-10 16:01:08 UTC (rev 15607)
@@ -4,15 +4,30 @@
 Last-Update: 2009-08-10
 Index: kdeadmin-4.3.0/system-config-printer-kde/options.py
 ===================================================================
---- kdeadmin-4.3.0.orig/system-config-printer-kde/options.py	2009-08-10 14:26:59.000000000 +0200
-+++ kdeadmin-4.3.0/system-config-printer-kde/options.py	2009-08-10 14:30:40.000000000 +0200
-@@ -137,8 +137,7 @@
+--- kdeadmin-4.3.0.orig/system-config-printer-kde/options.py        2009-08-10 15:18:28.000000000 +0200
++++ kdeadmin-4.3.0/system-config-printer-kde/options.py        2009-08-10 17:54:35.000000000 +0200
+@@ -131,14 +131,20 @@
+             if (type(self.widget) == QComboBox and
+                 self.ipp_type == str):
+                 self.widget.clear()
+-                for each in supported:
+-                    self.widget.addItem(each)
++                if type(supported) == list:
++                        for each in supported:
++                                self.widget.addItem(each)
++                else:
++                        self.widget.addItem(supported)
+             elif (type(self.widget) == QComboBox and
                    self.ipp_type == int and
                    self.combobox_map != None):
                  self.widget.clear()
 -                for each in supported:
 -                    self.widget.addItem(self.combobox_dict[each])
-+                self.widget.addItem(self.combobox_dict[supported])
++                if type(supported) == list:
++                        for each in supported:
++                                self.widget.addItem(self.combobox_dict[each])
++                else:
++                        self.widget.addItem(self.combobox_dict[supported])
          if original_value != None:
              self.original_value = self.ipp_type (original_value)
              self.set_widget_value (self.original_value)