aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/folder-browser.c6
-rw-r--r--mail/mail-display.c2
3 files changed, 13 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index bb1a8623dc..c1f80534a3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2001-01-19 Dan Winship <danw@ximian.com>
+ * mail-display.c (pixmap_press): Update for e_popup_menu_run
+ change.
+
+ * folder-browser.c (etable_key): On GDK_Menu (the menu key on
+ 105-key keyboards), pop up the right-click menu.
+ (on_right_click): update for e_popup_menu_run change.
+
* subscribe-dialog.c (recursive_add_folder): New function to add a
folder and any parents of it that don't yet exist. Fixes bugzilla
#1028.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 7b1168c7e0..0feb8a24dc 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -770,7 +770,7 @@ display_menu:
g_free(mailing_list_name);
}
- e_popup_menu_run (menu, (GdkEventButton *)event, enable_mask, 0, fb);
+ e_popup_menu_run (menu, event, enable_mask, 0, fb);
g_free(filter_menu[last_item].name);
@@ -841,6 +841,10 @@ etable_key (ETable *table, int row, int col, GdkEvent *ev, FolderBrowser *fb)
0, CAMEL_MESSAGE_SEEN);
return TRUE;
+ case GDK_Menu:
+ on_right_click (table, row, col, ev, fb);
+ return TRUE;
+
default:
return FALSE;
}
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 745ec5615e..c585ec0eac 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -372,7 +372,7 @@ pixmap_press (GtkWidget *ebox, GdkEventButton *event, EScrollFrame *user_data)
mask |= 2;
}
- e_popup_menu_run (menu, event, mask, 0, ebox);
+ e_popup_menu_run (menu, (GdkEvent *)event, mask, 0, ebox);
g_free (menu[1].name);
g_free (menu[2].name);
return TRUE;