#include "modest-ui-actions.h"
#include "modest-platform.h"
#include "modest-defs.h"
-#include "widgets/modest-main-window.h"
#include "widgets/modest-msg-edit-window.h"
#include "widgets/modest-msg-view-window.h"
#include "modest-debug.h"
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,
struct _ModestWindowMgrPrivate {
guint banner_counter;
-#ifndef MODEST_TOOLKIT_HILDON2
- ModestWindow *main_window;
-#endif
GSList *windows_that_prevent_hibernation;
GSList *preregistered_uids;
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;
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;
/* 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);
+ }
}
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 ());
+
+ /* Do also allow modest to shutdown when the
+ application is closed */
+ modest_runtime_set_allow_shutdown (TRUE);
}
- return MODEST_WINDOW_MGR_GET_CLASS (self)->register_window (self, window, parent);
+ return retval;
}
static gboolean
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);
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)) {
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*
-modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
-{
- return MODEST_WINDOW_MGR_GET_CLASS (self)->get_main_window (self, 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;
-}
-
-
-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)
{
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;
}
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
+ g_warning ("You must implement %s", __FUNCTION__);
+
return NULL;
-#endif
}
projects / modest / blobdiff