widget: Directly access priv pointer in even controller API
authorTimm Bäder <mail@baedert.org>
Wed, 2 May 2018 17:57:36 +0000 (19:57 +0200)
committerTimm Bäder <mail@baedert.org>
Sat, 5 May 2018 05:25:10 +0000 (07:25 +0200)
Spares us a few lines.

gtk/gtkwidget.c

index 58a8379aacc08337388c49e6118eae4d7dc7ebfd..15c8384bbfc329975c8b9694f8f06a6977d4c78d 100644 (file)
@@ -12903,15 +12903,13 @@ void
 gtk_widget_add_controller (GtkWidget          *widget,
                            GtkEventController *controller)
 {
-  GtkWidgetPrivate *priv;
+  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
   EventControllerData *data;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
   g_return_if_fail (gtk_event_controller_get_widget (controller) == NULL);
 
-  priv = widget->priv;
-
   GTK_EVENT_CONTROLLER_GET_CLASS (controller)->set_widget (controller, widget);
 
   data = g_new0 (EventControllerData, 1);
@@ -12948,16 +12946,14 @@ void
 gtk_widget_remove_controller (GtkWidget          *widget,
                               GtkEventController *controller)
 {
+  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
   EventControllerData *data = NULL;
-  GtkWidgetPrivate *priv;
   GList *l;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
   g_return_if_fail (gtk_event_controller_get_widget (controller) == widget);
 
-  priv = widget->priv;
-
   for (l = priv->event_controllers; l; l = l->next)
     {
       data = l->data;