* Commented some code in the mail operations that should be reviewed
* Added support to automatically unregister windows when destroyed
pmo-trunk-r1533
* so we can supply them when creating the connection somehow.
*/
GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
* so we can supply them when creating the connection somehow.
*/
GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
g_signal_connect (G_OBJECT (window), "hide",
G_CALLBACK (on_smtp_servers_window_hide), self);
gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
g_signal_connect (G_OBJECT (window), "hide",
G_CALLBACK (on_smtp_servers_window_hide), self);
- gtk_widget_show (window);
+ gtk_widget_show (window);
}
static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
}
static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
/* Toolbar */
toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
/* Toolbar */
toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
- reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
-
- menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolbarReplyContextMenu");
- gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
/* Set homogeneous toolbar */
gtk_container_foreach (GTK_CONTAINER (toolbar), set_homogeneous, NULL);
/* Set homogeneous toolbar */
gtk_container_foreach (GTK_CONTAINER (toolbar), set_homogeneous, NULL);
+ /* Set reply message tap and hold menu */
+ reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolbarReplyContextMenu");
+ gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+
modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
}
modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
}
-static void
-on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
- gint num, gint total, gpointer user_data)
-{
- ModestMailOperation *self;
- ModestMailOperationPrivate *priv;
-
- /* TODO: if tinymail issues a status update before the
- callback call then this could happen. If this is true the
- we must review the design */
- if (!G_IS_OBJECT (user_data))
- return;
+/* static void */
+/* on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg, */
+/* gint num, gint total, gpointer user_data) */
+/* { */
+/* ModestMailOperation *self; */
+/* ModestMailOperationPrivate *priv; */
- self = MODEST_MAIL_OPERATION (user_data);
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+/* self = MODEST_MAIL_OPERATION (user_data); */
+/* priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); */
- priv->done = num;
- priv->total = total;
+/* priv->done = num; */
+/* priv->total = total; */
- if (num == 1 && total == 100)
- return;
+/* if (num == 1 && total == 100) */
+/* return; */
- g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
-}
+/* g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); */
+/* } */
void
modest_mail_operation_refresh_folder (ModestMailOperation *self,
void
modest_mail_operation_refresh_folder (ModestMailOperation *self,
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
- /* Refresh the folder */
+ /* Refresh the folder. TODO: tinymail could issue a status
+ updates before the callback call then this could happen. We
+ must review the design */
tny_folder_refresh_async (folder,
on_refresh_folder,
tny_folder_refresh_async (folder,
on_refresh_folder,
- on_refresh_folder_status_update,
+/* on_refresh_folder_status_update, */
+ NULL,
if (!win) {
g_printerr ("modest: failed to create window\n");
return MODEST_ERR_UI;
if (!win) {
g_printerr ("modest: failed to create window\n");
return MODEST_ERR_UI;
+ } else {
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_register_window (mgr, win);
}
gtk_widget_show (GTK_WIDGET (win));
}
gtk_widget_show (GTK_WIDGET (win));
gchar *from_str = NULL;
GError *err = NULL;
TnyAccount *account;
gchar *from_str = NULL;
GError *err = NULL;
TnyAccount *account;
account_name = g_strdup(modest_window_get_active_account (win));
if (!account_name)
account_name = g_strdup(modest_window_get_active_account (win));
if (!account_name)
+ /* Create and register edit window */
msg_win = modest_msg_edit_window_new (msg, account_name);
msg_win = modest_msg_edit_window_new (msg, account_name);
+ mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_register_window (mgr, msg_win);
+
if (win)
gtk_window_set_transient_for (GTK_WINDOW (msg_win),
GTK_WINDOW (win));
if (win)
gtk_window_set_transient_for (GTK_WINDOW (msg_win),
GTK_WINDOW (win));
GError *err = NULL;
TnyFolder *folder = NULL;
TnyAccount *account = NULL;
GError *err = NULL;
TnyFolder *folder = NULL;
TnyAccount *account = NULL;
msg = TNY_MSG (data);
helper = (GetMsgAsyncHelper *) user_data;
msg = TNY_MSG (data);
helper = (GetMsgAsyncHelper *) user_data;
g_error_free (err);
goto cleanup;
}
g_error_free (err);
goto cleanup;
}
-
- /* Show edit window */
+
+ /* Create and register the windows */
msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
+ mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_register_window (mgr, msg_win);
+
+ /* Show edit window */
gtk_widget_show_all (GTK_WIDGET (msg_win));
cleanup:
gtk_widget_show_all (GTK_WIDGET (msg_win));
cleanup:
TnyFolder *folder = NULL;
TnyMsg *msg = NULL;
gchar *account = NULL;
TnyFolder *folder = NULL;
TnyMsg *msg = NULL;
gchar *account = NULL;
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
account = g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
if (!account)
account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
account = g_strdup(modest_window_get_active_account(MODEST_WINDOW(main_window)));
if (!account)
account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
+
+ /* Create and register message view window */
win = modest_msg_view_window_new (msg, account);
win = modest_msg_view_window_new (msg, account);
+ mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_register_window (mgr, win);
+
gtk_window_set_transient_for (GTK_WINDOW (win),
GTK_WINDOW (main_window));
gtk_window_set_transient_for (GTK_WINDOW (win),
GTK_WINDOW (main_window));
static void modest_window_mgr_class_init (ModestWindowMgrClass *klass);
static void modest_window_mgr_init (ModestWindowMgr *obj);
static void modest_window_mgr_finalize (GObject *obj);
static void modest_window_mgr_class_init (ModestWindowMgrClass *klass);
static void modest_window_mgr_init (ModestWindowMgr *obj);
static void modest_window_mgr_finalize (GObject *obj);
+
+static void on_window_destroy (ModestWindow *window,
+ ModestWindowMgr *self);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
/* list my signals */
enum {
/* MY_SIGNAL_1, */
/* Add to list. Keep a reference to the window */
g_object_ref (window);
priv->window_list = g_list_prepend (priv->window_list, window);
/* Add to list. Keep a reference to the window */
g_object_ref (window);
priv->window_list = g_list_prepend (priv->window_list, window);
+
+ /* Listen to object destruction */
+ g_signal_connect (window, "destroy", G_CALLBACK (on_window_destroy), self);
+}
+
+static void
+on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
+{
+ modest_window_mgr_unregister_window (self, window);