[Xfce4-commits] <xfce4-panel:devel> Port to new plugin api. Resident plugin because of libxfce4menu.

[Nick Schermer]

Updating branch refs/heads/devel
         to 5f10279b2827932bcf0652fdefeb2ff9db51dbf4 (commit)
       from 604f3648a0c44ed3e162f38414f4ad0352f693fa (commit)

commit 5f10279b2827932bcf0652fdefeb2ff9db51dbf4
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 15 15:32:23 2009 +0100

    Port to new plugin api. Resident plugin because of libxfce4menu.

 plugins/launcher/launcher.c |    6 ++----
 plugins/launcher/launcher.h |    6 ++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index e883e05..8ff5873 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -135,10 +135,8 @@ enum
 
 
 
-/* define and register the plugin */
-G_DEFINE_TYPE (XfceLauncherPlugin, launcher_plugin, XFCE_TYPE_PANEL_PLUGIN)
-
-XFCE_PANEL_PLUGIN_REGISTER_OBJECT (XFCE_TYPE_LAUNCHER_PLUGIN)
+/* define the plugin */
+XFCE_PANEL_DEFINE_PLUGIN_RESIDENT (XfceLauncherPlugin, launcher_plugin)
 
 
 
diff --git a/plugins/launcher/launcher.h b/plugins/launcher/launcher.h
index 1d050c9..73a5302 100644
--- a/plugins/launcher/launcher.h
+++ b/plugins/launcher/launcher.h
@@ -48,9 +48,11 @@ enum _LauncherArrowType
   LAUNCHER_ARROW_INTERNAL
 };
 
-GType             launcher_plugin_get_type    (void) G_GNUC_CONST;
+GType             launcher_plugin_get_type      (void) G_GNUC_CONST;
 
-GSList           *launcher_plugin_get_items   (XfceLauncherPlugin *plugin);
+void              launcher_plugin_register_type (GTypeModule *type_module);
+
+GSList           *launcher_plugin_get_items     (XfceLauncherPlugin *plugin);
 
 G_END_DECLS