summaryrefslogtreecommitdiff
path: root/capplets/keybindings
diff options
context:
space:
mode:
authorJody Goldberg <jody@gnome.org>2002-05-24 12:39:10 +0000
committerJody Goldberg <jody@src.gnome.org>2002-05-24 12:39:10 +0000
commit9af1b5753d00c00570fd41157d7dc3717d8722a3 (patch)
tree82cc130e22a7193085fb046b26a52785d0547389 /capplets/keybindings
parent8c6844c7bb824c9cd178ff03e77ad37b482a36d6 (diff)
downloadgnome-control-center-9af1b5753d00c00570fd41157d7dc3717d8722a3.tar.gz
http://bugzilla.gnome.org/show_bug.cgi?id=82850 some protection against
2002-05-24 Jody Goldberg <jody@gnome.org> http://bugzilla.gnome.org/show_bug.cgi?id=82850 * gnome-keybinding-properties.c (setup_dialog) : some protection against faulty installs.
Diffstat (limited to 'capplets/keybindings')
-rw-r--r--capplets/keybindings/ChangeLog6
-rw-r--r--capplets/keybindings/gnome-keybinding-properties.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index a54708100..a76858328 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-24 Jody Goldberg <jody@gnome.org>
+
+ http://bugzilla.gnome.org/show_bug.cgi?id=82850
+ * gnome-keybinding-properties.c (setup_dialog) : some protection
+ against faulty installs.
+
Tue May 21 19:36:13 2002 Jonathan Blandford <jrb@redhat.com>
* gnome-keybinding-properties.c (accel_edited_callback):
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index cd398b7cd..e7acf9cf4 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -890,7 +890,8 @@ setup_dialog (GladeXML *dialog)
widget = WID ("gnome-keybinding-dialog");
filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, "keyboard-shortcut.png", TRUE, NULL);
icon_pixbuf = gdk_pixbuf_new_from_file ("keyboard-shortcut.png", NULL);
- gtk_window_set_icon (GTK_WINDOW (widget), icon_pixbuf);
+ if (icon_pixbuf != NULL)
+ gtk_window_set_icon (GTK_WINDOW (widget), icon_pixbuf);
g_free (filename);
g_object_unref (icon_pixbuf);
gtk_widget_show (widget);