[shotwell] Remove deprecated gtk_menu_popup call
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Remove deprecated gtk_menu_popup call
- Date: Sat, 31 Mar 2018 20:03:16 +0000 (UTC)
commit d821d0f7f2e21866c109b2f6d4974a06fe30bf2c
Author: Jens Georg <mail jensge org>
Date: Fri Mar 30 09:03:02 2018 +0200
Remove deprecated gtk_menu_popup call
src/Page.vala | 5 +----
src/SearchFilter.vala | 2 +-
src/sidebar/Tree.vala | 9 +++------
3 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/src/Page.vala b/src/Page.vala
index ea8606e..05ad483 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -1083,10 +1083,7 @@ public abstract class Page : Gtk.ScrolledWindow {
if (context_menu == null || !on_context_invoked())
return false;
- if (event == null)
- context_menu.popup(null, null, null, 0, Gtk.get_current_event_time());
- else
- context_menu.popup(null, null, null, event.button, event.time);
+ context_menu.popup_at_pointer(event);
return true;
}
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index fba5488..806ca74 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -1191,7 +1191,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
// Ticket #3260 part IV - display the context menu on secondary click
private bool on_context_menu_requested(int x, int y, int button) {
- close_menu.popup(null, null, null, button, Gtk.get_current_event_time());
+ close_menu.popup_at_pointer(null);
return false;
}
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index c707c63..f63c916 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -863,16 +863,13 @@ public class Sidebar.Tree : Gtk.TreeView {
context_menu.attach_to_widget (this, null);
}
- if (event != null)
- context_menu.popup(null, null, null, event.button, event.time);
- else
- context_menu.popup(null, null, null, 0, Gtk.get_current_event_time());
-
+ context_menu.popup_at_pointer(event);
+
return true;
}
private bool popup_default_context_menu(Gdk.EventButton event) {
- default_context_menu.popup(null, null, null, event.button, event.time);
+ default_context_menu.popup_at_pointer(event);
return true;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]