Author: jannis
Date: 2007-12-27 00:13:05 +0000 (Thu, 27 Dec 2007)
New Revision: 26507

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c
Log:
        * libxfce4menu/xfce-menu-monitor.c: Use the KEY, not the VALUE pointer
          to remove items from the shared handle hash table. In this case, use
          the directory string instead of the shared handle. This should fix
          the issue we've had with monitoring directories only.
          xfce_menu_item_has_category (XfceMenuItem *, const char *).
          This can be used in combination with file monitoring: Once something
          has changed a) destroy the current menu, b) invalidate the cache and
          c) create the menu again.
        

Modified: libxfce4menu/trunk/ChangeLog
===================================================================
--- libxfce4menu/trunk/ChangeLog        2007-12-26 22:54:08 UTC (rev 26506)
+++ libxfce4menu/trunk/ChangeLog        2007-12-27 00:13:05 UTC (rev 26507)
@@ -1,3 +1,9 @@
+2007-12-27     Jannis Pohlmann <[EMAIL PROTECTED]>
+       * libxfce4menu/xfce-menu-monitor.c: Use the KEY, not the VALUE pointer
+         to remove items from the shared handle hash table. In this case, use
+         the directory string instead of the shared handle. This should fix
+         the issue we've had with monitoring directories only.
+
 2007-12-23     Jannis Pohlmann <[EMAIL PROTECTED]>
 
        * libxfce4menu/xfce-menu-item.{c,h}: Add support for "GenericName" as
@@ -2,8 +8,8 @@
          requested by Brian. Also add a convenience function 
-               xfce_menu_item_has_category (XfceMenuItem *, const char *).
+         xfce_menu_item_has_category (XfceMenuItem *, const char *).
        * libxfce4menu/xfce-menu-item-cache.c: Re-add caching features, but now
          also allow the cache to be invalidated using _item_cache_invalidate().
-               This can be used in combination with file monitoring: Once 
something
-               has changed a) destroy the current menu, b) invalidate the 
cache and
-               c) create the menu again.
+         This can be used in combination with file monitoring: Once something
+         has changed a) destroy the current menu, b) invalidate the cache and
+         c) create the menu again.
 
@@ -724,3 +730,5 @@
          Abort setting properties if new values are equal to the old ones.
        * tests/load-root-menu-test.c: Display only_unallocated, delete and
          directory_dirs information.
+       
+vim:set sw=8 sts=8 ts=8 noexpandtab:

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c
===================================================================
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c 2007-12-26 22:54:08 UTC 
(rev 26506)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-monitor.c 2007-12-27 00:13:05 UTC 
(rev 26507)
@@ -243,7 +243,7 @@
           xfce_menu_monitor_vtable.remove_monitor (menu, 
shared_handle->monitor_handle);
 
           /* Remove directory handle from the hash table and destroy it */
-          g_hash_table_remove (xfce_menu_monitor_shared_handles, 
shared_handle);
+          g_hash_table_remove (xfce_menu_monitor_shared_handles, directory);
         }
     }
 }

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to