Avoid duplicating code

[projects/chimara/chimara.git] / player / browser.c

diff --git a/player/browser.c b/player/browser.c
index 4646eefddbb2169d1914916c9f20822631bf9e79..9be256afbf8cced3681c957ba3865c70d256517f 100644 (file)
--- 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");