* remove some g_asserts, add warnings instead

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 818acea..65b175d 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -166,10 +166,10 @@ static gboolean  on_header_view_focus_in (GtkWidget *widget,
                                          GdkEventFocus *event,
                                          gpointer userdata);
 
-static void      modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
-                                                                TnyFolderStore *folder_store, 
-                                                                gboolean selected,
-                                                                ModestMainWindow *main_window);
+static void      on_folder_selection_changed (ModestFolderView *folder_view,
+                                             TnyFolderStore *folder_store, 
+                                             gboolean selected,
+                                             ModestMainWindow *main_window);
                                                
 static void set_at_least_one_account_visible(ModestMainWindow *self);
 
@@ -543,7 +543,7 @@ update_menus (ModestMainWindow* self)
 
        send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                      "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
-       gtk_action_set_visible (send_receive_all, num_accounts > 1);
+       gtk_action_set_visible (send_receive_all, num_accounts > 0);
 
        /* Delete old send&receive popup items. We can not just do a
           menu_detach because it does not work well with
@@ -870,7 +870,7 @@ connect_signals (ModestMainWindow *self)
        priv->sighandlers = 
                modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), 
                                           "folder_selection_changed",
-                                          G_CALLBACK (modest_main_window_on_folder_selection_changed), 
+                                          G_CALLBACK (on_folder_selection_changed), 
                                           self);
        priv->sighandlers = 
                modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), 
@@ -1066,7 +1066,7 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
                accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
                send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, 
                                                              "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
-               gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1);
+               gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 0);
                modest_account_mgr_free_account_names (accounts);
                update_menus (MODEST_MAIN_WINDOW (self));
        }
@@ -1431,7 +1431,10 @@ modest_main_window_show_toolbar (ModestWindow *self,
                gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
 
                gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
-               set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+               if (modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW(self)))
+                       set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_TRANSFER);
+               else
+                       set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
        } else {
                gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
 
@@ -2016,12 +2019,12 @@ set_toolbar_mode (ModestMainWindow *self,
                        gtk_action_set_visible (refresh_action, FALSE);
                if (cancel_action)
                        gtk_action_set_visible (cancel_action, TRUE);
+               if (priv->progress_bar)
+                       gtk_widget_show (priv->progress_bar);
                if (priv->progress_toolitem) {
                        gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
                        gtk_widget_show (priv->progress_toolitem);
                }
-               if (priv->progress_bar)
-                       gtk_widget_show (priv->progress_bar);
 
                /* Show toolbar if it's hiden (optimized view ) */
                if (priv->optimized_view)
@@ -2388,10 +2391,10 @@ on_header_view_focus_in (GtkWidget *widget,
 }
 
 static void 
-modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
-                                               TnyFolderStore *folder_store, 
-                                               gboolean selected,
-                                               ModestMainWindow *main_window)
+on_folder_selection_changed (ModestFolderView *folder_view,
+                            TnyFolderStore *folder_store, 
+                            gboolean selected,
+                            ModestMainWindow *main_window)
 {
        ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (main_window);
        GtkAction *action = NULL;