diff options
author | rbuj <[email protected]> | 2019-02-22 12:02:30 +0100 |
---|---|---|
committer | ZenWalker <[email protected]> | 2019-03-15 20:37:21 +0100 |
commit | 449753407d3ecf43e3401363557437984c138941 (patch) | |
tree | 9fc9697392d10fce6c36a676e94c7ff16b879ec2 /src/terminal-util.c | |
parent | 773ef179210ecc4572ba9df1887ba79ac1eb1876 (diff) | |
download | mate-terminal-449753407d3ecf43e3401363557437984c138941.tar.bz2 mate-terminal-449753407d3ecf43e3401363557437984c138941.tar.xz |
Use gresources for about_DATA, uimanager_DATA & builder_DATA
Diffstat (limited to 'src/terminal-util.c')
-rw-r--r-- | src/terminal-util.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/terminal-util.c b/src/terminal-util.c index 3c7cb3b..1ffb629 100644 --- a/src/terminal-util.c +++ b/src/terminal-util.c @@ -339,26 +339,17 @@ terminal_util_get_licence_text (void) } gboolean -terminal_util_load_builder_file (const char *filename, +terminal_util_load_builder_resource (const char *path, const char *object_name, ...) { - char *path; GtkBuilder *builder; GError *error = NULL; va_list args; - path = g_build_filename (TERM_PKGDATADIR, filename, NULL); builder = gtk_builder_new (); - if (!gtk_builder_add_from_file (builder, path, &error)) - { - g_warning ("Failed to load %s: %s\n", filename, error->message); - g_error_free (error); - g_free (path); - g_object_unref (builder); - return FALSE; - } - g_free (path); + gtk_builder_add_from_resource (builder, path, &error); + g_assert_no_error (error); va_start (args, object_name); |