# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1275027887 0
# Node ID 0a3490f24e2bc3deacb6e3620731e9d923b52217
# Parent  34af082d702e6648b57e70d87622299d7b8d6d9c# Parent  44ec2e7c24881c9a792acae05b6883aa4c9d6cdb
merge of '3083d5a5d5b46193be6849e67ddef5bb26111789'
     and 'b14459623a35c6926c2e383067d203bff65fd06f'

diff -r 44ec2e7c2488 -r 0a3490f24e2b ChangeLog
--- a/ChangeLog	Fri May 28 04:13:53 2010 +0000
+++ b/ChangeLog	Fri May 28 06:24:47 2010 +0000
@@ -3,6 +3,9 @@
 version 2.7.1 (??/??/????):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
+	* Add configure option --enable-trayicon-compat which installs tray
+	  icons into directories that are compatible with older versions of
+	  hicolor-icon-theme (0.9).
 
 	Pidgin:
 	* Restore the tray icon's blinking functionality.
diff -r 44ec2e7c2488 -r 0a3490f24e2b configure.ac
--- a/configure.ac	Fri May 28 04:13:53 2010 +0000
+++ b/configure.ac	Fri May 28 06:24:47 2010 +0000
@@ -322,6 +322,8 @@
 	fi
 fi #enable_i18n
 
+AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+
 dnl #######################################################################
 dnl # Check for GLib 2.12 (required)
 dnl #######################################################################
@@ -2464,7 +2466,12 @@
 
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
 
-AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+dnl #######################################################################
+dnl # Tweak status tray icon installation directory
+dnl #######################################################################
+AC_ARG_ENABLE(trayicon-compat, AC_HELP_STRING([--enable-trayicon-compat], [install tray icons in location compatible with older releases of hicolor-icon-theme]), enable_traycompat="$enableval", enable_traycompat=no)
+
+AM_CONDITIONAL(ENABLE_TRAYCOMPAT, test "x$enable_traycompat" = "xyes")
 
 dnl #######################################################################
 dnl # Check for Doxygen and dot (part of GraphViz)
@@ -2635,6 +2642,7 @@
 echo Use external libzephyr........ : $zephyr
 echo Use external libgadu.......... : $gadu_libs
 echo Install pixmaps............... : $enable_pixmaps
+echo Old tray icon compatibility... : $enable_traycompat
 echo Install translations.......... : $enable_i18n
 echo Has you....................... : yes
 echo
@@ -2662,7 +2670,7 @@
 fi
 if test "x$enable_i18n" = "xno" ; then
 	echo
-	echo Warning: You have disabled the building and intallation of translation
+	echo Warning: You have disabled the building and installation of translation
 	echo data.  This will prevent building pidgin.desktop and the GConf schemas.
 	echo Be sure you know what you are doing.
 fi
diff -r 44ec2e7c2488 -r 0a3490f24e2b pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Fri May 28 04:13:53 2010 +0000
+++ b/pidgin/pixmaps/Makefile.am	Fri May 28 06:24:47 2010 +0000
@@ -587,11 +587,32 @@
 		$(TOOLBAR_32) \
 		$(TOOLBAR_48) \
 		$(TRAY_THEME) \
+		$(TRAY_16_ICO)
+if ENABLE_TRAYCOMPAT
+# Install in a location compatible with hicolor-icon-theme 0.9
+
+pidginpixmaptray16dir = $(datadir)/pixmaps/pidgin/tray/hicolor/16x16/actions
+dist_pidginpixmaptray16_DATA = $(TRAY_16)
+
+pidginpixmaptray22dir = $(datadir)/pixmaps/pidgin/tray/hicolor/22x22/actions
+dist_pidginpixmaptray22_DATA = $(TRAY_22)
+
+pidginpixmaptray32dir = $(datadir)/pixmaps/pidgin/tray/hicolor/32x32/actions
+dist_pidginpixmaptray32_DATA = $(TRAY_32)
+
+pidginpixmaptray48dir = $(datadir)/pixmaps/pidgin/tray/hicolor/48x48/actions
+dist_pidginpixmaptray48_DATA = $(TRAY_48)
+
+else
+# Install in the "correct" locations
+
+nobase_dist_pidginpixmap_DATA += \
 		$(TRAY_16) \
 		$(TRAY_16_ICO) \
 		$(TRAY_22) \
 		$(TRAY_32) \
 		$(TRAY_48)
+endif
 
 nobase_dist_pidginicons_DATA = \
 		$(ICONS_16) \
diff -r 44ec2e7c2488 -r 0a3490f24e2b pidgin/pixmaps/tray/hicolor/index.theme
--- a/pidgin/pixmaps/tray/hicolor/index.theme	Fri May 28 04:13:53 2010 +0000
+++ b/pidgin/pixmaps/tray/hicolor/index.theme	Fri May 28 06:24:47 2010 +0000
@@ -2,28 +2,55 @@
 Name=Pidgin
 Comment=Icon theme for Pidgin tray icons
 Hidden=True
-Directories=16x16/status,22x22/status,32x32/status,48x48/status,scalable/status
+Directories=16x16/actions,16x16/status,22x22/actions,22x22/status,32x32/actions,32x32/status,48x48/actions,48x48/status,scalable/actions,scalable/status
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
 
 [16x16/status]
 Size=16
 Context=Status
 Type=Threshold
 
+[22x22/actions]
+Size=22
+Context=Actions
+Type=Threshold
+
 [22x22/status]
 Size=22
 Context=Status
 Type=Threshold
 
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
 [32x32/status]
 Size=32
 Context=Status
 Type=Threshold
 
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
 [48x48/status]
 Size=48
 Context=Status
 Type=Threshold
 
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
 [scalable/status]
 MinSize=1
 Size=128