Author: kelnos
Date: 2007-10-20 19:46:02 +0000 (Sat, 20 Oct 2007)
New Revision: 26162
Modified:
xfdesktop/trunk/modules/menu/desktop-menu.c
Log:
no need to clear XfceMenu monitor vtable
Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 19:44:48 UTC (rev
26161)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 19:46:02 UTC (rev
26162)
@@ -328,11 +328,13 @@
xfce_desktop_menu_new_impl(const gchar *menu_file,
gboolean deferred)
{
+#ifdef HAVE_THUNAR_VFS
static XfceMenuMonitorVTable monitor_vtable = {
desktop_menu_xfce_menu_monitor_file,
desktop_menu_xfce_menu_monitor_directory,
desktop_menu_xfce_menu_remove_monitor
};
+#endif
XfceDesktopMenu *desktop_menu = g_new0(XfceDesktopMenu, 1);
desktop_menu->use_menu_icons = TRUE;
@@ -353,7 +355,6 @@
desktop_menu->idle_id = g_idle_add(_generate_menu_initial,
desktop_menu);
else {
if(!_generate_menu(desktop_menu, FALSE)) {
- xfce_menu_monitor_set_vtable(NULL, NULL);
g_free(desktop_menu);
desktop_menu = NULL;
}
@@ -459,10 +460,6 @@
desktop_menu->idle_id = 0;
}
-#ifdef HAVE_THUNAR_VFS
- xfce_menu_monitor_set_vtable(NULL, NULL);
-#endif
-
g_signal_handlers_disconnect_by_func(_deskmenu_icon_theme,
G_CALLBACK(itheme_changed_cb),
desktop_menu);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
