diff options
| author | Bastien Nocera <hadess@hadess.net> | 2022-03-30 14:17:30 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2022-03-30 14:42:06 +0200 |
| commit | d5b2ae499ef49a170fe23592ec812396ec1a815c (patch) | |
| tree | 5ce1fb9413fdd37deba45dbce541b432f31f2212 | |
| parent | c7a709c1188822c8a2c26f48a3703770523650e7 (diff) | |
| download | totem-d5b2ae499ef49a170fe23592ec812396ec1a815c.tar.gz | |
main: Build main window from resource
| -rw-r--r-- | data/meson.build | 9 | ||||
| -rw-r--r-- | data/totem.gresource.xml | 1 | ||||
| -rw-r--r-- | src/totem-object.c | 5 |
3 files changed, 2 insertions, 13 deletions
diff --git a/data/meson.build b/data/meson.build index 51e2bb5f9..2209dacba 100644 --- a/data/meson.build +++ b/data/meson.build @@ -36,15 +36,6 @@ else message('Man page generation disabled') endif -ui_files = files( - 'totem.ui', -) - -install_data( - ui_files, - install_dir: totem_pkgdatadir -) - ui_resources = gnome.compile_resources( 'totemresources', 'totem.gresource.xml', diff --git a/data/totem.gresource.xml b/data/totem.gresource.xml index d5f6061de..aeb11ac02 100644 --- a/data/totem.gresource.xml +++ b/data/totem.gresource.xml @@ -5,5 +5,6 @@ <file compressed="true">playlist.ui</file> <file compressed="true">uri.ui</file> <file compressed="true">shortcuts.ui</file> + <file compressed="true">totem.ui</file> </gresource> </gresources> diff --git a/src/totem-object.c b/src/totem-object.c index 01a2d3c2d..e1cc12cdd 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -179,10 +179,7 @@ totem_object_app_activate (GApplication *app) return; /* Main window */ - totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem); - if (totem->xml == NULL) - totem_object_exit (NULL); - + totem->xml = gtk_builder_new_from_resource ("/org/gnome/totem/ui/totem.ui"); totem->bvw = BACON_VIDEO_WIDGET (gtk_builder_get_object (totem->xml, "bvw")); totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window")); #if DEVELOPMENT_VERSION |