trying to commit
[modest] / src / modest-account-mgr-helpers.c
index 2d38cb0..20ed6a6 100644 (file)
@@ -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);
@@ -538,6 +568,37 @@ modest_account_mgr_set_default_account  (ModestAccountMgr *self, const gchar* ac
 
 }
 
+gboolean
+modest_account_mgr_unset_default_account  (ModestAccountMgr *self)
+{
+       ModestConf *conf;
+       
+       g_return_val_if_fail (self,    FALSE);
+
+       conf = MODEST_ACCOUNT_MGR_GET_PRIVATE (self)->modest_conf;
+               
+       return modest_conf_remove_key (conf, MODEST_CONF_DEFAULT_ACCOUNT, NULL /* err */);
+
+}
+
+gboolean
+modest_account_mgr_set_first_account_as_default  (ModestAccountMgr *self)
+{
+       gboolean result = FALSE;
+       GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
+       if(account_names)
+       {
+               const gchar* account_name = (const gchar*)account_names->data;
+               if (account_name)
+                       result = modest_account_mgr_set_default_account (self, account_name);
+       }
+       
+       /* TODO: Free the strings too? */
+       g_slist_free (account_names);
+       
+       return result;
+}
+
 gchar*
 modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name)
 {
@@ -558,3 +619,91 @@ modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name)
 
        return from;
 }
+
+/* Add a number to the end of the text, or increment a number that is already there.
+ */
+static gchar*
+util_increment_name (const gchar* text)
+{
+       /* Get the end character,
+        * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
+        */
+       const gchar* end = NULL;
+       if (!g_utf8_validate (text, -1, &end))
+               return NULL;
+  
+       if (!end)
+               return NULL;
+               
+       --end; /* Go to before the null-termination. */
+               
+       /* Look at each UTF-8 characer, starting at the end: */
+       const gchar* p = end;
+       const gchar* alpha_end = NULL;
+       while (p)
+       {       
+               /* Stop when we reach the first character that is not a numeric digit: */
+               const gunichar ch = g_utf8_get_char (p);
+               if (!g_unichar_isdigit (ch)) {
+                       alpha_end = p;
+                       break;
+               }
+               
+               p = g_utf8_prev_char (p);       
+       }
+       
+       if(!alpha_end) {
+               /* The text must consist completely of numeric digits. */
+               alpha_end = text;
+       }
+       else
+               ++alpha_end;
+       
+       /* Intepret and increment the number, if any: */
+       gint num = atol (alpha_end);
+       ++num;
+       
+       /* Get the name part: */
+       gint name_len = alpha_end - text;
+       gchar *name_without_number = g_malloc(name_len + 1);
+       memcpy (name_without_number, text, name_len);
+       name_without_number[name_len] = 0;\
+       
+    /* Concatenate the text part and the new number: */        
+       gchar *result = g_strdup_printf("%s%d", name_without_number, num);
+       g_free (name_without_number);
+       
+       return result;  
+}
+
+gchar*
+modest_account_mgr_get_unused_account_name (ModestAccountMgr *self, const gchar* starting_name,
+       gboolean server_account)
+{
+       gchar *account_name = g_strdup (starting_name);
+
+       while (modest_account_mgr_account_exists (self, 
+               account_name, server_account /*  server_account */)) {
+                       
+               gchar * account_name2 = util_increment_name (account_name);
+               g_free (account_name);
+               account_name = account_name2;
+       }
+       
+       return account_name;
+}
+
+gchar*
+modest_account_mgr_get_unused_account_display_name (ModestAccountMgr *self, const gchar* starting_name)
+{
+       gchar *account_name = g_strdup (starting_name);
+
+       while (modest_account_mgr_account_with_display_name_exists (self, account_name)) {
+                       
+               gchar * account_name2 = util_increment_name (account_name);
+               g_free (account_name);
+               account_name = account_name2;
+       }
+       
+       return account_name;
+}