Move icons to hicolor theme (WIP)

The transition is not complete, mgaapplet still needs fixed to lookup the icons
in the theme paths and no in a hardcoded /usr/share/mgaonline

16 files changed, 3 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index c7ead352..d5cdc508 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ SUBDIRS = po polkit
 
 PREFIX = /
 DATADIR = $(PREFIX)/usr/share
-PKGDATADIR = $(DATADIR)/$(NAME)
 ICONSDIR = $(DATADIR)/icons
 LIBEXECDIR = $(PREFIX)/usr/libexec
 BINDIR = $(PREFIX)/usr/bin
@@ -30,18 +29,14 @@ clean:
 	find . -name '*~' | xargs rm -f
 
 install: all
-	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/icons,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime}
+	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,autostart,gnome/autostart,icons},lib/libDrakX/drakfirsttime}
 	install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR)
 	install -m755 $(MGAAPPLET) $(MGAAPPLET)-update-checker $(BINDIR)
 	install -d $(SYSCONFDIR)
 	install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet
-	install -D -m644 icons/$(NAME)16.png $(ICONSDIR)/hicolor/16x16/apps/$(NAME).png
-	install -D -m644 icons/$(NAME)32.png $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png
-	install -D -m644 icons/$(NAME)48.png $(ICONSDIR)/hicolor/48x48/apps/$(NAME).png
-	install -D -m644 icons/$(NAME).svg $(ICONSDIR)/hicolor/scalable/apps/$(NAME).png
+	cp -a icons/hicolor $(ICONSDIR)
 	# Compat symlink, to be sure we don't break external apps relying on this icon
 	ln -s $(ICONSDIR)/hicolor/32x32/apps/$(NAME).png $(ICONSDIR)/$(NAME).png
-	install -m644 data/icons/*.svg $(PKGDATADIR)/icons
 	perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm
 	install -m644 mgaonline.pm $(FBLIBDIR)
 	install -m644 mgaapplet.pm $(FBLIBDIR)
diff --git a/icons/mgaonline16.png b/icons/hicolor/16x16/apps/mgaonline.png
index 1e376758..1e376758 100644
--- a/icons/mgaonline16.png
+++ b/icons/hicolor/16x16/apps/mgaonline.png
diff --git a/icons/mgaonline32.png b/icons/hicolor/32x32/apps/mgaonline.png
index 5dabbcab..5dabbcab 100644
--- a/icons/mgaonline32.png
+++ b/icons/hicolor/32x32/apps/mgaonline.png
diff --git a/icons/mgaonline48.png b/icons/hicolor/48x48/apps/mgaonline.png
index bb9df771..bb9df771 100644
--- a/icons/mgaonline48.png
+++ b/icons/hicolor/48x48/apps/mgaonline.png
diff --git a/data/icons/bugfix.svg b/icons/hicolor/scalable/actions/mgaonline-bugfix.svg
index 760d3e8c..760d3e8c 100644
--- a/data/icons/bugfix.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-bugfix.svg
diff --git a/data/icons/bundle.svg b/icons/hicolor/scalable/actions/mgaonline-bundle.svg
index 55c703df..55c703df 100644
--- a/data/icons/bundle.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-bundle.svg
diff --git a/data/icons/busy.svg b/icons/hicolor/scalable/actions/mgaonline-busy.svg
index 02591187..02591187 100644
--- a/data/icons/busy.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-busy.svg
diff --git a/data/icons/disabled.svg b/icons/hicolor/scalable/actions/mgaonline-disabled.svg
index 8453f8fb..8453f8fb 100644
--- a/data/icons/disabled.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-disabled.svg
diff --git a/data/icons/disconnect.svg b/icons/hicolor/scalable/actions/mgaonline-disconnect.svg
index a904ea83..a904ea83 100644
--- a/data/icons/disconnect.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-disconnect.svg
diff --git a/data/icons/noconf.svg b/icons/hicolor/scalable/actions/mgaonline-noconf.svg
index e0209c03..e0209c03 100644
--- a/data/icons/noconf.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-noconf.svg
diff --git a/data/icons/okay.svg b/icons/hicolor/scalable/actions/mgaonline-okay.svg
index 9a16755d..9a16755d 100644
--- a/data/icons/okay.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-okay.svg
diff --git a/data/icons/updates.svg b/icons/hicolor/scalable/actions/mgaonline-updates.svg
index 519c2aaa..519c2aaa 100644
--- a/data/icons/updates.svg
+++ b/icons/hicolor/scalable/actions/mgaonline-updates.svg
diff --git a/icons/mgaonline.svg b/icons/hicolor/scalable/apps/mgaonline.svg
index 71ec37ae..71ec37ae 100644
--- a/icons/mgaonline.svg
+++ b/icons/hicolor/scalable/apps/mgaonline.svg
diff --git a/mgaapplet b/mgaapplet
index 4b7d3a47..db76ba17 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -42,6 +42,7 @@ use Net::DBus qw(:typing);
 use Rpmdrake::open_db;
 use Glib::Object::Introspection;
 
+# FIXME: Icon lookup should be done in hicolor theme
 use constant IMAGE_FOLDER => '/usr/share/mgaonline/icons/';
 
 Glib::Object::Introspection->setup(
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 24d35104..9a6d516a 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -41,7 +41,6 @@ use Rpmdrake::open_db;
 use lang;
 use mgaapplet_gui qw(run_ask_credentials_dialog);
 
-ugtk3::add_icon_path("/usr/share/mgaonline/icons/");
 my ($log_file);
 
 my ($new_distro_version, $download_dir);
diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index 11190453..75e09fca 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -53,8 +53,6 @@ use interactive;
 use interactive::gtk;
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
 
-ugtk3::add_icon_path("/usr/share/mgaonline/icons/");
-
 our $localdir = "$ENV{HOME}/.MgaOnline";
 our $localfile = "$localdir/mgaonline";