diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mark-all-read/mark-all-read.c | 6 | ||||
| -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 | 8 |
4 files changed, 6 insertions, 10 deletions
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 4fe19cf71b..ab8549495b 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -318,7 +318,7 @@ scan_folder_tree_for_unread_helper (GtkTreeModel *model, } static gint -scan_folder_tree_for_unread (const gchar *folder_uri) +scan_folder_tree_for_unread (EMailBackend *backend, const gchar *folder_uri) { GtkTreeRowReference *reference; EMFolderTreeModel *model; @@ -338,7 +338,7 @@ scan_folder_tree_for_unread (const gchar *folder_uri) if (folder_uri == NULL) return 0; - model = em_folder_tree_model_get_default (); + model = em_folder_tree_model_get_default (backend); reference = em_folder_tree_model_lookup_uri (model, folder_uri); if (gtk_tree_row_reference_valid (reference)) { @@ -602,7 +602,7 @@ update_actions_cb (EShellView *shell_view, g_object_get (shell_sidebar, "folder-tree", &folder_tree, NULL); folder_uri = em_folder_tree_get_selected_uri (folder_tree); - visible = (scan_folder_tree_for_unread (folder_uri) > 0); + visible = (scan_folder_tree_for_unread (E_MAIL_BACKEND (e_shell_view_get_shell_backend (shell_view)), folder_uri) > 0); gtk_action_set_visible (action, visible); g_object_unref (folder_tree); 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..ed9cf18bb6 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -59,13 +59,11 @@ 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"); |