widget-factory: Put gesture into ui file

diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 8627c1d5a5f6068e0a51bcbf9f59cf0f6fd8144f..8b8e852dd5bac8258866783b48c6fb0f57b07e15 100644 (file)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -1646,7 +1646,6 @@ activate (GApplication *app)
   gint i;
   GPermission *permission;
   GAction *action;
-  GtkGesture *gesture;
 
   g_type_ensure (my_text_view_get_type ());
 
@@ -1671,6 +1670,7 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
   gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
   gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
 
   gtk_builder_connect_signals (builder, NULL);
 
@@ -1888,10 +1888,6 @@ activate (GApplication *app)
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);
 
-  widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
-  gesture = gtk_gesture_multi_press_new (widget);
-  g_signal_connect (gesture, "pressed", G_CALLBACK (osd_frame_pressed), widget);
-
   gtk_widget_show (GTK_WIDGET (window));
 
   g_object_unref (builder);

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 8d70fc8d058b6700c90ca36f96d635d2927c55b0..fc6f98494d45c41b8b6e4fff394af1ea6b8a5359 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -3101,6 +3101,11 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                               </object>
                             </child>
+                            <child>
+                              <object class="GtkGestureMultiPress">
+                                <signal name="pressed" handler="osd_frame_pressed" object="osd_frame" swapped="no"/>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>