diff src/audacious/main.c @ 3309:4400659c1ea6 trunk

Automated merge with ssh://hg.atheme.org//hg/audacious

--- a/src/audacious/main.c	Fri Aug 10 10:46:22 2007 -0500
+++ b/src/audacious/main.c	Fri Aug 10 10:46:29 2007 -0500
@@ -1193,6 +1193,16 @@
     init_dbus();
 #endif
     mowgli_init();
+
+    if (options.headless != 1)
+    {
+      /* UIManager
+         NOTE: this needs to be called before plugin init, cause
+         plugin init functions may want to add custom menu entries */ 
+      ui_manager_init();
+      ui_manager_create_menus();
+    }
+
     plugin_system_init();
 
     /* Initialize the playlist system. */
@@ -1207,10 +1217,6 @@
 
         gtk_accel_map_load(bmp_paths[BMP_PATH_ACCEL_FILE]);
 
-        /* uimanager */
-        ui_manager_init();
-        ui_manager_create_menus();
-
         if (!init_skins(cfg.skin)) {
             run_load_skin_error_dialog(cfg.skin);
             exit(EXIT_FAILURE);