typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
struct _ModestWindowMgrPrivate {
GList *window_list;
+ guint banner_counter;
ModestWindow *main_window;
priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
priv->window_list = NULL;
+ priv->banner_counter = 0;
priv->main_window = NULL;
priv->fullscreen_mode = FALSE;
modest_window_mgr_close_all_windows (ModestWindowMgr *self)
{
ModestWindowMgrPrivate *priv = NULL;
- GList *wins = NULL;
gboolean ret_value = FALSE;
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
- /* delete-event handler already removes window_list item, */
- /* so no next its required on this loop */
- wins = priv->window_list;
- while (wins) {
- g_signal_emit_by_name (G_OBJECT (wins->data), "delete-event", NULL, &ret_value);
+ /* If there is a main window then try to close it, and it will
+ close the others if needed */
+ if (priv->main_window) {
+ g_signal_emit_by_name (priv->main_window, "delete-event", NULL, &ret_value);
+ } else {
+ GList *wins = NULL, *next = NULL;
+ /* delete-event handler actually removes window_list item, */
wins = priv->window_list;
+ while (wins) {
+ next = g_list_next (wins);
+ g_signal_emit_by_name (G_OBJECT (wins->data), "delete-event", NULL, &ret_value);
+ wins = next;
+ }
}
}
/* If the user wants to close all the windows */
if ((dialog_response == GTK_RESPONSE_OK)
- || (dialog_response == GTK_RESPONSE_ACCEPT)
- || (dialog_response == GTK_RESPONSE_YES))
- {
+ || (dialog_response == GTK_RESPONSE_ACCEPT)
+ || (dialog_response == GTK_RESPONSE_YES)) {
GList *iter = priv->window_list;
do {
if (iter->data != window) {
iter = g_list_next (iter);
}
} while (iter);
- }
- else
- {
- return TRUE;
- }
+ } else {
+ return TRUE;
+ }
}
}
else {
modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
_("mcen_nc_no_email_message_modified_save_changes"));
/* Save to drafts */
- if (response != GTK_RESPONSE_CANCEL)
- modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));
+ if (response == GTK_RESPONSE_OK)
+ if (!modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window)))
+ return TRUE;
}
}
}
GList *win;
ModestWindowMgrPrivate *priv;
gulong *tmp, handler_id;
+ GSList* pending_ops = NULL;
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
g_return_if_fail (MODEST_IS_WINDOW (window));
g_hash_table_remove (priv->destroy_handlers, window);
/* cancel open and receive operations */
- if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+ pending_ops = modest_mail_operation_queue_get_by_source (modest_runtime_get_mail_operation_queue (),
+ G_OBJECT (window));
+ while (pending_ops != NULL) {
ModestMailOperationTypeOperation type;
- GSList* pending_ops = NULL;
GSList* tmp_list = NULL;
- pending_ops = modest_mail_operation_queue_get_by_source (
- modest_runtime_get_mail_operation_queue (),
- G_OBJECT (window));
- while (pending_ops != NULL) {
- type = modest_mail_operation_get_type_operation (MODEST_MAIL_OPERATION (pending_ops->data));
- if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || type == MODEST_MAIL_OPERATION_TYPE_OPEN) {
- modest_mail_operation_cancel (pending_ops->data);
- }
- tmp_list = pending_ops;
- pending_ops = g_slist_next (pending_ops);
- g_slist_free_1 (tmp_list);
+
+ type = modest_mail_operation_get_type_operation (MODEST_MAIL_OPERATION (pending_ops->data));
+ if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || type == MODEST_MAIL_OPERATION_TYPE_OPEN) {
+ modest_mail_operation_cancel (pending_ops->data);
}
+ g_object_unref (G_OBJECT (pending_ops->data));
+ tmp_list = pending_ops;
+ pending_ops = g_slist_next (pending_ops);
+ g_slist_free_1 (tmp_list);
}
/* Disconnect the "delete-event" handler, we won't need it anymore */
gtk_widget_destroy (win->data);
/* If there are no more windows registered emit the signal */
- if (priv->window_list == NULL)
+ if (priv->window_list == NULL && priv->banner_counter == 0)
g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
}
g_mutex_unlock (priv->queue_lock);
if (!old_modal) {
+ /* make us transient wrt the main window then */
+ ModestWindow *main_win = modest_window_mgr_get_main_window (self, FALSE);
+ if (GTK_WINDOW(main_win) != window) /* they should not be the same */
+ gtk_window_set_transient_for (window, GTK_WINDOW(main_win));
+
gtk_window_set_modal (window, TRUE);
} else {
/* un-modalize the old one; the one on top should be the
g_mutex_unlock (priv->queue_lock);
/* Show it */
- if (topmost)
+ if (topmost) {
+ gdk_threads_enter ();
gtk_window_present (topmost);
+ gdk_threads_leave ();
+ }
return FALSE;
}
gint
modest_window_mgr_num_windows (ModestWindowMgr *self)
{
- ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+ ModestWindowMgrPrivate *priv;
gint num_windows = 0;
+ g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), -1);
+
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+
if (priv->window_list)
num_windows = g_list_length (priv->window_list);
- return num_windows;
+ return num_windows + priv->banner_counter;
}
GtkWidget *
modest_window_mgr_get_msg_edit_window (ModestWindowMgr *self)
{
GtkWidget *result;
- ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+ ModestWindowMgrPrivate *priv;
+
+ g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+
if (priv->cached_editor) {
result = priv->cached_editor;
priv->cached_editor = NULL;
modest_window_mgr_get_msg_view_window (ModestWindowMgr *self)
{
GtkWidget *result;
- ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+ ModestWindowMgrPrivate *priv;
+
+ g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
+
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
if (priv->cached_view) {
result = priv->cached_view;
return result;
}
+
+void
+modest_window_mgr_register_banner (ModestWindowMgr *self)
+{
+ ModestWindowMgrPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ priv->banner_counter++;
+
+}
+
+void
+modest_window_mgr_unregister_banner (ModestWindowMgr *self)
+{
+ ModestWindowMgrPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+ priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+ priv->banner_counter--;
+ if (priv->window_list == NULL && priv->banner_counter == 0) {
+ g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
+ }
+
+}
projects / modest / blobdiff