Regression: Window menu not updated properly (Issue #320)

Fixes #320
Fixes #321

thunar/thunar-gtk-extensions.c

@@ -125,6 +125,32 @@ thunar_gtk_menu_thunarx_menu_item_new (GObject      *thunarx_menu_item,
 
 
 
+/**
+ * thunar_gtk_menu_clean:
+ * @menu : a #GtkMenu.
+ *
+ * Walks through the menu and all submenus and removes them,
+ * so that the result will be a clean #GtkMenu without any items
+ **/
+void
+thunar_gtk_menu_clean (GtkMenu *menu)
+{
+  GList     *children, *lp;
+  GtkWidget *submenu;
+
+  children = gtk_container_get_children (GTK_CONTAINER (menu));
+  for (lp = children; lp != NULL; lp = lp->next)
+    {
+      submenu = gtk_menu_item_get_submenu (lp->data);
+      if (submenu != NULL)
+        gtk_widget_destroy (submenu);
+      gtk_container_remove (GTK_CONTAINER (menu), lp->data);
+    }
+  g_list_free (children);
+}
+
+
+
 /**
  * thunar_gtk_menu_run:
  * @menu : a #GtkMenu.

thunar/thunar-gtk-extensions.h

@@ -27,6 +27,7 @@ G_BEGIN_DECLS;
 
 void             thunar_gtk_label_set_a11y_relation           (GtkLabel           *label,
                                                                GtkWidget          *widget);
+void             thunar_gtk_menu_clean                        (GtkMenu            *menu);
 void             thunar_gtk_menu_run                          (GtkMenu            *menu);
 
 void             thunar_gtk_menu_run_at_event                 (GtkMenu            *menu,