[Xfce4-commits] r26505 - in xfdesktop/trunk: . modules/menu

[Brian Tarricone]

Author: kelnos
Date: 2007-12-26 06:59:39 +0000 (Wed, 26 Dec 2007)
New Revision: 26505

Modified:
   xfdesktop/trunk/configure.ac.in
   xfdesktop/trunk/modules/menu/desktop-menu.c
Log:
invalidate .desktop file cache when something changes, disable
adding per-file monitors (per-directory is enough), tho there appears
to be a bug in the menu directory monitor code in libxfce4menu


Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in	2007-12-26 03:13:04 UTC (rev 26504)
+++ xfdesktop/trunk/configure.ac.in	2007-12-26 06:59:39 UTC (rev 26505)
@@ -13,7 +13,7 @@
 
 dnl minimum required versions
 m4_define([gtk_minimum_version], [2.6.0])
-m4_define([libxfce4util_minimum_version], [4.5.0svn-r26484])
+m4_define([libxfce4util_minimum_version], [4.5.0svn-r26500])
 m4_define([xfce_minimum_version], [4.4.1])
 m4_define([xfce4menu_minimum_version], [0.1.0svn-r26163])
 m4_define([exo_minimum_version], [0.3.2])

Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c	2007-12-26 03:13:04 UTC (rev 26504)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c	2007-12-26 06:59:39 UTC (rev 26505)
@@ -115,10 +115,15 @@
                                gpointer user_data)
 {
     XfceDesktopMenu *desktop_menu = user_data;
+    XfceMenuItemCache *cache = xfce_menu_item_cache_get_default();
+    
     TRACE("entering (%s)", thunar_vfs_path_get_name(event_path));
+    
+    xfce_menu_item_cache_invalidate(cache);
     _generate_menu(desktop_menu, FALSE);
 }
 
+#if 0
 static gpointer
 desktop_menu_xfce_menu_monitor_file(XfceMenu *menu,
                                     const gchar *filename,
@@ -143,6 +148,7 @@
     
     return mhandle;
 }
+#endif
 
 static gpointer
 desktop_menu_xfce_menu_monitor_directory(XfceMenu *menu,
@@ -330,7 +336,7 @@
 {
 #ifdef HAVE_THUNAR_VFS
     static XfceMenuMonitorVTable monitor_vtable = {
-        desktop_menu_xfce_menu_monitor_file,
+        NULL, //desktop_menu_xfce_menu_monitor_file,
         desktop_menu_xfce_menu_monitor_directory,
         desktop_menu_xfce_menu_remove_monitor
     };