Add new application menu plugin.

Garcon based menu plugin. Basically works the same as
the plugin in xfdesktop, with an  additional option
to show the generic names in the menu.

Also extend the migration program to migrate from the
xfdesktop menu to the panel menu.

1 files changed, 23 insertions, 0 deletions

diff --git a/migrate/migrate-46.c b/migrate/migrate-46.c
index 80508610..c9ba6868 100644
--- a/migrate/migrate-46.c
+++ b/migrate/migrate-46.c
@@ -553,6 +553,23 @@ migrate_46_plugin_windowlist (XfconfChannel *channel,
 
 
 static void
+migrate_46_plugin_xfce4_menu (XfconfChannel *channel,
+                              XfceRc        *rc)
+{
+  migrate_46_plugin_bool ("show_menu_icons", "show-menu-icons", TRUE);
+  migrate_46_plugin_bool ("show_button_title", "show-button-title", TRUE);
+  migrate_46_plugin_string ("menu_file", "custom-menu-file", "");
+  migrate_46_plugin_string ("icon_file", "button-icon", "xfce4-panel-menu");
+  migrate_46_plugin_string ("button_title", "button-title", "");
+
+  if (xfce_rc_has_entry (rc, "use_default_menu"))
+    xfconf_channel_set_bool (channel, "/custom-menu",
+       !xfce_rc_read_bool_entry (rc, "use_default_menu", TRUE));
+}
+
+
+
+static void
 migrate_46_panel_add_plugin (ConfigParser  *parser,
                              const gchar   *name,
                              const gchar   *id,
@@ -626,6 +643,12 @@ migrate_46_panel_add_plugin (ConfigParser  *parser,
       if (G_LIKELY (rc != NULL))
         migrate_46_plugin_windowlist (channel, rc);
     }
+  else if (strcmp (name, "xfce4-menu") == 0)
+    {
+      plugin_name = "applicationsmenu";
+      if (G_LIKELY (rc != NULL))
+        migrate_46_plugin_xfce4_menu (channel, rc);
+    }
   else
     {
       /* handle other "external" plugins */