3438
|
1 |
diff -Naur redshift-1.6/src/location-gnome-clock.c redshift-1.6_bonoboiidfix/src/location-gnome-clock.c
|
|
2 |
--- redshift-1.6/src/location-gnome-clock.c 2010-09-04 13:32:56.000000000 +0100
|
|
3 |
+++ redshift-1.6_bonobofix/src/location-gnome-clock.c 2011-01-16 23:10:54.654764596 +0000
|
|
4 |
@@ -104,11 +104,28 @@
|
|
5 |
char *bonobo_iid = gconf_client_get_string(client, key,
|
|
6 |
&error);
|
|
7 |
|
|
8 |
+ /* Try both gnome-panel 2.30.x and earlier bonobo_iid key and
|
|
9 |
+ newer applet_iid. */
|
|
10 |
if (!error && bonobo_iid != NULL &&
|
|
11 |
!strcmp(bonobo_iid, "OAFIID:GNOME_ClockApplet")) {
|
|
12 |
clock_applet_count += 1;
|
|
13 |
current_city = find_current_city(client, id);
|
|
14 |
}
|
|
15 |
+ else {
|
|
16 |
+ g_free(key);
|
|
17 |
+ key = g_strdup_printf("/apps/panel/applets/%s"
|
|
18 |
+ "/applet_iid", id);
|
|
19 |
+ char *applet_iid = gconf_client_get_string(client, key,
|
|
20 |
+ &error);
|
|
21 |
+
|
|
22 |
+ if (!error && applet_iid != NULL &&
|
|
23 |
+ !strcmp(applet_iid, "ClockAppletFactory::ClockApplet")) {
|
|
24 |
+ clock_applet_count += 1;
|
|
25 |
+ current_city = find_current_city(client, id);
|
|
26 |
+ }
|
|
27 |
+
|
|
28 |
+ g_free(applet_iid);
|
|
29 |
+ }
|
|
30 |
|
|
31 |
g_free(bonobo_iid);
|
|
32 |
g_free(key);
|