Attachment 196021 Details for Bug 291261 – use the system icon theme

[patch] use the system icon theme

s-c-keyboard.patch (text/plain), 1.39 KB, created by Bill Nottingham on 2007-09-14 16:48:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-09-14 16:48:28 UTC

Size: 1.39 KB

patch

obsolete

>diff -up system-config-keyboard-1.2.11/src/keyboard_gui.py.foo system-config-keyboard-1.2.11/src/keyboard_gui.py
>--- system-config-keyboard-1.2.11/src/keyboard_gui.py.foo	2007-09-14 12:36:00.000000000 -0400
>+++ system-config-keyboard-1.2.11/src/keyboard_gui.py	2007-09-14 12:36:02.000000000 -0400
>@@ -49,10 +49,14 @@ translate.textdomain ("rhpl")
> ##
> 
> iconPixbuf = None      
>+icon_theme = gtk.icon_theme_get_default()
> try:
>-    iconPixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-keyboard/pixmaps/system-config-keyboard.png")
>+    iconPixbuf = icon_theme.load_icon("preferences-desktop-keyboard", 48, 0)
> except:
>-    pass
>+    try:
>+        iconPixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-keyboard/pixmaps/system-config-keyboard.png")
>+    except:
>+        pass
> 
> keyboardBackend = keyboard_backend.KeyboardBackend()
> 
>@@ -168,14 +172,7 @@ class KeyboardWindow(FirstbootModuleWind
>         # XXX set up a test area and do some sort of instant apply ?
> 
>         # set up the icon
>-        p = None
>-        try:
>-            p = gtk.gdk.pixbuf_new_from_file("../pixmaps/system-config-keyboard.png")
>-        except:
>-            try:
>-                p = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-keyboard/pixmaps/system-config-keyboard.png")
>-            except:
>-                pass
>+        p = iconPixbuf
> 
>         if p:
>             self.icon = gtk.Image()

Actions: View | Diff

Attachments on bug 291261: 196021