From 1ab47c13608df8d3bb0892c6614473b504c352dc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Nov 2010 16:18:42 +0100 Subject: Default to beginning of the day for the last alarm notification --- calendar/gui/alarm-notify/config-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 00cb0dc7ba..65e3e15a87 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -336,7 +336,7 @@ config_data_get_last_notification_time (ECal *cal) return val; } - return time (NULL); + return -1; } /** -- cgit v1.2.3 From 1ddae03ed906264f203ddc253bec27a4c8d49dd5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 16 Dec 2010 18:04:52 +0100 Subject: Enable debugging of alarm-notify with ALARMS_DEBUG=1 environment variable --- calendar/gui/alarm-notify/config-data.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 65e3e15a87..eea273cf62 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -391,3 +391,34 @@ config_data_is_blessed_program (const gchar *program) return found; } + +static gboolean can_debug = FALSE; +static GStaticRecMutex rec_mutex = G_STATIC_REC_MUTEX_INIT; + +void +config_data_init_debugging (void) +{ + can_debug = g_getenv ("ALARMS_DEBUG") != NULL; +} + +/* returns whether started debugging; + call config_data_stop_debugging() when started and you are done with it +*/ +gboolean +config_data_start_debugging (void) +{ + g_static_rec_mutex_lock (&rec_mutex); + + if (can_debug) + return TRUE; + + g_static_rec_mutex_unlock (&rec_mutex); + + return FALSE; +} + +void +config_data_stop_debugging (void) +{ + g_static_rec_mutex_unlock (&rec_mutex); +} -- cgit v1.2.3 From 6af0c53b697c6981c1470c177b2c37e081635258 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 29 Jan 2011 10:50:53 -0500 Subject: Coding style and whitespace cleanup. --- calendar/gui/alarm-notify/config-data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index eea273cf62..2aab3cee71 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -402,8 +402,8 @@ config_data_init_debugging (void) } /* returns whether started debugging; - call config_data_stop_debugging() when started and you are done with it -*/ + * call config_data_stop_debugging() when started and you are done with it + */ gboolean config_data_start_debugging (void) { -- cgit v1.2.3 From c24038c4f62f37b89d1bda9542ca5ccc843d4ea0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 27 May 2011 15:23:07 +0200 Subject: Bug #646109 - Fix use of include to make sure translations work --- calendar/gui/alarm-notify/config-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 2aab3cee71..e1fe1f48ff 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -22,7 +22,7 @@ * */ -#ifdef HAVE_CONFIOH +#ifdef HAVE_CONFIG_H #include #endif -- cgit v1.2.3 From e7954c3f251aabbf95d099159709c8c66dfedc44 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 4 Jun 2011 15:53:10 -0500 Subject: Coding style and whitespace cleanups. --- calendar/gui/alarm-notify/config-data.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index e1fe1f48ff..41207d48fb 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -309,9 +309,13 @@ config_data_get_last_notification_time (ECal *cal) if (cal) { ESource *source = e_cal_get_source (cal); if (source) { - const gchar *last_notified = e_source_get_property (source, "last-notified"); + const gchar *last_notified; + GTimeVal tmval = {0}; + last_notified = e_source_get_property ( + source, "last-notified"); + if (last_notified && *last_notified && g_time_val_from_iso8601 (last_notified, &tmval)) { time_t now = time (NULL), val = (time_t) tmval.tv_sec; @@ -326,9 +330,13 @@ config_data_get_last_notification_time (ECal *cal) if (!(client = config_data_get_conf_client ())) return -1; - value = gconf_client_get_without_default (client, KEY_LAST_NOTIFICATION_TIME, NULL); + value = gconf_client_get_without_default ( + client, KEY_LAST_NOTIFICATION_TIME, NULL); if (value) { - time_t val = (time_t) gconf_value_get_int (value), now = time (NULL); + time_t val, now; + + val = (time_t) gconf_value_get_int (value); + now = time (NULL); if (val > now) val = now; -- cgit v1.2.3 From 84339b3be5a771406fcd5898bbd21dc1c5b98c82 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- calendar/gui/alarm-notify/config-data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 41207d48fb..b5e6faa923 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -259,7 +259,7 @@ config_data_get_notify_with_tray (void) * triggered while it was not running. **/ void -config_data_set_last_notification_time (ECal *cal, time_t t) +config_data_set_last_notification_time (ECalClient *cal, time_t t) { GConfClient *client; time_t current_t, now = time (NULL); @@ -267,7 +267,7 @@ config_data_set_last_notification_time (ECal *cal, time_t t) g_return_if_fail (t != -1); if (cal) { - ESource *source = e_cal_get_source (cal); + ESource *source = e_client_get_source (E_CLIENT (cal)); if (source) { GTimeVal tmval = {0}; gchar *as_text; @@ -301,13 +301,13 @@ config_data_set_last_notification_time (ECal *cal, time_t t) * Return value: The last saved value, or -1 if no value had been saved before. **/ time_t -config_data_get_last_notification_time (ECal *cal) +config_data_get_last_notification_time (ECalClient *cal) { GConfValue *value; GConfClient *client; if (cal) { - ESource *source = e_cal_get_source (cal); + ESource *source = e_client_get_source (E_CLIENT (cal)); if (source) { const gchar *last_notified; -- cgit v1.2.3 From adfa0f1cd303e4f4af30f9c075d78b0d8b584158 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 16 Jun 2011 10:58:11 +0200 Subject: Fix typo in a GConf key for alarm-notification dialog timezone setting --- calendar/gui/alarm-notify/config-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index b5e6faa923..31425c5985 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -207,7 +207,7 @@ config_data_get_timezone (void) ensure_inited (); - key = "/apps/evolution/calendar/display/user_system_timezone"; + key = "/apps/evolution/calendar/display/use_system_timezone"; if (gconf_client_get_bool (conf_client, key, NULL)) location = e_cal_util_get_system_timezone_location (); else { -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/alarm-notify/config-data.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 31425c5985..d056131280 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -124,7 +124,7 @@ config_data_get_calendars (const gchar *key) state = gconf_client_get_bool (conf_client, "/apps/evolution/calendar/notify/notify_with_tray", NULL); - if (!state) /* Should be old client*/ { + if (!state) /* Should be old client */ { GSList *source; gconf_client_set_bool (conf_client, "/apps/evolution/calendar/notify/notify_with_tray", @@ -158,8 +158,8 @@ config_data_get_calendars (const gchar *key) void config_data_replace_string_list (const gchar *key, - const gchar *old, - const gchar *new) + const gchar *old, + const gchar *new) { GSList *source, *tmp; @@ -259,7 +259,8 @@ config_data_get_notify_with_tray (void) * triggered while it was not running. **/ void -config_data_set_last_notification_time (ECalClient *cal, time_t t) +config_data_set_last_notification_time (ECalClient *cal, + time_t t) { GConfClient *client; time_t current_t, now = time (NULL); @@ -287,7 +288,7 @@ config_data_set_last_notification_time (ECalClient *cal, time_t t) return; /* we only store the new notification time if it is bigger - than the already stored one */ + * than the already stored one */ current_t = gconf_client_get_int (client, KEY_LAST_NOTIFICATION_TIME, NULL); if (t > current_t || current_t > now) gconf_client_set_int (client, KEY_LAST_NOTIFICATION_TIME, t, NULL); -- cgit v1.2.3 From 035eda3f14857100bbf53b70173442ed5b929b19 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 15 Sep 2011 11:24:25 +0200 Subject: Port alarm-notify configuration to GSettings --- calendar/gui/alarm-notify/config-data.c | 111 +++++++++++++------------------- 1 file changed, 44 insertions(+), 67 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index d056131280..aa8755973a 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -30,14 +30,11 @@ #include #include "config-data.h" -#define KEY_LAST_NOTIFICATION_TIME \ - "/apps/evolution/calendar/notify/last_notification_time" -#define KEY_PROGRAMS "/apps/evolution/calendar/notify/programs" - /* Whether we have initied ourselves by reading * the data from the configuration engine. */ static gboolean inited = FALSE; static GConfClient *conf_client = NULL; +static GSetting *calendar_settings = NULL; static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; @@ -71,6 +68,9 @@ do_cleanup (void) g_object_unref (conf_client); conf_client = NULL; + g_object_unref (calendar_settings); + calendar_settings = FALSE; + inited = FALSE; } @@ -89,6 +89,8 @@ ensure_inited (void) return; } + calendar_settings = g_settings_new ("org.gnome.evolution.calendar"); + g_atexit ((GVoidFunc) do_cleanup); /* load the sources for calendars and tasks */ @@ -106,8 +108,10 @@ config_data_get_calendars (const gchar *key) gboolean state; GSList *gconf_list; - if (!inited) + if (!inited) { conf_client = gconf_client_get_default (); + calendar_settings = g_settings_new ("org.gnome.evolution.calendar"); + } gconf_list = gconf_client_get_list (conf_client, key, @@ -121,15 +125,11 @@ config_data_get_calendars (const gchar *key) return cal_sources; } - state = gconf_client_get_bool (conf_client, - "/apps/evolution/calendar/notify/notify_with_tray", - NULL); + state = g_settings_get_boolean (calendar_settings, "notify-with-tray", NULL); if (!state) /* Should be old client */ { GSList *source; - gconf_client_set_bool (conf_client, - "/apps/evolution/calendar/notify/notify_with_tray", - TRUE, - NULL); + + g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE, NULL); source = gconf_client_get_list (conf_client, "/apps/evolution/calendar/sources", GCONF_VALUE_STRING, @@ -202,17 +202,14 @@ icaltimezone * config_data_get_timezone (void) { gchar *location; - const gchar *key; icaltimezone *local_timezone; ensure_inited (); - key = "/apps/evolution/calendar/display/use_system_timezone"; - if (gconf_client_get_bool (conf_client, key, NULL)) + if (g_settings_get_boolean (calendar_settings, "use-system-timezone")) location = e_cal_util_get_system_timezone_location (); else { - key = "/apps/evolution/calendar/display/timezone"; - location = gconf_client_get_string (conf_client, key, NULL); + location = g_settings_get_string (calendar_settings, "timezone"); } if (location && location[0]) @@ -231,10 +228,7 @@ config_data_get_24_hour_format (void) ensure_inited (); if (locale_supports_12_hour_format ()) { - const gchar *key; - - key = "/apps/evolution/calendar/display/use_24hour_format"; - return gconf_client_get_bool (conf_client, key, NULL); + return g_settings_get_boolean (calendar_client, "use-24hour-format"); } return TRUE; @@ -245,9 +239,7 @@ config_data_get_notify_with_tray (void) { ensure_inited (); - return gconf_client_get_bool (conf_client, - "/apps/evolution/calendar/notify/notify_with_tray", - NULL); + return g_settings_get_boolean (calendar_client, "notify-with-tray"); } /** @@ -262,7 +254,6 @@ void config_data_set_last_notification_time (ECalClient *cal, time_t t) { - GConfClient *client; time_t current_t, now = time (NULL); g_return_if_fail (t != -1); @@ -284,14 +275,11 @@ config_data_set_last_notification_time (ECalClient *cal, } } - if (!(client = config_data_get_conf_client ())) - return; - /* we only store the new notification time if it is bigger * than the already stored one */ - current_t = gconf_client_get_int (client, KEY_LAST_NOTIFICATION_TIME, NULL); + current_t = g_settings_get_int (calendar_settings, "last-notification-time"); if (t > current_t || current_t > now) - gconf_client_set_int (client, KEY_LAST_NOTIFICATION_TIME, t, NULL); + g_settings_set_int (calendar_settings "last-notification-time", t); } /** @@ -304,8 +292,7 @@ config_data_set_last_notification_time (ECalClient *cal, time_t config_data_get_last_notification_time (ECalClient *cal) { - GConfValue *value; - GConfClient *client; + time_t value, now; if (cal) { ESource *source = e_client_get_source (E_CLIENT (cal)); @@ -328,24 +315,13 @@ config_data_get_last_notification_time (ECalClient *cal) } } - if (!(client = config_data_get_conf_client ())) - return -1; - - value = gconf_client_get_without_default ( - client, KEY_LAST_NOTIFICATION_TIME, NULL); - if (value) { - time_t val, now; - - val = (time_t) gconf_value_get_int (value); - now = time (NULL); - - if (val > now) - val = now; + value = g_settings_get_int (calendar_settings, "last-notification-time"); + now = time (NULL); - return val; - } + if (val > now) + val = now; - return -1; + return val; } /** @@ -357,17 +333,19 @@ config_data_get_last_notification_time (ECalClient *cal) void config_data_save_blessed_program (const gchar *program) { - GConfClient *client; - GSList *l; + gchar **list; + gint i; + GArray *array = g_array_new (TRUE, FALSE, sizeof (gchar *)); - if (!(client = config_data_get_conf_client ())) - return; + list = g_settings_get_strv (calendar_settings, "notify-programs"); + for (i = 0; i < g_strv_length (list); i++) + g_array_append_val (array, list[i]); - l = gconf_client_get_list (client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL); - l = g_slist_append (l, g_strdup (program)); - gconf_client_set_list (client, KEY_PROGRAMS, GCONF_VALUE_STRING, l, NULL); - g_slist_foreach (l, (GFunc) g_free, NULL); - g_slist_free (l); + g_array_append_val (array, program); + g_settings_set_strv (calendar_settings, "notify-programs", (const gchar *const *) array->data); + + g_strfreev (list); + g_array_free (array, TRUE); } /** @@ -381,23 +359,22 @@ config_data_save_blessed_program (const gchar *program) gboolean config_data_is_blessed_program (const gchar *program) { - GConfClient *client; - GSList *l, *n; + gchar **list; + gint i = 0; gboolean found = FALSE; - if (!(client = config_data_get_conf_client ())) + list = g_settings_get_strv (calendar_settings, "notify-programs"); + if (!list) return FALSE; - l = gconf_client_get_list (client, KEY_PROGRAMS, GCONF_VALUE_STRING, NULL); - while (l) { - n = l->next; + while (list[i] != NULL) { if (!found) - found = strcmp ((gchar *) l->data, program) == 0; - g_free (l->data); - g_slist_free_1 (l); - l = n; + found = strcmp ((gchar *) list[i], program) == 0; + i++; } + g_strfreev (list); + return found; } -- cgit v1.2.3 From 8fd93c9042bb30e53ce88303f8a0789a6ca688eb Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 5 Oct 2011 18:19:33 +0200 Subject: First successful build --- calendar/gui/alarm-notify/config-data.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 4f30a4e4f3..f44a832b4c 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -34,7 +34,7 @@ * the data from the configuration engine. */ static gboolean inited = FALSE; static GConfClient *conf_client = NULL; -static GSetting *calendar_settings = NULL; +static GSettings *calendar_settings = NULL; static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; /* Copied from ../calendar-config.c; returns whether the locale has 'am' and @@ -123,11 +123,11 @@ config_data_get_calendars (const gchar *key) return cal_sources; } - state = g_settings_get_boolean (calendar_settings, "notify-with-tray", NULL); + state = g_settings_get_boolean (calendar_settings, "notify-with-tray"); if (!state) /* Should be old client */ { GSList *source; - g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE, NULL); + g_settings_set_boolean (calendar_settings, "notify-with-tray", TRUE); source = gconf_client_get_list (conf_client, "/apps/evolution/calendar/sources", GCONF_VALUE_STRING, @@ -226,7 +226,7 @@ config_data_get_24_hour_format (void) ensure_inited (); if (locale_supports_12_hour_format ()) { - return g_settings_get_boolean (calendar_client, "use-24hour-format"); + return g_settings_get_boolean (calendar_settings, "use-24hour-format"); } return TRUE; @@ -237,7 +237,7 @@ config_data_get_notify_with_tray (void) { ensure_inited (); - return g_settings_get_boolean (calendar_client, "notify-with-tray"); + return g_settings_get_boolean (calendar_settings, "notify-with-tray"); } /** @@ -286,7 +286,7 @@ config_data_set_last_notification_time (ECalClient *cal, * than the already stored one */ current_t = g_settings_get_int (calendar_settings, "last-notification-time"); if (t > current_t || current_t > now) - g_settings_set_int (calendar_settings "last-notification-time", t); + g_settings_set_int (calendar_settings, "last-notification-time", t); } /** @@ -313,21 +313,21 @@ config_data_get_last_notification_time (ECalClient *cal) if (last_notified && *last_notified && g_time_val_from_iso8601 (last_notified, &tmval)) { - time_t now = time (NULL), val = (time_t) tmval.tv_sec; + time_t now = time (NULL), value = (time_t) tmval.tv_sec; - if (val > now) - val = now; - return val; + if (value > now) + value = now; + return value; } } } value = g_settings_get_int (calendar_settings, "last-notification-time"); now = time (NULL); - if (val > now) - val = now; + if (value > now) + value = now; - return val; + return value; } /** -- cgit v1.2.3 From c94f0cf7538bae7e740d58893a8bfcf7eca49c97 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 13:46:30 +0200 Subject: NULL-terminate arrays that we pass to g_settings_set_strv --- calendar/gui/alarm-notify/config-data.c | 1 + 1 file changed, 1 insertion(+) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index f44a832b4c..3275c4d219 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -348,6 +348,7 @@ config_data_save_blessed_program (const gchar *program) g_array_append_val (array, list[i]); g_array_append_val (array, program); + g_array_append_val (array, NULL); g_settings_set_strv (calendar_settings, "notify-programs", (const gchar *const *) array->data); g_strfreev (list); -- cgit v1.2.3 From 805d8c25ac6c8f58c8e17f3b89fa50f17cfdf27b Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 13 Oct 2011 16:18:42 +0200 Subject: Use a GPtrArray instead of GArray to build the array string to use for g_settings_set_strv --- calendar/gui/alarm-notify/config-data.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 3275c4d219..b9f2be49a3 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -341,18 +341,18 @@ config_data_save_blessed_program (const gchar *program) { gchar **list; gint i; - GArray *array = g_array_new (TRUE, FALSE, sizeof (gchar *)); + GPtrArray *array = g_ptr_array_new (); list = g_settings_get_strv (calendar_settings, "notify-programs"); for (i = 0; i < g_strv_length (list); i++) - g_array_append_val (array, list[i]); + g_ptr_array_add (array, list[i]); - g_array_append_val (array, program); - g_array_append_val (array, NULL); - g_settings_set_strv (calendar_settings, "notify-programs", (const gchar *const *) array->data); + g_ptr_array_add (array, program); + g_ptr_array_add (array, NULL); + g_settings_set_strv (calendar_settings, "notify-programs", (const gchar *const *) array->pdata); g_strfreev (list); - g_array_free (array, TRUE); + g_ptr_array_free (array, TRUE); } /** -- cgit v1.2.3 From cda52538315c481bc3b11ff2db40f7165113d1ab Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 9 Nov 2011 16:13:27 +0100 Subject: Remove unused config_data_get_conf_client --- calendar/gui/alarm-notify/config-data.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index b9f2be49a3..910e786e6b 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -189,13 +189,6 @@ config_data_replace_string_list (const gchar *key, } } -GConfClient * -config_data_get_conf_client (void) -{ - ensure_inited (); - return conf_client; -} - icaltimezone * config_data_get_timezone (void) { -- cgit v1.2.3 From c75f58d01bb7bbe139cd73a85894dc5f50185816 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Nov 2011 09:58:44 -0500 Subject: Fix compiler warnings. --- calendar/gui/alarm-notify/config-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 910e786e6b..c8348f89fc 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -340,7 +340,7 @@ config_data_save_blessed_program (const gchar *program) for (i = 0; i < g_strv_length (list); i++) g_ptr_array_add (array, list[i]); - g_ptr_array_add (array, program); + g_ptr_array_add (array, (gpointer) program); g_ptr_array_add (array, NULL); g_settings_set_strv (calendar_settings, "notify-programs", (const gchar *const *) array->pdata); -- cgit v1.2.3