[Xfce4-commits] <xfce4-indicator-plugin:master> Some exo fixes to make config settings work

[Andrzej]

Updating branch refs/heads/master
         to 84ab84c4f70b6c011b225a72e7cce9dd426155c3 (commit)
       from ed35886b41b7d1b7059822773ce423c3e3dbe962 (commit)

commit 84ab84c4f70b6c011b225a72e7cce9dd426155c3
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Apr 7 23:52:11 2013 +0100

    Some exo fixes to make config settings work

 panel-plugin/Makefile.am        |    2 +-
 panel-plugin/indicator-config.c |   18 ++++++------------
 panel-plugin/indicator-dialog.c |    9 +++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 7eb6ac0..4229737 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -85,7 +85,7 @@ DISTCLEANFILES += \
 	$(libindicator_built_sources)
 
 indicator-dialog_ui.h: indicator-dialog.glade
-	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=indicator_dialog_ui $< >$@
+	$(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=indicator_dialog_ui $< >$@
 endif
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/indicator-config.c b/panel-plugin/indicator-config.c
index a560da4..06fb0a9 100644
--- a/panel-plugin/indicator-config.c
+++ b/panel-plugin/indicator-config.c
@@ -157,24 +157,21 @@ indicator_config_class_init (IndicatorConfigClass *klass)
                                                       128,
                                                       DEFAULT_ICON_SIZE_MAX,
                                                       G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS |
-                                                      G_PARAM_CONSTRUCT_ONLY));
+                                                      G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALIGN_LEFT,
                                    g_param_spec_boolean ("align-left", NULL, NULL,
                                                          DEFAULT_ALIGN_LEFT,
                                                          G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS |
-                                                         G_PARAM_CONSTRUCT_ONLY));
+                                                         G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
                                    PROP_MODE_WHITELIST,
                                    g_param_spec_boolean ("mode-whitelist", NULL, NULL,
                                                          DEFAULT_MODE_WHITELIST,
                                                          G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS |
-                                                         G_PARAM_CONSTRUCT_ONLY));
+                                                         G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
                                    PROP_BLACKLIST,
@@ -182,8 +179,7 @@ indicator_config_class_init (IndicatorConfigClass *klass)
                                                        NULL, NULL,
                                                        XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY,
                                                        G_PARAM_READWRITE |
-                                                       G_PARAM_STATIC_STRINGS |
-                                                       G_PARAM_CONSTRUCT_ONLY));
+                                                       G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WHITELIST,
@@ -191,8 +187,7 @@ indicator_config_class_init (IndicatorConfigClass *klass)
                                                        NULL, NULL,
                                                        XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY,
                                                        G_PARAM_READWRITE |
-                                                       G_PARAM_STATIC_STRINGS |
-                                                       G_PARAM_CONSTRUCT_ONLY));
+                                                       G_PARAM_STATIC_STRINGS));
 
 
   g_object_class_install_property (gobject_class,
@@ -201,8 +196,7 @@ indicator_config_class_init (IndicatorConfigClass *klass)
                                                        NULL, NULL,
                                                        XFCE_TYPE_INDICATOR_CONFIG_VALUE_ARRAY,
                                                        G_PARAM_READWRITE |
-                                                       G_PARAM_STATIC_STRINGS |
-                                                       G_PARAM_CONSTRUCT_ONLY));
+                                                       G_PARAM_STATIC_STRINGS));
 
 
   indicator_config_signals[CONFIGURATION_CHANGED] =
diff --git a/panel-plugin/indicator-dialog.c b/panel-plugin/indicator-dialog.c
index 71af392..af1964b 100644
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -480,16 +480,25 @@ indicator_dialog_build (IndicatorDialog *dialog)
       g_return_if_fail (GTK_IS_WIDGET (object));
       //exo_mutual_binding_new (G_OBJECT (dialog->config), "icon-size-max",
       //                        G_OBJECT (object), "value");
+      g_object_bind_property (G_OBJECT (dialog->config), "icon-size-max",
+                              G_OBJECT (object), "value",
+                              G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
 
       object = gtk_builder_get_object (builder, "checkbutton-align-left");
       g_return_if_fail (GTK_IS_WIDGET (object));
       //exo_mutual_binding_new (G_OBJECT (dialog->config), "align-left",
       //                        G_OBJECT (object), "active");
+      g_object_bind_property (G_OBJECT (dialog->config), "align-left",
+                              G_OBJECT (object), "active",
+                              G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
 
       object = gtk_builder_get_object (builder, "checkbutton-whitelist");
       g_return_if_fail (GTK_IS_WIDGET (object));
       //exo_mutual_binding_new (G_OBJECT (dialog->config), "mode-whitelist",
       //                        G_OBJECT (object), "active");
+      g_object_bind_property (G_OBJECT (dialog->config), "mode-whitelist",
+                              G_OBJECT (object), "active",
+                              G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
       g_signal_connect (G_OBJECT (object), "toggled",
                         G_CALLBACK (indicator_dialog_mode_whitelist_toggled), dialog);
       indicator_dialog_mode_whitelist_toggled (GTK_CHECK_BUTTON (object), dialog);