X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=98d57c6682ef06b8fe1d0a46206f136559386087;hp=111fd032d9cbd18d267eeeb686193d714965eb9d;hb=de8ac9aa1f0d03dffda84e55ad31c094923ad70f;hpb=8a821d22130a023dbd639d6a9117245320cb3a2b

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 111fd03..98d57c6 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -122,8 +122,6 @@ static void     reply_forward_cb       (ModestMailOperation *mail_op,
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
 
-static gchar*   ask_for_folder_name    (GtkWindow *parent_window, const gchar *title);
-
 
 static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op, 
 						   ModestMailOperationState *state,
@@ -347,10 +345,11 @@ modest_ui_actions_on_delete (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 {
-	#ifdef MODEST_PLATFORM_MAEMO
+#ifdef MODEST_PLATFORM_MAEMO
 	modest_osso_save_state();
-	#endif /* MODEST_PLATFORM_MAEMO */
-	
+#endif /* MODEST_PLATFORM_MAEMO */
+
+	g_message ("quiting...");	
 	gtk_main_quit ();
 }
 
@@ -1474,6 +1473,7 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 	MsgData *data;
 	gchar *account_name, *from;
 	ModestAccountMgr *account_mgr;
+	gchar *info_text = NULL;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 	
@@ -1530,6 +1530,10 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
 
 	modest_msg_edit_window_free_msg_data (edit_window, data);
 
+	info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+	modest_platform_information_banner (NULL, NULL, info_text);
+	g_free (info_text);
+
 	/* Save settings and close the window */
 	gtk_widget_destroy (GTK_WIDGET (edit_window));
 }
@@ -1779,46 +1783,6 @@ modest_ui_actions_on_remove_attachments (GtkAction *action,
 	modest_msg_edit_window_remove_attachments (window, NULL);
 }
 
-/*
- * Shows a dialog with an entry that asks for some text. The returned
- * value must be freed by the caller. The dialog window title will be
- * set to @title.
- */
-static gchar *
-ask_for_folder_name (GtkWindow *parent_window,
-		     const gchar *title)
-{
-	GtkWidget *dialog, *entry;
-	gchar *folder_name = NULL;
-
-	/* Ask for folder name */
-	dialog = gtk_dialog_new_with_buttons (_("New Folder Name"),
-					      parent_window,
-					      GTK_DIALOG_MODAL,
-					      GTK_STOCK_CANCEL,
-					      GTK_RESPONSE_REJECT,
-					      GTK_STOCK_OK,
-					      GTK_RESPONSE_ACCEPT,
-					      NULL);
-	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-			    gtk_label_new(title),
-			    FALSE, FALSE, 0);
-		
-	entry = gtk_entry_new_with_max_length (40);
-	gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), 
-			    entry,
-			    TRUE, FALSE, 0);	
-	
-	gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
-	
-	if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)		
-		folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
-
-	gtk_widget_destroy (dialog);
-
-	return folder_name;
-}
-
 void 
 modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
 {
@@ -1898,10 +1862,14 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
 	
 	if (folder && TNY_IS_FOLDER (folder)) {
 		gchar *folder_name;
-		folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-						   _("Please enter a new name for the folder"));
+		gint response;
+		const gchar *current_name;
+
+		current_name = tny_folder_get_name (TNY_FOLDER (folder));
+		response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (main_window), NULL,
+								     current_name, &folder_name);
 
-		if (folder_name != NULL && strlen (folder_name) > 0) {
+		if (response == GTK_RESPONSE_OK && strlen (folder_name) > 0) {
 			ModestMailOperation *mail_op;
 
 			mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT(main_window));
@@ -2132,12 +2100,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 			const gboolean username_was_changed = 
 				(strcmp (*username, initial_username) != 0);
 			if (username_was_changed) {
-				/* To actually use a changed username, 
-				 * we must reset the connection, according to pvanhoof.
-				 * This _might_ be a sensible way to do that: */
-				 TnyDevice *device = modest_runtime_get_device();
-				 tny_device_force_offline (device);
-				 tny_device_force_online (device);
+				g_warning ("%s: tinymail does not yet support changing the "
+					"username in the get_password() callback.\n", __FUNCTION__);
 			}
 		}
 			
@@ -3083,7 +3047,7 @@ modest_ui_actions_remove_attachments (GtkAction *action,
 				      ModestWindow *window)
 {
 	if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
-		modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window), NULL);
+		modest_msg_view_window_remove_attachments (MODEST_MSG_VIEW_WINDOW (window));
 	} else {
 		/* not supported window for this action */
 		g_return_if_reached ();