From ba846b6b545490d957af46038c9b686b440ca25a Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 20 Nov 2002 21:57:43 +0000 Subject: Use GConf. * e-summary.c (e_summary_init): Use GConf. * e-summary-tasks.c: Replaced member config_listener in ESummaryTasks with a gconf_client. (setup_gconf_client): Renamed from setup_config_listener(). Set up the GConf client and invoke gconf_client_add_dir() on the interesting namespaces. (gconf_client_value_changed_cb): Renamed from config_listener_value_changed_cb and changed prototype to match that of the "value_changed" signal in GConfClient. (setup_task_folder): Updated to use GConf. * e-summary-calendar.c: Replaced member config_listener with a gconf_listener. (setup_calendar): Use GConf. (setup_gconf_client): Renamed from setup_config_listener. Set up a GConf client and invoke gconf_client_add_dir() on the interesting namespaces. (gconf_client_value_changed_cb): Renamed from config_listener_key_changed_cb() and changed prototype to match that of the "value_changed" signal in GConfClient. (locale_uses_24h_time_format): Removed. (e_summary_calendar_free): g_object_unref() the gconf_client. * Makefile.am: Add rules to install the schemas. * apps_evolution_summary.schemas: New. * e-summary-preferences.c: Did a global GList -> GSList switch. (e_summary_preferences_restore): Use GConfClient instead of EConfigListener. (vector_from_folder_list): Removed since GConf makes this useless. (folder_list_from_vector): Likewise. (str_list_from_vector): Likewise. (vector_from_str_list): Likewise. (make_initial_weather_list): Likewise. (make_initial_rdf_list): Likewise. (make_initial_mail_list): Likewise. (e_summary_preferences_save): Use GConf. (e_summary_preferences_init): No need to set up defaults here. * e-summary.h: Changed members display_folders, rdf_urls, stations in ESummaryPrefs to be GSLists instead of GLists; updated all the functions that use them accordingly. svn path=/trunk/; revision=18863 --- my-evolution/e-summary.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'my-evolution/e-summary.c') diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c index 005c20b6ac..274b469cd6 100644 --- a/my-evolution/e-summary.c +++ b/my-evolution/e-summary.c @@ -65,11 +65,11 @@ #include #include +#include + #include #include -#include "e-util/e-config-listener.h" - #include "e-summary.h" #include "e-summary-preferences.h" #include "my-evolution-html.h" @@ -489,7 +489,7 @@ alarm_fn (gpointer alarm_id, static void e_summary_init (ESummary *summary) { - EConfigListener *config_listener; + GConfClient *gconf_client; ESummaryPrivate *priv; GdkColor bgcolor = {0, 0xffff, 0xffff, 0xffff}; time_t t, day_end; @@ -528,18 +528,16 @@ e_summary_init (ESummary *summary) priv->protocol_hash = NULL; priv->connections = NULL; - config_listener = e_config_listener_new (); + gconf_client = gconf_client_get_default (); - summary->timezone = e_config_listener_get_string_with_default (config_listener, - "/Calendar/Display/Timezone", "UTC", - NULL); + summary->timezone = gconf_client_get_string (gconf_client, "/apps/evolution/calendar/display/timezone", NULL); if (!summary->timezone || !summary->timezone[0]) { g_free (summary->timezone); summary->timezone = g_strdup ("UTC"); } summary->tz = icaltimezone_get_builtin_timezone (summary->timezone); - g_object_unref (config_listener); + g_object_unref (gconf_client); t = time (NULL); if (summary->tz == NULL) { -- cgit v1.2.3