summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2015-12-16 19:23:25 +0100
committerCarlos Garnacho <carlosg@gnome.org>2015-12-16 19:47:06 +0100
commit26f3d02f0354321a13b6608930116b1744f0c549 (patch)
treed46b038a3db4d9fa962aa0e6c64e13474fc7f2a5
parente2c8d3c6808c6cf7e4f625d5d5eb984f924152ee (diff)
downloadgtk+-26f3d02f0354321a13b6608930116b1744f0c549.tar.gz
GtkComboBox: Avoid GdkDeviceManager API
We used to pick a master pointer "at random", use the default seat pointer instead.
-rw-r--r--gtk/gtkcombobox.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a9dfba1ef5..d89e89cd05 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2310,17 +2310,11 @@ gtk_combo_box_real_popup (GtkComboBox *combo_box)
if (!device)
{
- GdkDeviceManager *device_manager;
GdkDisplay *display;
- GList *devices;
-
- display = gtk_widget_get_display (GTK_WIDGET (combo_box));
- device_manager = gdk_display_get_device_manager (display);
/* No device was set, pick the first master device */
- devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
- device = devices->data;
- g_list_free (devices);
+ display = gtk_widget_get_display (GTK_WIDGET (combo_box));
+ device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
}
gtk_combo_box_popup_for_device (combo_box, device);