diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-12-20 11:27:39 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-12-20 11:27:39 +0800 |
| commit | 987fb91d5ec4b61d1283acdb9cf02960cc47b74d (patch) | |
| tree | 5e9dc4fa1e10995f0217b068daff2ca6b77cf461 /mail/e-mail-account-store.c | |
| parent | da67edd2a675481fb90b8f5fcbeb3eaf5dc427ea (diff) | |
| download | gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar.gz gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar.bz2 gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar.lz gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar.xz gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.tar.zst gsoc2013-evolution-987fb91d5ec4b61d1283acdb9cf02960cc47b74d.zip | |
Reduce diff noise with account-mgmt branch.
Diffstat (limited to 'mail/e-mail-account-store.c')
| -rw-r--r-- | mail/e-mail-account-store.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index c3d62070e0..824a521ee9 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -1106,7 +1106,7 @@ e_mail_account_store_remove_service (EMailAccountStore *store, CamelService *service) { GtkTreeIter iter; - gboolean proceed; + gboolean proceed = TRUE; g_return_if_fail (E_IS_MAIL_ACCOUNT_STORE (store)); g_return_if_fail (CAMEL_IS_SERVICE (service)); @@ -1114,10 +1114,11 @@ e_mail_account_store_remove_service (EMailAccountStore *store, if (!mail_account_store_get_iter (store, service, &iter)) g_return_if_reached (); - /* Possibly request user confirmation. */ - g_signal_emit ( - store, signals[REMOVE_REQUESTED], 0, - parent_window, service, &proceed); + /* If no parent window was given, skip the request signal. */ + if (GTK_IS_WINDOW (parent_window)) + g_signal_emit ( + store, signals[REMOVE_REQUESTED], 0, + parent_window, service, &proceed); if (proceed) { g_object_ref (service); @@ -1138,7 +1139,7 @@ e_mail_account_store_enable_service (EMailAccountStore *store, CamelService *service) { GtkTreeIter iter; - gboolean proceed; + gboolean proceed = TRUE; g_return_if_fail (E_IS_MAIL_ACCOUNT_STORE (store)); g_return_if_fail (CAMEL_IS_SERVICE (service)); @@ -1146,10 +1147,11 @@ e_mail_account_store_enable_service (EMailAccountStore *store, if (!mail_account_store_get_iter (store, service, &iter)) g_return_if_reached (); - /* Possibly request user confirmation. */ - g_signal_emit ( - store, signals[ENABLE_REQUESTED], 0, - parent_window, service, &proceed); + /* If no parent window was given, skip the request signal. */ + if (GTK_IS_WINDOW (parent_window)) + g_signal_emit ( + store, signals[ENABLE_REQUESTED], 0, + parent_window, service, &proceed); if (proceed) { gtk_list_store_set ( @@ -1166,7 +1168,7 @@ e_mail_account_store_disable_service (EMailAccountStore *store, CamelService *service) { GtkTreeIter iter; - gboolean proceed; + gboolean proceed = TRUE; g_return_if_fail (E_IS_MAIL_ACCOUNT_STORE (store)); g_return_if_fail (CAMEL_IS_SERVICE (service)); @@ -1174,10 +1176,11 @@ e_mail_account_store_disable_service (EMailAccountStore *store, if (!mail_account_store_get_iter (store, service, &iter)) g_return_if_reached (); - /* Possibly request user confirmation. */ - g_signal_emit ( - store, signals[DISABLE_REQUESTED], 0, - parent_window, service, &proceed); + /* If no parent window was given, skip the request signal. */ + if (GTK_IS_WINDOW (parent_window)) + g_signal_emit ( + store, signals[DISABLE_REQUESTED], 0, + parent_window, service, &proceed); if (proceed) { gtk_list_store_set ( |