JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to get location from a secondary clock applet

Browse Source
This commit is contained in:
Francesco Marella
2010-09-02 17:45:58 +02:00
parent 0c61913007
commit e5926206c6
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/location-gnome-clock.c
+25 -23
View File
@@ -51,10 +51,11 @@ location_gnome_clock_init(location_gnome_clock_state_t *state)
}
char *cities_key = NULL;
char *current_city = NULL;
for (GSList *applet = applets; applet != NULL;
applet = g_slist_next(applet)) {
char *path = applet->data;
if (cities_key == NULL) {
if (current_city == NULL) {
char *key = g_strdup_printf("/apps/panel/applets/%s"
"/bonobo_iid", path);
char *bonobo_iid = gconf_client_get_string(client, key,
@@ -66,6 +67,29 @@ location_gnome_clock_init(location_gnome_clock_state_t *state)
cities_key = g_strdup_printf(
"/apps/panel/applets/%s"
"/prefs/cities", path);
GSList *cities = gconf_client_get_list(client, cities_key,
GCONF_VALUE_STRING, &error);
if (error) {
fprintf(stderr, _("Error reading city list: `%s'.\n"),
cities_key);
g_free(cities_key);
g_object_unref(client);
return -1;
}
g_free(cities_key);
for (GSList *city = cities; city != NULL;
city = g_slist_next(city)) {
char *city_spec = city->data;
char *c = strstr(city_spec, "current=\"true\"");
if (c) current_city = g_strdup(city_spec);
g_free(city->data);
}
g_slist_free(cities);
}
g_free(bonobo_iid);
}
@@ -83,28 +107,6 @@ location_gnome_clock_init(location_gnome_clock_state_t *state)
return -1;
}
GSList *cities = gconf_client_get_list(client, cities_key,
GCONF_VALUE_STRING, &error);
if (error) {
fprintf(stderr, _("Error reading city list: `%s'.\n"),
cities_key);
g_free(cities_key);
g_object_unref(client);
return -1;
}
g_free(cities_key);
char *current_city = NULL;
for (GSList *city = cities; city != NULL;
city = g_slist_next(city)) {
char *city_spec = city->data;
char *c = strstr(city_spec, "current=\"true\"");
if (c) current_city = g_strdup(city_spec);
g_free(city->data);
}
g_slist_free(cities);
if (current_city == NULL) {
fputs(_("No city selected as current city.\n"), stderr);
return -1;