[gthumb] use the local icons if the run-in-place option is enabled

From: Paolo Bacchilega <paobac src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gthumb] use the local icons if the run-in-place option is enabled
Date: Sun, 17 Jan 2010 16:39:41 +0000 (UTC)
commit e980b588c1586061532ac9d6a733eb08cd2e1ede
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jan 17 17:28:01 2010 +0100

    use the local icons if the run-in-place option is enabled

 configure.ac                                       |   29 ++++++++++---------
 data/icons/Makefile.am                             |   15 +---------
 data/icons/{ => hicolor}/16x16/Makefile.am         |    0
 data/icons/{ => hicolor}/16x16/actions/Makefile.am |    0
 .../{ => hicolor}/16x16/actions/browser-mode.png   |  Bin 577 -> 577 bytes
 .../{ => hicolor}/16x16/actions/file-catalog.png   |  Bin 436 -> 436 bytes
 .../{ => hicolor}/16x16/actions/file-library.png   |  Bin 444 -> 444 bytes
 .../{ => hicolor}/16x16/actions/file-search.png    |  Bin 655 -> 655 bytes
 data/icons/{ => hicolor}/16x16/apps/Makefile.am    |    0
 data/icons/{ => hicolor}/16x16/apps/gthumb.png     |  Bin 798 -> 798 bytes
 data/icons/{ => hicolor}/16x16/apps/gthumb.svg     |    0
 data/icons/{ => hicolor}/22x22/Makefile.am         |    0
 data/icons/{ => hicolor}/22x22/actions/Makefile.am |    0
 .../{ => hicolor}/22x22/actions/browser-mode.png   |  Bin 1114 -> 1114 bytes
 .../{ => hicolor}/22x22/actions/file-catalog.png   |  Bin 650 -> 650 bytes
 .../{ => hicolor}/22x22/actions/file-library.png   |  Bin 650 -> 650 bytes
 .../{ => hicolor}/22x22/actions/file-search.png    |  Bin 891 -> 891 bytes
 data/icons/{ => hicolor}/22x22/actions/palette.png |  Bin 1390 -> 1390 bytes
 .../{ => hicolor}/22x22/actions/zoom-fit-width.png |  Bin 1405 -> 1405 bytes
 data/icons/{ => hicolor}/22x22/apps/Makefile.am    |    0
 data/icons/{ => hicolor}/22x22/apps/gthumb.png     |  Bin 1573 -> 1573 bytes
 data/icons/{ => hicolor}/22x22/apps/gthumb.svg     |    0
 data/icons/{ => hicolor}/32x32/Makefile.am         |    0
 data/icons/{ => hicolor}/32x32/apps/Makefile.am    |    0
 data/icons/{ => hicolor}/32x32/apps/gthumb.png     |  Bin 2628 -> 2628 bytes
 data/icons/{ => hicolor}/32x32/apps/gthumb.svg     |    0
 data/icons/{ => hicolor}/48x48/Makefile.am         |    0
 data/icons/{ => hicolor}/48x48/actions/Makefile.am |    0
 .../{ => hicolor}/48x48/actions/browser-mode.png   |  Bin 2730 -> 2730 bytes
 .../{ => hicolor}/48x48/actions/file-catalog.png   |  Bin 1438 -> 1438 bytes
 .../{ => hicolor}/48x48/actions/file-library.png   |  Bin 1438 -> 1438 bytes
 .../{ => hicolor}/48x48/actions/file-search.png    |  Bin 2097 -> 2097 bytes
 data/icons/{ => hicolor}/48x48/actions/palette.png |  Bin 4057 -> 4057 bytes
 data/icons/{ => hicolor}/48x48/apps/Makefile.am    |    0
 data/icons/{ => hicolor}/48x48/apps/gthumb.png     |  Bin 4765 -> 4765 bytes
 data/icons/{ => hicolor}/48x48/apps/gthumb.svg     |    0
 data/icons/hicolor/Makefile.am                     |   16 +++++++++++
 data/icons/{ => hicolor}/scalable/Makefile.am      |    0
 .../{ => hicolor}/scalable/actions/Makefile.am     |    0
 .../scalable/actions/browser-mode.svg              |    0
 .../scalable/actions/file-catalog.svg              |    0
 .../scalable/actions/file-library.svg              |    0
 .../{ => hicolor}/scalable/actions/file-search.svg |    0
 .../{ => hicolor}/scalable/actions/palette.svg     |    0
 data/icons/{ => hicolor}/scalable/apps/Makefile.am |    0
 data/icons/{ => hicolor}/scalable/apps/gthumb.svg  |    0
 gthumb/Makefile.am                                 |    3 ++
 gthumb/gth-main.c                                  |    2 +-
 48 files changed, 36 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 299d6b1..e3aff44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,20 +309,21 @@ data/gthumb.desktop.in
 data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in
 data/gthumb-import.desktop.in
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/22x22/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/32x32/Makefile
-data/icons/32x32/apps/Makefile
-data/icons/48x48/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/48x48/apps/Makefile
-data/icons/scalable/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/apps/Makefile
+data/icons/hicolor/Makefile
+data/icons/hicolor/16x16/Makefile
+data/icons/hicolor/16x16/actions/Makefile
+data/icons/hicolor/16x16/apps/Makefile
+data/icons/hicolor/22x22/Makefile
+data/icons/hicolor/22x22/actions/Makefile
+data/icons/hicolor/22x22/apps/Makefile
+data/icons/hicolor/32x32/Makefile
+data/icons/hicolor/32x32/apps/Makefile
+data/icons/hicolor/48x48/Makefile
+data/icons/hicolor/48x48/actions/Makefile
+data/icons/hicolor/48x48/apps/Makefile
+data/icons/hicolor/scalable/Makefile
+data/icons/hicolor/scalable/actions/Makefile
+data/icons/hicolor/scalable/apps/Makefile
 data/ui/Makefile
 help/Makefile
 extensions/Makefile
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index cd6358a..e9b9c06 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,16 +1,3 @@
-SUBDIRS = 16x16 22x22 32x32 48x48 scalable
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
+SUBDIRS = hicolor
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/hicolor/16x16/Makefile.am
similarity index 100%
rename from data/icons/16x16/Makefile.am
rename to data/icons/hicolor/16x16/Makefile.am
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/hicolor/16x16/actions/Makefile.am
similarity index 100%
rename from data/icons/16x16/actions/Makefile.am
rename to data/icons/hicolor/16x16/actions/Makefile.am
diff --git a/data/icons/16x16/actions/browser-mode.png b/data/icons/hicolor/16x16/actions/browser-mode.png
similarity index 100%
rename from data/icons/16x16/actions/browser-mode.png
rename to data/icons/hicolor/16x16/actions/browser-mode.png
diff --git a/data/icons/16x16/actions/file-catalog.png b/data/icons/hicolor/16x16/actions/file-catalog.png
similarity index 100%
rename from data/icons/16x16/actions/file-catalog.png
rename to data/icons/hicolor/16x16/actions/file-catalog.png
diff --git a/data/icons/16x16/actions/file-library.png b/data/icons/hicolor/16x16/actions/file-library.png
similarity index 100%
rename from data/icons/16x16/actions/file-library.png
rename to data/icons/hicolor/16x16/actions/file-library.png
diff --git a/data/icons/16x16/actions/file-search.png b/data/icons/hicolor/16x16/actions/file-search.png
similarity index 100%
rename from data/icons/16x16/actions/file-search.png
rename to data/icons/hicolor/16x16/actions/file-search.png
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/hicolor/16x16/apps/Makefile.am
similarity index 100%
rename from data/icons/16x16/apps/Makefile.am
rename to data/icons/hicolor/16x16/apps/Makefile.am
diff --git a/data/icons/16x16/apps/gthumb.png b/data/icons/hicolor/16x16/apps/gthumb.png
similarity index 100%
rename from data/icons/16x16/apps/gthumb.png
rename to data/icons/hicolor/16x16/apps/gthumb.png
diff --git a/data/icons/16x16/apps/gthumb.svg b/data/icons/hicolor/16x16/apps/gthumb.svg
similarity index 100%
rename from data/icons/16x16/apps/gthumb.svg
rename to data/icons/hicolor/16x16/apps/gthumb.svg
diff --git a/data/icons/22x22/Makefile.am b/data/icons/hicolor/22x22/Makefile.am
similarity index 100%
rename from data/icons/22x22/Makefile.am
rename to data/icons/hicolor/22x22/Makefile.am
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/hicolor/22x22/actions/Makefile.am
similarity index 100%
rename from data/icons/22x22/actions/Makefile.am
rename to data/icons/hicolor/22x22/actions/Makefile.am
diff --git a/data/icons/22x22/actions/browser-mode.png b/data/icons/hicolor/22x22/actions/browser-mode.png
similarity index 100%
rename from data/icons/22x22/actions/browser-mode.png
rename to data/icons/hicolor/22x22/actions/browser-mode.png
diff --git a/data/icons/22x22/actions/file-catalog.png b/data/icons/hicolor/22x22/actions/file-catalog.png
similarity index 100%
rename from data/icons/22x22/actions/file-catalog.png
rename to data/icons/hicolor/22x22/actions/file-catalog.png
diff --git a/data/icons/22x22/actions/file-library.png b/data/icons/hicolor/22x22/actions/file-library.png
similarity index 100%
rename from data/icons/22x22/actions/file-library.png
rename to data/icons/hicolor/22x22/actions/file-library.png
diff --git a/data/icons/22x22/actions/file-search.png b/data/icons/hicolor/22x22/actions/file-search.png
similarity index 100%
rename from data/icons/22x22/actions/file-search.png
rename to data/icons/hicolor/22x22/actions/file-search.png
diff --git a/data/icons/22x22/actions/palette.png b/data/icons/hicolor/22x22/actions/palette.png
similarity index 100%
rename from data/icons/22x22/actions/palette.png
rename to data/icons/hicolor/22x22/actions/palette.png
diff --git a/data/icons/22x22/actions/zoom-fit-width.png b/data/icons/hicolor/22x22/actions/zoom-fit-width.png
similarity index 100%
rename from data/icons/22x22/actions/zoom-fit-width.png
rename to data/icons/hicolor/22x22/actions/zoom-fit-width.png
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/hicolor/22x22/apps/Makefile.am
similarity index 100%
rename from data/icons/22x22/apps/Makefile.am
rename to data/icons/hicolor/22x22/apps/Makefile.am
diff --git a/data/icons/22x22/apps/gthumb.png b/data/icons/hicolor/22x22/apps/gthumb.png
similarity index 100%
rename from data/icons/22x22/apps/gthumb.png
rename to data/icons/hicolor/22x22/apps/gthumb.png
diff --git a/data/icons/22x22/apps/gthumb.svg b/data/icons/hicolor/22x22/apps/gthumb.svg
similarity index 100%
rename from data/icons/22x22/apps/gthumb.svg
rename to data/icons/hicolor/22x22/apps/gthumb.svg
diff --git a/data/icons/32x32/Makefile.am b/data/icons/hicolor/32x32/Makefile.am
similarity index 100%
rename from data/icons/32x32/Makefile.am
rename to data/icons/hicolor/32x32/Makefile.am
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/hicolor/32x32/apps/Makefile.am
similarity index 100%
rename from data/icons/32x32/apps/Makefile.am
rename to data/icons/hicolor/32x32/apps/Makefile.am
diff --git a/data/icons/32x32/apps/gthumb.png b/data/icons/hicolor/32x32/apps/gthumb.png
similarity index 100%
rename from data/icons/32x32/apps/gthumb.png
rename to data/icons/hicolor/32x32/apps/gthumb.png
diff --git a/data/icons/32x32/apps/gthumb.svg b/data/icons/hicolor/32x32/apps/gthumb.svg
similarity index 100%
rename from data/icons/32x32/apps/gthumb.svg
rename to data/icons/hicolor/32x32/apps/gthumb.svg
diff --git a/data/icons/48x48/Makefile.am b/data/icons/hicolor/48x48/Makefile.am
similarity index 100%
rename from data/icons/48x48/Makefile.am
rename to data/icons/hicolor/48x48/Makefile.am
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/hicolor/48x48/actions/Makefile.am
similarity index 100%
rename from data/icons/48x48/actions/Makefile.am
rename to data/icons/hicolor/48x48/actions/Makefile.am
diff --git a/data/icons/48x48/actions/browser-mode.png b/data/icons/hicolor/48x48/actions/browser-mode.png
similarity index 100%
rename from data/icons/48x48/actions/browser-mode.png
rename to data/icons/hicolor/48x48/actions/browser-mode.png
diff --git a/data/icons/48x48/actions/file-catalog.png b/data/icons/hicolor/48x48/actions/file-catalog.png
similarity index 100%
rename from data/icons/48x48/actions/file-catalog.png
rename to data/icons/hicolor/48x48/actions/file-catalog.png
diff --git a/data/icons/48x48/actions/file-library.png b/data/icons/hicolor/48x48/actions/file-library.png
similarity index 100%
rename from data/icons/48x48/actions/file-library.png
rename to data/icons/hicolor/48x48/actions/file-library.png
diff --git a/data/icons/48x48/actions/file-search.png b/data/icons/hicolor/48x48/actions/file-search.png
similarity index 100%
rename from data/icons/48x48/actions/file-search.png
rename to data/icons/hicolor/48x48/actions/file-search.png
diff --git a/data/icons/48x48/actions/palette.png b/data/icons/hicolor/48x48/actions/palette.png
similarity index 100%
rename from data/icons/48x48/actions/palette.png
rename to data/icons/hicolor/48x48/actions/palette.png
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/hicolor/48x48/apps/Makefile.am
similarity index 100%
rename from data/icons/48x48/apps/Makefile.am
rename to data/icons/hicolor/48x48/apps/Makefile.am
diff --git a/data/icons/48x48/apps/gthumb.png b/data/icons/hicolor/48x48/apps/gthumb.png
similarity index 100%
rename from data/icons/48x48/apps/gthumb.png
rename to data/icons/hicolor/48x48/apps/gthumb.png
diff --git a/data/icons/48x48/apps/gthumb.svg b/data/icons/hicolor/48x48/apps/gthumb.svg
similarity index 100%
rename from data/icons/48x48/apps/gthumb.svg
rename to data/icons/hicolor/48x48/apps/gthumb.svg
diff --git a/data/icons/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
new file mode 100644
index 0000000..cd6358a
--- /dev/null
+++ b/data/icons/hicolor/Makefile.am
@@ -0,0 +1,16 @@
+SUBDIRS = 16x16 22x22 32x32 48x48 scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
similarity index 100%
rename from data/icons/scalable/Makefile.am
rename to data/icons/hicolor/scalable/Makefile.am
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/hicolor/scalable/actions/Makefile.am
similarity index 100%
rename from data/icons/scalable/actions/Makefile.am
rename to data/icons/hicolor/scalable/actions/Makefile.am
diff --git a/data/icons/scalable/actions/browser-mode.svg b/data/icons/hicolor/scalable/actions/browser-mode.svg
similarity index 100%
rename from data/icons/scalable/actions/browser-mode.svg
rename to data/icons/hicolor/scalable/actions/browser-mode.svg
diff --git a/data/icons/scalable/actions/file-catalog.svg b/data/icons/hicolor/scalable/actions/file-catalog.svg
similarity index 100%
rename from data/icons/scalable/actions/file-catalog.svg
rename to data/icons/hicolor/scalable/actions/file-catalog.svg
diff --git a/data/icons/scalable/actions/file-library.svg b/data/icons/hicolor/scalable/actions/file-library.svg
similarity index 100%
rename from data/icons/scalable/actions/file-library.svg
rename to data/icons/hicolor/scalable/actions/file-library.svg
diff --git a/data/icons/scalable/actions/file-search.svg b/data/icons/hicolor/scalable/actions/file-search.svg
similarity index 100%
rename from data/icons/scalable/actions/file-search.svg
rename to data/icons/hicolor/scalable/actions/file-search.svg
diff --git a/data/icons/scalable/actions/palette.svg b/data/icons/hicolor/scalable/actions/palette.svg
similarity index 100%
rename from data/icons/scalable/actions/palette.svg
rename to data/icons/hicolor/scalable/actions/palette.svg
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/hicolor/scalable/apps/Makefile.am
similarity index 100%
rename from data/icons/scalable/apps/Makefile.am
rename to data/icons/hicolor/scalable/apps/Makefile.am
diff --git a/data/icons/scalable/apps/gthumb.svg b/data/icons/hicolor/scalable/apps/gthumb.svg
similarity index 100%
rename from data/icons/scalable/apps/gthumb.svg
rename to data/icons/hicolor/scalable/apps/gthumb.svg
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 8dd5f48..dfc6bc1 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -243,10 +243,12 @@ gthumb_LDADD =						\
 
 if RUN_IN_PLACE
 ui_dir = $(abs_top_srcdir)/data/ui
+icon_dir = $(abs_top_srcdir)/data/icons
 extensions_ui_dir = $(abs_top_srcdir)/extensions
 extensions_dir = $(abs_top_builddir)/extensions
 else
 ui_dir = $(pkgdatadir)/ui
+icon_dir = $(pkgdatadir)/icons
 extensions_ui_dir = $(pkgdatadir)/ui
 extensions_dir = $(pkglibdir)/extensions
 endif
@@ -262,6 +264,7 @@ gthumb_CFLAGS =							\
 	-DGTHUMB_LIBDIR=\"$(libdir)\" 				\
 	-DGTHUMB_PKGDATADIR=\"$(pkgdatadir)\"			\
 	-DGTHUMB_UI_DIR=\"$(ui_dir)\"				\
+	-DGTHUMB_ICON_DIR=\"$(icon_dir)\"			\
 	-DGTHUMB_EXTENSIONS_UI_DIR=\"$(extensions_ui_dir)\"	\
 	-DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\"		\
 	$(NULL)
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 7e875de..0f5b0b7 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -256,7 +256,7 @@ gth_main_initialize (void)
 
 	g_set_application_name (_("gthumb"));
 	gtk_window_set_default_icon_name ("gthumb");
-	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), GTHUMB_PKGDATADIR G_DIR_SEPARATOR_S "icons");
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), GTHUMB_ICON_DIR);
 	gtk_about_dialog_set_url_hook (about_dialog_activate_link_cb, NULL, NULL);
 	gtk_about_dialog_set_email_hook (about_dialog_activate_email_cb, NULL, NULL);
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]