X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fbrowser.c;fp=player%2Fbrowser.c;h=9be256afbf8cced3681c957ba3865c70d256517f;hb=84814759ceb7dc7a97a3a73b6e365a5ca67d4ef8;hp=4646eefddbb2169d1914916c9f20822631bf9e79;hpb=32ba95a539a77d1dd2b94d19e83024c40d9c10c7;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/browser.c b/player/browser.c
index 4646eef..9be256a 100644
--- a/player/browser.c
+++ b/player/browser.c
@@ -3,7 +3,7 @@
 #include <gtk/gtk.h>
 #include "browser.h"
 #include "app.h"
-#include "error.h"
+#include "util.h"
 
 typedef struct _ChimaraBrowserPrivate {
 	int dummy;
@@ -49,19 +49,7 @@ chimara_browser_init(ChimaraBrowser *self)
 		"title", _("Chimara"),
 		NULL);
 
-	GtkUIManager *uimanager = gtk_ui_manager_new();
-	if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/browser.menus", &error) ) {
-#ifdef DEBUG
-		g_error_free(error);
-		error = NULL;
-		if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/browser.menus", &error) ) {
-#endif /* DEBUG */
-			error_dialog(NULL, error, "Error while building interface: ");
-			return;
-#ifdef DEBUG
-		}
-#endif /* DEBUG */
-	}
+	GtkUIManager *uimanager = new_ui_manager("browser.menus");
 
 	gtk_ui_manager_insert_action_group(uimanager, chimara_app_get_action_group(theapp), 0);
 	GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/browser_menu");