aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-attachment-bar.c2
-rw-r--r--composer/e-msg-composer.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8466e11499..34507eac3b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-17 Not Zed <NotZed@Ximian.com>
+
+ * e-msg-composer-attachment-bar.c (emcab_popup):
+
+ * e-msg-composer.c (drag_data_received):
+
2004-12-08 Hans Petter Jansson <hpj@novell.com>
* e-msg-composer-hdrs.h: Include <libebook/e-destination.h> from
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 5d3e32eae2..221deb9b37 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -517,7 +517,7 @@ emcab_popup(EMsgComposerAttachmentBar *bar, GdkEventButton *event, int id)
* This is the context menu on the composer attachment bar.
*/
emp = em_popup_new("org.gnome.evolution.mail.composer.attachmentbar.popup");
- e_popup_add_items((EPopup *)emp, menus, emcab_popups_free, bar);
+ e_popup_add_items((EPopup *)emp, menus, NULL,emcab_popups_free, bar);
t = em_popup_target_new_attachments(emp, attachments);
t->target.widget = (GtkWidget *)bar;
menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)t, 0);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6284280373..690193f4f8 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2931,7 +2931,7 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context,
for (i=0;i<sizeof(drop_popup_menu)/sizeof(drop_popup_menu[0]);i++)
menus = g_slist_append(menus, &drop_popup_menu[i]);
- e_popup_add_items((EPopup *)emp, menus, drop_popup_free, m);
+ e_popup_add_items((EPopup *)emp, menus, NULL, drop_popup_free, m);
menu = e_popup_create_menu_once((EPopup *)emp, NULL, 0);
gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 0, time);
} else {