X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=2cd56e6aeccf66157eb7fcef1a275affbe6b4423;hb=51cc36c187e300ea0db5e3cff2bdeb687f8c2d28;hp=b9487e5cda6b5c03d59f9eae29f6f13cf7638b2c;hpb=41bbafe351ec044e9e8f7abedf0747751e464b9d;p=modest

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index b9487e5..2cd56e6 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1478,36 +1478,41 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
 	ModestMsgEditWindowPrivate *priv;
 	GtkWidget *dialog = NULL;
 	gint response = 0;
-	gchar *uri = NULL, *filename = NULL;
+	GSList *uris;
+	GSList *uri_node;
 	
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 	
 	dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN);
+	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 	switch (response) {
 	case GTK_RESPONSE_OK:
-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
-		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+		uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
 		break;
 	default:
 		break;
 	}
 	gtk_widget_destroy (dialog);
 
-	if (uri) {
-
+	for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+		const gchar *uri;
 		GnomeVFSHandle *handle = NULL;
 		GnomeVFSResult result;
 
+		uri = (const gchar *) uri_node->data;
 		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
 		if (result == GNOME_VFS_OK) {
 			TnyMimePart *mime_part;
 			TnyStream *stream;
 			const gchar *mime_type = NULL;
 			gchar *basename;
+			gchar *filename;
 			gchar *content_id;
 			GnomeVFSFileInfo info;
+
+			filename = g_filename_from_uri (uri, NULL, NULL);
 			
 			if (gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE) == GNOME_VFS_OK)
 				mime_type = gnome_vfs_file_info_get_mime_type (&info);
@@ -1532,9 +1537,12 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
 			gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
 			gtk_widget_show_all (priv->attachments_caption);
 			gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+			g_free (filename);
+
 		} 
-		g_free (filename);
 	}
+	g_slist_foreach (uris, (GFunc) g_free, NULL);
+	g_slist_free (uris);
 }
 
 void
@@ -1791,7 +1799,7 @@ modest_msg_edit_window_zoom_plus (ModestWindow *window)
 	group = gtk_radio_action_get_group (zoom_radio_action);
 
 	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-		hildon_banner_show_information (NULL, NULL, _("mcen_ib_max_zoom_level"));
+		hildon_banner_show_information (NULL, NULL, _("ckct_ib_max_zoom_level_reached"));
 		return FALSE;
 	}
 
@@ -1823,7 +1831,7 @@ modest_msg_edit_window_zoom_minus (ModestWindow *window)
 				gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
 				return TRUE;
 			} else
-				hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level"));
+				hildon_banner_show_information (NULL, NULL, _("ckct_ib_min_zoom_level_reached"));
 			break;
 		}
 	}