GNOME.org
 

[gtk/wip/otte/builder: 3/10] builder: Remove user_data argument from gtk_builder_connect_signals()

commit 27d05102ab6182220da454b2597d975cf42ba077
Author: Benjamin Otte <otte redhat com>
Date:   Thu Nov 21 19:36:06 2019 +0100

    builder: Remove user_data argument from gtk_builder_connect_signals()
    
    This is pretty unused and gets in the way of the next steps.
    
    A potential side effect is that for templates the widget was passed as
    the user data argument. If that turns out to be important, we have to
    special case that situation.

 demos/gtk-demo/builder.c              |  2 +-
 demos/gtk-demo/cursors.c              |  2 +-
 demos/gtk-demo/filtermodel.c          |  2 +-
 demos/gtk-demo/fishbowl.c             |  2 +-
 demos/gtk-demo/font_features.c        |  2 +-
 demos/gtk-demo/fontrendering.c        |  2 +-
 demos/gtk-demo/iconscroll.c           |  2 +-
 demos/gtk-demo/modelbutton.c          |  2 +-
 demos/gtk-demo/revealer.c             |  2 +-
 demos/gtk-demo/scale.c                |  2 +-
 demos/gtk-demo/shortcuts.c            |  2 +-
 demos/gtk-demo/spinbutton.c           |  2 +-
 demos/gtk-demo/stack.c                |  2 +-
 demos/widget-factory/widget-factory.c |  2 +-
 gtk/gtkbuilder.c                      |  6 ++----
 gtk/gtkbuilder.h                      |  3 +--
 gtk/gtkwidget.c                       |  2 +-
 tests/teststackedheaders.c            |  2 +-
 tests/visuals/visuals.c               |  2 +-
 testsuite/gtk/builder.c               | 10 +++++-----
 20 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index cf293c53cd..9a982b3dd9 100644
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -59,7 +59,7 @@ do_builder (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/builder/demo.ui");
 
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c
index 275dab06d1..e150d14b22 100644
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -24,7 +24,7 @@ do_cursors (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/filtermodel.c b/demos/gtk-demo/filtermodel.c
index a7f3f55c0a..a0e6660684 100644
--- a/demos/gtk-demo/filtermodel.c
+++ b/demos/gtk-demo/filtermodel.c
@@ -122,7 +122,7 @@ do_filtermodel (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 45f63710b0..1c1a8691fe 100644
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -293,7 +293,7 @@ do_fishbowl (GtkWidget *do_widget)
                                         "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
                                         "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index 665e598647..a7a1bf81d6 100644
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -1221,7 +1221,7 @@ do_font_features (GtkWidget *do_widget)
       gtk_builder_add_callback_symbol (builder, "reset", reset_features);
       gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
       gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
 
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index 2f3274f3eb..9cd18f041d 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -248,7 +248,7 @@ do_fontrendering (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/fontrendering/fontrendering.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/iconscroll.c b/demos/gtk-demo/iconscroll.c
index 63a68bc62d..509aa4642b 100644
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -210,7 +210,7 @@ do_iconscroll (GtkWidget *do_widget)
                                         "next_clicked_cb", G_CALLBACK (next_clicked_cb),
                                         "prev_clicked_cb", G_CALLBACK (prev_clicked_cb),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
diff --git a/demos/gtk-demo/modelbutton.c b/demos/gtk-demo/modelbutton.c
index 8adbe3762c..b454415762 100644
--- a/demos/gtk-demo/modelbutton.c
+++ b/demos/gtk-demo/modelbutton.c
@@ -41,7 +41,7 @@ do_modelbutton (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/modelbutton/modelbutton.ui");
       gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/revealer.c b/demos/gtk-demo/revealer.c
index 6d4ee0c3c0..5b65f36b72 100644
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -69,7 +69,7 @@ do_revealer (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/scale.c b/demos/gtk-demo/scale.c
index 938eb1a9d1..2b44107a76 100644
--- a/demos/gtk-demo/scale.c
+++ b/demos/gtk-demo/scale.c
@@ -18,7 +18,7 @@ do_scale (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/shortcuts.c b/demos/gtk-demo/shortcuts.c
index 884431e774..124bb11585 100644
--- a/demos/gtk-demo/shortcuts.c
+++ b/demos/gtk-demo/shortcuts.c
@@ -95,7 +95,7 @@ do_shortcuts (GtkWidget *do_widget)
                                         "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
                                         "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/spinbutton.c b/demos/gtk-demo/spinbutton.c
index d01d073d78..e30456eb21 100644
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -199,7 +199,7 @@ do_spinbutton (GtkWidget *do_widget)
                                       "month_spin_input", G_CALLBACK (month_spin_input),
                                       "month_spin_output", G_CALLBACK (month_spin_output),
                                       NULL);
-    gtk_builder_connect_signals (builder, NULL);
+    gtk_builder_connect_signals (builder);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/stack.c b/demos/gtk-demo/stack.c
index d86e485e7d..9d3b5eee61 100644
--- a/demos/gtk-demo/stack.c
+++ b/demos/gtk-demo/stack.c
@@ -18,7 +18,7 @@ do_stack (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 4af47abf0d..65b46b0d50 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -1729,7 +1729,7 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
   gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
 
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b2d136931a..5538ecfe8c 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1689,7 +1689,6 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
 /**
  * gtk_builder_connect_signals:
  * @builder: a #GtkBuilder
- * @user_data: user data to pass back with all signals
  *
  * This method is a simpler variation of gtk_builder_connect_signals_full().
  * It uses symbols explicitly added to @builder with prior calls to
@@ -1714,14 +1713,13 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
  * gmodule-export-2.0.
  **/
 void
-gtk_builder_connect_signals (GtkBuilder *builder,
-                             gpointer    user_data)
+gtk_builder_connect_signals (GtkBuilder *builder)
 {
   g_return_if_fail (GTK_IS_BUILDER (builder));
 
   gtk_builder_connect_signals_full (builder,
                                     gtk_builder_connect_signals_default,
-                                    user_data);
+                                    NULL);
 }
 
 /**
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index a3b2e7ad0e..f3353cedcf 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -150,8 +150,7 @@ void         gtk_builder_expose_object           (GtkBuilder    *builder,
                                                   const gchar   *name,
                                                   GObject       *object);
 GDK_AVAILABLE_IN_ALL
-void         gtk_builder_connect_signals         (GtkBuilder    *builder,
-                                                 gpointer       user_data);
+void         gtk_builder_connect_signals         (GtkBuilder    *builder);
 GDK_AVAILABLE_IN_ALL
 void         gtk_builder_connect_signals_full    (GtkBuilder    *builder,
                                                   GtkBuilderConnectFunc func,
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 0b8e4a07e2..2cd54e13f2 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12212,7 +12212,7 @@ gtk_widget_init_template (GtkWidget *widget)
   if (template->connect_func)
     gtk_builder_connect_signals_full (builder, template->connect_func, template->connect_data);
   else
-    gtk_builder_connect_signals (builder, object);
+    gtk_builder_connect_signals (builder);
 
   g_object_unref (builder);
 }
diff --git a/tests/teststackedheaders.c b/tests/teststackedheaders.c
index c342d685ca..60a03b6a68 100644
--- a/tests/teststackedheaders.c
+++ b/tests/teststackedheaders.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
   gtk_builder_add_callback_symbol (builder, "back_to_main", G_CALLBACK (back_to_main));
   gtk_builder_add_callback_symbol (builder, "go_to_secondary", G_CALLBACK (go_to_secondary));
   gtk_builder_add_from_file (builder, "teststackedheaders.ui", NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   win = (GtkWidget *)gtk_builder_get_object (builder, "window");
   header_stack = (GtkWidget *)gtk_builder_get_object (builder, "header_stack");
diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c
index 7faed00536..f9f1d8f8a7 100644
--- a/tests/visuals/visuals.c
+++ b/tests/visuals/visuals.c
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_file (builder, filename, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
   g_object_unref (G_OBJECT (builder));
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 89636bc3bb..a31dd910e6 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -244,7 +244,7 @@ test_connect_signals (void)
     "</interface>";
 
   builder = builder_new_from_string (buffer, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = gtk_builder_get_object (builder, "window1");
   gtk_window_set_title (GTK_WINDOW (window), "test");
@@ -258,7 +258,7 @@ test_connect_signals (void)
   g_object_unref (builder);
   
   builder = builder_new_from_string (buffer_order, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   window = gtk_builder_get_object (builder, "window1");
   normal = 0;
   gtk_window_set_title (GTK_WINDOW (window), "test");
@@ -270,7 +270,7 @@ test_connect_signals (void)
                               strlen (buffer_extra), NULL);
   gtk_builder_add_from_string (builder, buffer_extra2,
                               strlen (buffer_extra2), NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   window = gtk_builder_get_object (builder, "window2");
   gtk_window_set_title (GTK_WINDOW (window), "test");
   g_assert (normal == 30);
@@ -289,7 +289,7 @@ test_connect_signals (void)
   
   builder = builder_new_from_string (buffer_after_child, -1, NULL);
   window = gtk_builder_get_object (builder, "window1");
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   gtk_window_set_title (GTK_WINDOW (window), "test");
 
   g_assert (normal == 1);
@@ -2601,7 +2601,7 @@ test_anaconda_signal (void)
     "</interface>";
 
   builder = builder_new_from_string (buffer, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   g_object_unref (builder);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]