diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
| commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
| tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /plugins/exchange-operations | |
| parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
| download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.bz2 gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.lz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.xz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip | |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'plugins/exchange-operations')
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-folder.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 785857400a..0d526d6245 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Bharath Acharya <abharath@novell.com> + + ** Fix for bug #557246 + + * exchange-folder.c: (org_gnome_exchange_check_inbox_subscribed): Pop + up the "Unsubscribe Folder" option only for the subscribed folders and + not to the Other's folder hierarchy. + 2008-10-08 Milan Crha <mcrha@redhat.com> ** Fix for bug #530606 diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 3f2dc421fc..b2b53d1bb3 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -223,7 +223,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar g_free (path); - if (!sub_folder) + if (!sub_folder || !g_strrstr(sub_folder, "/")) return; for (i = 0; i < sizeof (popup_inbox_items) / sizeof (popup_inbox_items[0]); i++) |