SOURCES: psi-status_indicator-add.patch - indicator.png must be in...

[hawk]

Author: hawk                         Date: Fri Jan 25 22:40:38 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- indicator.png must be included in builtin default roster
- fixed alpha channel bug, now patch is working correctly

---- Files affected:
SOURCES:
   psi-status_indicator-add.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/psi-status_indicator-add.patch
diff -u SOURCES/psi-status_indicator-add.patch:1.11 SOURCES/psi-status_indicator-add.patch:1.12
--- SOURCES/psi-status_indicator-add.patch:1.11	Fri Jan 25 21:18:13 2008
+++ SOURCES/psi-status_indicator-add.patch	Fri Jan 25 23:40:33 2008
@@ -13,6 +13,17 @@
  	<!-- Special icons -->
  	<icon>
  		<x xmlns='name'>psi/chat</x>
+diff -urN psi-0.11.orig/iconsets.qrc psi-0.11/iconsets.qrc
+--- psi-0.11.orig/iconsets.qrc	2007-10-14 16:00:49.000000000 +0200
++++ psi-0.11/iconsets.qrc	2008-01-25 23:10:56.169394807 +0100
+@@ -18,6 +18,7 @@
+ 		<file>iconsets/roster/default/offline.png</file>
+ 		<file>iconsets/roster/default/online.png</file>
+ 		<file>iconsets/roster/default/perr.png</file>
++		<file>iconsets/roster/default/indicator.png</file>
+ 		<file>iconsets/roster/default/system.png</file>
+ 		<file>iconsets/roster/default/xa.png</file>
+ 
 diff -urN psi-0.11.orig/iris/xmpp-im/client.cpp psi-0.11/iris/xmpp-im/client.cpp
 --- psi-0.11.orig/iris/xmpp-im/client.cpp	2007-10-14 16:00:50.000000000 +0200
 +++ psi-0.11/iris/xmpp-im/client.cpp	2008-01-25 18:48:00.863060210 +0100
@@ -73,7 +84,7 @@
  	bool ppIsOn;
 diff -urN psi-0.11.orig/src/contactview.cpp psi-0.11/src/contactview.cpp
 --- psi-0.11.orig/src/contactview.cpp	2007-10-14 16:00:51.000000000 +0200
-+++ psi-0.11/src/contactview.cpp	2008-01-25 20:53:48.792407367 +0100
++++ psi-0.11/src/contactview.cpp	2008-01-25 23:34:55.711825614 +0100
 @@ -26,6 +26,7 @@
  #include <q3header.h>
  #include <qtimer.h>
@@ -145,7 +156,7 @@
 +
 +				m.drawPixmap((mask.width() - imask.width()) / 2, (mask.height() - imask.height()) / 2,
 +					mask);
-+				out.setMask(mask);
++				out.setAlphaChannel(mask);
 +			}
 +			i.drawPixmap((out.width() - ipix.width()) / 2, (out.height() - ipix.height()) / 2,
 +				ipix);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-status_indicator-add.patch?r1=1.11&r2=1.12&f=u