aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-02-18 04:06:45 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-02-18 04:06:45 +0800
commit5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4 (patch)
treeec38437fa6befee537b42fa97ac69c8e16120aca
parenta3050142c49d6b4c188df0614ec4ec90105396e8 (diff)
downloadgsoc2013-evolution-5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4.tar.gz
gsoc2013-evolution-5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4.tar.zst
gsoc2013-evolution-5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4.zip
Pushing a downstream patch from OpenSUSE.
2008-02-18 Srinivasa Ragavan <sragavan@novell.com> * exchange-folder-subscription.c: (subscribe_to_folder), (create_folder_subscription_dialog): Pushing a downstream patch from OpenSUSE. svn path=/trunk/; revision=35029
-rw-r--r--plugins/exchange-operations/ChangeLog6
-rw-r--r--plugins/exchange-operations/exchange-folder-subscription.c6
2 files changed, 12 insertions, 0 deletions
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 <sragavan@novell.com>
+
+ * exchange-folder-subscription.c: (subscribe_to_folder),
+ (create_folder_subscription_dialog): Pushing a downstream patch from
+ OpenSUSE.
+
2008-02-02 Jeff Cai <jeff.cai@sun.com>
** 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;