[libpanel] bindings: port to GBindingGroup



commit 1dc0d3e584f619bef4c8a6b4e9017b1aa74a90a2
Author: Christian Hergert <chergert redhat com>
Date:   Sat Sep 10 13:39:08 2022 -0700

    bindings: port to GBindingGroup
    
    We don't need PanelBindingGroup as we can rely on the one that landed in
    upstream GLib instead.

 src/meson.build                   |   2 -
 src/panel-binding-group-private.h |  56 ---
 src/panel-binding-group.c         | 639 ----------------------------
 src/panel-frame-header-bar.c      |  17 +-
 src/panel-frame-switcher.c        |   1 -
 src/panel-signal-group-private.h  |  63 ---
 src/panel-signal-group.c          | 849 --------------------------------------
 7 files changed, 8 insertions(+), 1619 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index b600160..b579992 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -20,7 +20,6 @@ panel_version_h = configure_file(
 libpanel_private_sources = [
   'gsettings-mapping.c',
   'panel-action-muxer.c',
-  'panel-binding-group.c',
   'panel-dock-child.c',
   'panel-drop-controls.c',
   'panel-frame-header-bar-row.c',
@@ -30,7 +29,6 @@ libpanel_private_sources = [
   'panel-resizer.c',
   'panel-save-dialog.c',
   'panel-scaler.c',
-  'panel-signal-group.c',
 ]
 
 libpanel_sources = [
diff --git a/src/panel-frame-header-bar.c b/src/panel-frame-header-bar.c
index a7ae675..090e379 100644
--- a/src/panel-frame-header-bar.c
+++ b/src/panel-frame-header-bar.c
@@ -23,7 +23,6 @@
 #include <adwaita.h>
 #include <glib/gi18n.h>
 
-#include "panel-binding-group-private.h"
 #include "panel-frame-header-bar.h"
 #include "panel-frame-header-bar-row-private.h"
 #include "panel-frame-private.h"
@@ -35,7 +34,7 @@ struct _PanelFrameHeaderBar
 {
   GtkWidget          parent_instance;
 
-  PanelBindingGroup *bindings;
+  GBindingGroup     *bindings;
   PanelFrame        *frame;
   GMenuModel        *menu_model;
   PanelWidget       *visible_child;
@@ -443,12 +442,12 @@ panel_frame_header_bar_init (PanelFrameHeaderBar *self)
   button = gtk_widget_get_first_child (GTK_WIDGET (self->title_button));
   gtk_button_set_child (GTK_BUTTON (button), box);
 
-  self->bindings = panel_binding_group_new ();
-  panel_binding_group_bind (self->bindings, "title", self->title, "label", 0);
-  panel_binding_group_bind_full (self->bindings, "modified",
-                                 self->modified, "label",
-                                 0, boolean_to_modified, NULL, NULL, NULL);
-  panel_binding_group_bind (self->bindings, "icon", self->image, "gicon", 0);
+  self->bindings = g_binding_group_new ();
+  g_binding_group_bind (self->bindings, "title", self->title, "label", 0);
+  g_binding_group_bind_full (self->bindings, "modified",
+                             self->modified, "label",
+                             0, boolean_to_modified, NULL, NULL, NULL);
+  g_binding_group_bind (self->bindings, "icon", self->image, "gicon", 0);
 }
 
 static gboolean
@@ -486,7 +485,7 @@ panel_frame_header_bar_page_changed (PanelFrameHeader *header,
   gtk_widget_set_sensitive (GTK_WIDGET (self->menu_button), page != NULL);
   gtk_widget_set_sensitive (GTK_WIDGET (self->drag_button), page != NULL);
 
-  panel_binding_group_set_source (self->bindings, page);
+  g_binding_group_set_source (self->bindings, page);
 
   gtk_widget_set_sensitive (GTK_WIDGET (self->title_button), page != NULL);
 
diff --git a/src/panel-frame-switcher.c b/src/panel-frame-switcher.c
index 7714504..44c1243 100644
--- a/src/panel-frame-switcher.c
+++ b/src/panel-frame-switcher.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include "panel-binding-group-private.h"
 #include "panel-dock-private.h"
 #include "panel-frame-private.h"
 #include "panel-frame-header.h"


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