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

* src/maemo/easysetup/modest-easysetup-wizard.c:
        (create_page_custom_outgoing): Correct the position of the horizontal separator to
        match the UI spec.

        * src/maemo/modest-main-window.c: (set_toolbar_mode): Check that widgets are not NULL
        before showing/hiding them, to avoid a crash when clicking on folders when there are no
        gconf settings. I probably added more checks than necessary, but that is safer.

        * src/modest-ui-actions.c: (modest_ui_actions_on_move_to): Initialize the mail_op
        variable to fix the build, but this seems to be used when it is still NULL.

pmo-trunk-r1695

diff --git a/ChangeLog2 b/ChangeLog2
index 080b38d..b96121d 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,18 @@
 2007-04-27  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
+       (create_page_custom_outgoing): Correct the position of the horizontal separator to 
+       match the UI spec.
+       
+       * src/maemo/modest-main-window.c: (set_toolbar_mode): Check that widgets are not NULL 
+       before showing/hiding them, to avoid a crash when clicking on folders when there are no 
+       gconf settings. I probably added more checks than necessary, but that is safer.
+       
+       * src/modest-ui-actions.c: (modest_ui_actions_on_move_to): Initialize the mail_op 
+       variable to fix the build, but this seems to be used when it is still NULL.
+
+2007-04-27  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-platform.h:
        * src/gnome/modest-platform.c: (modest_platform_connect_and_wait):
        * src/maemo/modest-platform.c: (modest_platform_connect_and_wait):

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 22d156d..f7e6d62 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -672,6 +672,10 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (caption);
        
+       GtkWidget *separator = gtk_hseparator_new ();
+       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (separator);
+       
        /* connection-specific checkbox: */
        if (!self->checkbox_outgoing_smtp_specific) {
                self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
@@ -684,10 +688,6 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (caption);
        
-       GtkWidget *separator = gtk_hseparator_new ();
-       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (separator);
-       
        /* Connection-specific SMTP-Severs Edit button: */
        if (!self->button_outgoing_smtp_servers)
                self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 34fb4e8..db8a848 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1053,10 +1053,18 @@ set_toolbar_mode (ModestMainWindow *self,
 /*             gtk_action_set_visible (cancel_action, FALSE); */
 /*             gtk_widget_hide (priv->progress_toolitem); */
 /*             gtk_widget_hide (priv->progress_bar); */
+
+               if (priv->sort_toolitem)
                gtk_widget_show (priv->sort_toolitem);
-               gtk_widget_show (priv->refresh_toolitem);
-               gtk_widget_hide (priv->progress_bar);
-               gtk_widget_hide (priv->cancel_toolitem);
+               
+               if (priv->refresh_toolitem)
+                       gtk_widget_show (priv->refresh_toolitem);
+                       
+               if (priv->progress_bar)
+                       gtk_widget_hide (priv->progress_bar);
+                       
+               if (priv->cancel_toolitem)
+                       gtk_widget_hide (priv->cancel_toolitem);
                break;
        case TOOLBAR_MODE_TRANSFER:
 /*             gtk_action_set_visible (sort_action, FALSE); */
@@ -1064,10 +1072,18 @@ set_toolbar_mode (ModestMainWindow *self,
 /*             gtk_action_set_visible (cancel_action, TRUE); */
 /*             gtk_widget_show (priv->progress_toolitem); */
 /*             gtk_widget_show (priv->progress_bar); */
-               gtk_widget_hide (priv->sort_toolitem);
-               gtk_widget_hide (priv->refresh_toolitem);
-               gtk_widget_show (priv->progress_bar);
-               gtk_widget_show (priv->cancel_toolitem);
+
+               if (priv->sort_toolitem)
+                       gtk_widget_hide (priv->sort_toolitem);
+               
+               if (priv->refresh_toolitem)
+                       gtk_widget_hide (priv->refresh_toolitem);
+               
+               if (priv->progress_bar)
+                       gtk_widget_show (priv->progress_bar);
+                       
+               if (priv->cancel_toolitem)
+                       gtk_widget_show (priv->cancel_toolitem);
                break;
        default:
 /*             gtk_action_set_visible (sort_action, TRUE); */
@@ -1075,10 +1091,18 @@ set_toolbar_mode (ModestMainWindow *self,
 /*             gtk_action_set_visible (cancel_action, FALSE); */
 /*             gtk_widget_hide (priv->progress_toolitem); */
 /*             gtk_widget_hide (priv->progress_bar); */
-               gtk_widget_show (priv->sort_toolitem);
-               gtk_widget_show (priv->refresh_toolitem);
-               gtk_widget_hide (priv->progress_bar);
-               gtk_widget_hide (priv->cancel_toolitem);
+
+               if (priv->cancel_toolitem)
+                       gtk_widget_show (priv->sort_toolitem);
+                       
+               if (priv->refresh_toolitem)
+                       gtk_widget_show (priv->refresh_toolitem);
+                       
+               if (priv->progress_bar)
+                       gtk_widget_hide (priv->progress_bar);
+                       
+               if (priv->cancel_toolitem)
+                       gtk_widget_hide (priv->cancel_toolitem);
        }
 }
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 1cb21f1..13127a9 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1887,7 +1887,7 @@ modest_ui_actions_on_move_to (GtkAction *action,
        GtkWidget *dialog, *scroll, *folder_view, *tree_view;
        gint result;
        TnyFolderStore *folder_store;
-       ModestMailOperation *mail_op;
+       ModestMailOperation *mail_op = NULL;
        ModestMainWindow *main_window;
 
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win) ||
@@ -1948,6 +1948,7 @@ modest_ui_actions_on_move_to (GtkAction *action,
                g_object_unref (msg);
 
                /* Transfer current msg */
+               /* TODO: mail_op is never set. murrayc */
                modest_mail_operation_xfer_msgs (mail_op, 
                                                 headers,
                                                 TNY_FOLDER (folder_store),