From a714a01aeb70692229f0994d1530b6c9dadd1f29 Mon Sep 17 00:00:00 2001 From: Shakti Sen Date: Thu, 14 Jul 2005 07:00:51 +0000 Subject: Checked for if the exchange account exist/configured. Replaced all the 2005-07-13 Shakti Sen * exchange-operations.c: Checked for if the exchange account exist/configured. * exchange-folder-permission.c: Replaced all the occurences of function exchange_config_listener_get_accounts() with exchange_operations_get_exchange_account() and returns if it doesn't exist. Also took care to avoid some compile time warnings. * exchange-folder.c: Same. Also took care to avoid some compile time warnings. * exchange-folder-subscription.c: Included exchange-folder-subscription.h file to avoid compilation warning. Fixes bug #310233. svn path=/trunk/; revision=29768 --- .../exchange-folder-permission.c | 28 ++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'plugins/exchange-operations/exchange-folder-permission.c') diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 61a47785a3..885eb11493 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -34,6 +34,7 @@ #include "exchange-operations.h" #include #include +#include "exchange-permissions-dialog.h" static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data); void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t); @@ -57,14 +58,13 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t) GSList *menus = NULL; int i = 0; static int first =1; - GSList *accounts, *acc; ExchangeAccount *account = NULL; EFolder *folder = NULL; - accounts = exchange_config_listener_get_accounts (exchange_global_config_listener); - for (acc = accounts; acc; acc = acc->next) { - account = acc->data; - } + account = exchange_operations_get_exchange_account (); + + if (!account) + return; folder = exchange_account_get_folder (account, t->uri); @@ -94,14 +94,13 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t) static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data) { - GSList *accounts, *acc; ExchangeAccount *account = NULL; EFolder *folder = NULL; - accounts = exchange_config_listener_get_accounts (exchange_global_config_listener); - for (acc = accounts; acc; acc = acc->next) { - account = acc->data; - } + account = exchange_operations_get_exchange_account (); + + if (!account) + return; folder = exchange_account_get_folder (account, selected_exchange_folder_uri); if (folder) @@ -112,17 +111,16 @@ org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data) void org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *target) { - GSList *accounts, *acc; ExchangeAccount *account = NULL; EFolder *folder = NULL; if (target == NULL) return; - accounts = exchange_config_listener_get_accounts (exchange_global_config_listener); - for (acc = accounts; acc; acc = acc->next) { - account = acc->data; - } + account = exchange_operations_get_exchange_account (); + + if (!account) + return; folder = exchange_account_get_folder (account, target->uri); if (folder) -- cgit v1.2.3