From 67d1ed0f19733f11d0d9147efe96289f8029e94a Mon Sep 17 00:00:00 2001
From: Bandie <bandie@chaospott.de>
Date: Fri, 2 Nov 2018 23:13:57 +0100
Subject: [PATCH] No, 48x48 is not necessary. Statically link to the icon in
 desktop

---
 configure.ac                                     |   3 +--
 src/pam_panic_config/Makefile.am                 |   2 +-
 .../applications/pampanic-config.desktop         |   2 +-
 src/pam_panic_config/icons/48x48/Makefile.am     |   2 --
 src/pam_panic_config/icons/48x48/pampanic.png    | Bin 2272 -> 0 bytes
 .../icons/{scalable => }/Makefile.am             |   0
 .../icons/{scalable => }/pampanic.svg            |   0
 7 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/pam_panic_config/icons/48x48/Makefile.am
 delete mode 100644 src/pam_panic_config/icons/48x48/pampanic.png
 rename src/pam_panic_config/icons/{scalable => }/Makefile.am (100%)
 rename src/pam_panic_config/icons/{scalable => }/pampanic.svg (100%)

diff --git a/configure.ac b/configure.ac
index 6acda10..f2b8ce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,8 +77,7 @@ AC_CONFIG_FILES([
     src/pam_panic_pw/man/Makefile
     src/pam_panic_config/Makefile
     src/pam_panic_config/applications/Makefile
-    src/pam_panic_config/icons/48x48/Makefile
-    src/pam_panic_config/icons/scalable/Makefile
+    src/pam_panic_config/icons/Makefile
     test/Makefile
 ])
 
diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am
index 960a872..0dd48d1 100644
--- a/src/pam_panic_config/Makefile.am
+++ b/src/pam_panic_config/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = applications icons/48x48 icons/scalable
+SUBDIRS = applications icons
 bin_SCRIPTS = pam_panic_config
diff --git a/src/pam_panic_config/applications/pampanic-config.desktop b/src/pam_panic_config/applications/pampanic-config.desktop
index 0493db1..7bd38ae 100644
--- a/src/pam_panic_config/applications/pampanic-config.desktop
+++ b/src/pam_panic_config/applications/pampanic-config.desktop
@@ -18,7 +18,7 @@ Keywords[es]=PAM;seguridad;contraseña;autenticación;usb;
 Keywords[jp]=PAM;セキュリティ;パスワード;認証;USB;
 Exec=sudo pam_panic_config
 TryExec=pam_panic_config
-Icon=pampanic
+Icon=/usr/share/icons/hicolor/scalable/apps/pampanic.svg
 Terminal=true
 Categories=Settings;Security;ConsoleOnly;
 StartupNotify=false
diff --git a/src/pam_panic_config/icons/48x48/Makefile.am b/src/pam_panic_config/icons/48x48/Makefile.am
deleted file mode 100644
index 9fe0d3e..0000000
--- a/src/pam_panic_config/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-appicondir=$(datadir)/icons/hicolor/48x48/apps
-appicon_DATA=pampanic.png
diff --git a/src/pam_panic_config/icons/48x48/pampanic.png b/src/pam_panic_config/icons/48x48/pampanic.png
deleted file mode 100644
index 3eb96b34c5ec942b5d5ea171ab2be6cf407b0742..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2272
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

diff --git a/src/pam_panic_config/icons/scalable/Makefile.am b/src/pam_panic_config/icons/Makefile.am
similarity index 100%
rename from src/pam_panic_config/icons/scalable/Makefile.am
rename to src/pam_panic_config/icons/Makefile.am
diff --git a/src/pam_panic_config/icons/scalable/pampanic.svg b/src/pam_panic_config/icons/pampanic.svg
similarity index 100%
rename from src/pam_panic_config/icons/scalable/pampanic.svg
rename to src/pam_panic_config/icons/pampanic.svg