aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2011-11-22 02:31:51 +0800
committerClaudio Saavedra <csaavedra@igalia.com>2011-11-22 02:43:38 +0800
commit1ea903e6e4f0079501486409b16887edfc8fd0b0 (patch)
tree917b433318b749237786aa2aafb2820ef5afc0a7 /src
parent1e8f2bd6fdf325a412343b475d89d7afc0ba394b (diff)
downloadgsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar.gz
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar.bz2
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar.lz
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar.xz
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.tar.zst
gsoc2013-epiphany-1ea903e6e4f0079501486409b16887edfc8fd0b0.zip
Remove some deprecated GTK+ calls
https://bugzilla.gnome.org/show_bug.cgi?id=664120
Diffstat (limited to 'src')
-rw-r--r--src/ephy-notebook.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index d5cc41372..756a29ddc 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -189,14 +189,16 @@ ephy_notebook_class_init (EphyNotebookClass *klass)
/* FIXME remove when gtknotebook's func for this becomes public, bug #.... */
static EphyNotebook *
-find_notebook_at_pointer (gint abs_x, gint abs_y)
+find_notebook_at_pointer (GdkDisplay *display, gint abs_x, gint abs_y)
{
GdkWindow *win_at_pointer, *toplevel_win;
gpointer toplevel = NULL;
gint x, y;
- /* FIXME multi-head */
- win_at_pointer = gdk_window_at_pointer (&x, &y);
+ win_at_pointer = gdk_device_get_window_at_position (
+ gdk_device_manager_get_client_pointer (
+ gdk_display_get_device_manager (display)),
+ &x, &y);
if (win_at_pointer == NULL)
{
/* We are outside all windows containing a notebook */
@@ -224,7 +226,8 @@ is_in_notebook_window (EphyNotebook *notebook,
{
EphyNotebook *nb_at_pointer;
- nb_at_pointer = find_notebook_at_pointer (abs_x, abs_y);
+ nb_at_pointer = find_notebook_at_pointer (gtk_widget_get_display (GTK_WIDGET (notebook)),
+ abs_x, abs_y);
return nb_at_pointer == notebook;
}