put back in the attachment attaching code. Doesn't work for s/mime and

2004-09-28  Not Zed  <NotZed@Ximian.com>

        * em-composer-utils.c (forward_non_attached): put back in the
        attachment attaching code.  Doesn't work for s/mime and pgp, but
        why bother arguing about it.

2004-10-06  Not Zed  <NotZed@Ximian.com>

        * em-folder-tree.c (emft_get_folder_info__desc): fix busted cast.

        * *.c: e-popup api changes.

2004-10-06  Not Zed  <NotZed@Ximian.com>

        * em-folder-tree.c (emft_tree_button_press): remove some debug
        that made it in accidentally.

svn path=/trunk/; revision=27487

6 files changed, 35 insertions, 17 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 08eca7526f..5f449977ba 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,20 @@
+2004-09-28  Not Zed  <NotZed@Ximian.com>
+
+	* em-composer-utils.c (forward_non_attached): put back in the
+	attachment attaching code.  Doesn't work for s/mime and pgp, but
+	why bother arguing about it.
+
+2004-10-06  Not Zed  <NotZed@Ximian.com>
+
+	* em-folder-tree.c (emft_get_folder_info__desc): fix busted cast.
+
+	* *.c: e-popup api changes.
+
+2004-10-06  Not Zed  <NotZed@Ximian.com>
+
+	* em-folder-tree.c (emft_tree_button_press): remove some debug
+	that made it in accidentally.
+
 2004-10-05  Not Zed  <NotZed@Ximian.com>
 
 	* em-folder-tree.c (emft_popup_copy_folder_selected): remove old
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 20df960507..db5a280991 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -891,7 +891,10 @@ forward_non_attached (GPtrArray *messages, int style, const char *fromuri)
 		
 		if (text) {
 			composer = create_new_composer (subject, fromuri);
-			
+
+			if (CAMEL_IS_MULTIPART(camel_medium_get_content_object((CamelMedium *)message)))
+				e_msg_composer_add_message_attachments(composer, message, FALSE);
+
 			e_msg_composer_set_body_text (composer, text, len);
 						
 			e_msg_composer_unset_changed (composer);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index e8e4ce85d2..7cd4a2a07d 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1101,7 +1101,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y
 				menus = g_slist_append(menus, item);
 		}
 		e_popup_add_items((EPopup *)emp, menus, emft_drop_popup_free, m);
-		menu = e_popup_create_menu_once((EPopup *)emp, NULL, mask, mask);
+		menu = e_popup_create_menu_once((EPopup *)emp, NULL, mask);
 		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 	} else {
 		tree_drag_data_action(m);
@@ -1711,7 +1711,7 @@ struct _EMFolderTreeGetFolderInfo {
 static char *
 emft_get_folder_info__desc(struct _mail_msg *mm, int done)
 {
-	struct _EMFolderTreeGetFolderInfo *m = (struct _get_folderinfo_msg *)mm;
+	struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm;
 	char *ret, *name;
 
 	name = camel_service_get_name((CamelService *)m->store, TRUE);
@@ -2728,18 +2728,18 @@ static EPopupItem emft_popup_menu[] = {
 
 	{ E_POPUP_BAR, "10.emc" },
 #endif
-	{ E_POPUP_ITEM, "10.emc.00", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT },
-	{ E_POPUP_ITEM, "10.emc.01", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "10.emc.00", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT },
+	{ E_POPUP_ITEM, "10.emc.01", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
 	
 	{ E_POPUP_BAR, "20.emc" },
 	/* FIXME: need to disable for nochildren folders */
-	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_folder", EM_POPUP_FOLDER_INFERIORS },
+	{ E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_folder", 0, EM_POPUP_FOLDER_INFERIORS },
 	/* FIXME: need to disable for undeletable folders */
-	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
-	{ E_POPUP_ITEM, "20.emc.01", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
+	{ E_POPUP_ITEM, "20.emc.01", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE },
 	
 	{ E_POPUP_BAR, "80.emc" },
-	{ E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
+	{ E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
 };
 
 static void
@@ -2789,10 +2789,8 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr
 	gtk_tree_path_free (tree_path);
 	
 	/* FIXME: we really need the folderinfo to build a proper menu */
-	if (!emft_selection_get_selected (selection, &model, &iter)) {
-		printf("nothing selected!\n");
+	if (!emft_selection_get_selected (selection, &model, &iter))
 		return FALSE;
-	}
 	
 	gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
 			    COL_STRING_URI, &uri, COL_STRING_FULL_NAME, &full_name,
@@ -2833,7 +2831,7 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr
 	
 	e_popup_add_items ((EPopup *)emp, menus, emft_popup_free, emft);
 
-	menu = e_popup_create_menu_once ((EPopup *)emp, (EPopupTarget *)target, 0, target->target.mask);
+	menu = e_popup_create_menu_once ((EPopup *)emp, (EPopupTarget *)target, 0);
 	
 	if (event == NULL || event->type == GDK_KEY_PRESS) {
 		/* FIXME: menu pos function */
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index ef9007a683..b59fb0ff5c 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1048,7 +1048,7 @@ emfv_popup(EMFolderView *emfv, GdkEvent *event)
 
 	e_popup_add_items((EPopup *)emp, label_list, emfv_popup_labels_free, emfv);
 
-	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, target->target.mask, target->target.mask);
+	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, 0);
 
 	if (event == NULL || event->type == GDK_KEY_PRESS) {
 		/* FIXME: menu pos function */
@@ -2202,7 +2202,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const
 		e_popup_add_items((EPopup *)emp, menus, emfv_uri_popup_free, emfv);
 	}
 
-	menu = e_popup_create_menu_once((EPopup *)emp, target, target->mask, target->mask);
+	menu = e_popup_create_menu_once((EPopup *)emp, target, 0);
 	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
 
 	return TRUE;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 58037057a4..6b156daf1d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1106,7 +1106,7 @@ efhd_attachment_popup(GtkWidget *w, GdkEventButton *event, struct _attach_puri *
 
 	e_popup_add_items((EPopup *)emp, menus, efhd_menu_items_free, info);
 
-	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, target->target.mask, target->target.mask);
+	menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)target, 0);
 	if (event)
 		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
 	else
diff --git a/mail/message-list.c b/mail/message-list.c
index c34a4ccf1e..45860c536e 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1757,7 +1757,7 @@ ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col,
 			menus = g_slist_append(menus, &ml_drop_popup_menu[i]);
 
 		e_popup_add_items((EPopup *)emp, menus, ml_drop_popup_free, m);
-		menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0, 0);
+		menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0);
 		gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 	} else {
 		ml_drop_action(m);