diff options
author | rbuj <[email protected]> | 2021-02-03 13:34:43 +0100 |
---|---|---|
committer | raveit65 <[email protected]> | 2021-02-25 08:10:37 +0100 |
commit | 09179d9d1d686db03701c843172c43c5425afdda (patch) | |
tree | ab0870b60ed4ad86f78a7555839c572f604a7e41 /pluma/pluma-window.c | |
parent | a17e85d74bc6e6d7927880eaa50bee4141cef58c (diff) | |
download | pluma-09179d9d1d686db03701c843172c43c5425afdda.tar.bz2 pluma-09179d9d1d686db03701c843172c43c5425afdda.tar.xz |
Drop pluma_dirs_get_ui_file
Diffstat (limited to 'pluma/pluma-window.c')
-rw-r--r-- | pluma/pluma-window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c index 58d3fcf7..337af89c 100644 --- a/pluma/pluma-window.c +++ b/pluma/pluma-window.c @@ -63,7 +63,6 @@ #include "pluma-settings.h" #define LANGUAGE_NONE (const gchar *)"LangNone" -#define PLUMA_UIFILE "pluma-ui.xml" #define TAB_WIDTH_DATA "PlumaWindowTabWidthData" #define LANGUAGE_DATA "PlumaWindowLanguageData" #define FULLSCREEN_ANIMATION_SPEED 4 @@ -1505,7 +1504,6 @@ create_menu_bar_and_toolbar (PlumaWindow *window, GtkUIManager *manager; GtkRecentManager *recent_manager; GError *error = NULL; - gchar *ui_file; pluma_debug (DEBUG_WINDOW); @@ -1590,14 +1588,16 @@ create_menu_bar_and_toolbar (PlumaWindow *window, window->priv->panes_action_group = action_group; /* now load the UI definition */ - ui_file = pluma_dirs_get_ui_file (PLUMA_UIFILE); - gtk_ui_manager_add_ui_from_file (manager, ui_file, &error); + gtk_ui_manager_add_ui_from_file (manager, + PLUMA_DATADIR "/ui/pluma-ui.xml", + &error); if (error != NULL) { - g_warning ("Could not merge %s: %s", ui_file, error->message); + g_warning ("Could not merge %s: %s", + PLUMA_DATADIR "/ui/pluma-ui.xml", + error->message); g_error_free (error); } - g_free (ui_file); /* show tooltips in the statusbar */ g_signal_connect (manager, |