Move all GdkDevice members to private and add one missing accessor

13 files changed, 14 insertions, 14 deletions

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 8fd97ad2e5..71fb865f43 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1827,10 +1827,10 @@ gtk_real_button_activate (GtkButton *button)
 
   device = gtk_get_current_event_device ();
 
-  if (device && device->source != GDK_SOURCE_KEYBOARD)
+  if (device && gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD)
     device = gdk_device_get_associated_device (device);
 
-  g_return_if_fail (device && device->source == GDK_SOURCE_KEYBOARD);
+  g_return_if_fail (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD);
 
   if (gtk_widget_get_realized (widget) && !priv->activate_timeout)
     {
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index f18ce56d51..b0a42dbc36 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -616,7 +616,7 @@ gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
   if (!device)
     return NULL;
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyb = device;
       pointer = gdk_device_get_associated_device (device);
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index c294266d32..2ed64827af 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1912,7 +1912,7 @@ get_screen_color (GtkWidget *button)
 
   device = gtk_get_current_event_device ();
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyb_device = device;
       pointer_device = gdk_device_get_associated_device (device);
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 9df273d81c..0a922fa023 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2199,7 +2199,7 @@ gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
 
   time = gtk_get_current_event_time ();
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyboard = device;
       pointer = gdk_device_get_associated_device (device);
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index d951181632..08496d5761 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2329,7 +2329,7 @@ gtk_drag_begin_internal (GtkWidget         *widget,
 
       pointer = gdk_event_get_device (event);
 
-      if (pointer->source == GDK_SOURCE_KEYBOARD)
+      if (gdk_device_get_source (pointer) == GDK_SOURCE_KEYBOARD)
         {
           keyboard = pointer;
           pointer = gdk_device_get_associated_device (keyboard);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3c0d4b4ff1..cd70918e1e 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9710,7 +9710,7 @@ gtk_entry_completion_changed (GtkWidget *widget,
 
   device = gtk_get_current_event_device ();
 
-  if (device && device->source == GDK_SOURCE_KEYBOARD)
+  if (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     device = gdk_device_get_associated_device (device);
 
   if (device)
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 743ad5a63d..3032f3b95e 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1469,7 +1469,7 @@ gtk_menu_popup_for_device (GtkMenu             *menu,
   menu_shell = GTK_MENU_SHELL (menu);
   priv = gtk_menu_get_private (menu);
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyboard = device;
       pointer = gdk_device_get_associated_device (device);
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index e531de1c13..d630cdd253 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1807,7 +1807,7 @@ _gtk_menu_shell_set_grab_device (GtkMenuShell *menu_shell,
 
   if (!device)
     priv->grab_pointer = NULL;
-  else if (device->source == GDK_SOURCE_KEYBOARD)
+  else if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     priv->grab_pointer = gdk_device_get_associated_device (device);
   else
     priv->grab_pointer = device;
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index ca7e3e0857..ca3af73c27 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -378,7 +378,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
           {
             GdkDevice *device = d->data;
 
-            if (device->source == GDK_SOURCE_KEYBOARD)
+            if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
               keyboard = device;
           }
 
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index fb2624e53e..f3894ff84b 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -1027,7 +1027,7 @@ gtk_scale_popup (GtkWidget *widget,
 
   device = gdk_event_get_device (event);
 
-  if (device->source == GDK_SOURCE_KEYBOARD)
+  if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
       keyboard = device;
       pointer = gdk_device_get_associated_device (device);
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 309013f847..16018b609d 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1350,7 +1350,7 @@ _gtk_tooltip_focus_in (GtkWidget *widget)
 
   device = gtk_get_current_event_device ();
 
-  if (device && device->source == GDK_SOURCE_KEYBOARD)
+  if (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     device = gdk_device_get_associated_device (device);
 
   /* This function should be called by either a focus in event,
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 66e8a5f5d2..85280038a8 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10407,7 +10407,7 @@ send_focus_change (GtkWidget *widget,
       GdkEvent *fevent;
       GdkWindow *window;
 
-      if (dev->source != GDK_SOURCE_KEYBOARD)
+      if (gdk_device_get_source (dev) != GDK_SOURCE_KEYBOARD)
         continue;
 
       window = gtk_widget_get_window (widget);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0621701be9..1f7134e646 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5923,7 +5923,7 @@ do_focus_change (GtkWidget *widget,
       GdkDevice *dev = d->data;
       GdkEvent *fevent;
 
-      if (dev->source != GDK_SOURCE_KEYBOARD)
+      if (gdk_device_get_source (dev) != GDK_SOURCE_KEYBOARD)
         continue;
 
       /* Skip non-master keyboards that haven't