[gtk/matthiasc/for-main] demos: Use gtk_builder_cscope_add_callback

[Matthias Clasen <matthiasc src gnome org>]

commit a284dc9f31ac9424789c2e91444562f79a4427b2
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 30 20:10:06 2022 -0400

    demos: Use gtk_builder_cscope_add_callback
    
    This is C convenience API, lets use it for
    our convenience.

 demos/gtk-demo/clipboard.c            | 17 +++++++---------
 demos/gtk-demo/errorstates.c          |  9 +++------
 demos/gtk-demo/listbox_controls.c     |  3 +--
 demos/gtk-demo/listview_settings.c    |  8 ++++----
 demos/widget-factory/widget-factory.c | 37 ++++++++++++++++-------------------
 5 files changed, 32 insertions(+), 42 deletions(-)
---
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 9a9be6d9e5..1520349498 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -341,16 +341,13 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *button;
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-                                               "copy_button_clicked", G_CALLBACK (copy_button_clicked),
-                                               "paste_button_clicked", G_CALLBACK (paste_button_clicked),
-                                               "source_changed_cb", G_CALLBACK (source_changed_cb),
-                                               "text_changed_cb", G_CALLBACK (text_changed_cb),
-                                               "open_file_cb", G_CALLBACK (open_file_cb),
-                                               "on_drop", G_CALLBACK (on_drop),
-                                               "drag_prepare", G_CALLBACK (drag_prepare),
-                                               NULL);
-
+      gtk_builder_cscope_add_callback (scope, copy_button_clicked);
+      gtk_builder_cscope_add_callback (scope, paste_button_clicked);
+      gtk_builder_cscope_add_callback (scope, source_changed_cb);
+      gtk_builder_cscope_add_callback (scope, text_changed_cb);
+      gtk_builder_cscope_add_callback (scope, open_file_cb);
+      gtk_builder_cscope_add_callback (scope, on_drop);
+      gtk_builder_cscope_add_callback (scope, drag_prepare);
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
       gtk_builder_add_from_resource (builder, "/clipboard/clipboard.ui", NULL);
diff --git a/demos/gtk-demo/errorstates.c b/demos/gtk-demo/errorstates.c
index 5cd35d6467..82ea73dbca 100644
--- a/demos/gtk-demo/errorstates.c
+++ b/demos/gtk-demo/errorstates.c
@@ -90,12 +90,9 @@ do_errorstates (GtkWidget *do_widget)
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-              "validate_more_details", G_CALLBACK (validate_more_details),
-              "mode_switch_state_set", G_CALLBACK (mode_switch_state_set),
-              "level_scale_value_changed", G_CALLBACK (level_scale_value_changed),
-              NULL);
-
+      gtk_builder_cscope_add_callback (scope, validate_more_details);
+      gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
+      gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
       gtk_builder_expose_object (builder, "toplevel", G_OBJECT (toplevel));
diff --git a/demos/gtk-demo/listbox_controls.c b/demos/gtk-demo/listbox_controls.c
index 5a72622d22..b08507d880 100644
--- a/demos/gtk-demo/listbox_controls.c
+++ b/demos/gtk-demo/listbox_controls.c
@@ -42,8 +42,7 @@ do_listbox_controls (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope),
-                                              "row_activated", G_CALLBACK (row_activated));
+      gtk_builder_cscope_add_callback (scope, row_activated);
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
 
diff --git a/demos/gtk-demo/listview_settings.c b/demos/gtk-demo/listview_settings.c
index 6e67d56790..36cd5c22df 100644
--- a/demos/gtk-demo/listview_settings.c
+++ b/demos/gtk-demo/listview_settings.c
@@ -356,10 +356,10 @@ do_listview_settings (GtkWidget *do_widget)
       g_type_ensure (SETTINGS_TYPE_KEY);
 
       scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", 
(GCallback)search_enabled);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", 
(GCallback)search_changed);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", 
(GCallback)stop_search);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "item_value_changed", 
(GCallback)item_value_changed);
+      gtk_builder_cscope_add_callback (scope, search_enabled);
+      gtk_builder_cscope_add_callback (scope, search_changed);
+      gtk_builder_cscope_add_callback (scope, stop_search);
+      gtk_builder_cscope_add_callback (scope, item_value_changed);
 
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 5e0353b80b..b2adc2b1b7 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -2081,26 +2081,23 @@ activate (GApplication *app)
 
   builder = gtk_builder_new ();
   scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-          "on_entry_icon_release", (GCallback)on_entry_icon_release,
-          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
-          "on_record_button_toggled", (GCallback)on_record_button_toggled,
-          "on_page_combo_changed", (GCallback)on_page_combo_changed,
-          "on_range_from_changed", (GCallback)on_range_from_changed,
-          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
-          "on_picture_drop", (GCallback)on_picture_drop,
-          "tab_close_cb", (GCallback)tab_close_cb,
-          "increase_icon_size", (GCallback)increase_icon_size,
-          "decrease_icon_size", (GCallback)decrease_icon_size,
-          "reset_icon_size", (GCallback)reset_icon_size,
-          "osd_frame_pressed", (GCallback)osd_frame_pressed,
-          "age_entry_changed", (GCallback)age_entry_changed,
-          "validate_more_details", (GCallback)validate_more_details,
-          "mode_switch_state_set", (GCallback)mode_switch_state_set,
-          "level_scale_value_changed", (GCallback)level_scale_value_changed,
-          "transition_speed_changed", (GCallback)transition_speed_changed,
-          NULL);
+  gtk_builder_cscope_add_callback (scope, on_entry_icon_release);
+  gtk_builder_cscope_add_callback (scope, on_scale_button_value_changed);
+  gtk_builder_cscope_add_callback (scope, on_record_button_toggled);
+  gtk_builder_cscope_add_callback (scope, on_page_combo_changed);
+  gtk_builder_cscope_add_callback (scope, on_range_from_changed);
+  gtk_builder_cscope_add_callback (scope, on_range_to_changed);
+  gtk_builder_cscope_add_callback (scope, on_picture_drag_prepare);
+  gtk_builder_cscope_add_callback (scope, on_picture_drop);
+  gtk_builder_cscope_add_callback (scope, tab_close_cb);
+  gtk_builder_cscope_add_callback (scope, increase_icon_size);
+  gtk_builder_cscope_add_callback (scope, decrease_icon_size);
+  gtk_builder_cscope_add_callback (scope, osd_frame_pressed);
+  gtk_builder_cscope_add_callback (scope, age_entry_changed);
+  gtk_builder_cscope_add_callback (scope, validate_more_details);
+  gtk_builder_cscope_add_callback (scope, mode_switch_state_set);
+  gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
+  gtk_builder_cscope_add_callback (scope, transition_speed_changed);
   gtk_builder_set_scope (builder, scope);
   g_object_unref (scope);
   if (!gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", &error))