Removed MainWindow dependency from widgets

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

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 87848b7..1a27e00 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -58,7 +58,9 @@ static void modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
                                                     GType window_type,
                                                     gboolean show_toolbars,
                                                     gboolean fullscreen);
+#ifndef MODEST_TOOLKIT_HILDON2
 static ModestWindow* modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show);
+#endif
 static GtkWindow *modest_window_mgr_get_modal_default (ModestWindowMgr *self);
 static void modest_window_mgr_set_modal_default (ModestWindowMgr *self, 
                                                 GtkWindow *window,
@@ -95,11 +97,12 @@ typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
 struct _ModestWindowMgrPrivate {
        guint         banner_counter;
 
+#ifndef MODEST_TOOLKIT_HILDON2
        ModestWindow *main_window;
-
+#endif
        GSList       *windows_that_prevent_hibernation;
        GSList       *preregistered_uids;
-       
+
        guint        closing_time;
 
        GtkWidget    *cached_view;
@@ -161,7 +164,9 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass)
        mgr_class->set_fullscreen_mode = modest_window_mgr_set_fullscreen_mode_default;
        mgr_class->get_fullscreen_mode = modest_window_mgr_get_fullscreen_mode_default;
        mgr_class->show_toolbars = modest_window_mgr_show_toolbars_default;
+#ifndef MODEST_TOOLKIT_HILDON2
        mgr_class->get_main_window = modest_window_mgr_get_main_window_default;
+#endif
        mgr_class->get_modal = modest_window_mgr_get_modal_default;
        mgr_class->set_modal = modest_window_mgr_set_modal_default;
        mgr_class->close_all_windows = modest_window_mgr_close_all_windows_default;
@@ -252,8 +257,9 @@ modest_window_mgr_init (ModestWindowMgr *obj)
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
        priv->banner_counter = 0;
+#ifndef MODEST_TOOLKIT_HILDON2
        priv->main_window = NULL;
-
+#endif
        priv->preregistered_uids = NULL;
 
        priv->closing_time = 0;
@@ -568,6 +574,7 @@ 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) {
@@ -578,6 +585,7 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
                        priv->main_window = window;
                }
        }
+#endif
 
        /* remove from the list of pre-registered uids */
        if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
@@ -585,7 +593,7 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
                        (MODEST_MSG_VIEW_WINDOW (window));
 
                MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid ? uid : "<none>"););
-               
+
                if (has_uid (priv->preregistered_uids, uid)) {
                        priv->preregistered_uids = 
                                remove_uid (priv->preregistered_uids,
@@ -595,7 +603,7 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
        } else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
                const gchar *uid = modest_msg_edit_window_get_message_uid
                        (MODEST_MSG_EDIT_WINDOW (window));
-               
+
                MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid););
 
                priv->preregistered_uids = 
@@ -659,7 +667,7 @@ modest_window_mgr_get_fullscreen_mode_default (ModestWindowMgr *self)
        return FALSE;
 }
 
-void 
+void
 modest_window_mgr_show_toolbars (ModestWindowMgr *self,
                                 GType window_type,
                                 gboolean show_toolbars,
@@ -668,7 +676,7 @@ modest_window_mgr_show_toolbars (ModestWindowMgr *self,
        return MODEST_WINDOW_MGR_GET_CLASS (self)->show_toolbars (self, window_type, show_toolbars, fullscreen);
 }
 
-static void 
+static void
 modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
                                         GType window_type,
                                         gboolean show_toolbars,
@@ -677,35 +685,36 @@ modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
        return;
 }
 
+#ifndef MODEST_TOOLKIT_HILDON2
 void
 modest_window_mgr_set_main_window (ModestWindowMgr *self, ModestWindow *win)
 {
        ModestWindowMgrPrivate *priv;
-       
+
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
        priv->main_window = win;
 }
 
-ModestWindow*  
+ModestWindow*
 modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
 {
        return MODEST_WINDOW_MGR_GET_CLASS (self)->get_main_window (self, show);
 }
 
-static ModestWindow*  
+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) 
+       if (show)
                return modest_main_window_new ();
        else return NULL;
 }
@@ -715,13 +724,13 @@ gboolean
 modest_window_mgr_main_window_exists  (ModestWindowMgr *self)
 {
        ModestWindowMgrPrivate *priv;
-       
+
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
        return priv->main_window != NULL;
 }
-
+#endif
 
 GtkWindow *
 modest_window_mgr_get_modal (ModestWindowMgr *self)
@@ -850,9 +859,11 @@ modest_window_mgr_get_num_windows (ModestWindowMgr *self)
                g_list_free (window_list);
        }
 
+#ifndef MODEST_TOOLKIT_HILDON2
        /* Do not take into account the main window if it was hidden */
        if (num_windows && priv->main_window && !GTK_WIDGET_VISIBLE (priv->main_window))
                num_windows--;
+#endif
 
        return num_windows + priv->banner_counter;
 }
@@ -952,9 +963,13 @@ modest_window_mgr_show_initial_window (ModestWindowMgr *self)
 static ModestWindow *
 modest_window_mgr_show_initial_window_default (ModestWindowMgr *self)
 {
+#ifndef MODEST_TOOLKIT_HILDON2
        /* By default it returns the main window creating it if
           needed */
        return modest_window_mgr_get_main_window (self, TRUE);
+#else
+       return NULL;
+#endif
 }