summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2022-02-08 15:51:06 +0100
committerBastien Nocera <hadess@hadess.net>2022-02-08 15:54:33 +0100
commit0c92c6d0763361a2c181a1cff413ab040d439009 (patch)
tree039335280e67b64880252ca55590ac9deec46dd7
parenta98e687d699cbc6f79689c4d6d921d106c698d06 (diff)
downloadtotem-0c92c6d0763361a2c181a1cff413ab040d439009.tar.gz
backend: Move internal icons to GResource
-rw-r--r--data/icons/meson.build12
-rw-r--r--src/backend/audio-only-symbolic.svg (renamed from data/icons/symbolic/audio-only-symbolic.svg)0
-rw-r--r--src/backend/bacon-video-widget.c3
-rw-r--r--src/backend/bacon-video-widget.gresource.xml2
-rw-r--r--src/backend/broken-video-symbolic.svg (renamed from data/icons/symbolic/broken-video-symbolic.svg)0
5 files changed, 5 insertions, 12 deletions
diff --git a/data/icons/meson.build b/data/icons/meson.build
index f1a12b601..1d61003c2 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -8,15 +8,3 @@ install_data(
rename : [application_id + '-symbolic.svg'],
install_dir: join_paths(totem_datadir, 'icons', 'hicolor', 'symbolic', 'apps')
)
-
-icons = [
- 'audio-only-symbolic.svg',
- 'broken-video-symbolic.svg'
-]
-
-foreach icon: icons
- install_data(
- join_paths('symbolic', icon),
- install_dir: join_paths(totem_datadir, 'icons', 'hicolor', 'scalable', 'status')
- )
-endforeach
diff --git a/data/icons/symbolic/audio-only-symbolic.svg b/src/backend/audio-only-symbolic.svg
index 53ef2e0fb..53ef2e0fb 100644
--- a/data/icons/symbolic/audio-only-symbolic.svg
+++ b/src/backend/audio-only-symbolic.svg
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 5dae6a17c..bf3f7efb2 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -927,6 +927,9 @@ bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
g_resources_register (_bvw_get_resource ());
+ GtkIconTheme *default_theme;
+ default_theme = gtk_icon_theme_get_default ();
+ gtk_icon_theme_add_resource_path (default_theme, "/org/gnome/totem/bvw");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/totem/bvw/bacon-video-widget.ui");
gtk_widget_class_bind_template_child (widget_class, BaconVideoWidget, stack);
gtk_widget_class_bind_template_child (widget_class, BaconVideoWidget, audio_only);
diff --git a/src/backend/bacon-video-widget.gresource.xml b/src/backend/bacon-video-widget.gresource.xml
index cf4abcd4b..a66a7a509 100644
--- a/src/backend/bacon-video-widget.gresource.xml
+++ b/src/backend/bacon-video-widget.gresource.xml
@@ -2,5 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/totem/bvw">
<file compressed="true">bacon-video-widget.ui</file>
+ <file preprocess="xml-stripblanks" alias="scalable/status/audio-only-symbolic.svg">audio-only-symbolic.svg</file>
+ <file preprocess="xml-stripblanks" alias="scalable/status/broken-video-symbolic.svg">broken-video-symbolic.svg</file>
</gresource>
</gresources>
diff --git a/data/icons/symbolic/broken-video-symbolic.svg b/src/backend/broken-video-symbolic.svg
index 066e1fb26..066e1fb26 100644
--- a/data/icons/symbolic/broken-video-symbolic.svg
+++ b/src/backend/broken-video-symbolic.svg