X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=a7696f156077737b6bdf6c2d91c6001b66b1a582;hp=2aec465ec5d6bb4c4d7812c402b77016172da749;hb=9b9efa32a2edc633130c4df8967dee7abc0ec41a;hpb=e88463756e12926277a032f2db233bd90b4694b0

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 2aec465..a7696f1 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -247,7 +247,7 @@ static const GtkActionEntry modest_header_view_action_entries [] = {
 	{ "HeaderViewCSMCut",           NULL,  N_("mcen_me_inbox_cut"),         "<CTRL>X", NULL, G_CALLBACK (modest_ui_actions_on_cut) },
 	{ "HeaderViewCSMCopy",          NULL,  N_("mcen_me_inbox_copy"),        "<CTRL>C", NULL, G_CALLBACK (modest_ui_actions_on_copy) },
 	{ "HeaderViewCSMPaste",         NULL,  N_("mcen_me_inbox_paste"),       "<CTRL>V", NULL, G_CALLBACK (modest_ui_actions_on_paste) },
-	{ "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete) },
+	{ "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
 	{ "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, G_CALLBACK (modest_ui_actions_cancel_send) },
 	{ "HeaderViewCSMHelp",          NULL,  N_("mcen_me_inbox_help"),        NULL,      NULL, G_CALLBACK (modest_ui_actions_on_help) },
 };
@@ -800,7 +800,8 @@ modest_main_window_new (void)
 	GError *error = NULL;
 	ModestConf *conf = NULL;
 	GtkAction *action = NULL;
-
+	GdkPixbuf *window_icon;
+	
 	self  = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL));
 	priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
@@ -936,6 +937,12 @@ modest_main_window_new (void)
 	g_signal_connect (G_OBJECT(self), "show",
 			  G_CALLBACK (modest_main_window_on_show), folder_win);
 		
+	/* Set window icon */
+	window_icon = modest_platform_get_icon (MODEST_APP_ICON);
+	if (window_icon) {
+		gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+		g_object_unref (window_icon);
+	}
 
 	restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
 
@@ -1278,7 +1285,9 @@ on_account_update (TnyAccountStore *account_store,
 		
 		ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
 
-		/* Create display name. The default account is shown differently */
+		/* Create display name. The UI specification specifies a different format string 
+		 * to use for the default account, though both seem to be "%s", so 
+		 * I don't see what the point is. murrayc. */
 		if (default_account && account_data->account_name && 
 			!(strcmp (default_account, account_data->account_name) == 0)) {
 			display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), 
@@ -1304,7 +1313,7 @@ on_account_update (TnyAccountStore *account_store,
 			/* Add ui from account data. We allow 2^9-1 account
 			   changes in a single execution because we're
 			   downcasting the guint to a guint8 in order to use a
-			   GByteArray, it should be enough */
+			   GByteArray. It should be enough. */
 			item_name = g_strconcat (account_data->account_name, "Menu", NULL);
 			merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
 			priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
@@ -1962,7 +1971,7 @@ on_queue_changed (ModestMailOperationQueue *queue,
 	/* Get toolbar mode from operation id*/
 	op_type = modest_mail_operation_get_type_operation (mail_op);
 	switch (op_type) {
-	case MODEST_MAIL_OPERATION_TYPE_SEND:
+/* 	case MODEST_MAIL_OPERATION_TYPE_SEND: */
 	case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
 	case MODEST_MAIL_OPERATION_TYPE_OPEN:
 		mode = TOOLBAR_MODE_TRANSFER;