small fix to path in some patches

(Portage version: 2.0.51.22-r1)

5 files changed, 1027 insertions, 15 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 269d1ba5940d..4ca09f63e376 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.69 2005/06/27 18:30:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.70 2005/06/28 20:34:23 humpback Exp $
+
+  28 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/psi-status_indicator++_add-on_roster-nr.patch,
+  +files/vcard-photo-interface.patch, psi-0.9.3-r4.ebuild:
+  Small changes to the patches. Fixes bug #97177.
 
   27 Jun 2005; Gustavo Felisberto <humpback@gentoo.org>;
   psi-0.9.3-r1.ebuild, psi-0.9.3-r2.ebuild, psi-0.9.3-r3.ebuild,
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 2b9f23d15fa6..285054640e2a 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 17462ce42b3ed3f1b0e0d721ae39cfec ChangeLog 8831
 MD5 9b91ead14acbf0da98d3b33e75c67e79 metadata.xml 306
 MD5 e6f5de8ed652b522a8dbc50a42bb0015 psi-0.9.3-r1.ebuild 8118
 MD5 849d8f11e7e35325f45a2e79278f6a4d psi-0.9.3-r2.ebuild 9405
 MD5 4df38ef8d0270123661efa4f2a4850da psi-0.9.3-r3.ebuild 9804
-MD5 eceea7b584672d355f32da1e8efdb81c psi-0.9.3-r4.ebuild 9010
+MD5 63abfae969c112579ef34179d5e90ac7 psi-0.9.3-r4.ebuild 9010
 MD5 fc8fae7a49b592b4f2c2914c21494c11 files/digest-psi-0.9.3-r1 1924
 MD5 db2a4c5b68dbb0147392a4657f2dbc92 files/digest-psi-0.9.3-r2 2132
 MD5 839e6fa5502e1f03a660918bc30e48b5 files/digest-psi-0.9.3-r3 2211
@@ -17,10 +14,5 @@ MD5 5fa629c5177a7b1c5090428e22b7ec30 files/psi-emergency.png 295
 MD5 0d5cafd17325fc912c4855252d73378f files/psi-indicator.png 300
 MD5 76f5cc28b75698adddaa068e5f4593f5 files/psi-pathfix.patch 462
 MD5 893421922de588e6a40fbe8357976279 files/psi-reverse_trayicon.patch 937
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwEQu8zY1VwezZiERAhCxAJ0e9Ya6pWILAMUcfT8kBy9j2d/iZQCeMOfW
-YNtY8XOMMXwnUCTp9pKVgWU=
-=cUOo
------END PGP SIGNATURE-----
+MD5 18253b59a4622a06bc3a17a4eef93d22 files/psi-status_indicator++_add-on_roster-nr.patch 9821
+MD5 0250867fe42d1dc91e798336869a09d6 files/vcard-photo-interface.patch 32494
diff --git a/net-im/psi/files/psi-status_indicator++_add-on_roster-nr.patch b/net-im/psi/files/psi-status_indicator++_add-on_roster-nr.patch
new file mode 100644
index 000000000000..1390f22b6de4
--- /dev/null
+++ b/net-im/psi/files/psi-status_indicator++_add-on_roster-nr.patch
@@ -0,0 +1,275 @@
+diff -Naur  psi-0.9.3-orig/iconsets/roster/default/icondef.xml  psi-0.9.3/iconsets/roster/default/icondef.xml
+--- psi-0.9.3-orig/iconsets/roster/default/icondef.xml	2004-04-22 19:49:53.000000000 +0000
++++ psi-0.9.3/iconsets/roster/default/icondef.xml	2005-05-19 11:52:35.000000000 +0000
+@@ -61,6 +61,11 @@
+ 		<x xmlns='name'>status/error</x>
+ 		<object mime='image/png'>perr.png</object>
+ 	</icon>
++	
++	<icon>
++		<x xmlns='name'>psi/statInd</x>
++		<object mime='image/png'>indicator.png</object>
++	</icon>
+ 
+ 	<!-- Special icons -->
+ 	<icon>
+diff -Naur  psi-0.9.3-orig/iris/xmpp-im/client.cpp  psi-0.9.3/iris/xmpp-im/client.cpp
+--- psi-0.9.3-orig/iris/xmpp-im/client.cpp	2004-12-28 20:19:45.000000000 +0000
++++ psi-0.9.3/iris/xmpp-im/client.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -792,10 +792,27 @@
+ 
+ 	// unavailable?  remove the resource
+ 	if(!s.isAvailable()) {
+-		if(found) {
+-			(*rit).setStatus(s);
+-			debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
+-			resourceUnavailable(j, *rit);
++		Resource r;
++		if(!found) {
++			//if (!s.status().isEmpty()) {
++				r = Resource(j.resource(), s);
++				i->resourceList() += r;
++				debug(QString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
++				resourceAvailable(j, r);
++		} 
++		else {
++				(*rit).setStatus(s);
++				r = *rit;
++				debug(QString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
++				resourceAvailable(j, r);			
++		}
++		
++		rit = i->resourceList().find(j.resource());
++		found = (rit == i->resourceList().end()) ? false: true;
++		
++ 		if(found) {
++ 			(*rit).setStatus(s);
++ 			debug(QString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); 	resourceUnavailable(j, *rit);
+ 			i->resourceList().remove(rit);
+ 			i->setLastUnavailableStatus(s);
+ 		}
+diff -Naur  psi-0.9.3-orig/src/chatdlg.cpp  psi-0.9.3/src/chatdlg.cpp
+--- psi-0.9.3-orig/src/chatdlg.cpp	2004-12-22 12:37:35.000000000 +0000
++++ psi-0.9.3/src/chatdlg.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -474,8 +474,10 @@
+ 			u = ul.first();
+ 			if(rname.isEmpty()) {
+ 				// use priority
+-				if(!u->isAvailable())
++				if(!u->isAvailable()){
+ 					status = STATUS_OFFLINE;
++					statusString = u->lastUnavailableStatus().status();
++				}
+ 				else {
+ 					const UserResource &r = *u->userResourceList().priority();
+ 					status = makeSTATUS(r.status());
+diff -Naur  psi-0.9.3-orig/src/common.h  psi-0.9.3/src/common.h
+--- psi-0.9.3-orig/src/common.h	2005-05-19 11:52:34.000000000 +0000
++++ psi-0.9.3/src/common.h	2005-05-19 11:52:35.000000000 +0000
+@@ -146,6 +146,7 @@
+ 	QStringList gcHighlights, gcNickColors;
+ 
+ 	bool clNewHeadings;
++	bool clStIndicator;
+ 	bool clIconsAtTop;
+ 	bool clTransportStatus;
+ 
+diff -Naur  psi-0.9.3-orig/src/contactview.cpp  psi-0.9.3/src/contactview.cpp
+--- psi-0.9.3-orig/src/contactview.cpp	2005-05-19 11:52:34.000000000 +0000
++++ psi-0.9.3/src/contactview.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include<qheader.h>
+ #include<qtimer.h>
+ #include<qpainter.h>
++#include<qbitmap.h>
+ #include<qpopupmenu.h>
+ #include<qmessagebox.h>
+ #include<qinputdialog.h>
+@@ -2260,7 +2261,7 @@
+ 		strName = "";
+ 		v_selected = false;
+ 
+-		icon = lastIcon = 0;
++		icon = lastIcon = indIcon = 0;
+ 	}
+ 
+ 	~Private() {
+@@ -2323,7 +2324,7 @@
+ 	bool alerting;
+ 	bool animatingNick;
+ 
+-	Icon *icon, *lastIcon;
++	Icon *icon, *lastIcon, *indIcon;
+ 	int animateNickX, animateNickColor; // nick animation
+ };
+ 
+@@ -2595,6 +2596,12 @@
+ 				}
+ 			}
+ 		}
++
++		if( d->indIcon ){
++			const QPixmap &ipix = d->indIcon->pixmap();
++			const int y = (option.clIconsAtTop) ? 2 + pxh - ipix.height() : (h - ipix.height())/2;
++			p->drawPixmap((pix->width() - ipix.width())/2, y, ipix);
++		}
+ 	}
+ 	else if ( d->type == Group ) {
+ 		QColorGroup xcg = cg;
+@@ -2956,12 +2963,13 @@
+ 
+ void ContactViewItem::setIcon(const Icon *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;
+-
++	*/
+ 	if ( d->icon ) {
+ 		disconnect(d->icon, 0, this, 0 );
+ 		d->icon->stop();
+@@ -2983,11 +2991,29 @@
+ 		pix = d->icon->pixmap();
+ 	}
+ 
+-	setPixmap(0, pix);
++	iconUpdated(pix);
+ }
+ 
+ void ContactViewItem::iconUpdated(const QPixmap &pix)
+ {
++	// set status indicator icon
++	if(d->u){
++		bool ind = false;
++		if(!d->u->userResourceList().isEmpty() && option.clStIndicator) {
++			UserResourceList srl = d->u->userResourceList();
++
++			for(UserResourceList::ConstIterator rit = srl.begin(); rit != srl.end(); ++rit)
++				if(!(*rit).status().status().isEmpty()) { ind = true; break; }
++			
++		} 
++		else if(!d->u->lastUnavailableStatus().status().isEmpty() && option.clStIndicator)
++			ind = true;
++
++		if(ind)
++			d->indIcon = is->indicatorPtr(d->u->jid());
++		else
++			d->indIcon = 0;
++	}
+ 	setPixmap(0, pix);
+ }
+ 
+diff -Naur  psi-0.9.3-orig/src/options/opt_roster.cpp  psi-0.9.3/src/options/opt_roster.cpp
+--- psi-0.9.3-orig/src/options/opt_roster.cpp	2005-05-19 11:52:34.000000000 +0000
++++ psi-0.9.3/src/options/opt_roster.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -38,6 +38,8 @@
+ 		"  Check this option if you'd rather invoke with a single-click."));
+ 	QWhatsThis::add(d->ck_scrollTo,
+ 		tr("Makes Psi scroll the main window automatically so you can see new incoming events."));
++	QWhatsThis::add(d->ck_statusIndicator,
++		tr("Displays an indicator by the contact name if the contact entered a descriptive text status line."));
+ 	QWhatsThis::add(d->ck_useStatusLinebreak,
+ 		tr("Use new lines characters in shown statuses (shown statuses will be a bit bigger with this)."));
+ 
+@@ -61,6 +63,7 @@
+ 	opt->rosterAnim = d->ck_rosterAnim->isChecked();
+ 	opt->singleclick = d->ck_singleclick->isChecked();
+ 	opt->scrollTo = d->ck_scrollTo->isChecked();
++	opt->clStIndicator = d->ck_statusIndicator->isChecked();
+ 	opt->clIconsAtTop  = d->ck_iconsAtTop->isChecked();
+ 	opt->useStatusLinebreak = d->ck_useStatusLinebreak->isChecked();
+ 	opt->clTransportStatus = d->ck_transportStatus->isChecked();
+@@ -79,6 +82,7 @@
+ 	d->ck_rosterAnim->setChecked( opt->rosterAnim );
+ 	d->ck_singleclick->setChecked( opt->singleclick );
+ 	d->ck_scrollTo->setChecked( opt->scrollTo );
++	d->ck_statusIndicator->setChecked( opt->clStIndicator );
+ 	d->ck_iconsAtTop->setChecked( opt->clIconsAtTop );
+ 	d->ck_useStatusLinebreak->setChecked( opt->useStatusLinebreak );
+ 	d->ck_transportStatus->setChecked( opt->clTransportStatus );
+diff -Naur  psi-0.9.3-orig/src/options/opt_roster-ui.ui  psi-0.9.3/src/options/opt_roster-ui.ui
+--- psi-0.9.3-orig/src/options/opt_roster-ui.ui	2005-05-19 11:52:34.000000000 +0000
++++ psi-0.9.3/src/options/opt_roster-ui.ui	2005-05-19 11:52:35.000000000 +0000
+@@ -49,6 +49,14 @@
+                 <string>Scroll roster to contact on event</string>
+             </property>
+         </widget>
++	<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="QCheckBox">
+             <property name="name">
+                 <cstring>ck_iconsAtTop</cstring>
+diff -Naur  psi-0.9.3-orig/src/psiiconset.cpp  psi-0.9.3/src/psiiconset.cpp
+--- psi-0.9.3-orig/src/psiiconset.cpp	2004-06-14 10:34:43.000000000 +0000
++++ psi-0.9.3/src/psiiconset.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -516,6 +516,19 @@
+ 	return Icon();
+ }
+ 
++Icon *PsiIconset::indicatorPtr(const XMPP::Jid &jid)
++{
++	return d->jid2icon(jid, "psi/statInd");
++}
++
++Icon PsiIconset::indicator(const XMPP::Jid &jid)
++{
++	Icon *icon = indicatorPtr(jid);
++	if ( icon )
++		return *icon;
++	return Icon();
++}
++
+ Icon *PsiIconset::statusPtr(const XMPP::Jid &jid, int s)
+ {
+ 	return d->jid2icon(jid, status2name(s));
+diff -Naur  psi-0.9.3-orig/src/psiiconset.h  psi-0.9.3/src/psiiconset.h
+--- psi-0.9.3-orig/src/psiiconset.h	2003-11-20 03:32:47.000000000 +0000
++++ psi-0.9.3/src/psiiconset.h	2005-05-19 11:52:35.000000000 +0000
+@@ -61,9 +61,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 &);
+ 
+ 	// functions to get status icon by transport name
+ 	Icon *transportStatusPtr(QString name, int);
+diff -Naur  psi-0.9.3-orig/src/psi_profiles.cpp  psi-0.9.3/src/psi_profiles.cpp
+--- psi-0.9.3-orig/src/psi_profiles.cpp	2005-05-19 11:52:34.000000000 +0000
++++ psi-0.9.3/src/psi_profiles.cpp	2005-05-19 11:52:35.000000000 +0000
+@@ -448,6 +448,7 @@
+ 		prefs.font[fStatusMes] = font.toString();
+ 	}
+ 
++	prefs.clStIndicator = TRUE;
+ 	prefs.clIconsAtTop = TRUE;
+ 
+ 	// calculate the small font size
+@@ -890,6 +891,7 @@
+ 			tag.appendChild(textTag(doc, "rosterAnim", prefs.rosterAnim));
+ 			tag.appendChild(textTag(doc, "singleclick", prefs.singleclick));
+ 			tag.appendChild(textTag(doc, "scrollTo", prefs.scrollTo));
++			tag.appendChild(textTag(doc, "statusIndicator", prefs.clStIndicator));
+ 			tag.appendChild(textTag(doc, "contactIconsAtTop", prefs.clIconsAtTop));
+ 			tag.appendChild(textTag(doc, "newHeadings", prefs.clNewHeadings));
+ 		}
+@@ -1417,6 +1419,7 @@
+ 				readBoolEntry(tag, "rosterAnim", &prefs.rosterAnim);
+ 				readBoolEntry(tag, "singleclick", &prefs.singleclick);
+ 				readBoolEntry(tag, "scrollTo", &prefs.scrollTo);
++				readBoolEntry(tag, "statusIndicator", &prefs.clStIndicator);
+ 				readBoolEntry(tag, "contactIconsAtTop", &prefs.clIconsAtTop);
+ 				readBoolEntry(tag, "newHeadings", &prefs.clNewHeadings);
+ 			}
diff --git a/net-im/psi/files/vcard-photo-interface.patch b/net-im/psi/files/vcard-photo-interface.patch
new file mode 100644
index 000000000000..22a7e4b79071
--- /dev/null
+++ b/net-im/psi/files/vcard-photo-interface.patch
@@ -0,0 +1,740 @@
+diff -Naur psi-0.9.3-orig/src/common.h psi-0.9.3/src/common.h
+--- psi-0.9.3-orig/src/common.h	2005-05-17 23:31:38.000000000 +0000
++++ psi-0.9.3/src/common.h	2005-05-17 23:31:39.000000000 +0000
+@@ -252,6 +252,10 @@
+ 	QString spoofClientName;
+ 	QString spoofClientVersion;
+ 	QString spoofClientOS;
++
++	// Last used path remembering
++	QString lastPath;
++	QString lastSavePath;
+ };
+ 
+ // functions
+diff -Naur psi-0.9.3-orig/src/infodlg.cpp psi-0.9.3/src/infodlg.cpp
+--- psi-0.9.3-orig/src/infodlg.cpp	2004-10-03 11:11:35.000000000 +0000
++++ psi-0.9.3/src/infodlg.cpp	2005-05-17 23:31:39.000000000 +0000
+@@ -27,6 +27,8 @@
+ #include<qlineedit.h>
+ #include<qmessagebox.h>
+ #include<qtextedit.h>
++#include<qfiledialog.h> 
++#include<qbuffer.h>
+ #include"xmpp.h"
+ #include"xmpp_vcard.h"
+ #include"xmpp_tasks.h"
+@@ -36,6 +38,7 @@
+ #include"vcardfactory.h"
+ #include"iconwidget.h"
+ 
++
+ using namespace XMPP;
+ 
+ class InfoDlg::Private
+@@ -78,12 +81,18 @@
+ 
+ 	connect(pb_refresh, SIGNAL(clicked()), this, SLOT(doRefresh()));
+ 	connect(te_desc, SIGNAL(textChanged()), this, SLOT(textChanged()));
++	connect(pb_open, SIGNAL(clicked()), this, SLOT(selectPhoto()));
++	connect(pb_clear, SIGNAL(clicked()), this, SLOT(clearPhoto()));
+ 
+ 	if(d->type == Self) {
+ 		connect(pb_submit, SIGNAL(clicked()), this, SLOT(doSubmit()));
+ 	}
+ 	else {
+ 		pb_submit->hide();
++		pb_open->hide();
++		pb_clear->hide();
++		//ly_photo->setSpacing(0);
++		delete ly_photo_buttons;
+ 		setReadOnly(true);
+ 	}
+ 
+@@ -206,6 +215,14 @@
+ 	le_title->setText( i.title() );
+ 	le_role->setText( i.role() );
+ 	te_desc->setText( i.desc() );
++	
++	if ( !i.photo().isEmpty() ) {
++		//printf("There is a picture...\n");
++		QImage img(i.photo());
++		label_photo->setPixmap(QPixmap(img));
++	}
++	else
++		clearPhoto();
+ 
+ 	setEdited(false);
+ }
+@@ -218,6 +235,8 @@
+ 	le_email->setEnabled(x);
+ 	le_homepage->setEnabled(x);
+ 	le_phone->setEnabled(x);
++	pb_open->setEnabled(x);
++	pb_clear->setEnabled(x);
+ 
+ 	le_street->setEnabled(x);
+ 	le_ext->setEnabled(x);
+@@ -377,6 +396,17 @@
+ 		list << p;
+ 		v.setPhoneList( list );
+ 	}
++	
++	if ( label_photo->pixmap() ) {
++		//printf("Adding a pixmap to the vCard...\n");
++		QImage image = (label_photo->pixmap())->convertToImage();
++		QByteArray ba;
++		QBuffer buffer( ba );
++		buffer.open( IO_WriteOnly );
++		image.save( &buffer, "PNG" );
++		
++		v.setPhoto( ba );
++	}
+ 
+ 	if ( !le_street->text().isEmpty() ||
+ 	     !le_ext->text().isEmpty()    ||
+@@ -419,3 +449,72 @@
+ {
+ 	d->te_edited = true;
+ }
++
++/*!
++ * Opens a file browser dialog, and if selected, calls the setPreviewPhoto with the consecuent path.
++ * \see setPreviewPhoto(const QString& path)
++*/
++void InfoDlg::selectPhoto()
++{
++	while(1) {
++		if(option.lastPath.isEmpty())
++			option.lastPath = QDir::homeDirPath();
++		QString str = QFileDialog::getOpenFileName(option.lastPath, tr("Images (*.png *.xpm *.jpg *.jpeg *.gif *.PNG *.XPM *.JPG *.JPEG *.GIF)"), this, 0, tr("Choose a file"));
++		if(!str.isEmpty()) {
++			QFileInfo fi(str);
++			if(!fi.exists()) {
++				QMessageBox::information(this, tr("Error"), tr("The file specified does not exist."));
++				continue;
++			}
++			option.lastPath = fi.dirPath();
++			//printf(QDir::convertSeparators(fi.filePath()));
++			
++			// put the image in the preview box
++			setPreviewPhoto(str);
++		}
++		break;
++	}
++	
++}
++
++/*!
++ * Loads the image from the requested URL, and inserts the resized image into the preview box.
++ * \param path image file to load
++*/
++void InfoDlg::setPreviewPhoto(const QString& path)
++{
++	bool loadOK;
++	QPixmap pixmap;
++	loadOK = pixmap.load(path);
++	
++	if(loadOK) {
++		const int MAXSIZE = 128;
++		const int width = (int) MAXSIZE*((float)pixmap.width()/pixmap.height());
++		printf("%i width\n%i height\n",width,MAXSIZE);
++	
++		// copy the pixmap in the image
++		QImage i = pixmap.convertToImage();
++		
++		// resize the image and put it into the pixmap
++		pixmap.convertFromImage(i.smoothScale(width,MAXSIZE,QImage::ScaleMax));
++
++		// put the image in the box
++		label_photo->setPixmap(pixmap);
++		// printf("%i\n",(label_photo->pixmap())->width());
++		
++		// activate the te_edited variable in the private: the image was changed
++		d->te_edited = true;
++	}
++}
++
++/*!
++ * Clears the preview image box and marks the te_edited signal in the private.
++*/
++void InfoDlg::clearPhoto()
++{
++	// this will cause the pixmap disappear
++	label_photo->setText(tr("Picture not\navailable"));
++	
++	// the picture changed, so notify there are some changes done
++	d->te_edited = true;
++}
+diff -Naur psi-0.9.3-orig/src/infodlg.h psi-0.9.3/src/infodlg.h
+--- psi-0.9.3-orig/src/infodlg.h	2003-10-22 11:40:37.000000000 +0000
++++ psi-0.9.3/src/infodlg.h	2005-05-17 23:31:39.000000000 +0000
+@@ -51,6 +51,8 @@
+ 	void jt_finished();
+ 	void doSubmit();
+ 	void textChanged();
++	void selectPhoto();
++	void clearPhoto();
+ 
+ private:
+ 	class Private;
+@@ -62,6 +64,9 @@
+ 	void setReadOnly(bool);
+ 	bool edited();
+ 	void setEdited(bool);
++	void setPreviewPhoto(const QString& str);
++	inline int min(int a, int b)
++		{ return (a<b)?a:b; }
+ };
+ 
+ #endif
+diff -Naur psi-0.9.3-orig/src/psi_profiles.cpp psi-0.9.3/src/psi_profiles.cpp
+--- psi-0.9.3-orig/src/psi_profiles.cpp	2005-05-17 23:31:38.000000000 +0000
++++ psi-0.9.3/src/psi_profiles.cpp	2005-05-17 23:31:39.000000000 +0000
+@@ -677,6 +677,10 @@
+ 	prefs.replyInAuthReq		= true;
+ 	prefs.defaultReplyWithoutQuoting	= true;
+ 
++	// Last used path remembering
++	prefs.lastPath = QDir::homeDirPath();
++	prefs.lastSavePath = QDir::homeDirPath();
++
+ 	// Avatars
+ 	prefs.avatarsEnabled = true;
+ 	prefs.avatarsChatdlgEnabled = true;
+@@ -842,6 +846,8 @@
+ 			p_misc.appendChild(textTag(doc, "jidComplete", prefs.jidComplete));
+ 			p_misc.appendChild(textTag(doc, "grabUrls", prefs.grabUrls));
+ 			p_misc.appendChild(textTag(doc, "messageEvents", prefs.messageEvents));
++			p_misc.appendChild(textTag(doc, "lastPath", prefs.lastPath));
++			p_misc.appendChild(textTag(doc, "lastSavePath", prefs.lastSavePath));
+ 			p_misc.appendChild(textTag(doc, "autoCopy", prefs.autoCopy));
+ 		}
+ 		{
+@@ -1558,6 +1564,8 @@
+ 				readBoolEntry(tag, "grabUrls", &prefs.grabUrls);
+ 				readBoolEntry(tag, "smallChats", &prefs.smallChats);
+ 				readBoolEntry(tag, "messageEvents", &prefs.messageEvents);
++				readEntry(tag, "lastPath", &prefs.lastPath);
++				readEntry(tag, "lastSavePath", &prefs.lastSavePath);
+ 				readBoolEntry(tag, "autoCopy", &prefs.autoCopy);
+ 			}
+ 
+diff -Naur psi-0.9.3-orig/src/ui_info.ui psi-0.9.3/src/ui_info.ui
+--- psi-0.9.3-orig/src/ui_info.ui	2003-07-23 21:42:25.000000000 +0000
++++ psi-0.9.3/src/ui_info.ui	2005-05-17 23:31:39.000000000 +0000
+@@ -1,4 +1,4 @@
+-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+ <class>InfoUI</class>
+ <widget class="QDialog">
+     <property name="name">
+@@ -12,6 +12,12 @@
+             <height>337</height>
+         </rect>
+     </property>
++    <property name="minimumSize">
++        <size>
++            <width>129</width>
++            <height>129</height>
++        </size>
++    </property>
+     <property name="caption">
+         <string>User Info</string>
+     </property>
+@@ -39,6 +45,227 @@
+                 <attribute name="title">
+                     <string>General</string>
+                 </attribute>
++                <grid>
++                    <property name="name">
++                        <cstring>unnamed</cstring>
++                    </property>
++                    <widget class="QLabel" row="0" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_2_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>Full Name</string>
++                        </property>
++                    </widget>
++                    <widget class="QLabel" row="3" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_3_2_2_2_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>Phone #</string>
++                        </property>
++                    </widget>
++                    <widget class="QLabel" row="4" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_2_3_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>Homepage</string>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="4" column="1">
++                        <property name="name">
++                            <cstring>le_homepage</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLabel" row="5" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_2_2_2_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>E-Mail</string>
++                        </property>
++                    </widget>
++                    <widget class="QLabel" row="1" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>Nickname</string>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="3" column="1">
++                        <property name="name">
++                            <cstring>le_phone</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLabel" row="2" column="0">
++                        <property name="name">
++                            <cstring>TextLabel1_3_2_3_2</cstring>
++                        </property>
++                        <property name="text">
++                            <string>Birthday</string>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="2" column="1">
++                        <property name="name">
++                            <cstring>le_bday</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="5" column="1">
++                        <property name="name">
++                            <cstring>le_email</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="1" column="1">
++                        <property name="name">
++                            <cstring>le_nickname</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
++                        <property name="name">
++                            <cstring>le_fullname</cstring>
++                        </property>
++                    </widget>
++                    <widget class="QLayoutWidget" row="1" column="2" rowspan="5" colspan="1">
++                        <property name="name">
++                            <cstring>ly_photo</cstring>
++                        </property>
++                        <vbox>
++                            <property name="name">
++                                <cstring>unnamed</cstring>
++                            </property>
++                            <widget class="QLabel">
++                                <property name="name">
++                                    <cstring>label_photo</cstring>
++                                </property>
++                                <property name="sizePolicy">
++                                    <sizepolicy>
++                                        <hsizetype>1</hsizetype>
++                                        <vsizetype>1</vsizetype>
++                                        <horstretch>0</horstretch>
++                                        <verstretch>0</verstretch>
++                                    </sizepolicy>
++                                </property>
++                                <property name="minimumSize">
++                                    <size>
++                                        <width>129</width>
++                                        <height>129</height>
++                                    </size>
++                                </property>
++                                <property name="maximumSize">
++                                    <size>
++                                        <width>32767</width>
++                                        <height>32767</height>
++                                    </size>
++                                </property>
++                                <property name="frameShape">
++                                    <enum>PopupPanel</enum>
++                                </property>
++                                <property name="frameShadow">
++                                    <enum>Raised</enum>
++                                </property>
++                                <property name="lineWidth">
++                                    <number>1</number>
++                                </property>
++                                <property name="margin">
++                                    <number>2</number>
++                                </property>
++                                <property name="scaledContents">
++                                    <bool>false</bool>
++                                </property>
++                                <property name="alignment">
++                                    <set>AlignCenter</set>
++                                </property>
++                            </widget>
++                            <widget class="QLayoutWidget">
++                                <property name="name">
++                                    <cstring>ly_photo_buttons</cstring>
++                                </property>
++                                <hbox>
++                                    <property name="name">
++                                        <cstring>unnamed</cstring>
++                                    </property>
++                                    <widget class="QPushButton">
++                                        <property name="name">
++                                            <cstring>pb_open</cstring>
++                                        </property>
++                                        <property name="sizePolicy">
++                                            <sizepolicy>
++                                                <hsizetype>1</hsizetype>
++                                                <vsizetype>0</vsizetype>
++                                                <horstretch>0</horstretch>
++                                                <verstretch>0</verstretch>
++                                            </sizepolicy>
++                                        </property>
++                                        <property name="text">
++                                            <string>&amp;Open...</string>
++                                        </property>
++                                        <property name="accel">
++                                            <string>Alt+O</string>
++                                        </property>
++                                        <property name="autoDefault">
++                                            <bool>false</bool>
++                                        </property>
++                                        <property name="flat">
++                                            <bool>false</bool>
++                                        </property>
++                                    </widget>
++                                    <widget class="QPushButton">
++                                        <property name="name">
++                                            <cstring>pb_clear</cstring>
++                                        </property>
++                                        <property name="sizePolicy">
++                                            <sizepolicy>
++                                                <hsizetype>1</hsizetype>
++                                                <vsizetype>0</vsizetype>
++                                                <horstretch>0</horstretch>
++                                                <verstretch>0</verstretch>
++                                            </sizepolicy>
++                                        </property>
++                                        <property name="text">
++                                            <string>&amp;Clear</string>
++                                        </property>
++                                        <property name="accel">
++                                            <string>Alt+C</string>
++                                        </property>
++                                        <property name="autoDefault">
++                                            <bool>false</bool>
++                                        </property>
++                                        <property name="flat">
++                                            <bool>false</bool>
++                                        </property>
++                                    </widget>
++                                </hbox>
++                            </widget>
++                        </vbox>
++                    </widget>
++                    <spacer row="6" column="1">
++                        <property name="name">
++                            <cstring>spacer34</cstring>
++                        </property>
++                        <property name="orientation">
++                            <enum>Vertical</enum>
++                        </property>
++                        <property name="sizeType">
++                            <enum>Expanding</enum>
++                        </property>
++                        <property name="sizeHint">
++                            <size>
++                                <width>20</width>
++                                <height>60</height>
++                            </size>
++                        </property>
++                    </spacer>
++                </grid>
++            </widget>
++            <widget class="QWidget">
++                <property name="name">
++                    <cstring>tab</cstring>
++                </property>
++                <attribute name="title">
++                    <string>Work</string>
++                </attribute>
+                 <vbox>
+                     <property name="name">
+                         <cstring>unnamed</cstring>
+@@ -51,7 +278,7 @@
+                     </property>
+                     <widget class="QLayoutWidget">
+                         <property name="name">
+-                            <cstring>Layout4</cstring>
++                            <cstring>Layout8</cstring>
+                         </property>
+                         <grid>
+                             <property name="name">
+@@ -63,89 +290,63 @@
+                             <property name="spacing">
+                                 <number>6</number>
+                             </property>
+-                            <widget class="QLineEdit" row="1" column="1">
+-                                <property name="name">
+-                                    <cstring>le_nickname</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="5" column="1">
+-                                <property name="name">
+-                                    <cstring>le_email</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="7" column="1">
+-                                <property name="name">
+-                                    <cstring>le_phone</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="6" column="1">
++                            <widget class="QLineEdit" row="2" column="1">
+                                 <property name="name">
+-                                    <cstring>le_homepage</cstring>
++                                    <cstring>le_title</cstring>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="4" column="0">
++                            <widget class="QLabel" row="0" column="0">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_3_2_3_2</cstring>
++                                    <cstring>TextLabel1_2_2_2_3</cstring>
+                                 </property>
+                                 <property name="text">
+-                                    <string>Birthday</string>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="4" column="1">
+-                                <property name="name">
+-                                    <cstring>le_bday</cstring>
++                                    <string>Company</string>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="6" column="0">
++                            <widget class="QLabel" row="2" column="0">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_2_3_2</cstring>
++                                    <cstring>TextLabel1_3_2_2_2_3_2</cstring>
+                                 </property>
+                                 <property name="text">
+-                                    <string>Homepage</string>
++                                    <string>Position</string>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="0" column="0">
++                            <widget class="QLineEdit" row="0" column="1">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_2_2</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>Full Name</string>
++                                    <cstring>le_orgName</cstring>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="7" column="0">
++                            <widget class="QLabel" row="1" column="0">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_3_2_2_2_2</cstring>
++                                    <cstring>TextLabel1_2_3_3</cstring>
+                                 </property>
+                                 <property name="text">
+-                                    <string>Phone #</string>
++                                    <string>Department</string>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="5" column="0">
++                            <widget class="QLineEdit" row="1" column="1">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_2_2_2_2</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>E-Mail</string>
++                                    <cstring>le_orgUnit</cstring>
+                                 </property>
+                             </widget>
+-                            <widget class="QLineEdit" row="0" column="1">
++                            <widget class="QLineEdit" row="3" column="1">
+                                 <property name="name">
+-                                    <cstring>le_fullname</cstring>
++                                    <cstring>le_role</cstring>
+                                 </property>
+                             </widget>
+-                            <widget class="QLabel" row="1" column="0">
++                            <widget class="QLabel" row="3" column="0">
+                                 <property name="name">
+-                                    <cstring>TextLabel1_2</cstring>
++                                    <cstring>TextLabel1_3_2_2_2_4</cstring>
+                                 </property>
+                                 <property name="text">
+-                                    <string>Nickname</string>
++                                    <string>Role</string>
+                                 </property>
+                             </widget>
+                         </grid>
+                     </widget>
+                     <spacer>
+                         <property name="name">
+-                            <cstring>Spacer5</cstring>
++                            <cstring>Spacer7</cstring>
+                         </property>
+                         <property name="orientation">
+                             <enum>Vertical</enum>
+@@ -183,6 +384,18 @@
+                         <property name="name">
+                             <cstring>Layout5</cstring>
+                         </property>
++                        <property name="minimumSize">
++                            <size>
++                                <width>0</width>
++                                <height>0</height>
++                            </size>
++                        </property>
++                        <property name="maximumSize">
++                            <size>
++                                <width>32767</width>
++                                <height>32767</height>
++                            </size>
++                        </property>
+                         <grid>
+                             <property name="name">
+                                 <cstring>unnamed</cstring>
+@@ -289,110 +502,6 @@
+                     <cstring>tab</cstring>
+                 </property>
+                 <attribute name="title">
+-                    <string>Work</string>
+-                </attribute>
+-                <vbox>
+-                    <property name="name">
+-                        <cstring>unnamed</cstring>
+-                    </property>
+-                    <property name="margin">
+-                        <number>11</number>
+-                    </property>
+-                    <property name="spacing">
+-                        <number>6</number>
+-                    </property>
+-                    <widget class="QLayoutWidget">
+-                        <property name="name">
+-                            <cstring>Layout8</cstring>
+-                        </property>
+-                        <grid>
+-                            <property name="name">
+-                                <cstring>unnamed</cstring>
+-                            </property>
+-                            <property name="margin">
+-                                <number>0</number>
+-                            </property>
+-                            <property name="spacing">
+-                                <number>6</number>
+-                            </property>
+-                            <widget class="QLineEdit" row="2" column="1">
+-                                <property name="name">
+-                                    <cstring>le_title</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLabel" row="0" column="0">
+-                                <property name="name">
+-                                    <cstring>TextLabel1_2_2_2_3</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>Company</string>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLabel" row="2" column="0">
+-                                <property name="name">
+-                                    <cstring>TextLabel1_3_2_2_2_3_2</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>Position</string>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="0" column="1">
+-                                <property name="name">
+-                                    <cstring>le_orgName</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLabel" row="1" column="0">
+-                                <property name="name">
+-                                    <cstring>TextLabel1_2_3_3</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>Department</string>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="1" column="1">
+-                                <property name="name">
+-                                    <cstring>le_orgUnit</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLineEdit" row="3" column="1">
+-                                <property name="name">
+-                                    <cstring>le_role</cstring>
+-                                </property>
+-                            </widget>
+-                            <widget class="QLabel" row="3" column="0">
+-                                <property name="name">
+-                                    <cstring>TextLabel1_3_2_2_2_4</cstring>
+-                                </property>
+-                                <property name="text">
+-                                    <string>Role</string>
+-                                </property>
+-                            </widget>
+-                        </grid>
+-                    </widget>
+-                    <spacer>
+-                        <property name="name">
+-                            <cstring>Spacer7</cstring>
+-                        </property>
+-                        <property name="orientation">
+-                            <enum>Vertical</enum>
+-                        </property>
+-                        <property name="sizeType">
+-                            <enum>Expanding</enum>
+-                        </property>
+-                        <property name="sizeHint">
+-                            <size>
+-                                <width>0</width>
+-                                <height>20</height>
+-                            </size>
+-                        </property>
+-                    </spacer>
+-                </vbox>
+-            </widget>
+-            <widget class="QWidget">
+-                <property name="name">
+-                    <cstring>tab</cstring>
+-                </property>
+-                <attribute name="title">
+                     <string>About</string>
+                 </attribute>
+                 <vbox>
+@@ -438,7 +547,7 @@
+                     </property>
+                     <property name="sizeHint">
+                         <size>
+-                            <width>149</width>
++                            <width>190</width>
+                             <height>16</height>
+                         </size>
+                     </property>
+@@ -508,8 +617,5 @@
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+     <includehint>busywidget.h</includehint>
+-    <includehint>iconwidget.h</includehint>
+-    <includehint>iconwidget.h</includehint>
+-    <includehint>iconwidget.h</includehint>
+ </includehints>
+ </UI>
diff --git a/net-im/psi/psi-0.9.3-r4.ebuild b/net-im/psi/psi-0.9.3-r4.ebuild
index c5893cac11bb..24c97409d3c3 100644
--- a/net-im/psi/psi-0.9.3-r4.ebuild
+++ b/net-im/psi/psi-0.9.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r4.ebuild,v 1.3 2005/06/27 18:30:44 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.3-r4.ebuild,v 1.4 2005/06/28 20:34:23 humpback Exp $
 
 inherit eutils
 
@@ -87,7 +87,7 @@ src_unpack() {
 			cd ${S}
 			# roster-nr
 			epatch ${PATCHDIR}/psi-roster-nr-0.7.patch
-			epatch ${PATCHDIR}/psi-status_indicator++_add-on_roster-nr.patch
+			epatch ${FILESDIR}/psi-status_indicator++_add-on_roster-nr.patch
 			# indicator icon
 			cp ${FILESDIR}/psi-indicator.png ${S}/iconsets/roster/default/indicator.png
 
@@ -174,7 +174,7 @@ src_unpack() {
 			epatch ${PATCHDIR}/checkboxes-sound-options.diff
 			epatch ${PATCHDIR}/psi-history_lug.patch
 			epatch ${PATCHDIR}/psi-cli-v2_gentoo.diff
-			epatch ${PATCHDIR}/vcard-photo-interface.patch
+			epatch ${FILESDIR}/vcard-photo-interface.patch
 			epatch ${PATCHDIR}/psi-history-deletion-bugfix.patch
 
 			# from http://tleilax.if.pw.edu.pl/~myak/