* minor fixes; revert is-default logic for default account

pmo-trunk-r1534

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index e8e4473..5da79f6 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -79,7 +79,7 @@ UI_FILES=\
        ui/modest-main-window-ui.xml \
        ui/modest-msg-edit-window-ui.xml \
        ui/modest-msg-view-window-ui.xml
-               
+
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index ec4f7ed..dabce5d 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -700,8 +700,8 @@ modest_tny_account_store_get_tny_account_by_id  (ModestTnyAccountStore *self, co
 
        for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
                const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data));
-               if (acc_id && strcmp (acc_id, id) == 0) {
-               account = TNY_ACCOUNT(cursor->data);
+               if (acc_id && strcmp (acc_id, id) == 0) { 
+                       account = TNY_ACCOUNT(cursor->data);
                        break;
                }
        }

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index aa0b06e..decd89c 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -231,7 +231,9 @@ on_account_removed (ModestAccountMgr *account_mgr,
        on_account_changed (account_mgr, account, NULL, server_account, self);
 }
 
-#if 0
+
+/* currently unused */
+#if 0 
 static void
 on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
                           ModestAccountView *self)
@@ -266,7 +268,7 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
        printf ("debug: on_account_default_toggled\n");
        gboolean is_default = gtk_cell_renderer_toggle_get_active (cell_renderer);
        printf ("debug: is_default: %d\n", is_default);
-       if (!is_default) {
+       if (is_default) {
                /* Do not allow an account to be marked non-default.
                 * Only allow this to be changed by setting another account to default: */
                gtk_cell_renderer_toggle_set_active (cell_renderer, TRUE);