SOURCES (AC-branch): psi-customos.patch, psi-desktop.patch, psi-st...

hawk hawk at pld-linux.org
Sun Nov 25 20:30:28 CET 2007


Author: hawk                         Date: Sun Nov 25 19:30:27 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- adjusted for psi 0.11, not tested at all, NFY

---- Files affected:
SOURCES:
   psi-customos.patch (1.5 -> 1.5.2.1) , psi-desktop.patch (1.8 -> 1.8.2.1) , psi-status_indicator-add.patch (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SOURCES/psi-customos.patch
diff -u SOURCES/psi-customos.patch:1.5 SOURCES/psi-customos.patch:1.5.2.1
--- SOURCES/psi-customos.patch:1.5	Sun Jun  6 01:08:46 2004
+++ SOURCES/psi-customos.patch	Sun Nov 25 20:30:22 2007
@@ -1,19 +1,19 @@
-diff -urN psi-old/src/common.cpp psi/src/common.cpp
---- psi-old/src/common.cpp	2004-03-22 11:48:01.079698856 +0100
-+++ psi/src/common.cpp	2004-03-22 11:49:21.273507544 +0100
-@@ -1145,6 +1145,7 @@
+diff -ur psi-0.11.orig/src/systeminfo.cpp psi-0.11/src/systeminfo.cpp
+--- psi-0.11.orig/src/systeminfo.cpp	2007-10-14 16:00:54.000000000 +0200
++++ psi-0.11/src/systeminfo.cpp	2007-11-25 15:28:41.000000000 +0100
+@@ -52,6 +52,7 @@
  	// get description about os
  	enum LinuxName {
  		LinuxNone = 0,
-+                LinuxCustom,
++		LinuxCustom,
  
  		LinuxMandrake,
  		LinuxDebian,
-@@ -1175,6 +1176,7 @@
- 		QString file;
- 		QString name;
- 	} osInfo[] = {
-+		{ LinuxCustom,		OsUseFile,	getHomeDir()+"/custom-os",	"",			},
- 		{ LinuxMandrake,	OsUseFile,	"/etc/mandrake-release",	"Mandrake Linux"	},
- 		{ LinuxDebian,		OsAppendFile,	"/etc/debian_version",		"Debian GNU/Linux"	},
- 		{ LinuxGentoo,		OsUseFile,	"/etc/gentoo-release",		"Gentoo Linux"		},
+@@ -100,6 +101,7 @@
+ 		// many distros use the /etc/redhat-release for compatibility, so RedHat will be the last :)
+ 		{ LinuxRedHat,		OsUseFile,	"/etc/redhat-release",		"RedHat Linux"		},
+ 
++		{ LinuxCustom,		OsUseFile,	getHomeDir()+"/custom-os",	""			},
+ 		{ LinuxNone,		OsUseName,	"",				""			}
+ 	};
+ 

================================================================
Index: SOURCES/psi-desktop.patch
diff -u SOURCES/psi-desktop.patch:1.8 SOURCES/psi-desktop.patch:1.8.2.1
--- SOURCES/psi-desktop.patch:1.8	Thu Jan 19 21:24:22 2006
+++ SOURCES/psi-desktop.patch	Sun Nov 25 20:30:22 2007
@@ -1,11 +1,8 @@
-diff -Nur psi-0.10.orig/psi.desktop psi-0.10/psi.desktop
 --- psi-0.10.orig/psi.desktop	2006-01-19 21:17:58.849492250 +0100
 +++ psi-0.10/psi.desktop	2006-01-19 21:23:30.142196750 +0100
-@@ -1,15 +1,14 @@
- [Desktop Entry]
+@@ -3,12 +3,12 @@
+ Version=1.0
  Type=Application
- Version=0.9.4
--Encoding=UTF-8
  Name=Psi
 -GenericName=Jabber Client
  Comment=Communicate over the Jabber network
@@ -13,15 +10,14 @@
 +Icon=psi.png
  Exec=psi
  Terminal=false
- Categories=Qt;Network;InstantMessaging;
- StartupNotify=true
+ Categories=Network;InstantMessaging;Qt;
 +Encoding=UTF-8
  
  # Translations
- GenericName[nl]=Jabber Client
-@@ -26,3 +25,5 @@
- Comment[pl]=Komunikacja poprzez sieć Jabber
- GenericName[pt_BR]=Cliente Jabber
+ GenericName[ca]=Client Jabber
+@@ -27,3 +27,5 @@
  Comment[pt_BR]=Comunique-se através da rede Jabber
+ GenericName[sl]=Odjemalec za Jabber
+ Comment[sl]=Komuniciranje prek omrežja Jabber
 +
 +# vi: encoding=utf-8

================================================================
Index: SOURCES/psi-status_indicator-add.patch
diff -u SOURCES/psi-status_indicator-add.patch:1.7 SOURCES/psi-status_indicator-add.patch:1.7.2.1
--- SOURCES/psi-status_indicator-add.patch:1.7	Sat Jan 21 20:46:24 2006
+++ SOURCES/psi-status_indicator-add.patch	Sun Nov 25 20:30:22 2007
@@ -1,7 +1,7 @@
-diff -urN psi-0.10.orig/iris/xmpp-im/client.cpp psi-0.10/iris/xmpp-im/client.cpp
---- psi-0.10.orig/iris/xmpp-im/client.cpp	2005-08-21 19:44:28.000000000 +0200
-+++ psi-0.10/iris/xmpp-im/client.cpp	2006-01-21 18:38:28.405294000 +0100
-@@ -792,10 +792,27 @@
+diff -ur 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	2007-11-25 15:29:32.000000000 +0100
+@@ -789,10 +789,27 @@
  
  	// unavailable?  remove the resource
  	if(!s.isAvailable()) {
@@ -33,10 +33,10 @@
  			i->resourceList().remove(rit);
  			i->setLastUnavailableStatus(s);
  		}
-diff -urN psi-0.10.orig/src/chatdlg.cpp psi-0.10/src/chatdlg.cpp
---- psi-0.10.orig/src/chatdlg.cpp	2006-01-07 22:19:01.000000000 +0100
-+++ psi-0.10/src/chatdlg.cpp	2006-01-21 18:38:28.415294000 +0100
-@@ -522,8 +522,10 @@
+diff -ur psi-0.11.orig/src/chatdlg.cpp psi-0.11/src/chatdlg.cpp
+--- psi-0.11.orig/src/chatdlg.cpp	2007-10-14 16:00:51.000000000 +0200
++++ psi-0.11/src/chatdlg.cpp	2007-11-25 15:29:32.000000000 +0100
+@@ -575,8 +575,10 @@
  			u = ul.first();
  			if(rname.isEmpty()) {
  				// use priority
@@ -48,10 +48,10 @@
  				else {
  					const UserResource &r = *u->userResourceList().priority();
  					status = makeSTATUS(r.status());
-diff -urN psi-0.10.orig/src/common.h psi-0.10/src/common.h
---- psi-0.10.orig/src/common.h	2005-10-06 15:50:35.000000000 +0200
-+++ psi-0.10/src/common.h	2006-01-21 18:38:28.415294000 +0100
-@@ -150,6 +150,7 @@
+diff -ur psi-0.11.orig/src/common.h psi-0.11/src/common.h
+--- psi-0.11.orig/src/common.h	2007-10-14 16:00:51.000000000 +0200
++++ psi-0.11/src/common.h	2007-11-25 15:29:32.000000000 +0100
+@@ -124,6 +124,7 @@
  
  	bool clNewHeadings;
  	bool outlineHeadings;
@@ -59,33 +59,32 @@
  
  	// passive popups
  	bool ppIsOn;
-diff -urN psi-0.10.orig/src/contactview.cpp psi-0.10/src/contactview.cpp
---- psi-0.10.orig/src/contactview.cpp	2006-01-07 22:19:01.000000000 +0100
-+++ psi-0.10/src/contactview.cpp	2006-01-21 18:38:28.415294000 +0100
-@@ -25,6 +25,7 @@
- #include<qheader.h>
- #include<qtimer.h>
- #include<qpainter.h>
-+#include<qbitmap.h>
- #include<qpopupmenu.h>
- #include<qmessagebox.h>
- #include<qinputdialog.h>
-@@ -3018,12 +3019,13 @@
+diff -ur 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	2007-11-25 15:54:38.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <q3header.h>
+ #include <qtimer.h>
+ #include <qpainter.h>
++#include <qbitmap.h>
+ #include <q3popupmenu.h>
+ #include <qmessagebox.h>
+ #include <qinputdialog.h>
+@@ -3378,11 +3379,13 @@
  
- void ContactViewItem::setIcon(const Icon *icon, bool alert)
+ void ContactViewItem::setIcon(const PsiIcon *icon, bool alert)
  {
 +	/* needed by status indicator :o|
  	if ( d->lastIcon == icon ) {
  		return; // cause less flicker. but still have to run calltree valgring skin on psi while online (mblsha).
  	}
  	else
- 		d->lastIcon = (Icon *)icon;
--
+ 		d->lastIcon = (PsiIcon *)icon;
 +	*/
+ 
  	if ( d->icon ) {
  		disconnect(d->icon, 0, this, 0 );
- 		d->icon->stop();
-@@ -3045,12 +3047,42 @@
+@@ -3407,12 +3410,42 @@
  		pix = d->icon->pixmap();
  	}
  
@@ -93,9 +92,9 @@
 +	iconUpdated(pix);
  }
  
- void ContactViewItem::iconUpdated(const QPixmap &pix)
+ void ContactViewItem::iconUpdated()
  {
--	setPixmap(0, pix);
+-	setPixmap(0, d->icon ? d->icon->pixmap() : QPixmap());
 +	QPixmap out(pix);
 +	// add status indicator to contact icon
 +	if(d->u && !out.isNull()){
@@ -130,26 +129,26 @@
  }
  
  void ContactViewItem::animateNick()
-diff -urN psi-0.10.orig/src/options/opt_appearance.cpp psi-0.10/src/options/opt_appearance.cpp
---- psi-0.10.orig/src/options/opt_appearance.cpp	2006-01-07 22:19:01.000000000 +0100
-+++ psi-0.10/src/options/opt_appearance.cpp	2006-01-21 19:03:59.065294000 +0100
-@@ -104,6 +104,7 @@
+diff -ur psi-0.11.orig/src/options/opt_appearance.cpp psi-0.11/src/options/opt_appearance.cpp
+--- psi-0.11.orig/src/options/opt_appearance.cpp	2007-10-14 16:00:52.000000000 +0200
++++ psi-0.11/src/options/opt_appearance.cpp	2007-11-25 15:39:58.000000000 +0100
+@@ -113,6 +113,7 @@
  
  	opt->clNewHeadings = d->ck_newHeadings->isChecked();	
  	opt->outlineHeadings = d->ck_outlineHeadings->isChecked();	
 +	opt->clStIndicator = d->ck_statusIndicator->isChecked();
- 	opt->rosterOpacity = d->sl_rosterop->value();
- 	opt->chatOpacity = d->sl_chatdlgop->value();
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.opacity", d->sl_rosterop->value());
+ 	PsiOptions::instance()->setOption("options.ui.chat.opacity", d->sl_chatdlgop->value());
  }
-@@ -117,6 +118,7 @@
+@@ -126,6 +127,7 @@
  
  	d->ck_newHeadings->setChecked( opt->clNewHeadings );
  	d->ck_outlineHeadings->setChecked( opt->outlineHeadings );
 +	d->ck_statusIndicator->setChecked( opt->clStIndicator );
  	
- 	d->sl_rosterop->setValue( opt->rosterOpacity );
- 	d->sl_chatdlgop->setValue( opt->chatOpacity );
-@@ -262,7 +264,7 @@
+ 	d->sl_rosterop->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.opacity").toInt() );
+ 	d->sl_chatdlgop->setValue( PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt() );
+@@ -279,7 +281,7 @@
  
  	//OptAppearanceUI *d = (OptAppearanceUI *)w;
  	//d->ck_avatarsChatdlg->setChecked( opt->avatarsChatdlgEnabled ); // Avatars
@@ -158,66 +157,63 @@
  	int n;
  	for (n = 0; n < 4; ++n)
  		le_font[n]->setFont(opt->font[n]);
-diff -urN psi-0.10.orig/src/options/opt_appearance_misc-ui.ui psi-0.10/src/options/opt_appearance_misc-ui.ui
---- psi-0.10.orig/src/options/opt_appearance_misc-ui.ui	2005-10-14 02:36:14.000000000 +0200
-+++ psi-0.10/src/options/opt_appearance_misc-ui.ui	2006-01-21 18:48:44.155294000 +0100
-@@ -19,6 +19,14 @@
-         <property name="name">
-             <cstring>unnamed</cstring>
-         </property>
-+        <widget class="QCheckBox">
-+            <property name="name">
-+                <cstring>ck_statusIndicator</cstring>
-+            </property>
-+            <property name="text">
-+                <string>Show indicator for text statuses</string>
-+            </property>
-+        </widget>
-         <widget class="QGroupBox">
-             <property name="name">
-                 <cstring>groupBox4</cstring>
-diff -urN psi-0.10.orig/src/psiiconset.cpp psi-0.10/src/psiiconset.cpp
---- psi-0.10.orig/src/psiiconset.cpp	2005-08-21 19:44:32.000000000 +0200
-+++ psi-0.10/src/psiiconset.cpp	2006-01-21 18:38:28.425294000 +0100
-@@ -518,6 +518,19 @@
- 	return Icon();
+diff -ur psi-0.11.orig/src/options/opt_appearance_misc.ui psi-0.11/src/options/opt_appearance_misc.ui
+--- psi-0.11.orig/src/options/opt_appearance_misc.ui	2007-10-14 16:00:52.000000000 +0200
++++ psi-0.11/src/options/opt_appearance_misc.ui	2007-11-25 16:02:07.000000000 +0100
+@@ -23,6 +23,11 @@
+     <number>6</number>
+    </property>
+    <item>
++    <widget class="QCheckBox" name="ck_statusIndicator" >
++     <property name="text">
++      <string>Show indicator for text statuses</string>
++     </property>
++    </widget>
+     <widget class="QGroupBox" name="groupBox4" >
+      <property name="title" >
+       <string>Headings</string>
+diff -ur psi-0.11.orig/src/psiiconset.cpp psi-0.11/src/psiiconset.cpp
+--- psi-0.11.orig/src/psiiconset.cpp	2007-10-14 16:00:53.000000000 +0200
++++ psi-0.11/src/psiiconset.cpp	2007-11-25 15:46:38.000000000 +0100
+@@ -523,6 +523,19 @@
+ 	return PsiIcon();
  }
  
-+Icon *PsiIconset::indicatorPtr(const XMPP::Jid &jid)
++PsiIcon *PsiIconset::indicatorPtr(const XMPP::Jid &jid)
 +{
 +	return d->jid2icon(jid, "psi/statInd");
 +}
 +
-+Icon PsiIconset::indicator(const XMPP::Jid &jid)
++PsiIcon PsiIconset::indicator(const XMPP::Jid &jid)
 +{
-+	Icon *icon = indicatorPtr(jid);
++	PsiIcon *icon = indicatorPtr(jid);
 +	if ( icon )
 +		return *icon;
-+	return Icon();
++	return PsiIcon();
 +}
 +
- Icon *PsiIconset::statusPtr(const XMPP::Jid &jid, int s)
+ PsiIcon *PsiIconset::statusPtr(const XMPP::Jid &jid, int s)
  {
  	return d->jid2icon(jid, status2name(s));
-diff -urN psi-0.10.orig/src/psiiconset.h psi-0.10/src/psiiconset.h
---- psi-0.10.orig/src/psiiconset.h	2005-08-21 19:44:27.000000000 +0200
-+++ psi-0.10/src/psiiconset.h	2006-01-21 18:38:28.425294000 +0100
-@@ -61,9 +61,11 @@
+diff -ur psi-0.11.orig/src/psiiconset.h psi-0.11/src/psiiconset.h
+--- psi-0.11.orig/src/psiiconset.h	2007-10-14 16:00:53.000000000 +0200
++++ psi-0.11/src/psiiconset.h	2007-11-25 15:42:04.000000000 +0100
+@@ -64,9 +64,11 @@
  	// JID-enabled status functions
- 	Icon *statusPtr(const XMPP::Jid &, int);
- 	Icon *statusPtr(const XMPP::Jid &, const XMPP::Status &);
-+	Icon *indicatorPtr(const XMPP::Jid &);
- 
- 	Icon status(const XMPP::Jid &, int);
- 	Icon status(const XMPP::Jid &, const XMPP::Status &);
-+	Icon indicator(const XMPP::Jid &);
+ 	PsiIcon *statusPtr(const XMPP::Jid &, int);
+ 	PsiIcon *statusPtr(const XMPP::Jid &, const XMPP::Status &);
++	PsiIcon *indicatorPtr(const XMPP::Jid &);
+ 
+ 	PsiIcon status(const XMPP::Jid &, int);
+ 	PsiIcon status(const XMPP::Jid &, const XMPP::Status &);
++	PsiIcon indicator(const XMPP::Jid &);
  
  	// functions to get status icon by transport name
- 	Icon *transportStatusPtr(QString name, int);
-diff -urN psi-0.10.orig/src/psi_profiles.cpp psi-0.10/src/psi_profiles.cpp
---- psi-0.10.orig/src/psi_profiles.cpp	2006-01-21 18:37:41.000000000 +0100
-+++ psi-0.10/src/psi_profiles.cpp	2006-01-21 18:38:28.425294000 +0100
-@@ -428,6 +428,8 @@
+ 	PsiIcon *transportStatusPtr(QString name, int);
+diff -ur psi-0.11.orig/src/psi_profiles.cpp psi-0.11/src/psi_profiles.cpp
+--- psi-0.11.orig/src/psi_profiles.cpp	2007-10-14 16:00:53.000000000 +0200
++++ psi-0.11/src/psi_profiles.cpp	2007-11-25 15:40:54.000000000 +0100
+@@ -535,6 +535,8 @@
  		prefs.font[fPopup] = font.toString();
  	}
  
@@ -226,19 +222,19 @@
  	// calculate the small font size
  	const int minimumFontSize = 7;
  	prefs.smallFontSize = qApp->font().pointSize();
-@@ -905,6 +907,7 @@
- 		p_lnf.appendChild(textTag(doc, "chat-opacity", prefs.chatOpacity));
- 		p_lnf.appendChild(textTag(doc, "roster-opacity", prefs.rosterOpacity));
+@@ -987,6 +989,7 @@
+ 
+ 		p_lnf.appendChild(textTag(doc, "newHeadings", prefs.clNewHeadings));
  		p_lnf.appendChild(textTag(doc, "outline-headings", prefs.outlineHeadings));
 +		p_lnf.appendChild(textTag(doc, "statusIndicator", prefs.clStIndicator));
  
  		{
  			QDomElement tag = doc.createElement("colors");
-@@ -1483,6 +1486,7 @@
+@@ -1543,6 +1546,7 @@
+ 
+ 			readBoolEntry(p_lnf, "newHeadings", &prefs.clNewHeadings);
  			readBoolEntry(p_lnf, "outline-headings", &prefs.outlineHeadings);
- 			readNumEntry(p_lnf, "chat-opacity", &prefs.chatOpacity);
- 			readNumEntry(p_lnf, "roster-opacity", &prefs.rosterOpacity);
 +			readBoolEntry(p_lnf, "statusIndicator", &prefs.clStIndicator);
+ 			migrateIntEntry(p_lnf, "chat-opacity", "options.ui.chat.opacity");
+ 			migrateIntEntry(p_lnf, "roster-opacity", "options.ui.contactlist.opacity");
  
- 			QDomElement tag = findSubTag(p_lnf, "colors", &found);
- 			if(found) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-customos.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-desktop.patch?r1=1.8&r2=1.8.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-status_indicator-add.patch?r1=1.7&r2=1.7.2.1&f=u



More information about the pld-cvs-commit mailing list