X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=dd8a5b964f54d8db4f3a3ee18547a021c9523a58;hb=a026bc5d9c12b113534de401d042c6d80a2344df;hp=02937ed0f4b93ea754b1098cc1ed5db80df85f79;hpb=4de8582cb20e814a1e49d3d3b6fdf19a78c859ca;p=modest

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index 02937ed..dd8a5b9 100644
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -84,6 +84,9 @@ static void row_count_changed (ModestAccountsWindow *self);
 static gboolean on_key_press(GtkWidget *widget,
 				GdkEventKey *event,
 				gpointer user_data);
+static gboolean on_delete_event (GtkWidget *widget,
+				 GdkEvent *event,
+				 gpointer userdata);
 
 typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate;
 struct _ModestAccountsWindowPrivate {
@@ -371,6 +374,8 @@ modest_accounts_window_new (void)
 	g_signal_connect (G_OBJECT (self), "map-event",
 			  G_CALLBACK (_modest_accounts_window_map_event),
 			  G_OBJECT (self));
+	g_signal_connect (G_OBJECT (self), "delete-event",
+			  G_CALLBACK (on_delete_event), self);
 	update_progress_hint (MODEST_ACCOUNTS_WINDOW (self));
 
 	row_count_changed (MODEST_ACCOUNTS_WINDOW (self));
@@ -399,29 +404,29 @@ setup_menu (ModestAccountsWindow *self)
 	g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self));
 
 	/* Settings menu buttons */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL, 
-					   APP_MENU_CALLBACK (modest_ui_actions_on_new_account), 
-					   NULL);
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
-					   dngettext(GETTEXT_PACKAGE,
-						     "mcen_me_edit_account",
-						     "mcen_me_edit_accounts",
-						     2),
-					   NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_accounts), 
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
-					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
-					   APP_MENU_CALLBACK (modest_ui_actions_on_settings), 
-					   NULL);
+	modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_account"), NULL, 
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_account), 
+				   NULL);
+	modest_window_add_to_menu (MODEST_WINDOW (self),
+				   dngettext(GETTEXT_PACKAGE,
+					     "mcen_me_edit_account",
+					     "mcen_me_edit_accounts",
+					     2),
+				   NULL,
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_accounts), 
+				   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
+	modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
+				   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
+	modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+				   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
+	modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_cancel_send),
+				   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+	modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_options"), NULL,
+				   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_settings), 
+				   NULL);
 }
 
 
@@ -697,3 +702,25 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
 	return FALSE;
 }
+
+static gboolean
+on_delete_event (GtkWidget *widget,
+		 GdkEvent *event,
+		 gpointer userdata)
+{
+	ModestAccountsWindowPrivate *priv;
+
+	priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (widget);
+
+	modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), FALSE);
+
+	gtk_widget_queue_resize (widget);
+
+	gdk_window_process_updates (priv->account_view->window, TRUE);
+	hildon_gtk_window_take_screenshot (GTK_WINDOW (widget), TRUE);
+
+	modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
+
+	return FALSE;
+
+}