aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-10 17:23:08 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-11 16:29:44 +0800
commit8f95b35828bbf37beda060ed25957599e4f50c5f (patch)
tree3f7bf7ea6f6b5f55b4552a467e833126eb27111f /libempathy-gtk
parent19fe264f32b68246b21b0db8eb2694a159b833f2 (diff)
downloadgsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar.gz
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar.bz2
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar.lz
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar.xz
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.tar.zst
gsoc2013-empathy-8f95b35828bbf37beda060ed25957599e4f50c5f.zip
stop using gtk_widget_get_pointer()
It has been deprecated. I asked on #gtk+ and that seems to be the right way to do this. See http://git.gnome.org/browse/gtk+/commit/?id=2783158f8d9ca69e5a8fc4a903bfbcc3871a1b02 All these APIs are available since GTK+ 3.0 so we're good. https://bugzilla.gnome.org/show_bug.cgi?id=662903
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat-text-view.c4
-rw-r--r--libempathy-gtk/empathy-chat.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index f52ad28d5..c251f1f42 100644
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -286,7 +286,9 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
table = gtk_text_buffer_get_tag_table (priv->buffer);
tag = gtk_text_tag_table_lookup (table, EMPATHY_CHAT_TEXT_VIEW_TAG_LINK);
- gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+ gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (view)),
+ gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (view)))), &x, &y, NULL);
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
GTK_TEXT_WINDOW_WIDGET,
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 09146d896..307ecf3e1 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -2331,7 +2331,10 @@ chat_input_populate_popup_cb (GtkTextView *view,
switch (priv->most_recent_event_type) {
case GDK_BUTTON_PRESS:
/* get the location from the pointer */
- gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+ gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (view)),
+ gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (
+ gtk_widget_get_display (GTK_WIDGET (view)))), &x, &y, NULL);
+
gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
GTK_TEXT_WINDOW_WIDGET,
x, y,