* when the window-manager is asked for the main_window, and none such

  exists, create one in place. the fix in modest_window_mgr is trivial,
  but it would crash immediately because of old signal handlers still
  be invoked; now, we clear all signal handlers when destroy a main_window

Fixes: NB#59752

pmo-trunk-r2910

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 5fd735c..5dbb687 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -63,6 +63,7 @@
 #include "modest-ui-dimming-manager.h"
 #include "maemo/modest-osso-state-saving.h"
 #include "modest-text-utils.h"
+#include "modest-signal-mgr.h"
 
 #ifdef MODEST_HAVE_HILDON0_WIDGETS
 #include <hildon-widgets/hildon-program.h>
@@ -213,9 +214,9 @@ struct _ModestMainWindowPrivate {
        guint progress_bar_timeout;
 
        /* Signal handler UIDs */
-       gint queue_changed_handler_uid; 
        GList *queue_err_signals;
-
+       GSList *sighandlers;
+       
        ModestConfNotificationId notification_id;
 };
 #define MODEST_MAIN_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -339,7 +340,7 @@ modest_main_window_init (ModestMainWindow *obj)
        priv->optimized_view  = FALSE;
        priv->send_receive_in_progress  = FALSE;
        priv->progress_bar_timeout = 0;
-       priv->queue_changed_handler_uid = 0;
+       priv->sighandlers = NULL;
 }
 
 static void
@@ -349,6 +350,12 @@ modest_main_window_finalize (GObject *obj)
 
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->notification_id) {
+               modest_conf_forget_namespace (modest_runtime_get_conf (),
+                                             MODEST_CONF_NAMESPACE,
+                                             priv->notification_id);
+       }
+       
        /* Sanity check: shouldn't be needed, the window mgr should
           call this function before */
        modest_main_window_disconnect_signals (MODEST_WINDOW (obj));
@@ -364,12 +371,6 @@ modest_main_window_finalize (GObject *obj)
                priv->progress_bar_timeout = 0;
        }
 
-       if (priv->notification_id) {
-               modest_conf_forget_namespace (modest_runtime_get_conf (),
-                                             MODEST_CONF_NAMESPACE,
-                                             priv->notification_id);
-       }
-
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -643,15 +644,11 @@ _header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
 static void
 modest_main_window_disconnect_signals (ModestWindow *self)
 {      
-       ModestMainWindowPrivate *priv;
-       
+       ModestMainWindowPrivate *priv;  
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 
-       /* Disconnect signal handlers */
-       if (g_signal_handler_is_connected (modest_runtime_get_mail_operation_queue (),
-                                          priv->queue_changed_handler_uid))
-               g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
-                                            priv->queue_changed_handler_uid);
+       modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+       priv->sighandlers = NULL;       
 }
 
 static void
@@ -665,76 +662,71 @@ connect_signals (ModestMainWindow *self)
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
 
        /* folder view */
-       g_signal_connect (G_OBJECT(priv->folder_view), "key-press-event",
-                         G_CALLBACK(on_inner_widgets_key_pressed), self);
-       g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
-                         G_CALLBACK(modest_main_window_on_folder_selection_changed), self);
-       g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
-                         G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
-       g_signal_connect (G_OBJECT (priv->folder_view), "focus-in-event", 
-                         G_CALLBACK (on_folder_view_focus_in), self);
+       
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+                                                      G_OBJECT(priv->folder_view), "key-press-event",
+                                                      G_CALLBACK(on_inner_widgets_key_pressed), 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), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed",
+                                                      G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event", 
+                                                      G_CALLBACK (on_folder_view_focus_in), self);
 
        /* Folder view CSM */
        menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
        gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
-       g_signal_connect (G_OBJECT(priv->folder_view), "tap-and-hold",
-                         G_CALLBACK(_folder_view_csm_menu_activated),
-                         self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "tap-and-hold",
+                                                      G_CALLBACK(_folder_view_csm_menu_activated),
+                                                      self);
        /* header view */
-       g_signal_connect (G_OBJECT(priv->header_view), "header_selected",
-                         G_CALLBACK(modest_ui_actions_on_header_selected), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "header_activated",
-                         G_CALLBACK(modest_ui_actions_on_header_activated), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "item_not_found",
-                         G_CALLBACK(modest_ui_actions_on_item_not_found), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "key-press-event",
-                         G_CALLBACK(on_inner_widgets_key_pressed), self);
-       g_signal_connect (G_OBJECT(priv->header_view), "msg_count_changed",
-                         G_CALLBACK(_on_msg_count_changed), self);
-       g_signal_connect (G_OBJECT (priv->header_view), "focus-in-event",
-                         G_CALLBACK (on_header_view_focus_in), self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected",
+                                                      G_CALLBACK(modest_ui_actions_on_header_selected), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_activated",
+                                                      G_CALLBACK(modest_ui_actions_on_header_activated), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "item_not_found",
+                                                      G_CALLBACK(modest_ui_actions_on_item_not_found), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "key-press-event",
+                                                      G_CALLBACK(on_inner_widgets_key_pressed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "msg_count_changed",
+                                                      G_CALLBACK(_on_msg_count_changed), self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event",
+                                                      G_CALLBACK (on_header_view_focus_in), self);
+       
        /* Header view CSM */
        menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
        gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
-       g_signal_connect (G_OBJECT(priv->header_view), "tap-and-hold",
-                         G_CALLBACK(_header_view_csm_menu_activated),
-                         self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
+                                                      G_CALLBACK(_header_view_csm_menu_activated),
+                                                      self);
        
        /* window */
-       g_signal_connect (G_OBJECT (self), "window-state-event",
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event",
                          G_CALLBACK (modest_main_window_window_state_event),
                          NULL);
        
        /* Mail Operation Queue */
-       priv->queue_changed_handler_uid = 
-               g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
-                                 "queue-changed", G_CALLBACK (on_queue_changed), self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+                                                      "queue-changed", G_CALLBACK (on_queue_changed), self);
+       
        /* Track changes in the device name */
        priv->notification_id =  modest_conf_listen_to_namespace (modest_runtime_get_conf (), 
                                                                  MODEST_CONF_NAMESPACE);
-       g_signal_connect (G_OBJECT(modest_runtime_get_conf ()),
-                         "key_changed", G_CALLBACK (on_configuration_key_changed), 
-                         self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(modest_runtime_get_conf ()),
+                                                      "key_changed", G_CALLBACK (on_configuration_key_changed), 
+                                                      self);
+       
        /* Track account changes. We need to refresh the toolbar */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                         "account_inserted", G_CALLBACK (account_number_changed),
-                         self);
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                         "account_removed", G_CALLBACK (account_number_changed),
-                         self);
-
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+                                                      "account_inserted", G_CALLBACK (account_number_changed),
+                                                      self);
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+                                                      "account_removed", G_CALLBACK (account_number_changed),
+                                                      self);
        /* Account store */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), 
-                         "password_requested",
-                         G_CALLBACK (modest_ui_actions_on_password_requested), self);
-                         
-/*     /\* Device *\/ */
-/*     g_signal_connect (G_OBJECT(modest_runtime_get_account_store()),  */
-/*                       "connecting-finished", */
-/*                       G_CALLBACK(on_account_store_connecting_finished), self); */
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store()), 
+                                                      "password_requested",
+                                                      G_CALLBACK (modest_ui_actions_on_password_requested), self);
 }
 
 #if 0

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index d0d8b27..ca5798c 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -36,7 +36,7 @@
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
-/* include other impl specific header files */
+
 
 /* 'private'/'protected' functions */
 static void modest_window_mgr_class_init (ModestWindowMgrClass *klass);
@@ -572,10 +572,10 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
 
        /* Disconnect all the window signals */
        modest_window_disconnect_signals (window);
-
+       
        /* Destroy the window */
        gtk_widget_destroy (win->data);
-
+       
        /* If there are no more windows registered then exit program */
        if (priv->window_list == NULL) {
                ModestConf *conf = modest_runtime_get_conf ();
@@ -683,11 +683,16 @@ ModestWindow*
 modest_window_mgr_get_main_window (ModestWindowMgr *self)
 {
        ModestWindowMgrPrivate *priv;
-
+       
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
-
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
+       /* create the main window, if it hasn't been created yet */
+       if (!priv->main_window) {
+               g_debug ("%s: creating main window\n", __FUNCTION__);
+               modest_window_mgr_register_window (self, modest_main_window_new ());
+       }
+       
        return priv->main_window;
 }