[Xfce4-commits] <xfce4-panel:devel> Use the xfconf channel singleton in the panel and plugins.

[Nick Schermer]

Updating branch refs/heads/devel
         to 9f9f210828f51a82696d450e74bc2f2537bff621 (commit)
       from 6d98e962a48e30a859dfb5ca050d450809d6024a (commit)

commit 9f9f210828f51a82696d450e74bc2f2537bff621
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 1 09:35:07 2009 +0200

    Use the xfconf channel singleton in the panel and plugins.

 panel/panel-application.c       |    2 +-
 plugins/actions/actions.c       |    2 +-
 plugins/launcher/launcher.c     |    2 +-
 plugins/pager/pager.c           |    2 +-
 plugins/separator/separator.c   |    2 +-
 plugins/systray/systray.c       |    2 +-
 plugins/tasklist/tasklist.c     |    2 +-
 plugins/windowmenu/windowmenu.c |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 80691b7..1a1e798 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -186,7 +186,7 @@ panel_application_init (PanelApplication *application)
   application->drop_occurred = FALSE;
 
   /* get the xfconf channel */
-  application->xfconf = xfconf_channel_new ("xfce4-panel");
+  application->xfconf = panel_properties_get_channel ();
 
   /* get all the panel properties */
   hash_table = xfconf_channel_get_properties (application->xfconf, NULL);
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index d3a6a0d..58a5b7a 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -311,7 +311,7 @@ actions_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* bind all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin),
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 73b5291..80670f3 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -514,7 +514,7 @@ launcher_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* bind all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin),
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 92051de..1c24850 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -319,7 +319,7 @@ pager_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* bind all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin),
diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c
index cc11db2..4017cff 100644
--- a/plugins/separator/separator.c
+++ b/plugins/separator/separator.c
@@ -284,7 +284,7 @@ separator_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* set the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* connect all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin),
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 7e5c626..564930f 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -306,7 +306,7 @@ systray_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* bind all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin),
diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c
index a2fe334..4a0ce0f 100644
--- a/plugins/tasklist/tasklist.c
+++ b/plugins/tasklist/tasklist.c
@@ -145,7 +145,7 @@ tasklist_plugin_construct (XfcePanelPlugin *panel_plugin)
   xfce_panel_plugin_set_expand (panel_plugin, TRUE);
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* bind all properties */
   panel_properties_bind (plugin->channel, G_OBJECT (plugin->tasklist),
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 19aff30..9605020 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -395,7 +395,7 @@ window_menu_plugin_construct (XfcePanelPlugin *panel_plugin)
   };
 
   /* open the xfconf channel */
-  plugin->channel = xfconf_channel_new (XFCE_PANEL_PLUGIN_CHANNEL_NAME);
+  plugin->channel = panel_properties_get_channel ();
 
   /* show the icon */
   gtk_widget_show (plugin->icon);