2007-04-30 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-account-mgr-helpers.c

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index fbbbc51..6b2c10d 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -47,6 +47,30 @@ modest_account_mgr_get_enabled (ModestAccountMgr *self, const gchar* name)
        return modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_ENABLED, FALSE);
 }
 
+gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar* name, 
+       const gchar* signature, gboolean use_signature)
+{
+       gboolean result = modest_account_mgr_set_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE, 
+               use_signature, FALSE);
+       result = result && modest_account_mgr_set_string (self, name, MODEST_ACCOUNT_SIGNATURE, 
+               signature, FALSE);
+       return result;
+}
+
+
+gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name, 
+       gboolean* use_signature)
+{
+       if (use_signature) {
+               *use_signature = 
+                       modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE, FALSE);
+       }
+       
+       return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
+}
+       
+       
+
 #if 0 /* Not needed, but works. */
 static gint
 compare_option_strings_for_name (const gchar* a, const gchar* b)
@@ -134,7 +158,7 @@ gboolean modest_account_mgr_set_connection_specific_smtp (ModestAccountMgr *self
                
        /* The server account is in the item after the connection name: */
        GSList *list_connection = g_slist_append (list, (gpointer)connection_name);
-       g_slist_append (list_connection, (gpointer)server_account_name);
+       list_connection = g_slist_append (list_connection, (gpointer)server_account_name);
        
        /* Reset the changed list: */
        modest_account_mgr_set_list (self, account_name, 
@@ -171,7 +195,7 @@ gboolean modest_account_mgr_remove_connection_specific_smtp (ModestAccountMgr *s
        if (list_connection) {
                /* remove both items: */
                GSList *temp = g_slist_delete_link(list_connection, list_connection);
-               g_slist_delete_link(temp, g_slist_next(temp));
+               temp = g_slist_delete_link(temp, g_slist_next(temp));
        }
        
        /* Reset the changed list: */
@@ -340,7 +364,7 @@ modest_account_mgr_get_server_account_option (ModestAccountMgr *self,
 }
 #endif
 
-static ModestServerAccountData*
+ModestServerAccountData*
 modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar* name)
 {
        ModestServerAccountData *data;
@@ -378,7 +402,7 @@ modest_account_mgr_get_server_account_data (ModestAccountMgr *self, const gchar*
 }
 
 
-static void
+void
 modest_account_mgr_free_server_account_data (ModestAccountMgr *self,
                                             ModestServerAccountData* data)
 {
@@ -422,7 +446,13 @@ modest_account_mgr_get_account_data     (ModestAccountMgr *self, const gchar* na
        
        g_return_val_if_fail (self, NULL);
        g_return_val_if_fail (name, NULL);
-       g_return_val_if_fail (modest_account_mgr_account_exists (self, name,FALSE), NULL);      
+       
+       if (!modest_account_mgr_account_exists (self, name, FALSE)) {
+               /* For instance, maybe you are mistakenly checking for a server account name? */
+               g_warning ("%s: Account %s does not exist.", __FUNCTION__, name);
+               return NULL;
+       }
+       
        data = g_slice_new0 (ModestAccountData);
        
        data->account_name = g_strdup (name);