diff options
| -rw-r--r-- | modules/calendar/e-task-shell-content.c | 1 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-format-fb.c | 1 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-format-ical.c | 1 | ||||
| -rw-r--r-- | plugins/save-calendar/rdf-format.c | 19 |
4 files changed, 3 insertions, 19 deletions
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 80e9239706..cb2443f19d 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -28,7 +28,6 @@ #include <glib/gi18n.h> #include "e-util/e-selection.h" -#include "e-util/gconf-bridge.h" #include "shell/e-shell-utils.h" #include "widgets/menus/gal-view-etable.h" #include "widgets/misc/e-paned.h" diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 1059e1d5be..b818a58d08 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -27,7 +27,6 @@ #include <string.h> #include <time.h> #include <glib/gi18n.h> -#include <gconf/gconf-client.h> #include <libedataserver/e-source.h> #include <libedataserver/e-source-list.h> #include <libedataserverui/e-client-utils.h> diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index b28a57aceb..82b38983a6 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -26,7 +26,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <gconf/gconf-client.h> #include <libedataserver/e-source.h> #include <libedataserver/e-source-list.h> #include <libedataserverui/e-client-utils.h> diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index c93eb1fb59..b5f1e283d0 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -45,27 +45,14 @@ static void add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value); -/* Use { */ - -/* #include <calendar/gui/calendar-config-keys.h> */ -/* #include <calendar/gui/calendar-config.h> */ - -/* } or { */ -#define CALENDAR_CONFIG_PREFIX "/apps/evolution/calendar" -#define CALENDAR_CONFIG_TIMEZONE CALENDAR_CONFIG_PREFIX "/display/timezone" - -static GConfClient *config = NULL; - static gchar * calendar_config_get_timezone (void) { - + GSettings *settings; gchar *retval = NULL; - if (!config) - config = gconf_client_get_default (); - - retval = gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL); + settings = g_settings_new ("org.gnome.evolution.calendar"); + retval = g_settings_get_string (settings, "timezone"); if (!retval) retval = g_strdup ("UTC"); |