[libpanel] position: make GVariant serialization public API



commit 56bff292ee71405365a87bb8aa445563e8182427
Author: Christian Hergert <chergert redhat com>
Date:   Wed Sep 14 16:27:36 2022 -0700

    position: make GVariant serialization public API
    
    I want to use this from Builder, and I'd also like to drop layout and this
    would make it possible.

 src/panel-layout-item.c      |  6 +++---
 src/panel-layout.c           |  2 +-
 src/panel-position-private.h | 30 ------------------------------
 src/panel-position.c         |  6 +++---
 src/panel-position.h         |  4 ++++
 5 files changed, 11 insertions(+), 37 deletions(-)
---
diff --git a/src/panel-layout-item.c b/src/panel-layout-item.c
index 6c9e0f6..bbed598 100644
--- a/src/panel-layout-item.c
+++ b/src/panel-layout-item.c
@@ -22,7 +22,7 @@
 
 #include "panel-layout-item-private.h"
 #include "panel-macros.h"
-#include "panel-position-private.h"
+#include "panel-position.h"
 
 struct _PanelLayoutItem
 {
@@ -475,7 +475,7 @@ _panel_layout_item_to_variant (PanelLayoutItem *self,
   if (self->position != NULL)
     g_variant_builder_add_parsed (builder,
                                   "{'position',<%v>}",
-                                  _panel_position_to_variant (self->position));
+                                  panel_position_to_variant (self->position));
 
   if (self->id != NULL)
     g_variant_builder_add_parsed (builder, "{'id',<%s>}", self->id);
@@ -532,7 +532,7 @@ _panel_layout_item_new_from_variant (GVariant  *variant,
   if ((positionv = g_variant_lookup_value (variant, "position", NULL)))
     {
       GVariant *child = g_variant_get_variant (positionv);
-      self->position = _panel_position_new_from_variant (child);
+      self->position = panel_position_new_from_variant (child);
       g_clear_pointer (&child, g_variant_unref);
     }
 
diff --git a/src/panel-layout.c b/src/panel-layout.c
index 16cdaac..1676f3c 100644
--- a/src/panel-layout.c
+++ b/src/panel-layout.c
@@ -22,7 +22,7 @@
 
 #include "panel-layout.h"
 #include "panel-layout-item-private.h"
-#include "panel-position-private.h"
+#include "panel-position.h"
 
 struct _PanelLayout
 {
diff --git a/src/panel-position.c b/src/panel-position.c
index 92838bc..9cf30bc 100644
--- a/src/panel-position.c
+++ b/src/panel-position.c
@@ -22,7 +22,7 @@
 
 #include "panel-dock.h"
 #include "panel-enums.h"
-#include "panel-position-private.h"
+#include "panel-position.h"
 
 struct _PanelPosition
 {
@@ -381,7 +381,7 @@ panel_position_is_indeterminate (PanelPosition *self)
 }
 
 GVariant *
-_panel_position_to_variant (PanelPosition *self)
+panel_position_to_variant (PanelPosition *self)
 {
   GVariantDict dict;
 
@@ -435,7 +435,7 @@ _panel_position_to_variant (PanelPosition *self)
 }
 
 PanelPosition *
-_panel_position_new_from_variant (GVariant *variant)
+panel_position_new_from_variant (GVariant *variant)
 {
 
   PanelPosition *self;
diff --git a/src/panel-position.h b/src/panel-position.h
index 513df4c..9087306 100644
--- a/src/panel-position.h
+++ b/src/panel-position.h
@@ -33,6 +33,10 @@ G_DECLARE_FINAL_TYPE (PanelPosition, panel_position, PANEL, POSITION, GObject)
 PANEL_AVAILABLE_IN_ALL
 PanelPosition *panel_position_new              (void);
 PANEL_AVAILABLE_IN_ALL
+PanelPosition *panel_position_new_from_variant (GVariant      *variant);
+PANEL_AVAILABLE_IN_ALL
+GVariant      *panel_position_to_variant       (PanelPosition *self);
+PANEL_AVAILABLE_IN_ALL
 PanelArea      panel_position_get_area         (PanelPosition *self);
 PANEL_AVAILABLE_IN_ALL
 gboolean       panel_position_get_area_set     (PanelPosition *self);


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