[gimp/gtk3-port: 44/227] app: use GdkDeviceManager to list devices
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 44/227] app: use GdkDeviceManager to list devices
- Date: Mon, 10 Feb 2014 21:56:44 +0000 (UTC)
commit d82dea82f4301af6916410bfc3441a8e1f83a0f3
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 19 13:55:42 2010 +0200
app: use GdkDeviceManager to list devices
app/widgets/gimptoolbox.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index 9c533a6..eae8ad6 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -193,11 +193,13 @@ gimp_toolbox_init (GimpToolbox *toolbox)
static void
gimp_toolbox_constructed (GObject *object)
{
- GimpToolbox *toolbox = GIMP_TOOLBOX (object);
- GimpGuiConfig *config;
- GtkWidget *main_vbox;
- GdkDisplay *display;
- GList *list;
+ GimpToolbox *toolbox = GIMP_TOOLBOX (object);
+ GimpGuiConfig *config;
+ GtkWidget *main_vbox;
+ GdkDisplay *display;
+ GdkDeviceManager *manager;
+ GList *devices;
+ GList *list;
g_assert (GIMP_IS_CONTEXT (toolbox->p->context));
@@ -277,10 +279,16 @@ gimp_toolbox_constructed (GObject *object)
* manually that all devices have a cursor, before establishing the check.
*/
display = gtk_widget_get_display (GTK_WIDGET (toolbox));
- for (list = gdk_display_list_devices (display); list; list = list->next)
+ manager = gdk_display_get_device_manager (display);
+
+ devices = gdk_device_manager_list_devices (manager, GDK_DEVICE_TYPE_MASTER);
+
+ for (list = devices; list; list = g_list_next (list))
if (! ((GdkDevice *) (list->data))->has_cursor)
break;
+ g_list_free (devices);
+
if (! list) /* all devices have cursor */
{
gtk_widget_add_events (GTK_WIDGET (toolbox), GDK_POINTER_MOTION_MASK);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]