[evolution-data-server] module-gnome-online-accounts: Mail part of the account can be disabled



commit 7338cb6fc0dae4185b7cff674dbc917d7efaf0d6
Author: Milan Crha <mcrha redhat com>
Date:   Mon Mar 2 18:00:53 2015 +0100

    module-gnome-online-accounts: Mail part of the account can be disabled
    
    Then it doesn't make sense to claim a runtime warning when the GOA
    object doesn't return any Mail object.

 .../module-gnome-online-accounts.c                 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c 
b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index f3533be..a71ec6e 100644
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -697,7 +697,9 @@ gnome_online_accounts_config_mail_identity (EGnomeOnlineAccounts *extension,
        const gchar *extension_name;
 
        goa_mail = goa_object_get_mail (goa_object);
-       g_return_if_fail (goa_mail != NULL);
+       /* NULL, when the Mail part is disabled */
+       if (!goa_mail)
+               return;
 
        extension_name = E_SOURCE_EXTENSION_MAIL_IDENTITY;
        source_extension = e_source_get_extension (source, extension_name);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]