[gnome-control-center] info-overview: Move signal handler code into UI file



commit 9fba05a287181bc462f749db3415c08db3ba3a6c
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Sep 25 22:26:38 2019 +1200

    info-overview: Move signal handler code into UI file

 panels/info-overview/cc-info-overview-panel.c  | 11 +++++------
 panels/info-overview/cc-info-overview-panel.ui |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
index 6dd5468c2..8ae9c8efa 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/info-overview/cc-info-overview-panel.c
@@ -665,8 +665,7 @@ does_gpk_update_viewer_exist (void)
 }
 
 static void
-on_updates_button_clicked (GtkWidget           *widget,
-                           CcInfoOverviewPanel *self)
+on_updates_button_clicked (CcInfoOverviewPanel *self)
 {
   g_autoptr(GError) error = NULL;
   gboolean ret;
@@ -740,6 +739,8 @@ cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, CcInfoOverviewPanel, updates_button);
   gtk_widget_class_bind_template_child_private (widget_class, CcInfoOverviewPanel, virt_type_title_label);
 
+  gtk_widget_class_bind_template_callback (widget_class, on_updates_button_clicked);
+
   g_type_ensure (CC_TYPE_HOSTNAME_ENTRY);
 }
 
@@ -755,10 +756,8 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
 
   priv->graphics_data = get_graphics_data ();
 
-  if (does_gnome_software_exist () || does_gpk_update_viewer_exist ())
-    g_signal_connect (priv->updates_button, "clicked", G_CALLBACK (on_updates_button_clicked), self);
-  else
-    gtk_widget_destroy (priv->updates_button);
+  if (!does_gnome_software_exist () && !does_gpk_update_viewer_exist ())
+    gtk_widget_destroy (GTK_WIDGET (priv->updates_button));
 
   priv->client = udisks_client_new_sync (NULL, &error);
 
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index 4c3d96caf..7e8992766 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -335,6 +335,7 @@
                         <property name="receives_default">True</property>
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
+                        <signal name="clicked" handler="on_updates_button_clicked" 
object="CcInfoOverviewPanel" swapped="yes"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]