#include "modest-tny-msg.h"
#include "modest-tny-account.h"
#include <tny-merge-folder.h>
+#include <modest-account-mgr-helpers.h>
/* 'private'/'protected' functions */
static void modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass);
ModestWindow **win);
static GList *modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self);
static gboolean modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *self);
+static gboolean modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self);
static gboolean window_has_modals (ModestWindow *window);
static ModestWindow *modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self);
static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self);
mgr_class->find_registered_message_uid = modest_hildon2_window_mgr_find_registered_message_uid;
mgr_class->get_window_list = modest_hildon2_window_mgr_get_window_list;
mgr_class->close_all_windows = modest_hildon2_window_mgr_close_all_windows;
+ mgr_class->close_all_but_initial = modest_hildon2_window_mgr_close_all_but_initial;
mgr_class->show_initial_window = modest_hildon2_window_mgr_show_initial_window;
mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top;
mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on;
HildonWindowStack *stack;
gboolean nested_msg = FALSE;
ModestWindow *current_top;
+ const gchar *acc_name;
g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
*handler_id = g_signal_connect (window, "delete-event", G_CALLBACK (on_window_destroy), self);
g_hash_table_insert (priv->destroy_handlers, window, handler_id);
+ if (!MODEST_IS_MSG_EDIT_WINDOW (window) &&
+ !MODEST_IS_ACCOUNTS_WINDOW (window)) {
+ acc_name = modest_window_get_active_account (window);
+
+ if (acc_name) {
+ modest_platform_remove_new_mail_notifications (FALSE, acc_name);
+ modest_account_mgr_set_has_new_mails (modest_runtime_get_account_mgr (),
+ acc_name,
+ FALSE);
+ }
+ }
+
/* Show toolbar always */
- modest_window_show_toolbar (window, TRUE);
+ if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+ gboolean show_toolbar;
+ show_toolbar = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL);
+ modest_window_show_toolbar (window, show_toolbar);
+ } else {
+ modest_window_show_toolbar (window, TRUE);
+ }
return TRUE;
fail:
gtk_window_set_modal (window, TRUE);
gtk_window_set_transient_for (window, parent);
gtk_window_set_destroy_with_parent (window, TRUE);
+
+ if (!gtk_window_has_toplevel_focus (window)) {
+ GList *toplevels, *node;
+
+ toplevels = gtk_window_list_toplevels ();
+ for (node = toplevels; node != NULL; node = g_list_next (node)) {
+ if (gtk_window_has_toplevel_focus (GTK_WINDOW (node->data))) {
+ if (GTK_IS_DIALOG (node->data)) {
+ gtk_window_set_transient_for (window, GTK_WINDOW (node->data));
+ }
+ break;
+ }
+ }
+ }
}
-static gboolean
-on_idle_close_all_but_first (gpointer data)
+static void
+close_all_but_first (gpointer data)
{
gint num_windows, i;
gboolean retval;
HildonWindowStack *stack;
stack = hildon_window_stack_get_default ();
- g_return_val_if_fail (stack, FALSE);
+ g_return_if_fail (stack);
num_windows = hildon_window_stack_size (stack);
current_top = hildon_window_stack_peek (stack);
g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
}
+}
+
+static gboolean
+on_idle_close_all_but_first (gpointer data)
+{
+ gdk_threads_enter ();
+ close_all_but_first (data);
+ gdk_threads_leave ();
+
return FALSE;
}
modest_accounts_window_pre_create ();
MODEST_WINDOW_MGR_CLASS(parent_class)->create_caches (self);
-
}
-static void
-osso_display_event_cb (osso_display_state_t state,
+static void
+osso_display_event_cb (osso_display_state_t state,
gpointer data)
{
ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data);
/* Stop blinking if the screen becomes on */
if (priv->display_state == OSSO_DISPLAY_ON)
- modest_platform_remove_new_mail_notifications (TRUE);
+ modest_platform_remove_new_mail_notifications (TRUE, NULL);
+}
+
+static gboolean
+modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self)
+{
+ ModestWindow *top;
+
+ /* Exit if there are no windows */
+ if (!modest_window_mgr_get_num_windows (self)) {
+ g_warning ("%s: unable to close, there are no windows", __FUNCTION__);
+ return FALSE;
+ }
+
+ /* Close active modals */
+ if (!_modest_window_mgr_close_active_modals (self)) {
+ g_debug ("%s: unable to close some dialogs", __FUNCTION__);
+ return FALSE;
+ }
+
+ /* Close all but first */
+ top = modest_window_mgr_get_current_top (self);
+ if (!MODEST_IS_ACCOUNTS_WINDOW (top))
+ close_all_but_first (NULL);
+
+ /* If some cannot be closed return */
+ top = modest_window_mgr_get_current_top (self);
+ if (!MODEST_IS_ACCOUNTS_WINDOW (top)) {
+ g_debug ("%s: could not close some windows", __FUNCTION__);
+ return FALSE;
+ }
+
+ return TRUE;
}
projects / modest / blobdiff