patches/grandr-01-gconf.diff
author trisk
Sun, 16 Sep 2007 18:13:20 +0000
changeset 479 742d70ca4cea
permissions -rw-r--r--
2007-09-16 Albert Lee <[email protected]> * SFEgimmie.spec: Add patch2 * SFEgrandr.spec: *NEW* GTK interface to the X Resize And Rotate (XRandR) extension * SFEpulseaudio.spec: Fix rules, add patch3 * SFEsexy-python.spec: Fix rules, update Python library dir * patches/gimmie-02-monitor.diff: Allow gnomevfs monitoring to fail * patches/grandr-01-gconf.diff: Fix crash on empty gconf value * patches/grandr-02-desktop-file.diff: Add desktop file * patches/pulseaudio-03-esdcompat.diff: Fix bashism in esdcompat script
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
479
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     1
--- grandr-0.1.orig/src/grandr.c
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     2
+++ grandr-0.1/src/grandr.c
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     3
@@ -1381,7 +1381,7 @@
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     4
 											NULL);
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     5
 	command = gconf_client_get_string(client, GCONF_KEY2,
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     6
 											NULL);
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     7
-	if (strcmp(key, HOTKEY) == 0 && strcmp(command, APP_NAME) == 0) {
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     8
+	if (key && strcmp(key, HOTKEY) == 0 && command && strcmp(command, APP_NAME) == 0) {
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     9
 		gtk_toggle_button_set_active (hotkey_cbtn, TRUE);
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    10
 	} else {
742d70ca4cea 2007-09-16 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    11
 		gtk_toggle_button_set_active (hotkey_cbtn, FALSE);