aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer-attachment-bar.c2
-rw-r--r--composer/e-msg-composer.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8eabcbdc64..6b5f92db60 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06 Not Zed <NotZed@Ximian.com>
+
+ * e-msg-composer.c (drag_data_received):
+ * e-msg-composer-attachment-bar.c (emcab_popup): e-popup api changes.
+
2004-10-01 JP Rosevear <jpr@novell.com>
* e-msg-composer.c: uses GTKHTML_API_VERSION for the bonobo server
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 5bc912baed..3c96f4ab79 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -513,7 +513,7 @@ emcab_popup(EMsgComposerAttachmentBar *bar, GdkEventButton *event, int id)
e_popup_add_items((EPopup *)emp, menus, 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, t->target.mask, t->target.mask);
+ menu = e_popup_create_menu_once((EPopup *)emp, (EPopupTarget *)t, 0);
if (event == NULL)
gtk_menu_popup(menu, NULL, NULL, emcab_popup_position, bar, 0, gtk_get_current_event_time());
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index e02f333a5b..a282a568f2 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2929,7 +2929,7 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context,
menus = g_slist_append(menus, &drop_popup_menu[i]);
e_popup_add_items((EPopup *)emp, menus, 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, time);
} else {
drop_action(composer, context, context->action, selection, info, time);