[gnome-builder] Revert "plugins/newcomers: embed symbolic pngs instead of installing them"

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder] Revert "plugins/newcomers: embed symbolic pngs instead of installing them"
Date: Tue, 2 Aug 2022 01:30:48 +0000 (UTC)
commit d63afa09587a1c87de5ae17dacf3e80a22bafeac
Author: Christian Hergert <chergert redhat com>
Date:   Mon Aug 1 18:28:34 2022 -0700

    Revert "plugins/newcomers: embed symbolic pngs instead of installing them"
    
    This reverts commit b20fb92d1dd90e2f222f01235455fd82ff56d13f.
    
    We couldn't do this because it breaks the symbolic color as it was. We
    need to find a way to make the .symbolic.png work embedded, but i've yet
    to figure out the right incantation.

 .../32x32/actions/org.gnome.Builder-symbolic.png   | Bin 579 -> 0 bytes
 .../64x64/actions/org.gnome.Builder-symbolic.png   | Bin 1187 -> 0 bytes
 .../apps/org.gnome.Boxes-symbolic.symbolic.png}    | Bin
 .../apps/org.gnome.Calendar-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.Maps-symbolic.symbolic.png}     | Bin
 .../apps/org.gnome.Music-symbolic.symbolic.png}    | Bin
 .../apps/org.gnome.Nautilus-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.Photos-symbolic.symbolic.png}   | Bin
 .../apps/org.gnome.Polari-symbolic.symbolic.png}   | Bin
 .../org.gnome.SoundRecorder-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.clocks-symbolic.symbolic.png}   | Bin
 .../apps/org.gnome.gitg-symbolic.symbolic.png}     | Bin
 .../apps/org.gnome.Boxes-symbolic.symbolic.png}    | Bin
 .../apps/org.gnome.Calendar-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.Maps-symbolic.symbolic.png}     | Bin
 .../apps/org.gnome.Music-symbolic.symbolic.png}    | Bin
 .../apps/org.gnome.Nautilus-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.Photos-symbolic.symbolic.png}   | Bin
 .../apps/org.gnome.Polari-symbolic.symbolic.png}   | Bin
 .../org.gnome.SoundRecorder-symbolic.symbolic.png} | Bin
 .../apps/org.gnome.clocks-symbolic.symbolic.png}   | Bin
 .../apps/org.gnome.gitg-symbolic.symbolic.png}     | Bin
 .../symbolic/apps/org.gnome.Boxes-symbolic.svg     |   0
 .../symbolic/apps/org.gnome.Calendar-symbolic.svg  |   0
 .../symbolic/apps/org.gnome.Maps-symbolic.svg      |   0
 .../symbolic/apps/org.gnome.Music-symbolic.svg     |   0
 .../symbolic/apps/org.gnome.Nautilus-symbolic.svg  |   0
 .../symbolic/apps/org.gnome.Photos-symbolic.svg    |   0
 .../symbolic/apps/org.gnome.Polari-symbolic.svg    |   0
 .../apps/org.gnome.SoundRecorder-symbolic.svg      |   0
 .../symbolic/apps/org.gnome.clocks-symbolic.svg    |   0
 .../symbolic/apps/org.gnome.gitg-symbolic.svg      |   0
 src/plugins/newcomers/icons/meson.build            |   3 +++
 .../symbolic/apps/org.gnome.Builder-symbolic.svg   |   1 -
 src/plugins/newcomers/meson.build                  |   2 ++
 src/plugins/newcomers/newcomers-plugin.c           |   6 -----
 src/plugins/newcomers/newcomers.gresource.xml      |  26 ---------------------
 37 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Boxes-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Boxes-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Boxes-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Boxes-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Calendar-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Calendar-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Calendar-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Calendar-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Maps-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Maps-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Maps-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Maps-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Music-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Music-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Music-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Music-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Nautilus-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Nautilus-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Nautilus-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Nautilus-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Photos-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Photos-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Photos-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Photos-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.Polari-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Polari-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.Polari-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.Polari-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.SoundRecorder-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.SoundRecorder-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.SoundRecorder-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.SoundRecorder-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.clocks-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.clocks-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.clocks-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.clocks-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/32x32/actions/org.gnome.gitg-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.gitg-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/32x32/actions/org.gnome.gitg-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/32x32/apps/org.gnome.gitg-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Boxes-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Boxes-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Boxes-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Boxes-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Calendar-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Calendar-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Calendar-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Calendar-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Maps-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Maps-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Maps-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Maps-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Music-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Music-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Music-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Music-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Nautilus-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Nautilus-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Nautilus-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Nautilus-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Photos-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Photos-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Photos-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Photos-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.Polari-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Polari-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.Polari-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.Polari-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.SoundRecorder-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.SoundRecorder-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.SoundRecorder-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.SoundRecorder-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.clocks-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.clocks-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.clocks-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.clocks-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/64x64/actions/org.gnome.gitg-symbolic.png 
b/src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.gitg-symbolic.symbolic.png
similarity index 100%
rename from src/plugins/newcomers/icons/64x64/actions/org.gnome.gitg-symbolic.png
rename to src/plugins/newcomers/icons/hicolor/64x64/apps/org.gnome.gitg-symbolic.symbolic.png
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Boxes-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Boxes-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Calendar-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Calendar-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Calendar-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Calendar-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Maps-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Maps-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Maps-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Maps-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Music-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Music-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Music-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Nautilus-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Nautilus-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Photos-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Photos-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Photos-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Photos-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.Polari-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Polari-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.Polari-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.Polari-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.SoundRecorder-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.SoundRecorder-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.SoundRecorder-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.SoundRecorder-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.clocks-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.clocks-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.clocks-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.clocks-symbolic.svg
diff --git a/src/plugins/newcomers/icons/symbolic/apps/org.gnome.gitg-symbolic.svg 
b/src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.gitg-symbolic.svg
similarity index 100%
rename from src/plugins/newcomers/icons/symbolic/apps/org.gnome.gitg-symbolic.svg
rename to src/plugins/newcomers/icons/hicolor/symbolic/apps/org.gnome.gitg-symbolic.svg
diff --git a/src/plugins/newcomers/icons/meson.build b/src/plugins/newcomers/icons/meson.build
new file mode 100644
index 000000000..91da32253
--- /dev/null
+++ b/src/plugins/newcomers/icons/meson.build
@@ -0,0 +1,3 @@
+foreach size: ['32x32', '64x64']
+  install_subdir('hicolor/@0@'.format(size), install_dir: pkgicondir)
+endforeach
diff --git a/src/plugins/newcomers/meson.build b/src/plugins/newcomers/meson.build
index 256d7a10c..2cdf4bbe4 100644
--- a/src/plugins/newcomers/meson.build
+++ b/src/plugins/newcomers/meson.build
@@ -14,4 +14,6 @@ plugin_newcomers_resources = gnome.compile_resources(
 
 plugins_sources += plugin_newcomers_resources
 
+subdir('icons')
+
 endif
diff --git a/src/plugins/newcomers/newcomers-plugin.c b/src/plugins/newcomers/newcomers-plugin.c
index 12dd404d8..6ec9547c8 100644
--- a/src/plugins/newcomers/newcomers-plugin.c
+++ b/src/plugins/newcomers/newcomers-plugin.c
@@ -22,9 +22,7 @@
 
 #include "config.h"
 
-#include <gtk/gtk.h>
 #include <libpeas/peas.h>
-
 #include <libide-greeter.h>
 
 #include "gbp-newcomers-section.h"
@@ -32,10 +30,6 @@
 _IDE_EXTERN void
 _gbp_newcomers_register_types (PeasObjectModule *module)
 {
-  GdkDisplay *display = gdk_display_get_default ();
-  GtkIconTheme *icon_theme = gtk_icon_theme_get_for_display (display);
-
-  gtk_icon_theme_add_resource_path (icon_theme, "/plugins/newcomers/icons");
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_GREETER_SECTION,
                                               GBP_TYPE_NEWCOMERS_SECTION);
diff --git a/src/plugins/newcomers/newcomers.gresource.xml b/src/plugins/newcomers/newcomers.gresource.xml
index c169c7cae..1b7673963 100644
--- a/src/plugins/newcomers/newcomers.gresource.xml
+++ b/src/plugins/newcomers/newcomers.gresource.xml
@@ -3,31 +3,5 @@
   <gresource prefix="/plugins/newcomers">
     <file>newcomers.plugin</file>
     <file>gbp-newcomers-section.ui</file>
-
-    <!-- symbolic app icons for 1x -->
-    <file>icons/64x64/actions/org.gnome.Boxes-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Builder-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Calendar-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Maps-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Music-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Nautilus-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Photos-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.Polari-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.SoundRecorder-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.clocks-symbolic.png</file>
-    <file>icons/64x64/actions/org.gnome.gitg-symbolic.png</file>
-
-    <!-- symbolic app icons for 2x -->
-    <file>icons/32x32/actions/org.gnome.Boxes-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Builder-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Calendar-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Maps-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Music-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Nautilus-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Photos-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.Polari-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.SoundRecorder-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.clocks-symbolic.png</file>
-    <file>icons/32x32/actions/org.gnome.gitg-symbolic.png</file>
   </gresource>
 </gresources>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]