typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
struct _ModestWindowMgrPrivate {
GList *window_list;
+
ModestWindow *main_window;
+ GtkDialog *easysetup_dialog;
+
gboolean fullscreen_mode;
gboolean show_toolbars;
gboolean show_toolbars_fullscreen;
GSList *preregistered_uids;
GHashTable *destroy_handlers;
GHashTable *viewer_handlers;
+
+ guint closing_time;
};
#define MODEST_WINDOW_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_WINDOW_MGR, \
priv->window_list = NULL;
priv->main_window = NULL;
priv->fullscreen_mode = FALSE;
-
+ priv->easysetup_dialog = NULL;
+
priv->preregistered_uids = NULL;
/* Could not initialize it from gconf, singletons are not
priv->show_toolbars_fullscreen = FALSE;
priv->destroy_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
priv->viewer_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
+
+ priv->closing_time = 0;
}
static void
priv->viewer_handlers = NULL;
}
+ if (priv->easysetup_dialog) {
+ g_warning ("%s: forgot to destroy an easysetup dialog somewhere",
+ __FUNCTION__);
+ gtk_widget_destroy (GTK_WIDGET(priv->easysetup_dialog));
+ priv->easysetup_dialog = NULL;
+ }
+
/* Do not unref priv->main_window because it does not hold a
new reference */
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
/* Get message uid from msg window */
if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
msg_uid = modest_msg_edit_window_get_message_uid (MODEST_MSG_EDIT_WINDOW (win));
+ if (msg_uid && uid &&!strcmp (msg_uid, uid))
+ return 0;
} else {
msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
}
}
-
gboolean
modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
ModestWindow **win)
if (win)
*win = NULL;
-/* g_debug ("windows in list: %d", g_list_length (priv->window_list)); */
-/* g_debug ("headers in list: %d", g_slist_length (priv->preregistered_uids)); */
-
has_header = has_uid (priv->preregistered_uids, uid);
item = g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids);
gint *handler_id;
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
- g_return_if_fail (MODEST_IS_WINDOW (window));
+ g_return_if_fail (GTK_IS_WINDOW (window));
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
win = g_list_find (priv->window_list, window);
if (win) {
- g_warning ("Trying to register an already registered window");
+ g_warning ("%s: trying to re-register a window",
+ __FUNCTION__);
return;
}
/* Check that it's not a second main window */
if (MODEST_IS_MAIN_WINDOW (window)) {
if (priv->main_window) {
- g_warning ("Trying to register a second main window");
+ g_warning ("%s: trying to register a second main window",
+ __FUNCTION__);
return;
} else {
priv->main_window = window;
if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
const gchar *uid = modest_msg_view_window_get_message_uid
(MODEST_MSG_VIEW_WINDOW (window));
-
- g_debug ("registering window for %s", uid);
-
+
if (!has_uid (priv->preregistered_uids, uid))
g_debug ("weird: no uid for window (%s)", uid);
+
+ g_debug ("registering window for %s", uid ? uid : "<none>");
priv->preregistered_uids =
remove_uid (priv->preregistered_uids,
modest_msg_view_window_get_message_uid
(MODEST_MSG_VIEW_WINDOW (window)));
+
} else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
const gchar *uid = modest_msg_edit_window_get_message_uid
(MODEST_MSG_EDIT_WINDOW (window));
-
+
g_debug ("registering window for %s", uid);
-
- if (!has_uid (priv->preregistered_uids, uid))
- g_debug ("weird: no uid for window (%s)", uid);
priv->preregistered_uids =
remove_uid (priv->preregistered_uids,
}
+
+/* interval before retrying to close the application */
+#define CLOSING_RETRY_INTERVAL 3000
+/* interval before cancel whatever is left in the queue, and closing anyway */
+#define MAX_WAIT_FOR_CLOSING 30 * 1000
+
+static gboolean
+on_quit_maybe (ModestWindowMgr *self)
+{
+ ModestWindowMgrPrivate *priv;
+ guint queue_num;
+
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ /* it seems, in the meantime some windows were
+ * created. in that case, stop 'on_quit_maybe' */
+ if (priv->window_list) {
+ priv->closing_time = 0;
+ return FALSE;
+ }
+
+ if (priv->closing_time >= MAX_WAIT_FOR_CLOSING) {
+ /* we waited long enough: cancel all remaining operations */
+ g_debug ("%s: we waited long enough (%ds), cancelling queue and quiting",
+ __FUNCTION__, priv->closing_time/1000);
+ /* FIXME: below gives me a lot of:
+ * GLIB CRITICAL ** default - modest_mail_operation_cancel:
+ * assertion `priv->account' failed
+ * which means there is no account for the given operation
+ * so, we're not trying to be nice, we're just quiting.
+ */
+ //modest_mail_operation_queue_cancel_all
+ // (modest_runtime_get_mail_operation_queue());
+ } else {
+
+ /* if there is anything left in our operation queue,
+ * wait another round
+ */
+ queue_num = modest_mail_operation_queue_num_elements
+ (modest_runtime_get_mail_operation_queue());
+ if (queue_num > 0) {
+ g_debug ("%s: waiting, there are still %d operation(s) queued",
+ __FUNCTION__, queue_num);
+ priv->closing_time += CLOSING_RETRY_INTERVAL;
+ return TRUE;
+ }
+ }
+
+ /* so: no windows left, nothing in the queue: quit */
+ priv->closing_time = 0;
+ gtk_main_quit ();
+ return FALSE;
+}
+
+
void
modest_window_mgr_unregister_window (ModestWindowMgr *self,
ModestWindow *window)
priv->main_window = NULL;
/* Disconnect all emissions of msg-changed */
- g_hash_table_foreach (priv->viewer_handlers,
- disconnect_msg_changed,
- NULL);
- g_hash_table_destroy (priv->viewer_handlers);
- priv->viewer_handlers = NULL;
+ if (priv->viewer_handlers) {
+ g_hash_table_foreach (priv->viewer_handlers,
+ disconnect_msg_changed,
+ NULL);
+ g_hash_table_destroy (priv->viewer_handlers);
+ priv->viewer_handlers = NULL;
+ }
}
/* Remove the viewer window handler from the hash table. The
/* If there are no more windows registered then exit program */
if (priv->window_list == NULL) {
+
ModestConf *conf = modest_runtime_get_conf ();
-
/* Save show toolbar status */
modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN,
priv->show_toolbars_fullscreen, NULL);
modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR,
priv->show_toolbars, NULL);
- /* Quit main loop */
- /* FIXME: do we ever need to do this here? */
- if (gtk_main_level() > 0)
- gtk_main_quit ();
+ g_timeout_add (CLOSING_RETRY_INTERVAL,
+ (GSourceFunc)on_quit_maybe, self);
}
}
+
+
void
modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
gboolean on)
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 will set priv->main_window */
modest_window_mgr_register_window (self, modest_main_window_new ());
+ g_debug ("%s: created main window: %p\n", __FUNCTION__, priv->main_window);
}
return priv->main_window;
}
+
+GtkDialog*
+modest_window_mgr_get_easysetup_dialog (ModestWindowMgr *self)
+{
+ ModestWindowMgrPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ return priv->easysetup_dialog;
+}
+
+
+GtkDialog*
+modest_window_mgr_set_easysetup_dialog (ModestWindowMgr *self, GtkDialog *dialog)
+{
+ ModestWindowMgrPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ return priv->easysetup_dialog = dialog;
+}
+
+
static void
on_nonhibernating_window_hide(GtkWidget *widget, gpointer user_data)
{
G_CALLBACK (on_nonhibernating_window_hide), self);
}
-void modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self,
+void
+modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self,
GtkWindow *window)
{
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
}
}
-gboolean modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
+gboolean
+modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
{
g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
}
-void modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
+void
+modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
{
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
projects / modest / blobdiff