Fix gnome build after fixes for hildon screenshot.

[modest] / src / widgets / modest-window-mgr.c

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 7dd86e3..4b69e23 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -76,6 +76,7 @@ static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_show_initial_window_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_get_current_top_default (ModestWindowMgr *self);
 static gboolean modest_window_mgr_screen_is_on_default (ModestWindowMgr *self);
+static ModestWindow *modest_window_mgr_get_folder_window_default (ModestWindowMgr *self);
 static void modest_window_mgr_create_caches_default (ModestWindowMgr *self);
 static void modest_window_mgr_on_queue_changed (ModestMailOperationQueue *queue,
                                                ModestMailOperation *mail_op,
@@ -179,6 +180,7 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass)
        mgr_class->screen_is_on = modest_window_mgr_screen_is_on_default;
        mgr_class->create_caches = modest_window_mgr_create_caches_default;
        mgr_class->close_all_but_initial = modest_window_mgr_close_all_but_initial_default;
+       mgr_class->get_folder_window = modest_window_mgr_get_folder_window_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
 
@@ -443,11 +445,12 @@ modest_window_mgr_register_help_id (ModestWindowMgr *self, GtkWindow *win, const
        /* we don't need 'self', but for API consistency... */
        g_return_if_fail (self && MODEST_IS_WINDOW_MGR(self));
 
-       g_return_if_fail (win && GTK_IS_WINDOW(win));
        g_return_if_fail (help_id);
-       
-       g_object_set_data_full (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM,
-                               g_strdup(help_id), g_free);
+
+       if (GTK_IS_WINDOW (win)) {
+               g_object_set_data_full (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM,
+                                       g_strdup(help_id), g_free);
+       }
 }
 
 
@@ -544,16 +547,25 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
                                   ModestWindow *window,
                                   ModestWindow *parent)
 {
-       /* If this is the first registered window then reset the
-          status of the TnyDevice as it might be forced to be offline
-          when modest is running in the background (see
-          modest_tny_account_store_new()) */
-       if (modest_window_mgr_get_num_windows (self) == 0) {
+       gboolean no_windows, retval;
+
+       no_windows = (modest_window_mgr_get_num_windows (self) == 0);
+
+       retval = MODEST_WINDOW_MGR_GET_CLASS (self)->register_window (self, window, parent);
+
+       if  (no_windows) {
+               /* If this is the first registered window then reset the
+                  status of the TnyDevice as it might be forced to be offline
+                  when modest is running in the background (see
+                  modest_tny_account_store_new()) */
                if (tny_device_is_forced (modest_runtime_get_device ()))
                        tny_device_reset (modest_runtime_get_device ());
-       }
 
-       return MODEST_WINDOW_MGR_GET_CLASS (self)->register_window (self, window, parent);
+               /* Do also allow modest to shutdown when the
+                  application is closed */
+               modest_runtime_set_allow_shutdown (TRUE);
+       }
+       return retval;
 }
 
 static gboolean
@@ -564,7 +576,7 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
        ModestWindowMgrPrivate *priv;
 
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
-       g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
+       g_return_val_if_fail (MODEST_IS_WINDOW (window), FALSE);
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
@@ -576,18 +588,6 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
                                                               self);
        }
 
-#ifndef MODEST_TOOLKIT_HILDON2
-       /* Check that it's not a second main window */
-       if (MODEST_IS_MAIN_WINDOW (window)) {
-               if (priv->main_window) {
-                       g_warning ("%s: trying to register a second main window",
-                                  __FUNCTION__);
-                       return FALSE;
-               } else {
-                       priv->main_window = window;
-               }
-       }
-#endif
 
        /* remove from the list of pre-registered uids */
        if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
@@ -708,17 +708,7 @@ modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
 static ModestWindow*
 modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show)
 {
-       ModestWindowMgrPrivate *priv;
-
-       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
-
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-       if (priv->main_window)
-               return priv->main_window;
-
-       if (show)
-               return modest_main_window_new ();
-       else return NULL;
+       return NULL;
 }
 
 
@@ -1230,3 +1220,18 @@ modest_window_mgr_close_all_but_initial_default (ModestWindowMgr *self)
        /* Empty default implementation */
        return FALSE;
 }
+
+ModestWindow *
+modest_window_mgr_get_folder_window (ModestWindowMgr *self)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_folder_window (self);
+}
+
+static ModestWindow *
+modest_window_mgr_get_folder_window_default (ModestWindowMgr *self)
+{
+       /* Default implementation returns NULL always */
+
+       return NULL;
+}
+