pidgin: 3083d5a5: Add a configure option --enable-trayicon...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 3083d5a5d5b46193be6849e67ddef5bb26111789
Ancestor: 760e30937c90e5827b73e5a2483cde58d71c1f30
Author: qulogic at pidgin.im
Date: 2010-05-28T06:14:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3083d5a5d5b46193be6849e67ddef5bb26111789

Modified files:
        ChangeLog configure.ac pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/tray/hicolor/index.theme

ChangeLog: 

Add a configure option --enable-trayicon-compat which installs tray icons
into a directory compatible with older versions of hicolor-icon-theme. Use
this option on distros that don't have a new enough copy. If you actually
have a new enough copy, this option should not have any adverse effects.

Fixes #11846.

-------------- next part --------------
============================================================
--- ChangeLog	84222fa1acef78da3a40b624e357336d0b862d1f
+++ ChangeLog	93d306b41363f388c8f314e183173a595f7081dc
@@ -3,6 +3,9 @@ version 2.7.1 (??/??/????):
 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.
============================================================
--- configure.ac	991aed624a2eb955c5655cd9a08e32980a58fdab
+++ configure.ac	e031126dca3756bffc31ac702428ebdf55867162
@@ -2467,6 +2467,13 @@ dnl ####################################
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "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)
 dnl #######################################################################
 AC_ARG_ENABLE(doxygen,
@@ -2635,6 +2642,7 @@ echo Install pixmaps............... : $e
 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
============================================================
--- pidgin/pixmaps/Makefile.am	66f170eb0924a41fb79533746e6eb1ab6f33ea3b
+++ pidgin/pixmaps/Makefile.am	989a9c156acd51f5e22203c3e0ef0421cb170528
@@ -587,11 +587,32 @@ nobase_dist_pidginpixmap_DATA = \
 		$(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) \
============================================================
--- pidgin/pixmaps/tray/hicolor/index.theme	7731d178dc6680110e754237caf31f32a10d9e66
+++ pidgin/pixmaps/tray/hicolor/index.theme	1228d84e32517ad66dfb9829b051f58a3921d591
@@ -2,28 +2,55 @@ Hidden=True
 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