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

* src/maemo/modest-main-window.c: (modest_main_window_on_show):
Offer a connection dialog if there is no connection when
starting modest. This should fix projects.maemo.org bug NB#61134.

pmo-trunk-r2816

diff --git a/ChangeLog2 b/ChangeLog2
index b53a045..80ce63a 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-07-27  Murray Cumming  <murrayc@murrayc.com>
 
 2007-07-27  Murray Cumming  <murrayc@murrayc.com>
 

+       * src/maemo/modest-main-window.c: (modest_main_window_on_show):
+       Offer a connection dialog if there is no connection when 
+       starting modest. This should fix projects.maemo.org bug NB#61134.
+
+2007-07-27  Murray Cumming  <murrayc@murrayc.com>
+

        * src/maemo/modest-msg-edit-window.c: (replace_with_attachments):
        Reverted my last commit. I was able to fix the build by doing 
        apt-get install wpeditor0 (replacing other wpeditor packages) and 
        * src/maemo/modest-msg-edit-window.c: (replace_with_attachments):
        Reverted my last commit. I was able to fix the build by doing 
        apt-get install wpeditor0 (replacing other wpeditor packages) and 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 31781b3..d61565f 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -799,7 +799,9 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
                modest_account_mgr_free_account_names (accounts);
        }
 
                modest_account_mgr_free_account_names (accounts);
        }
 

-
+       /* The UI spec wants us to show a connection dialog when the application is 
+        * started by the user, if there is no connection: */
+        modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);

 }
 
 ModestWindow *
 }
 
 ModestWindow *

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index cee2bdb..8fce36c 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1809,7 +1809,8 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
 
                gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {

-//                     modest_platform_connect_and_wait ();
+                       /* TODO: Comment about why is this commented out: */
+                       /* modest_platform_connect_and_wait (); */

                }
        }
        gtk_widget_destroy (dialog);
                }
        }
        gtk_widget_destroy (dialog);