This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository apps/xfce4-terminal.
commit 1f9850fe8d3b0315dde4f017a1ae7d79b8b22425 Author: Egmont Koblinger <egm...@gmail.com> Date: Wed Jun 1 00:46:34 2016 +0200 Replace obsolete vte_terminal_match_check --- terminal/terminal-widget.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c index c98abc7..15651e7 100644 --- a/terminal/terminal-widget.c +++ b/terminal/terminal-widget.c @@ -274,8 +274,7 @@ static void terminal_widget_context_menu (TerminalWidget *widget, gint button, guint32 event_time, - gint x, - gint y) + GdkEvent *event) { VteTerminal *terminal = VTE_TERMINAL (widget); GMainLoop *loop; @@ -294,10 +293,7 @@ terminal_widget_context_menu (TerminalWidget *widget, return; /* check if we have a match */ - match = vte_terminal_match_check (terminal, - x / vte_terminal_get_char_width(terminal), - y / vte_terminal_get_char_height(terminal), - &tag); + match = vte_terminal_match_check_event (terminal, event, &tag); if (G_UNLIKELY (match != NULL)) { /* prepend a separator to the menu if it does not already contain one */ @@ -408,10 +404,7 @@ terminal_widget_button_press_event (GtkWidget *widget, if (event->button == 2 && event->type == GDK_BUTTON_PRESS) { /* middle-clicking on an URI fires the responsible application */ - match = vte_terminal_match_check (VTE_TERMINAL (widget), - event->x / vte_terminal_get_char_width(VTE_TERMINAL (widget)), - event->y / vte_terminal_get_char_height(VTE_TERMINAL (widget)), - &tag); + match = vte_terminal_match_check_event (VTE_TERMINAL (widget), event, &tag); if (G_UNLIKELY (match != NULL)) { terminal_widget_open_uri (TERMINAL_WIDGET (widget), match, tag); @@ -438,7 +431,7 @@ terminal_widget_button_press_event (GtkWidget *widget, { terminal_widget_context_menu (TERMINAL_WIDGET (widget), event->button, event->time, - event->x, event->y); + event); } } @@ -623,8 +616,6 @@ terminal_widget_key_press_event (GtkWidget *widget, gboolean scrolling_single_line; gboolean shortcuts_no_menukey; gdouble value; - gint x; - gint y; /* determine current settings */ g_object_get (G_OBJECT (TERMINAL_WIDGET (widget)->preferences), @@ -636,8 +627,7 @@ terminal_widget_key_press_event (GtkWidget *widget, if (event->keyval == GDK_KEY_Menu || (!shortcuts_no_menukey && (event->state & GDK_SHIFT_MASK) != 0 && event->keyval == GDK_KEY_F10)) { - gtk_widget_get_pointer (widget, &x, &y); - terminal_widget_context_menu (TERMINAL_WIDGET (widget), 0, event->time, x, y); + terminal_widget_context_menu (TERMINAL_WIDGET (widget), 0, event->time, event); return TRUE; } else if (G_LIKELY (scrolling_single_line)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits