patches/redshift-02-clock-applet.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3438 a1dade982b66
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3438
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     1
diff -Naur redshift-1.6/src/location-gnome-clock.c redshift-1.6_bonoboiidfix/src/location-gnome-clock.c
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     2
--- redshift-1.6/src/location-gnome-clock.c	2010-09-04 13:32:56.000000000 +0100
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     3
+++ redshift-1.6_bonobofix/src/location-gnome-clock.c	2011-01-16 23:10:54.654764596 +0000
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     4
@@ -104,11 +104,28 @@
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     5
 			char *bonobo_iid = gconf_client_get_string(client, key,
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     6
 								   &error);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     7
 
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     8
+			/* Try both gnome-panel 2.30.x and earlier bonobo_iid key and
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     9
+			   newer applet_iid. */
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    10
 			if (!error && bonobo_iid != NULL &&
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    11
 			    !strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) {
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    12
 				clock_applet_count += 1;
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    13
 				current_city = find_current_city(client, id);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    14
 			}
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    15
+			else {
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    16
+				g_free(key);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    17
+				key = g_strdup_printf("/apps/panel/applets/%s"
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    18
+					    "/applet_iid", id);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    19
+				char *applet_iid = gconf_client_get_string(client, key,
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    20
+									    &error);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    21
+
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    22
+				if (!error && applet_iid != NULL &&
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    23
+				    !strcmp(applet_iid, "ClockAppletFactory::ClockApplet")) {
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    24
+					clock_applet_count += 1;
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    25
+					current_city = find_current_city(client, id);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    26
+				}
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    27
+
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    28
+				g_free(applet_iid);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    29
+			}
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    30
 
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    31
 			g_free(bonobo_iid);
a1dade982b66 2011-04-30 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    32
 			g_free(key);