From 5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 17 Feb 2008 20:06:45 +0000 Subject: Pushing a downstream patch from OpenSUSE. 2008-02-18 Srinivasa Ragavan * exchange-folder-subscription.c: (subscribe_to_folder), (create_folder_subscription_dialog): Pushing a downstream patch from OpenSUSE. svn path=/trunk/; revision=35029 --- plugins/exchange-operations/ChangeLog | 6 ++++++ plugins/exchange-operations/exchange-folder-subscription.c | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'plugins') diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index d74523f7a2..0fcb71c10e 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,9 @@ +2008-02-18 Srinivasa Ragavan + + * exchange-folder-subscription.c: (subscribe_to_folder), + (create_folder_subscription_dialog): Pushing a downstream patch from + OpenSUSE. + 2008-02-02 Jeff Cai ** Fixes bug #513395 diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 17c7d27a52..0de3f87a46 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -240,6 +240,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) g_free (folder_name); switch (result) { case EXCHANGE_ACCOUNT_FOLDER_OK: + exchange_account_rescan_tree (subscription_info->account); break; case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS: e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL); @@ -296,6 +297,11 @@ create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname) GladeXML *glade_xml; GtkWidget *dialog, *ok_button; SubscriptionInfo *subscription_info; + int mode; + + exchange_account_is_offline (account, &mode); + if (mode == OFFLINE_MODE) + return FALSE; subscription_info = g_new0 (SubscriptionInfo, 1); subscription_info->account = account; -- cgit