[Xfce4-commits] r29655 - in xfdesktop/trunk: . common

[Brian Tarricone]

Author: kelnos
Date: 2009-03-13 05:27:33 +0000 (Fri, 13 Mar 2009)
New Revision: 29655

Modified:
   xfdesktop/trunk/NEWS
   xfdesktop/trunk/common/desktop-menu-stub.c
   xfdesktop/trunk/configure.ac.in
Log:
no need to call xfce_menu_init() from the stub; module does it (bug 3370)

Modified: xfdesktop/trunk/NEWS
===================================================================
--- xfdesktop/trunk/NEWS	2009-03-12 18:15:36 UTC (rev 29654)
+++ xfdesktop/trunk/NEWS	2009-03-13 05:27:33 UTC (rev 29655)
@@ -1,5 +1,11 @@
+Xfce 4.6.1
+----------
+
+  * Fix desktop menu failing to load on FreeBSD (bug 3370).
+
+
 Xfce 4.6.0
-==========
+----------
 
   * Fix menu plugin crash when selecting custom menu file (bug 4879).
   * Only regen the monitor on changes to files we care about (bug 4979).

Modified: xfdesktop/trunk/common/desktop-menu-stub.c
===================================================================
--- xfdesktop/trunk/common/desktop-menu-stub.c	2009-03-12 18:15:36 UTC (rev 29654)
+++ xfdesktop/trunk/common/desktop-menu-stub.c	2009-03-13 05:27:33 UTC (rev 29655)
@@ -39,9 +39,6 @@
 void (*xfce_desktop_menu_set_show_icons)(XfceDesktopMenu *desktop_menu, gboolean show_icons) = NULL;
 static void (*xfce_desktop_menu_destroy_p)(XfceDesktopMenu *desktop_menu) = NULL;
 
-static void (*my_xfce_menu_init)(const gchar *env) = NULL;
-static void (*my_xfce_menu_shutdown)() = NULL;
-
 static GQuark
 desktop_menu_error_quark(void)
 {
@@ -117,12 +114,7 @@
         return NULL;
     }
     
-    if(!_setup_functions(module)
-       || !g_module_symbol(module, "xfce_menu_init",
-                           (gpointer)&my_xfce_menu_init)
-       || !g_module_symbol(module, "xfce_menu_shutdown",
-                           (gpointer)&my_xfce_menu_shutdown))
-    {
+    if(!_setup_functions(module)) {
         if(err) {
             g_set_error(err, desktop_menu_error_quark(), 0,
                     "The XfceDesktopMenu module is not valid: %s",
@@ -132,15 +124,12 @@
         return NULL;
     }
     
-    my_xfce_menu_init("XFCE");
-    
     return module;
 }
 
 static void
 desktop_menu_stub_cleanup(GModule *module)
 {
-    my_xfce_menu_shutdown();
     g_module_close(module);
 }
 

Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in	2009-03-12 18:15:36 UTC (rev 29654)
+++ xfdesktop/trunk/configure.ac.in	2009-03-13 05:27:33 UTC (rev 29655)
@@ -9,7 +9,7 @@
 m4_define([xfdesktop_version_micro], [0])
 m4_define([xfdesktop_version_nano], [])
 m4_define([xfdesktop_version_build], [r at REVISION@])
-m4_define([xfdesktop_version_tag],[])
+m4_define([xfdesktop_version_tag],[svn])
 m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [svn], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])])
 
 dnl minimum required versions