Author: kelnos
Date: 2007-10-20 20:36:24 +0000 (Sat, 20 Oct 2007)
New Revision: 26164
Modified:
xfdesktop/trunk/configure.ac.in
xfdesktop/trunk/modules/menu/desktop-menu.c
Log:
jannis made it possible to clean up the vtable, so let's do that.
requires newer version of libxfce4menu
Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in 2007-10-20 20:23:43 UTC (rev 26163)
+++ xfdesktop/trunk/configure.ac.in 2007-10-20 20:36:24 UTC (rev 26164)
@@ -9,7 +9,7 @@
dnl minimum required versions
m4_define([gtk_minimum_version], [2.6.0])
m4_define([xfce_minimum_version], [4.4.0])
-m4_define([xfce4menu_minimum_version], [0.1.0svn-r26116])
+m4_define([xfce4menu_minimum_version], [0.1.0svn-r26163])
m4_define([exo_minimum_version], [0.3.2])
m4_define([thunar_minimum_version], [0.8.0])
m4_define([dbus_minimum_version], [0.34])
Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 20:23:43 UTC (rev
26163)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 20:36:24 UTC (rev
26164)
@@ -355,6 +355,9 @@
desktop_menu->idle_id = g_idle_add(_generate_menu_initial,
desktop_menu);
else {
if(!_generate_menu(desktop_menu, FALSE)) {
+#ifdef HAVE_THUNAR_VFS
+ xfce_menu_monitor_set_vtable(NULL, NULL);
+#endif
g_free(desktop_menu);
desktop_menu = NULL;
}
@@ -455,6 +458,10 @@
g_return_if_fail(desktop_menu != NULL);
TRACE("dummy");
+#ifdef HAVE_THUNAR_VFS
+ xfce_menu_monitor_set_vtable(NULL, NULL);
+#endif
+
if(desktop_menu->idle_id) {
g_source_remove(desktop_menu->idle_id);
desktop_menu->idle_id = 0;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
