commit 4bf97071ddbc02f75233727ea3142e8292046279
parent 050e170bbb4be3b5e2d783ac8a93e22c03163dfd
Author: paul <paul@claws-mail.org>
Date: Thu, 21 Nov 2019 12:02:16 +0000
replace deprecated gtk_menu_popup()
Diffstat:
18 files changed, 28 insertions(+), 74 deletions(-)
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
@@ -242,9 +242,7 @@ static gint custom_attr_list_btn_pressed(GtkWidget *widget, GdkEventButton *even
cm_menu_set_sensitive("CustomAttrPopup/Delete", non_empty);
cm_menu_set_sensitive("CustomAttrPopup/DeleteAll", non_empty);
- gtk_menu_popup(GTK_MENU(custom_attr_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_widget(GTK_MENU(custom_attr_popup_menu), widget, 3, 3, NULL);
return FALSE;
}
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -2491,8 +2491,7 @@ static gboolean addressbook_list_button_pressed(GtkWidget *widget,
addressbook_list_menu_setup();
if( event->button == 3 ) {
- gtk_menu_popup( GTK_MENU(addrbook.list_popup), NULL, NULL, NULL, NULL,
- event->button, event->time );
+ gtk_menu_popup_at_pointer(GTK_MENU(addrbook.list_popup), NULL);
} else if (event->button == 1) {
if (event->type == GDK_2BUTTON_PRESS) {
if (prefs_common.add_address_by_click &&
@@ -2686,8 +2685,7 @@ just_set_sens:
addrbook.target_compose != NULL);
if( event->button == 3 )
- gtk_menu_popup(GTK_MENU(addrbook.tree_popup), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(addrbook.tree_popup), NULL);
return FALSE;
}
diff --git a/src/compose.c b/src/compose.c
@@ -10208,8 +10208,8 @@ static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
* selected, the properties dialog can only edit one attachment. */
cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", (attach_nr_selected == 1));
- gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
- NULL, NULL, event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(compose->popupmenu), NULL);
+
return TRUE;
}
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -998,9 +998,7 @@ static void addressbook_edit_person_set_picture_cb(GtkWidget *widget,
if (event->button == 1) {
addressbook_edit_person_set_picture();
} else {
- gtk_menu_popup(GTK_MENU(editaddr_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(editaddr_popup_menu), NULL);
}
}
diff --git a/src/edittags.c b/src/edittags.c
@@ -318,9 +318,7 @@ static gint apply_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
cm_menu_set_sensitive("EditTags/Delete", non_empty);
cm_menu_set_sensitive("EditTags/DeleteAll", non_empty);
- gtk_menu_popup(GTK_MENU(apply_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(apply_popup_menu), NULL);
return FALSE;
}
diff --git a/src/folderview.c b/src/folderview.c
@@ -2007,8 +2007,7 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
g_signal_connect(G_OBJECT(popup), "selection_done",
G_CALLBACK(folderview_popup_close),
folderview);
- gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(popup), NULL);
}
static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -3335,8 +3334,7 @@ static gboolean folderview_header_button_pressed(GtkWidget *widget,
/* Handle right-click for context menu */
if (event->button == 3) {
- gtk_menu_popup(GTK_MENU(folderview->headerpopupmenu),
- NULL, NULL, NULL, NULL, 3, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(folderview->headerpopupmenu), NULL);
return TRUE;
}
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -990,9 +990,7 @@ static gboolean about_textview_uri_clicked(GtkTextTag *tag, GObject *obj,
g_object_set_data(
G_OBJECT(link_popupmenu),
"raw_url", link);
- gtk_menu_popup(GTK_MENU(link_popupmenu),
- NULL, NULL, NULL, NULL,
- bevent->button, bevent->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(link_popupmenu), NULL);
return TRUE;
}
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -1051,10 +1051,7 @@ gboolean gtkaspell_check_next_prev(GtkAspell *gtkaspell, gboolean forward)
for (cur = list; cur; cur = cur->next)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- gtkaspell->ctx.set_menu_pos,
- gtkaspell->ctx.data,
- 0, GDK_CURRENT_TIME);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
g_signal_connect(G_OBJECT(menu), "deactivate",
G_CALLBACK(destroy_menu),
gtkaspell);
@@ -1384,10 +1381,7 @@ static void check_with_alternate_cb(GtkWidget *w, gpointer data)
for (cur = list; cur; cur = cur->next)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(cur->data));
g_slist_free(list);
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- gtkaspell->ctx.set_menu_pos,
- gtkaspell->ctx.data, 0,
- GDK_CURRENT_TIME);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
g_signal_connect(G_OBJECT(menu), "deactivate",
G_CALLBACK(destroy_menu),
gtkaspell);
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3892,9 +3892,7 @@ static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event
menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(mainwin->ac_menu));
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
- menu_button_position, widget,
- event->button, event->time);
+ gtk_menu_popup_at_widget(GTK_MENU(menu), widget, 3, 3, NULL);
return TRUE;
}
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
@@ -477,8 +477,7 @@ static void notification_banner_show_popup(GtkWidget *widget,
event_time = gtk_get_current_event_time();
}
- gtk_menu_popup(GTK_MENU(banner_popup), NULL, NULL, NULL, NULL,
- button, event_time);
+ gtk_menu_popup_at_pointer(GTK_MENU(banner_popup), NULL);
}
static void notification_banner_popup_done(GtkMenuShell *menushell,
diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c
@@ -474,8 +474,7 @@ static void notification_trayicon_on_popup_menu(GtkStatusIcon *status_icon,
updating_menu = FALSE;
- gtk_menu_popup(GTK_MENU(traymenu_popup), NULL, NULL, NULL, NULL,
- button, activate_time);
+ gtk_menu_popup_at_pointer(GTK_MENU(traymenu_popup), NULL);
}
static gboolean notification_trayicon_on_size_changed(GtkStatusIcon *icon,
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
@@ -342,13 +342,9 @@ static void on_button_press_event_cb(GtkWidget *widget
g_object_set_data(G_OBJECT(dw->Vbox), "go_today_cb",
day_view_today_cb);
if (uid)
- gtk_menu_popup(GTK_MENU(dw->event_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(dw->event_menu), NULL);
else
- gtk_menu_popup(GTK_MENU(dw->view_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(dw->view_menu), NULL);
}
}
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
@@ -296,9 +296,7 @@ static void header_button_clicked_cb(GtkWidget *button
month_view_new_meeting_cb);
g_object_set_data(G_OBJECT(mw->Vbox), "go_today_cb",
month_view_today_cb);
- gtk_menu_popup(GTK_MENU(mw->view_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(mw->view_menu), NULL);
}
}
@@ -332,9 +330,7 @@ static void on_button_press_event_cb(GtkWidget *widget
month_view_cancel_meeting_cb);
g_object_set_data(G_OBJECT(mw->Vbox), "go_today_cb",
month_view_today_cb);
- gtk_menu_popup(GTK_MENU(mw->event_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(mw->event_menu), NULL);
}
}
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -1143,9 +1143,7 @@ static gint prefs_actions_list_btn_pressed(GtkWidget *widget, GdkEventButton *ev
non_empty = gtk_tree_model_iter_next(model, &iter);
cm_menu_set_sensitive("PrefsActionsPopup/DeleteAll", non_empty);
- gtk_menu_popup(GTK_MENU(prefs_actions_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(prefs_actions_popup_menu), NULL);
}
}
return FALSE;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -1768,9 +1768,7 @@ static gint prefs_filtering_list_btn_pressed(GtkWidget *widget, GdkEventButton *
non_empty = gtk_tree_model_iter_next(model, &iter);
cm_menu_set_sensitive("PrefsFilteringPopup/DeleteAll", non_empty);
- gtk_menu_popup(GTK_MENU(prefs_filtering_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(prefs_filtering_popup_menu), NULL);
}
}
return FALSE;
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -1168,9 +1168,7 @@ static gint prefs_template_list_btn_pressed(GtkWidget *widget, GdkEventButton *e
non_empty = gtk_tree_model_iter_next(model, &iter);
cm_menu_set_sensitive("PrefsTemplatePopup/DeleteAll", non_empty);
- gtk_menu_popup(GTK_MENU(prefs_template_popup_menu),
- NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(prefs_template_popup_menu), NULL);
}
}
return FALSE;
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -6478,9 +6478,7 @@ static gboolean summary_popup_menu(GtkWidget *widget, gpointer data)
SummaryView *summaryview = (SummaryView *)data;
summaryview->display_msg = messageview_is_visible(summaryview->messageview);
- gtk_menu_popup(GTK_MENU(summaryview->popupmenu),
- NULL, NULL, NULL, NULL,
- 3, gtk_get_current_event_time());
+ gtk_menu_popup_at_pointer(GTK_MENU(summaryview->popupmenu), NULL);
return TRUE;
}
@@ -6645,8 +6643,7 @@ static gboolean summary_header_button_pressed(GtkWidget *widget,
prefs_common_get_prefs()->summary_col_lock);
summaryview->header_menu_lock = FALSE;
- gtk_menu_popup(GTK_MENU(summaryview->headerpopupmenu),
- NULL, NULL, NULL, NULL, 3, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(summaryview->headerpopupmenu), NULL);
return TRUE;
}
@@ -6910,8 +6907,7 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
if (event->button == 3) {
/* right clicked */
summary_set_menu_sensitive(summaryview);
- gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
- NULL, NULL, event->button, event->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(summaryview->popupmenu), NULL);
} else if (event->button == 2) {
summaryview->display_msg = messageview_is_visible(summaryview->messageview);
} else if (event->button == 1) {
diff --git a/src/textview.c b/src/textview.c
@@ -2768,9 +2768,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
g_object_set_data(
G_OBJECT(textview->mail_popup_menu),
"menu_button", uri);
- gtk_menu_popup(GTK_MENU(textview->mail_popup_menu),
- NULL, NULL, NULL, NULL,
- bevent->button, bevent->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(textview->mail_popup_menu), NULL);
} else {
PrefsAccount *account = NULL;
FolderItem *folder_item = NULL;
@@ -2800,9 +2798,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
g_object_set_data(
G_OBJECT(textview->link_popup_menu),
"menu_button", uri);
- gtk_menu_popup(GTK_MENU(textview->link_popup_menu),
- NULL, NULL, NULL, NULL,
- bevent->button, bevent->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(textview->link_popup_menu), NULL);
}
return TRUE;
} else {
@@ -2810,9 +2806,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
g_object_set_data(
G_OBJECT(textview->file_popup_menu),
"menu_button", uri);
- gtk_menu_popup(GTK_MENU(textview->file_popup_menu),
- NULL, NULL, NULL, NULL,
- bevent->button, bevent->time);
+ gtk_menu_popup_at_pointer(GTK_MENU(textview->file_popup_menu), NULL);
return TRUE;
}
}
