[Xfce4-commits] <xfce4-panel:devel> Move plugin macros to the macros files.

[Nick Schermer]

Updating branch refs/heads/devel
         to a7029764f0ccc6e49a87d26c36ce8b1794892f93 (commit)
       from a01ff5a731fbf089e001c54d0dd7182fbe41ade2 (commit)

commit a7029764f0ccc6e49a87d26c36ce8b1794892f93
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Jun 1 09:33:41 2009 +0200

    Move plugin macros to the macros files.

 libxfce4panel/xfce-panel-macros.h |    8 ++++++++
 libxfce4panel/xfce-panel-plugin.h |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libxfce4panel/xfce-panel-macros.h b/libxfce4panel/xfce-panel-macros.h
index 9d8a5ee..705f947 100644
--- a/libxfce4panel/xfce-panel-macros.h
+++ b/libxfce4panel/xfce-panel-macros.h
@@ -53,6 +53,14 @@ G_BEGIN_DECLS
 #define I_(string) (g_intern_static_string ((string)))
 #endif
 
+/* xfconf channel for plugins */
+#define XFCE_PANEL_PLUGIN_CHANNEL_NAME ("xfce4-panel")
+
+/* macro for opening an XfconfChannel for plugin */
+#define xfce_panel_plugin_xfconf_channel_new(plugin) \
+  xfconf_channel_new_with_property_base (XFCE_PANEL_PLUGIN_CHANNEL_NAME, \
+    xfce_panel_plugin_get_property_base (XFCE_PANEL_PLUGIN (plugin)));
+
 /* this is defined in glib 2.13.0 */
 #ifndef G_PARAM_STATIC_STRINGS
 #define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
diff --git a/libxfce4panel/xfce-panel-plugin.h b/libxfce4panel/xfce-panel-plugin.h
index 45a3871..1839516 100644
--- a/libxfce4panel/xfce-panel-plugin.h
+++ b/libxfce4panel/xfce-panel-plugin.h
@@ -39,14 +39,6 @@ typedef struct _XfcePanelPlugin        XfcePanelPlugin;
 #define XFCE_IS_PANEL_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_PANEL_PLUGIN))
 #define XFCE_PANEL_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_PANEL_PLUGIN, XfcePanelPluginClass))
 
-/* xfconf channel for plugins */
-#define XFCE_PANEL_PLUGIN_CHANNEL_NAME ("xfce4-panel")
-
-/* macro for opening an XfconfChannel for plugin */
-#define xfce_panel_plugin_xfconf_channel_new(plugin) \
-  xfconf_channel_new_with_property_base (XFCE_PANEL_PLUGIN_CHANNEL_NAME, \
-    xfce_panel_plugin_get_property_base (XFCE_PANEL_PLUGIN (plugin)));
-
 struct _XfcePanelPluginClass
 {
   /*< private >*/