[Goodies-commits] r7568 - in xfce4-notes-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2009-06-14 13:04:26 +0000 (Sun, 14 Jun 2009)
New Revision: 7568

Modified:
   xfce4-notes-plugin/trunk/ChangeLog
   xfce4-notes-plugin/trunk/panel-plugin/main.vala
Log:
Refactorize main.vala

Modified: xfce4-notes-plugin/trunk/ChangeLog
===================================================================
--- xfce4-notes-plugin/trunk/ChangeLog	2009-06-14 12:21:22 UTC (rev 7567)
+++ xfce4-notes-plugin/trunk/ChangeLog	2009-06-14 13:04:26 UTC (rev 7568)
@@ -1,5 +1,9 @@
 2009-06-09  Mike Massonnet <mmassonnet at xfce.org>
 
+Refactorize main.vala
+
+2009-06-09  Mike Massonnet <mmassonnet at xfce.org>
+
 Previous problem catched...
 
 The valac compiler doesn't like libxfcegui4+libxfce4panel...

Modified: xfce4-notes-plugin/trunk/panel-plugin/main.vala
===================================================================
--- xfce4-notes-plugin/trunk/panel-plugin/main.vala	2009-06-14 12:21:22 UTC (rev 7567)
+++ xfce4-notes-plugin/trunk/panel-plugin/main.vala	2009-06-14 13:04:26 UTC (rev 7568)
@@ -34,17 +34,19 @@
 	private Xfce.PanelPlugin panel_plugin;
 	private Xnp.Application application;
 
-#if HAVE_LIBXFCE4PANEL47
 	~NotesPlugin () {
+		// FIXME: Is called before unrefing application
 		Xfconf.shutdown ();
 	}
 
+#if HAVE_LIBXFCE4PANEL47
 	public override void @construct () {
 		panel_plugin = this;
 #else
 	public NotesPlugin (Xfce.PanelPlugin panel_plugin) {
 		this.panel_plugin = panel_plugin;
 #endif
+
 		Xfce.textdomain (Config.GETTEXT_PACKAGE, Config.PACKAGE_LOCALE_DIR);
 		try {
 			Xfconf.init ();
@@ -112,16 +114,6 @@
 		return true;
 	}
 
-#if !HAVE_LIBXFCE4PANEL47
-	static NotesPlugin plugin;
-	public static void panel_plugin_register (Xfce.PanelPlugin panel_plugin) {
-		plugin = new NotesPlugin (panel_plugin);
-	}
-
-	public static int main (string[] args) {
-		return Xfce.PanelPluginRegisterExternal (ref args, panel_plugin_register);
-	}
-#endif
 }
 
 #if HAVE_LIBXFCE4PANEL47
@@ -129,4 +121,12 @@
 public Type __xpp_init (TypeModule module) {
 	return typeof (NotesPlugin);
 }
+#else
+static NotesPlugin plugin;
+public static void panel_plugin_register (Xfce.PanelPlugin panel_plugin) {
+	plugin = new NotesPlugin (panel_plugin);
+}
+public static int main (string[] args) {
+	return Xfce.PanelPluginRegisterExternal (ref args, panel_plugin_register);
+}
 #endif