From a439aeb8fd08d9858055bbb2ae1326a1335600d1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sun, 23 Jan 2011 15:53:27 -0600
Subject: Reimplementing the cache based on object data with signals to cleanup

---
 libdbusmenu-gtk/parser.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-gtk/parser.c')

diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 9d0f9b4..f1c46ba 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -29,6 +29,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "parser.h"
 #include "menuitem.h"
 
+#define CACHED_MENUITEM  "dbusmenu-gtk-parser-cached-item"
+
 typedef struct _RecurseContext
 {
   GtkWidget * toplevel;
@@ -83,6 +85,20 @@ dbusmenu_gtk_parse_menu_structure (GtkWidget * widget)
   return NULL;
 }
 
+static void
+dbusmenu_cache_freed (gpointer data, GObject * obj)
+{
+	g_object_set_data(G_OBJECT(data), CACHED_MENUITEM, NULL);
+	return;
+}
+
+static void
+object_cache_freed (gpointer data)
+{
+	g_object_weak_unref(G_OBJECT(data), dbusmenu_cache_freed, data);
+	return;
+}
+
 static void
 parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 {
@@ -119,7 +135,10 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
 
       if (recurse->count > -1 && increment)
         {
-          DbusmenuMenuitem *dmi = NULL; //g_hash_table_lookup (recurse->context->lookup, widget);
+		  gpointer pmi = g_object_get_data(G_OBJECT(widget), CACHED_MENUITEM);
+          DbusmenuMenuitem *dmi = NULL;
+		  if (pmi != NULL) dmi = DBUSMENU_MENUITEM(pmi);
+
           if (dmi != NULL)
             {
               if (increment)
@@ -130,7 +149,8 @@ parse_menu_structure_helper (GtkWidget * widget, RecurseContext * recurse)
           else
             {
               recurse->stack[recurse->count] = construct_dbusmenu_for_widget (widget);
-              //g_hash_table_insert (recurse->context->lookup, widget, recurse->stack[recurse->count]);
+			  g_object_set_data_full(G_OBJECT(widget), CACHED_MENUITEM, recurse->stack[recurse->count], object_cache_freed);
+			  g_object_weak_ref(G_OBJECT(recurse->stack[recurse->count]), dbusmenu_cache_freed, widget);
             }
 
           if (!gtk_widget_get_visible (widget))
-- 
cgit v1.2.3