Fixing bugs #106665 and #139159. Updated langpacks.

(Portage version: 2.1.2_pre1-r3)

3 files changed, 187 insertions, 4 deletions

diff --git a/net-im/psi/files/digest-psi-0.10-r1 b/net-im/psi/files/digest-psi-0.10-r1
new file mode 100644
index 000000000000..a25cba4b1c1d
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.10-r1
@@ -0,0 +1,90 @@
+MD5 4aacc2de659a5a551e9b47382af83c35 gentoo-psi-0.10.tar.bz2 211538
+RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a gentoo-psi-0.10.tar.bz2 211538
+SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd gentoo-psi-0.10.tar.bz2 211538
+MD5 f0fd4ccf077f7b24e236f71c22649b7b psi-0.10.tar.bz2 1430929
+RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 psi-0.10.tar.bz2 1430929
+SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 psi-0.10.tar.bz2 1430929
+MD5 2885ffd0943e95edc0b8521309b01d32 psi_ar-0.9.3.tar.bz2 31466
+RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 psi_ar-0.9.3.tar.bz2 31466
+SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9 psi_ar-0.9.3.tar.bz2 31466
+MD5 8b91c9ef940301482d8aa34d986a9044 psi_bg-0.10-b.tar.bz2 34424
+RMD160 59f5b2f211a94d1b6bcafafc1743358cdc4b777d psi_bg-0.10-b.tar.bz2 34424
+SHA256 9aa835049a69e461cdc7d0d4ca2d6e8c280f0df9c1da42f563fa27abb42f7f18 psi_bg-0.10-b.tar.bz2 34424
+MD5 622036532a748c70f0958c17d9253380 psi_ca-0.10-a.tar.bz2 33851
+RMD160 9d50518a0bb07c74a8f8ced5e0fe8133a5579707 psi_ca-0.10-a.tar.bz2 33851
+SHA256 5daafd6909f489ded72d0e69f9657fbf39d9315caa1e8641baad4255218e0adc psi_ca-0.10-a.tar.bz2 33851
+MD5 b41abf14979bc09aa757d903c056bd8d psi_cs-0.10-a.tar.bz2 36255
+RMD160 170a772e6b2bc18e44b286cb3550eef1355702b4 psi_cs-0.10-a.tar.bz2 36255
+SHA256 fc531736bbb70b0e00e46883d13d59144f34bbe8582bf4431313e4f829967ba7 psi_cs-0.10-a.tar.bz2 36255
+MD5 208ed7a4f2c8b0aa870beb806c025b6e psi_da-0.9.3.tar.bz2 30325
+RMD160 0d833e0540f90ee60aa09544d1bf828d76f4efe6 psi_da-0.9.3.tar.bz2 30325
+SHA256 12700c28ed73b87bf28e4eb7c350011bd38f5143c50dcebf7c60056bfdad5d35 psi_da-0.9.3.tar.bz2 30325
+MD5 8f9dd26a5e74a74f0757620da8a34397 psi_de-0.10-a.tar.bz2 33675
+RMD160 ea50b3945d4b9997b7603002cdef7850304ef1d7 psi_de-0.10-a.tar.bz2 33675
+SHA256 cb359514b7507caebef993c0bd3c3474c9f470b9ef4d8154940c7465dfc28874 psi_de-0.10-a.tar.bz2 33675
+MD5 8a659618968a698ba7a5cd76b46be6f2 psi_el-0.9.3-a.tar.bz2 34891
+RMD160 ca2aeaaa5035d7ebc203994bc76f6e4f41358b15 psi_el-0.9.3-a.tar.bz2 34891
+SHA256 feb3628bbcf5fc282ba888bbaf85682639ff286f4acb2738b2026ff5fbaa5d63 psi_el-0.9.3-a.tar.bz2 34891
+MD5 7a8c32d1881f61b5dc3d2243a55034a1 psi_eo-0.10-a.tar.bz2 33751
+RMD160 97ed29f43f7b3910d17119dbba36b223ae933447 psi_eo-0.10-a.tar.bz2 33751
+SHA256 c88c25b548d0a6c0c85691916423bd7dae24465e216ff6193dc296dd04663114 psi_eo-0.10-a.tar.bz2 33751
+MD5 a0565b1d496baa34a433c1b42f04ac6d psi_es-0.10-a.tar.bz2 33686
+RMD160 e0155c338a547bb76400ef102bb5dd4a2d2be99b psi_es-0.10-a.tar.bz2 33686
+SHA256 e513906d05267c21bf6791d808632e7811882bff0b440b2c52a95e3032b42113 psi_es-0.10-a.tar.bz2 33686
+MD5 22057516346027b429aa2b78f8e02f97 psi_et-0.10-a.tar.bz2 32116
+RMD160 b93798742faf5a9ee619bde2454d5a31e38120ab psi_et-0.10-a.tar.bz2 32116
+SHA256 05217591af9d9573ffa651e13f9cd80b666f46085cd881cd7181c1d8465f128a psi_et-0.10-a.tar.bz2 32116
+MD5 d41e102a476ed319f0bcca4c516b4938 psi_fi-0.9.3.tar.bz2 23718
+RMD160 3544990eec2f645d1dd9958741eafe3b72984285 psi_fi-0.9.3.tar.bz2 23718
+SHA256 ac58365b157f4f9420b4ca76f24d43ba63ceda7e53dae66347b248c1bde384ae psi_fi-0.9.3.tar.bz2 23718
+MD5 393bbbca1273cba8b9ffa9f4cb8b9bf0 psi_fr-0.10-a.tar.bz2 35556
+RMD160 85b0036c7cab4aa4821756460b360764b9003e2a psi_fr-0.10-a.tar.bz2 35556
+SHA256 6eb3b3818d172de6de0f2bc1f0cbd783cc12662666974d3e5c83fecc02287d1f psi_fr-0.10-a.tar.bz2 35556
+MD5 b5bfba7b5d74fd32e226456e9c1cb581 psi_hu-0.10-a.tar.bz2 33578
+RMD160 828ec1e570ab7f53e1cfd94c1d80756ae8b9e4c3 psi_hu-0.10-a.tar.bz2 33578
+SHA256 00dcc95225f581da306a3a53c9a90c4deb83da161435ab24622e4b64f7829df6 psi_hu-0.10-a.tar.bz2 33578
+MD5 fccaeb853b8184252aed7c1bfb6b9a32 psi_it-0.10-a.tar.bz2 35032
+RMD160 341c92570f8c00ff3f68cc6608e95e6fd4f5eb6d psi_it-0.10-a.tar.bz2 35032
+SHA256 821e3895e145793a884891939bd8c13368d4f97523da11cc42ca462a31990ae8 psi_it-0.10-a.tar.bz2 35032
+MD5 e2163b47140c617881141ed2e3d9dbbe psi_mk-0.10-a.tar.bz2 33739
+RMD160 d5c09521d68cd71458e7b935fa53ccbf2782ca5e psi_mk-0.10-a.tar.bz2 33739
+SHA256 b0829b3fb3381f5204412206572612cdb04052f87181007bd3a40e6de4ce5957 psi_mk-0.10-a.tar.bz2 33739
+MD5 b29b85674c0d233960240930a6d6067a psi_nl-0.10-a.tar.bz2 34353
+RMD160 02f7afdfb76004c54f2942a748733eddaf936809 psi_nl-0.10-a.tar.bz2 34353
+SHA256 974882df2ba07bfc4e6528c172f4f586c049c421483da45c58767ba53aacfa7a psi_nl-0.10-a.tar.bz2 34353
+MD5 f270e6ed02653bcf9c638b273b50a7cb psi_pl-0.9.3-1.tar.bz2 36619
+RMD160 b7dd19cc5694e7c1a1bb249e6c06a4d9710d90dd psi_pl-0.9.3-1.tar.bz2 36619
+SHA256 cabc951788405f7f067c9aeba3bfe9f4b7a475ab7590bb971a62ae0afa68be8c psi_pl-0.9.3-1.tar.bz2 36619
+MD5 b29def1039c5140e0e3b915909c9df9f psi_pt-0.10-a.tar.bz2 33178
+RMD160 7703955a54319ac3c6ecb277ce9fd8d921f6663a psi_pt-0.10-a.tar.bz2 33178
+SHA256 8e05d53b8970acdcfef37542535b8ceeb72574d94811c50123795080535a80ec psi_pt-0.10-a.tar.bz2 33178
+MD5 8bd6ff47cc42fd3e5664fbb961dd17f3 psi_ptBR-0.10-a.tar.bz2 34206
+RMD160 7fdb8b2c8ec96081ef0c44070db2bb9d272415ff psi_ptBR-0.10-a.tar.bz2 34206
+SHA256 c65d62f29db06e36de987a78961da878c3cb5343f70c61082a08b5572d59cd3d psi_ptBR-0.10-a.tar.bz2 34206
+MD5 5e20def73cdfdee2b9af6798fa75417b psi_ru-0.9.3-a.tar.bz2 33201
+RMD160 67d50a071cd3271866f1bc50af7cfcd5e788a691 psi_ru-0.9.3-a.tar.bz2 33201
+SHA256 84abfb915cb027a2afbd85232ce2a4da1e2066ca9eb7e4a3c88b6ff45c66ddce psi_ru-0.9.3-a.tar.bz2 33201
+MD5 01bf0c623a576e2d9f4ff30942c50a29 psi_se-0.9.3_rc1.tar.bz2 15726
+RMD160 7a7bcb502314e86548fde646a1623146f4dae715 psi_se-0.9.3_rc1.tar.bz2 15726
+SHA256 3008138f07575f60476c00a93589279fca2ab53d4763acffdb49a3bddee19cd5 psi_se-0.9.3_rc1.tar.bz2 15726
+MD5 b804dbef25e3c358767ad69f3dc08acb psi_sk-0.10-a.tar.bz2 35642
+RMD160 609b01504d6bd94f9638340719d4d373fe7c5082 psi_sk-0.10-a.tar.bz2 35642
+SHA256 ba17406a9decdce5a1375108d9055b8f0a7a54d19dd60b8b2990c6fc516a6e03 psi_sk-0.10-a.tar.bz2 35642
+MD5 87f54834c3c4232725cd20f778866d6c psi_sl-0.10-b.tar.bz2 33955
+RMD160 edef7a536af2b72472623990c8e9fd7faad6ac72 psi_sl-0.10-b.tar.bz2 33955
+SHA256 4335c2cdd99efa6b501d05bf0a70e7236210b9102f476fa65303ac93d5ba907e psi_sl-0.10-b.tar.bz2 33955
+MD5 2b10f3faec826d223747ff30cf5135d6 psi_sr-0.10-a.tar.bz2 35244
+RMD160 c61c5e2391fba7f755fa2940877b9e8537df1b56 psi_sr-0.10-a.tar.bz2 35244
+SHA256 5b5d39926b40584b7df479b87ec06cd5f79d5652cc5583ca413482dd110895f8 psi_sr-0.10-a.tar.bz2 35244
+MD5 2773bbf4585e054e7c0ca472b5723014 psi_sv-0.9.3.tar.bz2 35122
+RMD160 a8a28d3a5de1814b2e5cc2767b27dc92fcb86519 psi_sv-0.9.3.tar.bz2 35122
+SHA256 97347269e00d9ce53c56f0c6e510fec873d3d37798a6f2a9ecce4d35824a5098 psi_sv-0.9.3.tar.bz2 35122
+MD5 df93122447366aef362bafde0ed67618 psi_sw-0.9.3.tar.bz2 32917
+RMD160 da126fa3e5c27a1ab5f3c69f9f10e04d164e7744 psi_sw-0.9.3.tar.bz2 32917
+SHA256 452b1d0d1d1357844c3405f8975e82213cf4bd05ac3585662c41956bd04e9348 psi_sw-0.9.3.tar.bz2 32917
+MD5 68bfd1e81913e6629b0cf0f768957837 psi_vi-0.10-b.tar.bz2 34281
+RMD160 bad4fe3166cc123b9bdcb18bd63c2a1f69b3e366 psi_vi-0.10-b.tar.bz2 34281
+SHA256 3b55f4f876a9a7da214d7c610620bace881b7ed0fddb1a1771a9481d2ef8339d psi_vi-0.10-b.tar.bz2 34281
+MD5 45df7c6ec0667673b8d7dadd578dad46 psi_zh-0.10-a.tar.bz2 32845
+RMD160 5865ca950633f698699ce01aec5f129351f76fb4 psi_zh-0.10-a.tar.bz2 32845
+SHA256 b2ba7c788bb81e3bf42b5890d21198f3c8c485b7cad6051a3412b3d088d05785 psi_zh-0.10-a.tar.bz2 32845
diff --git a/net-im/psi/files/psi-desktop2.patch b/net-im/psi/files/psi-desktop2.patch
index deb0f4ea9d70..119a0dd2e7d0 100644
--- a/net-im/psi/files/psi-desktop2.patch
+++ b/net-im/psi/files/psi-desktop2.patch
@@ -1,17 +1,15 @@
 diff -Naur psi-0.10-test3-orig/psi.desktop psi-0.10-test3/psi.desktop
 --- psi-0.10-test3-orig/psi.desktop	2005-11-07 00:39:22.000000000 +0000
 +++ psi-0.10-test3/psi.desktop	2005-11-07 01:16:22.000000000 +0000
-@@ -1,8 +1,12 @@
+@@ -1,7 +1,11 @@
  Encoding=UTF-8
  Name=Psi
  GenericName=Jabber Client
 +GenericName[pl]=Klient Jabbera
 +GenericName[fr]=Client Jabber
  Comment=Communicate over the Jabber network
--Icon=psi
 +Comment[pl]=Komunikator sieci Jabber
 +Comment[fr]=Communiquer sur le réseau Jabber
-+Icon=../icons/hicolor/48x48/apps/psi.png
+ Icon=psi
  Exec=psi
  Terminal=false
- Categories=Qt;Network;InstantMessaging;
diff --git a/net-im/psi/files/psi-taskbar_flashing.patch b/net-im/psi/files/psi-taskbar_flashing.patch
new file mode 100644
index 000000000000..0bc549d54745
--- /dev/null
+++ b/net-im/psi/files/psi-taskbar_flashing.patch
@@ -0,0 +1,95 @@
+diff -Naur psi-0.10-orig/src/groupchatdlg.cpp psi-0.10/src/groupchatdlg.cpp
+--- psi-0.10-orig/src/groupchatdlg.cpp	2006-09-28 22:54:44.000000000 +0000
++++ psi-0.10/src/groupchatdlg.cpp	2006-09-28 22:53:27.000000000 +0000
+@@ -2521,32 +2523,6 @@
+ #endif
+ }
+ 
+-#ifdef Q_WS_WIN
+-void GCMainDlg::doFlash(bool yes)
+-{
+-	if(yes) {
+-		if(d->flashTimer)
+-			return;
+-		d->flashTimer = new QTimer(this);
+-		connect(d->flashTimer, SIGNAL(timeout()), SLOT(flashAnimate()));
+-		d->flashCount = 0;
+-		flashAnimate(); // kick the first one immediately
+-		d->flashTimer->start(500);
+-	}
+-	else {
+-		if(d->flashTimer) {
+-			delete d->flashTimer;
+-			d->flashTimer = 0;
+-			FlashWindow(winId(), false);
+-		}
+-	}
+-}
+-#else
+-void GCMainDlg::doFlash(bool)
+-{
+-}
+-#endif
+-
+ void GCMainDlg::flashAnimate()
+ {
+ #ifdef Q_WS_WIN
+@@ -2897,3 +2873,58 @@
+ }
+ 
+ #include "groupchatdlg.moc"
++
++#if defined( Q_WS_WIN )
++void GCMainDlg::doFlash(bool yes)
++{
++	if(yes) {
++		if(d->flashTimer)
++			return;
++		d->flashTimer = new QTimer(this);
++		connect(d->flashTimer, SIGNAL(timeout()), SLOT(flashAnimate()));
++		d->flashCount = 0;
++		flashAnimate(); // kick the first one immediately
++		d->flashTimer->start(500);
++	}
++	else {
++		if(d->flashTimer) {
++			delete d->flashTimer;
++			d->flashTimer = 0;
++			FlashWindow(winId(), false);
++		}
++	}
++}
++#elif defined( Q_WS_X11 )
++#include<X11/Xutil.h>
++void GCMainDlg::doFlash(bool yes)
++{
++	Display *xdisplay = qt_xdisplay();
++	Window rootwin = qt_xrootwin(), winId = this->winId();
++
++	static Atom demandsAttention = XInternAtom(xdisplay, "_NET_WM_STATE_DEMANDS_ATTENTION", true);
++	static Atom wmState = XInternAtom(xdisplay, "_NET_WM_STATE", true);
++
++	XEvent e;
++	e.xclient.type = ClientMessage;
++	e.xclient.message_type = wmState;
++	e.xclient.display = xdisplay;
++	e.xclient.window = winId;
++	e.xclient.format = 32;
++	e.xclient.data.l[1] = demandsAttention;
++	e.xclient.data.l[2] = 0l;
++	e.xclient.data.l[3] = 0l;
++	e.xclient.data.l[4] = 0l;
++
++	if (yes) {
++		e.xclient.data.l[0] = 1;
++	}
++	else {
++		e.xclient.data.l[0] = 0;
++	}
++	XSendEvent(xdisplay, rootwin, False, (SubstructureRedirectMask | SubstructureNotifyMask), &e);
++}
++#else
++void GCMainDlg::doFlash(bool)
++{
++}
++#endif