[gnome-builder] gb-terminal: remove deprecated gtk_menu_popup
- From: Sébastien Lafargue <slafargue src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] gb-terminal: remove deprecated gtk_menu_popup
- Date: Fri, 28 Oct 2016 13:02:01 +0000 (UTC)
commit 1d8fab4de8f9cb4be9384f4b89934fda311b9112
Author: Sebastien Lafargue <slafargue gnome org>
Date: Fri Oct 28 14:53:38 2016 +0200
gb-terminal: remove deprecated gtk_menu_popup
plugins/terminal/gb-terminal.c | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal.c b/plugins/terminal/gb-terminal.c
index 73c8237..53dd79d 100644
--- a/plugins/terminal/gb-terminal.c
+++ b/plugins/terminal/gb-terminal.c
@@ -26,9 +26,7 @@
typedef struct
{
GbTerminal *terminal;
- guint button;
- guint time;
- GdkDevice *device;
+ GdkEvent *event;
} PopupInfo;
struct _GbTerminal
@@ -102,18 +100,8 @@ popup_targets_received (GtkClipboard *clipboard,
g_signal_emit (terminal, signals[POPULATE_POPUP], 0, terminal->popup_menu);
- if (popup_info->device)
- gtk_menu_popup_for_device (GTK_MENU (terminal->popup_menu),
- popup_info->device, NULL, NULL, NULL, NULL, NULL,
- popup_info->button, popup_info->time);
- else
- {
- gtk_menu_popup (GTK_MENU (terminal->popup_menu), NULL, NULL,
- NULL, terminal,
- 0, gtk_get_current_event_time ());
-
- gtk_menu_shell_select_first (GTK_MENU_SHELL (terminal->popup_menu), FALSE);
- }
+ gtk_menu_popup_at_pointer (GTK_MENU (terminal->popup_menu), popup_info->event);
+ gdk_event_free (popup_info->event);
}
g_object_unref (terminal);
@@ -126,20 +114,10 @@ gb_terminal_do_popup (GbTerminal *terminal,
{
PopupInfo *popup_info = g_slice_new (PopupInfo);
- popup_info->terminal = g_object_ref (terminal);
+ popup_info->event = (event != NULL) ? gdk_event_copy (event)
+ : gtk_get_current_event ();
- if (event != NULL)
- {
- gdk_event_get_button (event, &popup_info->button);
- popup_info->time = gdk_event_get_time (event);
- popup_info->device = gdk_event_get_device (event);
- }
- else
- {
- popup_info->button = 0;
- popup_info->time = gtk_get_current_event_time ();
- popup_info->device = NULL;
- }
+ popup_info->terminal = g_object_ref (terminal);
gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (terminal), GDK_SELECTION_CLIPBOARD),
gdk_atom_intern_static_string ("TARGETS"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]