[totem/wip/hadess/interface-load: 2/6] main: Build main window from resource
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/interface-load: 2/6] main: Build main window from resource
- Date: Wed, 30 Mar 2022 12:41:49 +0000 (UTC)
commit d3ffc70d4e957f4f119cdd5128cf8c6db8cdfad9
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 30 14:17:30 2022 +0200
main: Build main window from resource
data/meson.build | 9 ---------
data/totem.gresource.xml | 1 +
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]