Request 1389 (accepted)

Overview

Request 1389 (accepted)

update to 20141106

Created by jirislaby about 10 years ago
In state accepted
Package maintainer: jirislaby

Submit psi+-iconsets

Submit package home:jirislaby / psi+-iconsets to package Essentials / psi+-iconsets

psi+-iconsets.changes Changed

psi+-iconsets.spec Changed

_service Added

psi-plus-main-20130107.tar.xz/iconsets/roster Deleted

psi-plus-main-20130107.tar.xz/iconsets/roster/default Deleted

psi-plus-main-20130107.tar.xz/iconsets/roster/default/typing.png Deleted

psi-plus-main-20130107.tar.xz/iconsets/system/default/psiplus/action_button_send.png Deleted

psi-plus-main-20130107.tar.xz/iconsets/system/default/psiplus/theme_title_texture.png Deleted

psi-plus-main-20130107.tar.xz/patches/0002-psi-extend-popups.diff Deleted

@@ -1,4203 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -278,18 +278,34 @@
- 			</look>
- 			<notifications>
- 				<alert-style type="QString">animate</alert-style>
-+				<typename type="QString">Classic</typename>
- 				<bounce-dock type="QString">forever</bounce-dock>
--				<enable-growl type="bool">true</enable-growl>
- 				<passive-popups>
--					<duration type="int">10000</duration>
-+					<delays>
-+						<chat type="int">5000</chat>
-+						<file type="int">5000</file>
-+						<message type="int">5000</message>
-+						<gc-message type="int">5000</gc-message>
-+						<status type="int">2000</status>
-+					</delays>
- 					<enabled type="bool">false</enabled>
-+					<top-to-bottom type="bool">false</top-to-bottom>
-+					<at-left-corner type="bool">false</at-left-corner>
- 					<incoming-chat type="bool">true</incoming-chat>
-+					<composing type="bool">true</composing>
- 					<incoming-file-transfer type="bool">true</incoming-file-transfer>
- 					<incoming-headline type="bool">true</incoming-headline>
- 					<incoming-message type="bool">true</incoming-message>
-+					<notify-every-muc-message type="bool">false</notify-every-muc-message>
- 					<maximum-jid-length type="int">25</maximum-jid-length>
- 					<maximum-text-length type="int">300</maximum-text-length>
- 					<maximum-status-length type="int">-1</maximum-status-length>
-+					<avatar-size type="int">48</avatar-size>
-+					<suppress-while-away type="bool">false</suppress-while-away>
-+					<suppress-while-dnd type="bool">true</suppress-while-dnd>
-+					<dbus>
-+						<transient-hint type="bool">false</transient-hint>
-+					</dbus>
- 					<status>
- 						<offline type="bool">true</offline>
- 						<online type="bool">true</online>
---- psi.orig/options/macosx.xml
-+++ psi/options/macosx.xml
-@@ -10,6 +10,9 @@
- 					<passive-popup type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</passive-popup>
- 				</font>
- 			</look>
-+			<notifications>
-+				<typename type="QString">Growl</type>
-+			</notifications>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
- 			<contactlist comment="Shortcuts in the contactlist">
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -88,6 +88,8 @@
- #include <windows.h>
- #endif
- 
-+#include "popupmanager.h"
-+#include "psievent.h"
- 
- #define MCMDMUC		"http://psi-im.org/ids/mcmd#mucmain"
- #define MCMDMUCNICK	"http://psi-im.org/ids/mcmd#mucnick"
-@@ -1457,6 +1459,15 @@ void GCMainDlg::message(const Message &_
- 	else {
- 		if(alert || (PsiOptions::instance()->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
- 			account()->playSound(PsiAccount::eGroupChat);
-+
-+		if(alert || (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
-+			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
-+				XMPP::Jid jid = m.from()/*.withDomain("")*/;
-+				MessageEvent *e = new MessageEvent(m, account());
-+				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), 0, (PsiEvent *)e);
-+				e->deleteLater();
-+			}
-+		}
- 	}
- 
- 	if(from.isEmpty())
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -56,7 +56,6 @@
- #include "psitoolbar.h"
- #include "aboutdlg.h"
- #include "psitoolbar.h"
--#include "psipopup.h"
- #include "psioptions.h"
- #include "tipdlg.h"
- #include "mucjoindlg.h"
-@@ -453,8 +452,6 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
- MainWin::~MainWin()
- {
--	PsiPopup::deleteAll();
--
- 	if(d->tray) {
- 		delete d->tray;
- 		d->tray = 0;
---- psi.orig/src/options/opt_events.cpp
-+++ psi/src/options/opt_events.cpp
-@@ -23,9 +23,9 @@ public:
- //----------------------------------------------------------------------------
- 
- OptionsTabEvents::OptionsTabEvents(QObject *parent)
--: OptionsTab(parent, "events", "", tr("Events"), tr("The events behaviour"), "psi/events")
-+	: OptionsTab(parent, "events", "", tr("Events"), tr("The events behaviour"), "psi/events")
-+	, w(0)
- {
--	w = 0;
- }
- 
- QWidget *OptionsTabEvents::widget()
-@@ -79,11 +79,6 @@ QWidget *OptionsTabEvents::widget()
- 	d->cb_bounce->hide();
- 	d->lb_bounce->hide();
- #endif
--
--#if !defined(Q_WS_MAC) || !defined(HAVE_GROWL)
--	d->ck_growl->hide();
--#endif
--
- /*
- 	list_alerts.insert(0,d->rb_aSolid);
- 	list_alerts.insert(1,d->rb_aBlink);
-@@ -110,16 +105,6 @@ void OptionsTabEvents::applyOptions()
- 	PsiOptions::instance()->setOption("options.subscriptions.automatically-allow-authorization", d->ck_autoAuth->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.notifications.successful-subscription", d->ck_notifyAuth->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.notifications.bounce-dock", d->cb_bounce->itemData( d->cb_bounce->currentIndex()));
--
--	PsiOptions::instance()->setOption("options.ui.notifications.enable-growl", d->ck_growl->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.enabled", d->ck_popupOn->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-message", d->ck_popupOnMessage->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-chat", d->ck_popupOnMessage->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-headline", d->ck_popupOnHeadline->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.incoming-file-transfer", d->ck_popupOnFile->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.online", d->ck_popupOnOnline->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.offline", d->ck_popupOnOffline->isChecked());
--	PsiOptions::instance()->setOption("options.ui.notifications.passive-popups.status.other-changes", d->ck_popupOnStatus->isChecked());
- }
- 
- void OptionsTabEvents::restoreOptions()
-@@ -139,13 +124,4 @@ void OptionsTabEvents::restoreOptions()
- 	d->ck_autoAuth->setChecked( PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorization").toBool() );
- 	d->ck_notifyAuth->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.successful-subscription").toBool() );
- 	d->cb_bounce->setCurrentIndex( d->cb_bounce->findData(PsiOptions::instance()->getOption("options.ui.notifications.bounce-dock").toString()) );
--
--	d->ck_growl->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.enable-growl").toBool() );
--	d->ck_popupOn->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool() );
--	d->ck_popupOnMessage->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool() || PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool() );
--	d->ck_popupOnHeadline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool() );
--	d->ck_popupOnFile->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool() );
--	d->ck_popupOnOnline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool() );
--	d->ck_popupOnOffline->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool() );
--	d->ck_popupOnStatus->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool() );
- }
---- psi.orig/src/options/opt_events.ui
-+++ psi/src/options/opt_events.ui
-@@ -6,7 +6,7 @@
-     <x>0</x>
-     <y>0</y>
-     <width>347</width>
--    <height>588</height>
-+    <height>335</height>
-    </rect>
-   </property>
-   <property name="windowTitle" >
-@@ -192,83 +192,6 @@
-      </item>
-     </layout>
-    </item>
--   <item>
--    <widget class="QCheckBox" name="ck_growl" >
--     <property name="text" >
--      <string>Enable Growl notifications</string>
--     </property>
--     <property name="checked" >
--      <bool>true</bool>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QCheckBox" name="ck_popupOn" >
--     <property name="text" >
--      <string>Enable popup notifications</string>
--     </property>
--     <property name="checked" >
--      <bool>true</bool>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="groupBox1" >
--     <property name="title" >
--      <string>Popup notifications</string>
--     </property>
--     <layout class="QVBoxLayout" >
--      <property name="margin" >
--       <number>10</number>
--      </property>
--      <property name="spacing" >
--       <number>6</number>
--      </property>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnMessage" >
--        <property name="text" >
--         <string>On incoming message event</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnHeadline" >
--        <property name="text" >
--         <string>On incoming headline event</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnFile" >
--        <property name="text" >
--         <string>On incoming file event</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnOnline" >
--        <property name="text" >
--         <string>When a contact becomes available</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnOffline" >
--        <property name="text" >
--         <string>When a contact becomes unavailable</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_popupOnStatus" >
--        <property name="text" >
--         <string>When a contact changes status</string>
--        </property>
--       </widget>
--      </item>
--     </layout>
--    </widget>
--   </item>
-   </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-@@ -284,32 +207,6 @@
-   <tabstop>ck_notifyAuth</tabstop>
-   <tabstop>cb_bounce</tabstop>
-   <tabstop>cb_animation</tabstop>
--  <tabstop>ck_growl</tabstop>
--  <tabstop>ck_popupOn</tabstop>
--  <tabstop>ck_popupOnMessage</tabstop>
--  <tabstop>ck_popupOnHeadline</tabstop>
--  <tabstop>ck_popupOnFile</tabstop>
--  <tabstop>ck_popupOnOnline</tabstop>
--  <tabstop>ck_popupOnOffline</tabstop>
--  <tabstop>ck_popupOnStatus</tabstop>
-  </tabstops>
-  <resources/>
-- <connections>
--  <connection>
--   <sender>ck_popupOn</sender>
--   <signal>toggled(bool)</signal>
--   <receiver>groupBox1</receiver>
--   <slot>setEnabled(bool)</slot>
--   <hints>
--    <hint type="sourcelabel" >
--     <x>158</x>
--     <y>384</y>
--    </hint>
--    <hint type="destinationlabel" >
--     <x>158</x>
--     <y>425</y>
--    </hint>
--   </hints>
--  </connection>
-- </connections>
- </ui>
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -42,6 +42,7 @@
- #include "opt_appearance.h"
- #include "opt_chat.h"
- #include "opt_events.h"
-+#include "opt_popups.h"
- #include "opt_status.h"
- #include "opt_iconset.h"
- #include "opt_groupchat.h"
-@@ -271,6 +272,7 @@ void OptionsDlg::Private::createTabs()
- 	tabs.append( applicationTab );
- 	tabs.append( new OptionsTabChat(this) );
- 	tabs.append( new OptionsTabEvents(this) );
-+	tabs.append( new OptionsTabPopups(this) );
- 	tabs.append( new OptionsTabStatus(this) );
- 	tabs.append( new OptionsTabAppearance(this) );
- 	//tabs.append( new OptionsTabIconsetSystem(this) );
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
-@@ -14,6 +14,7 @@ HEADERS += \
- 	$$PWD/opt_application.h \
- 	$$PWD/opt_chat.h \
- 	$$PWD/opt_events.h \
-+	$$PWD/opt_popups.h \
- 	$$PWD/opt_status.h \
- 	$$PWD/opt_appearance.h \
- 	$$PWD/opt_iconset.h \
-@@ -30,6 +31,7 @@ SOURCES += \
- 	$$PWD/opt_application.cpp \
- 	$$PWD/opt_chat.cpp \
- 	$$PWD/opt_events.cpp \
-+	$$PWD/opt_popups.cpp \
- 	$$PWD/opt_status.cpp \
- 	$$PWD/opt_appearance.cpp \
- 	$$PWD/opt_iconset.cpp \
-@@ -46,6 +48,7 @@ FORMS += \
- 	$$PWD/opt_application.ui \
- 	$$PWD/opt_chat.ui \
- 	$$PWD/opt_events.ui \
-+	$$PWD/opt_popups.ui \
- 	$$PWD/opt_status.ui \
- 	$$PWD/opt_appearance.ui \
- 	$$PWD/opt_appearance_misc.ui \
---- psi.orig/src/options/opt_popups.cpp
-+++ psi/src/options/opt_popups.cpp
-@@ -0,0 +1,166 @@
-+/*
-+ * opt_popups.cpp
-+ * Copyright (C) 2011  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+//#include <QHBoxLayout>
-+#include <QRadioButton>
-+
-+#include "opt_popups.h"
-+#include "ui_opt_popups.h"
-+#include "psioptions.h"
-+#include "psicon.h"
-+#include "popupmanager.h"
-+
-+class OptPopupsUI : public QWidget, public Ui::OptPopups
-+{
-+public:
-+	OptPopupsUI() : QWidget() { setupUi(this); }
-+};
-+
-+OptionsTabPopups::OptionsTabPopups(QObject *parent)
-+	: OptionsTab(parent, "popups", "", tr("Popups"), tr("The popups behaviour"), "psi/tip")
-+	, w(0)
-+	, popup_(0)
-+{
-+}
-+
-+QWidget *OptionsTabPopups::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new OptPopupsUI();
-+	return w;
-+}
-+
-+void OptionsTabPopups::applyOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptPopupsUI *d = (OptPopupsUI *)w;
-+
-+	PsiOptions *o = PsiOptions::instance();
-+
-+	o->setOption("options.ui.notifications.passive-popups.enabled", d->ck_popupOn->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.incoming-message", d->ck_popupOnMessage->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.showMessage", d->ck_showPopupMessage->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.incoming-chat", d->ck_popupOnMessage->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.incoming-headline", d->ck_popupOnHeadline->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.incoming-file-transfer", d->ck_popupOnFile->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.status.online", d->ck_popupOnOnline->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.status.offline", d->ck_popupOnOffline->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.status.other-changes", d->ck_popupOnStatus->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.composing", d->ck_popupComposing->isChecked());
-+	o->setOption("options.ui.notifications.passive-popups.avatar-size", d->sb_avatar->value());
-+
-+	o->setOption("options.ui.notifications.passive-popups.maximum-jid-length", QVariant(d->sb_jid->value()));
-+	o->setOption("options.ui.notifications.passive-popups.maximum-status-length", QVariant(d->sb_status->value()));
-+	o->setOption("options.ui.notifications.passive-popups.maximum-text-length", QVariant(d->sb_text->value()));
-+	o->setOption("options.ui.notifications.passive-popups.top-to-bottom",QVariant(d->ck_topToBottom->isChecked()));
-+	o->setOption("options.ui.notifications.passive-popups.at-left-corner",QVariant(d->ck_atLeft->isChecked()));
-+	o->setOption("options.ui.notifications.passive-popups.notify-every-muc-message",QVariant(d->ck_everyMucMessage->isChecked()));
-+
-+	foreach(QObject* obj, d->sa_durations->widget()->children()) {
-+		QSpinBox *sb = dynamic_cast<QSpinBox*>(obj);
-+		if(sb) {
-+			const QString oName = sb->property("name").toString();
-+			const QString oPath = sb->property("path").toString();
-+			const int value = sb->value();
-+			popup_->setValue(oName, value);
-+			if(!oPath.isEmpty()) {
-+				PsiOptions::instance()->setOption(oPath, value*1000);
-+			}
-+		}
-+	}
-+
-+	foreach(QObject* obj, d->gb_type->children()) {
-+		QRadioButton *rb = dynamic_cast<QRadioButton*>(obj);
-+		if(rb && rb->isChecked()) {
-+			o->setOption("options.ui.notifications.typename", rb->text());
-+			break;
-+		}
-+	}
-+}
-+
-+void OptionsTabPopups::restoreOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptPopupsUI *d = (OptPopupsUI *)w;
-+
-+	PsiOptions *o = PsiOptions::instance();
-+
-+	d->ck_popupOn->setChecked( o->getOption("options.ui.notifications.passive-popups.enabled").toBool() );
-+	d->ck_popupOnMessage->setChecked( o->getOption("options.ui.notifications.passive-popups.incoming-message").toBool() || o->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool() );
-+	d->ck_showPopupMessage->setChecked( o->getOption("options.ui.notifications.passive-popups.showMessage").toBool());
-+	d->ck_popupOnHeadline->setChecked( o->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool() );
-+	d->ck_popupOnFile->setChecked( o->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool() );
-+	d->ck_popupOnOnline->setChecked( o->getOption("options.ui.notifications.passive-popups.status.online").toBool() );
-+	d->ck_popupOnOffline->setChecked( o->getOption("options.ui.notifications.passive-popups.status.offline").toBool() );
-+	d->ck_popupOnStatus->setChecked( o->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool() );
-+	d->ck_popupComposing->setChecked( o->getOption("options.ui.notifications.passive-popups.composing").toBool() );
-+	d->sb_avatar->setValue( o->getOption("options.ui.notifications.passive-popups.avatar-size").toInt() );
-+
-+	d->sb_jid->setValue(o->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt());
-+	d->sb_status->setValue(o->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt());
-+	d->sb_text->setValue(o->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt());
-+	d->ck_topToBottom->setChecked(o->getOption("options.ui.notifications.passive-popups.top-to-bottom").toBool());
-+	d->ck_atLeft->setChecked(o->getOption("options.ui.notifications.passive-popups.at-left-corner").toBool());
-+	d->ck_everyMucMessage->setChecked(o->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool());
-+
-+	QWidget *areaWidget = new QWidget;
-+	QVBoxLayout *vBox = new QVBoxLayout(areaWidget);
-+	foreach(const QString& option, popup_->optionsNamesList()) {
-+		QHBoxLayout *l = new QHBoxLayout;
-+		l->addWidget(new QLabel(option));
-+		l->addStretch();
-+		QSpinBox *sb = new QSpinBox();
-+		sb->setMinimum(-1);
-+		sb->setValue(popup_->value(option));
-+		sb->setProperty("path", popup_->optionPath(option));
-+		sb->setProperty("name", option);
-+		l->addWidget(sb);
-+		vBox->addLayout(l);
-+	}
-+	d->sa_durations->setWidget(areaWidget);
-+
-+	delete d->gb_type->layout();
-+	qDeleteAll(d->gb_type->children());
-+	QHBoxLayout *l = new QHBoxLayout(d->gb_type);
-+
-+	foreach(QString type_, popup_->availableTypes()) {
-+		QRadioButton* rb = new QRadioButton(type_);
-+		d->gb_type->layout()->addWidget(rb);
-+		l->addWidget(rb);
-+		if(popup_->currentType() == type_)
-+			rb->setChecked(true);
-+	}
-+
-+	if(l->count() == 1)
-+		d->gb_type->setVisible(false);
-+
-+	emit connectDataChanged(w);
-+}
-+
-+void OptionsTabPopups::setData(PsiCon *psi, QWidget *)
-+{
-+	popup_ = psi->popupManager();
-+}
---- psi.orig/src/options/opt_popups.h
-+++ psi/src/options/opt_popups.h
-@@ -0,0 +1,49 @@
-+/*
-+ * opt_popups.h
-+ * Copyright (C) 2011  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef OPT_POPUPS_H
-+#define OPT_POPUPS_H
-+
-+#include "optionstab.h"
-+
-+class PsiCon;
-+class PopupManager;
-+
-+class OptionsTabPopups : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabPopups(QObject *parent);
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+
-+	virtual bool stretchable() const { return true; }
-+
-+public slots:
-+	virtual void setData(PsiCon *psi, QWidget *);
-+
-+private:
-+	QWidget *w;
-+	PopupManager* popup_;
-+};
-+
-+#endif
---- psi.orig/src/options/opt_popups.ui
-+++ psi/src/options/opt_popups.ui
-@@ -0,0 +1,421 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptPopups</class>
-+ <widget class="QWidget" name="OptPopups">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>608</width>
-+    <height>520</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>OptPopupsUI</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout_4">
-+   <item>
-+    <widget class="QCheckBox" name="ck_popupOn">
-+     <property name="text">
-+      <string>Enable popup notifications</string>
-+     </property>
-+     <property name="checked">
-+      <bool>true</bool>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QGroupBox" name="gb_type">
-+     <property name="title">
-+      <string>Notifications type</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QTabWidget" name="tabWidget">
-+     <property name="autoFillBackground">
-+      <bool>false</bool>
-+     </property>
-+     <property name="currentIndex">
-+      <number>0</number>
-+     </property>
-+     <widget class="QWidget" name="tab">
-+      <attribute name="title">
-+       <string>General</string>
-+      </attribute>
-+      <layout class="QVBoxLayout" name="verticalLayout_3">
-+       <item>
-+        <widget class="QGroupBox" name="groupBox1">
-+         <property name="title">
-+          <string>Popup notifications</string>
-+         </property>
-+         <layout class="QVBoxLayout" name="verticalLayout_2">
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnMessage">
-+            <property name="text">
-+             <string>On incoming message event</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_showPopupMessage">
-+            <property name="text">
-+             <string>Show incoming message on popup</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnHeadline">
-+            <property name="text">
-+             <string>On incoming headline event</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnFile">
-+            <property name="text">
-+             <string>On incoming file event</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupComposing">
-+            <property name="text">
-+             <string>When a contact begins typing</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnOnline">
-+            <property name="text">
-+             <string>When a contact becomes available</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnOffline">
-+            <property name="text">
-+             <string>When a contact becomes unavailable</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_popupOnStatus">
-+            <property name="text">
-+             <string>When a contact changes status</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QCheckBox" name="ck_everyMucMessage">
-+            <property name="text">
-+             <string>Enable popup notifications for every muc message</string>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </widget>
-+       </item>
-+       <item>
-+        <layout class="QGridLayout" name="gridLayout">
-+         <item row="0" column="0">
-+          <widget class="QGroupBox" name="groupBox">
-+           <property name="title">
-+            <string>Limitations</string>
-+           </property>
-+           <layout class="QGridLayout" name="_3">
-+            <item row="0" column="0">
-+             <widget class="QLabel" name="label">
-+              <property name="text">
-+               <string>Maximum JID length:</string>
-+              </property>
-+              <property name="alignment">
-+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+              </property>
-+             </widget>
-+            </item>
-+            <item row="0" column="1">
-+             <widget class="QSpinBox" name="sb_jid">
-+              <property name="sizePolicy">
-+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-+                <horstretch>0</horstretch>
-+                <verstretch>0</verstretch>
-+               </sizepolicy>
-+              </property>
-+              <property name="minimum">
-+               <number>-1</number>
-+              </property>
-+              <property name="maximum">
-+               <number>999</number>
-+              </property>
-+             </widget>
-+            </item>
-+            <item row="1" column="0">
-+             <widget class="QLabel" name="label_2">
-+              <property name="text">
-+               <string>Maximum text length:</string>
-+              </property>
-+              <property name="alignment">
-+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+              </property>
-+             </widget>
-+            </item>
-+            <item row="1" column="1">
-+             <widget class="QSpinBox" name="sb_text">
-+              <property name="sizePolicy">
-+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-+                <horstretch>0</horstretch>
-+                <verstretch>0</verstretch>
-+               </sizepolicy>
-+              </property>
-+              <property name="minimum">
-+               <number>-1</number>
-+              </property>
-+              <property name="maximum">
-+               <number>999</number>
-+              </property>
-+             </widget>
-+            </item>
-+            <item row="2" column="0">
-+             <widget class="QLabel" name="label_3">
-+              <property name="text">
-+               <string>Maximum status length:</string>
-+              </property>
-+              <property name="alignment">
-+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+              </property>
-+             </widget>
-+            </item>
-+            <item row="2" column="1">
-+             <widget class="QSpinBox" name="sb_status">
-+              <property name="sizePolicy">
-+               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-+                <horstretch>0</horstretch>
-+                <verstretch>0</verstretch>
-+               </sizepolicy>
-+              </property>
-+              <property name="minimum">
-+               <number>-1</number>
-+              </property>
-+              <property name="maximum">
-+               <number>999</number>
-+              </property>
-+             </widget>
-+            </item>
-+           </layout>
-+          </widget>
-+         </item>
-+         <item row="0" column="1">
-+          <widget class="QGroupBox" name="groupBox2">
-+           <property name="title">
-+            <string>Popup location</string>
-+           </property>
-+           <layout class="QVBoxLayout" name="_2" stretch="0,0,0">
-+            <item>
-+             <widget class="QCheckBox" name="ck_topToBottom">
-+              <property name="text">
-+               <string>Show popups from top to bottom</string>
-+              </property>
-+             </widget>
-+            </item>
-+            <item>
-+             <widget class="QCheckBox" name="ck_atLeft">
-+              <property name="text">
-+               <string>Place popups at left</string>
-+              </property>
-+             </widget>
-+            </item>
-+            <item>
-+             <spacer name="verticalSpacer_2">
-+              <property name="orientation">
-+               <enum>Qt::Vertical</enum>
-+              </property>
-+              <property name="sizeHint" stdset="0">
-+               <size>
-+                <width>20</width>
-+                <height>40</height>
-+               </size>
-+              </property>
-+             </spacer>
-+            </item>
-+           </layout>
-+          </widget>
-+         </item>
-+         <item row="0" column="2">
-+          <spacer name="horizontalSpacer">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>40</width>
-+             <height>20</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+        </layout>
-+       </item>
-+      </layout>
-+     </widget>
-+     <widget class="QWidget" name="tab_2">
-+      <attribute name="title">
-+       <string>Misc</string>
-+      </attribute>
-+      <layout class="QVBoxLayout" name="verticalLayout">
-+       <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout_2">
-+         <item>
-+          <widget class="QLabel" name="label_4">
-+           <property name="text">
-+            <string>Avatar size:</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QSpinBox" name="sb_avatar"/>
-+         </item>
-+         <item>
-+          <spacer name="horizontalSpacer_3">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>40</width>
-+             <height>20</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+        </layout>
-+       </item>
-+       <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout">
-+         <item>
-+          <widget class="QGroupBox" name="gb_durations">
-+           <property name="title">
-+            <string>Durations, sec.</string>
-+           </property>
-+           <layout class="QVBoxLayout" name="verticalLayout_5">
-+            <item>
-+             <widget class="QScrollArea" name="sa_durations">
-+              <property name="autoFillBackground">
-+               <bool>false</bool>
-+              </property>
-+              <property name="frameShape">
-+               <enum>QFrame::NoFrame</enum>
-+              </property>
-+              <property name="frameShadow">
-+               <enum>QFrame::Sunken</enum>
-+              </property>
-+              <property name="lineWidth">
-+               <number>0</number>
-+              </property>
-+              <property name="horizontalScrollBarPolicy">
-+               <enum>Qt::ScrollBarAlwaysOff</enum>
-+              </property>
-+              <property name="widgetResizable">
-+               <bool>false</bool>
-+              </property>
-+              <property name="alignment">
-+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-+              </property>
-+              <widget class="QWidget" name="scrollAreaWidgetContents">
-+               <property name="geometry">
-+                <rect>
-+                 <x>0</x>
-+                 <y>0</y>
-+                 <width>538</width>
-+                 <height>81</height>
-+                </rect>
-+               </property>
-+               <property name="autoFillBackground">
-+                <bool>false</bool>
-+               </property>
-+              </widget>
-+             </widget>
-+            </item>
-+           </layout>
-+          </widget>
-+         </item>
-+         <item>
-+          <spacer name="horizontalSpacer_2">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>0</width>
-+             <height>0</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+        </layout>
-+       </item>
-+       <item>
-+        <spacer name="verticalSpacer">
-+         <property name="orientation">
-+          <enum>Qt::Vertical</enum>
-+         </property>
-+         <property name="sizeHint" stdset="0">
-+          <size>
-+           <width>10</width>
-+           <height>0</height>
-+          </size>
-+         </property>
-+        </spacer>
-+       </item>
-+      </layout>
-+     </widget>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <tabstops>
-+  <tabstop>ck_popupOn</tabstop>
-+  <tabstop>ck_popupOnMessage</tabstop>
-+  <tabstop>ck_popupOnHeadline</tabstop>
-+  <tabstop>ck_popupOnFile</tabstop>
-+  <tabstop>ck_popupOnOnline</tabstop>
-+  <tabstop>ck_popupOnOffline</tabstop>
-+  <tabstop>ck_popupOnStatus</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>ck_popupOn</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>tabWidget</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>303</x>
-+     <y>19</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>303</x>
-+     <y>273</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_popupOn</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>gb_type</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>303</x>
-+     <y>19</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>303</x>
-+     <y>50</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
---- psi.orig/src/popupmanager.cpp
-+++ psi/src/popupmanager.cpp
-@@ -0,0 +1,264 @@
-+/*
-+ * popupmanager.cpp
-+ * Copyright (C) 2011-2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "popupmanager.h"
-+#include "psioptions.h"
-+#include "psiaccount.h"
-+#include "psicon.h"
-+#include "psipopupinterface.h"
-+#include "xmpp/jid/jid.h"
-+
-+#include <QPluginLoader>
-+#include <QtPlugin>
-+
-+
-+static const int defaultTimeout = 5;
-+static const QString defaultType = "Classic";
-+
-+struct OptionValue
-+{
-+	OptionValue(const QString& name, const QString& path, int value, int _id = 0)
-+		: optionName(name)
-+		, optionPath(path)
-+		, optionValue(value)
-+		, id(_id)
-+	{
-+	}
-+
-+	QString optionName;
-+	QString optionPath;
-+	int optionValue; //value in secconds
-+	int id;
-+
-+	bool operator==(const OptionValue& other)
-+	{
-+		return optionName == other.optionName;
-+	}
-+};
-+
-+class PopupManager::Private
-+{
-+
-+public:
-+	Private()
-+		: psi_(0)
-+		, lastCustomType_(PopupManager::AlertCustom)
-+	{
-+	}
-+
-+	PsiPopupInterface* popup(const QString& name)
-+	{
-+		PsiPopupInterface* ppi = 0;
-+		PsiPopupPluginInterface *plugin = 0;
-+		if(popups_.keys().contains(name)) {
-+			plugin = popups_.value(name);
-+		}
-+		if(plugin) {
-+			ppi = plugin->popup(psi_);
-+		}
-+
-+		return ppi;
-+	}
-+
-+	bool noPopup(PsiAccount *account) const
-+	{
-+		if(account) {
-+			if(account->noPopup())
-+				return true;
-+		}
-+		else {
-+			Status::Type type = psi_->currentStatusType();
-+			if((type == Status::DND && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.suppress-while-dnd").toBool())
-+				|| ( (type == Status::Away || type == Status::XA) &&
-+				     PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.suppress-while-away").toBool() ))
-+				{
-+				return true;
-+			}
-+		}
-+		return false;
-+	}
-+
-+	int timeout(PopupType type) const
-+	{
-+		if(type == AlertMessage || type == AlertAvCall)
-+			type = AlertChat;
-+		else if(type == AlertOffline || type == AlertStatusChange || type == AlertNone || type == AlertComposing)
-+			type = AlertOnline;
-+
-+		foreach(const OptionValue& v, options_)
-+			if(v.id == type)
-+				return v.optionValue*1000;
-+
-+		return defaultTimeout*1000;
-+	}
-+
-+	PsiCon* psi_;
-+	int lastCustomType_;
-+	QList<OptionValue> options_;
-+	QMap<QString, PsiPopupPluginInterface*> popups_;
-+};
-+
-+PopupManager::PopupManager(PsiCon *psi)
-+{
-+	d = new Private;
-+	d->psi_ = psi;
-+
-+	QList<OptionValue> initList;
-+	initList << OptionValue(QObject::tr("Status"), "options.ui.notifications.passive-popups.delays.status",
-+			PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.delays.status").toInt()/1000, AlertOnline)
-+	<< OptionValue(QObject::tr("Headline"),  "options.ui.notifications.passive-popups.delays.message",
-+			PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.delays.message").toInt()/1000, AlertHeadline)
-+	<< OptionValue(QObject::tr("File"), "options.ui.notifications.passive-popups.delays.file",
-+			PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.delays.file").toInt()/1000, AlertFile)
-+	<< OptionValue(QObject::tr("Chat Message"), "options.ui.notifications.passive-popups.delays.chat",
-+			PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.delays.chat").toInt()/1000, AlertChat)
-+	<< OptionValue(QObject::tr("Groupchat Message"),  "options.ui.notifications.passive-popups.delays.gc-message",
-+			PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.delays.gc-message").toInt()/1000, AlertGcHighlight);
-+
-+	d->options_ += initList;
-+
-+	foreach(QObject* plugin, QPluginLoader::staticInstances()) {
-+		PsiPopupPluginInterface* ppi = qobject_cast<PsiPopupPluginInterface*>(plugin);
-+		if(ppi && ppi->isAvailable()) {
-+			d->popups_.insert(ppi->name(), ppi);
-+		}
-+	}
-+}
-+
-+PopupManager::~PopupManager()
-+{
-+	delete d;
-+}
-+
-+int PopupManager::registerOption(const QString& name, int initValue, const QString& path)
-+{	
-+	foreach(const OptionValue& v, d->options_) {
-+		if(v.optionName == name)
-+			return v.id;
-+	}
-+
-+	OptionValue ov(name, path, initValue, ++d->lastCustomType_);
-+	d->options_.append(ov);
-+
-+	return ov.id;
-+}
-+
-+void PopupManager::unregisterOption(const QString &name)
-+{
-+	OptionValue ov(name, "", 0, 0);
-+	d->options_.removeAll(ov);
-+}
-+
-+void PopupManager::setValue(const QString& name, int value)
-+{	
-+	QList<OptionValue>::iterator i = d->options_.begin();
-+	for(; i != d->options_.end(); ++i) {
-+		if((*i).optionName == name) {
-+			(*i).optionValue = value;
-+		}
-+	}
-+}
-+
-+int PopupManager::value(const QString& name) const
-+{
-+	foreach(const OptionValue& v, d->options_) {
-+		if(v.optionName == name)
-+			return v.optionValue;
-+	}
-+
-+	return defaultTimeout;
-+}
-+
-+const QString PopupManager::optionPath(const QString& name) const
-+{	
-+	foreach(const OptionValue& v, d->options_) {
-+		if(v.optionName == name)
-+			return v.optionPath;
-+	}
-+
-+	return QString();
-+}
-+
-+const QStringList PopupManager::optionsNamesList() const
-+{
-+	QStringList ret;
-+	foreach(const OptionValue& v, d->options_)
-+		ret.append(v.optionName);
-+
-+	return ret;
-+}
-+
-+void PopupManager::doPopup(PsiAccount *account, PopupType pType, const Jid &j, const Resource &r,
-+			   UserListItem *u, PsiEvent *e, bool checkNoPopup)
-+{
-+	if (!PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool())
-+		return;
-+
-+	if(checkNoPopup && d->noPopup(account))
-+		return;
-+
-+	PsiPopupInterface *popup = d->popup(currentType());
-+	if(popup) {
-+		popup->setDuration(d->timeout(pType));
-+		popup->popup(account, pType, j, r, u, e);
-+	}
-+}
-+
-+void PopupManager::doPopup(PsiAccount *account, const Jid &j, const PsiIcon *titleIcon, const QString &titleText,
-+			   const QPixmap *avatar, const PsiIcon *icon, const QString &text, bool checkNoPopup, PopupType pType)
-+{
-+	if (!PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool())
-+		return;
-+
-+	if(checkNoPopup && d->noPopup(account))
-+		return;
-+
-+	PsiPopupInterface *popup = d->popup(currentType());
-+	if(popup) {
-+		popup->setDuration(d->timeout(pType));
-+		popup->popup(account, pType, j, titleIcon, titleText, avatar, icon, text);
-+	}
-+}
-+
-+
-+QStringList PopupManager::availableTypes() const
-+{
-+	return d->popups_.keys();
-+}
-+
-+QString PopupManager::currentType() const
-+{
-+	const QString type = PsiOptions::instance()->getOption("options.ui.notifications.typename").toString();
-+	if(availableTypes().contains(type))
-+		return type;
-+
-+	return defaultType;
-+}
-+
-+
-+Q_IMPORT_PLUGIN(psipopup)
-+
-+#if defined(Q_WS_MAC) && defined(HAVE_GROWL)
-+Q_IMPORT_PLUGIN(psigrowlnotifier)
-+#endif
-+
-+#ifdef USE_DBUS
-+Q_IMPORT_PLUGIN(psidbusnotifier)
-+#endif
---- psi.orig/src/popupmanager.h
-+++ psi/src/popupmanager.h
-@@ -0,0 +1,83 @@
-+/*
-+ * popupmanager.h
-+ * Copyright (C) 2011-2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef POPUPMANAGER_H
-+#define POPUPMANAGER_H
-+
-+#include <QStringList>
-+
-+class PsiAccount;
-+class PsiCon;
-+class UserListItem;
-+class PsiEvent;
-+class PsiIcon;
-+class QPixmap;
-+
-+namespace XMPP {
-+	class Jid;
-+	class Resource;
-+}
-+using namespace XMPP;
-+
-+class PopupManager
-+{
-+
-+public:
-+	PopupManager(PsiCon* psi);
-+	virtual ~PopupManager();
-+
-+	enum PopupType {
-+		AlertNone = 0,
-+
-+		AlertOnline = 1,
-+		AlertOffline = 2,
-+		AlertStatusChange = 3,
-+
-+		AlertMessage = 4,
-+		AlertComposing = 5,
-+		AlertChat = 6,
-+		AlertHeadline = 7,
-+		AlertFile = 8,
-+		AlertAvCall = 9,
-+		AlertGcHighlight = 10,
-+		AlertCustom = 11
-+	};
-+
-+	int registerOption(const QString& name, int initValue = 5, const QString& path = QString());
-+	void unregisterOption(const QString& name);
-+	void setValue(const QString& name, int value);
-+	int value(const QString& name) const;
-+	const QString optionPath(const QString& name) const;
-+	const QStringList optionsNamesList() const;
-+
-+	QStringList availableTypes() const;
-+	QString currentType() const;
-+
-+	void doPopup(PsiAccount* account, PopupType type, const Jid& j, const Resource& r,
-+			    UserListItem* u = 0, PsiEvent* e = 0, bool checkNoPopup = true);
-+	void doPopup(PsiAccount *account, const Jid &j, const PsiIcon *titleIcon, const QString& titleText,
-+			    const QPixmap *avatar, const PsiIcon *icon, const QString& text, bool checkNoPopup = true, PopupType type = AlertNone);
-+
-+private:
-+	class Private;
-+	Private* d;
-+};
-+
-+#endif
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -118,7 +118,6 @@
- #include "qwextend.h"
- #include "geolocation.h"
- #include "physicallocation.h"
--#include "psipopup.h"
- #include "translationmanager.h"
- #include "irisprotocol/iris_discoinfoquerier.h"
- #include "iconwidget.h"
-@@ -148,6 +147,7 @@
- #include "bookmarkmanagedlg.h"
- #include "accountloginpassword.h"
- #include "alertmanager.h"
-+#include "popupmanager.h"
- 
- #include "psimedia/psimedia.h"
- #include "avcall/avcall.h"
-@@ -159,10 +159,6 @@
- 
- #include <QtCrypto>
- 
--#if defined(Q_WS_MAC) && defined(HAVE_GROWL)
--#include "psigrowlnotifier.h"
--#endif
--
- #include "bsocket.h"
- /*#ifdef Q_WS_WIN
- #include <windows.h>
-@@ -491,6 +487,27 @@ public:
- 			return true;
- 
- 		if (lastManualStatus().isAvailable()) {
-+			if (lastManualStatus().type() == XMPP::Status::DND &&
-+			    PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.suppress-while-dnd").toBool())
-+			{
-+				return true;
-+			}
-+			if ((lastManualStatus().type() == XMPP::Status::Away || lastManualStatus().type() == XMPP::Status::XA) &&
-+			    PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.suppress-while-away").toBool())
-+			{
-+				return true;
-+			}
-+		}
-+
-+		return false;
-+	}
-+
-+	bool noPopupDialogs(ActivationType activationType) const
-+	{
-+		if (activationType == FromXml || !doPopups_)
-+			return true;
-+
-+		if (lastManualStatus().isAvailable()) {
- 			if (lastManualStatus().type() == XMPP::Status::DND)
- 				return true;
- 			if ((lastManualStatus().type() == XMPP::Status::Away || lastManualStatus().type() == XMPP::Status::XA) &&
-@@ -2373,34 +2390,24 @@ void PsiAccount::client_resourceAvailabl
- 	if(doSound)
- 		playSound(eOnline);
- 
--#if !defined(Q_WS_MAC) || !defined(HAVE_GROWL)
- 	// Do the popup test earlier (to avoid needless JID lookups)
- 	if ((popupType == PopupOnline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool()) || (popupType == PopupStatusChange && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool())) {
--#endif
- 		if(notifyOnlineOk && doPopup && !d->blockTransportPopupList->find(j, popupType == PopupOnline) && !d->noPopup(IncomingStanza)) {
--			QString name;
- 			UserListItem *u = findFirstRelevant(j);
--
--			PsiPopup::PopupType pt = PsiPopup::AlertNone;
-+			PopupManager::PopupType pt = PopupManager::AlertNone;
- 			if ( popupType == PopupOnline )
--				pt = PsiPopup::AlertOnline;
-+				pt = PopupManager::AlertOnline;
- 			else if ( popupType == PopupStatusChange )
--				pt = PsiPopup::AlertStatusChange;
-+				pt = PopupManager::AlertStatusChange;
- 
- 			if ((popupType == PopupOnline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.online").toBool()) || (popupType == PopupStatusChange && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.other-changes").toBool())) {
--				PsiPopup *popup = new PsiPopup(pt, this);
--				popup->setData(j, r, u);
-+				psi()->popupManager()->doPopup(this, pt, j, r, u, 0, false);
- 			}
--#if defined(Q_WS_MAC) && defined(HAVE_GROWL)
--			PsiGrowlNotifier::instance()->popup(this, pt, j, r, u);
--#endif
- 		}
- 		else if ( !notifyOnlineOk ) {
- 			d->userCounter++;
- 		}
--#if !defined(Q_WS_MAC) || !defined(HAVE_GROWL)
- 	}
--#endif
- 
- 	// Update entity capabilities.
- 	// This has to happen after the userlist item has been created.
-@@ -2477,21 +2484,14 @@ void PsiAccount::client_resourceUnavaila
- 	if(doSound)
- 		playSound(eOffline);
- 
--#if !defined(Q_WS_MAC) || !defined(HAVE_GROWL)
- 	// Do the popup test earlier (to avoid needless JID lookups)
--	if (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool())
--#endif
--	if(doPopup && !d->blockTransportPopupList->find(j) && !d->noPopup(IncomingStanza)) {
--		QString name;
-+	if(PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool() &&
-+	   doPopup && !d->blockTransportPopupList->find(j) && !d->noPopup(IncomingStanza)) {
- 		UserListItem *u = findFirstRelevant(j);
- 
- 		if (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.status.offline").toBool()) {
--			PsiPopup *popup = new PsiPopup(PsiPopup::AlertOffline, this);
--			popup->setData(j, r, u);
-+			psi()->popupManager()->doPopup(this, PopupManager::AlertOffline, j, r, u, 0, false);
- 		}
--#if defined(Q_WS_MAC) && defined(HAVE_GROWL)
--		PsiGrowlNotifier::instance()->popup(this, PsiPopup::AlertOffline, j, r, u);
--#endif
- 	}
- }
- 
-@@ -2881,6 +2881,11 @@ void PsiAccount::setStatusActual(const S
- 	}
- }
- 
-+bool PsiAccount::noPopup() const
-+{
-+	return d->noPopup(UserAction);
-+}
-+
- void PsiAccount::sentInitialPresence()
- {
- 	QTimer::singleShot(15000, this, SLOT(enableNotifyOnline()));
-@@ -4550,7 +4555,7 @@ void PsiAccount::handleEvent(PsiEvent* e
- 
- 	bool doPopup    = false;
- 	bool putToQueue = true;
--	PsiPopup::PopupType popupType = PsiPopup::AlertNone;
-+	PopupManager::PopupType popupType = PopupManager::AlertNone;
- 	SoundType soundType = eNone;
- 
- 	// find someone to accept the event
-@@ -4650,12 +4655,19 @@ void PsiAccount::handleEvent(PsiEvent* e
- 					c->incomingMessage(m);
- 				}
- 			}
--			delete e;
--			return;
-+			if(m.chatState() == StateComposing) {
-+				doPopup = true;
-+				putToQueue = false;
-+				popupType = PopupManager::AlertComposing;
-+			}
-+			else {
-+				delete e;
-+				return;
-+			}
- 		}
- 
- 		// pass chat messages directly to a chat window if possible (and deal with sound)
--		if(m.type() == "chat") {
-+		else if(m.type() == "chat") {
- 			ChatDlg *c = findChatDialog(e->from());
- 			if(!c)
- 				c = findChatDialog(e->jid());
-@@ -4694,18 +4706,18 @@ void PsiAccount::handleEvent(PsiEvent* e
- 
- 			if (putToQueue) {
- 				doPopup = true;
--				popupType = PsiPopup::AlertChat;
-+				popupType = PopupManager::AlertChat;
- 			}
- 		} // /chat
- 		else if (m.type() == "headline") {
- 			soundType = eHeadline;
- 			doPopup = true;
--			popupType = PsiPopup::AlertHeadline;
-+			popupType = PopupManager::AlertHeadline;
- 		} // /headline
- 		else if (m.type().isEmpty()) {
- 			soundType = eMessage;
- 			doPopup = true;
--			popupType = PsiPopup::AlertMessage;
-+			popupType = PopupManager::AlertMessage;
- 		} // /""
- 		else {
- 			soundType = eSystem;
-@@ -4722,12 +4734,12 @@ void PsiAccount::handleEvent(PsiEvent* e
- 	else if(e->type() == PsiEvent::File) {
- 		soundType = eIncomingFT;
- 		doPopup = true;
--		popupType = PsiPopup::AlertFile;
-+		popupType = PopupManager::AlertFile;
- 	}
- 	else if(e->type() == PsiEvent::AvCallType) {
- 		soundType = eIncomingFT;
- 		doPopup = true;
--		popupType = PsiPopup::AlertAvCall;
-+		popupType = PopupManager::AlertAvCall;
- 	}
- 	else if(e->type() == PsiEvent::RosterExchange) {
- 		RosterExchangeEvent* re = (RosterExchangeEvent*) e;
-@@ -4802,18 +4814,16 @@ void PsiAccount::handleEvent(PsiEvent* e
- 			r = *(u->priority());
- 		}
- 
--		if ((popupType == PsiPopup::AlertChat     && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool())     ||
--		    (popupType == PsiPopup::AlertMessage  && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool())  ||
--		    (popupType == PsiPopup::AlertHeadline && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool()) ||
--		    (popupType == PsiPopup::AlertFile     && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool()) ||
--		    (popupType == PsiPopup::AlertAvCall   && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()))
-+		if ((popupType == PopupManager::AlertChat      && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool())     ||
-+		    (popupType == PopupManager::AlertMessage   && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool())  ||
-+		    (popupType == PopupManager::AlertHeadline  && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool()) ||
-+		    (popupType == PopupManager::AlertFile      && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool()) ||
-+		    (popupType == PopupManager::AlertAvCall    && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
-+		    (popupType == PopupManager::AlertComposing && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.composing").toBool()))
- 		{
--			PsiPopup *popup = new PsiPopup(popupType, this);
--			popup->setData(j, r, u, e);
-+			psi()->popupManager()->doPopup(this, popupType, j, r, u, e, false);
- 		}
--#if defined(Q_WS_MAC) && defined(HAVE_GROWL)
--		PsiGrowlNotifier::instance()->popup(this, popupType, j, r, u, e);
--#endif
-+
- 		emit startBounce();
- 	}
- 
-@@ -4937,7 +4947,7 @@ void PsiAccount::queueEvent(PsiEvent* e,
- 
- 	// FIXME: We shouldn't be doing this kind of stuff here, because this
- 	// function is named *queue*Event() not deleteThisMessageSometimes()
--	if (!d->noPopup(activationType)) {
-+	if (!d->noPopupDialogs(activationType)) {
- 		bool doPopup = false;
- 
- 		// Check to see if we need to popup
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -145,6 +145,7 @@ public:
- 
- 	void setAutoAwayStatus(AutoAway status);
- 
-+	bool noPopup() const;
- 	bool loggedIn() const;
- 	void setNick(const QString &);
- 	QString nick() const;
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -103,6 +103,7 @@
- #include "avcall/calldlg.h"
- #include "alertmanager.h"
- #include "bosskey.h"
-+#include "popupmanager.h"
- 
- #include "AutoUpdater/AutoUpdater.h"
- #ifdef HAVE_SPARKLE
-@@ -212,6 +213,7 @@ public:
- 		, quitting(false)
- 		, alertManager(parent)
- 		, bossKey(0)
-+		, popupManager(0)
- 	{
- 		psi = parent;
- 	}
-@@ -290,6 +292,7 @@ public:
- 	AutoUpdater *autoUpdater;
- 	AlertManager alertManager;
- 	BossKey *bossKey;
-+	PopupManager * popupManager;
- 
- 	struct IdleSettings
- 	{
-@@ -358,6 +361,7 @@ PsiCon::~PsiCon()
- 	delete d->edb;
- 	delete d->defaultMenuBar;
- 	delete d->tabManager;
-+	delete d->popupManager;
- 	delete d;
- }
- 
-@@ -542,6 +546,9 @@ bool PsiCon::init()
- 
- 	connect(&d->idle, SIGNAL(secondsIdle(int)), SLOT(secondsIdle(int)));
- 
-+	//PopupDurationsManager
-+	d->popupManager = new PopupManager(this);
-+
- 	// S5B
- 	d->s5bServer = new S5BServer;
- 	s5b_init();
-@@ -773,6 +780,11 @@ FileTransDlg *PsiCon::ftdlg() const
- #endif
- }
- 
-+PopupManager* PsiCon::popupManager() const
-+{
-+	return d->popupManager;
-+}
-+
- TabManager *PsiCon::tabManager() const
- {
- 	return d->tabManager;
-@@ -1625,6 +1637,18 @@ void PsiCon::processEvent(PsiEvent *e, A
- 	}
- }
- 
-+void PsiCon::removeEvent(PsiEvent *e)
-+{
-+	PsiAccount* account = e->account();
-+	if (!account)
-+		return;
-+	UserListItem *u = account->find(e->jid());
-+	account->eventQueue()->dequeue(e);
-+	account->queueChanged();
-+	if(u)
-+		account->cpUpdate(*u);
-+}
-+
- void PsiCon::updateS5BServerAddresses()
- {
- 	if(!d->s5bServer)
---- psi.orig/src/psicon.h
-+++ psi/src/psicon.h
-@@ -55,6 +55,7 @@ class TuneController;
- class PsiContactList;
- class TabManager;
- class ContactUpdatesManager;
-+class PopupManager;
- 
- namespace OpenPGP {
- 	class Engine;
-@@ -118,6 +119,7 @@ public:
- 	IconSelectPopup *iconSelectPopup() const;
- 	bool filterEvent(const PsiAccount*, const PsiEvent*) const;
- 	void processEvent(PsiEvent*, ActivationType activationType);
-+	void removeEvent(PsiEvent* e);
- 
- 	Status::Type currentStatusType() const;
- 	Status::Type lastLoggedInStatusType() const;
-@@ -125,6 +127,8 @@ public:
- 
- 	bool haveAutoUpdater() const;
- 
-+	PopupManager* popupManager() const;
-+
- signals:
- 	void quit(int);
- 	void accountAdded(PsiAccount *);
---- psi.orig/src/psidbusnotifier.cpp
-+++ psi/src/psidbusnotifier.cpp
-@@ -0,0 +1,410 @@
-+/*
-+ * psidbusnotifier.cpp: Psi's interface to org.freedesktop.Notify
-+ * Copyright (C) 2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * You can also redistribute and/or modify this program under the
-+ * terms of the Psi License, specified in the accompanied COPYING
-+ * file, as published by the Psi Project; either dated January 1st,
-+ * 2005, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+
-+#include <QDBusConnection>
-+#include <QDBusMessage>
-+#include <QDBusInterface>
-+#include <QDBusArgument>
-+#include <QDBusMetaType>
-+#include <QDBusReply>
-+#include <QImage>
-+#include <QTimer>
-+#include <QtPlugin>
-+
-+#include "psidbusnotifier.h"
-+#include "psiaccount.h"
-+#include "psievent.h"
-+#include "common.h"
-+#include "avatars.h"
-+#include "userlist.h"
-+#include "psioptions.h"
-+#include "psicon.h"
-+#include "textutil.h"
-+
-+
-+static const int minLifeTime = 5000;
-+static const QString markupCaps = "body-markup";
-+
-+class iiibiiay
-+{
-+public:
-+	iiibiiay(QImage* img)
-+	{
-+		if(img->format() != QImage::Format_ARGB32)
-+			*img = img->convertToFormat(QImage::Format_ARGB32);
-+		width = img->width();
-+		height = img->height();
-+		rowstride = img->bytesPerLine();
-+		hasAlpha = img->hasAlphaChannel();
-+		channels = img->isGrayscale()?1:hasAlpha?4:3;
-+		bitsPerSample = img->depth()/channels;
-+		image.append((char*)img->rgbSwapped().bits(),img->numBytes());
-+	}
-+	iiibiiay(){}
-+	static const int id;
-+	int width;
-+	int height;
-+	int rowstride;
-+	bool hasAlpha;
-+	int bitsPerSample;
-+	int channels;
-+	QByteArray image;
-+};
-+Q_DECLARE_METATYPE(iiibiiay)
-+
-+const int iiibiiay::id(qDBusRegisterMetaType<iiibiiay>());
-+
-+QDBusArgument &operator<<(QDBusArgument &a, const iiibiiay &i)
-+{
-+	a.beginStructure();
-+	a << i.width << i.height << i.rowstride << i.hasAlpha << i.bitsPerSample << i.channels << i.image;
-+	a.endStructure();
-+	return a;
-+}
-+const QDBusArgument & operator >>(const QDBusArgument &a,  iiibiiay &i)
-+{
-+	a.beginStructure();
-+	a >> i.width >> i.height >> i.rowstride >> i.hasAlpha >> i.bitsPerSample >> i.channels >> i.image;
-+	a.endStructure();
-+	return a;
-+}
-+
-+static QDBusMessage createMessage(const QString& method)
-+{
-+	return QDBusMessage::createMethodCall("org.freedesktop.Notifications",
-+					     "/org/freedesktop/Notifications",
-+					    "org.freedesktop.Notifications",
-+					    method);
-+}
-+
-+
-+PsiDBusNotifier::PsiDBusNotifier(QObject *parent)
-+	: QObject(parent)
-+	, id_(0)
-+	, account_(0)
-+	, event_(0)
-+	, lifeTimer_(new QTimer(this))
-+{
-+	QDBusConnection::sessionBus().connect("org.freedesktop.Notifications",
-+					      "/org/freedesktop/Notifications",
-+					      "org.freedesktop.Notifications",
-+					      "NotificationClosed", this, SLOT(popupClosed(uint,uint)));
-+	lifeTimer_->setSingleShot(true);
-+	connect(lifeTimer_, SIGNAL(timeout()), SLOT(readyToDie()));
-+}
-+
-+PsiDBusNotifier::~PsiDBusNotifier()
-+{
-+}
-+
-+bool PsiDBusNotifier::isAvailable()
-+{
-+	static bool ret = checkServer();
-+	return ret;
-+}
-+
-+bool PsiDBusNotifier::checkServer()
-+{
-+	QDBusInterface i("org.freedesktop.Notifications",
-+			"/org/freedesktop/Notifications",
-+			"org.freedesktop.Notifications",
-+			QDBusConnection::sessionBus());
-+	if(!i.isValid())
-+		return false;
-+
-+	//We'll need caps in the future
-+	QDBusMessage m = createMessage("GetCapabilities");
-+	QDBusMessage ret = QDBusConnection::sessionBus().call(m);
-+	if(ret.type() != QDBusMessage::InvalidMessage && !ret.arguments().isEmpty()) {
-+		QVariant v = ret.arguments().first();
-+		if(v.type() == QVariant::StringList)
-+			caps_ = v.toStringList();
-+	}
-+
-+	return true;
-+}
-+
-+QStringList PsiDBusNotifier::capabilities()
-+{
-+	return caps_;
-+}
-+
-+void PsiDBusNotifier::popup(PsiAccount* account, PopupManager::PopupType type, const Jid& jid, const Resource& r, const UserListItem* uli, PsiEvent* event)
-+{
-+	account_ = account;
-+	jid_ = jid;
-+	if(event) {
-+		event_ = event;
-+		connect(event_, SIGNAL(destroyed()), SLOT(eventDestroyed()));
-+	}
-+
-+	QString title, desc, contact, text, statusMsg;
-+	QString statusTxt = status2txt(makeSTATUS(r.status()));
-+	int len = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt();
-+	if (len != 0)
-+		statusMsg = r.status().status();
-+	if (len > 0)
-+		if (((int)statusMsg.length()) > len)
-+			statusMsg = statusMsg.left(len) + "...";
-+	bool doAlert = false;
-+	PsiIcon* ico = 0;
-+
-+	if (uli && !uli->name().isEmpty()) {
-+		contact = uli->name();
-+	}
-+	else if (event && event->type() == PsiEvent::Auth) {
-+		contact = ((AuthEvent*) event)->nick();
-+	}
-+	else if (event && event->type() == PsiEvent::Message) {
-+		contact = ((MessageEvent*) event)->nick();
-+	}
-+
-+	QString j = jid.full();
-+	int jidLen = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt();
-+	if (jidLen > 0 && ((int)j.length()) > jidLen)
-+		j = j.left(jidLen) + "...";
-+
-+	if(contact.isEmpty()) {
-+		contact = j;
-+	}
-+	else {
-+		contact = QString("%1(%2)").arg(contact, j);
-+	}
-+
-+	title = this->title(type, &doAlert, &ico);
-+
-+	QVariantMap hints;
-+	if(PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.dbus.transient-hint").toBool() ||
-+	   type == PopupManager::AlertComposing || type == PopupManager::AlertOffline ||
-+	   type == PopupManager::AlertOnline || type == PopupManager::AlertStatusChange || type == PopupManager::AlertNone)
-+	{
-+		hints.insert("transient", QVariant(true));
-+	}
-+//	if(doAlert) {
-+//		hints.insert("urgency", QVariant(2));
-+//	}
-+	QImage im;
-+	if(account) {
-+		im = account->avatarFactory()->getAvatar(jid.bare()).toImage();
-+		if(!im.isNull()) {
-+			int size = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.avatar-size").toInt();
-+			im = im.scaledToWidth(size, Qt::SmoothTransformation);
-+		}
-+	}
-+
-+	if(im.isNull() && ico) {
-+		im = ico->pixmap().toImage();
-+	}
-+
-+	if(!im.isNull()) {
-+		iiibiiay i(&im);
-+		hints.insert("icon_data", QVariant(iiibiiay::id, &i));
-+	}
-+
-+	bool showMessage = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.showMessage").toBool();
-+
-+	switch(type) {
-+	case PopupManager::AlertOnline:
-+		text = QString("%1 (%2)").arg(contact).arg(statusTxt);
-+		desc = statusMsg;
-+		break;
-+	case PopupManager::AlertOffline:
-+		text = QString("%1 (%2)").arg(contact).arg(statusTxt);
-+		desc = statusMsg;
-+		break;
-+	case PopupManager::AlertStatusChange:
-+		text = QString("%1 (%2)").arg(contact).arg(statusTxt);
-+		desc = statusMsg;
-+		break;
-+	case PopupManager::AlertComposing:
-+		text = QString("%1%2").arg(contact).arg(QObject::tr(" is typing..."));
-+		desc = "";
-+		break;
-+	case PopupManager::AlertMessage:
-+	case PopupManager::AlertChat:
-+	case PopupManager::AlertGcHighlight:
-+		{
-+			text = QObject::tr("%1 says:").arg(contact);
-+			if(showMessage) {
-+				const Message* jmessage = &((MessageEvent *)event)->message();
-+				desc = jmessage->body();
-+			}
-+			break;
-+		}
-+	case PopupManager::AlertHeadline: {
-+			text = QObject::tr("Headline from %1").arg(contact);
-+			if(showMessage) {
-+				const Message* jmessage = &((MessageEvent *)event)->message();
-+				if ( !jmessage->subject().isEmpty())
-+					title = jmessage->subject();
-+				desc = jmessage->body();
-+			}
-+			break;
-+		}
-+	case PopupManager::AlertFile:
-+		text = QObject::tr("Incoming file from %1").arg(contact);
-+		break;
-+	case PopupManager::AlertAvCall:
-+		text = QObject::tr("Incoming call from %1").arg(contact);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	if(!desc.isEmpty()) {
-+		desc = clipText(desc);
-+		text += "\n" + desc;
-+	}
-+
-+	int lifeTime = duration();
-+	bool bodyMarkup = capabilities().contains(markupCaps);
-+	text = TextUtil::rich2plain(text);
-+	text = bodyMarkup ? TextUtil::escape(text) : text;
-+	QDBusMessage m = createMessage("Notify");
-+	QVariantList args;
-+	args << QString(ApplicationInfo::name());
-+	args << QVariant(QVariant::UInt);
-+	args << QVariant("");
-+	args << QString(title);
-+	args << QString(text);
-+	args << QStringList();
-+	args << hints;
-+	args << lifeTime;
-+	m.setArguments(args);
-+	QDBusPendingCall call = QDBusConnection::sessionBus().asyncCall(m);
-+	QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
-+
-+	connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-+			 this, SLOT(asyncCallFinished(QDBusPendingCallWatcher*)));
-+
-+	lifeTime = (lifeTime < 0) ? lifeTime : qMax(minLifeTime, lifeTime);
-+	if(lifeTime >= 0)
-+		lifeTimer_->start(lifeTime);
-+}
-+
-+void PsiDBusNotifier::popup(PsiAccount *account, PopupManager::PopupType /*type*/, const Jid &j, const PsiIcon *titleIcon, const QString &titleText,
-+			    const QPixmap *avatar, const PsiIcon */*icon*/, const QString &text)
-+{
-+	account_ = account;
-+	jid_ = j;
-+
-+	QVariantMap hints;
-+	if(PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.dbus.transient-hint").toBool()) {
-+		hints.insert("transient", QVariant(true));
-+	}
-+	if(avatar || titleIcon) {
-+		int size = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.avatar-size").toInt();
-+		QImage im = avatar ? avatar->toImage().scaledToWidth(size, Qt::SmoothTransformation) : titleIcon->pixmap().toImage();
-+		iiibiiay i(&im);
-+		hints.insert("icon_data", QVariant(iiibiiay::id, &i));
-+	}
-+
-+	int lifeTime = duration();
-+	bool bodyMarkup = capabilities().contains(markupCaps);
-+	QString plainText = TextUtil::rich2plain(text);
-+	plainText = bodyMarkup ? TextUtil::escape(plainText) : plainText;
-+	QDBusMessage m = createMessage("Notify");
-+	QVariantList args;
-+	args << QString(ApplicationInfo::name());
-+	args << QVariant(QVariant::UInt);
-+	args << QVariant("");
-+	args << QString(titleText);
-+	args << QString(plainText);
-+	args << QStringList();
-+	args << hints;
-+	args << lifeTime;
-+	m.setArguments(args);
-+	QDBusPendingCall call = QDBusConnection::sessionBus().asyncCall(m);
-+	QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
-+
-+	connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-+			 this, SLOT(asyncCallFinished(QDBusPendingCallWatcher*)));
-+
-+	lifeTime = (lifeTime < 0) ? lifeTime : qMax(minLifeTime, lifeTime);
-+	if(lifeTime >= 0)
-+		lifeTimer_->start(lifeTime);
-+}
-+
-+void PsiDBusNotifier::asyncCallFinished(QDBusPendingCallWatcher *watcher)
-+{
-+	QDBusMessage m = watcher->reply();
-+	if(m.type() == QDBusMessage::InvalidMessage || m.arguments().isEmpty()) {
-+		readyToDie();
-+		return;
-+	}
-+
-+	QVariant repl = m.arguments().first();
-+	if(repl.type() != QVariant::UInt || repl.toUInt() == 0) {
-+		readyToDie();
-+	}
-+	else {
-+		id_ = repl.toUInt();
-+	}
-+}
-+
-+void PsiDBusNotifier::popupClosed(uint id, uint reason)
-+{
-+	if(id_ != 0 && id_ == id) {
-+		if(reason == 2) {
-+			if(account_) {
-+				if(event_) {
-+					account_->psi()->processEvent(event_, UserAction);
-+				}
-+				else if(jid_.isValid()) {
-+					account_->actionDefault(Jid(jid_.bare()));
-+				}
-+			}
-+		}
-+		readyToDie();
-+	}
-+}
-+
-+void PsiDBusNotifier::eventDestroyed()
-+{
-+	event_ = 0;
-+}
-+
-+void PsiDBusNotifier::readyToDie()
-+{
-+	if(lifeTimer_->isActive()) {
-+		lifeTimer_->stop();
-+	}
-+
-+	QDBusConnection::sessionBus().disconnect("org.freedesktop.Notifications",
-+						 "/org/freedesktop/Notifications",
-+						 "org.freedesktop.Notifications",
-+						 "NotificationClosed", this, SLOT(popupClosed(uint,uint)));
-+
-+	if(event_) {
-+		disconnect(event_, SIGNAL(destroyed()), this, SLOT(eventDestroyed()));
-+	}
-+
-+	deleteLater();
-+}
-+
-+QStringList PsiDBusNotifier::caps_ = QStringList();
-+
-+Q_EXPORT_PLUGIN2(psidbusnotifier, PsiDBusNotifierPlugin)
---- psi.orig/src/psidbusnotifier.h
-+++ psi/src/psidbusnotifier.h
-@@ -0,0 +1,82 @@
-+/*
-+ * psidbusnotifier.h: Psi's interface to org.freedesktop.Notify
-+ * Copyright (C) 2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * You can also redistribute and/or modify this program under the
-+ * terms of the Psi License, specified in the accompanied COPYING
-+ * file, as published by the Psi Project; either dated January 1st,
-+ * 2005, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef PSIDBUSNOTIFIER_H
-+#define PSIDBUSNOTIFIER_H
-+
-+#ifndef QT_STATICPLUGIN
-+#define QT_STATICPLUGIN
-+#endif
-+
-+#include "psipopupinterface.h"
-+#include "xmpp/jid/jid.h"
-+
-+class QDBusPendingCallWatcher;
-+class QTimer;
-+
-+class PsiDBusNotifier : public QObject, public PsiPopupInterface
-+{
-+	Q_OBJECT
-+
-+public:
-+	PsiDBusNotifier(QObject* parent = 0);
-+	~PsiDBusNotifier();
-+	static bool isAvailable();
-+
-+	virtual void popup(PsiAccount *account, PopupManager::PopupType type, const Jid& j, const Resource& r, const UserListItem* = 0, PsiEvent* = 0);
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const PsiIcon* titleIcon, const QString& titleText,
-+			   const QPixmap* avatar, const PsiIcon* icon, const QString& text);
-+
-+private slots:
-+	void popupClosed(uint id, uint reason);
-+	void eventDestroyed();
-+	void asyncCallFinished(QDBusPendingCallWatcher*);
-+	void readyToDie();
-+
-+private:
-+	static bool checkServer();
-+	static QStringList capabilities();
-+
-+private:
-+	Jid jid_;
-+	uint id_;
-+	PsiAccount *account_;
-+	PsiEvent *event_;
-+	QTimer *lifeTimer_;
-+	static QStringList caps_;
-+};
-+
-+class PsiDBusNotifierPlugin : public QObject, public PsiPopupPluginInterface
-+{
-+	Q_OBJECT
-+	Q_INTERFACES(PsiPopupPluginInterface)
-+
-+public:
-+	virtual QString name() const { return "DBus"; }
-+	virtual PsiPopupInterface* popup(QObject* p) { return new PsiDBusNotifier(p); }
-+	virtual bool isAvailable() { return PsiDBusNotifier::isAvailable(); }
-+};
-+
-+#endif
---- psi.orig/src/psigrowlnotifier.cpp
-+++ psi/src/psigrowlnotifier.cpp
-@@ -26,6 +26,8 @@
- #include <QPixmap>
- #include <QStringList>
- #include <QCoreApplication>
-+#include <QtPlugin>
-+
- #include "common.h"
- #include "psiaccount.h"
- #include "avatars.h"
-@@ -34,6 +36,7 @@
- #include "psievent.h"
- #include "userlist.h"
- #include "psioptions.h"
-+#include "textutil.h"
- 
- /**
-  * A class representing the notification context, which will be passed to
-@@ -43,8 +46,8 @@ class NotificationContext
- {
- public:
- 	NotificationContext(PsiAccount* a, Jid j) : account_(a), jid_(j), deleteCount_(0) { }
--	PsiAccount* account() { return account_; }
--	Jid jid() { return jid_; }
-+	PsiAccount* account() const { return account_; }
-+	Jid jid() const { return jid_; }
- 
- private:
- 	PsiAccount* account_;
-@@ -69,16 +72,19 @@ PsiGrowlNotifier::PsiGrowlNotifier() : Q
- 	nots << QObject::tr("Incoming Message");
- 	nots << QObject::tr("Incoming Headline");
- 	nots << QObject::tr("Incoming File");
--
--	// Initialize default notifications
--	QStringList defaults;
--	defaults << QObject::tr("Contact becomes Available");
--	defaults << QObject::tr("Incoming Message");
--	defaults << QObject::tr("Incoming Headline");
--	defaults << QObject::tr("Incoming File");
-+	nots << QObject::tr("Typing notify");
-+	nots << QObject::tr("Groupchat highlight");
-+	nots << QObject::tr("Incoming Call");
-+
-+//	Initialize default notifications
-+//	QStringList defaults;
-+//	defaults << QObject::tr("Contact becomes Available");
-+//	defaults << QObject::tr("Incoming Message");
-+//	defaults << QObject::tr("Incoming Headline");
-+//	defaults << QObject::tr("Incoming File");
- 
- 	// Register with Growl
--	gn_ = new GrowlNotifier(nots, defaults, "Psi");
-+	gn_ = new GrowlNotifier(nots, nots, QCoreApplication::applicationName());
- }
- 
- 
-@@ -107,83 +113,126 @@ PsiGrowlNotifier* PsiGrowlNotifier::inst
-  * \param uli The originating userlist item. Can be NULL.
-  * \param event The originating event. Can be NULL.
-  */
--void PsiGrowlNotifier::popup(PsiAccount* account, PsiPopup::PopupType type, const Jid& jid, const Resource& r, const UserListItem* uli, PsiEvent* event)
-+void PsiGrowlNotifier::popup(PsiAccount* account, PopupManager::PopupType type, const Jid& jid, const Resource& r, const UserListItem* uli, PsiEvent* event)
- {
--	// if growl is explicitly disabled from within psi then don't send
--	if(!PsiOptions::instance()->getOption("options.ui.notifications.enable-growl").toBool())
--		return;
--
- 	QString name;
- 	QString title, desc, contact;
- 	QString statusTxt = status2txt(makeSTATUS(r.status()));
--	QString statusMsg = r.status().status();
--	QPixmap icon = account->avatarFactory()->getAvatar(jid.bare());
-+	QString statusMsg;
-+	int len = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt();
-+	if (len != 0)
-+		statusMsg = r.status().status();
-+	if (len > 0)
-+		if (((int)statusMsg.length()) > len)
-+			statusMsg = statusMsg.left(len) + "...";
-+	QPixmap icon;
-+	if(account)
-+		icon = account->avatarFactory()->getAvatar(jid.bare());
-+
- 	if (uli) {
- 		contact = uli->name();
- 	}
--	else if (event->type() == PsiEvent::Auth) {
-+	else if (event && event->type() == PsiEvent::Auth) {
- 		contact = ((AuthEvent*) event)->nick();
- 	}
--	else if (event->type() == PsiEvent::Message) {
-+	else if (event && event->type() == PsiEvent::Message) {
- 		contact = ((MessageEvent*) event)->nick();
- 	}
- 
- 	if (contact.isEmpty())
- 		contact = jid.bare();
- 
-+	int jidLen = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt();
-+	if (jidLen > 0 && ((int)contact.length()) > jidLen)
-+		contact = contact.left(jidLen) + "...";
-+
- 	// Default value for the title
- 	title = contact;
- 
-+	bool showMessage = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.showMessage").toBool();
-+
- 	switch(type) {
--		case PsiPopup::AlertOnline:
-+		case PopupManager::AlertOnline:
- 			name = QObject::tr("Contact becomes Available");
- 			title = QString("%1 (%2)").arg(contact).arg(statusTxt);
- 			desc = statusMsg;
- 			//icon = PsiIconset::instance()->statusPQString(jid, r.status());
- 			break;
--		case PsiPopup::AlertOffline:
-+		case PopupManager::AlertOffline:
- 			name = QObject::tr("Contact becomes Unavailable");
- 			title = QString("%1 (%2)").arg(contact).arg(statusTxt);
- 			desc = statusMsg;
- 			//icon = PsiIconset::instance()->statusPQString(jid, r.status());
- 			break;
--		case PsiPopup::AlertStatusChange:
-+		case PopupManager::AlertStatusChange:
- 			name = QObject::tr("Contact changes Status");
- 			title = QString("%1 (%2)").arg(contact).arg(statusTxt);
- 			desc = statusMsg;
- 			//icon = PsiIconset::instance()->statusPQString(jid, r.status());
- 			break;
--		case PsiPopup::AlertMessage: {
-+		case PopupManager::AlertComposing:
-+			name = QObject::tr("Typing notify");
-+			title = QString("%1%2").arg(contact).arg(QObject::tr(" is typing..."));
-+			desc = QObject::tr("[Typing notify]");
-+			//icon = (PsiIcon *)IconsetFactory::iconPtr("psi/typing");
-+			break;
-+		case PopupManager::AlertMessage: {
- 			name = QObject::tr("Incoming Message");
- 			title = QObject::tr("%1 says:").arg(contact);
--			const Message* jmessage = &((MessageEvent *)event)->message();
--			desc = jmessage->body();
-+			if(showMessage) {
-+				const Message* jmessage = &((MessageEvent *)event)->message();
-+				desc = jmessage->body();
-+			} else
-+				desc = QObject::tr("[Incoming Message]");
- 			//icon = IconsetFactory::iconPQString("psi/message");
- 			break;
- 		}
--		case PsiPopup::AlertChat: {
-+		case PopupManager::AlertChat: {
- 			name = QObject::tr("Incoming Message");
--			const Message* jmessage = &((MessageEvent *)event)->message();
--			desc = jmessage->body();
-+			if(showMessage) {
-+				const Message* jmessage = &((MessageEvent *)event)->message();
-+				desc = jmessage->body();
-+			} else
-+				desc = QObject::tr("[Incoming Message]");
- 			//icon = IconsetFactory::iconPQString("psi/start-chat");
- 			break;
- 		}
--		case PsiPopup::AlertHeadline: {
-+		case PopupManager::AlertHeadline: {
- 			name = QObject::tr("Incoming Headline");
- 			const Message* jmessage = &((MessageEvent *)event)->message();
- 			if ( !jmessage->subject().isEmpty())
- 				title = jmessage->subject();
--			desc = jmessage->body();
-+			if(showMessage) {
-+				desc = jmessage->body();
-+			} else
-+				desc = QObject::tr("[Incoming Headline]");
- 			//icon = IconsetFactory::iconPQString("psi/headline");
- 			break;
- 		}
--		case PsiPopup::AlertFile:
-+		case PopupManager::AlertFile:
- 			name = QObject::tr("Incoming File");
- 			desc = QObject::tr("[Incoming File]");
- 			//icon = IconsetFactory::iconPQString("psi/file");
- 			break;
-+		case PopupManager::AlertGcHighlight: {
-+			name = QObject::tr("Groupchat highlight");
-+			if(showMessage) {
-+				const Message* jmessage = &((MessageEvent *)event)->message();
-+				desc = jmessage->body();
-+			} else
-+				desc = QObject::tr("[Groupchat highlight]");
-+			break;
-+		}
-+		case PopupManager::AlertAvCall:
-+			name = QObject::tr("Incoming Call");
-+			desc = QObject::tr("[Incoming Call]");
-+			break;
- 		default:
- 			break;
-+		}
-+
-+	if(!desc.isEmpty()) {
-+		desc = clipText(desc);
- 	}
- 
- 	// Notify Growl
-@@ -191,6 +240,15 @@ void PsiGrowlNotifier::popup(PsiAccount*
- 	gn_->notify(name, title, desc, icon, false, this, SLOT(notificationClicked(void*)), SLOT(notificationTimedOut(void*)), context);
- }
- 
-+void PsiGrowlNotifier::popup(PsiAccount *account, PopupManager::PopupType/* type*/, const Jid &j, const PsiIcon *titleIcon, const QString &titleText,
-+			     const QPixmap */*avatar*/, const PsiIcon */*icon*/, const QString &text)
-+{
-+	// Notify Growl
-+	NotificationContext* context = new NotificationContext(account, j);
-+	gn_->notify(QObject::tr("Incoming Headline"), titleText, TextUtil::rich2plain(text),
-+		    titleIcon->pixmap(), false, this, SLOT(notificationClicked(void*)), SLOT(notificationTimedOut(void*)), context);
-+}
-+
- void PsiGrowlNotifier::cleanup()
- {
- 	// try to keep the garbage bin no larger than 50 entries
-@@ -215,7 +273,8 @@ void PsiGrowlNotifier::tryDeleteContext(
- void PsiGrowlNotifier::notificationClicked(void* c)
- {
- 	NotificationContext* context = (NotificationContext*) c;
--	context->account()->actionDefault(context->jid());
-+	if(context->account())
-+		context->account()->actionDefault(context->jid());
- 	//delete context;
- 	tryDeleteContext(context);
- }
-@@ -227,4 +286,11 @@ void PsiGrowlNotifier::notificationTimed
- 	tryDeleteContext(context);
- }
- 
-+bool  PsiGrowlNotifier::isAvailable()
-+{
-+	return true; //GrowlNotifier::isRunning();
-+}
-+
- PsiGrowlNotifier* PsiGrowlNotifier::instance_ = 0;
-+
-+Q_EXPORT_PLUGIN2(psigrowlnotifier, PsiGrowlNotifierPlugin)
---- psi.orig/src/psigrowlnotifier.h
-+++ psi/src/psigrowlnotifier.h
-@@ -26,15 +26,17 @@
- #ifndef PSIGROWLNOTIFIER_H
- #define PSIGROWLNOTIFIER_H
- 
--#include <QObject>
-+#ifndef QT_STATICPLUGIN
-+#define QT_STATICPLUGIN
-+#endif
- 
--#include "psipopup.h"
-+#include "psipopupinterface.h"
- 
- class GrowlNotifier;
--class PsiAccount;
--
- class NotificationContext;
- 
-+using namespace XMPP;
-+
- /**
-  * An interface for Psi to Growl.
-  * This class uses GrowlNotifier to interface with Growl.
-@@ -43,13 +45,17 @@ class NotificationContext;
-  *
-  * \see GrowlNotifier
-  */
--class PsiGrowlNotifier : public QObject
-+class PsiGrowlNotifier : public QObject, public PsiPopupInterface
- {
- 	Q_OBJECT
- 
- public:
- 	static PsiGrowlNotifier* instance();
--	void popup(PsiAccount* account, PsiPopup::PopupType type, const Jid& j, const Resource& r, const UserListItem* = 0, PsiEvent* = 0);
-+	static bool isAvailable();
-+
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const Resource& r, const UserListItem* = 0, PsiEvent* = 0);
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const PsiIcon* titleIcon, const QString& titleText,
-+		   const QPixmap* avatar, const PsiIcon* icon, const QString& text);
- 
- public slots:
- 	void notificationClicked(void*);
-@@ -67,4 +74,15 @@ private:
- 	QList<NotificationContext*> contexts_;
- };
- 
-+class PsiGrowlNotifierPlugin : public QObject, public PsiPopupPluginInterface
-+{
-+	Q_OBJECT
-+	Q_INTERFACES(PsiPopupPluginInterface)
-+
-+public:
-+	virtual QString name() const { return "Growl"; }
-+	virtual PsiPopupInterface* popup(QObject* ) { return PsiGrowlNotifier::instance(); }
-+	virtual bool isAvailable() { return PsiGrowlNotifier::isAvailable(); }
-+};
-+
- #endif
---- psi.orig/src/psipopup.cpp
-+++ psi/src/psipopup.cpp
-@@ -19,7 +19,6 @@
-  */
- 
- #include "psipopup.h"
--#include "common.h"
- #include "fancypopup.h"
- #include "fancylabel.h"
- #include "userlist.h"
-@@ -32,6 +31,7 @@
- #include "iconlabel.h"
- #include "psioptions.h"
- #include "coloropt.h"
-+#include "avatars.h"
- 
- #include <QApplication>
- #include <QLayout>
-@@ -41,6 +41,7 @@
- #include <QBoxLayout>
- #include <QList>
- #include <QTextDocument>
-+#include <QtPlugin>
- 
- /**
-  * Limits number of popups that could be displayed 
-@@ -65,9 +66,8 @@ public:
- 	Private(PsiPopup *p);
- 	~Private();
- 
--	void init(const PsiIcon *titleIcon, QString titleText, PsiAccount *_acc, PopupType type);
--	QString clipText(QString);
--	QBoxLayout *createContactInfo(const PsiIcon *icon, QString text);
-+	void init(const PsiIcon *titleIcon, const QString& titleText, PsiAccount *_acc);
-+	QBoxLayout *createContactInfo(const QPixmap *avatar, const PsiIcon *icon, const QString& text);
- 
- private slots:
- 	void popupDestroyed();
-@@ -80,21 +80,25 @@ public:
- 	FancyPopup *popup;
- 	PsiPopup *psiPopup;
- 	QString id;
--	PopupType popupType;
-+	PopupManager::PopupType popupType;
- 	Jid jid;
- 	Status status;
- 	PsiEvent *event;
- 	PsiIcon *titleIcon;
- 	bool display;
-+	bool doAlertIcon;
- };
- 
- PsiPopup::Private::Private(PsiPopup *p)
-+	: psi(0)
-+	, account(0)
-+	, popup(0)
-+	, psiPopup(p)
-+	, popupType(PopupManager::AlertNone)
-+	, event(0)
-+	, titleIcon(0)
-+	, doAlertIcon(false)
- {
--	psiPopup = p;
--	popup = 0;
--	popupType = AlertNone;
--	event = 0;
--	titleIcon = 0;
- }
- 
- PsiPopup::Private::~Private()
-@@ -109,15 +113,13 @@ PsiPopup::Private::~Private()
- 	popup = 0;
- }
- 
--void PsiPopup::Private::init(const PsiIcon *_titleIcon, QString titleText, PsiAccount *acc, PopupType type)
-+void PsiPopup::Private::init(const PsiIcon *_titleIcon, const QString& titleText, PsiAccount *acc)
- {
--	psi = acc->psi();
-+	if(acc)
-+		psi = acc->psi();
- 	account = acc;
- 	display = true;
- 
--	if ( !PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.enabled").toBool() )
--		return;
--
- 	if ( !psiPopupList )
- 		psiPopupList = new QList<PsiPopup *>();
- 
-@@ -128,13 +130,13 @@ void PsiPopup::Private::init(const PsiIc
- 	if ( psiPopupList->count() && psiPopupList->last() )
- 		lastPopup = psiPopupList->last()->popup();
- 
--	if ( type != AlertNone )
-+	if ( doAlertIcon )
- 		titleIcon = new AlertIcon(_titleIcon);
- 	else
- 		titleIcon = new PsiIcon(*_titleIcon);
- 
--	FancyPopup::setHideTimeout( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.duration").toInt() );
--	FancyPopup::setBorderColor( ColorOpt::instance()->color("options.ui.look.colors.passive-popup.border") );
-+	FancyPopup::setHideTimeout(psiPopup->duration());
-+	FancyPopup::setBorderColor(ColorOpt::instance()->color("options.ui.look.colors.passive-popup.border"));
- 
- 	popup = new FancyPopup(titleText, titleIcon, lastPopup, false);
- 	connect(popup, SIGNAL(clicked(int)), SLOT(popupClicked(int)));
-@@ -164,39 +166,33 @@ void PsiPopup::Private::popupClicked(int
- 			account->actionDefault( j );
- 		}
- 	}
-+	else if ( event && event->account() && button == (int)Qt::RightButton ) {
-+		event->account()->psi()->removeEvent(event);
-+	}
-+
-+	popup->deleteLater();
- }
- 
- void PsiPopup::Private::eventDestroyed()
- {
--	popup->deleteLater();
- 	event = 0;
- }
- 
--QString PsiPopup::Private::clipText(QString text)
-+QBoxLayout *PsiPopup::Private::createContactInfo(const QPixmap *avatar, const PsiIcon *icon, const QString& text)
- {
--	if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() > 0 ) {
--		// richtext will give us trouble here
--		if ( ((int)text.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() ) {
--			text = text.left( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt() );
--
--			// delete last unclosed tag
--			/*if ( text.find("</") > text.find(">") ) {
-+	QHBoxLayout *dataBox = new QHBoxLayout();
- 
--				text = text.left( text.find("</") );
--			}*/
- 
--			text += "...";
--		}
-+	if (avatar && !avatar->isNull()) {
-+		int size = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.avatar-size").toInt();
-+		QLabel *avatarLabel = new QLabel(popup);
-+		avatarLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
-+		avatarLabel->setPixmap(avatar->scaled(QSize(size, size), Qt::KeepAspectRatio, Qt::SmoothTransformation));
-+		dataBox->addWidget(avatarLabel);
-+		dataBox->addSpacing(5);
- 	}
- 
--	return text;
--}
--
--QBoxLayout *PsiPopup::Private::createContactInfo(const PsiIcon *icon, QString text)
--{
--	QHBoxLayout *dataBox = new QHBoxLayout();
--
--	if ( icon ) {
-+	if (icon) {
- 		IconLabel *iconLabel = new IconLabel(popup);
- 		iconLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
- 		iconLabel->setPsiIcon(icon);
-@@ -222,10 +218,10 @@ QBoxLayout *PsiPopup::Private::createCon
- // PsiPopup
- //----------------------------------------------------------------------------
- 
--PsiPopup::PsiPopup(const PsiIcon *titleIcon, QString titleText, PsiAccount *acc)
-+PsiPopup::PsiPopup(QObject *parent)
-+	:QObject(parent)
- {
- 	d = new Private(this);
--	d->init(titleIcon, titleText, acc, AlertNone);
- }
- 
- PsiPopup::~PsiPopup()
-@@ -233,68 +229,37 @@ PsiPopup::~PsiPopup()
- 	delete d;
- }
- 
--PsiPopup::PsiPopup(PopupType type, PsiAccount *acc)
-+void PsiPopup::popup(PsiAccount *acc, PopupManager::PopupType type, const Jid &j, const Resource &r, const UserListItem *item, PsiEvent *event)
- {
--	d = new Private(this);
--
- 	d->popupType = type;
- 	PsiIcon *icon = 0;
--	QString text = "Psi: ";
--	bool doAlertIcon = false;
-+	QString text = title(type, &d->doAlertIcon, &icon);
-+	d->init(icon, text, acc);
-+	setData(j, r, item, event);
-+}
- 
--	switch(type) {
--	case AlertOnline:
--		text += PsiPopup::tr("Contact online");
--		icon = (PsiIcon *)IconsetFactory::iconPtr("status/online");
--		break;
--	case AlertOffline:
--		text += PsiPopup::tr("Contact offline");
--		icon = (PsiIcon *)IconsetFactory::iconPtr("status/offline");
--		break;
--	case AlertStatusChange:
--		text += PsiPopup::tr("Status change");
--		icon = (PsiIcon *)IconsetFactory::iconPtr("status/online");
--		break;
--	case AlertMessage:
--		text += PsiPopup::tr("Incoming message");
--		icon = (PsiIcon *)IconsetFactory::iconPtr("psi/message");
--		doAlertIcon = true;
--		break;
--	case AlertChat:
--		text += PsiPopup::tr("Incoming chat message");
--		icon= (PsiIcon *)IconsetFactory::iconPtr("psi/chat");
--		doAlertIcon = true;
--		break;
--	case AlertHeadline:
--		text += PsiPopup::tr("Headline");
--		icon= (PsiIcon *)IconsetFactory::iconPtr("psi/headline");
--		doAlertIcon = true;
--		break;
--	case AlertFile:
--		text += PsiPopup::tr("Incoming file");
--		icon= (PsiIcon *)IconsetFactory::iconPtr("psi/file");
--		doAlertIcon = true;
--		break;
--	case AlertAvCall:
--		text += PsiPopup::tr("Incoming call");
--		icon= (PsiIcon *)IconsetFactory::iconPtr("psi/call");
--		doAlertIcon = true;
--		break;
--	default:
--		break;
--	}
-+void PsiPopup::popup(PsiAccount *acc, PopupManager::PopupType type, const Jid &j, const PsiIcon *titleIcon, const QString &titleText,
-+		     const QPixmap *avatar, const PsiIcon *icon, const QString &text)
-+{
-+	d->popupType = type;
-+	d->init(titleIcon, titleText, acc);
-+	setJid(j);
-+	setData(avatar, icon, text);
-+}
- 
--	d->init(icon, text, acc, doAlertIcon ? type : AlertNone);
-+void PsiPopup::setJid(const Jid &j)
-+{
-+	d->jid = j;
- }
- 
--void PsiPopup::setData(const PsiIcon *icon, QString text)
-+void PsiPopup::setData(const QPixmap *avatar, const PsiIcon *icon, const QString& text)
- {
- 	if ( !d->popup ) {
- 		deleteLater();
- 		return;
- 	}
- 
--	d->popup->addLayout( d->createContactInfo(icon, text) );
-+	d->popup->addLayout( d->createContactInfo(avatar, icon, text) );
- 
- 	// update id
- 	if ( icon )
-@@ -313,24 +278,26 @@ void PsiPopup::setData(const Jid &j, con
- 
- 	d->jid    = j;
- 	d->status = r.status();
--	d->event  = (PsiEvent *)event;
-+	if(d->popupType != PopupManager::AlertComposing)
-+		d->event  = (PsiEvent *)event;
- 
--	if ( event )
-+	if ( d->event )
- 		connect(event, SIGNAL(destroyed()), d, SLOT(eventDestroyed()));
- 
- 	PsiIcon *icon = PsiIconset::instance()->statusPtr(j, r.status());
--	QString text;
- 
- 	QString jid = j.full();
--	if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() > 0 && ((int)jid.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() )
--		jid = jid.left( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() ) + "...";
-+	int jidLen = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt();
-+	if (jidLen > 0 && ((int)jid.length()) > jidLen)
-+		jid = jid.left(jidLen) + "...";
- 
- 	QString status;
--	if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() != 0 )
-+	int len = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt();
-+	if (len != 0)
- 		status = r.status().status();
--	if ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() > 0 )
--		if ( ((int)status.length()) > PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() )
--			status = status.left ( PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-status-length").toInt() ) + "...";
-+	if (len > 0)
-+		if ( ((int)status.length()) > len )
-+			status = status.left (len) + "...";
- 
- 	QString name;
- 	if ( u && !u->name().isEmpty() ) {
-@@ -344,7 +311,7 @@ void PsiPopup::setData(const Jid &j, con
- 	}
- 		
- 	if (!name.isEmpty()) {
--		if ( !PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-jid-length").toInt() )
-+		if (!jidLen)
- 			name = "<nobr>" + TextUtil::escape(name) + "</nobr>";
- 		else
- 			name = "<nobr>" + TextUtil::escape(name) + " &lt;" + TextUtil::escape(jid) + "&gt;" + "</nobr>";
-@@ -366,20 +333,39 @@ void PsiPopup::setData(const Jid &j, con
- 	// hack for duplicate "Contact Online"/"Status Change" popups
- 	foreach (PsiPopup *pp, *psiPopupList) {
- 		if ( d->jid.full() == pp->d->jid.full() && d->status.show() == pp->d->status.show() && d->status.status() == d->status.status() ) {
--			if ( d->popupType == AlertStatusChange && pp->d->popupType == AlertOnline ) {
-+			if ( d->popupType == PopupManager::AlertStatusChange && pp->d->popupType == PopupManager::AlertOnline ) {
- 				d->display = false;
- 				deleteLater();
- 				break;
- 			}
- 		}
- 	}
--
-+	QPixmap avatar = d->account->avatarFactory()->getAvatar(jid);
- 	// show popup
--	if ( d->popupType != AlertHeadline && (d->popupType != AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) )
--		setData(icon, contactText);
--	else if ( d->popupType == AlertHeadline ) {
-+	if ( d->popupType != PopupManager::AlertComposing && d->popupType != PopupManager::AlertHeadline &&
-+	     (d->popupType != PopupManager::AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) )
-+	{
-+		if ((event && event->type() == PsiEvent::Message) && (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.showMessage").toBool())) {
-+			const Message *jmessage = &((MessageEvent *)event)->message();
-+			QString message;
-+			 
-+			if ( !jmessage->subject().isEmpty() )
-+				message += "<font color=\"red\"><b>" + tr("Subject:") + " " + jmessage->subject() + "</b></font><br>";
-+			message += TextUtil::plain2rich( jmessage->body() );
-+			
-+			if (!message.isEmpty()) {
-+				contactText += "<br/><font size=\"+1\">" + message + "</font>";
-+			}
-+		}
-+                setData(&avatar, icon, contactText);
-+	}
-+	else if ( d->popupType == PopupManager::AlertComposing ) {
-+		QString txt = "<font size=\"+1\">" + name + tr(" is typing...") + "</font>" ;
-+		setData(&avatar, icon, txt);
-+	}
-+	else if ( d->popupType == PopupManager::AlertHeadline ) {
- 		QVBoxLayout *vbox = new QVBoxLayout;
--		vbox->addLayout( d->createContactInfo(icon, contactText) );
-+		vbox->addLayout( d->createContactInfo(&avatar, icon, contactText) );
- 
- 		vbox->addSpacing(5);
- 
-@@ -396,7 +382,7 @@ void PsiPopup::setData(const Jid &j, con
- 
- 		messageLabel->setWordWrap(true);
- 		messageLabel->setTextFormat(Qt::RichText);
--		messageLabel->setText( d->clipText(TextUtil::linkify( message )) );
-+		messageLabel->setText( clipText(TextUtil::linkify( message )) );
- 		messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- 		vbox->addWidget(messageLabel);
- 
-@@ -409,6 +395,9 @@ void PsiPopup::setData(const Jid &j, con
- 		d->popup->addLayout( vbox );
- 		show();
- 	}
-+	else {
-+		deleteLater();
-+	}
- }
- 
- void PsiPopup::show()
-@@ -443,7 +432,7 @@ QString PsiPopup::id() const
- 	return d->id;
- }
- 
--FancyPopup *PsiPopup::popup()
-+FancyPopup *PsiPopup::popup() const
- {
- 	return d->popup;
- }
-@@ -459,3 +448,5 @@ void PsiPopup::deleteAll()
- }
- 
- #include "psipopup.moc"
-+
-+Q_EXPORT_PLUGIN2(psipopup, PsiPopupPlugin)
---- psi.orig/src/psipopup.h
-+++ psi/src/psipopup.h
-@@ -21,58 +21,51 @@
- #ifndef PSIPOPUP_H
- #define PSIPOPUP_H
- 
--#include <QObject>
-+#ifndef QT_STATICPLUGIN
-+#define QT_STATICPLUGIN
-+#endif
- 
--class PsiCon;
--class PsiAccount;
--class UserListItem;
--class FancyPopup;
--class PsiIcon;
--class PsiEvent;
--namespace XMPP {
--	class Jid;
--	class Resource;
--}
--using namespace XMPP;
-+#include "psipopupinterface.h"
- 
-+class FancyPopup;
- 
--class PsiPopup : public QObject
-+class PsiPopup : public QObject, public PsiPopupInterface
- {
- 	Q_OBJECT
-+
- public:
--	PsiPopup(const PsiIcon *titleIcon, QString titleText, PsiAccount *acc);
-+	PsiPopup(QObject* parent = 0);
- 	~PsiPopup();
- 
--	enum PopupType {
--		AlertNone = 0,
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const Resource& r, const UserListItem* = 0, PsiEvent* = 0);
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const PsiIcon* titleIcon, const QString& titleText,
-+		   const QPixmap* avatar, const PsiIcon* icon, const QString& text);
- 
--		AlertOnline,
--		AlertOffline,
--		AlertStatusChange,
--
--		AlertMessage,
--		AlertChat,
--		AlertHeadline,
--		AlertFile,
--		AlertAvCall
--	};
--	PsiPopup(PopupType type, PsiAccount *acc);
-+	static void deleteAll();
- 
--	void setData(const PsiIcon *icon, QString text);
-+private:
- 	void setData(const Jid &, const Resource &, const UserListItem * = 0, const PsiEvent * = 0);
--
--	void show();
--
-+	void setData(const QPixmap *avatar, const PsiIcon *icon, const QString& text);
-+	void setJid(const Jid &j);
- 	QString id() const;
--	FancyPopup *popup();
--
--	static void deleteAll();
-+	FancyPopup *popup() const;
-+	void show();
- 
--public:
--	class Private;
- private:
-+	class Private;
- 	Private *d;
- 	friend class Private;
- };
- 
-+class PsiPopupPlugin : public QObject, public PsiPopupPluginInterface
-+{
-+	Q_OBJECT
-+	Q_INTERFACES(PsiPopupPluginInterface)
-+
-+public:
-+	virtual ~PsiPopupPlugin() { PsiPopup::deleteAll(); }
-+	virtual QString name() const { return "Classic"; }
-+	virtual PsiPopupInterface* popup(QObject* p) { return new PsiPopup(p); }
-+};
-+
- #endif
---- psi.orig/src/psipopupinterface.cpp
-+++ psi/src/psipopupinterface.cpp
-@@ -0,0 +1,107 @@
-+/*
-+ * psipopuinterface.cpp
-+ * Copyright (C) 2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psipopupinterface.h"
-+#include "psioptions.h"
-+#include "psiiconset.h"
-+#include "common.h"
-+
-+QString PsiPopupInterface::clipText(QString text)
-+{
-+	int len = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.maximum-text-length").toInt();
-+	if (len > 0) {
-+		// richtext will give us trouble here
-+		if (((int)text.length()) > len) {
-+			text = text.left(len);
-+
-+			// delete last unclosed tag
-+			/*if ( text.find("</") > text.find(">") ) {
-+
-+				text = text.left( text.find("</") );
-+			}*/
-+
-+			text += "...";
-+		}
-+	}
-+
-+	return text;
-+}
-+
-+QString PsiPopupInterface::title(PopupManager::PopupType type, bool *doAlertIcon, PsiIcon **icon)
-+{
-+	QString text;
-+
-+	switch(type) {
-+	case PopupManager::AlertOnline:
-+		text = QObject::tr("Contact online");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("status/online");
-+		*doAlertIcon = false;
-+		break;
-+	case PopupManager::AlertOffline:
-+		text = QObject::tr("Contact offline");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("status/offline");
-+		*doAlertIcon = false;
-+		break;
-+	case PopupManager::AlertStatusChange:
-+		text = QObject::tr("Status change");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("status/online");
-+		*doAlertIcon = false;
-+		break;
-+	case PopupManager::AlertMessage:
-+		text = QObject::tr("Incoming message");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/message");
-+		*doAlertIcon = true;
-+		break;
-+	case PopupManager::AlertComposing:
-+		text = QObject::tr("Typing notify");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/typing");
-+		*doAlertIcon = false;
-+		break;
-+	case PopupManager::AlertChat:
-+		text = QObject::tr("Incoming chat message");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/chat");
-+		*doAlertIcon = true;
-+		break;
-+	case PopupManager::AlertHeadline:
-+		text = QObject::tr("Headline");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/headline");
-+		*doAlertIcon = true;
-+		break;
-+	case PopupManager::AlertFile:
-+		text = QObject::tr("Incoming file");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/file");
-+		*doAlertIcon = true;
-+		break;
-+	case PopupManager::AlertAvCall:
-+		text = QObject::tr("Incoming call");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/call");
-+		*doAlertIcon = true;
-+		break;
-+	case PopupManager::AlertGcHighlight:
-+		text = QObject::tr("Groupchat highlight");
-+		*icon = (PsiIcon *)IconsetFactory::iconPtr("psi/headline");
-+		*doAlertIcon = true;
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return CAP(text);
-+}
---- psi.orig/src/psipopupinterface.h
-+++ psi/src/psipopupinterface.h
-@@ -0,0 +1,57 @@
-+/*
-+ * psipopuinterface.h
-+ * Copyright (C) 2012  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSIPOPUPINTERFACE_H
-+#define PSIPOPUPINTERFACE_H
-+
-+#include "popupmanager.h"
-+
-+class PsiPopupInterface;
-+
-+class PsiPopupPluginInterface
-+{
-+public:
-+	virtual QString name() const = 0;
-+	virtual bool isAvailable() const { return true; }
-+	virtual PsiPopupInterface* popup(QObject* ) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(PsiPopupPluginInterface, "psi-im.org.PsiPopupInterface/0.1")
-+
-+
-+class PsiPopupInterface
-+{
-+public:
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const Resource& r, const UserListItem* = 0, PsiEvent* = 0) = 0;
-+	virtual void popup(PsiAccount* account, PopupManager::PopupType type, const Jid& j, const PsiIcon* titleIcon, const QString& titleText,
-+				    const QPixmap* avatar, const PsiIcon* icon, const QString& text) = 0;
-+
-+	void setDuration(int d) { duration_ = d; }
-+
-+protected:
-+	static QString clipText(QString text);
-+	static QString title(PopupManager::PopupType type, bool *doAlertIcon, PsiIcon **icon);
-+	int duration() const { return duration_; }
-+
-+private:
-+	int duration_;
-+};
-+
-+#endif
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -133,6 +133,8 @@ HEADERS += \
- 	$$PWD/alerticon.h \
- 	$$PWD/alertable.h \
- 	$$PWD/psipopup.h \
-+	$$PWD/popupmanager.h \
-+	$$PWD/psipopupinterface.h \
- 	$$PWD/psiapplication.h \
- 	$$PWD/filecache.h \
- 	$$PWD/avatars.h \
-@@ -259,6 +261,8 @@ SOURCES += \
- 	$$PWD/alerticon.cpp \
- 	$$PWD/alertable.cpp \
- 	$$PWD/psipopup.cpp \
-+	$$PWD/popupmanager.cpp \
-+	$$PWD/psipopupinterface.cpp \
- 	$$PWD/psiapplication.cpp \
- 	$$PWD/filecache.cpp \
- 	$$PWD/avatars.cpp \
-@@ -555,9 +559,11 @@ psi_plugins {
- }
- 
- dbus {
--	HEADERS += 	$$PWD/dbus.h
-+	HEADERS += 	$$PWD/dbus.h \
-+			$$PWD/psidbusnotifier.h
- 	SOURCES += 	$$PWD/dbus.cpp
--	SOURCES += $$PWD/activeprofiles_dbus.cpp
-+	SOURCES +=	$$PWD/activeprofiles_dbus.cpp \
-+			$$PWD/psidbusnotifier.cpp
- 	DEFINES += USE_DBUS
- 	CONFIG += qdbus
- }
---- psi.orig/src/widgets/fancypopup.cpp
-+++ psi/src/widgets/fancypopup.cpp
-@@ -19,15 +19,11 @@
-  */
- 
- #include "fancypopup.h"
-+#include "ui_fancypopup.h"
- 
--#include <QPixmap>
- #include <QApplication>
--#include <QLabel>
--#include <QLayout>
- #include <QTimer>
--#include <QPainter>
- #include <QList>
--#include <QToolButton>
- #include <QStyle>
- #include <QDesktopWidget>
- #include <QMouseEvent>
-@@ -35,8 +31,9 @@
- 
- #include "iconset.h"
- #include "fancylabel.h"
--#include "iconlabel.h"
-+//#include "iconlabel.h"
- #include "psitooltip.h"
-+#include "psioptions.h"
- 
- #define BUTTON_WIDTH	16
- #define BUTTON_HEIGHT	14
-@@ -72,7 +69,7 @@ public:
- 
- 	QPoint position();
- 
--	class BackgroundWidget : public QWidget
-+	/*class BackgroundWidget : public QWidget
- 	{
- 	public:
- 		BackgroundWidget(QWidget *parent)
-@@ -95,7 +92,7 @@ public:
- 			p->drawTiledPixmap(0, 0, width(), height(), background);
- 			delete p;
- 		}
--	};
-+	};*/
- 
- 	bool eventFilter(QObject *o, QEvent *e);
- 
-@@ -116,9 +113,10 @@ public:
- 	PopupLayout popupLayout;
- 
- 	QList<FancyPopup *> prevPopups;
--	QBoxLayout *layout;
-+	//QBoxLayout *layout;
- 	FancyPopup *popup;
- 	QTimer *hideTimer;
-+	Ui::Frame ui_;
- };
- 
- int  FancyPopup::Private::hideTimeout = 5 * 1000; // 5 seconds
-@@ -148,12 +146,17 @@ void FancyPopup::Private::popupDestroyed
- QPoint FancyPopup::Private::position()
- {
- 	QRect geom = qApp->desktop()->availableGeometry(popup);
--	QPoint destination(geom.x() + geom.width(), geom.y() + geom.height()); // in which corner popup should appear
-+	bool topToBottom = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.top-to-bottom").toBool();
-+	bool atLeft = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.at-left-corner").toBool();
-+	QPoint destination(geom.x() + (atLeft ? 0 : geom.width()),
-+			   geom.y() + (topToBottom ? 0 : geom.height()) ); // in which corner popup should appear
- 
--	if ( destination.y() > (qApp->desktop()->screenGeometry().height()/2) )
-+	/*if ( destination.y() > (qApp->desktop()->screenGeometry().height()/2) )
- 		popupLayout = Private::BottomToTop;
- 	else
--		popupLayout = Private::TopToBottom;
-+		popupLayout = Private::TopToBottom;*/
-+
-+	popupLayout = topToBottom ? Private::TopToBottom : Private::BottomToTop;
- 
- 	if ( (destination.x() + popup->width()) > (geom.x() + geom.width()) )
- 		destination.setX( geom.x() + geom.width() - popup->width() );
-@@ -181,45 +184,14 @@ void FancyPopup::Private::initContents(Q
- 	QPixmap back(1, 1);
- 	back.fill(backgroundColor);
- 	
--	QVBoxLayout *vbox = new QVBoxLayout(popup);
--	vbox->setMargin(0);
--	vbox->setSpacing(0);
--
--	// top row
--	QHBoxLayout *tophbox = new QHBoxLayout;
--	vbox->addLayout(tophbox);
--	QLabel *top1 = new QLabel(popup);
--	top1->setAutoFillBackground(true);
--	top1->setFixedWidth(3);
--	top1->setPalette(backgroundPalette);
--	tophbox->addWidget(top1);
--
--	QVBoxLayout *topvbox = new QVBoxLayout;
--	tophbox->addLayout(topvbox);
--	QLabel *top2 = new QLabel(popup);
--	top2->setAutoFillBackground(true);
--	top2->setFixedHeight(1);
--	top2->setPalette(backgroundPalette);
--	topvbox->addWidget(top2);
--
--	QHBoxLayout *tophbox2 = new QHBoxLayout;
--	topvbox->addLayout(tophbox2);
--
--	IconLabel *titleIcon = new IconLabel(popup);
--	titleIcon->setAutoFillBackground(true);
--	titleIcon->setPsiIcon(icon, copyIcon);
--	titleIcon->setPalette(backgroundPalette);
--	tophbox2->addWidget(titleIcon);
--
--	QLabel *top5 = new QLabel(popup);
--	top5->setAutoFillBackground(true);
--	top5->setFixedWidth(3);
--	top5->setPalette(backgroundPalette);
--	tophbox2->addWidget(top5);
--
--	// title label
--	QLabel *titleText = new QLabel(popup);
--	titleText->setAutoFillBackground(true);
-+	ui_.setupUi(popup);
-+	ui_.lb_bottom1->setPalette(backgroundPalette);
-+	ui_.lb_icon->setPalette(backgroundPalette);
-+	ui_.lb_mid1->setPalette(backgroundPalette);
-+	ui_.lb_mid2->setPalette(backgroundPalette);
-+	ui_.lb_top1->setPalette(backgroundPalette);
-+	ui_.closeFrame->setPalette(backgroundPalette);
-+
- 	QBrush titleFontColor;
- 	if ( (backgroundColor.red() + backgroundColor.green() + backgroundColor.blue())/3 > 128 )
- 		titleFontColor = QBrush(Qt::white);
-@@ -227,96 +199,20 @@ void FancyPopup::Private::initContents(Q
- 		titleFontColor = QBrush(Qt::black);
- 	QPalette titlePalette = backgroundPalette;
- 	titlePalette.setBrush(QPalette::Text, titleFontColor);
--	titleText->setPalette(titlePalette);
--		
--	QFont titleFont = titleText->font();
-+	ui_.lb_title->setPalette(titlePalette);
-+	QFont titleFont = ui_.lb_title->font();
- 	titleFont.setBold(true);
--	titleText->setFont(titleFont);
--	
--	titleText->setText( title );
--	titleText->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
--	tophbox2->addWidget(titleText);
--
--	// 2-pixel space
--	Private::BackgroundWidget *spacing = new Private::BackgroundWidget(popup);
--	spacing->setBackground(back);
--	tophbox2->addWidget(spacing);
--	QVBoxLayout *spacingLayout = new QVBoxLayout(spacing);
--	spacingLayout->addSpacing(2);
--
--	// close button
--	Private::BackgroundWidget *closeButtonBack = new Private::BackgroundWidget(popup);	
--	closeButtonBack->setBackground(back);
--	tophbox2->addWidget(closeButtonBack);
--
--	QVBoxLayout *closeButtonBackLayout = new QVBoxLayout(closeButtonBack);
--	closeButtonBackLayout->setMargin(0);
--	closeButtonBackLayout->addStretch();
--
--	QToolButton *closeButton = new QToolButton(closeButtonBack);
--	closeButton->setObjectName("closeButton");
--	closeButton->setToolTip(tr("Close"));
--	closeButtonBackLayout->addWidget( closeButton );
--	closeButtonBackLayout->addStretch();
--	closeButton->setFocusPolicy( Qt::NoFocus );
--	closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
--	closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
--	connect(closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
--
--	QLabel *top3 = new QLabel(popup);
--	top3->setAutoFillBackground(true);
--	top3->setFixedHeight(1);
--	top3->setPalette(backgroundPalette);
--	topvbox->addWidget(top3);
--
--	QLabel *top4 = new QLabel(popup);
--	top4->setAutoFillBackground(true);
--	top4->setFixedWidth(3);
--	top4->setPalette(backgroundPalette);
--	tophbox->addWidget(top4);
--
--	// middle row
--	QHBoxLayout *middlehbox = new QHBoxLayout;
--	vbox->addLayout(middlehbox);
--	QLabel *middle1 = new QLabel(popup);
--	middle1->setAutoFillBackground(true);
--	middle1->setFixedWidth(4);
--	middle1->setPalette(backgroundPalette);
--	middlehbox->addWidget(middle1);
--
--	middlehbox->addSpacing(5);
--	QVBoxLayout *middlevbox = new QVBoxLayout;
--	middlehbox->addLayout(middlevbox);
--	middlevbox->addSpacing(5);
--	layout = middlevbox; // we'll add more items later in addLayout()
--	middlehbox->addSpacing(5);
--
--	QLabel *middle3 = new QLabel(popup);
--	middle3->setAutoFillBackground(true);
--	middle3->setFixedWidth(4);
--	middle3->setPalette(backgroundPalette);
--	middlehbox->addWidget(middle3);
--
--	// bottom row
--	QHBoxLayout *bottomhbox = new QHBoxLayout;
--	vbox->addLayout(bottomhbox);
--	QLabel *bottom1 = new QLabel(popup);
--	bottom1->setAutoFillBackground(true);
--	bottom1->setFixedSize( 4, 4 );
--	bottom1->setPalette(backgroundPalette);
--	bottomhbox->addWidget(bottom1);
--
--	QLabel *bottom2 = new QLabel(popup);
--	bottom2->setAutoFillBackground(true);
--	bottom2->setFixedHeight(4);
--	bottom2->setPalette(backgroundPalette);
--	bottomhbox->addWidget(bottom2);
--
--	QLabel *bottom3 = new QLabel(popup);
--	bottom3->setAutoFillBackground(true);
--	bottom3->setFixedSize( 4, 4 );
--	bottom3->setPalette(backgroundPalette);
--	bottomhbox->addWidget(bottom3);
-+	ui_.lb_title->setFont(titleFont);
-+	ui_.lb_title->setText( title );
-+
-+	ui_.lb_icon->setPsiIcon(icon, copyIcon);
-+
-+	ui_.closeButton->setObjectName("closeButton");
-+	ui_.closeButton->setToolTip(tr("Close"));
-+	ui_.closeButton->setFocusPolicy( Qt::NoFocus );
-+	ui_.closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
-+	ui_.closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
-+	connect(ui_.closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
- }
- 
- bool FancyPopup::Private::eventFilter(QObject *o, QEvent *e)
-@@ -359,8 +255,8 @@ FancyPopup::~FancyPopup()
- 
- void FancyPopup::addLayout(QLayout *layout, int stretch)
- {
--	d->layout->addLayout(layout, stretch);
--	d->layout->addSpacing(5);
-+	d->ui_.layout->addLayout(layout, stretch);
-+	d->ui_.layout->addSpacing(5);
- }
- 
- void FancyPopup::show()
---- psi.orig/src/widgets/fancypopup.ui
-+++ psi/src/widgets/fancypopup.ui
-@@ -0,0 +1,777 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>Frame</class>
-+ <widget class="QFrame" name="Frame">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>452</width>
-+    <height>207</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="minimumSize">
-+   <size>
-+    <width>0</width>
-+    <height>10</height>
-+   </size>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Frame</string>
-+  </property>
-+  <property name="frameShape">
-+   <enum>QFrame::StyledPanel</enum>
-+  </property>
-+  <property name="frameShadow">
-+   <enum>QFrame::Raised</enum>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <property name="spacing">
-+    <number>0</number>
-+   </property>
-+   <property name="margin">
-+    <number>0</number>
-+   </property>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_3">
-+     <property name="spacing">
-+      <number>0</number>
-+     </property>
-+     <property name="leftMargin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="QLabel" name="lb_top1">
-+       <property name="minimumSize">
-+        <size>
-+         <width>4</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>4</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="text">
-+        <string/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="IconLabel" name="lb_icon">
-+       <property name="minimumSize">
-+        <size>
-+         <width>18</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>18</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="text">
-+        <string/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="lb_title">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="minimumSize">
-+        <size>
-+         <width>0</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>16777215</width>
-+         <height>18</height>
-+        </size>
-+       </property>
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="text">
-+        <string/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QFrame" name="closeFrame">
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="frameShape">
-+        <enum>QFrame::NoFrame</enum>
-+       </property>
-+       <property name="frameShadow">
-+        <enum>QFrame::Raised</enum>
-+       </property>
-+       <layout class="QHBoxLayout" name="horizontalLayout_4">
-+        <property name="spacing">
-+         <number>0</number>
-+        </property>
-+        <property name="leftMargin">
-+         <number>9</number>
-+        </property>
-+        <property name="topMargin">
-+         <number>0</number>
-+        </property>
-+        <property name="rightMargin">
-+         <number>9</number>
-+        </property>
-+        <property name="bottomMargin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <widget class="QToolButton" name="closeButton">
-+          <property name="maximumSize">
-+           <size>
-+            <width>16</width>
-+            <height>16</height>
-+           </size>
-+          </property>
-+          <property name="text">
-+           <string/>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="centralLayout">
-+     <property name="spacing">
-+      <number>6</number>
-+     </property>
-+     <property name="leftMargin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="QLabel" name="lb_mid1">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="minimumSize">
-+        <size>
-+         <width>4</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>4</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+       <property name="baseSize">
-+        <size>
-+         <width>4</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="text">
-+        <string/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer_2">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeType">
-+        <enum>QSizePolicy::Fixed</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>5</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <layout class="QHBoxLayout" name="layout">
-+       <property name="spacing">
-+        <number>0</number>
-+       </property>
-+       <item>
-+        <spacer name="horizontalSpacer">
-+         <property name="orientation">
-+          <enum>Qt::Horizontal</enum>
-+         </property>
-+         <property name="sizeHint" stdset="0">
-+          <size>
-+           <width>0</width>
-+           <height>0</height>
-+          </size>
-+         </property>
-+        </spacer>
-+       </item>
-+      </layout>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer_3">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeType">
-+        <enum>QSizePolicy::Fixed</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>5</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="lb_mid2">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="minimumSize">
-+        <size>
-+         <width>4</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>4</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+       <property name="palette">
-+        <palette>
-+         <active>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </active>
-+         <inactive>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>255</red>
-+             <green>255</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </inactive>
-+         <disabled>
-+          <colorrole role="Base">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+          <colorrole role="Window">
-+           <brush brushstyle="SolidPattern">
-+            <color alpha="255">
-+             <red>0</red>
-+             <green>0</green>
-+             <blue>255</blue>
-+            </color>
-+           </brush>
-+          </colorrole>
-+         </disabled>
-+        </palette>
-+       </property>
-+       <property name="autoFillBackground">
-+        <bool>true</bool>
-+       </property>
-+       <property name="text">
-+        <string/>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <widget class="QLabel" name="lb_bottom1">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-+       <horstretch>0</horstretch>
-+       <verstretch>0</verstretch>
-+      </sizepolicy>
-+     </property>
-+     <property name="minimumSize">
-+      <size>
-+       <width>0</width>
-+       <height>4</height>
-+      </size>
-+     </property>
-+     <property name="maximumSize">
-+      <size>
-+       <width>16777215</width>
-+       <height>4</height>
-+      </size>
-+     </property>
-+     <property name="palette">
-+      <palette>
-+       <active>
-+        <colorrole role="Base">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>255</red>
-+           <green>255</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+        <colorrole role="Window">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>0</red>
-+           <green>0</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+       </active>
-+       <inactive>
-+        <colorrole role="Base">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>255</red>
-+           <green>255</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+        <colorrole role="Window">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>0</red>
-+           <green>0</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+       </inactive>
-+       <disabled>
-+        <colorrole role="Base">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>0</red>
-+           <green>0</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+        <colorrole role="Window">
-+         <brush brushstyle="SolidPattern">
-+          <color alpha="255">
-+           <red>0</red>
-+           <green>0</green>
-+           <blue>255</blue>
-+          </color>
-+         </brush>
-+        </colorrole>
-+       </disabled>
-+      </palette>
-+     </property>
-+     <property name="autoFillBackground">
-+      <bool>true</bool>
-+     </property>
-+     <property name="text">
-+      <string/>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconLabel</class>
-+   <extends>QLabel</extends>
-+   <header>iconlabel.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/widgets/widgets.pri
-+++ psi/src/widgets/widgets.pri
-@@ -43,6 +43,8 @@ HEADERS += \
- 	$$PWD/psitabbar.h \
- 	$$PWD/actionlineedit.h
- 
-+FORMS += $$PWD/fancypopup.ui
-+
- # to remove dependency on iconset and stuff
- #DEFINES += WIDGET_PLUGIN
-

psi-plus-main-20130107.tar.xz/patches/0009-psi-dont-send-composing-events.diff Deleted

@@ -1,123 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -424,6 +440,7 @@
- 			<ignore-non-roster-contacts type="bool">false</ignore-non-roster-contacts>
- 			<send-composing-events type="bool">true</send-composing-events>
- 			<send-inactivity-events type="bool">false</send-inactivity-events>
-+			<dont-send-composing-events type="bool">false</dont-send-composing-events>
- 		</messages>
- 		<p2p>
- 			<bytestreams>
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -905,36 +905,38 @@ void ChatDlg::setChatState(ChatState sta
- 		}
- 
- 		// Build event message
--		Message m(jid());
--		if (sendComposingEvents_) {
--			m.setEventId(eventId_);
--			if (state == XMPP::StateComposing) {
--				m.addEvent(ComposingEvent);
--			}
--			else if (lastChatState_ == XMPP::StateComposing) {
--				m.addEvent(CancelEvent);
-+		if( !PsiOptions::instance()->getOption("options.messages.dont-send-composing-events").toBool() ) {
-+			Message m(jid());
-+			if (sendComposingEvents_) {
-+				m.setEventId(eventId_);
-+				if (state == XMPP::StateComposing) {
-+					m.addEvent(ComposingEvent);
-+				}
-+				else if (lastChatState_ == XMPP::StateComposing) {
-+					m.addEvent(CancelEvent);
-+				}
- 			}
--		}
--		if (contactChatState_ != XMPP::StateNone) {
--			if (lastChatState_ != XMPP::StateGone) {
--				if ((state == XMPP::StateInactive && lastChatState_ == XMPP::StateComposing) || (state == XMPP::StateComposing && lastChatState_ == XMPP::StateInactive)) {
--					// First go to the paused state
--					Message tm(jid());
--					m.setType("chat");
--					m.setChatState(XMPP::StatePaused);
--					if (account()->isAvailable()) {
--						account()->dj_sendMessage(m, false);
-+			if (contactChatState_ != XMPP::StateNone) {
-+				if (lastChatState_ != XMPP::StateGone) {
-+					if ((state == XMPP::StateInactive && lastChatState_ == XMPP::StateComposing) || (state == XMPP::StateComposing && lastChatState_ == XMPP::StateInactive)) {
-+						// First go to the paused state
-+						Message tm(jid());
-+						m.setType("chat");
-+						m.setChatState(XMPP::StatePaused);
-+						if (account()->isAvailable()) {
-+							account()->dj_sendMessage(m, false);
-+						}
- 					}
-+					m.setChatState(state);
- 				}
--				m.setChatState(state);
- 			}
--		}
- 
--		// Send event message
--		if (m.containsEvents() || m.chatState() != XMPP::StateNone) {
--			m.setType("chat");
--			if (account()->isAvailable()) {
--				account()->dj_sendMessage(m, false);
-+			// Send event message
-+			if (m.containsEvents() || m.chatState() != XMPP::StateNone) {
-+				m.setType("chat");
-+				if (account()->isAvailable()) {
-+					account()->dj_sendMessage(m, false);
-+				}
- 			}
- 		}
- 
---- psi.orig/src/options/opt_advanced.cpp
-+++ psi/src/options/opt_advanced.cpp
-@@ -92,7 +92,9 @@ QWidget *OptionsTabAdvanced::widget()
- 		" like system-wide news on MSN, announcements, etc."));
- 
- 	connect(d->ck_messageevents,SIGNAL(toggled(bool)),d->ck_inactiveevents,SLOT(setEnabled(bool)));
-+	connect(d->ck_messageevents,SIGNAL(toggled(bool)),d->ck_sendComposingEvents,SLOT(setEnabled(bool)));
- 	d->ck_inactiveevents->setEnabled(d->ck_messageevents->isChecked());
-+	d->ck_sendComposingEvents->setEnabled(d->ck_messageevents->isChecked());
- 
- 	return w;
- }
-@@ -106,6 +108,7 @@ void OptionsTabAdvanced::applyOptions()
- 
- 	PsiOptions::instance()->setOption("options.messages.send-composing-events", d->ck_messageevents->isChecked());
- 	PsiOptions::instance()->setOption("options.messages.send-inactivity-events", d->ck_inactiveevents->isChecked());
-+	PsiOptions::instance()->setOption("options.messages.dont-send-composing-events", d->ck_sendComposingEvents->isChecked());
- 	PsiOptions::instance()->setOption("options.external-control.adhoc-remote-control.enable", d->ck_rc->isChecked());
- 	if ( SpellChecker::instance()->available() )
- 		PsiOptions::instance()->setOption("options.ui.spell-check.enabled",d->ck_spell->isChecked());
-@@ -132,6 +135,7 @@ void OptionsTabAdvanced::restoreOptions(
- 
- 	d->ck_messageevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool() );
- 	d->ck_inactiveevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-inactivity-events").toBool() );
-+	d->ck_sendComposingEvents->setChecked( PsiOptions::instance()->getOption("options.messages.dont-send-composing-events").toBool() );
- 	d->ck_rc->setChecked( PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool() );
- 	if ( !SpellChecker::instance()->available() )
- 		d->ck_spell->setChecked(false);
---- psi.orig/src/options/opt_advanced.ui
-+++ psi/src/options/opt_advanced.ui
-@@ -34,6 +34,16 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_sendComposingEvents">
-+     <property name="whatsThis">
-+      <string>Disables the sending of message events such as &quot;Contact is Typing...&quot;</string>
-+     </property>
-+     <property name="text">
-+      <string>Do not send composing events</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_rc" >
-      <property name="text" >
-       <string>Enable remote controlling from other locations</string>

psi-plus-main-20130107.tar.xz/patches/0030-psi-webkit.diff Deleted

@@ -1,7437 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -26,6 +26,9 @@
- 			<chat comment="HTML in chats">
- 				<render comment="Display received HTML" type="bool">true</render>
- 			</chat>
-+			<muc comment="HTML in group chats">
-+				<render comment="Display received HTML" type="bool">false</render>
-+			</muc>
- 		</html>
- 		<extended-presence comment="Extended presence options">
- 			<notify comment="Get notified of extended presence changes" type="bool">true</notify>
-@@ -90,6 +93,7 @@
- 				<size type="QString"></size> 
- 			</message>
- 			<chat comment="Chat dialog options">
-+				<theme comment="The theme used for chat messages rendering" type="QString">psi/classic</theme>
- 				<central-toolbar comment="Have a central toolbar" type="bool">false</central-toolbar>
- 				<size comment="Remembered window size" type="QSize">
- 				</size>
-@@ -191,6 +195,7 @@
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-+				<theme comment="The theme used for groupchat messages rendering" type="QString">psi/classic</theme>
- 				<highlight-words type="QStringList" />
- 				<size comment="Remembered window size" type="QSize">
- 					<width>580</width>
-@@ -260,6 +265,7 @@
- 						<received type="QColor" comment="Color used to indicate received messages.">#0000ff</received>
- 						<sent type="QColor" comment="Color used to indicate sent messages.">#ff0000</sent>
- 						<informational type="QColor" comment="Color used to indicate informational (status change, spooled) messages.">#008000</informational>
-+						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
- 					</messages>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
---- psi.orig/psi.qc
-+++ psi/psi.qc
-@@ -24,6 +24,9 @@
-     <disabled/>  
-   </dep>
-   <dep type='qdbus'/>
-+  <dep type='webkit'>
-+    <disabled/>
-+  </dep>
-   <dep type='growl'/>
-   <dep type='whiteboarding'>
-     <disabled/>
---- psi.orig/qcm/webkit.qcm
-+++ psi/qcm/webkit.qcm
-@@ -0,0 +1,38 @@
-+/*
-+-----BEGIN QCMOD-----
-+name: QtWebKit
-+-----END QCMOD-----
-+*/
-+
-+//----------------------------------------------------------------------------
-+// qc_webkit
-+//----------------------------------------------------------------------------
-+class qc_webkit : public ConfObj
-+{
-+public:
-+	qc_webkit(Conf *c) : ConfObj(c) {}
-+	QString name() const { return "QtWebKit"; }
-+	QString shortname() const { return "webkit"; }
-+	bool exec()
-+	{
-+		QString proextra =
-+		"CONFIG += qt webkit\n"
-+		"QT += webkit\n";
-+
-+		QString str =
-+		"\n"
-+		"int main()\n"
-+		"{\n"
-+		"	return 0;\n"
-+		"}\n";
-+
-+		int ret;
-+		if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra, &ret))
-+			return false;
-+		if(ret != 0)
-+			return false;
-+		
-+		conf->addExtra("CONFIG += webkit");
-+		return true;
-+	}
-+};
---- psi.orig/src/bytearrayreply.cpp
-+++ psi/src/bytearrayreply.cpp
-@@ -0,0 +1,89 @@
-+/*
-+ * bytearrayreply.cpp - Base class for QNetworReply'es returning QByteArray
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "bytearrayreply.h"
-+
-+#include <QTimer>
-+
-+ByteArrayReply::ByteArrayReply(const QNetworkRequest &request,
-+							   const QByteArray &ba, const QString& mimeType,
-+							   QObject *parent) :
-+	QNetworkReply(parent),
-+	origLen(ba.size()),
-+	data(ba)
-+{
-+	setRequest(request);
-+	setOpenMode(QIODevice::ReadOnly);
-+
-+	if (ba.isNull()) {
-+		setError(QNetworkReply::ContentNotFoundError, "Not found");
-+		QTimer::singleShot(0, this, SIGNAL(metaDataChanged()));
-+		QTimer::singleShot(0, this, SLOT(signalError()));
-+		QTimer::singleShot(0, this, SIGNAL(finished()));
-+	} else {
-+		if (mimeType.isEmpty()) {
-+			setHeader(QNetworkRequest::ContentTypeHeader, "application/octet-stream");
-+		} else {
-+			setHeader(QNetworkRequest::ContentTypeHeader, mimeType);
-+		}
-+		setHeader(QNetworkRequest::ContentLengthHeader, QByteArray::number(origLen));
-+		QTimer::singleShot(0, this, SIGNAL(metaDataChanged()));
-+		QTimer::singleShot(0, this, SIGNAL(readyRead()));
-+	}
-+}
-+
-+ByteArrayReply::~ByteArrayReply() {
-+
-+}
-+
-+void ByteArrayReply::abort() {
-+	// its ok for abort here. webkit calls it in any case on finish
-+}
-+
-+qint64 ByteArrayReply::bytesAvailable() const
-+{
-+	return data.length() + QNetworkReply::bytesAvailable();
-+}
-+
-+
-+qint64 ByteArrayReply::readData(char *buffer, qint64 maxlen)
-+{
-+	qint64 len = qMin(qint64(data.length()), maxlen);
-+	if (len) {
-+		memcpy(buffer, data.constData(), len);
-+		data.remove(0, len);
-+	}
-+	if (!data.length())
-+		QTimer::singleShot(0, this, SIGNAL(finished()));
-+	return len;
-+
-+}
-+
-+
-+bool ByteArrayReply::open(OpenMode mode) {
-+	Q_UNUSED(mode);
-+	Q_ASSERT(0); //should never happened
-+	return true;
-+}
-+
-+void ByteArrayReply::signalError()
-+{
-+	emit error(error());
-+}
---- psi.orig/src/bytearrayreply.h
-+++ psi/src/bytearrayreply.h
-@@ -0,0 +1,56 @@
-+/*
-+ * bytearrayreply.h - Base class for QNetworReply'es returning QByteArray
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef BYTEARRAYREPLY_H
-+#define BYTEARRAYREPLY_H
-+
-+#include <QNetworkReply>
-+#include <QBuffer>
-+
-+
-+class ByteArrayReply : public QNetworkReply {
-+
-+	Q_OBJECT
-+
-+public:
-+	ByteArrayReply(const QNetworkRequest &request,
-+				   const QByteArray &ba = QByteArray(),
-+				   const QString &mimeType = QString(),
-+				   QObject * parent = 0);
-+
-+	/** Construct IconReply that fails with ContentAccessDenied error */
-+	//ByteArrayReply();
-+	~ByteArrayReply();
-+
-+	//reimplemented
-+	void abort();
-+	qint64 readData(char *buffer, qint64 maxlen);
-+	qint64 bytesAvailable() const;
-+	bool open(OpenMode mode);
-+
-+private slots:
-+	void signalError();
-+
-+private:
-+	int origLen;
-+	QByteArray data;
-+};
-+
-+#endif
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -73,6 +73,8 @@
- #include "psicontactlist.h"
- #include "accountlabel.h"
- #include "psirichtext.h"
-+#include "messageview.h"
-+#include "chatview.h"
- 
- #ifdef Q_WS_WIN
- #include <windows.h>
-@@ -117,12 +119,16 @@ void ChatDlg::init()
- 	initActions();
- 	setShortcuts();
- 
--	// TODO: this have to be moved to chatEditCreated()
-+	chatEdit()->installEventFilter(this);
- 	chatView()->setDialog(this);
--	chatEdit()->setDialog(this);
-+	chatView()->setSessionData(false, jid().full(), jid().full()); //FIXME fix nick updating
-+#ifdef WEBKIT
-+	chatView()->setAccount(account());
-+#endif
-+	chatView()->init();
- 
--	chatEdit()->installEventFilter(this);
--	connect(chatView(), SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
-+	// seems its useless hack
-+	//connect(chatView(), SIGNAL(selectionChanged()), SLOT(logSelectionChanged())); //
- 
- 	// SyntaxHighlighters modify the QTextEdit in a QTimer::singleShot(0, ...) call
- 	// so we need to install our hooks after it fired for the first time
-@@ -200,12 +206,12 @@ void ChatDlg::setShortcuts()
- 
- void ChatDlg::scrollUp()
- {
--	chatView()->verticalScrollBar()->setValue(chatView()->verticalScrollBar()->value() - chatView()->verticalScrollBar()->pageStep() / 2);
-+	chatView()->scrollUp();
- }
- 
- void ChatDlg::scrollDown()
- {
--	chatView()->verticalScrollBar()->setValue(chatView()->verticalScrollBar()->value() + chatView()->verticalScrollBar()->pageStep() / 2);
-+	chatView()->scrollDown();
- }
- 
- void ChatDlg::closeEvent(QCloseEvent *e)
-@@ -303,12 +309,13 @@ void ChatDlg::logSelectionChanged()
- {
- #ifdef Q_WS_MAC
- 	// A hack to only give the message log focus when text is selected
--	if (chatView()->textCursor().hasSelection()) {
--		chatView()->setFocus();
--	}
--	else {
--		chatEdit()->setFocus();
--	}
-+// seems its already useless. at least copy works w/o this hack
-+//	if (chatView()->textCursor().hasSelection()) {
-+//		chatView()->setFocus();
-+//	}
-+//	else {
-+//		chatEdit()->setFocus();
-+//	}
- #endif
- }
- 
-@@ -450,18 +457,7 @@ void ChatDlg::updateContact(const Jid &j
- 			updatePGP();
- 
- 			if (fromPresence && statusChanged) {
--				QString msg = tr("%1 is %2").arg(TextUtil::escape(dispNick_)).arg(status2txt(status_));
--				if (!statusString_.isEmpty()) {
--					QString ss = TextUtil::linkify(TextUtil::plain2rich(statusString_));
--					if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) {
--						ss = TextUtil::emoticonify(ss);
--					}
--					if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool()) {
--						ss = TextUtil::legacyFormat(ss);
--					}
--					msg += QString(" [%1]").arg(ss);
--				}
--				appendSysMsg(msg);
-+				chatView()->dispatchMessage(MessageView::statusMessage(dispNick_, status_, statusString_));
- 			}
- 		}
- 
-@@ -670,6 +666,8 @@ void ChatDlg::doSend()
- 	if (isEncryptionEnabled()) {
- 		m.setWasEncrypted(true);
- 	}
-+	QString id = account()->client()->genUniqueId();
-+	m.setId(id); // we need id early for message manipulations in chatview
- 	m_ = m;
- 
- 	// Request events
-@@ -777,7 +775,7 @@ QString ChatDlg::whoNick(bool local) con
- 		result = dispNick_;
- 	}
- 
--	return TextUtil::escape(result);
-+	return result;
- }
- 
- void ChatDlg::appendMessage(const Message &m, bool local)
-@@ -792,17 +790,14 @@ void ChatDlg::appendMessage(const Messag
- 	encEnabled = lastWasEncrypted_;
- 
- 	if (encChanged) {
--		if (encEnabled) {
--			appendSysMsg(QString("<icon name=\"psi/cryptoYes\"> ") + tr("Encryption Enabled"));
--			if (!local) {
--				setPGPEnabled(true);
--			}
--		}
--		else {
--			appendSysMsg(QString("<icon name=\"psi/cryptoNo\"> ") + tr("Encryption Disabled"));
--			if (!local) {
--				setPGPEnabled(false);
--
-+		chatView()->dispatchMessage(MessageView::fromHtml(
-+				encEnabled? QString("<icon name=\"psi/cryptoYes\"> ") + tr("Encryption Enabled"):
-+							QString("<icon name=\"psi/cryptoNo\"> ") + tr("Encryption Disabled"),
-+				MessageView::System
-+		));
-+		if (!local) {
-+			setPGPEnabled(encEnabled);
-+			if (!encEnabled) {
- 				// enable warning
- 				warnSend_ = true;
- 				QTimer::singleShot(3000, this, SLOT(setWarnSendFalse()));
-@@ -810,21 +805,31 @@ void ChatDlg::appendMessage(const Messag
- 		}
- 	}
- 
--	QString txt = messageText(m);
--	QString subject = messageSubject(m);
--
--	ChatDlg::SpooledType spooledType = m.spooled() ?
--	                                   ChatDlg::Spooled_OfflineStorage :
--	                                   ChatDlg::Spooled_None;
--	if (isEmoteMessage(m))
--		appendEmoteMessage(spooledType, m.timeStamp(), local, txt, subject);
--	else
--		appendNormalMessage(spooledType, m.timeStamp(), local, txt, subject);
--
--	appendMessageFields(m);
-+	if (!m.subject().isEmpty()) {
-+		chatView()->dispatchMessage(MessageView::subjectMessage(m.subject()));
-+	}
- 
--	if (local) {
--		deferredScroll();
-+	MessageView mv(MessageView::Message);
-+	if (m.containsHTML() && PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !m.html().text().isEmpty()) {
-+		mv.setHtml(m.html().toString("span"));
-+	} else {
-+		mv.setPlainText(m.body());
-+	}
-+	mv.setMessageId(m.id());
-+	mv.setLocal(local);
-+	mv.setNick(whoNick(local));
-+	mv.setUserId(local?account()->jid().bare():jid().bare());
-+	mv.setDateTime(m.timeStamp());
-+	mv.setSpooled(m.spooled());
-+	chatView()->dispatchMessage(mv);
-+
-+	if (!m.urlList().isEmpty()) {
-+		UrlList urls = m.urlList();
-+		QMap<QString,QString> urlsMap;
-+		foreach (const Url &u, urls) {
-+			urlsMap.insert(u.url(), u.desc());
-+		}
-+		chatView()->dispatchMessage(MessageView::urlsMessage(urlsMap));
- 	}
- 
- 	// if we're not active, notify the user by changing the title
-@@ -855,16 +860,6 @@ void ChatDlg::appendMessage(const Messag
- 	}
- }
- 
--void ChatDlg::deferredScroll()
--{
--	QTimer::singleShot(250, this, SLOT(slotScroll()));
--}
--
--void ChatDlg::slotScroll()
--{
--	chatView()->scrollToBottom();
--}
--
- void ChatDlg::updateIsComposing(bool b)
- {
- 	setChatState(b ? XMPP::StateComposing : XMPP::StatePaused);
-@@ -1029,67 +1024,8 @@ void ChatDlg::nicksChanged()
- 	// this function is intended to be reimplemented in subclasses
- }
- 
--static const QString me_cmd = "/me ";
--
--bool ChatDlg::isEmoteMessage(const XMPP::Message& m)
--{
--	if (m.body().startsWith(me_cmd) || m.html().text().trimmed().startsWith(me_cmd))
--		return true;
--
--	return false;
--}
--
--QString ChatDlg::messageText(const XMPP::Message& m)
--{
--	bool emote = isEmoteMessage(m);
--	QString txt;
--
--	if (m.containsHTML() && PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !m.html().text().isEmpty()) {
--		txt = m.html().toString("span");
--
--		if (emote) {
--			int cmd = txt.indexOf(me_cmd);
--			txt = txt.remove(cmd, me_cmd.length());
--		}
--		// qWarning("html body:\n%s\n",qPrintable(txt));
--	}
--	else {
--		txt = m.body();
--
--		if (emote)
--			txt = txt.mid(me_cmd.length());
--
--		txt = TextUtil::plain2rich(txt);
--		txt = TextUtil::linkify(txt);
--		// qWarning("regular body:\n%s\n",qPrintable(txt));
--	}
--
--	if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
--		txt = TextUtil::emoticonify(txt);
--	if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool())
--		txt = TextUtil::legacyFormat(txt);
--
--	return txt;
--}
--
--QString ChatDlg::messageSubject(const XMPP::Message& m)
--{
--	QString txt = m.subject();
--
--	if (!txt.isEmpty()) {
--		txt = TextUtil::plain2rich(txt);
--		txt = TextUtil::linkify(txt);
--		if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
--			txt = TextUtil::emoticonify(txt);
--		if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool())
--			txt = TextUtil::legacyFormat(txt);
--	}
--	return txt;
--}
--
- void ChatDlg::chatEditCreated()
- {
--	chatView()->setDialog(this);
- 	chatEdit()->setDialog(this);
- 
- 	if (highlightersInstalled_) {
---- psi.orig/src/chatdlg.h
-+++ psi/src/chatdlg.h
-@@ -124,7 +124,6 @@ private slots:
- 	virtual void updatePGP();
- 	virtual void setPGPEnabled(bool enabled);
- 	void encryptedMessageSent(int, bool, int, const QString &);
--	void slotScroll();
- 	void setChatState(XMPP::ChatState s);
- 	void updateIsComposing(bool);
- 	void setContactChatState(ChatState s);
-@@ -145,28 +144,15 @@ protected:
- 	void doneSend();
- 	virtual void setLooks();
- 	void setSelfDestruct(int);
--	void deferredScroll();
--	bool isEmoteMessage(const XMPP::Message& m);
--	QString messageText(const XMPP::Message& m);
--	QString messageSubject(const XMPP::Message& m);
- 	virtual void chatEditCreated();
- 
--	enum SpooledType {
--		Spooled_None,
--		Spooled_OfflineStorage
--	};
--
- 	virtual void initUi() = 0;
- 	virtual void capsChanged();
- 	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
--	virtual QString colorString(bool local, SpooledType spooled) const = 0;
- 
- 	void appendMessage(const Message &, bool local = false);
- 	virtual bool isEncryptionEnabled() const;
- 	virtual void appendSysMsg(const QString& txt) = 0;
--	virtual void appendEmoteMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject) = 0;
--	virtual void appendNormalMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject) = 0;
--	virtual void appendMessageFields(const Message& m) = 0;
- 	virtual void nicksChanged();
- 
- 	QString whoNick(bool local) const;
---- psi.orig/src/chatdlg.ui
-+++ psi/src/chatdlg.ui
-@@ -203,9 +203,6 @@
-          <property name="focusPolicy" >
-           <enum>Qt::NoFocus</enum>
-          </property>
--         <property name="readOnly" >
--          <bool>true</bool>
--         </property>
-         </widget>
-        </item>
-       </layout>
-@@ -313,8 +310,8 @@
-  <customwidgets>
-   <customwidget>
-    <class>ChatView</class>
--   <extends>QTextEdit</extends>
--   <header>msgmle.h</header>
-+   <extends>QFrame</extends>
-+   <header>chatview.h</header>
-   </customwidget>
-   <customwidget>
-    <class>ChatSplitter</class>
---- psi.orig/src/chatviewcommon.cpp
-+++ psi/src/chatviewcommon.cpp
-@@ -0,0 +1,71 @@
-+/*
-+ * chatviewcommon.cpp - shared part of any chatview
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QWidget>
-+
-+#include "chatviewcommon.h"
-+#include "psioptions.h"
-+
-+void ChatViewCommon::setLooks(QWidget *w)
-+{
-+	QPalette pal = w->palette(); // copy widget's palette to non const QPalette
-+	pal.setColor(QPalette::Inactive, QPalette::HighlightedText,
-+				 pal.color(QPalette::Active, QPalette::HighlightedText));
-+	pal.setColor(QPalette::Inactive, QPalette::Highlight,
-+				 pal.color(QPalette::Active, QPalette::Highlight));
-+	w->setPalette(pal);        // set the widget's palette
-+}
-+
-+bool ChatViewCommon::updateLastMsgTime(QDateTime t)
-+{
-+	bool doInsert = t.date() != _lastMsgTime.date();
-+	_lastMsgTime = t;
-+	return doInsert;
-+}
-+
-+QString ChatViewCommon::getMucNickColor(const QString &nick, bool isSelf, QStringList validList)
-+{
-+	int sender;
-+	if(isSelf || nick.isEmpty()) {
-+		sender = -1;
-+	} else {
-+		if (!_nicks.contains(nick)) {
-+			//not found in map
-+			_nicks.insert(nick,_nickNumber);
-+			_nickNumber++;
-+		}
-+		sender=_nicks[nick];
-+	}
-+
-+	QStringList nickColors = validList.isEmpty()
-+		? PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList()
-+		: validList;
-+
-+	if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || nickColors.empty()) {
-+		return "#000000";
-+	}
-+	else if(sender == -1 || nickColors.size() == 1) {
-+		return nickColors[nickColors.size()-1];
-+	}
-+	else {
-+		int n = sender % (nickColors.size()-1);
-+		return nickColors[n];
-+	}
-+}
---- psi.orig/src/chatviewcommon.h
-+++ psi/src/chatviewcommon.h
-@@ -0,0 +1,47 @@
-+/*
-+ * chatviewcommon.h - shared part of any chatview
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef CHATVIEWBASE_H
-+#define CHATVIEWBASE_H
-+
-+#include <QDateTime>
-+#include <QMap>
-+#include <QStringList>
-+
-+class QWidget;
-+
-+class ChatViewCommon
-+{
-+public:
-+	ChatViewCommon() : _nickNumber(0) { }
-+	void setLooks(QWidget *);
-+	bool updateLastMsgTime(QDateTime t);
-+	QString getMucNickColor(const QString &, bool,
-+							QStringList validList = QStringList());
-+
-+protected:
-+	QDateTime _lastMsgTime;
-+
-+private:
-+	int _nickNumber;
-+	QMap<QString,int> _nicks;
-+};
-+
-+#endif
---- psi.orig/src/chatview.h
-+++ psi/src/chatview.h
-@@ -0,0 +1,5 @@
-+#ifdef WEBKIT
-+#include "chatview_webkit.h"
-+#else
-+#include "chatview_te.h"
-+#endif
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -0,0 +1,383 @@
-+/*
-+ * chatview_te.cpp - subclass of PsiTextView to handle various hotkeys
-+ * Copyright (C) 2001-2010  Justin Karneges, Michail Pishchagin, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "chatview_te.h"
-+
-+#include "msgmle.h"
-+#include "messageview.h"
-+#include "psioptions.h"
-+#include "coloropt.h"
-+#include "textutil.h"
-+#include "psirichtext.h"
-+#include "common.h"
-+
-+#include <QWidget>
-+#include <QTextOption>
-+#include <QScrollBar>
-+#include <QTimer>
-+#include <QKeyEvent>
-+
-+static const char *infomrationalColorOpt = "options.ui.look.colors.messages.informational";
-+
-+//----------------------------------------------------------------------------
-+// ChatView
-+//----------------------------------------------------------------------------
-+ChatView::ChatView(QWidget *parent)
-+	: PsiTextView(parent)
-+	, isMuc_(false)
-+	, oldTrackBarPosition(0)
-+	, dialog_(0)
-+{
-+	setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
-+
-+	setReadOnly(true);
-+	setUndoRedoEnabled(false);
-+	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-+	setLooks(this);
-+
-+#ifndef Q_WS_X11	// linux has this feature built-in
-+	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
-+	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
-+#endif
-+}
-+
-+ChatView::~ChatView()
-+{
-+
-+}
-+
-+// something after we know isMuc and dialog is set
-+void ChatView::init()
-+{
-+
-+}
-+
-+QSize ChatView::sizeHint() const
-+{
-+	return minimumSizeHint();
-+}
-+
-+void ChatView::setDialog(QWidget* dialog)
-+{
-+	dialog_ = dialog;
-+}
-+
-+void ChatView::setSessionData(bool isMuc, const QString &jid, const QString name)
-+{
-+	isMuc_ = isMuc;
-+	jid_ = jid;
-+	name_ = name;
-+}
-+
-+bool ChatView::focusNextPrevChild(bool next)
-+{
-+	return QWidget::focusNextPrevChild(next);
-+}
-+
-+void ChatView::keyPressEvent(QKeyEvent *e)
-+{
-+/*	if(e->key() == Qt::Key_Escape)
-+		e->ignore();
-+#ifdef Q_WS_MAC
-+	else if(e->key() == Qt::Key_W && e->modifiers() & Qt::ControlModifier)
-+		e->ignore();
-+	else
-+#endif
-+	else if(e->key() == Qt::Key_Return && ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier)) )
-+		e->ignore();
-+	else if(e->key() == Qt::Key_H && (e->modifiers() & Qt::ControlModifier))
-+		e->ignore();
-+	else if(e->key() == Qt::Key_I && (e->modifiers() & Qt::ControlModifier))
-+		e->ignore(); */
-+	/*else*/ if(e->key() == Qt::Key_M && (e->modifiers() & Qt::ControlModifier) && !isReadOnly()) // newline
-+		append("\n");
-+/*	else if(e->key() == Qt::Key_U && (e->modifiers() & Qt::ControlModifier) && !isReadOnly())
-+		setText(""); */
-+	else if ((e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier))) {
-+		e->ignore();
-+	}
-+	else {
-+		PsiTextView::keyPressEvent(e);
-+	}
-+}
-+
-+/**
-+ * Copies any selected text to the clipboard
-+ * if autoCopy is enabled and ChatView is in read-only mode.
-+ */
-+void ChatView::autoCopy()
-+{
-+	if (isReadOnly() && PsiOptions::instance()->getOption("options.ui.automatically-copy-selected-text").toBool()) {
-+		copy();
-+	}
-+}
-+
-+/**
-+ * Handle KeyPress events that happen in ChatEdit widget. This is used
-+ * to 'fix' the copy shortcut.
-+ * \param object object that should receive the event
-+ * \param event received event
-+ * \param chatEdit pointer to the dialog's ChatEdit widget that receives user input
-+ */
-+bool ChatView::handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit)
-+{
-+	if (object == chatEdit && event->type() == QEvent::ShortcutOverride &&
-+		((QKeyEvent*)event)->matches(QKeySequence::Copy)) {
-+
-+		if (!chatEdit->textCursor().hasSelection() &&
-+			this->textCursor().hasSelection()) {
-+			this->copy();
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+QString ChatView::formatTimeStamp(const QDateTime &time)
-+{
-+	// TODO: provide an option for user to customize
-+	// time stamp format
-+	return QString().sprintf("%02d:%02d:%02d", time.time().hour(), time.time().minute(), time.time().second());;
-+}
-+
-+QString ChatView::colorString(bool local, bool spooled) const
-+{
-+	if (spooled) {
-+		return ColorOpt::instance()->color(infomrationalColorOpt).name();
-+	}
-+
-+	if (local) {
-+		return ColorOpt::instance()->color("options.ui.look.colors.messages.sent").name();
-+	}
-+
-+	return ColorOpt::instance()->color("options.ui.look.colors.messages.received").name();
-+}
-+
-+void ChatView::appendText(const QString &text)
-+{
-+	bool doScrollToBottom = atBottom();
-+
-+	// prevent scrolling back to selected text when
-+	// restoring selection
-+	int scrollbarValue = verticalScrollBar()->value();
-+
-+	PsiTextView::appendText(text);
-+
-+	if (doScrollToBottom)
-+		scrollToBottom();
-+	else
-+		verticalScrollBar()->setValue(scrollbarValue);
-+}
-+
-+void ChatView::dispatchMessage(const MessageView &mv)
-+{
-+	if ((mv.type() == MessageView::Message || mv.type() == MessageView::Subject)
-+			&& ChatViewCommon::updateLastMsgTime(mv.dateTime()))
-+	{
-+		QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
-+		appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(mv.dateTime().date().toString(Qt::ISODate)));
-+	}
-+	switch (mv.type()) {
-+		case MessageView::Message:
-+			if (isMuc_) {
-+				renderMucMessage(mv);
-+			} else {
-+				renderMessage(mv);
-+			}
-+			break;
-+		case MessageView::Subject:
-+			if (isMuc_) {
-+				renderMucSubject(mv);
-+			} else {
-+				renderSubject(mv);
-+			}
-+			break;
-+		case MessageView::Urls:
-+			renderUrls(mv);
-+			break;
-+		default: // System/Status
-+			renderSysMessage(mv);
-+	}
-+}
-+
-+void ChatView::renderMucMessage(const MessageView &mv)
-+{
-+	const QString timestr = formatTimeStamp(mv.dateTime());
-+	QString alerttagso, alerttagsc, nickcolor;
-+	QString textcolor = palette().color(QPalette::Active, QPalette::Text).name();
-+	if(mv.isAlert()) {
-+		textcolor = "#FF0000";
-+		alerttagso = "<b>";
-+		alerttagsc = "</b>";
-+	}
-+
-+	if(mv.isSpooled()) {
-+		nickcolor = ColorOpt::instance()->color(infomrationalColorOpt).name();
-+	} else {
-+		nickcolor = getMucNickColor(mv.nick(), mv.isLocal());
-+	}
-+
-+	if(mv.isEmote()) {
-+		appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+	}
-+	else {
-+		if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
-+			appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(mv.nick())) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+		}
-+		else {
-+			appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
-+		}
-+	}
-+
-+	if(mv.isLocal()) {
-+		scrollToBottom();
-+	}
-+}
-+
-+void ChatView::renderMessage(const MessageView &mv)
-+{
-+	QString timestr = formatTimeStamp(mv.dateTime());
-+	QString color = colorString(mv.isLocal(), mv.isSpooled());
-+	if (mv.isEmote()) {
-+		appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
-+	} else {
-+		if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
-+			appendText(QString("<p style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</p>" + mv.formattedText());
-+		}
-+		else {
-+			appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ") + mv.formattedText());
-+		}
-+	}
-+
-+	if (mv.isLocal()) {
-+		deferredScroll();
-+	}
-+}
-+
-+void ChatView::renderSysMessage(const MessageView &mv)
-+{
-+	QString timestr = formatTimeStamp(mv.dateTime());
-+	QString ut = mv.formattedUserText();
-+	QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
-+	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
-+	appendText(QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
-+						(ut.isEmpty()?"":":") + "</font>" +
-+						(ut.isEmpty()?"":QString(" <span style=\"color:%1;\">%2</span>").arg(userTextColor, ut)));
-+}
-+
-+void ChatView::renderSubject(const MessageView &mv)
-+{
-+	appendText(QString("<b>") + tr("Subject:") + "</b> " + QString("%1").arg(mv.formattedUserText()));
-+}
-+
-+void ChatView::renderMucSubject(const MessageView &mv)
-+{
-+	QString timestr = formatTimeStamp(mv.dateTime());
-+	QString ut = mv.formattedUserText();
-+	QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
-+	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
-+	appendText(QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
-+						(ut.isEmpty()?"":":<br>") + "</font>" +
-+						(ut.isEmpty()?"":QString(" <span style=\"color:%1;font-weight:bold\">%2</span>").arg(userTextColor, ut)));
-+}
-+
-+void ChatView::renderUrls(const MessageView &mv)
-+{
-+	QMap<QString, QString> urls = mv.urls();
-+	foreach (const QString &key, urls.keys()) {
-+		appendText(QString("<b>") + tr("URL:") + "</b> " + QString("%1").arg(TextUtil::linkify(TextUtil::escape(key))));
-+		if (!urls.value(key).isEmpty()) {
-+			appendText(QString("<b>") + tr("Desc:") + "</b> " + QString("%1").arg(urls.value(key)));
-+		}
-+	}
-+}
-+
-+void ChatView::slotScroll() {
-+	scrollToBottom();
-+}
-+
-+void ChatView::deferredScroll()
-+{
-+	QTimer::singleShot(250, this, SLOT(slotScroll()));
-+}
-+
-+void ChatView::scrollUp()
-+{
-+	verticalScrollBar()->setValue(verticalScrollBar()->value() - verticalScrollBar()->pageStep() / 2);
-+}
-+
-+void ChatView::scrollDown()
-+{
-+	verticalScrollBar()->setValue(verticalScrollBar()->value() + verticalScrollBar()->pageStep() / 2);
-+}
-+
-+void ChatView::doTrackBar()
-+{
-+	// save position, because our manipulations could change it
-+	int scrollbarValue = verticalScrollBar()->value();
-+
-+	QTextCursor cursor = textCursor();
-+	cursor.beginEditBlock();
-+	PsiRichText::Selection selection = PsiRichText::saveSelection(this, cursor);
-+
-+	//removeTrackBar(cursor);
-+	if (oldTrackBarPosition) {
-+		cursor.setPosition(oldTrackBarPosition, QTextCursor::KeepAnchor);
-+		QTextBlockFormat blockFormat = cursor.blockFormat();
-+		blockFormat.clearProperty(QTextFormat::BlockTrailingHorizontalRulerWidth);
-+		cursor.clearSelection();
-+		cursor.setBlockFormat(blockFormat);
-+	}
-+
-+	//addTrackBar(cursor);
-+	cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
-+	oldTrackBarPosition = cursor.position();
-+	QTextBlockFormat blockFormat = cursor.blockFormat();
-+	blockFormat.setProperty(QTextFormat::BlockTrailingHorizontalRulerWidth, QVariant(true));
-+	cursor.clearSelection();
-+	cursor.setBlockFormat(blockFormat);
-+
-+	PsiRichText::restoreSelection(this, cursor, selection);
-+	cursor.endEditBlock();
-+	setTextCursor(cursor);
-+
-+	verticalScrollBar()->setValue(scrollbarValue);
-+}
-+
-+bool ChatView::internalFind(QString str, bool startFromBeginning)
-+{
-+	if (startFromBeginning) {
-+		QTextCursor cursor = textCursor();
-+		cursor.movePosition(QTextCursor::Start, QTextCursor::KeepAnchor);
-+		cursor.clearSelection();
-+		setTextCursor(cursor);
-+	}
-+
-+	bool found = find(str);
-+	if(!found) {
-+		if (!startFromBeginning)
-+			return internalFind(str, true);
-+
-+		return false;
-+	}
-+
-+	return true;
-+}
---- psi.orig/src/chatview_te.h
-+++ psi/src/chatview_te.h
-@@ -0,0 +1,88 @@
-+/*
-+ * chatview_te.h - subclass of PsiTextView to handle various hotkeys
-+ * Copyright (C) 2001-2010  Justin Karneges, Michail Pishchagin, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef CHATVIEW_TE_H
-+#define CHATVIEW_TE_H
-+
-+#include <QWidget>
-+#include <QDateTime>
-+#include <QPointer>
-+
-+#include "psitextview.h"
-+#include "chatviewcommon.h"
-+
-+class ChatEdit;
-+class ChatViewBase;
-+class MessageView;
-+
-+class ChatView : public PsiTextView, public ChatViewCommon
-+{
-+	Q_OBJECT
-+public:
-+	ChatView(QWidget* parent);
-+	~ChatView();
-+
-+	// reimplemented
-+	QSize sizeHint() const;
-+
-+	void init();
-+	void setDialog(QWidget* dialog);
-+	void setSessionData(bool isMuc, const QString &jid, const QString name);
-+
-+	void appendText(const QString &text);
-+	void dispatchMessage(const MessageView &);
-+	bool handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit);
-+
-+	void deferredScroll();
-+	void scrollUp();
-+	void scrollDown();
-+	void doTrackBar();
-+	bool internalFind(QString str, bool startFromBeginning = false);
-+
-+protected:
-+	// override the tab/esc behavior
-+	bool focusNextPrevChild(bool next);
-+	void keyPressEvent(QKeyEvent *);
-+
-+	QString formatTimeStamp(const QDateTime &time);
-+	QString colorString(bool local, bool spooled) const;
-+
-+	void renderMucMessage(const MessageView &);
-+	void renderMessage(const MessageView &);
-+	void renderSysMessage(const MessageView &);
-+	void renderSubject(const MessageView &);
-+	void renderMucSubject(const MessageView &);
-+	void renderUrls(const MessageView &);
-+
-+protected slots:
-+	void autoCopy();
-+
-+private slots:
-+	void slotScroll();
-+
-+private:
-+	bool isMuc_;
-+	QString jid_;
-+	QString name_;
-+	int  oldTrackBarPosition;
-+	QPointer<QWidget> dialog_;
-+};
-+
-+#endif
---- psi.orig/src/chatviewtheme.cpp
-+++ psi/src/chatviewtheme.cpp
-@@ -0,0 +1,277 @@
-+/*
-+ * chatviewtheme.cpp - theme for webkit based chatview
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "chatviewtheme.h"
-+#include "psioptions.h"
-+#include "coloropt.h"
-+#include "jsutil.h"
-+#include "psiwkavatarhandler.h"
-+#include "webview.h"
-+#include <QWebPage>
-+#include <QWebFrame>
-+#include <QFileInfo>
-+#include <QApplication>
-+
-+
-+class ChatViewTheme;
-+class ChatViewTheme::Private
-+{
-+public:
-+	QString html;
-+	QString jsNamespace;
-+	QString adapterPath;
-+	QStringList scripts;
-+	QPointer<QObject> jso;
-+	QPointer<WebView> wv;
-+};
-+
-+class ChatViewThemeJS : public QObject {
-+	Q_OBJECT
-+private:
-+	ChatViewTheme *theme;
-+	QMap<QString,QVariant> cache_;
-+public:
-+	ChatViewThemeJS(ChatViewTheme *theme_)
-+		: theme(theme_)
-+	{
-+	}
-+
-+public slots:
-+	void setMetaData(const QVariantMap &map)
-+	{
-+		if (map["name"].isValid()) {
-+			theme->setName(map["name"].toString());
-+		}
-+	}
-+
-+	QString psiOption(const QString &option) const
-+	{
-+		return JSUtil::variant2js(PsiOptions::instance()->getOption(option));
-+	}
-+
-+	QString colorOption(const QString &option) const
-+	{
-+		return JSUtil::variant2js(ColorOpt::instance()->color(option));
-+	}
-+
-+	QString getFileContents(const QString &name) const
-+	{
-+		return QString(Theme::loadData(name, theme->fileName()));
-+	}
-+
-+	QString getFileContentsFromAdapterDir(const QString &name) const
-+	{
-+		QFile file(theme->d->adapterPath + "/" + name);
-+		if (file.open(QIODevice::ReadOnly)) {
-+			QByteArray result = file.readAll();
-+			file.close();
-+			return QString::fromUtf8(result.constData(), result.size());
-+		} else {
-+			qDebug("Failed to open file %s: %s", qPrintable(file.fileName()),
-+				   qPrintable(file.errorString()));
-+		}
-+		return QString();
-+	}
-+
-+	void setHtml(const QString &h)
-+	{
-+		theme->d->html = h;
-+	}
-+
-+	QString formatDate(const QDateTime &dt, const QString &format) const
-+	{
-+		return dt.toLocalTime().toString(format);
-+	}
-+
-+	QString getPaletteColor(const QString &name) const
-+	{
-+		QPalette::ColorRole cr = QPalette::NoRole;
-+
-+		if (name == "WindowText") {
-+			cr = QPalette::WindowText;
-+		} else if (name == "Text") {
-+			cr = QPalette::Text;
-+		} else if (name == "Base") {
-+			cr = QPalette::Base;
-+		} else if (name == "Window") {
-+			cr = QPalette::Window;
-+		} else if (name == "Highlight") {
-+			cr = QPalette::Highlight;
-+		} else if (name == "HighlightedText") {
-+			cr = QPalette::HighlightedText;
-+		} else if (name.endsWith("Text")) {
-+			cr = QPalette::Text;
-+		} else {
-+			cr = QPalette::Base;
-+		}
-+
-+		return QApplication::palette().color(cr).name();
-+	}
-+
-+	void console(const QString &text) const
-+	{
-+		qDebug("%s", qPrintable(text));
-+	}
-+
-+	// we don't need not text cache since binary data(images?)
-+	// most likely will be cached by webkit itself
-+	void toCache(const QString &name, const QVariant &data)
-+	{
-+		cache_.insert(name, data);
-+	}
-+
-+	QVariant cache(const QString &name) const
-+	{
-+		return cache_.value(name);
-+	}
-+
-+	void setDefaultAvatar(const QString &filename, const QString &host = QString())
-+	{
-+		QByteArray ba = Theme::loadData(filename, theme->fileName());
-+		if (!ba.isEmpty()) {
-+			((PsiWKAvatarHandler *)NetworkAccessManager::instance()
-+				->schemeHandler("avatar").data())->setDefaultAvatar(ba, host);
-+		}
-+	}
-+
-+	void setAvatarSize(int width, int height)
-+	{
-+		((PsiWKAvatarHandler *)NetworkAccessManager::instance()
-+				->schemeHandler("avatar").data())->setAvatarSize(QSize(width,
-+																	   height));
-+	}
-+
-+	void setJSNamespace(const QString &ns)
-+	{
-+		theme->d->jsNamespace = ns;
-+	}
-+
-+	const QString jsNamespace() const
-+	{
-+		return theme->d->jsNamespace;
-+	}
-+
-+	const QString themeId() const
-+	{
-+		return theme->id();
-+	}
-+
-+	QString status2text(int status) const
-+	{
-+		return ::status2txt(status);
-+	}
-+
-+	QString hex2rgba(const QString &hex, float opacity)
-+	{
-+		QColor color("#" + hex);
-+		color.setAlphaF(opacity);
-+		return QString("rgba(%1,%2,%3,%4)").arg(color.red()).arg(color.green())
-+				.arg(color.blue()).arg(color.alpha());
-+	}
-+};
-+
-+
-+//------------------------------------------------------------------------------
-+// ChatViewTheme
-+//------------------------------------------------------------------------------
-+ChatViewTheme::ChatViewTheme(const QString &id) :
-+	Theme(id)
-+{
-+	d = new Private;
-+	d->jsNamespace = "chat";
-+}
-+
-+ChatViewTheme::~ChatViewTheme()
-+{
-+	if (!d->jso.isNull())
-+		delete d->jso;
-+	if (!d->wv.isNull())
-+		delete d->wv;
-+	delete d;
-+}
-+
-+bool ChatViewTheme::load(const QString &file, const QStringList &helperScripts,
-+						 const QString &adapterPath)
-+{
-+	if (d->jso.isNull())
-+		d->jso = new ChatViewThemeJS(this);
-+	if (d->wv.isNull()) {
-+		d->wv = new WebView(0);
-+		d->wv->setHtml("", baseUrl());
-+	}
-+	d->adapterPath = adapterPath;
-+	setFileName(file);
-+	d->scripts = helperScripts;
-+
-+	d->wv->page()->mainFrame()->addToJavaScriptWindowObject("chatServer", d->jso,
-+												QScriptEngine::QtOwnership);
-+	foreach (const QString &script, d->scripts) {
-+		QVariant result = d->wv->page()->mainFrame()->evaluateJavaScript(script);
-+		if (result != "ok") {
-+			qDebug("failed to eval helper script: %s...", qPrintable(script.mid(0, 50)));
-+			return false;
-+		}
-+	}
-+	QString resStr = d->wv->page()->mainFrame()->evaluateJavaScript(
-+				"try { window[chatServer.jsNamespace()].adapter.loadTheme() } "
-+				"catch(e) { window[chatServer.jsNamespace()].util.props(e); }").toString();
-+
-+	if (resStr == "ok") {
-+		return true;
-+	}
-+	qWarning("javascript part of the theme loader "
-+			 "didn't return expected result: %s", qPrintable(resStr));
-+	return false;
-+}
-+
-+QByteArray ChatViewTheme::screenshot()
-+{
-+	return Theme::loadData("screenshot.png", fileName());
-+}
-+
-+QObject * ChatViewTheme::jsHelper()
-+{
-+	return d->jso;
-+}
-+
-+QStringList ChatViewTheme::scripts()
-+{
-+	return d->scripts;
-+}
-+
-+QString ChatViewTheme::html(QObject *session)
-+{
-+	if (d->html.isEmpty()) {
-+		if (session) {
-+			d->wv->page()->mainFrame()->addToJavaScriptWindowObject("chatSession", session);
-+		}
-+		return d->wv->page()->mainFrame()->evaluateJavaScript(
-+					"try { "+d->jsNamespace+".adapter.getHtml(); } catch(e) { e.toString() + ' line:' +e.line; }").toString();
-+	}
-+	return d->html;
-+}
-+
-+QString ChatViewTheme::jsNamespace()
-+{
-+	return d->jsNamespace;
-+}
-+
-+
-+#include "chatviewtheme.moc"
---- psi.orig/src/chatviewtheme.h
-+++ psi/src/chatviewtheme.h
-@@ -0,0 +1,54 @@
-+/*
-+ * chatviewtheme.h - theme for webkit based chatview
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef CHATVIEWTHEME_H
-+#define CHATVIEWTHEME_H
-+
-+#include <QPointer>
-+
-+#include "theme.h"
-+#include "webview.h"
-+
-+class ChatViewThemeJS;
-+
-+class ChatViewTheme : public Theme
-+{
-+	friend class ChatViewThemeJS;
-+public:
-+	ChatViewTheme(const QString &id);
-+	~ChatViewTheme();
-+
-+	QByteArray screenshot();
-+
-+	bool load( const QString &file, const QStringList &helperScripts,
-+			   const QString &adapterPath );
-+
-+	QObject * jsHelper();
-+	QStringList scripts();
-+	QString html(QObject *session = 0);
-+	QString jsNamespace();
-+	inline QUrl baseUrl() const { return QUrl("theme://messages/" + id() + "/"); }
-+
-+private:
-+	class Private;
-+	Private *d;
-+};
-+
-+#endif
---- psi.orig/src/chatviewthemeprovider.cpp
-+++ psi/src/chatviewthemeprovider.cpp
-@@ -0,0 +1,200 @@
-+/*
-+ * chatviewthemeprovider.h - adapter for set of chatview themes
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+
-+#include "chatviewthemeprovider.h"
-+
-+#include <QFile>
-+#include <QFileInfo>
-+#include <QDir>
-+
-+#include "chatviewtheme.h"
-+#include "psioptions.h"
-+#include "theme.h"
-+#include "applicationinfo.h"
-+#include "psiwkavatarhandler.h"
-+#include "psithememanager.h"
-+
-+static bool singleInited = false;
-+static QMap<QString, QString> chatViewScripts;
-+static QMap<QString, QString> chatViewAdapterDirs;
-+
-+class ChatViewThemeProvider;
-+
-+class ChatViewThemeUrlHandler : public NAMSchemeHandler
-+{
-+public:
-+	QByteArray data(const QUrl &url) const
-+	{
-+		qDebug("loading theme file: %s", qPrintable(url.toString()));
-+		QString themeId = url.path().section('/', 1, 2);
-+		Theme *theme;
-+		if (!(theme = PsiThemeManager::instance()->provider("chatview")->current())
-+				|| theme->id() != themeId) // slightly stupid detector of current provider
-+		{
-+			theme = PsiThemeManager::instance()->provider("groupchatview")->current();
-+			if (theme->id() != themeId) {
-+				theme = NULL;
-+			}
-+		}
-+		if (theme) {
-+			QByteArray td = Theme::loadData(url.path().mid(themeId.size() + 1),
-+											theme->fileName());
-+			if (td.isNull()) {
-+				qDebug("content of %s is not found in the theme",
-+					   qPrintable(url.toString()));
-+			}
-+			return td;
-+		}
-+		qDebug("theme with id %s is not loaded. failed to load url %s",
-+			   qPrintable(themeId), qPrintable(url.toString()));
-+		return QByteArray();
-+	}
-+
-+};
-+
-+static void singleInit(PsiCon *pc)
-+{
-+	if (!singleInited) {
-+		NetworkAccessManager::instance()->setSchemeHandler(
-+				"avatar", new PsiWKAvatarHandler(pc));
-+		NetworkAccessManager::instance()->setSchemeHandler(
-+				"theme", new ChatViewThemeUrlHandler());
-+		singleInited = true;
-+	}
-+}
-+
-+
-+
-+//--------------------------------------
-+// ChatViewThemeProvider
-+//--------------------------------------
-+ChatViewThemeProvider::ChatViewThemeProvider(QObject *parent_)
-+	: PsiThemeProvider(parent_)
-+	, curTheme(0)
-+{
-+	singleInit((PsiCon*)parent());
-+}
-+
-+const QStringList ChatViewThemeProvider::themeIds() const
-+{
-+	QStringList dirs;
-+	dirs << ":";
-+	dirs << ".";
-+	dirs << ApplicationInfo::homeDir(ApplicationInfo::DataLocation);
-+	dirs << ApplicationInfo::resourcesDir();
-+
-+	QSet<QString> ret;
-+	foreach (QString dir, dirs) {
-+		foreach (QFileInfo tDirInfo, QDir(dir+"/themes/chatview/")
-+			.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot)) {
-+			QString typeName = tDirInfo.fileName();
-+			foreach (QFileInfo themeInfo,
-+					QDir(tDirInfo.absoluteFilePath())
-+						.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot) +
-+					QDir(tDirInfo.absoluteFilePath())
-+						.entryInfoList(QStringList("*.theme"), QDir::Files)) {
-+				ret<<(QString("%1/%2").arg(typeName).arg(themeInfo.fileName()));
-+				//qDebug("found theme: %s", qPrintable(QString("%1/%2").arg(typeName).arg(themeInfo.fileName())));
-+			}
-+		}
-+	}
-+
-+	return ret.values();
-+}
-+
-+Theme * ChatViewThemeProvider::load(const QString &themeId)
-+{
-+	QString up;
-+	if (chatViewScripts.value("util").isEmpty()) {
-+		if (!(up = themePath("chatview/util.js")).isEmpty()) {
-+			QFile file(up);
-+			if (file.open(QIODevice::ReadOnly)) {
-+				chatViewScripts["util"] = file.readAll();
-+			}
-+		}
-+	}
-+	if (!chatViewScripts.value("util").isEmpty()) {
-+		int pos;
-+		if ((pos = themeId.indexOf('/')) > 0) {
-+			QString tp = themePath("chatview/" + themeId);
-+			QString typeName = themeId.mid(0, pos);
-+			if (!tp.isEmpty()) { // theme exists
-+				QString ap, ad;
-+				if (chatViewScripts.value(typeName).isEmpty() &&
-+					!(ap = themePath("chatview/" + typeName + "/adapter.js")).isEmpty()) {
-+					QFile afile(ap);
-+					if (afile.open(QIODevice::ReadOnly)) {
-+						chatViewScripts[typeName] = afile.readAll();
-+						ad = QFileInfo(afile).dir().absolutePath();
-+						chatViewAdapterDirs.insert(typeName, ad);
-+					}
-+				} else {
-+					ad = chatViewAdapterDirs.value(typeName);
-+				}
-+				if (!ad.isEmpty() && !chatViewScripts.value(typeName).isEmpty()) {
-+					ChatViewTheme *theme = new ChatViewTheme(themeId);
-+					if (theme->load(tp, QStringList()<<chatViewScripts["util"]
-+									<<chatViewScripts[typeName], ad)) {
-+						return theme;
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return 0;
-+}
-+
-+bool ChatViewThemeProvider::loadCurrent()
-+{
-+	QString loadedId = curTheme? curTheme->id() : "";
-+	QString themeName = PsiOptions::instance()->getOption(optionString()).toString();
-+	if (!loadedId.isEmpty() && loadedId == themeName) {
-+		return true; // already loaded. nothing todo
-+	}
-+	ChatViewTheme *theme = 0;
-+	if (!(theme = (ChatViewTheme *)load(themeName))) {
-+		if (themeName != "psi/classic") {
-+			qDebug("fallback to classic chatview theme");
-+			if ( (theme = (ChatViewTheme *)load("psi/classic")) ) {
-+				PsiOptions::instance()->setOption(optionString(), "psi/classic");
-+			}
-+		}
-+	}
-+	if (theme) {
-+		if (curTheme) {
-+			delete curTheme;
-+		}
-+		curTheme = theme;
-+		if (theme->id() != loadedId) {
-+			emit themeChanged();
-+		}
-+		return true;
-+	}
-+	return false;
-+}
-+
-+void ChatViewThemeProvider::setCurrentTheme(const QString &id)
-+{
-+	PsiOptions::instance()->setOption(optionString(), id);
-+	if (!curTheme || curTheme->id() != id) {
-+		loadCurrent();
-+	}
-+}
---- psi.orig/src/chatviewthemeprovider.h
-+++ psi/src/chatviewthemeprovider.h
-@@ -0,0 +1,73 @@
-+/*
-+ * chatviewthemeprovider.h - adapter for set of chatview themes
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+
-+#ifndef CHATVIEWTHEMEPROVIDER_H
-+#define CHATVIEWTHEMEPROVIDER_H
-+
-+#include "psithemeprovider.h"
-+
-+class ChatViewTheme;
-+
-+class ChatViewThemeProvider : public PsiThemeProvider
-+{
-+	Q_OBJECT
-+
-+public:
-+	ChatViewThemeProvider(QObject *);
-+
-+	const char* type() const { return "chatview"; }
-+	const QStringList themeIds() const;
-+	Theme* load(const QString &themeId);
-+	bool loadCurrent();
-+	Theme *current() const { return (Theme*)curTheme; }
-+	void setCurrentTheme(const QString &);
-+	virtual int screenshotWidth() const { return 512; } // hack
-+
-+	QString optionsName() const { return tr("Chat Message Style"); }
-+	QString optionsDescription() const { return tr("Configure your chat theme here"); }
-+
-+protected:
-+	virtual const char* optionString() const { return "options.ui.chat.theme"; }
-+
-+signals:
-+	void themeChanged();
-+
-+private:
-+	ChatViewTheme *curTheme;
-+};
-+
-+class GroupChatViewThemeProvider : public ChatViewThemeProvider
-+{
-+	Q_OBJECT
-+
-+public:
-+	GroupChatViewThemeProvider(QObject *parent) :
-+		ChatViewThemeProvider(parent) {}
-+
-+	const char* type() const { return "groupchatview"; }
-+	QString optionsName() const { return tr("Groupchat Message Style"); }
-+	QString optionsDescription() const { return tr("Configure your groupchat theme here"); }
-+
-+protected:
-+	const char* optionString() const { return "options.ui.muc.theme"; }
-+};
-+
-+#endif // CHATVIEWTHEMEPROVIDER_H
---- psi.orig/src/chatview_webkit.cpp
-+++ psi/src/chatview_webkit.cpp
-@@ -0,0 +1,341 @@
-+/*
-+ * chatview_webkit.cpp - Webkit based chatview
-+ * Copyright (C) 2010  Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "chatview_webkit.h"
-+
-+#include "msgmle.h"
-+#include "psioptions.h"
-+#include "textutil.h"
-+
-+#include <QWidget>
-+#include <QWebFrame>
-+#include <QFile>
-+#include <QFileInfo>
-+#include <QLayout>
-+#include <QPalette>
-+
-+#include "webview.h"
-+//#include "psiapplication.h"
-+#include "psiaccount.h"
-+#include "applicationinfo.h"
-+#include "networkaccessmanager.h"
-+#include "jsutil.h"
-+#include "messageview.h"
-+#include "psithememanager.h"
-+#include "chatviewtheme.h"
-+
-+
-+
-+//----------------------------------------------------------------------------
-+// ChatViewJSObject
-+// object which will be embed to javascript part of view
-+//----------------------------------------------------------------------------
-+class ChatViewJSObject : public QObject
-+{
-+	Q_OBJECT
-+
-+	ChatView *_view;
-+
-+public:
-+	ChatViewJSObject(ChatView *view) :
-+		QObject(view),
-+		_view(view)
-+	{
-+
-+	}
-+
-+public slots:
-+	QString mucNickColor(QString nick, bool isSelf,
-+						 QStringList validList = QStringList()) const
-+	{
-+		return _view->getMucNickColor(nick, isSelf, validList);
-+	}
-+
-+	bool isMuc() const
-+	{
-+		return _view->isMuc_;
-+	}
-+
-+	QString chatName() const
-+	{
-+		return _view->name_;
-+	}
-+
-+	QString jid() const
-+	{
-+		return _view->jid_;
-+	}
-+
-+	QString account() const
-+	{
-+		return _view->account_->id();
-+	}
-+
-+	void signalInited()
-+	{
-+		emit inited();
-+	}
-+
-+	QString getFont() const
-+	{
-+		QFont f = ((ChatView*)parent())->font();
-+		QString weight = "normal";
-+		switch (f.weight()) {
-+			case QFont::Light: weight = "lighter"; break;
-+			case QFont::DemiBold: weight = "bold"; break;
-+			case QFont::Bold: weight = "bolder"; break;
-+			case QFont::Black: weight = "900"; break;
-+		}
-+		return QString("{fontFamily:'%1',fontSize:'%2pt',fontStyle:'%3',fontVariant:'%4',fontWeight:'%5'}")
-+						 .arg(f.family())
-+						 .arg(f.pointSize())
-+						 .arg(f.style()==QFont::StyleNormal?"normal":(f.style()==QFont::StyleItalic?"italic":"oblique"))
-+						 .arg(f.capitalization() == QFont::SmallCaps?"small-caps":"normal")
-+						 .arg(weight);
-+	}
-+
-+	void setTransparent()
-+	{
-+		QPalette palette = _view->webView->palette();
-+		palette.setBrush(QPalette::Base, Qt::transparent);
-+		_view->webView->page()->setPalette(palette);
-+		_view->webView->setAttribute(Qt::WA_OpaquePaintEvent, false);
-+
-+		palette = _view->palette();
-+		palette.setBrush(QPalette::Base, Qt::transparent);
-+		_view->setPalette(palette);
-+		_view->setAttribute(Qt::WA_TranslucentBackground, true);
-+	}
-+
-+signals:
-+	void inited();
-+};
-+
-+
-+//----------------------------------------------------------------------------
-+// ChatView
-+//----------------------------------------------------------------------------
-+ChatView::ChatView(QWidget *parent)
-+	: QFrame(parent)
-+	, sessionReady_(false)
-+	, dialog_(0)
-+	, isMuc_(false)
-+{
-+	jsObject = new ChatViewJSObject(this);
-+	webView = new WebView(this);
-+	webView->setFocusPolicy(Qt::NoFocus);
-+	webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-+
-+	QVBoxLayout *layout = new QVBoxLayout;
-+	layout->setContentsMargins(0,0,0,0);
-+	layout->addWidget(webView);
-+	setLayout(layout);
-+	setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-+	setLooks(webView);
-+
-+#ifndef Q_WS_X11	// linux has this feature built-in
-+	connect( PsiOptions::instance(), SIGNAL(optionChanged(QString)), SLOT(psiOptionChanged(QString)) ); //needed only for save autocopy state atm
-+	psiOptionChanged("options.ui.automatically-copy-selected-text"); // init autocopy connection
-+#endif
-+	connect(jsObject, SIGNAL(inited()), SLOT(sessionInited()));
-+	connect(webView->page()->mainFrame(),
-+			SIGNAL(javaScriptWindowObjectCleared()), SLOT(embedJsObject()));
-+}
-+
-+ChatView::~ChatView()
-+{
-+}
-+
-+ChatViewTheme* ChatView::currentTheme()
-+{
-+	return (ChatViewTheme *)PsiThemeManager::instance()->
-+			provider(isMuc_?"groupchatview":"chatview")->current();
-+}
-+
-+// something after we know isMuc and dialog is set
-+void ChatView::init()
-+{
-+	ChatViewTheme *theme = currentTheme();
-+	QString html = theme->html(jsObject);
-+	//qDebug() << "Set html:" << html;
-+	webView->page()->mainFrame()->setHtml(
-+		html, theme->baseUrl()
-+	);
-+}
-+
-+void ChatView::embedJsObject()
-+{
-+	ChatViewTheme *theme = currentTheme();
-+	QWebFrame *wf = webView->page()->mainFrame();
-+	wf->addToJavaScriptWindowObject("chatServer", theme->jsHelper());
-+	wf->addToJavaScriptWindowObject("chatSession", jsObject);
-+	foreach (const QString &script, theme->scripts()) {
-+		wf->evaluateJavaScript(script);
-+	}
-+}
-+
-+QSize ChatView::sizeHint() const
-+{
-+	return minimumSizeHint();
-+}
-+
-+void ChatView::setDialog(QWidget* dialog)
-+{
-+	dialog_ = dialog;
-+}
-+
-+void ChatView::setSessionData(bool isMuc, const QString &jid, const QString name)
-+{
-+	isMuc_ = isMuc;
-+	jid_ = jid;
-+	name_ = name;
-+	connect(PsiThemeManager::instance()->provider(isMuc_?"groupchatview":"chatview"),
-+			SIGNAL(themeChanged()),
-+			SLOT(init()));
-+}
-+
-+bool ChatView::focusNextPrevChild(bool next)
-+{
-+	return QWidget::focusNextPrevChild(next);
-+}
-+
-+void ChatView::changeEvent(QEvent * event)
-+{
-+	if ( event->type() == QEvent::ApplicationPaletteChange
-+		|| event->type() == QEvent::PaletteChange
-+		|| event->type() == QEvent::FontChange ) {
-+		QVariantMap m;
-+		m["type"] = "settings";
-+		sendJsObject(m);
-+	}
-+	QFrame::changeEvent(event);
-+}
-+
-+void ChatView::psiOptionChanged(const QString &option)
-+{
-+	if (option == "options.ui.automatically-copy-selected-text") {
-+		if (PsiOptions::instance()->
-+			getOption("options.ui.automatically-copy-selected-text").toBool()) {
-+			connect(webView->page(), SIGNAL(selectionChanged()), webView, SLOT(copySelected()));
-+		} else {
-+			disconnect(webView->page(), SIGNAL(selectionChanged()), webView, SLOT(copySelected()));
-+		}
-+	}
-+}
-+
-+void ChatView::sendJsObject(const QVariantMap &map)
-+{
-+	sendJsCommand(QString(currentTheme()->jsNamespace() + ".adapter.receiveObject(%1);")
-+				  .arg(JSUtil::map2json(map)));
-+}
-+
-+void ChatView::sendJsCommand(const QString &cmd)
-+{
-+	jsBuffer_.append(cmd);
-+	checkJsBuffer();
-+}
-+
-+void ChatView::checkJsBuffer()
-+{
-+	if (sessionReady_) {
-+		while (!jsBuffer_.isEmpty()) {
-+			webView->evaluateJS(jsBuffer_.takeFirst());
-+		}
-+	}
-+}
-+
-+void ChatView::sessionInited()
-+{
-+	sessionReady_ = true;
-+	checkJsBuffer();
-+}
-+
-+bool ChatView::handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit) {
-+	if (object == chatEdit && event->type() == QEvent::ShortcutOverride &&
-+		((QKeyEvent*)event)->matches(QKeySequence::Copy)) {
-+
-+		if (!chatEdit->textCursor().hasSelection() &&
-+			 !(webView->page()->selectedText().isEmpty()))
-+		{
-+			webView->copySelected();
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+// input point of all messages
-+void ChatView::dispatchMessage(const MessageView &mv)
-+{
-+	if ((mv.type() == MessageView::Message || mv.type() == MessageView::Subject)
-+			&& updateLastMsgTime(mv.dateTime()))
-+	{
-+		QVariantMap m;
-+		m["date"] = mv.dateTime();
-+		m["type"] = "message";
-+		m["mtype"] = "lastDate";
-+		sendJsObject(m);
-+	}
-+	QVariantMap vm = mv.toVariantMap(isMuc_, true);
-+	vm["mtype"] = vm["type"];
-+	vm["type"] = "message";
-+	sendJsObject(vm);
-+}
-+
-+void ChatView::scrollUp()
-+{
-+	QWebFrame *f = webView->page()->mainFrame();
-+	f->setScrollBarValue(Qt::Vertical, f->scrollBarValue(Qt::Vertical) - 50);
-+}
-+
-+void ChatView::scrollDown()
-+{
-+	QWebFrame *f = webView->page()->mainFrame();
-+	f->setScrollBarValue(Qt::Vertical, f->scrollBarValue(Qt::Vertical) + 50);
-+}
-+
-+void ChatView::clear()
-+{
-+	QVariantMap m;
-+	m["type"] = "clear";
-+	sendJsObject(m);
-+}
-+
-+void ChatView::doTrackBar()
-+{
-+	QVariantMap m;
-+	m["type"] = "trackbar";
-+	sendJsObject(m);
-+}
-+
-+bool ChatView::internalFind(QString str, bool startFromBeginning)
-+{
-+	bool found = webView->page()->findText(str, startFromBeginning ?
-+				 QWebPage::FindWrapsAroundDocument : (QWebPage::FindFlag)0);
-+
-+	if (!found && !startFromBeginning) {
-+		return internalFind(str, true);
-+	}
-+
-+	return found;
-+}
-+
-+#include "chatview_webkit.moc"
---- psi.orig/src/chatview_webkit.h
-+++ psi/src/chatview_webkit.h
-@@ -0,0 +1,99 @@
-+/*
-+ * chatview_webkit.h - Webkit based chatview
-+ * Copyright (C) 2010  Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef CHATVIEW_H
-+#define CHATVIEW_H
-+
-+#include <QWidget>
-+#include <QDateTime>
-+#include <QFrame>
-+#include <QPointer>
-+#include "webview.h"
-+#include "chatviewcommon.h"
-+
-+class ChatEdit;
-+class ChatView;
-+class MessageView;
-+class PsiAccount;
-+class ChatViewTheme;
-+
-+
-+class ChatViewJSObject;
-+
-+class ChatView : public QFrame, public ChatViewCommon
-+{
-+	Q_OBJECT
-+public:
-+	ChatView(QWidget* parent);
-+	~ChatView();
-+
-+	// reimplemented
-+	QSize sizeHint() const;
-+
-+	void setDialog(QWidget* dialog);
-+	void setSessionData(bool isMuc, const QString &jid, const QString name);
-+	void setAccount(PsiAccount *acc) { account_ = acc; }
-+
-+	void sendJsObject(const QVariantMap &);
-+	void sendJsCommand(const QString &cmd);
-+	bool handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit);
-+
-+	void dispatchMessage(const MessageView &m);
-+
-+	void scrollUp();
-+	void scrollDown();
-+	void clear();
-+	void doTrackBar();
-+	bool internalFind(QString str, bool startFromBeginning = false);
-+
-+protected:
-+	// override the tab/esc behavior
-+	bool focusNextPrevChild(bool next);
-+	void changeEvent(QEvent * event);
-+	//void keyPressEvent(QKeyEvent *);
-+
-+protected slots:
-+	void psiOptionChanged(const QString &);
-+	//void autoCopy();
-+
-+public slots:
-+	void init();
-+
-+private slots:
-+	void embedJsObject();
-+	void checkJsBuffer();
-+	void sessionInited();
-+
-+private:
-+	friend class ChatViewJSObject;
-+	ChatViewTheme* currentTheme();
-+
-+	WebView *webView;
-+	ChatViewJSObject *jsObject;
-+	QStringList jsBuffer_;
-+	bool sessionReady_;
-+	QPointer<QWidget> dialog_;
-+	bool isMuc_;
-+	QString jid_;
-+	QString name_;
-+	PsiAccount *account_;
-+};
-+
-+#endif
---- psi.orig/src/coloropt.cpp
-+++ psi/src/coloropt.cpp
-@@ -46,6 +46,7 @@ ColorOpt::ColorOpt()
- 		{"messages.received", QPalette::Text},
- 		{"messages.sent", QPalette::Text},
- 		{"messages.informational", QPalette::Text},
-+		{"messages.usertext", QPalette::Text},
- 		{"passive-popup.border", QPalette::Window}
- 	};
- 	for (unsigned int i = 0; i < sizeof(source) / sizeof(SourceType); i++) {
---- psi.orig/src/eventdlg.cpp
-+++ psi/src/eventdlg.cpp
-@@ -52,7 +52,7 @@
- #include "psiiconset.h"
- #include "jidutil.h"
- #include "psioptions.h"
--#include "msgmle.h"
-+#include "psitextview.h"
- #include "accountscombobox.h"
- #include "common.h"
- #include "xmpp_htmlelement.h"
-@@ -524,7 +524,7 @@ public:
- 	IconButton *pb_next;
- 	IconButton *pb_close, *pb_quote, *pb_deny, *pb_send, *pb_reply, *pb_chat, *pb_auth, *pb_http_confirm, *pb_http_deny;
- 	IconButton *pb_form_submit, *pb_form_cancel;
--	ChatView *mle;
-+	PsiTextView *mle;
- 	AttachView *attachView;
- 	QTimer *whois;
- 	QString lastWhois;
-@@ -849,8 +849,8 @@ void EventDlg::init()
- 	}
- 
- 	// text area
--	d->mle = new ChatView(this);
--	d->mle->setDialog(this);
-+	d->mle = new PsiTextView(this);
-+	//d->mle->setDialog(this);
- 	d->mle->setReadOnly(false);
- 	d->mle->setUndoRedoEnabled(true);
- 	d->mle->setMinimumHeight(50);
---- psi.orig/src/filetransdlg.cpp
-+++ psi/src/filetransdlg.cpp
-@@ -17,7 +17,7 @@
- #include "busywidget.h"
- #include "filetransfer.h"
- #include "psiiconset.h"
--#include "msgmle.h"
-+#include "psitextview.h"
- #include "jidutil.h"
- #include "psitooltip.h"
- #include "psicontactlist.h"
-@@ -521,7 +521,7 @@ public:
- 	QLabel* lb_identity;
- 	AccountLabel* lb_ident;
- 	QLabel* lb_time;
--	ChatView *te;
-+	PsiTextView *te;
- 	Jid jid;
- 	FileTransferHandler *ft;
- 	QString fileName;
-@@ -571,7 +571,7 @@ FileRequestDlg::FileRequestDlg(const Jid
- 	connect(d->psi, SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	updateIdentityVisibility();
- 
--	d->te = new ChatView(this);
-+	d->te = new PsiTextView(this);
- 	d->te->setReadOnly(false);
- 	d->te->setAcceptRichText(false);
- 	replaceWidget(te_desc, d->te);
-@@ -662,7 +662,7 @@ FileRequestDlg::FileRequestDlg(const QDa
- 
- 	replaceWidget(lb_accountlabel, hb);
- 
--	d->te = new ChatView(this);
-+	d->te = new PsiTextView(this);
- 	d->te->setAcceptRichText(false);
- 	replaceWidget(te_desc, d->te);
- 	setTabOrder(le_fname, d->te);
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -64,6 +64,7 @@
- #include "mucmanager.h"
- #include "busywidget.h"
- #include "msgmle.h"
-+#include "messageview.h"
- #include "iconwidget.h"
- #include "iconselect.h"
- #include "xmpp_tasks.h"
-@@ -189,7 +190,6 @@ public:
- 		nonAnonymous = false;
- 		
- 		trackBar = false;
--		oldTrackBarPosition = 0;
- 		mCmdManager.registerProvider(this);
- 	}
- 
-@@ -198,6 +198,7 @@ public:
- 	MUCManager *mucManager;
- 	QString self, prev_self;
- 	QString password;
-+	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
- 	IconAction *act_find, *act_clear, *act_icon, *act_configure;
- #ifdef WHITEBOARDING
-@@ -226,8 +227,6 @@ public:
- 	
- public:
- 	bool trackBar;
--protected:
--	int  oldTrackBarPosition;
- 
- public:
- 	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
-@@ -245,11 +244,6 @@ public slots:
- 		PsiRichText::addEmoticon(mle(), text);
- 	}
- 
--	void deferredScroll() {
--		//QTimer::singleShot(250, this, SLOT(slotScroll()));
--		te_log()->scrollToBottom();
--	}
--
- 	void sp_result(StatusPingTask::Result res, QString id)
- 	{
- 		//qDebug() << res;
-@@ -433,76 +427,11 @@ join <channel>{,<channel>} [pass{,<pass>
- 	virtual void mCmdSiteDestroyed() {
- 	}
- 
--
--
--protected slots:
--	void slotScroll() {
--		te_log()->scrollToBottom();
--	}
--
--public:
--	bool internalFind(QString str, bool startFromBeginning = false)
--	{
--		if (startFromBeginning) {
--			QTextCursor cursor = te_log()->textCursor();
--			cursor.movePosition(QTextCursor::Start, QTextCursor::KeepAnchor);
--			cursor.clearSelection();
--			te_log()->setTextCursor(cursor);
--		}
--		
--		bool found = te_log()->find(str);
--		if(!found) {
--			if (!startFromBeginning)
--				return internalFind(str, true);
--			
--			return false;
--		}
--
--		return true;
--	}
--	
--private:
--	void removeTrackBar(QTextCursor &cursor)
--	{
--		if (oldTrackBarPosition) {
--			cursor.setPosition(oldTrackBarPosition, QTextCursor::KeepAnchor);
--			QTextBlockFormat blockFormat = cursor.blockFormat();
--			blockFormat.clearProperty(QTextFormat::BlockTrailingHorizontalRulerWidth);
--			cursor.clearSelection();
--			cursor.setBlockFormat(blockFormat);
--		}
--	}
--		
--	void addTrackBar(QTextCursor &cursor)
--	{
--		cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
--		oldTrackBarPosition = cursor.position();
--		QTextBlockFormat blockFormat = cursor.blockFormat();
--		blockFormat.setProperty(QTextFormat::BlockTrailingHorizontalRulerWidth, QVariant(true));
--		cursor.clearSelection();
--		cursor.setBlockFormat(blockFormat);
--	}
--
- public:		
- 	void doTrackBar()
- 	{
- 		trackBar = false;
--
--		// save position, because our manipulations could change it
--		int scrollbarValue = te_log()->verticalScrollBar()->value();
--
--		QTextCursor cursor = te_log()->textCursor();
--		cursor.beginEditBlock();
--		PsiRichText::Selection selection = PsiRichText::saveSelection(te_log(), cursor);
--
--		removeTrackBar(cursor);
--		addTrackBar(cursor);
--
--		PsiRichText::restoreSelection(te_log(), cursor, selection);
--		cursor.endEditBlock();
--		te_log()->setTextCursor(cursor);
--
--		te_log()->verticalScrollBar()->setValue(scrollbarValue);
-+		te_log()->doTrackBar();
- 	}
- 
- public:
-@@ -633,7 +562,6 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	: TabbableWidget(j.bare(), pa, tabManager)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
--	nicknumber=0;
- 	d = new Private(this);
- 	d->self = d->prev_self = j.resource();
- 	account()->dialogRegister(this, jid());
-@@ -660,6 +588,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.setupUi(this);
- 	ui_.lb_ident->setAccount(account());
- 	ui_.lb_ident->setShowJid(false);
-+	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
-+#ifdef WEBKIT
-+	ui_.log->setAccount(account());
-+#endif
- 
- 	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(doTopic()));
- 	PsiToolTip::install(ui_.le_topic);
-@@ -674,7 +606,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
- 
- #ifdef Q_WS_MAC
--	connect(ui_.log, SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
-+	// seems its useless hack
-+	//connect(ui_.log, SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
- #endif
- 
- 	ui_.lv_users->setMainDlg(this);
-@@ -733,6 +666,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.mini_prompt->hide();
- 	connect(ui_.mle, SIGNAL(textEditCreated(QTextEdit*)), SLOT(chatEditCreated()));
- 	chatEditCreated();
-+	ui_.log->init(); //here is we ready to do that
- 
- 	d->pm_settings = new QMenu(this);
- 	connect(d->pm_settings, SIGNAL(aboutToShow()), SLOT(buildMenu()));
-@@ -810,12 +744,12 @@ void GCMainDlg::setShortcuts()
- 
- void GCMainDlg::scrollUp()
- {
--	ui_.log->verticalScrollBar()->setValue(ui_.log->verticalScrollBar()->value() - ui_.log->verticalScrollBar()->pageStep()/2);
-+	ui_.log->scrollUp();
- }
- 
- void GCMainDlg::scrollDown()
- {
--	ui_.log->verticalScrollBar()->setValue(ui_.log->verticalScrollBar()->value() + ui_.log->verticalScrollBar()->pageStep()/2);
-+	ui_.log->scrollDown();
- }
- 
- void GCMainDlg::closeEvent(QCloseEvent *e)
-@@ -866,10 +800,11 @@ void GCMainDlg::logSelectionChanged()
- {
- #ifdef Q_WS_MAC
- 	// A hack to only give the message log focus when text is selected
--	if (ui_.log->textCursor().hasSelection()) 
--		ui_.log->setFocus();
--	else 
--		ui_.mle->chatEdit()->setFocus();
-+// seems its already useless. at least copy works w/o this hack
-+//	if (ui_.log->textCursor().hasSelection())
-+//		ui_.log->setFocus();
-+//	else
-+//		ui_.mle->chatEdit()->setFocus();
- #endif
- }
- 
-@@ -1011,7 +946,7 @@ void GCMainDlg::doTopic()
- 
- void GCMainDlg::doClear()
- {
--	ui_.log->setText("");
-+	ui_.log->clear();
- }
- 
- void GCMainDlg::doClearButton()
-@@ -1026,7 +961,7 @@ void GCMainDlg::doClearButton()
- 			)
- 		) {
- 		case QMessageBox::No:
--			break;
-+		break;
- 		case QMessageBox::YesAll:
- 			PsiOptions::instance()->setOption("options.ui.chat.warn-before-clear", false);
- 			// fall-through
-@@ -1066,7 +1001,7 @@ void GCMainDlg::configureRoom()
- void GCMainDlg::doFind(const QString &str)
- {
- 	d->lastSearch = str;
--	if (d->internalFind(str))
-+	if (d->te_log()->internalFind(str))
- 		d->findDlg->found();
- 	else
- 		d->findDlg->error(str);
-@@ -1194,7 +1129,7 @@ void GCMainDlg::mucKickMsgHelper(const Q
- 	if (!s.mucItem().reason().isEmpty()) {
- 		message += QString(" (%1)").arg(s.mucItem().reason());
- 	}
--	appendSysMsg(message, false, QDateTime::currentDateTime());
-+	appendSysMsg(message);
- }
- 
- void GCMainDlg::presence(const QString &nick, const Status &s)
-@@ -1208,7 +1143,7 @@ void GCMainDlg::presence(const QString &
- 		else {
- 			message = tr("An error occurred (errorcode: %1)").arg(s.errorCode());
- 		}
--		appendSysMsg(message, false, QDateTime::currentDateTime());
-+		appendSysMsg(message);
- 		return;
- 	}
- 
-@@ -1228,7 +1163,7 @@ void GCMainDlg::presence(const QString &
- 	if(s.isAvailable()) {
- 		// Available
- 		if (s.getMUCStatuses().contains(201)) {
--			appendSysMsg(tr("New room created"), false, QDateTime::currentDateTime());
-+			appendSysMsg(tr("New room created"));
- 			if (options_->getOption("options.muc.accept-defaults").toBool()) {
- 				d->mucManager->setDefaultConfiguration();
- 			} else if (options_->getOption("options.muc.auto-configure").toBool()) {
-@@ -1260,7 +1195,7 @@ void GCMainDlg::presence(const QString &
- 				} else {
- 					message = message.arg(nick);
- 				}
--				appendSysMsg(message, false, QDateTime::currentDateTime());
-+				appendSysMsg(message);
- 			}
- 		}
- 		else {
-@@ -1280,23 +1215,18 @@ void GCMainDlg::presence(const QString &
- 				}
- 
- 				if (!message.isEmpty()) {
--					appendSysMsg(message, false, QDateTime::currentDateTime());
-+					appendSysMsg(message);
- 				}
- 			}
- 			if ( !d->connecting && options_->getOption("options.muc.show-status-changes").toBool() ) {
- 				if (s.status() != contact->s.status() || s.show() != contact->s.show())	{
--					QString message;
- 					QString st;
- 					if (s.show().isEmpty()) {
- 						st=tr("online");
- 					} else {
- 						st=s.show();
- 					}
--					message = tr("%1 is now %2").arg(nick).arg(st);
--					if (!s.status().isEmpty()) {
--						message+=QString(" (%1)").arg(s.status());
--					}
--					appendSysMsg(message, false, QDateTime::currentDateTime());
-+					ui_.log->dispatchMessage(MessageView::statusMessage(nick, (int)s.type(), s.status()));
- 				}
- 			}
- 		}
-@@ -1325,7 +1255,7 @@ void GCMainDlg::presence(const QString &
- 			else {
- 				QMessageBox::information(this,tr("Room Destroyed"), message);
- 			}
--			appendSysMsg(log, false, QDateTime::currentDateTime());
-+			appendSysMsg(log);
- 			goForcedLeave();
- 		}
- 
-@@ -1385,7 +1315,7 @@ void GCMainDlg::presence(const QString &
- 					message += QString(" (%1)").arg(s.status());
- 				}
- 			}
--			appendSysMsg(message, false, QDateTime::currentDateTime());
-+			appendSysMsg(message);
- 		}
- 		ui_.lv_users->removeEntry(nick);
- 	}
-@@ -1416,18 +1346,33 @@ void GCMainDlg::message(const Message &_
- 		d->nonAnonymous = false;
- 	}
- 
--
- 	if(!m.subject().isNull()) {
--		ui_.le_topic->setText(m.subject());
-+		QString subject = m.subject();
-+		d->topic = subject;
-+		QString subjectTooltip = TextUtil::plain2rich(subject);
-+		subjectTooltip = TextUtil::linkify(subjectTooltip);
-+		if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) {
-+			subjectTooltip = TextUtil::emoticonify(subjectTooltip);
-+		}
-+		ui_.le_topic->setText(subject.replace("\n\n", " || ").replace("\n", " | ").replace("\t", " ").replace(QRegExp("\\s{2,}"), " "));
- 		ui_.le_topic->setCursorPosition(0);
--		ui_.le_topic->setToolTip(QString("<qt><p>%1</p></qt>").arg(m.subject()));
--		if(m.body().isEmpty()) {
--			if (!from.isEmpty())
--				m.setBody(QString("/me ") + tr("has set the topic to: %1").arg(m.subject()));
--			else
--				// The topic was set by the server
--				m.setBody(tr("The topic has been set to: %1").arg(m.subject()));
-+		ui_.le_topic->setToolTip(QString("<qt><p>%1</p></qt>").arg(subjectTooltip));
-+
-+		QString sysMsg;
-+		if (from.isEmpty()) {
-+			// The topic was set by the server
-+			// ugly trick
-+			int btStart = m.body().indexOf(d->topic);
-+			sysMsg = btStart > 0?m.body().left(btStart).remove(": "):tr("The topic has been set to");
-+		} else {
-+			sysMsg = QString(from) + (d->topic.isEmpty()?
-+						 tr(" has unset the topic"):tr(" has set the topic to"));
- 		}
-+		MessageView tv = MessageView::subjectMessage(d->topic, sysMsg);
-+		tv.setDateTime(m.timeStamp());
-+		appendSysMsg(tv);
-+		//ui_.log->dispatchMessage(tv);
-+		return;
- 	}
- 
- 	if(m.body().isEmpty())
-@@ -1460,7 +1405,7 @@ void GCMainDlg::message(const Message &_
- 	}
- 
- 	if(from.isEmpty())
--		appendSysMsg(m.body(), alert, m.timeStamp(), true);
-+		appendSysMsg(m.body(), alert, m.timeStamp());
- 	else
- 		appendMessage(m, alert);
- }
-@@ -1487,144 +1432,57 @@ const QString& GCMainDlg::nick() const
- 	return d->self;
- }
- 
--void GCMainDlg::updateLastMsgTime(QDateTime t)
-+void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
- {
--	bool doInsert = t.date() != lastMsgTime_.date();
--	lastMsgTime_ = t;
--	if (doInsert) {
--		QString color = ColorOpt::instance()->color("options.ui.look.colors.messages.informational").name();
--		ui_.log->appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(t.date().toString(Qt::ISODate)));
-+	MessageView mv = MessageView::fromPlainText(str, MessageView::System);
-+	if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool()) {
-+		alert = false;
-+	}
-+	mv.setAlert(alert);
-+	if(!ts.isNull()) {
-+		mv.setDateTime(ts);
- 	}
-+	appendSysMsg(mv);
- }
- 
--void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts, bool prepareAsChatMessage)
--{
--	// FIXME:
--	//  prepareAsChatMessage was added to linkify server-generated topic information.
--	//  First idea was to linkify, etc, every SysMsg, but that leads to problems,
--	//  such as parsing full JIDs of participants joining a non-anonymous room as
--	//  emails and looking ugly.
--	//  Possibly a better way would be to change this function to something like
--	//  appendSysMsg(nick, jid, message, alert, ts)
--	//  or maybe even separate functions for different types of system messages.
--
-+void GCMainDlg::appendSysMsg(const MessageView &mv)
-+{
- 	if (d->trackBar)
- 		d->doTrackBar();
- 
--	if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool())
--		alert=false;
--
--	QDateTime time = QDateTime::currentDateTime();
--	if(!ts.isNull())
--		time = ts;
--
--	updateLastMsgTime(time);
--	QString timestr = ui_.log->formatTimeStamp(time);
--	QString color = ColorOpt::instance()->color("options.ui.look.colors.messages.informational").name();
--	ui_.log->appendText(QString("<font color=\"%1\">[%2]").arg(color, timestr) +
--		QString(" *** %1</font>").arg(prepareAsChatMessage ? TextUtil::prepareMessageText(str) : TextUtil::escape(str)));
-+	ui_.log->dispatchMessage(mv);
- 
--	if(alert)
-+	if(mv.isAlert())
- 		doAlert();
- }
- 
--QString GCMainDlg::getNickColor(QString nick)
--{
--	int sender;
--	if(nick == d->self||nick.isEmpty())
--		sender = -1;
--	else {
--		if (!nicks.contains(nick)) {
--			//not found in map
--			nicks.insert(nick,nicknumber);
--			nicknumber++;
--		}
--		sender=nicks[nick];
--	}
--	
--	QStringList nickColors = PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList();
--	
--	if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || nickColors.empty()) {
--		return "#000000";
--	}
--	else if(sender == -1 || nickColors.size() == 1) {
--		return nickColors[nickColors.size()-1];
--	}
--	else {
--		int n = sender % (nickColors.size()-1);
--		return nickColors[n];
--	}
--}
--
- void GCMainDlg::appendMessage(const Message &m, bool alert)
- {
--	updateLastMsgTime(m.timeStamp());
--	//QString who, color;
-+	MessageView mv(MessageView::Message);
-+	if (m.containsHTML() && PsiOptions::instance()
-+							->getOption("options.html.muc.render").toBool() &&
-+							!m.html().text().isEmpty()) {
-+		mv.setHtml(m.html().toString("span"));
-+	} else {
-+		mv.setPlainText(m.body());
-+	}
- 	if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool())
- 		alert=false;
--	QString who, textcolor, nickcolor,alerttagso,alerttagsc;
-+	mv.setAlert(alert);
-+	mv.setUserId(m.from().full());
-+	mv.setNick(m.from().resource());
-+	mv.setLocal(mv.nick() == d->self);
-+	mv.setSpooled(m.spooled());
-+	mv.setDateTime(m.timeStamp());
- 
--	who = m.from().resource();
--	if (d->trackBar&&m.from().resource() != d->self&&!m.spooled())
-+	if (d->trackBar && !mv.isLocal() && !mv.isSpooled()) {
- 		d->doTrackBar();
--	/*if(local) {
--		color = "#FF0000";
- 	}
--	else {
--		color = "#0000FF";
--	}*/
--	nickcolor = getNickColor(who);
--	textcolor = ui_.log->palette().windowText().color().name();
--	if(alert) {
--		textcolor = "#FF0000";
--		alerttagso = "<b>";
--		alerttagsc = "</b>";
--	}
--	if(m.spooled()) {
--		nickcolor = ColorOpt::instance()->color("options.ui.look.colors.messages.informational").name();
--	}
--
--	QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
--
--	bool emote = false;
--	if(m.body().left(4) == "/me ")
--		emote = true;
--
--	QString txt;
--	if(emote)
--		txt = TextUtil::plain2rich(m.body().mid(4));
--	else
--		txt = TextUtil::plain2rich(m.body());
--
--	txt = TextUtil::linkify(txt);
- 
--	if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
--		txt = TextUtil::emoticonify(txt);
--	if( PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() )
--		txt = TextUtil::legacyFormat(txt);
--
--	if(emote) {
--		//ui_.log->append(QString("<font color=\"%1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(who)) + txt + "</font>");
--		ui_.log->appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(who)) + alerttagso + txt + alerttagsc + "</font>");
--	}
--	else {
--		if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--			//ui_.log->append(QString("<font color=\"%1\">").arg(color) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(who)) + "</font><br>" + txt);
--			ui_.log->appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(who)) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + txt + alerttagsc + "</font>");
--		}
--		else {
--			//ui_.log->append(QString("<font color=\"%1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(who) + QString("&gt;</font> ") + txt);
--			ui_.log->appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(who) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + txt + alerttagsc +"</font>");
--		}
--	}
--
--	//if(local)
--	if(m.from().resource() == d->self) {
--		d->deferredScroll();
--	}
-+	ui_.log->dispatchMessage(mv);
- 
- 	// if we're not active, notify the user by changing the title
--	if(!isActiveTab() && (who != d->self)) {
-+	if(!isActiveTab() && !mv.isLocal()) {
- 		++d->pending;
- 		invalidateTab();
- 	}
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -39,6 +39,7 @@ class PsiAccount;
- class PsiOptions;
- class QRect;
- class GCMainDlg;
-+class MessageView;
- class QColorGroup;
- namespace XMPP {
- 	class Message;
-@@ -136,9 +137,9 @@ private:
- 	Ui::GroupChatDlg ui_;
- 
- 	void doAlert();
--	void appendSysMsg(const QString &, bool, const QDateTime &ts=QDateTime(), bool prepareAsChatMessage=false);
-+	void appendSysMsg(const QString &, bool alert=false, const QDateTime &ts=QDateTime());
-+	void appendSysMsg(const MessageView &);
- 	void appendMessage(const Message &, bool);
--	void updateLastMsgTime(QDateTime t);
- 	void setLooks();
- 
- 	void mucKickMsgHelper(const QString &nick, const Status &s, const QString &nickJid, const QString &title,
-@@ -147,9 +148,6 @@ private:
- 
- 	void contextMenuEvent(QContextMenuEvent *);
- 
--	QString getNickColor(QString);
--	QMap<QString,int> nicks;
--	int nicknumber;
- 	PsiOptions* options_;
- 	QDateTime lastMsgTime_;
- };
---- psi.orig/src/groupchatdlg.ui
-+++ psi/src/groupchatdlg.ui
-@@ -180,9 +180,6 @@
-           <property name="focusPolicy" >
-            <enum>Qt::NoFocus</enum>
-           </property>
--          <property name="readOnly" >
--           <bool>true</bool>
--          </property>
-          </widget>
-          <widget class="GCUserView" name="lv_users" >
-           <property name="minimumSize" >
-@@ -292,8 +289,8 @@
-   </customwidget>
-   <customwidget>
-    <class>ChatView</class>
--   <extends>QTextEdit</extends>
--   <header>msgmle.h</header>
-+   <extends>QFrame</extends>
-+   <header>chatview.h</header>
-   </customwidget>
-   <customwidget>
-    <class>ChatEditProxy</class>
---- psi.orig/src/jsutil.cpp
-+++ psi/src/jsutil.cpp
-@@ -0,0 +1,81 @@
-+/*
-+ * jsutil.cpp
-+ * Copyright (C) 2009  Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "jsutil.h"
-+#include <QStringList>
-+#include <QDateTime>
-+
-+QString JSUtil::map2json(const QVariantMap &map)
-+{
-+	QStringList ret;
-+	QMapIterator<QString, QVariant> i(map);
-+	while (i.hasNext()) {
-+		i.next();
-+		ret.append(QString("\"%1\":").arg(escapeStringCopy(i.key())) +
-+				   variant2js(i.value()));
-+	}
-+	return QString("{%1}").arg(ret.join(","));
-+}
-+
-+QString JSUtil::variant2js(const QVariant &value)
-+{
-+	QString strVal;
-+	switch (value.type()) {
-+		case QVariant::String:
-+		case QVariant::Color:
-+			strVal = value.toString();
-+			escapeString(strVal);
-+			strVal = QString("\"%1\"").arg(strVal);
-+			break;
-+		case QVariant::StringList:
-+			{
-+				QStringList sl = value.toStringList();
-+				for (int i=0; i<sl.count(); i++) {
-+					escapeString(sl[i]);
-+					sl[i] = QString("\"%1\"").arg(sl[i]);
-+				}
-+				strVal = QString("[%1]").arg(sl.join(","));
-+			}
-+			break;
-+		case QVariant::DateTime:
-+			strVal = QString("new Date(%1)").arg(value.toDateTime().toString("yyyy,M-1,d,h,m,s"));
-+			break;
-+		case QVariant::Date:
-+			strVal = QString("new Date(%1)").arg(value.toDate().toString("yyyy,M-1,d"));
-+			break;
-+		case QVariant::Map:
-+			strVal = map2json(value.toMap());
-+			break;
-+		default:
-+			strVal = value.toString();
-+	}
-+	return strVal;
-+}
-+
-+void JSUtil::escapeString(QString& str)
-+{
-+
-+	str.replace("\r\n", "\n");  //windows
-+	str.replace("\r", "\n");    //mac
-+	str.replace("\\", "\\\\");
-+	str.replace("\"", "\\\"");
-+	str.replace("\n", "\\\n");
-+	str.replace(QChar(8232), "\\\n"); //ctrl+enter
-+}
---- psi.orig/src/jsutil.h
-+++ psi/src/jsutil.h
-@@ -0,0 +1,46 @@
-+/*
-+ * jsutil.h
-+ * Copyright (C) 2009  Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef JSUTIL
-+#define JSUTIL
-+
-+class QString;
-+class QVariant;
-+
-+#include <QVariantMap>
-+
-+class JSUtil
-+{
-+public:
-+	static QString map2json(const QVariantMap &);
-+	static QString variant2js(const QVariant &);
-+	/** Escapes " and \n  (for JS evaluation) */
-+	static void escapeString(QString &str);
-+
-+	/** Escapes " and \n  (for JS evaluation) [overload] */
-+	static inline QString escapeStringCopy(QString str)
-+	{
-+		escapeString(str);
-+		return str;
-+	}
-+};
-+
-+
-+#endif
---- psi.orig/src/messageview.cpp
-+++ psi/src/messageview.cpp
-@@ -0,0 +1,183 @@
-+/*
-+ * messageview.cpp - message data for chatview
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "messageview.h"
-+#include "textutil.h"
-+#include "psioptions.h"
-+#include "common.h"
-+
-+#include <QTextDocument>
-+
-+static const QString me_cmd = "/me ";
-+
-+MessageView::MessageView(Type t)
-+	: _type(t)
-+	, _emote(false)
-+	, _alert(false)
-+	, _local(false)
-+	, _spooled(false)
-+	, _status(0)
-+	, _dateTime(QDateTime::currentDateTime())
-+{
-+
-+}
-+
-+MessageView MessageView::fromPlainText(const QString &text, Type type)
-+{
-+	MessageView mv(type);
-+	mv.setPlainText(text);
-+	return mv;
-+}
-+
-+MessageView MessageView::fromHtml(const QString &text, Type type)
-+{
-+	MessageView mv(type);
-+	mv.setHtml(text);
-+	return mv;
-+}
-+
-+MessageView MessageView::urlsMessage(const QMap<QString, QString> &urls)
-+{
-+	MessageView mv(Urls);
-+	mv._type = Urls;
-+	mv._urls = urls;
-+	return mv;
-+}
-+
-+MessageView MessageView::subjectMessage(const QString &subject, const QString &prefix)
-+{
-+	MessageView mv(Subject);
-+	mv._text = TextUtil::escape(prefix);
-+	mv._userText = subject;
-+	return mv;
-+}
-+
-+MessageView MessageView::statusMessage(const QString &nick, int status,
-+									   const QString &statusText)
-+{
-+	MessageView mv = MessageView::fromPlainText(QObject::tr("%1 is now %2")
-+												.arg(nick, status2txt(status)),
-+												Status);
-+	mv.setNick(nick);
-+	mv.setStatus(status);
-+	mv.setUserText(statusText);
-+	return mv;
-+}
-+
-+// getters and setters
-+
-+void MessageView::setPlainText(const QString &text)
-+{
-+	if (!text.isEmpty()) {
-+		if (_type == Message) {
-+			_emote = text.startsWith(me_cmd);
-+		}
-+		_text = TextUtil::plain2rich(text);
-+		if (_type == Message) {
-+			_text = TextUtil::linkify(_text);
-+		}
-+	}
-+}
-+
-+void MessageView::setHtml(const QString &text)
-+{
-+	if (_type == Message) {
-+		_emote = text.trimmed().startsWith(me_cmd);
-+	}
-+	_text = text;
-+}
-+
-+QString MessageView::formattedText() const
-+{
-+	QString txt = _text;
-+
-+	if (_emote && _type == Message) {
-+		int cmd = txt.indexOf(me_cmd);
-+		txt = txt.remove(cmd, me_cmd.length());
-+	}
-+	if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
-+		txt = TextUtil::emoticonify(txt);
-+	if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool())
-+		txt = TextUtil::legacyFormat(txt);
-+
-+	return txt;
-+}
-+
-+QString MessageView::formattedUserText() const
-+{
-+	if (!_userText.isEmpty()) {
-+		QString text = TextUtil::plain2rich(_userText);
-+		text = TextUtil::linkify(text);
-+		if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
-+			text = TextUtil::emoticonify(text);
-+		if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool())
-+			text = TextUtil::legacyFormat(text);
-+		return text;
-+	}
-+	return "";
-+}
-+
-+QVariantMap MessageView::toVariantMap(bool isMuc, bool formatted) const
-+{
-+	static QHash<Type, QString> types;
-+	if (types.isEmpty()) {
-+		types.insert(Message,	"message");
-+		types.insert(System,	"system");
-+		types.insert(Status,	"status");
-+		types.insert(Subject,	"subject");
-+		types.insert(Urls,		"urls");
-+	}
-+	QVariantMap m;
-+	m["time"] = _dateTime;
-+	m["type"] = types.value(_type);
-+	switch (_type) {
-+		case Message:
-+			m["message"] = formatted?formattedText():_text;
-+			m["emote"] = _emote;
-+			m["local"] = _local;
-+			m["sender"] = _nick;
-+			m["userid"] = _userId;
-+			m["spooled"] = _spooled;
-+			m["id"] = _messageId;
-+			if (isMuc) { // maybe w/o conditions ?
-+				m["alert"] = _alert;
-+			}
-+			break;
-+		case Status:
-+			m["sender"] = _nick;
-+			m["status"] = _status;
-+			m["message"] = _text;
-+			m["usertext"] = formatted?formattedUserText():_userText;
-+			break;
-+		case System:
-+		case Subject:
-+			m["message"] = formatted?formattedText():_text;
-+			m["usertext"] = formatted?formattedUserText():_userText;
-+			break;
-+		case Urls:
-+			QVariantMap vmUrls;
-+			foreach (const QString &u, _urls.keys()) {
-+				vmUrls[u] = _urls.value(u);
-+			}
-+			m["urls"] = vmUrls;
-+			break;
-+	}
-+	return m;
-+}
---- psi.orig/src/messageview.h
-+++ psi/src/messageview.h
-@@ -0,0 +1,106 @@
-+/*
-+ * messageview.h - message data for chatview
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef MESSAGEVIEW_H
-+#define MESSAGEVIEW_H
-+
-+#include <QDateTime>
-+#include <QVariantMap>
-+
-+class MessageView
-+{
-+public:
-+	enum Type {
-+		Message,
-+		System,
-+		Status,
-+		Subject,
-+		Urls
-+	};
-+
-+	enum SystemMessageType {
-+		MUCJoin,
-+		MUCPart,
-+		FileTransferRequest,
-+		FileTransferFinished
-+	};
-+
-+	MessageView(Type);
-+
-+	static MessageView fromPlainText(const QString &, Type);
-+	static MessageView fromHtml(const QString &, Type);
-+	static MessageView urlsMessage(const QMap<QString, QString> &);
-+	static MessageView subjectMessage(const QString &subject,
-+									  const QString &prefix = QString());
-+
-+	// accepts plain/text nick, plain/text status and rich/text statusText
-+	static MessageView statusMessage(const QString &nick, int status,
-+									 const QString &statusText = QString());
-+
-+	inline Type type() const { return _type; }
-+	inline const QString &text() const { return _text; }
-+	inline void setText(const QString &text) { _text = text; }
-+	inline const QString &userText() const { return _userText; }
-+	inline void setUserText(const QString &text) { _userText = text; }
-+
-+	void setPlainText(const QString &);
-+	void setHtml(const QString &);
-+	QString formattedText() const;
-+	QString formattedUserText() const;
-+
-+	inline void setAlert(bool state) { _alert = state; }
-+	inline bool isAlert() const { return _alert; }
-+	inline void setLocal(bool state) { _local = state; }
-+	inline bool isLocal() const { return _local; }
-+	inline void setEmote(bool state) { _emote = state; }
-+	inline bool isEmote() const { return _emote; }
-+	inline void setSpooled(bool state) { _spooled = state; }
-+	inline bool isSpooled() const { return _spooled; }
-+	inline void setStatus(int s) { _status = s; }
-+	inline int status() const { return _status; }
-+	inline void setNick(const QString &nick) { _nick = nick; }
-+	inline const QString &nick() const { return _nick; }
-+	inline void setMessageId(const QString &id) { _messageId = id; }
-+	inline const QString &messageId() const { return _messageId; }
-+	inline void setUserId(const QString &id) { _userId = id; }
-+	inline const QString &userId() const { return _userId; }
-+	inline void setDateTime(const QDateTime &dt) { _dateTime = dt; }
-+	inline const QDateTime &dateTime() const { return _dateTime; }
-+	inline QMap<QString, QString> urls() const { return _urls; }
-+
-+	QVariantMap toVariantMap(bool isMuc, bool formatted = false) const;
-+
-+private:
-+	Type _type;
-+	bool _emote;
-+	bool _alert;
-+	bool _local;
-+	bool _spooled;
-+	int _status;
-+	QString _messageId;
-+	QString _userId;
-+	QString _nick; // rich / as is
-+	QString _text; // always rich (plain text converted to rich)
-+	QString _userText; // rich
-+	QDateTime _dateTime;
-+	QMap<QString, QString> _urls;
-+};
-+
-+#endif
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -29,11 +29,9 @@
- #include <QLayout>
- #include <QMenu>
- #include <QResizeEvent>
--#include <QScrollBar>
- #include <QTextCharFormat>
- #include <QTextDocument>
- #include <QTimer>
--#include <QDateTime>
- 
- #include "shortcutmanager.h"
- #include "spellchecker/spellhighlighter.h"
-@@ -41,135 +39,6 @@
- #include "psioptions.h"
- 
- //----------------------------------------------------------------------------
--// ChatView
--//----------------------------------------------------------------------------
--ChatView::ChatView(QWidget *parent)
--	: PsiTextView(parent)
--	, dialog_(0)
--{
--	setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
--
--	setReadOnly(true);
--	setUndoRedoEnabled(false);
--	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
--
--#ifndef Q_WS_X11	// linux has this feature built-in
--	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
--	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
--#endif
--}
--
--ChatView::~ChatView()
--{
--}
--
--void ChatView::setDialog(QWidget* dialog)
--{
--	dialog_ = dialog;
--}
--
--QSize ChatView::sizeHint() const
--{
--	return minimumSizeHint();
--}
--
--bool ChatView::focusNextPrevChild(bool next)
--{
--	return QWidget::focusNextPrevChild(next);
--}
--
--void ChatView::keyPressEvent(QKeyEvent *e)
--{
--/*	if(e->key() == Qt::Key_Escape)
--		e->ignore(); 
--#ifdef Q_WS_MAC
--	else if(e->key() == Qt::Key_W && e->modifiers() & Qt::ControlModifier)
--		e->ignore();
--	else
--#endif
--	else if(e->key() == Qt::Key_Return && ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier)) )
--		e->ignore();
--	else if(e->key() == Qt::Key_H && (e->modifiers() & Qt::ControlModifier))
--		e->ignore();
--	else if(e->key() == Qt::Key_I && (e->modifiers() & Qt::ControlModifier))
--		e->ignore(); */
--	/*else*/ if(e->key() == Qt::Key_M && (e->modifiers() & Qt::ControlModifier) && !isReadOnly()) // newline 
--		append("\n");
--/*	else if(e->key() == Qt::Key_U && (e->modifiers() & Qt::ControlModifier) && !isReadOnly())
--		setText(""); */
--	else if ((e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier))) {
--		e->ignore();
--	}
--	else {
--		PsiTextView::keyPressEvent(e);
--	}
--}
--
--/**
-- * Copies any selected text to the clipboard
-- * if autoCopy is enabled and ChatView is in read-only mode.
-- */
--void ChatView::autoCopy()
--{
--	if (isReadOnly() && PsiOptions::instance()->getOption("options.ui.automatically-copy-selected-text").toBool()) {
--		copy();
--	}
--}
--
--/**
-- * Handle KeyPress events that happen in ChatEdit widget. This is used
-- * to 'fix' the copy shortcut.
-- * \param object object that should receive the event
-- * \param event received event
-- * \param chatEdit pointer to the dialog's ChatEdit widget that receives user input
-- */
--bool ChatView::handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit)
--{
--	if (object == chatEdit && event->type() == QEvent::KeyPress) {
--		QKeyEvent *e = (QKeyEvent *)event;
--		if ((e->key() == Qt::Key_C && (e->modifiers() & Qt::ControlModifier)) ||
--		    (e->key() == Qt::Key_Insert && (e->modifiers() & Qt::ControlModifier)))
--		{
--			if (!chatEdit->textCursor().hasSelection() &&
--			     this->textCursor().hasSelection()) 
--			{
--				this->copy();
--				return true;
--			}
--		}
--	}
--	
--	return false;
--}
--
--void ChatView::appendText(const QString &text)
--{
--	bool doScrollToBottom = atBottom();
--	
--	// prevent scrolling back to selected text when 
--	// restoring selection
--	int scrollbarValue = verticalScrollBar()->value();
--	
--	PsiTextView::appendText(text);
--	
--	if (doScrollToBottom)
--		scrollToBottom();
--	else
--		verticalScrollBar()->setValue(scrollbarValue);
--}
--
--/**
-- * \brief Common function for ChatDlg and GCMainDlg. FIXME: Extract common
-- * chat window from both dialogs and move this function to that class.
-- */
--QString ChatView::formatTimeStamp(const QDateTime &time)
--{
--	// TODO: provide an option for user to customize
--	// time stamp format
--	return QString().sprintf("%02d:%02d:%02d", time.time().hour(), time.time().minute(), time.time().second());;
--}
--
--//----------------------------------------------------------------------------
- // ChatEdit
- //----------------------------------------------------------------------------
- ChatEdit::ChatEdit(QWidget *parent)
---- psi.orig/src/msgmle.h
-+++ psi/src/msgmle.h
-@@ -23,8 +23,6 @@
- 
- #include <QTextEdit>
- 
--#include "psitextview.h"
--
- class ChatEdit;
- class QEvent;
- class QKeyEvent;
-@@ -32,34 +30,6 @@ class QResizeEvent;
- class QTimer;
- class SpellHighlighter;
- 
--class ChatView : public PsiTextView
--{
--	Q_OBJECT
--public:
--	ChatView(QWidget* parent);
--	~ChatView();
--
--	void setDialog(QWidget* dialog);
--
--	// reimplemented
--	QSize sizeHint() const;
--
--	void appendText(const QString &text);
--	bool handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit);
--
--	QString formatTimeStamp(const QDateTime &time);
--
--protected:
--	// override the tab/esc behavior
--	bool focusNextPrevChild(bool next);
--	void keyPressEvent(QKeyEvent *);
--
--protected slots:
--	void autoCopy();
--
--private:
--	QWidget* dialog_;
--};
- 
- class ChatEdit : public QTextEdit
- {
---- psi.orig/src/networkaccessmanager.cpp
-+++ psi/src/networkaccessmanager.cpp
-@@ -0,0 +1,117 @@
-+/*
-+ * networkaccessmanager.cpp - Network Manager for WebView able to process
-+ * custom url schemas
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "networkaccessmanager.h"
-+
-+#include "bytearrayreply.h"
-+#include <QCoreApplication>
-+
-+NetworkAccessManager::NetworkAccessManager(QObject *parent)
-+: QNetworkAccessManager(parent) {
-+	setParent(QCoreApplication::instance());
-+}
-+
-+
-+NetworkAccessManager::~NetworkAccessManager() {
-+	schemeHandlers_.clear();
-+}
-+
-+
-+QNetworkReply * NetworkAccessManager::createRequest(Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0) {
-+    //download local file
-+	//qDebug("url: %s", qPrintable(req.url().toString()));
-+	if (req.url().scheme() == "file" || req.url().scheme() == "data") {
-+		return QNetworkAccessManager::createRequest(op, req, outgoingData);
-+    }
-+
-+	if (schemeHandlers_.contains(req.url().scheme())) {
-+		ByteArrayReply *repl = new ByteArrayReply(
-+					req,
-+					schemeHandlers_.value(req.url().scheme())->data(req.url()),
-+					QString(),
-+					this);
-+		connect(repl, SIGNAL(finished()), SLOT(callFinished()));
-+		return repl;
-+	}
-+
-+    //on whiteList?
-+    whiteListMutex.lock();
-+
-+    bool whiteListed = whiteList.contains(req.url().toString());
-+
-+    whiteListMutex.unlock();
-+
-+    if (whiteListed) {
-+        return QNetworkAccessManager::createRequest(op, req, outgoingData);
-+    }
-+
-+	QNetworkReply * reply = new ByteArrayReply(req); //finishes with error
-+    connect(reply, SIGNAL(finished()), SLOT(callFinished()));
-+
-+    return reply;
-+}
-+
-+
-+void NetworkAccessManager::callFinished() {
-+    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
-+    
-+    if (reply) {
-+        emit finished(reply);
-+    }
-+}
-+
-+
-+void NetworkAccessManager::addUrlToWhiteList(const QString& url) {
-+
-+    whiteListMutex.lock();
-+    whiteList.append(url);
-+    whiteListMutex.unlock();
-+}
-+
-+QSharedPointer<NAMSchemeHandler> NetworkAccessManager::schemeHandler(const QString &scheme)
-+{
-+	if (schemeHandlers_.contains(scheme)) {
-+		return schemeHandlers_.value(scheme);
-+	}
-+	return QSharedPointer<NAMSchemeHandler>();
-+}
-+
-+void NetworkAccessManager::setSchemeHandler(const QString &scheme, NAMSchemeHandler *handler)
-+{
-+	if (schemeHandlers_.contains(scheme)) {
-+		qDebug("%s is already registered. replacing..", qPrintable(scheme));
-+		schemeHandlers_.remove(scheme);
-+	}
-+	schemeHandlers_.insert(scheme, QSharedPointer<NAMSchemeHandler>(handler));
-+}
-+
-+/**
-+ * Returns the singleton instance of this class
-+ * \return Instance of NetworkAccessManager
-+ */
-+NetworkAccessManager* NetworkAccessManager::instance()
-+{
-+	if ( !instance_ )
-+		instance_ = new NetworkAccessManager();
-+	return instance_;
-+}
-+
-+NetworkAccessManager* NetworkAccessManager::instance_ = NULL;
---- psi.orig/src/networkaccessmanager.h
-+++ psi/src/networkaccessmanager.h
-@@ -0,0 +1,93 @@
-+/*
-+ * networkaccessmanager.h - Network Manager for WebView able to process
-+ * custom url schemas
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef _NETWORKACCESSMANAGER_H
-+#define _NETWORKACCESSMANAGER_H
-+
-+#include <QNetworkAccessManager>
-+#include <QStringList>
-+#include <QSharedPointer>
-+#include <QHash> //for qt-4.4
-+#include <QMutex>
-+
-+#include <QNetworkReply>
-+#include <QNetworkRequest>
-+#include <QIODevice>
-+
-+class NetworkAccessManager;
-+
-+class NAMSchemeHandler {
-+public:
-+	virtual QByteArray data(const QUrl &) const = 0;
-+};
-+
-+/** Blocks internet connections and allows to use icon:// URLs in webkit-based ChatViews*/
-+class NetworkAccessManager : public QNetworkAccessManager {
-+
-+	Q_OBJECT
-+public:
-+	/**
-+	 * Constructor.
-+	 *
-+	 * \param iconServer will be used to serve icon:// urls
-+	 */
-+	NetworkAccessManager(QObject *parent = 0);
-+	~NetworkAccessManager();
-+
-+	/** Add URL to whiteList. */
-+	void addUrlToWhiteList(const QString& url);
-+	static NetworkAccessManager* instance();
-+	QSharedPointer<NAMSchemeHandler> schemeHandler(const QString &);
-+	void setSchemeHandler(const QString &, NAMSchemeHandler *);
-+
-+private slots:
-+
-+	/**
-+	 * Called by QNetworkReply::finish().
-+	 *
-+	 * Emitts finish(reply)
-+	 */
-+	void callFinished();
-+
-+protected:
-+	QNetworkReply* createRequest(Operation op, const QNetworkRequest & req, QIODevice * outgoingData);
-+
-+	/*
-+	 * List of whitelisted URLs.
-+	 *
-+	 * Access to whitelisted URLs is not denied.
-+	 */
-+	QStringList whiteList;
-+
-+	/**
-+	 * Mutal exclusion for whitList.
-+	 *
-+	 * WhiteList can be accessed by Webkit (createRequest())
-+	 * and Psi (addUrlToWhiteList()) simultaneously)
-+	 */
-+	QMutex whiteListMutex;
-+
-+private:
-+	static NetworkAccessManager* instance_;
-+	QHash<QString, QSharedPointer<NAMSchemeHandler> > schemeHandlers_;
-+};
-+
-+#endif
---- psi.orig/src/options/opt_appearance.cpp
-+++ psi/src/options/opt_appearance.cpp
-@@ -1,5 +1,6 @@
- #include "opt_appearance.h"
- #include "opt_iconset.h"
-+#include "opt_theme.h"
- #include "common.h"
- #include "iconwidget.h"
- 
-@@ -21,6 +22,7 @@
- #include "ui_opt_appearance_misc.h"
- #include "psioptions.h"
- #include "coloropt.h"
-+#include "psithememanager.h"
- 
- 
- class OptAppearanceUI : public QWidget, public Ui::OptAppearance
-@@ -78,12 +80,25 @@ QSize FontLabel::sizeHint() const
- OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's appearance"), "psi/appearance")
- {
- 	addTab( new OptionsTabAppearanceGeneral(this) );
-+	addTab( new OptionsTabIconset(this) );
-+	if (PsiThemeManager::instance()->registeredProviders().count()) {
-+		addTab( new OptionsTabAppearanceThemes(this) );
-+	}
-+	addTab( new OptionsTabAppearanceMisc(this) );
-+}
-+
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabIconset
-+//----------------------------------------------------------------------------
-+OptionsTabIconset::OptionsTabIconset(QObject *parent) : MetaOptionsTab(parent, "iconsets", "", tr("Icons"), tr("Icons"))
-+{
- 	addTab( new OptionsTabIconsetEmoticons(this) );
- 	addTab( new OptionsTabIconsetRoster(this) );
- 	addTab( new OptionsTabIconsetSystem(this) );
--	addTab( new OptionsTabAppearanceMisc(this) );
- }
- 
-+
- //----------------------------------------------------------------------------
- // OptionsTabAppearanceMisc
- //----------------------------------------------------------------------------
-@@ -232,7 +247,9 @@ QWidget *OptionsTabAppearanceGeneral::wi
- 		{d->ck_cAnimBack,        d->pb_cAnimBack,    "contactlist.status-change-animation2", ""},
- 		{d->ck_cMessageSent,     d->pb_cMessageSent,     "messages.sent", ""},
- 		{d->ck_cMessageReceived, d->pb_cMessageReceived, "messages.received", ""},
--		{d->ck_cSysMsg,          d->pb_cSysMsg,          "messages.informational", ""}
-+		{d->ck_cSysMsg,          d->pb_cSysMsg,          "messages.informational", ""},
-+		{d->ck_cUserText,        d->pb_cUserText,        "messages.usertext", ""}
-+
- 	};
- 
- 	bg_color = new QButtonGroup(this);
---- psi.orig/src/options/opt_appearance.h
-+++ psi/src/options/opt_appearance.h
-@@ -36,6 +36,13 @@ public:
- 	OptionsTabAppearance(QObject *parent);
- };
- 
-+class OptionsTabIconset : public MetaOptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabIconset(QObject *parent);
-+};
-+
- class OptionsTabAppearanceMisc : public OptionsTab
- {
- 	Q_OBJECT
---- psi.orig/src/options/opt_appearance.ui
-+++ psi/src/options/opt_appearance.ui
-@@ -37,7 +37,7 @@
-            <x>0</x>
-            <y>0</y>
-            <width>282</width>
--           <height>432</height>
-+           <height>460</height>
-           </rect>
-          </property>
-          <layout class="QGridLayout" name="gridLayout">
-@@ -296,14 +296,14 @@
-             </property>
-            </widget>
-           </item>
--          <item row="9" column="0">
-+          <item row="10" column="0">
-            <widget class="QCheckBox" name="ck_cOnline">
-             <property name="text">
-              <string>Online contacts:</string>
-             </property>
-            </widget>
-           </item>
--          <item row="9" column="1">
-+          <item row="10" column="1">
-            <widget class="QToolButton" name="pb_cOnline">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -322,14 +322,14 @@
-             </property>
-            </widget>
-           </item>
--          <item row="10" column="0">
-+          <item row="11" column="0">
-            <widget class="QCheckBox" name="ck_cAway">
-             <property name="text">
-              <string>Away contacts:</string>
-             </property>
-            </widget>
-           </item>
--          <item row="10" column="1">
-+          <item row="11" column="1">
-            <widget class="QToolButton" name="pb_cAway">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -348,14 +348,14 @@
-             </property>
-            </widget>
-           </item>
--          <item row="11" column="0">
-+          <item row="12" column="0">
-            <widget class="QCheckBox" name="ck_cDND">
-             <property name="text">
-              <string>DND contacts:</string>
-             </property>
-            </widget>
-           </item>
--          <item row="11" column="1">
-+          <item row="12" column="1">
-            <widget class="QToolButton" name="pb_cDND">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -374,14 +374,14 @@
-             </property>
-            </widget>
-           </item>
--          <item row="12" column="0">
-+          <item row="13" column="0">
-            <widget class="QCheckBox" name="ck_cOffline">
-             <property name="text">
-              <string>Offline contacts:</string>
-             </property>
-            </widget>
-           </item>
--          <item row="12" column="1">
-+          <item row="13" column="1">
-            <widget class="QToolButton" name="pb_cOffline">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -400,7 +400,7 @@
-             </property>
-            </widget>
-           </item>
--          <item row="13" column="0">
-+          <item row="14" column="0">
-            <widget class="QCheckBox" name="ck_cListBack">
-             <property name="whatsThis">
-              <string>Specifies the background color for the main window.</string>
-@@ -410,7 +410,7 @@
-             </property>
-            </widget>
-           </item>
--          <item row="13" column="1">
-+          <item row="14" column="1">
-            <widget class="QToolButton" name="pb_cListBack">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -429,14 +429,14 @@
-             </property>
-            </widget>
-           </item>
--          <item row="14" column="0">
-+          <item row="15" column="0">
-            <widget class="QCheckBox" name="ck_cStatus">
-             <property name="text">
-              <string>Status messages:</string>
-             </property>
-            </widget>
-           </item>
--          <item row="14" column="1">
-+          <item row="15" column="1">
-            <widget class="QToolButton" name="pb_cStatus">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-@@ -455,6 +455,29 @@
-             </property>
-            </widget>
-           </item>
-+          <item row="9" column="0">
-+           <widget class="QCheckBox" name="ck_cUserText">
-+            <property name="whatsThis">
-+             <string>Specifies the color for additional text of system messages. MUC topic for example.</string>
-+            </property>
-+            <property name="text">
-+             <string>Additional message text:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item row="9" column="1">
-+           <widget class="QToolButton" name="pb_cUserText">
-+            <property name="maximumSize">
-+             <size>
-+              <width>20</width>
-+              <height>20</height>
-+             </size>
-+            </property>
-+            <property name="text">
-+             <string/>
-+            </property>
-+           </widget>
-+          </item>
-          </layout>
-         </widget>
-        </widget>
-@@ -578,6 +601,8 @@
-   <tabstop>pb_cMessageReceived</tabstop>
-   <tabstop>ck_cSysMsg</tabstop>
-   <tabstop>pb_cSysMsg</tabstop>
-+  <tabstop>ck_cUserText</tabstop>
-+  <tabstop>pb_cUserText</tabstop>
-   <tabstop>ck_cOnline</tabstop>
-   <tabstop>pb_cOnline</tabstop>
-   <tabstop>ck_cAway</tabstop>
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
-@@ -17,6 +17,7 @@ HEADERS += \
- 	$$PWD/opt_status.h \
- 	$$PWD/opt_appearance.h \
- 	$$PWD/opt_iconset.h \
-+	$$PWD/opt_theme.h \
- 	$$PWD/opt_groupchat.h \
- 	$$PWD/opt_sound.h \
- 	$$PWD/opt_avcall.h \
-@@ -33,6 +34,7 @@ SOURCES += \
- 	$$PWD/opt_status.cpp \
- 	$$PWD/opt_appearance.cpp \
- 	$$PWD/opt_iconset.cpp \
-+	$$PWD/opt_theme.cpp \
- 	$$PWD/opt_groupchat.cpp \
- 	$$PWD/opt_sound.cpp \
- 	$$PWD/opt_avcall.cpp \
-@@ -49,6 +51,7 @@ FORMS += \
- 	$$PWD/opt_status.ui \
- 	$$PWD/opt_appearance.ui \
- 	$$PWD/opt_appearance_misc.ui \
-+	$$PWD/opt_theme.ui \
- 	$$PWD/opt_sound.ui \
- 	$$PWD/opt_avcall.ui \
- 	$$PWD/opt_advanced.ui \
---- psi.orig/src/options/opt_theme.cpp
-+++ psi/src/options/opt_theme.cpp
-@@ -0,0 +1,91 @@
-+#include "opt_theme.h"
-+
-+#include "ui_opt_theme.h"
-+#include "psioptions.h"
-+#include "psithememodel.h"
-+#include "psithemeviewdelegate.h"
-+#include "psithememanager.h"
-+
-+class OptAppearanceThemeUI : public QWidget, public Ui::OptAppearanceTheme
-+{
-+public:
-+	OptAppearanceThemeUI() : QWidget() { setupUi(this); }
-+};
-+
-+
-+
-+OptionsTabAppearanceThemes::OptionsTabAppearanceThemes(QObject *parent)
-+	: MetaOptionsTab(parent, "themes", "", tr("Themes"), tr("Configure themes"))
-+{
-+	foreach (PsiThemeProvider *provider,
-+			 PsiThemeManager::instance()->registeredProviders()) {
-+		addTab( new OptionsTabAppearanceTheme(this, provider) );
-+	}
-+}
-+
-+
-+
-+
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabAppearanceTheme
-+//----------------------------------------------------------------------------
-+
-+OptionsTabAppearanceTheme::OptionsTabAppearanceTheme(QObject *parent,
-+													PsiThemeProvider *provider_)
-+	: OptionsTab(parent, provider_->type(), "",
-+				 provider_->optionsName(),
-+				 provider_->optionsDescription())
-+	, w(0)
-+	, provider(provider_)
-+{
-+
-+}
-+
-+OptionsTabAppearanceTheme::~OptionsTabAppearanceTheme()
-+{
-+
-+}
-+
-+QWidget *OptionsTabAppearanceTheme::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new OptAppearanceThemeUI();
-+	OptAppearanceThemeUI *d = (OptAppearanceThemeUI *)w;
-+	themesModel = new PsiThemeModel(this);
-+	themesModel->setType(provider->type());
-+	PsiThemeViewDelegate *vd = new PsiThemeViewDelegate(d->themeView);
-+	d->themeView->setItemDelegate(vd);
-+	d->themeView->setModel(themesModel);
-+	int sw = provider->screenshotWidth();
-+	if (sw) {
-+		d->themeView->setFixedWidth(sw);
-+	}
-+	connect(d->themeView->selectionModel(),
-+			SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-+			SIGNAL(dataChanged()));
-+
-+	return w;
-+}
-+
-+void OptionsTabAppearanceTheme::applyOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptAppearanceThemeUI *d = (OptAppearanceThemeUI *)w;
-+	provider->setCurrentTheme(d->themeView->currentIndex().data(PsiThemeModel::IdRole).toString());
-+}
-+
-+void OptionsTabAppearanceTheme::restoreOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptAppearanceThemeUI *d = (OptAppearanceThemeUI *)w;
-+
-+	Theme *theme = provider->current();
-+	d->themeView->setCurrentIndex(themesModel->index( themesModel->themeRow(theme?theme->id():"") ));
-+}
---- psi.orig/src/options/opt_theme.h
-+++ psi/src/options/opt_theme.h
-@@ -0,0 +1,35 @@
-+#ifndef OPT_THEME_H
-+#define OPT_THEME_H
-+
-+#include "optionstab.h"
-+
-+class QWidget;
-+class PsiThemeModel;
-+class PsiThemeProvider;
-+
-+class OptionsTabAppearanceThemes : public MetaOptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabAppearanceThemes(QObject *parent);
-+};
-+
-+class OptionsTabAppearanceTheme : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabAppearanceTheme(QObject *parent, PsiThemeProvider *provider_);
-+	~OptionsTabAppearanceTheme();
-+
-+	bool stretchable() const { return true; }
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+
-+private:
-+	QWidget *w;
-+	PsiThemeModel *themesModel;
-+	PsiThemeProvider *provider;
-+};
-+
-+#endif
---- psi.orig/src/options/opt_theme.ui
-+++ psi/src/options/opt_theme.ui
-@@ -0,0 +1,82 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptAppearanceTheme</class>
-+ <widget class="QWidget" name="OptAppearanceTheme">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>274</width>
-+    <height>257</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>OptAppearanceThemeUI</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <layout class="QHBoxLayout" name="adapterLayout">
-+     <item>
-+      <widget class="QListView" name="themeView"/>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer_2">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="URLLabel" name="lbl_morethemes">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="text">
-+        <string>&lt;a href=&quot;thememanager://showmore/&quot;&gt;More themes&lt;/a&gt;</string>
-+       </property>
-+       <property name="alignment">
-+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>URLLabel</class>
-+   <extends>QLabel</extends>
-+   <header>urllabel.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -27,6 +27,7 @@
- #include "iconwidget.h"
- #include "fancylabel.h"
- #include "msgmle.h"
-+#include "messageview.h"
- #include "iconselect.h"
- #include "avatars.h"
- #include "psitooltip.h"
-@@ -39,7 +40,6 @@
- #include "psicontactlist.h"
- #include "userlist.h"
- #include "jidutil.h"
--#include "textutil.h"
- #include "xmpp_tasks.h"
- #include "lastactivitytask.h"
- 
-@@ -136,8 +136,8 @@ public slots:
- 			dlg_->appendSysMsg("No version information available.");
- 			return;
- 		}
--		dlg_->appendSysMsg(QString("Version response: N: %2 V: %3 OS: %4")
--			.arg(version->name(), version->version(), version->os()));
-+		dlg_->appendSysMsg(TextUtil::escape(QString("Version response: N: %2 V: %3 OS: %4")
-+			.arg(version->name(), version->version(), version->os())));
- 	};
- 
- 	void lastactivity_finished()
-@@ -154,7 +154,7 @@ public slots:
- 				.arg(idle->time().toString()));
- 		} else {
- 			dlg_->appendSysMsg(QString("Last activity at %1 (%2)")
--				.arg(idle->time().toString(), idle->status()));
-+				.arg(idle->time().toString(), TextUtil::escape(idle->status())));
- 		}
- 	}
- 
-@@ -526,67 +526,6 @@ void PsiChatDlg::updateCounter()
- 	ui_.lb_count->setNum(chatEdit()->toPlainText().length());
- }
- 
--void PsiChatDlg::appendEmoteMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject)
--{
--	updateLastMsgTime(time);
--	QString color = colorString(local, spooled);
--	QString timestr = chatView()->formatTimeStamp(time);
--
--	if (subject.isEmpty()) {
--		chatView()->appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(whoNick(local)) + txt + "</span>");
--	} else {
--		chatView()->appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + "</span><br><b>" + tr("Subject:") + "</b> " + subject);
--		chatView()->appendText(QString("<span style=\"color: %1\">").arg(color) + QString(" *%1 ").arg(whoNick(local)) + txt + "</span>");
--	}
--
--}
--
--void PsiChatDlg::appendNormalMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject)
--{
--	updateLastMsgTime(time);
--	QString color = colorString(local, spooled);
--	QString timestr = chatView()->formatTimeStamp(time);
--	QString subjectLine;
--	if (!subject.isEmpty()) {
--		subjectLine = "<b>" + tr("Subject:") + "</b> " + subject;
--	}
--
--	if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--		chatView()->appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(whoNick(local)) + "</span>");
--		if (!subjectLine.isEmpty()) {
--			chatView()->appendText(subjectLine);
--		}
--		chatView()->appendText(txt);
--	}
--	else {
--		QString intro = QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + whoNick(local) + QString("&gt;</span>");
--		if (subjectLine.isEmpty()) {
--			chatView()->appendText(intro + " " + txt);
--		} else {
--			chatView()->appendText(intro);
--			chatView()->appendText(subjectLine);
--			chatView()->appendText(txt);
--		}
--
--	}
--}
--
--void PsiChatDlg::appendMessageFields(const Message& m)
--{
--//	if (!m.subject().isEmpty()) {
--//		chatView()->appendText(QString("<b>") + tr("Subject:") + "</b> " + QString("%1").arg(TextUtil::escape(m.subject())));
--//	}
--	if (!m.urlList().isEmpty()) {
--		UrlList urls = m.urlList();
--		chatView()->appendText(QString("<i>") + tr("-- Attached URL(s) --") + "</i>");
--		for (QList<Url>::ConstIterator it = urls.begin(); it != urls.end(); ++it) {
--			const Url &u = *it;
--			chatView()->appendText(QString("<b>") + tr("URL:") + "</b> " + QString("%1").arg(TextUtil::linkify(TextUtil::escape(u.url()))));
--			chatView()->appendText(QString("<b>") + tr("Desc:") + "</b> " + QString("%1").arg(u.desc()));
--		}
--	}
--}
--
- bool PsiChatDlg::isEncryptionEnabled() const
- {
- 	return act_pgp_->isChecked();
-@@ -594,25 +533,7 @@ bool PsiChatDlg::isEncryptionEnabled() c
- 
- void PsiChatDlg::appendSysMsg(const QString &str)
- {
--	QDateTime t = QDateTime::currentDateTime();
--	updateLastMsgTime(t);
--	QString timestr = chatView()->formatTimeStamp(t);
--	QString color = ColorOpt::instance()->color("options.ui.look.colors.messages.informational").name();
--
--	chatView()->appendText(QString("<font color=\"%1\">[%2]").arg(color, timestr) + QString(" *** %1</font>").arg(str));
--}
--
--QString PsiChatDlg::colorString(bool local, ChatDlg::SpooledType spooled) const
--{
--	if (spooled == ChatDlg::Spooled_OfflineStorage) {
--		return ColorOpt::instance()->color("options.ui.look.colors.messages.informational").name();
--	}
--
--	if (local) {
--		return ColorOpt::instance()->color("options.ui.look.colors.messages.sent").name();
--	}
--
--	return ColorOpt::instance()->color("options.ui.look.colors.messages.received").name();
-+	chatView()->dispatchMessage(MessageView::fromHtml(str, MessageView::System));
- }
- 
- ChatView* PsiChatDlg::chatView() const
-@@ -643,23 +564,13 @@ void PsiChatDlg::doSend() {
- 	if (mCmdSite_.isActive()) {
- 		QString str = chatEdit()->toPlainText();
- 		if (!mCmdManager_.processCommand(str)) {
--			appendSysMsg(tr("Error: Can not parse command: ") + str);
-+			appendSysMsg(tr("Error: Can not parse command: ") + TextUtil::escape(str));
- 		}
- 	} else {
- 		ChatDlg::doSend();
- 	}
- }
- 
--void PsiChatDlg::updateLastMsgTime(QDateTime t)
--{
--	bool doInsert = t.date() != lastMsgTime_.date();
--	lastMsgTime_ = t;
--	if (doInsert) {
--		QString color = "#00A000";
--		chatView()->appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(t.date().toString(Qt::ISODate)));
--	}
--}
--
- void PsiChatDlg::doMiniCmd()
- {
- 	mCmdManager_.open(new MCmdSimpleState(MCMDCHAT, tr("Command>")), QStringList() );
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -55,12 +55,7 @@ private:
- 	void activated();
- 	void setLooks();
- 	void setShortcuts();
--	QString colorString(bool local, SpooledType spooled) const;
- 	void appendSysMsg(const QString &);
--	void appendEmoteMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject);
--	void appendNormalMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject);
--	void appendMessageFields(const Message& m);
--	void updateLastMsgTime(QDateTime t);
- 	ChatView* chatView() const;
- 	ChatEdit* chatEdit() const;
- 
-@@ -86,7 +81,6 @@ private:
- 	MCmdTabCompletion tabCompletion;
- 
- 	bool smallChat_;
--	QDateTime lastMsgTime_;
- 	class ChatDlgMCmdProvider;
- };
- 
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -40,6 +40,7 @@
- #include "activeprofiles.h"
- #include "accountadddlg.h"
- #include "psiiconset.h"
-+#include "psithememanager.h"
- #ifndef NEWCONTACTLIST
- # include "contactview.h"
- #endif
-@@ -80,6 +81,12 @@
- #include "accountscombobox.h"
- #include "tabdlg.h"
- #include "chatdlg.h"
-+#ifdef WEBKIT
-+#include "avatars.h"
-+#include "chatviewthemeprovider.h"
-+#include "networkaccessmanager.h"
-+#include "webview.h"
-+#endif
- #include "capsregistry.h"
- #include "urlobject.h"
- #include "anim.h"
-@@ -191,6 +198,7 @@ private:
- 	}
- };
- 
-+
- //----------------------------------------------------------------------------
- // PsiCon::Private
- //----------------------------------------------------------------------------
-@@ -496,6 +504,19 @@ bool PsiCon::init()
- 		//}
- 	}
- 
-+#ifdef WEBKIT
-+	PsiThemeManager::instance()->registerProvider(
-+			new ChatViewThemeProvider(this), true);
-+	PsiThemeManager::instance()->registerProvider(
-+			new GroupChatViewThemeProvider(this), true);
-+	NetworkAccessManager::instance()->setSchemeHandler("icon", new IconHandler());
-+#endif
-+
-+	if( !PsiThemeManager::instance()->loadAll() ) {
-+		QMessageBox::critical(0, tr("Error"), tr("Unable to load theme!  Please make sure Psi is properly installed."));
-+		result = false;
-+	}
-+
- 	if ( !d->actionList )
- 		d->actionList = new PsiActionList( this );
- 
-@@ -642,7 +663,6 @@ bool PsiCon::init()
- 	}	
- 	
- 	checkAccountsEmpty();
--	
- 	// try autologin if needed
- 	foreach(PsiAccount* account, d->contactList->accounts()) {
- 		account->autoLogin();
---- psi.orig/src/psiiconset.cpp
-+++ psi/src/psiiconset.cpp
-@@ -235,7 +235,7 @@ public:
- 		foreach(QString name, PsiOptions::instance()->getOption("options.iconsets.emoticons").toStringList()) {
- 			Iconset *is = new Iconset;
- 			if ( is->load ( iconsetPath("emoticons/" + name) ) ) {
--				PsiIconset::removeAnimation(is);
-+				//PsiIconset::removeAnimation(is);
- 				is->addToFactory();
- 				emo.append( is );
- 			}
---- psi.orig/src/psithememanager.cpp
-+++ psi/src/psithememanager.cpp
-@@ -0,0 +1,86 @@
-+/*
-+ * psithememanager.h - manages all themes in psi
-+ * Copyright (C) 2010  Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psithememanager.h"
-+
-+#include <QCoreApplication>
-+
-+#include "theme.h"
-+#include "applicationinfo.h"
-+
-+class PsiThemeManager::Private {
-+public:
-+	QMap<QString, PsiThemeProvider *> providers;
-+	QSet<QString> required;
-+};
-+
-+
-+
-+//---------------------------------------------------------
-+// PsiThemeManager
-+//---------------------------------------------------------
-+PsiThemeManager::PsiThemeManager()
-+	: QObject(QCoreApplication::instance())
-+{
-+	d = new Private;//(this);
-+}
-+
-+PsiThemeManager::~PsiThemeManager()
-+{
-+	delete d;
-+}
-+
-+PsiThemeManager* PsiThemeManager::instance()
-+{
-+	if (!instance_)
-+		instance_ = new PsiThemeManager();
-+	return instance_;
-+}
-+
-+void PsiThemeManager::registerProvider(PsiThemeProvider *provider,
-+									   bool required)
-+{
-+	d->providers[provider->type()] = provider;
-+	if (required) {
-+		d->required.insert(provider->type());
-+	}
-+}
-+
-+PsiThemeProvider *PsiThemeManager::provider(const QString &type)
-+{
-+	return d->providers.value(type);
-+}
-+
-+QList<PsiThemeProvider *> PsiThemeManager::registeredProviders() const
-+{
-+	return d->providers.values();
-+}
-+
-+bool PsiThemeManager::loadAll()
-+{
-+	foreach (const QString &type, d->providers.keys()) {
-+		if (!d->providers[type]->loadCurrent() && d->required.contains(type)) {
-+			return false;
-+		}
-+	}
-+	return true;
-+}
-+
-+PsiThemeManager* PsiThemeManager::instance_ = NULL;
---- psi.orig/src/psithememanager.h
-+++ psi/src/psithememanager.h
-@@ -0,0 +1,51 @@
-+/*
-+ * psithememanager.h - manages all themes in psi
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSITHEMEMANAGER_H
-+#define PSITHEMEMANAGER_H
-+
-+#include <QObject>
-+
-+#include "psithemeprovider.h"
-+
-+//class ChatViewTheme;
-+
-+class PsiThemeManager : public QObject {
-+	Q_OBJECT
-+public:
-+	static PsiThemeManager* instance();
-+
-+	void registerProvider(PsiThemeProvider *provider, bool required = false);
-+	PsiThemeProvider *provider(const QString &type);
-+	QList<PsiThemeProvider *> registeredProviders() const;
-+	bool loadAll();
-+
-+private:
-+	PsiThemeManager();
-+	~PsiThemeManager();
-+
-+	static PsiThemeManager* instance_;
-+
-+	class Private;
-+	Private *d;
-+};
-+
-+
-+#endif
---- psi.orig/src/psithememodel.cpp
-+++ psi/src/psithememodel.cpp
-@@ -0,0 +1,153 @@
-+/*
-+ * psithememodel.h - just a model for theme views
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psithememodel.h"
-+
-+#include <QtConcurrentMap>
-+#include <QPixmap>
-+
-+#include "psithememanager.h"
-+
-+
-+class PsiThemeModel;
-+struct PsiThemeModel::Loader
-+{
-+	Loader(PsiThemeProvider *provider_)
-+	: provider(provider_) { }
-+
-+	typedef ThemeItemInfo result_type;
-+
-+	ThemeItemInfo operator()(const QString &id)
-+	{
-+		Theme *t = provider->load(id);
-+		ThemeItemInfo ti;
-+		if (t) { // if loaded
-+			ti.id = id;
-+			ti.title = t->title();
-+			ti.screenshot = t->screenshot();
-+			ti.isValid = true;
-+		} else {
-+			ti.isValid = false;
-+		}
-+		return ti;
-+	}
-+
-+	PsiThemeProvider *provider;
-+};
-+
-+//------------------------------------------------------------------------------
-+// PsiThemeModel
-+//------------------------------------------------------------------------------
-+
-+PsiThemeModel::PsiThemeModel(QObject *parent)
-+	: QAbstractListModel(parent)
-+{
-+	connect(&themeWatcher, SIGNAL(progressValueChanged(int)),
-+			SLOT(loadProgress(int)));
-+	connect(&themeWatcher, SIGNAL(finished()), SLOT(loadComplete()));
-+}
-+
-+void PsiThemeModel::loadProgress(int pv)
-+{
-+	qDebug("%d", pv);
-+}
-+
-+void PsiThemeModel::loadComplete()
-+{
-+	QFutureIterator<ThemeItemInfo> i(themesFuture);
-+#if QT_VERSION >= 0x040600
-+	beginResetModel();
-+#endif
-+	while (i.hasNext()) {
-+		ThemeItemInfo ti = i.next();
-+		if (ti.isValid) {
-+			qDebug("%s theme loaded", qPrintable(ti.id));
-+			themesInfo.append(ti);
-+		} else {
-+			qDebug("failed to load theme %s", qPrintable(ti.id));
-+		}
-+	}
-+#if QT_VERSION >= 0x040600
-+	endResetModel();
-+#else
-+	reset();
-+#endif
-+}
-+
-+void PsiThemeModel::setType(const QString &type)
-+{
-+	PsiThemeProvider *provider = PsiThemeManager::instance()->provider(type);
-+	if (provider) {
-+		Loader loader = Loader(provider);
-+		if (provider->threadedLoading()) {
-+			themesFuture = QtConcurrent::mapped(provider->themeIds(), loader);
-+			themeWatcher.setFuture(themesFuture);
-+		} else {
-+#if QT_VERSION >= 0x040600
-+			beginResetModel();
-+#endif
-+			foreach (const QString id, provider->themeIds()) {
-+				ThemeItemInfo ti = loader(id);
-+				if (ti.isValid) {
-+					themesInfo.append(ti);
-+				}
-+			}
-+#if QT_VERSION >= 0x040600
-+			endResetModel();
-+#else
-+			reset();
-+#endif
-+		}
-+	}
-+}
-+
-+int PsiThemeModel::rowCount ( const QModelIndex & parent ) const
-+{
-+	Q_UNUSED(parent)
-+	return themesInfo.count();
-+}
-+
-+QVariant PsiThemeModel::data ( const QModelIndex & index, int role ) const
-+{
-+	switch (role) {
-+		case IdRole:
-+			return themesInfo[index.row()].id;
-+		case TitleRole:
-+			return themesInfo[index.row()].title;
-+		case ScreenshotRole:
-+			QPixmap p;
-+			p.loadFromData(themesInfo[index.row()].screenshot);
-+			return p;
-+	}
-+	return QVariant();
-+}
-+
-+
-+int PsiThemeModel::themeRow(const QString &id)
-+{
-+	int i = 0;
-+	foreach (const ThemeItemInfo &tii, themesInfo) {
-+		if (tii.id == id) {
-+			return i;
-+		}
-+		i++;
-+	}
-+	return -1;
-+}
---- psi.orig/src/psithememodel.h
-+++ psi/src/psithememodel.h
-@@ -0,0 +1,67 @@
-+/*
-+ * psithememodel.h - just a model for theme views
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSITHEMEMODEL_H
-+#define PSITHEMEMODEL_H
-+
-+#include <QAbstractListModel>
-+#include <QFutureWatcher>
-+
-+class Theme;
-+
-+struct ThemeItemInfo
-+{
-+	QString id;
-+	QString title;
-+	QByteArray screenshot;
-+	bool isValid;
-+};
-+
-+
-+class PsiThemeModel : public QAbstractListModel
-+{
-+	Q_OBJECT
-+
-+public:
-+	enum ThemeRoles {
-+		IdRole = Qt::UserRole + 1,
-+		ScreenshotRole = Qt::UserRole + 2,
-+		TitleRole = Qt::UserRole + 3
-+	};
-+
-+	PsiThemeModel(QObject *parent);
-+	void setType(const QString &type);
-+
-+	int rowCount ( const QModelIndex & parent = QModelIndex() ) const ;
-+	QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
-+	int themeRow(const QString &id);
-+
-+private slots:
-+	void loadProgress(int);
-+	void loadComplete();
-+
-+private:
-+	class Loader;
-+	QFutureWatcher<ThemeItemInfo> themeWatcher;
-+	QFuture<ThemeItemInfo> themesFuture;
-+	QList<ThemeItemInfo> themesInfo;
-+};
-+
-+#endif
---- psi.orig/src/psithemeprovider.cpp
-+++ psi/src/psithemeprovider.cpp
-@@ -0,0 +1,64 @@
-+/*
-+ * psithemeprovider.cpp - kinda adapter for set of themes
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psithemeprovider.h"
-+
-+#include <QFileInfo>
-+#include <QStringList>
-+
-+#include "applicationinfo.h"
-+
-+
-+PsiThemeProvider::PsiThemeProvider(QObject *parent)
-+	: QObject(parent)
-+{
-+
-+}
-+
-+QString PsiThemeProvider::themePath(const QString &name) const {
-+	QStringList dirs;
-+	dirs << ":";
-+	dirs << ".";
-+	dirs << ApplicationInfo::homeDir(ApplicationInfo::DataLocation);
-+	dirs << ApplicationInfo::resourcesDir();
-+
-+	foreach (QString dir, dirs) {
-+		QString fileName = dir + "/themes/" + name;
-+
-+		QFileInfo fi(fileName);
-+		if ( fi.exists() )
-+			return fileName;
-+	}
-+
-+	qWarning("PsiThemeManager::Private::themePath(\"%s\"): not found", qPrintable(name));
-+	return QString();
-+}
-+
-+
-+// says where theme is able to load in separate thread
-+bool PsiThemeProvider::threadedLoading() const
-+{
-+	return false;
-+}
-+
-+int PsiThemeProvider::screenshotWidth() const
-+{
-+	return 0;
-+}
---- psi.orig/src/psithemeprovider.h
-+++ psi/src/psithemeprovider.h
-@@ -0,0 +1,50 @@
-+/*
-+ * psithemeprovider.h - kinda adapter for set of themes
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSITHEMEPROVIDER_H
-+#define PSITHEMEPROVIDER_H
-+
-+#include <QFuture>
-+#include "theme.h"
-+
-+class PsiThemeProvider : public QObject
-+{
-+	Q_OBJECT
-+
-+public:
-+	PsiThemeProvider(QObject *parent);
-+
-+	virtual const char* type() const = 0;
-+	virtual Theme* load(const QString &) = 0;
-+	virtual const QStringList themeIds() const = 0;
-+	virtual bool loadCurrent() = 0;
-+	virtual Theme* current() const = 0;
-+	virtual void setCurrentTheme(const QString &) = 0;
-+
-+	virtual bool threadedLoading() const;
-+	virtual int screenshotWidth() const;
-+
-+	virtual QString optionsName() const = 0;
-+	virtual QString optionsDescription() const = 0;
-+
-+	QString themePath(const QString &name) const;
-+};
-+
-+#endif
---- psi.orig/src/psithemeviewdelegate.cpp
-+++ psi/src/psithemeviewdelegate.cpp
-@@ -0,0 +1,87 @@
-+/*
-+ * psithemeviewdelegate.cpp - renders theme items
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psithemeviewdelegate.h"
-+#include "psithememodel.h"
-+#include <QPainter>
-+#include <QFontMetrics>
-+#include "iconset.h"
-+
-+// painting
-+void PsiThemeViewDelegate::paint(QPainter *painter,
-+				   const QStyleOptionViewItem &option,
-+				   const QModelIndex &index) const
-+{
-+	QPixmap screenshot = index.data(PsiThemeModel::ScreenshotRole).value<QPixmap>();
-+	QPixmap texture = IconsetFactory::iconPixmap("psi/themeTitleTexture");
-+	int texturew = texture.width();
-+	int textureh = texture.height();
-+
-+	QFont f("Serif");
-+	f.setBold(true);
-+	if (screenshot.isNull()) {
-+		f.setPixelSize(20);
-+		painter->setFont(f);
-+		painter->setPen(QColor(170, 170, 170));
-+		QRect nirect(0, option.rect.top() + textureh, option.rect.width(), 20);
-+		painter->drawText(nirect, Qt::AlignCenter, tr("No Image"));
-+	} else {
-+		QRect sp = screenshot.rect();
-+		sp.moveTopLeft(option.rect.topLeft());
-+		painter->drawPixmap(sp, screenshot);
-+	}
-+
-+	f.setItalic(true);
-+	f.setPixelSize(textureh - 8);
-+	painter->setFont(f);
-+	QFontMetrics fm(f);
-+	QString text = index.data(PsiThemeModel::TitleRole).toString();
-+	QSize textSize = fm.size(Qt::TextSingleLine, text);
-+	int tw = textSize.width() + 10;
-+	int y = option.rect.top();
-+	int vw = option.rect.width();
-+
-+	painter->drawPixmap(0, y, vw - tw - texturew, textureh, texture.copy(0, 0, 1, textureh).scaled(vw - tw - texturew, textureh));
-+	painter->drawPixmap(vw - tw - texturew, y, texturew, textureh, texture);
-+	painter->drawPixmap(vw - tw, y, tw, textureh, texture.copy(texturew - 1, 0, 1, textureh).scaled(tw, textureh));
-+
-+
-+	painter->setPen(option.state & QStyle::State_Selected? Qt::white : QColor(170, 170, 170));
-+	QRect txtr(vw - tw, y, tw, textureh-5); // 5 shadow size?
-+	painter->drawText(txtr, Qt::AlignCenter, text);
-+}
-+
-+QSize PsiThemeViewDelegate::sizeHint(const QStyleOptionViewItem &option,
-+					   const QModelIndex &index) const
-+{
-+	int textureh = IconsetFactory::iconPixmap("psi/themeTitleTexture").height();
-+	QPixmap screenshot = index.data(PsiThemeModel::ScreenshotRole).value<QPixmap>();
-+	int h = screenshot.isNull()? textureh + 20 : qMax(textureh, screenshot.height());
-+	return QSize(option.rect.width(), h);
-+}
-+
-+// editing
-+QWidget *PsiThemeViewDelegate::createEditor(QWidget */*parent*/,
-+							  const QStyleOptionViewItem &/*option*/,
-+							  const QModelIndex &/*index*/) const
-+{
-+	return 0;
-+}
-+
---- psi.orig/src/psithemeviewdelegate.h
-+++ psi/src/psithemeviewdelegate.h
-@@ -0,0 +1,49 @@
-+/*
-+ * psithemeviewdelegate.h - renders theme items
-+ * Copyright (C) 2010 Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSITHEMEVIEWDELEGATE_H
-+#define PSITHEMEVIEWDELEGATE_H
-+
-+#include <QAbstractItemDelegate>
-+
-+class PsiThemeViewDelegate : public QAbstractItemDelegate
-+{
-+	Q_OBJECT
-+public:
-+	PsiThemeViewDelegate ( QObject * parent = 0 )
-+		: QAbstractItemDelegate ( parent ) { }
-+
-+	// painting
-+	virtual void paint(QPainter *painter,
-+					   const QStyleOptionViewItem &option,
-+					   const QModelIndex &index) const;
-+
-+	virtual QSize sizeHint(const QStyleOptionViewItem &option,
-+						   const QModelIndex &index) const;
-+
-+	// editing
-+	virtual QWidget *createEditor(QWidget *parent,
-+								  const QStyleOptionViewItem &option,
-+								  const QModelIndex &index) const;
-+
-+	static const int TextPadding = 3;
-+};
-+
-+#endif
---- psi.orig/src/psiwkavatarhandler.cpp
-+++ psi/src/psiwkavatarhandler.cpp
-@@ -0,0 +1,81 @@
-+/*
-+ * psiwkavatarhandler.cpp - "avatar" schema handler for for network manager
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "psiwkavatarhandler.h"
-+
-+#include <QBuffer>
-+
-+#include "iconset.h"
-+#include "avatars.h"
-+#include "psicontactlist.h"
-+#include "psiaccount.h"
-+
-+PsiWKAvatarHandler::PsiWKAvatarHandler(PsiCon *pc)
-+	: psi_(pc)
-+{
-+	defaultAvatar_[""] = IconsetFactory::icon("psi/default_avatar").pixmap();
-+	size_ = defaultAvatar_[""].size();
-+}
-+
-+QByteArray PsiWKAvatarHandler::data(const QUrl &url) const {
-+	QStringList parts = url.path().split("/");
-+	qDebug("loading avatar");
-+	PsiAccount *ac;
-+	if (parts.size() > 0 && parts[0].isEmpty()) { // first / makes empty string
-+		parts.removeFirst();
-+	}
-+	if (parts.count() == 2 && (ac = psi_->contactList()->getAccount(parts[0]))) {
-+		QPixmap p = ac->avatarFactory()->getAvatar(parts[1]);
-+		if (p.isNull()) {
-+			if (!url.host().isEmpty() && defaultAvatar_.value(url.host()).isNull()) {
-+				p = defaultAvatar_.value("");
-+			} else {
-+				p = defaultAvatar_.value(url.host());
-+			}
-+			if (p.isNull()) {
-+				p = IconsetFactory::icon("psi/default_avatar").pixmap();
-+			}
-+		}
-+		QByteArray ba;
-+		QBuffer buffer(&ba);
-+		buffer.open(QIODevice::WriteOnly);
-+		p.scaled(size_, Qt::KeepAspectRatio, Qt::SmoothTransformation).toImage().save(&buffer, "PNG");
-+		return ba;
-+	}
-+	return QByteArray();
-+}
-+
-+void PsiWKAvatarHandler::setDefaultAvatar(const QString &filename, const QString &host)
-+{
-+	defaultAvatar_[host] = QPixmap(filename);
-+	size_ = defaultAvatar_[host].size();
-+}
-+
-+void PsiWKAvatarHandler::setDefaultAvatar(const QByteArray &ba, const QString &host)
-+{
-+	defaultAvatar_[host] = QPixmap();
-+	defaultAvatar_[host].loadFromData(ba);
-+	size_ = defaultAvatar_[host].size();
-+}
-+
-+void PsiWKAvatarHandler::setAvatarSize(const QSize &size)
-+{
-+	size_ = size;
-+}
---- psi.orig/src/psiwkavatarhandler.h
-+++ psi/src/psiwkavatarhandler.h
-@@ -0,0 +1,42 @@
-+/*
-+ * psiwkavatarhandler.h - "avatar" schema handler for for network manager
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PSIWKAVATARHANDLER_H
-+#define PSIWKAVATARHANDLER_H
-+
-+#include "networkaccessmanager.h"
-+#include "psicon.h"
-+
-+class PsiWKAvatarHandler : public NAMSchemeHandler
-+{
-+public:
-+	PsiWKAvatarHandler(PsiCon *pc);
-+	QByteArray data(const QUrl &url) const;
-+	void setDefaultAvatar(const QString &filename, const QString &host = "");
-+	void setDefaultAvatar(const QByteArray &ba, const QString &host = "");
-+	void setAvatarSize(const QSize &);
-+
-+private:
-+	QMap<QString,QPixmap> defaultAvatar_;
-+	PsiCon *psi_;
-+	QSize size_;
-+};
-+
-+#endif
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -114,6 +114,11 @@ HEADERS += \
- 	$$PWD/psievent.h \
- 	$$PWD/xmlconsole.h \
- 	$$PWD/psiiconset.h \
-+	$$PWD/psithememanager.h \
-+	$$PWD/psithememodel.h \
-+	$$PWD/psithemeviewdelegate.h \
-+	$$PWD/psithemeprovider.h \
-+	$$PWD/theme.cpp \
- 	$$PWD/applicationinfo.h \
- 	$$PWD/pgptransaction.h \
- 	$$PWD/userlist.h \
-@@ -131,6 +136,9 @@ HEADERS += \
- 	$$PWD/accountmodifydlg.h \
- 	$$PWD/changepwdlg.h \
- 	$$PWD/msgmle.h \
-+	$$PWD/chatviewcommon.h \
-+	$$PWD/chatview.h \
-+	$$PWD/messageview.h \
- 	$$PWD/statusdlg.h \
- 	$$PWD/statuscombobox.h \
- 	$$PWD/eventdlg.h \
-@@ -240,6 +248,11 @@ SOURCES += \
- 	$$PWD/psievent.cpp \
- 	$$PWD/xmlconsole.cpp \
- 	$$PWD/psiiconset.cpp \
-+	$$PWD/psithememanager.cpp \
-+	$$PWD/psithememodel.cpp \
-+	$$PWD/psithemeviewdelegate.cpp \
-+	$$PWD/psithemeprovider.cpp \
-+	$$PWD/theme.cpp \
- 	$$PWD/applicationinfo.cpp \
- 	$$PWD/pgptransaction.cpp \
- 	$$PWD/serverinfomanager.cpp \
-@@ -258,6 +271,8 @@ SOURCES += \
- 	$$PWD/accountmodifydlg.cpp \
- 	$$PWD/changepwdlg.cpp \
- 	$$PWD/msgmle.cpp \
-+	$$PWD/chatviewcommon.cpp \
-+	$$PWD/messageview.cpp \
- 	$$PWD/statusdlg.cpp \
- 	$$PWD/statuscombobox.cpp \
- 	$$PWD/eventdlg.cpp \
-@@ -595,6 +610,31 @@ unix:!dbus {
- 	SOURCES += $$PWD/activeprofiles_stub.cpp
- }
- 
-+webkit {
-+	HEADERS += 	$$PWD/chatview_webkit.h \
-+			$$PWD/networkaccessmanager.h \
-+			$$PWD/bytearrayreply.h \
-+			$$PWD/webview.h \
-+			$$PWD/psiwkavatarhandler.h \
-+			$$PWD/jsutil.h \
-+			$$PWD/chatviewtheme.h \
-+			$$PWD/chatviewthemeprovider.h
-+	SOURCES += 	$$PWD/chatview_webkit.cpp \
-+			$$PWD/networkaccessmanager.cpp \
-+			$$PWD/bytearrayreply.cpp \
-+			$$PWD/webview.cpp \
-+			$$PWD/psiwkavatarhandler.cpp \
-+			$$PWD/jsutil.cpp \
-+			$$PWD/chatviewtheme.cpp \
-+			$$PWD/chatviewthemeprovider.cpp
-+	DEFINES += WEBKIT
-+	QT += webkit
-+}
-+else {
-+	HEADERS += 	$$PWD/chatview_te.h
-+	SOURCES += 	$$PWD/chatview_te.cpp
-+}
-+
- mac {
- 	QMAKE_LFLAGS += -framework Carbon -framework IOKit -framework AppKit
- }
---- psi.orig/src/src.pro
-+++ psi/src/src.pro
-@@ -31,6 +31,9 @@ unix {
- 	# Shared files
- 	sharedfiles.path  = $$PSI_DATADIR
- 	sharedfiles.files = ../README ../COPYING ../iconsets ../sound ../certs
-+	webkit {
-+		sharedfiles.files += ../themes
-+	}
- 	INSTALLS += sharedfiles
- 
- 	# Widgets
---- psi.orig/src/statusdlg.cpp
-+++ psi/src/statusdlg.cpp
-@@ -37,7 +37,7 @@
- #include "psiaccount.h"
- #include "userlist.h"
- #include "common.h"
--#include "msgmle.h"
-+#include "psitextview.h"
- #include "statuspreset.h"
- #include "statuscombobox.h"
- #include "shortcutmanager.h"
-@@ -88,7 +88,7 @@ public:
- 	PsiCon *psi;
- 	PsiAccount *pa;
- 	Status s;
--	ChatView *te;
-+	PsiTextView *te;
- 	StatusComboBox *cb_type;
- 	QComboBox *cb_preset;
- 	QLineEdit *le_priority;
-@@ -161,8 +161,8 @@ void StatusSetDlg::init()
- 	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(chooseStatusPreset(int)));
- 	hb1->addWidget(d->cb_preset,3);
- 
--	d->te = new ChatView(this);
--	d->te->setDialog(this);
-+	d->te = new PsiTextView(this);
-+	//d->te->setDialog(this);
- 	d->te->setReadOnly(false);
- 	d->te->setAcceptRichText(false);
- 	d->te->setMinimumHeight(50);
---- psi.orig/src/textutil.cpp
-+++ psi/src/textutil.cpp
-@@ -150,7 +150,7 @@ QString TextUtil::rich2plain(const QStri
- 				out += '\n';
- 			
- 			// handle output of Qt::convertFromPlainText() correctly
--			if((tagName == "p" || tagName == "/p") && out.length() > 0)
-+			if((tagName == "p" || tagName == "/p" || tagName == "div") && out.length() > 0)
- 				out += '\n';
- 		}
- 		// entity?
-@@ -540,6 +540,15 @@ QString TextUtil::emoticonify(const QStr
- 	return out;
- }
- 
-+QString TextUtil::img2title(const QString &in)
-+{
-+	QString ret = in;
-+	QRegExp rxq("<img[^>]+title\\s*=\\s*'([^']+)'[^>]*>"),  rxdq("<img[^>]+title\\s*=\\s*\"([^\"]+)\"[^>]*>");
-+	ret.replace(rxq, "\\1");
-+	ret.replace(rxdq, "\\1");
-+	return ret;
-+}
-+
- QString TextUtil::legacyFormat(const QString& in)
- {
- 
-@@ -557,38 +566,3 @@ QString TextUtil::legacyFormat(const QSt
- 
- 	return out;
- }
--
--/**
-- * Creates linkified and optionally emoticonified and legacy-formatted rich text.
-- * \a text, text to modify (either plain or rich, depending on \a isHtml
-- * \a isEmote, if true, remove "/me " part
-- * \a isHtml, if false, \a text is first converted to rich text.
-- */
--QString TextUtil::prepareMessageText(const QString& text, bool isEmote, bool isHtml)
--{
--	static const QString me_cmd = "/me ";
--
--	QString txt = text;
--
--	if (isHtml) {
--		if (isEmote) {
--			int cmd = txt.indexOf(me_cmd);
--			txt = txt.remove(cmd, me_cmd.length());
--		}
--	}
--	else {
--		if (isEmote) {
--			txt = txt.mid(me_cmd.length());
--		}
--
--		txt = TextUtil::plain2rich(txt);
--		txt = TextUtil::linkify(txt);
--	}
--
--	if (PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
--		txt = TextUtil::emoticonify(txt);
--	if (PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool())
--		txt = TextUtil::legacyFormat(txt);
--
--	return txt;
--}
---- psi.orig/src/textutil.h
-+++ psi/src/textutil.h
-@@ -15,6 +15,7 @@ namespace TextUtil
- 	QString linkify(const QString &);
- 	QString legacyFormat(const QString &);
- 	QString emoticonify(const QString &in);
-+	QString img2title(const QString &in);
- 
- 	QString prepareMessageText(const QString& text, bool isEmote=false, bool isHtml=false);
- };
---- psi.orig/src/theme.cpp
-+++ psi/src/theme.cpp
-@@ -0,0 +1,190 @@
-+/*
-+ * theme.cpp - base class for any theme
-+ * Copyright (C) 2010 Justin Karneges, Michail Pishchagin, Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "theme.h"
-+
-+#include <QFileInfo>
-+#include <QStringList>
-+
-+#ifndef NO_Theme_ZIP
-+#define Theme_ZIP
-+#endif
-+
-+#ifdef Theme_ZIP
-+#	include "zip/zip.h"
-+#endif
-+
-+class ThemeMetaData : public QSharedData
-+{
-+public:
-+	QString id, name, version, description, creation, homeUrl, filename;
-+	QStringList authors;
-+	QHash<QString, QString> info;
-+
-+public:
-+	ThemeMetaData(const QString &id);
-+	//QByteArray loadData(const QString &fileName, const QString &dir) const;
-+};
-+
-+ThemeMetaData::ThemeMetaData(const QString &id) :
-+	id(id),
-+	name(QObject::tr("Unnamed"))
-+{
-+
-+}
-+
-+
-+//--------------------------------------
-+// Theme
-+//--------------------------------------
-+Theme::Theme(const QString &id) :
-+	md(new ThemeMetaData(id))
-+{
-+
-+}
-+
-+Theme::Theme(const Theme &other) :
-+	md(other.md)
-+{
-+
-+}
-+
-+Theme::~Theme()
-+{
-+
-+}
-+
-+QByteArray Theme::loadData(const QString &fileName, const QString &dir)
-+{
-+	QByteArray ba;
-+
-+	QFileInfo fi(dir);
-+	if ( fi.isDir() ) {
-+		QFile file ( dir + '/' + fileName );
-+		//qDebug("read data from %s", qPrintable(file.fileName()));
-+		if (!file.open(QIODevice::ReadOnly))
-+			return ba;
-+
-+		ba = file.readAll();
-+	}
-+#ifdef Theme_ZIP
-+	else if ( fi.suffix() == "jisp" || fi.suffix() == "zip" || fi.suffix() == "theme" ) {
-+		UnZip z(dir);
-+		if ( !z.open() )
-+			return ba;
-+
-+		QString n = fi.completeBaseName() + '/' + fileName;
-+		if ( !z.readFile(n, &ba) ) {
-+			n = "/" + fileName;
-+			z.readFile(n, &ba);
-+		}
-+	}
-+#endif
-+
-+	return ba;
-+}
-+
-+const QString &Theme::id() const
-+{
-+	return md->id;
-+}
-+
-+const QString &Theme::name() const
-+{
-+	return md->name;
-+}
-+
-+void Theme::setName(const QString &name)
-+{
-+	md->name = name;
-+}
-+
-+const QString &Theme::version() const
-+{
-+	return md->version;
-+}
-+
-+const QString &Theme::description() const
-+{
-+	return md->description;
-+}
-+
-+/**
-+ * Returns the Theme authors list.
-+ */
-+const QStringList &Theme::authors() const
-+{
-+	return md->authors;
-+}
-+
-+/**
-+ * Returns the Theme creation date.
-+ */
-+const QString &Theme::creation() const
-+{
-+	return md->creation;
-+}
-+
-+const QString &Theme::homeUrl() const
-+{
-+	return md->homeUrl;
-+}
-+
-+/**
-+ * Returns directory (or .zip/.jisp archive) name from which Theme was loaded.
-+ */
-+const QString &Theme::fileName() const
-+{
-+	return md->filename;
-+}
-+
-+/**
-+ * Sets the Theme directory (.zip archive) name.
-+ */
-+void Theme::setFileName(const QString &f)
-+{
-+	md->filename = f;
-+}
-+
-+/**
-+ * Returns additional Theme information.
-+ * \sa setInfo()
-+ */
-+const QHash<QString, QString> Theme::info() const
-+{
-+	return md->info;
-+}
-+
-+/**
-+ * Sets additional Theme information.
-+ * \sa info()
-+ */
-+void Theme::setInfo(const QHash<QString, QString> &i)
-+{
-+	md->info = i;
-+}
-+
-+/**
-+ * Title suitable to display in options dialog
-+ */
-+QString Theme::title() const
-+{
-+	return md->name.isEmpty()? md->id : md->name;
-+}
---- psi.orig/src/theme.h
-+++ psi/src/theme.h
-@@ -0,0 +1,65 @@
-+/*
-+ * theme.h - base class for any theme
-+ * Copyright (C) 2010 Justin Karneges, Michail Pishchagin, Rion (Sergey Ilinyh)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+/*
-+ MOST IMPORTANT RULE: the theme never depends on thing to which its applied,
-+ so its one-way relation.
-+*/
-+
-+#ifndef PSITHEME_H
-+#define PSITHEME_H
-+
-+#include <QSharedData>
-+#include <QHash>
-+
-+class ThemeMetaData;
-+
-+//-----------------------------------------------
-+// Theme
-+//-----------------------------------------------
-+class Theme {
-+public:
-+	Theme(const QString &id);
-+	Theme(const Theme &other);
-+	virtual ~Theme();
-+
-+	static QByteArray loadData(const QString &fileName, const QString &dir);
-+
-+	const QString &id() const;
-+	const QString &name() const;
-+	void setName(const QString &name);
-+	const QString &version() const;
-+	const QString &description() const;
-+	const QStringList &authors() const;
-+	const QString &creation() const;
-+	const QString &homeUrl() const;
-+	const QString &fileName() const;
-+	void setFileName(const QString &f);
-+	const QHash<QString, QString> info() const;
-+	void setInfo(const QHash<QString, QString> &i);
-+
-+	virtual QString title() const;
-+	virtual QByteArray screenshot() = 0; // this hack must be replaced with something widget based
-+protected:
-+	QSharedDataPointer<ThemeMetaData> md;
-+};
-+
-+
-+#endif
---- psi.orig/src/tools/iconset/iconset.cpp
-+++ psi/src/tools/iconset/iconset.cpp
-@@ -31,6 +31,7 @@
- #include <QThread>
- #include <QCoreApplication>
- #include <QLocale>
-+#include <QBuffer>
- 
- #include <QTextCodec>
- 
-@@ -270,6 +271,7 @@ public:
- 		text = from.text;
- 		sound = from.sound;
- 		impix = from.impix;
-+		rawData = from.rawData;
- 		anim = from.anim ? new Anim ( *from.anim ) : 0;
- 		icon = 0;
- 		activatedCount = from.activatedCount;
-@@ -320,6 +322,7 @@ public:
- 	Impix impix;
- 	Anim *anim;
- 	QIcon *icon;
-+	mutable QByteArray rawData;
- 
- 	int activatedCount;
- 	friend class PsiIcon;
-@@ -447,6 +450,24 @@ const QIcon &PsiIcon::icon() const
- 	return *d->icon;
- }
- 
-+#ifdef WEBKIT
-+/**
-+ * Returns original image data
-+ */
-+const QByteArray & PsiIcon::raw() const
-+{
-+	if (!(d->rawData.size())) {
-+		QPixmap pix = impix().pixmap();
-+		if (!pix.isNull()) {
-+			QBuffer buffer(&d->rawData);
-+			buffer.open(QIODevice::WriteOnly);
-+			pix.save(&buffer, "PNG");
-+		}
-+	}
-+	return d->rawData;
-+}
-+#endif
-+
- /**
-  * Sets the PsiIcon impix to \a impix.
-  * \sa impix()
-@@ -683,7 +704,11 @@ bool PsiIcon::blockSignals(bool b)
- bool PsiIcon::loadFromData(const QByteArray &ba, bool isAnim)
- {
- 	detach();
--
-+#ifdef WEBKIT
-+	if (isAnim) {
-+		d->rawData = ba;
-+	}
-+#endif
- 	bool ret = false;
- 	if ( isAnim ) {
- 		Anim *anim = new Anim(ba);
-@@ -961,6 +986,20 @@ const QStringList IconsetFactory::icons(
- 	return IconsetFactoryPrivate::instance()->icons();
- }
- 
-+#ifdef WEBKIT
-+/**
-+ * Returs image raw data aka original image
-+ */
-+const QByteArray IconsetFactory::raw(const QString &name)
-+{
-+	const PsiIcon *i = iconPtr(name);
-+	if ( i ) {
-+		return i->raw();
-+	}
-+	return QByteArray();
-+}
-+#endif
-+
- //----------------------------------------------------------------------------
- // Iconset
- //----------------------------------------------------------------------------
---- psi.orig/src/tools/iconset/iconset.h
-+++ psi/src/tools/iconset/iconset.h
-@@ -120,6 +120,9 @@ public:
- 	virtual const QPixmap &pixmap() const;
- 	virtual const QImage &image() const;
- 	virtual const QIcon & icon() const;
-+#ifdef WEBKIT
-+	virtual const QByteArray & raw() const;
-+#endif
- 
- 	virtual const Impix &impix() const;
- 	virtual const Impix &frameImpix() const;
-@@ -239,6 +242,9 @@ public:
- 
- 	static const PsiIcon *iconPtr(const QString &name);
- 	static const QStringList icons();
-+#ifdef WEBKIT
-+	static const QByteArray raw(const QString &name);
-+#endif
- };
- 
- #endif
---- psi.orig/src/webview.cpp
-+++ psi/src/webview.cpp
-@@ -0,0 +1,205 @@
-+/*
-+ * webview.cpp - QWebView handling links and copying text
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QWebFrame>
-+#include <QFile>
-+#include <QMimeData>
-+#include <QApplication>
-+#include <QStyle>
-+
-+#include "webview.h"
-+#include "urlobject.h"
-+#include "textutil.h"
-+
-+WebView::WebView(QWidget* parent) : QWebView(parent), possibleDragging(false), isLoading_(false)
-+{
-+
-+    settings()->setAttribute(QWebSettings::JavaEnabled, false);
-+    settings()->setAttribute(QWebSettings::PluginsEnabled, false);
-+	setAcceptDrops(false);
-+
-+	page()->setNetworkAccessManager(NetworkAccessManager::instance());
-+    page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
-+
-+	connect(page(), SIGNAL(linkClicked(const QUrl&)), this, SLOT(linkClickedEvent(const QUrl&)));
-+	connect(page()->action(QWebPage::Copy), SIGNAL(triggered()), SLOT(textCopiedEvent()));
-+	connect(page()->action(QWebPage::Cut), SIGNAL(triggered()), SLOT(textCopiedEvent()));
-+	connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStartedEvent()));
-+	connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinishedEvent(bool)));
-+}
-+
-+void WebView::linkClickedEvent(const QUrl& url)
-+{
-+	//qDebug()<<"clicked link: "<<url.toString();
-+	URLObject::getInstance()->popupAction(url.toEncoded());
-+}
-+
-+void WebView::loadStartedEvent()
-+{
-+	//qDebug("page load started");
-+	isLoading_ = true;
-+}
-+
-+void WebView::loadFinishedEvent(bool success)
-+{
-+	//qDebug("page load finished");
-+	if (!success) {
-+		qDebug("webview page load failed");
-+	}
-+	isLoading_ = false;
-+}
-+
-+void WebView::contextMenuEvent(QContextMenuEvent* event)
-+{
-+	if (isLoading_) return;
-+	QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
-+	QMenu *menu;
-+
-+	if (!r.linkUrl().isEmpty()) {
-+		menu = URLObject::getInstance()->createPopupMenu(r.linkUrl().toEncoded());
-+		//menu->addAction(pageAction(QWebPage::CopyLinkToClipboard));
-+	} else {
-+		menu = new QMenu(this);
-+		if (!page()->selectedText().isEmpty()) {
-+			menu->addAction(pageAction(QWebPage::Copy));
-+		} else {
-+			if (!menu->isEmpty()) {
-+				menu->addSeparator();
-+			}
-+#if QT_VERSION >= 0x040500
-+			menu->addAction(pageAction(QWebPage::SelectAll));
-+#endif
-+		}
-+		if (settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled)) {
-+			menu->addAction(pageAction(QWebPage::InspectElement));
-+		}
-+	}
-+	menu->exec(mapToGlobal(event->pos()));
-+	event->accept();
-+	delete menu;
-+}
-+
-+void WebView::mousePressEvent ( QMouseEvent * event )
-+{
-+	if (isLoading_) return;
-+	QWebView::mousePressEvent(event);
-+	if (event->buttons() & Qt::LeftButton) {
-+		QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
-+		QSize cs = page()->mainFrame()->contentsSize();
-+		QSize vs = page()->viewportSize();
-+		possibleDragging = r.isContentSelected() &&
-+			QRect(QPoint(0,0),
-+				  cs - QSize(cs.width()>vs.width()?1:0, cs.height()>vs.height()?1:0) *
-+					style()->pixelMetric(QStyle::PM_ScrollBarExtent)
-+				 ).contains(event->pos());
-+		dragStartPosition = event->pos();
-+	} else {
-+		possibleDragging = false;
-+	}
-+}
-+
-+void WebView::mouseReleaseEvent ( QMouseEvent * event )
-+{
-+	QWebView::mouseReleaseEvent(event);
-+	possibleDragging = false;
-+#ifdef Q_WS_X11
-+	if (!page()->selectedText().isEmpty()) {
-+		convertClipboardHtmlImages(QClipboard::Selection);
-+	}
-+#endif
-+}
-+
-+void WebView::mouseMoveEvent(QMouseEvent *event)
-+ {
-+	//QWebView::mouseMoveEvent(event);
-+	if (!possibleDragging || !(event->buttons() & Qt::LeftButton)) {
-+		QWebView::mouseMoveEvent(event);
-+		return;
-+	}
-+	if ((event->pos() - dragStartPosition).manhattanLength()
-+		< QApplication::startDragDistance())
-+		return;
-+
-+	QDrag *drag = new QDrag(this);
-+	QMimeData *mimeData = new QMimeData;
-+
-+	QString html = selectedHtml();
-+	mimeData->setHtml(html);
-+	mimeData->setText(TextUtil::rich2plain(html));
-+
-+	drag->setMimeData(mimeData);
-+	drag->exec(Qt::CopyAction);
-+}
-+
-+void WebView::convertClipboardHtmlImages(QClipboard::Mode mode)
-+{
-+	QClipboard *cb = QApplication::clipboard();
-+	//qDebug("text selection before: %s", qPrintable(cb->text(mode)));
-+	QString html = TextUtil::img2title(cb->mimeData(mode)->html());
-+	QMimeData *data = new QMimeData;
-+	data->setHtml(html);
-+	data->setText(TextUtil::rich2plain(html));
-+	cb->setMimeData(data, mode);
-+	//qDebug("selection: %s", qPrintable(cb->mimeData(mode)->text()));
-+}
-+
-+void WebView::evaluateJS(const QString &scriptSource)
-+{
-+	//qDebug()<< "EVALUATE: " << (scriptSource.size()>200?scriptSource.mid(0,200)+"...":scriptSource);
-+	page()->mainFrame()->evaluateJavaScript(scriptSource);
-+}
-+
-+QString WebView::selectedHtml()
-+{
-+	// WARNING: selectedHtml must be implemented in qt-4.8 and
-+	// this ugly hack will become useless
-+	QClipboard *clipboard = QApplication::clipboard();
-+	QMimeData *originalData = new QMimeData;
-+	foreach (QString format, clipboard->mimeData(QClipboard::Clipboard)->formats()) {
-+		originalData->setData(format, clipboard->mimeData(QClipboard::Clipboard)->data(format));
-+	}
-+	copySelected();
-+
-+	QString html = clipboard->mimeData()->html();
-+	clipboard->setMimeData(originalData);
-+
-+	return html;
-+}
-+
-+QString WebView::selectedText()
-+{
-+	return TextUtil::rich2plain(selectedHtml());
-+}
-+
-+void WebView::copySelected()
-+{
-+	// use native selectedText w/o clipboard hacks.
-+	// ideally we should call something like hasSelection() but there is no such method in Qt API for webkit classes.
-+	if (!page()->selectedText().isEmpty()) {
-+		page()->triggerAction(QWebPage::Copy);
-+		textCopiedEvent();
-+	}
-+	//qDebug("copied text: %s", qPrintable(QApplication::clipboard()->text(QClipboard::Clipboard)));
-+}
-+
-+void WebView::textCopiedEvent()
-+{
-+	convertClipboardHtmlImages(QClipboard::Clipboard);
-+}
---- psi.orig/src/webview.h
-+++ psi/src/webview.h
-@@ -0,0 +1,107 @@
-+/*
-+ * webview.h - QWebView handling links and copying text
-+ * Copyright (C) 2010 senu, Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef _WEBVIEW_H
-+#define	_WEBVIEW_H
-+
-+#include <QWebView>
-+#include <QMessageBox>
-+#include <QMenu>
-+#include <QContextMenuEvent>
-+#include <QClipboard>
-+#include <QBuffer>
-+
-+#include "networkaccessmanager.h"
-+#include "iconset.h"
-+
-+class IconHandler : public NAMSchemeHandler
-+{
-+	QByteArray data(const QUrl &url) const {
-+		int w = url.queryItemValue("w").toInt();
-+		int h = url.queryItemValue("h").toInt();
-+		PsiIcon icon = IconsetFactory::icon(url.path());
-+		if (w && h && !icon.isAnimated()) {
-+			QByteArray ba;
-+			QBuffer buffer(&ba);
-+			buffer.open(QIODevice::WriteOnly);
-+			icon.pixmap().scaled(w, h, Qt::KeepAspectRatio, Qt::SmoothTransformation)
-+					.toImage().save(&buffer, "PNG");
-+			return ba;
-+		} else { //scaling impossible, return as is. do scaling with help of css or html attributes
-+			return IconsetFactory::raw(url.path());
-+		}
-+	}
-+};
-+
-+/**
-+ * Extended QWebView.
-+ *
-+ * It's used in EventView and HTMLChatView.
-+ * Provides evaluateJavaScript escaping and secure NetworkManager with icon:// URL 
-+ * support and \<img\> whitelisting. 
-+ *
-+ * Better name for it would be: PsiWebView, but it's used in HTMLChatView which is 
-+ * Psi-unaware.  
-+ */
-+class WebView : public QWebView {
-+
-+    Q_OBJECT
-+public:
-+
-+	WebView(QWidget* parent);
-+
-+	/** Evaluates JavaScript code */
-+	void evaluateJS(const QString &scriptSource = "");
-+
-+	QString selectedHtml();
-+	QString selectedText();
-+	bool isLoading() { return isLoading_; }
-+
-+public slots:
-+	void copySelected();
-+
-+protected:
-+    /** Creates menu with Copy actions */
-+	void contextMenuEvent(QContextMenuEvent* event);
-+	void mousePressEvent ( QMouseEvent * event );
-+	void mouseReleaseEvent ( QMouseEvent * event );
-+	void mouseMoveEvent(QMouseEvent *event);
-+
-+	//QAction* copyAction, *copyLinkAction;
-+
-+private:
-+	void convertClipboardHtmlImages(QClipboard::Mode);
-+
-+	bool possibleDragging;
-+	bool isLoading_;
-+	QStringList jsBuffer_;
-+	QPoint dragStartPosition;
-+
-+
-+protected slots:
-+	void linkClickedEvent(const QUrl& url);
-+	void textCopiedEvent();
-+	void loadStartedEvent();
-+	void loadFinishedEvent(bool);
-+};
-+
-+
-+#endif
-+
---- psi.orig/src/widgets/iconselect.cpp
-+++ psi/src/widgets/iconselect.cpp
-@@ -104,10 +104,6 @@ signals:
- 	void iconSelected(const PsiIcon *);
- 	void textSelected(QString);
- 
--public slots:
--	void aboutToShow() { iconStart(); }
--	void aboutToHide() { iconStop();  }
--
- private:
- 	void iconStart()
- 	{
-@@ -147,8 +143,8 @@ private:
- 		}
- 	}
- 
--	void enterEvent(QEvent *) { setFocus();   update(); } // focus follows mouse mode
--	void leaveEvent(QEvent *) { clearFocus(); update(); }
-+	void enterEvent(QEvent *) { iconStart(); setFocus();  update(); } // focus follows mouse mode
-+	void leaveEvent(QEvent *) { iconStop(); clearFocus(); update(); }
- 
- private slots:
- 	void iconUpdated()
-@@ -338,8 +334,8 @@ void IconSelect::setIconset(const Iconse
- 		connect (b, SIGNAL(iconSelected(const PsiIcon *)), menu, SIGNAL(iconSelected(const PsiIcon *)));
- 		connect (b, SIGNAL(textSelected(QString)), menu, SIGNAL(textSelected(QString)));
- 
--		connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
--		connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
-+		//connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
-+		//connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
- 
- 		if (++column >= size) {
- 			++row;
---- psi.orig/themes/chatview/adium/adapter.js
-+++ psi/themes/chatview/adium/adapter.js
-@@ -0,0 +1,374 @@
-+try {
-+
-+window[chatServer.jsNamespace()].adapter = {
-+	loadTheme : function() {
-+		var chat = window[chatServer.jsNamespace()];
-+		//chat.console("DEBUG: loading " + chatServer.themeId());
-+		var resources = ["Template.html", "FileTransferRequest.html",
-+		"Footer.html", "Header.html", "Status.html", "Topic.html", "Content.html",
-+		"Incoming/Content.html", "Incoming/NextContent.html",
-+		"Incoming/Context.html", "Incoming/NextContext.html", 
-+		"Outgoing/Content.html", "Outgoing/NextContent.html",
-+		"Outgoing/Context.html", "Outgoing/NextContext.html"];
-+		for (var i=0; i<resources.length; i++) {
-+			var content = chatServer.getFileContents("Contents/Resources/" + resources[i]) ||
-+						chatServer.getFileContents("Contents/Resources/" + resources[i].toLowerCase());
-+			if (content.length) {
-+				chatServer.toCache(resources[i], content);
-+			}
-+		}
-+		//chat.console("DEBUG: 2");
-+		var ipDoc = chat.util.loadXML("Contents/Info.plist");
-+		var xres = ipDoc.evaluate("/plist/dict/*", ipDoc, null, null, null);
-+		var e;
-+		var curKey = "";
-+		var ip = {variants: {}};
-+		var varKey = null;
-+		var value;
-+		while (e = xres.iterateNext()) {
-+			//chat.console("DEBUG: " + e.textContent);
-+			switch(e.tagName) {
-+				case "key":
-+					curKey = e.textContent.split(':');
-+					varKey = null;
-+					if (curKey.length == 2) {
-+						varKey = curKey[1];
-+					}
-+					curKey = curKey[0];
-+					continue;
-+				case "string":
-+					value = e.textContent;
-+					break;
-+				case "integer":
-+					value = Number(e.textContent);
-+					break;
-+				case "false":
-+					value = false;
-+					break;
-+				case "true":
-+					value = true;
-+					break;
-+				default:
-+					value = undefined;
-+			}
-+			//chat.console("DEBUG: 2.5");
-+			if (varKey) {
-+				if (!ip.variants[varKey]) {
-+					ip.variants[varKey] = {};
-+				}
-+				ip.variants[varKey][curKey] = value;
-+			} else {
-+				ip[curKey] = value;
-+			}
-+		}
-+		//chat.console("DEBUG: 3");
-+		var baseHtml = chatServer.cache("Template.html");
-+		if (baseHtml) {
-+			chatServer.toCache("html", baseHtml);
-+			if (!ip.MessageViewVersion) { // is not set. trying to guess
-+				if (baseHtml.indexOf("replaceLastMessage") != -1) {
-+					ip.MessageViewVersion = 4;
-+				} else if (baseHtml.indexOf("appendMessageNoScroll") != -1) {
-+					ip.MessageViewVersion = 3;
-+				} else  {
-+					ip.MessageViewVersion = 2; // or less
-+				}
-+			}
-+		} else {
-+			chatServer.toCache("html", chatServer.getFileContentsFromAdapterDir("Template.html"));
-+			ip.MessageViewVersion = 4;
-+		}
-+		if (!String(chatServer.cache("html")).length) {
-+			return "Failed to cache Template.html";
-+		}
-+		chatServer.toCache("Info.plist", ip);
-+		chatServer.setMetaData({name: ip.CFBundleName});
-+		var jsRootName = "_adiumChat"+Math.round(1000*Math.random());
-+		window[jsRootName] = window[chatServer.jsNamespace()];
-+		chatServer.setJSNamespace(jsRootName);
-+		chatServer.setDefaultAvatar("Contents/Resources/Incoming/buddy_icon.png", "incoming");
-+		chatServer.setDefaultAvatar("Contents/Resources/Outgoing/buddy_icon.png", "outgoing");
-+		return "ok";
-+	}
-+}
-+
-+// update apapter with methods having some private part
-+window[chatServer.jsNamespace()].util.updateObject(window[chatServer.jsNamespace()].adapter, function(){
-+	var chat = window[chatServer.jsNamespace()];
-+	var server = window.chatServer;
-+	var session = null;
-+	var dateFormat = "hh:mm";
-+	var cdata;
-+	var proxyEl = document.createElement("div");
-+	
-+	function TemplateVar(name, param) {
-+		this.name = name;
-+		this.param = param
-+	}
-+	
-+	TemplateVar.prototype = {
-+		toString : function() {
-+			//chat.console("DEBUG: TemplateVar.prototype.toString " + session);
-+			var d = cdata[this.name];
-+			if (this.name == "sender") { //may not be html
-+				d = chat.util.escapeHtml(d);
-+			} else if (d instanceof Date) {
-+				d = server.formatDate(d, "yyyy-MM-dd");
-+			} else if (this.name == "userIconPath") {
-+				return "avatar://" + (cdata.local?"outgoing/":"incoming/") +
-+					encodeURIComponent(session.account()) +
-+					"/" + encodeURIComponent(cdata.userid);
-+			} else if (this.name == "incomingIconPath") {
-+				return "avatar://incoming/" + encodeURIComponent(session.account()) +
-+					"/" + encodeURIComponent(session.jid());
-+			} else if (this.name == "senderColor") {
-+				return session.mucNickColor(cdata.sender, cdata.local);
-+			}
-+			return d || "";
-+		}
-+	}
-+	
-+	function TemplateTimeVar(name, param) {
-+		this.name = name;
-+		if (param) {
-+			var i, r = {y:'yy',Y:'yyyy',m:'MM',d:'dd',H:'hh',M:'mm',S:'ss'};
-+			var m = param.split(/%([a-zA-Z]+)/)
-+			for (i=0; i<m.length; i++) {
-+				m[i] = r[m[i]] || m[i];
-+			}
-+			this.format = m.join("");
-+		} else {
-+			this.format = dateFormat
-+		}
-+	}
-+	
-+	TemplateTimeVar.prototype.toString = function() {
-+		//chat.console("DEBUG: TemplateTimeVar.prototype.toString");
-+		return cdata[this.name] instanceof Date?
-+			server.formatDate(cdata[this.name], this.format) : 
-+			(cdata[this.name] ? cdata[this.name] : "");
-+	}
-+
-+	function Template(raw) {
-+		var splitted = raw.split(/(%[\w]+(?:\{[\w:%]+\})?%)/), i;
-+		this.parts = [];
-+		
-+		for (i = 0; i < splitted.length; i++) {
-+			var m = splitted[i].match(/%([\w]+)(?:\{([\w:%]+)\})?%/);
-+			if (m) {
-+				this.parts.push(m[1] in tvConstructors
-+					? new tvConstructors[m[1]](m[1], m[2])
-+					: new TemplateVar(m[1], m[2]));
-+			} else {
-+				this.parts.push(splitted[i]);
-+			}
-+		}
-+	}
-+	
-+	Template.prototype.toString = function(data) {
-+		//chat.console("prepare Template.prototype.toString1");
-+		cdata = data || cdata;
-+		var html = this.parts.join("");
-+		proxyEl.innerHTML = html;
-+		chat.util.replaceIcons(proxyEl);
-+		//chat.console("prepare Template.prototype.toString2");
-+		return proxyEl.innerHTML;
-+	}
-+	
-+	// Template variable constructors
-+	var tvConstructors = {
-+		time : TemplateTimeVar,
-+		timeOpened : TemplateTimeVar
-+	}
-+	
-+	function psiOption(name) {
-+		return eval("[" + server.psiOption(name) + "][0]")
-+	}
-+	
-+	return {
-+		getHtml : function() {
-+			session = window.chatSession; // global session because Template needs it
-+			
-+			//chat.console("prepare html");
-+			var html = server.cache("html");
-+			//chat.console("cached Template.html: " + html);
-+			var ip = server.cache("Info.plist");
-+			var variant = ip.DefaultVariant;
-+			if (variant && ip.variants[variant]) {
-+				chat.util.updateObject(ip, ip.variants[variant]);
-+			}
-+			////chat.console("prepare html2");
-+			var topHtml = (session.isMuc() && server.cache("Topic.html")) || server.cache("Header.html");
-+			//chat.console("prepare html2.5");
-+			topHtml = topHtml? (new Template(topHtml)).toString({
-+				chatName: chat.util.escapeHtml(session.chatName()),
-+				timeOpened: new Date()
-+			}) : "";
-+			//chat.console("prepare html3");
-+			var footerHtml = new Template(server.cache("Footer.html") || "").toString({});
-+			footerHtml += "\n<script type='text/javascript'>window.addEventListener('load', "+
-+				server.jsNamespace()+".adapter.initSession, false);</script>";
-+			//chat.console("prepare html4");
-+			//var baseUrl = "/" + server.themeId() + "/Contents/Resources//"; // double slash is hack to make relative css import path working
-+			var baseUrl = window.location.href + "Contents/Resources//";
-+			if (ip.MessageViewVersion < 3) {
-+				var replace = [
-+					baseUrl, "main.css",
-+					topHtml, footerHtml
-+				];
-+			} else {
-+				var replace = [
-+					baseUrl, "@import url( \"main.css\" );",
-+					ip.DefaultVariant? "Variants/" + ip.DefaultVariant + ".css" : "main.css",
-+					topHtml, footerHtml
-+				];
-+			}
-+			//chat.console("prepare html5");
-+			html = html.replace(/%@/g, function(){return replace.shift() || ""});
-+			if (ip.DefaultBackgroundIsTransparent) {
-+				session.setTransparent();
-+			} else {
-+				if (ip.DefaultBackgroundColor)
-+					html = html.replace(/<head>/i, '<head><style type="text/css" media="screen,print">' +
-+						"body { background-color:#"+ip.DefaultBackgroundColor+" }</style>");
-+			}
-+			
-+			var styles = [];
-+			if (ip.DefaultFontFamily) {
-+				styles.push("font-family:"+ip.DefaultFontFamily);
-+			}
-+			if (ip.DefaultFontSize) {
-+				styles.push("font-size:"+ip.DefaultFontSize+"pt");
-+			}
-+			
-+			html = html.replace("==bodyBackground==", styles.join(";"));
-+			//chat.console("prepare html: " + html);
-+			return html
-+		},
-+		initSession : function() {
-+			//chat.console("init session");
-+			session = window.chatSession;
-+			chat.adapter.initSession = null;
-+			chat.adapter.loadTheme = null;
-+			chat.adapter.getHtml = null;
-+			var trackbar = null;
-+			var ip = server.cache("Info.plist");
-+			var prevGrouppingData = null;
-+			var groupping = !(ip.DisableCombineConsecutive == true);
-+			
-+			chat.adapter.receiveObject = function(data) {
-+				cdata = data;
-+				try {
-+					//chat.console(chat.util.props(data, true))
-+					var template;
-+					if (data.type == "message") {
-+						if (data.mtype != "message") {
-+							prevGrouppingData = null;
-+						}
-+						switch (data.mtype) {
-+							case "message":
-+								data.nextOfGroup = groupping && !!(prevGrouppingData &&
-+									(prevGrouppingData.type == cdata.type) &&
-+									(prevGrouppingData.mtype == cdata.mtype) &&
-+									(prevGrouppingData.userid == cdata.userid) &&
-+									(prevGrouppingData.emote == cdata.emote) &&
-+									(prevGrouppingData.local == cdata.local));
-+									
-+								if (data.nextOfGroup) {
-+									template = data.local?templates.outgoingNextContent:templates.incomingNextContent;
-+								} else {
-+									template = data.local?templates.outgoingContent:templates.incomingContent;
-+								}
-+								prevGrouppingData = data;
-+								data.senderStatusIcon="icon:status/online"; //FIXME temporary hack
-+								break;
-+							case "status":
-+							case "system":
-+								if (data["usertext"]) {
-+									data["message"] += " (" + data["usertext"] + ")"
-+								}
-+								template = templates.status;
-+								break;
-+							case "lastDate":
-+								data["message"] = data["date"];
-+								data["time"] = "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;"; //fixes some themes =)
-+								template = templates.status;
-+								break;
-+							case "subject": //its better to init with proper templates on start than do comparision like below
-+								template = templates.status;
-+								var e = document.getElementById("topic");
-+								if (e) {
-+									e.innerHTML = data["usertext"]
-+								} else {
-+									data["message"] += ("<br/>" + data["usertext"]);
-+								}
-+								break;
-+							case "urls":
-+								var i, urls=[];
-+								for (url in data.urls) {
-+									urls.push('<a href="'+url+'">'+(data.urls[url]?chat.util.escapeHtml(data.urls[url]):url)+"</a>");
-+								}
-+								data["message"] = urls.join("<br/>");
-+								template = templates.status;
-+								break;
-+						}
-+						if (template) {
-+							if (data.nextOfGroup) {
-+								appendNextMessage(template.toString(data));
-+							} else {
-+								appendMessage(template.toString(data));
-+							}
-+							if (data.mtype == "message" && data.local) {
-+								scrollToBottom();
-+							}
-+						} else {
-+							throw "Template not found";
-+						}
-+					} else if (data.type == "clear") {
-+						prevGrouppingData = null; //groupping impossible
-+						trackbar = null;
-+					}
-+				} catch(e) {
-+					chat.util.showCriticalError("APPEND ERROR: " + e + " \nline: " + e.line)
-+				}
-+			};
-+			
-+			var t = {};
-+			var templates = {}
-+			var tcList = ["Status.html", "Content.html",
-+				"Incoming/Content.html", "Incoming/NextContent.html",
-+				"Incoming/Context.html", "Incoming/NextContext.html", 
-+				"Outgoing/Content.html", "Outgoing/NextContent.html",
-+				"Outgoing/Context.html", "Outgoing/NextContext.html"];
-+			var i
-+			for (i=0; i<tcList.length; i++) {
-+				var content = server.cache(tcList[i]);
-+				if (content) {
-+					t[tcList[i]] = new Template(content);
-+				}
-+			}
-+			templates.content = t["Content.html"] || "%message%";
-+			templates.status = t["Status.html"] || t.message;
-+			templates.incomingContent = t["Incoming/Content.html"] || templates.content;
-+			templates.outgoingContent = t["Outgoing/Content.html"] || templates.incomingContent;
-+			templates.incomingNextContent = t["Incoming/NextContent.html"] || templates.incomingContent;
-+			templates.outgoingNextContent = t["Outgoing/NextContent.html"] || templates.outgoingContent;
-+			templates.incomingContext = t["Incoming/Context.html"] || templates.incomingContent;
-+			templates.outgoingContext = t["Outgoing/Context.html"] || templates.outgoingContent;
-+			templates.incomingNextContext = t["Incoming/NextContext.html"] || templates.incomingNextContent;
-+			templates.outgoingNextContext = t["Outgoing/NextContext.html"] || templates.outgoingNextContent;
-+			delete t
-+			//t.lastMsgDate = t.lastMsgDate || t.sys;
-+			//t.subject = t.subject || t.sys;
-+			//t.urls = t.urls || t.sys;
-+			//t.trackbar = t.trackbar || "<hr/>";
-+			chat.console("session inited");
-+			session.signalInited();
-+		}
-+	}
-+}())
-+
-+} catch(e) {
-+	window[chatServer.jsNamespace()].console("adapter load error!!! "+ e + "(Line:" + e.line + ")");
-+}
-+"ok"; // just an indicator for script loader
---- psi.orig/themes/chatview/adium/Template.html
-+++ psi/themes/chatview/adium/Template.html
-@@ -0,0 +1,343 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-+<html>
-+<head>
-+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-+	<base href="%@">
-+	<script type="text/javascript" defer="defer">
-+		// NOTE:
-+		// Any percent signs in this file must be escaped!
-+		// Use two escape signs (%%) to display it, this is passed through a format call!
-+		
-+		function appendHTML(html) {
-+			var node = document.getElementById("Chat");
-+			var range = document.createRange();
-+			range.selectNode(node);
-+			var documentFragment = range.createContextualFragment(html);
-+			node.appendChild(documentFragment);
-+		}
-+		
-+		// a coalesced HTML object buffers and outputs DOM objects en masse.
-+		// saves A LOT of CSS recalculation time when loading many messages.
-+		// (ex. a long twitter timeline)
-+		function CoalescedHTML() {
-+			var self = this;
-+			this.fragment = document.createDocumentFragment();
-+			this.timeoutID = 0;
-+			this.coalesceRounds = 0;
-+			this.isCoalescing = false;
-+			this.isConsecutive = undefined;
-+			this.shouldScroll = undefined;
-+			
-+			var appendElement = function (elem) {
-+				document.getElementById("Chat").appendChild(elem);
-+			};
-+			
-+			function outputHTML() {
-+				var insert = document.getElementById("insert");
-+				if(!!insert && self.isConsecutive) {
-+					insert.parentNode.replaceChild(self.fragment, insert);
-+				} else {
-+					if(insert)
-+						insert.parentNode.removeChild(insert);
-+					// insert the documentFragment into the live DOM
-+					appendElement(self.fragment);
-+				}
-+				alignChat(self.shouldScroll);
-+				
-+				// reset state to empty/non-coalescing
-+				self.shouldScroll = undefined;
-+				self.isConsecutive = undefined;
-+				self.isCoalescing = false;
-+				self.coalesceRounds = 0;
-+			}
-+			
-+			// creates and returns a new documentFragment, containing all content nodes
-+			// which can be inserted as a single node.
-+			function createHTMLNode(html) {
-+				var range = document.createRange();
-+				range.selectNode(document.getElementById("Chat"));
-+				return range.createContextualFragment(html);
-+			}
-+			
-+			// removes first insert node from the internal fragment.
-+			function rmInsertNode() {
-+				var insert = self.fragment.querySelector("#insert");
-+				if(insert)
-+					insert.parentNode.removeChild(insert);
-+			}
-+			
-+			function setShouldScroll(flag) {
-+				if(flag && undefined === self.shouldScroll)
-+					self.shouldScroll = flag;
-+			}
-+			
-+			// hook in a custom method to append new data
-+			// to the chat.
-+			this.setAppendElementMethod = function (func) {
-+				if(typeof func === 'function')
-+					appendElement = func;
-+			}
-+						
-+			// (re)start the coalescing timer.
-+			//   we wait 25ms for a new message to come in.
-+			//   If we get one, restart the timer and wait another 10ms.
-+			//   If not, run outputHTML()
-+			//  We do this a maximum of 400 times, for 10s max that can be spent
-+			//  coalescing input, since this will block display.
-+			this.coalesce = function() {
-+				window.clearTimeout(self.timeoutID);
-+				self.timeoutID = window.setTimeout(outputHTML, 25);
-+				self.isCoalescing = true;
-+				self.coalesceRounds += 1;
-+				if(400 < self.coalesceRounds)
-+					self.cancel();
-+			}
-+			
-+			// if we need to append content into an insertion div,
-+			// we need to clear the buffer and cancel the timeout.
-+			this.cancel = function() {
-+				if(self.isCoalescing) {
-+					window.clearTimeout(self.timeoutID);
-+					outputHTML();
-+				}
-+			}
-+			
-+			
-+			// coalased analogs to the global functions
-+			
-+			this.append = function(html, shouldScroll) {
-+				// if we started this fragment with a consecuative message,
-+				// cancel and output before we continue
-+				if(self.isConsecutive) {
-+					self.cancel();
-+				}
-+				self.isConsecutive = false;
-+				rmInsertNode();
-+				var node = createHTMLNode(html);
-+				self.fragment.appendChild(node);
-+				
-+				node = null;
-+
-+				setShouldScroll(shouldScroll);
-+				self.coalesce();
-+			}
-+			
-+			this.appendNext = function(html, shouldScroll) {
-+				if(undefined === self.isConsecutive)
-+					self.isConsecutive = true;
-+				var node = createHTMLNode(html);
-+				var insert = self.fragment.querySelector("#insert");
-+				if(insert) {
-+					insert.parentNode.replaceChild(node, insert);
-+				} else {
-+					self.fragment.appendChild(node);
-+				}
-+				node = null;
-+				setShouldScroll(shouldScroll);
-+				self.coalesce();
-+			}
-+			
-+			this.replaceLast = function (html, shouldScroll) {
-+				rmInsertNode();
-+				var node = createHTMLNode(html);
-+				var lastMessage = self.fragment.lastChild;
-+				lastMessage.parentNode.replaceChild(node, lastMessage);
-+				node = null;
-+				setShouldScroll(shouldScroll);
-+			}
-+		}
-+		var coalescedHTML;
-+
-+		//Appending new content to the message view
-+		function appendMessage(html) {
-+			var shouldScroll;
-+			
-+			// Only call nearBottom() if should scroll is undefined.
-+			if(undefined === coalescedHTML.shouldScroll) {
-+				shouldScroll = nearBottom();
-+			} else {
-+				shouldScroll = coalescedHTML.shouldScroll;
-+			}
-+			appendMessageNoScroll(html, shouldScroll);
-+		}
-+		
-+		function appendMessageNoScroll(html, shouldScroll) {			
-+			shouldScroll = shouldScroll || false;
-+			// always try to coalesce new, non-griuped, messages
-+			coalescedHTML.append(html, shouldScroll)
-+		}
-+		
-+		function appendNextMessage(html){
-+			var shouldScroll;
-+			if(undefined === coalescedHTML.shouldScroll) {
-+				shouldScroll = nearBottom();
-+			} else {
-+				shouldScroll = coalescedHTML.shouldScroll;
-+			}
-+			appendNextMessageNoScroll(html, shouldScroll);
-+		}
-+		
-+		function appendNextMessageNoScroll(html, shouldScroll){
-+			shouldScroll = shouldScroll || false;
-+			// only group next messages if we're already coalescing input
-+			coalescedHTML.appendNext(html, shouldScroll);
-+		}
-+
-+		function replaceLastMessage(html){
-+			var shouldScroll;
-+			// only replace messages if we're already coalescing
-+			if(coalescedHTML.isCoalescing){
-+				if(undefined === coalescedHTML.shouldScroll) {
-+					shouldScroll = nearBottom();
-+				} else {
-+					shouldScroll = coalescedHTML.shouldScroll;
-+				}
-+				coalescedHTML.replaceLast(html, shouldScroll);
-+			} else {
-+				shouldScroll = nearBottom();
-+				//Retrieve the current insertion point, then remove it
-+				//This requires that there have been an insertion point... is there a better way to retrieve the last element? -evands
-+				var insert = document.getElementById("insert");
-+				if(insert){
-+					var parentNode = insert.parentNode;
-+					parentNode.removeChild(insert);
-+					var lastMessage = document.getElementById("Chat").lastChild;
-+					document.getElementById("Chat").removeChild(lastMessage);
-+				}
-+
-+				//Now append the message itself
-+				appendHTML(html);
-+
-+				alignChat(shouldScroll);
-+			}
-+		}
-+
-+		//Auto-scroll to bottom.  Use nearBottom to determine if a scrollToBottom is desired.
-+		function nearBottom() {
-+			return ( document.body.scrollTop >= ( document.body.offsetHeight - ( window.innerHeight * 1.2 ) ) );
-+		}
-+		function scrollToBottom() {
-+			document.body.scrollTop = document.body.offsetHeight;
-+		}
-+
-+		//Dynamically exchange the active stylesheet
-+		function setStylesheet( id, url ) {
-+			var code = "<style id=\"" + id + "\" type=\"text/css\" media=\"screen,print\">";
-+			if( url.length ) 
-+				code += "@import url( \"" + url + "\" );";
-+			code += "</style>";
-+			var range = document.createRange();
-+			var head = document.getElementsByTagName( "head" ).item(0);
-+			range.selectNode( head );
-+			var documentFragment = range.createContextualFragment( code );
-+			head.removeChild( document.getElementById( id ) );
-+			head.appendChild( documentFragment );
-+		}
-+
-+		/* Converts emoticon images to textual emoticons; all emoticons in message if alt is held */
-+		document.onclick = function imageCheck() {
-+			var node = event.target;
-+			if (node.tagName.toLowerCase() != 'img')
-+				return;
-+				
-+			imageSwap(node, false);
-+		}
-+		
-+		/* Converts textual emoticons to images if textToImagesFlag is true, otherwise vice versa */
-+		function imageSwap(node, textToImagesFlag) {
-+			var shouldScroll = nearBottom();
-+			
-+			var images = [node];
-+			if (event.altKey) {
-+				while (node.id != "Chat" && node.parentNode.id != "Chat")
-+					node = node.parentNode;
-+				images = node.querySelectorAll(textToImagesFlag ? "a" : "img");
-+			}
-+			
-+			for (var i = 0; i < images.length; i++) {
-+				textToImagesFlag ? textToImage(images[i]) : imageToText(images[i]);
-+			}
-+			
-+			alignChat(shouldScroll);
-+		}
-+
-+		function textToImage(node) {
-+			if (!node.getAttribute("isEmoticon"))
-+				return;
-+			//Swap the image/text
-+			var img = document.createElement('img');
-+			img.setAttribute('src', node.getAttribute('src'));
-+			img.setAttribute('alt', node.firstChild.nodeValue);
-+			img.className = node.className;
-+			node.parentNode.replaceChild(img, node);
-+		}
-+		
-+		function imageToText(node)
-+		{
-+			if (client.zoomImage(node) || !node.alt)
-+				return;
-+			var a = document.createElement('a');
-+			a.setAttribute('onclick', 'imageSwap(this, true)');
-+			a.setAttribute('src', node.getAttribute('src'));
-+			a.setAttribute('isEmoticon', true);
-+			a.className = node.className;
-+			var text = document.createTextNode(node.alt);
-+			a.appendChild(text);
-+			node.parentNode.replaceChild(a, node);
-+		}
-+		
-+		//Align our chat to the bottom of the window.  If true is passed, view will also be scrolled down
-+		function alignChat(shouldScroll) {
-+			var windowHeight = window.innerHeight;
-+
-+			if (windowHeight > 0) {
-+				var contentElement = document.getElementById('Chat');
-+				var contentHeight = contentElement.offsetHeight;
-+				if (windowHeight - contentHeight > 0) {
-+					contentElement.style.position = 'relative';
-+					contentElement.style.top = (windowHeight - contentHeight) + 'px';
-+				} else {
-+					contentElement.style.position = 'static';
-+				}
-+			}
-+
-+			if (shouldScroll) scrollToBottom();
-+		}
-+
-+		window.onresize = function windowDidResize(){
-+			alignChat(true/*nearBottom()*/); //nearBottom buggy with inactive tabs
-+		}
-+		
-+		function initStyle() {
-+			alignChat(true);
-+			if(!coalescedHTML)
-+				coalescedHTML = new CoalescedHTML();
-+		}
-+	</script>
-+
-+	<style type="text/css">
-+		.actionMessageUserName { display:none; }
-+		.actionMessageBody:before { content:"*"; }
-+		.actionMessageBody:after { content:"*"; }
-+		* { word-wrap:break-word; text-rendering: optimizelegibility; }
-+		img.scaledToFitImage { height: auto; max-width: 100%%; }
-+	</style>
-+
-+	
-+	<style id="baseStyle" type="text/css" media="screen,print">
-+		%@
-+	</style>
-+
-+	
-+	<style id="mainStyle" type="text/css" media="screen,print">
-+		@import url( "%@" );
-+	</style>
-+
-+</head>
-+<body onload="initStyle();" style="==bodyBackground==">
-+%@
-+<div id="Chat">
-+</div>
-+%@
-+</body>
-+</html>
---- psi.orig/themes/chatview/psi/adapter.js
-+++ psi/themes/chatview/psi/adapter.js
-@@ -0,0 +1,260 @@
-+try {
-+	
-+window[chatServer.jsNamespace()].adapter = {
-+	loadTheme : function() {
-+        chatServer.setHtml(chatServer.getFileContents("index.html"));
-+        eval(chatServer.getFileContents("load.js"));
-+		return "ok";
-+	},
-+	initSession : function() {
-+		var chat = window[chatServer.jsNamespace()];
-+		var trackbar = null;
-+		var inited = false;
-+		var proxy = null;
-+
-+		var shared = {
-+			templates : {},
-+			server : window.chatServer,
-+			session : window.chatSession,
-+			isMuc : window.chatSession.isMuc(),
-+			accountId : window.chatSession.account(),
-+			dateFormat : "hh:mm:ss",
-+			scroller : null,
-+			varHandlers : {},
-+			prevGrouppingData : null,
-+			groupping : false,
-+			chatElement : null,
-+		
-+			TemplateVar : function(name) {
-+				this.name = name;
-+			},
-+		
-+			Template : function(raw) {
-+				var splitted = raw.split('%'), i;
-+				this.parts = [];
-+				
-+				for (i = 0; i < splitted.length; i++) {
-+					if (/^[a-zA-Z]+$/.test(splitted[i])) {
-+						this.parts.push(new shared.TemplateVar(splitted[i]));
-+					} else if (this.parts.length>0 && typeof(this.parts[this.parts.length-1]) == "string") {
-+						this.parts[this.parts.length-1]+=('%'+splitted[i]);
-+					} else {
-+						this.parts.push(splitted[i]);
-+					}
-+				}
-+			},
-+			
-+			psiOption : function(name) {
-+				return eval("[" + shared.server.psiOption(name) + "][0]")
-+			},
-+			
-+			colorOption : function(name) {
-+				return eval("[" + shared.server.colorOption(name) + "][0]")
-+			},
-+			
-+			appendHtml : function(html, scroll, nextEl) { //scroll[true|false|auto/other]
-+				if (typeof(scroll) == 'boolean') {
-+					shared.scroller.atBottom = scroll;
-+				}
-+				if (nextEl) {
-+					chat.util.siblingHtml(nextEl, html);
-+				} else {
-+					chat.util.appendHtml(shared.chatElement, html);
-+				}
-+				shared.scroller.invalidate();
-+			},
-+			
-+			stopGroupping : function() {
-+				if (shared.prevGrouppingData) {
-+					shared.prevGrouppingData.nextEl.parentNode.removeChild(shared.prevGrouppingData.nextEl)
-+					shared.prevGrouppingData = null;
-+				}
-+			},
-+			
-+			initTheme : function(config) {
-+				if (inited) {
-+					chat.util.showCriticalError("Theme should not be inited twice. Something wrong with theme.")
-+					return false;
-+				}
-+				var t = shared.templates;
-+				shared.chatElement = config.chatElement;
-+				shared.dateFormat = config.dateFormat || shared.dateFormat;
-+				shared.scroller = config.scroller || new chat.WindowScroller(false);
-+				shared.groupping = config.groupping || shared.groupping;
-+				proxy = config.proxy;
-+				shared.varHandlers = config.varHandlers || {};
-+				for (var tname in config.templates) {
-+					if (config.templates[tname]) {
-+						t[tname] = new shared.Template(config.templates[tname]);
-+					}
-+				}
-+				t.message = t.message || "%message%";
-+				t.sys = t.sys || "%message%";
-+				t.sysMessage = t.sysMessage || t.sys;
-+				t.sysMessageUT = t.sysMessageUT || t.sysMessage;
-+				t.statusMessage = t.statusMessage || t.sysMessage;
-+				t.statusMessageUT = t.statusMessageUT || t.statusMessage;
-+				t.sentMessage = t.sentMessage || t.message;
-+				t.receivedMessage = t.receivedMessage || t.message;
-+				t.spooledMessage = t.spooledMessage || t.message;
-+				t.receivedMessageGroupping = t.receivedMessageGroupping || t.messageGroupping;
-+				t.sentMessageGroupping = t.sentMessageGroupping || t.messageGroupping;
-+				t.lastMsgDate = t.lastMsgDate || t.sys;
-+				t.subject = t.subject || t.sys;
-+				t.urls = t.urls || t.sys;
-+				t.trackbar = t.trackbar || "<hr/>";
-+				config.defaultAvatar && shared.server.setDefaultAvatar(config.defaultAvatar)
-+				config.avatarSize && shared.server.setAvatarSize(config.avatarSize.width, config.avatarSize.height);
-+				inited = true;
-+			},
-+			checkNextOfGroup : function() {
-+				shared.cdata.nextOfGroup = !!(shared.prevGrouppingData &&
-+									(shared.prevGrouppingData.type == shared.cdata.type) &&
-+									(shared.prevGrouppingData.mtype == shared.cdata.mtype) &&
-+									(shared.prevGrouppingData.userid == shared.cdata.userid) &&
-+									(shared.prevGrouppingData.emote == shared.cdata.emote) &&
-+									(shared.prevGrouppingData.local == shared.cdata.local));
-+				return shared.cdata.nextOfGroup;
-+			}
-+		};
-+        
-+        // internationalization
-+        function tr(text)
-+        {
-+            // TODO translate
-+            return text;
-+        }
-+        
-+        // accepts some templater object and object with 2 optional methods: "pre" and "post(text)"
-+        function proxyTemplate(template, handlers)
-+        {
-+            return {"toString": function(){
-+                if(handlers.pre) handlers.pre();
-+                var result = template.toString();
-+                if(handlers.post) result = handlers.post(result);
-+                return result;
-+            }}
-+        }
-+		
-+		shared.TemplateVar.prototype = {
-+			toString : function() {
-+				if (shared.varHandlers[this.name]) {
-+					return shared.varHandlers[this.name]();
-+				}
-+				var d = shared.cdata[this.name];
-+				if (this.name == "sender") { //may not be html
-+					d = chat.util.escapeHtml(d);
-+				} else if (d instanceof Date) {
-+					if (this.name == "time") {
-+						d = shared.server.formatDate(d, shared.dateFormat);
-+					} else { // last message date ?
-+						d = shared.server.formatDate(d, "yyyy-MM-dd");
-+					}
-+				 } else if (this.name == "avatarurl") {
-+					return "avatar:" + encodeURIComponent(shared.accountId) +
-+						"/" + encodeURIComponent(shared.cdata.userid);
-+				} else if (this.name == "next") {
-+					shared.cdata.nextEl = "nextMessagePH"+(1000+Math.floor(Math.random()*1000));
-+					return '<div id="'+shared.cdata.nextEl +'"></div>';
-+				}
-+				return d || "";
-+			}
-+		}
-+		
-+		shared.Template.prototype.toString = function() {
-+			return this.parts.join("");
-+		}
-+		
-+		
-+		chat.adapter.receiveObject = function(data) {
-+			shared.cdata = data;
-+			if (!inited) {
-+				chat.util.showCriticalError("A try to output data while theme is not inited. output is impossible.\nCheck if your theme does not have errors.");
-+				return;
-+			}
-+			try {
-+				//shared.server.console(chat.util.props(data, true))
-+				var template;
-+				if (proxy && (template = proxy()) === false) { // proxy stopped processing
-+					return; //we don't store shared.prevGrouppingData here, let's proxy do it if needed
-+				}
-+				if (data.type == "message") {
-+					if (data.mtype != "message") {
-+						shared.stopGroupping();
-+					}
-+					if (!template) switch (data.mtype) {
-+						case "message":
-+							if (shared.checkNextOfGroup()) {
-+								template = data.local?shared.templates.sentMessageGroupping:shared.templates.receivedMessageGroupping;
-+							}
-+							if (!template) {
-+								data.nextOfGroup = false; //can't group w/o template
-+								template = data.local?shared.templates.sentMessage:shared.templates.receivedMessage;
-+							}
-+							break;
-+                        case "status":
-+                            template = data.usertext?shared.templates.statusMessageUT:shared.templates.statusMessage;
-+							break;
-+						case "system":
-+							template = data.usertext?shared.templates.sysMessageUT:shared.templates.sysMessage;
-+							break;
-+						case "lastDate":
-+							template = shared.templates.lastMsgDate;
-+							break;
-+						case "subject": //its better to init with proper templates on start than do comparision like below
-+							template = shared.templates.subject;
-+							break;
-+						case "urls":
-+							var i, urls=[];
-+							for (url in data.urls) {
-+								urls.push('<a href="'+url+'">'+(data.urls[url]?chat.util.escapeHtml(data.urls[url]):url)+"</a>");
-+							}
-+							data["message"] = urls.join("<br/>");
-+							template = shared.templates.urls;
-+							break;
-+					}
-+					if (template) {
-+						shared.appendHtml(template.toString(), data.local?true:null, data.nextOfGroup?
-+							shared.prevGrouppingData.nextEl:null); //force scroll on local messages
-+						shared.stopGroupping();// safe clean up previous data
-+						if (shared.cdata.nextEl) { //convert to DOM
-+							shared.cdata.nextEl = document.getElementById(shared.cdata.nextEl);
-+							shared.prevGrouppingData = shared.cdata;
-+						}
-+					} else {
-+						throw "Template not found";
-+					}
-+				} else if (data.type == "trackbar") {
-+					if (!trackbar) {
-+						trackbar = document.createElement("div");
-+						trackbar.innerHTML = shared.templates.trackbar.toString();
-+					} else {
-+						shared.chatElement.removeChild(trackbar);
-+					}
-+					shared.chatElement.appendChild(trackbar);
-+					shared.scroller.invalidate();
-+					shared.stopGroupping(); //groupping impossible
-+				} else if (data.type == "clear") {
-+					shared.stopGroupping(); //groupping impossible
-+					shared.chatElement.innerHTML = "";
-+					trackbar = null;
-+				}
-+			} catch(e) {
-+				chat.util.showCriticalError("APPEND ERROR: " + e + " \nline: " + e.line)
-+			}
-+		};
-+	
-+		chat.adapter.initSession = null;
-+		chat.adapter.loadTheme = null;
-+		window.chatServer = null;
-+		window.chatSession = null;
-+		return shared;
-+	
-+	}
-+}
-+
-+
-+} catch(e) {
-+	window[chatServer.jsNamespace()].console("adapter load error!!! "+e)
-+}
-+"ok"; // just an indicator for script loader
---- psi.orig/themes/chatview/psi/classic/index.html
-+++ psi/themes/chatview/psi/classic/index.html
-@@ -0,0 +1,117 @@
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-+<html>
-+<head>
-+  <style type="text/css" media="screen,print">
-+body {padding:0 0 2px 0; margin:0; width:100%;}
-+body > div {
-+	margin:0px 3px 0px 3px;
-+	line-height:1.4em;
-+	word-wrap:break-word !important;
-+	white-space: pre-wrap !important;
-+	overflow:hidden;
-+}
-+body > div img { vertical-align:bottom; }
-+.sent {}
-+.received {}
-+.infmsg {}
-+.usertext {}
-+.alert {font-weight:bold; color:red;}
-+.trackbar { height:1px; border:1px solid black; border-color:#bbf #66f #66f #bbf }
-+  </style>
-+</head>
-+<body>
-+<script type="text/javascript">
-+try {
-+
-+window[chatServer.jsNamespace()].theme = function() {
-+	var nicks = {};
-+	var nickNumber = 0;
-+	var chat = window[chatServer.jsNamespace()];
-+	
-+	var cssBody = chat.util.findStyleSheet(document.styleSheets[0], "body").style;
-+	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets[0], ".sent").style;
-+	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets[0], ".received").style;
-+	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
-+	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
-+	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
-+	
-+	var applyPsiSettings = function() {
-+		chat.util.updateObject(cssBody, eval("["+shared.session.getFont()+"][0]"));
-+		cssBody.backgroundColor = shared.server.getPaletteColor("Base");
-+		cssBody.color = shared.server.getPaletteColor("Text");
-+		cssSentMsg.color = shared.colorOption("options.ui.look.colors.messages.sent");
-+		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
-+		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
-+		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
-+	}
-+	
-+	var shared = chat.adapter.initSession();
-+	shared.initTheme({
-+		chatElement : document.body,
-+		templates : {
-+			message: shared.isMuc?
-+				"<div class='msg'><span style='color:%nickcolor%'>[%time%] %sender%</span> %message%</div>"
-+				: "<div class='msg'><span class='%sentrec%'>[%time%] %sender%</span> %message%</div>",
-+			messageNC: shared.isMuc?
-+				"<div style='color:%nickcolor%'>[%time%] %sender% %message%</div>"
-+				: "<div class='%sentrec%'>[%time%] %sender% %message%</div>",
-+			receivedMessage: shared.isMuc?
-+				"<div class='msg'><span style='color:%nickcolor%'>[%time%] %sender%</span> %alertedmessage%</div>"
-+				: null,
-+			spooledMessage: "<div class='infmsg'>[%time%] %sender% %message%</div>",
-+			sys: "<div class='infmsg'>%message%</div>",
-+			sysMessage: "<div class='infmsg'>[%time%] *** %message%</div>",
-+			sysMessageUT: "<div class='infmsg'>[%time%] *** %message%: <span class='usertext'>%usertext%</span></div>",
-+			lastMsgDate: "<div class='infmsg'>*** %date%</div>",
-+			subject: shared.isMuc?
-+				"<div class='infmsg'>[%time%] %message%<div class='usertext'><b>%usertext%</b></div></div>"
-+				: "<div class='infmsg'><b>*** %usertext%</b></div>",
-+			trackbar: '<hr class="trackbar" />'
-+		},
-+		dateFormat : "hh:mm:ss",
-+		proxy : function() { //optional
-+			if (shared.cdata.type == "settings") {
-+				applyPsiSettings();
-+				return false;
-+			}
-+			if (shared.cdata.mtype == "message") {
-+				var template = shared.cdata.emote && shared.templates.messageNC ||
-+					(shared.cdata.spooled && shared.templates.message || null);
-+				if (template) {
-+					shared.appendHtml(template.toString(), shared.cdata.local?true:null);
-+					return false;
-+				}
-+			}
-+		},
-+		varHandlers : {
-+			sender : function() {
-+				var nick = chat.util.escapeHtml(shared.cdata.sender);
-+				return shared.cdata.emote?"*"+nick:"&lt;"+nick+"&gt;";
-+			},
-+			alertedmessage : function() {
-+				return shared.cdata.alert?"<span class='alert'>"+
-+					shared.cdata.message+"</span>":shared.cdata.message;
-+			},
-+			sentrec : function() {return shared.cdata.spooled?"infmsg":
-+				(shared.cdata.local?"sent":"received");},
-+			nickcolor : function() {
-+				return shared.session.mucNickColor(shared.cdata.sender, shared.cdata.local);
-+			}
-+		}
-+	});
-+	
-+	applyPsiSettings();
-+	
-+	shared.session.signalInited();
-+	
-+	return {
-+		
-+	};
-+}()
-+
-+} catch(e) {
-+	 document.body.innerHTML = "Theme initialization failed: " + e
-+}
-+</script>
-+</body>
-+</html>
---- psi.orig/themes/chatview/psi/classic/load.js
-+++ psi/themes/chatview/psi/classic/load.js
-@@ -0,0 +1 @@
-+chatServer.setMetaData({name: "Classic"});
---- psi.orig/themes/chatview/util.js
-+++ psi/themes/chatview/util.js
-@@ -0,0 +1,193 @@
-+window[chatServer.jsNamespace()] = function() {
-+	var htmlSource = document.createElement("div"); //manages appendHtml
-+	var server = window.chatServer;
-+	var chat =  {
-+		console : server.console,
-+		adapter : {
-+			receiveObject : function(data) {
-+				chat.util.showCriticalError("Adapter is not loaded. output impossible!\n\nData was:" + chat.util.props(data));
-+			}
-+		},
-+		util: {
-+			showCriticalError : function(text) {
-+				var e=document.body || document.documentElement.appendChild(document.createElement("body"));
-+				var er = e.appendChild(document.createElement("div"))
-+				er.style.cssText = "background-color:red;color:white;border:1px solid black;padding:1em;margin:1em;font-weight:bold";
-+				er.innerHTML = chat.util.escapeHtml(text).replace(/\n/, "<br/>");
-+			},
-+			
-+			// just for debug
-+			escapeHtml : function(html) {
-+				return html.split("&").join("&amp;").split( "<").join("&lt;").split(">").join("&gt;");
-+			},
-+			
-+			// just for debug
-+			props : function(e, rec) {
-+				var ret='';
-+				for (var i in e) {
-+					var gotValue = true;
-+					var val = null;
-+					try {
-+						val = e[i];
-+					} catch(err) {
-+						val = err.toString();
-+						gotValue = false;
-+					}
-+					if (gotValue) {
-+						if (val instanceof Object && rec && val.constructor != Date) {
-+							ret+=i+" = "+val.constructor.name+"{"+chat.util.props(val, rec)+"}\n";
-+						} else {
-+							if (val instanceof Function) {
-+								ret+=i+" = Function: "+i+"\n";
-+							} else {
-+								ret+=i+" = "+(val === null?"null\n":val.constructor.name+"(\""+val+"\")\n");
-+							}
-+						}
-+					} else {
-+						ret+=i+" = [CAN'T GET VALUE: "+val+"]\n";
-+					}
-+				}
-+				return ret;
-+			},
-+			
-+			// replaces <icon name="icon_name" text="icon_text" />
-+			// with <img src="icon://psi/icon_name" title="icon_text" />
-+			icon2img : function (obj) {
-+			   var img = document.createElement('img');
-+			   img.src = "icon:" + obj.getAttribute("name");
-+			   img.title = obj.getAttribute("text");
-+			   var ib = obj.nextSibling
-+			   while (obj.firstChild) obj.parentNode.insertBefore(obj.firstChild, ib);
-+			   obj.parentNode.replaceChild(img, obj);
-+			},
-+
-+			// replaces all occurrence of <icon> by function above
-+			replaceIcons : function(el) {
-+				var icon, icons = [], i, els;
-+				while (true) {
-+					els = el.getElementsByTagName("icon");
-+					if (els.length == 0) break;
-+					for (i=0; i<els.length; i++) {
-+						chat.util.icon2img(els[i]);
-+					}
-+				}
-+			},
-+			
-+			updateObject : function(object, update) {
-+				for (var i in update) {
-+					object[i] = update[i]
-+				}
-+			},
-+			
-+			findStyleSheet : function (sheet, selector) {
-+				for (var i=0; i<sheet.cssRules.length; i++) {
-+					if (sheet.cssRules[i].selectorText == selector)
-+						return sheet.cssRules[i];
-+				}
-+				return false;
-+			},
-+			
-+			appendHtml : function(dest, html) {
-+				htmlSource.innerHTML = html;
-+				chat.util.replaceIcons(htmlSource);
-+				while (htmlSource.firstChild) dest.appendChild(htmlSource.firstChild);
-+			},
-+			
-+			siblingHtml : function(dest, html) {
-+				htmlSource.innerHTML = html;
-+				chat.util.replaceIcons(htmlSource);
-+				while (htmlSource.firstChild) dest.parentNode.insertBefore(htmlSource.firstChild, dest);
-+			},
-+			
-+			ensureDeleted : function(id) {
-+				if (id) {
-+					var el = document.getElementById(id);
-+					if (el) {
-+						el.parentNode.removeChild(el);
-+					}
-+				}
-+			},
-+			
-+			loadXML : function(path, allowEmpty) {
-+				allowEmpty = allowEmpty || false;
-+				text = server.getFileContents(path);
-+				if (!text && !allowEmpty) {
-+					throw new Error("File " + path + " is empty. can't parse xml");
-+				}
-+				try {
-+					return new DOMParser().parseFromString(text, "text/xml");
-+				} catch (e) {
-+					server.console("failed to parse xml from file " + path);
-+					throw e;
-+				}
-+			}
-+		},
-+		
-+		WindowScroller : function(animate) {
-+			var o=this, state, timerId
-+			var ignoreNextScroll = false;
-+			o.animate = animate;
-+			o.atBottom = true; //just a state of aspiration
-+
-+			var animationStep = function() {
-+				timerId = null;
-+				var before = document.height - (window.innerHeight+window.pageYOffset);
-+				var step = before;
-+				if (o.animate) {
-+					step = step>200?200:(step<8?step:Math.floor(step/1.7));
-+				}
-+				ignoreNextScroll = true;
-+				window.scrollTo(0, document.height - window.innerHeight - before + step);
-+				if (before>0) {
-+					timerId = setTimeout(animationStep, 70); //next step in 250ms even if we are already at bottom (control shot)
-+				}
-+			}
-+
-+			var startAnimation = function() {
-+				if (timerId) return;
-+				if (document.height > window.innerHeight) { //if we have what to scroll
-+					timerId = setTimeout(animationStep, 0);
-+				}
-+			}
-+
-+			var stopAnimation = function() {
-+				if (timerId) {
-+					clearTimeout(timerId);
-+					timerId = null;
-+				}
-+			}
-+			
-+			//timeout to be sure content rerendered correctly
-+			window.addEventListener("resize", function() {setTimeout(function(){
-+				if (o.atBottom) { //immediatelly scroll to bottom if we wish it
-+					window.scrollTo(0, document.height - window.innerHeight);
-+				}
-+			}, 0);}, false);
-+			
-+			//let's consider scroll may happen only by user action
-+			window.addEventListener("scroll", function(){
-+				if (ignoreNextScroll) {
-+					ignoreNextScroll = false;
-+					return;
-+				}
-+				stopAnimation();
-+				o.atBottom = document.height == (window.innerHeight+window.pageYOffset);
-+			}, false);
-+			
-+			//EXTERNAL API
-+			// checks current state of scroll and wish and activates necessary actions
-+			o.invalidate = function() {
-+				if (o.atBottom) {
-+					startAnimation();
-+				}
-+			}
-+			
-+			o.force = function() {
-+				o.atBottom = true;
-+				o.invalidate();
-+			}
-+		}
-+	}
-+	return chat;
-+}();
-+"ok"; // just an indicator for script loader

psi-plus-main-20130107.tar.xz/patches/0040-psi-muc-topic.diff Deleted

@@ -1,283 +0,0 @@
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -96,6 +96,8 @@
- static const QString geometryOption = "options.ui.muc.size";
- 
- 
-+#include "groupchattopicdlg.h"
-+
- //----------------------------------------------------------------------------
- // StatusPingTask
- //----------------------------------------------------------------------------
-@@ -224,7 +226,7 @@ public:
- 	QString lastSearch;
- 
- 	QPointer<MUCConfigDlg> configDlg;
--	
-+	QPointer<GroupchatTopicDlg> topicDlg;
- public:
- 	bool trackBar;
- 
-@@ -593,7 +595,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.log->setAccount(account());
- #endif
- 
--	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(doTopic()));
-+	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(openTopic()));
- 	PsiToolTip::install(ui_.le_topic);
- 
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
-@@ -927,23 +929,27 @@ void GCMainDlg::le_downPressed()
- 	}
- }*/
- 
--void GCMainDlg::doTopic()
-+void GCMainDlg::openTopic()
- {
--	bool ok = false;
--	QString str = QInputDialog::getText(this,
--		tr("Set Groupchat Topic"),
--		tr("Enter a topic:"),
--		QLineEdit::Normal, ui_.le_topic->text(), &ok);
--
--	if(ok) {
--		Message m(jid());
--		m.setType("groupchat");
--		m.setSubject(str);
--		m.setTimeStamp(QDateTime::currentDateTime());
--		aSend(m);
-+	if(d->topicDlg) {
-+		::bringToFront(d->topicDlg);
-+	} else {
-+		d->topicDlg = new GroupchatTopicDlg(this);
-+		d->topicDlg->setAttribute(Qt::WA_DeleteOnClose);
-+		d->topicDlg->show();
-+		connect(d->topicDlg, SIGNAL(topicAccepted(const QString)), this, SLOT(setTopic(const QString)));
- 	}
- }
- 
-+void GCMainDlg::setTopic(const QString &topic)
-+{
-+	Message m(jid());
-+	m.setType("groupchat");
-+	m.setSubject(topic);
-+	m.setTimeStamp(QDateTime::currentDateTime());
-+	aSend(m);
-+}
-+
- void GCMainDlg::doClear()
- {
- 	ui_.log->clear();
-@@ -1432,6 +1438,11 @@ const QString& GCMainDlg::nick() const
- 	return d->self;
- }
- 
-+const QString& GCMainDlg::topic() const
-+{
-+	return d->topic;
-+}
-+
- void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
- {
- 	MessageView mv = MessageView::fromPlainText(str, MessageView::System);
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -74,6 +74,7 @@ public:
- 	void joined();
- 	void setPassword(const QString&);
- 	const QString& nick() const;
-+	const QString& topic() const;
- 
- 	bool isInactive() const;
- 	void reactivate();
-@@ -107,7 +108,8 @@ private slots:
- 	void scrollUp();
- 	void scrollDown();
- 	void mle_returnPressed();
--	void doTopic();
-+	void openTopic();
-+	void setTopic(const QString &);
- 	void openFind();
- 	void configureRoom();
- 	void doFind(const QString &);
---- /dev/null
-+++ git/src/groupchattopicdlg.cpp
-@@ -0,0 +1,44 @@
-+#include "groupchattopicdlg.h"
-+#include "ui_groupchattopicdlg.h"
-+
-+#include "psioptions.h"
-+#include "groupchatdlg.h"
-+
-+GroupchatTopicDlg::GroupchatTopicDlg(GCMainDlg *parent) :
-+	QDialog(parent),
-+	m_ui(new Ui::GroupchatTopicDlg)
-+{
-+	m_ui->setupUi(this);
-+	QFont f;
-+	f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString());
-+	m_ui->pte_topic->setFont(f);
-+	m_ui->pte_topic->setPlainText(parent->topic());
-+}
-+
-+GroupchatTopicDlg::~GroupchatTopicDlg()
-+{
-+	delete m_ui;
-+}
-+
-+QString GroupchatTopicDlg::topic() const
-+{
-+	return m_ui->pte_topic->toPlainText();
-+}
-+
-+void GroupchatTopicDlg::accept()
-+{
-+	emit topicAccepted(m_ui->pte_topic->toPlainText());
-+	QDialog::accept();
-+}
-+
-+void GroupchatTopicDlg::changeEvent(QEvent *e)
-+{
-+	QDialog::changeEvent(e);
-+	switch (e->type()) {
-+		case QEvent::LanguageChange:
-+			m_ui->retranslateUi(this);
-+			break;
-+		default:
-+			break;
-+	}
-+}
---- /dev/null
-+++ git/src/groupchattopicdlg.h
-@@ -0,0 +1,32 @@
-+#ifndef GROUPCHATTOPICDLG_H
-+#define GROUPCHATTOPICDLG_H
-+
-+#include <QtGui/QDialog>
-+
-+namespace Ui {
-+	class GroupchatTopicDlg;
-+}
-+
-+class GCMainDlg;
-+
-+class GroupchatTopicDlg : public QDialog {
-+	Q_OBJECT
-+public:
-+	GroupchatTopicDlg(GCMainDlg *parent = 0);
-+	~GroupchatTopicDlg();
-+	QString topic() const;
-+
-+protected:
-+	void changeEvent(QEvent *e);
-+
-+private:
-+	Ui::GroupchatTopicDlg *m_ui;
-+
-+public slots:
-+	void accept();
-+
-+signals:
-+	void topicAccepted(const QString &);
-+};
-+
-+#endif // GROUPCHATTOPICDLG_H
---- /dev/null
-+++ git/src/groupchattopicdlg.ui
-@@ -0,0 +1,71 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>GroupchatTopicDlg</class>
-+ <widget class="QDialog" name="GroupchatTopicDlg">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>600</width>
-+    <height>450</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Set Groupchat Topic</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QPlainTextEdit" name="pte_topic">
-+     <property name="whatsThis">
-+      <string>Text of topic</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QDialogButtonBox" name="buttonBox">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+     <property name="standardButtons">
-+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>accepted()</signal>
-+   <receiver>GroupchatTopicDlg</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>248</x>
-+     <y>254</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>157</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>rejected()</signal>
-+   <receiver>GroupchatTopicDlg</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>316</x>
-+     <y>260</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>286</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -366,16 +366,19 @@ groupchat {
- 	HEADERS += \
- 		$$PWD/groupchatdlg.h \
- 		$$PWD/gcuserview.h \
--		$$PWD/mucjoindlg.h
-+		$$PWD/mucjoindlg.h \
-+		$$PWD/groupchattopicdlg.h
- 
- 	SOURCES += \
- 		$$PWD/groupchatdlg.cpp \
- 		$$PWD/gcuserview.cpp \
--		$$PWD/mucjoindlg.cpp
-+		$$PWD/mucjoindlg.cpp \
-+		$$PWD/groupchattopicdlg.cpp
- 
- 	FORMS += \
- 		$$PWD/groupchatdlg.ui \
--		$$PWD/mucjoin.ui
-+		$$PWD/mucjoin.ui \
-+		$$PWD/groupchattopicdlg.ui
- }
- 
- whiteboarding {

psi-plus-main-20130107.tar.xz/patches/0050-psi-receipts.diff Deleted

@@ -1,598 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -110,6 +110,8 @@
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
- 				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
- 				<use-small-chats type="bool">false</use-small-chats>
-+				<use-message-icons type="bool">true</use-message-icons>
-+				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
- 			</chat>
- 			<history comment="History dialog options">
-@@ -283,6 +285,8 @@
- 				</font>
- 			</look>
- 			<notifications>
-+				<send-receipts type="bool" >true</send-receipts>
-+				<request-receipts type="bool" >true</request-receipts>
- 				<alert-style type="QString">animate</alert-style>
- 				<typename type="QString">Classic</typename>
- 				<bounce-dock type="QString">forever</bounce-dock>
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -668,6 +668,20 @@ void ChatDlg::doSend()
- 	}
- 	QString id = account()->client()->genUniqueId();
- 	m.setId(id); // we need id early for message manipulations in chatview
-+
-+	//xep-0184 Message Receipts
-+	if (PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool()) {
-+		QStringList sl;
-+		sl<<"urn:xmpp:receipts";
-+		//FIXME uncomment next lines when all bugs will be fixed
-+		//if (!jid().resource().isEmpty() || (account()->capsManager()->isEnabled() &&
-+		//    account()->capsManager()->features(jid()).test(sl))) {
-+		if (true) {
-+			m.setMessageReceipt(ReceiptRequest);
-+			//rememberPosition(id);
-+		}
-+	}
-+
- 	m_ = m;
- 
- 	// Request events
-@@ -741,6 +755,9 @@ void ChatDlg::incomingMessage(const Mess
- 		if (m.chatState() != XMPP::StateNone) {
- 			setContactChatState(m.chatState());
- 		}
-+		if (m.messageReceipt() == ReceiptReceived) {
-+			chatView()->markReceived(m.id());
-+		}
- 	}
- 	else {
- 		// Normal message
-@@ -821,6 +838,7 @@ void ChatDlg::appendMessage(const Messag
- 	mv.setUserId(local?account()->jid().bare():jid().bare());
- 	mv.setDateTime(m.timeStamp());
- 	mv.setSpooled(m.spooled());
-+	mv.setAwaitingReceipt(local && m.messageReceipt() == ReceiptRequest);
- 	chatView()->dispatchMessage(mv);
- 
- 	if (!m.urlList().isEmpty()) {
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -27,12 +27,14 @@
- #include "textutil.h"
- #include "psirichtext.h"
- #include "common.h"
-+#include "iconset.h"
- 
- #include <QWidget>
- #include <QTextOption>
- #include <QScrollBar>
- #include <QTimer>
- #include <QKeyEvent>
-+#include <QUrl>
- 
- static const char *infomrationalColorOpt = "options.ui.look.colors.messages.informational";
- 
-@@ -56,6 +58,26 @@ ChatView::ChatView(QWidget *parent)
- 	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
- 	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
- #endif
-+
-+	useMessageIcons_ = PsiOptions::instance()->getOption("options.ui.chat.use-message-icons").toBool();
-+	if (useMessageIcons_) {
-+		int logIconsSize = fontInfo().pixelSize()*0.93;
-+		if (PsiOptions::instance()->getOption("options.ui.chat.scaled-message-icons").toBool()) {
-+			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+		} else {
-+			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive");
-+			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send");
-+			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok");
-+			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time");
-+			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info");
-+		}
-+		addLogIconsResources();
-+	}
-+
- }
- 
- ChatView::~ChatView()
-@@ -86,6 +108,29 @@ void ChatView::setSessionData(bool isMuc
- 	name_ = name;
- }
- 
-+void ChatView::clear()
-+{
-+	PsiTextView::clear();
-+	addLogIconsResources();
-+}
-+
-+void ChatView::addLogIconsResources()
-+{
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_send"), logIconSend);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_time"), logIconTime);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_info"), logIconInfo);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered"), logIconDelivered);
-+}
-+
-+void ChatView::markReceived(QString id)
-+{
-+	if (useMessageIcons_) {
-+		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + id), logIconDelivered);
-+		setLineWrapColumnOrWidth(lineWrapColumnOrWidth());
-+	}
-+}
-+
- bool ChatView::focusNextPrevChild(bool next)
- {
- 	return QWidget::focusNextPrevChild(next);
-@@ -193,7 +238,8 @@ void ChatView::dispatchMessage(const Mes
- 			&& ChatViewCommon::updateLastMsgTime(mv.dateTime()))
- 	{
- 		QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
--		appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(mv.dateTime().date().toString(Qt::ISODate)));
-+		appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_time\" />":"") +
-+				   QString("<font color=\"%1\">*** %2</font>").arg(color).arg(mv.dateTime().date().toString(Qt::ISODate)));
- 	}
- 	switch (mv.type()) {
- 		case MessageView::Message:
-@@ -223,6 +269,8 @@ void ChatView::renderMucMessage(const Me
- 	const QString timestr = formatTimeStamp(mv.dateTime());
- 	QString alerttagso, alerttagsc, nickcolor;
- 	QString textcolor = palette().color(QPalette::Active, QPalette::Text).name();
-+	QString icon = useMessageIcons_?
-+					(QString("<img src=\"%1\" />").arg(mv.isLocal()?"icon:log_icon_delivered":"icon:log_icon_receive")):"";
- 	if(mv.isAlert()) {
- 		textcolor = "#FF0000";
- 		alerttagso = "<b>";
-@@ -236,14 +284,14 @@ void ChatView::renderMucMessage(const Me
- 	}
- 
- 	if(mv.isEmote()) {
--		appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+		appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
- 	}
- 	else {
- 		if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--			appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(mv.nick())) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(mv.nick())) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
- 		}
- 		else {
--			appendText(QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
-+			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
- 		}
- 	}
- 
-@@ -256,14 +304,20 @@ void ChatView::renderMessage(const Messa
- {
- 	QString timestr = formatTimeStamp(mv.dateTime());
- 	QString color = colorString(mv.isLocal(), mv.isSpooled());
-+	if (useMessageIcons_ && mv.isAwaitingReceipt()) {
-+		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()), logIconSend);
-+	}
-+	QString icon = useMessageIcons_?
-+		(QString("<img src=\"%1\" />").arg(mv.isLocal()?
-+		(mv.isAwaitingReceipt()?QString("icon:delivery") + mv.messageId():"icon:log_icon_send"):"icon:log_icon_receive")):"";
- 	if (mv.isEmote()) {
--		appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
-+		appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
- 	} else {
- 		if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--			appendText(QString("<p style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</p>" + mv.formattedText());
-+			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</span><br>" + mv.formattedText());
- 		}
- 		else {
--			appendText(QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ") + mv.formattedText());
-+			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ") + mv.formattedText());
- 		}
- 	}
- 
-@@ -278,14 +332,15 @@ void ChatView::renderSysMessage(const Me
- 	QString ut = mv.formattedUserText();
- 	QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
- 	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
--	appendText(QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
-+	appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_info\" />":"") +
-+			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
- 						(ut.isEmpty()?"":":") + "</font>" +
- 						(ut.isEmpty()?"":QString(" <span style=\"color:%1;\">%2</span>").arg(userTextColor, ut)));
- }
- 
- void ChatView::renderSubject(const MessageView &mv)
- {
--	appendText(QString("<b>") + tr("Subject:") + "</b> " + QString("%1").arg(mv.formattedUserText()));
-+	appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_info\" />":"") + "<b>" + tr("Subject:") + "</b> " + QString("%1").arg(mv.formattedUserText()));
- }
- 
- void ChatView::renderMucSubject(const MessageView &mv)
-@@ -294,7 +349,8 @@ void ChatView::renderMucSubject(const Me
- 	QString ut = mv.formattedUserText();
- 	QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
- 	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
--	appendText(QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
-+	appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_info\" />":"") +
-+			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
- 						(ut.isEmpty()?"":":<br>") + "</font>" +
- 						(ut.isEmpty()?"":QString(" <span style=\"color:%1;font-weight:bold\">%2</span>").arg(userTextColor, ut)));
- }
---- psi.orig/src/chatview_te.h
-+++ psi/src/chatview_te.h
-@@ -39,8 +39,12 @@ public:
- 	ChatView(QWidget* parent);
- 	~ChatView();
- 
-+	void addLogIconsResources();
-+	void markReceived(QString id);
-+
- 	// reimplemented
- 	QSize sizeHint() const;
-+	void clear();
- 
- 	void init();
- 	void setDialog(QWidget* dialog);
-@@ -83,6 +87,13 @@ private:
- 	QString name_;
- 	int  oldTrackBarPosition;
- 	QPointer<QWidget> dialog_;
-+	bool useMessageIcons_;
-+
-+	QPixmap logIconSend;
-+	QPixmap logIconReceive;
-+	QPixmap logIconDelivered;
-+	QPixmap logIconTime;
-+	QPixmap logIconInfo;
- };
- 
- #endif
---- psi.orig/src/chatview_webkit.cpp
-+++ psi/src/chatview_webkit.cpp
-@@ -191,6 +191,14 @@ void ChatView::embedJsObject()
- 	}
- }
- 
-+void ChatView::markReceived(QString id)
-+{
-+	QVariantMap m;
-+	m["type"] = "receipt";
-+	m["id"] = id;
-+	sendJsObject(m);
-+}
-+
- QSize ChatView::sizeHint() const
- {
- 	return minimumSizeHint();
---- psi.orig/src/chatview_webkit.h
-+++ psi/src/chatview_webkit.h
-@@ -44,6 +44,8 @@ public:
- 	ChatView(QWidget* parent);
- 	~ChatView();
- 
-+	void markReceived(QString id);
-+
- 	// reimplemented
- 	QSize sizeHint() const;
- 
---- psi.orig/src/messageview.cpp
-+++ psi/src/messageview.cpp
-@@ -33,6 +33,7 @@ MessageView::MessageView(Type t)
- 	, _alert(false)
- 	, _local(false)
- 	, _spooled(false)
-+	, _awaitingReceipt(false)
- 	, _status(0)
- 	, _dateTime(QDateTime::currentDateTime())
- {
-@@ -158,6 +159,8 @@ QVariantMap MessageView::toVariantMap(bo
- 			m["id"] = _messageId;
- 			if (isMuc) { // maybe w/o conditions ?
- 				m["alert"] = _alert;
-+			} else {
-+				m["awaitingReceipt"] = _awaitingReceipt;
- 			}
- 			break;
- 		case Status:
---- psi.orig/src/messageview.h
-+++ psi/src/messageview.h
-@@ -75,6 +75,8 @@ public:
- 	inline bool isSpooled() const { return _spooled; }
- 	inline void setStatus(int s) { _status = s; }
- 	inline int status() const { return _status; }
-+	inline void setAwaitingReceipt(bool b) { _awaitingReceipt = b; }
-+	inline bool isAwaitingReceipt() const { return _awaitingReceipt; }
- 	inline void setNick(const QString &nick) { _nick = nick; }
- 	inline const QString &nick() const { return _nick; }
- 	inline void setMessageId(const QString &id) { _messageId = id; }
-@@ -93,6 +95,7 @@ private:
- 	bool _alert;
- 	bool _local;
- 	bool _spooled;
-+	bool _awaitingReceipt;
- 	int _status;
- 	QString _messageId;
- 	QString _userId;
---- psi.orig/src/options/opt_advanced.cpp
-+++ psi/src/options/opt_advanced.cpp
-@@ -52,6 +52,10 @@ QWidget *OptionsTabAdvanced::widget()
- 	d->ck_inactiveevents->setWhatsThis(
- 		tr("Enables the sending of events when you end or suspend a "
- 		"conversation"));
-+	d->ck_requestReceipts->setWhatsThis(
-+		tr("Request receipts from contacts on each message."));
-+	d->ck_sendReceipts->setWhatsThis(
-+		tr("Send receipts to contacts by request."));
- 	d->ck_rc->setWhatsThis(
- 		tr("Enables remote controlling your client from other locations"));
- 	d->ck_spell->setWhatsThis(
-@@ -109,6 +113,8 @@ void OptionsTabAdvanced::applyOptions()
- 	PsiOptions::instance()->setOption("options.messages.send-composing-events", d->ck_messageevents->isChecked());
- 	PsiOptions::instance()->setOption("options.messages.send-inactivity-events", d->ck_inactiveevents->isChecked());
- 	PsiOptions::instance()->setOption("options.messages.dont-send-composing-events", d->ck_sendComposingEvents->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.notifications.request-receipts", d->ck_requestReceipts->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.notifications.send-receipts", d->ck_sendReceipts->isChecked());
- 	PsiOptions::instance()->setOption("options.external-control.adhoc-remote-control.enable", d->ck_rc->isChecked());
- 	if ( SpellChecker::instance()->available() )
- 		PsiOptions::instance()->setOption("options.ui.spell-check.enabled",d->ck_spell->isChecked());
-@@ -136,6 +142,8 @@ void OptionsTabAdvanced::restoreOptions(
- 	d->ck_messageevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool() );
- 	d->ck_inactiveevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-inactivity-events").toBool() );
- 	d->ck_sendComposingEvents->setChecked( PsiOptions::instance()->getOption("options.messages.dont-send-composing-events").toBool() );
-+	d->ck_requestReceipts->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool() );
-+	d->ck_sendReceipts->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool() );
- 	d->ck_rc->setChecked( PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool() );
- 	if ( !SpellChecker::instance()->available() )
- 		d->ck_spell->setChecked(false);
---- psi.orig/src/options/opt_advanced.ui
-+++ psi/src/options/opt_advanced.ui
-@@ -44,6 +44,20 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_requestReceipts" >
-+     <property name="text" >
-+      <string>Request receipts</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QCheckBox" name="ck_sendReceipts" >
-+     <property name="text" >
-+      <string>Send receipts</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_rc" >
-      <property name="text" >
-       <string>Enable remote controlling from other locations</string>
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -1043,6 +1043,7 @@ PsiAccount::PsiAccount(const UserAccount
- #endif
- 
- 	setSendChatState(PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool());
-+	setReceipts(PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool());
- 
- 	//connect(d->client, SIGNAL(connected()), SLOT(client_connected()));
- 	//connect(d->client, SIGNAL(handshaken()), SLOT(client_handshaken()));
-@@ -2558,7 +2559,7 @@ void PsiAccount::client_messageReceived(
- void PsiAccount::processIncomingMessage(const Message &_m)
- {
- 	// skip empty messages, but not if the message contains a data form
--	if(_m.body().isEmpty() && _m.urlList().isEmpty() && _m.invite().isEmpty() && !_m.containsEvents() && _m.chatState() == StateNone && _m.subject().isNull() && _m.rosterExchangeItems().isEmpty() && _m.mucInvites().isEmpty() &&  _m.getForm().fields().empty())
-+	if(_m.body().isEmpty() && _m.urlList().isEmpty() && _m.invite().isEmpty() && !_m.containsEvents() && _m.chatState() == StateNone && _m.subject().isNull() && _m.rosterExchangeItems().isEmpty() && _m.mucInvites().isEmpty() &&  _m.getForm().fields().empty() && _m.messageReceipt() == ReceiptNone)
- 		return;
- 
- 	// skip headlines?
-@@ -2658,6 +2659,17 @@ void PsiAccount::processIncomingMessage(
- 	//if(m.type() == "chat" && (!m.urlList().isEmpty() || !m.subject().isEmpty()))
- 	//	m.setType("");
- 
-+	if( m.messageReceipt() == ReceiptRequest && !m.id().isEmpty() &&
-+		PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool()) {
-+		UserListItem *u;
-+		if(j.compare(d->self.jid(), false) || groupchats().contains(j.bare()) || (!d->loginStatus.isInvisible() && (u = d->userList.find(j)) && (u->subscription().type() == Subscription::To || u->subscription().type() == Subscription::Both))) {
-+			Message tm(m.from());
-+			tm.setId(m.id());
-+			tm.setMessageReceipt(ReceiptReceived);
-+			dj_sendMessage(tm, false);
-+		}
-+	}
-+
- 	MessageEvent *me = new MessageEvent(m, this);
- 	me->setOriginLocal(false);
- 	handleEvent(me, IncomingStanza);
-@@ -4643,6 +4655,19 @@ void PsiAccount::handleEvent(PsiEvent* e
- 			delete e;
- 			return;
- 		}
-+		else if (m.messageReceipt() == ReceiptReceived) {
-+			if (PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool()) {
-+				ChatDlg *c = findChatDialog(e->from());
-+				if (!c) {
-+					c = findChatDialog(e->jid());
-+				}
-+				if (c) {
-+					c->incomingMessage(m);
-+				}
-+			}
-+			delete e;
-+			return;
-+		}
- 
- 		// Pass message events to chat window
- 		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
-@@ -5627,7 +5652,9 @@ void PsiAccount::pgp_encryptFinished()
- 		if (m.containsEvent(DisplayedEvent)) mwrap.addEvent(DisplayedEvent);
- 		if (m.containsEvent(ComposingEvent)) mwrap.addEvent(ComposingEvent);
- 		if (m.containsEvent(CancelEvent)) mwrap.addEvent(CancelEvent);
-+		if (m.messageReceipt() == ReceiptRequest) mwrap.setMessageReceipt(ReceiptRequest);
- 		mwrap.setChatState(m.chatState());
-+		mwrap.setId(m.id());
- 		dj_sendMessage(mwrap);
- 	}
- 	emit encryptedMessageSent(x, pt->success(), pt->errorCode(), pt->diagnosticText());
-@@ -5743,6 +5770,9 @@ void PsiAccount::optionsUpdate()
- 	// Chat states
- 	setSendChatState(PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool());
- 
-+	//Receipts
-+	setReceipts(PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool()); //FIXME second presence?
-+
- 	// Remote Controlling
- 	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
- 
-@@ -5787,6 +5817,19 @@ void PsiAccount::setSendChatState(bool b
- 	}
- }
- 
-+void PsiAccount::setReceipts(bool b)
-+{
-+	if (b && !d->client->extensions().contains("mr")) {
-+		d->client->addExtension("mr",Features("urn:xmpp:receipts"));
-+		if (isConnected())
-+			setStatusActual(d->loginStatus);
-+	}
-+	else if (!b && d->client->extensions().contains("mr")) {
-+		d->client->removeExtension("mr");
-+		if (isConnected())
-+			setStatusActual(d->loginStatus);
-+	}
-+}
- 
- void PsiAccount::invokeGCMessage(const Jid &j)
- {
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -440,6 +440,7 @@ protected:
- 
- 	void publishTune(const Tune&);
- 	void setSendChatState(bool);
-+	void setReceipts(bool);
- 	void setRCEnabled(bool);
- 	void sessionStarted();
- 
---- psi.orig/themes/chatview/psi/classic/index.html
-+++ psi/themes/chatview/psi/classic/index.html
-@@ -11,6 +11,7 @@ body > div {
- 	overflow:hidden;
- }
- body > div img { vertical-align:bottom; }
-+body > div > img:first-child { vertical-align:text-bottom; }
- .sent {}
- .received {}
- .infmsg {}
-@@ -34,6 +35,7 @@ window[chatServer.jsNamespace()].theme =
- 	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
- 	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
- 	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
-+	var useMessageIcons, messageIconsSize = 0;
- 	
- 	var applyPsiSettings = function() {
- 		chat.util.updateObject(cssBody, eval("["+shared.session.getFont()+"][0]"));
-@@ -43,6 +45,17 @@ window[chatServer.jsNamespace()].theme =
- 		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
- 		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
- 		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
-+		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
-+		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
-+			var d = document.createElement("div");
-+			d.style.position = "absolute";
-+			d.style.top = "-1000;";
-+			d.style.visibility = "hidden";
-+			d.style.height = "1em";
-+			shared.chatElement.appendChild(d);
-+			messageIconsSize = parseInt(document.defaultView.getComputedStyle(d, null).height);
-+			shared.chatElement.removeChild(d);
-+		}
- 	}
- 	
- 	var shared = chat.adapter.initSession();
-@@ -50,22 +63,22 @@ window[chatServer.jsNamespace()].theme =
- 		chatElement : document.body,
- 		templates : {
- 			message: shared.isMuc?
--				"<div class='msg'><span style='color:%nickcolor%'>[%time%] %sender%</span> %message%</div>"
--				: "<div class='msg'><span class='%sentrec%'>[%time%] %sender%</span> %message%</div>",
-+				"<div class='msg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %message%</div>"
-+				: "<div class='msg'>%icon%<span class='%sentrec%'>[%time%] %sender%</span> %message%</div>",
- 			messageNC: shared.isMuc?
--				"<div style='color:%nickcolor%'>[%time%] %sender% %message%</div>"
--				: "<div class='%sentrec%'>[%time%] %sender% %message%</div>",
-+				"<div style='color:%nickcolor%'>%icon%[%time%] %sender% %message%</div>"
-+				: "<div class='%sentrec%'>%icon%[%time%] %sender% %message%</div>",
- 			receivedMessage: shared.isMuc?
--				"<div class='msg'><span style='color:%nickcolor%'>[%time%] %sender%</span> %alertedmessage%</div>"
-+				"<div class='msg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %alertedmessage%</div>"
- 				: null,
--			spooledMessage: "<div class='infmsg'>[%time%] %sender% %message%</div>",
--			sys: "<div class='infmsg'>%message%</div>",
--			sysMessage: "<div class='infmsg'>[%time%] *** %message%</div>",
--			sysMessageUT: "<div class='infmsg'>[%time%] *** %message%: <span class='usertext'>%usertext%</span></div>",
--			lastMsgDate: "<div class='infmsg'>*** %date%</div>",
-+			spooledMessage: "<div class='infmsg'>%icon%[%time%] %sender% %message%</div>",
-+			sys: "<div class='infmsg'>%icon%%message%</div>",
-+			sysMessage: "<div class='infmsg'>%icon%[%time%] *** %message%</div>",
-+			sysMessageUT: "<div class='infmsg'>%icon%[%time%] *** %message%: <span class='usertext'>%usertext%</span></div>",
-+			lastMsgDate: "<div class='infmsg'>%icon%*** %date%</div>",
- 			subject: shared.isMuc?
--				"<div class='infmsg'>[%time%] %message%<div class='usertext'><b>%usertext%</b></div></div>"
--				: "<div class='infmsg'><b>*** %usertext%</b></div>",
-+				"<div class='infmsg'>%icon%[%time%] %message%<div class='usertext'><b>%usertext%</b></div></div>"
-+				: "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
- 			trackbar: '<hr class="trackbar" />'
- 		},
- 		dateFormat : "hh:mm:ss",
-@@ -73,6 +86,12 @@ window[chatServer.jsNamespace()].theme =
- 			if (shared.cdata.type == "settings") {
- 				applyPsiSettings();
- 				return false;
-+			} else if (shared.cdata.type == "receipt") {
-+				var img = document.getElementById("receipt"+shared.cdata.id);
-+				if (img) {
-+					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
-+					img.src = "icon:psi/notification_chat_delivery_ok"+sizeUri;
-+				}
- 			}
- 			if (shared.cdata.mtype == "message") {
- 				var template = shared.cdata.emote && shared.templates.messageNC ||
-@@ -96,7 +115,32 @@ window[chatServer.jsNamespace()].theme =
- 				(shared.cdata.local?"sent":"received");},
- 			nickcolor : function() {
- 				return shared.session.mucNickColor(shared.cdata.sender, shared.cdata.local);
--			}
-+			},
-+			icon : function() {
-+				var icon = "";
-+				if (useMessageIcons) {
-+					switch (shared.cdata.mtype) {
-+						case "message":
-+							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
-+								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
-+								: "psi/notification_chat_receive";
-+							break;
-+						case "system":
-+						case "subject":
-+						case "urls":
-+							icon = "psi/notification_chat_info";
-+							break;
-+						case "lastDate":
-+							icon = "psi/notification_chat_time";
-+							break;
-+					}
-+					var sizeStyle = messageIconsSize?" style='width:"+messageIconsSize+"px; height:"+messageIconsSize+"px'":"";
-+					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
-+					var id = shared.cdata.awaitingReceipt?" id='receipt"+shared.cdata.id+"'":"";
-+					icon = icon?"<img src='icon:"+icon+sizeUri+"'"+sizeStyle+id+" />":"";
-+				}
-+				return icon;
-+ 			}
- 		}
- 	});
-

psi-plus-main-20130107.tar.xz/patches/0070-psi-entity-time.diff Deleted

@@ -1,612 +0,0 @@
---- git.orig/iris/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
-+++ git/iris/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
-@@ -250,6 +250,23 @@ QString queryNS(const QDomElement &e)
- 	return "";
- }
- 
-+QDomElement queryTag(const QDomElement &e, const QString &element)
-+{
-+	bool found;
-+	QDomElement q = findSubTag(e, element, &found);
-+	return q;
-+}
-+
-+QString queryNS(const QDomElement &e, const QString &element)
-+{
-+	bool found;
-+	QDomElement q = findSubTag(e, element, &found);
-+	if(found)
-+		return q.attribute("xmlns");
-+
-+	return "";
-+}
-+
- /**
- 	\brief Extracts the error code and description from the stanza element.
- 
---- git.orig/iris/src/xmpp/xmpp-im/xmpp_xmlcommon.h
-+++ git/iris/src/xmpp/xmpp-im/xmpp_xmlcommon.h
-@@ -68,7 +68,9 @@ QDomElement findSubTag(const QDomElement
- XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI, const QString &localName);
- QDomElement createIQ(QDomDocument *doc, const QString &type, const QString &to, const QString &id);
- QDomElement queryTag(const QDomElement &e);
-+QDomElement queryTag(const QDomElement &e, const QString &element);
- QString queryNS(const QDomElement &e);
-+QString queryNS(const QDomElement &e, const QString &element);
- void getErrorFromElement(const QDomElement &e, const QString &baseNS, int *code, QString *str);
- QDomElement addCorrectNS(const QDomElement &e);
- 
---- /dev/null
-+++ git/src/entitytimetask.cpp
-@@ -0,0 +1,123 @@
-+/*
-+ * entitytimetask.cpp - Entity time fetching task
-+ * Copyright (C) 2007  Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QTime>
-+#include "entitytimetask.h"
-+#include "xmpp_xmlcommon.h"
-+
-+using namespace XMPP;
-+
-+/**
-+ * \class EntityTimeTask
-+ * \brief Gets entity time
-+ *
-+ * This task can be used to get time zone information of an entity.
-+ */
-+
-+
-+// convert [+|-]hh:mm to minutes
-+static Maybe<int> stringToOffset(const QString &off)
-+{
-+	QTime t = QTime::fromString(off.mid(1), "hh:mm");
-+
-+	if (t.isValid() && (off[0] == '+' || off[0] == '-')) {
-+		int m = t.hour() * 60 + t.minute();
-+		if (off[0] == '-')
-+			m = -m;
-+		return m;
-+	}
-+	else {
-+		return Maybe<int>();
-+	}
-+}
-+
-+/**
-+ * \brief Create new task.
-+ */
-+EntityTimeTask::EntityTimeTask(Task* parent) : Task(parent)
-+{
-+}
-+
-+/**
-+ * \brief Queried entity's JID.
-+ */
-+const Jid & EntityTimeTask::jid() const
-+{
-+	return jid_;
-+}
-+
-+/**
-+ * \brief Prepares the task to get information from JID.
-+ */
-+void EntityTimeTask::get(const Jid &jid)
-+{
-+	jid_ = jid;
-+	iq_ = createIQ(doc(), "get", jid_.full(), id());
-+	QDomElement time = doc()->createElement("time");
-+	time.setAttribute("xmlns", "urn:xmpp:time");
-+	iq_.appendChild(time);
-+}
-+
-+void EntityTimeTask::onGo()
-+{
-+	send(iq_);
-+}
-+
-+bool EntityTimeTask::take(const QDomElement &x)
-+{
-+	if (!iqVerify(x, jid_, id()))
-+		return false;
-+
-+	if (x.attribute("type") == "result") {
-+		bool found = false;
-+		QDomElement q = queryTag(x, "time");
-+		QDomElement tag;
-+		tag = findSubTag(q, "utc", &found);
-+		if (found)
-+			utc_ = tagContent(tag);
-+		tag = findSubTag(q, "tzo", &found);
-+		if (found) {
-+			tzoString_ = tagContent(tag);
-+			tzo_ = stringToOffset(tzoString_);
-+		}
-+		setSuccess();
-+	}
-+	else {
-+		setError(x);
-+	}
-+
-+	return true;
-+}
-+
-+/**
-+ * \brief Timezone offset in [+|-]hh:mm format (or empty string if no data).
-+ */
-+const QString& EntityTimeTask::timezoneOffsetString() const
-+{
-+	return tzoString_;
-+}
-+
-+/**
-+ * \brief Timezone offset in minutes (if available).
-+ */
-+Maybe<int> EntityTimeTask::timezoneOffset() const
-+{
-+	return tzo_;
-+}
---- /dev/null
-+++ git/src/entitytimetask.h
-@@ -0,0 +1,49 @@
-+/*
-+ * entitytimetask.h - Entity time fetching task
-+ * Copyright (C) 2007  Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ENTITYTIMETASK_H
-+#define ENTITYTIMETASK_H
-+
-+#include <QDomElement>
-+#include "xmpp_task.h"
-+#include "xmpp_jid.h"
-+#include "maybe.h"
-+
-+class EntityTimeTask : public XMPP::Task
-+{
-+public:
-+	EntityTimeTask(Task*);
-+
-+	void onGo();
-+	bool take(const QDomElement &);
-+	void get(const XMPP::Jid &jid);
-+	const XMPP::Jid & jid() const;
-+
-+	const QString& timezoneOffsetString() const;
-+	Maybe<int> timezoneOffset() const;
-+
-+private:
-+	QDomElement iq_;
-+	XMPP::Jid jid_;
-+	QString utc_, tzoString_;
-+	Maybe<int> tzo_;
-+};
-+
-+#endif
---- git.orig/src/infodlg.cpp
-+++ git/src/infodlg.cpp
-@@ -44,6 +44,7 @@
- #include "iconset.h"
- #include "common.h"
- #include "lastactivitytask.h"
-+#include "entitytimetask.h"
- #include "vcardfactory.h"
- #include "iconwidget.h"
- #ifndef NEWCONTACTLIST
-@@ -240,7 +241,7 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	updateStatus();
- 	foreach(UserListItem* u, d->findRelevant(j)) {
- 		foreach(UserResource r, u->userResourceList()) {
--			requestClientVersion(d->jid.withResource(r.name()));
-+			requestResourceInfo(d->jid.withResource(r.name()));
- 		}
- 		if (u->userResourceList().isEmpty() && u->lastAvailable().isNull()) {
- 			requestLastActivity();
-@@ -774,13 +775,24 @@ void InfoDlg::setStatusVisibility(bool v
- 	}
- }
- 
--void InfoDlg::requestClientVersion(const Jid& j)
-+/**
-+ * \brief Requests per-resource information.
-+ *
-+ * Gets information about client version and time.
-+ */
-+void InfoDlg::requestResourceInfo(const Jid& j)
- {
- 	d->infoRequested += j.full();
-+
- 	JT_ClientVersion *jcv = new JT_ClientVersion(d->pa->client()->rootTask());
- 	connect(jcv, SIGNAL(finished()), SLOT(clientVersionFinished()));
- 	jcv->get(j);
- 	jcv->go(true);
-+
-+	EntityTimeTask *jet = new EntityTimeTask(d->pa->client()->rootTask());
-+	connect(jet, SIGNAL(finished()), SLOT(entityTimeFinished()));
-+	jet->get(j);
-+	jet->go(true);
- }
- 
- void InfoDlg::clientVersionFinished()
-@@ -801,6 +813,23 @@ void InfoDlg::clientVersionFinished()
- 	}
- }
- 
-+void InfoDlg::entityTimeFinished()
-+{
-+	EntityTimeTask *j = (EntityTimeTask *)sender();
-+	if(j->success()) {
-+		foreach(UserListItem* u, d->findRelevant(j->jid())) {
-+			UserResourceList::Iterator rit = u->userResourceList().find(j->jid().resource());
-+			bool found = (rit == u->userResourceList().end()) ? false: true;
-+			if(!found)
-+				continue;
-+
-+			(*rit).setTimezone(j->timezoneOffset());
-+			d->updateEntry(*u);
-+			updateStatus();
-+		}
-+	}
-+}
-+
- void InfoDlg::requestLastActivity()
- {
- 	LastActivityTask *jla = new LastActivityTask(d->jid.bare(),d->pa->client()->rootTask());
-@@ -826,7 +855,7 @@ void InfoDlg::contactAvailable(const Jid
- {
- 	if (d->jid.compare(j,false)) {
- 		if (!d->infoRequested.contains(j.withResource(r.name()).full())) {
--			requestClientVersion(j.withResource(r.name()));
-+			requestResourceInfo(j.withResource(r.name()));
- 		}
- 	}
- }
---- git.orig/src/infodlg.h
-+++ git/src/infodlg.h
-@@ -59,6 +59,7 @@ private slots:
- 	void contactUnavailable(const Jid &, const Resource &);
- 	void contactUpdated(const Jid &);
- 	void clientVersionFinished();
-+	void entityTimeFinished();
- 	void requestLastActivityFinished();
- 	void jt_finished();
- 	void doSubmit();
-@@ -87,7 +88,7 @@ private:
- 	bool edited();
- 	void setEdited(bool);
- 	void setPreviewPhoto(const QString& str);
--	void requestClientVersion(const XMPP::Jid& j);
-+	void requestResourceInfo(const XMPP::Jid& j);
- 	void requestLastActivity();
- };
- 
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -133,6 +133,7 @@
- #include "rc.h"
- #include "tabdlg.h"
- #include "proxy.h"
-+#include "timeserver.h"
- #include "bobfilecache.h"
- #include "psicontactlist.h"
- #include "psicontact.h"
-@@ -1113,6 +1114,10 @@ PsiAccount::PsiAccount(const UserAccount
- 	d->httpAuthManager = new HttpAuthManager(d->client->rootTask());
- 	connect(d->httpAuthManager, SIGNAL(confirmationRequest(const PsiHttpAuthRequest &)), SLOT(incomingHttpAuthRequest(const PsiHttpAuthRequest &)));
- 
-+	// Time server
-+	new TimeServer(d->client->rootTask());
-+	d->client->addExtension("e-time", QStringList("urn:xmpp:time"));
-+
- 	// Initialize Adhoc Commands server
- 	d->ahcManager = new AHCServerManager(this);
- 	d->rcSetStatusServer = 0;
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -172,6 +172,8 @@ HEADERS += \
- 	$$PWD/xdata_widget.h \
- 	$$PWD/statuspreset.h \
- 	$$PWD/lastactivitytask.h \
-+	$$PWD/entitytimetask.h \
-+	$$PWD/timeserver.h \
- 	$$PWD/bobfilecache.h \
- 	$$PWD/mucmanager.h \
- 	$$PWD/mucconfigdlg.h \
-@@ -302,6 +304,8 @@ SOURCES += \
- 	$$PWD/psiactionlist.cpp \
- 	$$PWD/xdata_widget.cpp \
- 	$$PWD/lastactivitytask.cpp \
-+	$$PWD/entitytimetask.cpp \
-+	$$PWD/timeserver.cpp \
- 	$$PWD/bobfilecache.cpp \
- 	$$PWD/statuspreset.cpp \
- 	$$PWD/mucmanager.cpp \
---- git.orig/src/systeminfo.cpp
-+++ git/src/systeminfo.cpp
-@@ -181,7 +181,7 @@ SystemInfo::SystemInfo() : QObject(QCore
- 		if(s.at(0) == '+')
- 			s.remove(0,1);
- 		s.truncate(s.length()-2);
--		timezone_offset_ = s.toInt();
-+		timezone_offset_ = s.toInt() * 60;	// FIX-ME: should really read the offset in minutes
- 	}
- 	strcpy(fmt, "%Z");
- 	strftime(str, 256, fmt, localtime(&x));
-@@ -214,14 +214,12 @@ SystemInfo::SystemInfo() : QObject(QCore
- 
- #if defined(Q_WS_WIN)
- 	TIME_ZONE_INFORMATION i;
--	//GetTimeZoneInformation(&i);
--	//timezone_offset_ = (-i.Bias) / 60;
- 	memset(&i, 0, sizeof(i));
- 	bool inDST = (GetTimeZoneInformation(&i) == TIME_ZONE_ID_DAYLIGHT);
- 	int bias = i.Bias;
- 	if(inDST)
- 		bias += i.DaylightBias;
--	timezone_offset_ = (-bias) / 60;
-+	timezone_offset_ = -bias;
- 	timezone_str_ = "";
- 	for(int n = 0; n < 32; ++n) {
- 		int w = inDST ? i.DaylightName[n] : i.StandardName[n];
-@@ -266,3 +264,13 @@ SystemInfo* SystemInfo::instance()
- }
- 
- SystemInfo* SystemInfo::instance_ = NULL;
-+
-+/**
-+ * \fn int SystemInfo::timezoneOffset()
-+ * \brief Local timezone offset in minutes.
-+ */
-+
-+/**
-+ * \fn const QString& SystemInfo::timezoneString() const
-+ * \brief Local timezone name.
-+ */
---- /dev/null
-+++ git/src/timeserver.cpp
-@@ -0,0 +1,87 @@
-+/*
-+ * timeserver.cpp - Entity time server
-+ * Copyright (C) 2001, 2002, 2007  Justin Karneges, Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "timeserver.h"
-+#include "systeminfo.h"
-+#include "xmpp_xmlcommon.h"
-+#include <QDateTime>
-+
-+using namespace XMPP;
-+
-+
-+/**
-+ * \class TimeServer
-+ * \brief Server current time
-+ *
-+ * This serving task answers XEP-0202 and XEP-0090 queries
-+ */
-+
-+TimeServer::TimeServer(Task *parent)
-+:Task(parent)
-+{
-+}
-+
-+TimeServer::~TimeServer()
-+{
-+}
-+
-+bool TimeServer::take(const QDomElement &e)
-+{
-+	if (e.tagName() != "iq" || e.attribute("type") != "get")
-+		return false;
-+
-+	QString ns = queryNS(e, "time");
-+	QString ns_deprecated = queryNS(e);
-+	if (ns == "urn:xmpp:time") {
-+		QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-+		QDomElement time = doc()->createElement("time");
-+		time.setAttribute("xmlns", ns);
-+		iq.appendChild(time);
-+
-+		QDateTime local = QDateTime::currentDateTime();
-+		int off = SystemInfo::instance()->timezoneOffset();
-+		QTime t = QTime(0, 0).addSecs(qAbs(off)*60);
-+		QString tzo = (off < 0 ? "-" : "+") + t.toString("HH:mm");
-+		time.appendChild(textTag(doc(), "tzo", tzo));
-+		QString localTimeStr = local.toUTC().toString(Qt::ISODate);
-+		if (!localTimeStr.endsWith("Z"))
-+			localTimeStr.append("Z");
-+		time.appendChild(textTag(doc(), "utc", localTimeStr));
-+
-+		send(iq);
-+		return true;
-+	}
-+	else if (ns_deprecated == "jabber:iq:time") {
-+		QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-+		QDomElement query = doc()->createElement("query");
-+		query.setAttribute("xmlns", "jabber:iq:time");
-+		iq.appendChild(query);
-+
-+		QDateTime local = QDateTime::currentDateTime();
-+		QString str = SystemInfo::instance()->timezoneString();
-+		query.appendChild(textTag(doc(), "utc", TS2stamp(local.toUTC())));
-+		query.appendChild(textTag(doc(), "tz", str));
-+		query.appendChild(textTag(doc(), "display", QString("%1 %2").arg(local.toString()).arg(str)));
-+
-+		send(iq);
-+		return true;
-+	}
-+	return false;
-+}
---- /dev/null
-+++ git/src/timeserver.h
-@@ -0,0 +1,35 @@
-+/*
-+ * timeserver.h - Entity time server
-+ * Copyright (C) 2007  Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef TIMESERVER_H
-+#define TIMESERVER_H
-+
-+#include "xmpp_task.h"
-+
-+class TimeServer : public XMPP::Task
-+{
-+	Q_OBJECT
-+public:
-+	TimeServer(Task *);
-+	~TimeServer();
-+	bool take(const QDomElement &);
-+};
-+
-+#endif
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -102,6 +102,43 @@ void UserResource::setClient(const QStri
- 	}
- }
- 
-+/**
-+ * \brief Timezone offset in minutes (if available).
-+ */
-+Maybe<int> UserResource::timezoneOffset() const
-+{
-+	return v_tzo;
-+}
-+
-+/**
-+ * \brief Timezone offset as string (or empty string if no data).
-+ *
-+ * String is formatted as "UTC[+|-]h[:mm]".
-+ */
-+const QString& UserResource::timezoneOffsetString() const
-+{
-+	return v_tzoString;
-+}
-+
-+/**
-+ * \brief Set timezone offset (in minutes).
-+ */
-+void UserResource::setTimezone(Maybe<int> off)
-+{
-+	v_tzo = off;
-+
-+	if (off.hasValue()) {
-+		QTime t = QTime(0, 0).addSecs(abs(off.value())*60);
-+		QString u = QString("UTC") + (off.value() < 0 ? "-" : "+");
-+		u += QString::number(t.hour());
-+		if (t.minute())
-+			u += QString(":%1").arg(t.minute());
-+		v_tzoString = u;
-+	}
-+	else
-+		v_tzoString = "";
-+}
-+
- const QString & UserResource::publicKeyID() const
- {
- 	return v_keyID;
-@@ -565,6 +602,12 @@ QString UserListItem::makeBareTip(bool t
- 			if (!r.geoLocation().isNull())
- 				str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(r.geoLocation().lat().value()) + "/" + QString::number(r.geoLocation().lon().value()) + "</div>";
- 
-+			// Entity Time
-+			if (r.timezoneOffset().hasValue()) {
-+				QDateTime dt = QDateTime::currentDateTime().toUTC().addSecs(r.timezoneOffset().value()*60);
-+				str += QString("<br><nobr>") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::TextDate)).arg(r.timezoneOffsetString()) + "</nobr>";
-+			}
-+
- 			// client
- 			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
- 				QString ver = r.versionString();
---- git.orig/src/userlist.h
-+++ git/src/userlist.h
-@@ -30,6 +30,7 @@
- #include "mood.h"
- #include "geolocation.h"
- #include "physicallocation.h"
-+#include "maybe.h"
- 
- class AvatarFactory;
- namespace XMPP {
-@@ -51,6 +52,10 @@ public:
- 	const QString& clientOS() const;
- 	void setClient(const QString& name, const QString& version, const QString& os);
- 
-+	Maybe<int> timezoneOffset() const;
-+	const QString& timezoneOffsetString() const;
-+	void setTimezone(Maybe<int> tzo);
-+
- 	const QString & publicKeyID() const;
- 	int pgpVerifyStatus() const;
- 	QDateTime sigTimestamp() const;
-@@ -67,6 +72,8 @@ public:
- 
- private:
- 	QString v_ver, v_clientName, v_clientVersion, v_clientOS, v_keyID;
-+	Maybe<int> v_tzo;
-+	QString v_tzoString;
- 	QString v_tune;
- 	GeoLocation v_geoLocation;
- 	PhysicalLocation v_physicalLocation;

psi-plus-main-20130107.tar.xz/patches/0080-psi-mood-icons-and-description.diff Deleted

@@ -1,659 +0,0 @@
---- git.orig/src/mood.cpp
-+++ git/src/mood.cpp
-@@ -48,6 +48,11 @@ QString Mood::typeText() const
- 	return MoodCatalog::instance()->findEntryByType(type_).text();
- }
- 
-+QString Mood::typeValue() const
-+{
-+	return MoodCatalog::instance()->findEntryByType(type_).value();
-+}
-+
- const QString& Mood::text() const
- {
- 	return text_;
---- git.orig/src/mood.h
-+++ git/src/mood.h
-@@ -31,14 +31,16 @@ class Mood
- public:
- 	enum Type { 
- 		Unknown,
--		Afraid, Amazed, Angry, Annoyed, Anxious, Aroused, Ashamed, Bored,
--    	Brave, Calm, Cold, Confused, Contented, Cranky, Curious, Depressed,
--    	Disappointed, Disgusted, Distracted, Embarrassed, Excited, Flirtatious,
--		Frustrated, Grumpy, Guilty, Happy, Hot, Humbled, Humiliated, Hungry,
-+		Afraid, Amazed, Angry, Amorous, Annoyed, Anxious, Aroused, Ashamed, Bored,
-+		Brave, Calm, Cautious, Cold, Confident, Confused, Contemplative, Contented,
-+		Cranky, Crazy, Creative, Curious, Dejected, Depressed, Disappointed,
-+		Disgusted, Dismayed, Distracted, Embarrassed, Envious, Excited, Flirtatious,
-+		Frustrated, Grumpy, Guilty, Happy, Hopeful, Hot, Humbled, Humiliated, Hungry,
- 		Hurt, Impressed, In_awe, In_love, Indignant, Interested, Intoxicated,
--		Invincible, Jealous, Lonely, Mean, Moody, Nervous, Neutral, Offended,
--		Playful, Proud, Relieved, Remorseful, Restless, Sad, Sarcastic, Serious,
--		Shocked, Shy, Sick, Sleepy, Stressed, Surprised, Thirsty, Worried
-+		Invincible, Jealous, Lonely, Lucky, Mean, Moody, Nervous, Neutral, Offended,
-+		Outraged, Playful, Proud, Relaxed, Relieved, Remorseful, Restless, Sad,
-+		Sarcastic, Serious, Shocked, Shy, Sick, Sleepy, Spontaneous, Stressed, Strong,
-+		Surprised, Thankful, Thirsty, Tired, Undefined, Weak, Worried
- 	};
- 
- 	Mood();
-@@ -47,6 +49,7 @@ public:
- 
- 	Type type() const;
- 	QString typeText() const;
-+	QString typeValue() const;
- 	const QString& text() const;
- 	bool isNull() const;
- 
---- git.orig/src/moodcatalog.cpp
-+++ git/src/moodcatalog.cpp
-@@ -53,11 +53,22 @@ bool MoodCatalog::Entry::isNull() const
- 	return type_ == Mood::Unknown && text_.isNull() && value_.isNull();
- }
- 
-+bool MoodCatalog::Entry::operator<(const MoodCatalog::Entry &m) const
-+{
-+	if ( type_ == Mood::Undefined )
-+		return false;
-+	if ( m.type_ == Mood::Undefined )
-+		return true;
-+	int result = QString::localeAwareCompare ( text_, m.text_ );
-+	return result<0;
-+}
-+
- MoodCatalog::MoodCatalog() : QObject(QCoreApplication::instance())
- {
- 	entries_ += Entry(Mood::Afraid, "afraid", QObject::tr("Afraid"));
- 	entries_ += Entry(Mood::Amazed, "amazed", QObject::tr("Amazed"));
- 	entries_ += Entry(Mood::Angry, "angry", QObject::tr("Angry"));
-+	entries_ += Entry(Mood::Amorous, "amorous", QObject::tr("Amorous"));
- 	entries_ += Entry(Mood::Annoyed, "annoyed", QObject::tr("Annoyed"));
- 	entries_ += Entry(Mood::Anxious, "anxious", QObject::tr("Anxious"));
- 	entries_ += Entry(Mood::Aroused, "aroused", QObject::tr("Aroused"));
-@@ -65,22 +76,31 @@ MoodCatalog::MoodCatalog() : QObject(QCo
- 	entries_ += Entry(Mood::Bored, "bored", QObject::tr("Bored"));
- 	entries_ += Entry(Mood::Brave, "brave", QObject::tr("Brave"));
- 	entries_ += Entry(Mood::Calm, "calm", QObject::tr("Calm"));
-+	entries_ += Entry(Mood::Cautious, "cautious", QObject::tr("Cautious"));
- 	entries_ += Entry(Mood::Cold, "cold", QObject::tr("Cold"));
-+	entries_ += Entry(Mood::Confident, "confident", QObject::tr("Confident"));
- 	entries_ += Entry(Mood::Confused, "confused", QObject::tr("Confused"));
-+	entries_ += Entry(Mood::Contemplative, "contemplative", QObject::tr("Contemplative"));
- 	entries_ += Entry(Mood::Contented, "contented", QObject::tr("Contented"));
- 	entries_ += Entry(Mood::Cranky, "cranky", QObject::tr("Cranky"));
-+	entries_ += Entry(Mood::Crazy, "crazy", QObject::tr("Crazy"));
-+	entries_ += Entry(Mood::Creative, "creative", QObject::tr("Creative"));
- 	entries_ += Entry(Mood::Curious, "curious", QObject::tr("Curious"));
-+	entries_ += Entry(Mood::Dejected, "dejected", QObject::tr("Dejected"));
- 	entries_ += Entry(Mood::Depressed, "depressed", QObject::tr("Depressed"));
- 	entries_ += Entry(Mood::Disappointed, "disappointed", QObject::tr("Disappointed"));
- 	entries_ += Entry(Mood::Disgusted, "disgusted", QObject::tr("Disgusted"));
-+	entries_ += Entry(Mood::Dismayed, "dismayed", QObject::tr("Dismayed"));
- 	entries_ += Entry(Mood::Distracted, "distracted", QObject::tr("Distracted"));
- 	entries_ += Entry(Mood::Embarrassed, "embarrassed", QObject::tr("Embarrassed"));
-+	entries_ += Entry(Mood::Envious, "envious", QObject::tr("Envious"));
- 	entries_ += Entry(Mood::Excited, "excited", QObject::tr("Excited"));
- 	entries_ += Entry(Mood::Flirtatious, "flirtatious", QObject::tr("Flirtatious"));
- 	entries_ += Entry(Mood::Frustrated, "frustrated", QObject::tr("Frustrated"));
- 	entries_ += Entry(Mood::Grumpy, "grumpy", QObject::tr("Grumpy"));
- 	entries_ += Entry(Mood::Guilty, "guilty", QObject::tr("Guilty"));
- 	entries_ += Entry(Mood::Happy, "happy", QObject::tr("Happy"));
-+	entries_ += Entry(Mood::Hopeful, "hopeful", QObject::tr("Hopeful"));
- 	entries_ += Entry(Mood::Hot, "hot", QObject::tr("Hot"));
- 	entries_ += Entry(Mood::Humbled, "humbled", QObject::tr("Humbled"));
- 	entries_ += Entry(Mood::Humiliated, "humiliated", QObject::tr("Humiliated"));
-@@ -95,13 +115,16 @@ MoodCatalog::MoodCatalog() : QObject(QCo
- 	entries_ += Entry(Mood::Invincible, "invincible", QObject::tr("Invincible"));
- 	entries_ += Entry(Mood::Jealous, "jealous", QObject::tr("Jealous"));
- 	entries_ += Entry(Mood::Lonely, "lonely", QObject::tr("Lonely"));
-+	entries_ += Entry(Mood::Lucky, "lucky", QObject::tr("Lucky"));
- 	entries_ += Entry(Mood::Mean, "mean", QObject::tr("Mean"));
- 	entries_ += Entry(Mood::Moody, "moody", QObject::tr("Moody"));
- 	entries_ += Entry(Mood::Nervous, "nervous", QObject::tr("Nervous"));
- 	entries_ += Entry(Mood::Neutral, "neutral", QObject::tr("Neutral"));
- 	entries_ += Entry(Mood::Offended, "offended", QObject::tr("Offended"));
-+	entries_ += Entry(Mood::Outraged, "outraged", QObject::tr("Outraged"));
- 	entries_ += Entry(Mood::Playful, "playful", QObject::tr("Playful"));
- 	entries_ += Entry(Mood::Proud, "proud", QObject::tr("Proud"));
-+	entries_ += Entry(Mood::Relaxed, "relaxed", QObject::tr("Relaxed"));
- 	entries_ += Entry(Mood::Relieved, "relieved", QObject::tr("Relieved"));
- 	entries_ += Entry(Mood::Remorseful, "remorseful", QObject::tr("Remorseful"));
- 	entries_ += Entry(Mood::Restless, "restless", QObject::tr("Restless"));
-@@ -112,10 +135,17 @@ MoodCatalog::MoodCatalog() : QObject(QCo
- 	entries_ += Entry(Mood::Shy, "shy", QObject::tr("Shy"));
- 	entries_ += Entry(Mood::Sick, "sick", QObject::tr("Sick"));
- 	entries_ += Entry(Mood::Sleepy, "sleepy", QObject::tr("Sleepy"));
-+	entries_ += Entry(Mood::Spontaneous, "spontaneous", QObject::tr("Spontaneous"));
- 	entries_ += Entry(Mood::Stressed, "stressed", QObject::tr("Stressed"));
-+	entries_ += Entry(Mood::Strong, "strong", QObject::tr("Strong"));
- 	entries_ += Entry(Mood::Surprised, "surprised", QObject::tr("Surprised"));
-+	entries_ += Entry(Mood::Thankful, "thankful", QObject::tr("Thankful"));
- 	entries_ += Entry(Mood::Thirsty, "thirsty", QObject::tr("Thirsty"));
-+	entries_ += Entry(Mood::Tired, "tired", QObject::tr("Tired"));
-+	entries_ += Entry(Mood::Undefined, "undefined", QObject::tr("Else"));
-+	entries_ += Entry(Mood::Weak, "weak", QObject::tr("Weak"));
- 	entries_ += Entry(Mood::Worried, "worried", QObject::tr("Worried"));
-+	qSort(entries_);
- }
- 
- MoodCatalog* MoodCatalog::instance()
---- git.orig/src/moodcatalog.h
-+++ git/src/moodcatalog.h
-@@ -39,6 +39,7 @@ public:
- 			const QString& value() const;
- 			const QString& text() const;
- 			bool isNull() const;
-+			bool operator<(const MoodCatalog::Entry &m) const;
- 
- 		private:
- 			Mood::Type type_;
---- git.orig/src/mooddlg.cpp
-+++ git/src/mooddlg.cpp
-@@ -25,6 +25,7 @@
- #include "moodcatalog.h"
- #include "psiaccount.h"
- #include "pepmanager.h"
-+#include "psiiconset.h"
- 
- MoodDlg::MoodDlg(PsiAccount* pa)
- 	: QDialog(0), pa_(pa)
-@@ -36,9 +37,16 @@ MoodDlg::MoodDlg(PsiAccount* pa)
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));	
- 
- 	ui_.cb_type->addItem(tr("<unset>"));
-+	Mood::Type mt = pa->mood().type();
-+	int i=1;
- 	foreach(MoodCatalog::Entry e, MoodCatalog::instance()->entries()) {
--		ui_.cb_type->addItem(e.text());
-+        	ui_.cb_type->addItem(IconsetFactory::icon("mood/"+e.value()).icon(), e.text());
-+		if (e.type() == mt) {
-+			ui_.cb_type->setCurrentIndex(i);
-+		}
-+		i++;
- 	}
-+	ui_.le_text->setText(pa->mood().text());
- }
- 
- 
---- git.orig/src/options/opt_appearance.cpp
-+++ git/src/options/opt_appearance.cpp
-@@ -94,6 +94,7 @@ OptionsTabAppearance::OptionsTabAppearan
- OptionsTabIconset::OptionsTabIconset(QObject *parent) : MetaOptionsTab(parent, "iconsets", "", tr("Icons"), tr("Icons"))
- {
- 	addTab( new OptionsTabIconsetEmoticons(this) );
-+	addTab( new OptionsTabIconsetMoods(this) );
- 	addTab( new OptionsTabIconsetRoster(this) );
- 	addTab( new OptionsTabIconsetSystem(this) );
- }
---- git.orig/src/options/opt_iconset.cpp
-+++ git/src/options/opt_iconset.cpp
-@@ -23,6 +23,7 @@
- #include <QTreeWidget>
- 
- #include "ui_opt_iconset_emo.h"
-+#include "ui_opt_iconset_mood.h"
- #include "ui_opt_iconset_system.h"
- #include "ui_opt_iconset_roster.h"
- #include "ui_ui_isdetails.h"
-@@ -33,6 +34,12 @@ public:
- 	IconsetEmoUI() : QWidget() { setupUi(this); }
- };
- 
-+class IconsetMoodUI : public QWidget, public Ui::IconsetMood
-+{
-+public:
-+	IconsetMoodUI() : QWidget() { setupUi(this); }
-+};
-+
- class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
- {
- public:
-@@ -647,6 +654,155 @@ void OptionsTabIconsetEmoticons::cancelT
- 	}
- }
- 
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabIconsetMoods
-+//----------------------------------------------------------------------------
-+
-+OptionsTabIconsetMoods::OptionsTabIconsetMoods(QObject *parent)
-+	: OptionsTab(parent, "iconset_moods", "", tr("Moods"), tr("Select your mood iconset"))
-+	, w(0)
-+	, thread(0)
-+{
-+}
-+
-+OptionsTabIconsetMoods::~OptionsTabIconsetMoods()
-+{
-+	cancelThread();
-+}
-+
-+QWidget *OptionsTabIconsetMoods::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new IconsetMoodUI;
-+	IconsetMoodUI *d = (IconsetMoodUI *)w;
-+
-+	connect(d->pb_moodDetails, SIGNAL(clicked()), SLOT(previewIconset()));
-+
-+	return w;
-+}
-+
-+void OptionsTabIconsetMoods::applyOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetMoodUI *d = (IconsetMoodUI *)w;
-+
-+	const Iconset *is = d->iss_moods->iconset();
-+	if ( is ) {
-+		QFileInfo fi( is->fileName() );
-+		PsiOptions::instance()->setOption("options.iconsets.moods", fi.fileName());
-+	}
-+}
-+
-+void OptionsTabIconsetMoods::restoreOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetMoodUI *d = (IconsetMoodUI *)w;
-+
-+	d->iss_moods->clear();
-+	QStringList loaded;
-+
-+	d->setCursor(Qt::WaitCursor);
-+
-+	QPalette customPal = d->palette();
-+	customPal.setCurrentColorGroup(QPalette::Inactive);
-+	d->iss_moods->setEnabled(false);
-+	d->iss_moods->setPalette(customPal);
-+
-+	d->pb_moodDetails->setEnabled(false);
-+	d->pb_moodDetails->setPalette(customPal);
-+
-+	d->progress->show();
-+	d->progress->setValue( 0 );
-+
-+	numIconsets = countIconsets("/moods", loaded);
-+	iconsetsLoaded = 0;
-+
-+	cancelThread();
-+
-+	thread = new IconsetLoadThread(this, "/moods");
-+	thread->start();
-+}
-+
-+bool OptionsTabIconsetMoods::event(QEvent *e)
-+{
-+	IconsetMoodUI *d = (IconsetMoodUI *)w;
-+	if ( e->type() == QEvent::User ) { // iconset load event
-+		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
-+
-+		if ( thread != le->thread() )
-+			return false;
-+
-+		if ( !numIconsets )
-+			numIconsets = 1;
-+		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
-+
-+		Iconset *i = le->iconset();
-+		if ( i ) {
-+			PsiIconset::instance()->stripFirstAnimFrame(i);
-+			d->iss_moods->insert(*i);
-+
-+			QFileInfo fi( i->fileName() );
-+			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.moods").toString() )
-+				d->iss_moods->setItemSelected(d->iss_moods->lastItem(), true);
-+
-+			delete i;
-+		}
-+
-+		return true;
-+	}
-+	else if ( e->type() == QEvent::User + 1 ) { // finish event
-+		d->iss_moods->setEnabled(true);
-+		d->iss_moods->setPalette(QPalette());
-+
-+		d->pb_moodDetails->setEnabled(true);
-+		d->pb_moodDetails->setPalette(QPalette());
-+
-+		connect(d->iss_moods, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
-+
-+		d->progress->hide();
-+
-+		d->unsetCursor();
-+		thread = 0;
-+
-+		return true;
-+	}
-+
-+	return false;
-+}
-+
-+void OptionsTabIconsetMoods::previewIconset()
-+{
-+	IconsetMoodUI *d = (IconsetMoodUI *)w;
-+	const Iconset *is = d->iss_moods->iconset();
-+	if (is) {
-+		isDetails(*is, parentWidget->parentWidget(), psi);
-+	}
-+}
-+
-+void OptionsTabIconsetMoods::setData(PsiCon *psicon, QWidget *p)
-+{
-+	psi = psicon;
-+	parentWidget = p;
-+}
-+
-+void OptionsTabIconsetMoods::cancelThread()
-+{
-+	if ( thread ) {
-+		threadCancelled.lock();
-+		thread->cancelled = true;
-+		threadCancelled.unlock();
-+
-+		thread = 0;
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // OptionsTabIconsetRoster
- //----------------------------------------------------------------------------
---- git.orig/src/options/opt_iconset.h
-+++ git/src/options/opt_iconset.h
-@@ -65,6 +65,34 @@ private:
- 	IconsetLoadThread *thread;
- };
- 
-+class OptionsTabIconsetMoods : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabIconsetMoods(QObject *parent);
-+	~OptionsTabIconsetMoods();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	bool stretchable() const { return true; }
-+
-+private slots:
-+	void setData(PsiCon *, QWidget *);
-+	void previewIconset();
-+
-+protected:
-+	bool event(QEvent *);
-+	void cancelThread();
-+
-+private:
-+	QWidget *w, *parentWidget;
-+	PsiCon *psi;
-+
-+	int numIconsets, iconsetsLoaded;
-+	IconsetLoadThread *thread;
-+};
-+
- class OptionsTabIconsetRoster : public OptionsTab
- {
- 	Q_OBJECT
---- /dev/null
-+++ git/src/options/opt_iconset_mood.ui
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>IconsetMood</class>
-+ <widget class="QWidget" name="IconsetMood">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>256</width>
-+    <height>195</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>IconsetMoodUI</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-+    <number>9</number>
-+   </property>
-+   <item>
-+    <widget class="QGroupBox" name="groupBox9">
-+     <property name="title">
-+      <string>Mood iconsets</string>
-+     </property>
-+     <layout class="QGridLayout">
-+      <property name="margin">
-+       <number>8</number>
-+      </property>
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item row="1" column="2">
-+       <spacer>
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeType">
-+         <enum>QSizePolicy::Expanding</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>204</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+      <item row="1" column="3">
-+       <widget class="IconButton" name="pb_moodDetails" native="true">
-+        <property name="text" stdset="0">
-+         <string>&amp;Show Details</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item row="0" column="0" colspan="4">
-+       <widget class="IconsetSelect" name="iss_moods" native="true"/>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QProgressBar" name="progress">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconButton</class>
-+   <extends></extends>
-+   <header>iconbutton.h</header>
-+  </customwidget>
-+  <customwidget>
-+   <class>IconsetSelect</class>
-+   <extends></extends>
-+   <header>iconsetselect.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/options/options.pri
-+++ git/src/options/options.pri
-@@ -58,6 +58,7 @@ FORMS += \
- 	$$PWD/opt_lookfeel_toolbars.ui \
- 	$$PWD/ui_isdetails.ui \
- 	$$PWD/opt_iconset_emo.ui \
-+	$$PWD/opt_iconset_mood.ui \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -5440,6 +5440,11 @@ QString PsiAccount::nick() const
- 	return d->self.name();
- }
- 
-+const Mood &PsiAccount::mood() const
-+{
-+	return d->self.mood();
-+}
-+
- //void PsiAccount::pgpToggled(bool b)
- //{
- //	QCA::PGPKey oldkey = d->cur_pgpSecretKey;
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -32,6 +32,7 @@
- #include "xmpp_rosterx.h"
- #include "xmpp_status.h"
- #include "psiactions.h"
-+#include "mood.h"
- 
- namespace XMPP
- {
-@@ -138,6 +139,7 @@ public:
- 	bool loggedIn() const;
- 	void setNick(const QString &);
- 	QString nick() const;
-+	const Mood &mood() const;
- 	void forceDisconnect(bool fast, const XMPP::Status &s);
- 	bool hasPGP() const;
- 	QHostAddress *localAddress() const;
---- git.orig/src/psiiconset.cpp
-+++ git/src/psiiconset.cpp
-@@ -42,8 +42,8 @@ class PsiIconset::Private
- private:
- 	PsiIconset *psi;
- public:
--	Iconset system;
--	QString cur_system, cur_status;
-+	Iconset system, moods;
-+	QString cur_system, cur_status, cur_moods;
- 	QStringList cur_emoticons;
- 	QMap<QString, QString> cur_service_status;
- 	QMap<QString, QString> cur_custom_status;
-@@ -228,6 +228,23 @@ public:
- 		return def;
- 	}
- 
-+	Iconset moodsIconset(bool *ok)
-+	{
-+		Iconset def;
-+		*ok = def.load( iconsetPath("moods/default") );
-+
-+		if ( PsiOptions::instance()->getOption("options.iconsets.moods").toString() != "default" ) {
-+			Iconset is;
-+			is.load ( iconsetPath("moods/" + PsiOptions::instance()->getOption("options.iconsets.moods").toString()) );
-+
-+			loadIconset(&def, &is);
-+		}
-+
-+		stripFirstAnimFrame( def );
-+
-+		return def;
-+	}
-+
- 	QList<Iconset*> emoticons()
- 	{
- 		QList<Iconset*> emo;
-@@ -352,12 +369,28 @@ void PsiIconset::loadEmoticons()
- 	}
- }
- 
-+bool PsiIconset::loadMoods()
-+{
-+	bool ok = true;
-+	QString cur_moods = PsiOptions::instance()->getOption("options.iconsets.moods").toString();
-+	if (d->cur_moods != cur_moods) {
-+		Iconset moods = d->moodsIconset(&ok);
-+		d->loadIconset(&d->moods, &moods);
-+		d->moods.addToFactory();
-+
-+		d->cur_moods = cur_moods;
-+	}
-+
-+	return ok;
-+}
-+
- bool PsiIconset::loadAll()
- {
- 	if (!loadSystem() || !loadRoster())
- 		return false;
- 
- 	loadEmoticons();
-+	loadMoods();
- 	return true;
- }
- 
-@@ -369,6 +402,9 @@ void PsiIconset::optionChanged(const QSt
- 	else if (option == "options.iconsets.emoticons") {
- 		loadEmoticons();
- 	}
-+	else if (option == "options.iconsets.moods") {
-+		loadMoods();
-+	}
- 
- 	// currently we rely on PsiCon calling reloadRoster() when
- 	// all options are already applied. otherwise we risk the chance
---- git.orig/src/psiiconset.h
-+++ git/src/psiiconset.h
-@@ -44,6 +44,7 @@ public:
- 
- 	QHash<QString, Iconset*> roster;
- 	QList<Iconset*> emoticons;
-+	Iconset moods;
- 	const Iconset &system() const;
- 	void stripFirstAnimFrame(Iconset *);
- 	static void removeAnimation(Iconset *);
-@@ -95,6 +96,7 @@ private:
- 
- 	bool loadRoster();
- 	void loadEmoticons();
-+	bool loadMoods();
- };
- 
- #endif
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -466,6 +466,7 @@ QString UserListItem::makeBareTip(bool t
- 	// you most probably want to wrap it with TextUtil::escape()
- 
- 	QString str;
-+	QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
- 	bool useAvatar = false;
- 	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
- 		useAvatar = true;
-@@ -493,7 +494,8 @@ QString UserListItem::makeBareTip(bool t
- 
- 	// User Mood
- 	if (!mood().isNull()) {
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " + mood().typeText();
-+		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
-+			QString("<%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + mood().typeText();
- 		if (!mood().text().isEmpty())
- 			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
- 		str += "</div>";
-@@ -539,7 +541,6 @@ QString UserListItem::makeBareTip(bool t
- 			else if(status == STATUS_INVISIBLE)
- 				istr = "status/invisible"; //this shouldn't happen
- 
--			QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
- 			QString secstr;
- 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
- 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);

psi-plus-main-20130107.tar.xz/patches/0090-psi-muc-change-affiliation.diff Deleted

@@ -1,38 +0,0 @@
---- git.orig/src/gcuserview.cpp
-+++ git/src/gcuserview.cpp
-@@ -483,7 +483,6 @@ void GCUserView::contextMenuRequested(co
- 	act->setEnabled( (!self || lvi->s.mucItem().role() == MUCItem::Moderator) && MUCManager::canSetRole(c->s.mucItem(),lvi->s.mucItem(),MUCItem::Moderator));
- 	pm->addMenu(rm);
- 
--	/*
- 	QMenu* am = new QMenu(tr("Change Affiliation"), pm);
- 	act = am->addAction(tr("Unaffiliated"));
- 	act->setData(15);
-@@ -510,7 +509,6 @@ void GCUserView::contextMenuRequested(co
- 	act->setEnabled((!self || lvi->s.mucItem().affiliation() == MUCItem::Owner) && MUCManager::canSetAffiliation(c->s.mucItem(),lvi->s.mucItem(),MUCItem::Owner));
- 
- 	pm->addMenu(am);
--	*/
- 	pm->addSeparator();
- 	//pm->insertItem(tr("Send &File"), 4);
- 	//pm->insertSeparator();
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1654,7 +1654,7 @@ void GCMainDlg::lv_action(const QString 
- 		}
- 
- 	}
--	/*else if(x == 15) {
-+	else if(x == 15) {
- 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
- 		if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
- 			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation);
-@@ -1673,7 +1673,7 @@ void GCMainDlg::lv_action(const QString 
- 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
- 		if (contact->s.mucItem().affiliation() != MUCItem::Owner)
- 			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner);
--	}*/
-+	}
- }
- 
- void GCMainDlg::contextMenuEvent(QContextMenuEvent *)

psi-plus-main-20130107.tar.xz/patches/0100-psi-muc-nickclick-chat.diff Deleted

@@ -1,370 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -75,6 +75,7 @@
- #include "psirichtext.h"
- #include "messageview.h"
- #include "chatview.h"
-+#include "urlobject.h"
- 
- #ifdef Q_WS_WIN
- #include <windows.h>
-@@ -111,8 +112,16 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 	sendComposingEvents_ = false;
- 	isComposing_ = false;
- 	composingTimer_ = 0;
-+	connect(URLObject::getInstance(), SIGNAL(vcardsig(QString)), SLOT(vcard(QString)));
- }
- 
-+void ChatDlg::vcard(const QString& string)
-+{
-+	QString str = string;
-+	str.remove(0, str.indexOf(":")+1);
-+	XMPP::Jid jd(str);
-+	account()->actionInfo(jd);
-+}
- void ChatDlg::init()
- {
- 	initUi();
---- git.orig/src/chatdlg.h
-+++ git/src/chatdlg.h
-@@ -107,6 +107,7 @@ public slots:
- 	void incomingMessage(const Message &);
- 	virtual void updateAvatar() = 0;
- 	void updateAvatar(const Jid&);
-+	void vcard(const QString& str);
- 
- protected slots:
- 	void scrollUp();
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -114,6 +114,19 @@ void ChatView::clear()
- 	addLogIconsResources();
- }
- 
-+void ChatView::contextMenuEvent(QContextMenuEvent *e)
-+{
-+	const QUrl anc = QUrl::fromEncoded(anchorAt(e->pos()).toAscii());
-+
-+	if ( anc.scheme() == "addnick" ) {
-+		showNM(anc.path().mid(1));
-+		e->accept();
-+	}
-+	else {
-+		PsiTextView::contextMenuEvent(e);
-+	}
-+}
-+
- void ChatView::addLogIconsResources()
- {
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
-@@ -282,16 +295,18 @@ void ChatView::renderMucMessage(const Me
- 	} else {
- 		nickcolor = getMucNickColor(mv.nick(), mv.isLocal());
- 	}
-+	QString nick = QString("<a href=\"addnick://psi/") + QUrl::toPercentEncoding(mv.nick()) +
-+				   "\" style=\"color: "+nickcolor+"; text-decoration: none; \">"+TextUtil::escape(mv.nick())+"</a>";
- 
- 	if(mv.isEmote()) {
--		appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+		appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(nick) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
- 	}
- 	else {
- 		if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(mv.nick())) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
-+			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(nick) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
- 		}
- 		else {
--			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
-+			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + nick + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
- 		}
- 	}
- 
---- git.orig/src/chatview_te.h
-+++ git/src/chatview_te.h
-@@ -24,6 +24,7 @@
- #include <QWidget>
- #include <QDateTime>
- #include <QPointer>
-+#include <QContextMenuEvent>
- 
- #include "psitextview.h"
- #include "chatviewcommon.h"
-@@ -45,6 +46,7 @@ public:
- 	// reimplemented
- 	QSize sizeHint() const;
- 	void clear();
-+	void contextMenuEvent(QContextMenuEvent *e);
- 
- 	void init();
- 	void setDialog(QWidget* dialog);
-@@ -81,6 +83,9 @@ protected slots:
- private slots:
- 	void slotScroll();
- 
-+signals:
-+	void showNM(const QString&);
-+
- private:
- 	bool isMuc_;
- 	QString jid_;
---- git.orig/src/chatview_webkit.cpp
-+++ git/src/chatview_webkit.cpp
-@@ -219,6 +219,15 @@ void ChatView::setSessionData(bool isMuc
- 			SLOT(init()));
- }
- 
-+void ChatView::contextMenuEvent(QContextMenuEvent *e)
-+{
-+	QWebHitTestResult r = webView->page()->mainFrame()->hitTestContent(e->pos());
-+	if ( r.linkUrl().scheme() == "addnick" ) {
-+		showNM(r.linkUrl().path().mid(1));
-+		e->accept();
-+	}
-+}
-+
- bool ChatView::focusNextPrevChild(bool next)
- {
- 	return QWidget::focusNextPrevChild(next);
---- git.orig/src/chatview_webkit.h
-+++ git/src/chatview_webkit.h
-@@ -53,6 +53,7 @@ public:
- 	void setSessionData(bool isMuc, const QString &jid, const QString name);
- 	void setAccount(PsiAccount *acc) { account_ = acc; }
- 
-+	void contextMenuEvent(QContextMenuEvent* event);
- 	void sendJsObject(const QVariantMap &);
- 	void sendJsCommand(const QString &cmd);
- 	bool handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit);
-@@ -83,6 +84,9 @@ private slots:
- 	void checkJsBuffer();
- 	void sessionInited();
- 
-+signals:
-+	void showNM(const QString&);
-+
- private:
- 	friend class ChatViewJSObject;
- 	ChatViewTheme* currentTheme();
---- git.orig/src/desktoputil.cpp
-+++ git/src/desktoputil.cpp
-@@ -84,7 +84,10 @@ static bool doOpenUrl(const QUrl& url)
-  */
- bool DesktopUtil::openUrl(const QString& url)
- {
--	QByteArray ascii = url.toAscii();
-+	if (url.startsWith("addnick://")) return true;
-+
-+	QByteArray ascii = url.toUtf8();
-+
- 	if (ascii == url)
- 		return doOpenUrl(QUrl::fromEncoded(ascii));
- 	else
---- git.orig/src/gcuserview.cpp
-+++ git/src/gcuserview.cpp
-@@ -393,13 +393,8 @@ void GCUserView::qlv_doubleClicked(const
- 	}
- }
- 
--void GCUserView::contextMenuRequested(const QPoint &p)
-+void GCUserView::doContextMenu(QTreeWidgetItem *i)
- {
--	QTreeWidgetItem *i = itemAt(p);
--
--	if(!i || !i->parent() || !gcDlg_)
--		return;
--
- 	QPointer<GCUserViewItem> lvi = (GCUserViewItem *)i;
- 	bool self = gcDlg_->nick() == i->text(0);
- 	GCUserViewItem* c = (GCUserViewItem*) findEntry(gcDlg_->nick());
-@@ -532,6 +527,16 @@ void GCUserView::contextMenuRequested(co
- 	action(lvi->text(0), lvi->s, x);
- }
- 
-+void GCUserView::contextMenuRequested(const QPoint &p)
-+{
-+	QTreeWidgetItem *i = itemAt(p);
-+
-+	if(!i || !i->parent() || !gcDlg_)
-+		return;
-+
-+	doContextMenu(i);
-+}
-+
- void GCUserView::mousePressEvent(QMouseEvent *event)
- {
- 	QTreeWidget::mousePressEvent(event);
---- git.orig/src/gcuserview.h
-+++ git/src/gcuserview.h
-@@ -75,6 +75,7 @@ public:
- 	void updateEntry(const QString &, const Status &);
- 	void removeEntry(const QString &);
- 	QStringList nickList() const;
-+	void doContextMenu(QTreeWidgetItem* it);
- 
- protected:
- 	enum Role { Moderator = 0, Participant = 1, Visitor = 2 };
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -72,6 +72,7 @@
- #include "psitooltip.h"
- #include "psioptions.h"
- #include "coloropt.h"
-+#include "urlobject.h"
- #include "shortcutmanager.h"
- #include "psicontactlist.h"
- #include "accountlabel.h"
-@@ -560,6 +561,28 @@ public:
- 
- };
- 
-+void GCMainDlg::openURL(const QString& url)
-+{
-+	if (url.startsWith("addnick://") && isActiveTab()) {
-+		const QString nick = QUrl::fromPercentEncoding(url.mid(14).toAscii());
-+		if (ui_.mle->chatEdit()->toPlainText().length() == 0) {
-+			ui_.mle->chatEdit()->insertPlainText(nick + QString(": "));
-+		}
-+		else {
-+			ui_.mle->chatEdit()->insertPlainText(QString(" %1 ").arg(nick));
-+		}
-+		ui_.mle->chatEdit()->setFocus();
-+	}
-+}
-+
-+void GCMainDlg::showNM(const QString& nick)
-+{
-+	QTreeWidgetItem* itm = ui_.lv_users->findEntry(nick);
-+	if (itm) {
-+		ui_.lv_users->doContextMenu(itm);
-+	}
-+}
-+
- GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	: TabbableWidget(j.bare(), pa, tabManager)
- {
-@@ -595,6 +618,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.log->setAccount(account());
- #endif
- 
-+	connect(ui_.log, SIGNAL(showNM(QString)), this, SLOT(showNM(QString)));
-+	connect(URLObject::getInstance(), SIGNAL(openURL(QString)), SLOT(openURL(QString)));
-+	
- 	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(openTopic()));
- 	PsiToolTip::install(ui_.le_topic);
- 
-@@ -697,6 +723,15 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	setShortcuts();
- 	invalidateTab();
- 	setConnecting();
-+	connect(URLObject::getInstance(), SIGNAL(vcardsig(QString)), SLOT(vcard(QString)));
-+}
-+
-+void GCMainDlg::vcard(const QString& _str)
-+{
-+	QString str = _str;
-+	str.remove(0, str.indexOf(":")+1);
-+	XMPP::Jid jd(str);
-+	account()->actionInfo(jd);
- }
- 
- GCMainDlg::~GCMainDlg()
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -103,8 +103,11 @@ public slots:
- 	virtual void ensureTabbedCorrectly();
- 
- 	void optionsUpdate();
-+	void vcard(const QString& str);
- 	
- private slots:
-+	void showNM(const QString&);
-+	void openURL(const QString&);
- 	void scrollUp();
- 	void scrollDown();
- 	void mle_returnPressed();
---- git.orig/src/webview.cpp
-+++ git/src/webview.cpp
-@@ -73,6 +73,10 @@ void WebView::contextMenuEvent(QContextM
- 	QMenu *menu;
- 
- 	if (!r.linkUrl().isEmpty()) {
-+		if (r.linkUrl().scheme() == "addnick") {
-+			event->ignore();
-+			return;
-+		}
- 		menu = URLObject::getInstance()->createPopupMenu(r.linkUrl().toEncoded());
- 		//menu->addAction(pageAction(QWebPage::CopyLinkToClipboard));
- 	} else {
---- git.orig/src/widgets/urlobject.cpp
-+++ git/src/widgets/urlobject.cpp
-@@ -34,7 +34,7 @@ class URLObject::Private : QObject
- 	Q_OBJECT
- public:
- 	QString link;
--	IconAction *act_xmpp, *act_mailto, *act_join_groupchat, *act_send_message, *act_chat, *act_browser, *act_add_to_roster, *act_copy;
-+	IconAction *act_xmpp, *act_mailto, *act_join_groupchat, *act_send_message, *act_chat, *act_browser, *act_add_to_roster, *act_copy, *act_info;
- 	URLObject *urlObject;
- 	QSignalMapper xmppActionMapper;
- 
-@@ -82,6 +82,10 @@ public:
- 		act_copy = new IconAction(tr, tr, 0, this);
- 		connect(act_copy, SIGNAL(triggered()), SLOT(popupCopy()));
- 
-+		tr = qApp->translate("URLLabel", "User Info");
-+		act_info = new IconAction(tr, "psi/vCard", tr, 0, this);
-+		connect(act_info, SIGNAL(triggered()), SLOT(vcard()));
-+
- 		connect(&xmppActionMapper, SIGNAL(mapped(const QString&)), SLOT(xmppAction(const QString&)));
- 	}
- 		
-@@ -127,6 +131,10 @@ public slots:
- 		popupCopy(link);
- 	}
- 
-+	void vcard() {
-+		emit urlObject->vcardsig(link);
-+	}
-+
- 	void xmppAction(const QString& lnk, const QString& query) {
- 		QUrl uri(lnk);
- 		if (!query.isEmpty()) {
-@@ -198,6 +206,7 @@ QMenu *URLObject::createPopupMenu(const 
- 		if (service == "x-psi-atstyle") {
- 			m->addSeparator();
- 		}
-+		m->addAction(d->act_info);
- 		m->addAction(d->act_xmpp);
- 		m->addAction(d->act_chat);
- 		m->addAction(d->act_send_message);
---- git.orig/src/widgets/urlobject.h
-+++ git/src/widgets/urlobject.h
-@@ -47,6 +47,7 @@ public:
- 	
- signals:
- 	void openURL(QString);
-+	void vcardsig(QString);
- 	
- public:
- 	class Private;
---- git.orig/themes/chatview/psi/classic/index.html
-+++ git/themes/chatview/psi/classic/index.html
-@@ -18,6 +18,7 @@ body > div > img:first-child { vertical-
- .usertext {}
- .alert {font-weight:bold; color:red;}
- .trackbar { height:1px; border:1px solid black; border-color:#bbf #66f #66f #bbf }
-+.nicklink { text-decoration:none; color:inherit; }
-   </style>
- </head>
- <body>
-@@ -105,6 +106,9 @@ window[chatServer.jsNamespace()].theme =
- 		varHandlers : {
- 			sender : function() {
- 				var nick = chat.util.escapeHtml(shared.cdata.sender);
-+				nick = shared.cdata.mtype == "message" && shared.isMuc?
-+					'<a href="addnick://psi/'+encodeURIComponent(shared.cdata.sender)+
-+					'" class="nicklink">'+nick+'</a>' : nick;
- 				return shared.cdata.emote?"*"+nick:"&lt;"+nick+"&gt;";
- 			},
- 			alertedmessage : function() {

psi-plus-main-20130107.tar.xz/patches/0110-psi-send-button-arrow.diff Deleted

@@ -1,128 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -213,6 +213,7 @@
- 			<spell-check comment="Options related to the spell checker">
- 				<enabled comment="Whether the spell checker is enabled" type="bool">true</enabled>
- 			</spell-check>
-+			<disable-send-button type="bool">false</disable-send-button>
- 			<systemtray comment="Options related to the system tray">
- 				<use-old comment="Use the old system tray code (deprecated)" type="bool">false</use-old>
- 				<enable type="bool">true</enable>
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -285,6 +285,31 @@
-           </layout>
-          </item>
-          <item>
-+          <widget class="QPushButton" name="pb_send">
-+           <property name="sizePolicy">
-+            <sizepolicy vsizetype="Expanding" hsizetype="Minimum">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="minimumSize">
-+            <size>
-+             <width>26</width>
-+             <height>0</height>
-+            </size>
-+           </property>
-+           <property name="maximumSize" >
-+            <size>
-+             <width>26</width>
-+             <height>16777215</height>
-+            </size>
-+           </property>
-+           <property name="toolTip">
-+            <string>Send</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-           <widget class="QLabel" name="avatar" >
-            <property name="sizePolicy" >
-             <sizepolicy>
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -681,6 +681,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->act_send = new QAction(this);
- 	addAction(d->act_send);
- 	connect(d->act_send,SIGNAL(triggered()), SLOT(mle_returnPressed()));
-+ 	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
-+	connect(ui_.pb_send, SIGNAL(clicked()), SLOT(mle_returnPressed()));
- 	d->act_close = new QAction(this);
- 	addAction(d->act_close);
- 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
-@@ -1592,6 +1594,13 @@ void GCMainDlg::setLooks()
- 		ui_.tb_actions->show();
- 	}
- 
-+	if (PsiOptions::instance()->getOption("options.ui.disable-send-button").toBool()) {
-+		ui_.pb_send->hide();
-+	}
-+	else {
-+		ui_.pb_send->show();
-+	}
-+
- 	setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
- 
- 	// update the widget icon
---- git.orig/src/groupchatdlg.ui
-+++ git/src/groupchatdlg.ui
-@@ -263,6 +263,31 @@
-            </property>
-           </widget>
-          </item>
-+         <item>
-+          <widget class="QPushButton" name="pb_send">
-+           <property name="sizePolicy">
-+            <sizepolicy vsizetype="Expanding" hsizetype="Minimum">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="minimumSize">
-+            <size>
-+             <width>26</width>
-+             <height>0</height>
-+            </size>
-+           </property>
-+           <property name="maximumSize">
-+            <size>
-+             <width>26</width>
-+             <height>16777215</height>
-+            </size>
-+           </property>
-+           <property name="toolTip">
-+            <string>Send</string>
-+           </property>
-+          </widget>
-+         </item>
-         </layout>
-        </item>
-       </layout>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -215,6 +215,8 @@ void PsiChatDlg::initUi()
- 	ui_.splitter->setSizes(list);
- 
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-+ 	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
-+	connect(ui_.pb_send, SIGNAL(clicked()), this, SLOT(doSend()));
- 
- 	act_mini_cmd_ = new QAction(this);
- 	act_mini_cmd_->setText(tr("Input command..."));
-@@ -297,6 +299,13 @@ void PsiChatDlg::updateIdentityVisibilit
- 	else {
- 		ui_.lb_ident->setVisible(false);
- 	}
-+	
-+	if (PsiOptions::instance()->getOption("options.ui.disable-send-button").toBool()) {
-+		ui_.pb_send->hide();
-+	}
-+	else {
-+		ui_.pb_send->show();
-+	}
- }
- 
- void PsiChatDlg::initToolButtons()

psi-plus-main-20130107.tar.xz/patches/0120-psi-bookmark-skip.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0140-psi-icon-actions-shortcuts.diff Deleted

@@ -1,120 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -345,6 +345,52 @@
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
-+			<alist comment="Action List" >
-+				<menu_disco type="QKeySequence" comment="Service Discovery"></menu_disco>
-+				<menu_add_contact type="QKeySequence" comment="Add Contact"></menu_add_contact>
-+				<menu_new_message type="QKeySequence" comment="New Message"></menu_new_message>
-+				<menu_join_groupchat type="QKeySequence" comment="Join Group Chat"></menu_join_groupchat>
-+				<menu_account_setup type="QKeySequence" comment="Account Setup"></menu_account_setup>
-+				<menu_options type="QKeySequence" comment="Options"></menu_options>
-+				<menu_file_transfer type="QKeySequence" comment="File Transfer"></menu_file_transfer>
-+				<menu_toolbars type="QKeySequence" comment="Toolbars"></menu_toolbars>
-+				<menu_xml_console type="QKeySequence" comment="XML Console"></menu_xml_console>
-+				<menu_change_profile type="QKeySequence" comment="Change Profile"></menu_change_profile>
-+				<menu_play_sounds type="QKeySequence" comment="Play Sounds"></menu_play_sounds>
-+				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
-+				<button_options type="QKeySequence" comment="Options"></button_options>
-+				<button_status type="QKeySequence" comment="Status"></button_status>
-+				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
-+				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
-+				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
-+				<show_away type="QKeySequence" comment="Show Away Contacts"></show_away>
-+				<show_hidden type="QKeySequence" comment="Show Hidden Contacts"></show_hidden>
-+				<show_agents type="QKeySequence" comment="Show Agents"></show_agents>
-+				<show_self type="QKeySequence" comment="Show Self"></show_self>
-+				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
-+				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
-+				<status_all type="QKeySequence" comment="Status All"></status_all>
-+				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
-+				<status_online type="QKeySequence" comment="Status Online"></status_online>
-+				<status_away type="QKeySequence" comment="Status Away"></status_away>
-+				<status_xa type="QKeySequence" comment="Status XA"></status_xa>
-+				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
-+				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
-+				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
-+				<help_readme type="QKeySequence" comment="README"></help_readme>
-+				<help_tip type="QKeySequence" comment="Tips"></help_tip>
-+				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
-+				<help_online_help type="QKeySequence" comment="Open Help"></help_online_help>
-+				<help_online_wiki type="QKeySequence" comment="Open Wiki"></help_online_wiki>
-+				<help_online_home type="QKeySequence" comment="Open Home Page"></help_online_home>
-+				<help_psi_muc type="QKeySequence" comment="Help Psi MUC"></help_psi_muc>
-+				<help_report_bug type="QKeySequence" comment="Report Bug"></help_report_bug>
-+				<help_about type="QKeySequence" comment="About Psi"></help_about>
-+				<help_about_psimedia type="QKeySequence" comment="About PsiMedia" />
-+				<help_about_qt type="QKeySequence" comment="About Qt"></help_about_qt>
-+				<help_diag_qcaplugin type="QKeySequence" comment="QCA plugin diag"></help_diag_qcaplugin>
-+				<help_diag_qcakeystore type="QKeySequence" comment="QCA key store diag"></help_diag_qcakeystore>
-+			</alist>
- 			<chat comment="Shortcuts in the chat dialog">
- 				<next-tab type="QVariantList" comment="Switch to the next tab">
- 					<item type="QKeySequence">Ctrl+PgDown</item>
---- git.orig/src/psiactionlist.cpp
-+++ git/src/psiactionlist.cpp
-@@ -19,15 +19,20 @@
-  */
- 
- #include "psiactionlist.h"
-+#include "shortcutmanager.h"
- 
- #include <QObject>
- #include <QPointer>
-+#include <map>
-+#include <utility>
- 
- #include "iconset.h"
- #include "psioptions.h"
- 
- #include "mainwin_p.h"
- 
-+using namespace std;
-+
- //----------------------------------------------------------------------------
- // PsiActionList::Private
- //----------------------------------------------------------------------------
-@@ -43,6 +48,7 @@ private:
- 	PsiActionList *list;
- 	PsiCon *psi;
- 	QPointer<ActionList> statusActionList;
-+	map<QString,IconAction*> actionmap;
- 
- 	void createCommon();
- 	void createMainWin();
-@@ -90,13 +96,21 @@ PsiActionList::Private::~Private()
- 
- ActionList* PsiActionList::Private::createActionList( QString name, int id, ActionNames *actionlist )
- {
-+	static const QStringList skipList = QStringList() << "separator" << "spacer";
-+
- 	ActionList *actions = new ActionList( name, id, false );
- 
- 	QString aName;
- 	for ( int i = 0; !(aName = QString(actionlist[i].name)).isEmpty(); i++ ) {
- 		IconAction *action = actionlist[i].action;
- 		if (action)
-+		{
- 			actions->addAction( aName, action );
-+			if(!skipList.contains(aName)) {
-+				action->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + aName));
-+				actionmap[aName] = action;
-+			}
-+		}
- 	}
- 
- 	list->addList( actions );
-@@ -411,6 +425,11 @@ void PsiActionList::Private::optionsChan
- 	statusActionList->action("status_chat")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool());
- 	statusActionList->action("status_xa")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool());
- 	statusActionList->action("status_invisible")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool());
-+
-+	for(map<QString,IconAction*>::iterator i=actionmap.begin(); i!=actionmap.end(); i++)
-+	{
-+		 i->second->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + i->first));
-+	}
- }
- 
- //----------------------------------------------------------------------------

psi-plus-main-20130107.tar.xz/patches/0150-psi-xmpp-uri-in-chat-mode.diff Deleted

@@ -1,201 +0,0 @@
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -1003,6 +1003,12 @@ void ChatDlg::addEmoticon(QString text)
- 	PsiRichText::addEmoticon(chatEdit(), text);
- }
- 
-+void ChatDlg::setText(const QString& text)
-+{
-+	chatEdit()->clear();
-+	chatEdit()->insertHtml(text + ' ');
-+}
-+
- /**
-  * Records that the user is composing
-  */
---- git.orig/src/chatdlg.h
-+++ git/src/chatdlg.h
-@@ -72,6 +72,7 @@ public:
- 
- public:
- 	PsiAccount* account() const;
-+	void setText(const QString& );
- 
- signals:
- 	void aInfo(const Jid &);
---- git.orig/src/common.cpp
-+++ git/src/common.cpp
-@@ -25,6 +25,7 @@
- #include "psiiconset.h"
- #include "applicationinfo.h"
- #include "psioptions.h"
-+#include "tabdlg.h"
- 
- #include <QUrl>
- #include <QProcess>
-@@ -377,6 +378,32 @@ void closeDialogs(QWidget *w)
- 	}
- }
- 
-+TabbableWidget* findActiveTab()
-+{
-+	QWidget* chat = QApplication::activeWindow();
-+	TabbableWidget* tw = 0;
-+	if(chat) {
-+		TabDlg* td = qobject_cast<TabDlg*>(chat);
-+		if(td) {
-+			tw = td->getCurrentTab();
-+		}
-+		else {
-+			tw = qobject_cast<TabbableWidget*>(chat);
-+			if (!tw) {
-+				QList<TabDlg*> tmp = chat->findChildren<TabDlg*>(); // all-in-one
-+				while(!tmp.isEmpty()) {
-+					TabDlg* td = tmp.takeFirst();
-+					tw = td->getCurrentTab();
-+					if(tw) {
-+						break;
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return tw;
-+}
-+
- #ifdef Q_WS_X11
- #include <X11/Xlib.h>
- #include <X11/Xutil.h> // needed for WM_CLASS hinting
---- git.orig/src/common.h
-+++ git/src/common.h
-@@ -29,6 +29,7 @@
- #include <QColor>
- 
- class QMenu;
-+class TabbableWidget;
- 
- #include "statuspreset.h"
- 
-@@ -147,6 +148,7 @@ void clearMenu(QMenu *m); // deletes all
- void bringToFront(QWidget *w, bool grabFocus = true);
- void replaceWidget(QWidget *, QWidget *);
- void closeDialogs(QWidget *);
-+TabbableWidget* findActiveTab();
- #ifdef Q_WS_X11
- #include <QWidget>
- #include <QX11Info>
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3875,7 +3875,7 @@ void PsiAccount::actionHistoryBox(PsiEve
- 	w->show();
- }
- 
--void PsiAccount::actionOpenChat(const Jid &j)
-+void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
- {
- 	UserListItem *u = find(j);
- 	if(!u) {
-@@ -3909,9 +3909,9 @@ void PsiAccount::actionOpenChat(const Ji
- 	}
- 
- 	if(!res.isEmpty())
--		openChat(j.withResource(res), UserAction);
-+		openChat(j.withResource(res), UserAction, body);
- 	else
--		openChat(j, UserAction);
-+		openChat(j, UserAction, body);
- }
- 
- // unlike actionOpenChat(), this function will work on jids that aren't
-@@ -4211,11 +4211,11 @@ void PsiAccount::openUri(const QUrl &uri
- 		QString subject = uri.queryItemValue("subject");
- 		QString body = uri.queryItemValue("body");
- 		QString type = uri.queryItemValue("type");
--		if (type == "chat" && subject.isEmpty() && body.isEmpty()) {
-+		if (type == "chat" && subject.isEmpty()) {
- 			if (!find(entity)) {
- 				addUserListItem(entity);
- 			}
--			actionOpenChat(entity);
-+			actionOpenChat(entity, body);
- 		} else {
- 			dj_newMessage(entity, body, subject, "");
- 		}
-@@ -5186,7 +5186,7 @@ void PsiAccount::processChats(const Jid 
- 	processChatsHelper(j, true);
- }
- 
--void PsiAccount::openChat(const Jid& j, ActivationType activationType)
-+void PsiAccount::openChat(const Jid& j, ActivationType activationType, const QString& body)
- {
- 	ChatDlg* chat = ensureChatDlg(j);
- 	chat->ensureTabbedCorrectly();
-@@ -5202,6 +5202,9 @@ void PsiAccount::openChat(const Jid& j, 
- 			QTimer::singleShot(1000, dlg, SLOT(showTabWithoutActivation()));
- 		}
- 	}
-+	if (!body.isEmpty()) {
-+		chat->setText(body);
-+	}
- }
- 
- void PsiAccount::chatMessagesRead(const Jid &j)
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -318,7 +318,7 @@ public slots:
- 	void actionRename(const Jid &, const QString &);
- 	void actionGroupRename(const QString &, const QString &);
- 	void actionHistory(const Jid &);
--	void actionOpenChat(const Jid &);
-+	void actionOpenChat(const Jid &,const QString & body = QString());
- 	void actionOpenSavedChat(const Jid &);
- 	void actionOpenChat2(const Jid &);
- 	void actionOpenChatSpecific(const Jid &);
-@@ -493,7 +493,7 @@ private:
- 
- 	void processChatsHelper(const Jid& jid, bool removeEvents);
- 	void processChats(const Jid &);
--	void openChat(const Jid &, ActivationType activationType);
-+	void openChat(const Jid &, ActivationType activationType, const QString & body = QString());
- 	EventDlg *ensureEventDlg(const Jid &);
- 	friend class PsiCon;
- 
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -1187,7 +1187,14 @@ void PsiCon::openUri(const QUrl &uri)
- 	// authority
- 	PsiAccount *pa = 0;
- 	//if (uri.authority().isEmpty()) {
--		pa = d->contactList->defaultAccount();
-+		TabbableWidget* tw = findActiveTab();
-+		if (tw) {
-+			pa = tw->account();
-+		}
-+		if (!pa) {
-+			pa = d->contactList->defaultAccount();
-+		}
-+
- 		if (!pa) {
- 			QMessageBox::critical(0, tr("Error"), QString("You need to have an account configured and enabled to open URIs (links)."));
- 			return;
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -798,3 +798,8 @@ void TabDlg::setSimplifiedCaptionEnabled
- 	simplifiedCaption_ = enabled;
- 	updateCaption();
- }
-+
-+TabbableWidget* TabDlg::getCurrentTab() const
-+{
-+	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
-+}
---- git.orig/src/tabs/tabdlg.h
-+++ git/src/tabs/tabdlg.h
-@@ -84,6 +84,7 @@ public:
- 	void setUserManagementEnabled(bool enabled); // default enabled
- 	void setTabBarShownForSingles(bool enabled); // default enabled
- 	void setSimplifiedCaptionEnabled(bool enabled); // default disabled
-+	TabbableWidget* getCurrentTab() const;
- 
- protected:
- 	void setShortcuts();

psi-plus-main-20130107.tar.xz/patches/0160-psi-user-activity.diff Deleted

@@ -1,1084 +0,0 @@
---- /dev/null
-+++ git/src/activitycatalog.cpp
-@@ -0,0 +1,216 @@
-+/*
-+ * activitycatalog.cpp
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QString>
-+#include <QObject>
-+#include <QCoreApplication>
-+
-+#include "activity.h"
-+#include "activitycatalog.h"
-+		
-+ActivityCatalog::Entry::Entry()
-+{
-+}
-+
-+ActivityCatalog::Entry::Entry(Activity::Type type, const QString& value, const QString& text)
-+{
-+	type_  = type;
-+	specificType_ = Activity::UnknownSpecific;
-+	value_ = value;
-+	text_  = text;
-+}
-+
-+ActivityCatalog::Entry::Entry(Activity::Type type, Activity::SpecificType specificType, const QString& value, const QString& text)
-+{
-+	type_ = type;
-+	specificType_ = specificType;
-+	value_ = value;
-+	text_  = text;
-+}
-+
-+Activity::Type ActivityCatalog::Entry::type() const
-+{
-+	return type_;
-+}
-+
-+Activity::SpecificType ActivityCatalog::Entry::specificType() const
-+{
-+	return specificType_;
-+}
-+
-+const QString& ActivityCatalog::Entry::value() const
-+{
-+	return value_;
-+}
-+
-+const QString& ActivityCatalog::Entry::text() const
-+{
-+	return text_;
-+}
-+
-+bool ActivityCatalog::Entry::isNull() const
-+{
-+	return type_ == Activity::Unknown && text_.isNull() && value_.isNull();
-+}
-+
-+ActivityCatalog::ActivityCatalog() : QObject(QCoreApplication::instance())
-+{
-+	entries_ += Entry(Activity::DoingChores, "doing_chores", QObject::tr("Doing Chores"));
-+	entries_ += Entry(Activity::DoingChores, Activity::BuyingGroceries, "buying_groceries", QObject::tr("Buying Groceries"));
-+	entries_ += Entry(Activity::DoingChores, Activity::Cleaning, "cleaning", QObject::tr("Cleaning"));
-+	entries_ += Entry(Activity::DoingChores, Activity::Cooking, "cooking", QObject::tr("Cooking"));
-+	entries_ += Entry(Activity::DoingChores, Activity::DoingMaintenance, "doing_maintenance", QObject::tr("Doing Maintenance"));
-+	entries_ += Entry(Activity::DoingChores, Activity::DoingTheDishes, "doing_the_dishes", QObject::tr("Doing The Dishes"));
-+	entries_ += Entry(Activity::DoingChores, Activity::DoingTheLaundry, "doing_the_laundry", QObject::tr("Doing The Laundry"));
-+	entries_ += Entry(Activity::DoingChores, Activity::Gardening, "gardening", QObject::tr("Gardening"));
-+	entries_ += Entry(Activity::DoingChores, Activity::RunningAnErrand, "running_an_errand", QObject::tr("Running An Errand"));
-+	entries_ += Entry(Activity::DoingChores, Activity::WalkingTheDog, "walking_the_dog", QObject::tr("Walking The Dog"));
-+
-+	entries_ += Entry(Activity::Drinking, "drinking", QObject::tr("Drinking"));
-+	entries_ += Entry(Activity::Drinking, Activity::HavingABeer, "having_a_beer", QObject::tr("Having A Beer"));
-+	entries_ += Entry(Activity::Drinking, Activity::HavingCoffee, "having_coffee", QObject::tr("Having Coffee"));
-+	entries_ += Entry(Activity::Drinking, Activity::HavingTea, "having_tea", QObject::tr("Having Tea"));
-+
-+	entries_ += Entry(Activity::Eating, "eating", QObject::tr("Eating"));
-+	entries_ += Entry(Activity::Eating, Activity::HavingASnack, "having_a_snack", QObject::tr("Having A Snack"));
-+	entries_ += Entry(Activity::Eating, Activity::HavingBreakfast, "having_breakfast", QObject::tr("Having Breakfast"));
-+	entries_ += Entry(Activity::Eating, Activity::HavingLunch, "having_lunch", QObject::tr("Having Lunch"));
-+	entries_ += Entry(Activity::Eating, Activity::HavingDinner, "having_dinner", QObject::tr("Having Dinner"));
-+
-+	entries_ += Entry(Activity::Exercising, "exercising", QObject::tr("Exercising"));
-+	entries_ += Entry(Activity::Exercising, Activity::Cycling, "cycling", QObject::tr("Cycling"));
-+	entries_ += Entry(Activity::Exercising, Activity::Dancing, "dancing", QObject::tr("Dancing"));
-+	entries_ += Entry(Activity::Exercising, Activity::Hiking, "hiking", QObject::tr("Hiking"));
-+	entries_ += Entry(Activity::Exercising, Activity::Jogging, "jogging", QObject::tr("Jogging"));
-+	entries_ += Entry(Activity::Exercising, Activity::PlayingSports, "playing_sports", QObject::tr("Playing Sports"));
-+	entries_ += Entry(Activity::Exercising, Activity::Running, "running", QObject::tr("Running"));
-+	entries_ += Entry(Activity::Exercising, Activity::Skiing, "skiing", QObject::tr("Skiing"));
-+	entries_ += Entry(Activity::Exercising, Activity::Swimming, "swimming", QObject::tr("Swimming"));
-+	entries_ += Entry(Activity::Exercising, Activity::WorkingOut, "working_out", QObject::tr("Working Out"));
-+
-+	entries_ += Entry(Activity::Grooming, "grooming", QObject::tr("Grooming"));
-+	entries_ += Entry(Activity::Grooming, Activity::AtTheSpa, "at_the_spa", QObject::tr("At The Spa"));
-+	entries_ += Entry(Activity::Grooming, Activity::BrushingTeeth, "brushing_teeth", QObject::tr("Brushing Teeth"));
-+	entries_ += Entry(Activity::Grooming, Activity::GettingAHaircut, "getting_a_haircut", QObject::tr("Getting A Haircut"));
-+	entries_ += Entry(Activity::Grooming, Activity::Shaving, "shaving", QObject::tr("Shaving"));
-+	entries_ += Entry(Activity::Grooming, Activity::TakingABath, "taking_a_bath", QObject::tr("Taking A Bath"));
-+	entries_ += Entry(Activity::Grooming, Activity::TakingAShower, "taking_a_shower", QObject::tr("Taking A Shower"));
-+
-+	entries_ += Entry(Activity::HavingAppointment, "having_appointment", QObject::tr("Having Appointment"));
-+
-+	entries_ += Entry(Activity::Inactive, "inactive", QObject::tr("Inactive"));
-+	entries_ += Entry(Activity::Inactive, Activity::DayOff, "day_off", QObject::tr("Day Off"));
-+	entries_ += Entry(Activity::Inactive, Activity::HangingOut, "hanging_out", QObject::tr("Hanging Out"));
-+	entries_ += Entry(Activity::Inactive, Activity::Hiding, "hiding", QObject::tr("Hiding"));
-+	entries_ += Entry(Activity::Inactive, Activity::OnVacation, "on_vacation", QObject::tr("On Vacation"));
-+	entries_ += Entry(Activity::Inactive, Activity::Praying, "praying", QObject::tr("Praying"));
-+	entries_ += Entry(Activity::Inactive, Activity::ScheduledHoliday, "scheduled_holiday", QObject::tr("Scheduled Holiday"));
-+	entries_ += Entry(Activity::Inactive, Activity::Sleeping, "sleeping", QObject::tr("Sleeping"));
-+	entries_ += Entry(Activity::Inactive, Activity::Thinking, "thinking", QObject::tr("Thinking"));
-+
-+	entries_ += Entry(Activity::Relaxing, "relaxing", QObject::tr("Relaxing"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Fishing, "fishing", QObject::tr("Fishing"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Gaming, "gaming", QObject::tr("Gaming"));
-+	entries_ += Entry(Activity::Relaxing, Activity::GoingOut, "going_out", QObject::tr("Going Out"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Partying, "partying", QObject::tr("Partying"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Reading, "reading", QObject::tr("Reading"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Rehearsing, "rehearsing", QObject::tr("Rehearsing"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Shopping, "shopping", QObject::tr("Shopping"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Smoking, "smoking", QObject::tr("Smoking"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Socializing, "socializing", QObject::tr("Socializing"));
-+	entries_ += Entry(Activity::Relaxing, Activity::Sunbathing, "sunbathing", QObject::tr("Sunbathing"));
-+	entries_ += Entry(Activity::Relaxing, Activity::WatchingTv, "watching_tv", QObject::tr("Watching TV"));
-+	entries_ += Entry(Activity::Relaxing, Activity::WatchingAMovie, "watching_a_movie", QObject::tr("Watching A Movie"));
-+
-+	entries_ += Entry(Activity::Talking, "talking", QObject::tr("Talking"));
-+	entries_ += Entry(Activity::Talking, Activity::InRealLife, "in_real_life", QObject::tr("In Real Life"));
-+	entries_ += Entry(Activity::Talking, Activity::OnThePhone, "on_the_phone", QObject::tr("On The Phone"));
-+	entries_ += Entry(Activity::Talking, Activity::OnVideoPhone, "on_video_phone", QObject::tr("On Video Phone"));
-+
-+	entries_ += Entry(Activity::Traveling, "traveling", QObject::tr("Traveling"));
-+	entries_ += Entry(Activity::Traveling, Activity::Commuting, "commuting", QObject::tr("Commuting"));
-+	entries_ += Entry(Activity::Traveling, Activity::Cycling, "cycling", QObject::tr("Cycling"));
-+	entries_ += Entry(Activity::Traveling, Activity::Driving, "driving", QObject::tr("Driving"));
-+	entries_ += Entry(Activity::Traveling, Activity::InACar, "in_a_car", QObject::tr("In A Car"));
-+	entries_ += Entry(Activity::Traveling, Activity::OnABus, "on_a_bus", QObject::tr("On A Bus"));
-+	entries_ += Entry(Activity::Traveling, Activity::OnAPlane, "on_a_plane", QObject::tr("On A Plane"));
-+	entries_ += Entry(Activity::Traveling, Activity::OnATrain, "on_a_train", QObject::tr("On A Train"));
-+	entries_ += Entry(Activity::Traveling, Activity::OnATrip, "on_a_trip", QObject::tr("On A Trip"));
-+	entries_ += Entry(Activity::Traveling, Activity::Walking, "walking", QObject::tr("Walking"));
-+
-+	entries_ += Entry(Activity::Working, "working", QObject::tr("Working"));
-+	entries_ += Entry(Activity::Working, Activity::Coding, "coding", QObject::tr("Coding"));
-+	entries_ += Entry(Activity::Working, Activity::InAMeeting, "in_a_meeting", QObject::tr("In A Meeting"));
-+	entries_ += Entry(Activity::Working, Activity::Studying, "studying", QObject::tr("Studying"));
-+	entries_ += Entry(Activity::Working, Activity::Writing, "writing", QObject::tr("Writing"));
-+
-+	// Undefined specific activity
-+	entries_ += Entry(Activity::Unknown, Activity::Other, "other", QObject::tr("Other"));
-+}
-+
-+ActivityCatalog* ActivityCatalog::instance()
-+{
-+	if (!instance_)
-+		instance_ = new  ActivityCatalog();
-+	return instance_;
-+}
-+
-+ActivityCatalog::Entry ActivityCatalog::findEntryByType(Activity::Type type) const
-+{
-+	foreach(Entry e, entries_) {
-+		if (e.type() == type)
-+			return e;
-+	}
-+	return Entry();
-+}
-+
-+ActivityCatalog::Entry ActivityCatalog::findEntryByType(Activity::SpecificType specificType) const
-+{
-+	foreach(Entry e, entries_) {
-+		if (e.specificType() == specificType)
-+			return e;
-+	}
-+	return Entry();
-+}
-+
-+ActivityCatalog::Entry ActivityCatalog::findEntryByValue(const QString& value) const
-+{
-+	foreach(Entry e, entries_) {
-+		if (e.value() == value)
-+			return e;
-+	}
-+	return Entry();
-+}
-+
-+ActivityCatalog::Entry ActivityCatalog::findEntryByText(const QString& text) const
-+{
-+	foreach(Entry e, entries_) {
-+		if (e.text() == text)
-+			return e;
-+	}
-+	return Entry();
-+}
-+
-+const QList<ActivityCatalog::Entry>& ActivityCatalog::entries() const
-+{
-+	return entries_;
-+}
-+	
-+ActivityCatalog* ActivityCatalog::instance_ = 0;
---- /dev/null
-+++ git/src/activitycatalog.h
-@@ -0,0 +1,69 @@
-+/*
-+ * activitycatalog.h
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ACTIVITYCATALOG_H
-+#define ACTIVITYCATALOG_H
-+
-+#include <QList>
-+#include <QObject>
-+
-+#include "activity.h"
-+
-+class QString;
-+
-+class ActivityCatalog : public QObject
-+{
-+public:
-+	class Entry {
-+		public:
-+			Entry();
-+			Entry(Activity::Type, const QString&, const QString&);
-+			Entry(Activity::Type, Activity::SpecificType, const QString&, const QString&);
-+			Activity::Type type() const;
-+			Activity::SpecificType specificType() const;
-+			const QString& value() const;
-+			const QString& text() const;
-+			bool isNull() const;
-+
-+		private:
-+			Activity::Type type_;
-+			Activity::SpecificType specificType_;
-+			QString value_;
-+			QString text_;
-+	};
-+	
-+	static ActivityCatalog* instance();
-+
-+	Entry findEntryByType(Activity::Type) const;
-+	Entry findEntryByType(Activity::SpecificType) const;
-+	Entry findEntryByValue(const QString&) const;
-+	Entry findEntryByText(const QString& text) const;
-+	
-+	const QList<Entry>& entries() const;
-+	
-+private:
-+	ActivityCatalog();
-+	
-+	QList<Entry> entries_;
-+	static ActivityCatalog* instance_;
-+
-+};
-+
-+#endif
---- /dev/null
-+++ git/src/activity.cpp
-@@ -0,0 +1,130 @@
-+/*
-+ * activity.cpp
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QDomDocument>
-+#include <QDomElement>
-+
-+#include "activity.h"
-+#include "activitycatalog.h"
-+
-+Activity::Activity()
-+{
-+	type_ = Unknown;
-+	specificType_ = UnknownSpecific;
-+}
-+
-+Activity::Activity(Activity::Type type, Activity::SpecificType specificType, const QString& text)
-+{
-+	type_ = type;
-+	specificType_ = specificType;
-+	text_ = text;
-+}
-+
-+Activity::Activity(const QDomElement& e)
-+{
-+	fromXml(e);
-+}
-+
-+Activity::Type Activity::type() const
-+{
-+	return type_;
-+}
-+
-+QString Activity::typeText() const
-+{
-+	return ActivityCatalog::instance()->findEntryByType(type_).text();
-+}
-+
-+Activity::SpecificType Activity::specificType() const
-+{
-+	return specificType_;
-+}
-+
-+QString Activity::specificTypeText() const
-+{
-+	return ActivityCatalog::instance()->findEntryByType(specificType_).text();
-+}
-+
-+const QString& Activity::text() const
-+{
-+	return text_;
-+}
-+
-+bool Activity::isNull() const
-+{
-+	return type_ == Unknown && text().isEmpty();
-+}
-+
-+QDomElement Activity::toXml(QDomDocument& doc)
-+{
-+	QDomElement activity = doc.createElement("activity");
-+	activity.setAttribute("xmlns", "http://jabber.org/protocol/activity");
-+
-+	if (!type() == Unknown) {
-+		ActivityCatalog* ac = ActivityCatalog::instance();
-+		QDomElement el = doc.createElement(ac->findEntryByType(type()).value());
-+
-+		if (!specificType() == UnknownSpecific) {
-+			QDomElement elChild = doc.createElement(ac->findEntryByType(specificType()).value());
-+			el.appendChild(elChild);
-+		}
-+
-+		activity.appendChild(el);
-+	}
-+	else {
-+		qWarning("activity.cpp: ERROR: Converting unknown activity");
-+	}
-+
-+	if (!text().isEmpty()) {
-+		QDomElement el = doc.createElement("text");
-+		QDomText t = doc.createTextNode(text());
-+		el.appendChild(t);
-+		activity.appendChild(el);
-+	}
-+
-+	return activity;
-+}
-+
-+void Activity::fromXml(const QDomElement& element)
-+{
-+	if (element.tagName() != "activity")
-+		return;
-+
-+	type_ = Activity::Unknown;
-+	specificType_ = Activity::UnknownSpecific;
-+
-+	for (QDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) {
-+		QDomElement child = node.toElement();
-+		if (child.tagName() == "text") {
-+			text_ = child.text();
-+		}
-+		else {
-+			ActivityCatalog* ac = ActivityCatalog::instance();
-+			type_ = ac->findEntryByValue(child.tagName()).type();
-+
-+			if (child.hasChildNodes()) {
-+				QDomElement specificTypeElement = child.firstChildElement();
-+				if (!specificTypeElement.isNull()) {
-+					specificType_ = ac->findEntryByValue(specificTypeElement.tagName()).specificType();
-+				}
-+			}
-+		}
-+	}
-+}
---- /dev/null
-+++ git/src/activitydlg.cpp
-@@ -0,0 +1,90 @@
-+/*
-+ * activitydlg.cpp
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "xmpp_pubsubitem.h"
-+#include "xmpp_client.h"
-+#include "xmpp_task.h"
-+#include "activitydlg.h"
-+#include "activitycatalog.h"
-+#include "psiaccount.h"
-+#include "pepmanager.h"
-+
-+ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
-+{
-+	setAttribute(Qt::WA_DeleteOnClose);
-+	ui_.setupUi(this);
-+	setModal(false);
-+	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
-+	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-+	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
-+
-+	ui_.cb_general_type->addItem(tr("<unset>"));
-+	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
-+		if (e.specificType() == Activity::UnknownSpecific) {
-+			// The entry e is for a 'general' type.
-+			ui_.cb_general_type->addItem(e.text());
-+		}
-+	}
-+}
-+
-+void ActivityDlg::loadSpecificActivities(const QString& generalActivityStr)
-+{
-+	ui_.cb_specific_type->clear();
-+
-+	if (generalActivityStr == tr("<unset>")) {
-+		return;
-+	}
-+	else {
-+		ui_.cb_specific_type->addItem(tr("<unset>"));
-+		ActivityCatalog* ac = ActivityCatalog::instance();
-+		foreach(ActivityCatalog::Entry e, ac->entries()) {
-+			if (e.specificType() != Activity::UnknownSpecific) {
-+				// The entry e is for a 'specific' type.
-+				ActivityCatalog::Entry ge = ac->findEntryByText(generalActivityStr);
-+				if (e.type() == ge.type()) {
-+					ui_.cb_specific_type->addItem(e.text());
-+				}
-+			}
-+		}
-+	}
-+
-+	ui_.cb_specific_type->addItem(tr("Other"));
-+}
-+
-+void ActivityDlg::setActivity()
-+{
-+	QString generalActivityStr  = ui_.cb_general_type->currentText();
-+	QString specificActivityStr = ui_.cb_specific_type->currentText();
-+
-+	if (generalActivityStr == tr("<unset>")) {
-+		pa_->pepManager()->retract("http://jabber.org/protocol/activity", "current");
-+	}
-+	else {
-+		ActivityCatalog* ac = ActivityCatalog::instance();
-+		Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
-+
-+		Activity::SpecificType specificType = Activity::UnknownSpecific;
-+		if (specificActivityStr != tr("<unset>")) {
-+			specificType = ac->findEntryByText(specificActivityStr).specificType();
-+		}
-+		pa_->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+	}
-+	close();
-+}
---- /dev/null
-+++ git/src/activitydlg.h
-@@ -0,0 +1,46 @@
-+/*
-+ * activitydlg.h
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ACTIVITYDLG_H
-+#define ACTIVITYDLG_H
-+
-+#include <QDialog>
-+
-+#include "ui_activity.h"
-+
-+class PsiAccount;
-+
-+class ActivityDlg : public QDialog
-+{
-+	Q_OBJECT
-+
-+public:
-+	ActivityDlg(PsiAccount*);
-+
-+protected slots:
-+	void setActivity();
-+	void loadSpecificActivities(const QString&);
-+
-+private:
-+	Ui::Activity ui_;
-+	PsiAccount* pa_;
-+};
-+
-+#endif
---- /dev/null
-+++ git/src/activity.h
-@@ -0,0 +1,94 @@
-+/*
-+ * activiy.h
-+ * Copyright (C) 2008 Armando Jagucki
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ACTIVITY_H
-+#define ACTIVITY_H
-+
-+#include <QString>
-+
-+class QDomElement;
-+class QDomDocument;
-+
-+class Activity
-+{
-+public:
-+	enum Type { 
-+		Unknown,
-+		DoingChores, Drinking, Eating, Exercising, Grooming,
-+		HavingAppointment, Inactive, Relaxing, Talking, Traveling,
-+		Working
-+	};
-+
-+	enum SpecificType {
-+		UnknownSpecific,
-+		// under 'doing_chores'
-+		BuyingGroceries, Cleaning, Cooking, DoingMaintenance,
-+		DoingTheDishes, DoingTheLaundry, Gardening, RunningAnErrand,
-+		WalkingTheDog,
-+		// under 'drinking'
-+		HavingABeer, HavingCoffee, HavingTea,
-+		// under 'eating'
-+		HavingASnack, HavingBreakfast, HavingLunch, HavingDinner,
-+		// under 'excercising'
-+		Cycling, Dancing, Hiking, Jogging, PlayingSports, Running, Skiing,
-+		Swimming, WorkingOut,
-+		// under 'grooming'
-+		AtTheSpa, BrushingTeeth, GettingAHaircut, Shaving, TakingABath,
-+		TakingAShower,
-+		// under 'having_appointment'
-+		// under 'inactive'
-+		DayOff, HangingOut, Hiding, OnVacation, Praying, ScheduledHoliday, Sleeping, Thinking,
-+		// under 'relaxing'
-+		Fishing, Gaming, GoingOut, Partying, Reading, Rehearsing, Shopping, Smoking,
-+		Socializing, Sunbathing, WatchingTv, WatchingAMovie,
-+		// under 'talking'
-+		InRealLife, OnThePhone, OnVideoPhone,
-+		// under 'traveling'
-+		Commuting, /* Cycling (already included), */ Driving, InACar,
-+		OnABus, OnAPlane, OnATrain, OnATrip, Walking,
-+		// under 'working'
-+		Coding, InAMeeting, Studying, Writing,
-+		// undefined specific activity
-+		Other
-+	};
-+
-+	Activity();
-+	Activity(Type, SpecificType, const QString& = QString());
-+	Activity(const QDomElement&);
-+
-+	Type type() const;
-+	QString typeText() const;
-+	SpecificType specificType() const;
-+	QString specificTypeText() const;
-+	const QString& text() const;
-+	bool isNull() const;
-+
-+	QDomElement toXml(QDomDocument&);
-+
-+protected:
-+	void fromXml(const QDomElement&);
-+	
-+private:
-+	Type type_;
-+	SpecificType specificType_;
-+	QString text_;
-+};
-+
-+#endif
---- /dev/null
-+++ git/src/activity.ui
-@@ -0,0 +1,113 @@
-+<ui version="4.0" >
-+ <class>Activity</class>
-+ <widget class="QDialog" name="Activity" >
-+  <property name="geometry" >
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>313</width>
-+    <height>162</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle" >
-+   <string>User Activity</string>
-+  </property>
-+  <layout class="QVBoxLayout" >
-+   <item>
-+    <layout class="QGridLayout" >
-+     <item row="0" column="0" >
-+      <widget class="QLabel" name="label" >
-+       <property name="text" >
-+        <string>General:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="0" column="1" >
-+      <widget class="QComboBox" name="cb_general_type" />
-+     </item>
-+     <item row="1" column="0" >
-+      <widget class="QLabel" name="label_3" >
-+       <property name="text" >
-+        <string>Specific:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="1" column="1" >
-+      <widget class="QComboBox" name="cb_specific_type" />
-+     </item>
-+     <item row="2" column="0" >
-+      <widget class="QLabel" name="label_2" >
-+       <property name="text" >
-+        <string>Description:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="2" column="1" >
-+      <widget class="QLineEdit" name="le_description" />
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <spacer>
-+     <property name="orientation" >
-+      <enum>Qt::Vertical</enum>
-+     </property>
-+     <property name="sizeHint" >
-+      <size>
-+       <width>223</width>
-+       <height>16</height>
-+      </size>
-+     </property>
-+    </spacer>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" >
-+     <property name="spacing" >
-+      <number>6</number>
-+     </property>
-+     <property name="leftMargin" >
-+      <number>0</number>
-+     </property>
-+     <property name="topMargin" >
-+      <number>0</number>
-+     </property>
-+     <property name="rightMargin" >
-+      <number>0</number>
-+     </property>
-+     <property name="bottomMargin" >
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <spacer>
-+       <property name="orientation" >
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" >
-+        <size>
-+         <width>131</width>
-+         <height>31</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_ok" >
-+       <property name="text" >
-+        <string>OK</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_cancel" >
-+       <property name="text" >
-+        <string>Cancel</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -37,6 +37,7 @@ class ContactListAccountMenu::Private : 
- 	QPointer<ContactListAccountGroup> account;
- 	StatusMenu* statusMenu_;
- 	QAction* moodAction_;
-+	QAction* activityAction_;
- 	QAction* setAvatarAction_;
- 	QMenu* avatarMenu_;
- 	QAction* unsetAvatarAction_;
-@@ -72,6 +73,9 @@ public:
- 		moodAction_ = new QAction(tr("Mood"), this);
- 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
- 
-+		activityAction_ = new QAction(tr("Activity"), this);
-+		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
-+
- 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
- 		connect(setAvatarAction_, SIGNAL(triggered()), SLOT(setAvatar()));
- 
-@@ -113,6 +117,7 @@ public:
- 
- 		menu->addMenu(statusMenu_);
- 		menu->addAction(moodAction_);
-+		menu->addAction(activityAction_);
- 		avatarMenu_ = menu->addMenu(tr("Avatar"));
- 		avatarMenu_->addAction(setAvatarAction_);
- 		avatarMenu_->addAction(unsetAvatarAction_);
-@@ -150,9 +155,11 @@ private slots:
- 		statusMenu_->setStatus(account->account()->status().type());
- #ifndef USE_PEP
- 		moodAction_->setVisible(false);
-+		activityAction_->setVisible(false);
- 		avatarMenu_->setVisible(false);
- #else
- 		moodAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
-+		activityAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
- 		avatarMenu_->setEnabled(account->account()->serverInfoManager()->hasPEP());
- #endif
- 		bookmarksMenu_->clear();
-@@ -201,6 +208,14 @@ private slots:
- 		account->account()->actionSetMood();
- 	}
- 
-+	void setActivity()
-+	{
-+		if (!account)
-+			return;
-+
-+		account->account()->actionSetActivity();
-+	}
-+
- 	void setAvatar()
- 	{
- 		if (!account)
---- git.orig/src/contactview.cpp
-+++ git/src/contactview.cpp
-@@ -954,11 +954,14 @@ void ContactProfile::doContextMenu(Conta
- 		pm.insertItem(tr("Mood"), 11);
- 		pm.setItemEnabled(11, d->pa->serverInfoManager()->hasPEP());
- 
-+		pm.insertItem(tr("Activity"), 12);
-+		pm.setItemEnabled(12, d->pa->serverInfoManager()->hasPEP());
-+
- 		QMenu *avatarm = new QMenu (&pm);
--		avatarm->insertItem(tr("Set Avatar"), 12);
--		avatarm->insertItem(tr("Unset Avatar"), 13);
--		pm.insertItem(tr("Avatar"), avatarm, 14);
--		pm.setItemEnabled(14, d->pa->serverInfoManager()->hasPEP());
-+		avatarm->insertItem(tr("Set Avatar"), 13);
-+		avatarm->insertItem(tr("Unset Avatar"), 14);
-+		pm.insertItem(tr("Avatar"), avatarm, 15);
-+		pm.setItemEnabled(15, d->pa->serverInfoManager()->hasPEP());
- #endif
- 		const int bookmarks_start = STATUS_CHAT + status_start + 1; // STATUS_CHAT is the highest value of the states
- 		QMenu *bookmarks = new QMenu(&pm);
-@@ -1038,10 +1041,13 @@ void ContactProfile::doContextMenu(Conta
- 		else if(x == 11 && pm.isItemEnabled(11)) {
- 			emit actionSetMood();
- 		}
--		else if(x == 12  && pm.isItemEnabled(14)) {
-+		else if(x == 12 && pm.isItemEnabled(12)) {
-+			emit actionSetActivity();
-+		}
-+		else if(x == 13  && pm.isItemEnabled(15)) {
- 			emit actionSetAvatar();
- 		}
--		else if(x == 13  && pm.isItemEnabled(14)) {
-+		else if(x == 14  && pm.isItemEnabled(15)) {
- 			emit actionUnsetAvatar();
- 		}
- 		else if(x >= status_start && x <= STATUS_CHAT + status_start) { // STATUS_CHAT is the highest value of the states
---- git.orig/src/contactview.h
-+++ git/src/contactview.h
-@@ -124,6 +124,7 @@ signals:
- 	void actionAssignKey(const Jid &);
- 	void actionUnassignKey(const Jid &);
- 	void actionSetMood();
-+	void actionSetActivity();
- 	void actionSetAvatar();
- 	void actionUnsetAvatar();
- 
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -83,6 +83,7 @@
- # include "contactview.h"
- #endif
- #include "mood.h"
-+#include "activity.h"
- #include "tune.h"
- #ifdef GROUPCHAT
- #include "groupchatdlg.h"
-@@ -116,6 +117,7 @@
- #include "vcardfactory.h"
- //#include "qssl.h"
- #include "mooddlg.h"
-+#include "activitydlg.h"
- #include "qwextend.h"
- #include "geolocation.h"
- #include "physicallocation.h"
-@@ -1220,6 +1222,7 @@ PsiAccount::PsiAccount(const UserAccount
- 	if (d->options->getOption("options.extended-presence.notify").toBool()) {
- 		QStringList pepNodes;
- 		pepNodes += "http://jabber.org/protocol/mood+notify";
-+		pepNodes += "http://jabber.org/protocol/activity+notify";
- 		pepNodes += "http://jabber.org/protocol/tune+notify";
- 		pepNodes += "http://jabber.org/protocol/physloc+notify";
- 		pepNodes += "http://jabber.org/protocol/geoloc+notify";
-@@ -2184,6 +2187,7 @@ void PsiAccount::setPEPAvailable(bool b)
- 	if (b && !d->client->extensions().contains("ep")) {
- 		QStringList pepNodes;
- 		pepNodes += "http://jabber.org/protocol/mood";
-+		pepNodes += "http://jabber.org/protocol/activity";
- 		pepNodes += "http://jabber.org/protocol/tune";
- 		pepNodes += "http://jabber.org/protocol/physloc";
- 		pepNodes += "http://jabber.org/protocol/geoloc";
-@@ -3365,6 +3369,12 @@ void PsiAccount::itemRetracted(const Jid
- 			cpUpdate(*u);
- 		}
- 	}
-+	else if (n == "http://jabber.org/protocol/activity") {
-+		foreach(UserListItem* u, findRelevant(j)) {
-+			u->setActivity(Activity());
-+			cpUpdate(*u);
-+		}
-+	}
- 	else if (n == "http://jabber.org/protocol/geoloc") {
- 		// FIXME: try to find the right resource using JEP-33 'replyto'
- 		// see tune case above
-@@ -3418,6 +3428,13 @@ void PsiAccount::itemPublished(const Jid
- 			cpUpdate(*u);
- 		}
- 	}
-+	else if (n == "http://jabber.org/protocol/activity") {
-+		Activity activity(item.payload());
-+		foreach(UserListItem* u, findRelevant(j)) {
-+			u->setActivity(activity);
-+			cpUpdate(*u);
-+		}
-+	}
- 	else if (n == "http://jabber.org/protocol/geoloc") {
- 		// FIXME: try to find the right resource using JEP-33 'replyto'
- 		// see tune case above
-@@ -3734,6 +3751,12 @@ void PsiAccount::actionSetMood()
- 	w->show();
- }
- 
-+void PsiAccount::actionSetActivity()
-+{
-+	ActivityDlg *w = new ActivityDlg(this);
-+	w->show();
-+}
-+
- void PsiAccount::actionSetAvatar()
- {
- 	QString str = FileUtil::getImageFileName(0);
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -350,6 +350,7 @@ public slots:
- 	void actionExecuteCommand(const Jid& j, const QString& = QString());
- 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
- 	void actionSetMood();
-+	void actionSetActivity();
- 	void actionSetAvatar();
- 	void actionUnsetAvatar();
- 	void featureActivated(QString feature, Jid jid, QString node);
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -581,6 +581,7 @@ bool PsiCon::init()
- 
- 	registerCaps("ep", QStringList()
- 	             << "http://jabber.org/protocol/mood"
-+	             << "http://jabber.org/protocol/activity"
- 	             << "http://jabber.org/protocol/tune"
- 	             << "http://jabber.org/protocol/physloc"
- 	             << "http://jabber.org/protocol/geoloc"
-@@ -590,6 +591,7 @@ bool PsiCon::init()
- 
- 	registerCaps("ep-notify-2", QStringList()
- 	             << "http://jabber.org/protocol/mood+notify"
-+	             << "http://jabber.org/protocol/activity+notify"
- 	             << "http://jabber.org/protocol/tune+notify"
- 	             << "http://jabber.org/protocol/physloc+notify"
- 	             << "http://jabber.org/protocol/geoloc+notify"
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -185,6 +185,9 @@ HEADERS += \
- 	$$PWD/mood.h \
- 	$$PWD/moodcatalog.h \
- 	$$PWD/mooddlg.h \
-+	$$PWD/activity.h \
-+	$$PWD/activitycatalog.h \
-+	$$PWD/activitydlg.h \
- 	$$PWD/geolocation.h \
- 	$$PWD/physicallocation.h \
- 	$$PWD/urlbookmark.h \
-@@ -318,6 +321,9 @@ SOURCES += \
- 	$$PWD/mood.cpp \
- 	$$PWD/moodcatalog.cpp \
- 	$$PWD/mooddlg.cpp \
-+	$$PWD/activity.cpp \
-+	$$PWD/activitycatalog.cpp \
-+	$$PWD/activitydlg.cpp \
- 	$$PWD/geolocation.cpp \
- 	$$PWD/physicallocation.cpp \
- 	$$PWD/urlbookmark.cpp \
-@@ -572,6 +578,7 @@ FORMS += \
- 	$$PWD/disco.ui \
- 	$$PWD/tip.ui \
- 	$$PWD/mood.ui \
-+	$$PWD/activity.ui \
- 	$$PWD/voicecall.ui \
- 	$$PWD/chatdlg.ui \
- 	$$PWD/bookmarkmanage.ui \
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -319,6 +319,16 @@ const Mood& UserListItem::mood() const
- 	return v_mood;
- }
- 
-+void UserListItem::setActivity(const Activity& activity)
-+{
-+	v_activity = activity;
-+}
-+
-+const Activity& UserListItem::activity() const
-+{
-+	return v_activity;
-+}
-+
- void UserListItem::setTune(const QString& t)
- {
- 	v_tune = t;
-@@ -492,6 +502,17 @@ QString UserListItem::makeBareTip(bool t
- 	if(!v_keyID.isEmpty())
- 		str += QString("<div style='white-space:pre'>") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
- 
-+	// User Activity
-+	if (!activity().isNull()) {
-+		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " + activity().typeText();
-+		if (activity().specificType() != Activity::UnknownSpecific) {
-+			str += QString(" - ") + activity().specificTypeText();
-+		}
-+		if (!activity().text().isEmpty())
-+			str += QString(" (") + activity().text() + QString(")");
-+		str += "</div>";
-+	}
-+
- 	// User Mood
- 	if (!mood().isNull()) {
- 		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
---- git.orig/src/userlist.h
-+++ git/src/userlist.h
-@@ -28,6 +28,7 @@
- #include "xmpp_resource.h"
- #include "xmpp_liverosteritem.h"
- #include "mood.h"
-+#include "activity.h"
- #include "geolocation.h"
- #include "physicallocation.h"
- #include "maybe.h"
-@@ -123,6 +124,7 @@ public:
- 	QString makeDesc() const;
- 	bool isPrivate() const;
- 	const Mood& mood() const;
-+	const Activity& activity() const;
- 
- 	void setJid(const XMPP::Jid &);
- 	void setInList(bool);
-@@ -130,6 +132,7 @@ public:
- 	void setPresenceError(const QString &);
- 	void setPrivate(bool);
- 	void setMood(const Mood&);
-+	void setActivity(const Activity&);
- 	void setTune(const QString&);
- 	const QString& tune() const;
- 	void setGeoLocation(const GeoLocation&);
-@@ -161,6 +164,7 @@ private:
- 	QString v_keyID;
- 	QPixmap v_avatar;
- 	Mood v_mood;
-+	Activity v_activity;
- 	QString v_tune;
- 	GeoLocation v_geoLocation;
- 	PhysicalLocation v_physicalLocation;

psi-plus-main-20130107.tar.xz/patches/0180-psi-tab-status-icon.diff Deleted

@@ -1,309 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -336,6 +336,7 @@
- 				<recent-jids type="QStringList" />
- 			</service-discovery>
- 			<tabs>
-+				<show-tab-icons type="bool">true</show-tab-icons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
- 				<use-tabs type="bool">false</use-tabs>
- 				<size type="QString"></size> 
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -190,16 +190,6 @@ void ChatDlg::initActions()
- 	connect(act_scrolldown_, SIGNAL(triggered()), SLOT(scrollDown()));
- }
- 
--void ChatDlg::ensureTabbedCorrectly()
--{
--	TabbableWidget::ensureTabbedCorrectly();
--	setShortcuts();
--	if(!isTabbed() && geometryOptionPath().isEmpty()) {
--		setGeometryOptionPath(geometryOption);
--	}
--}
--
--
- void ChatDlg::setShortcuts()
- {
- 	act_send_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.send"));
-@@ -435,6 +425,18 @@ UserStatus userStatusFor(const Jid& jid,
- 	return u;
- }
- 
-+void ChatDlg::ensureTabbedCorrectly()
-+{
-+	TabbableWidget::ensureTabbedCorrectly();
-+	setShortcuts();
-+	QList<UserListItem*> ul = account()->findRelevant(jid());
-+	UserStatus userStatus = userStatusFor(jid(), ul, false);
-+	setTabIcon(PsiIconset::instance()->statusPtr(jid(), userStatus.statusType)->icon());
-+	if(!isTabbed() && geometryOptionPath().isEmpty()) {
-+		setGeometryOptionPath(geometryOption);
-+	}
-+}
-+
- void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- {
- 	// if groupchat, only update if the resource matches
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -763,6 +763,13 @@ void GCMainDlg::ensureTabbedCorrectly()
- 	QList<int> tmp = ui_.hsplitter->sizes();
- 	ui_.hsplitter->setSizes(QList<int>() << 0);
- 	ui_.hsplitter->setSizes(tmp);
-+	UserListItem* u = account()->find(jid().bare());
-+	if(u) {
-+		setTabIcon(PsiIconset::instance()->statusPtr(u)->icon());
-+	}
-+	else {
-+		setStatusTabIcon((d->state == Private::Connected ? STATUS_ONLINE : STATUS_OFFLINE));
-+	}
- 	if(!isTabbed() && geometryOptionPath().isEmpty()) {
- 		setGeometryOptionPath(geometryOption);
- 	}
-@@ -1057,6 +1064,7 @@ void GCMainDlg::goDisc()
- 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
- 		d->state = Private::Idle;
- 		ui_.pb_topic->setEnabled(false);
-+		setStatusTabIcon(STATUS_OFFLINE);
- 		appendSysMsg(tr("Disconnected."), true);
- 		ui_.mle->chatEdit()->setEnabled(false);
- 	}
-@@ -1144,6 +1152,7 @@ PsiAccount* GCMainDlg::account() const
- void GCMainDlg::error(int, const QString &str)
- {
- 	ui_.pb_topic->setEnabled(false);
-+	setStatusTabIcon(STATUS_ERROR);
- 
- 	if(d->state == Private::Connecting)
- 		appendSysMsg(tr("Unable to join groupchat.	Reason: %1").arg(str), true);
-@@ -1197,6 +1206,8 @@ void GCMainDlg::presence(const QString &
- 	}
- 
- 	if (nick == d->self) {
-+		if(s.isAvailable())
-+			setStatusTabIcon(s.type());
- 		// Update configuration dialog
- 		if (d->configDlg) {
- 			d->configDlg->setRoleAffiliation(s.mucItem().role(),s.mucItem().affiliation());
-@@ -1469,6 +1480,7 @@ void GCMainDlg::joined()
- 		ui_.lv_users->clear();
- 		d->state = Private::Connected;
- 		ui_.pb_topic->setEnabled(true);
-+		setStatusTabIcon(STATUS_ONLINE);
- 		ui_.mle->chatEdit()->setEnabled(true);
- 		setConnecting();
- 		appendSysMsg(tr("Connected."), true);
-@@ -1774,6 +1786,11 @@ int GCMainDlg::unreadMessageCount() cons
- 	return d->pending;
- }
- 
-+void GCMainDlg::setStatusTabIcon(int status)
-+{
-+	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -92,6 +92,7 @@ protected:
- 	void dropEvent(QDropEvent *);
- 	void closeEvent(QCloseEvent *);
- 	void mucInfoDialog(const QString& title, const QString& message, const Jid& actor, const QString& reason);
-+	void setStatusTabIcon(int status);
- 
- signals:
- 	void aSend(const Message &);
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -179,6 +179,7 @@ void PsiChatDlg::initUi()
- 
- 	PsiToolTip::install(ui_.lb_status);
- 	ui_.lb_status->setPsiIcon(IconsetFactory::iconPtr("status/noauth"));
-+	setTabIcon(IconsetFactory::iconPtr("status/noauth")->icon());
- 
- 	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
- 
-@@ -392,9 +393,11 @@ void PsiChatDlg::contactUpdated(UserList
- 
- 	if (status == -1 || !u) {
- 		ui_.lb_status->setPsiIcon(IconsetFactory::iconPtr("status/noauth"));
-+		setTabIcon(IconsetFactory::iconPtr("status/noauth")->icon());
- 	}
- 	else {
- 		ui_.lb_status->setPsiIcon(PsiIconset::instance()->statusPtr(jid(), status));
-+		setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
- 	}
- 
- 	if (u) {
---- git.orig/src/tabs/tabbablewidget.cpp
-+++ git/src/tabs/tabbablewidget.cpp
-@@ -209,3 +209,20 @@ void TabbableWidget::changeEvent(QEvent*
- 		}
- 	}
- }
-+
-+/**
-+ * Set the icon of the tab.
-+ */
-+void TabbableWidget::setTabIcon(const QIcon &icon)
-+{
-+	icon_ = icon;
-+	TabDlg* tabDlg = tabManager_->getManagingTabs(this);
-+	if (tabDlg) {
-+		tabDlg->setTabIcon(this, icon);
-+	}
-+}
-+
-+const QIcon &TabbableWidget::icon() const
-+{
-+	return icon_;
-+}
---- git.orig/src/tabs/tabbablewidget.h
-+++ git/src/tabs/tabbablewidget.h
-@@ -21,6 +21,7 @@
- #ifndef TABBABLE_H
- #define TABBABLE_H
- 
-+#include <QIcon>
- #include "advwidget.h"
- #include "im.h" // ChatState
- 
-@@ -42,6 +43,8 @@ public:
- 	~TabbableWidget();
- 
- 	PsiAccount* account() const;
-+	void setTabIcon(const QIcon &);
-+	const QIcon &icon() const;
- 
- 	virtual Jid jid() const; 
- 	virtual const QString & getDisplayName();
-@@ -86,6 +89,7 @@ private:
- 	Jid jid_;
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
-+	QIcon icon_;
- };
- 
- #endif
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -384,7 +384,7 @@ void TabDlg::addTab(TabbableWidget* tab)
- {
- 	setUpdatesEnabled(false);
- 	tabs_.append(tab);
--	tabWidget_->addTab(tab, captionForTab(tab));
-+	tabWidget_->addTab(tab, captionForTab(tab), tab->icon());
- 
- 	connect(tab, SIGNAL(invalidateTabInfo()), SLOT(updateTab()));
- 	connect(tab, SIGNAL(updateFlashState()), SLOT(updateFlashState()));
-@@ -579,12 +579,15 @@ void TabDlg::updateTab(TabbableWidget* c
- 
- 	if (chat->state() == TabbableWidget::StateComposing) {
- 		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
-+		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
- 	else if (chat->unreadMessageCount()) {
- 		tabWidget_->setTabTextColor(chat, Qt::red);
-+		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
- 	}
- 	else {
- 		tabWidget_->setTabTextColor(chat, palette().windowText().color());
-+		tabWidget_->setTabIcon(chat, chat->icon());
- 	}
- 	updateCaption();
- }
-@@ -803,3 +806,11 @@ TabbableWidget* TabDlg::getCurrentTab() 
- {
- 	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
- }
-+
-+/**
-+ * Set the icon of the tab.
-+ */
-+void TabDlg::setTabIcon(QWidget *widget,const QIcon &icon)
-+{
-+	tabWidget_->setTabIcon(widget, icon);
-+}
---- git.orig/src/tabs/tabdlg.h
-+++ git/src/tabs/tabdlg.h
-@@ -85,6 +85,7 @@ public:
- 	void setTabBarShownForSingles(bool enabled); // default enabled
- 	void setSimplifiedCaptionEnabled(bool enabled); // default disabled
- 	TabbableWidget* getCurrentTab() const;
-+	void setTabIcon(QWidget *,const QIcon &);
- 
- protected:
- 	void setShortcuts();
---- git.orig/src/widgets/psitabwidget.cpp
-+++ git/src/widgets/psitabwidget.cpp
-@@ -21,6 +21,7 @@
- #include "psitabwidget.h"
- #include "psitabbar.h"
- #include "common.h"
-+#include "psioptions.h"
- #include <QWidget>
- #include <QVBoxLayout>
- #include <QHBoxLayout>
-@@ -155,14 +156,18 @@ int PsiTabWidget::currentPageIndex() {
- /**
-  * Add the Widget to the tab stack.
-  */
--void PsiTabWidget::addTab(QWidget *widget, QString name) {
-+void PsiTabWidget::addTab(QWidget *widget, QString name, const QIcon &icon)
-+{
- 	Q_ASSERT(widget);
- 	if (widgets_.contains(widget)) {
- 		return;
- 	}
- 	widgets_.append(widget);
- 	stacked_->addWidget(widget);
--	tabBar_->addTab(name);
-+	if (PsiOptions::instance()->getOption("options.ui.tabs.show-tab-icons").toBool())
-+		tabBar_->addTab(icon, name);
-+	else
-+		tabBar_->addTab(name);
- 	showPage(currentPage());
- } 
- 
-@@ -230,6 +235,18 @@ void PsiTabWidget::setTabText(QWidget* w
- 	tabBar_->setTabText(index, label);
- } 
- 
-+/**
-+ * Set the icon of the tab.
-+ */
-+void PsiTabWidget::setTabIcon(QWidget *widget, const QIcon &icon)
-+{
-+	int index = getIndex(widget);
-+	if (index == -1 || !PsiOptions::instance()->getOption("options.ui.tabs.show-tab-icons").toBool()) {
-+		return;
-+	}
-+	tabBar_->setTabIcon(index, icon);
-+}
-+
- void PsiTabWidget::setCurrentPage(int index) {
- 	if (index >= 0 && index < count()) {
- 		showPage(widgets_[index]);
---- git.orig/src/widgets/psitabwidget.h
-+++ git/src/widgets/psitabwidget.h
-@@ -48,7 +48,7 @@ public:
- 	QWidget *currentPage();
- 	int currentPageIndex();
- 	QWidget *widget(int index);
--	void addTab(QWidget *, QString);
-+	void addTab(QWidget *, QString, const QIcon &icon = QIcon());
- 	void showPage(QWidget *);
- 	void showPageDirectly(QWidget *);
- 
-@@ -56,6 +56,7 @@ public:
- 	QWidget* page(int index);
- 	int getIndex(QWidget *);
- 	void setTabText(QWidget *, const QString &);
-+	void setTabIcon(QWidget *, const QIcon &);
- 	void setTabPosition(QTabWidget::TabPosition pos);
- 	void setCloseIcon(const QIcon &);
-

psi-plus-main-20130107.tar.xz/patches/0190-psi-typed-history.diff Deleted

@@ -1,227 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -408,6 +408,10 @@
- 				</send>
- 				<clear type="QKeySequence" comment="Clear the text"/>
- 				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
-+				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
-+				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
-+				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -694,6 +694,7 @@ void ChatDlg::doSend()
- 	}
- 
- 	m_ = m;
-+	emit chatEdit()->appendMessageHistory(m.body());
- 
- 	// Request events
- 	if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) {
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -948,6 +948,7 @@ void GCMainDlg::mle_returnPressed()
- 	m.setType("groupchat");
- 	m.setBody(str);
- 	m.setTimeStamp(QDateTime::currentDateTime());
-+	emit d->mle()->appendMessageHistory(m.body());
- 
- 	aSend(m);
- 
---- git.orig/src/msgmle.cpp
-+++ git/src/msgmle.cpp
-@@ -58,13 +58,45 @@ ChatEdit::ChatEdit(QWidget *parent)
- 	previous_position_ = 0;
- 	setCheckSpelling(checkSpellingGloballyEnabled());
- 	connect(PsiOptions::instance(),SIGNAL(optionChanged(const QString&)),SLOT(optionsChanged()));
-+	typedMsgsIndex = 0;
-+
-+	initActions();
-+	setShortcuts();
- }
- 
- ChatEdit::~ChatEdit()
- {
-+	clearMessageHistory();
- 	delete spellhighlighter_;
- }
- 
-+void ChatEdit::initActions()
-+{
-+	act_showMessagePrev = new QAction(this);
-+	addAction(act_showMessagePrev);
-+	connect(act_showMessagePrev, SIGNAL(triggered()), SLOT(showHistoryMessagePrev()));
-+
-+	act_showMessageNext= new QAction(this);
-+	addAction(act_showMessageNext);
-+	connect(act_showMessageNext, SIGNAL(triggered()), SLOT(showHistoryMessageNext()));
-+
-+	act_showMessageFirst = new QAction(this);
-+	addAction(act_showMessageFirst);
-+	connect(act_showMessageFirst, SIGNAL(triggered()), SLOT(showHistoryMessageFirst()));
-+
-+	act_showMessageLast= new QAction(this);
-+	addAction(act_showMessageLast);
-+	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
-+}
-+
-+void ChatEdit::setShortcuts()
-+{
-+	act_showMessagePrev->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messagePrev"));
-+	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
-+	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
-+	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
-+}
-+
- void ChatEdit::setDialog(QWidget* dialog)
- {
- 	dialog_ = dialog;
-@@ -239,6 +271,90 @@ void ChatEdit::optionsChanged()
- 	setCheckSpelling(checkSpellingGloballyEnabled());
- }
- 
-+void ChatEdit::showHistoryMessageNext()
-+{
-+	if (!typedMsgsHistory.isEmpty()) {
-+		if (typedMsgsIndex + 1 < typedMsgsHistory.size()) {
-+			++typedMsgsIndex;
-+			showMessageHistory();
-+		} else {
-+			if(typedMsgsIndex != typedMsgsHistory.size()) {
-+				typedMsgsIndex = typedMsgsHistory.size();
-+				// Restore last typed text
-+				setEditText(currentText);
-+			}
-+		}
-+	}
-+}
-+
-+void ChatEdit::showHistoryMessagePrev()
-+{
-+	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
-+		// Save current typed text
-+		if (typedMsgsIndex == typedMsgsHistory.size())
-+			currentText = toPlainText();
-+		--typedMsgsIndex;
-+		showMessageHistory();
-+	}
-+}
-+
-+void ChatEdit::showHistoryMessageFirst()
-+{
-+	if (!typedMsgsHistory.isEmpty()) {
-+		if (currentText.isEmpty()) {
-+			typedMsgsIndex = typedMsgsHistory.size() - 1;
-+			showMessageHistory();
-+		} else {
-+			typedMsgsIndex = typedMsgsHistory.size();
-+			// Restore last typed text
-+			setEditText(currentText);
-+		}
-+	}
-+}
-+
-+void ChatEdit::showHistoryMessageLast()
-+{
-+	if (!typedMsgsHistory.isEmpty()) {
-+		typedMsgsIndex = 0;
-+		showMessageHistory();
-+	}
-+}
-+
-+void ChatEdit::setEditText(const QString& text)
-+{
-+	setPlainText(text);
-+	moveCursor(QTextCursor::End);
-+}
-+
-+void ChatEdit::showMessageHistory()
-+{
-+	setEditText(typedMsgsHistory.at(typedMsgsIndex));
-+}
-+
-+void ChatEdit::appendMessageHistory(const QString& text)
-+{
-+	if (!text.simplified().isEmpty()) {
-+		if (currentText == text)
-+			// Remove current typed text only if we want to add it to history
-+			currentText.clear();
-+		long index = typedMsgsHistory.indexOf(text);
-+		if (index >=0) {
-+			typedMsgsHistory.removeAt(index);
-+		}
-+		if (typedMsgsHistory.size() >= MAX_MESSAGE_HISTORY) {
-+			typedMsgsHistory.removeAt(0);
-+		}
-+		typedMsgsHistory += text;
-+		typedMsgsIndex = typedMsgsHistory.size();
-+	}
-+}
-+
-+void ChatEdit::clearMessageHistory()
-+{
-+	typedMsgsHistory.clear();
-+	typedMsgsIndex = 0;
-+}
-+
- //----------------------------------------------------------------------------
- // LineEdit
- //----------------------------------------------------------------------------
---- git.orig/src/msgmle.h
-+++ git/src/msgmle.h
-@@ -23,6 +23,8 @@
- 
- #include <QTextEdit>
- 
-+#define MAX_MESSAGE_HISTORY 50
-+
- class ChatEdit;
- class QEvent;
- class QKeyEvent;
-@@ -47,10 +49,18 @@ public:
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
- 
-+public slots:
-+	void appendMessageHistory(const QString& text);
-+	void clearMessageHistory();
-+
- protected slots:
-  	void applySuggestion();
-  	void addToDictionary();
- 	void optionsChanged();
-+	void showHistoryMessageNext();
-+	void showHistoryMessagePrev();
-+	void showHistoryMessageFirst();
-+	void showHistoryMessageLast();
- 
- protected:
- 	// override the tab/esc behavior
-@@ -58,6 +68,10 @@ protected:
- 	void keyPressEvent(QKeyEvent *);
- 	bool event(QEvent * event);
- 	void contextMenuEvent(QContextMenuEvent *e);
-+	void showMessageHistory();
-+	void initActions();
-+	void setShortcuts();
-+	void setEditText(const QString& text);
- 
- private:
- 	QWidget	*dialog_;
-@@ -65,6 +79,13 @@ private:
- 	SpellHighlighter* spellhighlighter_;
- 	QPoint last_click_;
- 	int previous_position_;
-+	QStringList typedMsgsHistory;
-+	long typedMsgsIndex;
-+	QAction* act_showMessagePrev;
-+	QAction* act_showMessageNext;
-+	QAction* act_showMessageFirst;
-+	QAction* act_showMessageLast;
-+	QString currentText;
- };
- 
-

psi-plus-main-20130107.tar.xz/patches/0200-psi-roster-disable-scrollbar.diff Deleted

@@ -1,54 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -138,6 +138,7 @@
- 				<always-on-top type="bool">false</always-on-top>
- 				<automatically-resize-roster type="bool">false</automatically-resize-roster>
- 				<grow-roster-upwards type="bool">true</grow-roster-upwards>
-+				<disable-scrollbar type="bool">true</disable-scrollbar>
- 				<contact-sort-style type="QString">status</contact-sort-style>
- 				<disable-service-discovery type="bool">false</disable-service-discovery>
- 				<ensure-contact-visible-on-event type="bool">true</ensure-contact-visible-on-event>
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -639,6 +639,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- #endif
- 
- 	ui_.lv_users->setMainDlg(this);
-+	if ( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() ) {
-+		ui_.lv_users->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-+	}
- 	connect(ui_.lv_users, SIGNAL(action(const QString &, const Status &, int)), SLOT(lv_action(const QString &, const Status &, int)));
- 	connect(ui_.lv_users, SIGNAL(insertNick(const QString&)), d, SLOT(insertNick(const QString&)));
- 
---- psi.orig/src/psirosterwidget.cpp
-+++ psi/src/psirosterwidget.cpp
-@@ -48,6 +48,7 @@ static const QString showAgentsOptionPat
- static const QString showSelfOptionPath = "options.ui.contactlist.show.self-contact";
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
- static const QString allowAutoResizeOptionPath = "options.ui.contactlist.automatically-resize-roster";
-+static const QString showScrollBarOptionPath = "options.ui.contactlist.disable-scrollbar";
- 
- //----------------------------------------------------------------------------
- // PsiRosterFilterProxyModel
-@@ -131,6 +132,9 @@ PsiRosterWidget::PsiRosterWidget(QWidget
- 	contactListPageView_ = new PsiContactListView(contactListPage_);
- 	contactListPageView_->installEventFilter(this);
- 	contactListPageView_->setObjectName("contactListView");
-+	if ( PsiOptions::instance()->getOption(showScrollBarOptionPath).toBool() ) {
-+		contactListPageView_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-+	}
- 	contactListPageLayout->addWidget(contactListPageView_);
- 
- 	// filterPage_
-@@ -235,6 +239,11 @@ void PsiRosterWidget::optionChanged(cons
- 	else if (option == allowAutoResizeOptionPath) {
- 		contactListPageView_->setAutoResizeEnabled(PsiOptions::instance()->getOption(allowAutoResizeOptionPath).toBool());
- 	}
-+	else if (option == showScrollBarOptionPath) {
-+		contactListPageView_->setVerticalScrollBarPolicy(
-+			PsiOptions::instance()->getOption(showScrollBarOptionPath).toBool()?
-+			Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded);
-+	}
- }
- 
- void PsiRosterWidget::removeSelection(QMimeData* selection)

psi-plus-main-20130107.tar.xz/patches/0210-psi-status-align-center.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0220-psi-default-application-settings.diff Deleted

@@ -1,219 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -33,7 +33,7 @@
- 		<extended-presence comment="Extended presence options">
- 			<notify comment="Get notified of extended presence changes" type="bool">true</notify>
- 			<tune comment="Tune options">
--				<publish comment="Publish user tune information" type="bool">false</publish>
-+				<publish comment="Publish user tune information" type="bool">true</publish>
- 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
- 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
- 				<controller-filter comment="List of disabled controllers" type="QString"></controller-filter>
-@@ -45,7 +45,7 @@
- 			</bookmarks>
- 			<show-joins comment="Display notices of users joining and leaving conferences" type="bool">true</show-joins>
- 			<show-role-affiliation comment="Include role and affiliation changes in join messages, and display notices of changes" type="bool">true</show-role-affiliation>
--			<show-status-changes comment="Show status changes in groupchat window" type="bool">false</show-status-changes>
-+			<show-status-changes comment="Show status changes in groupchat window" type="bool">true</show-status-changes>
- 			<accept-defaults comment="Automatically accept the default room configuration when a new room is created." type="bool">true</accept-defaults>
- 			<auto-configure comment="Automatically open the configuration dialog when a new room is created. This option only has effect if accept-defaults is false." type="bool">true</auto-configure>
- 			<context comment="Options regarding the context being sent when joining a room">
-@@ -87,7 +87,7 @@
- 				<auto-grab-urls-from-clipboard type="bool">false</auto-grab-urls-from-clipboard>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-popup-headlines type="bool">false</auto-popup-headlines>
--				<show-character-count type="bool">false</show-character-count>
-+				<show-character-count type="bool">true</show-character-count>
- 				<show-subjects type="bool">true</show-subjects>
- 				<use-jid-auto-completion type="bool">true</use-jid-auto-completion>
- 				<size type="QString"></size> 
-@@ -105,10 +105,10 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
--				<delete-contents-after type="QString">hour</delete-contents-after>
-+				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
--				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
-+				<use-expanding-line-edit type="bool">false</use-expanding-line-edit>
- 				<use-small-chats type="bool">false</use-small-chats>
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
-@@ -159,7 +159,7 @@
- 				<use-left-click type="bool">false</use-left-click>
- 				<use-single-click type="bool">false</use-single-click>
- 				<use-status-change-animation type="bool">true</use-status-change-animation>
--				<use-transport-icons type="bool">false</use-transport-icons>
-+				<use-transport-icons type="bool">true</use-transport-icons>
- 				<saved-window-geometry type="QRect" >
- 					<x>64</x>
- 					<y>64</y>
-@@ -194,7 +194,7 @@
- 					<invisible comment="Enable invisibility" type="bool">false</invisible>
- 				</status>
- 				<view comment="Options for the view menu">
--					<show-away comment="Show the 'show away/xa' toggle" type="bool">false</show-away>
-+					<show-away comment="Show the 'show away/xa' toggle" type="bool">true</show-away>
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-@@ -310,8 +310,8 @@
- 					</status>
- 				</passive-popups>
- 				<popup-dialogs>
--					<suppress-when-not-on-roster type="bool">false</suppress-when-not-on-roster>
--					<suppress-while-away type="bool">false</suppress-while-away>
-+					<suppress-when-not-on-roster type="bool">true</suppress-when-not-on-roster>
-+					<suppress-while-away type="bool">true</suppress-while-away>
- 				</popup-dialogs>
- 				<sounds>
- 					<chat-message type="QString">sound/chat2.wav</chat-message>
-@@ -330,19 +330,19 @@
- 					<system-message type="QString">sound/chat2.wav</system-message>
- 					<unix-sound-player type="QString"/>
- 				</sounds>
--				<successful-subscription type="bool">false</successful-subscription>
-+				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
- 			<service-discovery>
--				<automatically-get-info type="bool">true</automatically-get-info>
-+				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
- 				<recent-jids type="QStringList" />
- 			</service-discovery>
- 			<tabs>
- 				<show-tab-icons type="bool">true</show-tab-icons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
--				<use-tabs type="bool">false</use-tabs>
-+				<use-tabs type="bool">true</use-tabs>
- 				<size type="QString"></size> 
--				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">C:M</grouping>
-+				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">CM</grouping>
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
-@@ -410,7 +410,7 @@
- 					<item type="QKeySequence">Enter</item>
- 				</send>
- 				<clear type="QKeySequence" comment="Clear the text"/>
--				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+Space</quick-command>
- 				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
-@@ -419,7 +419,7 @@
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
- 				<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/>
--				<delete type="QKeySequence" comment="Delete the selected contact">Del</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 				<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
- 				<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
- 				<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
-@@ -463,7 +463,7 @@
- 		</shortcuts>
- 		<contactlist>
- 			<hide-on-start type="bool">false</hide-on-start>
--			<resolve-nicks-on-contact-add type="bool">false</resolve-nicks-on-contact-add>
-+			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
- 			<use-toolwindow type="bool">false</use-toolwindow>
- 		</contactlist>
- 		<external-control>
-@@ -479,6 +479,10 @@
- 			</emoticons>
- 			<status type="QString">default</status>
- 			<system type="QString">default</system>
-+			<moods type="QString">default</moods>
-+			<clients type="QString">default</clients>
-+			<activities type="QString">default</activities>
-+			<affiliations type="QString">default</affiliations>
- 		</iconsets>
- 		<messages>
- 			<default-outgoing-message-type type="QString">chat</default-outgoing-message-type>
---- psi.orig/options/macosx.xml
-+++ psi/options/macosx.xml
-@@ -13,14 +13,25 @@
- 		</ui>
- 		<shortcuts comment="Shortcuts">
- 			<contactlist comment="Shortcuts in the contactlist">
--				<delete type="QVariantList" comment="Delete the selected contact">
--					<item type="QKeySequence">Backspace</item>
--					<item type="QKeySequence">Del</item>
--				</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 			</contactlist>
- 			<common comment="Common actions" >
- 				<history type="QKeySequence" comment="Open the message history">Ctrl+Shift+H</history>
- 			</common>
-+			<chat comment="Shortcuts in the chat dialog">
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+			</chat>
- 		</shortcuts>
-+		<ui comment="User interface options">
-+			<disable-send-button type="bool">true</disable-send-button>
-+			<look>
-+				<font>
-+					<chat type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</chat>
-+					<contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</contactlist>
-+					<message type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</message>
-+					<passive-popup type="QString">Lucida Grande,9,-1,5,50,0,0,0,0,0</passive-popup>
-+				</font>
-+			</look>
-+		</ui>
- 	</options>
- </psi>
---- psi.orig/options/windows.xml
-+++ psi/options/windows.xml
-@@ -6,6 +6,9 @@
- 				<enable type="bool">true</enable>
- 				<use-double-click type="bool">true</use-double-click>
- 			</systemtray>
-+			<spell-check comment="Options related to the spell checker">
-+				<enabled comment="Whether the spell checker is enabled" type="bool">false</enabled>
-+			</spell-check>
- 		</ui>
- 	</options>
- </psi>
---- psi.orig/src/psioptions.cpp
-+++ psi/src/psioptions.cpp
-@@ -192,10 +192,12 @@ bool PsiOptions::newProfile()
- 		buttons.dock = Qt3Dock_Bottom;
- 
- 		ToolbarPrefs showContacts;
-+		showContacts.on = true;
- 		showContacts.name = tr("Show contacts");
--		showContacts.keys << "show_offline" << "show_hidden" << "show_agents" << "show_self" << "show_statusmsg";
-+		showContacts.keys << "view_groups" << "menu_add_contact" << "menu_disco" << "menu_options" << "menu_play_sounds" <<"menu_xml_console";
- 
- 		ToolbarPrefs eventNotifier;
-+		eventNotifier.on = true;
- 		eventNotifier.name = tr("Event notifier");
- 		eventNotifier.keys << "event_notifier";
- 		eventNotifier.dock = Qt3Dock_Bottom;
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -130,17 +130,17 @@ void UserAccount::reset()
- 	port = 5222;
- 	opt_host = false;
- 	host = "";
--	opt_automatic_resource = true;
--	resource = "Psi";
--	priority = 5;
- 	ibbOnly = false;
-+	opt_automatic_resource = false;
-+	resource = "Psi+";
-+	priority = 55;
- 	opt_keepAlive = true;
- 	allow_plain = XMPP::ClientStream::AllowPlainOverTLS;
--	opt_compress = false;
-+	opt_compress = true;
- 	opt_log = true;
--	opt_reconn = false;
-+	opt_reconn = true;
- 	opt_connectAfterSleep = false;
--	opt_ignoreSSLWarnings = false;
-+	opt_ignoreSSLWarnings = true;
- 
- 	proxy_index = 0;
- 	proxy_type = PROXY_NONE;

psi-plus-main-20130107.tar.xz/patches/0230-psi-roster-settings.diff Deleted

@@ -1,500 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -153,7 +153,16 @@
- 					<self-contact type="bool">true</self-contact>
- 				</show>
- 				<show-group-counts type="bool">true</show-group-counts>
--				<show-menubar type="bool">true</show-menubar>
-+				<show-menubar type="bool">false</show-menubar>
-+				<disable-scrollbar type="bool">true</disable-scrollbar>
-+				<avatars>
-+					<show type="bool">true</show>
-+					<size type="int">24</size>
-+					<radius type="int">5</radius>
-+				</avatars>
-+				<show-mood-icons type="bool">true</show-mood-icons>
-+				<show-tune-icons type="bool">true</show-tune-icons>
-+				<show-client-icons type="bool">true</show-client-icons>
- 				<toolbars/>
- 				<toolbars-state type="QByteArray"/>
- 				<use-left-click type="bool">false</use-left-click>
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -39,16 +39,6 @@ QWidget *OptionsTabApplication::widget()
- 	w = new OptApplicationUI();
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
--	d->ck_alwaysOnTop->setWhatsThis(
--		tr("Makes the main Psi window always be in front of other windows."));
--	d->ck_autoRosterSize->setWhatsThis(
--		tr("Makes the main Psi window resize automatically to fit all contacts."));
--	d->ck_useleft->setWhatsThis(
--		tr("Normally, right-clicking with the mouse on a contact will activate the context-menu."
--		"  Check this option if you'd rather use a left-click."));
--	d->ck_showMenubar->setWhatsThis(
--		tr("Shows the menubar in the application window."));
--
- 	// docklet
- 	d->ck_docklet->setWhatsThis(
- 		tr("Makes Psi use a docklet icon, also known as system tray icon."));
-@@ -62,8 +52,6 @@ QWidget *OptionsTabApplication::widget()
- 		"window use a small titlebar."));
- 
- #ifdef Q_WS_MAC
--	d->ck_alwaysOnTop->hide();
--	d->ck_showMenubar->hide();
- 	d->gb_docklet->hide();
- #endif
- 
-@@ -95,11 +83,6 @@ void OptionsTabApplication::applyOptions
- 
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
--	PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked());
--	PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked());
--	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
--	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
--
- 	// Auto-update
- 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
- 	
-@@ -124,11 +107,6 @@ void OptionsTabApplication::restoreOptio
- 
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
--	d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() );
--	d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() );
--	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
--	d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() );
--	d->ck_useleft->setVisible(false); //currently useless
- 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
- 
- 	// docklet
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -14,37 +14,6 @@
-   </property>
-   <layout class="QVBoxLayout" >
-    <item>
--    <widget class="QCheckBox" name="ck_alwaysOnTop" >
--     <property name="text" >
--      <string>Roster window always on top</string>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QCheckBox" name="ck_autoRosterSize" >
--     <property name="text" >
--      <string>Auto-resize contact list</string>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QCheckBox" name="ck_useleft" >
--     <property name="enabled" >
--      <bool>true</bool>
--     </property>
--     <property name="text" >
--      <string>Use left-click for menu</string>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QCheckBox" name="ck_showMenubar" >
--     <property name="text" >
--      <string>Show menubar</string>
--     </property>
--    </widget>
--   </item>
--   <item>
-     <widget class="QCheckBox" name="ck_docklet" >
-      <property name="text" >
-       <string>Enable docklet</string>
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -39,6 +39,7 @@
- // tabs
- #include "opt_toolbars.h"
- #include "opt_application.h"
-+#include "opt_roster.h"
- #include "opt_appearance.h"
- #include "opt_chat.h"
- #include "opt_events.h"
-@@ -270,6 +271,7 @@ void OptionsDlg::Private::createTabs()
- 	OptionsTabApplication* applicationTab = new OptionsTabApplication(this);
- 	applicationTab->setHaveAutoUpdater(psi->haveAutoUpdater());
- 	tabs.append( applicationTab );
-+	tabs.append( new OptionsTabRoster(this) );
- 	tabs.append( new OptionsTabChat(this) );
- 	tabs.append( new OptionsTabEvents(this) );
- 	tabs.append( new OptionsTabPopups(this) );
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
-@@ -12,6 +12,7 @@ FORMS += \
- # additional tabs
- HEADERS += \
- 	$$PWD/opt_application.h \
-+	$$PWD/opt_roster.h \
- 	$$PWD/opt_chat.h \
- 	$$PWD/opt_events.h \
- 	$$PWD/opt_popups.h \
-@@ -30,6 +31,7 @@ HEADERS += $$PWD/opt_tree.h
- 
- SOURCES += \
- 	$$PWD/opt_application.cpp \
-+	$$PWD/opt_roster.cpp \
- 	$$PWD/opt_chat.cpp \
- 	$$PWD/opt_events.cpp \
- 	$$PWD/opt_popups.cpp \
-@@ -48,6 +50,7 @@ SOURCES += $$PWD/opt_tree.cpp
- 
- FORMS += \
- 	$$PWD/opt_application.ui \
-+	$$PWD/opt_roster.ui \
- 	$$PWD/opt_chat.ui \
- 	$$PWD/opt_events.ui \
- 	$$PWD/opt_popups.ui \
---- psi.orig/src/options/opt_roster.cpp
-+++ psi/src/options/opt_roster.cpp
-@@ -0,0 +1,103 @@
-+#include "opt_roster.h"
-+#include "common.h"
-+#include "iconwidget.h"
-+#include "psioptions.h"
-+
-+
-+#include "ui_opt_roster.h"
-+
-+class OptRosterUI : public QWidget, public Ui::OptRoster
-+{
-+public:
-+	OptRosterUI() : QWidget() { setupUi(this); }
-+};
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabRoster
-+//----------------------------------------------------------------------------
-+
-+OptionsTabRoster::OptionsTabRoster(QObject *parent)
-+	: OptionsTab(parent, "roster", "", tr("Roster"), tr("Roster window options"), "psi/roster_icon")
-+	, w(0)
-+{	
-+}
-+
-+OptionsTabRoster::~OptionsTabRoster()
-+{
-+}
-+
-+QWidget *OptionsTabRoster::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new OptRosterUI();
-+	OptRosterUI *d = (OptRosterUI *)w;
-+
-+	d->ck_alwaysOnTop->setWhatsThis(
-+		tr("Makes the main Psi window always be in front of other windows."));
-+	d->ck_autoRosterSize->setWhatsThis(
-+		tr("Makes the main Psi window resize automatically to fit all contacts."));
-+	d->ck_useleft->setWhatsThis(
-+		tr("Normally, right-clicking with the mouse on a contact will activate the context-menu."
-+		"  Check this option if you'd rather use a left-click."));
-+	d->ck_showMenubar->setWhatsThis(
-+		tr("Shows the menubar in the application window."));
-+
-+
-+#ifdef Q_WS_MAC
-+	d->ck_alwaysOnTop->hide();
-+	d->ck_showMenubar->hide();
-+#endif
-+
-+	return w;
-+}
-+
-+void OptionsTabRoster::applyOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptRosterUI *d = (OptRosterUI *)w;
-+
-+	PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
-+
-+	//enabled icons
-+	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
-+
-+	//avatars settings
-+	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.size", d->sb_avatarsSize->value());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.radius", d->sb_avatarsRadius->value());
-+}
-+
-+void OptionsTabRoster::restoreOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptRosterUI *d = (OptRosterUI *)w;
-+
-+	d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() );
-+	d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() );
-+	d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() );
-+	d->ck_useleft->setVisible(false);
-+	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
-+	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
-+
-+	//enabled icons
-+	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
-+	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
-+	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
-+	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
-+
-+	//avatars settings
-+	d->sb_avatarsSize->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.size").toInt() );
-+	d->sb_avatarsRadius->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt() );
-+}
---- psi.orig/src/options/opt_roster.h
-+++ psi/src/options/opt_roster.h
-@@ -0,0 +1,24 @@
-+#ifndef OPT_ROSTER_H
-+#define OPT_ROSTER_H
-+
-+#include "optionstab.h"
-+
-+class QWidget;
-+class QButtonGroup;
-+
-+class OptionsTabRoster : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabRoster(QObject *parent);
-+	~OptionsTabRoster();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+
-+private:
-+	QWidget *w;
-+};
-+
-+#endif
---- psi.orig/src/options/opt_roster.ui
-+++ psi/src/options/opt_roster.ui
-@@ -0,0 +1,208 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptRoster</class>
-+ <widget class="QWidget" name="OptRoster">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>343</width>
-+    <height>401</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>OptApplicationUI</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-+    <number>9</number>
-+   </property>
-+   <item>
-+    <widget class="QCheckBox" name="ck_alwaysOnTop">
-+     <property name="text">
-+      <string>Roster window always on top</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QCheckBox" name="ck_autoRosterSize">
-+     <property name="text">
-+      <string>Auto-resize contact list</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QCheckBox" name="ck_useleft">
-+     <property name="enabled">
-+      <bool>true</bool>
-+     </property>
-+     <property name="text">
-+      <string>Use left-click for menu</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QCheckBox" name="ck_showMenubar">
-+     <property name="text">
-+      <string>Show menubar</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QCheckBox" name="ck_disableScrollbar">
-+     <property name="whatsThis">
-+      <string>Disables scrollbar in the application window.</string>
-+     </property>
-+     <property name="text">
-+      <string>Disable scrollbar</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QGroupBox" name="gb_docklet">
-+     <property name="title">
-+      <string>Icons</string>
-+     </property>
-+     <layout class="QVBoxLayout">
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <property name="margin">
-+       <number>10</number>
-+      </property>
-+      <item>
-+       <widget class="QCheckBox" name="ck_showAvatarIcons">
-+        <property name="whatsThis">
-+         <string>Show avatars in roster</string>
-+        </property>
-+        <property name="text">
-+         <string>Avatars</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QCheckBox" name="ck_showMoodIcons">
-+        <property name="whatsThis">
-+         <string>Show moods in roster</string>
-+        </property>
-+        <property name="text">
-+         <string>Moods</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QCheckBox" name="ck_showTuneIcons">
-+        <property name="whatsThis">
-+         <string>Show icon when contact is listening to music</string>
-+        </property>
-+        <property name="text">
-+         <string>Now playing</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QCheckBox" name="ck_showClientIcons">
-+        <property name="whatsThis">
-+         <string>Show icon of user client</string>
-+        </property>
-+        <property name="text">
-+         <string>Clients</string>
-+        </property>
-+       </widget>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QGroupBox" name="gb_avatarsSettings">
-+     <property name="title">
-+      <string>Avatar settings</string>
-+     </property>
-+     <property name="checkable">
-+      <bool>false</bool>
-+     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout">
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout">
-+        <item>
-+         <widget class="QLabel" name="lbl_avatarsSize">
-+          <property name="text">
-+           <string>Size</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QSpinBox" name="sb_avatarsSize">
-+          <property name="maximumSize">
-+           <size>
-+            <width>60</width>
-+            <height>16777215</height>
-+           </size>
-+          </property>
-+          <property name="suffix">
-+           <string>px</string>
-+          </property>
-+          <property name="prefix">
-+           <string/>
-+          </property>
-+          <property name="minimum">
-+           <number>8</number>
-+          </property>
-+          <property name="maximum">
-+           <number>64</number>
-+          </property>
-+          <property name="value">
-+           <number>24</number>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout_2">
-+        <item>
-+         <widget class="QLabel" name="lbl_avatarsRadius">
-+          <property name="text">
-+           <string>Radius of corners</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QSpinBox" name="sb_avatarsRadius">
-+          <property name="maximumSize">
-+           <size>
-+            <width>60</width>
-+            <height>16777215</height>
-+           </size>
-+          </property>
-+          <property name="suffix">
-+           <string>px</string>
-+          </property>
-+          <property name="value">
-+           <number>5</number>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <tabstops>
-+  <tabstop>ck_alwaysOnTop</tabstop>
-+  <tabstop>ck_autoRosterSize</tabstop>
-+  <tabstop>ck_useleft</tabstop>
-+  <tabstop>ck_showMenubar</tabstop>
-+  <tabstop>ck_showAvatarIcons</tabstop>
-+  <tabstop>ck_showMoodIcons</tabstop>
-+  <tabstop>ck_showTuneIcons</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections/>
-+</ui>

psi-plus-main-20130107.tar.xz/patches/0250-psi-client-icons.diff Deleted

@@ -1,784 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -163,6 +163,7 @@
- 				<show-mood-icons type="bool">true</show-mood-icons>
- 				<show-tune-icons type="bool">true</show-tune-icons>
- 				<show-client-icons type="bool">true</show-client-icons>
-+				<show-all-client-icons type="bool">false</show-all-client-icons>
- 				<toolbars/>
- 				<toolbars-state type="QByteArray"/>
- 				<use-left-click type="bool">false</use-left-click>
---- git.orig/src/options/opt_appearance.cpp
-+++ git/src/options/opt_appearance.cpp
-@@ -95,6 +95,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
- {
- 	addTab( new OptionsTabIconsetEmoticons(this) );
- 	addTab( new OptionsTabIconsetMoods(this) );
-+	addTab( new OptionsTabIconsetClients(this) );
- 	addTab( new OptionsTabIconsetRoster(this) );
- 	addTab( new OptionsTabIconsetSystem(this) );
- }
---- git.orig/src/options/opt_iconset.cpp
-+++ git/src/options/opt_iconset.cpp
-@@ -24,6 +24,7 @@
- 
- #include "ui_opt_iconset_emo.h"
- #include "ui_opt_iconset_mood.h"
-+#include "ui_opt_iconset_client.h"
- #include "ui_opt_iconset_system.h"
- #include "ui_opt_iconset_roster.h"
- #include "ui_ui_isdetails.h"
-@@ -40,6 +41,12 @@ public:
- 	IconsetMoodUI() : QWidget() { setupUi(this); }
- };
- 
-+class IconsetClientUI : public QWidget, public Ui::IconsetClient
-+{
-+public:
-+	IconsetClientUI() : QWidget() { setupUi(this); }
-+};
-+
- class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
- {
- public:
-@@ -804,6 +811,154 @@ void OptionsTabIconsetMoods::cancelThrea
- }
- 
- //----------------------------------------------------------------------------
-+// OptionsTabIconsetClients
-+//----------------------------------------------------------------------------
-+
-+OptionsTabIconsetClients::OptionsTabIconsetClients(QObject *parent)
-+	: OptionsTab(parent, "iconset_clients", "", tr("Clients"), tr("Select your clients iconset"))
-+	, w(0)
-+	, thread(0)
-+{
-+}
-+
-+OptionsTabIconsetClients::~OptionsTabIconsetClients()
-+{
-+	cancelThread();
-+}
-+
-+QWidget *OptionsTabIconsetClients::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new IconsetClientUI;
-+	IconsetClientUI *d = (IconsetClientUI *)w;
-+
-+	connect(d->pb_clientDetails, SIGNAL(clicked()), SLOT(previewIconset()));
-+
-+	return w;
-+}
-+
-+void OptionsTabIconsetClients::applyOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetClientUI *d = (IconsetClientUI *)w;
-+
-+	const Iconset *is = d->iss_clients->iconset();
-+	if ( is ) {
-+		QFileInfo fi( is->fileName() );
-+		PsiOptions::instance()->setOption("options.iconsets.clients", fi.fileName());
-+	}
-+}
-+
-+void OptionsTabIconsetClients::restoreOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetClientUI *d = (IconsetClientUI *)w;
-+
-+	d->iss_clients->clear();
-+	QStringList loaded;
-+
-+	d->setCursor(Qt::WaitCursor);
-+
-+	QPalette customPal = d->palette();
-+	customPal.setCurrentColorGroup(QPalette::Inactive);
-+	d->iss_clients->setEnabled(false);
-+	d->iss_clients->setPalette(customPal);
-+
-+	d->pb_clientDetails->setEnabled(false);
-+	d->pb_clientDetails->setPalette(customPal);
-+
-+	d->progress->show();
-+	d->progress->setValue( 0 );
-+
-+	numIconsets = countIconsets("/clients", loaded);
-+	iconsetsLoaded = 0;
-+
-+	cancelThread();
-+
-+	thread = new IconsetLoadThread(this, "/clients");
-+	thread->start();
-+}
-+
-+bool OptionsTabIconsetClients::event(QEvent *e)
-+{
-+	IconsetClientUI *d = (IconsetClientUI *)w;
-+	if ( e->type() == QEvent::User ) { // iconset load event
-+		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
-+
-+		if ( thread != le->thread() )
-+			return false;
-+
-+		if ( !numIconsets )
-+			numIconsets = 1;
-+		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
-+
-+		Iconset *i = le->iconset();
-+		if ( i ) {
-+			PsiIconset::instance()->stripFirstAnimFrame(i);
-+			d->iss_clients->insert(*i);
-+
-+			QFileInfo fi( i->fileName() );
-+			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.clients").toString() )
-+				d->iss_clients->setItemSelected(d->iss_clients->lastItem(), true);
-+
-+			delete i;
-+		}
-+
-+		return true;
-+	}
-+	else if ( e->type() == QEvent::User + 1 ) { // finish event
-+		d->iss_clients->setEnabled(true);
-+		d->iss_clients->setPalette(QPalette());
-+
-+		d->pb_clientDetails->setEnabled(true);
-+		d->pb_clientDetails->setPalette(QPalette());
-+
-+		connect(d->iss_clients, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
-+
-+		d->progress->hide();
-+
-+		d->unsetCursor();
-+		thread = 0;
-+
-+		return true;
-+	}
-+
-+	return false;
-+}
-+
-+void OptionsTabIconsetClients::previewIconset()
-+{
-+	IconsetClientUI *d = (IconsetClientUI *)w;
-+	const Iconset *is = d->iss_clients->iconset();
-+	if (is) {
-+		isDetails(*is, parentWidget->parentWidget(), psi);
-+	}
-+}
-+
-+void OptionsTabIconsetClients::setData(PsiCon *psicon, QWidget *p)
-+{
-+	psi = psicon;
-+	parentWidget = p;
-+}
-+
-+void OptionsTabIconsetClients::cancelThread()
-+{
-+	if ( thread ) {
-+		threadCancelled.lock();
-+		thread->cancelled = true;
-+		threadCancelled.unlock();
-+
-+		thread = 0;
-+	}
-+}
-+
-+//----------------------------------------------------------------------------
- // OptionsTabIconsetRoster
- //----------------------------------------------------------------------------
- 
---- git.orig/src/options/opt_iconset.h
-+++ git/src/options/opt_iconset.h
-@@ -93,6 +93,34 @@ private:
- 	IconsetLoadThread *thread;
- };
- 
-+class OptionsTabIconsetClients : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabIconsetClients(QObject *parent);
-+	~OptionsTabIconsetClients();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	bool stretchable() const { return true; }
-+
-+private slots:
-+	void setData(PsiCon *, QWidget *);
-+	void previewIconset();
-+
-+protected:
-+	bool event(QEvent *);
-+	void cancelThread();
-+
-+private:
-+	QWidget *w, *parentWidget;
-+	PsiCon *psi;
-+
-+	int numIconsets, iconsetsLoaded;
-+	IconsetLoadThread *thread;
-+};
-+
- class OptionsTabIconsetRoster : public OptionsTab
- {
- 	Q_OBJECT
---- /dev/null
-+++ git/src/options/opt_iconset_client.ui
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>IconsetClient</class>
-+ <widget class="QWidget" name="IconsetClient">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>256</width>
-+    <height>195</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>IconsetClientUI</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-+    <number>9</number>
-+   </property>
-+   <item>
-+    <widget class="QGroupBox" name="groupBox9">
-+     <property name="title">
-+      <string>Client iconsets</string>
-+     </property>
-+     <layout class="QGridLayout">
-+      <property name="margin">
-+       <number>8</number>
-+      </property>
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item row="1" column="2">
-+       <spacer>
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeType">
-+         <enum>QSizePolicy::Expanding</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>204</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+      <item row="1" column="3">
-+       <widget class="IconButton" name="pb_clientDetails" native="true">
-+        <property name="text" stdset="0">
-+         <string>&amp;Show Details</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item row="0" column="0" colspan="4">
-+       <widget class="IconsetSelect" name="iss_clients" native="true"/>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QProgressBar" name="progress">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconButton</class>
-+   <extends></extends>
-+   <header>iconbutton.h</header>
-+  </customwidget>
-+  <customwidget>
-+   <class>IconsetSelect</class>
-+   <extends></extends>
-+   <header>iconsetselect.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/options/opt_roster.cpp
-+++ git/src/options/opt_roster.cpp
-@@ -44,7 +44,7 @@ QWidget *OptionsTabRoster::widget()
- 	d->ck_showMenubar->setWhatsThis(
- 		tr("Shows the menubar in the application window."));
- 
--
-+	connect(d->ck_showClientIcons, SIGNAL(toggled(bool)), d->cb_showAllClientIcons, SLOT(setEnabled(bool)));
- #ifdef Q_WS_MAC
- 	d->ck_alwaysOnTop->hide();
- 	d->ck_showMenubar->hide();
-@@ -71,6 +71,7 @@ void OptionsTabRoster::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
- 
- 	//avatars settings
- 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.size", d->sb_avatarsSize->value());
-@@ -95,7 +96,8 @@ void OptionsTabRoster::restoreOptions()
- 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
- 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
- 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
--
-+	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
-+	d->cb_showAllClientIcons->setCurrentIndex(PsiOptions::instance()->getOption("options.ui.contactlist.show-all-client-icons").toBool()?0:1);
- 	//avatars settings
- 	d->sb_avatarsSize->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.size").toInt() );
- 	d->sb_avatarsRadius->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt() );
---- git.orig/src/options/opt_roster.ui
-+++ git/src/options/opt_roster.ui
-@@ -1,4 +1,3 @@
--<?xml version="1.0" encoding="UTF-8"?>
- <ui version="4.0">
-  <class>OptRoster</class>
-  <widget class="QWidget" name="OptRoster">
-@@ -104,6 +103,11 @@
-        </widget>
-       </item>
-       <item>
-+       <layout class="QHBoxLayout" >
-+        <property name="spacing" >
-+         <number>5</number>
-+        </property>
-+        <item>
-        <widget class="QCheckBox" name="ck_showClientIcons">
-         <property name="whatsThis">
-          <string>Show icon of user client</string>
-@@ -113,6 +117,22 @@
-         </property>
-        </widget>
-       </item>
-+        <item>
-+         <widget class="QComboBox" name="cb_showAllClientIcons" >
-+          <item>
-+           <property name="text" >
-+            <string>all client icons</string>
-+           </property>
-+          </item>
-+          <item>
-+           <property name="text" >
-+            <string>only highest priority client icon</string>
-+           </property>
-+          </item>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-      </layout>
-     </widget>
-    </item>
-@@ -204,5 +224,4 @@
-   <tabstop>ck_showTuneIcons</tabstop>
-  </tabstops>
-  <resources/>
-- <connections/>
- </ui>
---- git.orig/src/options/options.pri
-+++ git/src/options/options.pri
-@@ -62,6 +62,7 @@ FORMS += \
- 	$$PWD/ui_isdetails.ui \
- 	$$PWD/opt_iconset_emo.ui \
- 	$$PWD/opt_iconset_mood.ui \
-+	$$PWD/opt_iconset_client.ui \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
---- git.orig/src/psiiconset.cpp
-+++ git/src/psiiconset.cpp
-@@ -42,8 +42,8 @@ class PsiIconset::Private
- private:
- 	PsiIconset *psi;
- public:
--	Iconset system, moods;
--	QString cur_system, cur_status, cur_moods;
-+	Iconset system, moods, clients;
-+	QString cur_system, cur_status, cur_moods, cur_clients;
- 	QStringList cur_emoticons;
- 	QMap<QString, QString> cur_service_status;
- 	QMap<QString, QString> cur_custom_status;
-@@ -245,6 +245,23 @@ public:
- 		return def;
- 	}
- 
-+	Iconset clientsIconset(bool *ok)
-+	{
-+		Iconset def;
-+		*ok = def.load( iconsetPath("clients/default") );
-+
-+		if ( PsiOptions::instance()->getOption("options.iconsets.clients").toString() != "default" ) {
-+			Iconset is;
-+			is.load ( iconsetPath("clients/" + PsiOptions::instance()->getOption("options.iconsets.clients").toString()) );
-+
-+			loadIconset(&def, &is);
-+		}
-+
-+		stripFirstAnimFrame( def );
-+
-+		return def;
-+	}
-+
- 	QList<Iconset*> emoticons()
- 	{
- 		QList<Iconset*> emo;
-@@ -384,6 +401,21 @@ bool PsiIconset::loadMoods()
- 	return ok;
- }
- 
-+bool PsiIconset::loadClients()
-+{
-+	bool ok = true;
-+	QString cur_clients = PsiOptions::instance()->getOption("options.iconsets.clients").toString();
-+	if (d->cur_clients != cur_clients) {
-+		Iconset clients = d->clientsIconset(&ok);
-+		d->loadIconset(&d->clients, &clients);
-+		d->clients.addToFactory();
-+
-+		d->cur_clients = cur_clients;
-+	}
-+
-+	return ok;
-+}
-+
- bool PsiIconset::loadAll()
- {
- 	if (!loadSystem() || !loadRoster())
-@@ -391,6 +423,7 @@ bool PsiIconset::loadAll()
- 
- 	loadEmoticons();
- 	loadMoods();
-+	loadClients();
- 	return true;
- }
- 
-@@ -405,6 +438,9 @@ void PsiIconset::optionChanged(const QSt
- 	else if (option == "options.iconsets.moods") {
- 		loadMoods();
- 	}
-+	else if (option == "options.iconsets.clients") {
-+		loadClients();
-+	}
- 
- 	// currently we rely on PsiCon calling reloadRoster() when
- 	// all options are already applied. otherwise we risk the chance
---- git.orig/src/psiiconset.h
-+++ git/src/psiiconset.h
-@@ -45,6 +45,7 @@ public:
- 	QHash<QString, Iconset*> roster;
- 	QList<Iconset*> emoticons;
- 	Iconset moods;
-+	Iconset clients;
- 	const Iconset &system() const;
- 	void stripFirstAnimFrame(Iconset *);
- 	static void removeAnimation(Iconset *);
-@@ -97,6 +98,7 @@ private:
- 	bool loadRoster();
- 	void loadEmoticons();
- 	bool loadMoods();
-+	bool loadClients();
- };
- 
- #endif
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -319,6 +319,253 @@ const Mood& UserListItem::mood() const
- 	return v_mood;
- }
- 
-+QStringList UserListItem::clients() const
-+{
-+	QStringList res;
-+
-+	//if(isMuc()) return res; //temporary commented out until necessary patches will be fixed
-+	if(!userResourceList().isEmpty()) {
-+		UserResourceList srl = userResourceList();
-+		srl.sort();
-+
-+		for(UserResourceList::ConstIterator rit = srl.begin(); rit != srl.end(); ++rit) {
-+			QString name = (*rit).clientName().toLower();
-+			res += findClient(name);
-+		}
-+	}
-+	return res;
-+}
-+
-+QString UserListItem::findClient(QString name) const
-+{
-+	QString res;
-+	if(name.startsWith("adium"))
-+		res = "adium";
-+	else if(name.startsWith("google talk user account"))
-+		res = "android";
-+	else if(name.startsWith("aqq"))
-+		res = "aqq";
-+	else if(name.startsWith("asterisk"))
-+		res = "asterisk";
-+	else if(name.startsWith("bayanicq") || name.startsWith("barobin.com"))
-+		res = "bayanicq";
-+	else if(name.startsWith("barracuda"))
-+		res = "barracuda-im";
-+	else if(name.startsWith("bitlbee"))
-+		res = "bitlbee";
-+	else if(name.startsWith("bluejabb"))
-+		res = "bluejabb";
-+	else if(name.startsWith("[bombus]") || name.contains("avalon"))
-+		res = "bombus-avalon";
-+	else if(name.startsWith("jame") || name.startsWith("jabrss") || name.startsWith("pako bot") || name.startsWith("fatal-bot") || name.startsWith("storm") || name.startsWith("sulci") || name.startsWith("sleekbot") || name.startsWith("sofserver") || name.startsWith("neutrina") || name.startsWith("yamaneko") || name.startsWith("talisman") || name.contains(QString::fromUtf8(QByteArray::fromHex("efbbbfd0b3d0bed0b2d0bdd0bed0b1d0bed182"))) || name.startsWith(QString::fromUtf8(QByteArray::fromHex("efbbbfcf84ceb1cebbceb9cf82cebcceb1ceb7"))))
-+		res = "bot";
-+	else if(name.startsWith("klub54.wen.ru") || name.startsWith("bombusklub"))
-+		res = "bombus-klub";
-+	else if(name.startsWith("bombusmod-qd.wen.ru") || name.startsWith("bombusqd"))
-+		res = "bombusqd";
-+	else if(name.startsWith("bombusmod"))
-+		res = "bombusmod";
-+	else if(name.startsWith("bombusng-md"))
-+		res = "bombusng-md";
-+	else if(name.startsWith("bombus-ng"))
-+		res = "bombusng";
-+	else if(name.startsWith("bombus.pl"))
-+		res = "bombuspl";
-+	else if(name.startsWith("bombus+") || name.startsWith("voffk.org.ru"))
-+		res = "bombusplus";
-+	else if(name.startsWith("bombus-im.org") || name.startsWith("bombus"))
-+		res = "bombus";
-+	else if(name.startsWith("buddydroid"))
-+		res = "buddydroid";
-+	else if(name.startsWith("centerim"))
-+		res = "centerim";
-+	else if(name.startsWith("coccinella"))
-+		res = "coccinella";
-+	else if(name.startsWith("dictbot"))
-+		res = "dictbot";
-+	else if(name.startsWith("ekg2"))
-+		res = "ekg2";
-+	else if(name.startsWith("emess"))
-+		res = "emess";
-+	else if(name.startsWith("exodus"))
-+		res = "exodus";
-+	else if(name.startsWith("freqbot"))
-+		res = "freqbot";
-+	else if(name.startsWith("google.com 1.0.0.66"))
-+		res = "fring";
-+	else if(name.startsWith("gaim"))
-+		res = "gaim";
-+	else if(name.startsWith("gajim"))
-+		res = "gajim";
-+	else if(name.startsWith("weather2jabber") || name.contains("gismeteo.ru"))
-+		res = "gismeteo";
-+	else if(name.startsWith("glu.net"))
-+		res = "glu";
-+	else if(name.startsWith("gluxibot"))
-+		res = "gluxibot";
-+	else if(name.startsWith("gizmo"))
-+		res = "gizmo";
-+	else if(name.startsWith("ichat") || name.contains("apple.com"))
-+		res = "ichat";
-+	else if(name.startsWith("imadering"))
-+		res = "imadering";
-+	else if(name.startsWith("imov"))
-+		res = "imov";
-+	else if(name.startsWith("icq mobile"))
-+		res = "icq-mobile";
-+	else if(name.startsWith("isida"))
-+		res = "isida-bot";
-+	else if(name.contains("jabbim"))
-+		res = "jabbim";
-+	else if(name.startsWith("jabbin"))
-+		res = "jabbin";
-+	else if(name.startsWith("jabber.el"))
-+		res = "jabber.el";
-+	else if(name.startsWith("jabbroid"))
-+		res = "jabbroid";
-+	else if(name.startsWith("jabiru"))
-+		res = "jabiru";
-+	else if(name.startsWith("jajc") || name.startsWith("just another jabber client"))
-+		res = "jajc";
-+	else if(name.startsWith("jappix"))
-+		res = "jappix";
-+	else if(name.contains("japyt"))
-+		res = "japyt";
-+	else if(name.startsWith("jimm"))
-+		res = "jimm-aspro";
-+	else if(name.startsWith("jbot"))
-+		res = "jbother";
-+	else if(name.startsWith("pjc"))
-+		res = "jubo";
-+	else if(name.startsWith("juick"))
-+		res = "juick";
-+	else if(name.startsWith("kadu"))
-+		res = "kadu";
-+	else if(name.startsWith("bluendo") || name.startsWith("lampiro"))
-+		res = "lampiro";
-+	else if(name.startsWith("leechcraft"))
-+		res = "leechcraft-azoth";
-+	else if(name.startsWith("libpurple"))
-+		res = "libpurple";
-+	else if(name.startsWith("irssi-xmpp"))
-+		res = "loudmouth";
-+	else if(name.startsWith("kopete"))
-+		res = "kopete";
-+	else if(name.startsWith("mail.google.com"))
-+		res = "mail.google.com";
-+	else if(name.startsWith("mrim") || name.startsWith("svn.xmpp.ru") || name.startsWith("none") || name.contains("mail.ru") || name.contains("list.ru") || name.contains("bk.ru") || name.contains("inbox.ru"))
-+		res = "mailruagent";
-+	else if(name.startsWith("mobileagent"))
-+		res = "mailruagent.sis";
-+	else if(name.startsWith("mobile mail agent"))
-+		res = "mailruagent.mob";
-+	else if(name.startsWith("mcabber"))
-+		res = "mcabber";
-+	else if(name.startsWith("mchat"))
-+		res = "mchat";
-+	else if(name.startsWith("meebo"))
-+		res = "meebo";
-+	else if(name.startsWith("miranda"))
-+		res = "miranda";
-+	else if(name.startsWith("hotcoffee"))
-+		res = "mirandahotcoffee";
-+	else if(name.startsWith("movamessenger"))
-+		res = "movamessenger.sis";
-+	else if(name.startsWith("msn") || name.startsWith("delx.net.au"))
-+		res = "msnmessenger";
-+	else if(name.startsWith("nimbuzz"))
-+		res = "nimbuzz";
-+	else if(name.startsWith("omnipresence") || name.startsWith("home.gna.org"))
-+		res = "omnipresence";
-+	else if(name.startsWith("om"))
-+		res = "om.beeonline.ru";
-+	else if(name.startsWith("process-one.net"))
-+		res = "oneteamiphone";
-+	else if(name.startsWith("oneteam"))
-+		res = "oneteam";
-+	else if(name.startsWith("osiris"))
-+		res = "osiris";
-+	else if(name.startsWith("chat.ovi.com") || name.startsWith("chat.nokia.com") || name.startsWith("nokiachat") || name.startsWith("ovi contacts"))
-+		res = "ovi-chat";
-+	else if(name.startsWith("pandion"))
-+		res = "pandion";
-+	else if(name.startsWith("palringo"))
-+		res = "palringo";
-+	else if(name.startsWith("psi+") || name.startsWith("psi-dev"))
-+		res = "psiplus";
-+	else if(name.startsWith("psi"))
-+		res = "psi";
-+	else if(name.startsWith("pidgin") || name.startsWith(QString::fromUtf8(QByteArray::fromHex("d0bfd0b8d0b4d0b6d0b8d0bd"))))
-+		res = "pidgin";
-+	else if(name.startsWith("pyicqt.googlecode.com") || name.startsWith("icq transport"))
-+		res = "pyicq-t";
-+	else if(name.startsWith("qip.ru") || name.startsWith("pda.qip.ru") || name.startsWith("qip pda"))
-+		res = "qippda";
-+	else if(name.startsWith("qip mobile"))
-+		res = "qipmobile";
-+	else if(name.startsWith("qip infium") || name.startsWith("qip 2010") || name.startsWith("qip 2012"))
-+		res = "qipinfium";
-+	else if(name.startsWith("qutim"))
-+		res = "qutim";
-+	else if(name.startsWith("apps.radio-t.com"))
-+		res = "radio-t";
-+	else if(name.startsWith("xmpp4moz") || name.startsWith("hyperstruct.net"))
-+		res = "sameplace";
-+	else if(name.startsWith("sapo messenger mac") || name.startsWith("messenger.sapo.pt"))
-+		res = "sapo";
-+	else if(name.startsWith("siemens native jabber client"))
-+		res = "siejc";
-+	else if(name.startsWith("sim"))
-+		res = "sim";
-+	else if(name.startsWith("sip-communicator") || name.startsWith("sip communicator") || name.startsWith("jitsi"))
-+		res = "sip-communicator";
-+	else if(name.startsWith("spark im client"))
-+		res = "spark";
-+	else if(name.startsWith("spectrum") || name.startsWith("binarytransport"))
-+		res = "spectrum";
-+	else if(name.startsWith("smack"))
-+		res = "smack-api";
-+	else if(name.startsWith("swift"))
-+		res = "swift";
-+	else if(name.startsWith("talkonaut") || name.startsWith("google.com 1.0.0.84"))
-+		res = "talkonaut";
-+	else if(name.startsWith("talkgadget.google.com"))
-+		res = "talkgadget.google.com";
-+	else if(name.startsWith("talk.google.com") || name.startsWith("google.com 1.0.0.104"))
-+		res = "talk.google.com";
-+	else if(name.startsWith("google.com"))
-+		res = "google.com";
-+	else if(name.startsWith("tkabber"))
-+		res = "tkabber";
-+	else if(name.startsWith("telepathy"))
-+		res = "telepathy.freedesktop.org";
-+	else if(name.startsWith("trillian"))
-+		res = "trillian";
-+	else if(name.startsWith("jabber weather.com transport"))
-+		res = "weather.com";
-+	else if(name.startsWith("weonlydo"))
-+		res = "weonlydo";
-+	else if(name.startsWith("wtw"))
-+		res = "wtw";
-+	else if(name.contains("vacuum"))
-+		res = "vacuum";
-+	else if(name.startsWith("vk.com") || name.startsWith("pyvk-t") || name.contains("vkontakte"))
-+		res = "vkontakte";
-+	else if(name.startsWith(QString::fromUtf8(QByteArray::fromHex("d18f2ed0bed0bdd0bbd0b0d0b9d0bd"))) || name.startsWith("online.yandex.ru"))
-+		res = "yaonline";
-+	else if(name.startsWith("ya.online"))
-+		res = "yaonlinej2me";
-+	else if(name.startsWith("yandexmail"))
-+		res = "yaonlinesymbian";
-+	else if(name.startsWith("yabber instant messenger"))
-+		res = "yabber";
-+	else if(name.startsWith("yaonline"))
-+		res = "yaonlinesymbian";
-+	else res = "unknown";
-+
-+return res;
-+}
-+
- void UserListItem::setActivity(const Activity& activity)
- {
- 	v_activity = activity;
-@@ -636,7 +883,7 @@ QString UserListItem::makeBareTip(bool t
- 				if(trim)
- 					ver = dot_truncate(ver, 80);
- 				ver = TextUtil::escape(ver);
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": %1").arg(ver) + "</div>";
-+				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": <%1=\"%2\"> %3").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())).arg(ver) + "</div>";
- 			}
- 
- 			// status message
---- git.orig/src/userlist.h
-+++ git/src/userlist.h
-@@ -124,6 +124,8 @@ public:
- 	QString makeDesc() const;
- 	bool isPrivate() const;
- 	const Mood& mood() const;
-+	QStringList clients() const;
-+	QString findClient(QString name) const;
- 	const Activity& activity() const;
- 
- 	void setJid(const XMPP::Jid &);

psi-plus-main-20130107.tar.xz/patches/0260-psi-send-custom-status.diff Deleted

@@ -1,314 +0,0 @@
---- git.orig/src/contactlistgroupmenu.cpp
-+++ git/src/contactlistgroupmenu.cpp
-@@ -32,6 +32,8 @@
- #include "iconaction.h"
- #include "psicontact.h"
- #include "psiaccount.h"
-+#include "statusdlg.h"
-+#include "xmpp_tasks.h"
- 
- class ContactListGroupMenu::Private : public QObject
- {
-@@ -45,6 +47,11 @@ class ContactListGroupMenu::Private : pu
- #endif
- 	QAction* sendMessageAction_;
- 	QAction* removeGroupWithoutContactsAction_;
-+	QMenu* authMenu_;
-+	QAction* actionAuth_;
-+	QAction* actionAuthRequest_;
-+	QAction* actionAuthRemove_;
-+	QAction* actionCustomStatus_;
- 
- public:
- 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
-@@ -57,6 +64,18 @@ public:
- 		renameAction_ = new IconAction("", tr("Re&name"), menu->shortcuts("contactlist.rename"), this, "act_rename");
- 		connect(renameAction_, SIGNAL(triggered()), this, SLOT(rename()));
- 
-+		actionAuth_ = new QAction(tr("Resend Authorization to Group"), this);
-+		connect(actionAuth_, SIGNAL(triggered()), this, SLOT(authResend()));
-+
-+		actionAuthRequest_ = new QAction(tr("Request Authorization from Group"), this);
-+		connect(actionAuthRequest_, SIGNAL(triggered()), this, SLOT(authRequest()));
-+
-+		actionAuthRemove_ = new QAction(tr("Remove Authorization from Group"), this);
-+		connect(actionAuthRemove_, SIGNAL(triggered()), this, SLOT(authRemove()));
-+
-+		actionCustomStatus_ = new IconAction(tr("Send Status to Group"), this, "psi/action_direct_presence");
-+		connect(actionCustomStatus_, SIGNAL(triggered()), this, SLOT(customStatus()));
-+
- 		removeGroupAndContactsAction_ = new IconAction(tr("Remove Group and Contacts"), this, "psi/remove");
- #ifdef YAPSI
- 		removeGroupAndContactsAction_->setText(tr("&Remove"));
-@@ -84,7 +103,12 @@ public:
- #else
- 		menu->addAction(renameAction_);
- 		menu->addAction(sendMessageAction_);
-+		menu->addAction(actionCustomStatus_);
- 		menu->addSeparator();
-+		authMenu_ = menu->addMenu(tr("Authorization"));
-+		authMenu_->addAction(actionAuth_);
-+		authMenu_->addAction(actionAuthRequest_);
-+		authMenu_->addAction(actionAuthRemove_);
- 		menu->addAction(removeGroupWithoutContactsAction_);
- 		menu->addAction(removeGroupAndContactsAction_);
- #endif
-@@ -121,6 +145,73 @@ private slots:
- 		emit menu_->removeSelection();
- 	}
- 
-+	void authResend()
-+	{
-+		if (!group)
-+			return;
-+
-+		QList<PsiContact*> contacts = group->contacts();
-+		if (!contacts.isEmpty()) {
-+			foreach(PsiContact* contact, contacts) {
-+				contact->account()->actionAuth(contact->jid());
-+			}
-+		}
-+	}
-+
-+	void authRequest()
-+	{
-+		if (!group)
-+		return;
-+
-+		QList<PsiContact*> contacts = group->contacts();
-+		if (!contacts.isEmpty()) {
-+			foreach(PsiContact* contact, contacts) {
-+				contact->account()->actionAuthRequest(contact->jid());
-+			}
-+		}
-+	}
-+
-+	void authRemove()
-+	{
-+		if (!group)
-+			return;
-+
-+		QList<PsiContact*> contacts = group->contacts();
-+		if (!contacts.isEmpty()) {
-+			foreach(PsiContact* contact, contacts) {
-+				contact->account()->actionAuthRemove(contact->jid());
-+			}
-+		}
-+	}
-+
-+	void customStatus()
-+	{
-+		if (!group)
-+			return;
-+
-+		PsiAccount *pa = group->contacts().first()->account();
-+		StatusSetDlg *w = new StatusSetDlg(pa->psi(), pa->status());
-+		QList<XMPP::Jid> list;
-+		foreach(PsiContact* contact, group->contacts()) {
-+			if(contact->isPrivate()) continue;
-+			list << contact->jid();
-+		}
-+		w->setJidList(list);
-+		connect(w, SIGNAL(setJidList(const QList<XMPP::Jid> &, const Status &)), SLOT(setStatusFromDialog(const QList<XMPP::Jid> &, const Status &)));
-+		w->show();
-+	}
-+
-+	void setStatusFromDialog(const QList<XMPP::Jid> &j, const Status &s)
-+	{
-+		PsiAccount *pa = group->contacts().first()->account();
-+		for(QList<Jid>::const_iterator it = j.begin(); it != j.end(); ++it)
-+		{
-+			JT_Presence *p = new JT_Presence(pa->client()->rootTask());
-+			p->pres(*it,s);
-+			p->go(true);
-+		}
-+	}
-+
- 	void removeGroupWithoutContacts()
- 	{
- 		if (!group)
---- git.orig/src/psicontactmenu.cpp
-+++ git/src/psicontactmenu.cpp
-@@ -36,6 +36,8 @@
- #include "psicon.h"
- #include "avatars.h"
- #include "userlist.h"
-+#include "statusdlg.h"
-+#include "xmpp_tasks.h"
- #ifdef HAVE_PGPUTIL
- #include "pgputil.h"
- #endif
-@@ -230,6 +232,7 @@ public:
- 	ResourceMenu* activeChatsMenu_;
- 	QAction* voiceCallAction_;
- 	QAction* sendFileAction_;
-+	QAction* customStatusAction_;
- 	InviteToGroupChatMenu* inviteToGroupchatMenu_;
- 	GroupMenu* groupMenu_;
- 	QAction* transportLogonAction_;
-@@ -349,6 +352,9 @@ public:
- 		authRemoveAction_ = new IconAction(tr("Remove Authorization From"), this, "");
- 		connect(authRemoveAction_, SIGNAL(triggered()), SLOT(authRemove()));
- 
-+		customStatusAction_ = new IconAction(tr("Sen&d Status"), this, "psi/action_direct_presence");
-+		connect(customStatusAction_, SIGNAL(triggered()), SLOT(customStatus()));
-+
- 		pictureAssignAction_ = new IconAction(tr("&Assign Custom Picture"), this, "");
- 		connect(pictureAssignAction_, SIGNAL(triggered()), SLOT(pictureAssign()));
- 		pictureAssignAction_->setShortcuts(ShortcutManager::instance()->shortcuts("contactlist.assign-custom-avatar"));
-@@ -421,6 +427,7 @@ public:
- 		authMenu_->addAction(authRerequestAction_);
- 		authMenu_->addAction(authRemoveAction_);
- 		menu_->addAction(removeAction_);
-+		menu_->addAction(customStatusAction_);
- 		menu_->addSeparator();
- 		pictureMenu_ = menu_->addMenu(tr("&Picture"));
- 		pictureMenu_->addAction(pictureAssignAction_);
-@@ -476,6 +483,7 @@ private slots:
- 
- 		addAuthAction_->setVisible(!contact_->isSelf() && !contact_->inList() && !PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool());
- 		addAuthAction_->setEnabled(contact_->account()->isAvailable());
-+		customStatusAction_->setEnabled(contact_->account()->isAvailable() && !contact_->isPrivate());
- 		receiveIncomingEventAction_->setVisible(contact_->alerting());
- 		if (!PsiOptions::instance()->getOption("options.ui.message.enabled").toBool()) {
- 			sendMessageAction_->setVisible(false);
-@@ -666,6 +674,24 @@ private slots:
- 			contact_->account()->actionAuthRemove(contact_->jid());
- 	}
- 
-+	void customStatus()
-+	{
-+		if (!contact_)
-+			return;
-+
-+		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), contact_->account()->status());
-+		w->setJid(contact_->jid());
-+		connect(w, SIGNAL(setJid(const Jid &, const Status &)), SLOT(setStatusFromDialog(const Jid &, const Status &)));
-+		w->show();
-+	}
-+
-+	void setStatusFromDialog(const Jid &j, const Status &s)
-+	{
-+		JT_Presence *p = new JT_Presence(contact_->account()->client()->rootTask());
-+		p->pres(j,s);
-+		p->go(true);
-+	}
-+
- 	void pictureAssign()
- 	{
- 		if (!contact_)
---- git.orig/src/statusdlg.cpp
-+++ git/src/statusdlg.cpp
-@@ -93,6 +93,9 @@ public:
- 	QComboBox *cb_preset;
- 	QLineEdit *le_priority;
- 	QCheckBox *save;
-+	Jid j;
-+	QList<XMPP::Jid> jl;
-+	setStatusEnum setStatusMode;
- };
- 
- StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s)
-@@ -106,6 +109,7 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi, 
- 	d->s = s;
- 
- 	setWindowTitle(CAP(tr("Set Status: All accounts")));
-+	d->setStatusMode = setStatusForAccount;
- 	init();
- }
- 
-@@ -120,9 +124,24 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
- 	d->s = s;
- 
- 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
-+	d->setStatusMode = setStatusForAccount;
- 	init();
- }
- 
-+void StatusSetDlg::setJid(const Jid &j)
-+{
-+	d->j = j;
-+	setWindowTitle(CAP(tr("Set Status for %1").arg(j.full())));
-+	d->setStatusMode = setStatusForJid;
-+}
-+
-+void StatusSetDlg::setJidList(const QList<XMPP::Jid> &jl)
-+{
-+	d->jl = jl;
-+	setWindowTitle(CAP(tr("Set Status for group")));
-+	d->setStatusMode = setStatusForJidList;
-+}
-+
- void StatusSetDlg::init()
- {
- 	int type = makeSTATUS(d->s);
-@@ -248,9 +265,31 @@ void StatusSetDlg::doButton()
- 	QString str = d->te->getPlainText();
- 
-  	if (d->le_priority->text().isEmpty())
-- 		emit set(makeStatus(type, str), false, true);
-+ 		//emit set(makeStatus(type, str), false, true);
-+		switch(d->setStatusMode) {
-+			case setStatusForAccount:
-+                                emit set(makeStatus(type,str), false, true);
-+				break;
-+			case setStatusForJid:
-+				emit setJid(d->j, makeStatus(type,str));
-+				break;
-+			case setStatusForJidList:
-+				emit setJidList(d->jl, makeStatus(type,str));
-+				break;
-+		}
-  	else 
-- 		emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
-+ 		//emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
-+		switch(d->setStatusMode) {
-+			case setStatusForAccount:
-+                                emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
-+				break;
-+			case setStatusForJid:
-+				emit setJid(d->j, makeStatus(type,str, d->le_priority->text().toInt()));
-+				break;
-+			case setStatusForJidList:
-+				emit setJidList(d->jl, makeStatus(type,str, d->le_priority->text().toInt()));
-+				break;
-+		}
- 
- 	close();
- }
---- git.orig/src/statusdlg.h
-+++ git/src/statusdlg.h
-@@ -23,6 +23,9 @@
- 
- #include <QDialog>
- 
-+#include <QList>
-+#include "xmpp_jid.h"
-+
- class PsiCon;
- class PsiAccount;
- class UserListItem;
-@@ -33,6 +36,8 @@ namespace XMPP {
- 
- using namespace XMPP;
- 
-+enum setStatusEnum{setStatusForAccount = 0, setStatusForJid, setStatusForJidList};
-+
- class StatusShowDlg : public QDialog
- {
- 	Q_OBJECT
-@@ -48,9 +53,14 @@ public:
- 	StatusSetDlg(PsiAccount *, const Status &);
- 	~StatusSetDlg();
- 
-+	void setJid(const Jid &);
-+	void setJidList(const QList<XMPP::Jid> &);
-+
- signals:
- 	void set(const XMPP::Status &, bool withPriority, bool isManualStatus);
- 	void cancelled();
-+	void setJid(const Jid &, const Status &);
-+	void setJidList(const QList<XMPP::Jid> &, const Status &);
- 
- private slots:
- 	void doButton();

psi-plus-main-20130107.tar.xz/patches/0270-psi-all-in-one-window.diff Deleted

@@ -1,498 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -114,6 +114,11 @@
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
- 			</chat>
-+			<save>
-+				<toolbars-state type="QByteArray"/>
-+				<log-width type="int">500</log-width>
-+				<roster-width type="int">180</roster-width>
-+			</save>
- 			<history comment="History dialog options">
- 				<size comment="Remembered window size" type="QSize">
- 					<width>640</width>
-@@ -165,10 +170,10 @@
- 				<show-client-icons type="bool">true</show-client-icons>
- 				<show-all-client-icons type="bool">false</show-all-client-icons>
- 				<toolbars/>
--				<toolbars-state type="QByteArray"/>
- 				<use-left-click type="bool">false</use-left-click>
- 				<use-single-click type="bool">false</use-single-click>
- 				<use-status-change-animation type="bool">true</use-status-change-animation>
-+				<roster-at-left-when-all-in-one-window type="bool">false</roster-at-left-when-all-in-one-window>
- 				<use-transport-icons type="bool">true</use-transport-icons>
- 				<saved-window-geometry type="QRect" >
- 					<x>64</x>
-@@ -357,7 +362,7 @@
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
- 				<use-tabs type="bool">true</use-tabs>
- 				<size type="QString"></size> 
--				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">CM</grouping>
-+				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs. 'A' means using all in one window patch.">CM</grouping>
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -35,6 +35,7 @@
- #include <QVBoxLayout>
- #include <QMenu>
- #include <QMenuItem>
-+#include <QSplitter>
- #include <QtAlgorithms>
- #include <QShortcut>
- 
-@@ -42,6 +43,8 @@
- #include <windows.h>
- #endif
- 
-+#include "tabmanager.h"
-+#include "tabdlg.h"
- #include "common.h"
- #include "showtextdlg.h"
- #include "psicon.h"
-@@ -98,14 +101,20 @@ public:
- 	Private(PsiCon *, MainWin *);
- 	~Private();
- 
--	QVBoxLayout* vb_main;
- 	bool onTop, asTool;
- 	QMenu* mainMenu, *statusMenu, *optionsMenu, *toolsMenu;
- 	int sbState;
- 	QString nickname;
- 	PsiTrayIcon* tray;
- 	QMenu* trayMenu;
-+	QVBoxLayout *vb_roster;
-+	QSplitter *splitter;
-+	TabDlg *mainTabs;
- 	QString statusTip;
-+	PsiToolBar *viewToolBar;
-+	int tabsSize;
-+	int rosterSize;
-+	bool isLeftRoster;
- 
- 	PopupAction* optionsButton, *statusButton;
- 	IconActionGroup* statusGroup;
-@@ -137,7 +146,7 @@ public:
- 	void updateMenu(QStringList actions, QMenu* menu);
- };
- 
--MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : psi(_psi), mainWin(_mainWin)
-+MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
- {
- 
- 	statusGroup   = (IconActionGroup *)getAction("status_all");
-@@ -258,6 +267,10 @@ void MainWin::Private::updateMenu(QStrin
- #define TOOLW_FLAGS ((Qt::WFlags) 0)
- #endif
- 
-+const QString toolbarsStateOptionPath = "options.ui.save.toolbars-state";
-+const QString rosterGeometryPath      = "options.ui.save.roster-width";
-+const QString tabsGeometryPath        = "options.ui.save.log-width";
-+
- MainWin::MainWin(bool _onTop, bool _asTool, PsiCon* psi)
- :AdvancedWidget<QMainWindow>(0, (_onTop ? Qt::WindowStaysOnTopHint : Qt::Widget) | (_asTool ? (Qt::Tool |TOOLW_FLAGS) : Qt::Widget))
- {
-@@ -283,14 +296,43 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->statusTip = "";
- 	d->nickname = "";
- 
--	QWidget* center = new QWidget (this);
--	setCentralWidget ( center );
-+	QWidget *rosterBar = new QWidget(this);
-+	bool allInOne = false;
-+
-+	if ( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() && PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
-+		d->splitter = new QSplitter(this);
-+		d->splitter->setObjectName("onewindowsplitter");
-+		connect(d->splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(splitterMoved()));
-+		setCentralWidget(d->splitter);
-+		allInOne = true;
-+
-+		d->mainTabs = d->psi->tabManager()->newTabs(0);
-+		d->psi->tabManager()->setPreferredTabsForKind('C', d->mainTabs);
-+		d->psi->tabManager()->setPreferredTabsForKind('M', d->mainTabs);
-+
-+		QList<int> sizes;
-+		d->rosterSize = PsiOptions::instance()->getOption(rosterGeometryPath).toInt();
-+		d->tabsSize = PsiOptions::instance()->getOption(tabsGeometryPath).toInt();
-+		d->isLeftRoster = PsiOptions::instance()->getOption("options.ui.contactlist.roster-at-left-when-all-in-one-window").toBool();
-+		if (d->isLeftRoster) {
-+			d->splitter->addWidget(rosterBar);
-+			d->splitter->addWidget(d->mainTabs);
-+			sizes << d->rosterSize << d->tabsSize;
-+		} else {
-+			d->splitter->addWidget(d->mainTabs);
-+			d->splitter->addWidget(rosterBar);
-+			sizes << d->tabsSize << d->rosterSize;
-+		}
-+
-+		d->splitter->setSizes(sizes);
-+	} else
-+		setCentralWidget(rosterBar);
- 
--	d->vb_main = new QVBoxLayout(center);
-+	d->vb_roster = new QVBoxLayout(rosterBar);
- #ifndef NEWCONTACTLIST
--	cvlist = new ContactView(center);
-+	cvlist = new ContactView(rosterBar);
- #else
--	d->rosterWidget_ = new PsiRosterWidget(center);
-+	d->rosterWidget_ = new PsiRosterWidget(rosterBar);
- 	d->rosterWidget_->setContactList(psi->contactList());
- #endif
- 
-@@ -304,13 +346,31 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	// d->contactListView_->setFrameShape(QFrame::NoFrame);
- #endif
- #endif
--	d->vb_main->setMargin(layoutMargin);
--	d->vb_main->setSpacing(layoutMargin);
-+	QMenu* viewMenu = new QMenu(tr("View"), this);
-+
-+
-+	d->vb_roster->setMargin(layoutMargin);
-+	d->vb_roster->setSpacing(layoutMargin);
-+
-+	if (allInOne) {
-+		QString toolOpt = "options.ui.contactlist.toolbars";
-+		foreach(QString base, PsiOptions::instance()->getChildOptionNames(toolOpt, true, true)) {
-+			// toolbar "Show contacts" is second, so check m1
-+			if (base == toolOpt + ".m1") {
-+				d->viewToolBar = new PsiToolBar(base, rosterBar, d->psi->actionList());
-+				d->viewToolBar->initialize();
-+				connect(d->viewToolBar, SIGNAL(customize()), d->psi, SLOT(doToolbars()));
-+				d->vb_roster->addWidget(d->viewToolBar);
-+				break;
-+			}
-+		}
-+	}
-+
- 
- #ifndef NEWCONTACTLIST
- 	// create search bar
--	d->searchWidget = new QWidget(centralWidget());
--	d->vb_main->addWidget(d->searchWidget);
-+	d->searchWidget = new QWidget(rosterBar);
-+	d->vb_roster->addWidget(d->searchWidget);
- 	QHBoxLayout* searchLayout = new QHBoxLayout(d->searchWidget);
- 	searchLayout->setMargin(0);
- 	searchLayout->setSpacing(0);
-@@ -327,15 +387,15 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
- 	//add contact view
- #ifndef NEWCONTACTLIST
--	d->vb_main->addWidget(cvlist);
-+	d->vb_roster->addWidget(cvlist);
- # ifdef Q_WS_MAC
- 	// Disable the empty vertical scrollbar:
- 	// it's here because of weird code in q3scrollview.cpp
- 	// Q3ScrollView::updateScrollBars() around line 877
--	d->vb_main->addSpacing(4);
-+	d->vb_roster->addSpacing(4);
- # endif
- #else
--	d->vb_main->addWidget(d->rosterWidget_);
-+	d->vb_roster->addWidget(d->rosterWidget_);
- #endif
- 
- 	d->statusMenu = new QMenu(tr("Status"), this);
-@@ -392,7 +452,6 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
- 	mainMenuBar()->addMenu(d->statusMenu);
- 
--	QMenu* viewMenu = new QMenu(tr("View"), this);
- 	mainMenuBar()->addMenu(viewMenu);
- 	d->getAction("show_offline")->addTo(viewMenu);
- 	// if (PsiOptions::instance()->getOption("options.ui.menu.view.show-away").toBool()) {
-@@ -461,9 +520,22 @@ MainWin::~MainWin()
- 	}
- 
- 	saveToolbarsState();
-+
-+	if(d->splitter) {
-+		PsiOptions::instance()->setOption(rosterGeometryPath, d->rosterSize);
-+		PsiOptions::instance()->setOption(tabsGeometryPath, d->tabsSize);
-+	}
-+
- 	delete d;
- }
- 
-+void MainWin::splitterMoved()
-+{
-+	QList<int> list = d->splitter->sizes();
-+	d->rosterSize = !d->isLeftRoster ? list.last() : list.first();
-+	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
-+}
-+
- void MainWin::registerAction( IconAction* action )
- {
- 	const char *activated  = SIGNAL( triggered() );
-@@ -695,8 +767,6 @@ QMenuBar* MainWin::mainMenuBar() const
- 	return menuBar();
- }
- 
--const QString toolbarsStateOptionPath = "options.ui.contactlist.toolbars-state";
--
- void MainWin::saveToolbarsState()
- {
- 	PsiOptions::instance()->setOption(toolbarsStateOptionPath, saveState());
-@@ -717,8 +787,21 @@ void MainWin::buildToolbars()
- 	qDeleteAll(toolbars_);
- 	toolbars_.clear();
- 
-+	bool allInOne = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A');
- 	foreach(QString base, PsiOptions::instance()->getChildOptionNames("options.ui.contactlist.toolbars", true, true)) {
--		PsiToolBar* tb = new PsiToolBar(base, this, d->psi->actionList());
-+		PsiToolBar* tb;
-+		if (allInOne) {
-+			if (d && d->viewToolBar && (d->viewToolBar->base() == base))
-+				continue;
-+			tb = new PsiToolBar(base, this, d->psi->actionList());
-+			d->vb_roster->addWidget(tb);
-+		} else {
-+			if (d && d->viewToolBar) {
-+				delete d->viewToolBar;
-+				d->viewToolBar = 0;
-+			}
-+			tb = new PsiToolBar(base, this, d->psi->actionList());
-+		}
- 		tb->initialize();
- 		connect(tb, SIGNAL(customize()), d->psi, SLOT(doToolbars()));
- 		toolbars_ << tb;
-@@ -740,6 +823,11 @@ void MainWin::buildToolbars()
- 	foreach(PsiToolBar* tb, toolbars_) {
- 		tb->setUpdatesEnabled(true);
- 	}
-+
-+	if (allInOne && d && d->viewToolBar) {
-+		d->viewToolBar->updateVisibility();
-+		d->viewToolBar->setUpdatesEnabled(true);
-+	}
- }
- 
- bool MainWin::showDockMenu(const QPoint &)
-@@ -1093,6 +1181,17 @@ void MainWin::closeEvent(QCloseEvent* e)
- #endif
- }
- 
-+void MainWin::changeEvent(QEvent *event)
-+{
-+    if (event->type() == QEvent::ActivationChange ||
-+	    event->type() == QEvent::WindowStateChange)
-+	{
-+		if (d->mainTabs) {
-+			QCoreApplication::sendEvent(d->mainTabs, event);
-+		}
-+	}
-+}
-+
- void MainWin::keyPressEvent(QKeyEvent* e)
- {
- #ifdef Q_WS_MAC
-@@ -1531,4 +1630,26 @@ void MainWin::avcallConfig()
- 		AvCallManager::config();
- }
- 
-+void MainWin::resizeEvent(QResizeEvent *e)
-+{
-+	AdvancedWidget<QMainWindow>::resizeEvent(e);
-+
-+	if(d->splitter && isVisible()) {
-+		QList<int> sizes = d->splitter->sizes();
-+		int tabsWidth = !d->isLeftRoster ? sizes.first() : sizes.last();
-+		int rosterWidth = d->isLeftRoster ? sizes.first() : sizes.last();
-+		int dw = rosterWidth - d->rosterSize;
-+		sizes.clear();
-+		sizes.append(tabsWidth + dw);
-+		if(d->isLeftRoster) {
-+			sizes.prepend(d->rosterSize);
-+		}
-+		else {
-+			sizes.append(d->rosterSize);
-+		}
-+		d->splitter->setSizes(sizes);
-+		d->tabsSize = tabsWidth + dw;
-+	}
-+}
-+
- //#endif
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -72,7 +72,9 @@ public:
- 
- protected:
- 	// reimplemented
-+	void resizeEvent(QResizeEvent *e);
- 	void closeEvent(QCloseEvent *);
-+	void changeEvent(QEvent *event);
- 	void keyPressEvent(QKeyEvent *);
- 	QMenuBar* mainMenuBar() const;
- #ifdef Q_WS_WIN
-@@ -141,6 +143,7 @@ private slots:
- 	void searchTextStarted(QString const &text);
- 
- 	void registerAction( IconAction * );
-+	void splitterMoved();
- 
- public slots:
- 	void setWindowIcon(const QPixmap&);
---- psi.orig/src/options/opt_chat.cpp
-+++ psi/src/options/opt_chat.cpp
-@@ -136,12 +136,15 @@ void OptionsTabChat::applyOptions()
- 		case 3:
- 			tabGrouping = "CM";
- 			break;
-+		case 4:
-+			tabGrouping = "ACM";
-+			break;
- 	}
- 	if (!tabGrouping.isEmpty()) {
- 		PsiOptions::instance()->setOption("options.ui.tabs.grouping", tabGrouping);
- 	} else {
--		if (d->cb_tabGrouping->count() == 5) {
--			d->cb_tabGrouping->removeItem(4);
-+		if (d->cb_tabGrouping->count() == 6) {
-+			d->cb_tabGrouping->removeItem(5);
- 		}
- 	}
- 	
-@@ -188,16 +191,18 @@ void OptionsTabChat::restoreOptions()
- 		d->cb_tabGrouping->setCurrentIndex(2);
- 	} else if (tabGrouping == "CM") {
- 		d->cb_tabGrouping->setCurrentIndex(3);
-+	} else if (tabGrouping == "ACM") {
-+		d->cb_tabGrouping->setCurrentIndex(4);
- 	} else {
--		if (d->cb_tabGrouping->count() == 5) {
--			d->cb_tabGrouping->setCurrentIndex(4);
-+		if (d->cb_tabGrouping->count() == 6) {
-+			d->cb_tabGrouping->setCurrentIndex(5);
- 		} else {
- 			d->cb_tabGrouping->setCurrentIndex(-1);
- 		}
- 		custom = true;
- 	}
--	if (!custom && d->cb_tabGrouping->count() == 5) {
--		d->cb_tabGrouping->removeItem(4);
-+	if (!custom && d->cb_tabGrouping->count() == 6) {
-+		d->cb_tabGrouping->removeItem(5);
- 	}
- 	d->ck_autoResize->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() );
- 	d->ck_tabShortcuts->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tab-shortcuts").toBool() );
---- psi.orig/src/options/opt_chat.ui
-+++ psi/src/options/opt_chat.ui
-@@ -92,6 +92,11 @@
-          <string>for mucs and chats in one window</string>
-         </property>
-        </item>
-+	   <item>
-+		<property name="text" >
-+		 <string>for mucs, chats and roster in one window</string>
-+		</property>
-+	   </item>
-        <item>
-         <property name="text" >
-          <string>[customized]</string>
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -1300,7 +1300,8 @@ void PsiCon::optionChanged(const QString
- 		alertIconUpdateAlertStyle();
- 	}
- 
--	if (option == "options.ui.tabs.use-tabs") {
-+	if (option == "options.ui.tabs.use-tabs" || 
-+		option == "options.ui.tabs.grouping") {
- 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
- 		notifyRestart = false;
- 	}
---- psi.orig/src/psicon.h
-+++ psi/src/psicon.h
-@@ -48,6 +48,7 @@ class QThread;
- class PsiActionList;
- class PsiToolBar;
- class TabDlg;
-+class TabManager;
- class AccountsComboBox;
- class ChatDlg;
- class AlertManager;
---- psi.orig/src/psitoolbar.cpp
-+++ psi/src/psitoolbar.cpp
-@@ -54,7 +54,7 @@ Qt::ToolBarArea dockPositionToToolBarAre
- 	return Qt::NoToolBarArea;
- }
- 
--PsiToolBar::PsiToolBar(const QString& base, QMainWindow* mainWindow, MetaActionList* actionList)
-+PsiToolBar::PsiToolBar(const QString& base, QWidget* mainWindow, MetaActionList* actionList)
- 	: QToolBar(mainWindow)
- 	, actionList_(actionList)
- 	, base_(base)
-@@ -81,6 +81,11 @@ void PsiToolBar::contextMenuEvent(QConte
- 	menu.exec(e->globalPos());
- }
- 
-+QString PsiToolBar::base() const
-+{
-+	return base_;
-+}
-+
- void PsiToolBar::initialize()
- {
- 	PsiOptions* o = PsiOptions::instance();
-@@ -108,11 +113,13 @@ void PsiToolBar::initialize()
- 		}
- 	}
- 
--	QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parentWidget());
--	mainWindow->addToolBar(dockPositionToToolBarArea((Qt3Dock)o->getOption(base_ + ".dock.position").toInt()),
--	                       this);
--	if (mainWindow && o->getOption(base_ + ".dock.nl").toBool()) {
--		mainWindow->insertToolBarBreak(this);
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
-+		QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parentWidget());
-+		if (mainWindow) {
-+			mainWindow->addToolBar(dockPositionToToolBarArea((Qt3Dock)o->getOption(base_ + ".dock.position").toInt()), this);
-+			if (o->getOption(base_ + ".dock.nl").toBool())
-+				mainWindow->insertToolBarBreak(this);
-+		}
- 	}
- 
- 	updateVisibility();
---- psi.orig/src/psitoolbar.h
-+++ psi/src/psitoolbar.h
-@@ -35,11 +35,12 @@ class PsiToolBar : public QToolBar
- 	Q_OBJECT
- 
- public:
--	PsiToolBar(const QString& base, QMainWindow* mainWindow, MetaActionList* actionList);
-+	PsiToolBar(const QString& base, QWidget* mainWindow, MetaActionList* actionList);
- 	~PsiToolBar();
- 
- 	void initialize();
- 	void updateVisibility();
-+	QString base() const;
- 
- 	static void structToOptions(PsiOptions* options, const ToolbarPrefs& s);
- 
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -185,7 +185,8 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 
- 	setShortcuts();
- 
--	setGeometryOptionPath(geometryOption);
-+	if(!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A'))
-+		setGeometryOptionPath(geometryOption);
- }
- 
- TabDlg::~TabDlg()
-@@ -484,7 +485,7 @@ void TabDlg::selectTab(TabbableWidget* c
- 
- void TabDlg::checkHasChats()
- {
--	if (tabWidget_->count() > 0)
-+	if (tabWidget_->count() > 0 || this != window())
- 		return;
- 	deleteLater();
- }

psi-plus-main-20130107.tar.xz/patches/0280-psi-muc-nick-hash-color.diff Deleted

@@ -1,179 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
-diff --git a/options/default.xml b/options/default.xml
-index ba43bc1..389d7c7 100644
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -219,7 +219,7 @@
- 					<width>580</width>
- 					<height>420</height>
- 				</size>
--				<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring>
-+				<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring><use-hash-nick-coloring type="bool">true</use-hash-nick-coloring><colored-history type="bool">true</colored-history>
- 			</muc>
- 			<show-deprecated comment="Deprecated functionality or protocols">
- 				<service-discovery comment="Service discovery dialog">
-diff --git a/src/chatview_te.cpp b/src/chatview_te.cpp
-index d5cd9d0..1e1fbab 100644
---- a/src/chatview_te.cpp
-+++ b/src/chatview_te.cpp
-@@ -290,7 +290,7 @@ void ChatView::renderMucMessage(const MessageView &mv)
- 		alerttagsc = "</b>";
- 	}
- 
--	if(mv.isSpooled()) {
-+	if(mv.isSpooled() && !PsiOptions::instance()->getOption("options.ui.muc.colored-history").toBool()) {
- 		nickcolor = ColorOpt::instance()->color(infomrationalColorOpt).name();
- 	} else {
- 		nickcolor = getMucNickColor(mv.nick(), mv.isLocal());
-diff --git a/src/chatviewcommon.cpp b/src/chatviewcommon.cpp
-index dcbd311..de1ecda 100644
---- a/src/chatviewcommon.cpp
-+++ b/src/chatviewcommon.cpp
-@@ -19,6 +19,8 @@
-  */
- 
- #include <QWidget>
-+#include <QColor>
-+#include <QRegExp>
- 
- #include "chatviewcommon.h"
- #include "psioptions.h"
-@@ -42,30 +44,52 @@ bool ChatViewCommon::updateLastMsgTime(QDateTime t)
- 
- QString ChatViewCommon::getMucNickColor(const QString &nick, bool isSelf, QStringList validList)
- {
-+	const char* rgbBlack = "#000000";
-+	QString nickwoun = nick; // nick without underscores
-+	nickwoun.replace(QRegExp("^_*"), "");
-+	nickwoun.replace(QRegExp("_*$"), "");
-+
- 	int sender;
--	if(isSelf || nick.isEmpty()) {
-+	if(isSelf || nickwoun.isEmpty()) {
- 		sender = -1;
- 	} else {
--		if (!_nicks.contains(nick)) {
-+		if (!_nicks.contains(nickwoun)) {
- 			//not found in map
--			_nicks.insert(nick,_nickNumber);
-+			_nicks.insert(nickwoun,_nickNumber);
- 			_nickNumber++;
- 		}
--		sender=_nicks[nick];
-+		sender=_nicks[nickwoun];
- 	}
- 
- 	QStringList nickColors = validList.isEmpty()
- 		? PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList()
- 		: validList;
- 
--	if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || nickColors.empty()) {
--		return "#000000";
--	}
--	else if(sender == -1 || nickColors.size() == 1) {
--		return nickColors[nickColors.size()-1];
--	}
--	else {
--		int n = sender % (nickColors.size()-1);
--		return nickColors[n];
-+	if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool()) {
-+		return rgbBlack;
-+	} else {
-+		if (PsiOptions::instance()->getOption("options.ui.muc.use-hash-nick-coloring").toBool()) {
-+			/* Hash-driven colors */
-+			Q_ASSERT(nickwoun.size());
-+			quint32 num = qHash(nickwoun);
-+			int s = ((char*)&num)[2];
-+			int v = ((char*)&num)[3];
-+			num = (num ^ (num >> 16)) & 0xffff;
-+			num ^= (num >> 9);
-+			QColor precolor = QColor::fromHsv(num % 360,
-+					s < 150? 250 : s, v > 210? 210 : v < 100? 150 : v);
-+			return precolor.name();
-+		} else {
-+			/* Colors from list */
-+			if (nickColors.empty()) {
-+				return rgbBlack;
-+			}
-+			if(sender == -1 || nickColors.size() == 1) {
-+				return nickColors[nickColors.size()-1];
-+			} else {
-+				int n = sender % (nickColors.size()-1);
-+				return nickColors[n];
-+			}
-+		}
- 	}
- }
-diff --git a/src/options/opt_general_groupchat.ui b/src/options/opt_general_groupchat.ui
-index cb539b4..83d7ab9 100644
---- a/src/options/opt_general_groupchat.ui
-+++ b/src/options/opt_general_groupchat.ui
-@@ -157,6 +157,13 @@
-        </property>
-       </widget>
-      </item>
-+      <item>
-+      <widget class="QCheckBox" name="ck_gcHashNickColoring" >
-+       <property name="text" >
-+        <string>Enable hash nick coloring</string>
-+       </property>
-+      </widget>
-+     </item>
-      <item>
-       <widget class="QGroupBox" name="ncGroupBox" >
-        <property name="title" >
-@@ -296,11 +303,30 @@
-   <tabstop>pb_removeHighlightWord</tabstop>
-   <tabstop>pb_addHighlightWord</tabstop>
-   <tabstop>ck_gcNickColoring</tabstop>
-+  <tabstop>ck_gcHashNickColoring</tabstop>
-   <tabstop>le_newNickColor</tabstop>
-   <tabstop>pb_nickColor</tabstop>
-   <tabstop>pb_removeNickColor</tabstop>
-   <tabstop>pb_addNickColor</tabstop>
-  </tabstops>
-  <resources/>
-- <connections/>
--</ui>
-+ <connections>
-+  <connection>
-+   <sender>ck_gcNickColoring</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>ck_gcHashNickColoring</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>326</x>
-+     <y>18</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>326</x>
-+     <y>42</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+ </ui>
-+
-diff --git a/src/options/opt_groupchat.cpp b/src/options/opt_groupchat.cpp
-index 84b8339..afc5cfc 100644
---- a/src/options/opt_groupchat.cpp
-+++ b/src/options/opt_groupchat.cpp
-@@ -67,6 +67,7 @@ void OptionsTabGroupchat::applyOptions()
- 	GeneralGroupchatUI *d = (GeneralGroupchatUI *)w;
- 	PsiOptions::instance()->setOption("options.ui.muc.use-highlighting", d->ck_gcHighlights->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.muc.use-nick-coloring", d->ck_gcNickColoring->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.muc.use-hash-nick-coloring", d->ck_gcHashNickColoring->isChecked());
- 
- 	QStringList highlight;
- 	int i;
-@@ -96,6 +97,8 @@ void OptionsTabGroupchat::restoreOptions()
- 	d->ck_gcHighlights->setChecked( PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool() );
- 	d->ck_gcNickColoring->setChecked( true );
- 	d->ck_gcNickColoring->setChecked( PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() );
-+	d->ck_gcHashNickColoring->setChecked( true );
-+	d->ck_gcHashNickColoring->setChecked( PsiOptions::instance()->getOption("options.ui.muc.use-hash-nick-coloring").toBool() );
- 	d->lw_highlightWords->clear();
- 	d->lw_highlightWords->addItems( PsiOptions::instance()->getOption("options.ui.muc.highlight-words").toStringList() );
- 	d->lw_nickColors->clear();

psi-plus-main-20130107.tar.xz/patches/0290-psi-tabs-button-killer.diff Deleted

@@ -1,80 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -364,6 +364,7 @@
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
-+				<show-tab-buttons type="bool">true</show-tab-buttons>
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
---- git.orig/src/options/opt_chat.cpp
-+++ git/src/options/opt_chat.cpp
-@@ -103,6 +103,7 @@ void OptionsTabChat::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.chat.alert-for-already-open-chats", d->ck_alertOpenChats->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.tabs.show-tab-buttons", d->ck_showTabButtons->isChecked());
- 	
- 	QString delafter;
- 	switch (bg_delChats->buttons().indexOf( bg_delChats->checkedButton() )) {
-@@ -177,6 +178,7 @@ void OptionsTabChat::restoreOptions()
- 	d->ck_alertOpenChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() );
- 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
- 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
-+	d->ck_showTabButtons->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool() );
- 	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
- 	d->cb_tabGrouping->setEnabled(PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool());
- 	QString tabGrouping = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString();
---- git.orig/src/options/opt_chat.ui
-+++ git/src/options/opt_chat.ui
-@@ -120,6 +120,13 @@
-     </layout>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_showTabButtons" >
-+     <property name="text" >
-+      <string>Show tab buttons</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_autoResize" >
-      <property name="text" >
-       <string>Auto-resize text input field</string>
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -1271,7 +1271,8 @@ void PsiCon::optionChanged(const QString
- 	}
- 
- 	if (option == "options.ui.tabs.use-tabs" || 
--		option == "options.ui.tabs.grouping") {
-+		option == "options.ui.tabs.grouping" || 
-+		option == "options.ui.tabs.show-tab-buttons") {
- 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
- 		notifyRestart = false;
- 	}
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -767,7 +767,7 @@ void TabDlg::setUserManagementEnabled(bo
- 	}
- 
- 	userManagement_ = enabled;
--	tabWidget_->setTabButtonsShown(enabled);
-+	tabWidget_->setTabButtonsShown(PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool());
- 	tabWidget_->setDragsEnabled(enabled);
- }
- 
---- git.orig/src/widgets/psitabwidget.cpp
-+++ git/src/widgets/psitabwidget.cpp
-@@ -75,6 +75,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 
- 	setTabPosition(QTabWidget::North);
- 
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
-+		closeButton_->hide();
-+		downButton_->hide();
-+	}
- 	connect( tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
- 	connect( tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
- 	connect( tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));

psi-plus-main-20130107.tar.xz/patches/0310-psi-toolbar-button-kill-arrow.diff Deleted

@@ -1,75 +0,0 @@
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -184,7 +184,7 @@
-             <enum>QToolButton::InstantPopup</enum>
-            </property>
-            <property name="arrowType" >
--            <enum>Qt::DownArrow</enum>
-+            <enum>Qt::NoArrow</enum>
-            </property>
-           </widget>
-          </item>
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -706,6 +706,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->pm_settings = new QMenu(this);
- 	connect(d->pm_settings, SIGNAL(aboutToShow()), SLOT(buildMenu()));
- 	ui_.tb_actions->setMenu(d->pm_settings);
-+	ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
- 	// resize the horizontal splitter
---- git.orig/src/groupchatdlg.ui
-+++ git/src/groupchatdlg.ui
-@@ -148,7 +148,7 @@
-              <enum>QToolButton::InstantPopup</enum>
-             </property>
-             <property name="arrowType" >
--             <enum>Qt::DownArrow</enum>
-+             <enum>Qt::NoArrow</enum>
-             </property>
-            </widget>
-           </item>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -206,6 +206,7 @@ void PsiChatDlg::initUi()
- 	pm_settings_ = new QMenu(this);
- 	connect(pm_settings_, SIGNAL(aboutToShow()), SLOT(buildMenu()));
- 	ui_.tb_actions->setMenu(pm_settings_);
-+	ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
- 	connect(account()->capsManager(), SIGNAL(capsChanged(const Jid&)), SLOT(capsChanged(const Jid&)));
---- git.orig/src/psitoolbar.cpp
-+++ git/src/psitoolbar.cpp
-@@ -26,6 +26,7 @@
- #include <QContextMenuEvent>
- #include <QList>
- #include <QMainWindow>
-+#include <QToolButton>
- 
- #include "iconset.h"
- #include "iconaction.h"
-@@ -97,6 +98,9 @@ void PsiToolBar::initialize()
- 	setWindowTitle(o->getOption(base_ + ".name").toString());
- 
- 	ActionList actions = actionList_->suitableActions(PsiActionList::Actions_MainWin | PsiActionList::Actions_Common);
-+	QList<QString> skipList;
-+	skipList << "button_options" << "button_status" << "event_notifier" << "spacer";
-+
- 	foreach(QString actionName, o->getOption(base_ + ".actions").toStringList()) {
- 		IconAction* action = actions.action(actionName);
- 
-@@ -104,6 +108,12 @@ void PsiToolBar::initialize()
- 			if (action->isSeparator()) {
- 				addSeparator();
- 			}
-+			else if (!skipList.contains(actionName)) {
-+				QToolButton *button = new QToolButton;
-+				button->setDefaultAction(action);
-+				button->setPopupMode(QToolButton::InstantPopup);
-+				addWidget(button);
-+			}
- 			else {
- 				action->addTo(this);
- 			}

psi-plus-main-20130107.tar.xz/patches/0320-psi-plugins-qcm-fix.diff Deleted

@@ -1,43 +0,0 @@
---- git.orig/qcm/plugins.qcm
-+++ git/qcm/plugins.qcm
-@@ -1,8 +1,6 @@
- /*
- -----BEGIN QCMOD-----
--name: Plugins
--arg: enable-plugins,Enable Psi Plugin support
--
-+name: Psi Plugin support
- -----END QCMOD-----
- */
- 
-@@ -13,17 +11,10 @@ class qc_plugins : public ConfObj
- {
- public:
- 	qc_plugins(Conf *c) : ConfObj(c) {}
--	QString name() const { return "Plugins"; }
--	QString shortname() const { return "Plugins"; }
-+	QString name() const { return "Psi Plugin support"; }
-+	QString shortname() const { return "plugins"; }
- 	bool exec()
- 	{
--		QString s;
--		
--		// Check if Jingle was enabled explicitly
--		s = conf->getenv("QC_ENABLE_PLUGINS");
--		if(s.isEmpty())
--			return false;
--		
- 		conf->addDefine("PSI_PLUGINS");
- 		
- 		// Finish
---- git.orig/psi.qc
-+++ git/psi.qc
-@@ -43,7 +43,7 @@
-   <dep type='spell'>
-     <required/>
-   </dep>
--  
-+  <dep type='plugins'><disabled/></dep>
-   <dep type='conf'>
-     <required/>
-   </dep>

psi-plus-main-20130107.tar.xz/patches/0330-psi-avcalls-addons.diff Deleted

@@ -1,152 +0,0 @@
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -132,6 +132,22 @@
-           </widget>
-          </item>
-          <item>
-+          <widget class="QToolButton" name="tb_voice" >
-+           <property name="toolTip" >
-+            <string>Voice Call</string>
-+           </property>
-+           <property name="text" >
-+            <string/>
-+           </property>
-+           <property name="iconSize" >
-+            <size>
-+             <width>16</width>
-+             <height>16</height>
-+            </size>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-           <widget class="QToolButton" name="tb_pgp" >
-            <property name="toolTip" >
-             <string>Toggle encryption</string>
---- git.orig/src/gcuserview.cpp
-+++ git/src/gcuserview.cpp
-@@ -35,6 +35,7 @@
- #include "common.h"
- #include "psioptions.h"
- #include "coloropt.h"
-+#include "avcall/avcall.h"
- 
- static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
- {
-@@ -410,6 +411,11 @@ void GCUserView::doContextMenu(QTreeWidg
- 	act = new QAction(IconsetFactory::icon("psi/start-chat").icon(), tr("Open &Chat Window"), pm);
- 	pm->addAction(act);
- 	act->setData(1);
-+	if (AvCallManager::isSupported()) {
-+		act = new QAction(IconsetFactory::icon("psi/avcall").icon(), tr("Voice Call"), pm);
-+		pm->addAction(act);
-+		act->setData(5);
-+	}
- 	pm->addSeparator();
- 
- 	// Kick and Ban submenus
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1677,6 +1677,9 @@ void GCMainDlg::lv_action(const QString 
- 	else if(x == 4) {
- 		account()->invokeGCFile(jid().withResource(nick));
- 	}
-+	else if(x == 5) {
-+		account()->actionVoice(jid().withResource(nick));
-+	}
- 	else if(x == 10) {
- 		d->mucManager->kick(nick);
- 	}
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -42,6 +42,7 @@
- #include "jidutil.h"
- #include "xmpp_tasks.h"
- #include "lastactivitytask.h"
-+#include "avcall/avcall.h"
- 
- 
- #define MCMDCHAT		"http://psi-im.org/ids/mcmd#chatmain"
-@@ -253,6 +254,7 @@ void PsiChatDlg::setLooks()
- 		ui_.tb_actions->hide();
- 		ui_.tb_emoticons->hide();
- 		ui_.toolbar->hide();
-+		ui_.tb_voice->hide();
- 	}
- 	else {
- 		ui_.lb_status->show();
-@@ -261,11 +263,13 @@ void PsiChatDlg::setLooks()
- 			ui_.toolbar->show();
- 			ui_.tb_actions->hide();
- 			ui_.tb_emoticons->hide();
-+			ui_.tb_voice->hide();
- 		}
- 		else {
- 			ui_.toolbar->hide();
- 			ui_.tb_emoticons->setVisible(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool());
- 			ui_.tb_actions->show();
-+			ui_.tb_voice->setVisible(AvCallManager::isSupported());
- 		}
- 	}
- 
-@@ -322,7 +326,8 @@ void PsiChatDlg::initToolButtons()
- 
- 	act_voice_ = new IconAction(tr("Voice Call"), "psi/voice", tr("Voice Call"), 0, this);
- 	connect(act_voice_, SIGNAL(triggered()), SLOT(doVoice()));
--	act_voice_->setEnabled(false);
-+	//act_voice_->setEnabled(false);
-+	ui_.tb_voice->setDefaultAction(act_voice_);
- 
- 	act_file_ = new IconAction(tr("Send File"), "psi/upload", tr("Send File"), 0, this);
- 	connect(act_file_, SIGNAL(triggered()), SLOT(doFile()));
-@@ -353,7 +358,7 @@ void PsiChatDlg::initToolBar()
- 	}
- 	ui_.toolbar->addAction(act_info_);
- 	ui_.toolbar->addAction(act_history_);
--	if (account()->voiceCaller()) {
-+	if (AvCallManager::isSupported()) {
- 		ui_.toolbar->addAction(act_voice_);
- 	}
- }
-@@ -372,7 +377,7 @@ void PsiChatDlg::capsChanged()
- 	if (resource.isEmpty() && ul && !ul->userResourceList().isEmpty()) {
- 		resource = (*(ul->userResourceList().priority())).name();
- 	}
--	act_voice_->setEnabled(!account()->capsManager()->isEnabled() || (ul && ul->isAvailable() && account()->capsManager()->features(jid().withResource(resource)).canVoice()));
-+	//act_voice_->setEnabled(!account()->capsManager()->isEnabled() || (ul && ul->isAvailable() && account()->capsManager()->features(jid().withResource(resource)).canVoice()));
- }
- 
- void PsiChatDlg::activated()
-@@ -525,8 +530,9 @@ void PsiChatDlg::buildMenu()
- 
- 	pm_settings_->addAction(act_icon_);
- 	pm_settings_->addAction(act_file_);
--	if (account()->voiceCaller())
--		act_voice_->addTo(pm_settings_);
-+	if (AvCallManager::isSupported()) {
-+		pm_settings_->addAction(act_voice_);
-+	}
- 	pm_settings_->addAction(act_pgp_);
- 	pm_settings_->addSeparator();
- 
---- git.orig/src/psicontactmenu.cpp
-+++ git/src/psicontactmenu.cpp
-@@ -38,6 +38,7 @@
- #include "userlist.h"
- #include "statusdlg.h"
- #include "xmpp_tasks.h"
-+#include "avcall/avcall.h"
- #ifdef HAVE_PGPUTIL
- #include "pgputil.h"
- #endif
-@@ -413,7 +414,9 @@ public:
- 		menu_->addMenu(openWhiteboardToMenu_);
- 		menu_->addMenu(executeCommandMenu_);
- 		menu_->addMenu(activeChatsMenu_);
--		menu_->addAction(voiceCallAction_);
-+		if(AvCallManager::isSupported()) {
-+			menu_->addAction(voiceCallAction_);
-+		}
- 		menu_->addSeparator();
- 		menu_->addAction(sendFileAction_);
- 		menu_->addMenu(inviteToGroupchatMenu_);

psi-plus-main-20130107.tar.xz/patches/0340-psi-send-button-context-menu.diff Deleted

@@ -1,1410 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -113,6 +113,8 @@
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<only-paste-template type="bool">false</only-paste-template>
-+				<disable-paste-send type="bool">false</disable-paste-send>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -323,6 +323,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-          <item>
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -205,7 +205,7 @@ public:
- 	QString password;
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
--	IconAction *act_find, *act_clear, *act_icon, *act_configure;
-+	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
- #endif
-@@ -606,6 +606,13 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 
- 	d->state = Private::Connected;
- 
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
-+
- 	setAcceptDrops(true);
- 
- #ifndef Q_WS_MAC
-@@ -672,6 +679,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(d->act_mini_cmd, SIGNAL(triggered()), d, SLOT(doMiniCmd()));
- 	addAction(d->act_mini_cmd);
- 
-+	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
-+	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
-+
-+	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
-+	d->act_templates->setMenu(getTemplateMenu());
- 	ui_.toolbar->setIconSize(QSize(16,16));
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_configure);
-@@ -680,6 +692,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- #endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(d->act_icon);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(d->act_templates);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_templates))->setPopupMode(QToolButton::InstantPopup);
-+	if (!PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		ui_.toolbar->addAction(d->act_ps);
- 	ui_.toolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
- 
- 	// Common actions
-@@ -688,6 +705,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(d->act_send,SIGNAL(triggered()), SLOT(mle_returnPressed()));
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
- 	connect(ui_.pb_send, SIGNAL(clicked()), SLOT(mle_returnPressed()));
-+	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
- 	d->act_close = new QAction(this);
- 	addAction(d->act_close);
- 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
-@@ -755,6 +773,13 @@ GCMainDlg::~GCMainDlg()
- 	account()->dialogUnregister(this);
- 	delete d->mucManager;
- 	delete d;
-+
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
- }
- 
- void GCMainDlg::ensureTabbedCorrectly()
-@@ -1768,6 +1793,9 @@ void GCMainDlg::buildMenu()
- 	d->pm_settings->addSeparator();
- 
- 	d->pm_settings->addAction(d->act_icon);
-+	d->pm_settings->addAction(d->act_templates);
-+	if (!PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		d->pm_settings->addAction(d->act_ps);
- 	d->pm_settings->addAction(d->act_nick);
- }
- 
-@@ -1799,6 +1827,50 @@ void GCMainDlg::setStatusTabIcon(int sta
- 	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
- }
- 
-+void GCMainDlg::sendButtonMenu()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		menu->setParams(true);
-+		menu->exec(QCursor::pos());
-+		menu->setParams(false);
-+		d->mle()->setFocus();
-+	}
-+}
-+
-+void GCMainDlg::editTemplates()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		showTemplateEditor();
-+	}
-+}
-+
-+void GCMainDlg::doPasteAndSend()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		d->mle()->paste();
-+		mle_returnPressed();
-+		d->act_ps->setEnabled(false);
-+		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
-+	}
-+}
-+
-+void GCMainDlg::psButtonEnabled()
-+{
-+	d->act_ps->setEnabled(true);
-+}
-+
-+void GCMainDlg::sendTemp(const QString &templText)
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		if (!templText.isEmpty()) {
-+			d->mle()->textCursor().insertText(templText);
-+			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+				mle_returnPressed();
-+		}
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -134,6 +134,11 @@ private slots:
- 	void openWhiteboard();
- #endif
- 	void chatEditCreated();
-+	void sendButtonMenu();
-+	void editTemplates();
-+	void doPasteAndSend();
-+	void sendTemp(const QString &);
-+	void psButtonEnabled();
- 
- public:
- 	class Private;
---- git.orig/src/groupchatdlg.ui
-+++ git/src/groupchatdlg.ui
-@@ -286,6 +286,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-         </layout>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -18,6 +18,7 @@
- #include <QDragEnterEvent>
- #include <QMessageBox>
- #include <QDebug>
-+#include <QTimer>
- 
- #include "psicon.h"
- #include "psiaccount.h"
-@@ -170,6 +171,23 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, P
- {
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
-+
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
-+}
-+
-+PsiChatDlg::~PsiChatDlg()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
- }
- 
- void PsiChatDlg::initUi()
-@@ -220,6 +238,7 @@ void PsiChatDlg::initUi()
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
- 	connect(ui_.pb_send, SIGNAL(clicked()), this, SLOT(doSend()));
-+	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
- 
- 	act_mini_cmd_ = new QAction(this);
- 	act_mini_cmd_->setText(tr("Input command..."));
-@@ -343,6 +362,12 @@ void PsiChatDlg::initToolButtons()
- 
- 	act_compact_ = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
- 	connect(act_compact_, SIGNAL(triggered()), SLOT(toggleSmallChat()));
-+
-+	act_ps_ = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
-+	connect(act_ps_, SIGNAL(triggered()), SLOT(doPasteAndSend()));
-+
-+	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
-+	act_templates_->setMenu(getTemplateMenu());
- }
- 
- void PsiChatDlg::initToolBar()
-@@ -352,6 +377,11 @@ void PsiChatDlg::initToolBar()
- 	ui_.toolbar->addAction(act_clear_);
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(act_icon_);
-+	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(act_templates_);
-+	((QToolButton *)ui_.toolbar->widgetForAction(act_templates_))->setPopupMode(QToolButton::InstantPopup);
-+	if (!PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		ui_.toolbar->addAction(act_ps_);
- 	ui_.toolbar->addAction(act_file_);
- 	if (PsiOptions::instance()->getOption("options.pgp.enable").toBool()) {
- 		ui_.toolbar->addAction(act_pgp_);
-@@ -529,6 +559,9 @@ void PsiChatDlg::buildMenu()
- 	pm_settings_->addSeparator();
- 
- 	pm_settings_->addAction(act_icon_);
-+	pm_settings_->addAction(act_templates_);
-+	if (!PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		pm_settings_->addAction(act_ps_);
- 	pm_settings_->addAction(act_file_);
- 	if (AvCallManager::isSupported()) {
- 		pm_settings_->addAction(act_voice_);
-@@ -611,5 +644,48 @@ bool PsiChatDlg::eventFilter( QObject *o
- 	return ChatDlg::eventFilter( obj, ev );
- }
- 
-+void PsiChatDlg::sendButtonMenu()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		menu->setParams(true);
-+		menu->exec(QCursor::pos());
-+		menu->setParams(false);
-+		chatEdit()->setFocus();
-+	}
-+}
-+
-+void PsiChatDlg::editTemplates()
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		showTemplateEditor();
-+	}
-+}
-+
-+void PsiChatDlg::doPasteAndSend()
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		chatEdit()->paste();
-+		doSend();
-+		act_ps_->setEnabled(false);
-+		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
-+	}
-+}
-+
-+void PsiChatDlg::psButtonEnabled()
-+{
-+	act_ps_->setEnabled(true);
-+}
-+
-+void PsiChatDlg::sendTemp(const QString &templText)
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		if (!templText.isEmpty()) {
-+			chatEdit()->textCursor().insertText(templText);
-+			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+				doSend();
-+		}
-+	}
-+}
- 
- #include "psichatdlg.moc"
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -16,6 +16,7 @@ class PsiChatDlg : public ChatDlg
- 	Q_OBJECT
- public:
- 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
-+	~PsiChatDlg();
- 
- protected:
- 	// reimplemented
-@@ -38,6 +39,11 @@ private slots:
- 
- 	// reimplemented
- 	void chatEditCreated();
-+	void sendButtonMenu();
-+	void editTemplates();
-+	void doPasteAndSend();
-+	void sendTemp(const QString &);
-+	void psButtonEnabled();
- 
- private:
- 	void initToolBar();
-@@ -72,7 +78,8 @@ private:
- 	IconAction* act_file_;
- 	IconAction* act_compact_;
- 	IconAction* act_voice_;
--
-+	IconAction* act_ps_;
-+	IconAction* act_templates_;
- 	QAction *act_mini_cmd_;
- 
- 	MCmdManager mCmdManager_;
---- /dev/null
-+++ git/src/sendbuttonmenu.cpp
-@@ -0,0 +1,495 @@
-+#include <QInputDialog>
-+#include <QMessageBox>
-+
-+#include "sendbuttonmenu.h"
-+#include "psioptions.h"
-+#include "psiiconset.h"
-+#include "common.h"
-+
-+SendButtonTemplatesEditor::SendButtonTemplatesEditor(QWidget* parent)
-+	: QDialog(parent)
-+{
-+	ui_.setupUi(this);
-+	setAttribute(Qt::WA_DeleteOnClose);
-+	// Create actions
-+	QAction *addRootTemplAction = new QAction(tr("Add template string"), this);
-+	connect(addRootTemplAction, SIGNAL(triggered()), this, SLOT(addRootTemplate()));
-+	addChildTemplAction = new QAction(tr("Add template string as submenu"), this);
-+	connect(addChildTemplAction, SIGNAL(triggered()), this, SLOT(addChildTemplate()));
-+	QAction *addRootSeparatorAction = new QAction(tr("Add separator"), this);
-+	connect(addRootSeparatorAction, SIGNAL(triggered()), this, SLOT(addRootSeparator()));
-+	addChildSeparatorAction = new QAction(tr("Add separator as submenu"), this);
-+	connect(addChildSeparatorAction, SIGNAL(triggered()), this, SLOT(addChildSeparator()));
-+	editAction = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("Edit"), this);
-+	removeAction = new QAction(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), this);
-+	upAction = new QAction(IconsetFactory::icon("psi/arrowUp").icon(), tr("Up"), this);
-+	downAction = new QAction(IconsetFactory::icon("psi/arrowDown").icon(), tr("Down"), this);
-+	// Create Add button menu
-+	QMenu *add_menu = new QMenu(this);
-+	add_menu->addAction(addRootTemplAction);
-+	add_menu->addAction(addChildTemplAction);
-+	add_menu->addAction(addRootSeparatorAction);
-+	add_menu->addAction(addChildSeparatorAction);
-+	ui_.btnAdd->setMenu(add_menu);
-+	//--
-+	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
-+	int templ_cnt = templ_list.size();
-+	QHash<QString, QTreeWidgetItem *> subitems;
-+	for (int i = 0; i < templ_cnt; i++) {
-+		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
-+		if (menu_list.size() == 0)
-+			continue;
-+		// find subitems if exists
-+		QTreeWidgetItem *item = NULL;
-+		QString menu_str = "";
-+		int j = menu_list.size() - 2;
-+		for (; j >= 0; j--) {
-+			menu_str = "";
-+			QString menu_str2 = "";
-+			for (int k = 0; k <= j; k++) {
-+				menu_str = menu_str2;
-+				menu_str2.append("/" + menu_list.at(k));
-+			}
-+			item = subitems.value(menu_str2, NULL);
-+			if (item) {
-+				menu_str = menu_str2;
-+				++j;
-+				break;
-+			}
-+		}
-+		if (j < 0)
-+			j = 0;
-+		// create subitems
-+		int sub_cnt = menu_list.size();
-+		for (; j < sub_cnt; j++) {
-+			QString str1 = menu_list.at(j);
-+			QTreeWidgetItem::ItemType type = QTreeWidgetItem::Type;
-+			if (j == (sub_cnt - 1) && str1 == "\\-") {
-+				str1 = tr("<separator>");
-+				type = QTreeWidgetItem::UserType;
-+			}
-+			if (j == 0) {
-+				// toplevel item
-+				item = new QTreeWidgetItem(ui_.lstTemplates, type);
-+			} else {
-+				item = new QTreeWidgetItem(item, type);
-+			}
-+			if (type == QTreeWidgetItem::UserType) {
-+				item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+			}
-+			item->setText(0, SendButtonTemplatesMenu::stripSlashes(str1));
-+			if (j < (sub_cnt - 1)) {
-+				menu_str.append("/" + str1);
-+				subitems[menu_str] = item;
-+			}
-+		}
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::addRootTemplate()
-+{
-+	QString t = ui_.txtTemplate->text();
-+	if (t.isEmpty())
-+		return;
-+	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(t), QTreeWidgetItem::Type);
-+	ui_.lstTemplates->addTopLevelItem(item);
-+	ui_.txtTemplate->setText("");
-+}
-+
-+void SendButtonTemplatesEditor::addChildTemplate()
-+{
-+	QString t = ui_.txtTemplate->text();
-+	if (t.isEmpty())
-+		return;
-+	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
-+	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
-+		curr_item->addChild(new QTreeWidgetItem(QStringList(t), QTreeWidgetItem::Type));
-+		ui_.txtTemplate->setText("");
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::addRootSeparator()
-+{
-+	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
-+	item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+	ui_.lstTemplates->addTopLevelItem(item);
-+}
-+
-+void SendButtonTemplatesEditor::addChildSeparator()
-+{
-+	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
-+	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
-+		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
-+		item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+		curr_item->addChild(item);
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::removeTemplate()
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	if (item) {
-+		delete item;
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::editTemplate()
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	if (item && item->type() == QTreeWidgetItem::Type) {
-+		QString templ_str = item->text(0);
-+		QInputDialog *editBox = new QInputDialog(this, Qt::Dialog);
-+		editBox->setWindowTitle(tr("Edit template"));
-+		editBox->setLabelText(tr("Input new template text"));
-+		editBox->setTextEchoMode(QLineEdit::Normal);
-+		editBox->setTextValue(templ_str);
-+		editBox->setWindowModality(Qt::WindowModal);
-+		if (editBox->exec() == QInputDialog::Accepted) {
-+			QString new_templ_str = editBox->textValue();
-+			if (!new_templ_str.isEmpty() && new_templ_str != templ_str) {
-+				item->setText(0, new_templ_str);
-+			}
-+		}
-+		delete editBox;
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::upTemplate()
-+{
-+	swapItem(-1);
-+}
-+
-+void SendButtonTemplatesEditor::downTemplate()
-+{
-+	swapItem(1);
-+}
-+
-+void SendButtonTemplatesEditor::selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem */*previous*/)
-+{
-+	bool up_e = false;
-+	bool dw_e = false;
-+	bool ed_e = false;
-+	bool dl_e = false;
-+	QModelIndex index = ui_.lstTemplates->currentIndex();
-+	if (current && index.isValid()) {
-+		QTreeWidgetItem *parent = current->parent();
-+		int cnt = 0;
-+		if (parent) {
-+			cnt = parent->childCount();
-+		} else {
-+			cnt = ui_.lstTemplates->topLevelItemCount();
-+		}
-+		int row = index.row();
-+		if (cnt > 0) {
-+			if (row > 0)
-+				up_e = true;
-+			if (row < cnt - 1)
-+				dw_e = true;
-+			if (current->type() == QTreeWidgetItem::Type)
-+				ed_e = true;
-+			dl_e = true;
-+		}
-+
-+	}
-+	addChildTemplAction->setEnabled(ed_e);
-+	addChildSeparatorAction->setEnabled(ed_e);
-+	ui_.btnEdit->setEnabled(ed_e);
-+	editAction->setEnabled(ed_e);
-+	ui_.btnRemove->setEnabled(dl_e);
-+	removeAction->setEnabled(ed_e);
-+	ui_.btnUp->setEnabled(up_e);
-+	upAction->setEnabled(up_e);
-+	ui_.btnDown->setEnabled(dw_e);
-+	downAction->setEnabled(dw_e);
-+}
-+
-+void SendButtonTemplatesEditor::contextMenu(QPoint pos)
-+{
-+	QMenu* menu = new QMenu(this);
-+	menu->addAction(editAction);
-+	menu->addAction(removeAction);
-+	menu->addSeparator();
-+	menu->addAction(upAction);
-+	menu->addAction(downAction);
-+	QAction *result = menu->exec(ui_.lstTemplates->mapToGlobal(pos));
-+	if (result == editAction) {
-+		editTemplate();
-+	} else if (result == removeAction) {
-+		removeTemplate();
-+	} else if (result == upAction) {
-+		upTemplate();
-+	} else if (result == downAction) {
-+		downTemplate();
-+	}
-+	delete menu;
-+}
-+
-+void SendButtonTemplatesEditor::swapItem(int updown)
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	QModelIndex index = ui_.lstTemplates->currentIndex();
-+	if (item && index.isValid()) {
-+		int row = index.row();
-+		int new_pos = row + updown;
-+		QTreeWidgetItem * parent = item->parent();
-+		int cnt = 0;
-+		if (parent) {
-+			cnt = parent->childCount();
-+		} else {
-+			cnt = ui_.lstTemplates->topLevelItemCount();
-+		}
-+		if (new_pos >= 0 && new_pos < cnt) {
-+			if (parent) {
-+				parent->removeChild(item);
-+				parent->insertChild(new_pos, item);
-+			} else {
-+				ui_.lstTemplates->takeTopLevelItem(row);
-+				ui_.lstTemplates->insertTopLevelItem(new_pos, item);
-+			}
-+			ui_.lstTemplates->setCurrentItem(item);
-+			selectionChanged(item, item); // needed update buttons
-+		}
-+	}
-+}
-+
-+QStringList SendButtonTemplatesEditor::genTemplatesList(QTreeWidgetItem* item, QString base_path)
-+{
-+	QStringList res_lst;
-+	QString new_base = base_path;
-+	if (!new_base.isEmpty())
-+		new_base.append("/");
-+	QString item_text = SendButtonTemplatesMenu::addSlashes(item->text(0));
-+	int child_cnt = item->childCount();
-+	if (child_cnt == 0) {
-+		if (item->type() != QTreeWidgetItem::Type)
-+			item_text = "\\-"; // Separator
-+		res_lst.push_back(new_base + item_text);
-+		return res_lst;
-+	}
-+	new_base.append(item_text);
-+	for (int idx = 0; idx < child_cnt; idx++) {
-+		res_lst.append(genTemplatesList(item->child(idx), new_base));
-+	}
-+	return res_lst;
-+}
-+
-+void SendButtonTemplatesEditor::accept()
-+{
-+	QString t = ui_.txtTemplate->text().trimmed();
-+	if (!t.isEmpty()) {
-+		QMessageBox *msgBox = new QMessageBox(this);
-+		msgBox->setIcon(QMessageBox::Warning);
-+		msgBox->setWindowTitle(tr("Save templates"));
-+		msgBox->setText(tr("The template \"%1\" hasn't been saved!").arg(t));
-+		msgBox->setInformativeText(tr("Continue?"));
-+		msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-+		msgBox->setDefaultButton(QMessageBox::No);
-+		msgBox->setWindowModality(Qt::WindowModal);
-+		int res = msgBox->exec();
-+		delete msgBox;
-+		if (res == QMessageBox::No) {
-+			return;
-+		}
-+	}
-+	QStringList templates;
-+	int top_cnt = ui_.lstTemplates->topLevelItemCount();
-+	for (int idx = 0; idx < top_cnt; idx++) {
-+		templates.append(genTemplatesList(ui_.lstTemplates->topLevelItem(idx)));
-+	}
-+	PsiOptions::instance()->setOption("options.ui.chat.templates", templates);
-+	QDialog::accept();
-+	close();
-+}
-+
-+void SendButtonTemplatesEditor::reject()
-+{
-+	QDialog::reject();
-+	close();
-+}
-+
-+//------------------------------
-+
-+SendButtonTemplatesMenu::SendButtonTemplatesMenu(QWidget* parent)
-+	: QMenu(parent)
-+	, mapper(NULL)
-+	, ps_(false)
-+{
-+	setSeparatorsCollapsible(true);
-+	update();
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+}
-+
-+void SendButtonTemplatesMenu::setParams(bool ps)
-+{
-+	if (ps_ != ps) {
-+		ps_ = ps;
-+		updatePsAction();
-+	}
-+}
-+
-+void SendButtonTemplatesMenu::updatePsAction()
-+{
-+	bool ps_v = false;
-+	if (ps_ && !PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		ps_v = true;
-+	pasteSendAct->setVisible(ps_v);
-+}
-+
-+/**
-+ * Split menu text string as submenu. Char '/' used as separator.
-+ */
-+QStringList SendButtonTemplatesMenu::getMenuItems(const QString text)
-+{
-+	QStringList res_list;
-+	int str_len = text.length();
-+	unsigned int sl_cnt = 0;
-+	int str_pos = 0;
-+	for (int i = 0; i < str_len; i++) {
-+		QChar ch = text.at(i);
-+		if (ch == '\\') {
-+			sl_cnt++;
-+		} else if (ch == '/') {
-+			if ((sl_cnt & 1) == 0) {
-+				QString str1 = text.mid(str_pos, i - str_pos).trimmed();
-+				if (!str1.isEmpty()) {
-+					res_list.push_back(str1);
-+					str_pos = i + 1;
-+				}
-+				str_pos = i + 1;
-+			}
-+			sl_cnt = 0;
-+		} else {
-+			sl_cnt = 0;
-+		}
-+	}
-+	if (str_pos < str_len) {
-+		QString str1 = text.mid(str_pos);
-+		if (!str1.isEmpty()) {
-+			res_list.push_back(str1);
-+		}
-+	}
-+	return res_list;
-+}
-+
-+QAction *SendButtonTemplatesMenu::makeAction(QString text)
-+{
-+	QString str1;
-+	if (text.length() > 30) {
-+		str1 = text.left(30).replace("&", "&&") + "...";
-+	} else {
-+		str1 = text.replace("&", "&&");
-+	}
-+	QAction *act = new QAction(str1, this);
-+	return act;
-+}
-+
-+void SendButtonTemplatesMenu::update()
-+{
-+	clearMenu(this);
-+	if (mapper)
-+		delete mapper;
-+	mapper = new QSignalMapper(this);
-+
-+	pasteSendAct = new QAction(IconsetFactory::icon("psi/action_paste_and_send").icon(), tr("Paste and &Send"), this);
-+	connect(pasteSendAct, SIGNAL(triggered()), SIGNAL(doPasteAndSend()));
-+	addAction(pasteSendAct);
-+	updatePsAction();
-+	addSeparator();
-+
-+	QAction *editTemplatesAct = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("&Edit Templates"), this);
-+	connect(editTemplatesAct, SIGNAL(triggered()), SIGNAL(doEditTemplates()));
-+	addAction(editTemplatesAct);
-+
-+	onlyPaste = new QAction(tr("Only &Paste"), this);
-+	onlyPaste->setCheckable(true);
-+	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
-+	connect(onlyPaste, SIGNAL(triggered()), SLOT(clickOnlyPaste()));
-+	addAction(onlyPaste);
-+	addSeparator();
-+
-+	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
-+	int templ_cnt = templ_list.size();
-+	QHash<QString, QAction *> submenus;
-+	for (int i = 0; i < templ_cnt; i++) {
-+		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
-+		if (menu_list.size() == 0)
-+			continue;
-+		// find submenus if exists
-+		QAction *m_act = NULL;
-+		QString menu_str = "";
-+		int j = menu_list.size() - 2;
-+		for (; j >= 0; j--) {
-+			menu_str = "";
-+			QString menu_str2 = "";
-+			for (int k = 0; k <= j; k++) {
-+				menu_str = menu_str2;
-+				menu_str2.append("/" + menu_list.at(k));
-+			}
-+			m_act = submenus.value(menu_str2, NULL);
-+			if (m_act) {
-+				menu_str = menu_str2;
-+				++j;
-+				break;
-+			}
-+		}
-+		if (j < 0)
-+			j = 0;
-+		// create submenus
-+		QMenu *smenu = this;
-+		if (m_act) {
-+			smenu = m_act->menu();
-+			if (!smenu)
-+				smenu = new QMenu(this);
-+		}
-+		int sub_cnt = menu_list.size();
-+		for (; ; j++) {
-+			QString str1 = menu_list.at(j);
-+			if (j == (sub_cnt - 1) && str1 == "\\-") {
-+				smenu->addSeparator();
-+				break;
-+			}
-+			QAction *c_act = makeAction(SendButtonTemplatesMenu::stripSlashes(str1));
-+			smenu->addAction(c_act);
-+			if (j == (sub_cnt - 1)) {
-+				connect(c_act, SIGNAL(triggered()), mapper, SLOT(map()));
-+				mapper->setMapping(c_act, SendButtonTemplatesMenu::stripSlashes(str1));
-+				break;
-+			} else {
-+				smenu = new QMenu(this);
-+				c_act->setMenu(smenu);
-+				menu_str.append("/" + str1);
-+				submenus[menu_str] = c_act;
-+			}
-+		}
-+	}
-+	connect(mapper, SIGNAL(mapped(const QString &)), SIGNAL(doTemplateText(const QString &)));
-+}
-+
-+void SendButtonTemplatesMenu::clickOnlyPaste()
-+{
-+	if (PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", false);
-+	else
-+		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", true);
-+}
-+
-+void SendButtonTemplatesMenu::optionChanged(const QString& option)
-+{
-+	if (option == "options.ui.chat.disable-paste-send") {
-+		updatePsAction();
-+	} else if (option == "options.ui.chat.css") {
-+		setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+	//} else if (option == "options.ui.chat.only-paste-template") {
-+	//	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
-+	}
-+}
-+
-+QString SendButtonTemplatesMenu::addSlashes(QString str)
-+{
-+	return str.replace("\\", "\\\\", Qt::CaseSensitive).replace("/", "\\/");
-+}
-+
-+QString SendButtonTemplatesMenu::stripSlashes(QString str)
-+{
-+	return str.replace("\\/", "/").replace("\\\\", "\\");
-+}
---- /dev/null
-+++ git/src/sendbuttonmenu.h
-@@ -0,0 +1,77 @@
-+#ifndef SENDBUTTONMENU_H
-+#define SENDBUTTONMENU_H
-+
-+#include <QDialog>
-+#include <QMenu>
-+#include <QPointer>
-+#include <QSignalMapper>
-+
-+#include "ui_sendbuttontemplateseditor.h"
-+
-+class SendButtonTemplatesEditor : public QDialog
-+{
-+	Q_OBJECT
-+public:
-+	SendButtonTemplatesEditor(QWidget* parent = 0);
-+
-+private:
-+	Ui::SendButtonTemplatesEditor ui_;
-+	//QString t;
-+	QAction *addChildTemplAction;
-+	QAction *addChildSeparatorAction;
-+	QAction *editAction;
-+	QAction *removeAction;
-+	QAction *upAction;
-+	QAction *downAction;
-+	void swapItem(int);
-+	QStringList genTemplatesList(QTreeWidgetItem* item, QString base_path = "");
-+
-+private slots:
-+	void addRootTemplate();
-+	void addChildTemplate();
-+	void addRootSeparator();
-+	void addChildSeparator();
-+	void removeTemplate();
-+	void editTemplate();
-+	void upTemplate();
-+	void downTemplate();
-+	void selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-+	void contextMenu(QPoint);
-+
-+protected slots:
-+	void accept();
-+	void reject();
-+
-+};
-+
-+class SendButtonTemplatesMenu : public QMenu
-+{
-+	Q_OBJECT
-+public:
-+	SendButtonTemplatesMenu(QWidget* parent);
-+	void setParams(bool ps);
-+	static QStringList getMenuItems(const QString);
-+	static QString addSlashes(QString);
-+	static QString stripSlashes(QString);
-+
-+private:
-+	QSignalMapper *mapper;
-+	bool ps_;
-+	QAction *pasteSendAct;
-+	QAction *onlyPaste;
-+	void updatePsAction();
-+	QAction *makeAction(const QString);
-+
-+private slots:
-+	void update();
-+	void clickOnlyPaste();
-+	void optionChanged(const QString& option);
-+
-+signals:
-+	void doPasteAndSend();
-+	void doEditTemplates();
-+	void doTemplateText(const QString &);
-+
-+};
-+
-+#endif
---- /dev/null
-+++ git/src/sendbuttontemplateseditor.ui
-@@ -0,0 +1,364 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>SendButtonTemplatesEditor</class>
-+ <widget class="QDialog" name="SendButtonTemplatesEditor">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>464</width>
-+    <height>407</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Template editor</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <item>
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-+      <string>Templates</string>
-+     </property>
-+     <layout class="QVBoxLayout">
-+      <item>
-+       <widget class="QLineEdit" name="txtTemplate">
-+        <property name="text">
-+         <string/>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="Line" name="line1">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout">
-+        <item>
-+         <widget class="QTreeWidget" name="lstTemplates">
-+          <property name="contextMenuPolicy">
-+           <enum>Qt::CustomContextMenu</enum>
-+          </property>
-+          <property name="dragEnabled">
-+           <bool>true</bool>
-+          </property>
-+          <property name="dragDropMode">
-+           <enum>QAbstractItemView::InternalMove</enum>
-+          </property>
-+          <property name="defaultDropAction">
-+           <enum>Qt::MoveAction</enum>
-+          </property>
-+          <attribute name="headerVisible">
-+           <bool>false</bool>
-+          </attribute>
-+          <attribute name="headerVisible">
-+           <bool>false</bool>
-+          </attribute>
-+          <column>
-+           <property name="text">
-+            <string notr="true">1</string>
-+           </property>
-+          </column>
-+         </widget>
-+        </item>
-+        <item>
-+         <layout class="QVBoxLayout">
-+          <item>
-+           <widget class="QToolButton" name="btnUp">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>26</width>
-+              <height>51</height>
-+             </size>
-+            </property>
-+            <property name="styleSheet">
-+             <string notr="true">margin:0;padding:0;</string>
-+            </property>
-+            <property name="arrowType">
-+             <enum>Qt::UpArrow</enum>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="btnDown">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>26</width>
-+              <height>51</height>
-+             </size>
-+            </property>
-+            <property name="styleSheet">
-+             <string notr="true">margin:0;padding:0;</string>
-+            </property>
-+            <property name="arrowType">
-+             <enum>Qt::DownArrow</enum>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <widget class="Line" name="line2">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout">
-+        <property name="spacing">
-+         <number>6</number>
-+        </property>
-+        <property name="margin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <widget class="QPushButton" name="btnAdd">
-+          <property name="text">
-+           <string>Add</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QPushButton" name="btnEdit">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Edit</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QPushButton" name="btnRemove">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Remove</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout">
-+     <property name="spacing">
-+      <number>6</number>
-+     </property>
-+     <property name="margin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <spacer>
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnOk">
-+       <property name="text">
-+        <string>Ok</string>
-+       </property>
-+       <property name="autoDefault">
-+        <bool>false</bool>
-+       </property>
-+       <property name="default">
-+        <bool>true</bool>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnCancel">
-+       <property name="text">
-+        <string>Cancel</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <tabstops>
-+  <tabstop>txtTemplate</tabstop>
-+  <tabstop>lstTemplates</tabstop>
-+  <tabstop>btnUp</tabstop>
-+  <tabstop>btnDown</tabstop>
-+  <tabstop>btnAdd</tabstop>
-+  <tabstop>btnEdit</tabstop>
-+  <tabstop>btnRemove</tabstop>
-+  <tabstop>btnOk</tabstop>
-+  <tabstop>btnCancel</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>btnOk</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>265</x>
-+     <y>271</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>-2</x>
-+     <y>287</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnCancel</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>341</x>
-+     <y>283</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>81</x>
-+     <y>272</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnRemove</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>removeTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>290</x>
-+     <y>227</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>199</x>
-+     <y>149</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnEdit</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>editTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>231</x>
-+     <y>269</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnUp</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>upTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>439</x>
-+     <y>120</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnDown</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>downTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>439</x>
-+     <y>196</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>lstTemplates</sender>
-+   <signal>customContextMenuRequested(QPoint)</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>contextMenu(QPoint)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>219</x>
-+     <y>158</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>lstTemplates</sender>
-+   <signal>currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>219</x>
-+     <y>158</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+ <slots>
-+  <slot>removeTemplate()</slot>
-+  <slot>editTemplate()</slot>
-+  <slot>upTemplate()</slot>
-+  <slot>downTemplate()</slot>
-+  <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
-+  <slot>contextMenu(QPoint)</slot>
-+ </slots>
-+</ui>
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -219,7 +219,9 @@ HEADERS += \
- 	$$PWD/bookmarkmanagedlg.h \
- 	$$PWD/vcardphotodlg.h \
- 	$$PWD/psicli.h \
--	$$PWD/coloropt.h
-+	$$PWD/coloropt.h \
-+	$$PWD/sendbuttonmenu.h
-+
- 
- 
- HEADERS += tabcompletion.h
-@@ -353,7 +355,9 @@ SOURCES += \
- 	$$PWD/accountlabel.cpp \
- 	$$PWD/bookmarkmanagedlg.cpp \
- 	$$PWD/vcardphotodlg.cpp \
--	$$PWD/coloropt.cpp
-+	$$PWD/coloropt.cpp \
-+	$$PWD/sendbuttonmenu.cpp
-+
- 
- CONFIG += filetransfer
- filetransfer {
-@@ -583,7 +587,8 @@ FORMS += \
- 	$$PWD/chatdlg.ui \
- 	$$PWD/bookmarkmanage.ui \
- 	$$PWD/ahcommanddlg.ui \
--	$$PWD/ahcformdlg.ui
-+	$$PWD/ahcformdlg.ui \
-+	$$PWD/sendbuttontemplateseditor.ui
- 
- # options dialog
- include($$PWD/options/options.pri)
---- git.orig/src/tabs/tabbablewidget.cpp
-+++ git/src/tabs/tabbablewidget.cpp
-@@ -41,6 +41,12 @@ TabbableWidget::TabbableWidget(const Jid
- 	, pa_(pa)
- 	, tabManager_(tabManager)
- {
-+	if (TabbableWidget::chatsCount == 0) {
-+		TabbableWidget::templateMenu = new SendButtonTemplatesMenu(NULL);
-+		TabbableWidget::templateMenu->setParams(false);
-+		TabbableWidget::templateMenu->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+	}
-+	++TabbableWidget::chatsCount;
- 	QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
- }
- 
-@@ -100,6 +106,42 @@ TabbableWidget::~TabbableWidget()
- 	if (isTabbed()) {
- 		getManagingTabDlg()->removeTabWithNoChecks(this);
- 	}
-+	--TabbableWidget::chatsCount;
-+	if (TabbableWidget::chatsCount == 0) {
-+		if (TabbableWidget::templateMenu != NULL) {
-+			delete TabbableWidget::templateMenu;
-+			TabbableWidget::templateMenu = NULL;
-+		}
-+		if (!TabbableWidget::templateEditDlg.isNull()) {
-+			delete (TabbableWidget::templateEditDlg);
-+			TabbableWidget::templateEditDlg = NULL;
-+		}
-+	}
-+}
-+
-+int TabbableWidget::chatsCount = 0;
-+SendButtonTemplatesMenu *TabbableWidget::templateMenu = NULL;
-+QPointer<SendButtonTemplatesEditor> TabbableWidget::templateEditDlg = NULL;
-+
-+SendButtonTemplatesMenu* TabbableWidget::getTemplateMenu()
-+{
-+	return TabbableWidget::templateMenu;
-+}
-+
-+void TabbableWidget::showTemplateEditor()
-+{
-+	bool new_window = false;
-+	if (TabbableWidget::templateEditDlg.isNull()) {
-+		new_window = true;
-+		TabbableWidget::templateEditDlg = new SendButtonTemplatesEditor(NULL);
-+		if (TabbableWidget::templateMenu) {
-+			TabbableWidget::templateEditDlg->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+			connect(TabbableWidget::templateEditDlg.data(), SIGNAL(accepted()), TabbableWidget::templateMenu, SLOT(update()));
-+		}
-+	}
-+	TabbableWidget::templateEditDlg->show();
-+	if (!new_window)
-+		::bringToFront(TabbableWidget::templateEditDlg);
- }
- 
- /**
---- git.orig/src/tabs/tabbablewidget.h
-+++ git/src/tabs/tabbablewidget.h
-@@ -24,6 +24,7 @@
- #include <QIcon>
- #include "advwidget.h"
- #include "im.h" // ChatState
-+#include "sendbuttonmenu.h"
- 
- namespace XMPP {
- 	class Jid;
-@@ -68,6 +69,11 @@ public:
- 	virtual int unreadMessageCount() const = 0;
- 	virtual QString desiredCaption() const = 0;
- 
-+	// Templates
-+	SendButtonTemplatesMenu* getTemplateMenu();
-+	void showTemplateEditor();
-+	// ---
-+
- signals:
- 	void invalidateTabInfo();
- 	void updateFlashState();
-@@ -90,6 +96,11 @@ private:
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
- 	QIcon icon_;
-+	// Templates
-+	static int chatsCount;
-+	static SendButtonTemplatesMenu *templateMenu;
-+	static QPointer<SendButtonTemplatesEditor> templateEditDlg;
-+	// ---
- };
- 
- #endif

psi-plus-main-20130107.tar.xz/patches/0350-psi-quit-on-close-option.diff Deleted

@@ -1,95 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -152,6 +152,7 @@
- 				<group-sort-style type="QString">alpha</group-sort-style>
- 				<lockdown-roster type="bool">false</lockdown-roster>
- 				<raise-on-new-event type="bool">false</raise-on-new-event>
-+				<quit-on-close type="bool">false</quit-on-close>
- 				<show>
- 					<agent-contacts type="bool">true</agent-contacts>
- 					<away-contacts type="bool">true</away-contacts>
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -1165,7 +1165,7 @@ void MainWin::closeEvent(QCloseEvent* e)
- 	trayHide();
- 	e->accept();
- #else
--	if(d->tray) {
-+	if(d->tray && !PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool()) {
- 		trayHide();
- 		e->accept();
- 		return;
---- git.orig/src/options/opt_application.cpp
-+++ git/src/options/opt_application.cpp
-@@ -67,6 +67,7 @@ QWidget *OptionsTabApplication::widget()
- 
- 
- 	connect(d->le_dtPort, SIGNAL(textChanged(QString)), this, SLOT(updatePortLabel()));
-+	connect(d->ck_docklet, SIGNAL(stateChanged(int)), this, SLOT(doEnableQuitOnClose(int)));
- 
- 	return w;
- }
-@@ -83,6 +84,8 @@ void OptionsTabApplication::applyOptions
- 
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
-+	PsiOptions::instance()->setOption("options.ui.contactlist.quit-on-close", d->ck_quitOnClose->isChecked());
-+
- 	// Auto-update
- 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
- 	
-@@ -108,18 +111,26 @@ void OptionsTabApplication::restoreOptio
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
- 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
-+	d->ck_quitOnClose->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool());
- 
- 	// docklet
- 	d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
- 	d->ck_dockDCstyle->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool() );
- 	d->ck_dockHideMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool() );
- 	d->ck_dockToolMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool() );
-+	doEnableQuitOnClose(d->ck_docklet->isChecked()?1:0);
- 
- 	// data transfer
- 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
- 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
- }
- 
-+void OptionsTabApplication::doEnableQuitOnClose(int state)
-+{
-+	OptApplicationUI *d = (OptApplicationUI *)w;
-+	d->ck_quitOnClose->setEnabled(state>0);
-+}
-+
- void OptionsTabApplication::updatePortLabel()
- {
- 	if ( !w )
---- git.orig/src/options/opt_application.h
-+++ git/src/options/opt_application.h
-@@ -25,6 +25,9 @@ private slots:
- private:
- 	QWidget *w;
- 	bool haveAutoUpdater_;
-+
-+private slots:
-+	void doEnableQuitOnClose(int);
- };
- 
- #endif
---- git.orig/src/options/opt_application.ui
-+++ git/src/options/opt_application.ui
-@@ -79,6 +79,13 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_quitOnClose" >
-+     <property name="text" >
-+      <string>Quit when closing the roster window</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="QLabel" name="textLabel1" >

psi-plus-main-20130107.tar.xz/patches/0360-psi-change-some-icons.diff Deleted

@@ -1,86 +0,0 @@
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -121,7 +121,7 @@ public:
- 		avatarMenu_ = menu->addMenu(tr("Avatar"));
- 		avatarMenu_->addAction(setAvatarAction_);
- 		avatarMenu_->addAction(unsetAvatarAction_);
--		bookmarksMenu_ = menu->addMenu(tr("Bookmarks"));
-+		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));
- 		bookmarksMenu_->addAction(bookmarksManageAction_);
- 		menu->addSeparator();
- 		menu->addAction(addContactAction_);
---- git.orig/src/contactview.cpp
-+++ git/src/contactview.cpp
-@@ -978,7 +978,7 @@ void ContactProfile::doContextMenu(Conta
- 			bookmarks->setEnabled(false);
- 		}
- 
--		pm.insertItem(tr("Bookmarks"), bookmarks);
-+		pm.insertItem(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"), bookmarks);
- 
- 		pm.insertSeparator();
- 		pm.insertItem(IconsetFactory::icon("psi/addContact").icon(), tr("&Add a Contact"), 7);
-@@ -1266,7 +1266,7 @@ void ContactProfile::doContextMenu(Conta
- 		// Voice call
- 		if(d->pa->avCallManager() && !isAgent) {
- 		//if(d->pa->voiceCaller() && !isAgent) {
--			pm.insertItem(IconsetFactory::icon("psi/voice").icon(), tr("Voice Call"), 24);
-+			pm.insertItem(IconsetFactory::icon("psi/avcall").icon(), tr("Voice Call"), 24);
- 			if(!online) {
- 				pm.setItemEnabled(24, false);
- 			}
---- git.orig/src/options/opt_avcall.cpp
-+++ git/src/options/opt_avcall.cpp
-@@ -166,7 +166,7 @@ void options_avcall_update()
- //----------------------------------------------------------------------------
- 
- OptionsTabAvCall::OptionsTabAvCall(QObject *parent)
--: OptionsTab(parent, "avcall", "", tr("Voice Calling"), AvCallManager::isVideoSupported() ? tr("Audio and video device configuration") : tr("Audio device configuration"), "psi/voice")
-+: OptionsTab(parent, "avcall", "", tr("Voice Calling"), AvCallManager::isVideoSupported() ? tr("Audio and video device configuration") : tr("Audio device configuration"), "psi/avcall")
- {
- 	w = 0;
- }
---- git.orig/src/options/opt_plugins.cpp
-+++ git/src/options/opt_plugins.cpp
-@@ -23,7 +23,7 @@ public:
- //----------------------------------------------------------------------------
- 
- OptionsTabPlugins::OptionsTabPlugins(QObject *parent)
--: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/advanced")
-+: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/plugins")
- {
- 	w = 0;
- }
---- git.orig/src/options/opt_tree.cpp
-+++ git/src/options/opt_tree.cpp
-@@ -5,7 +5,7 @@
- #include "psioptionseditor.h"
- 
- OptionsTabTree::OptionsTabTree(QObject *parent) 
--		: OptionsTab(parent, "tree", "", tr("Advanced"), tr("Options for advanced users"), "psi/advanced")
-+		: OptionsTab(parent, "tree", "", tr("Advanced"), tr("Options for advanced users"), "psi/advanced-plus")
- {
- 	w = 0;
- }
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -343,7 +343,7 @@ void PsiChatDlg::initToolButtons()
- 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
- 	ui_.tb_emoticons->setMenu(account()->psi()->iconSelectPopup());
- 
--	act_voice_ = new IconAction(tr("Voice Call"), "psi/voice", tr("Voice Call"), 0, this);
-+	act_voice_ = new IconAction(tr("Voice Call"), "psi/avcall", tr("Voice Call"), 0, this);
- 	connect(act_voice_, SIGNAL(triggered()), SLOT(doVoice()));
- 	//act_voice_->setEnabled(false);
- 	ui_.tb_voice->setDefaultAction(act_voice_);
---- git.orig/src/psicontactmenu.cpp
-+++ git/src/psicontactmenu.cpp
-@@ -331,7 +331,7 @@ public:
- 		openWhiteboardAction_ = new IconAction(tr("Open a &Whiteboard"), this, "psi/whiteboard");
- 		connect(openWhiteboardAction_, SIGNAL(triggered()), SLOT(openWhiteboard()));
- 
--		voiceCallAction_ = new IconAction(tr("Voice Call"), this, "psi/voice");
-+		voiceCallAction_ = new IconAction(tr("Voice Call"), this, "psi/avcall");
- 		connect(voiceCallAction_, SIGNAL(triggered()), SLOT(voiceCall()));
- 
- 		sendFileAction_ = new IconAction(tr("Send &File"), this, "psi/upload");

psi-plus-main-20130107.tar.xz/patches/0370-psi-fix-ns-correcting.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0380-psi-implements-iq-version-stuff-in-discodlg.diff Deleted

@@ -1,103 +0,0 @@
---- git.orig/src/discodlg.cpp
-+++ git/src/discodlg.cpp
-@@ -891,7 +891,7 @@ public: // data
- 	IconAction *actBrowse, *actBack, *actForward, *actRefresh, *actStop;
- 
- 	// custom actions, that will be added to toolbar and context menu
--	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd;
-+	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
- 
- 	typedef QList<History*> HistoryList;
- 	HistoryList backHistory, forwardHistory;
-@@ -1009,6 +1009,9 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 	actAdd = new IconAction (tr("Add to roster"), "psi/addContact", tr("&Add to roster"), 0, dlg);
- 	connect (actAdd, SIGNAL(triggered()), sm, SLOT(map()));
- 	sm->setMapping(actAdd, Features::FID_Add);
-+	actQueryVersion = new IconAction (tr("Query version"), "psi/info", tr("&Query version"), 0, dlg);
-+	connect (actQueryVersion, SIGNAL(triggered()), sm, SLOT(map()));
-+	sm->setMapping(actQueryVersion, Features::FID_QueryVersion);
- 
- 	// create toolbar
- 	toolBar = new QToolBar(tr("Service Discovery toolbar"), dlg);
-@@ -1034,6 +1037,7 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 	toolBar->addAction(actAdd);
- 	toolBar->addAction(actVCard);
- 	toolBar->addAction(actAHCommand);
-+	toolBar->addAction(actQueryVersion);
- 
- 	// select protocol
- 	if (PsiOptions::instance()->getOption("options.ui.show-deprecated.service-discovery.protocol-selector").toBool()) {
-@@ -1203,6 +1207,7 @@ void DiscoDlg::Private::enableButtons(co
- 	actAdd->setEnabled( itemSelected );
- 	actVCard->setEnabled( f.haveVCard() );
- 	actAHCommand->setEnabled( f.canCommand() );
-+	actQueryVersion->setEnabled( f.hasVersion() );
- }
- 
- void DiscoDlg::Private::itemSelected (QTreeWidgetItem *item)
-@@ -1331,7 +1336,8 @@ bool DiscoDlg::Private::eventFilter (QOb
- 			actAdd->addTo(&p);
- 			actVCard->addTo(&p);
- 			actAHCommand->addTo(&p);
--
-+			actQueryVersion->addTo(&p);
-+			
- 			// popup with all available features
- 			QMenu *fm = new QMenu(&p);
- 			QHash<QAction*, int> actions;
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3223,6 +3223,9 @@ void PsiAccount::featureActivated(QStrin
- 		QStringList sl;
- 		dj_add(jid, QString::null, sl, true);
- 	}
-+	else if ( f.hasVersion() ) {
-+		actionQueryVersion(jid);
-+	}
- }
- 
- void PsiAccount::actionManageBookmarks()
-@@ -3722,6 +3725,25 @@ void PsiAccount::actionSendFiles(const J
- 	sendFiles(j, l);
- }
- 
-+void PsiAccount::actionQueryVersion(const Jid& j)
-+{
-+	JT_ClientVersion *task = new JT_ClientVersion(d->client->rootTask());
-+	task->get(j);
-+	connect(task, SIGNAL(finished()), SLOT(queryVersionFinished()));
-+	task->go(true);
-+}
-+
-+void PsiAccount::queryVersionFinished()
-+{
-+	JT_ClientVersion* j = static_cast<JT_ClientVersion*>(sender());
-+	QString text;
-+	text += tr("Name:\t") + j->name();
-+	text += "\n" + tr("Version:\t") + j->version();
-+	text += "\n" + tr("Os:\t") + j->os();
-+	
-+	QMessageBox::information(NULL, QString(tr("Version Query Information")), text);
-+}
-+
- void PsiAccount::actionExecuteCommand(const Jid& j, const QString& node)
- {
- 	Jid j2 = j;
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -353,6 +353,7 @@ public slots:
- 	void actionSetActivity();
- 	void actionSetAvatar();
- 	void actionUnsetAvatar();
-+	void actionQueryVersion(const Jid& j);
- 	void featureActivated(QString feature, Jid jid, QString node);
- 
- 	void actionAssignKey(const Jid &);
-@@ -425,6 +426,7 @@ private slots:
- 
- 	void processReadNext(const UserListItem &);
- 	void processReadNext(const Jid &);
-+	void queryVersionFinished();
- 
- protected:
- 	bool validRosterExchangeItem(const RosterExchangeItem&);

psi-plus-main-20130107.tar.xz/patches/0390-psi-add-feature-jabber-iq-version-to-psi-s-feature-list.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0400-psi-add-iq-version-feature-stuff.diff Deleted

@@ -1,110 +0,0 @@
-From 36ef2857c30dea683d61b30eb4aaec423201a66d Mon Sep 17 00:00:00 2001
-From: Thilo Cestonaro <thilo@cestona.ro>
-Date: Wed, 8 Jul 2009 20:59:07 +0200
-Subject: [PATCH] add iq:version Feature stuff
-
----
- source/iris/src/xmpp/xmpp-im/xmpp_features.cpp |   49 ++++++++++++++++++++++-------------
- work/iris/src/xmpp/xmpp-im/xmpp_features.h   |    2 +
- 2 files changed, 33 insertions(+), 18 deletions(-)
-
---- git.orig/iris/src/xmpp/xmpp-im/xmpp_features.cpp
-+++ git/iris/src/xmpp/xmpp-im/xmpp_features.cpp
-@@ -138,6 +138,15 @@ bool Features::isGateway() const
- 	return test(ns);
- }
- 
-+#define FID_QUERYVERSION "jabber:iq:version"
-+bool Features::hasVersion() const
-+{
-+	QStringList ns;
-+	ns << FID_QUERYVERSION;
-+
-+	return test(ns);
-+}
-+
- #define FID_DISCO "http://jabber.org/protocol/disco"
- bool Features::canDisco() const
- {
-@@ -178,34 +187,36 @@ public:
- 	FeatureName()
- 	: QObject(QCoreApplication::instance())
- 	{
--		id2s[FID_Invalid]	= tr("ERROR: Incorrect usage of Features class");
--		id2s[FID_None]		= tr("None");
--		id2s[FID_Register]	= tr("Register");
--		id2s[FID_Search]	= tr("Search");
--		id2s[FID_Groupchat]	= tr("Groupchat");
--		id2s[FID_Gateway]	= tr("Gateway");
--		id2s[FID_Disco]		= tr("Service Discovery");
--		id2s[FID_VCard]		= tr("VCard");
--		id2s[FID_AHCommand]	= tr("Execute command");
-+		id2s[FID_Invalid]		= tr("ERROR: Incorrect usage of Features class");
-+		id2s[FID_None]			= tr("None");
-+		id2s[FID_Register]		= tr("Register");
-+		id2s[FID_Search]		= tr("Search");
-+		id2s[FID_Groupchat]		= tr("Groupchat");
-+		id2s[FID_Gateway]		= tr("Gateway");
-+		id2s[FID_Disco]			= tr("Service Discovery");
-+		id2s[FID_VCard]			= tr("VCard");
-+		id2s[FID_AHCommand]		= tr("Execute command");
-+		id2s[FID_QueryVersion]	= tr("Query version");
- 
- 		// custom Psi actions
--		id2s[FID_Add]		= tr("Add to roster");
-+		id2s[FID_Add]			= tr("Add to roster");
- 
- 		// compute reverse map
- 		//QMap<QString, long>::Iterator it = id2s.begin();
- 		//for ( ; it != id2s.end(); ++it)
- 		//	s2id[it.data()] = it.key();
- 
--		id2f[FID_Register]	= FID_REGISTER;
--		id2f[FID_Search]	= FID_SEARCH;
--		id2f[FID_Groupchat]	= FID_GROUPCHAT;
--		id2f[FID_Gateway]	= FID_GATEWAY;
--		id2f[FID_Disco]		= FID_DISCO;
--		id2f[FID_VCard]		= FID_VCARD;
--		id2f[FID_AHCommand]	= FID_AHCOMMAND;
-+		id2f[FID_Register]		= FID_REGISTER;
-+		id2f[FID_Search]		= FID_SEARCH;
-+		id2f[FID_Groupchat]		= FID_GROUPCHAT;
-+		id2f[FID_Gateway]		= FID_GATEWAY;
-+		id2f[FID_Disco]			= FID_DISCO;
-+		id2f[FID_VCard]			= FID_VCARD;
-+		id2f[FID_AHCommand]		= FID_AHCOMMAND;
-+		id2f[FID_QueryVersion]	= FID_QUERYVERSION;
- 
- 		// custom Psi actions
--		id2f[FID_Add]		= FID_ADD;
-+		id2f[FID_Add]			= FID_ADD;
- 	}
- 
- 	//QMap<QString, long> s2id;
-@@ -235,6 +246,8 @@ long Features::id() const
- 		return FID_AHCommand;
- 	else if ( test(QStringList(FID_ADD)) )
- 		return FID_Add;
-+	else if ( hasVersion() )
-+		return FID_QueryVersion;
- 
- 	return FID_None;
- }
---- git.orig/iris/src/xmpp/xmpp-im/xmpp_features.h
-+++ git/iris/src/xmpp/xmpp-im/xmpp_features.h
-@@ -49,6 +49,7 @@ namespace XMPP
- 		bool canChatState() const;
- 		bool canCommand() const;
- 		bool isGateway() const;
-+		bool hasVersion() const;
- 		bool haveVCard() const;
- 
- 		enum FeatureID {
-@@ -61,6 +62,7 @@ namespace XMPP
- 			FID_Gateway,
- 			FID_VCard,
- 			FID_AHCommand,
-+			FID_QueryVersion,
- 
- 			// private Psi actions
- 			FID_Add

psi-plus-main-20130107.tar.xz/patches/0410-psi-add-options-color-highliting.diff Deleted

@@ -1,48 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -288,6 +288,7 @@
- 						<sent type="QColor" comment="Color used to indicate sent messages.">#ff0000</sent>
- 						<informational type="QColor" comment="Color used to indicate informational (status change, spooled) messages.">#008000</informational>
- 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
-+						<highlighting type="QColor">#FF0000</highlighting>
- 					</messages>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -285,7 +285,7 @@ void ChatView::renderMucMessage(const Me
- 	QString icon = useMessageIcons_?
- 					(QString("<img src=\"%1\" />").arg(mv.isLocal()?"icon:log_icon_delivered":"icon:log_icon_receive")):"";
- 	if(mv.isAlert()) {
--		textcolor = "#FF0000";
-+		textcolor = PsiOptions::instance()->getOption("options.ui.look.colors.messages.highlighting").value<QColor>().name();
- 		alerttagso = "<b>";
- 		alerttagsc = "</b>";
- 	}
---- git.orig/themes/chatview/psi/classic/index.html
-+++ git/themes/chatview/psi/classic/index.html
-@@ -16,7 +16,7 @@ body > div > img:first-child { vertical-
- .received {}
- .infmsg {}
- .usertext {}
--.alert {font-weight:bold; color:red;}
-+.alert {font-weight:bold;}
- .trackbar { height:1px; border:1px solid black; border-color:#bbf #66f #66f #bbf }
- .nicklink { text-decoration:none; color:inherit; }
-   </style>
-@@ -36,6 +36,7 @@ window[chatServer.jsNamespace()].theme =
- 	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
- 	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
- 	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
-+	var cssAlertMsg = chat.util.findStyleSheet(document.styleSheets[0], ".alert").style;
- 	var useMessageIcons, messageIconsSize = 0;
- 	
- 	var applyPsiSettings = function() {
-@@ -46,6 +47,7 @@ window[chatServer.jsNamespace()].theme =
- 		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
- 		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
- 		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
-+		cssAlertMsg.color = shared.psiOption("options.ui.look.colors.messages.highlighting");
- 		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
- 		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
- 			var d = document.createElement("div");

psi-plus-main-20130107.tar.xz/patches/0420-psi-muc-bookmark-toolbar-button.diff Deleted

@@ -1,282 +0,0 @@
---- git.orig/src/bookmarkmanager.cpp
-+++ git/src/bookmarkmanager.cpp
-@@ -138,6 +138,24 @@ void BookmarkManager::setIsAvailable(boo
- 	}
- }
- 
-+bool BookmarkManager::isBookmarked(const XMPP::Jid &j)
-+{
-+	return indexOfConference(j) >= 0;
-+}
-+
-+void BookmarkManager::removeConference(const XMPP::Jid &j)
-+{
-+	if (isAvailable_) {
-+		QList<ConferenceBookmark> confs;
-+		foreach (ConferenceBookmark c, conferences_) {
-+			if (!c.jid().compare(j, false)) {
-+				confs.push_back(c);
-+			}
-+		}
-+		setBookmarks(confs);
-+	}
-+}
-+
- QList<URLBookmark> BookmarkManager::urls() const
- {
- 	return urls_;
-@@ -148,6 +166,20 @@ QList<ConferenceBookmark> BookmarkManage
- 	return conferences_;
- }
- 
-+int BookmarkManager::indexOfConference(const XMPP::Jid &j) const
-+{
-+	if (isAvailable_) {
-+		int i = 0;
-+		foreach(ConferenceBookmark c, conferences_) {
-+			if (c.jid().compare(j, false)) {
-+				return i;
-+			}
-+			i++;
-+		}
-+	}
-+	return -1;
-+}
-+
- void BookmarkManager::accountStateChanged()
- {
- 	if (!account_->isAvailable()) {
-@@ -214,4 +246,5 @@ void BookmarkManager::setBookmarks_finis
- {
- 	BookmarkTask* t = static_cast<BookmarkTask*>(sender());
- 	Q_UNUSED(t);
-+	emit bookmarksSaved();
- }
---- git.orig/src/bookmarkmanager.h
-+++ git/src/bookmarkmanager.h
-@@ -37,18 +37,22 @@ public:
- 	BookmarkManager(PsiAccount* account);
- 
- 	bool isAvailable() const;
-+	bool isBookmarked(const XMPP::Jid &);
- 
- 	QList<URLBookmark> urls() const;
- 	QList<ConferenceBookmark> conferences() const;
-+	int indexOfConference(const XMPP::Jid &) const;
- 
- 	void setBookmarks(const QList<URLBookmark>&, const QList<ConferenceBookmark>&);
- 	void setBookmarks(const QList<URLBookmark>&);
- 	void setBookmarks(const QList<ConferenceBookmark>&);
-+	void removeConference(const XMPP::Jid &);
- 
- signals:
- 	void availabilityChanged();
- 	void urlsChanged(const QList<URLBookmark>&);
- 	void conferencesChanged(const QList<ConferenceBookmark>&);
-+	void bookmarksSaved();
- 
- private slots:
- 	void getBookmarks_finished();
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -50,6 +50,9 @@
- #include <QTextDocument> // for TextUtil::escape()
- #include <QToolTip>
- #include <QScrollBar>
-+#include <QCheckBox>
-+#include <QDialogButtonBox>
-+#include <QFormLayout>
- 
- #include "psicon.h"
- #include "psiaccount.h"
-@@ -77,6 +80,7 @@
- #include "psicontactlist.h"
- #include "accountlabel.h"
- #include "gcuserview.h"
-+#include "bookmarkmanager.h"
- #include "mucreasonseditor.h"
- #include "mcmdmanager.h"
- #include "lastactivitytask.h"
-@@ -205,7 +209,7 @@ public:
- 	QString password;
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
--	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates;
-+	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
- #endif
-@@ -684,6 +688,19 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 
- 	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
- 	d->act_templates->setMenu(getTemplateMenu());
-+
-+	d->act_bookmark = new IconAction(this);
-+	connect(d->act_bookmark, SIGNAL(triggered()), SLOT(doBookmark()));
-+	ui_.le_topic->addAction(d->act_bookmark);
-+	BookmarkManager *bm = account()->bookmarkManager();
-+	d->act_bookmark->setVisible(bm->isAvailable());
-+	if (bm->isAvailable()) {
-+		updateBookmarkIcon();
-+	}
-+	connect(bm, SIGNAL(availabilityChanged()), SLOT(updateBookmarkIcon()));
-+	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
-+	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
-+
- 	ui_.toolbar->setIconSize(QSize(16,16));
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_configure);
-@@ -896,6 +913,25 @@ void GCMainDlg::updateIdentityVisibility
- 	ui_.lb_ident->setVisible(account()->psi()->contactList()->enabledAccounts().count() > 1);
- }
- 
-+void GCMainDlg::updateBookmarkIcon()
-+{
-+	BookmarkManager *bm = account()->bookmarkManager();
-+	d->act_bookmark->setVisible(bm->isAvailable());
-+	if (bm->isAvailable()) {
-+		QString text;
-+		if (bm->isBookmarked(jid())) {
-+			text = tr("Edit bookmark");
-+			d->act_bookmark->setPsiIcon("psi/bookmark_remove");
-+		} else {
-+			text = tr("Add to bookmarks");
-+			d->act_bookmark->setPsiIcon("psi/bookmark_add");
-+		}
-+		d->act_bookmark->setToolTip(text);
-+		d->act_bookmark->setText(text);
-+		d->act_bookmark->setStatusTip(text);
-+	}
-+}
-+
- #ifdef WHITEBOARDING
- void GCMainDlg::openWhiteboard()
- {
-@@ -1797,6 +1833,7 @@ void GCMainDlg::buildMenu()
- 	if (!PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
- 		d->pm_settings->addAction(d->act_ps);
- 	d->pm_settings->addAction(d->act_nick);
-+	d->pm_settings->addAction(d->act_bookmark);
- }
- 
- void GCMainDlg::chatEditCreated()
-@@ -1855,6 +1892,71 @@ void GCMainDlg::doPasteAndSend()
- 	}
- }
- 
-+void GCMainDlg::doBookmark()
-+{
-+	BookmarkManager *bm = account()->bookmarkManager();
-+	if (!bm->isAvailable()) {
-+		return;
-+	}
-+	QList<ConferenceBookmark> confs =  bm->conferences();
-+	int confInd = bm->indexOfConference(jid());
-+	if (confInd < 0) { // not found
-+		ConferenceBookmark conf(jid().bare(), jid(), false, nick(), d->password);
-+		confs.push_back(conf);
-+		bm->setBookmarks(confs);
-+		return;
-+	}
-+	ConferenceBookmark &b = confs[confInd];
-+	QDialog *dlg = new QDialog(this);
-+	QVBoxLayout *layout = new QVBoxLayout;
-+	QHBoxLayout *blayout = new QHBoxLayout;
-+	QFormLayout *formLayout = new QFormLayout;
-+	QLineEdit *txtName = new QLineEdit;
-+	QLineEdit *txtNick = new QLineEdit;
-+	QCheckBox *chkAJoin = new QCheckBox;
-+	QPushButton *saveBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogSaveButton), tr("Save"), dlg);
-+	QPushButton *deleteBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogDiscardButton), tr("Delete"), dlg);
-+	QPushButton *cancelBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogCancelButton), tr("Cancel"), dlg);
-+
-+	blayout->insertStretch(0);
-+	blayout->addWidget(saveBtn);
-+	blayout->addWidget(deleteBtn);
-+	blayout->addWidget(cancelBtn);
-+	txtName->setText(b.name());
-+	txtNick->setText(b.nick());
-+	chkAJoin->setChecked(b.autoJoin());
-+	formLayout->addRow(tr("&Name:"), txtName);
-+	formLayout->addRow(tr("N&ick:"), txtNick);
-+	formLayout->addRow(tr("&Auto join:"), chkAJoin);
-+	layout->addLayout(formLayout);
-+	layout->addLayout(blayout);
-+	dlg->setLayout(layout);
-+	dlg->setMinimumWidth(300);
-+	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));
-+	dlg->connect(deleteBtn, SIGNAL(clicked()), dlg, SLOT(reject()));
-+	dlg->connect(cancelBtn, SIGNAL(clicked()), dlg, SLOT(reject()));
-+	connect(deleteBtn, SIGNAL(clicked()), this, SLOT(doRemoveBookmark()));
-+
-+	dlg->setWindowTitle(tr("Bookmark conference"));
-+	dlg->adjustSize();
-+	dlg->move(ui_.le_topic->mapToGlobal(QPoint(
-+			ui_.le_topic->width() - dlg->width(), ui_.le_topic->height())));
-+	if (dlg->exec() == QDialog::Accepted) {
-+		ConferenceBookmark conf(txtName->text(), jid(), chkAJoin->checkState() == Qt::Checked, txtNick->text(), d->password);
-+		confs[confInd] = conf;
-+		bm->setBookmarks(confs);
-+	}
-+	delete dlg;
-+}
-+
-+void GCMainDlg::doRemoveBookmark()
-+{
-+	BookmarkManager *bm = account()->bookmarkManager();
-+	if (bm->isAvailable()) {
-+		bm->removeConference(jid());
-+	}
-+}
-+
- void GCMainDlg::psButtonEnabled()
- {
- 	d->act_ps->setEnabled(true);
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -130,6 +130,7 @@ private slots:
- 	void unsetConnecting();
- 	void action_error(MUCManager::Action, int, const QString&);
- 	void updateIdentityVisibility();
-+	void updateBookmarkIcon();
- #ifdef WHITEBOARDING
- 	void openWhiteboard();
- #endif
-@@ -137,6 +138,8 @@ private slots:
- 	void sendButtonMenu();
- 	void editTemplates();
- 	void doPasteAndSend();
-+	void doBookmark();
-+	void doRemoveBookmark();
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
- 
---- git.orig/src/groupchatdlg.ui
-+++ git/src/groupchatdlg.ui
-@@ -71,10 +71,13 @@
-            </widget>
-           </item>
-           <item>
--           <widget class="QLineEdit" name="le_topic" >
-+           <widget class="ActionLineEdit" name="le_topic" >
-             <property name="readOnly" >
-              <bool>true</bool>
-             </property>
-+            <property name="toolButtonStyle" >
-+             <enum>Qt::ToolButtonIconOnly</enum>
-+            </property>
-            </widget>
-           </item>
-           <item>
-@@ -325,6 +328,11 @@
-    <extends>QTextEdit</extends>
-    <header>chateditproxy.h</header>
-   </customwidget>
-+  <customwidget>
-+   <class>ActionLineEdit</class>
-+   <extends>QLineEdit</extends>
-+   <header>actionlineedit.h</header>
-+  </customwidget>
-  </customwidgets>
-  <resources/>
-  <connections/>

psi-plus-main-20130107.tar.xz/patches/0440-psi-configure-hyperlink-color.diff Deleted

@@ -1,35 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -290,6 +290,10 @@
- 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
- 						<highlighting type="QColor">#FF0000</highlighting>
- 					</messages>
-+					<chat>
-+						<link-color type="QColor">#0000ff</link-color>
-+						<mailto-color type="QColor">#0000ff</mailto-color>
-+					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
- 					</passive-popup>
---- git.orig/src/textutil.cpp
-+++ git/src/textutil.cpp
-@@ -417,7 +417,8 @@ QString TextUtil::linkify(const QString 
- 			href = TextUtil::escape(href);
- 			href = linkify_htmlsafe(href);
- 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + TextUtil::escape(link) + "</a>" + TextUtil::escape(pre.mid(cutoff));
-+			QColor lcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.link-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+lcolor.name()+"\">").arg(href) + TextUtil::escape(link) + "</a>" + TextUtil::escape(pre.mid(cutoff));
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}
-@@ -450,7 +451,8 @@ QString TextUtil::linkify(const QString 
- 
- 			href += link;
- 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + link + "</a>";
-+			QColor mcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.mailto-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+mcolor.name()+"\">").arg(href) + link + "</a>";
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}

psi-plus-main-20130107.tar.xz/patches/0450-psi-adhoc-leave-muc.diff Deleted

@@ -1,88 +0,0 @@
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -369,6 +369,7 @@ public:
- 		, rcSetStatusServer(0)
- 		, rcSetOptionsServer(0)
- 		, rcForwardServer(0)
-+		, rcLeaveMucServer(0)
- 		, avatarFactory(0)
- 		, voiceCaller(0)
- 		, avCallManager(0)
-@@ -435,6 +436,7 @@ public:
- 	RCSetStatusServer* rcSetStatusServer;
- 	RCSetOptionsServer* rcSetOptionsServer;
- 	RCForwardServer* rcForwardServer;
-+	RCLeaveMucServer* rcLeaveMucServer;
- 
- 	// Avatars
- 	AvatarFactory* avatarFactory;
-@@ -1127,6 +1129,7 @@ PsiAccount::PsiAccount(const UserAccount
- 	d->rcSetStatusServer = 0;
- 	d->rcSetOptionsServer = 0;
- 	d->rcForwardServer = 0;
-+	d->rcLeaveMucServer =0;
- 	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
- 
- 	// Plugins
-@@ -5833,6 +5836,7 @@ void PsiAccount::setRCEnabled(bool b)
- 	if (b && !d->rcSetStatusServer) {
- 		d->rcSetStatusServer = new RCSetStatusServer(d->ahcManager);
- 		d->rcForwardServer = new RCForwardServer(d->ahcManager);
-+		d->rcLeaveMucServer = new RCLeaveMucServer(d->ahcManager);
- 		d->rcSetOptionsServer = new RCSetOptionsServer(d->ahcManager, d->psi);
- 	}
- 	else if (!b && d->rcSetStatusServer) {
-@@ -5840,6 +5844,8 @@ void PsiAccount::setRCEnabled(bool b)
- 		d->rcSetStatusServer = 0;
- 		delete d->rcForwardServer;
- 		d->rcForwardServer = 0;
-+		delete d->rcLeaveMucServer;
-+		d->rcLeaveMucServer = 0;
- 		delete d->rcSetOptionsServer;
- 		d->rcSetOptionsServer = 0;
- 	}
---- git.orig/src/rc.cpp
-+++ git/src/rc.cpp
-@@ -27,6 +27,7 @@
- #include "xmpp_xdata.h"
- #include "ahcservermanager.h"
- #include "ahcommand.h"
-+#include "groupchatdlg.h"
- 
- using namespace XMPP;
- 
-@@ -245,3 +246,16 @@ AHCommand RCSetOptionsServer::execute(co
- 		return AHCommand::completedReply(c);
- 	}
- }
-+
-+AHCommand RCLeaveMucServer::execute(const AHCommand& c, const Jid& /*j*/)
-+{
-+	foreach (QString gc, manager()->account()->groupchats()) {
-+		Jid mj(gc);
-+		GCMainDlg *gcDlg = manager()->account()->findDialog<GCMainDlg*>(mj.bare());
-+		if (gcDlg) gcDlg->close();
-+	}
-+	XData form;
-+	form.setTitle(QObject::tr("Leave All Conferences"));
-+	form.setType(XData::Data_Form);
-+	return AHCommand::completedReply(c);
-+}
---- git.orig/src/rc.h
-+++ git/src/rc.h
-@@ -54,6 +54,15 @@ public:
- 	virtual AHCommand execute(const AHCommand& c, const Jid&);
- };
- 
-+class RCLeaveMucServer : public RCCommandServer
-+{
-+public:
-+	RCLeaveMucServer(AHCServerManager* m) : RCCommandServer(m) { }
-+	virtual QString name() const { return "Leave All Conferences"; }
-+	virtual QString rcNode() const { return "leave-muc"; }
-+	virtual AHCommand execute(const AHCommand& c, const Jid&);
-+};
-+
- class RCSetOptionsServer : public RCCommandServer
- {
- public:

psi-plus-main-20130107.tar.xz/patches/0460-psi-plugins-fixes.diff Deleted

@@ -1,182 +0,0 @@
---- git.orig/src/plugins/generic/antievil/antievil.cpp
-+++ git/src/plugins/generic/antievil/antievil.cpp
-@@ -42,7 +42,7 @@ public:
- 		return "0.1";
- 	}
- 
--	virtual QWidget* options() const
-+	virtual QWidget* options()
- 	{
- 		return 0;
- 	}
-@@ -91,6 +91,13 @@ public:
- 
- 		return blocked;
- 	}
-+
-+	virtual bool incomingStanza(int account, QDomElement& stanza)
-+	{
-+		Q_UNUSED(account)
-+		Q_UNUSED(stanza)
-+		return false;
-+	}
- 	
- 
- 	//-- StanzaSender ----------------------------------------
-@@ -100,6 +107,9 @@ public:
- 		stanzaSender = host;
- 	}
- 
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
-+
- 
- private:
- 	StanzaSendingHost* stanzaSender;
---- git.orig/src/plugins/generic/consoledump/consoledumpplugin.cpp
-+++ git/src/plugins/generic/consoledump/consoledumpplugin.cpp
-@@ -39,9 +39,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-@@ -72,7 +74,7 @@ QString ConsoleDumpPlugin::version() con
- 	return "0.1";
- }
- 
--QWidget* ConsoleDumpPlugin::options() const
-+QWidget* ConsoleDumpPlugin::options()
- {
- 	return 0;
- }
---- git.orig/src/plugins/generic/echo/echoplugin.cpp
-+++ git/src/plugins/generic/echo/echoplugin.cpp
-@@ -44,12 +44,12 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
- 	// EventFilter
--    virtual bool processEvent(int account, const QDomElement& e);
-+	virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
- 
- 	// StanzaSender
-@@ -59,7 +59,8 @@ public:
- 	virtual void setOptionAccessingHost(OptionAccessingHost* host);
- 	virtual void optionChanged(const QString& option);
- 
--
-+	virtual void applyOptions();
-+	virtual void restoreOptions();
- 
- private:
- 	bool enabled;
-@@ -91,7 +92,7 @@ QString EchoPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* EchoPlugin::options() const
-+QWidget* EchoPlugin::options()
- {
- 	return 0;
- }
-@@ -160,6 +161,4 @@ void EchoPlugin::optionChanged(const QSt
- {
- 	Q_UNUSED(option);
- }
--
--
- #include "echoplugin.moc"
---- git.orig/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-+++ git/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-@@ -44,7 +44,7 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-@@ -52,6 +52,8 @@ public:
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private slots:
- 	void stopGame();
-@@ -95,7 +97,7 @@ QString NoughtsAndCrossesPlugin::version
- 	return "0.1";
- }
- 
--QWidget* NoughtsAndCrossesPlugin::options() const
-+QWidget* NoughtsAndCrossesPlugin::options()
- {
- 	return 0;
- }
---- git.orig/src/plugins/generic/null/nullplugin.cpp
-+++ git/src/plugins/generic/null/nullplugin.cpp
-@@ -34,9 +34,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- };
- 
- Q_EXPORT_PLUGIN(NullPlugin);
-@@ -56,7 +58,7 @@ QString NullPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* NullPlugin::options() const
-+QWidget* NullPlugin::options()
- {
- 	return 0;
- }
---- git.orig/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-+++ git/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-@@ -44,12 +44,14 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private:
- 	bool enabled_;
-@@ -107,7 +109,7 @@ QString URLWatcherPlugin::version() cons
- 	return "0.2";
- }
- 
--QWidget* URLWatcherPlugin::options() const
-+QWidget* URLWatcherPlugin::options()
- {
- 	return 0;
- }

psi-plus-main-20130107.tar.xz/patches/0470-psi-movable-tabs-qt45-and-custom-style.diff Deleted

@@ -1,313 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -366,6 +366,9 @@
- 			</service-discovery>
- 			<tabs>
- 				<show-tab-icons type="bool">true</show-tab-icons>
-+				<disable-wheel-scroll type="bool">false</disable-wheel-scroll>
-+				<can-close-inactive-tab type="bool">true</can-close-inactive-tab>
-+				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
- 				<use-tabs type="bool">true</use-tabs>
- 				<size type="QString"></size> 
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -159,6 +159,7 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 	connect(tabWidget_, SIGNAL(tabContextMenu(int, QPoint, QContextMenuEvent*)), SLOT(showTabMenu(int, QPoint, QContextMenuEvent*)));
- 	connect(tabWidget_, SIGNAL(closeButtonClicked()), SLOT(closeCurrentTab()));
- 	connect(tabWidget_, SIGNAL(currentChanged(QWidget*)), SLOT(tabSelected(QWidget*)));
-+	connect(tabWidget_, SIGNAL(tabCloseRequested(int)), SLOT(tabCloseRequested(int)));
- 
- 	if(delegate_)
- 		delegate_->tabWidgetCreated(this, tabWidget_);
-@@ -803,6 +804,23 @@ void TabDlg::setSimplifiedCaptionEnabled
- 	updateCaption();
- }
- 
-+/**
-+  * the slot is invoked, when small close button is clicked on a tab
-+  * dont close tabs, that are not active.
-+  * \param tab number requested to close
-+  */
-+void TabDlg::tabCloseRequested(int i)
-+{
-+	if (tabWidget_->currentPageIndex() == i)
-+		closeTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
-+	else {
-+		if (PsiOptions::instance()->getOption("options.ui.tabs.can-close-inactive-tab").toBool())
-+			closeTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
-+		else
-+			selectTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
-+	}
-+}
-+
- TabbableWidget* TabDlg::getCurrentTab() const
- {
- 	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
---- git.orig/src/tabs/tabdlg.h
-+++ git/src/tabs/tabdlg.h
-@@ -120,6 +120,7 @@ public slots:
- 	void optionsUpdate();
- 	void detachTab(TabbableWidget*);
- 	void sendTabTo(TabbableWidget*, TabDlg *);
-+	void tabCloseRequested(int i);
- 
- signals:
- 	void resized(QSize size);
---- git.orig/src/widgets/psitabbar.cpp
-+++ git/src/widgets/psitabbar.cpp
-@@ -22,7 +22,8 @@
- #include "psitabwidget.h"
- #include <QMouseEvent>
- #include <QApplication>
--
-+#include <QPainter>
-+#include "psioptions.h"
- /**
-  * Constructor
-  */
-@@ -30,6 +31,13 @@ PsiTabBar::PsiTabBar(PsiTabWidget *paren
- 		: QTabBar(parent)
- 		, dragsEnabled_(true) {
- 	//setAcceptDrops(true);
-+
-+#if QT_VERSION >= 0x040500
-+	setMovable(true);
-+	setTabsClosable(true);
-+	setSelectionBehaviorOnRemove ( QTabBar::SelectPreviousTab );
-+#endif
-+	currTab=-1;
- }
- 
- /**
-@@ -69,20 +77,42 @@ int PsiTabBar::findTabUnder(const QPoint
- } 
- 
- void PsiTabBar::mousePressEvent(QMouseEvent *event) {
--	int tabno = findTabUnder(event->pos());
--	if (event->button() == Qt::LeftButton) {
--		dragStartPosition_ = event->pos();
--		dragTab_ = tabno;
--		if (tabno != -1) {
--			setCurrentIndex(tabno);
-+	QTabBar::mousePressEvent(event);
-+	event->accept();
-+}
-+
-+void PsiTabBar::mouseReleaseEvent ( QMouseEvent * event )
-+{
-+	if (event->button() == Qt::MidButton && findTabUnder(event->pos())!=-1) {
-+		emit mouseMiddleClickTab(findTabUnder(event->pos()));
-+		event->accept();
-+	}
-+	QTabBar::mouseReleaseEvent(event);
-+
-+#if QT_VERSION >= 0x040500
-+	if ((dragTab_ != -1) && (event->button() != Qt::MidButton)) {
-+		this->setCurrentIndex(currentIndex());
-+	}
-+#else
-+	if ((dragTab_ != currTab)&&(currTab!=-1)&&(dragTab_!=-1)) {
-+		if (dragTab_ < currTab) {
-+			this->insertTab(isOnTheLeft ? currTab : currTab+1, this->tabIcon(dragTab_), this->tabText(dragTab_));
-+			this->removeTab(dragTab_);
-+			emit tabMoved(dragTab_, isOnTheLeft ? currTab-1 : currTab);
- 		}
--	} else if (event->button() == Qt::MidButton) {
--		if (tabno != -1) {
--			emit mouseMiddleClickTab(tabno);
-+		else {
-+			this->insertTab(isOnTheLeft ? currTab : currTab+1, this->tabIcon(dragTab_), this->tabText(dragTab_));
-+			this->removeTab(dragTab_+1);
-+			emit tabMoved(dragTab_, isOnTheLeft ? currTab : currTab+1);
- 		}
- 	}
-+
-+	dragTab_ = -1;
-+	currTab = -1;
-+	this->update();
- 	event->accept();
--}
-+#endif
-+};
- 
- /*
-  * Used for starting drags of tabs
-@@ -92,6 +122,7 @@ void PsiTabBar::mouseMoveEvent(QMouseEve
- 		return;
- 	}
- 	if (!(event->buttons() & Qt::LeftButton)) {
-+		currTab=-1;
- 		return;
- 	}
- 	if ((event->pos() - dragStartPosition_).manhattanLength()
-@@ -100,22 +131,21 @@ void PsiTabBar::mouseMoveEvent(QMouseEve
- 	}
- 
- 	if (dragTab_ != -1) {
--		QDrag *drag = new QDrag(this);
--		QMimeData *mimeData = new QMimeData;
--		QByteArray data;
--		QPixmap icon;
--
--		data.setNum(dragTab_);
--
--		mimeData->setData(PSITABDRAGMIMETYPE, data);
--		drag->setMimeData(mimeData);
--		drag->setPixmap(icon);
--
--		Qt::DropAction dropAction = drag->start(Qt::MoveAction);
--		Q_UNUSED(dropAction);
--	}
--
-+#if QT_VERSION < 0x040500
-+	currTab = findTabUnder(event->pos());
-+	this->update(this->tabRect(currTab));
-+
-+	if (tabRect(currTab).center().x() - event->pos().x() > 0)
-+		isOnTheLeft = 1;
-+	else
-+		isOnTheLeft = 0;
-+#endif
-+	}
-+#if QT_VERSION >= 0x040500
-+	QTabBar::mouseMoveEvent(event);
-+#else
- 	event->accept();
-+#endif
- }
- 
- void PsiTabBar::contextMenuEvent(QContextMenuEvent *event) {
-@@ -124,6 +154,9 @@ void PsiTabBar::contextMenuEvent(QContex
- }
- 
- void PsiTabBar::wheelEvent(QWheelEvent *event) {
-+	if (PsiOptions::instance()->getOption("options.ui.tabs.disable-wheel-scroll").toBool())
-+		return;
-+
- 	int numDegrees = event->delta() / 8;
- 	int numSteps = numDegrees / 15;
- 
-@@ -145,3 +178,28 @@ void PsiTabBar::wheelEvent(QWheelEvent *
- void PsiTabBar::setDragsEnabled(bool enabled) {
- 	dragsEnabled_ = enabled;
- }
-+
-+void PsiTabBar::paintEvent(QPaintEvent *event)
-+{
-+	QTabBar::paintEvent(event);
-+#if QT_VERSION < 0x040500
-+	QPainter painter(this);
-+	QPen pen(Qt::cyan);
-+	pen.setWidth(4);
-+	pen.setStyle(Qt::SolidLine);
-+	painter.setPen(pen);
-+	if ( currTab != -1) {
-+		if (isOnTheLeft)
-+			painter.drawLine(tabRect(currTab).topLeft().x()+3, tabRect(currTab).topLeft().y(),
-+			tabRect(currTab).bottomLeft().x()+3, tabRect(currTab ).bottomLeft().y());
-+		else
-+			painter.drawLine(tabRect(currTab).topRight().x(), tabRect(currTab).topRight().y(),
-+			tabRect(currTab).bottomRight().x(), tabRect(currTab ).bottomRight().y());
-+	}
-+#endif
-+};
-+
-+void PsiTabBar::resizeEvent(QResizeEvent * event)
-+{
-+	QTabBar::resizeEvent(event);
-+};
---- git.orig/src/widgets/psitabbar.h
-+++ git/src/widgets/psitabbar.h
-@@ -41,6 +41,9 @@ signals:
- 	void mouseDoubleClickTab(int tab);
- 	void mouseMiddleClickTab(int tab);
- 	void tabDropped(int tab, PsiTabBar *source);
-+#if QT_VERSION <= 0x040500
-+	void tabMoved(int from, int to);
-+#endif
- 	// context menu on the blank space will have tab==-1
- 	void contextMenu(QContextMenuEvent *event, int tab);
- 
-@@ -52,11 +55,16 @@ protected:
- 	void mousePressEvent(QMouseEvent *event);
- 	void contextMenuEvent(QContextMenuEvent *event);
- 	void wheelEvent(QWheelEvent *event);
-+	void paintEvent(QPaintEvent *event);
-+	void mouseReleaseEvent ( QMouseEvent * event );
-+	void resizeEvent(QResizeEvent * event);
- 
- private:
- 	int findTabUnder(const QPoint &pos);
- 	QPoint dragStartPosition_;
- 	int dragTab_;
-+	int currTab;
-+	bool isOnTheLeft;
- 	bool dragsEnabled_;
- };
- 
---- git.orig/src/widgets/psitabwidget.cpp
-+++ git/src/widgets/psitabwidget.cpp
-@@ -79,11 +79,18 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 		closeButton_->hide();
- 		downButton_->hide();
- 	}
-+#if QT_VERSION >= 0x040500
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
-+		tabBar_->setTabsClosable(false);
-+	}
-+#endif
- 	connect( tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
- 	connect( tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
- 	connect( tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));
- 	connect( tabBar_, SIGNAL( contextMenu(QContextMenuEvent*,int)), SLOT( tab_contextMenu(QContextMenuEvent*,int)));
- 	connect( closeButton_, SIGNAL(clicked()), SIGNAL(closeButtonClicked()));
-+	connect(tabBar_, SIGNAL(tabMoved(int,int)),SLOT(widgetMoved(int,int)));
-+	connect(tabBar_, SIGNAL(tabCloseRequested(int)),SIGNAL(tabCloseRequested(int)));
- }
- 
- void PsiTabWidget::setCloseIcon(const QIcon& icon) {
-@@ -348,3 +355,25 @@ void PsiTabWidget::setTabButtonsShown(bo
- void PsiTabWidget::setDragsEnabled(bool enabled) {
- 	((PsiTabBar *)tabBar_)->setDragsEnabled(enabled);
- }
-+
-+void PsiTabWidget::widgetMoved(int from, int to)
-+{
-+	if (from > to) {
-+		stacked_->removeWidget(widgets_[from]);
-+		widgets_.insert(to, 1, widgets_[from]);
-+		widgets_.remove(from+1);
-+		stacked_->insertWidget(to,widgets_[to]);
-+	}
-+	else {
-+		stacked_->removeWidget(widgets_[from]);
-+		widgets_.insert(to+1, 1, widgets_[from]);
-+		widgets_.remove(from,1);
-+		stacked_->insertWidget(to,widgets_[to]);
-+	}
-+
-+#if QT_VERSION <= 0x040500
-+	setCurrentPage(to);
-+#endif
-+	emit currentChanged(currentPage());
-+
-+};
---- git.orig/src/widgets/psitabwidget.h
-+++ git/src/widgets/psitabwidget.h
-@@ -74,6 +74,7 @@ signals:
- 	void currentChanged(QWidget *selected);
- 	void closeButtonClicked();
- 	void aboutToShowMenu(QMenu *);
-+	void tabCloseRequested(int i);
- 
- 	// context menu on the blank space will have tab==-1
- 	void tabContextMenu(int tab, QPoint pos, QContextMenuEvent *event);
-@@ -85,6 +86,7 @@ private slots:
- 	void tab_contextMenu(QContextMenuEvent *event, int tab);
- 	void menu_aboutToShow();
- 	void menu_triggered(QAction *act);
-+	void widgetMoved(int from, int to);
- 
- private:
- 	QVector<QWidget*> widgets_;

psi-plus-main-20130107.tar.xz/patches/0480-psi-customize-dialogs-title-hint.diff Deleted

@@ -1,184 +0,0 @@
---- git.orig/src/accountadddlg.cpp
-+++ git/src/accountadddlg.cpp
-@@ -28,8 +28,11 @@
- AccountAddDlg::AccountAddDlg(PsiCon *_psi, QWidget *parent)
- :QDialog(parent)
- {
--  	setupUi(this);
-+	setupUi(this);
- 	setModal(false);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	psi = _psi;
- 	psi->dialogRegister(this);
- 
---- git.orig/src/accountmanagedlg.cpp
-+++ git/src/accountmanagedlg.cpp
-@@ -95,6 +95,9 @@ AccountRemoveDlg::AccountRemoveDlg(const
- {
- 	setupUi(this);
- 	setModal(false);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	d = new Private;
- 	d->acc = acc;
- 
-@@ -289,8 +292,11 @@ private slots:
- AccountManageDlg::AccountManageDlg(PsiCon *_psi)
- :QDialog(0)
- {
--  	setupUi(this);
-+	setupUi(this);
- 	setModal(false);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	psi = _psi;
- 	psi->dialogRegister(this);
- 
---- git.orig/src/accountmodifydlg.cpp
-+++ git/src/accountmodifydlg.cpp
-@@ -67,6 +67,9 @@ void AccountModifyDlg::init() 
- #ifndef Q_WS_MAC
- 	setWindowIcon(IconsetFactory::icon("psi/account").icon());
- #endif
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 
- 	le_pass->setEnabled(true);
- 	le_host->setEnabled(false);
---- git.orig/src/adduserdlg.cpp
-+++ git/src/adduserdlg.cpp
-@@ -109,6 +109,9 @@ void AddUserDlg::init(const QStringList 
- 
- 	setWindowTitle(CAP(windowTitle()));
- 	setWindowIcon(IconsetFactory::icon("psi/addContact").icon());
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 
- 	d->busy = busy;
- 
---- git.orig/src/bookmarkmanagedlg.cpp
-+++ git/src/bookmarkmanagedlg.cpp
-@@ -33,6 +33,9 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
- 	, model_(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose, true);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	ui_.setupUi(this);
- 	account_->dialogRegister(this);
- 
---- git.orig/src/changepwdlg.cpp
-+++ git/src/changepwdlg.cpp
-@@ -40,6 +40,9 @@ ChangePasswordDlg::ChangePasswordDlg(Psi
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose, true);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	ui_.setupUi(this);
- 
- 	pa = _pa;
---- git.orig/src/discodlg.cpp
-+++ git/src/discodlg.cpp
-@@ -1393,6 +1393,9 @@ DiscoDlg::DiscoDlg(PsiAccount *pa, const
- 	: QDialog(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	setupUi(this);
- 	// restore options
- 	ck_autoItems->setChecked(PsiOptions::instance()->getOption("options.ui.service-discovery.automatically-get-items").toBool());
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1980,6 +1980,9 @@ GCFindDlg::GCFindDlg(const QString& str,
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+        setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	setWindowTitle(tr("Find"));
- 	QVBoxLayout *vb = new QVBoxLayout(this);
- 	vb->setMargin(4);
---- git.orig/src/infodlg.cpp
-+++ git/src/infodlg.cpp
-@@ -125,6 +125,9 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	ui_.setupUi(this);
- 	d = new Private;
- 	setModal(false);
---- git.orig/src/mucjoindlg.cpp
-+++ git/src/mucjoindlg.cpp
-@@ -34,6 +34,9 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	: QDialog(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	setModal(false);
- 	ui_.setupUi(this);
- 	controller_ = psi;
---- git.orig/src/options/optionsdlg.cpp
-+++ git/src/options/optionsdlg.cpp
-@@ -489,6 +489,9 @@ OptionsDlg::OptionsDlg(PsiCon *psi, QWid
- 	pb_apply = buttonBox->button(QDialogButtonBox::Apply);
- 
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint | Qt::WindowContextHelpButtonHint);
-+#endif
- 	d = new Private(this, psi);
- 	setModal(false);
- 	d->psi->dialogRegister(this);
---- git.orig/src/privacy/privacydlg.cpp
-+++ git/src/privacy/privacydlg.cpp
-@@ -34,6 +34,9 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 	ui_.setupUi(this);
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setWindowTitle(tr("%1: Privacy Lists").arg(account_name));
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 
- 	connect(manager_,SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)),SLOT(updateLists(const QString&, const QString&, const QStringList&)));
- 	connect(manager_,SIGNAL(listReceived(const PrivacyList&)),SLOT(refreshList(const PrivacyList&)));
---- git.orig/src/searchdlg.cpp
-+++ git/src/searchdlg.cpp
-@@ -177,6 +177,9 @@ SearchDlg::SearchDlg(const Jid &jid, Psi
- 
- 	setWindowTitle(windowTitle().arg(d->jid.full()));
- 
-+	#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+	#endif
- 	d->busy = busy;
- 
- 	d->gr_form = new QWidget(gb_search);
---- git.orig/src/vcardphotodlg.cpp
-+++ git/src/vcardphotodlg.cpp
-@@ -13,6 +13,9 @@ ShowPhotoDlg::ShowPhotoDlg(QWidget *pare
- 	: QDialog(parent), initSize(true)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+#if QT_VERSION >= 0x040500
-+	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-+#endif
- 	photoPixmap = pixmap;
- 	setWindowTitle(QString(tr("Photo Preview: %1")).arg(parent->windowTitle()));
-

psi-plus-main-20130107.tar.xz/patches/0490-psi-account-menu-privacy-item.diff Deleted

@@ -1,65 +0,0 @@
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -29,6 +29,7 @@
- #include "bookmarkmanager.h"
- #include "psioptions.h"
- #include "iconaction.h"
-+#include "privacy/privacydlg.h"
- 
- class ContactListAccountMenu::Private : public QObject
- {
-@@ -48,6 +49,7 @@ class ContactListAccountMenu::Private : 
- 	QAction* serviceDiscoveryAction_;
- 	QAction* newMessageAction_;
- 	QAction* xmlConsoleAction_;
-+	QAction* privacyListsAction_;
- 	QAction* modifyAccountAction_;
- 	QMenu* adminMenu_;
- 	QAction* adminOnlineUsersAction_;
-@@ -94,6 +96,9 @@ public:
- 		newMessageAction_ = new IconAction(tr("New &Blank Message"), this, "psi/sendMessage");
- 		connect(newMessageAction_, SIGNAL(triggered()), SLOT(newMessage()));
- 
-+		privacyListsAction_ = new IconAction(tr("Privacy Lists"), this, "psi/eye");
-+		connect(privacyListsAction_, SIGNAL(triggered()), SLOT(privacyLists()));
-+
- 		xmlConsoleAction_ = new IconAction(tr("&XML Console"), this, "psi/xml");
- 		connect(xmlConsoleAction_, SIGNAL(triggered()), SLOT(xmlConsole()));
- 
-@@ -127,6 +132,7 @@ public:
- 		menu->addAction(addContactAction_);
- 		menu->addAction(serviceDiscoveryAction_);
- 		menu->addAction(newMessageAction_);
-+		menu->addAction(privacyListsAction_);
- 		menu->addSeparator();
- 		menu->addAction(xmlConsoleAction_);
- 		menu->addSeparator();
-@@ -182,6 +188,7 @@ private slots:
- 		newMessageAction_->setEnabled(account->account()->isAvailable());
- 		addContactAction_->setEnabled(account->account()->isAvailable());
- 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
-+		privacyListsAction_->setEnabled(account->account()->isAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
- 			adminMenu_->menuAction()->setVisible(false);
- 		}
-@@ -275,6 +282,20 @@ private slots:
- 		account->account()->actionSendMessage("");
- 	}
- 
-+	void privacyLists()
-+	{
-+		if (!account)
-+			return;
-+
-+		PrivacyDlg *dlg = account->account()->findDialog<PrivacyDlg*>();
-+		if(!dlg) {
-+			dlg = new PrivacyDlg(account->account()->name(), account->account()->privacyManager());
-+			account->account()->dialogRegister(dlg);
-+			dlg->show();
-+		} else
-+			bringToFront(dlg);
-+	}
-+
- 	void xmlConsole()
- 	{
- 		if (!account)

psi-plus-main-20130107.tar.xz/patches/0500-psi-muc-finddlg-swap-buttons.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0510-psi-muc-roster-size-and-location.diff Deleted

@@ -1,150 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -216,6 +216,9 @@
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-+				<log-width type="int">500</log-width>
-+				<roster-width type="int">80</roster-width>
-+				<roster-at-left type="bool">false</roster-at-left>
- 				<theme comment="The theme used for groupchat messages rendering" type="QString">psi/classic</theme>
- 				<highlight-words type="QStringList" />
- 				<size comment="Remembered window size" type="QSize">
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -234,6 +234,9 @@ public:
- 
- 	QPointer<MUCConfigDlg> configDlg;
- 	QPointer<GroupchatTopicDlg> topicDlg;
-+
-+	int logSize;
-+	int rosterSize;
- public:
- 	bool trackBar;
- 
-@@ -744,12 +747,24 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
-+	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
-+
- 	// resize the horizontal splitter
-+	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
-+	d->rosterSize = PsiOptions::instance()->getOption("options.ui.muc.roster-width").toInt();
- 	QList<int> list;
--	list << 500;
--	list << 80;
-+	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
-+	if(leftRoster)
-+		list << d->rosterSize << d->logSize;
-+	else
-+		list <<  d->logSize << d->rosterSize;
-+
- 	ui_.hsplitter->setSizes(list);
- 
-+	if (leftRoster)
-+		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
-+
-+	// resize the vertical splitter
- 	list.clear();
- 	list << 324;
- 	list << 10;
-@@ -779,6 +794,10 @@ void GCMainDlg::vcard(const QString& _st
- 
- GCMainDlg::~GCMainDlg()
- {
-+	//  Save splitters size
-+	PsiOptions::instance()->setOption("options.ui.muc.log-width", d->logSize);
-+	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
-+
- 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
- 		account()->groupChatLeave(jid().domain(), jid().node());
- 	}
-@@ -799,6 +818,17 @@ GCMainDlg::~GCMainDlg()
- 	}
- }
- 
-+void GCMainDlg::horizSplitterMoved()
-+{
-+	QList<int> list = ui_.hsplitter->sizes();
-+	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
-+	d->rosterSize = !leftRoster ? list.last() : list.first();
-+	d->logSize = leftRoster ? list.last() : list.first();
-+
-+	PsiOptions::instance()->setOption("options.ui.muc.log-width", d->logSize);
-+	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
-+}
-+
- void GCMainDlg::ensureTabbedCorrectly()
- {
- 	TabbableWidget::ensureTabbedCorrectly();
-@@ -806,9 +836,15 @@ void GCMainDlg::ensureTabbedCorrectly()
- 	// QSplitter is broken again, force resize so that
- 	// lv_users gets initizalised properly and context menu
- 	// works in tabs too.
--	QList<int> tmp = ui_.hsplitter->sizes();
-+	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
-+	d->rosterSize = PsiOptions::instance()->getOption("options.ui.muc.roster-width").toInt();
-+	QList<int> list;
-+	if(PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool())
-+		list << d->rosterSize << d->logSize;
-+	else
-+		list <<  d->logSize << d->rosterSize;
- 	ui_.hsplitter->setSizes(QList<int>() << 0);
--	ui_.hsplitter->setSizes(tmp);
-+	ui_.hsplitter->setSizes(list);
- 	UserListItem* u = account()->find(jid().bare());
- 	if(u) {
- 		setTabIcon(PsiIconset::instance()->statusPtr(u)->icon());
-@@ -1973,6 +2009,33 @@ void GCMainDlg::sendTemp(const QString &
- 	}
- }
- 
-+ 
-+
-+void GCMainDlg::resizeEvent(QResizeEvent *e)
-+{
-+	TabbableWidget::resizeEvent(e);
-+
-+	if(!isVisible())
-+		return;
-+
-+	QList<int> sizes = ui_.hsplitter->sizes();
-+	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
-+	int logWidth = !leftRoster ? sizes.first() : sizes.last();
-+	int rosterWidth = leftRoster ? sizes.first() : sizes.last();
-+	int dw = rosterWidth - d->rosterSize;
-+	sizes.clear();
-+	sizes.append(logWidth + dw);
-+	if(leftRoster) {
-+		sizes.prepend(d->rosterSize);
-+	}
-+	else {
-+		sizes.append(d->rosterSize);
-+	}
-+
-+	ui_.hsplitter->setSizes(sizes);
-+	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -88,6 +88,7 @@ protected:
- 	void setShortcuts();
- 
- 	// reimplemented
-+	void resizeEvent(QResizeEvent *e);
- 	void dragEnterEvent(QDragEnterEvent *);
- 	void dropEvent(QDropEvent *);
- 	void closeEvent(QCloseEvent *);
-@@ -142,6 +143,7 @@ private slots:
- 	void doRemoveBookmark();
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
-+	void horizSplitterMoved();
- 
- public:
- 	class Private;

psi-plus-main-20130107.tar.xz/patches/0520-psi-dirty-check.diff Deleted

@@ -1,295 +0,0 @@
---- psi.orig/src/AutoUpdater/AutoUpdater.pri
-+++ psi/src/AutoUpdater/AutoUpdater.pri
-@@ -16,3 +16,16 @@ Sparkle {
- 	
- 	LIBS += -framework Sparkle
- }
-+
-+QuickDirtyChecker {
-+        DEFINES += USE_QDCHECKER
-+
-+        HEADERS += \
-+                $$PWD/QDChecker.h
-+
-+        SOURCES += \
-+                $$PWD/QDChecker.cpp
-+
-+        FORMS += \
-+                $$PWD/QDChangeLog.ui
-+}
---- psi.orig/src/AutoUpdater/QDChangeLog.ui
-+++ psi/src/AutoUpdater/QDChangeLog.ui
-@@ -0,0 +1,71 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>ShowChangeLogForm</class>
-+ <widget class="QWidget" name="ShowChangeLogForm">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>400</width>
-+    <height>300</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>New version is available!</string>
-+  </property>
-+  <layout class="QGridLayout" name="gridLayout">
-+   <property name="margin">
-+    <number>6</number>
-+   </property>
-+   <property name="spacing">
-+    <number>2</number>
-+   </property>
-+   <item row="0" column="0">
-+    <widget class="QTextEdit" name="logText">
-+     <property name="readOnly">
-+      <bool>true</bool>
-+     </property>
-+     <property name="textInteractionFlags">
-+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="0">
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="label">
-+       <property name="text">
-+        <string>Open download page?</string>
-+       </property>
-+       <property name="alignment">
-+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QDialogButtonBox" name="buttonBox">
-+       <property name="standardButtons">
-+        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/AutoUpdater/QDChecker.cpp
-+++ psi/src/AutoUpdater/QDChecker.cpp
-@@ -0,0 +1,100 @@
-+/*
-+ * Quick-and-dirty checker for updates.
-+ * Written by Aleksey Palazhchenko.
-+ * No rights reserved for this ugly code. This file is in public domain.
-+ */
-+
-+#include "QDChecker.h"
-+#include "ui_QDChangeLog.h"
-+
-+#include <QtCore/QUrl>
-+#include <QtGui/QDesktopServices>
-+#include <QtNetwork/QNetworkAccessManager>
-+#include <QtNetwork/QNetworkRequest>
-+#include <QtNetwork/QNetworkReply>
-+#include <QtNetwork/QNetworkProxy>
-+
-+#include "psioptions.h"
-+#include "proxy.h"
-+
-+const QUrl QDChecker::updateCheckUrl_ = QUrl("https://raw.github.com/psi-plus/main/master/version.txt");
-+const QUrl QDChecker::changelogUrl_ = QUrl("https://raw.github.com/psi-plus/main/master/changelog.txt");
-+const QUrl QDChecker::downloadPageUrl_ = QUrl("http://code.google.com/p/psi-dev/downloads/list?q=label:Windows+Installer");
-+
-+const QString QDChecker::settingsKey_ = QLatin1String("options.auto-update.last-check-value");
-+
-+QDChecker::QDChecker()
-+	: manager_(new QNetworkAccessManager(this)), logForm_(0)
-+{
-+	ProxyItem it = ProxyManager::instance()->getItemForObject("Auto Updater");
-+	ProxySettings ps = it.settings;
-+	if(!ps.host.isEmpty()) {
-+		QNetworkProxy prx(QNetworkProxy::HttpCachingProxy, ps.host, ps.port, ps.user, ps.pass);
-+		if(it.type == "socks")
-+			prx.setType(QNetworkProxy::Socks5Proxy);
-+		manager_->setProxy(prx);
-+	}
-+}
-+
-+QDChecker::~QDChecker()
-+{
-+	delete logForm_;
-+}
-+
-+void QDChecker::checkForUpdates()
-+{
-+	QNetworkRequest request(updateCheckUrl_);
-+	QNetworkReply* reply = manager_->get(request);
-+	connect(reply, SIGNAL(finished()), this, SLOT(onCheckFinished()));
-+}
-+
-+void QDChecker::onCheckFinished()
-+{
-+	qDebug("onCheckFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		const QByteArray data = reply->readAll();
-+		const quint16 newValue = qChecksum(data.constData(), data.size());
-+		const quint16 oldValue = PsiOptions::instance()->getOption(settingsKey_).toUInt();
-+
-+		if(newValue != oldValue) {
-+			QNetworkRequest request(changelogUrl_);
-+			QNetworkReply* reply = manager_->get(request);
-+			connect(reply, SIGNAL(finished()), this, SLOT(onDownloadLogFinished()));
-+			PsiOptions::instance()->setOption(settingsKey_, newValue);
-+		}
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onDownloadLogFinished()
-+{
-+	qDebug("onDownloadLogFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		if(logForm_) {
-+			logForm_->deleteLater();
-+		}
-+		Ui::ShowChangeLogForm ui;
-+		logForm_ = new QWidget;
-+		ui.setupUi(logForm_);
-+
-+		ui.logText->setText(QString::fromUtf8(reply->readAll()));
-+
-+		connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(onOpenDownloadPage()));
-+		connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), logForm_, SLOT(hide()));
-+		logForm_->show();
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onOpenDownloadPage()
-+{
-+	QDesktopServices::openUrl(downloadPageUrl_);
-+}
---- psi.orig/src/AutoUpdater/QDChecker.h
-+++ psi/src/AutoUpdater/QDChecker.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Quick-and-dirty checker for updates.
-+ * Written by Aleksey Palazhchenko.
-+ * No rights reserved for this ugly code. This file is in public domain.
-+ */
-+
-+#ifndef QDCHECKER_H
-+#define QDCHECKER_H
-+
-+#include <QtCore/QObject>
-+class QWidget;
-+class QUrl;
-+class QNetworkAccessManager;
-+
-+#include "AutoUpdater.h"
-+
-+class QDChecker : public QObject, public AutoUpdater
-+{
-+	Q_OBJECT
-+
-+public:
-+	QDChecker();
-+	virtual ~QDChecker();
-+
-+	// from AutoUpdater
-+	virtual void checkForUpdates();
-+
-+private slots:
-+	void onCheckFinished();
-+	void onDownloadLogFinished();
-+	void onOpenDownloadPage();
-+
-+private:
-+	QNetworkAccessManager* manager_;
-+	QWidget* logForm_;
-+
-+	static const QUrl updateCheckUrl_;
-+	static const QUrl changelogUrl_;
-+	static const QUrl downloadPageUrl_;
-+
-+	static const QString settingsKey_;
-+};
-+
-+#endif // QDCHECKER_H
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -114,6 +114,8 @@
- #include "AutoUpdater/AutoUpdater.h"
- #ifdef HAVE_SPARKLE
- #include "AutoUpdater/SparkleAutoUpdater.h"
-+#elif defined(USE_QDCHECKER)
-+#	include "AutoUpdater/QDChecker.h"
- #endif
- 
- #ifdef Q_WS_MAC
-@@ -448,14 +450,6 @@ bool PsiCon::init()
- 	d->tuneManager = new TuneControllerManager();
- #endif
- 
--	// Auto updater initialization
--#ifdef HAVE_SPARKLE
--	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
--#endif
--	if (d->autoUpdater && PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool()) {
--		d->autoUpdater->checkForUpdates();
--	}
--
- 	// calculate the small font size
- 	const int minimumFontSize = 7;
- 	common_smallFontSize = qApp->font().pointSize();
-@@ -491,6 +485,15 @@ bool PsiCon::init()
- 	QDir profileDir( pathToProfile(activeProfile, ApplicationInfo::DataLocation) );
- 	profileDir.rmdir( "info" ); // remove unused dir
- 
-+	// Auto updater initialization
-+#ifdef HAVE_SPARKLE
-+	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
-+#elif defined(USE_QDCHECKER)
-+	d->autoUpdater = new QDChecker();
-+#endif
-+	if (PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool() && d->autoUpdater)
-+		d->autoUpdater->checkForUpdates();
-+
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -40,6 +40,7 @@ use_crash {
- }
- 
- # AutoUpdater
-+win32:CONFIG += QuickDirtyChecker
- include($$PWD/AutoUpdater/AutoUpdater.pri)
- 
- # Widgets

psi-plus-main-20130107.tar.xz/patches/0530-psi-temp-show-caps.diff Deleted

@@ -1,46 +0,0 @@
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -2344,6 +2344,8 @@ void PsiAccount::client_resourceAvailabl
- 			//ur.setSecurityEnabled(true);
- 			if(local)
- 				ur.setClient(ApplicationInfo::name(),ApplicationInfo::version(),SystemInfo::instance()->os());
-+			else
-+				ur.setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
- 
- 			u->userResourceList().append(ur);
- 			rp = &u->userResourceList().last();
-@@ -2423,8 +2425,8 @@ void PsiAccount::client_resourceAvailabl
- 		foreach(UserListItem* u, findRelevant(j)) {
- 			UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
- 			if (rit != u->userResourceList().end()) {
--				//(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
--				(*rit).setClient(QString(),QString(),"");
-+				(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
-+				//(*rit).setClient(QString(),QString(),"");
- 				cpUpdate(*u,(*rit).name());
- 			}
- 		}
-@@ -2930,8 +2932,8 @@ void PsiAccount::capsChanged(const Jid& 
- 		bool found = (rit == u->userResourceList().end()) ? false: true;
- 		if(!found)
- 			continue;
--		//(*rit).setClient(name,version,"");
--		(*rit).setClient(QString(),QString(),"");
-+		(*rit).setClient(name,version,"");
-+		//(*rit).setClient(QString(),QString(),"");
- 		cpUpdate(*u);
- 	}
- }
---- git.orig/src/gcuserview.cpp
-+++ git/src/gcuserview.cpp
-@@ -362,8 +362,8 @@ bool GCUserView::maybeTip(const QPoint &
- 	UserResource ur;
- 	ur.setName(nick);
- 	ur.setStatus(s);
--	//ur.setClient(client_name,client_version,"");
--	ur.setClient(QString(),QString(),"");
-+	ur.setClient(client_name,client_version,"");
-+	//ur.setClient(QString(),QString(),"");
- 	u.userResourceList().append(ur);
- 
- 	PsiToolTip::showText(mapToGlobal(pos), u.makeTip(), this);

psi-plus-main-20130107.tar.xz/patches/0540-psi-typeahead-find.diff Deleted

@@ -1,680 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -449,6 +449,8 @@
- 					<item type="QKeySequence">Ctrl+PgUp</item>
- 					<item type="QKeySequence">Ctrl+Shift+Tab</item>
- 				</previous-tab>
-+				<find-next type="QKeySequence" comment="Find text next"></find-next>
-+				<find-prev type="QKeySequence" comment="Find text previous"></find-prev>
- 				<find type="QKeySequence" comment="Find text">Ctrl+F</find>
- 				<send type="QVariantList" comment="Sends the message">
- 					<item type="QKeySequence">Return</item>
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -452,3 +452,8 @@ bool ChatView::internalFind(QString str,
- 
- 	return true;
- }
-+
-+ChatView * ChatView::textWidget()
-+{
-+	return this;
-+}
---- psi.orig/src/chatview_te.h
-+++ psi/src/chatview_te.h
-@@ -61,6 +61,7 @@ public:
- 	void scrollDown();
- 	void doTrackBar();
- 	bool internalFind(QString str, bool startFromBeginning = false);
-+	ChatView *textWidget();
- 
- protected:
- 	// override the tab/esc behavior
---- psi.orig/src/chatview_webkit.cpp
-+++ psi/src/chatview_webkit.cpp
-@@ -355,4 +355,9 @@ bool ChatView::internalFind(QString str,
- 	return found;
- }
- 
-+WebView* ChatView::textWidget()
-+{
-+	return webView;
-+}
-+
- #include "chatview_webkit.moc"
---- psi.orig/src/chatview_webkit.h
-+++ psi/src/chatview_webkit.h
-@@ -65,6 +65,7 @@ public:
- 	void clear();
- 	void doTrackBar();
- 	bool internalFind(QString str, bool startFromBeginning = false);
-+	WebView * textWidget();
- 
- protected:
- 	// override the tab/esc behavior
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -104,7 +104,7 @@ static const QString geometryOption = "o
- 
- 
- #include "groupchattopicdlg.h"
--
-+#include "typeaheadfind.h"
- //----------------------------------------------------------------------------
- // StatusPingTask
- //----------------------------------------------------------------------------
-@@ -210,6 +210,7 @@ public:
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
- 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
-+	TypeAheadFindBar *typeahead;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
- #endif
-@@ -229,8 +230,8 @@ public:
- 	QStringList hist;
- 	int histAt;
- 
--	QPointer<GCFindDlg> findDlg;
--	QString lastSearch;
-+	//QPointer<GCFindDlg> findDlg;
-+	//QString lastSearch;
- 
- 	QPointer<MUCConfigDlg> configDlg;
- 	QPointer<GroupchatTopicDlg> topicDlg;
-@@ -608,7 +609,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->connecting = false;
- 
- 	d->histAt = 0;
--	d->findDlg = 0;
-+	//d->findDlg = 0;
- 	d->configDlg = 0;
- 
- 	d->state = Private::Connected;
-@@ -642,11 +643,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	updateIdentityVisibility();
--
-+/*
- 	d->act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this);
- 	connect(d->act_find, SIGNAL(triggered()), SLOT(openFind()));
- 	ui_.tb_find->setDefaultAction(d->act_find);
--
-+*/
- 	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
- 
- #ifdef Q_WS_MAC
-@@ -661,8 +662,17 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(ui_.lv_users, SIGNAL(action(const QString &, const Status &, int)), SLOT(lv_action(const QString &, const Status &, int)));
- 	connect(ui_.lv_users, SIGNAL(insertNick(const QString&)), d, SLOT(insertNick(const QString&)));
- 
-+	// typeahead find bar
-+	QHBoxLayout *hb3a = new QHBoxLayout();
-+	d->typeahead = new TypeAheadFindBar(ui_.log->textWidget(), tr("Find toolbar"), 0);
-+	hb3a->addWidget( d->typeahead );
-+	ui_.vboxLayout1->addLayout(hb3a);
-+
- 	d->act_clear = new IconAction (tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
- 	connect( d->act_clear, SIGNAL(triggered()), SLOT(doClearButton()));
-+
-+	d->act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
-+	connect(d->act_find, SIGNAL(triggered()), d->typeahead, SLOT(toggleVisibility()));
- 	
- 	d->act_configure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("&Configure Room"), 0, this);
- 	connect(d->act_configure, SIGNAL(triggered()), SLOT(configureRoom()));
-@@ -706,6 +716,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 
- 	ui_.toolbar->setIconSize(QSize(16,16));
- 	ui_.toolbar->addAction(d->act_clear);
-+	ui_.toolbar->addAction(d->act_find);
- 	ui_.toolbar->addAction(d->act_configure);
- #ifdef WHITEBOARDING
- 	ui_.toolbar->addAction(d->act_whiteboard);
-@@ -1126,7 +1137,7 @@ void GCMainDlg::doClearButton()
- 		doClear();
- 	}
- }
--
-+/*
- void GCMainDlg::openFind()
- {
- 	if(d->findDlg)
-@@ -1137,7 +1148,7 @@ void GCMainDlg::openFind()
- 		d->findDlg->show();
- 	}
- }
--
-+*/
- void GCMainDlg::configureRoom()
- {
- 	if(d->configDlg)
-@@ -1151,7 +1162,7 @@ void GCMainDlg::configureRoom()
- 		d->configDlg->show();
- 	}
- }
--
-+/*
- void GCMainDlg::doFind(const QString &str)
- {
- 	d->lastSearch = str;
-@@ -1160,7 +1171,7 @@ void GCMainDlg::doFind(const QString &st
- 	else
- 		d->findDlg->error(str);
- }
--
-+*/
- void GCMainDlg::goDisc()
- {
- 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
-@@ -1742,7 +1753,7 @@ void GCMainDlg::optionsUpdate()
- 
- 	setLooks();
- 	setShortcuts();
--
-+	d->typeahead->optionsUpdate();
- 	// update status icons
- 	ui_.lv_users->updateAll();
- }
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -115,9 +115,9 @@ private slots:
- 	void mle_returnPressed();
- 	void openTopic();
- 	void setTopic(const QString &);
--	void openFind();
-+	//void openFind();
- 	void configureRoom();
--	void doFind(const QString &);
-+	//void doFind(const QString &);
- 	void pa_updatedActivity();
- 	void goDisc();
- 	void goConn();
---- psi.orig/src/groupchatdlg.ui
-+++ psi/src/groupchatdlg.ui
-@@ -96,25 +96,6 @@
-            </widget>
-           </item>
-           <item>
--           <widget class="QToolButton" name="tb_find" >
--            <property name="toolTip" >
--             <string>Select icon</string>
--            </property>
--            <property name="text" >
--             <string/>
--            </property>
--            <property name="iconSize" >
--             <size>
--              <width>16</width>
--              <height>16</height>
--             </size>
--            </property>
--            <property name="popupMode" >
--             <enum>QToolButton::InstantPopup</enum>
--            </property>
--           </widget>
--          </item>
--          <item>
-            <widget class="QToolButton" name="tb_emoticons" >
-             <property name="toolTip" >
-              <string>Select icon</string>
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -308,6 +308,9 @@ void PsiChatDlg::setShortcuts()
- 	ChatDlg::setShortcuts();
- 
- 	act_clear_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
-+// typeahead find bar
-+	act_find->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
-+// -- typeahead
- 	act_info_->setShortcuts(ShortcutManager::instance()->shortcuts("common.user-info"));
- 	act_history_->setShortcuts(ShortcutManager::instance()->shortcuts("common.history"));
- 
-@@ -335,9 +338,21 @@ void PsiChatDlg::updateIdentityVisibilit
- 
- void PsiChatDlg::initToolButtons()
- {
-+// typeahead find
-+	QHBoxLayout *hb3a = new QHBoxLayout();
-+	typeahead = new TypeAheadFindBar(ui_.log->textWidget(), tr("Find toolbar"), 0);
-+	hb3a->addWidget( typeahead );
-+	ui_.vboxLayout1->addLayout(hb3a);
-+// -- typeahead
-+
- 	act_clear_ = new IconAction(tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
- 	connect(act_clear_, SIGNAL(triggered()), SLOT(doClearButton()));
- 
-+// typeahead find
-+	act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
-+	connect(act_find, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
-+// -- typeahead
-+
- 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
- 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
- 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
-@@ -375,6 +390,9 @@ void PsiChatDlg::initToolBar()
- 	ui_.toolbar->setWindowTitle(tr("Chat Toolbar"));
- 	ui_.toolbar->setIconSize(QSize(16, 16));
- 	ui_.toolbar->addAction(act_clear_);
-+// typeahead find bar
-+	ui_.toolbar->addAction(act_find);
-+// -- typeahead
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(act_icon_);
- 	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
-@@ -498,6 +516,8 @@ void PsiChatDlg::optionsUpdate()
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
- 
- 	ChatDlg::optionsUpdate();
-+// typeahead find bar
-+	typeahead->optionsUpdate();
- }
- 
- void PsiChatDlg::updatePGP()
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -8,6 +8,7 @@
- #include "mcmdcompletion.h"
- 
- #include "ui_chatdlg.h"
-+#include "typeaheadfind.h"
- 
- class IconAction;
- 
-@@ -78,6 +79,8 @@ private:
- 	IconAction* act_file_;
- 	IconAction* act_compact_;
- 	IconAction* act_voice_;
-+	TypeAheadFindBar *typeahead;
-+	IconAction* act_find;
- 	IconAction* act_ps_;
- 	IconAction* act_templates_;
- 	QAction *act_mini_cmd_;
---- psi.orig/src/widgets/typeaheadfind.cpp
-+++ psi/src/widgets/typeaheadfind.cpp
-@@ -0,0 +1,290 @@
-+/*
-+ * typeaheadfind.cpp - Typeahead find toolbar
-+ * Copyright (C) 2006  Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "typeaheadfind.h"
-+
-+#include <QAction>
-+#include <QLineEdit>
-+#include <QCheckBox>
-+#include <QLabel>
-+#include <QTextEdit>
-+
-+#include "iconaction.h"
-+#include "stretchwidget.h"
-+#include "shortcutmanager.h"
-+#include "psioptions.h"
-+
-+/**
-+ * \class TypeAheadFindBar
-+ * \brief The TypeAheadFindBar class provides a toolbar for typeahead finding.
-+ */
-+
-+class TypeAheadFindBar::Private
-+{
-+public:
-+	// setup search and react to search results
-+	void doFind(bool backward = false)
-+	{
-+		QTextDocument::FindFlags options;
-+
-+		if (caseSensitive)
-+			options |= QTextDocument::FindCaseSensitively;
-+
-+		if (backward) {
-+			options |= QTextDocument::FindBackward;
-+
-+			if (widgetType == TypeAheadFindBar::WebViewType) {
-+				//FIXME make it work with web
-+			} else {
-+				// move cursor before currect selection
-+				// to prevent finding the same occurence again
-+				QTextCursor cursor = te->textCursor();
-+				cursor.setPosition(cursor.selectionStart());
-+				cursor.movePosition(QTextCursor::Left);
-+				te->setTextCursor(cursor);
-+			}
-+		}
-+
-+		if (find(text, options)) {
-+			le_find->setStyleSheet("");
-+		}
-+		else {
-+			le_find->setStyleSheet("QLineEdit { background: #ff6666; color: #ffffff }");
-+		}
-+	}
-+
-+	// real search code
-+
-+	bool find(const QString &str, QTextDocument::FindFlags options, QTextCursor::MoveOperation start = QTextCursor::NoMove)
-+	{
-+		if (widgetType == TypeAheadFindBar::WebViewType) {
-+#ifdef WEBKIT
-+			QWebPage::FindFlags wkOptions;
-+			wkOptions |= options & QTextDocument::FindBackward? QWebPage::FindBackward : (QWebPage::FindFlags)0;
-+			wkOptions |= options & QTextDocument::FindCaseSensitively? QWebPage::FindCaseSensitively : (QWebPage::FindFlags)0;
-+			return wv->findText(str, wkOptions);
-+#endif
-+		}
-+		if (start != QTextCursor::NoMove) {
-+			QTextCursor cursor = te->textCursor();
-+			cursor.movePosition(start);
-+			te->setTextCursor(cursor);
-+		}
-+
-+		bool found = te->find(text, options);
-+		if (!found) {
-+			if (start == QTextCursor::NoMove)
-+				return find(text, options, options & QTextDocument::FindBackward ? QTextCursor::End : QTextCursor::Start);
-+
-+			return false;
-+		}
-+
-+		return true;
-+	}
-+
-+	QString text;
-+	bool caseSensitive;
-+	TypeAheadFindBar::Type widgetType;
-+
-+	QTextEdit *te;
-+#ifdef WEBKIT
-+	WebView *wv;
-+#endif
-+	QLineEdit *le_find;
-+	QAction *act_next;
-+	QAction *act_prev;
-+	QCheckBox *cb_case;
-+};
-+
-+/**
-+ * \brief Creates new find toolbar, hidden by default.
-+ * \param textedit, QTextEdit that this toolbar will operate on.
-+ * \param title, toolbar's title
-+ * \param parent, toolbar's parent
-+ */
-+TypeAheadFindBar::TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent)
-+: QToolBar(title, parent)
-+{
-+	d = new Private();
-+	d->widgetType = TextEditType;
-+	d->te = textedit;
-+	init();
-+}
-+
-+#ifdef WEBKIT
-+TypeAheadFindBar::TypeAheadFindBar(WebView *webView, const QString &/*title*/, QWidget */*parent*/)
-+{
-+	d = new Private();
-+	d->widgetType = WebViewType;
-+	d->wv = webView;
-+	init();
-+}
-+#endif
-+
-+void TypeAheadFindBar::init()
-+{
-+	setIconSize(QSize(16,16));
-+	setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
-+
-+	d->caseSensitive = false;
-+	d->text = "";
-+
-+	d->le_find = new QLineEdit(this);
-+	d->le_find->setMaximumWidth(200);
-+	d->le_find->setToolTip(tr("Search"));
-+	connect(d->le_find, SIGNAL(textEdited(const QString &)), SLOT(textChanged(const QString &)));
-+	addWidget(d->le_find);
-+
-+	d->act_next = new IconAction(tr("Find next"), "psi/arrowDown", "", 0, this);
-+	d->act_next->setEnabled(false);
-+	d->act_next->setToolTip(tr("Find next"));
-+	connect(d->act_next, SIGNAL(triggered()), SLOT(findNext()));
-+	addAction(d->act_next);
-+
-+	d->act_prev = new IconAction(tr("Find previous"), "psi/arrowUp", "", 0, this);
-+	d->act_prev->setEnabled(false);
-+	d->act_prev->setToolTip(tr("Find previous"));
-+	connect(d->act_prev, SIGNAL(triggered()), SLOT(findPrevious()));
-+	addAction(d->act_prev);
-+
-+	d->cb_case = new QCheckBox(tr("&Case sensitive"), this);
-+	connect(d->cb_case, SIGNAL(stateChanged(int)), SLOT(caseToggled(int)));
-+	addWidget(d->cb_case);
-+
-+	addWidget(new StretchWidget(this));
-+
-+	optionsUpdate();
-+
-+	hide();
-+}
-+
-+/**
-+ * \brief Destroys the toolbar.
-+ */
-+TypeAheadFindBar::~TypeAheadFindBar()
-+{
-+	delete d;
-+	d = 0;
-+}
-+
-+/**
-+ * \brief Should be called when application options are changed.
-+ * This slot updates toolbar's shortcuts.
-+ */
-+void TypeAheadFindBar::optionsUpdate()
-+{
-+	d->act_next->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find-next"));
-+	d->act_prev->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find-prev"));
-+}
-+
-+/**
-+ * \brief Opens (shows) the toolbar.
-+ */
-+void TypeAheadFindBar::open()
-+{
-+	show();
-+	d->le_find->setFocus();
-+	d->le_find->selectAll();
-+	emit visibilityChanged(true);
-+}
-+
-+/**
-+ * \brief Closes (hides) the toolbar.
-+ */
-+void TypeAheadFindBar::close()
-+{
-+	hide();
-+	emit visibilityChanged(false);
-+}
-+
-+/**
-+ * \brief Switched between visible and hidden state.
-+ */
-+void TypeAheadFindBar::toggleVisibility()
-+{
-+	if (isVisible())
-+		hide();
-+	else
-+		//show();
-+		open();
-+}
-+
-+/**
-+ * \brief Private slot activated when find text chagnes.
-+ */
-+void TypeAheadFindBar::textChanged(const QString &str)
-+{
-+	QTextCursor cursor;
-+	if (d->widgetType == TextEditType) {
-+		cursor = d->te->textCursor();
-+	}
-+
-+	if (str.isEmpty()) {
-+		d->act_next->setEnabled(false);
-+		d->act_prev->setEnabled(false);
-+		d->le_find->setStyleSheet("");
-+		if (d->widgetType == WebViewType) {
-+#ifdef WEBKIT
-+			d->wv->page()->findText(""); //its buggy in qt-4.6.0
-+#endif
-+		} else { //TextEditType
-+			cursor.clearSelection();
-+			d->te->setTextCursor(cursor);
-+		}
-+		d->le_find->setStyleSheet("");
-+	}
-+	else {
-+		d->act_next->setEnabled(true);
-+		d->act_prev->setEnabled(true);
-+
-+		if (d->widgetType == TextEditType) {
-+			// don't jump to next word occurence after appending new charater
-+			cursor.setPosition(cursor.selectionStart());
-+			d->te->setTextCursor(cursor);
-+		}
-+
-+		d->text = str;
-+		d->doFind();
-+	}
-+}
-+
-+/**
-+ * \brief Private slot activated when find-next is requested.
-+ */
-+void TypeAheadFindBar::findNext()
-+{
-+	d->doFind();
-+}
-+
-+/**
-+ * \brief Private slot activated when find-prev is requested.
-+ */
-+void TypeAheadFindBar::findPrevious()
-+{
-+	d->doFind(true);
-+}
-+
-+/**
-+ * \brief Private slot activated when case-sensitive box is toggled.
-+ */
-+void TypeAheadFindBar::caseToggled(int state)
-+{
-+	d->caseSensitive = (state == Qt::Checked);
-+}
---- psi.orig/src/widgets/typeaheadfind.h
-+++ psi/src/widgets/typeaheadfind.h
-@@ -0,0 +1,69 @@
-+/*
-+ * typeaheadfind.h - Typeahead find toolbar
-+ * Copyright (C) 2006  Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef TYPEAHEADFIND_H
-+#define TYPEAHEADFIND_H
-+
-+#include <QToolBar>
-+
-+#ifdef WEBKIT
-+#include <webview.h>
-+#endif
-+
-+class QTextEdit;
-+class QString;
-+
-+class TypeAheadFindBar : public QToolBar
-+{
-+	Q_OBJECT
-+public:
-+	enum Type {
-+		TextEditType,
-+		WebViewType
-+	};
-+
-+	TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent = 0);
-+#ifdef WEBKIT
-+	TypeAheadFindBar(WebView *webView, const QString &title, QWidget *parent = 0);
-+#endif
-+	~TypeAheadFindBar();
-+	void init();
-+
-+public slots:
-+	void open();
-+	void close();
-+	void toggleVisibility();
-+	void optionsUpdate();
-+
-+signals:
-+	void visibilityChanged(bool visible);
-+
-+private slots:
-+	void textChanged(const QString &);
-+	void findNext();
-+	void findPrevious();
-+	void caseToggled(int);
-+
-+private:
-+	class Private;
-+	Private *d;
-+};
-+
-+#endif
---- psi.orig/src/widgets/widgets.pri
-+++ psi/src/widgets/widgets.pri
-@@ -16,7 +16,9 @@ SOURCES += \
- 	$$PWD/psitiplabel.cpp \
- 	$$PWD/psitabwidget.cpp \
- 	$$PWD/psitabbar.cpp \
--	$$PWD/actionlineedit.cpp
-+	$$PWD/actionlineedit.cpp \
-+	$$PWD/typeaheadfind.cpp
-+
- 
- HEADERS += \
- 	$$PWD/stretchwidget.h \
-@@ -41,7 +43,8 @@ HEADERS += \
- 	$$PWD/psitiplabel.h \
- 	$$PWD/psitabwidget.h \
- 	$$PWD/psitabbar.h \
--	$$PWD/actionlineedit.h
-+	$$PWD/actionlineedit.h \
-+	$$PWD/typeaheadfind.h
- 
- FORMS += $$PWD/fancypopup.ui
-

psi-plus-main-20130107.tar.xz/patches/0550-psi-improve-tray-tooltip.diff Deleted

@@ -1,307 +0,0 @@
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -55,6 +55,8 @@
- #include "serverinfomanager.h"
- #include "applicationinfo.h"
- #include "psiaccount.h"
-+#include "psievent.h"
-+#include "psitooltip.h"
- #include "psitrayicon.h"
- #include "psitoolbar.h"
- #include "aboutdlg.h"
-@@ -144,6 +146,8 @@ public:
- 	void registerActions();
- 	IconAction* getAction( QString name );
- 	void updateMenu(QStringList actions, QMenu* menu);
-+
-+	QString ToolTipText;
- };
- 
- MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
-@@ -714,7 +718,8 @@ void MainWin::setUseDock(bool use)
- 		connect(d->tray, SIGNAL(clicked(const QPoint &, int)), SLOT(trayClicked(const QPoint &, int)));
- 		connect(d->tray, SIGNAL(doubleClicked(const QPoint &)), SLOT(trayDoubleClicked()));
- 		d->tray->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
--		d->tray->setToolTip(ApplicationInfo::name());
-+		setTrayToolTip();
-+		connect(d->tray, SIGNAL(doToolTip(QObject *, QPoint)), this, SLOT(doTrayToolTip(QObject *, QPoint)));
- 
- 		updateReadNext(d->nextAnim, d->nextAmount);
- 
-@@ -1097,12 +1102,87 @@ void MainWin::buildTrayMenu()
- #endif
- }
- 
--void MainWin::setTrayToolTip(int status)
-+void MainWin::setTrayToolTip()
- {
- 	if (!d->tray) {
- 		return;
- 	}
--	d->tray->setToolTip(QString("Psi - " + status2txt(status)));
-+	QString s = ApplicationInfo::name();
-+	QString str = "<qt>";
-+	QString imgTag = "icon name";
-+	str += QString("<div style='white-space:pre'><b>%1</b></div>").arg(TextUtil::escape(ApplicationInfo::name()));
-+	QString Tip = "";
-+	QString TipPlain = "";
-+	QString Events = "";
-+	QString EventsPlain = "";
-+	foreach(PsiAccount *pa, d->psi->contactList()->enabledAccounts()) {
-+		Status stat = pa->status();
-+		int status = makeSTATUS(stat);
-+		QString istr = "status/offline";
-+		if(status == STATUS_ONLINE)
-+			istr = "status/online";
-+		else if(status == STATUS_AWAY)
-+			istr = "status/away";
-+		else if(status == STATUS_XA)
-+			istr = "status/xa";
-+		else if(status == STATUS_DND)
-+			istr = "status/dnd";
-+		else if(status == STATUS_CHAT)
-+ 			istr = "status/chat";
-+		else if(status == STATUS_INVISIBLE)
-+			istr = "status/invisible";
-+		Tip += QString("<div style='white-space:pre'>") + QString("<%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b>").arg(TextUtil::escape(pa->name())) + "</div>";
-+		TipPlain += "\n" + pa->name() + " (" + stat.typeString() + ")";
-+		QString text = stat.status();		
-+		if(!text.isEmpty()) {
-+			text = clipStatus(text, 40, 1);
-+			Tip += QString("<div style='white-space:pre'>%1: %2</div>").arg(tr("Status Message")).arg(TextUtil::escape(text));
-+		}
-+
-+		PsiEvent *e = 0;
-+		e = pa->eventQueue()->peekNext();
-+		if(e) {
-+			Jid jid = e->jid();
-+			QString from;
-+			if(!jid.isEmpty()) {
-+				LiveRoster Roster = pa->client()->roster();
-+				while(!Roster.isEmpty()) {
-+					LiveRosterItem item = Roster.takeFirst();
-+					if(item.jid().compare(jid)) {
-+						from = item.name();
-+						break;
-+					}
-+				}
-+				if(from.isEmpty()) {
-+					from = jid.full();
-+				}
-+			}
-+			if(!from.isEmpty()) {
-+				Events += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(from));
-+				EventsPlain += "\n" + from;
-+			}
-+		}
-+	}
-+
-+	if(!Tip.isEmpty()) {
-+		str += QString("<div style='white-space:pre'><u><b>%1</b></u></div>").arg(TextUtil::escape(tr("Active accounts:"))) + Tip;
-+		s += tr("\nActive accounts:") + TipPlain;
-+	}
-+
-+	if(!Events.isEmpty()) {
-+		str += QString("<div style='white-space:pre'><u><b>%1</b></u></div>").arg(TextUtil::escape(tr("Incoming event(s) from:"))) + Events;
-+		s += tr("\nIncoming event(s) from:") + EventsPlain;
-+	}
-+
-+	str += "</qt>";
-+
-+	d->ToolTipText = str;
-+	d->tray->setToolTip(s);
-+}
-+
-+void MainWin::doTrayToolTip(QObject *, QPoint p)
-+{
-+	PsiToolTip::showText(p, d->ToolTipText);
- }
- 
- void MainWin::decorateButton(int status)
-@@ -1113,6 +1193,8 @@ void MainWin::decorateButton(int status)
- 		action->setChecked ( d->statusActions[action] == status );
- 	}
- 
-+	setTrayToolTip();
-+
- 	if(d->lastStatus == status) {
- 		return;
- 	}
-@@ -1294,25 +1376,13 @@ void MainWin::toggleVisible()
- 	}
- }
- 
--void MainWin::setTrayToolTip(const Status& status, bool, bool)
-+void MainWin::setTrayToolTip(const Status&, bool, bool)
- {
- 	if (!d->tray) {
- 		return;
- 	}
--	QString s = "Psi";
- 
-- 	QString show = status.show();
--	if(!show.isEmpty()) {
--		show[0] = show[0].toUpper();
--		s += " - "+show;
--	}
--
--	QString text = status.status();
--	if(!text.isEmpty()) {
--		s += ": "+text;
--	}
--
--	d->tray->setToolTip(s);
-+	setTrayToolTip();
- }
- 
- void MainWin::trayClicked(const QPoint &, int button)
-@@ -1387,6 +1457,7 @@ void MainWin::updateReadNext(PsiIcon* an
- 
- 	updateTray();
- 	updateCaption();
-+	setTrayToolTip();
- }
- 
- QString MainWin::numEventsString(int x) const
-@@ -1423,6 +1494,8 @@ void MainWin::updateTray()
- 	
- 	buildTrayMenu();
- 	d->tray->setContextMenu(d->trayMenu);
-+
-+	d->tray->iconsetChanged(PsiOptions::instance()->getOption("options.iconsets.status").toString());
- }
- 
- void MainWin::doRecvNextEvent()
-@@ -1445,6 +1518,7 @@ PsiTrayIcon *MainWin::psiTrayIcon()
- void MainWin::numAccountsChanged()
- {
- 	d->statusButton->setEnabled(d->psi->contactList()->haveEnabledAccounts());
-+	setTrayToolTip();
- }
- 
- void MainWin::accountFeaturesChanged()
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -101,7 +101,7 @@ private slots:
- 	void buildMainMenu();
- 	void buildToolsMenu();
- 
--	void setTrayToolTip(int);
-+	void setTrayToolTip();
- 
- 	void activatedStatusAction(int);
- 
-@@ -145,6 +145,8 @@ private slots:
- 	void registerAction( IconAction * );
- 	void splitterMoved();
- 
-+	void doTrayToolTip(QObject *, QPoint);
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();
---- psi.orig/src/psitrayicon.cpp
-+++ psi/src/psitrayicon.cpp
-@@ -2,6 +2,7 @@
- #include <QPixmapCache>
- #include <QApplication> // old
- #include <QSystemTrayIcon>
-+#include <QHelpEvent>
- 
- #include "psitrayicon.h"
- #include "iconset.h"
-@@ -13,13 +14,16 @@
- 
- PsiTrayIcon::PsiTrayIcon(const QString &tip, QMenu *popup, QObject *parent)
- 	: QObject(parent)
-+	, icon_(NULL)
-+	, trayicon_(new QSystemTrayIcon())
- {
--	icon_ = NULL;
--	trayicon_ = NULL;
--	trayicon_ = new QSystemTrayIcon();
-+
- 	trayicon_->setContextMenu(popup);
- 	setToolTip(tip);
- 	connect(trayicon_,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
-+	trayicon_->installEventFilter(this);
-+
-+	iconsetChanged(PsiOptions::instance()->getOption("options.iconsets.status").toString());
- }
- 
- PsiTrayIcon::~PsiTrayIcon()
-@@ -35,7 +39,11 @@ void PsiTrayIcon::setContextMenu(QMenu*
- 
- void PsiTrayIcon::setToolTip(const QString &str)
- {
-+#ifndef Q_WS_X11
- 	trayicon_->setToolTip(str);
-+#else
-+	Q_UNUSED(str)
-+#endif
- }
- 
- void PsiTrayIcon::setIcon(const PsiIcon *icon, bool alert)
-@@ -78,6 +86,11 @@ bool PsiTrayIcon::isWMDock()
- 	return false;
- }
- 
-+void PsiTrayIcon::iconsetChanged(const QString &iconset)
-+{
-+	iconset_ = iconset;
-+}
-+
- void PsiTrayIcon::show()
- {
- 	trayicon_->show();
-@@ -179,7 +192,7 @@ void PsiTrayIcon::animate()
- 	if ( !icon_ )
- 		return;
- 
--	QString cachedName = "PsiTray/" + PsiOptions::instance()->getOption("options.iconsets.status").toString() + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
-+	QString cachedName = "PsiTray/" + iconset_ + "/" + icon_->name() + "/" + QString::number( icon_->frameNumber() );
- 
- 	QPixmap p;
- 	if ( !QPixmapCache::find(cachedName, p) ) {
-@@ -188,3 +201,12 @@ void PsiTrayIcon::animate()
- 	}
- 	trayicon_->setIcon(p);
- }
-+
-+bool PsiTrayIcon::eventFilter(QObject *obj, QEvent *event)
-+{
-+	if(obj == trayicon_ && event->type() == QEvent::ToolTip) {
-+		doToolTip(obj, ((QHelpEvent*)event)->globalPos());
-+		return true;
-+	}
-+	return QObject::eventFilter(obj, event);
-+}
---- psi.orig/src/psitrayicon.h
-+++ psi/src/psitrayicon.h
-@@ -25,10 +25,13 @@ public:
- 
- 	bool isWMDock();
- 
-+	void iconsetChanged(const QString& iconset);
-+
- signals:
- 	void clicked(const QPoint &, int);
- 	void doubleClicked(const QPoint &);
- 	void closed();
-+	void doToolTip(QObject *, QPoint);
- 
- public slots:
- 	void show();
-@@ -41,10 +44,12 @@ private slots:
- protected:
- 	QPixmap makeIcon();
- 	QRgb pixelBlend(QRgb p1, QRgb p2);
-+	bool eventFilter( QObject *, QEvent * );
- 
- private:
- 	PsiIcon* icon_;
- 	QSystemTrayIcon* trayicon_;
-+	QString iconset_;
- };
- 
-

psi-plus-main-20130107.tar.xz/patches/0560-psi-activity-icons-and-description.diff Deleted

@@ -1,676 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -169,6 +169,7 @@
- 					<radius type="int">5</radius>
- 				</avatars>
- 				<show-mood-icons type="bool">true</show-mood-icons>
-+				<show-activity-icons type="bool">true</show-activity-icons>
- 				<show-tune-icons type="bool">true</show-tune-icons>
- 				<show-client-icons type="bool">true</show-client-icons>
- 				<show-all-client-icons type="bool">false</show-all-client-icons>
---- git.orig/src/activity.cpp
-+++ git/src/activity.cpp
-@@ -67,6 +67,16 @@ const QString& Activity::text() const
- 	return text_;
- }
- 
-+QString Activity::typeValue() const
-+{
-+	return ActivityCatalog::instance()->findEntryByType(type_).value();
-+}
-+
-+QString Activity::specificTypeValue() const
-+{
-+	return ActivityCatalog::instance()->findEntryByType(specificType_).value();
-+}
-+
- bool Activity::isNull() const
- {
- 	return type_ == Unknown && text().isEmpty();
---- git.orig/src/activitydlg.cpp
-+++ git/src/activitydlg.cpp
-@@ -25,6 +25,7 @@
- #include "activitycatalog.h"
- #include "psiaccount.h"
- #include "pepmanager.h"
-+#include "psiiconset.h"
- 
- ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
- {
-@@ -36,12 +37,20 @@ ActivityDlg::ActivityDlg(PsiAccount* pa)
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
- 
- 	ui_.cb_general_type->addItem(tr("<unset>"));
-+	Activity::Type at = pa->activity().type();
-+	int i=1;
- 	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
- 		if (e.specificType() == Activity::UnknownSpecific) {
- 			// The entry e is for a 'general' type.
--			ui_.cb_general_type->addItem(e.text());
-+			ui_.cb_general_type->addItem(IconsetFactory::icon("activities/"+e.value()).icon(), e.text());
-+			if (e.type() == at) {
-+				ui_.cb_general_type->setCurrentIndex(i);
-+				loadSpecificActivities(ui_.cb_general_type->currentText());
-+			}
-+			i++;
- 		}
- 	}
-+	ui_.le_description->setText(pa->activity().text());
- }
- 
- void ActivityDlg::loadSpecificActivities(const QString& generalActivityStr)
-@@ -53,13 +62,19 @@ void ActivityDlg::loadSpecificActivities
- 	}
- 	else {
- 		ui_.cb_specific_type->addItem(tr("<unset>"));
-+		Activity::SpecificType at = pa_->activity().specificType();
-+		int i=1;
- 		ActivityCatalog* ac = ActivityCatalog::instance();
- 		foreach(ActivityCatalog::Entry e, ac->entries()) {
- 			if (e.specificType() != Activity::UnknownSpecific) {
- 				// The entry e is for a 'specific' type.
- 				ActivityCatalog::Entry ge = ac->findEntryByText(generalActivityStr);
- 				if (e.type() == ge.type()) {
--					ui_.cb_specific_type->addItem(e.text());
-+					ui_.cb_specific_type->addItem(IconsetFactory::icon("activities/"+ge.value()+"_"+e.value()).icon(), e.text());
-+					if (e.specificType() == at) {
-+						ui_.cb_specific_type->setCurrentIndex(i);
-+					}
-+					i++;
- 				}
- 			}
- 		}
---- git.orig/src/activity.h
-+++ git/src/activity.h
-@@ -75,6 +75,8 @@ public:
- 
- 	Type type() const;
- 	QString typeText() const;
-+	QString typeValue() const;
-+	QString specificTypeValue() const;
- 	SpecificType specificType() const;
- 	QString specificTypeText() const;
- 	const QString& text() const;
---- git.orig/src/options/opt_appearance.cpp
-+++ git/src/options/opt_appearance.cpp
-@@ -95,6 +95,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
- {
- 	addTab( new OptionsTabIconsetEmoticons(this) );
- 	addTab( new OptionsTabIconsetMoods(this) );
-+	addTab( new OptionsTabIconsetActivity(this) );
- 	addTab( new OptionsTabIconsetClients(this) );
- 	addTab( new OptionsTabIconsetRoster(this) );
- 	addTab( new OptionsTabIconsetSystem(this) );
---- /dev/null
-+++ git/src/options/opt_iconset_activity.ui
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>IconsetActivity</class>
-+ <widget class="QWidget" name="IconsetActivity">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>256</width>
-+    <height>195</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>IconsetActivityUI</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-+    <number>9</number>
-+   </property>
-+   <item>
-+    <widget class="QGroupBox" name="groupBox9">
-+     <property name="title">
-+      <string>Activity iconsets</string>
-+     </property>
-+     <layout class="QGridLayout">
-+      <property name="margin">
-+       <number>8</number>
-+      </property>
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item row="1" column="2">
-+       <spacer>
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeType">
-+         <enum>QSizePolicy::Expanding</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>204</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+      <item row="1" column="3">
-+       <widget class="IconButton" name="pb_activityDetails" native="true">
-+        <property name="text" stdset="0">
-+         <string>&amp;Show Details</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item row="0" column="0" colspan="4">
-+       <widget class="IconsetSelect" name="iss_activity" native="true"/>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QProgressBar" name="progress">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconButton</class>
-+   <extends></extends>
-+   <header>iconbutton.h</header>
-+  </customwidget>
-+  <customwidget>
-+   <class>IconsetSelect</class>
-+   <extends></extends>
-+   <header>iconsetselect.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/options/opt_iconset.cpp
-+++ git/src/options/opt_iconset.cpp
-@@ -24,6 +24,7 @@
- 
- #include "ui_opt_iconset_emo.h"
- #include "ui_opt_iconset_mood.h"
-+#include "ui_opt_iconset_activity.h"
- #include "ui_opt_iconset_client.h"
- #include "ui_opt_iconset_system.h"
- #include "ui_opt_iconset_roster.h"
-@@ -47,6 +48,12 @@ public:
- 	IconsetClientUI() : QWidget() { setupUi(this); }
- };
- 
-+class IconsetActivityUI : public QWidget, public Ui::IconsetActivity
-+{
-+public:
-+	IconsetActivityUI() : QWidget() { setupUi(this); }
-+};
-+
- class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
- {
- public:
-@@ -809,6 +816,153 @@ void OptionsTabIconsetMoods::cancelThrea
- 		thread = 0;
- 	}
- }
-+//----------------------------------------------------------------------------
-+// OptionsTabIconsetActivity
-+//----------------------------------------------------------------------------
-+
-+OptionsTabIconsetActivity::OptionsTabIconsetActivity(QObject *parent)
-+	: OptionsTab(parent, "iconset_activities", "", tr("Activity"), tr("Select your activity iconset"))
-+	, w(0)
-+	, thread(0)
-+{
-+}
-+
-+OptionsTabIconsetActivity::~OptionsTabIconsetActivity()
-+{
-+	cancelThread();
-+}
-+
-+QWidget *OptionsTabIconsetActivity::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new IconsetActivityUI;
-+	IconsetActivityUI *d = (IconsetActivityUI *)w;
-+
-+	connect(d->pb_activityDetails, SIGNAL(clicked()), SLOT(previewIconset()));
-+
-+	return w;
-+}
-+
-+void OptionsTabIconsetActivity::applyOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetActivityUI *d = (IconsetActivityUI *)w;
-+
-+	const Iconset *is = d->iss_activity->iconset();
-+	if ( is ) {
-+		QFileInfo fi( is->fileName() );
-+		PsiOptions::instance()->setOption("options.iconsets.activities", fi.fileName());
-+	}
-+}
-+
-+void OptionsTabIconsetActivity::restoreOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetActivityUI *d = (IconsetActivityUI *)w;
-+
-+	d->iss_activity->clear();
-+	QStringList loaded;
-+
-+	d->setCursor(Qt::WaitCursor);
-+
-+	QPalette customPal = d->palette();
-+	customPal.setCurrentColorGroup(QPalette::Inactive);
-+	d->iss_activity->setEnabled(false);
-+	d->iss_activity->setPalette(customPal);
-+
-+	d->pb_activityDetails->setEnabled(false);
-+	d->pb_activityDetails->setPalette(customPal);
-+
-+	d->progress->show();
-+	d->progress->setValue( 0 );
-+
-+	numIconsets = countIconsets("/activities", loaded);
-+	iconsetsLoaded = 0;
-+
-+	cancelThread();
-+
-+	thread = new IconsetLoadThread(this, "/activities");
-+	thread->start();
-+}
-+
-+bool OptionsTabIconsetActivity::event(QEvent *e)
-+{
-+	IconsetActivityUI *d = (IconsetActivityUI *)w;
-+	if ( e->type() == QEvent::User ) { // iconset load event
-+		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
-+
-+		if ( thread != le->thread() )
-+			return false;
-+
-+		if ( !numIconsets )
-+			numIconsets = 1;
-+		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
-+
-+		Iconset *i = le->iconset();
-+		if ( i ) {
-+			PsiIconset::instance()->stripFirstAnimFrame(i);
-+			d->iss_activity->insert(*i);
-+
-+			QFileInfo fi( i->fileName() );
-+			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.activities").toString() )
-+				d->iss_activity->setItemSelected(d->iss_activity->lastItem(), true);
-+
-+			delete i;
-+		}
-+
-+		return true;
-+	}
-+	else if ( e->type() == QEvent::User + 1 ) { // finish event
-+		d->iss_activity->setEnabled(true);
-+		d->iss_activity->setPalette(QPalette());
-+
-+		d->pb_activityDetails->setEnabled(true);
-+		d->pb_activityDetails->setPalette(QPalette());
-+
-+		connect(d->iss_activity, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
-+
-+		d->progress->hide();
-+
-+		d->unsetCursor();
-+		thread = 0;
-+
-+		return true;
-+	}
-+
-+	return false;
-+}
-+
-+void OptionsTabIconsetActivity::previewIconset()
-+{
-+	IconsetActivityUI *d = (IconsetActivityUI *)w;
-+	const Iconset *is = d->iss_activity->iconset();
-+	if (is) {
-+		isDetails(*is, parentWidget->parentWidget(), psi);
-+	}
-+}
-+
-+void OptionsTabIconsetActivity::setData(PsiCon *psicon, QWidget *p)
-+{
-+	psi = psicon;
-+	parentWidget = p;
-+}
-+
-+void OptionsTabIconsetActivity::cancelThread()
-+{
-+	if ( thread ) {
-+		threadCancelled.lock();
-+		thread->cancelled = true;
-+		threadCancelled.unlock();
-+
-+		thread = 0;
-+	}
-+}
- 
- //----------------------------------------------------------------------------
- // OptionsTabIconsetClients
---- git.orig/src/options/opt_iconset.h
-+++ git/src/options/opt_iconset.h
-@@ -93,6 +93,34 @@ private:
- 	IconsetLoadThread *thread;
- };
- 
-+class OptionsTabIconsetActivity : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabIconsetActivity(QObject *parent);
-+	~OptionsTabIconsetActivity();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	bool stretchable() const { return true; }
-+
-+private slots:
-+	void setData(PsiCon *, QWidget *);
-+	void previewIconset();
-+
-+protected:
-+	bool event(QEvent *);
-+	void cancelThread();
-+
-+private:
-+	QWidget *w, *parentWidget;
-+	PsiCon *psi;
-+
-+	int numIconsets, iconsetsLoaded;
-+	IconsetLoadThread *thread;
-+};
-+
- class OptionsTabIconsetClients : public OptionsTab
- {
- 	Q_OBJECT
---- git.orig/src/options/options.pri
-+++ git/src/options/options.pri
-@@ -62,6 +62,7 @@ FORMS += \
- 	$$PWD/ui_isdetails.ui \
- 	$$PWD/opt_iconset_emo.ui \
- 	$$PWD/opt_iconset_mood.ui \
-+	$$PWD/opt_iconset_activity.ui \
- 	$$PWD/opt_iconset_client.ui \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
---- git.orig/src/options/opt_roster.cpp
-+++ git/src/options/opt_roster.cpp
-@@ -69,6 +69,7 @@ void OptionsTabRoster::applyOptions()
- 	//enabled icons
- 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-activity-icons", d->ck_showActivityIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
-@@ -94,6 +95,7 @@ void OptionsTabRoster::restoreOptions()
- 	//enabled icons
- 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
- 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
-+	d->ck_showActivityIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-activity-icons").toBool() );
- 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
- 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
- 	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
---- git.orig/src/options/opt_roster.ui
-+++ git/src/options/opt_roster.ui
-@@ -1,3 +1,4 @@
-+<?xml version="1.0" encoding="UTF-8"?>
- <ui version="4.0">
-  <class>OptRoster</class>
-  <widget class="QWidget" name="OptRoster">
-@@ -5,8 +6,8 @@
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>343</width>
--    <height>401</height>
-+    <width>357</width>
-+    <height>452</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -65,13 +66,7 @@
-      <property name="title">
-       <string>Icons</string>
-      </property>
--     <layout class="QVBoxLayout">
--      <property name="spacing">
--       <number>6</number>
--      </property>
--      <property name="margin">
--       <number>10</number>
--      </property>
-+     <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QCheckBox" name="ck_showAvatarIcons">
-         <property name="whatsThis">
-@@ -93,30 +88,40 @@
-        </widget>
-       </item>
-       <item>
--       <widget class="QCheckBox" name="ck_showTuneIcons">
-+       <widget class="QCheckBox" name="ck_showActivityIcons">
-         <property name="whatsThis">
--         <string>Show icon when contact is listening to music</string>
-+         <string>Show activities in roster</string>
-         </property>
-         <property name="text">
--         <string>Now playing</string>
-+         <string>Activities</string>
-         </property>
-        </widget>
-       </item>
-       <item>
--       <layout class="QHBoxLayout" >
--        <property name="spacing" >
--         <number>5</number>
--        </property>
--        <item>
--       <widget class="QCheckBox" name="ck_showClientIcons">
-+       <widget class="QCheckBox" name="ck_showTuneIcons">
-         <property name="whatsThis">
--         <string>Show icon of user client</string>
-+         <string>Show icon when contact is listening to music</string>
-         </property>
-         <property name="text">
--         <string>Clients</string>
-+         <string>Now playing</string>
-         </property>
-        </widget>
-       </item>
-+      <item>
-+       <layout class="QHBoxLayout">
-+        <property name="spacing">
-+         <number>5</number>
-+        </property>
-+        <item>
-+         <widget class="QCheckBox" name="ck_showClientIcons">
-+          <property name="whatsThis">
-+           <string>Show icon of user client</string>
-+          </property>
-+          <property name="text">
-+           <string>Clients</string>
-+          </property>
-+         </widget>
-+        </item>
-         <item>
-          <widget class="QComboBox" name="cb_showAllClientIcons" >
-           <item>
-@@ -224,4 +229,5 @@
-   <tabstop>ck_showTuneIcons</tabstop>
-  </tabstops>
-  <resources/>
-+ <connections/>
- </ui>
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -5505,6 +5505,11 @@ QString PsiAccount::nick() const
- 	return d->self.name();
- }
- 
-+const Activity &PsiAccount::activity() const
-+{
-+	return d->self.activity();
-+}
-+
- const Mood &PsiAccount::mood() const
- {
- 	return d->self.mood();
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -33,6 +33,7 @@
- #include "xmpp_status.h"
- #include "psiactions.h"
- #include "mood.h"
-+#include "activity.h"
- 
- namespace XMPP
- {
-@@ -140,6 +141,7 @@ public:
- 	void setNick(const QString &);
- 	QString nick() const;
- 	const Mood &mood() const;
-+	const Activity &activity() const;
- 	void forceDisconnect(bool fast, const XMPP::Status &s);
- 	bool hasPGP() const;
- 	QHostAddress *localAddress() const;
---- git.orig/src/psiiconset.cpp
-+++ git/src/psiiconset.cpp
-@@ -42,8 +42,8 @@ class PsiIconset::Private
- private:
- 	PsiIconset *psi;
- public:
--	Iconset system, moods, clients;
--	QString cur_system, cur_status, cur_moods, cur_clients;
-+	Iconset system, moods, clients, activities;
-+	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity;
- 	QStringList cur_emoticons;
- 	QMap<QString, QString> cur_service_status;
- 	QMap<QString, QString> cur_custom_status;
-@@ -245,6 +245,23 @@ public:
- 		return def;
- 	}
- 
-+	Iconset activityIconset(bool *ok)
-+	{
-+		Iconset def;
-+		*ok = def.load( iconsetPath("activities/default") );
-+
-+		if ( PsiOptions::instance()->getOption("options.iconsets.activities").toString() != "default" ) {
-+			Iconset is;
-+			is.load ( iconsetPath("activities/" + PsiOptions::instance()->getOption("options.iconsets.activities").toString()) );
-+
-+			loadIconset(&def, &is);
-+		}
-+
-+		stripFirstAnimFrame( def );
-+
-+		return def;
-+	}
-+
- 	Iconset clientsIconset(bool *ok)
- 	{
- 		Iconset def;
-@@ -401,6 +418,21 @@ bool PsiIconset::loadMoods()
- 	return ok;
- }
- 
-+bool PsiIconset::loadActivity()
-+{
-+	bool ok = true;
-+	QString cur_activity = PsiOptions::instance()->getOption("options.iconsets.activities").toString();
-+	if (d->cur_activity != cur_activity) {
-+		Iconset activities = d->activityIconset(&ok);
-+		d->loadIconset(&d->activities, &activities);
-+		d->activities.addToFactory();
-+
-+		d->cur_activity = cur_activity;
-+	}
-+
-+	return ok;
-+}
-+
- bool PsiIconset::loadClients()
- {
- 	bool ok = true;
-@@ -423,6 +455,7 @@ bool PsiIconset::loadAll()
- 
- 	loadEmoticons();
- 	loadMoods();
-+	loadActivity();
- 	loadClients();
- 	return true;
- }
-@@ -438,6 +471,9 @@ void PsiIconset::optionChanged(const QSt
- 	else if (option == "options.iconsets.moods") {
- 		loadMoods();
- 	}
-+	else if (option == "options.iconsets.activities") {
-+		loadActivity();
-+	}
- 	else if (option == "options.iconsets.clients") {
- 		loadClients();
- 	}
---- git.orig/src/psiiconset.h
-+++ git/src/psiiconset.h
-@@ -45,6 +45,7 @@ public:
- 	QHash<QString, Iconset*> roster;
- 	QList<Iconset*> emoticons;
- 	Iconset moods;
-+	Iconset activities;
- 	Iconset clients;
- 	const Iconset &system() const;
- 	void stripFirstAnimFrame(Iconset *);
-@@ -98,6 +99,7 @@ private:
- 	bool loadRoster();
- 	void loadEmoticons();
- 	bool loadMoods();
-+	bool loadActivity();
- 	bool loadClients();
- };
- 
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -751,12 +751,17 @@ QString UserListItem::makeBareTip(bool t
- 
- 	// User Activity
- 	if (!activity().isNull()) {
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " + activity().typeText();
-+		QString act = activity().typeValue();
-+		if (activity().specificType() != Activity::UnknownSpecific && activity().specificType() != Activity::Other && !activity().specificTypeValue().isEmpty()) {
-+			act += "_" + activity().specificTypeValue();
-+		}
-+		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " +
-+			QString("<%1=\"activities/%2\"> ").arg(imgTag).arg(act) + activity().typeText();
- 		if (activity().specificType() != Activity::UnknownSpecific) {
- 			str += QString(" - ") + activity().specificTypeText();
- 		}
- 		if (!activity().text().isEmpty())
--			str += QString(" (") + activity().text() + QString(")");
-+			str += QString(" (") + TextUtil::escape(activity().text()) + QString(")");
- 		str += "</div>";
- 	}
-

psi-plus-main-20130107.tar.xz/patches/0570-psi-add-view-groups-to-tray-menu.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0580-psi-geolocation.diff Deleted

@@ -1,1332 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -137,6 +137,7 @@
- 				<tooltip comment="Display options for the contact list tooltips">
- 					<avatar comment="Display avatar" type="bool">true</avatar>
- 					<client-version comment="Display client version information" type="bool">true</client-version>
-+					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
- 					<last-status comment="Display the last status" type="bool">true</last-status>
- 					<pgp comment="Display PGP information" type="bool">true</pgp>
- 				</tooltip>
-@@ -170,6 +171,7 @@
- 				</avatars>
- 				<show-mood-icons type="bool">true</show-mood-icons>
- 				<show-activity-icons type="bool">true</show-activity-icons>
-+				<show-geolocation-icons type="bool">true</show-geolocation-icons>
- 				<show-tune-icons type="bool">true</show-tune-icons>
- 				<show-client-icons type="bool">true</show-client-icons>
- 				<show-all-client-icons type="bool">false</show-all-client-icons>
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -39,6 +39,7 @@ class ContactListAccountMenu::Private : 
- 	StatusMenu* statusMenu_;
- 	QAction* moodAction_;
- 	QAction* activityAction_;
-+	QAction* geolocationAction_;
- 	QAction* setAvatarAction_;
- 	QMenu* avatarMenu_;
- 	QAction* unsetAvatarAction_;
-@@ -78,6 +79,9 @@ public:
- 		activityAction_ = new QAction(tr("Activity"), this);
- 		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
- 
-+		geolocationAction_ = new QAction(tr("GeoLocation"), this);
-+		connect(geolocationAction_, SIGNAL(triggered()), SLOT(setGeolocation()));
-+
- 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
- 		connect(setAvatarAction_, SIGNAL(triggered()), SLOT(setAvatar()));
- 
-@@ -123,6 +127,7 @@ public:
- 		menu->addMenu(statusMenu_);
- 		menu->addAction(moodAction_);
- 		menu->addAction(activityAction_);
-+		menu->addAction(geolocationAction_);
- 		avatarMenu_ = menu->addMenu(tr("Avatar"));
- 		avatarMenu_->addAction(setAvatarAction_);
- 		avatarMenu_->addAction(unsetAvatarAction_);
-@@ -162,10 +167,12 @@ private slots:
- #ifndef USE_PEP
- 		moodAction_->setVisible(false);
- 		activityAction_->setVisible(false);
-+		geolocationAction_->setVisible(false);
- 		avatarMenu_->setVisible(false);
- #else
- 		moodAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
- 		activityAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
-+		geolocationAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
- 		avatarMenu_->setEnabled(account->account()->serverInfoManager()->hasPEP());
- #endif
- 		bookmarksMenu_->clear();
-@@ -223,6 +230,14 @@ private slots:
- 		account->account()->actionSetActivity();
- 	}
- 
-+	void setGeolocation()
-+	{
-+		if (!account)
-+			return;
-+
-+		account->account()->actionSetGeoLocation();
-+	}
-+
- 	void setAvatar()
- 	{
- 		if (!account)
---- git.orig/src/geolocation.cpp
-+++ git/src/geolocation.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QDomDocument>
- #include <QDomElement>
-+#include <QApplication>
- 
- #include "geolocation.h"
- 
-@@ -72,6 +73,56 @@ QDomElement GeoLocation::toXml(QDomDocum
- 		e.appendChild(doc.createTextNode(description_));
- 		geoloc.appendChild(e);
- 	}
-+	if (!country_.isEmpty()) {
-+		QDomElement e = doc.createElement("country");
-+		e.appendChild(doc.createTextNode(country_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!region_.isEmpty()) {
-+		QDomElement e = doc.createElement("region");
-+		e.appendChild(doc.createTextNode(region_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!locality_.isEmpty()) {
-+		QDomElement e = doc.createElement("locality");
-+		e.appendChild(doc.createTextNode(locality_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!area_.isEmpty()) {
-+		QDomElement e = doc.createElement("area");
-+		e.appendChild(doc.createTextNode(area_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!street_.isEmpty()) {
-+		QDomElement e = doc.createElement("street");
-+		e.appendChild(doc.createTextNode(street_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!building_.isEmpty()) {
-+		QDomElement e = doc.createElement("building");
-+		e.appendChild(doc.createTextNode(building_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!floor_.isEmpty()) {
-+		QDomElement e = doc.createElement("floor");
-+		e.appendChild(doc.createTextNode(floor_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!room_.isEmpty()) {
-+		QDomElement e = doc.createElement("room");
-+		e.appendChild(doc.createTextNode(room_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!postalcode_.isEmpty()) {
-+		QDomElement e = doc.createElement("postalcode");
-+		e.appendChild(doc.createTextNode(postalcode_));
-+		geoloc.appendChild(e);
-+	}
-+	if (!text_.isEmpty()) {
-+		QDomElement e = doc.createElement("text");
-+		e.appendChild(doc.createTextNode(text_));
-+		geoloc.appendChild(e);
-+	}
- 
- 	return geoloc;
- }
-@@ -85,18 +136,38 @@ void GeoLocation::fromXml(const QDomElem
- 		QDomElement m = n.toElement();
- 		if (m.tagName() == "alt") 
- 			alt_ = Maybe<float>(m.text().toFloat());
--		if (m.tagName() == "bearing") 
-+		else if (m.tagName() == "bearing")
- 			bearing_ = Maybe<float>(m.text().toFloat());
--		if (m.tagName() == "error") 
-+		else if (m.tagName() == "error")
- 			error_ = Maybe<float>(m.text().toFloat());
--		if (m.tagName() == "lat") 
-+		else if (m.tagName() == "lat")
- 			lat_ = Maybe<float>(m.text().toFloat());
--		if (m.tagName() == "lon") 
-+		else if (m.tagName() == "lon")
- 			lon_ = Maybe<float>(m.text().toFloat());
--		if (m.tagName() == "datum") 
-+		else if (m.tagName() == "datum")
- 			datum_ = m.text();
--		if (m.tagName() == "description") 
-+		else if (m.tagName() == "description")
- 			description_ = m.text();
-+		else if (m.tagName() == "country")
-+			country_ = m.text();
-+		else if (m.tagName() == "region")
-+			region_ = m.text();
-+		else if (m.tagName() == "locality")
-+			locality_ = m.text();
-+		else if (m.tagName() == "area")
-+			area_ = m.text();
-+		else if (m.tagName() == "street")
-+			street_ = m.text();
-+		else if (m.tagName() == "building")
-+			building_ = m.text();
-+		else if (m.tagName() == "floor")
-+			floor_ = m.text();
-+		else if (m.tagName() == "room")
-+			room_ = m.text();
-+		else if (m.tagName() == "postalcode")
-+			postalcode_ = m.text();
-+		else if (m.tagName() == "text")
-+			text_ = m.text();
- 	}
- }
- 
-@@ -169,9 +240,60 @@ const QString& GeoLocation::description(
- 	return description_;
- }
- 
-+const QString& GeoLocation::country() const
-+{
-+	return country_;
-+}
-+
-+const QString& GeoLocation::region() const
-+{
-+	return region_;
-+}
-+
-+const QString& GeoLocation::locality() const
-+{
-+	return locality_;
-+}
-+
-+const QString& GeoLocation::area() const
-+{
-+	return area_;
-+}
-+
-+const QString& GeoLocation::street() const
-+{
-+	return street_;
-+}
-+
-+const QString& GeoLocation::building() const
-+{
-+	return building_;
-+}
-+
-+const QString& GeoLocation::floor() const
-+{
-+	return floor_;
-+}
-+
-+const QString& GeoLocation::room() const
-+{
-+	return room_;
-+}
-+
-+const QString& GeoLocation::postalcode() const
-+{
-+	return postalcode_;
-+}
-+
-+const QString& GeoLocation::text() const
-+{
-+	return text_;
-+}
-+
- bool GeoLocation::isNull() const 
- {
--	return !lat_.hasValue() || !lon_.hasValue();
-+	return !lat_.hasValue() && !lon_.hasValue() && !alt_.hasValue() && !bearing_.hasValue() && !error_.hasValue() && country_.isNull() && region_.isNull() && locality_.isNull()
-+		&& area_.isNull() && street_.isNull() && building_.isNull() && floor_.isNull() && room_.isNull() && postalcode_.isNull() && text_.isNull() && description_.isNull() && datum_.isNull();
- }
- 
- bool GeoLocation::operator==(const GeoLocation& o) const
-@@ -180,6 +302,13 @@ bool GeoLocation::operator==(const GeoLo
- 	bool equal = true;
- 	equal = equal && (lat_.hasValue() ? lat_.value() == o.lat().value() : !o.lat().hasValue());
- 	equal = equal && (lon_.hasValue() ? lon_.value() == o.lon().value() : !o.lon().hasValue());
-+	equal = equal && (alt_.hasValue() ? alt_.value() == o.alt().value() : !o.alt().hasValue());
-+	equal = equal && (bearing_.hasValue() ? bearing_.value() == o.bearing().value() : !o.bearing().hasValue());
-+	equal = equal && (error_.hasValue() ? error_.value() == o.error().value() : !o.error().hasValue());
-+	equal == equal && country() == o.country() && region() == o.region() && locality() == o.locality()
-+			&& area() == o.area() && street() == o.street() && datum() == o.datum() && building() == o.building()
-+			&& floor() == o.floor() && room() == o.room() && postalcode() == o.postalcode() && text() == o.text()
-+			&& description() == o.description();
- 	return equal;
- }
- 
-@@ -187,3 +316,123 @@ bool GeoLocation::operator!=(const GeoLo
- {
- 	return !((*this) == o);
- }
-+
-+void GeoLocation::setCountry(const QString& s)
-+{
-+	country_ = s;
-+}
-+
-+void GeoLocation::setRegion(const QString& s)
-+{
-+	region_ = s;
-+}
-+
-+void GeoLocation::setLocality(const QString& s)
-+{
-+	locality_ = s;
-+}
-+
-+void GeoLocation::setArea(const QString& s)
-+{
-+	area_ = s;
-+}
-+
-+void GeoLocation::setStreet(const QString& s)
-+{
-+	street_ = s;
-+}
-+
-+void GeoLocation::setBuilding(const QString& s)
-+{
-+	building_ = s;
-+}
-+
-+void GeoLocation::setFloor(const QString& s)
-+{
-+	floor_ = s;
-+}
-+
-+void GeoLocation::setRoom(const QString& s)
-+{
-+	room_ = s;
-+}
-+
-+void GeoLocation::setPostalcode(const QString& s)
-+{
-+	postalcode_ = s;
-+}
-+
-+void GeoLocation::setText(const QString& s)
-+{
-+	text_ = s;
-+}
-+
-+QString GeoLocation::toString() const
-+{
-+	QString loc;
-+
-+	if(alt_.hasValue() || lon_.hasValue() || lat_.hasValue()) {
-+
-+		loc += QObject::tr("Latitude/Longitude/Altitude: ");
-+
-+		if(lat_.hasValue())
-+			loc += QString::number(lat_.value()) + "/";
-+		else
-+			loc += "0/";
-+
-+		if(lon_.hasValue())
-+			loc += QString::number(lon_.value()) + "/";
-+		else
-+			loc += "0/";
-+
-+		if(alt_.hasValue())
-+			loc += QString::number(alt_.value());
-+		else
-+			loc += "0";
-+
-+	}
-+
-+	if(bearing_.hasValue())
-+		loc += QObject::tr("\nBearing: ") + QString::number(bearing_.value());
-+
-+	if(error_.hasValue())
-+		loc += QObject::tr("\nError: ") + QString::number(error_.value());
-+
-+	if (!datum().isEmpty())
-+		loc += QObject::tr("\nDatum: ") + datum();
-+
-+	if (!country().isEmpty())
-+		loc += QObject::tr("\nCountry: ") + country();
-+
-+	if (!postalcode().isEmpty())
-+		loc += QObject::tr("\nPostalcode: ") + postalcode();
-+
-+	if (!region().isEmpty())
-+		loc += QObject::tr("\nRegion: ") + region();
-+
-+	if (!locality().isEmpty())
-+		loc += QObject::tr("\nLocality: ") + locality();
-+
-+	if (!area().isEmpty())
-+		loc += QObject::tr("\nArea: ") + area();
-+
-+	if (!street().isEmpty())
-+		loc += QObject::tr("\nStreet: ") + street();
-+
-+	if (!building().isEmpty() && (!area().isEmpty() || !street().isEmpty()))
-+		loc += ", " + building();
-+
-+	if (!floor().isEmpty())
-+		loc += QObject::tr("\nFloor: ") + floor();
-+
-+	if (!room().isEmpty())
-+		loc += QObject::tr("\nRoom: ") + room();
-+
-+	if (!description().isEmpty())
-+		loc += QObject::tr("\nDescription: ") + description();
-+
-+	if (!text().isEmpty())
-+		loc += "\n" + text();
-+
-+	return loc;
-+}
---- /dev/null
-+++ git/src/geolocationdlg.cpp
-@@ -0,0 +1,166 @@
-+/*
-+ * geolocationdlg.cpp
-+ * Copyright (C) 2009  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "geolocationdlg.h"
-+
-+#include "xmpp_pubsubitem.h"
-+#include "xmpp_client.h"
-+#include "xmpp_task.h"
-+#include "psiaccount.h"
-+#include "pepmanager.h"
-+#include "geolocation.h"
-+#include <QLineEdit>
-+
-+GeoLocationDlg::GeoLocationDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
-+{
-+	setAttribute(Qt::WA_DeleteOnClose);
-+	ui_.setupUi(this);
-+	setModal(false);
-+	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
-+	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
-+
-+	GeoLocation geoloc = pa_->geolocation();
-+	if(geoloc.isNull())
-+		return;
-+
-+	if (geoloc.alt().hasValue())
-+		ui_.le_altitude->setText(QString::number(geoloc.alt().value()));
-+
-+	if (!geoloc.area().isEmpty())
-+		ui_.le_area->setText(geoloc.area());
-+
-+	if (geoloc.bearing().hasValue())
-+		ui_.le_bearing->setText(QString::number(geoloc.bearing().value()));
-+
-+	if (!geoloc.building().isEmpty())
-+		ui_.le_building->setText(geoloc.building());
-+
-+	if (!geoloc.country().isEmpty())
-+		ui_.le_country->setText(geoloc.country());
-+
-+	if (!geoloc.datum().isEmpty())
-+		ui_.le_datum->setText(geoloc.datum());
-+
-+	if (!geoloc.description().isEmpty())
-+		ui_.le_description->setText(geoloc.description());
-+
-+	if (geoloc.error().hasValue())
-+		ui_.le_error->setText(QString::number(geoloc.error().value()));
-+
-+	if (!geoloc.floor().isEmpty())
-+		ui_.le_floor->setText(geoloc.floor());
-+
-+	if (geoloc.lat().hasValue())
-+		ui_.le_latitude->setText(QString::number(geoloc.lat().value()));
-+
-+	if (!geoloc.locality().isEmpty())
-+		ui_.le_locality->setText(geoloc.locality());
-+
-+	if (geoloc.lon().hasValue())
-+		ui_.le_longitude->setText(QString::number(geoloc.lon().value()));
-+
-+	if (!geoloc.postalcode().isEmpty())
-+		ui_.le_postalcode->setText(geoloc.postalcode());
-+
-+	if (!geoloc.region().isEmpty())
-+		ui_.le_region->setText(geoloc.region());
-+
-+	if (!geoloc.room().isEmpty())
-+		ui_.le_room->setText(geoloc.room());
-+
-+	if (!geoloc.street().isEmpty())
-+		ui_.le_street->setText(geoloc.street());
-+
-+	if (!geoloc.text().isEmpty())
-+		ui_.le_text->setText(geoloc.text());
-+}
-+
-+void GeoLocationDlg::reset()
-+{
-+	foreach(QLineEdit *le, this->findChildren<QLineEdit*>()) {
-+		le->setText("");
-+	}
-+}
-+
-+void GeoLocationDlg::setGeoLocation()
-+{
-+	GeoLocation geoloc;
-+
-+	if(!ui_.le_altitude->text().isEmpty())
-+		geoloc.setAlt(ui_.le_altitude->text().toFloat());
-+
-+	if(!ui_.le_bearing->text().isEmpty())
-+		geoloc.setBearing(ui_.le_bearing->text().toFloat());
-+
-+	if(!ui_.le_error->text().isEmpty())
-+		geoloc.setError(ui_.le_error->text().toFloat());
-+
-+	if(!ui_.le_latitude->text().isEmpty())
-+		geoloc.setLat(ui_.le_latitude->text().toFloat());
-+
-+	if(!ui_.le_longitude->text().isEmpty())
-+		geoloc.setLon(ui_.le_longitude->text().toFloat());
-+
-+	if(!ui_.le_datum->text().isEmpty())
-+		geoloc.setDatum(ui_.le_datum->text());
-+
-+	if(!ui_.le_description->text().isEmpty())
-+		geoloc.setDescription(ui_.le_description->text());
-+
-+	if(!ui_.le_country->text().isEmpty())
-+		geoloc.setCountry(ui_.le_country->text());
-+
-+	if(!ui_.le_region->text().isEmpty())
-+		geoloc.setRegion(ui_.le_region->text());
-+
-+	if(!ui_.le_locality->text().isEmpty())
-+		geoloc.setLocality(ui_.le_locality->text());
-+
-+	if(!ui_.le_area->text().isEmpty())
-+		geoloc.setArea(ui_.le_area->text());
-+
-+	if(!ui_.le_street->text().isEmpty())
-+		geoloc.setStreet(ui_.le_street->text());
-+
-+	if(!ui_.le_building->text().isEmpty())
-+		geoloc.setBuilding(ui_.le_building->text());
-+
-+	if(!ui_.le_floor->text().isEmpty())
-+		geoloc.setFloor(ui_.le_floor->text());
-+
-+	if(!ui_.le_room->text().isEmpty())
-+		geoloc.setRoom(ui_.le_room->text());
-+
-+	if(!ui_.le_postalcode->text().isEmpty())
-+		geoloc.setPostalcode(ui_.le_postalcode->text());
-+
-+	if(!ui_.le_text->text().isEmpty())
-+		geoloc.setText(ui_.le_text->text());
-+
-+	if (geoloc.isNull()) {
-+ 		pa_->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
-+	}
-+	else {                
-+		pa_->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+	}
-+	close();
-+}
-+
---- /dev/null
-+++ git/src/geolocationdlg.h
-@@ -0,0 +1,45 @@
-+/*
-+ * geolocationdlg.h
-+ * Copyright (C) 2009  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#ifndef GEOLOCATIONDLG_H
-+#define GEOLOCATIONDLG_H
-+
-+#include <QDialog>
-+
-+#include "ui_geolocation.h"
-+
-+class PsiAccount;
-+
-+class GeoLocationDlg : public QDialog
-+{
-+	Q_OBJECT
-+
-+public:
-+	GeoLocationDlg(PsiAccount*);
-+
-+protected slots:
-+	void setGeoLocation();
-+	void reset();
-+
-+private:
-+	Ui::GeoLocation ui_;
-+ 	PsiAccount* pa_;
-+};
-+
-+#endif // GEOLOCATIONDLG_H
---- git.orig/src/geolocation.h
-+++ git/src/geolocation.h
-@@ -52,7 +52,30 @@ public:
- 	void setDatum(const QString&);
- 	void setDescription(const QString&);
- 
-+	const QString& country() const;
-+	const QString& region() const;
-+	const QString& locality() const;
-+	const QString& area() const;
-+	const QString& street() const;
-+	const QString& building() const;
-+	const QString& floor() const;
-+	const QString& room() const;
-+	const QString& postalcode() const;
-+	const QString& text() const;
-+
-+	void setCountry(const QString& s);
-+ 	void setRegion(const QString& s);
-+	void setLocality(const QString& s);
-+	void setArea(const QString& s);
-+	void setStreet(const QString& s);
-+	void setBuilding(const QString& s);
-+	void setFloor(const QString& s);
-+	void setRoom(const QString& s);
-+	void setPostalcode(const QString& s);
-+	void setText(const QString& s);
-+
- 	QDomElement toXml(QDomDocument&);
-+	QString toString() const;
- 	
- 	bool operator==(const GeoLocation&) const;
- 	bool operator!=(const GeoLocation&) const;
-@@ -63,6 +86,7 @@ protected:
- private:
- 	Maybe<float> alt_, bearing_, error_, lat_, lon_;
- 	QString datum_, description_;
-+	QString country_, region_, locality_, area_, street_, building_, floor_, room_, postalcode_, text_;
- };
- 
- #endif
---- /dev/null
-+++ git/src/geolocation.ui
-@@ -0,0 +1,320 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>GeoLocation</class>
-+ <widget class="QDialog" name="GeoLocation">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>400</width>
-+    <height>533</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Set GeoLocation</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
-+     <item row="0" column="0">
-+      <widget class="QLabel" name="lb_altitude">
-+       <property name="text">
-+        <string>Altitude:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="0" column="1">
-+      <widget class="QLineEdit" name="le_altitude">
-+       <property name="toolTip">
-+        <string>Altitude in meters above or below sea level</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="1" column="0">
-+      <widget class="QLabel" name="lb_area">
-+       <property name="text">
-+        <string>Area:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="1" column="1">
-+      <widget class="QLineEdit" name="le_area">
-+       <property name="toolTip">
-+        <string>A named area such as a campus or neighborhood</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="2" column="0">
-+      <widget class="QLabel" name="lb_bearing">
-+       <property name="text">
-+        <string>Bearing:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="2" column="1">
-+      <widget class="QLineEdit" name="le_bearing">
-+       <property name="toolTip">
-+        <string>GPS bearing (direction in which the entity is heading to reach its next waypoint), measured in decimal degrees relative to true north</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="3" column="0">
-+      <widget class="QLabel" name="lb_building">
-+       <property name="text">
-+        <string>Building:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="3" column="1">
-+      <widget class="QLineEdit" name="le_building">
-+       <property name="toolTip">
-+        <string>A specific building on a street or in an area</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="4" column="0">
-+      <widget class="QLabel" name="lb_country">
-+       <property name="text">
-+        <string>Country:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="4" column="1">
-+      <widget class="QLineEdit" name="le_country">
-+       <property name="toolTip">
-+        <string>The nation where the user is located</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="5" column="0">
-+      <widget class="QLabel" name="lb_datum">
-+       <property name="text">
-+        <string>Datum:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="5" column="1">
-+      <widget class="QLineEdit" name="le_datum">
-+       <property name="toolTip">
-+        <string>GPS datum</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="6" column="0">
-+      <widget class="QLabel" name="lb_description">
-+       <property name="text">
-+        <string>Description:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="6" column="1">
-+      <widget class="QLineEdit" name="le_description">
-+       <property name="toolTip">
-+        <string>A natural-language name for or description of the location</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="7" column="0">
-+      <widget class="QLabel" name="lb_error">
-+       <property name="text">
-+        <string>Error:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="7" column="1">
-+      <widget class="QLineEdit" name="le_error">
-+       <property name="toolTip">
-+        <string>Horizontal GPS error in arc minutes; this element is deprecated in favor of &lt;accuracy/&gt;</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="8" column="0">
-+      <widget class="QLabel" name="lb_floor">
-+       <property name="text">
-+        <string>Floor:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="8" column="1">
-+      <widget class="QLineEdit" name="le_floor">
-+       <property name="toolTip">
-+        <string>A particular floor in a building</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="9" column="0">
-+      <widget class="QLabel" name="lb_latitude">
-+       <property name="text">
-+        <string>Latitude:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="9" column="1">
-+      <widget class="QLineEdit" name="le_latitude">
-+       <property name="toolTip">
-+        <string>Latitude in decimal degrees North</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="10" column="0">
-+      <widget class="QLabel" name="lb_locality">
-+       <property name="text">
-+        <string>Locality:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="10" column="1">
-+      <widget class="QLineEdit" name="le_locality">
-+       <property name="toolTip">
-+        <string>A locality within the administrative region, such as a town or city</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="11" column="0">
-+      <widget class="QLabel" name="lb_longitude">
-+       <property name="text">
-+        <string>Longitude:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="11" column="1">
-+      <widget class="QLineEdit" name="le_longitude">
-+       <property name="toolTip">
-+        <string>Longitude in decimal degrees East</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="12" column="0">
-+      <widget class="QLabel" name="lb_postalcode">
-+       <property name="text">
-+        <string>Postalcode:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="12" column="1">
-+      <widget class="QLineEdit" name="le_postalcode">
-+       <property name="toolTip">
-+        <string>A code used for postal delivery</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="13" column="0">
-+      <widget class="QLabel" name="lb_region">
-+       <property name="text">
-+        <string>Region:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="13" column="1">
-+      <widget class="QLineEdit" name="le_region">
-+       <property name="toolTip">
-+        <string>An administrative region of the nation, such as a state or province</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="14" column="0">
-+      <widget class="QLabel" name="lb_room">
-+       <property name="text">
-+        <string>Room:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="14" column="1">
-+      <widget class="QLineEdit" name="le_room">
-+       <property name="toolTip">
-+        <string>A particular room in a building</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="15" column="0">
-+      <widget class="QLabel" name="lb_street">
-+       <property name="text">
-+        <string>Street:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="15" column="1">
-+      <widget class="QLineEdit" name="le_street">
-+       <property name="toolTip">
-+        <string>A thoroughfare within the locality, or a crossing of two thoroughfares</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="16" column="0">
-+      <widget class="QLabel" name="lb_text">
-+       <property name="text">
-+        <string>Text:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item row="16" column="1">
-+      <widget class="QLineEdit" name="le_text">
-+       <property name="toolTip">
-+        <string>A catch-all element that captures any other information about the location</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <spacer name="verticalSpacer">
-+     <property name="orientation">
-+      <enum>Qt::Vertical</enum>
-+     </property>
-+     <property name="sizeHint" stdset="0">
-+      <size>
-+       <width>0</width>
-+       <height>0</height>
-+      </size>
-+     </property>
-+    </spacer>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout">
-+     <item>
-+      <widget class="QPushButton" name="pb_reset">
-+       <property name="text">
-+        <string>Reset</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer>
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>0</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_ok">
-+       <property name="text">
-+        <string>OK</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_cancel">
-+       <property name="text">
-+        <string>Cancel</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/options/opt_roster.cpp
-+++ git/src/options/opt_roster.cpp
-@@ -70,6 +70,7 @@ void OptionsTabRoster::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-activity-icons", d->ck_showActivityIcons->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-geolocation-icons", d->ck_showGeoLocationIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
-@@ -96,6 +97,7 @@ void OptionsTabRoster::restoreOptions()
- 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
- 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
- 	d->ck_showActivityIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-activity-icons").toBool() );
-+	d->ck_showGeoLocationIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-geolocation-icons").toBool() );
- 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
- 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
- 	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
---- git.orig/src/options/opt_roster.ui
-+++ git/src/options/opt_roster.ui
-@@ -7,7 +7,7 @@
-     <x>0</x>
-     <y>0</y>
-     <width>357</width>
--    <height>452</height>
-+    <height>481</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -98,6 +98,16 @@
-        </widget>
-       </item>
-       <item>
-+       <widget class="QCheckBox" name="ck_showGeoLocationIcons">
-+        <property name="whatsThis">
-+         <string>Show geolocation in roster</string>
-+        </property>
-+        <property name="text">
-+         <string>GeoLocation</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-        <widget class="QCheckBox" name="ck_showTuneIcons">
-         <property name="whatsThis">
-          <string>Show icon when contact is listening to music</string>
---- git.orig/src/physicallocation.cpp
-+++ git/src/physicallocation.cpp
-@@ -17,7 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  *
-  */
--
-+/*
- #include <QDomDocument>
- #include <QDomElement>
- #include <QStringList>
-@@ -268,3 +268,5 @@ QString PhysicalLocation::toString() con
- 
- 	return str;
- }
-+
-+*/
---- git.orig/src/physicallocation.h
-+++ git/src/physicallocation.h
-@@ -17,7 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  *
-  */
--
-+/*
- #ifndef PHYSICALOCATION_H
- #define PHYSICALOCATION_H
- 
-@@ -69,3 +69,4 @@ private:
- };
- 
- #endif
-+*/
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -119,8 +119,8 @@
- #include "mooddlg.h"
- #include "activitydlg.h"
- #include "qwextend.h"
--#include "geolocation.h"
--#include "physicallocation.h"
-+#include "geolocationdlg.h"
-+//#include "physicallocation.h"
- #include "translationmanager.h"
- #include "irisprotocol/iris_discoinfoquerier.h"
- #include "iconwidget.h"
-@@ -1228,7 +1228,7 @@ PsiAccount::PsiAccount(const UserAccount
- 		pepNodes += "http://jabber.org/protocol/mood+notify";
- 		pepNodes += "http://jabber.org/protocol/activity+notify";
- 		pepNodes += "http://jabber.org/protocol/tune+notify";
--		pepNodes += "http://jabber.org/protocol/physloc+notify";
-+	//	pepNodes += "http://jabber.org/protocol/physloc+notify";
- 		pepNodes += "http://jabber.org/protocol/geoloc+notify";
- 		pepNodes += "urn:xmpp:avatar:metadata+notify";
- 		d->client->addExtension("ep-notify-2",Features(pepNodes));
-@@ -2193,7 +2193,7 @@ void PsiAccount::setPEPAvailable(bool b)
- 		pepNodes += "http://jabber.org/protocol/mood";
- 		pepNodes += "http://jabber.org/protocol/activity";
- 		pepNodes += "http://jabber.org/protocol/tune";
--		pepNodes += "http://jabber.org/protocol/physloc";
-+	//	pepNodes += "http://jabber.org/protocol/physloc";
- 		pepNodes += "http://jabber.org/protocol/geoloc";
- 		pepNodes += "urn:xmpp:avatar:data";
- 		pepNodes += "urn:xmpp:avatar:metadata";
-@@ -3392,14 +3392,14 @@ void PsiAccount::itemRetracted(const Jid
- 			cpUpdate(*u);
- 		}
- 	}
--	else if (n == "http://jabber.org/protocol/physloc") {
-+	/*else if (n == "http://jabber.org/protocol/physloc") {
- 		// FIXME: try to find the right resource using JEP-33 'replyto'
- 		// see tune case above
- 		foreach(UserListItem* u, findRelevant(j)) {
- 			u->setPhysicalLocation(PhysicalLocation());
- 			cpUpdate(*u);
- 		}
--	}
-+	}*/
- }
- 
- void PsiAccount::itemPublished(const Jid& j, const QString& n, const PubSubItem& item)
-@@ -3453,7 +3453,7 @@ void PsiAccount::itemPublished(const Jid
- 			cpUpdate(*u);
- 		}
- 	}
--	else if (n == "http://jabber.org/protocol/physloc") {
-+	/*else if (n == "http://jabber.org/protocol/physloc") {
- 		// FIXME: try to find the right resource using JEP-33 'replyto'
- 		// see tune case above
- 		PhysicalLocation physloc(item.payload());
-@@ -3461,7 +3461,7 @@ void PsiAccount::itemPublished(const Jid
- 			u->setPhysicalLocation(physloc);
- 			cpUpdate(*u);
- 		}
--	}
-+	}*/
- }
- 
- QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
-@@ -3785,6 +3785,12 @@ void PsiAccount::actionSetActivity()
- 	w->show();
- }
- 
-+void PsiAccount::actionSetGeoLocation()
-+{
-+	GeoLocationDlg *w = new GeoLocationDlg(this);
-+	w->show();
-+}
-+
- void PsiAccount::actionSetAvatar()
- {
- 	QString str = FileUtil::getImageFileName(0);
-@@ -5510,6 +5516,11 @@ const Activity &PsiAccount::activity() c
- 	return d->self.activity();
- }
- 
-+const GeoLocation &PsiAccount::geolocation() const
-+{
-+	return d->self.geoLocation();
-+}
-+
- const Mood &PsiAccount::mood() const
- {
- 	return d->self.mood();
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -34,6 +34,7 @@
- #include "psiactions.h"
- #include "mood.h"
- #include "activity.h"
-+#include "geolocation.h"
- 
- namespace XMPP
- {
-@@ -142,6 +143,7 @@ public:
- 	QString nick() const;
- 	const Mood &mood() const;
- 	const Activity &activity() const;
-+	const GeoLocation &geolocation() const;
- 	void forceDisconnect(bool fast, const XMPP::Status &s);
- 	bool hasPGP() const;
- 	QHostAddress *localAddress() const;
-@@ -353,6 +355,7 @@ public slots:
- 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
- 	void actionSetMood();
- 	void actionSetActivity();
-+	void actionSetGeoLocation();
- 	void actionSetAvatar();
- 	void actionUnsetAvatar();
- 	void actionQueryVersion(const Jid& j);
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -586,7 +586,7 @@ bool PsiCon::init()
- 	             << "http://jabber.org/protocol/mood"
- 	             << "http://jabber.org/protocol/activity"
- 	             << "http://jabber.org/protocol/tune"
--	             << "http://jabber.org/protocol/physloc"
-+		  // << "http://jabber.org/protocol/physloc"
- 	             << "http://jabber.org/protocol/geoloc"
- 	             << "urn:xmpp:avatar:data"
- 	             << "urn:xmpp:avatar:metadata"
-@@ -596,7 +596,7 @@ bool PsiCon::init()
- 	             << "http://jabber.org/protocol/mood+notify"
- 	             << "http://jabber.org/protocol/activity+notify"
- 	             << "http://jabber.org/protocol/tune+notify"
--	             << "http://jabber.org/protocol/physloc+notify"
-+                //  << "http://jabber.org/protocol/physloc+notify"
- 	             << "http://jabber.org/protocol/geoloc+notify"
- 	             << "urn:xmpp:avatar:metadata+notify"
- 	            );
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -220,6 +220,7 @@ HEADERS += \
- 	$$PWD/vcardphotodlg.h \
- 	$$PWD/psicli.h \
- 	$$PWD/coloropt.h \
-+	$$PWD/geolocationdlg.h \
- 	$$PWD/sendbuttonmenu.h
- 
- 
-@@ -356,6 +357,7 @@ SOURCES += \
- 	$$PWD/bookmarkmanagedlg.cpp \
- 	$$PWD/vcardphotodlg.cpp \
- 	$$PWD/coloropt.cpp \
-+	$$PWD/geolocationdlg.cpp \
- 	$$PWD/sendbuttonmenu.cpp
- 
- 
-@@ -588,6 +590,7 @@ FORMS += \
- 	$$PWD/bookmarkmanage.ui \
- 	$$PWD/ahcommanddlg.ui \
- 	$$PWD/ahcformdlg.ui \
-+	$$PWD/geolocation.ui \
- 	$$PWD/sendbuttontemplateseditor.ui
- 
- # options dialog
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -189,7 +189,7 @@ const GeoLocation& UserResource::geoLoca
- 	return v_geoLocation;
- }
- 
--void UserResource::setPhysicalLocation(const PhysicalLocation& physicalLocation)
-+/*void UserResource::setPhysicalLocation(const PhysicalLocation& physicalLocation)
- {
- 	v_physicalLocation = physicalLocation;
- }
-@@ -197,7 +197,7 @@ void UserResource::setPhysicalLocation(c
- const PhysicalLocation& UserResource::physicalLocation() const
- {
- 	return v_physicalLocation;
--}
-+}*/
- 
- 
- bool operator<(const UserResource &r1, const UserResource &r2)
-@@ -596,7 +596,7 @@ const GeoLocation& UserListItem::geoLoca
- 	return v_geoLocation;
- }
- 
--void UserListItem::setPhysicalLocation(const PhysicalLocation& physicalLocation)
-+/*void UserListItem::setPhysicalLocation(const PhysicalLocation& physicalLocation)
- {
- 	v_physicalLocation = physicalLocation;
- }
-@@ -604,7 +604,7 @@ void UserListItem::setPhysicalLocation(c
- const PhysicalLocation& UserListItem::physicalLocation() const
- {
- 	return v_physicalLocation;
--}
-+}*/
- 
- void UserListItem::setAvatarFactory(AvatarFactory* av)
- {
-@@ -779,12 +779,12 @@ QString UserListItem::makeBareTip(bool t
- 		str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
- 
- 	// User Physical Location
--	if (!physicalLocation().isNull())
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(physicalLocation().toString()) + "</div>";
-+	//if (!physicalLocation().isNull())
-+	//	str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(physicalLocation().toString()) + "</div>";
- 
- 	// User Geolocation
--	if (!geoLocation().isNull())
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(geoLocation().lat().value()) + "/" + QString::number(geoLocation().lon().value()) + "</div>";
-+	if (!geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
-+		str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
- 
- 	// resources
- 	if(!userResourceList().isEmpty()) {
-@@ -869,12 +869,12 @@ QString UserListItem::makeBareTip(bool t
- 				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(r.tune()) + "</div>";
- 
- 			// User Physical Location
--			if (!r.physicalLocation().isNull())
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
-+		//	if (!r.physicalLocation().isNull())
-+		//		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
- 
- 			// User Geolocation
--			if (!r.geoLocation().isNull())
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(r.geoLocation().lat().value()) + "/" + QString::number(r.geoLocation().lon().value()) + "</div>";
-+			if (!r.geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
-+				str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
- 
- 			// Entity Time
- 			if (r.timezoneOffset().hasValue()) {
---- git.orig/src/userlist.h
-+++ git/src/userlist.h
-@@ -30,7 +30,7 @@
- #include "mood.h"
- #include "activity.h"
- #include "geolocation.h"
--#include "physicallocation.h"
-+//#include "physicallocation.h"
- #include "maybe.h"
- 
- class AvatarFactory;
-@@ -68,8 +68,8 @@ public:
- 	const QString& tune() const;
- 	void setGeoLocation(const GeoLocation&);
- 	const GeoLocation& geoLocation() const;
--	void setPhysicalLocation(const PhysicalLocation&);
--	const PhysicalLocation& physicalLocation() const;
-+	//void setPhysicalLocation(const PhysicalLocation&);
-+	//const PhysicalLocation& physicalLocation() const;
- 
- private:
- 	QString v_ver, v_clientName, v_clientVersion, v_clientOS, v_keyID;
-@@ -77,7 +77,7 @@ private:
- 	QString v_tzoString;
- 	QString v_tune;
- 	GeoLocation v_geoLocation;
--	PhysicalLocation v_physicalLocation;
-+	//PhysicalLocation v_physicalLocation;
- 	int v_pgpVerifyStatus;
- 	QDateTime sigts;
- };
-@@ -139,8 +139,8 @@ public:
- 	const QString& tune() const;
- 	void setGeoLocation(const GeoLocation&);
- 	const GeoLocation& geoLocation() const;
--	void setPhysicalLocation(const PhysicalLocation&);
--	const PhysicalLocation& physicalLocation() const;
-+	//void setPhysicalLocation(const PhysicalLocation&);
-+	//const PhysicalLocation& physicalLocation() const;
- 	void setAvatarFactory(AvatarFactory*);
- 
- 	UserResourceList & userResourceList();
-@@ -169,7 +169,7 @@ private:
- 	Activity v_activity;
- 	QString v_tune;
- 	GeoLocation v_geoLocation;
--	PhysicalLocation v_physicalLocation;
-+	//PhysicalLocation v_physicalLocation;
- 	AvatarFactory* v_avatarFactory;
- };
-

psi-plus-main-20130107.tar.xz/patches/0590-psi-add-standard-transports.diff Deleted

@@ -1,51 +0,0 @@
---- git.orig/src/options/opt_iconset.cpp
-+++ git/src/options/opt_iconset.cpp
-@@ -1146,12 +1146,22 @@ QWidget *OptionsTabIconsetRoster::widget
- 
- 	// Initialize transport iconsets
- 	addService("aim", "AIM");
-+	addService("muc", "Chat (MUC)");
- 	addService("gadugadu", "Gadu-Gadu");
- 	addService("icq", "ICQ");
-+	addService("irc", "IRC");
-+	addService("disk", "Jabber Disk");
-+	addService("mrim", "Mail.Ru-IM");
- 	addService("msn", "MSN");
-+	addService("rss", "RSS");
- 	addService("sms", "SMS");
--	addService("yahoo", "Yahoo!");
-+	addService("smtp", "SMTP");
- 	addService("transport", tr("Transport"));
-+	addService("vkontakte", tr("vk.com"));
-+	addService("weather", tr("Weather"));
-+	addService("xmpp", "XMPP");
-+	addService("yahoo", "Yahoo!");
-+	
- 	d->tw_isServices->resizeColumnToContents(0);
- 
- 	connect(d->pb_defRosterDetails, SIGNAL(clicked()), SLOT(defaultDetails()));
---- git.orig/src/psiiconset.cpp
-+++ git/src/psiiconset.cpp
-@@ -132,11 +132,20 @@ public:
- 		if ( jid.node().isEmpty() || PsiOptions::instance()->getOption("options.ui.contactlist.use-transport-icons").toBool() ) {
- 			QMap<QString, QRegExp> services;
- 			services["aim"]		= QRegExp("^aim");
-+			services["disk"]		= QRegExp("^disk");
- 			services["gadugadu"]	= QRegExp("^gg");
--			services["icq"]		= QRegExp("^icq");
-+			services["icq"]		= QRegExp("^icq|^jit");
-+			services["irc"]		= QRegExp("^irc");
-+			services["xmpp"]		= QRegExp("^j2j|^xmpp\\.[a-z1-9]+\\..*");
-+			services["mrim"]		= QRegExp("^mrim");
- 			services["msn"]		= QRegExp("^msn");
--			services["yahoo"]	= QRegExp("^yahoo");
-+			services["muc"]		= QRegExp("^conference|^rooms");
-+			services["rss"]		= QRegExp("^rss");
- 			services["sms"]		= QRegExp("^sms");
-+			services["smtp"]		= QRegExp("^smtp");
-+			services["vkontakte"]		= QRegExp("^vk.com|^vkontakte|^vk-t");
-+			services["weather"]		= QRegExp("^weather|^gism");
-+			services["yahoo"]	= QRegExp("^yahoo");
- 
- 			bool found = false;
-

psi-plus-main-20130107.tar.xz/patches/0610-psi-more-icons-in-account-menu.diff Deleted

@@ -1,44 +0,0 @@
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -30,6 +30,8 @@
- #include "psioptions.h"
- #include "iconaction.h"
- #include "privacy/privacydlg.h"
-+#include "psiiconset.h"
-+#include "common.h"
- 
- class ContactListAccountMenu::Private : public QObject
- {
-@@ -71,15 +73,20 @@ public:
- 
- 		statusMenu_ = new StatusMenu(0);
- 		statusMenu_->setTitle(tr("&Status"));
-+		statusMenu_->setIcon(PsiIconset::instance()->status(makeSTATUS(account->account()->status())).icon());
- 		connect(statusMenu_, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusChanged(XMPP::Status::Type)));
- 
--		moodAction_ = new QAction(tr("Mood"), this);
-+		moodAction_ = new IconAction(tr("Mood"), this, QString(("mood/%1")).arg(account->account()->mood().typeValue()));
- 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
- 
--		activityAction_ = new QAction(tr("Activity"), this);
-+		QString act = account->account()->activity().typeValue();
-+		if (account->account()->activity().specificType() != Activity::UnknownSpecific && account->account()->activity().specificType() != Activity::Other) {
-+			act += "_" + account->account()->activity().specificTypeValue();
-+		}
-+		activityAction_ = new IconAction(tr("Activity"), this, QString(("activities/%1")).arg(act));
- 		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
- 
--		geolocationAction_ = new QAction(tr("GeoLocation"), this);
-+		geolocationAction_ = new IconAction(tr("GeoLocation"), this, "system/geolocation");
- 		connect(geolocationAction_, SIGNAL(triggered()), SLOT(setGeolocation()));
- 
- 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
-@@ -128,7 +135,7 @@ public:
- 		menu->addAction(moodAction_);
- 		menu->addAction(activityAction_);
- 		menu->addAction(geolocationAction_);
--		avatarMenu_ = menu->addMenu(tr("Avatar"));
-+		avatarMenu_ = menu->addMenu(IconsetFactory::icon("psi/vCard").icon(), tr("Avatar"));
- 		avatarMenu_->addAction(setAvatarAction_);
- 		avatarMenu_->addAction(unsetAvatarAction_);
- 		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));

psi-plus-main-20130107.tar.xz/patches/0620-psi-modern-roster.diff Deleted

@@ -1,421 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -166,12 +166,16 @@
- 				<disable-scrollbar type="bool">true</disable-scrollbar>
- 				<avatars>
- 					<show type="bool">true</show>
-+					<avatars-at-left type="bool">false</avatars-at-left>
-+					<use-default-avatar type="bool">true</use-default-avatar>
- 					<size type="int">24</size>
- 					<radius type="int">5</radius>
- 				</avatars>
- 				<show-mood-icons type="bool">true</show-mood-icons>
- 				<show-activity-icons type="bool">true</show-activity-icons>
- 				<show-geolocation-icons type="bool">true</show-geolocation-icons>
-+				<show-status-icons type="bool">true</show-status-icons>
-+				<status-icon-over-avatar type="bool">false</status-icon-over-avatar>
- 				<show-tune-icons type="bool">true</show-tune-icons>
- 				<show-client-icons type="bool">true</show-client-icons>
- 				<show-all-client-icons type="bool">false</show-all-client-icons>
---- psi.orig/src/contactlistmodel.cpp
-+++ psi/src/contactlistmodel.cpp
-@@ -38,6 +38,7 @@
- #include "contactlistmodelupdater.h"
- #include "contactlistspecialgroup.h"
- #include "userlist.h"
-+#include "avatars.h"
- #ifdef YAPSI
- #include "yacommon.h"
- #endif
-@@ -517,6 +518,36 @@ QVariant ContactListModel::contactData(c
- 	else if (role == PhaseRole) {
- 		return QVariant(false);
- 	}
-+	else if (role == MoodRole) {
-+		if(contact->userListItem().mood().isNull())
-+			return QVariant();
-+		return QVariant(contact->userListItem().mood().typeValue());
-+	}
-+	else if (role == ActivityRole) {
-+		if (contact->userListItem().activity().isNull())
-+			return QVariant();
-+		QString act = contact->userListItem().activity().typeValue();
-+		if (contact->userListItem().activity().specificType() != Activity::UnknownSpecific
-+			&& contact->userListItem().activity().specificType() != Activity::Other
-+			&& !contact->userListItem().activity().specificTypeValue().isEmpty())
-+		{
-+			act += "_" + contact->userListItem().activity().specificTypeValue();
-+		}
-+		return QVariant(act);
-+	}
-+	else if (role == GeolocationRole) {
-+		return QVariant(!contact->userListItem().geoLocation().isNull());
-+	}
-+	else if (role == TuneRole) {
-+		return QVariant(!contact->userListItem().tune().isEmpty());
-+	}
-+	else if (role == ClientRole) {
-+		return QVariant(contact->userListItem().clients());
-+	}
-+	else if (role == AvatarRole) {
-+		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
-+		return QVariant(pix);
-+	}
- #ifdef YAPSI
- 	else if (role == Qt::ForegroundRole) {
- 		return QVariant(Ya::statusColor(contact->status().type()));
---- psi.orig/src/contactlistmodel.h
-+++ psi/src/contactlistmodel.h
-@@ -78,6 +78,12 @@ public:
- 		AlertPictureRole = Qt::UserRole + 11,
- 		IsAnimRole = Qt::UserRole + 21,
- 		PhaseRole = Qt::UserRole + 22,
-+		MoodRole = Qt::UserRole + 23,
-+		ActivityRole = Qt::UserRole + 24,
-+		GeolocationRole = Qt::UserRole + 25,
-+		ClientRole = Qt::UserRole + 26,
-+		TuneRole = Qt::UserRole + 27,
-+		AvatarRole = Qt::UserRole + 28,
- 
- 		// groups
- 		ExpandedRole = Qt::UserRole + 12,
---- psi.orig/src/contactlistviewdelegate.cpp
-+++ psi/src/contactlistviewdelegate.cpp
-@@ -197,7 +197,9 @@ void ContactListViewDelegate::drawText(Q
- 		txt = option.fontMetrics.elidedText(text, option.textElideMode, rect.width());
- #endif
- 		painter->save();
--		painter->setClipRect(rect);
-+		QRect txtRect(rect);
-+		txtRect.setHeight(option.fontMetrics.height());
-+		painter->setClipRect(txtRect);
- 	}
- 
- 	// painter->save();
---- psi.orig/src/psicontactlistviewdelegate.cpp
-+++ psi/src/psicontactlistviewdelegate.cpp
-@@ -34,6 +34,18 @@ static const QString slimGroupsOptionPat
- static const QString contactListBackgroundOptionPath = "options.ui.look.colors.contactlist.background";
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
- static const QString statusSingleOptionPath = "options.ui.contactlist.status-messages.single-line";
-+static const QString showClientIconsPath = "options.ui.contactlist.show-client-icons";
-+static const QString showMoodIconsPath = "options.ui.contactlist.show-mood-icons";
-+static const QString showGeolocIconsPath = "options.ui.contactlist.show-geolocation-icons";
-+static const QString showActivityIconsPath = "options.ui.contactlist.show-activity-icons";
-+static const QString showTuneIconsPath = "options.ui.contactlist.show-tune-icons";
-+static const QString avatarSizeOptionPath = "options.ui.contactlist.avatars.size";
-+static const QString avatarRadiusOptionPath = "options.ui.contactlist.avatars.radius";
-+static const QString showAvatarsPath = "options.ui.contactlist.avatars.show";
-+static const QString useDefaultAvatarPath = "options.ui.contactlist.avatars.use-default-avatar";
-+static const QString avatarAtLeftOptionPath = "options.ui.contactlist.avatars.avatars-at-left";
-+static const QString showStatusIconsPath = "options.ui.contactlist.show-status-icons";
-+static const QString statusIconsOverAvatarsPath = "options.ui.contactlist.status-icon-over-avatar";
- 
- PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
- 	: ContactListViewDelegate(parent)
-@@ -51,6 +64,18 @@ PsiContactListViewDelegate::PsiContactLi
- 	optionChanged(contactListBackgroundOptionPath);
- 	optionChanged(showStatusMessagesOptionPath);
- 	optionChanged(statusSingleOptionPath);
-+	optionChanged(showClientIconsPath);
-+	optionChanged(showMoodIconsPath);
-+	optionChanged(showGeolocIconsPath);
-+	optionChanged(showActivityIconsPath);
-+	optionChanged(showTuneIconsPath);
-+	optionChanged(avatarSizeOptionPath);
-+	optionChanged(avatarRadiusOptionPath);
-+	optionChanged(showAvatarsPath);
-+	optionChanged(useDefaultAvatarPath);
-+	optionChanged(avatarAtLeftOptionPath);
-+	optionChanged(showStatusIconsPath);
-+	optionChanged(statusIconsOverAvatarsPath);
- }
- 
- PsiContactListViewDelegate::~PsiContactListViewDelegate()
-@@ -61,7 +87,8 @@ PsiContactListViewDelegate::~PsiContactL
- 
- int PsiContactListViewDelegate::avatarSize() const
- {
--	return rowHeight_;
-+	return showAvatars_ ?
-+		qMax(avatarSize_ + 2, rowHeight_) : rowHeight_;
- }
- 
- QPixmap PsiContactListViewDelegate::statusPixmap(const QModelIndex& index) const
-@@ -89,6 +116,9 @@ QPixmap PsiContactListViewDelegate::stat
- 		}
- 	}
- 
-+	if (!showStatusIcons_)
-+		return QPixmap();
-+
- 	if (type == ContactListModel::ContactType) {
- 		if (!index.data(ContactListModel::PresenceErrorRole).toString().isEmpty())
- 			s = STATUS_ERROR;
-@@ -103,6 +133,57 @@ QPixmap PsiContactListViewDelegate::stat
- 	return PsiIconset::instance()->statusPtr(index.data(ContactListModel::JidRole).toString(), s)->pixmap();
- }
- 
-+QList<QPixmap> PsiContactListViewDelegate::clientPixmap(const QModelIndex& index) const
-+{
-+	QList<QPixmap> pixList;
-+	ContactListModel::Type type = ContactListModel::indexType(index);
-+	if (type != ContactListModel::ContactType)
-+		return pixList;
-+
-+	QStringList vList = index.data(ContactListModel::ClientRole).toStringList();
-+	if(vList.isEmpty())
-+		return pixList;
-+
-+	foreach(QString client, vList) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap("clients/" + client);
-+		if(!pix.isNull())
-+			pixList.push_back(pix);
-+	}
-+
-+	return pixList;
-+}
-+
-+QPixmap PsiContactListViewDelegate::avatarIcon(const QModelIndex& index) const
-+{
-+	QPixmap avatar_icon;
-+	int avSize = showAvatars_ ? avatarSize_ : 0;
-+	QPixmap av = qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
-+	if(av.isNull() && useDefaultAvatar_)
-+		av = IconsetFactory::iconPixmap("psi/default_avatar");
-+	int radius;
-+	if (avSize && !av.isNull()) {
-+		if ( (radius = avatarRadius_) ) {
-+			avSize = qMax(avSize, radius*2);
-+			av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+			int w = av.width(), h = av.height();
-+			QPainterPath pp;
-+			pp.addRoundedRect(0, 0, w, h, radius, radius);
-+			avatar_icon = QPixmap(w, h);
-+			avatar_icon.fill(QColor(0,0,0,0));
-+			QPainter mp(&avatar_icon);
-+			mp.setBackgroundMode(Qt::TransparentMode);
-+			mp.setRenderHints(QPainter::Antialiasing, true);
-+			mp.fillPath(pp, QBrush(av));
-+		} else {
-+			avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+		}
-+	} else {
-+		avatar_icon = QPixmap();
-+	}
-+
-+	return avatar_icon;
-+}
-+
- QSize PsiContactListViewDelegate::sizeHint(const QStyleOptionViewItem& /*option*/, const QModelIndex& index) const
- {
- 	if (index.isValid()) {
-@@ -110,12 +207,51 @@ void PsiContactListViewDelegate::drawCon
- 	QRect r = option.rect;
- 
- 	QRect avatarRect(r);
--	const QPixmap statusPixmap = this->statusPixmap(index);
--	avatarRect.translate(1, 1);
--	avatarRect.setSize(statusPixmap.size());
--	painter->drawPixmap(avatarRect.topLeft(), statusPixmap);
-+	if(showAvatars_) {
-+		const QPixmap avatarPixmap = avatarIcon(index);
-+		int size = avatarSize_;
-+		avatarRect.setSize(QSize(size,size));
-+		if(avatarAtLeft_) {
-+			avatarRect.translate(PsiOptions::instance()->getOption("options.ui.contactlist.enable-groups").toBool() ? -5:-1, 1);
-+			r.setLeft(avatarRect.right() + 3);
-+		}
-+		else {
-+			avatarRect.moveTopRight(r.topRight());
-+			avatarRect.translate(-1,1);
-+			r.setRight(avatarRect.left() - 3);
-+		}
-+		int row = (statusSingle_ && showStatusMessages_) ? rowHeight_*3/2 : rowHeight_;
-+		int h = (size - row)/2;
-+		if(h > 0) {
-+			r.setTop(r.top() + h);
-+			r.setHeight(row);
-+		}
-+		else {
-+			avatarRect.setTop(avatarRect.top() - h);
-+		}
- 
--	r.setLeft(avatarRect.right() + 3);
-+		if(!avatarPixmap.isNull()) {
-+			painter->drawPixmap(avatarRect.topLeft(), avatarPixmap);
-+		}
-+	}
-+
-+	QRect statusRect(r);
-+	QPixmap statusPixmap = this->statusPixmap(index);
-+	if(!statusPixmap.isNull()) {
-+		if(statusIconsOverAvatars_ && showAvatars_) {
-+			statusPixmap = statusPixmap.scaled(12,12, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+			statusRect.setSize(statusPixmap.size());
-+			statusRect.moveBottomRight(avatarRect.bottomRight());
-+			statusRect.translate(-1,-2);
-+			r.setLeft(r.left() + 3);
-+		} else {
-+			statusRect.translate(1, 1);
-+			statusRect.setSize(statusPixmap.size());
-+			r.setLeft(statusRect.right() + 3);
-+		}
-+		painter->drawPixmap(statusRect.topLeft(), statusPixmap);		
-+	} else
-+		r.setLeft(r.left() + 3);
- 
- 	QColor textColor;
- 	if(index.data(ContactListModel::IsAnimRole).toBool()) {
-@@ -146,6 +282,74 @@ void PsiContactListViewDelegate::drawCon
- 		drawText(painter, o, r, text, index);
- 	}
- 
-+	QRect iconRect(r);
-+	QList<QPixmap> rightPixs;
-+	QList<int> rightWidths;
-+	if (showClientIcons_) {
-+		bool showAllClients = PsiOptions::instance()->getOption("options.ui.contactlist.show-all-client-icons").toBool();
-+		const QList<QPixmap> pixList = this->clientPixmap(index);
-+
-+		for (QList<QPixmap>::ConstIterator it = pixList.begin(); it != pixList.end(); ++it) {
-+			const QPixmap &pix = *it;
-+			rightPixs.push_back(pix);
-+			rightWidths.push_back(pix.width());
-+			if(!showAllClients) break;
-+		}
-+	}
-+
-+	if (showMoodIcons_ && !index.data(ContactListModel::MoodRole).isNull()) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap(QString("mood/%1").arg(index.data(ContactListModel::MoodRole).toString()));
-+		if(!pix.isNull()) {
-+			rightPixs.push_back(pix);
-+			rightWidths.push_back(pix.width());
-+		}
-+	}
-+
-+	if (showActivityIcons_ && !index.data(ContactListModel::ActivityRole).isNull()) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap(QString("activities/%1").arg(index.data(ContactListModel::ActivityRole).toString()));
-+		if(!pix.isNull()) {
-+			rightPixs.push_back(pix);
-+			rightWidths.push_back(pix.width());
-+		}
-+	}
-+
-+	if (showTuneIcons_ && index.data(ContactListModel::TuneRole).toBool()) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap("psi/notification_roster_tune");
-+		rightPixs.push_back(pix);
-+		rightWidths.push_back(pix.width());
-+	}
-+
-+        if (showGeolocIcons_ && index.data(ContactListModel::GeolocationRole).toBool()) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap("system/geolocation");
-+		rightPixs.push_back(pix);
-+		rightWidths.push_back(pix.width());
-+	}
-+
-+	if(rightPixs.isEmpty())
-+		return;
-+
-+	int sumWidth = 0;
-+	foreach (int w, rightWidths) {
-+		sumWidth += w;
-+	}
-+	QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
-+	QColor tbgc = bgc;
-+	tbgc.setAlpha(0);
-+	sumWidth+=rightPixs.count();
-+	QLinearGradient grad(r.right() - sumWidth - 20, 0, r.right() - sumWidth, 0);
-+	grad.setColorAt(0, tbgc);
-+	grad.setColorAt(1, bgc);
-+	QBrush tbakBr(grad);
-+	QRect gradRect(r);
-+	gradRect.setLeft(gradRect.right() - sumWidth - 20);
-+	painter->fillRect(gradRect, tbakBr);
-+
-+	for (int i=0; i<rightPixs.size(); i++) {
-+		const QPixmap pix = rightPixs[i];
-+		iconRect.setRight(iconRect.right() - pix.width() -1);
-+		painter->drawPixmap(iconRect.topRight(), pix);
-+	}
-+
- #if 0
- 	int x;
- 	if (d->status_single)
-@@ -307,6 +531,54 @@ void PsiContactListViewDelegate::optionC
- 		showStatusMessages_ = PsiOptions::instance()->getOption(showStatusMessagesOptionPath).toBool();
- 		contactList()->viewport()->update();
- 	}
-+	else if(option == showClientIconsPath) {
-+		showClientIcons_ = PsiOptions::instance()->getOption(showClientIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showMoodIconsPath) {
-+		showMoodIcons_ = PsiOptions::instance()->getOption(showMoodIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showActivityIconsPath) {
-+		showActivityIcons_ = PsiOptions::instance()->getOption(showActivityIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showTuneIconsPath) {
-+		showTuneIcons_ = PsiOptions::instance()->getOption(showTuneIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showGeolocIconsPath) {
-+		showGeolocIcons_ = PsiOptions::instance()->getOption(showGeolocIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showAvatarsPath) {
-+		showAvatars_ = PsiOptions::instance()->getOption(showAvatarsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == useDefaultAvatarPath) {
-+		useDefaultAvatar_ = PsiOptions::instance()->getOption(useDefaultAvatarPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == avatarAtLeftOptionPath) {
-+		avatarAtLeft_ = PsiOptions::instance()->getOption(avatarAtLeftOptionPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == avatarSizeOptionPath) {
-+		avatarSize_ = PsiOptions::instance()->getOption(avatarSizeOptionPath).toInt();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == avatarRadiusOptionPath) {
-+		avatarRadius_ = PsiOptions::instance()->getOption(avatarRadiusOptionPath).toInt();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == showStatusIconsPath) {
-+		showStatusIcons_ = PsiOptions::instance()->getOption(showStatusIconsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == statusIconsOverAvatarsPath) {
-+		statusIconsOverAvatars_ = PsiOptions::instance()->getOption(statusIconsOverAvatarsPath).toBool();
-+		contactList()->viewport()->update();
-+	}
- 	else if(option == slimGroupsOptionPath) {
- 		slimGroup_ = PsiOptions::instance()->getOption(slimGroupsOptionPath).toBool();
- 		contactList()->viewport()->update();
---- psi.orig/src/psicontactlistviewdelegate.h
-+++ psi/src/psicontactlistviewdelegate.h
-@@ -51,6 +52,8 @@ protected:
- 	virtual QRect editorRect(const QRect& nameRect) const;
- 
- 	virtual QPixmap statusPixmap(const QModelIndex& index) const;
-+	virtual QList<QPixmap> clientPixmap(const QModelIndex& index) const;
-+	virtual QPixmap avatarIcon(const QModelIndex& index) const;
- 
- private slots:
- 	void optionChanged(const QString& option);
-@@ -60,7 +63,9 @@ private:
- 	QFontMetrics* fontMetrics_;
- 	bool statusSingle_;
- 	int rowHeight_;
--	bool showStatusMessages_, slimGroup_, outlinedGroup_;
-+	bool showStatusMessages_, slimGroup_, outlinedGroup_, showClientIcons_, showMoodIcons_, showActivityIcons_, showGeolocIcons_, showTuneIcons_;
-+	bool showAvatars_, useDefaultAvatar_, avatarAtLeft_, showStatusIcons_, statusIconsOverAvatars_;
-+	int avatarSize_, avatarRadius_;
- 	mutable QHash<QModelIndex, bool> alertingIndexes_;
- };
-

psi-plus-main-20130107.tar.xz/patches/0630-psi-contact-manager.diff Deleted

@@ -1,1212 +0,0 @@
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -32,6 +32,7 @@
- #include "privacy/privacydlg.h"
- #include "psiiconset.h"
- #include "common.h"
-+#include "contactmanager/contactmanagerdlg.h"
- 
- class ContactListAccountMenu::Private : public QObject
- {
-@@ -45,6 +46,7 @@ class ContactListAccountMenu::Private : 
- 	QAction* setAvatarAction_;
- 	QMenu* avatarMenu_;
- 	QAction* unsetAvatarAction_;
-+	QAction* contactManagerAction_;
- 	QMenu* bookmarksMenu_;
- 	QAction* bookmarksManageAction_;
- 	QList<QAction*> bookmarksJoinActions_;
-@@ -95,6 +97,9 @@ public:
- 		unsetAvatarAction_ = new QAction(tr("Unset Avatar"), this);
- 		connect(unsetAvatarAction_, SIGNAL(triggered()), SLOT(unsetAvatar()));
- 
-+		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
-+		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
-+
- 		bookmarksManageAction_ = new QAction(tr("Manage..."), this);
- 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
- 
-@@ -144,6 +149,7 @@ public:
- 		menu->addAction(addContactAction_);
- 		menu->addAction(serviceDiscoveryAction_);
- 		menu->addAction(newMessageAction_);
-+		menu->addAction(contactManagerAction_);
- 		menu->addAction(privacyListsAction_);
- 		menu->addSeparator();
- 		menu->addAction(xmlConsoleAction_);
-@@ -202,6 +208,7 @@ private slots:
- 		newMessageAction_->setEnabled(account->account()->isAvailable());
- 		addContactAction_->setEnabled(account->account()->isAvailable());
- 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
-+		contactManagerAction_->setEnabled(account->account()->isAvailable());
- 		privacyListsAction_->setEnabled(account->account()->isAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
- 			adminMenu_->menuAction()->setVisible(false);
-@@ -318,6 +325,19 @@ private slots:
- 			bringToFront(dlg);
- 	}
- 
-+	void contactManager()
-+	{
-+		if (!account)
-+			return;
-+
-+		ContactManagerDlg *dlg = account->account()->findDialog<ContactManagerDlg*>();
-+		if(!dlg) {
-+			dlg = new ContactManagerDlg(account->account());
-+			dlg->show();
-+		} else
-+			bringToFront(dlg);
-+	}
-+
- 	void xmlConsole()
- 	{
- 		if (!account)
---- /dev/null
-+++ git/src/contactmanager/contactmanagerdlg.cpp
-@@ -0,0 +1,318 @@
-+/*
-+ * contactmanagerdlg.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QMessageBox>
-+#include <QItemSelectionModel>
-+#include <QFileDialog>
-+#include <QFile>
-+#include <QScrollArea>
-+#include <QCheckBox>
-+
-+#include "contactmanagerdlg.h"
-+
-+#include "psiaccount.h"
-+#include "userlist.h"
-+#include "xmpp_tasks.h"
-+#include "psiiconset.h"
-+#include "vcardfactory.h"
-+//#include "contactview.h"
-+
-+
-+ContactManagerDlg::ContactManagerDlg(PsiAccount *pa) :
-+	QDialog(0, Qt::Window),
-+	pa_(pa),
-+	um(0)
-+{
-+	setAttribute(Qt::WA_DeleteOnClose, true);
-+	ui_.setupUi(this);
-+	pa_->dialogRegister(this);
-+	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+
-+	um = new ContactManagerModel(this, pa_);
-+	um->reloadUsers();
-+	ui_.usersView->setModel(um);
-+	ui_.usersView->init();
-+
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/sendMessage").icon(), tr("Message"), 1);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), 2);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth request"), 3);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth grant"), 4);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/command").icon(), tr("Change domain"), 5);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/info").icon(), tr("Resolve nicks"), 6);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/browse").icon(), tr("Move to group"), 7);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/cm_export").icon(), tr("Export"), 8);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/cm_import").icon(), tr("Import"), 9);
-+	connect(ui_.cbAction, SIGNAL(currentIndexChanged(int)), this, SLOT(showParamField(int)));
-+	showParamField(0); // 0 - default index of combobox
-+
-+	ui_.cmbField->insertItems(0, um->manageableFields());
-+	ui_.cmbMatchType->addItem(tr("Simple"), ContactManagerModel::SimpleMatch);
-+	ui_.cmbMatchType->addItem(tr("RegExp"), ContactManagerModel::RegexpMatch);
-+	connect(ui_.btnExecute, SIGNAL(clicked()), this, SLOT(executeCurrent()));
-+	connect(ui_.btnSelect, SIGNAL(clicked()), this, SLOT(doSelect()));
-+
-+	connect(pa_->client(), SIGNAL(rosterRequestFinished(bool,int,QString)), this, SLOT(client_rosterUpdated(bool,int,QString)));
-+}
-+
-+
-+
-+ContactManagerDlg::~ContactManagerDlg()
-+{
-+	pa_->dialogUnregister(this);
-+}
-+
-+void ContactManagerDlg::changeEvent(QEvent *e)
-+{
-+    switch (e->type()) {
-+    case QEvent::LanguageChange:
-+		ui_.retranslateUi(this);
-+        break;
-+    default:
-+        break;
-+    }
-+}
-+
-+void ContactManagerDlg::doSelect()
-+{
-+	int type = ui_.cmbMatchType->itemData(ui_.cmbMatchType->currentIndex()).toInt();
-+	int coumnIndex = ui_.cmbField->currentIndex();
-+	um->invertByMatch(coumnIndex + 1, type,  ui_.edtMatch->text());
-+}
-+
-+void ContactManagerDlg::executeCurrent()
-+{
-+	int action = ui_.cbAction->itemData(ui_.cbAction->currentIndex()).toInt();
-+	QList<UserListItem *> users = um->checkedUsers();
-+	if (!users.count() && action != 9) {
-+		return;
-+	}
-+	switch (action) {
-+		case 1: //message
-+			{
-+				QList<XMPP::Jid> list;
-+				foreach (UserListItem *u, users) {
-+					list.append(u->jid().full());
-+				}
-+				pa_->actionSendMessage(list);
-+			}
-+			break;
-+		case 2: //remove
-+			{
-+				if (QMessageBox::question(this, tr("Removal confirmation"),
-+										  tr("Are you sure want to delete selected contacts?"),
-+										  QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
-+					return;
-+				}
-+				um->startBatch();
-+				foreach (UserListItem *u, users) {
-+					if(u->isTransport() && !Jid(pa_->client()->host()).compare(u->jid())) {
-+						JT_UnRegister *ju = new JT_UnRegister(pa_->client()->rootTask());
-+						ju->unreg(u->jid());
-+						ju->go(true);
-+					}
-+					JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+					r->remove(u->jid());
-+					r->go(true);
-+				}
-+				um->clear();
-+				pa_->client()->rosterRequest();
-+			}
-+			break;
-+		case 3: //Auth request
-+			foreach (UserListItem *u, users) {
-+				pa_->dj_authReq(u->jid());
-+			}
-+			break;
-+		case 4: //Auth grant
-+			foreach (UserListItem *u, users) {
-+				pa_->dj_auth(u->jid());
-+			}
-+			break;
-+		case 5: //change domain
-+			changeDomain(users);
-+			break;
-+		case 6: //resolve nicks
-+			foreach (UserListItem *u, users) {
-+				VCardFactory::instance()->getVCard(u->jid(), pa_->client()->rootTask(), pa_, SLOT(resolveContactName()));
-+			}
-+			break;
-+		case 7:
-+			changeGroup(users);
-+			break;
-+		case 8: //export
-+			exportRoster(users);
-+			break;
-+		case 9: //import
-+			importRoster();
-+			break;
-+		default:
-+			QMessageBox::warning(this, tr("Invalid"), tr("This action is not supported atm"));
-+	}
-+}
-+
-+void ContactManagerDlg::showParamField(int index)
-+{
-+	int action = ui_.cbAction->itemData(index).toInt();
-+	ui_.edtActionParam->hide();
-+	ui_.cmbActionParam->hide();
-+	switch (action) {
-+		case 5:
-+			ui_.edtActionParam->show();
-+			break;
-+		case 7:
-+			ui_.cmbActionParam->clear();
-+			ui_.cmbActionParam->addItems(pa_->groupList());
-+			ui_.cmbActionParam->show();
-+			break;
-+	}
-+}
-+
-+void ContactManagerDlg::changeDomain(QList<UserListItem *>& users)
-+{
-+	QString domain = ui_.edtActionParam->text();
-+	if (domain.size()) {
-+		um->startBatch();
-+		um->clear();
-+		foreach (UserListItem *u, users) {
-+			JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+			if (!u->jid().node().isEmpty()) {
-+				r->set(u->jid().withDomain(domain), u->name(), u->groups());
-+				r->remove(u->jid());
-+			}
-+			r->go(true);
-+		}
-+		pa_->client()->rosterRequest();
-+	} else {
-+		QMessageBox::warning(this, tr("Invalid"), tr("Please fill parameter field with new domain name"));
-+	}
-+}
-+
-+void ContactManagerDlg::changeGroup(QList<UserListItem *>& users)
-+{
-+	QStringList groups(ui_.cmbActionParam->currentText());
-+
-+	foreach (UserListItem *u, users) {
-+		JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+		r->set(u->jid(), u->name(), groups);
-+		r->go(true);
-+	}
-+}
-+
-+void ContactManagerDlg::client_rosterUpdated(bool success, int statusCode,QString statusString)
-+{
-+	if (success) {
-+		um->reloadUsers();
-+	}
-+	ui_.usersView->viewport()->update();
-+	Q_UNUSED(statusCode);
-+	Q_UNUSED(statusString);
-+	um->stopBatch();
-+}
-+
-+void ContactManagerDlg::exportRoster(QList<UserListItem *>& users)
-+{
-+	QString fileName = QFileDialog::getSaveFileName(this, tr("Roster file"), QDir::homePath());
-+	if (!fileName.isEmpty()) {
-+		QDomDocument doc;
-+		QString nick;
-+		QDomElement root = doc.createElement("roster");
-+		doc.appendChild(root);
-+		foreach (UserListItem *u, users) {
-+			QDomElement contact = root.appendChild(doc.createElement("contact")).toElement();
-+			contact.setAttribute("jid", u->jid().bare());
-+			foreach (QString group, u->groups()) {
-+				contact.appendChild(doc.createElement("group")).appendChild(doc.createTextNode(group));
-+			}
-+			nick = u->name();
-+			if (!nick.isEmpty()) {
-+				contact.appendChild(doc.createElement("nick")).appendChild(doc.createTextNode(nick));
-+			}
-+		}
-+		QFile file(fileName);
-+		if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+			QMessageBox::critical(this, tr("Save error!"), tr("Can't open file %1 for writing").arg(fileName));
-+			return;
-+		}
-+		file.write(doc.toString().toLocal8Bit());
-+		file.close();
-+	}
-+}
-+
-+void ContactManagerDlg::importRoster()
-+{
-+	QString fileName = QFileDialog::getOpenFileName(this, tr("Roster file"), QDir::homePath());
-+	if (!fileName.isEmpty()) {
-+		QFile file(fileName);
-+		if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-+			QMessageBox::critical(this, tr("Open error!"), tr("Can't open file %1 for reading").arg(fileName));
-+			return;
-+		}
-+		QDomDocument doc;
-+		if (!doc.setContent(&file)) {
-+			QMessageBox::critical(this, tr("Open error!"), tr("File %1 is not xml file").arg(fileName));
-+			return;
-+		}
-+		QDomNodeList domContacts = doc.documentElement().elementsByTagName("contact");
-+		if (domContacts.isEmpty()) {
-+			QMessageBox::warning(this, tr("Nothing to do.."), tr("No contacts found in file %1").arg(fileName));
-+		}
-+
-+		QHash<QString, QString>nicks;
-+		QHash<QString, QStringList>groups;
-+		QString jid, nick;
-+		QStringList jids;
-+		QStringList labelContent;
-+		for (unsigned i=0; i<domContacts.length(); i++) {
-+			QDomElement contact = domContacts.item(i).toElement();
-+			jid = contact.attribute("jid");
-+			jids.append(jid);
-+			QDomNodeList props = contact.childNodes();
-+			for (unsigned j=0; j<props.length(); j++) {
-+				if (!props.item(j).isElement()) {
-+					continue;
-+				}
-+				QDomElement el = props.item(j).toElement();
-+				if (el.tagName() == "nick") {
-+					nicks[jid] = el.text();
-+				}
-+				if (el.tagName() == "group") {
-+					groups[jid].append(el.text());
-+				}
-+			}
-+			labelContent.append(QString("%1 (%2)").arg(jid).arg(nicks[jid]));
-+		}
-+		
-+		QMessageBox confirmDlg(
-+				QMessageBox::Question,tr("Confirm contacts importing"),
-+				tr("Do you really want to import these contacts?"), QMessageBox::Cancel | QMessageBox::Yes);
-+		confirmDlg.setDetailedText(labelContent.join("\n"));
-+		if (confirmDlg.exec() == QMessageBox::Yes) {
-+			um->startBatch();
-+			um->clear();
-+			foreach (QString jid, jids) {
-+				JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+				r->set(Jid(jid), nicks[jid], groups[jid]);
-+				r->go(true);
-+			}
-+			pa_->client()->rosterRequest(); // через ж.., но пускай пока так.
-+		}
-+		file.close();
-+	}
-+}
---- /dev/null
-+++ git/src/contactmanager/contactmanagerdlg.h
-@@ -0,0 +1,60 @@
-+/*
-+ * contactmanagerdlg.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERDLG_H
-+#define CONTACTMANAGERDLG_H
-+#include "ui_contactmanagerdlg.h"
-+
-+#include <QtGui/QDialog>
-+#include "contactmanagermodel.h"
-+class PsiAccount;
-+
-+namespace Ui {
-+    class ContactManagerDlg;
-+}
-+
-+class ContactManagerDlg : public QDialog {
-+    Q_OBJECT
-+    Q_DISABLE_COPY(ContactManagerDlg)
-+public:
-+	explicit ContactManagerDlg(PsiAccount *pa);
-+    virtual ~ContactManagerDlg();
-+
-+protected:
-+    virtual void changeEvent(QEvent *e);
-+
-+private:
-+	void changeDomain(QList<UserListItem *>& users);
-+	void changeGroup(QList<UserListItem *>& users);
-+	void exportRoster(QList<UserListItem *>& users);
-+	void importRoster();
-+
-+	Ui::ContactManagerDlg ui_;
-+	PsiAccount *pa_;
-+	ContactManagerModel *um;
-+
-+private slots:
-+	void doSelect();
-+	void executeCurrent();
-+	void showParamField(int index);
-+	void client_rosterUpdated(bool,int,QString);
-+};
-+
-+#endif // CONTACTMANAGERDLG_H
---- /dev/null
-+++ git/src/contactmanager/contactmanagerdlg.ui
-@@ -0,0 +1,203 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>ContactManagerDlg</class>
-+ <widget class="QDialog" name="ContactManagerDlg">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>600</width>
-+    <height>390</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Contacts Manager</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="ContactManagerView" name="usersView">
-+     <property name="selectionBehavior">
-+      <enum>QAbstractItemView::SelectRows</enum>
-+     </property>
-+     <property name="sortingEnabled">
-+      <bool>true</bool>
-+     </property>
-+     <attribute name="horizontalHeaderCascadingSectionResizes">
-+      <bool>true</bool>
-+     </attribute>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="lblField">
-+       <property name="text">
-+        <string>Field</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbField"/>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbMatchType"/>
-+     </item>
-+     <item>
-+      <widget class="QLineEdit" name="edtMatch">
-+       <property name="maximumSize">
-+        <size>
-+         <width>32000</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnSelect">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>32</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+       <property name="text">
-+        <string notr="true">+/-</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-+     <item>
-+      <widget class="QLabel" name="lblAction">
-+       <property name="text">
-+        <string>Action</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cbAction"/>
-+     </item>
-+     <item>
-+      <widget class="QLineEdit" name="edtActionParam">
-+       <property name="whatsThis">
-+        <string extracomment="Action's parameter"/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbActionParam">
-+       <property name="editable">
-+        <bool>true</bool>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnExecute">
-+       <property name="text">
-+        <string>Execute</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <widget class="QDialogButtonBox" name="buttonBox">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+     <property name="standardButtons">
-+      <set>QDialogButtonBox::Close</set>
-+     </property>
-+     <property name="centerButtons">
-+      <bool>false</bool>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <customwidgets>
-+  <customwidget>
-+   <class>ContactManagerView</class>
-+   <extends>QTableView</extends>
-+   <header>contactmanager/contactmanagerview.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>accepted()</signal>
-+   <receiver>ContactManagerDlg</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>257</x>
-+     <y>380</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>157</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>rejected()</signal>
-+   <receiver>ContactManagerDlg</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>325</x>
-+     <y>380</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>286</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>edtMatch</sender>
-+   <signal>returnPressed()</signal>
-+   <receiver>btnSelect</receiver>
-+   <slot>click()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>343</x>
-+     <y>292</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>386</x>
-+     <y>302</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
---- /dev/null
-+++ git/src/contactmanager/contactmanagermodel.cpp
-@@ -0,0 +1,303 @@
-+/*
-+ * contactmanagermodel.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "contactmanagermodel.h"
-+#include "psiaccount.h"
-+#include "userlist.h"
-+#include "xmpp_tasks.h"
-+#include "QDebug"
-+
-+
-+ContactManagerModel::ContactManagerModel(QObject * parent, PsiAccount *pa) :
-+		QAbstractTableModel(parent),
-+		pa_(pa)
-+{
-+	columnNames
-+			<<""
-+			<<tr("Nick")
-+			<<tr("Group")
-+			<<tr("Node")
-+			<<tr("Domain")
-+			<<tr("Subscription");
-+	roles	<<CheckRole
-+			<<NickRole
-+			<<GroupRole
-+			<<NodeRole
-+			<<DomainRole
-+			<<SubscriptionRole;
-+	connect(pa_, SIGNAL(updateContact(UserListItem)), this, SLOT(view_contactUpdated(UserListItem)));
-+	connect(pa_->client(), SIGNAL(rosterItemUpdated(const RosterItem &)), this, SLOT(client_rosterItemUpdated(const RosterItem &)));
-+}
-+
-+void ContactManagerModel::reloadUsers()
-+{
-+	clear();
-+	UserList *ul = pa_->userList();
-+	foreach (UserListItem *u, *ul) {
-+		if (u->inList()) {
-+			addContact(u);
-+		}
-+	}
-+	reset();
-+}
-+
-+void ContactManagerModel::clear()
-+{
-+	_userList.clear();
-+	checks.clear();
-+}
-+
-+int ContactManagerModel::rowCount(const QModelIndex &parent) const
-+{
-+	if (parent.isValid()) return 0;
-+	return _userList.count();
-+}
-+
-+int ContactManagerModel::columnCount ( const QModelIndex & parent) const
-+{
-+	Q_UNUSED(parent);
-+	return columnNames.count();
-+}
-+
-+QVariant ContactManagerModel::data(const QModelIndex &index, int role) const
-+{
-+	Role columnRole = roles[index.column()];
-+	UserListItem *u = _userList.at(index.row());
-+	if (u) {
-+		switch (columnRole) {
-+			case CheckRole: //checkbox
-+				if (role == Qt::CheckStateRole) {
-+					return checks.contains(u->jid().full())?2:0;
-+				} else if (role == Qt::TextAlignmentRole) {
-+					return (int)(Qt::AlignRight | Qt::AlignVCenter);
-+				}
-+				break;
-+			case NodeRole:
-+				if (role == Qt::TextAlignmentRole) {
-+					return (int)(Qt::AlignRight | Qt::AlignVCenter);
-+				}
-+			default:
-+				if (role == Qt::DisplayRole) {
-+					return userFieldString(u, columnRole);
-+				}
-+		}
-+	}
-+	return QVariant();
-+}
-+
-+QString ContactManagerModel::userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const
-+{
-+	QString data;
-+	switch (columnRole) {
-+		case NodeRole: //node
-+			data = u->jid().node();
-+			break;
-+		case DomainRole: //domain
-+			data = u->jid().domain();
-+			break;
-+		case NickRole: //nick
-+			data = u->name();
-+			break;
-+		case GroupRole: //group
-+			if (u->groups().isEmpty()) {
-+				data = "";
-+			} else {
-+				data = u->groups().first();
-+			}
-+			break;
-+		case SubscriptionRole: //subscription
-+			data = u->subscription().toString();
-+			break;
-+		default:
-+			break;
-+	}
-+	return data;
-+}
-+
-+QVariant ContactManagerModel::headerData(int section, Qt::Orientation orientation,
-+					 int role) const
-+{
-+	if (role == Qt::DisplayRole) {
-+		if (orientation == Qt::Horizontal) {
-+			return columnNames[section];
-+		} else {
-+			return section+1;
-+		}
-+	}
-+	return QVariant();
-+}
-+
-+
-+QStringList ContactManagerModel::manageableFields()
-+{
-+	QStringList ret = columnNames;
-+	ret.removeFirst();
-+	return ret;
-+}
-+
-+void ContactManagerModel::addContact(UserListItem *u)
-+{
-+	_userList.append(u);
-+}
-+
-+Qt::ItemFlags ContactManagerModel::flags ( const QModelIndex & index ) const
-+{
-+	Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-+	Role columnRole = roles[index.column()];
-+	if ( columnRole == CheckRole ) {
-+		flags |= ( Qt::ItemIsUserCheckable );
-+	}
-+	return flags;
-+}
-+
-+bool ContactManagerModel::setData ( const QModelIndex & index, const QVariant & value, int role )
-+{
-+	Q_UNUSED(role);
-+	if (index.isValid()) {
-+		Role columnRole = roles[index.column()];
-+		if ( columnRole == CheckRole ) {
-+			QString jid = _userList.at(index.row())->jid().full();
-+			if (value.toInt() == 3) { //iversion
-+				if (checks.contains(jid)) {
-+					checks.remove(jid);
-+				} else {
-+					checks.insert(jid);
-+				}
-+				emit dataChanged ( index, index );
-+			} else {
-+				if (checks.contains(jid)) {
-+					if (!value.toBool()) {
-+						checks.remove(jid);
-+						emit dataChanged ( index, index );
-+					}
-+				} else {
-+					if (value.toBool()) {
-+						checks.insert(jid);
-+						emit dataChanged ( index, index );
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return false;
-+}
-+
-+ContactManagerModel::Role ContactManagerModel::sortRole;
-+Qt::SortOrder ContactManagerModel::sortOrder = Qt::AscendingOrder;
-+
-+void ContactManagerModel::sort ( int column, Qt::SortOrder order = Qt::AscendingOrder )
-+{
-+	Role columnRole = roles[column];
-+	ContactManagerModel::sortRole = columnRole;
-+	ContactManagerModel::sortOrder = order;
-+	if (columnRole != CheckRole) {
-+		emit layoutAboutToBeChanged();
-+		qSort(_userList.begin(), _userList.end(), ContactManagerModel::sortLessThan);
-+		emit layoutChanged();
-+	}
-+}
-+
-+bool ContactManagerModel::sortLessThan(UserListItem *u1, UserListItem *u2)
-+{
-+	QString g1, g2;
-+	bool result = false;
-+	switch (ContactManagerModel::sortRole) {
-+		case NodeRole: //node
-+			result = u1->jid().node() < u2->jid().node();
-+			break;
-+		case DomainRole: //domain
-+			result = u1->jid().domain() < u2->jid().domain();
-+			break;
-+		case NickRole: //nick
-+			result = u1->name() < u2->name();
-+			break;
-+		case GroupRole: //group
-+			if (!u1->groups().isEmpty()) {
-+				g1 = u1->groups().first();
-+			}
-+			if (!u2->groups().isEmpty()) {
-+				g2 = u2->groups().first();
-+			}
-+			result = g1 < g2;
-+			break;
-+		case SubscriptionRole: //subscription
-+			result = u1->subscription().toString() < u2->subscription().toString();
-+			break;
-+		default:
-+			break;
-+	}
-+	return ContactManagerModel::sortOrder == Qt::AscendingOrder? result : !result;
-+}
-+
-+QList<UserListItem *> ContactManagerModel::checkedUsers()
-+{
-+	QList<UserListItem *> users;
-+	foreach (UserListItem *u, _userList) {
-+		if (checks.contains(u->jid().full())) {
-+			users.append(u);
-+		}
-+	}
-+	return users;
-+}
-+
-+void ContactManagerModel::invertByMatch(int columnIndex, int matchType, const QString &str)
-+{
-+	emit layoutAboutToBeChanged();
-+	Role columnRole = roles[columnIndex];
-+	QString data;
-+	QRegExp reg;
-+	if (matchType == ContactManagerModel::RegexpMatch) {
-+		reg = QRegExp(str);
-+	}
-+	foreach (UserListItem *u, _userList) {
-+		data = userFieldString(u, columnRole);
-+		if ((matchType == ContactManagerModel::SimpleMatch && str == data) ||
-+			(matchType == ContactManagerModel::RegexpMatch && reg.indexIn(data) != -1)) {
-+			QString jid = u->jid().full();
-+			if (checks.contains(jid)) {
-+				checks.remove(jid);
-+			} else {
-+				checks.insert(jid);
-+			}
-+		}
-+	}
-+	emit layoutChanged();
-+}
-+
-+void ContactManagerModel::view_contactUpdated(const UserListItem &u)
-+{
-+	contactUpdated(u.jid());
-+}
-+
-+void ContactManagerModel::client_rosterItemUpdated(const RosterItem &item)
-+{
-+	contactUpdated(item.jid());
-+}
-+
-+void  ContactManagerModel::contactUpdated(const Jid &jid)
-+{
-+	int i = 0;
-+	foreach (UserListItem *lu, _userList) {
-+		if (lu->jid() == jid) {
-+			dataChanged(index(i, 1), index(i, columnNames.count()-1));
-+		}
-+		i++;
-+	}
-+}
---- /dev/null
-+++ git/src/contactmanager/contactmanagermodel.h
-@@ -0,0 +1,93 @@
-+/*
-+ * contactmanagermodel.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERMODEL_H
-+#define CONTACTMANAGERMODEL_H
-+
-+#include <QAbstractTableModel>
-+#include <QStringList>
-+#include <QSet>
-+
-+class UserListItem;
-+class PsiAccount;
-+namespace XMPP
-+{
-+	class RosterItem;
-+	class Jid;
-+}
-+using namespace XMPP;
-+
-+class ContactManagerModel : public QAbstractTableModel
-+{
-+	Q_OBJECT
-+public:
-+	enum Role {
-+		// DisplayRole / EditRole
-+		CheckRole,
-+		NickRole,
-+		GroupRole,
-+		NodeRole,
-+		DomainRole,
-+		SubscriptionRole
-+	};
-+	const static int SimpleMatch = 1;
-+	const static int RegexpMatch = 2;
-+
-+	ContactManagerModel(QObject * parent, PsiAccount *pa);
-+	int rowCount(const QModelIndex &parent = QModelIndex()) const;
-+	int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
-+	QVariant data(const QModelIndex &index, int role) const;
-+	QVariant headerData(int section, Qt::Orientation orientation,
-+						 int role = Qt::DisplayRole) const;
-+	Qt::ItemFlags flags ( const QModelIndex & index ) const;
-+	bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
-+	void sort ( int column, Qt::SortOrder order );
-+	static bool sortLessThan(UserListItem *u1, UserListItem *u2);
-+	static Role sortRole;
-+	static Qt::SortOrder sortOrder;
-+
-+
-+	QStringList manageableFields();
-+	void reloadUsers();
-+	void clear();
-+	void addContact(UserListItem *u);
-+	QList<UserListItem *> checkedUsers();
-+	void invertByMatch(int columnIndex, int matchType, const QString &str);
-+
-+	void startBatch() { layoutAboutToBeChanged(); }
-+	void stopBatch() { layoutChanged(); }
-+
-+
-+private:
-+	PsiAccount *pa_;
-+	QList<UserListItem *> _userList;
-+	QStringList columnNames;
-+	QList<Role> roles;
-+	QSet<QString> checks;
-+
-+	QString userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const;
-+	void contactUpdated(const Jid &);
-+
-+private slots:
-+	void view_contactUpdated(const UserListItem &);
-+	void client_rosterItemUpdated(const RosterItem &);
-+};
-+
-+#endif // CONTACTMANAGERMODEL_H
---- /dev/null
-+++ git/src/contactmanager/contactmanager.pri
-@@ -0,0 +1,7 @@
-+HEADERS += $$PWD/contactmanagerdlg.h \
-+    $$PWD/contactmanagermodel.h \
-+	$$PWD/contactmanagerview.h
-+SOURCES += $$PWD/contactmanagerdlg.cpp \
-+    $$PWD/contactmanagermodel.cpp \
-+	$$PWD/contactmanagerview.cpp
-+FORMS += $$PWD/contactmanagerdlg.ui
---- /dev/null
-+++ git/src/contactmanager/contactmanagerview.cpp
-@@ -0,0 +1,92 @@
-+/*
-+ * contactmanagerview.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QMenu>
-+#include <QContextMenuEvent>
-+#include <QtGui/QHeaderView>
-+
-+#include "contactmanagerview.h"
-+#include "psiiconset.h"
-+
-+ContactManagerView::ContactManagerView( QWidget * parent )
-+		: QTableView(parent)
-+{
-+
-+}
-+
-+void ContactManagerView::init()
-+{
-+	resizeColumnsToContents();
-+	horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
-+	horizontalHeader()->setStretchLastSection(true);
-+	horizontalHeader()->setSortIndicator(-1, Qt::AscendingOrder);
-+	verticalHeader()->setDefaultAlignment( Qt::AlignHCenter );
-+
-+	connect(horizontalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(sortByColumn(int)));
-+}
-+
-+void ContactManagerView::contextMenuEvent( QContextMenuEvent * e )
-+{
-+	QMenu *popup = new QMenu(this);
-+	QList<QAction *> actions;
-+	actions <<new QAction(IconsetFactory::icon("psi/cm_check").icon(), tr("Check"), popup)
-+			<<new QAction(IconsetFactory::icon("psi/cm_uncheck").icon(), tr("Uncheck"), popup)
-+			<<new QAction(IconsetFactory::icon("psi/cm_invertcheck").icon(), tr("Invert"), popup);
-+	popup->addActions(actions);
-+	QAction *result = popup->exec(e->globalPos());
-+	int iresult;
-+	if (result) {
-+		iresult = actions.indexOf(result);
-+		const QVariant value(2);
-+		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
-+			switch (iresult) {
-+				case 0: //check
-+					model()->setData(check, 2);
-+					break;
-+				case 1: //uncheck
-+					model()->setData(check, 0);
-+					break;
-+				case 2: //invert
-+					model()->setData(check, 3);
-+					break;
-+			}
-+		}
-+	}
-+	delete popup;
-+}
-+
-+void ContactManagerView::keyPressEvent( QKeyEvent * e )
-+{
-+	if (e->key() == Qt::Key_Space) {
-+		int data = 2; //check
-+		if (e->modifiers() & Qt::ControlModifier) {
-+			data = 3; //invert
-+		} else if (e->modifiers() & Qt::ShiftModifier) {
-+			data = 0; //uncheck
-+		}
-+		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
-+			model()->setData(check, data);
-+		}
-+		e->accept();
-+	} else {
-+		QTableView::keyPressEvent(e);
-+		e->ignore();
-+	}
-+}
---- /dev/null
-+++ git/src/contactmanager/contactmanagerview.h
-@@ -0,0 +1,38 @@
-+/*
-+ * contactmanagerview.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERVIEW_H
-+#define CONTACTMANAGERVIEW_H
-+
-+#include <QTableView>
-+
-+class ContactManagerView : public QTableView
-+{
-+	Q_OBJECT
-+public:
-+	ContactManagerView( QWidget * parent = 0 );
-+	void init();
-+
-+protected:
-+	void contextMenuEvent( QContextMenuEvent * e );
-+	void keyPressEvent( QKeyEvent * e );
-+};
-+
-+#endif // CONTACTMANAGERVIEW_H
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -7,6 +7,7 @@ include($$PWD/privacy/privacy.pri)
- include($$PWD/capabilities/capabilities.pri)
- include($$PWD/tabs/tabs.pri)
- include($$PWD/Certificates/Certificates.pri)
-+include($$PWD/contactmanager/contactmanager.pri)
- 
- # tools
- # include($$PWD/tools/trayicon/trayicon.pri)

psi-plus-main-20130107.tar.xz/patches/0640-psi-asterisk-allow-multiple-payload-types.diff Deleted

@@ -1,96 +0,0 @@
-From 414e49698a7fb64741d4b64ce01139a4bb31db2a Mon Sep 17 00:00:00 2001
-From: Julius Schwartzenberg <julius.schwartzenberg@gmail.com>
-Date: Wed, 24 Feb 2010 00:12:51 +0100
-Subject: Allow multiple payload types
-
----
- src/avcall/avcall.cpp |   63 ++++++++++++++++++------------------------------
- 1 files changed, 24 insertions(+), 39 deletions(-)
-
---- git.orig/src/avcall/avcall.cpp
-+++ git/src/avcall/avcall.cpp
-@@ -625,35 +625,38 @@ private slots:
- 
- 		printf("rtp_started\n");
- 
--		PsiMedia::PayloadInfo audio, *pAudio;
--		PsiMedia::PayloadInfo video, *pVideo;
--
--		pAudio = 0;
--		pVideo = 0;
--		if(transmitAudio)
-+		if(!incoming)
-+		{
-+			sess = manager->rtpManager->createOutgoing();
-+			setup_sess();
-+		}
-+		
-+		if(transmitAudio && !rtp.localAudioPayloadInfo().isEmpty())
- 		{
--			// confirm transmitting of audio is actually possible,
--			//   in the case that a file is used as input
--			if(rtp.canTransmitAudio())
-+			QList<JingleRtpPayloadType> pis;
-+			foreach(PsiMedia::PayloadInfo pi, rtp.localAudioPayloadInfo())
- 			{
--				audio = rtp.localAudioPayloadInfo().first();
--				pAudio = &audio;
-+				JingleRtpPayloadType pt = payloadInfoToPayloadType(pi);
-+				pis << pt;
- 			}
--			else
--				transmitAudio = false;
-+			sess->setLocalAudioPayloadTypes(pis);
- 		}
--		if(transmitVideo)
-+		else
-+			transmitAudio = false;
-+
-+		if(transmitVideo && !rtp.localVideoPayloadInfo().isEmpty())
- 		{
--			// same for video
--			if(rtp.canTransmitVideo())
-+			QList<JingleRtpPayloadType> pis;
-+			foreach(PsiMedia::PayloadInfo pi, rtp.localVideoPayloadInfo())
- 			{
--				video = rtp.localVideoPayloadInfo().first();
--				pVideo = &video;
-+				JingleRtpPayloadType pt = payloadInfoToPayloadType(pi);
-+				pis << pt;
- 			}
--			else
--				transmitVideo = false;
-+			sess->setLocalVideoPayloadTypes(pis);
- 		}
--
-+		else
-+			transmitVideo = false;
-+		
- 		if(transmitAudio && transmitVideo)
- 			mode = AvCall::Both;
- 		else if(transmitAudio && !transmitVideo)
-@@ -667,24 +670,6 @@ private slots:
- 		}
- 
- 		if(!incoming)
--		{
--			sess = manager->rtpManager->createOutgoing();
--			setup_sess();
--		}
--
--		if(pAudio)
--		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pAudio);
--			sess->setLocalAudioPayloadTypes(QList<JingleRtpPayloadType>() << pt);
--		}
--
--		if(pVideo)
--		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pVideo);
--			sess->setLocalVideoPayloadTypes(QList<JingleRtpPayloadType>() << pt);
--		}
--
--		if(!incoming)
- 			sess->connectToJid(peer);
- 		else
- 			sess->localMediaUpdate();

psi-plus-main-20130107.tar.xz/patches/0650-psi-coloring-tooltip.diff Deleted

@@ -1,70 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -284,6 +284,11 @@
- 						<status-change-animation2 type="QColor">#969696</status-change-animation2>
- 						<status-messages type="QColor">#808080</status-messages>
- 					</contactlist>
-+					<tooltip>
-+						<enable comment="Enable tooltip coloring feature" type="bool">true</enable>
-+						<background comment="Tooltip background color" type="QColor">#e9ecc7</background>
-+						<text comment="Tooltip text color" type="QColor">#000000</text>
-+					</tooltip>
- 					<muc>
- 						<nick-colors type="QStringList" >
- 							<item>Blue</item>
---- git.orig/src/widgets/psitiplabel.cpp
-+++ git/src/widgets/psitiplabel.cpp
-@@ -11,6 +11,7 @@
- #include <QTextEdit>
- 
- #include "psirichtext.h"
-+#include "psioptions.h"
- 
- PsiTipLabel *PsiTipLabel::instance_ = 0;
- 
-@@ -35,7 +36,21 @@ void PsiTipLabel::init(const QString& te
- 	qApp->installEventFilter(this);
- 	startHideTimer();
- 	setWindowOpacity(style()->styleHint(QStyle::SH_ToolTipLabel_Opacity, 0, this) / 255.0);
--	setPalette(QToolTip::palette());
-+
-+	QPalette palette(QToolTip::palette());
-+	enableColoring_ = PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.enable").toBool();
-+	if(enableColoring_){
-+		QString textColor(PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.text").toString());
-+		QString baseColor(PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.background").toString());
-+		if(textColor == baseColor) { //options values are not set
-+			palette.setColor(QPalette::WindowText, palette.color(QPalette::ToolTipText));
-+			palette.setColor(QPalette::Window, palette.color(QPalette::ToolTipBase));
-+		} else {
-+			palette.setColor(QPalette::WindowText, QColor(textColor));
-+			palette.setColor(QPalette::Window, QColor(baseColor));
-+		}
-+	}
-+	setPalette(palette);
- }
- 
- void PsiTipLabel::setText(const QString& text)
-@@ -158,7 +173,11 @@ void PsiTipLabel::paintEvent(QPaintEvent
- 	QStylePainter p(this);
- 	QStyleOptionFrame opt;
- 	opt.init(this);
--	p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
-+	if(enableColoring_) {
-+		p.drawPrimitive(QStyle::PE_Frame, opt);
-+	} else {
-+		p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
-+	}
- 	p.end();
- 
- 	// stolen from QLabel::paintEvent
---- git.orig/src/widgets/psitiplabel.h
-+++ git/src/widgets/psitiplabel.h
-@@ -40,6 +40,7 @@ private:
- 	QString theText_;
- 	bool isRichText;
- 	int margin;
-+	bool enableColoring_;
- 	// int indent;
- 
- 	virtual void initUi();

psi-plus-main-20130107.tar.xz/patches/0660-psiplus-more-compatibility-with-skinsplugin.diff Deleted

@@ -1,37 +0,0 @@
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -333,6 +333,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	} else
- 		setCentralWidget(rosterBar);
- 
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+
- 	d->vb_roster = new QVBoxLayout(rosterBar);
- #ifndef NEWCONTACTLIST
- 	cvlist = new ContactView(rosterBar);
-@@ -541,6 +543,14 @@ void MainWin::splitterMoved()
- 	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
- }
- 
-+void MainWin::optionChanged(const QString& option)
-+{
-+	if (option == toolbarsStateOptionPath) { //for compatibility with skins plugin
-+		loadToolbarsState();
-+		//buildToolbars(); //FIXME!!! not a very good solution
-+	}
-+}
-+
- void MainWin::registerAction( IconAction* action )
- {
- 	const char *activated  = SIGNAL( triggered() );
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -147,6 +147,8 @@ private slots:
- 
- 	void doTrayToolTip(QObject *, QPoint);
- 
-+	void optionChanged(const QString&);
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();

psi-plus-main-20130107.tar.xz/patches/0670-psi-css-style-sheet.diff Deleted

@@ -1,322 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -113,6 +113,7 @@
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<css type="QString" />
- 				<only-paste-template type="bool">false</only-paste-template>
- 				<disable-paste-send type="bool">false</disable-paste-send>
- 			</chat>
-@@ -135,6 +136,7 @@
- 					<show comment="Show status messages" type="bool">false</show>
- 				</status-messages>
- 				<tooltip comment="Display options for the contact list tooltips">
-+					<css type="QString"></css>
- 					<avatar comment="Display avatar" type="bool">true</avatar>
- 					<client-version comment="Display client version information" type="bool">true</client-version>
- 					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
-@@ -143,6 +145,58 @@
- 				</tooltip>
- 				<temp-no-roster-animation comment="Disable animated icons. This option will be removed as soon as the contactlist code is optimized enough" type="bool">false</temp-no-roster-animation>
- 				<account-sort-style type="QString">alpha</account-sort-style>
-+				<css type="QString">/* frame of avatar - general settings */
-+/* фрейм с аватаром - общие настройки */
-+RosterAvatarFrame * {
-+	margin: 1px;
-+}
-+
-+/* frame of avatar - avatar */
-+/* фрейм с аватаром - аватар */
-+QLabel#lb_avatar {
-+	margin-left: 0px;
-+	margin-top: 2px;
-+	margin-bottom: 2px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - nick */
-+/* фрейм с аватаром - ник */
-+QLabel#lb_nick {
-+	margin: 2px;
-+	margin-right: 1px;
-+	margin-bottom: 3px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - buttons of PEP and status */
-+/* фрейм с аватаром - кнопки PEP и статуса */
-+QToolButton#tb_status, #tb_mood, #tb_activity {
-+	margin-left: 1px;
-+	margin-right: 1px;
-+	margin-bottom: 2px;
-+	width: 100%;
-+}
-+
-+QToolButton#tb_status {
-+	margin-top: 0px;
-+	margin-bottom: 1px;
-+}
-+
-+/* frame of avatar - button of status, arrow */
-+/* фрейм с аватаром - кнопка статуса, стрелка */
-+QToolButton#tb_status::menu-indicator {
-+	image: url();
-+}
-+
-+/* frame of avatar - field of status message */
-+/* фрейм с аватаром - строка статусного сообщения */
-+QLineEdit#le_status_text {
-+	margin-right: 0px;
-+	margin-bottom: 2px;
-+}</css>
- 				<always-on-top type="bool">false</always-on-top>
- 				<automatically-resize-roster type="bool">false</automatically-resize-roster>
- 				<grow-roster-upwards type="bool">true</grow-roster-upwards>
-@@ -323,6 +377,7 @@
- 					<message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</message>
- 					<passive-popup type="QString">Sans Serif,7,-1,5,50,0,0,0,0,0</passive-popup>
- 				</font>
-+				<css type="QString" />
- 			</look>
- 			<notifications>
- 				<send-receipts type="bool" >true</send-receipts>
-@@ -339,6 +394,7 @@
- 						<status type="int">2000</status>
- 					</delays>
- 					<enabled type="bool">false</enabled>
-+					<css type="QString"></css>
- 					<top-to-bottom type="bool">false</top-to-bottom>
- 					<at-left-corner type="bool">false</at-left-corner>
- 					<incoming-chat type="bool">true</incoming-chat>
---- psi.orig/src/contactlistitemmenu.cpp
-+++ psi/src/contactlistitemmenu.cpp
-@@ -21,12 +21,17 @@
- #include "contactlistitemmenu.h"
- 
- #include "shortcutmanager.h"
-+#include "psioptions.h"
- 
- ContactListItemMenu::ContactListItemMenu(ContactListItem* item, ContactListModel* model)
- 	: QMenu(0)
- 	, item_(item)
- 	, model_(model)
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- ContactListItemMenu::~ContactListItemMenu()
---- psi.orig/src/gcuserview.cpp
-+++ psi/src/gcuserview.cpp
-@@ -522,6 +522,10 @@ void GCUserView::doContextMenu(QTreeWidg
- 	pm->addAction(act);
- 	act->setData(3);
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		pm->setStyleSheet(css);
-+	}
- 	int x = -1;
- 	bool enabled = false;
- 	act = pm->exec(QCursor::pos());
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1707,6 +1707,10 @@ QString GCMainDlg::desiredCaption() cons
- 
- void GCMainDlg::setLooks()
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- 	ui_.vsplitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -515,6 +515,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
-         /*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
-         connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
-+
-+	optionChanged("options.ui.contactlist.css");
- }
- 
- MainWin::~MainWin()
-@@ -549,6 +551,12 @@ void MainWin::optionChanged(const QStrin
- 		loadToolbarsState();
- 		//buildToolbars(); //FIXME!!! not a very good solution
- 	}
-+	else if (option == "options.ui.contactlist.css") {
-+		const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+		if (!css.isEmpty()) {
-+			setStyleSheet(css);
-+		}
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -263,6 +263,10 @@ void PsiChatDlg::setLooks()
- {
- 	ChatDlg::setLooks();
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- 	ui_.splitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -501,6 +501,10 @@ bool PsiCon::init()
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty())
-+		d->iconSelect->setStyleSheet(css);
-+
- 	// first thing, try to load the iconset
- 	bool result = true;;
- 	if( !PsiIconset::instance()->loadAll() ) {
-@@ -1326,6 +1330,13 @@ void PsiCon::optionChanged(const QString
- 	if (option == "options.p2p.bytestreams.listen-port") {
- 		s5b_init();
- 	}
-+	if (option == "options.ui.chat.css") {
-+		QString css = PsiOptions::instance()->getOption(option).toString();
-+		if (!css.isEmpty())
-+			d->iconSelect->setStyleSheet(css);
-+		return;
-+	}
-+
- #ifdef USE_PEP
- 	if (option == tuneUrlFilterOptionPath || option == tuneTitleFilterOptionPath) {
- 		d->tuneManager->setTuneFilters(PsiOptions::instance()->getOption(tuneUrlFilterOptionPath).toString().split(QRegExp("\\W+")),
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -365,6 +365,11 @@ void TabDlg::setLooks()
- 		tabWidget_->setTabPosition(QTabWidget::South);
- 
- 	setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- void TabDlg::tabSelected(QWidget* _selected)
---- psi.orig/src/widgets/fancypopup.cpp
-+++ psi/src/widgets/fancypopup.cpp
-@@ -218,6 +218,11 @@ void FancyPopup::Private::initContents(Q
- 	ui_.closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
- 	ui_.closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
- 	connect(ui_.closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.css").toString();
-+	if (!css.isEmpty()) {
-+		popup->setStyleSheet(css);
-+	}
- }
- 
- bool FancyPopup::Private::eventFilter(QObject *o, QEvent *e)
---- psi.orig/src/widgets/iconaction.cpp
-+++ psi/src/widgets/iconaction.cpp
-@@ -30,6 +30,8 @@ class PsiIcon;
- class Iconset;
- #endif
- 
-+#include "psioptions.h"
-+
- #include <QLayout>
- #include <QMenu>
- #include <QTimer>
-@@ -428,6 +430,11 @@ IconActionGroup::IconActionGroup(QObject
- 	d->updatePopup();
- 
- 	d->exclusive = exclusive;
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		d->popup->setStyleSheet(css);
-+	}
- }
- 
- IconActionGroup::~IconActionGroup()
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -74,6 +74,7 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	stacked_ = new QStackedLayout(layout_);
- 
- 	setTabPosition(QTabWidget::North);
-+	setLooks();
- 
- 	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
- 		closeButton_->hide();
-@@ -179,7 +180,16 @@ void PsiTabWidget::addTab(QWidget *widge
- 		tabBar_->addTab(icon, name);
- 	else
- 		tabBar_->addTab(name);
-+	setLooks();
- 	showPage(currentPage());
-+}
-+
-+void PsiTabWidget::setLooks()
-+{
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- } 
- 
- /**
---- psi.orig/src/widgets/psitabwidget.h
-+++ psi/src/widgets/psitabwidget.h
-@@ -67,6 +67,7 @@ public:
- public slots:
- 	void setCurrentPage(int);
- 	void removeCurrentPage();
-+	void setLooks();
- 
- signals:
- 	void mouseDoubleClickTab(QWidget *tab);
---- psi.orig/src/widgets/psitiplabel.cpp
-+++ psi/src/widgets/psitiplabel.cpp
-@@ -51,6 +51,10 @@ void PsiTipLabel::init(const QString& te
- 		}
- 	}
- 	setPalette(palette);
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- void PsiTipLabel::setText(const QString& text)
---- psi.orig/src/widgets/urlobject.cpp
-+++ psi/src/widgets/urlobject.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include "urlobject.h"
-+#include "psioptions.h"
- 
- #include <QApplication>
- #include <QClipboard>
-@@ -221,6 +222,7 @@ QMenu *URLObject::createPopupMenu(const
- 	}
- 
- 	m->addAction(d->act_copy);
-+	m->setStyleSheet(PsiOptions::instance()->getOption("options.ui.look.css").toString());
- 	return m;
- }
-

psi-plus-main-20130107.tar.xz/patches/0680-psi-roster-groups-disable.diff Deleted

@@ -1,109 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -203,6 +203,7 @@ QLineEdit#le_status_text {
- 				<disable-scrollbar type="bool">true</disable-scrollbar>
- 				<contact-sort-style type="QString">status</contact-sort-style>
- 				<disable-service-discovery type="bool">false</disable-service-discovery>
-+				<enable-groups type="bool">true</enable-groups>
- 				<ensure-contact-visible-on-event type="bool">true</ensure-contact-visible-on-event>
- 				<group-sort-style type="QString">alpha</group-sort-style>
- 				<lockdown-roster type="bool">false</lockdown-roster>
-@@ -466,6 +467,7 @@ QLineEdit#le_status_text {
- 				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
- 				<button_options type="QKeySequence" comment="Options"></button_options>
- 				<button_status type="QKeySequence" comment="Status"></button_status>
-+				<enable_groups type="QKeySequence" comment="Enable Groups"></enable_groups>
- 				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
- 				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
- 				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -587,6 +587,7 @@ void MainWin::registerAction( IconAction
- 		{ "show_agents",    toggled, contactList, SLOT( setShowAgents(bool) ) },
- 		{ "show_self",      toggled, contactList, SLOT( setShowSelf(bool) ) },
- 		{ "show_statusmsg", toggled, d->rosterWidget_, SLOT( setShowStatusMsg(bool) ) },
-+		{ "enable_groups",  toggled,   this, SLOT( actEnableGroupsActivated(bool) ) },
- #endif
- 
- 		{ "button_options", activated, this, SIGNAL( doOptions() ) },
-@@ -648,6 +649,9 @@ void MainWin::registerAction( IconAction
- 			if ( aName == "menu_play_sounds" ) {
- 				action->setChecked(PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool());
- 			}
-+			else if ( aName == "enable_groups" ) {
-+				action->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.enable-groups").toBool());
-+			}
- 			//else if ( aName == "foobar" )
- 			//	;
- 		}
-@@ -1084,6 +1088,11 @@ void MainWin::actPublishTuneActivated (b
- 	PsiOptions::instance()->setOption("options.extended-presence.tune.publish",state);
- }
- 
-+void MainWin::actEnableGroupsActivated (bool state)
-+{
-+	PsiOptions::instance()->setOption("options.ui.contactlist.enable-groups", state);
-+}
-+
- void MainWin::activatedAccOption(PsiAccount* pa, int x)
- {
- 	if(x == 0) {
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -131,6 +131,7 @@ private slots:
- 	void actAboutPsiMediaActivated ();
- 	void actPlaySoundsActivated (bool);
- 	void actPublishTuneActivated (bool);
-+	void actEnableGroupsActivated (bool);
- 	void actTipActivated();
- 	void actDiagQCAPluginActivated();
- 	void actDiagQCAKeyStoreActivated();
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -140,6 +140,9 @@ void PsiActionList::Private::createMainW
- 		viewGroups->setUsesDropDown(true);
- 		viewGroups->setExclusive(false);
- 
-+		IconAction *actEnableGroups = new IconAction(tr("Show Roster Groups"), "psi/enable-groups", tr("Show Roster Groups"), 0, viewGroups, 0, true);
-+		actEnableGroups->setWhatsThis(tr("Enable/disable groups in roster"));
-+
- 		IconAction *showOffline = new IconAction(tr("Show Offline Contacts"), "psi/show_offline", tr("Show Offline Contacts"), 0, viewGroups, 0, true);
- 		showOffline->setWhatsThis(tr("Toggles visibility of offline contacts in roster"));
- 
-@@ -161,6 +164,7 @@ void PsiActionList::Private::createMainW
- 
- 		ActionNames actions[] = {
- 			{ "view_groups",  viewGroups  },
-+			{ "enable_groups",   actEnableGroups  },
- 			{ "show_offline", showOffline },
- 			//{ "show_away",    showAway    },
- 			{ "show_hidden",  showHidden  },
---- psi.orig/src/psirosterwidget.cpp
-+++ psi/src/psirosterwidget.cpp
-@@ -49,6 +49,7 @@ static const QString showSelfOptionPath
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
- static const QString allowAutoResizeOptionPath = "options.ui.contactlist.automatically-resize-roster";
- static const QString showScrollBarOptionPath = "options.ui.contactlist.disable-scrollbar";
-+static const QString enableGroupsOptionPath = "options.ui.contactlist.enable-groups";
- 
- //----------------------------------------------------------------------------
- // PsiRosterFilterProxyModel
-@@ -181,7 +182,7 @@ void PsiRosterWidget::setContactList(Psi
- 
- 	contactListModel_ = new PsiContactListModel(contactList_);
- 	contactListModel_->invalidateLayout();
--	contactListModel_->setGroupsEnabled(true);
-+	contactListModel_->setGroupsEnabled(PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool());
- 	contactListModel_->setAccountsEnabled(true);
- 	contactListModel_->storeGroupState("contacts");
- #ifdef MODELTEST
-@@ -244,6 +245,9 @@ void PsiRosterWidget::optionChanged(cons
- 			PsiOptions::instance()->getOption(showScrollBarOptionPath).toBool()?
- 			Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded);
- 	}
-+	else if (option == enableGroupsOptionPath) {
-+		contactListModel_->setGroupsEnabled(PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool());
-+	}
- }
- 
- void PsiRosterWidget::removeSelection(QMimeData* selection)

psi-plus-main-20130107.tar.xz/patches/0690-psi-muc-minimize-to-roster.diff Deleted

@@ -1,1107 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -116,6 +116,7 @@
- 				<css type="QString" />
- 				<only-paste-template type="bool">false</only-paste-template>
- 				<disable-paste-send type="bool">false</disable-paste-send>
-+				<hide-when-closing type="bool">false</hide-when-closing>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
-@@ -443,6 +444,7 @@ QLineEdit#le_status_text {
- 				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
- 				<use-tabs type="bool">true</use-tabs>
-+				<mouse-middle-button type="QString">close</mouse-middle-button>
- 				<size type="QString"></size> 
- 				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs. 'A' means using all in one window patch.">CM</grouping>
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
-@@ -535,9 +537,13 @@ QLineEdit#le_status_text {
- 				<scroll-up type="QKeySequence" comment="Scroll up">Shift+PgUp</scroll-up>
- 				<scroll-down type="QKeySequence" comment="Scroll down">Shift+PgDown</scroll-down>
- 				<close type="QVariantList" comment="Close the current window/tab">
--					<item type="QKeySequence">Esc</item>
-+					<item type="QKeySequence">Ctrl+Q</item>
- 					<item type="QKeySequence">Ctrl+W</item>
- 				</close>
-+				<hide type="QVariantList" comment="Hide the current window/tab">
-+					<item type="QKeySequence">ESC</item>
-+					<item type="QKeySequence">Alt+H</item>
-+				</hide>
- 				<history type="QKeySequence" comment="Open the message history">Ctrl+H</history>
- 				<user-info type="QKeySequence" comment="Show the user info of the contact">Ctrl+I</user-info>
- 			</common>
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -181,6 +181,10 @@ void ChatDlg::initActions()
- 	addAction(act_close_);
- 	connect(act_close_, SIGNAL(triggered()), SLOT(close()));
- 
-+	act_hide_ = new QAction(this);
-+	addAction(act_hide_);
-+	connect(act_hide_, SIGNAL(triggered()), SLOT(hideTab()));
-+
- 	act_scrollup_ = new QAction(this);
- 	addAction(act_scrollup_);
- 	connect(act_scrollup_, SIGNAL(triggered()), SLOT(scrollUp()));
-@@ -195,6 +199,7 @@ void ChatDlg::setShortcuts()
- 	act_send_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.send"));
- 	act_scrollup_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
- 	act_scrolldown_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
-+	act_hide_->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
- 
- 	if(!isTabbed()) {
- 		act_close_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
---- psi.orig/src/chatdlg.h
-+++ psi/src/chatdlg.h
-@@ -173,6 +173,7 @@ private:
- 	QAction* act_scrollup_;
- 	QAction* act_scrolldown_;
- 	QAction* act_close_;
-+	QAction* act_hide_;
- 
- 	int pending_;
- 	bool keepOpen_;
---- psi.orig/src/contactlistgroup.h
-+++ psi/src/contactlistgroup.h
-@@ -92,7 +92,8 @@ public:
- 		SpecialType_General,
- 		SpecialType_NotInList,
- 		SpecialType_Transports,
--		SpecialType_MUCPrivateChats
-+		SpecialType_MUCPrivateChats,
-+		SpecialType_Conference
- 	};
- 
- 	virtual bool isSpecial() const;
---- psi.orig/src/contactlistgroupmenu.cpp
-+++ psi/src/contactlistgroupmenu.cpp
-@@ -35,6 +35,8 @@
- #include "statusdlg.h"
- #include "xmpp_tasks.h"
- 
-+#include "groupchatdlg.h"
-+
- class ContactListGroupMenu::Private : public QObject
- {
- 	Q_OBJECT
-@@ -52,6 +54,9 @@ class ContactListGroupMenu::Private : pu
- 	QAction* actionAuthRequest_;
- 	QAction* actionAuthRemove_;
- 	QAction* actionCustomStatus_;
-+	QAction* actionMucHide_;
-+	QAction* actionMucShow_;
-+	QAction* actionMucLeave_;
- 
- public:
- 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
-@@ -94,23 +99,41 @@ public:
- 		connect(addGroupAction_, SIGNAL(triggered()), SLOT(addGroup()));
- #endif
- 
-+		actionMucHide_ = new IconAction(tr("Hide All"), this, "psi/action_muc_hide");
-+		connect(actionMucHide_, SIGNAL(triggered()), SLOT(mucHide()));
-+
-+		actionMucShow_ = new IconAction(tr("Show All"), this, "psi/action_muc_show");
-+		connect(actionMucShow_, SIGNAL(triggered()), SLOT(mucShow()));
-+		
-+		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
-+		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
-+
- 		updateActions();
- 
-+		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
- #ifdef YAPSI
--		menu->addAction(renameAction_);
--		menu->addAction(removeGroupAndContactsAction_);
--		menu->addAction(addGroupAction_);
-+			menu->addAction(renameAction_);
-+			menu->addAction(removeGroupAndContactsAction_);
-+			menu->addAction(addGroupAction_);
- #else
--		menu->addAction(renameAction_);
--		menu->addAction(sendMessageAction_);
--		menu->addAction(actionCustomStatus_);
--		menu->addSeparator();
--		authMenu_ = menu->addMenu(tr("Authorization"));
--		authMenu_->addAction(actionAuth_);
--		authMenu_->addAction(actionAuthRequest_);
--		authMenu_->addAction(actionAuthRemove_);
--		menu->addAction(removeGroupWithoutContactsAction_);
--		menu->addAction(removeGroupAndContactsAction_);
-+			menu->addAction(renameAction_);
-+			menu->addAction(sendMessageAction_);
-+			menu->addAction(actionCustomStatus_);
-+			menu->addSeparator();
-+			authMenu_ = menu->addMenu(tr("Authorization"));
-+			authMenu_->addAction(actionAuth_);
-+			authMenu_->addAction(actionAuthRequest_);
-+			authMenu_->addAction(actionAuthRemove_);
-+			menu->addAction(removeGroupWithoutContactsAction_);
-+			menu->addAction(removeGroupAndContactsAction_);
-+		}
-+		else {
-+			menu->addAction(actionMucHide_);
-+			menu->addAction(actionMucShow_);
-+			menu->addAction(actionMucLeave_);
-+			menu->addSeparator();
-+			menu->addAction(actionCustomStatus_);
-+		}
- #endif
- 	}
- 
-@@ -129,6 +152,41 @@ private slots:
- #endif
- 	}
- 
-+	void mucHide()
-+	{
-+		PsiAccount *pa = group->contacts().first()->account();
-+		foreach (QString gc, pa->groupchats()) {
-+			Jid j(gc);
-+			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
-+			if (gcDlg && (gcDlg->isTabbed() || !gcDlg->isHidden()))
-+				gcDlg->hideTab();
-+		}
-+	}
-+
-+	void mucShow()
-+	{
-+		PsiAccount *pa = group->contacts().first()->account();
-+		foreach (QString gc, pa->groupchats()) {
-+			Jid j(gc);
-+			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
-+			if (gcDlg) {
-+				gcDlg->ensureTabbedCorrectly();
-+				gcDlg->bringToFront();
-+			}
-+		}
-+	}
-+
-+	void mucLeave()
-+	{
-+		PsiAccount *pa = group->contacts().first()->account();
-+		foreach (QString gc, pa->groupchats()) {
-+			Jid j(gc);
-+			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
-+			if (gcDlg)
-+				gcDlg->close();
-+		}
-+	}
-+
- 	void rename()
- 	{
- 		if (!group)
---- psi.orig/src/contactlistmodel.cpp
-+++ psi/src/contactlistmodel.cpp
-@@ -548,6 +548,12 @@ QVariant ContactListModel::contactData(c
- 		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
- 		return QVariant(pix);
- 	}
-+	else if (role == IsMucRole) {
-+		return QVariant(contact->userListItem().isConference());
-+	}
-+	else if (role == MucMessagesRole) {
-+		return QVariant(contact->userListItem().pending());
-+	}
- #ifdef YAPSI
- 	else if (role == Qt::ForegroundRole) {
- 		return QVariant(Ya::statusColor(contact->status().type()));
---- psi.orig/src/contactlistmodel.h
-+++ psi/src/contactlistmodel.h
-@@ -84,6 +84,8 @@ public:
- 		ClientRole = Qt::UserRole + 26,
- 		TuneRole = Qt::UserRole + 27,
- 		AvatarRole = Qt::UserRole + 28,
-+		IsMucRole = Qt::UserRole + 29,
-+		MucMessagesRole = Qt::UserRole + 30,
- 
- 		// groups
- 		ExpandedRole = Qt::UserRole + 12,
---- psi.orig/src/contactlistnestedgroup.cpp
-+++ psi/src/contactlistnestedgroup.cpp
-@@ -298,6 +298,9 @@ ContactListGroup* ContactListNestedGroup
- 	else if (contact->isAgent()) {
- 		type = ContactListGroup::SpecialType_Transports;
- 	}
-+	else if (contact->isConference()) {
-+		type = ContactListGroup::SpecialType_Conference;
-+	}
- 	else if (contact->noGroups()) {
- 		type = ContactListGroup::SpecialType_General;
- 	}
---- psi.orig/src/contactlistspecialgroup.cpp
-+++ psi/src/contactlistspecialgroup.cpp
-@@ -45,6 +45,10 @@ ContactListSpecialGroup::ContactListSpec
- 		name_ += "mucprivatechats";
- 		displayName_ = tr("Private messages");
- 		break;
-+	case SpecialType_Conference:
-+		name_ += "conferences";
-+		displayName_ = tr("Conferences");
-+		break;
- 	default:
- 		Q_ASSERT(false);
- 	}
-@@ -102,8 +106,9 @@ bool ContactListSpecialGroup::compare(co
- 		rank[SpecialType_General]         = 0;
- 		rank[SpecialType_None]            = 1;
- 		rank[SpecialType_MUCPrivateChats] = 2;
--		rank[SpecialType_Transports]      = 3;
-+		rank[SpecialType_Conference]      = 3;
- 		rank[SpecialType_NotInList]       = 4;
-+		rank[SpecialType_Transports]      = 5;
- 		Q_ASSERT(rank.contains(specialGroupType()));
- 		Q_ASSERT(rank.contains(group->specialGroupType()));
- 		return rank[specialGroupType()] < rank[group->specialGroupType()];
---- psi.orig/src/eventdlg.cpp
-+++ psi/src/eventdlg.cpp
-@@ -1412,6 +1412,8 @@ void EventDlg::keyPressEvent(QKeyEvent *
- 		close();
- 	else if(ShortcutManager::instance()->shortcuts("message.send").contains(key))
- 		doSend();
-+	else if(ShortcutManager::instance()->shortcuts("common.hide").contains(key))
-+		hide();
- 	else
- 		e->ignore();
- }
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -214,7 +214,7 @@ public:
- #endif
- 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
- 
--	QAction *act_mini_cmd, *act_nick;
-+	QAction *act_mini_cmd, *act_nick, *act_hide;
- 
- 	MCmdSimpleSite mCmdSite;
- 	MCmdManager mCmdManager;
-@@ -223,6 +223,7 @@ public:
- 
- 	QMenu *pm_settings;
- 	int pending;
-+	int hPending; // highlight pending
- 	bool connecting;
- 
- 	QStringList hist;
-@@ -604,6 +605,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	options_ = PsiOptions::instance();
- 
- 	d->pending = 0;
-+	d->hPending = 0;
- 	d->connecting = false;
- 
- 	d->histAt = 0;
-@@ -738,6 +740,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->act_close = new QAction(this);
- 	addAction(d->act_close);
- 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
-+	d->act_hide = new QAction(this);
-+	addAction(d->act_hide);
-+	connect(d->act_hide,SIGNAL(triggered()), SLOT(hideTab()));
- 	d->act_scrollup = new QAction(this);
- 	addAction(d->act_scrollup);
- 	connect(d->act_scrollup,SIGNAL(triggered()), SLOT(scrollUp()));
-@@ -876,6 +881,7 @@ void GCMainDlg::setShortcuts()
- 	} else {
- 		d->act_close->QAction::setShortcuts (QList<QKeySequence>());
- 	}
-+	d->act_hide->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
- 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
- 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
- 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
-@@ -894,6 +900,8 @@ void GCMainDlg::scrollDown()
- void GCMainDlg::closeEvent(QCloseEvent *e)
- {
- 	e->accept();
-+	if (d->state != Private::Connected)
-+		account()->groupChatLeave(d->dlg->jid().domain(),d->dlg->jid().node());
- }
- 
- void GCMainDlg::deactivated()
-@@ -909,6 +917,12 @@ void GCMainDlg::activated()
- 
- 	if(d->pending > 0) {
- 		d->pending = 0;
-+		d->hPending = 0;
-+		UserListItem* u = account()->find(d->dlg->jid().bare());
-+		if (u) {
-+			u->setPending(d->pending, d->hPending);
-+			account()->updateEntry(*u);
-+		}
- 		invalidateTab();
- 	}
- 	doFlash(false);
-@@ -1319,6 +1333,14 @@ void GCMainDlg::presence(const QString &
- 	if (nick == d->self) {
- 		if(s.isAvailable())
- 			setStatusTabIcon(s.type());
-+		UserListItem* u = account()->find(d->dlg->jid().bare());
-+		if(u) {
-+			Resource r;
-+			r.setName("Muc");
-+			r.setStatus(s);
-+			u->userResourceList().replace(0, r);
-+			account()->updateEntry(*u);
-+		}
- 		// Update configuration dialog
- 		if (d->configDlg) {
- 			d->configDlg->setRoleAffiliation(s.mucItem().role(),s.mucItem().affiliation());
-@@ -1588,6 +1610,7 @@ void GCMainDlg::joined()
- 		setConnecting();
- 		appendSysMsg(tr("Connected."), true);
- 	}
-+	account()->addMucItem(d->dlg->jid().bare());
- }
- 
- void GCMainDlg::setPassword(const QString& p)
-@@ -1657,6 +1680,13 @@ void GCMainDlg::appendMessage(const Mess
- 	// if we're not active, notify the user by changing the title
- 	if(!isActiveTab() && !mv.isLocal()) {
- 		++d->pending;
-+		if(alert)
-+			++d->hPending;
-+		UserListItem* u = account()->find(d->dlg->jid().bare());
-+		if (u) {
-+			u->setPending(d->pending, d->hPending);
-+			account()->updateEntry(*u);
-+		}
- 		invalidateTab();
- 	}
- 
---- psi.orig/src/historydlg.cpp
-+++ psi/src/historydlg.cpp
-@@ -208,7 +208,8 @@ void HistoryDlg::loadContacts()
- 	ui_.msgLog->clear();
- 	foreach (PsiContact* contact, d->pa->contactList())
- 	{
--		if(contact->isPrivate()
-+		if(contact->isConference()
-+		|| contact->isPrivate()
- 		|| jids_.contains(contact->jid().bare()))
- 			continue;
- 
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -161,6 +161,8 @@ void MUCJoinDlg::doJoin()
- 
- 	GCMainDlg *gc = account_->findDialog<GCMainDlg*>(j.bare());
- 	if (gc) {
-+		if(gc->isHidden() && !gc->isTabbed())
-+			gc->ensureTabbedCorrectly();
- 		gc->bringToFront();
- 		if (gc->isInactive()) {
- 			gc->reactivate();
-@@ -198,6 +200,7 @@ void MUCJoinDlg::joined()
- 
- 	closeDialogs(this);
- 	deleteLater();
-+	account_->addMucItem(jid_.bare());
- }
- 
- void MUCJoinDlg::error(int, const QString &str)
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -610,10 +610,11 @@ public:
- 	void removeEntry(const Jid& jid)
- 	{
- 		PsiContact* contact = findContact(jid);
--		Q_ASSERT(contact);
--		delete contact;
--		emit account->removeContact(jid);
--
-+		if (contact) {
-+			Q_ASSERT(contact);
-+			delete contact;
-+			emit account->removeContact(jid);
-+		}
- 		updateOnlineContactsCount();
- 	}
- 
-@@ -3798,6 +3799,14 @@ void PsiAccount::actionDefault(const Jid
- 
- 	if(d->eventQueue->count(u->jid()) > 0)
- 		openNextEvent(*u, UserAction);
-+	else if (groupchats().contains(j.full()))
-+	{
-+		TabbableWidget *tab = findDialog<TabbableWidget*>(Jid(j.full()));
-+		if(tab) {
-+			tab->ensureTabbedCorrectly();
-+			tab->bringToFront();
-+		}
-+	}
- 	else {
- 		if(PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message")
- 			actionSendMessage(u->jid());
-@@ -4742,7 +4751,8 @@ void PsiAccount::handleEvent(PsiEvent* e
- #endif
- 				c->incomingMessage(m);
- 				soundType = eChat2;
--				if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab()) {
-+				if((PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab())
-+					|| (c->isTabbed() && c->getManagingTabDlg()->isHidden()) ) {
- 					// to alert the chat also, we put it in the queue
- 					me->setSentToChatWindow(true);
- 				}
-@@ -4939,6 +4949,7 @@ UserListItem* PsiAccount::addUserListIte
- 	u->setInList(false);
- 	u->setAvatarFactory(avatarFactory());
- 	u->setName(nick);
-+	u->setConference(groupchats().contains(jid.full()));
- 
- 	// is it a private groupchat?
- 	Jid j = u->jid();
-@@ -4954,6 +4965,21 @@ UserListItem* PsiAccount::addUserListIte
- 		u->userResourceList().append(ur);
- 	}
- 
-+	if(u->isConference()) {
-+		// make a resource so the contact appears online
-+		QString name = j.node();
-+		UserResource ur;
-+		foreach(ConferenceBookmark c, d->bookmarkManager->conferences())
-+		{
-+			if(c.jid().full() == j.bare()) name = c.name();
-+		}
-+		u->setInList(true);
-+		u->setName(name);
-+		ur.setName("Muc");
-+		ur.setStatus(status());
-+		u->userResourceList().append(ur);
-+	}
-+
- 	// treat it like a push  [pushinfo]
- 	//VCard info;
- 	//if(readUserInfo(item->jid, &info) && !info.field[vNickname].isEmpty())
-@@ -4968,6 +4994,20 @@ UserListItem* PsiAccount::addUserListIte
- 	return u;
- }
- 
-+void PsiAccount::addMucItem(const Jid& jid)
-+{
-+	if (jid.isEmpty())
-+		return;
-+	UserListItem *u = find(jid);
-+	if (u) {
-+		d->removeEntry(jid);
-+		d->userList.removeAll(u);
-+	}
-+	if (!d->groupchats.contains(jid.bare()))
-+		d->groupchats += jid.bare();
-+	addUserListItem(jid.bare(), "");
-+}
-+
- // put an event into the event queue, and update the related alerts
- void PsiAccount::queueEvent(PsiEvent* e, ActivationType activationType)
- {
-@@ -5062,8 +5102,12 @@ void PsiAccount::openNextEvent(Activatio
- 	}
- 
- 	UserListItem *u = find(e->jid());
--	if(!u)
--		return;
-+	if(!u) {
-+		u = new UserListItem();
-+		u->setJid(e->jid());
-+		u->setInList(false);
-+		d->userList.append(u);
-+	}
- 	openNextEvent(*u, activationType);
- }
- 
-@@ -5252,9 +5296,9 @@ void PsiAccount::openChat(const Jid& j, 
- 
- void PsiAccount::chatMessagesRead(const Jid &j)
- {
--	if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) {
-+//	if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) {
- 		processChats(j);
--	}
-+//	}
- }
- 
- void PsiAccount::logEvent(const Jid &j, PsiEvent *e)
-@@ -5276,17 +5320,6 @@ void PsiAccount::edb_finished()
- void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType)
- {
- #ifdef GROUPCHAT
--	QString str = j.bare();
--	bool found = false;
--	for(QStringList::ConstIterator it = d->groupchats.begin(); it != d->groupchats.end(); ++it) {
--		if((*it) == str) {
--			found = true;
--			break;
--		}
--	}
--	if(!found)
--		d->groupchats += str;
--
- 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
- 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
- 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
-@@ -5320,8 +5353,14 @@ void PsiAccount::groupChatSetStatus(cons
- 
- void PsiAccount::groupChatLeave(const QString &host, const QString &room)
- {
--	d->groupchats.removeAll(room + '@' + host);
-+	Jid j(room + '@' + host);
-+	d->groupchats.removeAll(j.bare());
- 	d->client->groupChatLeave(host, room);
-+	UserListItem *u = find(j);
-+	if (u) {
-+		d->removeEntry(j);
-+		d->userList.removeAll(u);
-+	}
- }
- 
- GCContact *PsiAccount::findGCContact(const Jid &j) const
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -267,6 +267,7 @@ public:
- 	class xmlRingElem { public: int type; QDateTime time; QString xml; };
- 	QList< xmlRingElem > dumpRingbuf();
- 	void clearRingbuf();
-+	void addMucItem(const Jid&);
- 
- signals:
- 	void accountDestroyed();
---- psi.orig/src/psicontact.cpp
-+++ psi/src/psicontact.cpp
-@@ -369,7 +369,8 @@ bool PsiContact::isDragEnabled() const
- {
- 	return isEditable()
- 	       && !isPrivate()
--	       && !isAgent();
-+	       && !isAgent()
-+	       && !isConference();
- }
- 
- /**
-@@ -950,6 +951,11 @@ bool PsiContact::isAgent() const
- 	return userListItem().isTransport();
- }
- 
-+bool PsiContact::isConference() const
-+{
-+	return userListItem().isConference();
-+}
-+
- bool PsiContact::inList() const
- {
- 	return userListItem().inList();
---- psi.orig/src/psicontact.h
-+++ psi/src/psicontact.h
-@@ -55,6 +55,7 @@ public:
- 	virtual bool isAgent() const;
- 	virtual bool inList() const;
- 	virtual bool isPrivate() const;
-+	virtual bool isConference() const;
- 	virtual bool noGroups() const;
- 	virtual bool authorized() const;
- 	virtual bool authorizesToSeeStatus() const;
---- psi.orig/src/psicontactlistviewdelegate.cpp
-+++ psi/src/psicontactlistviewdelegate.cpp
-@@ -297,7 +297,9 @@ void PsiContactListViewDelegate::drawCon
- 			txtRect.setHeight(r.height() - txtRect.height());
- 			o.font.setPointSize(qMax(o.font.pointSize()-2, 7));
- 			o.fontMetrics = QFontMetrics(o.font);
-+			painter->save();
- 			drawText(painter, o, txtRect, statusMsg, index);
-+			painter->restore();
- 		}
- 	}
- 	else {
-@@ -306,9 +308,15 @@ void PsiContactListViewDelegate::drawCon
- 		drawText(painter, o, r, text, index);
- 	}
- 
-+	bool isMuc = index.data(ContactListModel::IsMucRole).toBool();
-+	QString mucMessages;
-+	if(isMuc)
-+		mucMessages = index.data(ContactListModel::MucMessagesRole).toString();
-+
- 	QRect iconRect(r);
- 	QList<QPixmap> rightPixs;
- 	QList<int> rightWidths;
-+	if(!isMuc) {
- 	if (showClientIcons_) {
- 		bool showAllClients = PsiOptions::instance()->getOption("options.ui.contactlist.show-all-client-icons").toBool();
- 		const QList<QPixmap> pixList = this->clientPixmap(index);
-@@ -348,18 +356,23 @@ void PsiContactListViewDelegate::drawCon
- 		rightPixs.push_back(pix);
- 		rightWidths.push_back(pix.width());
- 	}
-+	}
- 
--	if(rightPixs.isEmpty())
-+	if(rightPixs.isEmpty() && mucMessages.isEmpty())
- 		return;
- 
- 	int sumWidth = 0;
--	foreach (int w, rightWidths) {
--		sumWidth += w;
-+	if(isMuc)
-+		sumWidth = fontMetrics_->width(mucMessages);
-+	else {
-+		foreach (int w, rightWidths) {
-+			sumWidth += w;
-+		}
-+		sumWidth+=rightPixs.count();
- 	}
- 	QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
- 	QColor tbgc = bgc;
- 	tbgc.setAlpha(0);
--	sumWidth+=rightPixs.count();
- 	QLinearGradient grad(r.right() - sumWidth - 20, 0, r.right() - sumWidth, 0);
- 	grad.setColorAt(0, tbgc);
- 	grad.setColorAt(1, bgc);
-@@ -368,10 +381,16 @@ void PsiContactListViewDelegate::drawCon
- 	gradRect.setLeft(gradRect.right() - sumWidth - 20);
- 	painter->fillRect(gradRect, tbakBr);
- 
--	for (int i=0; i<rightPixs.size(); i++) {
--		const QPixmap pix = rightPixs[i];
--		iconRect.setRight(iconRect.right() - pix.width() -1);
--		painter->drawPixmap(iconRect.topRight(), pix);
-+	if(isMuc) {
-+		iconRect.setLeft(iconRect.right() - sumWidth - 1);
-+		painter->drawText(iconRect, mucMessages);
-+	}
-+	else {
-+		for (int i=0; i<rightPixs.size(); i++) {
-+			const QPixmap pix = rightPixs[i];
-+			iconRect.setRight(iconRect.right() - pix.width() -1);
-+			painter->drawPixmap(iconRect.topRight(), pix);
-+		}
- 	}
- 
- #if 0
---- psi.orig/src/psicontactmenu.cpp
-+++ psi/src/psicontactmenu.cpp
-@@ -47,6 +47,8 @@
- #include "yaprofile.h"
- #endif
- 
-+#include "groupchatdlg.h"
-+
- //----------------------------------------------------------------------------
- // GroupMenu
- //----------------------------------------------------------------------------
-@@ -249,6 +251,10 @@ public:
- 	QAction* gpgUnassignKeyAction_;
- 	QAction* vcardAction_;
- 	QAction* historyAction_;
-+	QAction* mucHideAction_;
-+	QAction* mucShowAction_;
-+	QAction* mucLeaveAction_;
-+
- #endif
- 
- public:
-@@ -312,6 +318,7 @@ public:
- 		menu->addAction(blockAction_);
- 		menu_->addSeparator();
- 		menu_->addAction(disableMoodNotificationsAction_);
-+		updateActions();
- #else
- 		addAuthAction_ = new IconAction(tr("Add/Authorize to Contact List"), this, "psi/addContact");
- 		connect(addAuthAction_, SIGNAL(triggered()), SLOT(addAuth()));
-@@ -402,46 +409,66 @@ public:
- 		activeChatsMenu_->setActiveChatsMode(true);
- 		connect(activeChatsMenu_, SIGNAL(resourceActivated(PsiContact*, const XMPP::Jid&)), SLOT(openActiveChat(PsiContact*, const XMPP::Jid&)));
- 
--		menu_->addAction(addAuthAction_);
--		menu_->addSeparator();
--		menu_->addAction(receiveIncomingEventAction_);
--		menu_->addSeparator();
--		menu_->addAction(sendMessageAction_);
--		menu_->addMenu(sendMessageToMenu_);
--		menu_->addAction(openChatAction_);
--		menu_->addMenu(openChatToMenu_);
--		menu_->addAction(openWhiteboardAction_);
--		menu_->addMenu(openWhiteboardToMenu_);
--		menu_->addMenu(executeCommandMenu_);
--		menu_->addMenu(activeChatsMenu_);
--		if(AvCallManager::isSupported()) {
--			menu_->addAction(voiceCallAction_);
-+		mucHideAction_ = new IconAction(tr("Hide"), this, "psi/action_muc_hide");
-+		connect(mucHideAction_, SIGNAL(triggered()), SLOT(mucHide()));
-+		mucHideAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
-+
-+		mucShowAction_ = new IconAction(tr("Show"), this, "psi/action_muc_show");
-+		connect(mucShowAction_, SIGNAL(triggered()), SLOT(mucShow()));
-+		mucShowAction_->setShortcuts(ShortcutManager::instance()->shortcuts("contactlist.chat"));
-+
-+		mucLeaveAction_ = new IconAction(tr("Leave"), this, "psi/action_muc_leave");
-+		connect(mucLeaveAction_, SIGNAL(triggered()), SLOT(mucLeave()));
-+		mucLeaveAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
-+
-+		if (!contact_->isConference()) {
-+			menu_->addAction(addAuthAction_);
-+			menu_->addSeparator();
-+			menu_->addAction(receiveIncomingEventAction_);
-+			menu_->addSeparator();
-+			menu_->addAction(sendMessageAction_);
-+			menu_->addMenu(sendMessageToMenu_);
-+			menu_->addAction(openChatAction_);
-+			menu_->addMenu(openChatToMenu_);
-+			menu_->addAction(openWhiteboardAction_);
-+			menu_->addMenu(openWhiteboardToMenu_);
-+			menu_->addMenu(executeCommandMenu_);
-+			menu_->addMenu(activeChatsMenu_);
-+			if(AvCallManager::isSupported()) {
-+				menu_->addAction(voiceCallAction_);
-+			}
-+			menu_->addSeparator();
-+			menu_->addAction(sendFileAction_);
-+			menu_->addMenu(inviteToGroupchatMenu_);
-+			menu_->addSeparator();
-+			menu_->addAction(renameAction_);
-+			menu_->addMenu(groupMenu_);
-+			menu_->addAction(transportLogonAction_);
-+			menu_->addAction(transportLogoffAction_);
-+			authMenu_ = menu_->addMenu(tr("Authorization"));
-+			authMenu_->addAction(authResendAction_);
-+			authMenu_->addAction(authRerequestAction_);
-+			authMenu_->addAction(authRemoveAction_);
-+			menu_->addAction(removeAction_);
-+			menu_->addAction(customStatusAction_);
-+			menu_->addSeparator();
-+			pictureMenu_ = menu_->addMenu(tr("&Picture"));
-+			pictureMenu_->addAction(pictureAssignAction_);
-+			pictureMenu_->addAction(pictureClearAction_);
-+			menu_->addAction(gpgAssignKeyAction_);
-+			menu_->addAction(gpgUnassignKeyAction_);
-+			menu_->addAction(vcardAction_);
-+			menu_->addAction(historyAction_);
-+			updateActions();
-+		}
-+		else {
-+			menu_->addAction(mucHideAction_);
-+			menu_->addAction(mucShowAction_);
-+			menu_->addAction(mucLeaveAction_);
-+			menu_->addSeparator();
-+			menu_->addAction(customStatusAction_);
- 		}
--		menu_->addSeparator();
--		menu_->addAction(sendFileAction_);
--		menu_->addMenu(inviteToGroupchatMenu_);
--		menu_->addSeparator();
--		menu_->addAction(renameAction_);
--		menu_->addMenu(groupMenu_);
--		menu_->addAction(transportLogonAction_);
--		menu_->addAction(transportLogoffAction_);
--		authMenu_ = menu_->addMenu(tr("Authorization"));
--		authMenu_->addAction(authResendAction_);
--		authMenu_->addAction(authRerequestAction_);
--		authMenu_->addAction(authRemoveAction_);
--		menu_->addAction(removeAction_);
--		menu_->addAction(customStatusAction_);
--		menu_->addSeparator();
--		pictureMenu_ = menu_->addMenu(tr("&Picture"));
--		pictureMenu_->addAction(pictureAssignAction_);
--		pictureMenu_->addAction(pictureClearAction_);
--		menu_->addAction(gpgAssignKeyAction_);
--		menu_->addAction(gpgUnassignKeyAction_);
--		menu_->addAction(vcardAction_);
--		menu_->addAction(historyAction_);
- #endif
--
--		updateActions();
- 	}
- 
- private slots:
-@@ -458,7 +485,7 @@ private slots:
- 
- 	void updateActions()
- 	{
--		if (!contact_)
-+		if (!contact_ or contact_->isConference())
- 			return;
- 
- #ifdef YAPSI
-@@ -540,6 +567,30 @@ private slots:
- 	}
- #endif
- 
-+
-+	void mucHide()
-+	{
-+		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
-+		if (gc && (gc->isTabbed() || !gc->isHidden()))
-+			gc->hideTab();
-+	}
-+
-+	void mucShow()
-+	{
-+		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
-+		if (gc) {
-+			gc->ensureTabbedCorrectly();
-+			gc->bringToFront();
-+		}
-+	}
-+
-+	void mucLeave()
-+	{
-+		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
-+		if (gc)
-+			gc->close();
-+	}
-+
- 	void rename()
- 	{
- 		if (!contact_)
---- psi.orig/src/tabs/tabbablewidget.cpp
-+++ psi/src/tabs/tabbablewidget.cpp
-@@ -56,6 +56,9 @@ void TabbableWidget::ensureTabbedCorrect
- 		if (!isTabbed()) {
- 			tabManager_->getTabs(this)->addTab(this);
- 		}
-+		else {
-+			QTimer::singleShot(0, tabManager_->getTabs(this), SLOT(showTabWithoutActivation()));
-+		}
- 	}
- 	else {
- 		if (PsiOptions::instance()->getOption("options.ui.tabs.tab-singles").toString().contains(tabManager_->tabKind(this))) {
-@@ -268,3 +271,11 @@ const QIcon &TabbableWidget::icon() cons
- {
- 	return icon_;
- }
-+
-+void TabbableWidget::hideTab()
-+{
-+	if(isTabbed())
-+		getManagingTabDlg()->hideTab(this);
-+	else
-+		hide();
-+}
---- psi.orig/src/tabs/tabbablewidget.h
-+++ psi/src/tabs/tabbablewidget.h
-@@ -84,6 +84,7 @@ public slots:
- 	virtual void activated();
- 	void bringToFront(bool raiseWindow = true);
- 	virtual void ensureTabbedCorrectly();
-+	void hideTab();
- 
- protected:
- 	virtual void setJid(const Jid&);
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -246,6 +246,7 @@ void TabDlg::showTabMenu(int tab, QPoint
- 
- 	if (tab != -1) {
- 		QAction *d = 0;
-+		QAction *h = tabMenu_->addAction(tr("Hide Tab"));
- 		if(userManagement_) {
- 			d = tabMenu_->addAction(tr("Detach Tab"));
- 		}
-@@ -274,6 +275,9 @@ void TabDlg::showTabMenu(int tab, QPoint
- 		else if (act == d) {
- 			detachTab(getTab(tab));
- 		}
-+		else if(act == h) {
-+			hideTab(getTab(tab));
-+		}
- 		else {
- 			TabDlg* target = sentTos[act];
- 			if (target)
-@@ -285,6 +289,8 @@ void TabDlg::showTabMenu(int tab, QPoint
- void TabDlg::tab_aboutToShowMenu(QMenu *menu)
- {
- 	menu->addSeparator();
-+	menu->addAction(tr("Hide Current Tab"), this, SLOT(hideCurrentTab()));
-+	menu->addAction(tr("Hide All Tabs"), this, SLOT(hideAllTab()));
- 	menu->addAction(tr("Detach Current Tab"), this, SLOT(detachCurrentTab()));
- 	menu->addAction(tr("Close Current Tab"), this, SLOT(closeCurrentTab()));
- 
-@@ -406,6 +412,22 @@ void TabDlg::showTabWithoutActivation()
- 	showWithoutActivation();
- }
- 
-+void TabDlg::hideCurrentTab()
-+{
-+	hideTab(static_cast<TabbableWidget*>(tabWidget_->currentPage()));
-+}
-+
-+void TabDlg::hideTab(TabbableWidget* tab)
-+{
-+	closeTab(tab, false);
-+}
-+
-+void TabDlg::hideAllTab()
-+{
-+	foreach(TabbableWidget* tab, tabs_)
-+		hideTab(tab);
-+}
-+
- void TabDlg::detachCurrentTab()
- {
- 	detachTab(static_cast<TabbableWidget*>(tabWidget_->currentPage()));
-@@ -418,7 +440,10 @@ void TabDlg::mouseDoubleClickTab(QWidget
- }
- 
- void TabDlg::mouseMiddleClickTab(QWidget* widget) {
--	closeTab(static_cast<TabbableWidget*>(widget));
-+	if(PsiOptions::instance()->getOption("options.ui.tabs.mouse-middle-button").toString() == "close")
-+		closeTab(static_cast<TabbableWidget*>(widget));
-+	else
-+		hideTab(static_cast<TabbableWidget*>(widget));
- }
- 
- void TabDlg::detachTab(TabbableWidget* tab)
-@@ -460,6 +485,7 @@ void TabDlg::closeTab(TabbableWidget* ch
- 	chat->hide();
- 	removeTabWithNoChecks(chat);
- 	chat->setParent(0);
-+	chat->deactivated();
- 	if (tabWidget_->count() > 0) {
- 		updateCaption();
- 	}
-@@ -482,6 +508,10 @@ void TabDlg::checkHasChats()
- {
- 	if (tabWidget_->count() > 0 || this != window())
- 		return;
-+	if (tabs_.count() > 0) {
-+		hide();
-+		return;
-+	}
- 	deleteLater();
- }
- 
-@@ -534,8 +564,13 @@ void TabDlg::closeEvent(QCloseEvent* clo
- 			return;
- 		}
- 	}
--	foreach(TabbableWidget* tab, tabs_) {
--		closeTab(tab);
-+	if(PsiOptions::instance()->getOption("options.ui.chat.hide-when-closing").toBool()) {
-+		hide();
-+	}
-+	else {
-+		foreach(TabbableWidget* tab, tabs_) {
-+			closeTab(tab);
-+		}
- 	}
- }
- 
---- psi.orig/src/tabs/tabdlg.h
-+++ psi/src/tabs/tabdlg.h
-@@ -121,6 +121,9 @@ public slots:
- 	void detachTab(TabbableWidget*);
- 	void sendTabTo(TabbableWidget*, TabDlg *);
- 	void tabCloseRequested(int i);
-+	void hideTab(TabbableWidget*);
-+	void hideCurrentTab();
-+	void hideAllTab();
- 
- signals:
- 	void resized(QSize size);
---- psi.orig/src/userlist.cpp
-+++ psi/src/userlist.cpp
-@@ -296,8 +296,11 @@ UserListItem::UserListItem(bool self)
- 	v_inList = false;
- 	v_self = self;
- 	v_private = false;
-+	v_isConference = false;
- 	v_avatarFactory = NULL;
- 	lastmsgtype = -1;
-+	v_pending = 0;
-+	v_hPending = 0;
- }
- 
- UserListItem::~UserListItem()
-@@ -627,6 +630,32 @@ bool UserListItem::isTransport() const
- 	return v_isTransport;
- }
- 
-+bool UserListItem::isConference() const
-+{
-+	return v_isConference;
-+}
-+
-+void UserListItem::setConference(bool b)
-+{
-+	v_isConference = b;
-+}
-+
-+void UserListItem::setPending(int p, int h)
-+{
-+	v_pending = p;
-+	v_hPending = h;
-+}
-+
-+QString UserListItem::pending() const
-+{
-+	QString str;
-+	if (v_hPending)
-+		str = QString("[%1/%2]").arg(v_pending).arg(v_hPending);
-+	else if (v_pending)
-+		str = QString("[%1]").arg(v_pending);
-+	return str;
-+}
-+
- bool UserListItem::isAvailable() const
- {
- 	return !v_url.isEmpty();
-@@ -743,7 +772,7 @@ QString UserListItem::makeBareTip(bool t
- 		str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
- 
- 	// subscription
--	if(!v_self && subscription().type() != Subscription::Both)
-+	if(!v_self && !v_isConference && subscription().type() != Subscription::Both)
- 		str += QString("<div style='white-space:pre'>") + QObject::tr("Subscription") + ": " + subscription().toString() + "</div>";
- 
- 	if(!v_keyID.isEmpty())
-@@ -847,7 +876,7 @@ QString UserListItem::makeBareTip(bool t
- 			}
- 
- 			// MUC
--			if(r.status().hasMUCItem()) {
-+			if(!v_isConference && r.status().hasMUCItem()) {
- 				if(!r.status().mucItem().jid().isEmpty())
- 					str += QString("<div style='white-space:pre'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
- 				if(r.status().mucItem().role() != MUCItem::NoRole)
---- psi.orig/src/userlist.h
-+++ psi/src/userlist.h
-@@ -111,6 +111,7 @@ public:
- 
- 	bool inList() const;
- 	bool isTransport() const;
-+	bool isConference() const;
- 	bool isAvailable() const;
- 	bool isHidden() const;
- 	bool isAway() const;
-@@ -127,7 +128,8 @@ public:
- 	QStringList clients() const;
- 	QString findClient(QString name) const;
- 	const Activity& activity() const;
--
-+	QString pending() const;
-+	
- 	void setJid(const XMPP::Jid &);
- 	void setInList(bool);
- 	void setLastAvailable(const QDateTime &);
-@@ -136,6 +138,8 @@ public:
- 	void setMood(const Mood&);
- 	void setActivity(const Activity&);
- 	void setTune(const QString&);
-+	void setConference(bool);
-+	void setPending(int p, int h);
- 	const QString& tune() const;
- 	void setGeoLocation(const GeoLocation&);
- 	const GeoLocation& geoLocation() const;
-@@ -155,12 +159,12 @@ public:
- 	void setPublicKeyID(const QString &);
- 	
- private:
--	int lastmsgtype;
-+	int lastmsgtype, v_pending, v_hPending;
- 	bool v_inList;
- 	QDateTime v_t;
- 	UserResourceList v_url;
- 	QString v_perr;
--	bool v_self, v_isTransport;
-+	bool v_self, v_isTransport, v_isConference;
- 	bool v_private;
- 	QStringList secList;
- 	QString v_keyID;

psi-plus-main-20130107.tar.xz/patches/0700-psi-avcalls-enable-video.diff Deleted

@@ -1,50 +0,0 @@
-From 76f57a003af752fb712b01f2ca62bc0f2c036b28 Mon Sep 17 00:00:00 2001
-From: Julius Schwartzenberg <julius.schwartzenberg@gmail.com>
-Date: Tue, 13 Apr 2010 13:29:26 +0200
-Subject: Video patch by Arseniy Lartsev, unified version for the original see: http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-March/009046.html
-
----
- src/avcall/jinglertp.cpp |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
---- git.orig/src/avcall/jinglertp.cpp
-+++ git/src/avcall/jinglertp.cpp
-@@ -621,12 +621,10 @@ public:
- 				if((types & JingleRtp::Audio) && c.desc.media == "audio" && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
- 				else if((types & JingleRtp::Video) && c.desc.media == "video" && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
- 
-@@ -670,12 +668,10 @@ public:
- 				if((types & JingleRtp::Audio) && c.desc.media == "audio" && c.name == audioName && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
- 				else if((types & JingleRtp::Video) && c.desc.media == "video" && c.name == videoName && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
- 
-@@ -743,12 +739,10 @@ public:
- 				if((types & JingleRtp::Audio) && c.name == audioName && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
- 				else if((types & JingleRtp::Video) && c.name == videoName && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
-

psi-plus-main-20130107.tar.xz/patches/0710-psi-deactivation-some-menu-items.diff Deleted

@@ -1,30 +0,0 @@
---- git.orig/src/contactlistgroupmenu.cpp
-+++ git/src/contactlistgroupmenu.cpp
-@@ -108,7 +108,7 @@ public:
- 		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
- 		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
- 
--		updateActions();
-+		authMenu_ = 0;
- 
- 		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
- #ifdef YAPSI
-@@ -135,6 +135,7 @@ public:
- 			menu->addAction(actionCustomStatus_);
- 		}
- #endif
-+		updateActions();
- 	}
- 
- private slots:
-@@ -144,6 +145,10 @@ private slots:
- 			return;
- 
- 		sendMessageAction_->setVisible(PsiOptions::instance()->getOption("options.ui.message.enabled").toBool());
-+		sendMessageAction_->setEnabled(group->contacts().first()->account()->isAvailable());                
-+		actionCustomStatus_->setEnabled(group->contacts().first()->account()->isAvailable());
-+		if(authMenu_)
-+			authMenu_->setEnabled(group->contacts().first()->account()->isAvailable());
- 		renameAction_->setEnabled(group->isEditable());
- 		removeGroupAndContactsAction_->setEnabled(group->isRemovable());
- 		removeGroupWithoutContactsAction_->setEnabled(group->isRemovable());

psi-plus-main-20130107.tar.xz/patches/0720-psi-fix-client-version-in-muc-roster-tooltip.diff Deleted

psi-plus-main-20130107.tar.xz/patches/0740-psi-add-client-icon-to-chatdlg.diff Deleted

@@ -1,66 +0,0 @@
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -78,6 +78,25 @@
-           </widget>
-          </item>
-          <item>
-+          <widget class="QLabel" name="lb_client">
-+           <property name="minimumSize">
-+            <size>
-+             <width>16</width>
-+             <height>16</height>
-+            </size>
-+           </property>
-+           <property name="maximumSize">
-+            <size>
-+             <width>16</width>
-+             <height>16</height>
-+            </size>
-+           </property>
-+           <property name="text">
-+            <string/>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-           <widget class="QLabel" name="lb_count" >
-            <property name="sizePolicy" >
-             <sizepolicy>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -278,8 +278,10 @@ void PsiChatDlg::setLooks()
- 		ui_.tb_emoticons->hide();
- 		ui_.toolbar->hide();
- 		ui_.tb_voice->hide();
-+		ui_.lb_client->hide();
- 	}
- 	else {
-+		ui_.lb_client->show();
- 		ui_.lb_status->show();
- 		ui_.le_jid->show();
- 		if (PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
-@@ -481,6 +483,24 @@ void PsiChatDlg::contactUpdated(UserList
- 		ui_.le_jid->setText(name);
- 		ui_.le_jid->setCursorPosition(0);
- 		ui_.le_jid->setToolTip(name);
-+
-+		UserResourceList srl = u->userResourceList();
-+		if(!srl.isEmpty()) {			
-+			UserResource r;
-+			if(!jid().resource().isEmpty()) {
-+				QString res = jid().resource();
-+				UserResourceList::ConstIterator it = srl.find(res);
-+				if(it != srl.end())
-+					r = *it;
-+			}
-+			if(r.clientName().isEmpty()) {
-+				srl.sort();
-+				r = srl.first();
-+			}
-+			const QPixmap &pix = IconsetFactory::iconPixmap("clients/" + u->findClient(r.clientName().toLower()) );
-+			ui_.lb_client->setPixmap(pix);
-+			ui_.lb_client->setToolTip(r.versionString());
-+		}
- 	}
- }
-

psi-plus-main-20130107.tar.xz/patches/0750-psi-add-join-groupchat-item-to-account-menu.diff Deleted

@@ -1,68 +0,0 @@
---- git.orig/src/contactlistaccountmenu.cpp
-+++ git/src/contactlistaccountmenu.cpp
-@@ -33,6 +33,7 @@
- #include "psiiconset.h"
- #include "common.h"
- #include "contactmanager/contactmanagerdlg.h"
-+#include "mucjoindlg.h"
- 
- class ContactListAccountMenu::Private : public QObject
- {
-@@ -62,6 +63,7 @@ class ContactListAccountMenu::Private : 
- 	QAction* adminSetMotdAction_;
- 	QAction* adminUpdateMotdAction_;
- 	QAction* adminDeleteMotdAction_;
-+	QAction *doGroupChatAction_;
- 
- public:
- 	Private(ContactListAccountMenu* menu, ContactListAccountGroup* _account)
-@@ -100,9 +102,12 @@ public:
- 		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
- 		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
- 
--		bookmarksManageAction_ = new QAction(tr("Manage..."), this);
-+		bookmarksManageAction_ = new QAction(tr("Manage Bookmarks"), this);
- 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
- 
-+		doGroupChatAction_ = new IconAction(tr("Join Groupchat"), this, "psi/groupChat");
-+		connect(doGroupChatAction_, SIGNAL(triggered()), SLOT(doGroupChat()));
-+
- 		addContactAction_ = new IconAction(tr("&Add a Contact"), this, "psi/addContact");
- 		connect(addContactAction_, SIGNAL(triggered()), SLOT(addContact()));
- 
-@@ -143,7 +148,9 @@ public:
- 		avatarMenu_ = menu->addMenu(IconsetFactory::icon("psi/vCard").icon(), tr("Avatar"));
- 		avatarMenu_->addAction(setAvatarAction_);
- 		avatarMenu_->addAction(unsetAvatarAction_);
--		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));
-+		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Groupchat"));
-+		bookmarksMenu_->addAction(doGroupChatAction_);
-+		bookmarksMenu_->addSeparator();
- 		bookmarksMenu_->addAction(bookmarksManageAction_);
- 		menu->addSeparator();
- 		menu->addAction(addContactAction_);
-@@ -191,6 +198,8 @@ private slots:
- 		bookmarksMenu_->clear();
- 		qDeleteAll(bookmarksJoinActions_);
- 		bookmarksJoinActions_.clear();
-+		bookmarksMenu_->addAction(doGroupChatAction_);
-+		bookmarksMenu_->addSeparator();
- 		bookmarksMenu_->addAction(bookmarksManageAction_);
- 		if (account->account()->bookmarkManager()->isAvailable()) {
- 			bookmarksMenu_->setEnabled(true);
-@@ -279,6 +288,15 @@ private slots:
- 		account->account()->actionManageBookmarks();
- 	}
- 
-+	void doGroupChat()
-+	{
-+		if (!account)
-+			return;
-+
-+		MUCJoinDlg *w = new MUCJoinDlg(account->account()->psi(), account->account());
-+		w->show();
-+	}
-+
- 	void bookmarksJoin()
- 	{
- 		if (!account)

psi-plus-main-20130107.tar.xz/patches/0760-psi-pep-toolbar-buttons.diff Deleted

@@ -1,384 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -486,6 +486,9 @@ QLineEdit#le_status_text {
- 				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
- 				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
- 				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
-+				<set_mood type="QKeySequence" comment="Set Mood"/>
-+				<set_activity type="QKeySequence" comment="Set Activity"/>
-+				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
- 				<help_readme type="QKeySequence" comment="README"></help_readme>
- 				<help_tip type="QKeySequence" comment="Tips"></help_tip>
- 				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
---- git.orig/src/activitydlg.cpp
-+++ git/src/activitydlg.cpp
-@@ -27,9 +27,11 @@
- #include "pepmanager.h"
- #include "psiiconset.h"
- 
--ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
-+ActivityDlg::ActivityDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+	if(pa_.isEmpty())
-+		close();
- 	ui_.setupUi(this);
- 	setModal(false);
- 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
-@@ -37,6 +39,7 @@ ActivityDlg::ActivityDlg(PsiAccount* pa)
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
- 
- 	ui_.cb_general_type->addItem(tr("<unset>"));
-+	PsiAccount* pa = pa_.first();
- 	Activity::Type at = pa->activity().type();
- 	int i=1;
- 	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
-@@ -62,7 +65,8 @@ void ActivityDlg::loadSpecificActivities
- 	}
- 	else {
- 		ui_.cb_specific_type->addItem(tr("<unset>"));
--		Activity::SpecificType at = pa_->activity().specificType();
-+		PsiAccount* pa = pa_.first();
-+		Activity::SpecificType at = pa->activity().specificType();
- 		int i=1;
- 		ActivityCatalog* ac = ActivityCatalog::instance();
- 		foreach(ActivityCatalog::Entry e, ac->entries()) {
-@@ -88,18 +92,20 @@ void ActivityDlg::setActivity()
- 	QString generalActivityStr  = ui_.cb_general_type->currentText();
- 	QString specificActivityStr = ui_.cb_specific_type->currentText();
- 
--	if (generalActivityStr == tr("<unset>")) {
--		pa_->pepManager()->retract("http://jabber.org/protocol/activity", "current");
--	}
--	else {
--		ActivityCatalog* ac = ActivityCatalog::instance();
--		Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
--
--		Activity::SpecificType specificType = Activity::UnknownSpecific;
--		if (specificActivityStr != tr("<unset>")) {
--			specificType = ac->findEntryByText(specificActivityStr).specificType();
-+	foreach(PsiAccount *pa, pa_) {
-+		if (generalActivityStr == tr("<unset>")) {
-+			pa->pepManager()->retract("http://jabber.org/protocol/activity", "current");
-+		}
-+		else {
-+			ActivityCatalog* ac = ActivityCatalog::instance();
-+			Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
-+
-+			Activity::SpecificType specificType = Activity::UnknownSpecific;
-+			if (specificActivityStr != tr("<unset>")) {
-+				specificType = ac->findEntryByText(specificActivityStr).specificType();
-+			}
-+			pa->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
- 		}
--		pa_->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
- 	}
- 	close();
- }
---- git.orig/src/activitydlg.h
-+++ git/src/activitydlg.h
-@@ -32,7 +32,7 @@ class ActivityDlg : public QDialog
- 	Q_OBJECT
- 
- public:
--	ActivityDlg(PsiAccount*);
-+	ActivityDlg(QList<PsiAccount*>);
- 
- protected slots:
- 	void setActivity();
-@@ -40,7 +40,7 @@ protected slots:
- 
- private:
- 	Ui::Activity ui_;
--	PsiAccount* pa_;
-+	QList<PsiAccount*> pa_;
- };
- 
- #endif
---- git.orig/src/geolocationdlg.cpp
-+++ git/src/geolocationdlg.cpp
-@@ -28,16 +28,19 @@
- #include "geolocation.h"
- #include <QLineEdit>
- 
--GeoLocationDlg::GeoLocationDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
-+GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+	if(pa_.isEmpty())
-+		close();
- 	ui_.setupUi(this);
- 	setModal(false);
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
- 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
- 
--	GeoLocation geoloc = pa_->geolocation();
-+	PsiAccount *pa = pa_.first();
-+	GeoLocation geoloc = pa->geolocation();
- 	if(geoloc.isNull())
- 		return;
- 
-@@ -155,11 +158,13 @@ void GeoLocationDlg::setGeoLocation()
- 	if(!ui_.le_text->text().isEmpty())
- 		geoloc.setText(ui_.le_text->text());
- 
--	if (geoloc.isNull()) {
-- 		pa_->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
--	}
--	else {                
--		pa_->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+	foreach(PsiAccount *pa, pa_) {
-+		if (geoloc.isNull()) {
-+			pa->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
-+		}
-+		else {
-+			pa->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+		}
- 	}
- 	close();
- }
---- git.orig/src/geolocationdlg.h
-+++ git/src/geolocationdlg.h
-@@ -31,7 +31,7 @@ class GeoLocationDlg : public QDialog
- 	Q_OBJECT
- 
- public:
--	GeoLocationDlg(PsiAccount*);
-+	GeoLocationDlg(QList<PsiAccount*>);
- 
- protected slots:
- 	void setGeoLocation();
-@@ -39,7 +39,7 @@ protected slots:
- 
- private:
- 	Ui::GeoLocation ui_;
-- 	PsiAccount* pa_;
-+	QList<PsiAccount*> pa_;
- };
- 
- #endif // GEOLOCATIONDLG_H
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -70,6 +70,9 @@
- #ifdef NEWCONTACTLIST
- #include "psirosterwidget.h"
- #endif
-+#include "mooddlg.h"
-+#include "activitydlg.h"
-+#include "geolocationdlg.h"
- 
- #include "mainwin_p.h"
- 
-@@ -148,6 +151,10 @@ public:
- 	void updateMenu(QStringList actions, QMenu* menu);
- 
- 	QString ToolTipText;
-+
-+	QPointer<MoodDlg> moodDlg;
-+	QPointer<ActivityDlg> activityDlg;
-+	QPointer<GeoLocationDlg> geolocationDlg;
- };
- 
- MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
-@@ -609,6 +616,9 @@ void MainWin::registerAction( IconAction
- 		{ "menu_play_sounds",    toggled,   this, SLOT( actPlaySoundsActivated(bool) ) },
- #ifdef USE_PEP
- 		{ "publish_tune",        toggled,   this, SLOT( actPublishTuneActivated(bool) ) },
-+		{ "set_mood",		 activated,   this, SLOT( actSetMoodActivated() ) },
-+		{ "set_activity",        activated,   this, SLOT( actSetActivityActivated() ) },
-+		{ "set_geoloc",		 activated,   this, SLOT( actSetGeolocActivated() ) },
- #endif
- 
- 		{ "event_notifier", SIGNAL( clicked(int) ), this, SLOT( statusClicked(int) ) },
-@@ -1093,6 +1103,60 @@ void MainWin::actEnableGroupsActivated (
- 	PsiOptions::instance()->setOption("options.ui.contactlist.enable-groups", state);
- }
- 
-+void MainWin::actSetMoodActivated()
-+{
-+	QList<PsiAccount*> l;
-+	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+			l.append(pa);
-+	}
-+	if(l.isEmpty())
-+		return;
-+
-+	if(d->moodDlg)
-+		bringToFront(d->moodDlg);
-+	else {
-+		d->moodDlg = new MoodDlg(l);
-+		d->moodDlg->show();
-+	}
-+}
-+
-+void MainWin::actSetActivityActivated()
-+{
-+	QList<PsiAccount*> l;
-+	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+			l.append(pa);
-+	}
-+	if(l.isEmpty())
-+		return;
-+
-+	if(d->activityDlg)
-+		bringToFront(d->activityDlg);
-+	else {
-+		d->activityDlg = new ActivityDlg(l);
-+		d->activityDlg->show();
-+	}
-+}
-+
-+void MainWin::actSetGeolocActivated()
-+{
-+	QList<PsiAccount*> l;
-+	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+			l.append(pa);
-+	}
-+	if(l.isEmpty())
-+		return;
-+
-+	if(d->geolocationDlg)
-+		bringToFront(d->geolocationDlg);
-+	else {
-+		d->geolocationDlg = new GeoLocationDlg(l);
-+		d->geolocationDlg->show();
-+	}
-+}
-+
- void MainWin::activatedAccOption(PsiAccount* pa, int x)
- {
- 	if(x == 0) {
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -135,6 +135,9 @@ private slots:
- 	void actTipActivated();
- 	void actDiagQCAPluginActivated();
- 	void actDiagQCAKeyStoreActivated();
-+	void actSetMoodActivated();
-+	void actSetActivityActivated();
-+	void actSetGeolocActivated();
- 
- 	bool showDockMenu(const QPoint &);
- 	void dockActivated();
---- git.orig/src/mooddlg.cpp
-+++ git/src/mooddlg.cpp
-@@ -27,16 +27,19 @@
- #include "pepmanager.h"
- #include "psiiconset.h"
- 
--MoodDlg::MoodDlg(PsiAccount* pa)
--	: QDialog(0), pa_(pa)
-+MoodDlg::MoodDlg(QList<PsiAccount*> list)
-+	: QDialog(0), pa_(list)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+	if(pa_.isEmpty())
-+		close();
- 	ui_.setupUi(this);
- 	setModal(false);
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));	
- 
- 	ui_.cb_type->addItem(tr("<unset>"));
-+	PsiAccount *pa = pa_.first();
- 	Mood::Type mt = pa->mood().type();
- 	int i=1;
- 	foreach(MoodCatalog::Entry e, MoodCatalog::instance()->entries()) {
-@@ -53,11 +56,14 @@ MoodDlg::MoodDlg(PsiAccount* pa)
- void MoodDlg::setMood()
- {
- 	QString moodstr = ui_.cb_type->currentText();
--	if (moodstr == tr("<unset>")) {
--		pa_->pepManager()->retract("http://jabber.org/protocol/mood", "current");
--	} else {
--		Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
--		pa_->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+	foreach(PsiAccount *pa, pa_) {
-+		if (moodstr == tr("<unset>")) {
-+			pa->pepManager()->retract("http://jabber.org/protocol/mood", "current");
-+		}
-+		else {
-+			Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
-+			pa->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+		}
- 	}
- 	close();
- }
---- git.orig/src/mooddlg.h
-+++ git/src/mooddlg.h
-@@ -32,14 +32,14 @@ class MoodDlg : public QDialog
- 	Q_OBJECT
- 
- public:
--	MoodDlg(PsiAccount*);
-+	MoodDlg(QList<PsiAccount*>);
- 
- protected slots:
- 	void setMood();
- 
- private:
- 	Ui::Mood ui_;
--	PsiAccount* pa_;
-+	QList<PsiAccount*> pa_;
- };
- 
- #endif
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3776,19 +3776,25 @@ void PsiAccount::actionExecuteCommandSpe
- 
- void PsiAccount::actionSetMood()
- {
--	MoodDlg *w = new MoodDlg(this);
-+	QList<PsiAccount*> list;
-+	list.append(this);
-+	MoodDlg *w = new MoodDlg(list);
- 	w->show();
- }
- 
- void PsiAccount::actionSetActivity()
- {
--	ActivityDlg *w = new ActivityDlg(this);
-+	QList<PsiAccount*> list;
-+	list.append(this);
-+	ActivityDlg *w = new ActivityDlg(list);
- 	w->show();
- }
- 
- void PsiAccount::actionSetGeoLocation()
- {
--	GeoLocationDlg *w = new GeoLocationDlg(this);
-+	QList<PsiAccount*> list;
-+	list.append(this);
-+	GeoLocationDlg *w = new GeoLocationDlg(list);
- 	w->show();
- }
- 
---- git.orig/src/psiactionlist.cpp
-+++ git/src/psiactionlist.cpp
-@@ -275,8 +275,20 @@ void PsiActionList::Private::createMainW
- 		IconAction *actPublishTune = new IconAction (tr("Publish Tune"), "psi/publishTune", tr("Publish &Tune"), 0, this, 0, true);
- 		actPublishTune->setWhatsThis (tr("Toggles whether the currently playing tune should be published or not"));
- 
-+		IconAction *actSetMood = new IconAction (tr("Set Mood"), "mood/", tr("Set Mood"), 0, this);
-+		actSetMood->setWhatsThis (tr("Set Mood for all active accounts"));
-+
-+		IconAction *actSetActivity = new IconAction (tr("Set Activity"), "activities/other", tr("Set Activity"), 0, this);
-+		actSetActivity->setWhatsThis (tr("Set Activity for all active accounts"));
-+
-+		IconAction *actSetGeoloc = new IconAction (tr("Set Geolocation"), "system/geolocation", tr("Set Geolocation"), 0, this);
-+		actSetGeoloc->setWhatsThis (tr("Set Geolocation for all active accounts"));
-+
- 		ActionNames actions[] = {
--			{ "publish_tune", actPublishTune },
-+			{ "publish_tune",	actPublishTune },
-+			{ "set_mood",		actSetMood },
-+			{ "set_activity",	actSetActivity },
-+			{ "set_geoloc",		actSetGeoloc },
- 			{ "", 0 }
- 		};
-

psi-plus-main-20130107.tar.xz/patches/0770-psi-roster-avatar-frame.diff Deleted

@@ -1,664 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -210,6 +210,7 @@ QLineEdit#le_status_text {
- 				<lockdown-roster type="bool">false</lockdown-roster>
- 				<raise-on-new-event type="bool">false</raise-on-new-event>
- 				<quit-on-close type="bool">false</quit-on-close>
-+				<show-roster-avatar-frame type="bool">false</show-roster-avatar-frame>
- 				<show>
- 					<agent-contacts type="bool">true</agent-contacts>
- 					<away-contacts type="bool">true</away-contacts>
-@@ -256,6 +257,12 @@ QLineEdit#le_status_text {
- 				<saved-window-geometry-screen type="int">0</saved-window-geometry-screen>
- 				<saved-window-geometry-maximized type="bool">false</saved-window-geometry-maximized>
- 				<saved-window-geometry-fullscreen type="bool">false</saved-window-geometry-fullscreen>
-+				<roster-avatar-frame comment="Options for roster avatar frame">
-+					<avatar>
-+						<size type="int">52</size>
-+						<margin type="int">0</margin>
-+					</avatar>
-+				</roster-avatar-frame>
- 			</contactlist>
- 			<menu comment="Options for the menu">
- 				<account comment="Options for the account-specific menu">
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -79,6 +79,9 @@
- #include "psimedia/psimedia.h"
- #include "avcall/avcall.h"
- 
-+#include "rosteravatarframe.h"
-+#include "avatars.h"
-+
- using namespace XMPP;
- 
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -126,6 +129,8 @@ public:
- 	EventNotifierAction* eventNotifier;
- 	PsiCon* psi;
- 	MainWin* mainWin;
-+	RosterAvatarFrame* rosterAvatar;
-+	QPointer<PsiAccount> defaultAccount;
- 
- 	QLineEdit* searchText;
- 	QToolButton* searchPb;
-@@ -307,6 +312,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->trayMenu = 0;
- 	d->statusTip = "";
- 	d->nickname = "";
-+	d->defaultAccount = 0;
- 
- 	QWidget *rosterBar = new QWidget(this);
- 	bool allInOne = false;
-@@ -399,6 +405,16 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->searchWidget->setVisible(false);
- #endif
- 
-+
-+	// create rosteravatarframe
-+	d->rosterAvatar = new RosterAvatarFrame(this);
-+	d->vb_roster->addWidget(d->rosterAvatar);
-+	d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
-+	connect(d->rosterAvatar, SIGNAL(statusMessageChanged(QString)), this, SIGNAL(statusMessageChanged(QString)));
-+	connect(psiCon(), SIGNAL(statusMessageChanged(QString)), d->rosterAvatar, SLOT(setStatusMessage(QString)));
-+	connect(d->rosterAvatar, SIGNAL(setMood()), this, SLOT(actSetMoodActivated()));
-+	connect(d->rosterAvatar, SIGNAL(setActivity()), this, SLOT(actSetActivityActivated()));
-+
- 	//add contact view
- #ifndef NEWCONTACTLIST
- 	d->vb_roster->addWidget(cvlist);
-@@ -511,6 +527,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- #endif
- 	d->optionsButton->setMenu( d->optionsMenu );
- 	d->statusButton->setMenu( d->statusMenu );
-+	d->rosterAvatar->setStatusMenu( d->statusMenu );
- 
- 	buildToolbars();
- 	// setUnifiedTitleAndToolBarOnMac(true);
-@@ -564,6 +581,9 @@ void MainWin::optionChanged(const QStrin
- 			setStyleSheet(css);
- 		}
- 	}
-+	else if (option == "options.ui.contactlist.show-roster-avatar-frame") {
-+		d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
-@@ -1302,6 +1322,7 @@ void MainWin::decorateButton(int status)
- 		else {
- 			d->statusButton->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
- 			d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
-+			d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE)->icon());
- 		}
- 
- 		setWindowIcon(PsiIconset::instance()->status(STATUS_OFFLINE).impix());
-@@ -1310,6 +1331,7 @@ void MainWin::decorateButton(int status)
- 		d->statusButton->setText(status2txt(status));
- 		d->statusButton->setIcon(PsiIconset::instance()->statusPtr(status));
- 		d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(status));
-+		d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(status)->icon());
- 
- 		setWindowIcon(PsiIconset::instance()->status(status).impix());
- 	}
-@@ -1612,6 +1634,38 @@ void MainWin::numAccountsChanged()
- {
- 	d->statusButton->setEnabled(d->psi->contactList()->haveEnabledAccounts());
- 	setTrayToolTip();
-+	PsiAccount *acc = d->psi->contactList()->defaultAccount();
-+	if(acc && acc != d->defaultAccount) {
-+		if(d->defaultAccount) {
-+			disconnect(d->defaultAccount, SIGNAL(nickChanged()), this, SLOT(nickChanged()));
-+//			disconnect(d->defaultAccount->avatarFactory(), SIGNAL(avatarChanged(Jid)), this, SLOT(avatarChanged()));
-+		}
-+		d->defaultAccount = acc;
-+		avatarChanged();
-+		nickChanged();
-+		d->rosterAvatar->setStatusMessage(acc->status().status());
-+		connect(acc->avatarFactory(), SIGNAL(avatarChanged(Jid)), this, SLOT(avatarChanged()));
-+		connect(acc, SIGNAL(nickChanged()), this, SLOT(nickChanged()));
-+	}
-+}
-+
-+void MainWin::nickChanged()
-+{
-+	if(d->defaultAccount)
-+		d->rosterAvatar->setNick(d->defaultAccount->nick());
-+}
-+
-+void MainWin::avatarChanged()
-+{
-+	if(d->defaultAccount) {
-+		QPixmap pix = d->defaultAccount->avatarFactory()->getAvatar(d->defaultAccount->jid());
-+		if(pix.isNull())
-+			pix = IconsetFactory::iconPixmap("psi/default_avatar");
-+		d->rosterAvatar->setAvatar(pix);
-+	}
-+	else {
-+		d->rosterAvatar->setAvatar(IconsetFactory::iconPixmap("psi/default_avatar"));
-+	}
- }
- 
- void MainWin::accountFeaturesChanged()
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -83,6 +83,7 @@ protected:
- 
- signals:
- 	void statusChanged(int);
-+	void statusMessageChanged(QString);
- 	void changeProfile();
- 	void blankMessage();
- 	void closeProgram();
-@@ -153,6 +154,9 @@ private slots:
- 
- 	void optionChanged(const QString&);
- 
-+	void nickChanged();
-+	void avatarChanged();
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();
---- psi.orig/src/options/opt_roster.cpp
-+++ psi/src/options/opt_roster.cpp
-@@ -65,6 +65,7 @@ void OptionsTabRoster::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.contactlist.show-roster-avatar-frame", d->ck_roster_avatar->isChecked());
- 
- 	//enabled icons
- 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
-@@ -93,6 +94,7 @@ void OptionsTabRoster::restoreOptions()
- 	d->ck_useleft->setVisible(false);
- 	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
- 	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
-+	d->ck_roster_avatar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool() );
- 
- 	//enabled icons
- 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
---- psi.orig/src/options/opt_roster.ui
-+++ psi/src/options/opt_roster.ui
-@@ -62,6 +62,16 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_roster_avatar">
-+     <property name="whatsThis">
-+      <string>Enables avatar frame at the top of roster</string>
-+     </property>
-+     <property name="text">
-+      <string>Enable roster avatar frame</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QGroupBox" name="gb_docklet">
-      <property name="title">
-       <string>Icons</string>
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -544,6 +544,7 @@ bool PsiCon::init()
- 	connect(d->mainwin, SIGNAL(doGroupChat()), SLOT(doGroupChat()));
- 	connect(d->mainwin, SIGNAL(blankMessage()), SLOT(doNewBlankMessage()));
- 	connect(d->mainwin, SIGNAL(statusChanged(int)), SLOT(statusMenuChanged(int)));
-+	connect(d->mainwin, SIGNAL(statusMessageChanged(QString)), SLOT(setStatusMessage(QString)));
- 	connect(d->mainwin, SIGNAL(doOptions()), SLOT(doOptions()));
- 	connect(d->mainwin, SIGNAL(doToolbars()), SLOT(doToolbars()));
- 	connect(d->mainwin, SIGNAL(doFileTransDlg()), SLOT(doFileTransDlg()));
-@@ -676,6 +677,8 @@ bool PsiCon::init()
- 	foreach(PsiAccount* account, d->contactList->accounts()) {
- 		account->autoLogin();
- 	}
-+	if(d->contactList->defaultAccount())
-+		emit statusMessageChanged(d->contactList->defaultAccount()->status().status());
- 
- 	// show tip of the day
- 	if ( PsiOptions::instance()->getOption("options.ui.tip.show").toBool() ) {
-@@ -1113,6 +1116,16 @@ void PsiCon::setGlobalStatus(const Statu
- 	foreach(PsiAccount* account, d->contactList->enabledAccounts())
- 		if (allOffline || account->isActive())
- 			account->setStatus(s, withPriority, isManualStatus);
-+
-+	emit statusMessageChanged(s.status());
-+}
-+
-+void PsiCon::setStatusMessage(QString message)
-+{
-+	XMPP::Status s;
-+	s.setType(currentStatusType());
-+	s.setStatus(message);
-+	setGlobalStatus(s, false, true);
- }
- 
- void PsiCon::pa_updatedActivity()
---- psi.orig/src/psicon.h
-+++ psi/src/psicon.h
-@@ -135,6 +135,7 @@ signals:
- 	void accountActivityChanged();
- 	void emitOptionsUpdate();
- 	void restoringSavedChatsChanged();
-+	void statusMessageChanged(QString);
- 
- public slots:
- 	void setGlobalStatus(const Status &, bool withPriority = false, bool isManualStatus = false);
-@@ -152,6 +153,7 @@ public slots:
- 	void doOptions();
- 	void doFileTransDlg();
- 	void statusMenuChanged(int);
-+	void setStatusMessage(QString message);
- 	void pa_updatedActivity();
- 	void pa_updatedAccount();
- 	void slotApplyOptions();
---- psi.orig/src/rosteravatarframe.cpp
-+++ psi/src/rosteravatarframe.cpp
-@@ -0,0 +1,146 @@
-+/*
-+ * rosteravatarframe.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "rosteravatarframe.h"
-+#include "psioptions.h"
-+#include "iconset.h"
-+#include "qpainter.h"
-+
-+
-+RosterAvatarFrame::RosterAvatarFrame(QWidget *parent)
-+	: QFrame(parent)
-+	, statusMessage_("")
-+{
-+	ui_.setupUi(this);
-+	layout()->setMargin(PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.margin").toInt());
-+	layout()->setSpacing(0);
-+	setMoodIcon("mood/");
-+	setActivityIcon("activities/other");
-+	setFont();
-+
-+	connect(ui_.le_status_text, SIGNAL(returnPressed()), this, SLOT(statusMessageReturnPressed()));
-+	connect(ui_.tb_mood, SIGNAL(pressed()), this, SIGNAL(setMood()));
-+	connect(ui_.tb_activity, SIGNAL(pressed()), this, SIGNAL(setActivity()));
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(QString)),this, SLOT(optionChanged(QString)));
-+}
-+
-+void RosterAvatarFrame::setStatusMessage(const QString &message)
-+{
-+	ui_.le_status_text->setText(message);
-+	ui_.le_status_text->setCursorPosition(0);
-+	statusMessage_ = message;
-+}
-+
-+void RosterAvatarFrame::setAvatar(const QPixmap &avatar)
-+{
-+	avatarPixmap = avatar;
-+	drawAvatar();
-+}
-+
-+void RosterAvatarFrame::setMoodIcon(const QString &mood)
-+{
-+	ui_.tb_mood->setIcon(QIcon(IconsetFactory::iconPixmap(mood)));
-+}
-+
-+void RosterAvatarFrame::setActivityIcon(const QString &activity)
-+{
-+	ui_.tb_activity->setIcon(QIcon(IconsetFactory::iconPixmap(activity)));
-+}
-+
-+void RosterAvatarFrame::drawAvatar()
-+{
-+	int avSize = PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.size").toInt();
-+	QPixmap av = avatarPixmap;
-+	int radius = PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt();
-+	if(!radius)
-+		av = av.scaled(avSize,avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+	else {
-+		avSize = qMax(avSize, radius*2);
-+		av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+		int w = av.width(), h = av.height();
-+		QPainterPath pp;
-+		pp.addRoundedRect(0, 0, w, h, radius, radius);
-+		QPixmap avatar_icon = QPixmap(w, h);
-+		avatar_icon.fill(QColor(0,0,0,0));
-+		QPainter mp(&avatar_icon);
-+		mp.setBackgroundMode(Qt::TransparentMode);
-+		mp.setRenderHints(QPainter::Antialiasing, true);
-+		mp.fillPath(pp, QBrush(av));
-+		av = avatar_icon;
-+	}
-+	ui_.lb_avatar->setPixmap(av);
-+	ui_.lb_avatar->setFixedSize(avSize,avSize);
-+}
-+
-+void RosterAvatarFrame::setStatusIcon(const QIcon &ico)
-+{
-+	ui_.tb_status->setIcon(ico);
-+}
-+
-+void RosterAvatarFrame::setNick(const QString &nick)
-+{
-+	ui_.lb_nick->setText(nick);
-+}
-+
-+void RosterAvatarFrame::setFont()
-+{
-+	QFont f;
-+	f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
-+	ui_.lb_nick->setFont(f);
-+	ui_.le_status_text->setFont(f);
-+}
-+
-+void RosterAvatarFrame::statusMessageReturnPressed()
-+{
-+	statusMessage_ = ui_.le_status_text->text();
-+	ui_.le_status_text->setCursorPosition(0);
-+	ui_.lb_nick->setFocus(); //remove focus from lineedit
-+	emit statusMessageChanged(statusMessage_);
-+}
-+
-+void RosterAvatarFrame::setStatusMenu(QMenu *menu)
-+{
-+	statusMenu_ = menu;
-+	ui_.tb_status->setMenu(statusMenu_);
-+	ui_.tb_status->setPopupMode(QToolButton::InstantPopup);
-+}
-+
-+void RosterAvatarFrame::keyPressEvent(QKeyEvent *e)
-+{
-+	if(e->key() == Qt::Key_Escape) {
-+		ui_.le_status_text->setText(statusMessage_);
-+		ui_.le_status_text->setCursorPosition(0);
-+		ui_.lb_nick->setFocus(); //remove focus from lineedit
-+		e->accept();
-+	}
-+	else {
-+		e->ignore();
-+	}
-+}
-+
-+void RosterAvatarFrame::optionChanged(QString option)
-+{
-+	if(option == "options.ui.contactlist.avatars.radius" or "options.ui.contactlist.roster-avatar-frame.avatar.size")
-+		drawAvatar();
-+	if (option == "options.ui.look.font.contactlist")
-+		setFont();
-+	if (option == "options.ui.contactlist.roster-avatar-frame.avatar.margin")
-+		layout()->setMargin(PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.margin").toInt());
-+}
---- psi.orig/src/rosteravatarframe.h
-+++ psi/src/rosteravatarframe.h
-@@ -0,0 +1,65 @@
-+/*
-+ * rosteravatarframe.h
-+ * Copyright (C) 2010  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ROSTERAVATARFRAME_H
-+#define ROSTERAVATARFRAME_H
-+
-+#include "ui_rosteravatarframe.h"
-+
-+#include <QKeyEvent>
-+
-+class RosterAvatarFrame : public QFrame
-+{
-+	Q_OBJECT
-+	public:
-+		RosterAvatarFrame(QWidget *parent);
-+		void setAvatar(const QPixmap &avatar);
-+		void setStatusIcon(const QIcon &ico);                
-+		void setNick(const QString &nick);
-+		void setStatusMenu(QMenu *menu);
-+
-+	signals:
-+		void statusMessageChanged(QString);
-+		void setMood();
-+		void setActivity();
-+
-+	protected:
-+		void keyPressEvent(QKeyEvent *event);
-+
-+	private slots:
-+		void statusMessageReturnPressed();
-+		void optionChanged(QString);
-+
-+	public slots:
-+		void setStatusMessage(const QString &message);
-+		void setMoodIcon(const QString &mood);
-+		void setActivityIcon(const QString &activity);
-+
-+	private:
-+		Ui::RosterAvatarFrame ui_;
-+		QString statusMessage_;
-+		QMenu *statusMenu_;
-+		QPixmap avatarPixmap;
-+
-+		void drawAvatar();
-+		void setFont();
-+};
-+
-+#endif
---- psi.orig/src/rosteravatarframe.ui
-+++ psi/src/rosteravatarframe.ui
-@@ -0,0 +1,165 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>RosterAvatarFrame</class>
-+ <widget class="QFrame" name="RosterAvatarFrame">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>260</width>
-+    <height>81</height>
-+   </rect>
-+  </property>
-+  <property name="maximumSize">
-+   <size>
-+    <width>16777215</width>
-+    <height>81</height>
-+   </size>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Form</string>
-+  </property>
-+  <layout class="QHBoxLayout" name="horizontalLayout_3">
-+   <property name="sizeConstraint">
-+    <enum>QLayout::SetNoConstraint</enum>
-+   </property>
-+   <item>
-+    <widget class="QLabel" name="lb_avatar">
-+     <property name="minimumSize">
-+      <size>
-+       <width>32</width>
-+       <height>32</height>
-+      </size>
-+     </property>
-+     <property name="maximumSize">
-+      <size>
-+       <width>64</width>
-+       <height>64</height>
-+      </size>
-+     </property>
-+     <property name="text">
-+      <string/>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QVBoxLayout" name="verticalLayout">
-+     <item>
-+      <layout class="QHBoxLayout" name="horizontalLayout_2">
-+       <item>
-+        <widget class="QLabel" name="lb_nick">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="toolTip">
-+          <string>Nick</string>
-+         </property>
-+         <property name="text">
-+          <string/>
-+         </property>
-+         <property name="alignment">
-+          <set>Qt::AlignCenter</set>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QToolButton" name="tb_mood">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>28</width>
-+           <height>28</height>
-+          </size>
-+         </property>
-+         <property name="toolTip">
-+          <string>Set Mood for all active accounts</string>
-+         </property>
-+         <property name="text">
-+          <string/>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QToolButton" name="tb_activity">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>28</width>
-+           <height>28</height>
-+          </size>
-+         </property>
-+         <property name="toolTip">
-+          <string>Set Activity for all active accounts</string>
-+         </property>
-+         <property name="text">
-+          <string/>
-+         </property>
-+        </widget>
-+       </item>
-+      </layout>
-+     </item>
-+     <item>
-+      <layout class="QHBoxLayout" name="horizontalLayout">
-+       <item>
-+        <widget class="QToolButton" name="tb_status">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>28</width>
-+           <height>28</height>
-+          </size>
-+         </property>
-+         <property name="toolTip">
-+          <string>Set Status for all active accounts</string>
-+         </property>
-+         <property name="text">
-+          <string/>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QLineEdit" name="le_status_text">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>16777215</width>
-+           <height>25</height>
-+          </size>
-+         </property>
-+         <property name="toolTip">
-+          <string>Status Message</string>
-+         </property>
-+        </widget>
-+       </item>
-+      </layout>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -224,6 +224,7 @@ HEADERS += \
- 	$$PWD/psicli.h \
- 	$$PWD/coloropt.h \
- 	$$PWD/geolocationdlg.h \
-+	$$PWD/rosteravatarframe.h \
- 	$$PWD/sendbuttonmenu.h
- 
- 
-@@ -362,6 +363,7 @@ SOURCES += \
- 	$$PWD/vcardphotodlg.cpp \
- 	$$PWD/coloropt.cpp \
- 	$$PWD/geolocationdlg.cpp \
-+	$$PWD/rosteravatarframe.cpp \
- 	$$PWD/sendbuttonmenu.cpp
- 
- 
-@@ -596,6 +598,7 @@ FORMS += \
- 	$$PWD/ahcommanddlg.ui \
- 	$$PWD/ahcformdlg.ui \
- 	$$PWD/geolocation.ui \
-+	$$PWD/rosteravatarframe.ui \
- 	$$PWD/sendbuttontemplateseditor.ui
- 
- # options dialog

psi-plus-main-20130107.tar.xz/patches/0780-psi-add-dbus-status.diff Deleted

@@ -1,59 +0,0 @@
---- git.orig/src/dbus.cpp
-+++ git/src/dbus.cpp
-@@ -31,6 +31,14 @@ public Q_SLOTS:
- 	void raise();
- 	void sleep();
- 	void wake();
-+
-+	void setstatusonline(const QString &message);
-+	void setstatusaway(const QString &message);
-+	void setstatusffc(const QString &message);
-+	void setstatusxa(const QString &message);
-+	void setstatusdnd(const QString &message);
-+	void setstatusoffline(const QString &message);
-+
- /*Q_SIGNALS:
- 	void psi_pong();
- */
-@@ -74,6 +82,41 @@ void PsiConAdapter::wake()
- 	psicon->doWakeup();
- }
- 
-+void PsiConAdapter::setstatusonline(const QString &message)
-+{
-+	Status s(Status::Online, message);
-+	psicon->setGlobalStatus(s);
-+}
-+
-+void PsiConAdapter::setstatusaway(const QString &message)
-+{
-+	Status s(Status::Away, message);
-+	psicon->setGlobalStatus(s);
-+}
-+
-+void PsiConAdapter::setstatusffc(const QString &message)
-+{
-+	Status s(Status::FFC, message);
-+	psicon->setGlobalStatus(s);
-+}
-+
-+void PsiConAdapter::setstatusxa(const QString &message)
-+{
-+	Status s(Status::XA, message);
-+	psicon->setGlobalStatus(s);
-+}
-+
-+void PsiConAdapter::setstatusdnd(const QString &message)
-+{
-+	Status s(Status::DND, message);
-+	psicon->setGlobalStatus(s);
-+}
-+
-+void PsiConAdapter::setstatusoffline(const QString &message)
-+{
-+	Status s(Status::Offline, message);
-+	psicon->setGlobalStatus(s);
-+}
- 
- void addPsiConAdapter(PsiCon *psicon)
- {

psi-plus-main-20130107.tar.xz/patches/0790-psi-roster-autohide.diff Deleted

@@ -1,256 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -586,6 +586,8 @@ QLineEdit#le_status_text {
- 			<hide-on-start type="bool">false</hide-on-start>
- 			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
- 			<use-toolwindow type="bool">false</use-toolwindow>
-+			<use-autohide type="bool">false</use-autohide>
-+			<autohide-interval type="int">600</autohide-interval>
- 		</contactlist>
- 		<external-control>
- 			<adhoc-remote-control>
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -136,6 +136,10 @@ public:
- 	QToolButton* searchPb;
- 	QWidget* searchWidget;
- 
-+	QTimer *hideTimer;
-+	int hideTimerInterval; //interval in sec
-+	bool useAutohide;
-+
- 	QSignalMapper* statusMapper;
- 
- 	PsiIcon* nextAnim;
-@@ -181,10 +185,13 @@ MainWin::Private::Private(PsiCon* _psi, 
- 
- 	char* squishStr = getenv("SQUISH_ENABLED");
- 	squishEnabled = squishStr != 0;
-+
-+	hideTimer = new QTimer();
- }
- 
- MainWin::Private::~Private()
- {
-+	delete(hideTimer);
- }
- 
- void MainWin::Private::registerActions()
-@@ -533,6 +540,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	// setUnifiedTitleAndToolBarOnMac(true);
- 
- 	connect(qApp, SIGNAL(dockActivated()), SLOT(dockActivated()));
-+	qApp->installEventFilter(this);
- 
- 	connect(psi, SIGNAL(emitOptionsUpdate()), SLOT(optionsUpdate()));
- 	optionsUpdate();
-@@ -541,6 +549,11 @@ MainWin::MainWin(bool _onTop, bool _asTo
-         connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
- 
- 	optionChanged("options.ui.contactlist.css");
-+
-+	connect(d->hideTimer, SIGNAL(timeout()), SLOT(hideTimerTimeout()));
-+	d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
-+	d->hideTimer->setInterval(d->hideTimerInterval*1000);
-+	optionChanged("options.contactlist.use-autohide");
- }
- 
- MainWin::~MainWin()
-@@ -584,6 +597,28 @@ void MainWin::optionChanged(const QStrin
- 	else if (option == "options.ui.contactlist.show-roster-avatar-frame") {
- 		d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
- 	}
-+	else if (option == "options.contactlist.use-autohide") {
-+		d->useAutohide = PsiOptions::instance()->getOption("options.contactlist.use-autohide").toBool();
-+		if(d->useAutohide)
-+			d->hideTimer->start();
-+		else
-+			d->hideTimer->stop();
-+	}
-+	else if (option == "options.contactlist.autohide-interval") {
-+		d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
-+		d->hideTimer->setInterval(d->hideTimerInterval*1000);
-+		if(d->useAutohide)
-+			d->hideTimer->start();
-+	}
-+}
-+
-+void MainWin::hideTimerTimeout()
-+{
-+	d->hideTimer->stop();
-+	if(d->tray)
-+		trayHide();
-+	else
-+		setWindowState(Qt::WindowMinimized);
- }
- 
- void MainWin::registerAction( IconAction* action )
-@@ -1423,6 +1458,31 @@ void MainWin::keyPressEvent(QKeyEvent* e
- 	QWidget::keyPressEvent(e);
- }
- 
-+void MainWin::enterEvent(QEvent *e)
-+{
-+	if(d->useAutohide)
-+		d->hideTimer->stop();
-+	QMainWindow::enterEvent(e);
-+}
-+
-+void MainWin::leaveEvent(QEvent *e)
-+{
-+	if(d->useAutohide)
-+		d->hideTimer->start();
-+	QMainWindow::leaveEvent(e);
-+}
-+
-+bool MainWin::eventFilter(QObject *o, QEvent *e)
-+{
-+	if(e->type() == QEvent::KeyPress
-+	   && o->isWidgetType()
-+	   && isAncestorOf( (QWidget*)o ) ) {
-+		if(d->hideTimer->isActive())
-+			d->hideTimer->start();
-+	}
-+	return false;
-+}
-+
- #ifdef Q_WS_WIN
- #include <windows.h>
- bool MainWin::winEvent(MSG* msg, long* result)
-@@ -1542,6 +1602,8 @@ void MainWin::trayDoubleClicked()
- void MainWin::trayShow()
- {
- 	bringToFront(this);
-+	if(d->useAutohide)
-+		d->hideTimer->start();
- }
- 
- void MainWin::trayHide()
-@@ -1841,6 +1903,8 @@ void MainWin::showNoFocus()
- void MainWin::showNoFocus()
- {
- 	bringToFront(this);
-+	if(d->useAutohide)
-+		d->hideTimer->start();
- }
- 
- void MainWin::avcallConfig()
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -72,9 +72,12 @@ public:
- 
- protected:
- 	// reimplemented
-+	bool eventFilter(QObject* o, QEvent* e);
- 	void resizeEvent(QResizeEvent *e);
- 	void closeEvent(QCloseEvent *);
- 	void changeEvent(QEvent *event);
-+	void enterEvent(QEvent *e);
-+	void leaveEvent(QEvent *e);
- 	void keyPressEvent(QKeyEvent *);
- 	QMenuBar* mainMenuBar() const;
- #ifdef Q_WS_WIN
-@@ -157,6 +160,8 @@ private slots:
- 	void nickChanged();
- 	void avatarChanged();
- 
-+	void hideTimerTimeout();
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();
---- git.orig/src/options/opt_roster.cpp
-+++ git/src/options/opt_roster.cpp
-@@ -66,6 +66,8 @@ void OptionsTabRoster::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.contactlist.show-roster-avatar-frame", d->ck_roster_avatar->isChecked());
-+	PsiOptions::instance()->setOption("options.contactlist.use-autohide", d->cb_autohide->isChecked());
-+	PsiOptions::instance()->setOption("options.contactlist.autohide-interval", d->sb_hideInterval->value());
- 
- 	//enabled icons
- 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
-@@ -94,6 +96,9 @@ void OptionsTabRoster::restoreOptions()
- 	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
- 	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
- 	d->ck_roster_avatar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool() );
-+	d->cb_autohide->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-autohide").toBool() );
-+	d->sb_hideInterval->setValue( PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt() );
-+	d->sb_hideInterval->setEnabled(d->cb_autohide->isChecked());
- 
- 	//enabled icons
- 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
---- git.orig/src/options/opt_roster.ui
-+++ git/src/options/opt_roster.ui
-@@ -72,6 +72,47 @@
-     </widget>
-    </item>
-    <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_3">
-+     <item>
-+      <widget class="QCheckBox" name="cb_autohide">
-+       <property name="text">
-+        <string>Autohide roster after</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QSpinBox" name="sb_hideInterval">
-+       <property name="minimum">
-+        <number>1</number>
-+       </property>
-+       <property name="maximum">
-+        <number>9999</number>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="label_2">
-+       <property name="text">
-+        <string>seconds</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>0</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-     <widget class="QGroupBox" name="gb_docklet">
-      <property name="title">
-       <string>Icons</string>
-@@ -249,5 +290,22 @@
-   <tabstop>ck_showTuneIcons</tabstop>
-  </tabstops>
-  <resources/>
-- <connections/>
-+ <connections>
-+  <connection>
-+   <sender>cb_autohide</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>sb_hideInterval</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>92</x>
-+     <y>190</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>208</x>
-+     <y>191</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
- </ui>

psi-plus-main-20130107.tar.xz/patches/0810-psiplus-nix-application-icon-and-name.diff Deleted

@@ -1,34 +0,0 @@
---- git.orig/psi.desktop
-+++ git/psi.desktop
-@@ -2,7 +2,7 @@
- # This is the spec version, *not* the application version
- Version=1.0
- Type=Application
--Name=Psi
-+Name=Psi+
- GenericName=XMPP Client
- Comment=Communicate over the XMPP network
- Icon=psi
---- git.orig/src/src.pro
-+++ git/src/src.pro
-@@ -44,15 +44,15 @@ unix {
- 	dt.path=$$PREFIX/share/applications/
- 	dt.files = ../psi.desktop 
- 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
--	icon1.extra = cp -f ../iconsets/system/default/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
-+	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
- 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
--	icon2.extra = cp -f ../iconsets/system/default/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
-+	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
- 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
--	icon3.extra = cp -f ../iconsets/system/default/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
-+	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
- 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
--	icon4.extra = cp -f ../iconsets/system/default/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
-+	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
- 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
--	icon5.extra = cp -f ../iconsets/system/default/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
-+	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
- 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
- }
-

psi-plus-main-20130107.tar.xz/patches/0820-psi-presets-in-status-menu.diff Deleted

@@ -1,5299 +0,0 @@
---- psi.orig/iris/src/xmpp/xmpp-im/types.cpp
-+++ psi/iris/src/xmpp/xmpp-im/types.cpp
-@@ -2238,24 +2238,29 @@ void Status::setType(Status::Type _type)
- 	setIsInvisible(invisible);
- }
- 
--void Status::setType(QString stat)
-+Status::Type Status::txt2type(const QString& stat)
- {
- 	if (stat == "offline")
--		setType(XMPP::Status::Offline);
-+		return XMPP::Status::Offline;
- 	else if (stat == "online")
--		setType(XMPP::Status::Online);
-+		return XMPP::Status::Online;
- 	else if (stat == "away")
--		setType(XMPP::Status::Away);
-+		return XMPP::Status::Away;
- 	else if (stat == "xa")
--		setType(XMPP::Status::XA);
-+		return XMPP::Status::XA;
- 	else if (stat == "dnd")
--		setType(XMPP::Status::DND);
-+		return XMPP::Status::DND;
- 	else if (stat == "invisible")
--		setType(XMPP::Status::Invisible);
-+		return XMPP::Status::Invisible;
- 	else if (stat == "chat")
--		setType(XMPP::Status::FFC);
-+		return XMPP::Status::FFC;
- 	else
--		setType(XMPP::Status::Away);
-+		return XMPP::Status::Away;
-+}
-+
-+void Status::setType(QString stat)
-+{
-+	setType(txt2type(stat));
- }
- 
- void Status::setShow(const QString & _show)
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_status.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_status.h
-@@ -71,6 +71,8 @@ namespace XMPP
- 		int mucHistoryMaxStanzas() const;
- 		int mucHistorySeconds() const;
- 
-+		static Type txt2type(const QString& stat);
-+
- 		void setPriority(int);
- 		void setType(Type);
- 		void setType(QString);
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -58,6 +58,7 @@
- 				<maximum comment="The maximum number of recently joined rooms that should be remembered" type="int">10</maximum>
- 			</recent-joins>
- 			<reasons type="QStringList" />
-+			<leave-status-message comment="Leave status message" type="QString"></leave-status-message>
- 		</muc> 
- 		<pgp comment="PGP encryption options">
- 			<enable comment="Enable PGP globally" type="bool">true</enable>
-@@ -117,6 +118,7 @@
- 				<only-paste-template type="bool">false</only-paste-template>
- 				<disable-paste-send type="bool">false</disable-paste-send>
- 				<hide-when-closing type="bool">false</hide-when-closing>
-+				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
-@@ -286,6 +288,8 @@ QLineEdit#le_status_text {
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-+				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
-+				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
- 				<log-width type="int">500</log-width>
- 				<roster-width type="int">80</roster-width>
- 				<roster-at-left type="bool">false</roster-at-left>
-@@ -498,6 +502,7 @@ QLineEdit#le_status_text {
- 				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
- 				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
- 				<status_all type="QKeySequence" comment="Status All"></status_all>
-+				<status_group type="QKeySequence" comment="Status Group"></status_group>
- 				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
- 				<status_online type="QKeySequence" comment="Status Online"></status_online>
- 				<status_away type="QKeySequence" comment="Status Away"></status_away>
-@@ -505,6 +510,8 @@ QLineEdit#le_status_text {
- 				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
- 				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
- 				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
-+				<choose_status type="QKeySequence" comment="Choose status"></choose_status>
-+				<reconnect_all type="QKeySequence" comment="Reconnect all accounts"></reconnect_all>
- 				<set_mood type="QKeySequence" comment="Set Mood"/>
- 				<set_activity type="QKeySequence" comment="Set Activity"/>
- 				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
-@@ -641,17 +648,41 @@ QLineEdit#le_status_text {
- 		<status>
- 			<ask-for-message-on-offline type="bool">false</ask-for-message-on-offline>
- 			<ask-for-message-on-online type="bool">false</ask-for-message-on-online>
-+			<ask-for-message-on-chat type="bool">true</ask-for-message-on-chat>
-+			<ask-for-message-on-away type="bool">true</ask-for-message-on-away>
-+			<ask-for-message-on-xa type="bool">true</ask-for-message-on-xa>
-+			<ask-for-message-on-dnd type="bool">true</ask-for-message-on-dnd>
- 			<auto-away>
- 				<away-after type="int">10</away-after>
- 				<force-priority type="bool">false</force-priority>
-+				<force-xa-priority type="bool">false</force-xa-priority>
- 				<not-availible-after type="int">30</not-availible-after>
- 				<offline-after type="int">0</offline-after>
- 				<use-away type="bool">true</use-away>
- 				<use-not-availible type="bool">true</use-not-availible>
- 				<use-offline type="bool">false</use-offline>
- 			</auto-away>
--			<last-message type="QString"/>
-+			<last-message comment="Last status message" type="QString"/>
-+			<last-priority comment="Last priority" type="QString"/>
-+			<last-status comment="Last status" type="QString">away</last-status>
-+			<last-overwrite>
-+				<by-template type="bool">true</by-template>
-+				<by-status type="bool">false</by-status>
-+			</last-overwrite>
- 			<presets/>
-+			<presets-in-status-menus type="QString" comment="'yes', 'no' or 'submenu'">submenu</presets-in-status-menus>
-+			<show-only-online-offline type="bool">false</show-only-online-offline>
-+			<show-choose type="bool">true</show-choose>
-+			<show-edit-presets type="bool">true</show-edit-presets>
-+			<show-reconnect comment="Show Reconnect in status menus" type="bool">false</show-reconnect>
-+			<default-priority>
-+				<online type="int">50</online>
-+				<chat type="int">50</chat>
-+				<away type="int">40</away>
-+				<xa type="int">30</xa>
-+				<dnd type="int">20</dnd>
-+				<invisible type="int">10</invisible>
-+			</default-priority>
- 		</status>
- 		<subscriptions>
- 			<automatically-allow-authorization type="bool">false</automatically-allow-authorization>
---- psi.orig/src/accountmodifydlg.cpp
-+++ psi/src/accountmodifydlg.cpp
-@@ -86,8 +86,6 @@ void AccountModifyDlg::init()
- 	connect(pb_key, SIGNAL(clicked()), SLOT(chooseKey()));
- 	connect(pb_keyclear, SIGNAL(clicked()), SLOT(clearKey()));
- 	connect(buttonBox->button(QDialogButtonBox::Save), SIGNAL(clicked()), SLOT(save()));
--	connect(ck_automatic_resource, SIGNAL(toggled(bool)), le_resource, SLOT(setDisabled(bool)));
--	connect(ck_automatic_resource, SIGNAL(toggled(bool)), lb_resource, SLOT(setDisabled(bool)));
- 
- 	gb_pgp->setEnabled(false);
- 
-@@ -124,9 +122,18 @@ void AccountModifyDlg::init()
- 	le_port->setText(QString::number(acc.port));
- 	ck_req_mutual->setChecked(acc.req_mutual_auth);
- 
--	ck_automatic_resource->setChecked(acc.opt_automatic_resource);
-+	connect(cb_resource, SIGNAL(currentIndexChanged(int)), SLOT(resourceCbChanged(int)));
-+	connect(cb_priority, SIGNAL(currentIndexChanged(int)), SLOT(priorityCbChanged(int)));
-+	connect(ck_auto, SIGNAL(clicked()), SLOT(autoconnectCksChanged()));
-+	connect(ck_connectAfterSleep, SIGNAL(clicked()), SLOT(autoconnectCksChanged()));
-+	cb_resource->addItem(tr("Manual"));
-+	cb_resource->addItem(tr("Use host name"));
-+	cb_resource->setCurrentIndex(acc.opt_automatic_resource ? 1 : 0);
- 	le_resource->setText(acc.resource);
--	le_priority->setText(QString::number(acc.priority));
-+	cb_priority->addItem(tr("Fixed"));
-+	cb_priority->addItem(tr("Depends on status"));
-+	cb_priority->setCurrentIndex(acc.priority_dep_on_status ? 1 : 0);
-+	sb_priority->setValue(acc.priority);
- 
- 	connect(ck_custom_auth,SIGNAL(toggled(bool)), lb_authid, SLOT(setEnabled(bool)));
- 	connect(ck_custom_auth,SIGNAL(toggled(bool)), le_authid, SLOT(setEnabled(bool)));
-@@ -140,6 +147,7 @@ void AccountModifyDlg::init()
- 	ck_auto->setChecked(acc.opt_auto);
- 	ck_reconn->setChecked(acc.opt_reconn);
- 	ck_connectAfterSleep->setChecked(acc.opt_connectAfterSleep);
-+	ck_autoSameStatus->setChecked(acc.opt_autoSameStatus);
- 	ck_log->setChecked(acc.opt_log);
- 	ck_keepAlive->setChecked(acc.opt_keepAlive);
- 	ck_ibbOnly->setChecked(acc.ibbOnly);
-@@ -148,6 +156,7 @@ void AccountModifyDlg::init()
- 	le_stunPort->setText(QString::number(acc.stunPort));
- 	le_stunUser->setText(acc.stunUser);
- 	le_stunPass->setText(acc.stunPass);
-+	autoconnectCksChanged();
- 	connect(ck_ibbOnly, SIGNAL(toggled(bool)), SLOT(ibbOnlyToggled(bool)));
- 	ibbOnlyToggled(acc.ibbOnly);
- 
-@@ -249,7 +258,7 @@ void AccountModifyDlg::init()
- 		tr("This option sets the user (and realm) you want to "
- 			"authenticate as. This overrides the XMPP address you are logging in "
- 			"as."));
--	le_priority->setWhatsThis(
-+	sb_priority->setWhatsThis(
- 		tr("<p>You can have multiple clients connected to the XMPP "
- 		"server with your single account.  In such a situation, "
- 		"the client with the highest priority (that is specified in "
-@@ -309,7 +318,7 @@ void AccountModifyDlg::init()
- 	}
- 	
- 	if (!PsiOptions::instance()->getOption("options.ui.account.resource").toBool()) {
--		ck_automatic_resource->hide();
-+		cb_resource->hide();
- 		lb_resource->hide();
- 		le_resource->hide();
- 	}
-@@ -324,7 +333,8 @@ void AccountModifyDlg::init()
- 	
- 	if (!PsiOptions::instance()->getOption("options.ui.account.priority").toBool()) {
- 		lb_priority->hide();
--		le_priority->hide();
-+		cb_priority->hide();
-+		sb_priority->hide();
- 	}
- 	
- 	if (!PsiOptions::instance()->getOption("options.ui.account.data-proxy").toBool()) {
-@@ -511,9 +521,10 @@ void AccountModifyDlg::save()
- 	acc.req_mutual_auth = ck_req_mutual->isChecked();
- 	acc.security_level = cb_security_level->itemData(cb_security_level->currentIndex()).toInt();
- 
--	acc.opt_automatic_resource = ck_automatic_resource->isChecked();
-+	acc.opt_automatic_resource = (cb_resource->currentIndex() == 1);
- 	acc.resource = le_resource->text();
--	acc.priority = le_priority->text().toInt();
-+	acc.priority_dep_on_status = (cb_priority->currentIndex() == 1);
-+	acc.priority = sb_priority->value();
- 	acc.customAuth = ck_custom_auth->isChecked();
- 	acc.authid = le_authid->text();
- 	acc.realm = le_realm->text();
-@@ -522,6 +533,7 @@ void AccountModifyDlg::save()
- 	acc.opt_compress = ck_compress->isChecked();
- 	acc.opt_auto = ck_auto->isChecked();
- 	acc.opt_connectAfterSleep = ck_connectAfterSleep->isChecked();
-+	acc.opt_autoSameStatus = ck_autoSameStatus->isChecked();
- 	acc.opt_reconn = ck_reconn->isChecked();
- 	acc.opt_log = ck_log->isChecked();
- 	acc.opt_keepAlive = ck_keepAlive->isChecked();
-@@ -648,3 +660,22 @@ void AccountModifyDlg::getDefaultList_er
- 	setPrivacyTabEnabled(false);
- }
- 
-+void AccountModifyDlg::resourceCbChanged(int index)
-+{
-+	le_resource->setEnabled(index == 0);
-+}
-+
-+void AccountModifyDlg::priorityCbChanged(int index)
-+{
-+	sb_priority->setEnabled(index == 0);
-+}
-+
-+void AccountModifyDlg::autoconnectCksChanged()
-+{
-+	if (ck_auto->isChecked() || ck_connectAfterSleep->isChecked()) {
-+		ck_autoSameStatus->setEnabled(true);
-+	}
-+	else {
-+		ck_autoSameStatus->setEnabled(false);
-+	}
-+}
---- psi.orig/src/accountmodifydlg.h
-+++ psi/src/accountmodifydlg.h
-@@ -73,6 +73,10 @@ private slots:
-  	void getDefaultList_error();
-  	void changeList_error();
- 
-+	void resourceCbChanged(int index);
-+	void priorityCbChanged(int index);
-+	void autoconnectCksChanged();
-+
- private:
- 	PsiCon *psi;
- 	PsiAccount *pa;
---- psi.orig/src/accountmodify.ui
-+++ psi/src/accountmodify.ui
-@@ -150,6 +150,13 @@
-            </widget>
-           </item>
-           <item>
-+           <widget class="QCheckBox" name="ck_autoSameStatus">
-+            <property name="text">
-+             <string>Restore last status</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-            <widget class="QCheckBox" name="ck_reconn">
-             <property name="text">
-              <string>Automatically reconnect if disconnected</string>
-@@ -791,20 +798,7 @@
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
--        <widget class="QCheckBox" name="ck_automatic_resource">
--         <property name="text">
--          <string>Use hostname as resource</string>
--         </property>
--        </widget>
--       </item>
--       <item>
--        <layout class="QHBoxLayout">
--         <property name="spacing">
--          <number>6</number>
--         </property>
--         <property name="margin">
--          <number>0</number>
--         </property>
-+        <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <widget class="QLabel" name="lb_resource">
-            <property name="text">
-@@ -813,6 +807,9 @@
-           </widget>
-          </item>
-          <item>
-+          <widget class="QComboBox" name="cb_resource"/>
-+         </item>
-+         <item>
-           <widget class="QLineEdit" name="le_resource">
-            <property name="minimumSize">
-             <size>
-@@ -822,33 +819,46 @@
-            </property>
-           </widget>
-          </item>
-+        </layout>
-+       </item>
-+       <item>
-+        <layout class="QHBoxLayout">
-+         <property name="spacing">
-+          <number>6</number>
-+         </property>
-+         <property name="margin">
-+          <number>0</number>
-+         </property>
-          <item>
-           <widget class="QLabel" name="lb_priority">
-            <property name="text">
--            <string>Priority:</string>
-+            <string>Default priority:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
--          <widget class="QLineEdit" name="le_priority">
--           <property name="sizePolicy">
--            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
--             <horstretch>0</horstretch>
--             <verstretch>0</verstretch>
--            </sizepolicy>
--           </property>
-+          <widget class="QComboBox" name="cb_priority"/>
-+         </item>
-+         <item>
-+          <widget class="QSpinBox" name="sb_priority">
-            <property name="minimumSize">
-             <size>
--             <width>56</width>
-+             <width>60</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
--             <width>56</width>
--             <height>32767</height>
-+             <width>60</width>
-+             <height>16777215</height>
-             </size>
-            </property>
-+           <property name="minimum">
-+            <number>-128</number>
-+           </property>
-+           <property name="maximum">
-+            <number>127</number>
-+           </property>
-           </widget>
-          </item>
-         </layout>
-@@ -1107,9 +1117,6 @@
-   <tabstop>cb_plain</tabstop>
-   <tabstop>ck_req_mutual</tabstop>
-   <tabstop>cb_security_level</tabstop>
--  <tabstop>ck_automatic_resource</tabstop>
--  <tabstop>le_resource</tabstop>
--  <tabstop>le_priority</tabstop>
-   <tabstop>le_dtProxy</tabstop>
-   <tabstop>le_stunHost</tabstop>
-   <tabstop>le_stunPort</tabstop>
---- psi.orig/src/accountstatusmenu.cpp
-+++ psi/src/accountstatusmenu.cpp
-@@ -0,0 +1,33 @@
-+#include "accountstatusmenu.h"
-+
-+#include "psiiconset.h"
-+#include "psioptions.h"
-+#include "iconaction.h"
-+#include "common.h"
-+#include "statusdlg.h"
-+
-+void AccountStatusMenu::addChoose()
-+{
-+	//Action will be automatically added to menu, because we set "this" as parent for it
-+	IconAction *action = new IconAction(tr("Choose status..."), "psi/action_direct_presence", tr("Choose..."), 0, this);
-+	connect(action, SIGNAL(triggered()), SLOT(chooseStatusActivated()));
-+}
-+
-+void AccountStatusMenu::chooseStatusActivated()
-+{
-+	XMPP::Status::Type lastStatus = XMPP::Status::txt2type(PsiOptions::instance()->getOption("options.status.last-status").toString());
-+	StatusSetDlg *w = new StatusSetDlg(account, makeLastStatus(lastStatus), lastPriorityNotEmpty());
-+	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), account, SLOT(setStatus(const XMPP::Status &, bool, bool)));
-+	w->show();
-+}
-+
-+void AccountStatusMenu::addReconnect() {
-+	IconAction *action = new IconAction(tr("Reconnect"), "psi/reload", tr("Reconnect"), 0, this);
-+	connect(action, SIGNAL(triggered()), SIGNAL(reconnectActivated()));
-+}
-+
-+void AccountStatusMenu::fill()
-+{
-+	StatusMenu::fill();
-+	statusChanged(account->status());
-+}
---- psi.orig/src/accountstatusmenu.h
-+++ psi/src/accountstatusmenu.h
-@@ -0,0 +1,31 @@
-+#ifndef ACCOUNTSTATUSMENU_H
-+#define ACCOUNTSTATUSMENU_H
-+
-+#include "statusmenu.h"
-+#include "psiaccount.h"
-+#include "psicon.h"
-+
-+class AccountStatusMenu : public StatusMenu {
-+	Q_OBJECT
-+private:
-+	PsiAccount* account;
-+
-+public:
-+	AccountStatusMenu(QWidget* parent, PsiCon* _psi, PsiAccount* _account)
-+		: StatusMenu(parent, _psi), account(_account) {};
-+
-+	void fill();
-+
-+protected:
-+	void addChoose();
-+	void addReconnect();
-+
-+private slots:
-+	void chooseStatusActivated();
-+
-+signals:
-+	void reconnectActivated();
-+
-+};
-+
-+#endif // ACCOUNTSTATUSMENU_H
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -394,6 +394,7 @@ struct UserStatus {
- 	UserListItem* userListItem;
- 	XMPP::Status::Type statusType;
- 	QString status;
-+	int priority;
- 	QString publicKeyID;
- };
- 
-@@ -411,6 +412,7 @@ UserStatus userStatusFor(const Jid& jid,
- 			const UserResource &r = *u.userListItem->userResourceList().priority();
- 			u.statusType = r.status().type();
- 			u.status = r.status().status();
-+			u.priority = r.status().priority();
- 			u.publicKeyID = r.publicKeyID();
- 		}
- 	}
-@@ -420,12 +422,15 @@ UserStatus userStatusFor(const Jid& jid,
- 		if (rit != u.userListItem->userResourceList().end()) {
- 			u.statusType = (*rit).status().type();
- 			u.status = (*rit).status().status();
-+			u.priority = (*rit).status().priority();
- 			u.publicKeyID = (*rit).publicKeyID();
- 		}
- 	}
- 
--	if (u.statusType == XMPP::Status::Offline)
-+	if (u.statusType == XMPP::Status::Offline) {
- 		u.status = u.userListItem->lastUnavailableStatus().status();
-+		u.priority = 0;
-+	}
- 
- 	return u;
- }
-@@ -455,11 +460,13 @@ void ChatDlg::updateContact(const Jid &j
- 		if (userStatus.statusType == XMPP::Status::Offline)
- 			contactChatState_ = XMPP::StateNone;
- 
-+		bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.chat.status-with-priority").toBool();
- 		bool statusChanged = false;
--		if (status_ != userStatus.statusType || statusString_ != userStatus.status) {
-+		if (status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
- 			statusChanged = true;
- 			status_ = userStatus.statusType;
- 			statusString_ = userStatus.status;
-+			priority_ = userStatus.priority;
- 		}
- 
- 		contactUpdated(userStatus.userListItem, userStatus.statusType, userStatus.status);
-@@ -473,7 +480,9 @@ void ChatDlg::updateContact(const Jid &j
- 			updatePGP();
- 
- 			if (fromPresence && statusChanged) {
--				chatView()->dispatchMessage(MessageView::statusMessage(dispNick_, status_, statusString_));
-+				chatView()->dispatchMessage(MessageView::statusMessage(
-+												dispNick_, status_,
-+												statusString_, priority_));
- 			}
- 		}
- 
---- psi.orig/src/chatdlg.h
-+++ psi/src/chatdlg.h
-@@ -165,7 +165,7 @@ protected:
- private:
- 	bool highlightersInstalled_;
- 	QString dispNick_;
--	int status_;
-+	int status_, priority_;
- 	QString statusString_;
- 
- 	void initActions();
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -348,9 +348,13 @@ void ChatView::renderSysMessage(const Me
- 	QString color = ColorOpt::instance()->color(infomrationalColorOpt).name();
- 	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
- 	appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_info\" />":"") +
--			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
--						(ut.isEmpty()?"":":") + "</font>" +
--						(ut.isEmpty()?"":QString(" <span style=\"color:%1;\">%2</span>").arg(userTextColor, ut)));
-+			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) +
-+			   mv.formattedText() +
-+			   (ut.isEmpty()?"":QString(": <span style=\"color:%1;\">%2</span>")
-+									  .arg(userTextColor, ut)) +
-+			   (mv.type() == MessageView::Status && mv.statusPriority() ?
-+					QString(" [%1]").arg(mv.statusPriority()) :  "") +
-+			   "</font>");
- }
- 
- void ChatView::renderSubject(const MessageView &mv)
---- psi.orig/src/common.cpp
-+++ psi/src/common.cpp
-@@ -295,6 +295,23 @@ void soundPlay(const QString &s)
- #endif
- }
- 
-+bool lastPriorityNotEmpty()
-+{
-+	QString lastPriority = PsiOptions::instance()->getOption("options.status.last-priority").toString();
-+	return (lastPriority != "");
-+}
-+
-+XMPP::Status makeLastStatus(int x)
-+{
-+	PsiOptions* o = PsiOptions::instance();
-+	if (lastPriorityNotEmpty()) {
-+		return makeStatus(x, o->getOption("options.status.last-message").toString(), o->getOption("options.status.last-priority").toInt());
-+	}
-+	else {
-+		return makeStatus(x, o->getOption("options.status.last-message").toString());
-+	}
-+}
-+
- XMPP::Status makeStatus(int x, const QString &str, int priority)
- {
- 	XMPP::Status s = makeStatus(x,str);
-@@ -407,6 +424,35 @@ TabbableWidget* findActiveTab()
- 	return tw;
- }
- 
-+void reorderGridLayout(QGridLayout* layout, int maxCols)
-+{
-+	QList<QLayoutItem*> items;
-+	for (int i = 0; i < layout->rowCount(); i++) {
-+		for (int j = 0; j < layout->columnCount(); j++) {
-+			QLayoutItem* item = layout->itemAtPosition(i, j);
-+			if (item) {
-+				layout->removeItem(item);
-+				if (item->isEmpty()) {
-+					delete item;
-+				}
-+				else {
-+					items.append(item);
-+				}
-+			}
-+		}
-+	}
-+	int col = 0, row = 0;
-+	while (!items.isEmpty()) {
-+		QLayoutItem* item = items.takeAt(0);
-+		layout->addItem(item, row, col);
-+		col++;
-+		if (col >= maxCols) {
-+			col = 0;
-+			row++;
-+		}
-+	}
-+}
-+
- #ifdef Q_WS_X11
- #include <X11/Xlib.h>
- #include <X11/Xutil.h> // needed for WM_CLASS hinting
---- psi.orig/src/common.h
-+++ psi/src/common.h
-@@ -27,6 +27,7 @@
- #include <QStringList>
- #include <QList>
- #include <QColor>
-+#include <QGridLayout>
- 
- class QMenu;
- class TabbableWidget;
-@@ -112,6 +113,8 @@ enum { EventPriorityDontCare = -1 };
- #define STATUS_ERROR	 102
- 
- QString status2txt(int status);
-+bool lastPriorityNotEmpty();
-+XMPP::Status makeLastStatus(int);
- XMPP::Status makeStatus(int, const QString &);
- XMPP::Status makeStatus(int, const QString &, int);
- XMPP::Status::Type makeSTATUS(const XMPP::Status &);
-@@ -157,6 +160,7 @@ void x11wmClass(Display *dsp, WId wid, Q
- #else
- #define X11WM_CLASS(x)	/* dummy */
- #endif
-+void reorderGridLayout(QGridLayout* layout, int maxCols);
- 
- // -----------------------------------------------------------------------------
- // History utilities
---- psi.orig/src/contactlistaccountmenu.cpp
-+++ psi/src/contactlistaccountmenu.cpp
-@@ -24,7 +24,7 @@
- 
- #include "psiaccount.h"
- #include "contactlistaccountgroup.h"
--#include "statusmenu.h"
-+#include "accountstatusmenu.h"
- #include "serverinfomanager.h"
- #include "bookmarkmanager.h"
- #include "psioptions.h"
-@@ -40,7 +40,7 @@ class ContactListAccountMenu::Private :
- 	Q_OBJECT
- 
- 	QPointer<ContactListAccountGroup> account;
--	StatusMenu* statusMenu_;
-+	AccountStatusMenu* statusMenu_;
- 	QAction* moodAction_;
- 	QAction* activityAction_;
- 	QAction* geolocationAction_;
-@@ -75,10 +75,14 @@ public:
- 		connect(account->account(), SIGNAL(updatedActivity()), SLOT(updateActions()));
- 		connect(account->account(), SIGNAL(updatedAccount()), SLOT(updateActions()));
- 
--		statusMenu_ = new StatusMenu(0);
-+		statusMenu_ = new AccountStatusMenu(0, account->account()->psi(), account->account());
-+		statusMenu_->fill();
- 		statusMenu_->setTitle(tr("&Status"));
- 		statusMenu_->setIcon(PsiIconset::instance()->status(makeSTATUS(account->account()->status())).icon());
--		connect(statusMenu_, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusChanged(XMPP::Status::Type)));
-+		connect(statusMenu_, SIGNAL(statusSelected(XMPP::Status::Type, bool)), SLOT(statusChanged(XMPP::Status::Type, bool)));
-+		connect(statusMenu_, SIGNAL(statusPresetSelected(const XMPP::Status &, bool, bool)), account->account(), SLOT(setStatus(const XMPP::Status &, bool, bool)));
-+		connect(statusMenu_, SIGNAL(statusPresetDialogForced(const QString &)), account->account(), SLOT(showStatusDialog(const QString &)));
-+		connect(statusMenu_, SIGNAL(reconnectActivated()), account->account(), SLOT(reconnectOnce()));
- 
- 		moodAction_ = new IconAction(tr("Mood"), this, QString(("mood/%1")).arg(account->account()->mood().typeValue()));
- 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
-@@ -183,7 +187,7 @@ private slots:
- 		if (!account)
- 			return;
- 
--		statusMenu_->setStatus(account->account()->status().type());
-+		statusMenu_->statusChanged(account->account()->status());
- #ifndef USE_PEP
- 		moodAction_->setVisible(false);
- 		activityAction_->setVisible(false);
-@@ -232,12 +236,12 @@ private slots:
- 		adminDeleteMotdAction_->setVisible(newMessageAction_->isVisible());
- 	}
- 
--	void statusChanged(XMPP::Status::Type statusType)
-+	void statusChanged(XMPP::Status::Type statusType, bool forceDialog)
- 	{
- 		if (!account)
- 			return;
- 
--		account->account()->changeStatus(static_cast<int>(statusType));
-+		account->account()->changeStatus(static_cast<int>(statusType), forceDialog);
- 	}
- 
- 	void setMood()
---- psi.orig/src/contactlistgroupmenu.cpp
-+++ psi/src/contactlistgroupmenu.cpp
-@@ -253,7 +253,7 @@ private slots:
- 			return;
- 
- 		PsiAccount *pa = group->contacts().first()->account();
--		StatusSetDlg *w = new StatusSetDlg(pa->psi(), pa->status());
-+		StatusSetDlg *w = new StatusSetDlg(pa->psi(), makeLastStatus(pa->status().type()), lastPriorityNotEmpty());
- 		QList<XMPP::Jid> list;
- 		foreach(PsiContact* contact, group->contacts()) {
- 			if(contact->isPrivate()) continue;
---- psi.orig/src/globalstatusmenu.cpp
-+++ psi/src/globalstatusmenu.cpp
-@@ -0,0 +1,42 @@
-+#include "globalstatusmenu.h"
-+
-+#include "psiactionlist.h"
-+
-+void GlobalStatusMenu::addChoose()
-+{
-+	ActionList actions = psi->actionList()->suitableActions(PsiActionList::Actions_MainWin);
-+	IconAction* action = actions.action( "choose_status" );
-+
-+	if ( !action ) {
-+		qWarning("GlobalStatusMenu::addChoose(): action choose_status not found!");
-+	}
-+
-+	addAction(static_cast<QAction*>(action));
-+}
-+
-+void GlobalStatusMenu::addReconnect()
-+{
-+	ActionList actions = psi->actionList()->suitableActions(PsiActionList::Actions_MainWin);
-+	IconAction* action = actions.action( "reconnect_all" );
-+	if ( !action ) {
-+		qWarning("GlobalStatusMenu::addReconnect(): action reconnect_all not found!");
-+	}
-+	addAction(static_cast<QAction*>(action));
-+}
-+
-+void GlobalStatusMenu::fill()
-+{
-+	StatusMenu::fill();
-+	//TODO: Find another way to prevent manual toggling
-+	foreach (QAction* action, statusActs)
-+		connect(action, SIGNAL(triggered(bool)), SLOT(preventStateChange(bool)));
-+	foreach (QAction* action, presetActs)
-+		connect(action, SIGNAL(triggered(bool)), SLOT(preventStateChange(bool)));
-+	statusChanged(makeStatus(psi->currentStatusType(), psi->currentStatusMessage()));
-+}
-+
-+void GlobalStatusMenu::preventStateChange(bool checked)
-+{
-+	QAction* action = static_cast<QAction*>(sender());
-+	action->setChecked(!checked);
-+}
---- psi.orig/src/globalstatusmenu.h
-+++ psi/src/globalstatusmenu.h
-@@ -0,0 +1,23 @@
-+#ifndef GLOBALSTATUSMENU_H
-+#define GLOBALSTATUSMENU_H
-+
-+#include "psicon.h"
-+#include "statusmenu.h"
-+
-+class GlobalStatusMenu : public StatusMenu {
-+	Q_OBJECT
-+private:
-+	void addChoose();
-+	void addReconnect();
-+
-+public:
-+	GlobalStatusMenu(QWidget* parent, PsiCon* _psi)
-+		: StatusMenu(parent, _psi) { };
-+
-+	void fill();
-+
-+public slots:
-+	void preventStateChange(bool checked);
-+};
-+
-+#endif // GLOBALSTATUSMENU_H
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1365,9 +1365,8 @@ void GCMainDlg::presence(const QString &
- 		GCUserViewItem* contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
- 		if (contact == NULL) {
- 			//contact joining
--			if ( !d->connecting && options_->getOption("options.muc.show-joins").toBool() ) {
-+			if ((!d->connecting || options_->getOption("options.ui.muc.show-initial-joins").toBool()) && options_->getOption("options.muc.show-joins").toBool() ) {
- 				QString message = tr("%1 has joined the room");
--
- 				if ( options_->getOption("options.muc.show-role-affiliation").toBool() ) {
- 					if (s.mucItem().role() != MUCItem::NoRole) {
- 						if (s.mucItem().affiliation() != MUCItem::NoAffiliation) {
-@@ -1386,6 +1385,15 @@ void GCMainDlg::presence(const QString &
- 				} else {
- 					message = message.arg(nick);
- 				}
-+				if (options_->getOption("options.muc.show-status-changes").toBool()) {
-+					message += tr(" and now is %1").arg(status2txt(s.type()));
-+					if (!s.status().isEmpty()) {
-+						message += QString(" (%1)").arg(s.status());
-+					}
-+					if (options_->getOption("options.ui.muc.status-with-priority").toBool() && s.priority() != 0) {
-+						message += QString(" [%1]").arg(s.priority());
-+					}
-+				}
- 				appendSysMsg(message);
- 			}
- 		}
-@@ -1410,14 +1418,11 @@ void GCMainDlg::presence(const QString &
- 				}
- 			}
- 			if ( !d->connecting && options_->getOption("options.muc.show-status-changes").toBool() ) {
--				if (s.status() != contact->s.status() || s.show() != contact->s.show())	{
--					QString st;
--					if (s.show().isEmpty()) {
--						st=tr("online");
--					} else {
--						st=s.show();
--					}
--					ui_.log->dispatchMessage(MessageView::statusMessage(nick, (int)s.type(), s.status()));
-+				bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.muc.status-with-priority").toBool();
-+				if (s.status() != contact->s.status() || s.show() != contact->s.show() ||
-+						(statusWithPriority && s.priority() != contact->s.priority())) {
-+					ui_.log->dispatchMessage(MessageView::statusMessage(
-+												 nick, (int)s.type(), s.status(), s.priority()));
- 				}
- 			}
- 		}
---- psi.orig/src/libpsi/tools/priorityvalidator.cpp
-+++ psi/src/libpsi/tools/priorityvalidator.cpp
-@@ -0,0 +1,41 @@
-+/*
-+ * priorityvalidator.cpp - XMPP priority validator
-+ * Copyright (C) 2010 Dmitriy.trt
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "priorityvalidator.h"
-+
-+QValidator::State PriorityValidator::validate(QString &input, int &/*pos*/) const
-+{
-+	if (input.isEmpty()) {
-+		return QValidator::Acceptable;
-+	}
-+	else if (input == "-") {
-+		return QValidator::Intermediate;
-+	}
-+	else {
-+		bool ok = false;
-+		int val = input.toInt(&ok);
-+		if (ok && val >= -128 && val <= 127) {
-+			return QValidator::Acceptable;
-+		}
-+		else {
-+			return QValidator::Invalid;
-+		}
-+	}
-+}
---- psi.orig/src/libpsi/tools/priorityvalidator.h
-+++ psi/src/libpsi/tools/priorityvalidator.h
-@@ -0,0 +1,34 @@
-+/*
-+ * priorityvalidator.h - XMPP priority validator
-+ * Copyright (C) 2010 Dmitriy.trt
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PRIORITYVALIDATOR_H
-+#define PRIORITYVALIDATOR_H
-+
-+#include <QValidator>
-+
-+class PriorityValidator : public QValidator
-+{
-+	Q_OBJECT
-+public:
-+	PriorityValidator(QObject* parent = 0) : QValidator(parent) { };
-+	virtual State validate(QString &input, int &pos) const;
-+};
-+
-+#endif // PRIORITYVALIDATOR_H
---- psi.orig/src/libpsi/tools/tools.pri
-+++ psi/src/libpsi/tools/tools.pri
-@@ -18,7 +18,9 @@ mac {
- 
- HEADERS += \
- 	$$PWD/maybe.h \
-+	$$PWD/priorityvalidator.h \
- 	$$PWD/iodeviceopener.h
- 
- SOURCES += \
-+	$$PWD/priorityvalidator.cpp \
- 	$$PWD/iodeviceopener.cpp
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -67,6 +67,8 @@
- #include "mucjoindlg.h"
- #include "psicontactlist.h"
- #include "desktoputil.h"
-+#include "statusdlg.h"
-+#include "globalstatusmenu.h"
- #ifdef NEWCONTACTLIST
- #include "psirosterwidget.h"
- #endif
-@@ -110,7 +112,8 @@ public:
- 	~Private();
- 
- 	bool onTop, asTool;
--	QMenu* mainMenu, *statusMenu, *optionsMenu, *toolsMenu;
-+	QMenu* mainMenu, *optionsMenu, *toolsMenu;
-+	GlobalStatusMenu *statusMenu;
- 	int sbState;
- 	QString nickname;
- 	PsiTrayIcon* tray;
-@@ -126,6 +129,7 @@ public:
- 
- 	PopupAction* optionsButton, *statusButton;
- 	IconActionGroup* statusGroup, *viewGroups;
-+	IconAction* statusSmallerAlt;
- 	EventNotifierAction* eventNotifier;
- 	PsiCon* psi;
- 	MainWin* mainWin;
-@@ -169,12 +173,13 @@ public:
- MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
- {
- 
--	statusGroup   = (IconActionGroup *)getAction("status_all");
-+	statusGroup   = (IconActionGroup *)getAction("status_group");
- 	viewGroups    = (IconActionGroup *)getAction("view_groups");
- 	eventNotifier = (EventNotifierAction *)getAction("event_notifier");
- 
- 	optionsButton = (PopupAction *)getAction("button_options");
- 	statusButton  = (PopupAction *)getAction("button_status");
-+	statusSmallerAlt = getAction("status_all");
- 
- 	statusMapper = new QSignalMapper(mainWin);
- 	mainWin->connect(statusMapper, SIGNAL(mapped(int)), mainWin, SLOT(activatedStatusAction(int)));
-@@ -435,8 +440,12 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->vb_roster->addWidget(d->rosterWidget_);
- #endif
- 
--	d->statusMenu = new QMenu(tr("Status"), this);
-+	d->statusMenu = new GlobalStatusMenu((QWidget*)this, d->psi);
-+	d->statusMenu->setTitle(tr("Status"));
- 	d->statusMenu->setObjectName("statusMenu");
-+	connect(d->statusMenu, SIGNAL(statusSelected(XMPP::Status::Type, bool)), d->psi, SLOT(statusMenuChanged(XMPP::Status::Type, bool)));
-+	connect(d->statusMenu, SIGNAL(statusPresetSelected(XMPP::Status,bool,bool)), d->psi, SLOT(setGlobalStatus(XMPP::Status,bool,bool)));
-+	connect(d->statusMenu, SIGNAL(statusPresetDialogForced(const QString &)), d->psi, SLOT(showStatusDialog(const QString &)));
- 	d->optionsMenu = new QMenu(tr("General"), this);
- 	d->optionsMenu->setObjectName("optionsMenu");
- #ifdef Q_WS_MAC
-@@ -535,6 +544,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->optionsButton->setMenu( d->optionsMenu );
- 	d->statusButton->setMenu( d->statusMenu );
- 	d->rosterAvatar->setStatusMenu( d->statusMenu );
-+	d->getAction("status_all")->setMenu(d->statusMenu);
- 
- 	buildToolbars();
- 	// setUnifiedTitleAndToolBarOnMac(true);
-@@ -635,6 +645,8 @@ void MainWin::registerAction( IconAction
- 		QObject* receiver;
- 		const char* slot;
- 	} actionlist[] = {
-+		{ "choose_status", activated, this, SLOT( actChooseStatusActivated() ) },
-+		{ "reconnect_all", activated, this, SLOT( actReconnectActivated() ) },
- #ifndef NEWCONTACTLIST
- 		{ "show_offline", toggled, cvlist, SLOT( setShowOffline(bool) ) },
- 		{ "show_away",    toggled, cvlist, SLOT( setShowAway(bool) ) },
-@@ -818,22 +830,7 @@ void MainWin::setUseDock(bool use)
- void MainWin::buildStatusMenu()
- {
- 	d->statusMenu->clear();
--	d->getAction("status_online")->addTo(d->statusMenu);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool()) {
--		d->getAction("status_chat")->addTo(d->statusMenu);
--	}
--	d->statusMenu->addSeparator();
--	d->getAction("status_away")->addTo(d->statusMenu);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
--		d->getAction("status_xa")->addTo(d->statusMenu);
--	}
--	d->getAction("status_dnd")->addTo(d->statusMenu);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool()) {
--		d->statusMenu->addSeparator();
--		d->getAction("status_invisible")->addTo(d->statusMenu);
--	}
--	d->statusMenu->addSeparator();
--	d->getAction("status_offline")->addTo(d->statusMenu);
-+	d->statusMenu->fill();
- #ifdef USE_PEP
- 	d->statusMenu->addSeparator();
- 	d->getAction("publish_tune")->addTo(d->statusMenu);
-@@ -844,10 +841,10 @@ void MainWin::activatedStatusAction(int
- {
- 	QList<IconAction*> l = d->statusGroup->findChildren<IconAction*>();
- 	foreach(IconAction* action, l) {
--		action->setChecked ( d->statusActions[action] == id );
-+		action->setChecked ( d->statusActions.contains(action) && d->statusActions[action] == id );
- 	}
- 
--	statusChanged(id);
-+	statusChanged(static_cast<XMPP::Status::Type>(id));
- }
- 
- QMenuBar* MainWin::mainMenuBar() const
-@@ -1143,6 +1140,25 @@ void MainWin::actDiagQCAKeyStoreActivate
- 	w->show();
- }
- 
-+void MainWin::actChooseStatusActivated()
-+{
-+	PsiOptions* o = PsiOptions::instance();
-+	XMPP::Status::Type lastStatus = XMPP::Status::txt2type(PsiOptions::instance()->getOption("options.status.last-status").toString());
-+	StatusSetDlg *w = new StatusSetDlg(d->psi, makeLastStatus(lastStatus), lastPriorityNotEmpty());
-+	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->psi, SLOT(setGlobalStatus(const XMPP::Status &,bool,bool)));
-+	connect(w, SIGNAL(cancelled()), d->psi, SLOT(updateMainwinStatus()));
-+	if(o->getOption("options.ui.systemtray.enable").toBool() == true)
-+		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
-+	w->show();
-+}
-+
-+void MainWin::actReconnectActivated()
-+{
-+	foreach (PsiAccount *pa, d->psi->contactList()->accounts()) {
-+		pa->reconnectOnce();
-+	}
-+}
-+
- void MainWin::actPlaySoundsActivated (bool state)
- {
- 	PsiOptions::instance()->setOption("options.ui.notifications.sounds.enable", state);
-@@ -1342,31 +1358,30 @@ void MainWin::decorateButton(int status)
- 	}
- 
- 	setTrayToolTip();
--
--	if(d->lastStatus == status) {
--		return;
--	}
- 	d->lastStatus = status;
- 
- 	if(status == -1) {
- 		d->statusButton->setText(tr("Connecting"));
- 		if (PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() != "no") {
- 			d->statusButton->setAlert(IconsetFactory::iconPtr("psi/connect"));
--			d->statusGroup->setPsiIcon(IconsetFactory::iconPtr("psi/connect"));
-+			d->statusSmallerAlt->setPsiIcon(IconsetFactory::iconPtr("psi/connect"));
- 		}
- 		else {
- 			d->statusButton->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
--			d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
-+			d->statusSmallerAlt->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
- 			d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE)->icon());
- 		}
- 
-+		d->statusMenu->statusChanged(makeStatus(STATUS_OFFLINE, ""));
-+
- 		setWindowIcon(PsiIconset::instance()->status(STATUS_OFFLINE).impix());
- 	}
- 	else {
- 		d->statusButton->setText(status2txt(status));
- 		d->statusButton->setIcon(PsiIconset::instance()->statusPtr(status));
--		d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(status));
-+		d->statusSmallerAlt->setPsiIcon(PsiIconset::instance()->statusPtr(status));
- 		d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(status)->icon());
-+		d->statusMenu->statusChanged(makeStatus(status, d->psi->currentStatusMessage()));
- 
- 		setWindowIcon(PsiIconset::instance()->status(status).impix());
- 	}
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -28,6 +28,7 @@
- #include <QStringList>
- 
- #include "advwidget.h"
-+#include "xmpp_status.h"
- 
- class QMenuBar;
- class QAction;
-@@ -85,7 +86,7 @@ protected:
- #endif
- 
- signals:
--	void statusChanged(int);
-+	void statusChanged(XMPP::Status::Type);
- 	void statusMessageChanged(QString);
- 	void changeProfile();
- 	void blankMessage();
-@@ -139,6 +140,8 @@ private slots:
- 	void actTipActivated();
- 	void actDiagQCAPluginActivated();
- 	void actDiagQCAKeyStoreActivated();
-+	void actChooseStatusActivated();
-+	void actReconnectActivated();
- 	void actSetMoodActivated();
- 	void actSetActivityActivated();
- 	void actSetGeolocActivated();
---- psi.orig/src/mainwin_p.cpp
-+++ psi/src/mainwin_p.cpp
-@@ -301,7 +301,6 @@ void PopupAction::setIcon (const PsiIcon
- 
- void PopupAction::setText (const QString &text)
- {
--	IconAction::setText (text);
- 	foreach(PopupActionButton* btn, d->buttons) {
- 		btn->setLabel (text);
- 	}
---- psi.orig/src/messageview.cpp
-+++ psi/src/messageview.cpp
-@@ -35,6 +35,7 @@ MessageView::MessageView(Type t)
- 	, _spooled(false)
- 	, _awaitingReceipt(false)
- 	, _status(0)
-+	, _statusPriority(0)
- 	, _dateTime(QDateTime::currentDateTime())
- {
- 
-@@ -71,13 +72,14 @@ MessageView MessageView::subjectMessage(
- }
- 
- MessageView MessageView::statusMessage(const QString &nick, int status,
--									   const QString &statusText)
-+									   const QString &statusText, int priority)
- {
- 	MessageView mv = MessageView::fromPlainText(QObject::tr("%1 is now %2")
- 												.arg(nick, status2txt(status)),
- 												Status);
- 	mv.setNick(nick);
- 	mv.setStatus(status);
-+	mv.setStatusPriority(priority);
- 	mv.setUserText(statusText);
- 	return mv;
- }
-@@ -166,6 +168,7 @@ QVariantMap MessageView::toVariantMap(bo
- 		case Status:
- 			m["sender"] = _nick;
- 			m["status"] = _status;
-+			m["priority"] = _statusPriority;
- 			m["message"] = _text;
- 			m["usertext"] = formatted?formattedUserText():_userText;
- 			break;
---- psi.orig/src/messageview.h
-+++ psi/src/messageview.h
-@@ -52,7 +52,8 @@ public:
- 
- 	// accepts plain/text nick, plain/text status and rich/text statusText
- 	static MessageView statusMessage(const QString &nick, int status,
--									 const QString &statusText = QString());
-+									 const QString &statusText = QString(),
-+									 int priority = 0);
- 
- 	inline Type type() const { return _type; }
- 	inline const QString &text() const { return _text; }
-@@ -75,6 +76,8 @@ public:
- 	inline bool isSpooled() const { return _spooled; }
- 	inline void setStatus(int s) { _status = s; }
- 	inline int status() const { return _status; }
-+	inline void setStatusPriority(int s) { _statusPriority = s; }
-+	inline int statusPriority() const { return _statusPriority; }
- 	inline void setAwaitingReceipt(bool b) { _awaitingReceipt = b; }
- 	inline bool isAwaitingReceipt() const { return _awaitingReceipt; }
- 	inline void setNick(const QString &nick) { _nick = nick; }
-@@ -97,6 +100,7 @@ private:
- 	bool _spooled;
- 	bool _awaitingReceipt;
- 	int _status;
-+	int _statusPriority;
- 	QString _messageId;
- 	QString _userId;
- 	QString _nick; // rich / as is
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -176,6 +176,7 @@ public:
- public slots:
- 	void doApply();
- 	void openTab(QString id);
-+	void enableCommonWidgets(bool enable);
- 
- private slots:
- 	void currentItemChanged(QListWidgetItem* current, QListWidgetItem* previous);
-@@ -425,6 +426,13 @@ void OptionsDlg::Private::openTab(QStrin
- 	}
- }
- 
-+// enable/disable list widget and dialog buttons
-+void OptionsDlg::Private::enableCommonWidgets(bool enable)
-+{
-+	dlg->buttonBox->setEnabled(enable);
-+	dlg->lv_tabs->setEnabled(enable);
-+}
-+
- void OptionsDlg::Private::connectDataChanged(QWidget *widget)
- {
- 	foreach(QWidget* w, widget->findChildren<QWidget*>()) {
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
-@@ -17,6 +17,8 @@ HEADERS += \
- 	$$PWD/opt_events.h \
- 	$$PWD/opt_popups.h \
- 	$$PWD/opt_status.h \
-+	$$PWD/opt_statusgeneral.h \
-+	$$PWD/opt_statusauto.h \
- 	$$PWD/opt_appearance.h \
- 	$$PWD/opt_iconset.h \
- 	$$PWD/opt_theme.h \
-@@ -36,6 +38,8 @@ SOURCES += \
- 	$$PWD/opt_events.cpp \
- 	$$PWD/opt_popups.cpp \
- 	$$PWD/opt_status.cpp \
-+	$$PWD/opt_statusgeneral.cpp \
-+	$$PWD/opt_statusauto.cpp \
- 	$$PWD/opt_appearance.cpp \
- 	$$PWD/opt_iconset.cpp \
- 	$$PWD/opt_theme.cpp \
-@@ -54,7 +58,8 @@ FORMS += \
- 	$$PWD/opt_chat.ui \
- 	$$PWD/opt_events.ui \
- 	$$PWD/opt_popups.ui \
--	$$PWD/opt_status.ui \
-+	$$PWD/opt_statusgeneral.ui \
-+	$$PWD/opt_statusauto.ui \
- 	$$PWD/opt_appearance.ui \
- 	$$PWD/opt_appearance_misc.ui \
- 	$$PWD/opt_theme.ui \
---- psi.orig/src/options/optionstab.cpp
-+++ psi/src/options/optionstab.cpp
-@@ -109,6 +109,7 @@ public:
- 	OptionsTabWidget(QWidget *parent);
- 	void addTab(OptionsTab *);
- 	void restoreOptions();
-+	void enableOtherTabs(bool);
- 
- signals:
- 	void connectDataChanged(QWidget *);
-@@ -196,6 +197,15 @@ void OptionsTabWidget::restoreOptions()
- 	emit noDirty(false);
- }
- 
-+void OptionsTabWidget::enableOtherTabs(bool enable)
-+{
-+	for (int i = 0; i < count(); i++)
-+	{
-+		if (i != currentIndex())
-+			setTabEnabled(i, enable);
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // MetaOptionsTab
- //----------------------------------------------------------------------------
-@@ -235,6 +245,13 @@ void MetaOptionsTab::addTab(OptionsTab *
- 	tabs.append(tab);
- }
- 
-+void MetaOptionsTab::enableOtherTabs(bool enable)
-+{
-+	if (!w)
-+		return;
-+	static_cast<OptionsTabWidget*>(w)->enableOtherTabs(enable);
-+}
-+
- QWidget *MetaOptionsTab::widget()
- {
- 	if ( w )
---- psi.orig/src/options/optionstab.h
-+++ psi/src/options/optionstab.h
-@@ -65,6 +65,9 @@ public:
- 
- 	void addTab(OptionsTab *);
- 
-+public slots:
-+	void enableOtherTabs(bool);
-+
- private:
- 	void init();
- 	QWidget *w;
---- psi.orig/src/options/opt_statusauto.cpp
-+++ psi/src/options/opt_statusauto.cpp
-@@ -0,0 +1,168 @@
-+#include "opt_statusauto.h"
-+#include "psioptions.h"
-+#include "priorityvalidator.h"
-+
-+#include <limits.h>
-+#include <QWhatsThis>
-+#include <QCheckBox>
-+#include <QLineEdit>
-+#include <QSpinBox>
-+#include <QTextEdit>
-+
-+#include "ui_opt_statusauto.h"
-+
-+class OptStatusAutoUI : public QWidget, public Ui::OptStatusAuto
-+{
-+public:
-+	OptStatusAutoUI() : QWidget() { setupUi(this); }
-+};
-+
-+OptionsTabStatusAuto::OptionsTabStatusAuto(QObject *parent)
-+	: OptionsTab(parent, "status_auto", "", tr("Auto status and priority"), tr("Auto status and priority preferences"))
-+	, w(0)
-+{
-+}
-+
-+OptionsTabStatusAuto::~OptionsTabStatusAuto()
-+{
-+}
-+
-+QWidget *OptionsTabStatusAuto::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new OptStatusAutoUI();
-+	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
-+
-+	PriorityValidator* prValidator = new PriorityValidator(d->le_asPriority);
-+	d->le_asPriority->setValidator(prValidator);
-+	prValidator = new PriorityValidator(d->le_asXaPriority);
-+	d->le_asXaPriority->setValidator(prValidator);
-+
-+	QString s = tr("Makes Psi automatically set your status to \"away\" if your"
-+		" computer is idle for the specified amount of time.");
-+	d->ck_asAway->setWhatsThis(s);
-+	d->sb_asAway->setWhatsThis(s);
-+	s = tr("Makes Psi automatically set your status to \"extended away\" if your"
-+		" computer is idle for the specified amount of time.");
-+	d->ck_asXa->setWhatsThis(s);
-+	d->sb_asXa->setWhatsThis(s);
-+	s = tr("Makes Psi automatically set your status to \"offline\" if your"
-+		" computer is idle for the specified amount of time."
-+		"  This will disconnect you from the Jabber server.");
-+	PsiOptions* o = PsiOptions::instance();
-+	int dpCount = 6;
-+	if (!o->getOption("options.ui.menu.status.chat").toBool()) {
-+		d->sb_dpChat->hide();
-+		d->lb_dpChat->hide();
-+		dpCount--;
-+	}
-+
-+	if (!o->getOption("options.ui.menu.status.xa").toBool()) {
-+		d->ck_asXa->hide();
-+		d->sb_asXa->hide();
-+		d->lb_asXaPriority->hide();
-+		d->le_asXaPriority->hide();
-+		d->sb_dpXa->hide();
-+		d->lb_dpXa->hide();
-+		dpCount--;
-+	}
-+	if (!o->getOption("options.ui.menu.status.invisible").toBool()) {
-+		d->sb_dpInvisible->hide();
-+		d->lb_dpInvisible->hide();
-+		dpCount--;
-+	}
-+
-+	if (dpCount != 6) {
-+		reorderGridLayout(d->gridLayout, dpCount == 4 ? 2 : 3); //4 items in 2 columns look better
-+	}
-+
-+	d->ck_asOffline->setWhatsThis( s);
-+	d->sb_asOffline->setWhatsThis( s);
-+
-+	d->te_asMessage->setWhatsThis(
-+		tr("Specifies an extended message to use if you allow Psi"
-+		" to set your status automatically.  See options above."));
-+	d->le_asPriority->setWhatsThis(
-+		tr("Specifies priority of auto-away status. "
-+		"If empty, Psi will use account's default priority."));
-+
-+	return w;
-+}
-+
-+void OptionsTabStatusAuto::applyOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
-+	PsiOptions* o = PsiOptions::instance();
-+
-+	o->setOption("options.status.auto-away.away-after", d->sb_asAway->value());
-+	o->setOption("options.status.auto-away.not-availible-after", d->sb_asXa->value());
-+	o->setOption("options.status.auto-away.offline-after", d->sb_asOffline->value());
-+	o->setOption("options.status.auto-away.use-away", d->ck_asAway->isChecked());
-+	o->setOption("options.status.auto-away.use-not-availible", d->ck_asXa->isChecked());
-+	o->setOption("options.status.auto-away.use-offline", d->ck_asOffline->isChecked());
-+	o->setOption("options.status.auto-away.message", d->te_asMessage->toPlainText());
-+	bool forcePriority = false;
-+	o->setOption("options.status.auto-away.priority", d->le_asPriority->text().toInt(&forcePriority));
-+	o->setOption("options.status.auto-away.force-priority", forcePriority);
-+	forcePriority = false;
-+	o->setOption("options.status.auto-away.xa-priority", d->le_asXaPriority->text().toInt(&forcePriority));
-+	o->setOption("options.status.auto-away.force-xa-priority", forcePriority);
-+
-+	o->setOption("options.status.default-priority.online", d->sb_dpOnline->value());
-+	o->setOption("options.status.default-priority.chat", d->sb_dpChat->value());
-+	o->setOption("options.status.default-priority.away", d->sb_dpAway->value());
-+	o->setOption("options.status.default-priority.xa", d->sb_dpXa->value());
-+	o->setOption("options.status.default-priority.dnd", d->sb_dpDnd->value());
-+	o->setOption("options.status.default-priority.invisible", d->sb_dpInvisible->value());
-+}
-+
-+void OptionsTabStatusAuto::restoreOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
-+	PsiOptions* o = PsiOptions::instance();
-+
-+	d->sb_asAway->setMinimum(0);
-+	d->sb_asAway->setMaximum(INT_MAX);
-+	d->sb_asAway->setValue( o->getOption("options.status.auto-away.away-after").toInt() );
-+	d->sb_asXa->setMinimum(0);
-+	d->sb_asXa->setMaximum(INT_MAX);
-+	d->sb_asXa->setValue( o->getOption("options.status.auto-away.not-availible-after").toInt() );
-+	d->sb_asOffline->setMinimum(0);
-+	d->sb_asOffline->setMaximum(INT_MAX);
-+	d->sb_asOffline->setValue( o->getOption("options.status.auto-away.offline-after").toInt() );
-+	d->ck_asAway->setChecked( o->getOption("options.status.auto-away.use-away").toBool() );
-+	d->ck_asXa->setChecked( o->getOption("options.status.auto-away.use-not-availible").toBool() );
-+	d->ck_asOffline->setChecked( o->getOption("options.status.auto-away.use-offline").toBool() );
-+	d->te_asMessage->setText( o->getOption("options.status.auto-away.message").toString() );
-+	if (o->getOption("options.status.auto-away.force-priority").toBool()) {
-+		d->le_asPriority->setText(QString::number(o->getOption("options.status.auto-away.priority").toInt()));
-+	} else {
-+		d->le_asPriority->clear();
-+	}
-+	if (o->getOption("options.status.auto-away.force-xa-priority").toBool()) {
-+		d->le_asXaPriority->setText(QString::number(o->getOption("options.status.auto-away.xa-priority").toInt()));
-+	} else {
-+		d->le_asXaPriority->clear();
-+	}
-+
-+	d->sb_dpOnline->setValue(o->getOption("options.status.default-priority.online").toInt());
-+	d->sb_dpChat->setValue(o->getOption("options.status.default-priority.chat").toInt());
-+	d->sb_dpAway->setValue(o->getOption("options.status.default-priority.away").toInt());
-+	d->sb_dpXa->setValue(o->getOption("options.status.default-priority.xa").toInt());
-+	d->sb_dpDnd->setValue(o->getOption("options.status.default-priority.dnd").toInt());
-+	d->sb_dpInvisible->setValue(o->getOption("options.status.default-priority.invisible").toInt());
-+}
-+
-+void OptionsTabStatusAuto::setData(PsiCon *, QWidget *parentDialog)
-+{
-+	parentWidget = parentDialog;
-+}
-+
---- psi.orig/src/options/opt_statusauto.h
-+++ psi/src/options/opt_statusauto.h
-@@ -0,0 +1,26 @@
-+#ifndef OPT_STATUSAUTO_H
-+#define OPT_STATUSAUTO_H
-+
-+#include "optionstab.h"
-+#include "common.h"
-+
-+class QWidget;
-+
-+class OptionsTabStatusAuto : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabStatusAuto(QObject *parent);
-+	~OptionsTabStatusAuto();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+
-+	void setData(PsiCon *, QWidget *parentDialog);
-+
-+private:
-+	QWidget *w, *parentWidget;
-+};
-+
-+#endif // OPT_STATUSAUTO_H
---- psi.orig/src/options/opt_statusauto.ui
-+++ psi/src/options/opt_statusauto.ui
-@@ -0,0 +1,555 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptStatusAuto</class>
-+ <widget class="QWidget" name="OptStatusAuto">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>491</width>
-+    <height>379</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Form</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout_2">
-+   <item>
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-+      <string>Auto status</string>
-+     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout">
-+      <item>
-+       <layout class="QGridLayout" name="_2">
-+        <property name="margin">
-+         <number>0</number>
-+        </property>
-+        <property name="spacing">
-+         <number>6</number>
-+        </property>
-+        <item row="2" column="1">
-+         <widget class="QSpinBox" name="sb_asOffline">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="suffix">
-+           <string> minutes</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="1">
-+         <widget class="QSpinBox" name="sb_asXa">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="suffix">
-+           <string> minutes</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="2" column="0">
-+         <widget class="QCheckBox" name="ck_asOffline">
-+          <property name="text">
-+           <string>Auto offline after:</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="0">
-+         <widget class="QCheckBox" name="ck_asXa">
-+          <property name="text">
-+           <string>Auto XA after:</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="0">
-+         <widget class="QCheckBox" name="ck_asAway">
-+          <property name="text">
-+           <string>Auto away after:</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="1">
-+         <widget class="QSpinBox" name="sb_asAway">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="suffix">
-+           <string> minutes</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="3">
-+         <widget class="QLineEdit" name="le_asPriority">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="maximumSize">
-+           <size>
-+            <width>50</width>
-+            <height>16777215</height>
-+           </size>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="3">
-+         <widget class="QLineEdit" name="le_asXaPriority">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="maximumSize">
-+           <size>
-+            <width>50</width>
-+            <height>16777215</height>
-+           </size>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="4">
-+         <spacer name="horizontalSpacer">
-+          <property name="orientation">
-+           <enum>Qt::Horizontal</enum>
-+          </property>
-+          <property name="sizeHint" stdset="0">
-+           <size>
-+            <width>10</width>
-+            <height>20</height>
-+           </size>
-+          </property>
-+         </spacer>
-+        </item>
-+        <item row="0" column="2">
-+         <widget class="QLabel" name="lb_asPriority">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Priority:</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="2">
-+         <widget class="QLabel" name="lb_asXaPriority">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Priority:</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <widget class="QLabel" name="TextLabel1_8">
-+        <property name="text">
-+         <string>Status message:</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QTextEdit" name="te_asMessage">
-+        <property name="maximumSize">
-+         <size>
-+          <width>32767</width>
-+          <height>100</height>
-+         </size>
-+        </property>
-+        <property name="tabChangesFocus">
-+         <bool>true</bool>
-+        </property>
-+       </widget>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QGroupBox" name="gb_defPriority">
-+     <property name="title">
-+      <string>Default priority</string>
-+     </property>
-+     <layout class="QHBoxLayout" name="horizontalLayout_7">
-+      <item>
-+       <layout class="QGridLayout" name="gridLayout">
-+        <item row="0" column="0">
-+         <layout class="QHBoxLayout" name="horizontalLayout">
-+          <item>
-+           <widget class="QLabel" name="lb_dpOnline">
-+            <property name="text">
-+             <string>Online:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpOnline">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item row="0" column="2">
-+         <layout class="QHBoxLayout" name="horizontalLayout_5">
-+          <item>
-+           <widget class="QLabel" name="lb_dpAway">
-+            <property name="text">
-+             <string>Away:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpAway">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item row="0" column="1">
-+         <layout class="QHBoxLayout" name="horizontalLayout_2">
-+          <item>
-+           <widget class="QLabel" name="lb_dpChat">
-+            <property name="text">
-+             <string>Free For Chat:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpChat">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item row="1" column="0">
-+         <layout class="QHBoxLayout" name="horizontalLayout_3">
-+          <item>
-+           <widget class="QLabel" name="lb_dpXa">
-+            <property name="text">
-+             <string>XA:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpXa">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item row="1" column="1">
-+         <layout class="QHBoxLayout" name="horizontalLayout_4">
-+          <item>
-+           <widget class="QLabel" name="lb_dpDnd">
-+            <property name="text">
-+             <string>Do Not Disturb:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpDnd">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item row="1" column="2">
-+         <layout class="QHBoxLayout" name="horizontalLayout_6">
-+          <item>
-+           <widget class="QLabel" name="lb_dpInvisible">
-+            <property name="text">
-+             <string>Invisible:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QSpinBox" name="sb_dpInvisible">
-+            <property name="minimumSize">
-+             <size>
-+              <width>60</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>60</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+            <property name="minimum">
-+             <number>-128</number>
-+            </property>
-+            <property name="maximum">
-+             <number>127</number>
-+            </property>
-+            <property name="value">
-+             <number>0</number>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <spacer name="horizontalSpacer_2">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>40</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <spacer name="verticalSpacer">
-+     <property name="orientation">
-+      <enum>Qt::Vertical</enum>
-+     </property>
-+     <property name="sizeHint" stdset="0">
-+      <size>
-+       <width>20</width>
-+       <height>40</height>
-+      </size>
-+     </property>
-+    </spacer>
-+   </item>
-+  </layout>
-+ </widget>
-+ <tabstops>
-+  <tabstop>ck_asAway</tabstop>
-+  <tabstop>sb_asAway</tabstop>
-+  <tabstop>le_asPriority</tabstop>
-+  <tabstop>ck_asXa</tabstop>
-+  <tabstop>sb_asXa</tabstop>
-+  <tabstop>le_asXaPriority</tabstop>
-+  <tabstop>ck_asOffline</tabstop>
-+  <tabstop>sb_asOffline</tabstop>
-+  <tabstop>te_asMessage</tabstop>
-+  <tabstop>sb_dpOnline</tabstop>
-+  <tabstop>sb_dpChat</tabstop>
-+  <tabstop>sb_dpAway</tabstop>
-+  <tabstop>sb_dpXa</tabstop>
-+  <tabstop>sb_dpDnd</tabstop>
-+  <tabstop>sb_dpInvisible</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>ck_asAway</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>sb_asAway</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>87</x>
-+     <y>27</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>210</x>
-+     <y>28</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asXa</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>sb_asXa</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>87</x>
-+     <y>62</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>210</x>
-+     <y>63</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asOffline</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>sb_asOffline</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>87</x>
-+     <y>97</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>210</x>
-+     <y>98</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asAway</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>lb_asPriority</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>104</x>
-+     <y>48</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>346</x>
-+     <y>82</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asAway</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>le_asPriority</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>104</x>
-+     <y>48</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>404</x>
-+     <y>48</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asXa</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>lb_asXaPriority</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>104</x>
-+     <y>82</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>346</x>
-+     <y>48</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>ck_asXa</sender>
-+   <signal>toggled(bool)</signal>
-+   <receiver>le_asXaPriority</receiver>
-+   <slot>setEnabled(bool)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>104</x>
-+     <y>82</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>404</x>
-+     <y>82</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
---- psi.orig/src/options/opt_status.cpp
-+++ psi/src/options/opt_status.cpp
-@@ -1,360 +1,13 @@
- #include "opt_status.h"
--#include "common.h"
--#include "iconwidget.h"
--#include "psioptions.h"
--
--#include <limits.h>
--#include <QButtonGroup>
--#include <QMessageBox>
--#include <QWhatsThis>
--#include <QCheckBox>
--#include <QRadioButton>
--#include <QComboBox>
--#include <QLineEdit>
--#include <QSpinBox>
--#include <QTextEdit>
--#include <QInputDialog>
--
--#include "ui_opt_status.h"
--
--class OptStatusUI : public QWidget, public Ui::OptStatus
--{
--public:
--	OptStatusUI() : QWidget() { setupUi(this); }
--};
--
--//----------------------------------------------------------------------------
--// OptionsTabStatus
--//----------------------------------------------------------------------------
-+#include "opt_statusgeneral.h"
-+#include "opt_statusauto.h"
- 
- OptionsTabStatus::OptionsTabStatus(QObject *parent)
--: OptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
--{
--	w = 0;
--}
--
--OptionsTabStatus::~OptionsTabStatus()
--{
--}
--
--QWidget *OptionsTabStatus::widget()
--{
--	if ( w )
--		return 0;
--
--	w = new OptStatusUI();
--	OptStatusUI *d = (OptStatusUI *)w;
--
--	QString s = tr("Makes Psi automatically set your status to \"away\" if your"
--		" computer is idle for the specified amount of time.");
--	d->ck_asAway->setWhatsThis(s);
--	d->sb_asAway->setWhatsThis(s);
--	s = tr("Makes Psi automatically set your status to \"extended away\" if your"
--		" computer is idle for the specified amount of time.");
--	d->ck_asXa->setWhatsThis(s);
--	d->sb_asXa->setWhatsThis(s);
--	s = tr("Makes Psi automatically set your status to \"offline\" if your"
--		" computer is idle for the specified amount of time."
--		"  This will disconnect you from the XMPP server.");
--	if (!PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
--		d->ck_asXa->hide();
--		d->sb_asXa->hide();
--		d->lb_asXa->hide();
--	}
--	d->ck_asOffline->setWhatsThis( s);
--	d->sb_asOffline->setWhatsThis( s);
--
--	d->te_asMessage->setWhatsThis(
--		tr("Specifies an extended message to use if you allow Psi"
--		" to set your status automatically.  See options above."));
--	d->le_asPriority->setWhatsThis(
--		tr("Specifies priority of auto-away status. "
--		"If empty, Psi will use account's default priority."));
--
--	setStatusPresetWidgetsEnabled(false);
--	connect(d->pb_spNew, SIGNAL(clicked()), SLOT(newStatusPreset()));
--	connect(d->pb_spDelete, SIGNAL(clicked()), SLOT(removeStatusPreset()));
--	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(selectStatusPreset(int)));
--	connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
--	connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
--	connect(d->cb_sp_status, SIGNAL(activated(int)), SLOT(changeStatusPreset()));
--	
--	d->pb_spNew->setWhatsThis(
--		tr("Press this button to create a new status message preset."));
--	d->pb_spDelete->setWhatsThis(
--		tr("Press this button to delete a status message preset."));
--	d->cb_preset->setWhatsThis(
--		tr("Use this list to select a status message preset"
--		" to view or edit in the box to the bottom."));
--	d->te_sp->setWhatsThis(
--		tr("You may edit the message here for the currently selected"
--		" status message preset in the list to the above."));
--	d->cb_sp_status->setWhatsThis(
--		tr("Use this to choose the status that will be assigned to this preset"));
--	d->le_sp_priority->setWhatsThis(
--		tr("Fill in the priority that will be assigned to this preset."
--		   " If no priority is given, the default account priority will be used."));
--
--	d->ck_askOnline->setWhatsThis(
--		tr("XMPP allows you to put extended status messages on"
--		" all status types.  Normally, Psi does not prompt you for"
--		" an extended message when you set your status to \"online\"."
--		"  Check this option if you want to have this prompt."));
--
--	return w;
--}
--
--void OptionsTabStatus::applyOptions()
--{
--	if ( !w )
--		return;
--
--	OptStatusUI *d = (OptStatusUI *)w;
--
--	PsiOptions::instance()->setOption("options.status.auto-away.away-after", d->sb_asAway->value());
--	PsiOptions::instance()->setOption("options.status.auto-away.not-availible-after", d->sb_asXa->value());
--	PsiOptions::instance()->setOption("options.status.auto-away.offline-after", d->sb_asOffline->value());
--	PsiOptions::instance()->setOption("options.status.auto-away.use-away", d->ck_asAway->isChecked());
--	PsiOptions::instance()->setOption("options.status.auto-away.use-not-availible", d->ck_asXa->isChecked());
--	PsiOptions::instance()->setOption("options.status.auto-away.use-offline", d->ck_asOffline->isChecked());
--	PsiOptions::instance()->setOption("options.status.auto-away.message", d->te_asMessage->toPlainText());
--	bool forcePriority = false;
--	PsiOptions::instance()->setOption("options.status.auto-away.priority", d->le_asPriority->text().toInt(&forcePriority));
--	PsiOptions::instance()->setOption("options.status.auto-away.force-priority", forcePriority);
--	
--	foreach (QString name, deletedPresets) {
--		QString base = PsiOptions::instance()->mapLookup("options.status.presets", name);
--		PsiOptions::instance()->removeOption(base , true);
--	}
--	deletedPresets.clear();
--	foreach (QString name, dirtyPresets.toList() + newPresets.keys()) {
--		StatusPreset sp;
--		if (newPresets.contains(name)) {
--			sp = newPresets[name];
--		} else {
--			sp = presets[name];
--		}
--		PsiOptions *o = PsiOptions::instance();
--		sp.toOptions(o);
--	}
--	dirtyPresets.clear();
--	presets.unite(newPresets);
--	newPresets.clear();
--	
--	PsiOptions::instance()->setOption("options.status.ask-for-message-on-online", d->ck_askOnline->isChecked());
--	PsiOptions::instance()->setOption("options.status.ask-for-message-on-offline", d->ck_askOffline->isChecked());
--}
--
--void OptionsTabStatus::restoreOptions()
--{
--	if ( !w )
--		return;
--
--	OptStatusUI *d = (OptStatusUI *)w;
--
--	d->sb_asAway->setMinimum(0);
--	d->sb_asAway->setMaximum(INT_MAX);
--	d->sb_asAway->setValue( PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() );
--	d->sb_asXa->setMinimum(0);
--	d->sb_asXa->setMaximum(INT_MAX);
--	d->sb_asXa->setValue( PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() );
--	d->sb_asOffline->setMinimum(0);
--	d->sb_asOffline->setMaximum(INT_MAX);
--	d->sb_asOffline->setValue( PsiOptions::instance()->getOption("options.status.auto-away.offline-after").toInt() );
--	/*if (PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() <= 0 )
--		PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() = false;
--	if (PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() <= 0 )
--		PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() = false;
--	if(d->opt.asOffline <= 0)
--		PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() = false;*/
--	d->ck_asAway->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() );
--	d->ck_asXa->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() );
--	d->ck_asOffline->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() );
--	d->te_asMessage->setText( PsiOptions::instance()->getOption("options.status.auto-away.message").toString() );
--	if (PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
--		d->le_asPriority->setText(QString::number(PsiOptions::instance()->getOption("options.status.auto-away.priority").toInt()));
--	} else {
--		d->le_asPriority->clear();
--	}
--
--	
--	QStringList presetNames;
--	
--	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) {
--		QString base =  PsiOptions::instance()->mapLookup("options.status.presets", name.toString());
--		StatusPreset sp;
--		sp.setName(name.toString());
--		sp.setMessage(PsiOptions::instance()->getOption(base+".message").toString());
--		if (PsiOptions::instance()->getOption(base+".force-priority").toBool()) {
--			sp.setPriority(PsiOptions::instance()->getOption(base+".priority").toInt());
--		}
--
--		XMPP::Status status;
--		status.setType(PsiOptions::instance()->getOption(base+".status").toString());
--		sp.setStatus(status.type());
--		
--		presets[name.toString()] = sp;
--		presetNames += name.toString();
--	}
--	
--	
--	d->cb_preset->addItems(presetNames);
--
--	if(d->cb_preset->count() >= 1) {
--		d->cb_preset->setCurrentIndex(0);
--		selectStatusPreset(0);
--	}
--
--	d->ck_askOnline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool() );
--	d->ck_askOffline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool() );
--}
--
--void OptionsTabStatus::setData(PsiCon *, QWidget *parentDialog)
--{
--	parentWidget = parentDialog;
--}
--
--void OptionsTabStatus::selectStatusPreset(int x)
--{
--	OptStatusUI *d = (OptStatusUI *)w;
--
--	//noDirty = true;
--	disconnect(d->te_sp, SIGNAL(textChanged()), 0, 0);
--	disconnect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), 0, 0);
--	if ( x == -1 ) {
--		setStatusPresetWidgetsEnabled(false);
--		d->te_sp->setText("");
--		d->le_sp_priority->clear();
--
--		//noDirty = false;
--		connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
--		connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
--		return;
--	}
--
--	StatusPreset preset;
--	QString name = d->cb_preset->itemText(x);
--	
--	if (newPresets.contains(name)) {
--		preset = newPresets[name];
--	} else {
--		preset = presets[name];
--	}
--	
--	d->te_sp->setText(preset.message());
--	if (preset.priority().hasValue())
--		d->le_sp_priority->setText(QString::number(preset.priority().value()));
--	else
--		d->le_sp_priority->clear();
--	d->cb_sp_status->setStatus(preset.status());
--	
--	//noDirty = false;
--	connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
--	connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
--	
--	setStatusPresetWidgetsEnabled(true);
--}
--
--void OptionsTabStatus::newStatusPreset()
--{
--	OptStatusUI *d = (OptStatusUI *)w;
--
--	QString text;
--
--	while(1) {
--		bool ok = false;
--		text = QInputDialog::getText(parentWidget,
--			CAP(tr("New Status Preset")),
--			tr("Please enter a name for the new status preset:"),
--			QLineEdit::Normal, text, &ok);
--		if(!ok) {
--			return;
--		}
--
--		if(text.isEmpty()) {
--			QMessageBox::information(parentWidget, tr("Error"), tr("Can't create a blank preset!"));
--		} else if(presets.contains(text) || newPresets.contains(text)) {
--			QMessageBox::information(parentWidget, tr("Error"), tr("You already have a preset with that name!"));
--		} else {
--			break;
--		}
--	}
--
--	newPresets[text].setName(text);
--	d->cb_preset->addItem(text);
--	d->cb_preset->setCurrentIndex(d->cb_preset->count()-1);
--	selectStatusPreset(d->cb_preset->count()-1);
--	d->te_sp->setFocus();
--
--	emit dataChanged();
--}
--
--void OptionsTabStatus::removeStatusPreset()
--{
--	OptStatusUI *d = (OptStatusUI *)w;
--	int id = d->cb_preset->currentIndex();
--	if(id == -1)
--		return;
--
--	emit dataChanged();
--
--	QString name = d->cb_preset->itemText(id);
--	
--	if (newPresets.contains(name)) {
--		newPresets.remove(name);
--	} else {
--		deletedPresets += d->cb_preset->itemText(id);
--		presets.remove(d->cb_preset->itemText(id));
--	}
--	d->cb_preset->removeItem(id);
--
--	// select a new entry if possible
--	if(d->cb_preset->count() == 0) {
--		selectStatusPreset(-1);
--		return;
--	}
--
--	if(id >= (int)d->cb_preset->count())
--		id = d->cb_preset->count()-1;
--
--	d->cb_preset->setCurrentIndex(id);
--	selectStatusPreset(id);
--}
--
--void OptionsTabStatus::changeStatusPreset()
--{
--	OptStatusUI *d = (OptStatusUI *)w;
--	int id = d->cb_preset->currentIndex();
--	if(id == -1)
--		return;
--
--	StatusPreset sp;
--	sp.setMessage(d->te_sp->toPlainText());
--	if (d->le_sp_priority->text().isEmpty())
--		sp.clearPriority();
--	else
--		sp.setPriority(d->le_sp_priority->text().toInt());
--	sp.setStatus(d->cb_sp_status->status());
--
--	QString name = d->cb_preset->itemText(id);
--	
--	sp.setName(name);
--	if (newPresets.contains(name)) {
--		newPresets[name] = sp;
--	} else {
--		dirtyPresets += name;
--		presets[name] = sp;
--	}
--	
--	emit dataChanged();
--}
--
--void OptionsTabStatus::setStatusPresetWidgetsEnabled(bool enabled)
-+: MetaOptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
- {
--	OptStatusUI *d = (OptStatusUI *)w;
--	d->cb_preset->setEnabled(enabled);
--	d->pb_spDelete->setEnabled(enabled);
--	d->cb_sp_status->setEnabled(enabled);
--	d->le_sp_priority->setEnabled(enabled);
--	d->te_sp->setEnabled(enabled);
-+	OptionsTabStatusGeneral* general = new OptionsTabStatusGeneral(this);
-+	addTab(general);
-+	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), parent, SLOT(enableCommonWidgets(bool)));
-+	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), SLOT(enableOtherTabs(bool)));
-+	addTab(new OptionsTabStatusAuto(this));
- }
---- psi.orig/src/options/opt_statusgeneral.cpp
-+++ psi/src/options/opt_statusgeneral.cpp
-@@ -0,0 +1,398 @@
-+#include "opt_statusgeneral.h"
-+#include "common.h"
-+#include "psioptions.h"
-+#include "psiiconset.h"
-+#include "priorityvalidator.h"
-+
-+#include <QMessageBox>
-+#include <QInputDialog>
-+#include <QWhatsThis>
-+#include <QCheckBox>
-+#include <QComboBox>
-+#include <QLineEdit>
-+#include <QTextEdit>
-+
-+#include "ui_opt_statusgeneral.h"
-+
-+class OptStatusGeneralUI : public QWidget, public Ui::OptStatusGeneral
-+{
-+public:
-+	OptStatusGeneralUI() : QWidget() { setupUi(this); }
-+};
-+
-+OptionsTabStatusGeneral::OptionsTabStatusGeneral(QObject *parent)
-+	: OptionsTab(parent, "status_general", "", tr("General"), tr("General status preferences"))
-+	, w(0)
-+{
-+}
-+
-+OptionsTabStatusGeneral::~OptionsTabStatusGeneral()
-+{
-+}
-+
-+QWidget *OptionsTabStatusGeneral::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new OptStatusGeneralUI();
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	connect(d->lw_presets, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), SLOT(currentItemChanged(QListWidgetItem *, QListWidgetItem *)));
-+	connect(d->lw_presets, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(presetDoubleClicked(const QModelIndex &)));
-+	connect(d->pb_spNew, SIGNAL(clicked()), SLOT(newStatusPreset()));
-+	connect(d->pb_spEdit, SIGNAL(clicked()), SLOT(editStatusPreset()));
-+	connect(d->pb_spDelete, SIGNAL(clicked()), SLOT(deleteStatusPreset()));
-+	connect(d->cb_presetsMenus, SIGNAL(currentIndexChanged(int)), SLOT(statusMenusIndexChanged(int)));
-+	connect(d->bb_selPreset, SIGNAL(accepted()), SLOT(statusPresetAccepted()));
-+	connect(d->bb_selPreset, SIGNAL(rejected()), SLOT(statusPresetRejected()));
-+
-+	PriorityValidator* prValidator = new PriorityValidator(d->le_sp_priority);
-+	d->le_sp_priority->setValidator(prValidator);
-+
-+	spContextMenu = new QMenu(w);
-+	spContextMenu->addAction(tr("Edit"), this, SLOT(editStatusPreset()));
-+	spContextMenu->addAction(tr("Delete"), this, SLOT(deleteStatusPreset()));
-+	connect(d->lw_presets, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showMenuForPreset(const QPoint &)));
-+
-+	PsiOptions* o = PsiOptions::instance();
-+	int askCount = 6;
-+	if (!o->getOption("options.ui.menu.status.chat").toBool()) {
-+		d->ck_askChat->hide();
-+		askCount--;
-+	}
-+	if (!o->getOption("options.ui.menu.status.xa").toBool()) {
-+		d->ck_askXa->hide();
-+		askCount--;
-+	}
-+
-+	if (askCount != 6) {
-+		reorderGridLayout(d->gridLayout, askCount == 4 ? 2 : 3); //4 items in 2 columns look better
-+	}
-+
-+	d->pb_spNew->setWhatsThis(
-+		tr("Press this button to create a new status message preset."));
-+	d->pb_spDelete->setWhatsThis(
-+		tr("Press this button to delete a status message preset."));
-+	/*TODO d->cb_preset->setWhatsThis(
-+		tr("Use this list to select a status message preset"
-+		" to view or edit in the box to the right. You can"
-+		" also sort them manually with drag and drop."));*/
-+	d->te_sp->setWhatsThis(
-+		tr("You may edit the message here for the currently selected"
-+		" status message preset in the list to the above."));
-+	d->cb_sp_status->setWhatsThis(
-+		tr("Use this to choose the status that will be assigned to this preset"));
-+	d->le_sp_priority->setWhatsThis(
-+		tr("Fill in the priority that will be assigned to this preset."
-+		   " If no priority is given, the default account priority will be used."));
-+
-+	d->ck_askOnline->setWhatsThis(
-+		tr("Jabber allows you to put extended status messages on"
-+		" all status types.  Normally, Psi does not prompt you for"
-+		" an extended message when you set your status to \"online\"."
-+		"  Check this option if you want to have this prompt."));
-+	//TODO write whatsthis messages for other widgets
-+	return w;
-+}
-+
-+void OptionsTabStatusGeneral::applyOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	OptionsTree* o = PsiOptions::instance();
-+
-+	if (d->gbSelectedPreset->isEnabled())
-+	{
-+		statusPresetRejected();
-+		switchPresetMode(false);
-+	}
-+	//Unselect items
-+	d->lw_presets->setCurrentRow(-1);
-+
-+	//Delete all presets
-+	foreach(QString key, o->getChildOptionNames("options.status.presets", true, true)) {
-+		o->removeOption(key, true);
-+	}
-+
-+	//Recreate presets considering order from list widget
-+	for (int i = 0; i < d->lw_presets->count(); i++)
-+	{
-+		QListWidgetItem* item = d->lw_presets->item(i);
-+		StatusPreset sp = presets[item->text()];
-+		sp.filterStatus();
-+		sp.toOptions(o);
-+	}
-+
-+	o->setOption("options.status.ask-for-message-on-online", d->ck_askOnline->isChecked());
-+	o->setOption("options.status.ask-for-message-on-chat", d->ck_askChat->isChecked());
-+	o->setOption("options.status.ask-for-message-on-away", d->ck_askAway->isChecked());
-+	o->setOption("options.status.ask-for-message-on-xa", d->ck_askXa->isChecked());
-+	o->setOption("options.status.ask-for-message-on-dnd", d->ck_askDnd->isChecked());
-+	o->setOption("options.status.ask-for-message-on-offline", d->ck_askOffline->isChecked());
-+
-+	o->setOption("options.status.presets-in-status-menus", d->cb_presetsMenus->itemData(d->cb_presetsMenus->currentIndex()).toString());
-+
-+	o->setOption("options.status.show-only-online-offline", d->ck_onlyOnOff->isChecked());
-+	o->setOption("options.status.show-choose", d->ck_showChoose->isChecked());
-+	o->setOption("options.status.show-reconnect", d->ck_showReconnect->isChecked());
-+	o->setOption("options.status.show-edit-presets", d->ck_showEditPresets->isChecked());
-+}
-+
-+void OptionsTabStatusGeneral::restoreOptions()
-+{
-+	if ( !w )
-+		return;
-+
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	OptionsTree* o = PsiOptions::instance();
-+
-+	//TODO: Restore function is calling 3 times! Do something with it! Or maybe it's normal?
-+	d->lw_presets->clear();
-+	presets.clear();
-+
-+	foreach(QVariant name, o->mapKeyList("options.status.presets", true)) {
-+		StatusPreset sp;
-+		sp.fromOptions(o, name.toString());
-+		sp.filterStatus();
-+
-+		presets[name.toString()] = sp;
-+#ifdef Q_WS_MAC
-+		QListWidgetItem* item = new QListWidgetItem(sp.name(), d->lw_presets);
-+#else
-+		QListWidgetItem* item = new QListWidgetItem(PsiIconset::instance()->status(sp.status()).icon(), sp.name(), d->lw_presets);
-+#endif
-+		d->lw_presets->addItem(item);
-+	}
-+
-+	cleanupSelectedPresetGroup();
-+	switchPresetMode(false);
-+
-+	d->ck_askOnline->setChecked( o->getOption("options.status.ask-for-message-on-online").toBool() );
-+	d->ck_askChat->setChecked( o->getOption("options.status.ask-for-message-on-chat").toBool() );
-+	d->ck_askAway->setChecked( o->getOption("options.status.ask-for-message-on-away").toBool() );
-+	d->ck_askXa->setChecked( o->getOption("options.status.ask-for-message-on-xa").toBool() );
-+	d->ck_askDnd->setChecked( o->getOption("options.status.ask-for-message-on-dnd").toBool() );
-+	d->ck_askOffline->setChecked( o->getOption("options.status.ask-for-message-on-offline").toBool() );
-+
-+	d->cb_presetsMenus->setItemData(0, "submenu");
-+	d->cb_presetsMenus->setItemData(1, "yes");
-+	d->cb_presetsMenus->setItemData(2, "no");
-+	int mode = d->cb_presetsMenus->findData(o->getOption("options.status.presets-in-status-menus").toString());
-+	d->cb_presetsMenus->setCurrentIndex(mode == -1 ? 0 : mode);
-+
-+	d->ck_onlyOnOff->setChecked( o->getOption("options.status.show-only-online-offline").toBool() );
-+	d->ck_showChoose->setChecked( o->getOption("options.status.show-choose").toBool() );
-+	d->ck_showReconnect->setChecked( o->getOption("options.status.show-reconnect").toBool() );
-+	d->ck_showEditPresets->setChecked( o->getOption("options.status.show-edit-presets").toBool() );
-+}
-+
-+void OptionsTabStatusGeneral::setData(PsiCon *, QWidget *parentDialog)
-+{
-+	parentWidget = parentDialog;
-+}
-+
-+void OptionsTabStatusGeneral::currentItemChanged(QListWidgetItem * current, QListWidgetItem * /*previous*/ )
-+{
-+	OptStatusGeneralUI *d = static_cast<OptStatusGeneralUI*>(w);
-+	d->pb_spEdit->setEnabled(current != 0);
-+	d->pb_spDelete->setEnabled(current != 0);
-+	if (current)
-+		loadStatusPreset();
-+	else
-+		cleanupSelectedPresetGroup();
-+}
-+
-+void OptionsTabStatusGeneral::loadStatusPreset()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	QListWidgetItem* item = d->lw_presets->currentItem();
-+	if (!item)
-+		return;
-+
-+	StatusPreset preset = presets[item->text()];
-+	preset.filterStatus();
-+	d->le_spName->setText(preset.name());
-+	d->le_spName->home(false);
-+	d->te_sp->setText(preset.message());
-+	if (preset.priority().hasValue())
-+		d->le_sp_priority->setText(QString::number(preset.priority().value()));
-+	else
-+		d->le_sp_priority->clear();
-+	d->cb_sp_status->setStatus(preset.status());
-+}
-+
-+void OptionsTabStatusGeneral::saveStatusPreset()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	QListWidgetItem* item = d->lw_presets->currentItem();
-+	if (!item)
-+		return;
-+
-+	QString oldName = item->text();
-+
-+	StatusPreset sp;
-+	sp.setName(d->le_spName->text());
-+	sp.setMessage(d->te_sp->toPlainText());
-+	sp.setPriority(d->le_sp_priority->text());
-+	sp.setStatus(d->cb_sp_status->status());
-+	sp.filterStatus();
-+	if (oldName != sp.name())
-+	{
-+		presets.remove(oldName);
-+		item->setText(sp.name());
-+	}
-+#ifndef Q_WS_MAC
-+	item->setIcon(PsiIconset::instance()->status(sp.status()).icon());
-+#endif
-+	presets[sp.name()] = sp;
-+}
-+
-+void OptionsTabStatusGeneral::newStatusPreset()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	presets[""] = StatusPreset();
-+	d->lw_presets->addItem("");
-+	d->lw_presets->setCurrentRow(d->lw_presets->count()-1);
-+
-+	loadStatusPreset();
-+
-+	switchPresetMode(true);
-+}
-+
-+void OptionsTabStatusGeneral::deleteStatusPreset()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	int current = d->lw_presets->currentRow();
-+	if (current == -1)
-+		return;
-+
-+	QListWidgetItem* item = d->lw_presets->takeItem(current);
-+	presets.remove(item->text());
-+
-+	// select a new entry if possible
-+	if(d->lw_presets->count() > 0) {
-+		d->lw_presets->setCurrentRow(d->lw_presets->count()-1);
-+	}
-+	else
-+		cleanupSelectedPresetGroup();
-+
-+	//Emit dataChanged only if we delete existing item and not cancelling creating of new one
-+	if (!item->text().isEmpty())
-+		emit dataChanged();
-+
-+	delete item;
-+}
-+
-+void OptionsTabStatusGeneral::statusMenusIndexChanged ( int index )
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	if (index == -1 || d->cb_presetsMenus->itemData(d->cb_presetsMenus->currentIndex()).toString() == "no")
-+		d->ck_showEditPresets->setEnabled(false);
-+	else
-+		d->ck_showEditPresets->setEnabled(true);
-+}
-+
-+void OptionsTabStatusGeneral::showMenuForPreset(const QPoint &point)
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	QListWidgetItem* item = d->lw_presets->itemAt(point);
-+	if (item)
-+	{
-+		//paranoia: we must be sure item is selected
-+		d->lw_presets->setCurrentItem(item);
-+
-+		//Show menu
-+		spContextMenu->exec(d->lw_presets->mapToGlobal(point));
-+	}
-+}
-+
-+void OptionsTabStatusGeneral::editStatusPreset()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	int current = d->lw_presets->currentRow();
-+	if (current == -1)
-+		return;
-+
-+	loadStatusPreset();
-+
-+	switchPresetMode(true);
-+}
-+
-+void OptionsTabStatusGeneral::cleanupSelectedPresetGroup()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	d->le_spName->setText("");
-+	d->te_sp->setPlainText("");
-+	d->le_sp_priority->setText("");
-+	d->cb_sp_status->setStatus(XMPP::Status::Online);
-+}
-+
-+void OptionsTabStatusGeneral::statusPresetAccepted()
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+	QListWidgetItem* item = d->lw_presets->currentItem();
-+	if (!item)
-+		return;
-+
-+	QString newName = d->le_spName->text();
-+	if(newName.trimmed().isEmpty())
-+	{
-+		QMessageBox::critical(parentWidget, tr("Error"), tr("Can't create a blank preset!"));
-+	}
-+	else if(newName != item->text() && presets.contains(newName))
-+	{
-+		QMessageBox::critical(parentWidget, tr("Error"), tr("You already have a preset with that name!"));
-+	}
-+	else
-+	{
-+		saveStatusPreset();
-+		switchPresetMode(false);
-+		loadStatusPreset();
-+		emit dataChanged();
-+	}
-+}
-+
-+void OptionsTabStatusGeneral::statusPresetRejected()
-+{
-+	//TODO almost all functions have this line, GET RID OF IT
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	switchPresetMode(false);
-+	QListWidgetItem* item = d->lw_presets->currentItem();
-+	if (!item)
-+		return;
-+
-+	if (item->text().isEmpty())
-+	{
-+		//Cancel creating new item
-+		deleteStatusPreset();
-+	}
-+	else
-+	{
-+		//Cancel editing, just refresh Selected Preset group for viewing
-+		loadStatusPreset();
-+	}
-+}
-+
-+void OptionsTabStatusGeneral::switchPresetMode(bool toEdit)
-+{
-+	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
-+
-+	d->gbSelectedPreset->setEnabled(toEdit);
-+	d->gbPresets->setEnabled(!toEdit);
-+	d->gbStatusMenus->setEnabled(!toEdit);
-+	d->gbPrompts->setEnabled(!toEdit);
-+
-+	emit enableDlgCommonWidgets(!toEdit);
-+}
-+
-+void OptionsTabStatusGeneral::presetDoubleClicked(const QModelIndex & /*index*/ )
-+{
-+	editStatusPreset();
-+}
---- psi.orig/src/options/opt_statusgeneral.h
-+++ psi/src/options/opt_statusgeneral.h
-@@ -0,0 +1,52 @@
-+#ifndef OPT_STATUSGENERAL_H
-+#define OPT_STATUSGENERAL_H
-+
-+#include <QMap>
-+#include <QListWidgetItem>
-+#include <QMenu>
-+
-+#include "optionstab.h"
-+#include "statuspreset.h"
-+
-+class QWidget;
-+
-+class OptionsTabStatusGeneral : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabStatusGeneral(QObject *parent);
-+	~OptionsTabStatusGeneral();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+
-+	void setData(PsiCon *, QWidget *parentDialog);
-+	bool stretchable() const { return true; }
-+
-+signals:
-+	void enableDlgCommonWidgets(bool);
-+
-+private slots:
-+	void currentItemChanged(QListWidgetItem * current, QListWidgetItem * previous );
-+	void newStatusPreset();
-+	void deleteStatusPreset();
-+	void statusMenusIndexChanged( int index );
-+	void showMenuForPreset(const QPoint &);
-+	void editStatusPreset();
-+	void statusPresetAccepted();
-+	void statusPresetRejected();
-+	void presetDoubleClicked(const QModelIndex &);
-+
-+private:
-+	void loadStatusPreset();
-+	void saveStatusPreset();
-+	void switchPresetMode(bool toEdit);
-+	void cleanupSelectedPresetGroup();
-+
-+	QWidget *w, *parentWidget;
-+	QMap<QString, StatusPreset> presets;
-+	QMenu *spContextMenu;
-+};
-+
-+#endif // OPT_STATUSGENERAL_H
---- psi.orig/src/options/opt_statusgeneral.ui
-+++ psi/src/options/opt_statusgeneral.ui
-@@ -0,0 +1,445 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptStatusGeneral</class>
-+ <widget class="QWidget" name="OptStatusGeneral">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>629</width>
-+    <height>508</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Form</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout_4">
-+   <item>
-+    <widget class="QGroupBox" name="gbPrompts">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-+       <horstretch>0</horstretch>
-+       <verstretch>0</verstretch>
-+      </sizepolicy>
-+     </property>
-+     <property name="maximumSize">
-+      <size>
-+       <width>16777215</width>
-+       <height>16777215</height>
-+      </size>
-+     </property>
-+     <property name="title">
-+      <string>Prompt for status message when choosing</string>
-+     </property>
-+     <layout class="QHBoxLayout" name="horizontalLayout_5">
-+      <item>
-+       <layout class="QGridLayout" name="gridLayout">
-+        <property name="horizontalSpacing">
-+         <number>30</number>
-+        </property>
-+        <item row="0" column="0">
-+         <widget class="QCheckBox" name="ck_askOnline">
-+          <property name="text">
-+           <string>Online</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="1">
-+         <widget class="QCheckBox" name="ck_askChat">
-+          <property name="text">
-+           <string>Free for Chat</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="0" column="2">
-+         <widget class="QCheckBox" name="ck_askAway">
-+          <property name="text">
-+           <string>Away</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="0">
-+         <widget class="QCheckBox" name="ck_askXa">
-+          <property name="text">
-+           <string>Not Available</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="1">
-+         <widget class="QCheckBox" name="ck_askDnd">
-+          <property name="text">
-+           <string>Do not Disturb</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item row="1" column="2">
-+         <widget class="QCheckBox" name="ck_askOffline">
-+          <property name="text">
-+           <string>Offline</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <spacer name="horizontalSpacer_4">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>40</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QGroupBox" name="gbStatusMenus">
-+     <property name="title">
-+      <string>Status menus</string>
-+     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout_2">
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0">
-+        <item>
-+         <widget class="QLabel" name="label_4">
-+          <property name="sizePolicy">
-+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+            <horstretch>0</horstretch>
-+            <verstretch>0</verstretch>
-+           </sizepolicy>
-+          </property>
-+          <property name="text">
-+           <string>Show presets in menus:</string>
-+          </property>
-+          <property name="alignment">
-+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QComboBox" name="cb_presetsMenus">
-+          <property name="enabled">
-+           <bool>true</bool>
-+          </property>
-+          <property name="sizePolicy">
-+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-+            <horstretch>0</horstretch>
-+            <verstretch>0</verstretch>
-+           </sizepolicy>
-+          </property>
-+          <property name="minimumSize">
-+           <size>
-+            <width>40</width>
-+            <height>0</height>
-+           </size>
-+          </property>
-+          <item>
-+           <property name="text">
-+            <string>As submenu</string>
-+           </property>
-+          </item>
-+          <item>
-+           <property name="text">
-+            <string>With standard statuses</string>
-+           </property>
-+          </item>
-+          <item>
-+           <property name="text">
-+            <string>No</string>
-+           </property>
-+          </item>
-+         </widget>
-+        </item>
-+        <item>
-+         <spacer name="horizontalSpacer_2">
-+          <property name="orientation">
-+           <enum>Qt::Horizontal</enum>
-+          </property>
-+          <property name="sizeHint" stdset="0">
-+           <size>
-+            <width>40</width>
-+            <height>20</height>
-+           </size>
-+          </property>
-+         </spacer>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <widget class="QCheckBox" name="ck_onlyOnOff">
-+        <property name="toolTip">
-+         <string>Hide Free for Chat, Away, Not Available and Do not Disturb</string>
-+        </property>
-+        <property name="text">
-+         <string>Hide standard statuses (Chat, Away, XA, DND)</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout_6">
-+        <property name="topMargin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <widget class="QCheckBox" name="ck_showEditPresets">
-+          <property name="text">
-+           <string>Show &quot;Edit presets...&quot;</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <spacer name="horizontalSpacer_3">
-+          <property name="orientation">
-+           <enum>Qt::Horizontal</enum>
-+          </property>
-+          <property name="sizeHint" stdset="0">
-+           <size>
-+            <width>40</width>
-+            <height>20</height>
-+           </size>
-+          </property>
-+         </spacer>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout">
-+        <property name="spacing">
-+         <number>30</number>
-+        </property>
-+        <item>
-+         <widget class="QCheckBox" name="ck_showChoose">
-+          <property name="text">
-+           <string>Show &quot;Choose...&quot;</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QCheckBox" name="ck_showReconnect">
-+          <property name="text">
-+           <string>Show &quot;Reconnect&quot;</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <spacer name="horizontalSpacer">
-+          <property name="orientation">
-+           <enum>Qt::Horizontal</enum>
-+          </property>
-+          <property name="sizeHint" stdset="0">
-+           <size>
-+            <width>40</width>
-+            <height>20</height>
-+           </size>
-+          </property>
-+         </spacer>
-+        </item>
-+       </layout>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_3">
-+     <item>
-+      <widget class="QGroupBox" name="gbPresets">
-+       <property name="title">
-+        <string>Presets</string>
-+       </property>
-+       <layout class="QVBoxLayout" name="verticalLayout">
-+        <item>
-+         <widget class="QListWidget" name="lw_presets">
-+          <property name="sizePolicy">
-+           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+            <horstretch>0</horstretch>
-+            <verstretch>0</verstretch>
-+           </sizepolicy>
-+          </property>
-+          <property name="contextMenuPolicy">
-+           <enum>Qt::CustomContextMenu</enum>
-+          </property>
-+          <property name="dragEnabled">
-+           <bool>true</bool>
-+          </property>
-+          <property name="dragDropMode">
-+           <enum>QAbstractItemView::InternalMove</enum>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <layout class="QHBoxLayout" name="_2">
-+          <property name="spacing">
-+           <number>6</number>
-+          </property>
-+          <property name="margin">
-+           <number>0</number>
-+          </property>
-+          <item>
-+           <widget class="QPushButton" name="pb_spNew">
-+            <property name="text">
-+             <string>Add</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QPushButton" name="pb_spEdit">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="text">
-+             <string>Edit</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QPushButton" name="pb_spDelete">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="text">
-+             <string>Delete</string>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QGroupBox" name="gbSelectedPreset">
-+       <property name="enabled">
-+        <bool>false</bool>
-+       </property>
-+       <property name="title">
-+        <string>Selected preset</string>
-+       </property>
-+       <layout class="QVBoxLayout" name="verticalLayout_3">
-+        <item>
-+         <layout class="QHBoxLayout" name="horizontalLayout_4">
-+          <item>
-+           <widget class="QLabel" name="label_3">
-+            <property name="text">
-+             <string>Name:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QLineEdit" name="le_spName"/>
-+          </item>
-+         </layout>
-+        </item>
-+        <item>
-+         <layout class="QHBoxLayout" name="_3">
-+          <property name="spacing">
-+           <number>6</number>
-+          </property>
-+          <property name="margin">
-+           <number>0</number>
-+          </property>
-+          <item>
-+           <widget class="QLabel" name="label_2">
-+            <property name="text">
-+             <string>Status:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="StatusComboBox" name="cb_sp_status"/>
-+          </item>
-+          <item>
-+           <spacer>
-+            <property name="orientation">
-+             <enum>Qt::Horizontal</enum>
-+            </property>
-+            <property name="sizeHint" stdset="0">
-+             <size>
-+              <width>97</width>
-+              <height>20</height>
-+             </size>
-+            </property>
-+           </spacer>
-+          </item>
-+          <item>
-+           <widget class="QLabel" name="label">
-+            <property name="text">
-+             <string>Priority:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QLineEdit" name="le_sp_priority">
-+            <property name="minimumSize">
-+             <size>
-+              <width>50</width>
-+              <height>0</height>
-+             </size>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>50</width>
-+              <height>16777215</height>
-+             </size>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+        <item>
-+         <widget class="QTextEdit" name="te_sp">
-+          <property name="sizePolicy">
-+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-+            <horstretch>0</horstretch>
-+            <verstretch>0</verstretch>
-+           </sizepolicy>
-+          </property>
-+          <property name="maximumSize">
-+           <size>
-+            <width>32767</width>
-+            <height>32767</height>
-+           </size>
-+          </property>
-+          <property name="tabChangesFocus">
-+           <bool>true</bool>
-+          </property>
-+          <property name="html">
-+           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-+p, li { white-space: pre-wrap; }
-+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QDialogButtonBox" name="bb_selPreset">
-+          <property name="standardButtons">
-+           <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-+          </property>
-+          <property name="centerButtons">
-+           <bool>false</bool>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <customwidgets>
-+  <customwidget>
-+   <class>StatusComboBox</class>
-+   <extends>QComboBox</extends>
-+   <header>statuscombobox.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/options/opt_status.h
-+++ psi/src/options/opt_status.h
-@@ -1,43 +1,13 @@
- #ifndef OPT_STATUS_H
- #define OPT_STATUS_H
- 
--#include <QMap>
--#include <QSet>
--#include <QStringList>
--
- #include "optionstab.h"
--#include "statuspreset.h"
--
--class QWidget;
- 
--class OptionsTabStatus : public OptionsTab
-+class OptionsTabStatus : public MetaOptionsTab
- {
- 	Q_OBJECT
- public:
- 	OptionsTabStatus(QObject *parent);
--	~OptionsTabStatus();
--
--	QWidget *widget();
--	void applyOptions();
--	void restoreOptions();
--
--	void setData(PsiCon *, QWidget *parentDialog);
--	//bool stretchable() const { return true; }
--
--private slots:
--	void selectStatusPreset(int x);
--	void newStatusPreset();
--	void removeStatusPreset();
--	void changeStatusPreset();
--
--private:
--	void setStatusPresetWidgetsEnabled(bool);
--	
--	QWidget *w, *parentWidget;
--	QMap<QString, StatusPreset> presets;
--	QSet<QString> dirtyPresets;
--	QStringList deletedPresets;
--	QMap<QString, StatusPreset> newPresets;
- };
- 
- #endif
---- psi.orig/src/options/opt_status.ui
-+++ psi/src/options/opt_status.ui
-@@ -1,397 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<ui version="4.0">
-- <class>OptStatus</class>
-- <widget class="QWidget" name="OptStatus">
--  <property name="geometry">
--   <rect>
--    <x>0</x>
--    <y>0</y>
--    <width>407</width>
--    <height>559</height>
--   </rect>
--  </property>
--  <property name="windowTitle">
--   <string>OptStatusUI</string>
--  </property>
--  <layout class="QVBoxLayout">
--   <property name="spacing">
--    <number>6</number>
--   </property>
--   <property name="margin">
--    <number>9</number>
--   </property>
--   <item>
--    <widget class="QGroupBox" name="groupBox1">
--     <property name="title">
--      <string>Prompt for status message when choosing</string>
--     </property>
--     <layout class="QHBoxLayout">
--      <property name="spacing">
--       <number>0</number>
--      </property>
--      <property name="margin">
--       <number>9</number>
--      </property>
--      <item>
--       <widget class="QCheckBox" name="ck_askOnline">
--        <property name="text">
--         <string>Online</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QCheckBox" name="ck_askOffline">
--        <property name="text">
--         <string>Offline</string>
--        </property>
--       </widget>
--      </item>
--     </layout>
--    </widget>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="groupBox">
--     <property name="title">
--      <string>Auto status</string>
--     </property>
--     <layout class="QVBoxLayout" name="verticalLayout">
--      <property name="margin">
--       <number>9</number>
--      </property>
--      <item>
--       <layout class="QGridLayout">
--        <property name="margin">
--         <number>0</number>
--        </property>
--        <property name="spacing">
--         <number>6</number>
--        </property>
--        <item row="2" column="1">
--         <widget class="QSpinBox" name="sb_asOffline">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--         </widget>
--        </item>
--        <item row="2" column="2">
--         <widget class="QLabel" name="lb_asOffline">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--          <property name="text">
--           <string>Minutes</string>
--          </property>
--         </widget>
--        </item>
--        <item row="1" column="2">
--         <widget class="QLabel" name="lb_asXa">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--          <property name="text">
--           <string>Minutes</string>
--          </property>
--         </widget>
--        </item>
--        <item row="1" column="1">
--         <widget class="QSpinBox" name="sb_asXa">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--         </widget>
--        </item>
--        <item row="0" column="2">
--         <widget class="QLabel" name="lb_asAway">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--          <property name="text">
--           <string>Minutes</string>
--          </property>
--         </widget>
--        </item>
--        <item row="2" column="0">
--         <widget class="QCheckBox" name="ck_asOffline">
--          <property name="text">
--           <string>Auto offline after:</string>
--          </property>
--         </widget>
--        </item>
--        <item row="1" column="0">
--         <widget class="QCheckBox" name="ck_asXa">
--          <property name="text">
--           <string>Auto XA after:</string>
--          </property>
--         </widget>
--        </item>
--        <item row="0" column="0">
--         <widget class="QCheckBox" name="ck_asAway">
--          <property name="text">
--           <string>Auto away after:</string>
--          </property>
--         </widget>
--        </item>
--        <item row="0" column="1">
--         <widget class="QSpinBox" name="sb_asAway">
--          <property name="enabled">
--           <bool>false</bool>
--          </property>
--         </widget>
--        </item>
--       </layout>
--      </item>
--      <item>
--       <widget class="QLabel" name="TextLabel1_8">
--        <property name="text">
--         <string>Status message:</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QTextEdit" name="te_asMessage">
--        <property name="maximumSize">
--         <size>
--          <width>32767</width>
--          <height>50</height>
--         </size>
--        </property>
--        <property name="tabChangesFocus">
--         <bool>true</bool>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <layout class="QHBoxLayout" name="horizontalLayout">
--        <item>
--         <widget class="QLabel" name="label_4">
--          <property name="text">
--           <string>Priority:</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="QLineEdit" name="le_asPriority"/>
--        </item>
--       </layout>
--      </item>
--     </layout>
--    </widget>
--   </item>
--   <item>
--    <widget class="QGroupBox" name="groupBox10">
--     <property name="title">
--      <string>Presets</string>
--     </property>
--     <layout class="QVBoxLayout">
--      <property name="spacing">
--       <number>6</number>
--      </property>
--      <property name="margin">
--       <number>9</number>
--      </property>
--      <item>
--       <layout class="QHBoxLayout">
--        <property name="spacing">
--         <number>6</number>
--        </property>
--        <property name="margin">
--         <number>0</number>
--        </property>
--        <item>
--         <widget class="QLabel" name="label_3">
--          <property name="text">
--           <string>Preset:</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="QComboBox" name="cb_preset"/>
--        </item>
--        <item>
--         <spacer>
--          <property name="orientation">
--           <enum>Qt::Horizontal</enum>
--          </property>
--          <property name="sizeHint" stdset="0">
--           <size>
--            <width>40</width>
--            <height>20</height>
--           </size>
--          </property>
--         </spacer>
--        </item>
--        <item>
--         <widget class="QPushButton" name="pb_spNew">
--          <property name="text">
--           <string>New</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="QPushButton" name="pb_spDelete">
--          <property name="text">
--           <string>Delete</string>
--          </property>
--         </widget>
--        </item>
--       </layout>
--      </item>
--      <item>
--       <layout class="QHBoxLayout">
--        <property name="spacing">
--         <number>6</number>
--        </property>
--        <property name="margin">
--         <number>0</number>
--        </property>
--        <item>
--         <widget class="QLabel" name="label_2">
--          <property name="text">
--           <string>Status:</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="StatusComboBox" name="cb_sp_status"/>
--        </item>
--        <item>
--         <spacer>
--          <property name="orientation">
--           <enum>Qt::Horizontal</enum>
--          </property>
--          <property name="sizeHint" stdset="0">
--           <size>
--            <width>97</width>
--            <height>20</height>
--           </size>
--          </property>
--         </spacer>
--        </item>
--        <item>
--         <widget class="QLabel" name="label">
--          <property name="text">
--           <string>Priority:</string>
--          </property>
--         </widget>
--        </item>
--        <item>
--         <widget class="QLineEdit" name="le_sp_priority">
--          <property name="maximumSize">
--           <size>
--            <width>50</width>
--            <height>16777215</height>
--           </size>
--          </property>
--         </widget>
--        </item>
--       </layout>
--      </item>
--      <item>
--       <widget class="QLabel" name="TextLabel2_2">
--        <property name="text">
--         <string>Content:</string>
--        </property>
--       </widget>
--      </item>
--      <item>
--       <widget class="QTextEdit" name="te_sp">
--        <property name="sizePolicy">
--         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
--          <horstretch>0</horstretch>
--          <verstretch>0</verstretch>
--         </sizepolicy>
--        </property>
--        <property name="maximumSize">
--         <size>
--          <width>32767</width>
--          <height>90</height>
--         </size>
--        </property>
--        <property name="tabChangesFocus">
--         <bool>true</bool>
--        </property>
--       </widget>
--      </item>
--     </layout>
--    </widget>
--   </item>
--  </layout>
-- </widget>
-- <layoutdefault spacing="6" margin="11"/>
-- <customwidgets>
--  <customwidget>
--   <class>StatusComboBox</class>
--   <extends>QComboBox</extends>
--   <header>statuscombobox.h</header>
--  </customwidget>
-- </customwidgets>
-- <tabstops>
--  <tabstop>ck_askOnline</tabstop>
--  <tabstop>ck_askOffline</tabstop>
--  <tabstop>ck_asAway</tabstop>
--  <tabstop>sb_asAway</tabstop>
--  <tabstop>ck_asXa</tabstop>
--  <tabstop>sb_asXa</tabstop>
--  <tabstop>ck_asOffline</tabstop>
--  <tabstop>sb_asOffline</tabstop>
--  <tabstop>te_asMessage</tabstop>
--  <tabstop>le_asPriority</tabstop>
--  <tabstop>cb_preset</tabstop>
--  <tabstop>pb_spNew</tabstop>
--  <tabstop>pb_spDelete</tabstop>
--  <tabstop>cb_sp_status</tabstop>
--  <tabstop>le_sp_priority</tabstop>
--  <tabstop>te_sp</tabstop>
-- </tabstops>
-- <resources/>
-- <connections>
--  <connection>
--   <sender>ck_asOffline</sender>
--   <signal>toggled(bool)</signal>
--   <receiver>sb_asOffline</receiver>
--   <slot>setEnabled(bool)</slot>
--   <hints>
--    <hint type="sourcelabel">
--     <x>65</x>
--     <y>109</y>
--    </hint>
--    <hint type="destinationlabel">
--     <x>171</x>
--     <y>112</y>
--    </hint>
--   </hints>
--  </connection>
--  <connection>
--   <sender>ck_asXa</sender>
--   <signal>toggled(bool)</signal>
--   <receiver>sb_asXa</receiver>
--   <slot>setEnabled(bool)</slot>
--   <hints>
--    <hint type="sourcelabel">
--     <x>95</x>
--     <y>77</y>
--    </hint>
--    <hint type="destinationlabel">
--     <x>172</x>
--     <y>78</y>
--    </hint>
--   </hints>
--  </connection>
--  <connection>
--   <sender>ck_asAway</sender>
--   <signal>toggled(bool)</signal>
--   <receiver>sb_asAway</receiver>
--   <slot>setEnabled(bool)</slot>
--   <hints>
--    <hint type="sourcelabel">
--     <x>61</x>
--     <y>46</y>
--    </hint>
--    <hint type="destinationlabel">
--     <x>180</x>
--     <y>42</y>
--    </hint>
--   </hints>
--  </connection>
-- </connections>
--</ui>
---- psi.orig/src/profiles.h
-+++ psi/src/profiles.h
-@@ -49,23 +49,27 @@ public:
- 	
- 	void fromOptions(OptionsTree *o, QString base);
- 	void toOptions(OptionsTree *o, QString base=QString());
-+	int defaultPriority(const XMPP::Status &s);
-+	void saveLastStatus(OptionsTree *o, QString base);
- 
- 	QString id;
- 	QString name;
- 	QString jid, pass, host, resource, authid, realm;
- 	bool customAuth;
- 	int port, priority;
-- 	bool opt_enabled, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_log, opt_connectAfterSleep, opt_reconn, opt_ignoreSSLWarnings, opt_compress;
-+	bool opt_enabled, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_log, opt_connectAfterSleep, opt_autoSameStatus, opt_reconn, opt_ignoreSSLWarnings, opt_compress;
- 	XMPP::ClientStream::AllowPlainType allow_plain;
- 	bool req_mutual_auth;
- 	bool legacy_ssl_probe;
--	bool opt_automatic_resource;
-+	bool opt_automatic_resource, priority_dep_on_status;
- 	int security_level;
- 	enum SSLFlag { SSL_No = 0, SSL_Yes = 1, SSL_Auto = 2, SSL_Legacy = 3 } ssl;
- 
- 	QString proxyID;
- 
- 	XMPP::Roster roster;
-+	XMPP::Status lastStatus;
-+	bool lastStatusWithPriority;
- 
- 	struct GroupData {
- 		bool open;
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -407,6 +407,7 @@ public:
- 	Jid jid, nextJid;
- 	Status loginStatus;
- 	bool loginWithPriority;
-+	bool reconnectingOnce;
- 	EventQueue *eventQueue;
- 	XmlConsole *xmlConsole;
- 	UserList userList;
-@@ -858,11 +859,9 @@ public:
- 	{
- 		if (!account->isAvailable())
- 			return;
--		Status status = autoAwayStatus(autoAway);
--		if (status.type() != loginStatus.type() ||
--		    status.status() != loginStatus.status())
--		{
--			bool withPriority = autoAway == AutoAway_Away || autoAway == AutoAway_XA;
-+		bool withPriority = false;
-+		Status status = autoAwayStatus(autoAway, withPriority);
-+		if (status.type() != loginStatus.type() || status.status() != loginStatus.status()) {
- 			account->setStatusDirect(status, withPriority);
- 		}
- 	}
-@@ -887,14 +886,26 @@ public:
- private:
- 	Status lastManualStatus_;
- 
--	XMPP::Status autoAwayStatus(AutoAway autoAway)
-+	XMPP::Status autoAwayStatus(AutoAway autoAway, bool &withPriority)
- 	{
-+		withPriority = loginWithPriority;
- 		if (!lastManualStatus().isAway() && !lastManualStatus().isInvisible()) {
- 			int priority;
--			if (PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
-+			if (autoAway == AutoAway_Away && PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
- 				priority = PsiOptions::instance()->getOption("options.status.auto-away.priority").toInt();
--			} else {
-+				withPriority = true;
-+			}
-+			else if (autoAway == AutoAway_XA && PsiOptions::instance()->getOption("options.status.auto-away.force-xa-priority").toBool()) {
-+				priority = PsiOptions::instance()->getOption("options.status.auto-away.xa-priority").toInt();
-+				withPriority = true;
-+			}
-+			else {
- 				priority = acc.priority;
-+				if (autoAway == AutoAway_Away || autoAway == AutoAway_XA) {
-+					//We reach here when function was called for auto-status (not recover after it)
-+					// and priority for this auto-status was not set, so we force:
-+					withPriority = false;
-+				}
- 			}
- 
- 			switch (autoAway) {
-@@ -1545,13 +1556,35 @@ void PsiAccount::autoLogin()
- 	if (enabled()) {
- 		bool autoLogin = d->acc.opt_auto;
- 		if (autoLogin) {
--#ifndef YAPSI
--			// FIXME: we should remember last used status
--			setStatus(Status(Status::Online, "", d->acc.priority), false, true);
--#else
--			setStatus(Status(d->psi->lastLoggedInStatusType(), d->psi->currentStatusMessage(), d->acc.priority), false, true);
--#endif
-+			if (d->acc.opt_autoSameStatus) {
-+				setStatus(d->acc.lastStatus, d->acc.lastStatusWithPriority, true);
-+			}
-+			else {
-+				setStatus(makeStatus(XMPP::Status::Online, ""), false, true);
-+			}
-+		}
-+	}
-+}
-+
-+void PsiAccount::reconnectOnce()
-+{
-+	if (isActive()) {
-+		if (d->reconnectingOnce) {
-+			//To be sure phase2 will be called just once
-+			QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
- 		}
-+		d->reconnectingOnce = true;
-+		connect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
-+		logout(false, Status(Status::Offline, tr("Reconnecting"), 0));
-+	}
-+}
-+
-+void PsiAccount::reconnectOncePhase2()
-+{
-+	if (d->reconnectingOnce) {
-+		d->reconnectingOnce = false;
-+		QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
-+		setStatus(d->lastManualStatus(), d->loginWithPriority, false);
- 	}
- }
- 
-@@ -1680,7 +1713,7 @@ void PsiAccount::forceDisconnect(bool fa
- 		d->client->removeExtension("pep");
- 
- 		// send logout status
--		d->client->groupChatLeaveAll();
-+		d->client->groupChatLeaveAll(PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
- 		d->client->setPresence(s);
- 	}
- 
-@@ -2775,7 +2808,7 @@ Status PsiAccount::loggedOutStatus()
- #ifdef YAPSI
- 	return Status(Status::Offline);
- #else
--	return Status(Status::Offline, "Logged out", 0);
-+	return Status(Status::Offline, tr("Logged out"), 0);
- #endif
- }
- 
-@@ -2783,10 +2816,16 @@ void PsiAccount::setStatus(const Status
- {
- 	Status s = _s;
- 	if (!withPriority)
--		s.setPriority(d->acc.priority);
-+		s.setPriority(d->acc.defaultPriority(s));
- 
- 	if (isManualStatus) {
- 		d->setManualStatus(s);
-+
-+		if (s.isAvailable()) {
-+			//Save only non-offline status for reconnect use
-+			d->acc.lastStatus = s;
-+			d->acc.lastStatusWithPriority = withPriority;
-+		}
- 	}
- 
- 	// Block all transports' contacts' status change popups from popping
-@@ -2854,18 +2893,37 @@ void PsiAccount::setStatus(const Status
- 	}
- }
- 
-+void PsiAccount::showStatusDialog(const QString& presetName)
-+{
-+	StatusPreset preset;
-+	preset.fromOptions(PsiOptions::instance(), presetName);
-+	Status status(preset.status(), preset.message(), preset.priority().hasValue() ? preset.priority().value() : this->status().priority());
-+	StatusSetDlg *w = new StatusSetDlg(this, status, preset.priority().hasValue());
-+	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
-+	w->show();
-+}
-+
- void PsiAccount::passwordReady(QString password) {
- 	d->acc.pass = password;
- 	login();
- }
- 
-+int PsiAccount::defaultPriority(const XMPP::Status &s)
-+{
-+	return d->acc.defaultPriority(s);
-+}
-+
- void PsiAccount::setStatusDirect(const Status &_s, bool withPriority)
- {
- 	Status s = _s;
- 	if (!withPriority)
--		s.setPriority(d->acc.priority);
-+		s.setPriority(defaultPriority(s));
- 
--	//printf("setting status to [%s]\n", s.status().latin1());
-+	if (d->reconnectingOnce) {
-+		//If we reconnect once and got here, user chosen status and we must stop reconnecting
-+		d->reconnectingOnce = false;
-+		QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
-+	}
- 
- 	// using pgp?
- 	if(!d->cur_pgpSecretKey.isNull()) {
-@@ -3647,25 +3705,61 @@ ChatDlg *PsiAccount::ensureChatDlg(const
- 	return c;
- }
- 
--void PsiAccount::changeStatus(int x)
-+void PsiAccount::changeStatus(int x, bool forceDialog)
- {
--	if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) {
--		setStatus(loggedOutStatus(), false, true);
-+	QString optionName;
-+	if (!forceDialog)
-+	{
-+		switch (x) {
-+		case STATUS_OFFLINE:
-+			optionName = "offline";
-+			break;
-+		case STATUS_ONLINE:
-+			optionName = "online";
-+			break;
-+		case STATUS_CHAT:
-+			optionName = "chat";
-+			break;
-+		case STATUS_AWAY:
-+			optionName = "away";
-+			break;
-+		case STATUS_XA:
-+			optionName = "xa";
-+			break;
-+		case STATUS_DND:
-+			optionName = "dnd";
-+			break;
-+		}
-+	}
-+
-+	PsiOptions* o = PsiOptions::instance();
-+
-+	//If option name is not empty (it is empty for Invisible) and option is set to ask for message, show dialog
-+	if (forceDialog || (!optionName.isEmpty() && o->getOption("options.status.ask-for-message-on-" + optionName).toBool())) {
-+		StatusSetDlg *w = new StatusSetDlg(this, makeLastStatus(x), lastPriorityNotEmpty());
-+		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
-+		w->show();
- 	}
- 	else {
--		if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) {
--			setStatus(Status(), false, true);
--		}
--		else if(x == STATUS_INVISIBLE){
--			Status s("","",0,true);
--			s.setIsInvisible(true);
--			setStatus(s, false, true);
--		}
--		else {
--			StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, ""));
--			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
--			w->show();
-+		Status status;
-+		switch (x) {
-+		case STATUS_OFFLINE:
-+			status = PsiAccount::loggedOutStatus();
-+			break;
-+		case STATUS_INVISIBLE:
-+			status = Status("","",0,true);
-+			status.setIsInvisible(true);
-+			break;
-+		default:
-+			status = Status((XMPP::Status::Type)x, "", 0);
-+			break;
-+		}
-+		if (o->getOption("options.status.last-overwrite.by-status").toBool()) {
-+			o->setOption("options.status.last-priority", "");
-+			o->setOption("options.status.last-message", "");
-+			o->setOption("options.status.last-status", status.typeString());
- 		}
-+		setStatus(status, false, true);
- 	}
- }
- 
-@@ -5401,7 +5495,7 @@ void PsiAccount::groupChatLeave(const QS
- {
- 	Jid j(room + '@' + host);
- 	d->groupchats.removeAll(j.bare());
--	d->client->groupChatLeave(host, room);
-+	d->client->groupChatLeave(host, room, PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
- 	UserListItem *u = find(j);
- 	if (u) {
- 		d->removeEntry(j);
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -136,6 +136,7 @@ public:
- 	VoiceCaller* voiceCaller() const;
- 	Status status() const;
- 	static Status loggedOutStatus();
-+	int defaultPriority(const XMPP::Status &);
- 	void setStatusDirect(const XMPP::Status &, bool withPriority = false);
- 	void setStatusActual(const XMPP::Status &);
- 
-@@ -191,7 +192,7 @@ public:
- 	void reconfigureFTManager();
- 	void changeVCard();
- 	void changePW();
--	void changeStatus(int);
-+	void changeStatus(int, bool forceDialog = false);
- 	void doDisco();
- 
- 	void showXmlConsole();
-@@ -290,6 +291,7 @@ signals:
- 
- public slots:
- 	void setStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
-+	void showStatusDialog(const QString& presetName);
- 
- 	void capsChanged(const Jid&);
- 	void tuneStopped();
-@@ -300,6 +302,7 @@ public slots:
- 	void openNextEvent(ActivationType activationType);
- 	int forwardPendingEvents(const Jid &jid);
- 	void autoLogin();
-+	void reconnectOnce();
- 
- 	void showCert();
- 
-@@ -419,6 +422,7 @@ private slots:
- 
- 	void incomingHttpAuthRequest(const PsiHttpAuthRequest &);
- 
-+	void reconnectOncePhase2();
- 	void reconnect();
- 	void disconnect();
- 	void enableNotifyOnline();
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -299,10 +299,11 @@ void PsiActionList::Private::createMainW
- 	{
- 		// status actions
- 		IconActionGroup *statusGroup = new IconActionGroup ( this );
--		statusGroup->setText (tr("Set Status"));
--		statusGroup->setWhatsThis (tr("Smaller alternative to the Status button"));
--		statusGroup->setExclusive(false);
--		statusGroup->setUsesDropDown (true);
-+		statusGroup->setVisible(false);
-+
-+		IconAction* statusSmallerAlt = new IconAction(this);
-+		statusSmallerAlt->setText (tr("Set Status"));
-+		statusSmallerAlt->setWhatsThis (tr("Smaller alternative to the Status button"));
- 
- 		QString setStatusStr = tr("Changes your global status to '%1'");
- 
-@@ -326,6 +327,14 @@ void PsiActionList::Private::createMainW
- 
- 		statusGroup->addSeparator();
- 
-+		IconAction *chooseStatus = new IconAction(tr("Choose status..."), "psi/action_direct_presence", tr("Choose..."), 0, statusGroup);
-+		chooseStatus->setWhatsThis(tr("Show dialog to set your status"));
-+
-+		IconAction *reconnectAll = new IconAction(tr("Reconnect"), "psi/reload", tr("Reconnect"), 0, statusGroup);
-+		reconnectAll->setWhatsThis(tr("Reconnect all active accounts"));
-+
-+		statusGroup->addSeparator();
-+
- 		IconAction *statusInvisible = new IconAction (status2txt(STATUS_INVISIBLE), "status/invisible", status2txt(STATUS_INVISIBLE), 0, statusGroup, QString::number(STATUS_INVISIBLE), statusExl);
- 		statusInvisible->setWhatsThis (setStatusStr.arg(tr("Invisible")));
- 
-@@ -335,7 +344,8 @@ void PsiActionList::Private::createMainW
- 		statusOffline->setWhatsThis (setStatusStr.arg(tr("Offline")));
- 
- 		ActionNames actions[] = {
--			{ "status_all",       statusGroup     },
-+			{ "status_group",     statusGroup     },
-+			{ "status_all",       statusSmallerAlt},
- 			{ "status_chat",      statusChat      },
- 			{ "status_online",    statusOnline    },
- 			{ "status_away",      statusAway      },
-@@ -343,6 +353,8 @@ void PsiActionList::Private::createMainW
- 			{ "status_dnd",       statusDnd       },
- 			{ "status_invisible", statusInvisible },
- 			{ "status_offline",   statusOffline   },
-+			{ "choose_status",    chooseStatus    },
-+			{ "reconnect_all",    reconnectAll    },
- 			{ "", 0 }
- 		};
- 
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -547,7 +547,7 @@ bool PsiCon::init()
- 	connect(d->mainwin, SIGNAL(doManageAccounts()), SLOT(doManageAccounts()));
- 	connect(d->mainwin, SIGNAL(doGroupChat()), SLOT(doGroupChat()));
- 	connect(d->mainwin, SIGNAL(blankMessage()), SLOT(doNewBlankMessage()));
--	connect(d->mainwin, SIGNAL(statusChanged(int)), SLOT(statusMenuChanged(int)));
-+	connect(d->mainwin, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusMenuChanged(XMPP::Status::Type)));
- 	connect(d->mainwin, SIGNAL(statusMessageChanged(QString)), SLOT(setStatusMessage(QString)));
- 	connect(d->mainwin, SIGNAL(doOptions()), SLOT(doOptions()));
- 	connect(d->mainwin, SIGNAL(doToolbars()), SLOT(doToolbars()));
-@@ -727,6 +727,11 @@ bool PsiCon::haveAutoUpdater() const
- 	return d->autoUpdater != 0;
- }
- 
-+void PsiCon::updateStatusPresets()
-+{
-+	emit statusPresetsChanged();
-+}
-+
- void PsiCon::registerCaps(const QString& ext, const QStringList& features)
- {
- 	DiscoItem::Identity identity = { "client", ApplicationInfo::name(), "pc" };
-@@ -849,7 +854,7 @@ void PsiCon::changeProfile()
- 		if (messageBox.clickedButton() == cancel)
- 			return;
- 
--		setStatusFromDialog(XMPP::Status::Offline, false, true);
-+		setGlobalStatus(XMPP::Status::Offline, false, true);
- 	}
- 
- 	doQuit(QuitProfile);
-@@ -1007,37 +1012,67 @@ void PsiCon::removeAccount(PsiAccount *p
- 	d->contactList->removeAccount(pa);
- }
- 
--void PsiCon::statusMenuChanged(int x)
-+void PsiCon::statusMenuChanged(XMPP::Status::Type x, bool forceDialog)
- {
- #ifndef YAPSI
--	if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) {
--		setGlobalStatus(PsiAccount::loggedOutStatus(), false, true);
--		if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
--			d->mainwin->setTrayToolTip(Status(Status::Offline, "", 0));
-+	QString optionName;
-+	if (!forceDialog)
-+	{
-+		switch (x) {
-+		case STATUS_OFFLINE:
-+			optionName = "offline";
-+			break;
-+		case STATUS_ONLINE:
-+			optionName = "online";
-+			break;
-+		case STATUS_CHAT:
-+			optionName = "chat";
-+			break;
-+		case STATUS_AWAY:
-+			optionName = "away";
-+			break;
-+		case STATUS_XA:
-+			optionName = "xa";
-+			break;
-+		case STATUS_DND:
-+			optionName = "dnd";
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+	PsiOptions* o = PsiOptions::instance();
-+	//If option name is not empty (it is empty for Invisible) and option is set to ask for message, show dialog
-+	if (forceDialog || (!optionName.isEmpty() && o->getOption("options.status.ask-for-message-on-" + optionName).toBool())) {
-+		StatusSetDlg *w = new StatusSetDlg(this, makeLastStatus(x), lastPriorityNotEmpty());
-+		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setGlobalStatus(const XMPP::Status &, bool, bool)));
-+		connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
-+		if(o->getOption("options.ui.systemtray.enable").toBool() == true)
-+			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
-+		w->show();
- 	}
- 	else {
--		if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) {
--			setGlobalStatus(Status(), false, true);
--			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
--				d->mainwin->setTrayToolTip(Status());
--		}
--		else if(x == STATUS_INVISIBLE){
--			Status s("","",0,true);
--			s.setIsInvisible(true);
--			setGlobalStatus(s, false, true);
--			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
--				d->mainwin->setTrayToolTip(s);
-+		Status status;
-+		switch (x) {
-+		case STATUS_OFFLINE:
-+			status = PsiAccount::loggedOutStatus();
-+			break;
-+		case STATUS_INVISIBLE:
-+			status = Status("","",0,true);
-+			status.setIsInvisible(true);
-+			break;
-+		default:
-+			status = Status((XMPP::Status::Type)x, "", 0);
-+			break;
- 		}
--		else {
--			// Create a dialog with the last status message
--			StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, currentStatusMessage()));
--			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatusFromDialog(const XMPP::Status &, bool, bool)));
--			connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
--			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
--				connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
--			w->show();
-+		if (o->getOption("options.status.last-overwrite.by-status").toBool()) {
-+			o->setOption("options.status.last-priority", "");
-+			o->setOption("options.status.last-message", "");
-+			o->setOption("options.status.last-status", status.typeString());
- 		}
-+		setGlobalStatus(status, false, true);
- 	}
-+
- #else
- 	setGlobalStatus(makeStatus(x, currentStatusMessage()), false, true);
- #endif
-@@ -1070,16 +1105,6 @@ XMPP::Status::Type PsiCon::currentStatus
- #endif
- }
- 
--XMPP::Status::Type PsiCon::lastLoggedInStatusType() const
--{
--#ifdef YAPSI
--	return d->mainwin->lastLoggedInStatusType();
--#else
--// FIXME: Has to use status type from global status type selector
--	return XMPP::Status::Online;
--#endif
--}
--
- QString PsiCon::currentStatusMessage() const
- {
- #ifdef YAPSI
-@@ -1087,16 +1112,15 @@ QString PsiCon::currentStatusMessage() c
- 		return QString();
- 	return d->mainwin->statusMessage();
- #else
--	return PsiOptions::instance()->getOption("options.status.last-message").toString();
--#endif
--}
--
--void PsiCon::setStatusFromDialog(const XMPP::Status &s, bool withPriority, bool isManualStatus)
--{
--	if (isManualStatus) {
--		PsiOptions::instance()->setOption("options.status.last-message", s.status());
-+	QString message = "";
-+	foreach(PsiAccount* account, d->contactList->enabledAccounts()) {
-+		if(account->loggedIn()) {
-+			message = account->status().status();
-+			break;
-+		}
- 	}
--	setGlobalStatus(s, withPriority, isManualStatus);
-+	return message;
-+#endif
- }
- 
- void PsiCon::setStatusFromCommandline(const QString &status, const QString &message)
-@@ -1132,6 +1156,20 @@ void PsiCon::setGlobalStatus(const Statu
- 	emit statusMessageChanged(s.status());
- }
- 
-+void PsiCon::showStatusDialog(const QString& presetName)
-+{
-+	StatusPreset preset;
-+	preset.fromOptions(PsiOptions::instance(), presetName);
-+	int priority = preset.priority().hasValue() ? preset.priority().value() : 0;
-+	Status status(preset.status(), preset.message(), priority);
-+	StatusSetDlg *w = new StatusSetDlg(this, status, preset.priority().hasValue());
-+	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setGlobalStatus(const XMPP::Status &, bool, bool)));
-+	connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
-+	if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
-+		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
-+	w->show();
-+}
-+
- void PsiCon::setStatusMessage(QString message)
- {
- 	XMPP::Status s;
-@@ -1314,6 +1352,21 @@ void PsiCon::doToolbars()
- 	}
- }
- 
-+void PsiCon::doStatusPresets()
-+{
-+	OptionsDlg *w = (OptionsDlg *)dialogFind("OptionsDlg");
-+	if (w) {
-+		w->openTab("status");
-+		bringToFront(w);
-+	}
-+	else {
-+		w = new OptionsDlg(this);
-+		connect(w, SIGNAL(applyOptions()), SLOT(slotApplyOptions()));
-+		w->openTab("status");
-+		w->show();
-+	}
-+}
-+
- void PsiCon::optionChanged(const QString& option)
- {
- 	bool notifyRestart = true;
-@@ -1781,7 +1834,14 @@ void PsiCon::doWakeup()
- 	foreach(PsiAccount* account, d->contactList->enabledAccounts()) {
- 		if (account->userAccount().opt_connectAfterSleep) {
- 			// Should we do this when the network comes up ?
--			account->setStatus(Status("", "", account->userAccount().priority));
-+			if (account->accountOptions().opt_autoSameStatus) {
-+				Status s = account->accountOptions().lastStatus;
-+				account->setStatus(s, account->accountOptions().lastStatusWithPriority, true);
-+				emit statusMessageChanged(s.status());
-+			}
-+			else {
-+				account->setStatus(makeStatus(XMPP::Status::Online, ""), false, true);
-+			}
- 		}
- 	}
- }
---- psi.orig/src/psicon.h
-+++ psi/src/psicon.h
-@@ -123,10 +123,10 @@ public:
- 	void removeEvent(PsiEvent* e);
- 
- 	Status::Type currentStatusType() const;
--	Status::Type lastLoggedInStatusType() const;
- 	QString currentStatusMessage() const;
- 
- 	bool haveAutoUpdater() const;
-+	void updateStatusPresets();
- 
- 	PopupManager* popupManager() const;
- 
-@@ -140,10 +140,13 @@ signals:
- 	void emitOptionsUpdate();
- 	void restoringSavedChatsChanged();
- 	void statusMessageChanged(QString);
-+	void statusPresetsChanged();
- 
- public slots:
--	void setGlobalStatus(const Status &, bool withPriority = false, bool isManualStatus = false);
-+	void setGlobalStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
-+	void showStatusDialog(const QString& presetName);
- 	void doToolbars();
-+	void doStatusPresets();
- 	void checkAccountsEmpty();
- 
- public slots:
-@@ -156,14 +159,13 @@ public slots:
- 	void doNewBlankMessage();
- 	void doOptions();
- 	void doFileTransDlg();
--	void statusMenuChanged(int);
-+	void statusMenuChanged(XMPP::Status::Type, bool forceDialog = false);
- 	void setStatusMessage(QString message);
- 	void pa_updatedActivity();
- 	void pa_updatedAccount();
- 	void slotApplyOptions();
- 	void queueChanged();
- 	void recvNextEvent();
--	void setStatusFromDialog(const XMPP::Status &, bool withPriority, bool isManualStatus);
- 	void setStatusFromCommandline(const QString &status, const QString &message);
- 	void proxy_settingsChanged();
- 	void updateMainwinStatus();
---- psi.orig/src/psicontactmenu.cpp
-+++ psi/src/psicontactmenu.cpp
-@@ -734,7 +734,7 @@ private slots:
- 		if (!contact_)
- 			return;
- 
--		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), contact_->account()->status());
-+		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), makeLastStatus(contact_->account()->status().type()), lastPriorityNotEmpty());
- 		w->setJid(contact_->jid());
- 		connect(w, SIGNAL(setJid(const Jid &, const Status &)), SLOT(setStatusFromDialog(const Jid &, const Status &)));
- 		w->show();
---- psi.orig/src/psiiconset.cpp
-+++ psi/src/psiiconset.cpp
-@@ -623,7 +623,7 @@ PsiIcon *PsiIconset::event2icon(PsiEvent
- 	return d->jid2icon(e->from(), icon);
- }
- 
--static QString status2name(int s)
-+QString status2name(int s)
- {
- 	QString name;
- 	switch ( s ) {
---- psi.orig/src/psiiconset.h
-+++ psi/src/psiiconset.h
-@@ -103,4 +103,6 @@ private:
- 	bool loadClients();
- };
- 
-+QString status2name(int s);
-+
- #endif
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -104,6 +104,7 @@ void migrateRectEntry(const QDomElement&
- 
- 
- UserAccount::UserAccount()
-+	: lastStatus(XMPP::Status::Online)
- {
- 	reset();
- }
-@@ -132,6 +133,7 @@ void UserAccount::reset()
- 	host = "";
- 	ibbOnly = false;
- 	opt_automatic_resource = false;
-+	priority_dep_on_status = true;
- 	resource = "Psi+";
- 	priority = 55;
- 	opt_keepAlive = true;
-@@ -140,6 +142,8 @@ void UserAccount::reset()
- 	opt_log = true;
- 	opt_reconn = true;
- 	opt_connectAfterSleep = false;
-+	opt_autoSameStatus = true;
-+	lastStatusWithPriority = false;
- 	opt_ignoreSSLWarnings = true;
- 
- 	proxy_index = 0;
-@@ -179,6 +183,7 @@ void UserAccount::fromOptions(OptionsTre
- 	req_mutual_auth = o->getOption(base + ".require-mutual-auth").toBool();
- 	legacy_ssl_probe = o->getOption(base + ".legacy-ssl-probe").toBool();
- 	opt_automatic_resource = o->getOption(base + ".automatic-resource").toBool();
-+	priority_dep_on_status = o->getOption(base + ".priority-depends-on-status").toBool();
- 	opt_log = o->getOption(base + ".log").toBool();
- 	opt_reconn = o->getOption(base + ".reconn").toBool();
- 	opt_ignoreSSLWarnings = o->getOption(base + ".ignore-SSL-warnings").toBool();
-@@ -231,6 +236,19 @@ void UserAccount::fromOptions(OptionsTre
- 	resource = o->getOption(base + ".resource").toString();
- 	priority = o->getOption(base + ".priority").toInt();
- 
-+	if (allSetOptions.contains(base + ".auto-same-status")) {
-+		opt_autoSameStatus = o->getOption(base + ".auto-same-status").toBool();
-+		lastStatus.setType(o->getOption(base + ".last-status").toString());
-+		lastStatus.setStatus(o->getOption(base + ".last-status-message").toString());
-+		lastStatusWithPriority = o->getOption(base + ".last-with-priority").toBool();
-+		if (lastStatusWithPriority) {
-+			lastStatus.setPriority(o->getOption(base + ".last-priority").toInt());
-+		}
-+		else {
-+			lastStatus.setPriority(defaultPriority(lastStatus));
-+		}
-+	}
-+
- #ifdef HAVE_PGPUTIL
- 	QString pgpSecretKeyID = o->getOption(base + ".pgp-secret-key-id").toString();
- 	if (!pgpSecretKeyID.isEmpty()) {
-@@ -320,9 +338,11 @@ void UserAccount::toOptions(OptionsTree
- 	o->setOption(base + ".require-mutual-auth", req_mutual_auth);
- 	o->setOption(base + ".legacy-ssl-probe", legacy_ssl_probe);
- 	o->setOption(base + ".automatic-resource", opt_automatic_resource);
-+	o->setOption(base + ".priority-depends-on-status", priority_dep_on_status);
- 	o->setOption(base + ".log", opt_log);
- 	o->setOption(base + ".reconn", opt_reconn);
- 	o->setOption(base + ".connect-after-sleep", opt_connectAfterSleep);
-+	o->setOption(base + ".auto-same-status", opt_autoSameStatus);
- 	o->setOption(base + ".ignore-SSL-warnings", opt_ignoreSSLWarnings);
- 
- 	o->setOption(base + ".id", id);
-@@ -435,6 +455,7 @@ void UserAccount::toOptions(OptionsTree
- 
- 	o->setOption(base + ".tls.override-certificate", tlsOverrideCert);
- 	o->setOption(base + ".tls.override-domain", tlsOverrideDomain);
-+	saveLastStatus(o, base);
- }
- 
- void UserAccount::fromXml(const QDomElement &a)
-@@ -460,12 +481,8 @@ void UserAccount::fromXml(const QDomElem
- 	readBoolAttribute(a, "reconn", &opt_reconn);
- 	readBoolAttribute(a, "ignoreSSLWarnings", &opt_ignoreSSLWarnings);
- 	//readBoolAttribute(a, "gpg", &opt_gpg);
--	if (a.hasAttribute("automatic-resource")) {
--		readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
--	}
--	else {
--		opt_automatic_resource = false;
--	}
-+	readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
-+	readBoolAttribute(a, "priority-depends-on-status", &priority_dep_on_status);
- 	
- 	// Will be overwritten if there is a new option
- 	bool opt_plain = false;
-@@ -591,6 +608,37 @@ void UserAccount::fromXml(const QDomElem
- 	dtProxy = str;
- }
- 
-+int UserAccount::defaultPriority(const XMPP::Status &s)
-+{
-+	if (priority_dep_on_status) {
-+		if (s.isAvailable()) {
-+			return PsiOptions::instance()->getOption("options.status.default-priority." + s.typeString()).toInt();
-+		}
-+		else {
-+			return 0; //Priority for Offline status, it is not used
-+		}
-+	}
-+	else {
-+		return priority;
-+	}
-+}
-+
-+void UserAccount::saveLastStatus(OptionsTree *o, QString base=QString())
-+{
-+	if (base.isEmpty()) {
-+		base = optionsBase;
-+	}
-+
-+	o->setOption(base + ".last-status", lastStatus.typeString());
-+	o->setOption(base + ".last-status-message", lastStatus.status());
-+	o->setOption(base + ".last-with-priority", lastStatusWithPriority);
-+	if (lastStatusWithPriority) {
-+		o->setOption(base + ".last-priority", lastStatus.priority());
-+	}
-+	else {
-+		o->removeOption(base + ".last-priority");
-+	}
-+}
- 
- static ToolbarPrefs loadToolbarData( const QDomElement &e )
- {
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -462,6 +462,8 @@ newcontactlist {
- 		$$PWD/contactlistitemproxy.h \
- 		$$PWD/contactupdatesmanager.h \
- 		$$PWD/statusmenu.h \
-+		$$PWD/globalstatusmenu.h \
-+		$$PWD/accountstatusmenu.h \
- 		$$PWD/psirosterwidget.h \
- 		$$PWD/psifilteredcontactlistview.h
- 
-@@ -492,6 +494,8 @@ newcontactlist {
- 		$$PWD/contactlistitemproxy.cpp \
- 		$$PWD/contactupdatesmanager.cpp \
- 		$$PWD/statusmenu.cpp \
-+		$$PWD/globalstatusmenu.cpp \
-+		$$PWD/accountstatusmenu.cpp \
- 		$$PWD/psirosterwidget.cpp \
- 		$$PWD/psifilteredcontactlistview.cpp
- 
---- psi.orig/src/statuscombobox.cpp
-+++ psi/src/statuscombobox.cpp
-@@ -21,6 +21,7 @@
- #include "statuscombobox.h"
- 
- #include "psioptions.h"
-+#include "psiiconset.h"
- #include "common.h"
- 
- /**
-@@ -31,10 +32,10 @@
- StatusComboBox::StatusComboBox(QWidget* parent, XMPP::Status::Type type)
- 	: QComboBox(parent)
- {
-+	addStatus(XMPP::Status::Online);
- 	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool()) {
- 		addStatus(XMPP::Status::FFC);
- 	}
--	addStatus(XMPP::Status::Online);
- 	addStatus(XMPP::Status::Away);
- 	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
- 		addStatus(XMPP::Status::XA);
-@@ -81,7 +82,11 @@ XMPP::Status::Type StatusComboBox::statu
- // private
- 
- void StatusComboBox::addStatus(XMPP::Status::Type status){
-+#ifdef Q_WS_MAC
- 	addItem(status2txt(status), status);
-+#else
-+	addItem(PsiIconset::instance()->status(status).icon(), status2txt(status), status);
-+#endif
- }
- 
- void StatusComboBox::onCurrentIndexChanged(int index)
---- psi.orig/src/statusdlg.cpp
-+++ psi/src/statusdlg.cpp
-@@ -34,6 +34,7 @@
- #include "jidutil.h"
- #include "psicon.h"
- #include "psioptions.h"
-+#include "psiiconset.h"
- #include "psiaccount.h"
- #include "userlist.h"
- #include "common.h"
-@@ -41,7 +42,7 @@
- #include "statuspreset.h"
- #include "statuscombobox.h"
- #include "shortcutmanager.h"
--
-+#include "priorityvalidator.h"
- 
- //----------------------------------------------------------------------------
- // StatusShowDlg
-@@ -88,6 +89,7 @@ public:
- 	PsiCon *psi;
- 	PsiAccount *pa;
- 	Status s;
-+	bool withPriority;
- 	PsiTextView *te;
- 	StatusComboBox *cb_type;
- 	QComboBox *cb_preset;
-@@ -98,7 +100,7 @@ public:
- 	setStatusEnum setStatusMode;
- };
- 
--StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s)
-+StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s, bool withPriority)
- 	: QDialog(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-@@ -107,13 +109,14 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi,
- 	d->pa = 0;
- 	d->psi->dialogRegister(this);
- 	d->s = s;
-+	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: All accounts")));
- 	d->setStatusMode = setStatusForAccount;
- 	init();
- }
- 
--StatusSetDlg::StatusSetDlg(PsiAccount *pa, const Status &s)
-+StatusSetDlg::StatusSetDlg(PsiAccount *pa, const Status &s, bool withPriority)
- 	: QDialog(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-@@ -122,6 +125,7 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
- 	d->pa = pa;
- 	d->pa->dialogRegister(this);
- 	d->s = s;
-+	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
- 	d->setStatusMode = setStatusForAccount;
-@@ -164,6 +168,8 @@ void StatusSetDlg::init()
- 	hb1->addWidget(l);
- 	d->le_priority = new QLineEdit(this);
- 	d->le_priority->setMinimumWidth(30);
-+	PriorityValidator* prValidator = new PriorityValidator(d->le_priority);
-+	d->le_priority->setValidator(prValidator);
- 	hb1->addWidget(d->le_priority,1);
- 
- 	// Status preset
-@@ -171,12 +177,17 @@ void StatusSetDlg::init()
- 	hb1->addWidget(l);
- 	d->cb_preset = new QComboBox(this);
- 	d->cb_preset->addItem(tr("<None>"));
--	QStringList presets;
--	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) {
--		presets += name.toString();
-+	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets", true)) {
-+		StatusPreset sp;
-+		sp.fromOptions(PsiOptions::instance(), name.toString());
-+		sp.filterStatus();
-+#ifdef Q_WS_MAC
-+		d->cb_preset->addItem(sp.name());
-+#else
-+		d->cb_preset->addItem(PsiIconset::instance()->status(sp.status()).icon(), sp.name());
-+#endif
-+
- 	}
--	presets.sort();
--	d->cb_preset->addItems(presets);
- 	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(chooseStatusPreset(int)));
- 	hb1->addWidget(d->cb_preset,3);
- 
-@@ -203,6 +214,9 @@ void StatusSetDlg::init()
- 	d->te->setAcceptRichText(false);
- 	d->te->setText(d->s.status());
- 	d->te->selectAll();
-+	if (d->withPriority) {
-+		d->le_priority->setText(QString::number(d->s.priority()));
-+	}
- 	connect(pb1, SIGNAL(clicked()), SLOT(doButton()));
- 	connect(pb2, SIGNAL(clicked()), SLOT(cancel()));
- 	d->te->setFocus();
-@@ -259,18 +273,24 @@ void StatusSetDlg::doButton()
- 		}
- 		
- 		sp.toOptions(PsiOptions::instance());
--		QString base = PsiOptions::instance()->mapPut("options.status.presets", text);
-+		PsiOptions::instance()->mapPut("options.status.presets", text);
-+
-+		//PsiCon will emit signal to refresh presets in all status menus
-+		(d->psi ? d->psi : d->pa->psi())->updateStatusPresets();
- 	} 
- 
- 	// Set status
- 	int type = d->cb_type->status();
- 	QString str = d->te->getPlainText();
- 
-- 	if (d->le_priority->text().isEmpty())
-- 		//emit set(makeStatus(type, str), false, true);
-+	PsiOptions::instance()->setOption("options.status.last-priority", d->le_priority->text());
-+	PsiOptions::instance()->setOption("options.status.last-message", str);
-+	PsiOptions::instance()->setOption("options.status.last-status", XMPP::Status(d->cb_type->status()).typeString());
-+
-+	if (d->le_priority->text().isEmpty())
- 		switch(d->setStatusMode) {
- 			case setStatusForAccount:
--                                emit set(makeStatus(type,str), false, true);
-+				emit set(makeStatus(type,str), false, true);
- 				break;
- 			case setStatusForJid:
- 				emit setJid(d->j, makeStatus(type,str));
-@@ -279,11 +299,10 @@ void StatusSetDlg::doButton()
- 				emit setJidList(d->jl, makeStatus(type,str));
- 				break;
- 		}
-- 	else 
-- 		//emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
-+	else {
- 		switch(d->setStatusMode) {
- 			case setStatusForAccount:
--                                emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
-+				emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
- 				break;
- 			case setStatusForJid:
- 				emit setJid(d->j, makeStatus(type,str, d->le_priority->text().toInt()));
-@@ -292,7 +311,7 @@ void StatusSetDlg::doButton()
- 				emit setJidList(d->jl, makeStatus(type,str, d->le_priority->text().toInt()));
- 				break;
- 		}
--
-+	}
- 	close();
- }
- 
---- psi.orig/src/statusdlg.h
-+++ psi/src/statusdlg.h
-@@ -49,8 +49,8 @@ class StatusSetDlg : public QDialog
- {
- 	Q_OBJECT
- public:
--	StatusSetDlg(PsiCon *, const Status &);
--	StatusSetDlg(PsiAccount *, const Status &);
-+	StatusSetDlg(PsiCon *, const Status &, bool withPriority = true);
-+	StatusSetDlg(PsiAccount *, const Status &, bool withPriority = true);
- 	~StatusSetDlg();
- 
- 	void setJid(const Jid &);
---- psi.orig/src/statusmenu.cpp
-+++ psi/src/statusmenu.cpp
-@@ -26,62 +26,223 @@
- #include "xmpp_status.h"
- #include "common.h"
- 
-+#include <cassert>
-+
- /**
-  * \class StatusMenu
-  * Helper class that displays available statuses using QMenu.
-  */
- 
--StatusMenu::StatusMenu(QWidget* parent)
--	: QMenu(parent), currentStatus_(XMPP::Status::Offline)
-+StatusMenu::StatusMenu(QWidget* parent, PsiCon* _psi )
-+	: QMenu(parent), psi(_psi)
-+{
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
-+	connect(psi, SIGNAL(statusPresetsChanged()), this, SLOT(presetsChanged()));
-+	installEventFilter(this);
-+}
-+
-+void StatusMenu::fill()
- {
-+	PsiOptions* o = PsiOptions::instance();
-+
- 	addStatus(XMPP::Status::Online);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool())
--		addStatus(XMPP::Status::FFC);
--	addSeparator();
--	addStatus(XMPP::Status::Away);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool())
--		addStatus(XMPP::Status::XA);
--	addStatus(XMPP::Status::DND);
--	if (PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool()) {
-+	if (!o->getOption("options.status.show-only-online-offline").toBool()) {
-+		if (o->getOption("options.ui.menu.status.chat").toBool())
-+			addStatus(XMPP::Status::FFC);
-+		addSeparator();
-+		addStatus(XMPP::Status::Away);
-+		if (o->getOption("options.ui.menu.status.xa").toBool())
-+			addStatus(XMPP::Status::XA);
-+		addStatus(XMPP::Status::DND);
-+		if (o->getOption("options.ui.menu.status.invisible").toBool()) {
-+			addSeparator();
-+			addStatus(XMPP::Status::Invisible);
-+		}
-+	}
-+
-+	QString statusInMenus = o->getOption("options.status.presets-in-status-menus").toString();
-+	if (statusInMenus == "submenu") {
-+		addSeparator();
-+		IconActionGroup* submenu = new IconActionGroup(this);
-+		submenu->setText(tr("Presets"));
-+		submenu->setPsiIcon("psi/action_templates");
-+		const QString css = o->getOption("options.ui.contactlist.css").toString();
-+		if (!css.isEmpty()) {
-+			submenu->popup()->setStyleSheet(css);
-+		}
-+		addPresets(submenu);
-+		submenu->popup()->installEventFilter(this);
-+	}
-+	else if (statusInMenus == "yes") {
-+		addPresets();
-+	}
-+
-+	bool showChoose = o->getOption("options.status.show-choose").toBool();
-+	bool showReconnect = o->getOption("options.status.show-reconnect").toBool();
-+	if (showChoose || showReconnect) {
- 		addSeparator();
--		addStatus(XMPP::Status::Invisible);
-+		if (showChoose) {
-+			addChoose();
-+		}
-+		if (showReconnect) {
-+			addReconnect();
-+		}
- 	}
--#ifndef YAPSI_ACTIVEX_SERVER
-+
- 	addSeparator();
- 	addStatus(XMPP::Status::Offline);
--#endif
- }
- 
--void StatusMenu::setStatus(XMPP::Status::Type status)
-+void StatusMenu::clear()
- {
--	if (currentStatus_ == status)
--		return;
-+	statusActs.clear();
-+	presetActs.clear();
-+	QMenu::clear();
-+}
- 
--	currentStatus_ = status;
--	foreach(QAction* action, actions())
--		action->setChecked(actionStatus(action) == status);
-+void StatusMenu::addPresets(IconActionGroup* parent)
-+{
-+	QObject* parentMenu = parent ? parent : static_cast<QObject*>(this);
-+	PsiOptions* o = PsiOptions::instance();
-+	QVariantList presets = o->mapKeyList("options.status.presets", true);
-+	bool showEditPresets = o->getOption("options.status.show-edit-presets").toBool();
-+	if ((showEditPresets || presets.count() > 0) && !parent)
-+		this->addSeparator();
-+	if (presets.count() > 0) {
-+		foreach(QVariant name, presets) {
-+			StatusPreset preset;
-+			preset.fromOptions(o,name.toString());
-+			preset.filterStatus();
-+
-+			IconAction* action = new IconAction(name.toString().replace("&", "&&"), parentMenu, status2name(preset.status()));
-+			action->setCheckable(true);
-+			action->setProperty("preset", name);
-+			action->setProperty("message", preset.message());
-+			action->setProperty("status", QVariant(preset.status()));
-+			connect(action, SIGNAL(triggered()), SLOT(presetActivated()));
-+			presetActs.append(action);
-+		}
-+	}
-+	if (showEditPresets) {
-+		IconAction* action = new IconAction(tr("Edit presets..."), parentMenu, "psi/action_templates_edit");
-+		connect(action, SIGNAL(triggered()), SLOT(changePresetsActivated()));
-+	}
- }
- 
--XMPP::Status::Type StatusMenu::actionStatus(const QAction* action) const
-+void StatusMenu::presetsChanged()
- {
--	Q_ASSERT(action);
--	return static_cast<XMPP::Status::Type>(action->property("type").toInt());
-+	if (PsiOptions::instance()->getOption("options.status.presets-in-status-menus").toString() != "no")
-+	{
-+		//TODO Maybe refresh only presets?...
-+		clear();
-+		fill();
-+	}
-+}
-+
-+void StatusMenu::statusChanged(const Status& status)
-+{
-+	bool presetFound = false;
-+	foreach(IconAction* action, presetActs)
-+	{
-+		//Maybe we should compare with priority too
-+		int st = static_cast<int>(status.type());
-+		QString message = action->property("message").toString();
-+		if (!presetFound && action->property("status").toInt() == st && message == status.status())
-+		{
-+			action->setChecked(true);
-+			presetFound = true;
-+		}
-+		else
-+			action->setChecked(false);
-+	}
-+	bool statusFound = false;
-+	foreach(IconAction* action, statusActs)
-+	{
-+		if (!statusFound && !presetFound && action->property("type").toInt() == static_cast<int>(status.type()))
-+		{
-+			action->setChecked(true);
-+			statusFound = true;
-+		}
-+		else
-+			action->setChecked(false);
-+	}
-+}
-+
-+void StatusMenu::presetActivated()
-+{
-+	QAction* action = static_cast<QAction*>(sender());
-+	QString name = action->property("preset").toString();
-+	PsiOptions* o = PsiOptions::instance();
-+	QString base = o->mapLookup("options.status.presets", name);
-+	XMPP::Status status;
-+	status.setType(o->getOption(base + ".status").toString());
-+	status.setStatus(o->getOption(base + ".message").toString());
-+	bool withPriority = false;
-+	if (o->getOption(base + ".force-priority").toBool()) {
-+		withPriority = true;
-+		status.setPriority(o->getOption(base + ".priority").toInt());
-+	}
-+	if (o->getOption("options.status.last-overwrite.by-template").toBool()) {
-+		o->setOption("options.status.last-priority", withPriority ? QString::number(status.priority()) : "");
-+		o->setOption("options.status.last-message", status.status());
-+		o->setOption("options.status.last-status", status.typeString());
-+	}
-+	emit statusPresetSelected(status, withPriority, true);
-+}
-+
-+void StatusMenu::changePresetsActivated()
-+{
-+	psi->doStatusPresets();
- }
- 
- void StatusMenu::addStatus(XMPP::Status::Type type)
- {
--	QAction* action = new QAction(status2txt(type), this);
-+	IconAction* action = new IconAction(status2txt(type), this, status2name(type));
- 	action->setCheckable(true);
--	action->setChecked(currentStatus_ == type);
--	action->setIcon(PsiIconset::instance()->status(type).icon());
- 	action->setProperty("type", QVariant(type));
--	connect(action, SIGNAL(triggered()), SLOT(actionActivated()));
--	addAction(action);
-+	connect(action, SIGNAL(triggered()), SLOT(statusActivated()));
-+	statusActs.append(action);
- }
- 
--void StatusMenu::actionActivated()
-+XMPP::Status::Type StatusMenu::actionStatus(const QAction* action) const
-+{
-+	Q_ASSERT(action);
-+	return static_cast<XMPP::Status::Type>(action->property("type").toInt());
-+}
-+
-+void StatusMenu::statusActivated()
- {
- 	QAction* action = static_cast<QAction*>(sender());
--	setStatus(actionStatus(action));
--	emit statusChanged(currentStatus_);
-+	XMPP::Status::Type status = actionStatus(action);
-+	emit statusSelected(status, false);
-+}
-+
-+bool StatusMenu::eventFilter(QObject *obj, QEvent *event)
-+{
-+	if (event->type() == QEvent::MouseButtonRelease)
-+	{
-+		QMouseEvent* e = static_cast<QMouseEvent*>(event); //We sure event is QMouseEvent
-+		QMenu* menu = dynamic_cast<QMenu*>(obj); //Event filter can be installed on anything, so do dynamic_cast
-+		assert(menu != 0); //Dynamic cast on wrong type will return 0
-+		QAction* action = menu->actionAt(e->pos());
-+		if (action && e->button() == Qt::RightButton)
-+		{
-+			if (!action->property("type").isNull())
-+			{
-+				XMPP::Status::Type status = actionStatus(action);
-+				emit statusSelected(status, true);
-+				return true;
-+			}
-+			else if (!action->property("preset").isNull())
-+			{
-+				QString presetName = action->property("preset").toString();
-+				emit statusPresetDialogForced(presetName);
-+				return true;
-+			}
-+		}
-+	}
-+	return false;
- }
---- psi.orig/src/statusmenu.h
-+++ psi/src/statusmenu.h
-@@ -22,30 +22,48 @@
- #define STATUSMENU_H
- 
- #include <QMenu>
-+#include <QMouseEvent>
- 
-+#include "psicon.h"
-+#include "iconaction.h"
- #include "xmpp_status.h"
- 
- class StatusMenu : public QMenu
- {
- 	Q_OBJECT
--public:
--	StatusMenu(QWidget* parent);
-+protected:
-+	PsiCon* psi;
-+	QList<IconAction*> statusActs, presetActs;
-+
-+	bool eventFilter(QObject *obj, QEvent *event);
- 
--	void setStatus(XMPP::Status::Type);
-+public:
-+	StatusMenu(QWidget* parent, PsiCon* _psi );
-+	void fill();
-+	void clear();
-+
-+public slots:
-+	void presetsChanged();
-+	void statusChanged(const XMPP::Status& status);
- 
- signals:
--	void statusChanged(XMPP::Status::Type);
-+	void statusSelected(XMPP::Status::Type, bool);
-+	void statusPresetSelected(const XMPP::Status &status, bool withPriority, bool isManualStatus);
-+	void statusPresetDialogForced(const QString& presetName);
- 
- private:
-+	//It is empty here, because in global menu we'll use global action, but for account menu we'll create new action
-+	virtual void addChoose() = 0;
-+	virtual void addReconnect() = 0;
-+
- 	void addStatus(XMPP::Status::Type type);
-+	void addPresets(IconActionGroup* parent = 0);
-+	XMPP::Status::Type actionStatus(const QAction* action) const;
- 
- private slots:
--	void actionActivated();
--
--private:
--	XMPP::Status::Type currentStatus_;
--
--	XMPP::Status::Type actionStatus(const QAction* action) const;
-+	void presetActivated();
-+	void changePresetsActivated();
-+	void statusActivated();
- };
- 
- #endif
---- psi.orig/src/statuspreset.cpp
-+++ psi/src/statuspreset.cpp
-@@ -22,6 +22,7 @@
- 
- #include "maybe.h"
- #include "statuspreset.h"
-+#include "psioptions.h"
- 
- //-----------------------------------------------------------------------------
- // StatusPreset
-@@ -88,6 +89,16 @@ void StatusPreset::setPriority(int prior
- 	priority_ = Maybe<int>(priority);
- }
- 
-+void StatusPreset::setPriority(const QString& priority)
-+{
-+	bool ok = false;
-+	int p = priority.toInt(&ok);
-+	if (ok)
-+		setPriority(p);
-+	else
-+		clearPriority();
-+}
-+
- void StatusPreset::clearPriority() 
- {
- 	priority_ = Maybe<int>();
-@@ -128,6 +139,30 @@ void StatusPreset::fromXml(const QDomEle
- 	setStatus(status.type());
- }
- 
-+void StatusPreset::filterStatus()
-+{
-+	PsiOptions* o = PsiOptions::instance();
-+	switch (status_) {
-+	case XMPP::Status::FFC:
-+		if (!o->getOption("options.ui.menu.status.chat").toBool()) {
-+			status_ = XMPP::Status::Online;
-+		}
-+		break;
-+	case XMPP::Status::XA:
-+		if (!o->getOption("options.ui.menu.status.xa").toBool()) {
-+			status_ = XMPP::Status::Away;
-+		}
-+		break;
-+	case XMPP::Status::Invisible:
-+		if (!o->getOption("options.ui.menu.status.invisible").toBool()) {
-+			status_ = XMPP::Status::DND;
-+		}
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
- void StatusPreset::toOptions(OptionsTree *o)
- {
- 	QString base = o->mapPut("options.status.presets", name());
-@@ -138,3 +173,14 @@ void StatusPreset::toOptions(OptionsTree
- 		o->setOption(base + ".priority", priority().value());
- 	}
- }
-+
-+void StatusPreset::fromOptions(OptionsTree *o, QString name)
-+{
-+	QString path = o->mapLookup("options.status.presets", name);
-+	name_ = name;
-+	bool forcePriority = o->getOption(path + ".force-priority").toBool();
-+	message_ = o->getOption(path + ".message").toString();
-+	status_ = XMPP::Status::txt2type(o->getOption(path + ".status").toString());
-+	if (forcePriority)
-+		priority_ = o->getOption(path + ".priority").toInt();
-+}
---- psi.orig/src/statuspreset.h
-+++ psi/src/statuspreset.h
-@@ -46,9 +46,12 @@ public:
- 	void setStatus(XMPP::Status::Type);
- 	Maybe<int> priority() const;
- 	void setPriority(int priority);
-+	void setPriority(const QString& priority);
- 	void clearPriority();
-+	void filterStatus();
- 
- 	void toOptions(OptionsTree *o);
-+	void fromOptions(OptionsTree *o, QString name);
- 	QDomElement toXml(QDomDocument&) const;
- 	void fromXml(const QDomElement&);
- 
---- psi.orig/src/tools/optionstree/optionstree.cpp
-+++ psi/src/tools/optionstree/optionstree.cpp
-@@ -205,10 +205,34 @@ void OptionsTree::mapPut(const QString &
- 	setOption(mapPut(basename, key) + '.' + node, value);
- }
- 
--QVariantList OptionsTree::mapKeyList(const QString &basename) const
-+bool mapKeyListLessThanByNumber(const QString &s1, const QString &s2)
-+{
-+	int dotpos = s1.lastIndexOf('.');
-+	if (s1.leftRef(dotpos+1).compare(s2.leftRef(dotpos+1)) == 0)
-+	{
-+		QString name1 = s1.mid(dotpos+1), name2 = s2.mid(dotpos+1);
-+		if (name1[0] == 'm' && name2[0] == 'm')
-+		{
-+			bool ok1 = false, ok2 = false;
-+			unsigned int n1 = name1.mid(1).toUInt(&ok1), n2 = name2.mid(1).toUInt(&ok2);
-+			if (ok1 && ok2)
-+			{
-+				return n1 < n2;
-+			}
-+		}
-+	}
-+	//fallback to string comparison
-+	return s1 < s2;
-+}
-+
-+QVariantList OptionsTree::mapKeyList(const QString &basename, bool sortedByNumbers) const
- {
- 	QVariantList ret;
- 	QStringList children = getChildOptionNames( basename, true, true);
-+	if (sortedByNumbers)
-+	{
-+		qSort(children.begin(), children.end(), mapKeyListLessThanByNumber);
-+	}
- 	foreach (QString path, children) {
- 		ret << getOption(path+".key");
- 	}
---- psi.orig/src/tools/optionstree/optionstree.h
-+++ psi/src/tools/optionstree/optionstree.h
-@@ -54,7 +54,7 @@ public:
- 	void mapPut(const QString &basename, const QVariant &key, const QString &node, const QVariant &value);
- 	QVariant mapGet(const QString &basename, const QVariant &key, const QString &node) const;
- 	QVariant mapGet(const QString &basename, const QVariant &key, const QString &node, const QVariant &def) const;
--	QVariantList mapKeyList(const QString &basename) const;
-+	QVariantList mapKeyList(const QString &basename, bool sortedByNumbers = false) const;
- 
- 
- 	bool saveOptions(const QString& fileName, const QString& configName, const QString& configNS, const QString& configVersion, bool streamWriter = false) const;
---- psi.orig/src/widgets/iconaction.cpp
-+++ psi/src/widgets/iconaction.cpp
-@@ -511,4 +511,9 @@ void IconActionGroup::addingToolButton(I
- 	btn->setPopupMode( QToolButton::MenuButtonPopup );
- }
- 
-+QMenu* IconActionGroup::popup()
-+{
-+	return d->popup;
-+}
-+
- #include "iconaction.moc"
---- psi.orig/src/widgets/iconaction.h
-+++ psi/src/widgets/iconaction.h
-@@ -107,6 +107,8 @@ public:
- 
- 	IconAction *copy() const;
- 
-+	QMenu* popup();
-+
- public:
- 	class Private;
- private:

psi-plus-main-20130107.tar.xz/patches/0830-psi-tray-act-bring-to-front.diff Deleted

@@ -1,433 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -212,6 +212,7 @@ QLineEdit#le_status_text {
- 				<lockdown-roster type="bool">false</lockdown-roster>
- 				<raise-on-new-event type="bool">false</raise-on-new-event>
- 				<quit-on-close type="bool">false</quit-on-close>
-+				<raise-inactive type="bool">true</raise-inactive>
- 				<show-roster-avatar-frame type="bool">false</show-roster-avatar-frame>
- 				<show>
- 					<agent-contacts type="bool">true</agent-contacts>
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -84,6 +84,10 @@
- #include "rosteravatarframe.h"
- #include "avatars.h"
- 
-+#ifdef Q_WS_X11
-+#include <x11windowsystem.h>
-+#endif
-+
- using namespace XMPP;
- 
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -144,6 +148,10 @@ public:
- 	int hideTimerInterval; //interval in sec
- 	bool useAutohide;
- 
-+#ifdef Q_WS_WIN
-+	DWORD deactivationTickCount;
-+#endif
-+
- 	QSignalMapper* statusMapper;
- 
- 	PsiIcon* nextAnim;
-@@ -1430,7 +1438,23 @@ void MainWin::closeEvent(QCloseEvent* e)
- 
- void MainWin::changeEvent(QEvent *event)
- {
--    if (event->type() == QEvent::ActivationChange ||
-+#ifdef Q_WS_WIN
-+	if (event->type() == QEvent::ActivationChange
-+		&& PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()
-+		&& PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool()) {
-+		//On Windows app window loose active state when you
-+		//  click on tray icon. Workaround is to use timer:
-+		//  we'll keep activated == true within 300 msec
-+		//  (+ doubleClickInterval, if double click is enabled)
-+		//  after deactivation.
-+		if (!isActiveWindow())
-+		{
-+			d->deactivationTickCount = GetTickCount();
-+		}
-+	}
-+#endif
-+
-+	if (event->type() == QEvent::ActivationChange ||
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (d->mainTabs) {
-@@ -1556,14 +1580,37 @@ void MainWin::optionsUpdate()
- 	updateTray();
- }
- 
--void MainWin::toggleVisible()
-+void MainWin::toggleVisible(bool fromTray)
- {
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
-+	if (PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool())
-+	{
-+		bool hidden = false;
-+#ifdef Q_WS_WIN
-+		if (fromTray) {
-+			int timeout = 300;
-+			if (PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool())
-+				timeout += qApp->doubleClickInterval();
-+			hidden = isHidden() || (GetTickCount() - d->deactivationTickCount > timeout);
-+		}
-+		else {
-+			hidden = isHidden() || !isActiveWindow();
-+		}
-+#elif defined(Q_WS_X11)
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || X11WindowSystem::instance()->isWindowObscured(this, PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool());
-+#else
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || !isActiveWindow();
-+#endif
-+		if(hidden) {
-+			trayShow();
-+		}
-+		else {
-+			trayHide();
-+		}
- 	}
-+	else
-+		isHidden() ? trayShow() : trayHide();
- }
- 
- void MainWin::setTrayToolTip(const Status&, bool, bool)
-@@ -1586,32 +1633,21 @@ void MainWin::trayClicked(const QPoint &
- 		return;
- 	}
- 
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayDoubleClicked()
- {
--	if(!PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
--		return;
--	}
-+	//Double click works like second single click now if "double-click" style is disabled
- 
--	if(d->nextAmount > 0) {
--		doRecvNextEvent();
--		return;
-+	if(PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
-+		if(d->nextAmount > 0) {
-+			doRecvNextEvent();
-+			return;
-+		}
- 	}
- 
--
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayShow()
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -175,7 +175,7 @@ public slots:
- 	void optionsUpdate();
- 	void setTrayToolTip(const XMPP::Status &, bool usePriority = false, bool isManualStatus = false);
- 
--	void toggleVisible();
-+	void toggleVisible(bool fromTray = false);
- 
- 	void avcallConfig();
- 
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -363,6 +363,10 @@ SOURCES += \
- 	$$PWD/rosteravatarframe.cpp \
- 	$$PWD/sendbuttonmenu.cpp
- 
-+unix:!macx:!haiku {
-+	HEADERS += $$PWD/x11windowsystem.h
-+	SOURCES += $$PWD/x11windowsystem.cpp
-+}
- 
- CONFIG += filetransfer
- filetransfer {
---- /dev/null
-+++ git/src/x11windowsystem.cpp
-@@ -0,0 +1,215 @@
-+#include "x11windowsystem.h"
-+
-+#include <QX11Info>
-+#include <X11/Xlib.h>
-+
-+const long MAX_PROP_SIZE = 100000;
-+X11WindowSystem* X11WindowSystem::_instance = 0;
-+
-+X11WindowSystem::X11WindowSystem()
-+{
-+	const int atomsCount = 10;
-+	const char* names[atomsCount] = {
-+		"_NET_CLIENT_LIST_STACKING",
-+		"_NET_FRAME_EXTENTS",
-+
-+		"_NET_WM_WINDOW_TYPE",
-+		"_NET_WM_WINDOW_TYPE_NORMAL",
-+		"_NET_WM_WINDOW_TYPE_DIALOG",
-+		"_NET_WM_WINDOW_TYPE_UTILITY",
-+		"_NET_WM_WINDOW_TYPE_SPLASH",
-+
-+		"_NET_WM_STATE",
-+		"_NET_WM_STATE_ABOVE",
-+		"_NET_WM_STATE_HIDDEN"
-+	};
-+	Atom atoms[atomsCount], *atomsp[atomsCount] = {
-+		&net_client_list_stacking,
-+		&net_frame_extents,
-+
-+		&net_wm_window_type,
-+		&net_wm_window_type_normal,
-+		&net_wm_window_type_dialog,
-+		&net_wm_window_type_utility,
-+		&net_wm_window_type_splash,
-+
-+		&net_wm_state,
-+		&net_wm_state_above,
-+		&net_wm_state_hidden
-+	};
-+	int i = atomsCount;
-+	while (i--)
-+		atoms[i] = 0;
-+
-+	XInternAtoms(QX11Info::display(), (char**)names, atomsCount, true, atoms);
-+
-+	i = atomsCount;
-+	while (i--)
-+		*atomsp[i] = atoms[i];
-+
-+	if (net_wm_window_type_normal != None)
-+		normalWindows.insert(net_wm_window_type_normal);
-+	if (net_wm_window_type_dialog != None)
-+		normalWindows.insert(net_wm_window_type_dialog);
-+	if (net_wm_window_type_utility != None)
-+		normalWindows.insert(net_wm_window_type_utility);
-+	if (net_wm_window_type_splash != None)
-+		normalWindows.insert(net_wm_window_type_splash);
-+
-+	if (net_wm_state_hidden != None)
-+		ignoredWindowStates.insert(net_wm_state_hidden);
-+}
-+
-+X11WindowSystem* X11WindowSystem::instance()
-+{
-+	if (!_instance)
-+		_instance = new X11WindowSystem();
-+	return X11WindowSystem::_instance;
-+}
-+
-+// Get window coords relative to desktop window
-+QRect X11WindowSystem::windowRect(Window win)
-+{
-+	Window w_unused;
-+	int x, y;
-+	unsigned int w, h, junk;
-+	XGetGeometry(QX11Info::display(), win, &w_unused, &x, &y, &w, &h, &junk, &junk);
-+	XTranslateCoordinates(QX11Info::display(), win, QX11Info::appRootWindow(), 0, 0, &x, &y, &w_unused);
-+
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+	const Atom XA_CARDINAL = (Atom) 6;
-+	if (net_frame_extents != None && XGetWindowProperty(QX11Info::display(), win, net_frame_extents,
-+														0l, 4l, False, XA_CARDINAL, &type_ret, &format_ret,
-+														&nitems_ret, &unused, &data_ret) == Success)
-+	{
-+		if (type_ret == XA_CARDINAL && format_ret == 32 && nitems_ret == 4) {
-+			//Struts array: 0 - left, 1 - right, 2 - top, 3 - bottom
-+			long *d = (long *) data_ret;
-+			x -= d[0];
-+			y -= d[2];
-+			w += d[0] + d[1];
-+			h += d[2] + d[3];
-+		}
-+		if ( data_ret )
-+			XFree(data_ret);
-+	}
-+
-+	return QRect(x, y, w, h);
-+}
-+
-+// Determine if window is obscured by other windows
-+bool X11WindowSystem::isWindowObscured(QWidget *widget, bool alwaysOnTop)
-+{
-+	if (net_wm_state_above != None)
-+	{
-+		if (!alwaysOnTop)
-+			ignoredWindowStates.insert(net_wm_state_above);
-+		else
-+			ignoredWindowStates.remove(net_wm_state_above);
-+	}
-+
-+	//TODO Is it correct to use QX11Info::appRootWindow() as root window?
-+	Q_ASSERT(widget);
-+	QWidget* w = widget->window();
-+	Window win = w->winId();
-+
-+	const Atom XA_WINDOW= (Atom) 33;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+
-+	if (net_client_list_stacking != None)
-+	{
-+		QRect winRect = windowRect(win);
-+		if (XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), net_client_list_stacking,
-+					   0, MAX_PROP_SIZE, False, XA_WINDOW, &type_ret,
-+					   &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
-+			if (type_ret == XA_WINDOW && format_ret == 32) {
-+				Window *wins = (Window *) data_ret;
-+
-+				//Enumerate windows in reverse order (from most foreground window)
-+				while (nitems_ret--)
-+				{
-+					Window current = wins[nitems_ret];
-+
-+					//We are not interested in underlying windows
-+					if (current == win)
-+						break;
-+
-+					//If our window in not alwaysOnTop ignore such windows, because we can't raise on top of them
-+					if (windowHasAnyOfStates(current, ignoredWindowStates))
-+						continue;
-+
-+					if (!windowHasOnlyTypes(current, normalWindows))
-+						continue;
-+
-+					QRect rect = windowRect(current);
-+					if (winRect.intersects(rect))
-+						return true;
-+				}
-+			}
-+			if (data_ret)
-+				XFree(data_ret);
-+		}
-+	}
-+	return false;
-+}
-+
-+//If window has any type other than allowed_types return false, else return true
-+bool X11WindowSystem::windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes)
-+{
-+	const Atom XA_ATOM = (Atom) 4;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+
-+	if (net_wm_window_type != None && XGetWindowProperty(QX11Info::display(), win, net_wm_window_type,
-+														 0l, 2048l, False, XA_ATOM, &type_ret,
-+														 &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
-+		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
-+			Atom *types = (Atom *) data_ret;
-+			for (unsigned long i = 0; i < nitems_ret; i++)
-+			{
-+				if (!allowedTypes.contains(types[i]))
-+				{
-+					return false;
-+				}
-+			}
-+		}
-+		if (data_ret)
-+			XFree(data_ret);
-+		return true;
-+	}
-+	else
-+		return false;
-+}
-+
-+//If window has any of filteredStates return
-+bool X11WindowSystem::windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates)
-+{
-+	const Atom XA_ATOM = (Atom) 4;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+	if (net_wm_state != None && XGetWindowProperty(QX11Info::display(), win, net_wm_state, 0l, 2048l,
-+												   False, XA_ATOM, &type_ret, &format_ret,
-+												   &nitems_ret, &unused, &data_ret) == Success) {
-+		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
-+			Atom *states = (Atom *) data_ret;
-+			for (unsigned long i = 0; i < nitems_ret; i++) {
-+
-+				if (filteredStates.contains(states[i]))
-+					return true;
-+			}
-+		}
-+		if ( data_ret )
-+			XFree(data_ret);
-+	}
-+	return false;
-+}
---- /dev/null
-+++ git/src/x11windowsystem.h
-@@ -0,0 +1,44 @@
-+#ifndef X11WINDOWSYSTEM_H
-+#define X11WINDOWSYSTEM_H
-+
-+#include <QtCore>
-+#include <QWidget>
-+#include <QRect>
-+#include <QSet>
-+
-+//TODO: Find a way to include Xlib here and not redefine Atom and Window types
-+typedef unsigned long Atom;
-+typedef unsigned long Window;
-+
-+class X11WindowSystem {
-+private:
-+	Atom net_client_list_stacking;
-+	Atom net_frame_extents;
-+
-+	Atom net_wm_window_type;
-+	Atom net_wm_window_type_normal;
-+	Atom net_wm_window_type_dialog;
-+	Atom net_wm_window_type_utility;
-+	Atom net_wm_window_type_splash;
-+
-+	Atom net_wm_state;
-+	Atom net_wm_state_above;
-+	Atom net_wm_state_hidden;
-+
-+	QSet<Atom> normalWindows, ignoredWindowStates;
-+
-+	static X11WindowSystem* _instance;
-+	X11WindowSystem();
-+	~X11WindowSystem() {}
-+	X11WindowSystem(const X11WindowSystem& ) {};
-+	X11WindowSystem & operator=(const X11WindowSystem &) {return *this;};
-+
-+public:
-+	static X11WindowSystem* instance();
-+	QRect windowRect(Window win);
-+	bool isWindowObscured(QWidget *widget, bool alwaysOnTop);
-+	bool windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes);
-+	bool windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates);
-+};
-+
-+#endif // X11WINDOWSYSTEM_H

psi-plus-main-20130107.tar.xz/patches/0840-psi-custom-icons-size.diff Deleted

@@ -1,264 +0,0 @@
---- psi.orig/src/discodlg.cpp
-+++ psi/src/discodlg.cpp
-@@ -1015,7 +1015,8 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 
- 	// create toolbar
- 	toolBar = new QToolBar(tr("Service Discovery toolbar"), dlg);
--	toolBar->setIconSize(QSize(16,16));
-+	int s = PsiIconset::instance()->system().iconSize();
-+	toolBar->setIconSize(QSize(s,s));
- 	toolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
- 	replaceWidget(dlg->toolBarPlaceholder, toolBar);
- 
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -714,7 +714,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
- 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
- 
--	ui_.toolbar->setIconSize(QSize(16,16));
-+	int s = PsiIconset::instance()->system().iconSize();
-+	ui_.toolbar->setIconSize(QSize(s,s));
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_find);
- 	ui_.toolbar->addAction(d->act_configure);
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -25,6 +25,7 @@
- #include "fancylabel.h"
- #include "iconset.h"
- #include "iconwidget.h"
-+#include "psiiconset.h"
- 
- #include <QLayout>
- #include <QLabel>
-@@ -87,7 +88,8 @@ public:
- 			iconSize = icon.availableSizes().first();
- 		else
- #endif
--			iconSize = QSize(16, 16);
-+			int s = PsiIconset::instance()->system().iconSize();
-+			iconSize = QSize(s,s);
- 		QRect iconRect = opt.rect;
- 		iconRect.setLeft(4);
- 		iconRect.setWidth(iconSize.width());
-@@ -147,7 +149,8 @@ public:
- 			iconSize = icon.availableSizes().first();
- 		else
- #endif
--			iconSize = QSize(16, 16);
-+			int s = PsiIconset::instance()->system().iconSize();
-+			iconSize = QSize(s,s);
- 
- 		int width = iconSize.width();
- 		width += 8;
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -270,6 +270,10 @@ void PsiChatDlg::setLooks()
- 	ui_.splitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
-+	int s = PsiIconset::instance()->system().iconSize();
-+	ui_.lb_status->setFixedSize(s,s);
-+	ui_.lb_client->setFixedSize(s,s);
-+
- 	ui_.tb_pgp->hide();
- 	if (smallChat_) {
- 		ui_.lb_status->hide();
-@@ -394,7 +398,8 @@ void PsiChatDlg::initToolButtons()
- void PsiChatDlg::initToolBar()
- {
- 	ui_.toolbar->setWindowTitle(tr("Chat Toolbar"));
--	ui_.toolbar->setIconSize(QSize(16, 16));
-+	int s = PsiIconset::instance()->system().iconSize();
-+	ui_.toolbar->setIconSize(QSize(s, s));
- 	ui_.toolbar->addAction(act_clear_);
- // typeahead find bar
- 	ui_.toolbar->addAction(act_find);
---- psi.orig/src/psicontactlistviewdelegate.cpp
-+++ psi/src/psicontactlistviewdelegate.cpp
-@@ -47,6 +47,7 @@ static const QString useDefaultAvatarPat
- static const QString avatarAtLeftOptionPath = "options.ui.contactlist.avatars.avatars-at-left";
- static const QString showStatusIconsPath = "options.ui.contactlist.show-status-icons";
- static const QString statusIconsOverAvatarsPath = "options.ui.contactlist.status-icon-over-avatar";
-+static const QString statusIconsetOptionPath = "options.iconsets.status";
- 
- PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
- 	: ContactListViewDelegate(parent)
-@@ -59,6 +60,8 @@ PsiContactListViewDelegate::PsiContactLi
- 	connect(alertTimer_, SIGNAL(timeout()), SLOT(updateAlerts()));
- 
- 	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+	connect(PsiIconset::instance(), SIGNAL(rosterIconsSizeChanged(int)), SLOT(rosterIconsSizeChanged(int)));
-+	statusIconSize_ = PsiIconset::instance()->roster.value(PsiOptions::instance()->getOption(statusIconsetOptionPath).toString())->iconSize();
- 	optionChanged(slimGroupsOptionPath);
- 	optionChanged(outlinedGroupsOptionPath);
- 	optionChanged(contactListFontOptionPath);
-@@ -537,7 +540,7 @@ void PsiContactListViewDelegate::optionC
- 		font_ = new QFont();
- 		font_->fromString(PsiOptions::instance()->getOption(contactListFontOptionPath).toString());
- 		fontMetrics_ = new QFontMetrics(*font_);
--		rowHeight_ = qMax(fontMetrics_->height()+2, 18); // 18 - default row height
-+		rowHeight_ = qMax(fontMetrics_->height()+2, statusIconSize_+2);
- 		contactList()->viewport()->update();
- 	}
- 	else if (option == contactListBackgroundOptionPath) {
-@@ -612,6 +615,13 @@ void PsiContactListViewDelegate::optionC
- 	}
- }
- 
-+void PsiContactListViewDelegate::rosterIconsSizeChanged(int size)
-+{
-+	statusIconSize_ = size;
-+	rowHeight_ = qMax(fontMetrics_->height()+2, statusIconSize_+2);
-+	contactList()->viewport()->update();
-+}
-+
- void PsiContactListViewDelegate::drawText(QPainter* painter, const QStyleOptionViewItem& o, const QRect& rect, const QString& text, const QModelIndex& index) const
- {
- 	QRect r(rect);
---- psi.orig/src/psicontactlistviewdelegate.h
-+++ psi/src/psicontactlistviewdelegate.h
-@@ -58,6 +58,7 @@ protected:
- private slots:
- 	void optionChanged(const QString& option);
- 	void updateAlerts();
-+	void rosterIconsSizeChanged(int size);
- 
- private:
- 	QTimer* alertTimer_;
-@@ -69,6 +70,7 @@ private:
- 	bool showAvatars_, useDefaultAvatar_, avatarAtLeft_, showStatusIcons_, statusIconsOverAvatars_;
- 	int avatarSize_, avatarRadius_,;
- 	mutable QHash<QModelIndex, bool> alertingIndexes_;
-+	int statusIconSize_;
- };
- 
- #endif
---- psi.orig/src/psiiconset.cpp
-+++ psi/src/psiiconset.cpp
-@@ -333,6 +333,11 @@ bool PsiIconset::loadSystem()
- 	QString cur_system = PsiOptions::instance()->getOption("options.iconsets.system").toString();
- 	if (d->cur_system != cur_system) {
- 		Iconset sys = d->systemIconset(&ok);
-+
-+		if(sys.iconSize() != d->system.iconSize()) {
-+			emit systemIconsSizeChanged(sys.iconSize());
-+		}
-+
- 		d->loadIconset(&d->system, &sys);
- 
- 		//d->system = d->systemIconset();
-@@ -507,6 +512,10 @@ void PsiIconset::reloadRoster()
- 	if (d->cur_status != cur_status) {
- 		Iconset *newDef = d->defaultRosterIconset(&ok);
- 		Iconset *oldDef = roster[d->cur_status];
-+
-+		if(oldDef->iconSize() != newDef->iconSize())
-+			emit rosterIconsSizeChanged(newDef->iconSize());
-+
- 		d->loadIconset(oldDef, newDef);
- 
- 		roster.remove(d->cur_status);
---- psi.orig/src/psiiconset.h
-+++ psi/src/psiiconset.h
-@@ -80,6 +80,8 @@ public:
- 
- signals:
- 	void emoticonsChanged();
-+	void systemIconsSizeChanged(int);
-+	void rosterIconsSizeChanged(int);
- 
- public slots:
- 	static void reset();
---- psi.orig/src/psitoolbar.cpp
-+++ psi/src/psitoolbar.cpp
-@@ -29,6 +29,7 @@
- #include <QToolButton>
- 
- #include "iconset.h"
-+#include "psiiconset.h"
- #include "iconaction.h"
- #include "psioptions.h"
- #include "options/opt_toolbars.h"
-@@ -63,7 +64,8 @@ PsiToolBar::PsiToolBar(const QString& ba
- 	Q_ASSERT(mainWindow);
- 	Q_ASSERT(actionList_);
- 
--	setIconSize(QSize(16, 16));
-+	int s = PsiIconset::instance()->system().iconSize();
-+	setIconSize(QSize(s, s));
- 
- 	customizeAction_ = new QAction(tr("&Configure Toolbar..."), this);
- 	connect(customizeAction_, SIGNAL(triggered()), this, SIGNAL(customize()));
---- psi.orig/src/tools/iconset/iconset.cpp
-+++ psi/src/tools/iconset/iconset.cpp
-@@ -1028,6 +1028,7 @@ private:
- 		//authors << "I. M. Anonymous";
- 		//creation = "1900-01-01";
- 		homeUrl = QString::null;
-+		iconSize_ = 16;
- 	}
- 
- public:
-@@ -1036,6 +1037,7 @@ public:
- 	QHash<QString, PsiIcon *> dict; // unsorted hash for fast search
- 	QList<PsiIcon *> list;          // sorted list
- 	QHash<QString, QString> info;
-+	int iconSize_;
- 
- public:
- 	Private()
-@@ -1129,6 +1131,8 @@ public:
- 	{
- 		Q_UNUSED(dir);
- 
-+		iconSize_ = 16;
-+
- 		for (QDomNode node = i.firstChild(); !node.isNull(); node = node.nextSibling()) {
- 			QDomElement e = node.toElement();
- 			if( e.isNull() ) {
-@@ -1139,6 +1143,10 @@ public:
- 			if ( tag == "name" ) {
- 				name = e.text();
- 			}
-+			else if( tag == "size") {
-+				QString str = e.text();
-+				iconSize_ = str.toInt();
-+			}
- 			else if ( tag == "version" ) {
- 				version = e.text();
- 			}
-@@ -1410,6 +1418,7 @@ public:
- 		filename = from.filename;
- 		authors = from.authors;
- 		info = from.info;
-+		iconSize_ = from.iconSize_;
- 	}
- };
- //! \endif
-@@ -1599,6 +1608,14 @@ const QString &Iconset::name() const
- }
- 
- /**
-+ * Returns the icons size from Iconset.
-+ */
-+const int &Iconset::iconSize() const
-+{
-+	return d->iconSize_;
-+}
-+
-+/**
-  * Returns the Iconset version.
-  */
- const QString &Iconset::version() const
---- psi.orig/src/tools/iconset/iconset.h
-+++ psi/src/tools/iconset/iconset.h
-@@ -207,6 +207,7 @@ public:
- 	const QStringList &authors() const;
- 	const QString &creation() const;
- 	const QString &homeUrl() const;
-+	const int &iconSize() const;
- 
- 	const QString &fileName() const;
- 	void setFileName(const QString &);

psi-plus-main-20130107.tar.xz/patches/0850-psi-options-language-select.diff Deleted

@@ -1,101 +0,0 @@
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -3,11 +3,16 @@
- #include "iconwidget.h"
- #include "psioptions.h"
- #include "proxy.h"
-+#include "translationmanager.h"
-+#include "varlist.h"
-+#include "applicationinfo.h"
- 
- #include <QCheckBox>
- #include <QComboBox>
- #include <QLineEdit>
-+#include "qsettings.h"
- #include <QList>
-+#include <QMessageBox>
- 
- #include "ui_opt_application.h"
- 
-@@ -101,6 +106,23 @@ void OptionsTabApplication::applyOptions
- 
- 	//Proxy
- 	ProxyManager::instance()->proxyForObject()->save();
-+
-+	// Language
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QString lang = d->cb_lang->currentText();
-+	QString itemData;
-+	foreach(VarListItem it, TranslationManager::instance()->availableTranslations() ) {
-+		if(it.data() == lang) {
-+			itemData = it.key();
-+			break;
-+		}
-+	}
-+	if(curLang != itemData && !itemData.isEmpty()) {
-+		TranslationManager::instance()->loadTranslation(itemData);
-+		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
-+	}
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	s.setValue("last_lang", itemData);
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -123,6 +145,21 @@ void OptionsTabApplication::restoreOptio
- 	// data transfer
- 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
- 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
-+
-+	// Language
-+	VarList vList = TranslationManager::instance()->availableTranslations();
-+	QStringList lang = vList.varsToStringList();
-+	d->cb_lang->addItem(tr("Default"));
-+	foreach(QString item, lang) {
-+		d->cb_lang->addItem(vList.get(item));
-+	}
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	QString curL = s.value("last_lang", "").toString();
-+	if (curL.isEmpty())
-+		d->cb_lang->setCurrentIndex( 0 );
-+	else if(!curLang.isEmpty() && lang.contains(curLang) )
-+		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -179,6 +179,33 @@
-     </widget>
-    </item>
-    <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="label_2">
-+       <property name="text">
-+        <string>Language</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cb_lang"/>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Vertical</enum>

psi-plus-main-20130107.tar.xz/patches/0910-psi-small-tooltip-fix.diff Deleted

@@ -1,287 +0,0 @@
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -31,6 +31,7 @@
- #include "mucmanager.h"
- #include "psioptions.h"
- #include "jidutil.h"
-+#include "psiiconset.h"
- 
- using namespace XMPP;
- 
-@@ -752,31 +753,54 @@ QString UserListItem::makeBareTip(bool t
- 	// you most probably want to wrap it with TextUtil::escape()
- 
- 	QString str;
-+	int s = PsiIconset::instance()->system().iconSize();
-+	str +=QString("<style type='text/css'> \
-+		.layer1 { white-space:pre; margin-left:%1px;} \
-+		.layer2 { white-space:normal; margin-left:%1px;} \
-+	</style>").arg(s+2);
-+
- 	QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
- 	bool useAvatar = false;
-+	bool mucItem = false;
-+
-+	if(!userResourceList().isEmpty()) {
-+		mucItem = userResourceList()[0].status().hasMUCItem();
-+	}
-+
- 	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
- 		useAvatar = true;
-+	
-+	str += "<table cellspacing=\"3\"><tr>";
-+	str += "<td>";
- 
- 	if (useAvatar) {
--		str += "<table cellspacing=\"0\"><tr>";
--		str += "<td>";
- 		str += QString("<icon name=\"avatars/%1\">").arg(jid().bare());
- 		str += "</td><td width=\"10\"></td>";
- 		str += "<td>";
- 	}
- 
- 	QString nick = JIDUtil::nickOrJid(name(), jid().full());
--	if(jid().full() != nick)
--		str += QString("<div style='white-space:pre'>%1 &lt;%2&gt;</div>").arg(TextUtil::escape(nick)).arg(TextUtil::escape(JIDUtil::toString(jid(),true)));
--	else
--		str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
-+	if (!mucItem) {
-+		if(jid().full() != nick)
-+			str += QString("<div style='white-space:pre'>%1 &lt;%2&gt;</div>").arg(TextUtil::escape(nick)).arg(TextUtil::escape(JIDUtil::toString(jid(),true)));
-+		else
-+			str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
-+	}
- 
- 	// subscription
--	if(!v_self && !v_isConference && subscription().type() != Subscription::Both)
-+	if(!v_self && !v_isConference && subscription().type() != Subscription::Both && !mucItem)
- 		str += QString("<div style='white-space:pre'>") + QObject::tr("Subscription") + ": " + subscription().toString() + "</div>";
- 
--	if(!v_keyID.isEmpty())
--		str += QString("<div style='white-space:pre'>") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
-+	if(!v_keyID.isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
-+		str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/pgp") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
-+
-+	// User Mood
-+	if (!mood().isNull()) {
-+		str += QString("<div style='white-space:pre'><%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + QObject::tr("Mood") + ": " + mood().typeText();
-+		if (!mood().text().isEmpty())
-+			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
-+		str += "</div>";
-+	}
- 
- 	// User Activity
- 	if (!activity().isNull()) {
-@@ -784,8 +808,7 @@ QString UserListItem::makeBareTip(bool t
- 		if (activity().specificType() != Activity::UnknownSpecific && activity().specificType() != Activity::Other && !activity().specificTypeValue().isEmpty()) {
- 			act += "_" + activity().specificTypeValue();
- 		}
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " +
--			QString("<%1=\"activities/%2\"> ").arg(imgTag).arg(act) + activity().typeText();
-+		str += QString("<div style='white-space:pre'><%1=\"activities/%2\"> ").arg(imgTag).arg(act) + QObject::tr("Activity") + ": " + activity().typeText();
- 		if (activity().specificType() != Activity::UnknownSpecific) {
- 			str += QString(" - ") + activity().specificTypeText();
- 		}
-@@ -794,18 +817,9 @@ QString UserListItem::makeBareTip(bool t
- 		str += "</div>";
- 	}
- 
--	// User Mood
--	if (!mood().isNull()) {
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
--			QString("<%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + mood().typeText();
--		if (!mood().text().isEmpty())
--			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
--		str += "</div>";
--	}
--	
- 	// User Tune
- 	if (!tune().isEmpty())
--		str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
-+		str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/notification_roster_tune") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
- 
- 	// User Physical Location
- 	//if (!physicalLocation().isNull())
-@@ -813,7 +827,8 @@ QString UserListItem::makeBareTip(bool t
- 
- 	// User Geolocation
- 	if (!geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
--		str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
-+		str += QString("<div style='white-space:pre'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div>%3</div></td></tr></table></div>") \
-+		.arg(imgTag).arg("system/geolocation").arg(TextUtil::escape(geoLocation().toString().trimmed()));
- 
- 	// resources
- 	if(!userResourceList().isEmpty()) {
-@@ -822,6 +837,7 @@ QString UserListItem::makeBareTip(bool t
- 
- 		for(UserResourceList::ConstIterator rit = srl.begin(); rit != srl.end(); ++rit) {
- 			const UserResource &r = *rit;
-+
- 			QString name;
- 			if(!r.name().isEmpty())
- 				name = r.name();
-@@ -846,21 +862,29 @@ QString UserListItem::makeBareTip(bool t
- 			QString secstr;
- 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
- 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);
--			str += QString("<div style='white-space:pre'>") + QString("<%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) + QString("(%1)").arg(r.priority()) + secstr + "</div>";
-+			QString hr;
-+			if (!mucItem)
-+				hr = "<hr/>";
-+			if(r.status().mucItem().jid().isEmpty())
-+				str += hr + QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
-+				+ QString("(%1)").arg(r.priority()) + secstr + "</div>";
-+			else
-+				str += hr +  QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
-+				+ QString("(%1) &lt;%2&gt;").arg(r.priority()).arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true))) + secstr + "</div>";
- 
- 			if(!r.publicKeyID().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool()) {
- 				int v = r.pgpVerifyStatus();
- 				if(v == QCA::SecureMessageSignature::Valid || v == QCA::SecureMessageSignature::InvalidSignature || v == QCA::SecureMessageSignature::InvalidKey || v == QCA::SecureMessageSignature::NoKey) {
- 					if(v == QCA::SecureMessageSignature::Valid) {
--						QString d = r.sigTimestamp().toString(Qt::TextDate);
--						str += QString("<div style='white-space:pre'>") + QObject::tr("Signed") + " @ " + "<font color=\"#2A993B\">" + d + "</font>";
-+						QString d = r.sigTimestamp().toString(Qt::DefaultLocaleShortDate);
-+						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/gpg-yes") + QObject::tr("Signed") + ": " + "<font color=\"#2A993B\">" + d + "</font>";
- 					}
- 					else if(v == QCA::SecureMessageSignature::NoKey) {
--						QString d = r.sigTimestamp().toString(Qt::TextDate);
--						str += QString("<div style='white-space:pre'>") + QObject::tr("Signed") + " @ " + d;
-+						QString d = r.sigTimestamp().toString(Qt::DefaultLocaleShortDate);
-+						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/keyUnknown") + QObject::tr("Signed") + ": " + d;
- 					}
- 					else if(v == QCA::SecureMessageSignature::InvalidSignature || v == QCA::SecureMessageSignature::InvalidKey) {
--						str += QString("<div style='white-space:pre'>") + "<font color=\"#810000\">" + QObject::tr("Bad signature") + "</font>";
-+						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/keyBad") + "<font color=\"#810000\">" + QObject::tr("Bad signature") + "</font>";
- 					}
- 
- 					if(v_keyID != r.publicKeyID())
-@@ -869,55 +893,47 @@ QString UserListItem::makeBareTip(bool t
- 				}
- 			}
- 
--			// last status
--			if(r.status().timeStamp().isValid() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.last-status").toBool()) {
--				QString d = r.status().timeStamp().toString(Qt::TextDate);
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Last Status") + " @ " + d + "</div>";
--			}
--
--			// MUC
--			if(!v_isConference && r.status().hasMUCItem()) {
--				if(!r.status().mucItem().jid().isEmpty())
--					str += QString("<div style='white-space:pre'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
--				if(r.status().mucItem().role() != MUCItem::NoRole)
--					str += QString("<div style='white-space:pre'>") + QObject::tr("Role: %1").arg(MUCManager::roleToString(r.status().mucItem().role())) + QString("</div>");
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Affiliation: %1").arg(MUCManager::affiliationToString(r.status().mucItem().affiliation())) + QString("</div>");
--			}
--
--			// gabber music
--			if(!r.status().songTitle().isEmpty()) {
--				QString s = r.status().songTitle();
-+			// client
-+			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
-+				QString ver = r.versionString();
- 				if(trim)
--					s = dot_truncate(s, 80);
--				s = TextUtil::escape(s);
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + QString(": %1").arg(s) + "</div>";
-+					ver = dot_truncate(ver, 80);
-+				ver = TextUtil::escape(ver);
-+				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())) + QObject::tr("Using") + QString(": %3").arg(ver) + "</div>";
- 			}
--			
--			// User Tune
--			if (!r.tune().isEmpty())
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(r.tune()) + "</div>";
--
--			// User Physical Location
--		//	if (!r.physicalLocation().isNull())
--		//		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
--
--			// User Geolocation
--			if (!r.geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
--				str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
- 
- 			// Entity Time
- 			if (r.timezoneOffset().hasValue()) {
- 				QDateTime dt = QDateTime::currentDateTime().toUTC().addSecs(r.timezoneOffset().value()*60);
--				str += QString("<br><nobr>") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::TextDate)).arg(r.timezoneOffsetString()) + "</nobr>";
-+				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/time") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::DefaultLocaleShortDate)).arg(r.timezoneOffsetString()) + "</div>";
- 			}
- 
--			// client
--			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
--				QString ver = r.versionString();
--				if(trim)
--					ver = dot_truncate(ver, 80);
--				ver = TextUtil::escape(ver);
--				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": <%1=\"%2\"> %3").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())).arg(ver) + "</div>";
-+			// MUC
-+			if(!v_isConference && r.status().hasMUCItem()) {
-+				MUCItem::Affiliation a = r.status().mucItem().affiliation();
-+				QString aff;
-+				if(a == MUCItem::Owner)
-+					aff = "affiliation/owner";
-+				else if(a == MUCItem::Admin)
-+					aff = "affiliation/admin";
-+				else if(a == MUCItem::Member)
-+					aff = "affiliation/member";
-+				else if(a == MUCItem::Outcast)
-+					aff = "affiliation/outcast";
-+				else
-+					aff = "affiliation/noaffiliation";
-+				//if(!r.status().mucItem().jid().isEmpty())
-+				//	str += QString("<div class='layer1'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
-+				if(r.status().mucItem().role() != MUCItem::NoRole)
-+					str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td>").arg(imgTag).arg(aff);
-+					str += QString("<div style='white-space:pre'>") + QObject::tr("Role: %1").arg(MUCManager::roleToString(r.status().mucItem().role())) + QString("</div>");
-+					str += QString("<div style='white-space:pre'>") + QObject::tr("Affiliation: %1").arg(MUCManager::affiliationToString(r.status().mucItem().affiliation())) + QString("</td></tr></table></div>");
-+			}
-+
-+			// last status
-+			if(r.status().timeStamp().isValid() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.last-status").toBool()) {
-+				QString d = r.status().timeStamp().toString(Qt::DefaultLocaleShortDate);
-+				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/info") + QObject::tr("Last Status") + ": " + d + "</div>";
- 			}
- 
- 			// status message
-@@ -934,15 +950,17 @@ QString UserListItem::makeBareTip(bool t
- 					s = TextUtil::emoticonify(s);
- 				if( !doLinkify && PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() )
- 					s = TextUtil::legacyFormat(s);
--				str += QString("<div style='white-space:pre'><u>%1</u></div><div>%2</div>").arg(head).arg(s);
-+				
-+				str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div><u>%3</u>: %4</div></td></tr></table></div>") \
-+				.arg(imgTag).arg("psi/action_templates_edit").arg(head).arg(s);
- 			}
- 		}
- 	}
- 	else {
- 		// last available
- 		if(!lastAvailable().isNull()) {
--			QString d = lastAvailable().toString(Qt::TextDate);
--			str += QString("<div style='white-space:pre'>") + QObject::tr("Last Available") + " @ " + d + "</div>";
-+			QString d = lastAvailable().toString(Qt::DefaultLocaleShortDate);
-+			str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/info") + QObject::tr("Last Available") + ": " + d + "</div>";
- 		}
- 
- 		// presence error
-@@ -965,14 +983,13 @@ QString UserListItem::makeBareTip(bool t
- 				if ( doLinkify )
- 					s = TextUtil::linkify(s);
- 			}
--			str += QString("<div style='white-space:pre'><u>%1</u></div><div>%2</div>").arg(head).arg(s);
-+			str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div><u>%3</u>: %4</div></td></tr></table></div>") \
-+			.arg(imgTag).arg("psi/action_templates_edit").arg(head).arg(s);
- 		}
- 	}
- 
--	if (useAvatar) {
--		str += "</td>";
--		str += "</tr></table>";
--	}
-+	str += "</td>";
-+	str += "</tr></table>";
- 
- 	return str;
- }

psi-plus-main-20130107.tar.xz/patches/0930-psi-minimize-chat-hotkey.diff Deleted

@@ -1,115 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -542,6 +542,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -216,7 +216,7 @@ public:
- #endif
- 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
- 
--	QAction *act_mini_cmd, *act_nick, *act_hide;
-+	QAction *act_mini_cmd, *act_nick, *act_hide, *act_minimize;
- 
- 	MCmdSimpleSite mCmdSite;
- 	MCmdManager mCmdManager;
-@@ -698,6 +698,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(d->act_mini_cmd, SIGNAL(triggered()), d, SLOT(doMiniCmd()));
- 	addAction(d->act_mini_cmd);
- 
-+	d->act_minimize = new QAction(this);
-+	connect(d->act_minimize, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(d->act_minimize);
-+
- 	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
- 	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
- 
-@@ -846,6 +850,11 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
-+
- void GCMainDlg::ensureTabbedCorrectly()
- {
- 	TabbableWidget::ensureTabbedCorrectly();
-@@ -888,6 +897,7 @@ void GCMainDlg::setShortcuts()
- 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
- 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
- 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
-+	d->act_minimize->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void GCMainDlg::scrollUp()
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -144,6 +144,9 @@ private slots:
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
- 	void horizSplitterMoved();
-+	void doMinimize();
-+
-+
- 
- public:
- 	class Private;
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -247,6 +247,10 @@ void PsiChatDlg::initUi()
- 
- 	ui_.mini_prompt->hide();
- 
-+	act_minimize_ = new QAction(this);
-+
-+	connect(act_minimize_, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(act_minimize_);
- }
- 
- void PsiChatDlg::updateCountVisibility()
-@@ -326,6 +330,7 @@ void PsiChatDlg::setShortcuts()
- 
- 	act_mini_cmd_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
- 
-+	act_minimize_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void PsiChatDlg::updateIdentityVisibility()
-@@ -677,6 +682,10 @@ void PsiChatDlg::doMiniCmd()
- 	mCmdManager_.open(new MCmdSimpleState(MCMDCHAT, tr("Command>")), QStringList() );
- }
- 
-+void PsiChatDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
- 
- bool PsiChatDlg::eventFilter( QObject *obj, QEvent *ev ) {
- 	if ( obj == chatEdit() && ev->type() == QEvent::KeyPress ) {
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -33,6 +33,7 @@ private slots:
- 	void toggleSmallChat();
- 	void doClearButton();
- 	void doMiniCmd();
-+	void doMinimize();
- 	void buildMenu();
- 	void updateCounter();
- 	void updateIdentityVisibility();
-@@ -83,7 +84,7 @@ private:
- 	IconAction* act_find;
- 	IconAction* act_ps_;
- 	IconAction* act_templates_;
--	QAction *act_mini_cmd_;
-+	QAction *act_mini_cmd_, *act_minimize_;
- 
- 	MCmdManager mCmdManager_;
- 	MCmdSimpleSite mCmdSite_;

psi-plus-main-20130107.tar.xz/patches/0940-psi-send-xhtml-im.diff Deleted

@@ -1,653 +0,0 @@
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -691,6 +691,11 @@ void ChatDlg::doSend()
- 	if (isEncryptionEnabled()) {
- 		m.setWasEncrypted(true);
- 	}
-+
-+	HTMLElement html = chatEdit()->toHTMLElement();
-+	if(!html.body().isNull())
-+		m.setHTML(html);
-+
- 	QString id = account()->client()->genUniqueId();
- 	m.setId(id); // we need id early for message manipulations in chatview
- 
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -209,7 +209,7 @@ public:
- 	QString password;
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
--	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
-+	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
- 	TypeAheadFindBar *typeahead;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
-@@ -679,6 +679,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->act_configure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("&Configure Room"), 0, this);
- 	connect(d->act_configure, SIGNAL(triggered()), SLOT(configureRoom()));
- 
-+	d->act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
-+	connect(d->act_html_text, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
-+
- #ifdef WHITEBOARDING
- 	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
- 	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
-@@ -725,6 +728,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_find);
- 	ui_.toolbar->addAction(d->act_configure);
-+	ui_.toolbar->addAction(d->act_html_text);
- #ifdef WHITEBOARDING
- 	ui_.toolbar->addAction(d->act_whiteboard);
- #endif
-@@ -1084,6 +1088,11 @@ void GCMainDlg::mle_returnPressed()
- 	Message m(jid());
- 	m.setType("groupchat");
- 	m.setBody(str);
-+
-+	HTMLElement html = d->mle()->toHTMLElement();
-+	if(!html.body().isNull())
-+		m.setHTML(html);
-+
- 	m.setTimeStamp(QDateTime::currentDateTime());
- 	emit d->mle()->appendMessageHistory(m.body());
- 
-@@ -1755,6 +1764,7 @@ void GCMainDlg::setLooks()
- 	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
- 	if (!css.isEmpty()) {
- 		setStyleSheet(css);
-+		d->mle()->setCssString(css);
- 	}
- 	ui_.vsplitter->optionsChanged();
- 	ui_.mle->optionsChanged();
---- /dev/null
-+++ git/src/htmltextcontroller.cpp
-@@ -0,0 +1,320 @@
-+/*
-+ * htmltextcontroller.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+#include "htmltextcontroller.h"
-+#include <QMenu>
-+#include <QFontDialog>
-+#include <QColorDialog>
-+
-+class HTMLTextMenu : public QMenu
-+{
-+	Q_OBJECT
-+public:
-+	HTMLTextMenu(QWidget* parent = 0): QMenu(parent)
-+	{
-+		actBold = addAction(tr("Bold"));
-+		actBold->setCheckable(true);
-+		actBold->setData(QVariant(HTMLTextController::StateBold));
-+
-+		actItalic = addAction(tr("Italic"));
-+		actItalic->setCheckable(true);
-+		actItalic->setData(QVariant(HTMLTextController::StateItalic));
-+
-+		actUnderline = addAction(tr("Underline"));
-+		actUnderline->setCheckable(true);
-+		actUnderline->setData(QVariant(HTMLTextController::StateUnderline));
-+
-+		actStrikeOut = addAction(tr("Strike Out"));
-+		actStrikeOut->setCheckable(true);
-+		actStrikeOut->setData(QVariant(HTMLTextController::StateStrikeOut));
-+
-+		actTextColor = addAction(tr("Text Color"));
-+		actTextColor->setCheckable(true);
-+		actTextColor->setData(QVariant(HTMLTextController::StateTextColorChanged));
-+
-+		actBackgroundColor = addAction(tr("Background Color"));
-+		actBackgroundColor->setCheckable(true);
-+		actBackgroundColor->setData(QVariant(HTMLTextController::StateBackgroundColorChanged));
-+
-+		actText = addAction(tr("Font"));
-+		actText->setCheckable(true);
-+		actText->setData(QVariant(HTMLTextController::StateTextStyleChanged));
-+
-+		addSeparator();
-+
-+		actReset = addAction(tr("Reset"));
-+		actReset->setData(QVariant(HTMLTextController::StateNone));
-+	};
-+
-+	void setMenuState(QList<HTMLTextController::TextEditState> list)
-+	{
-+		foreach(HTMLTextController::TextEditState state, list) {
-+			switch(state) {
-+			case HTMLTextController::StateBold:
-+				actBold->setChecked(true);
-+				break;
-+			case HTMLTextController::StateItalic:
-+				actItalic->setChecked(true);
-+				break;
-+			case HTMLTextController::StateUnderline:
-+				actUnderline->setChecked(true);
-+				break;
-+			case HTMLTextController::StateStrikeOut:
-+				actStrikeOut->setChecked(true);
-+				break;
-+			case HTMLTextController::StateTextStyleChanged:
-+				//actText->setChecked(true);
-+				break;
-+			case HTMLTextController::StateTextColorChanged:
-+				actTextColor->setChecked(true);
-+				break;
-+			case HTMLTextController::StateBackgroundColorChanged:
-+				actBackgroundColor->setChecked(true);
-+				break;
-+			default:
-+				break;
-+			}
-+		}
-+	};
-+
-+private:
-+	QAction *actBold;
-+	QAction *actUnderline;
-+	QAction *actItalic;
-+	QAction *actStrikeOut;
-+	QAction *actText;
-+	QAction *actTextColor;
-+	QAction *actBackgroundColor;
-+	QAction *actReset;
-+
-+};
-+
-+//----------------------------------------------------------------------------
-+// HTMLTextController
-+//----------------------------------------------------------------------------
-+HTMLTextController::HTMLTextController(QTextEdit *parent)
-+	: QObject()
-+	, te_(parent)
-+{
-+	font_ = te_->font();
-+	currentFont_ = font_;
-+	background_ = te_->currentCharFormat().background();
-+	currentBackground_ = background_;
-+	foreground_ = te_->currentCharFormat().foreground();
-+	currentForeground_ = foreground_;
-+}
-+
-+void HTMLTextController::addState(TextEditState state)
-+{
-+	QTextCharFormat tcf;
-+	switch(state) {
-+	case StateBold:
-+		tcf.setFontWeight(QFont::Bold);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateItalic:
-+		tcf.setFontItalic(true);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateUnderline:
-+		tcf.setFontUnderline(true);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateStrikeOut:
-+		tcf.setFontStrikeOut(true);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateTextStyleChanged:
-+		tcf.setFont(currentFont_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateTextColorChanged:
-+		tcf.setForeground(currentForeground_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateBackgroundColorChanged:
-+		tcf.setBackground(currentBackground_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateNone:
-+		tcf.setFontWeight(QFont::Normal);
-+		tcf.setFontItalic(false);
-+		tcf.setFontUnderline(false);
-+		tcf.setFontStrikeOut(false);
-+		tcf.setFont(font_);
-+		tcf.setBackground(background_);
-+		tcf.setForeground(foreground_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+}
-+
-+void HTMLTextController::removeState(TextEditState state)
-+{
-+	QTextCharFormat tcf;
-+	switch(state) {
-+	case StateBold:
-+		tcf.setFontWeight(QFont::Normal);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateItalic:
-+		tcf.setFontItalic(false);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateUnderline:
-+		tcf.setFontUnderline(false);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateStrikeOut:
-+		tcf.setFontStrikeOut(false);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateTextStyleChanged:
-+		tcf.setFont(font_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateTextColorChanged:
-+		tcf.setForeground(foreground_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	case StateBackgroundColorChanged:
-+		tcf.setBackground(background_);
-+		te_->mergeCurrentCharFormat(tcf);
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+QList<HTMLTextController::TextEditState>  HTMLTextController::state()
-+{
-+	QList<TextEditState> list;
-+	const QTextCharFormat tcf = te_->textCursor().charFormat();
-+	if(tcf.fontWeight() == QFont::Bold)
-+		list.push_back(StateBold);
-+	if(tcf.fontItalic())
-+		list.push_back(StateItalic);
-+	if(tcf.fontUnderline())
-+		list.push_back(StateUnderline);
-+	if(tcf.fontStrikeOut())
-+		list.push_back(StateStrikeOut);
-+	if(tcf.font() != font_)
-+		list.push_back(StateTextStyleChanged);
-+	if(tcf.background() != background_)
-+		list.push_back(StateBackgroundColorChanged);
-+	if(tcf.foreground() != foreground_)
-+		list.push_back(StateTextColorChanged);
-+
-+	return list;
-+}
-+
-+void HTMLTextController::doMenu()
-+{
-+	HTMLTextMenu *menu = new HTMLTextMenu();
-+	menu->setMenuState(state());
-+	if(!cssString_.isEmpty())
-+		menu->setStyleSheet(cssString_);
-+	QAction *act = menu->exec(QCursor::pos());
-+	if(!act) {
-+		delete menu;
-+		return;
-+	}
-+	int data = act->data().toInt();
-+	if(data == StateBold) {
-+		if(act->isChecked())
-+			addState(StateBold);
-+		else
-+			removeState(StateBold);
-+	}
-+	if(data == StateItalic) {
-+		if(act->isChecked())
-+			addState(StateItalic);
-+		else
-+			removeState(StateItalic);
-+	}
-+	else if(data == StateUnderline) {
-+		if(act->isChecked())
-+			addState(StateUnderline);
-+		else
-+			removeState(StateUnderline);
-+	}
-+	else if(data == StateStrikeOut) {
-+		if(act->isChecked())
-+			addState(StateStrikeOut);
-+		else
-+			removeState(StateStrikeOut);
-+	}
-+	else if(data == StateTextStyleChanged) {
-+		if(act->isChecked()) {
-+			bool ok;
-+			QFont tmpFont = QFontDialog::getFont(&ok, font_);
-+			if(ok) {
-+				currentFont_ = tmpFont;
-+				addState(StateTextStyleChanged);
-+			}
-+		}
-+		else {
-+			currentFont_ = font_;
-+			removeState(StateTextStyleChanged);
-+		}
-+	}
-+	else if(data == StateTextColorChanged) {
-+		if(act->isChecked()) {
-+			QColor color = QColorDialog::getColor(currentForeground_.color());
-+			if(color.isValid()) {
-+				currentForeground_ = QBrush(color);
-+				addState(StateTextColorChanged);
-+			}
-+		}
-+		else {
-+			currentForeground_ = foreground_;
-+			removeState(StateTextColorChanged);
-+		}
-+	}
-+	else if(data == StateBackgroundColorChanged) {
-+		if(act->isChecked()) {
-+			QColor color = QColorDialog::getColor(currentBackground_.color());
-+			if(color.isValid()) {
-+				currentBackground_ = QBrush(color);
-+				addState(StateBackgroundColorChanged);
-+			}
-+		}
-+		else {
-+			currentBackground_ = background_;
-+			removeState(StateBackgroundColorChanged);
-+		}
-+	}
-+	else if(data == StateNone)
-+		addState(StateNone);
-+
-+	delete menu;
-+	te_->window()->activateWindow();
-+	te_->setFocus(Qt::MouseFocusReason);
-+
-+}
-+
-+void HTMLTextController::setFont(const QFont &f)
-+{
-+	font_ = f;
-+}
-+
-+#include "htmltextcontroller.moc"
---- /dev/null
-+++ git/src/htmltextcontroller.h
-@@ -0,0 +1,58 @@
-+/*
-+ * htmltextcontroller.h
-+ * Copyright (C) 2010  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+#ifndef HTMLTEXTCONTROLLER_H
-+#define HTMLTEXTCONTROLLER_H
-+
-+#include  <QTextEdit>
-+
-+class HTMLTextController : public QObject
-+{
-+	Q_OBJECT
-+public:
-+	enum TextEditState {
-+		StateNone = 0,
-+		StateBold = 1,
-+		StateItalic = 2,
-+		StateUnderline = 4,
-+		StateTextStyleChanged = 8,
-+		StateTextColorChanged = 16,
-+		StateBackgroundColorChanged = 32,
-+		StateStrikeOut = 64
-+	};
-+
-+	HTMLTextController(QTextEdit *parent);	
-+	void doMenu();
-+	void setFont(const QFont &);
-+	void setCssString(const QString& css) { cssString_ = css; };
-+
-+private:
-+	void addState(TextEditState state);
-+	void removeState(TextEditState state);
-+	QList<TextEditState> state();
-+	QString cssString_;
-+
-+private:
-+	QTextEdit *te_;
-+	QFont font_, currentFont_;
-+	QBrush background_ ,currentBackground_;
-+	QBrush foreground_, currentForeground_;
-+};
-+
-+#endif // HTMLTEXTCONTROLLER_H
---- git.orig/src/messageview.cpp
-+++ git/src/messageview.cpp
-@@ -102,7 +102,12 @@ void MessageView::setPlainText(const QSt
- void MessageView::setHtml(const QString &text)
- {
- 	if (_type == Message) {
--		_emote = text.trimmed().startsWith(me_cmd);
-+		QString str = TextUtil::rich2plain(text).trimmed();
-+		_emote = str.startsWith(me_cmd);
-+		if(_emote) {
-+			setPlainText(str);
-+			return;
-+		}
- 	}
- 	_text = text;
- }
---- git.orig/src/msgmle.cpp
-+++ git/src/msgmle.cpp
-@@ -37,6 +37,8 @@
- #include "spellchecker/spellhighlighter.h"
- #include "spellchecker/spellchecker.h"
- #include "psioptions.h"
-+#include "htmltextcontroller.h"
-+
- 
- //----------------------------------------------------------------------------
- // ChatEdit
-@@ -47,6 +49,8 @@ ChatEdit::ChatEdit(QWidget *parent)
- 	, check_spelling_(false)
- 	, spellhighlighter_(0)
- {
-+	controller_ = new HTMLTextController(this);
-+
- 	setWordWrapMode(QTextOption::WordWrap);
- 	setAcceptRichText(false);
- 
-@@ -68,6 +72,7 @@ ChatEdit::~ChatEdit()
- {
- 	clearMessageHistory();
- 	delete spellhighlighter_;
-+	delete controller_;
- }
- 
- void ChatEdit::initActions()
-@@ -107,6 +112,12 @@ QSize ChatEdit::sizeHint() const
- 	return minimumSizeHint();
- }
- 
-+void ChatEdit::setFont(const QFont &f)
-+{
-+	QTextEdit::setFont(f);
-+	controller_->setFont(f);
-+}
-+
- bool ChatEdit::checkSpellingGloballyEnabled()
- {
- 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
-@@ -355,6 +366,47 @@ void ChatEdit::clearMessageHistory()
- 	typedMsgsIndex = 0;
- }
- 
-+XMPP::HTMLElement ChatEdit::toHTMLElement() {
-+	XMPP::HTMLElement elem;
-+	QString html = toHtml();
-+	int index = html.indexOf("<body");
-+	int lastIndex = html.lastIndexOf("</body>");
-+	if(index == -1 || lastIndex == -1)
-+		return elem;
-+	lastIndex += 7;
-+	html = html.mid(index, lastIndex-index);
-+	QDomDocument doc;
-+	if(!doc.setContent(html))
-+		return elem;	
-+	QDomElement htmlElem = doc.firstChildElement("body");
-+	QDomElement p = htmlElem.firstChildElement("p");
-+	QDomElement body = doc.createElementNS("http://www.w3.org/1999/xhtml", "body");
-+	bool foundSpan = false;
-+	int paraCnt = 0;
-+	while(!p.isNull()) {
-+		p.setAttribute("style", "margin:0;padding:0;"); //p.removeAttribute("style");
-+		body.appendChild(p.cloneNode(true).toElement());
-+		if(!p.firstChildElement("span").isNull())
-+			foundSpan = true;
-+		p = p.nextSiblingElement("p");
-+		++paraCnt;
-+	}
-+	if(foundSpan) {
-+		if (paraCnt == 1)
-+			body.firstChildElement("p").setTagName("span");
-+		elem.setBody(body);
-+	}
-+	return elem;
-+}
-+
-+void ChatEdit::doHTMLTextMenu() {
-+	controller_->doMenu();
-+}
-+
-+void ChatEdit::setCssString(const QString &css) {
-+	controller_->setCssString(css);
-+}
-+
- //----------------------------------------------------------------------------
- // LineEdit
- //----------------------------------------------------------------------------
---- git.orig/src/msgmle.h
-+++ git/src/msgmle.h
-@@ -23,6 +23,8 @@
- 
- #include <QTextEdit>
- 
-+#include "xmpp_htmlelement.h"
-+
- #define MAX_MESSAGE_HISTORY 50
- 
- class ChatEdit;
-@@ -31,6 +33,7 @@ class QKeyEvent;
- class QResizeEvent;
- class QTimer;
- class SpellHighlighter;
-+class HTMLTextController;
- 
- 
- class ChatEdit : public QTextEdit
-@@ -45,13 +48,17 @@ public:
- 
- 	// reimplemented
- 	QSize sizeHint() const;
-+	void setFont(const QFont &);
- 
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
-+	XMPP::HTMLElement toHTMLElement();
- 
- public slots:
- 	void appendMessageHistory(const QString& text);
- 	void clearMessageHistory();
-+	void doHTMLTextMenu();
-+	void setCssString(const QString& css);
- 
- protected slots:
-  	void applySuggestion();
-@@ -86,6 +93,7 @@ private:
- 	QAction* act_showMessageFirst;
- 	QAction* act_showMessageLast;
- 	QString currentText;
-+	HTMLTextController *controller_;
- };
- 
- 
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -270,6 +270,7 @@ void PsiChatDlg::setLooks()
- 	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
- 	if (!css.isEmpty()) {
- 		setStyleSheet(css);
-+		chatEdit()->setCssString(css);
- 	}
- 	ui_.splitter->optionsChanged();
- 	ui_.mle->optionsChanged();
-@@ -368,6 +369,9 @@ void PsiChatDlg::initToolButtons()
- 	connect(act_find, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
- // -- typeahead
- 
-+	act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
-+	connect(act_html_text, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
-+
- 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
- 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
- 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
-@@ -409,6 +413,7 @@ void PsiChatDlg::initToolBar()
- // typeahead find bar
- 	ui_.toolbar->addAction(act_find);
- // -- typeahead
-+	ui_.toolbar->addAction(act_html_text);
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(act_icon_);
- 	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -84,6 +84,7 @@ private:
- 	IconAction* act_find;
- 	IconAction* act_ps_;
- 	IconAction* act_templates_;
-+	IconAction* act_html_text;
- 	QAction *act_mini_cmd_, *act_minimize_;
- 
- 	MCmdManager mCmdManager_;
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -135,6 +135,7 @@ HEADERS += \
- 	$$PWD/accountregdlg.h \
- 	$$PWD/accountmodifydlg.h \
- 	$$PWD/changepwdlg.h \
-+	$$PWD/htmltextcontroller.h \
- 	$$PWD/msgmle.h \
- 	$$PWD/chatviewcommon.h \
- 	$$PWD/chatview.h \
-@@ -278,6 +279,7 @@ SOURCES += \
- 	$$PWD/accountregdlg.cpp \
- 	$$PWD/accountmodifydlg.cpp \
- 	$$PWD/changepwdlg.cpp \
-+	$$PWD/htmltextcontroller.cpp \
- 	$$PWD/msgmle.cpp \
- 	$$PWD/chatviewcommon.cpp \
- 	$$PWD/messageview.cpp \

psi-plus-main-20130107.tar.xz/patches/0950-psi-improve-adhoc-forms.diff Deleted

@@ -1,828 +0,0 @@
---- git.orig/src/registrationdlg.cpp
-+++ git/src/registrationdlg.cpp
-@@ -159,6 +159,7 @@ RegistrationDlg::RegistrationDlg(const J
- 	QVBoxLayout *vb1 = new QVBoxLayout(this);
- 	vb1->setMargin(4);
- 	d->lb_top = new QLabel(this);
-+	d->lb_top->setWordWrap(true);
- 	d->lb_top->setFrameStyle( QFrame::Panel | QFrame::Sunken );
- 	d->lb_top->hide();
- 	vb1->addWidget(d->lb_top);
---- git.orig/src/searchdlg.cpp
-+++ git/src/searchdlg.cpp
-@@ -160,6 +160,8 @@ public:
- 	QList<QLineEdit*> le_field;
- 	XDataWidget *xdata;
- 	XData xdata_form;
-+	QScrollArea *scrollArea;
-+
- };
- 
- SearchDlg::SearchDlg(const Jid &jid, PsiAccount *pa)
-@@ -174,6 +176,8 @@ SearchDlg::SearchDlg(const Jid &jid, Psi
- 	d->pa->dialogRegister(this, d->jid);
- 	d->jt = 0;
- 	d->xdata = 0;
-+	d->scrollArea = scrollArea;
-+
- 
- 	setWindowTitle(windowTitle().arg(d->jid.full()));
- 
-@@ -184,8 +188,8 @@ SearchDlg::SearchDlg(const Jid &jid, Psi
- 
- 	d->gr_form = new QWidget(gb_search);
- 	d->gr_form_layout = new QGridLayout(d->gr_form);
--	d->gr_form_layout->setSpacing(4);
--	replaceWidget(lb_form, d->gr_form);
-+	d->gr_form_layout->setSpacing(0);
-+	d->scrollArea->setWidget(d->gr_form);
- 	d->gr_form->hide();
- 
- 	pb_add->setEnabled(false);
---- git.orig/src/search.ui
-+++ git/src/search.ui
-@@ -1,308 +1,315 @@
--<ui version="4.0" stdsetdef="1" >
--  <author></author>
--  <comment></comment>
--  <exportmacro></exportmacro>
--  <class>Search</class>
--  <widget class="QWidget" name="Search" >
--    <property name="geometry" >
--      <rect>
--        <x>0</x>
--        <y>0</y>
--        <width>568</width>
--        <height>422</height>
--      </rect>
--    </property>
--    <property name="windowTitle" >
--      <string>Search: %1</string>
--    </property>
--    <layout class="QVBoxLayout" >
--      <property name="margin" >
--        <number>11</number>
--      </property>
--      <property name="spacing" >
--        <number>6</number>
--      </property>
--      <item>
--        <layout class="QHBoxLayout" >
--          <property name="margin" >
--            <number>0</number>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>Search</class>
-+ <widget class="QWidget" name="Search">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>780</width>
-+    <height>480</height>
-+   </rect>
-+  </property>
-+  <property name="minimumSize">
-+   <size>
-+    <width>640</width>
-+    <height>480</height>
-+   </size>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Search: %1</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="margin">
-+    <number>5</number>
-+   </property>
-+   <item>
-+    <layout class="QHBoxLayout">
-+     <property name="margin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="QGroupBox" name="gb_search">
-+       <property name="minimumSize">
-+        <size>
-+         <width>280</width>
-+         <height>0</height>
-+        </size>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>256</width>
-+         <height>32767</height>
-+        </size>
-+       </property>
-+       <property name="title">
-+        <string>Search Fields</string>
-+       </property>
-+       <layout class="QVBoxLayout">
-+        <property name="margin">
-+         <number>1</number>
-+        </property>
-+        <item>
-+         <layout class="QVBoxLayout">
-+          <property name="margin">
-+           <number>0</number>
-           </property>
-           <item>
--            <widget class="QGroupBox" name="gb_search" >
--              <property name="maximumSize" >
--                <size>
--                  <width>256</width>
--                  <height>32767</height>
--                </size>
--              </property>
--              <property name="title" >
--                <string>Search Fields</string>
--              </property>
--              <layout class="QVBoxLayout" >
--                <property name="margin" >
--                  <number>11</number>
--                </property>
--                <property name="spacing" >
--                  <number>6</number>
--                </property>
--                <item>
--                  <layout class="QVBoxLayout" >
--                    <property name="margin" >
--                      <number>0</number>
--                    </property>
--                    <item>
--                      <widget class="QLabel" name="lb_instructions" >
--                        <property name="frameShape" >
--                          <enum>QFrame::Panel</enum>
--                        </property>
--                        <property name="frameShadow" >
--                          <enum>QFrame::Sunken</enum>
--                        </property>
--                        <property name="text" >
--                          <string>Instructions go here.</string>
--                        </property>
--                        <property name="wordWrap" >
--                          <bool>true</bool>
--                        </property>
--                      </widget>
--                    </item>
--                    <item>
--                      <widget class="QLabel" name="lb_form" >
--                        <property name="text" >
--                          <string>form</string>
--                        </property>
--                      </widget>
--                    </item>
--                    <item>
--                      <layout class="QHBoxLayout" >
--                        <property name="margin" >
--                          <number>0</number>
--                        </property>
--                        <item>
--                          <widget class="IconButton" name="pb_search" >
--                            <property name="text" >
--                              <string>&amp;Search</string>
--                            </property>
--                            <property name="psiIconName" stdset="0" >
--                              <string>psi/search</string>
--                            </property>
--                            <property name="default" >
--                              <bool>true</bool>
--                            </property>
--                          </widget>
--                        </item>
--                        <item>
--                          <spacer name="Spacer1" >
--                            <property name="sizeHint" >
--                              <size>
--                                <width>30</width>
--                                <height>16</height>
--                              </size>
--                            </property>
--                            <property name="sizeType" >
--                              <enum>Expanding</enum>
--                            </property>
--                            <property name="orientation" >
--                              <enum>Horizontal</enum>
--                            </property>
--                          </spacer>
--                        </item>
--                        <item>
--                          <widget class="IconButton" name="pb_stop" >
--                            <property name="text" >
--                              <string>&amp;Stop</string>
--                            </property>
--                            <property name="psiIconName" stdset="0" >
--                              <string>psi/stop</string>
--                            </property>
--                          </widget>
--                        </item>
--                      </layout>
--                    </item>
--                  </layout>
--                </item>
--              </layout>
--            </widget>
-+           <widget class="QLabel" name="lb_instructions">
-+            <property name="frameShape">
-+             <enum>QFrame::StyledPanel</enum>
-+            </property>
-+            <property name="frameShadow">
-+             <enum>QFrame::Sunken</enum>
-+            </property>
-+            <property name="text">
-+             <string>Instructions go here.</string>
-+            </property>
-+            <property name="wordWrap">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-           </item>
-           <item>
--            <layout class="QVBoxLayout" >
--              <property name="margin" >
--                <number>0</number>
--              </property>
--              <item>
--                <widget class="QTreeWidget" name="lv_results" >
--                  <property name="alternatingRowColors" >
--                    <bool>true</bool>
--                  </property>
--                  <property name="selectionMode" >
--                    <enum>QAbstractItemView::ExtendedSelection</enum>
--                  </property>
--                  <property name="selectionBehavior" >
--                    <enum>QAbstractItemView::SelectRows</enum>
--                  </property>
--                  <property name="indentation" >
--                    <number>0</number>
--                  </property>
--                  <property name="uniformRowHeights" >
--                    <bool>true</bool>
--                  </property>
--                  <property name="itemsExpandable" >
--                    <bool>false</bool>
--                  </property>
--                  <property name="allColumnsShowFocus" >
--                    <bool>true</bool>
--                  </property>
--                  <property name="sortingEnabled" >
--                    <bool>true</bool>
--                  </property>
--                  <column>
--                    <property name="text" >
--                      <string>Nickname</string>
--                    </property>
--                    <property name="clickable" >
--                      <bool>true</bool>
--                    </property>
--                    <property name="resizable" >
--                      <bool>true</bool>
--                    </property>
--                  </column>
--                  <column>
--                    <property name="text" >
--                      <string>First Name</string>
--                    </property>
--                    <property name="clickable" >
--                      <bool>true</bool>
--                    </property>
--                    <property name="resizable" >
--                      <bool>true</bool>
--                    </property>
--                  </column>
--                  <column>
--                    <property name="text" >
--                      <string>Last Name</string>
--                    </property>
--                    <property name="clickable" >
--                      <bool>true</bool>
--                    </property>
--                    <property name="resizable" >
--                      <bool>true</bool>
--                    </property>
--                  </column>
--                  <column>
--                    <property name="text" >
--                      <string>E-Mail Address</string>
--                    </property>
--                    <property name="clickable" >
--                      <bool>true</bool>
--                    </property>
--                    <property name="resizable" >
--                      <bool>true</bool>
--                    </property>
--                  </column>
--                  <column>
--                    <property name="text" >
--                      <string>XMPP Address</string>
--                    </property>
--                    <property name="clickable" >
--                      <bool>true</bool>
--                    </property>
--                    <property name="resizable" >
--                      <bool>true</bool>
--                    </property>
--                  </column>
--                </widget>
--              </item>
--              <item>
--                <layout class="QHBoxLayout" >
--                  <property name="margin" >
--                    <number>0</number>
--                  </property>
--                  <item>
--                    <spacer name="Spacer3" >
--                      <property name="sizeHint" >
--                        <size>
--                          <width>222</width>
--                          <height>16</height>
--                        </size>
--                      </property>
--                      <property name="sizeType" >
--                        <enum>Expanding</enum>
--                      </property>
--                      <property name="orientation" >
--                        <enum>Horizontal</enum>
--                      </property>
--                    </spacer>
--                  </item>
--                  <item>
--                    <widget class="IconButton" name="pb_add" >
--                      <property name="text" >
--                        <string>&amp;Add Contact</string>
--                      </property>
--                      <property name="psiIconName" stdset="0" >
--                        <string>psi/addContact</string>
--                      </property>
--                    </widget>
--                  </item>
--                  <item>
--                    <widget class="IconButton" name="pb_info" >
--                      <property name="text" >
--                        <string>User &amp;Info</string>
--                      </property>
--                      <property name="psiIconName" stdset="0" >
--                        <string>psi/vCard</string>
--                      </property>
--                    </widget>
--                  </item>
--                </layout>
--              </item>
--            </layout>
--          </item>
--        </layout>
--      </item>
--      <item>
--        <widget class="Line" name="line" >
--          <property name="frameShape" >
--            <enum>QFrame::HLine</enum>
--          </property>
--          <property name="frameShadow" >
--            <enum>QFrame::Sunken</enum>
--          </property>
--        </widget>
--      </item>
--      <item>
--        <layout class="QHBoxLayout" >
--          <property name="margin" >
--            <number>0</number>
--          </property>
--          <item>
--            <widget class="BusyWidget" name="busy" />
-+           <widget class="QScrollArea" name="scrollArea">
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="horizontalScrollBarPolicy">
-+             <enum>Qt::ScrollBarAlwaysOff</enum>
-+            </property>
-+            <property name="widgetResizable">
-+             <bool>true</bool>
-+            </property>
-+            <widget class="QWidget" name="scrollAreaWidgetContents_2">
-+             <property name="geometry">
-+              <rect>
-+               <x>0</x>
-+               <y>0</y>
-+               <width>270</width>
-+               <height>363</height>
-+              </rect>
-+             </property>
-+            </widget>
-+           </widget>
-           </item>
-           <item>
--            <spacer name="Spacer2" >
--              <property name="sizeHint" >
--                <size>
--                  <width>485</width>
--                  <height>16</height>
--                </size>
-+           <layout class="QHBoxLayout">
-+            <property name="margin">
-+             <number>0</number>
-+            </property>
-+            <item>
-+             <widget class="IconButton" name="pb_search" native="true">
-+              <property name="text" stdset="0">
-+               <string>&amp;Search</string>
-               </property>
--              <property name="sizeType" >
--                <enum>Expanding</enum>
-+              <property name="psiIconName" stdset="0">
-+               <string>psi/search</string>
-               </property>
--              <property name="orientation" >
--                <enum>Horizontal</enum>
-+              <property name="default" stdset="0">
-+               <bool>true</bool>
-               </property>
--            </spacer>
--          </item>
--          <item>
--            <widget class="IconButton" name="pb_close" >
--              <property name="text" >
--                <string>&amp;Close</string>
-+             </widget>
-+            </item>
-+            <item>
-+             <spacer name="Spacer1">
-+              <property name="orientation">
-+               <enum>Qt::Horizontal</enum>
-               </property>
--            </widget>
-+              <property name="sizeType">
-+               <enum>QSizePolicy::Expanding</enum>
-+              </property>
-+              <property name="sizeHint" stdset="0">
-+               <size>
-+                <width>30</width>
-+                <height>16</height>
-+               </size>
-+              </property>
-+             </spacer>
-+            </item>
-+            <item>
-+             <widget class="IconButton" name="pb_stop" native="true">
-+              <property name="text" stdset="0">
-+               <string>&amp;Stop</string>
-+              </property>
-+              <property name="psiIconName" stdset="0">
-+               <string>psi/stop</string>
-+              </property>
-+             </widget>
-+            </item>
-+           </layout>
-           </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+     <item>
-+      <layout class="QVBoxLayout">
-+       <property name="margin">
-+        <number>0</number>
-+       </property>
-+       <item>
-+        <widget class="QTreeWidget" name="lv_results">
-+         <property name="alternatingRowColors">
-+          <bool>true</bool>
-+         </property>
-+         <property name="selectionMode">
-+          <enum>QAbstractItemView::ExtendedSelection</enum>
-+         </property>
-+         <property name="selectionBehavior">
-+          <enum>QAbstractItemView::SelectRows</enum>
-+         </property>
-+         <property name="indentation">
-+          <number>0</number>
-+         </property>
-+         <property name="uniformRowHeights">
-+          <bool>true</bool>
-+         </property>
-+         <property name="itemsExpandable">
-+          <bool>false</bool>
-+         </property>
-+         <property name="sortingEnabled">
-+          <bool>true</bool>
-+         </property>
-+         <property name="allColumnsShowFocus">
-+          <bool>true</bool>
-+         </property>
-+         <column>
-+          <property name="text">
-+           <string>Nickname</string>
-+          </property>
-+         </column>
-+         <column>
-+          <property name="text">
-+           <string>First Name</string>
-+          </property>
-+         </column>
-+         <column>
-+          <property name="text">
-+           <string>Last Name</string>
-+          </property>
-+         </column>
-+         <column>
-+          <property name="text">
-+           <string>E-Mail Address</string>
-+          </property>
-+         </column>
-+         <column>
-+          <property name="text">
-+           <string>XMPP Address</string>
-+          </property>
-+         </column>
-+        </widget>
-+       </item>
-+       <item>
-+        <layout class="QHBoxLayout">
-+         <property name="margin">
-+          <number>0</number>
-+         </property>
-+         <item>
-+          <spacer name="Spacer3">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeType">
-+            <enum>QSizePolicy::Expanding</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>222</width>
-+             <height>16</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+         <item>
-+          <widget class="IconButton" name="pb_add" native="true">
-+           <property name="text" stdset="0">
-+            <string>&amp;Add Contact</string>
-+           </property>
-+           <property name="psiIconName" stdset="0">
-+            <string>psi/addContact</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="IconButton" name="pb_info" native="true">
-+           <property name="text" stdset="0">
-+            <string>User &amp;Info</string>
-+           </property>
-+           <property name="psiIconName" stdset="0">
-+            <string>psi/vCard</string>
-+           </property>
-+          </widget>
-+         </item>
-         </layout>
--      </item>
-+       </item>
-+      </layout>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <widget class="Line" name="line">
-+     <property name="frameShape">
-+      <enum>QFrame::HLine</enum>
-+     </property>
-+     <property name="frameShadow">
-+      <enum>QFrame::Sunken</enum>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout">
-+     <property name="margin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="BusyWidget" name="busy" native="true"/>
-+     </item>
-+     <item>
-+      <spacer name="Spacer2">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeType">
-+        <enum>QSizePolicy::Expanding</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>485</width>
-+         <height>16</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="IconButton" name="pb_close" native="true">
-+       <property name="text" stdset="0">
-+        <string>&amp;Close</string>
-+       </property>
-+      </widget>
-+     </item>
-     </layout>
--  </widget>
--  <layoutdefault spacing="6" margin="11" />
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconButton</class>
-+   <extends>QWidget</extends>
-+   <header>iconbutton.h</header>
-+  </customwidget>
-+  <customwidget>
-+   <class>BusyWidget</class>
-+   <extends>QWidget</extends>
-+   <header>busywidget.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
- </ui>
---- git.orig/src/xdata_widget.cpp
-+++ git/src/xdata_widget.cpp
-@@ -33,6 +33,7 @@
- #include <QNetworkAccessManager>
- #include <QNetworkRequest>
- #include <QNetworkReply>
-+#include <QSpacerItem>
- 
- #include "desktoputil.h"
- #include "xmpp_xdata.h"
-@@ -148,12 +149,12 @@ public:
- 		return _field;
- 	}
- 
--	QString labelText() const
-+	QString labelText(QString str=": ") const
- 	{
- 		QString text = _field.label();
- 		if ( text.isEmpty() )
- 			text = _field.var();
--		return text + ": ";
-+		return text + str;
- 	}
- 
- 	QString reqText() const
-@@ -207,16 +208,22 @@ public:
- 			if ( s == "1" || s == "true" || s == "yes" )
- 				checked = true;
- 		}
--
--		QLabel *label = new QLabel(labelText(), parent);
--		grid->addWidget(label, row, 0);
-+		
-+		QHBoxLayout *layout = new QHBoxLayout;
-+		QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
- 
- 		check = new QCheckBox(parent);
- 		check->setChecked(checked);
--		grid->addWidget(check, row, 1);
-+		layout->addWidget(check);
-+
-+		QLabel *label = new QLabel(labelText(""), parent);
-+		layout->addWidget(label);
-+		layout->addSpacerItem(spacerItem);
-+		
-+		grid->addLayout(layout, row, 0);
- 
- 		QLabel *req = new QLabel(reqText(), parent);
--		grid->addWidget(req, row, 2);
-+		grid->addWidget(req, row, 1);
- 
- 		if ( !f.desc().isEmpty() ) {
- 			label->setToolTip(f.desc());
-@@ -256,8 +263,9 @@ public:
- 			text += *it;
- 		}
- 
--		QLabel *fixed = new QLabel("<qt>" + text + "</qt>", parent);
--		grid->addWidget(fixed, row, 0, 2, 0);
-+		QLabel *fixed = new QLabel("<qt>" + text + "<br/></qt>", parent);
-+		fixed->setWordWrap(true);
-+		grid->addWidget(fixed, row, 0);
- 
- 		if ( !f.desc().isEmpty() ) {
- 			fixed->setToolTip(f.desc());
-@@ -294,16 +302,20 @@ public:
- 		QString text;
- 		if ( f.value().count() )
- 			text = f.value().first();
--
-+		QVBoxLayout *layout = new QVBoxLayout;
-+		
- 		QLabel *label = new QLabel(labelText(), parent);
--		grid->addWidget(label, row, 0);
-+		label->setWordWrap(true);
-+		layout->addWidget(label);
- 
- 		edit = new QLineEdit(parent);
- 		edit->setText(text);
--		grid->addWidget(edit, row, 1);
--
-+		layout->addWidget(edit);
-+		
-+		grid->addLayout(layout, row, 0);
-+		
- 		QLabel *req = new QLabel(reqText(), parent);
--		grid->addWidget(req, row, 2);
-+		grid->addWidget(req, row, 1);
- 
- 		if ( !f.desc().isEmpty() ) {
- 			label->setToolTip(f.desc());
-@@ -357,13 +369,18 @@ public:
- 	XDataField_ListSingle(XData::Field f, QGridLayout *grid, QWidget *parent)
- 	: XDataField(f, ((XDataWidget *)parent)->client())
- 	{
-+		QHBoxLayout *layout = new QHBoxLayout;
-+		
- 		int row = grid->rowCount();
- 		QLabel *label = new QLabel(labelText(), parent);
--		grid->addWidget(label, row, 0);
-+		label->setWordWrap(true);
-+		layout->addWidget(label);
- 
- 		combo = new QComboBox(parent);
--		grid->addWidget(combo, row, 1);
-+		layout->addWidget(combo);
- 		combo->setInsertPolicy(QComboBox::NoInsert);
-+		
-+		grid->addLayout(layout, row, 0);
- 
- 		QString sel;
- 		if ( !f.value().isEmpty() )
-@@ -382,7 +399,7 @@ public:
- 		}
- 
- 		QLabel *req = new QLabel(reqText(), parent);
--		grid->addWidget(req, row, 2);
-+		grid->addWidget(req, row, 1);
- 
- 		if ( !f.desc().isEmpty() ) {
- 			label->setToolTip(f.desc());
-@@ -425,6 +442,7 @@ public:
- 	{
- 		int row = grid->rowCount();
- 		QLabel *label = new QLabel(labelText(), parent);
-+		label->setWordWrap(true);
- 		grid->addWidget(label, row, 0);
- 
- 		list = new QListWidget(parent);
-@@ -494,11 +512,14 @@ public:
- 	: XDataField(f, ((XDataWidget *)parent)->client())
- 	{
- 		int row = grid->rowCount();
-+		QHBoxLayout *layout = new QHBoxLayout;
-+		
- 		QLabel *label = new QLabel(labelText(), parent);
--		grid->addWidget(label, row, 0);
-+		label->setWordWrap(true);
-+		layout->addWidget(label);
- 
- 		edit = new QTextEdit(parent);
--		grid->addWidget(edit, row, 1);
-+		layout->addWidget(edit);
- 
- 		QString text;
- 		QStringList val = f.value();
-@@ -510,8 +531,10 @@ public:
- 		}
- 		edit->setText(text);
- 
-+		grid->addLayout(layout, row, 0);
-+
- 		QLabel *req = new QLabel(reqText(), parent);
--		grid->addWidget(req, row, 2);
-+		grid->addWidget(req, row, 1);
- 
- 		if ( !f.desc().isEmpty() ) {
- 			label->setToolTip(f.desc());
-@@ -554,6 +577,8 @@ XDataWidget::XDataWidget(QWidget *parent
- {
- 	owner_ = owner;
- 	layout_ = new QVBoxLayout(this);
-+	layout_->setContentsMargins(0,0,0,0);
-+
- }
- 
- XDataWidget::~XDataWidget()
-@@ -684,6 +709,7 @@ void XDataWidget::setFields(const XData:
- 	if ( f.count() ) {
- 		// FIXME
- 		QGridLayout *grid = new QGridLayout(fields);
-+		grid->setSpacing(3);
- 
- 		XData::FieldList::ConstIterator it = f.begin();
- 		for ( ; it != f.end(); ++it) {

psi-plus-main-20130107.tar.xz/patches/0960-psi-change-password-dialog.diff Deleted

@@ -1,307 +0,0 @@
---- psi.orig/src/miniclient.cpp
-+++ psi/src/miniclient.cpp
-@@ -242,11 +242,12 @@ void MiniClient::cs_error(int err)
- {
- 	QString str;
- 	bool reconn;
-+	bool badPass;
- 	bool disableAutoConnect;
- 	bool isAuthError;
- 	bool isTemporaryAuthFailure;
- 
--	PsiAccount::getErrorInfo(err, conn, stream, tlsHandler, &str, &reconn, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
-+	PsiAccount::getErrorInfo(err, conn, stream, tlsHandler, &str, &reconn, &badPass, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
- 	close();
- 
- 	QMessageBox::critical(0, tr("Server Error"), tr("There was an error communicating with the XMPP server.\nDetails: %1").arg(str));
---- psi.orig/src/passdialog.cpp
-+++ psi/src/passdialog.cpp
-@@ -0,0 +1,77 @@
-+/*
-+ * passdialog.cpp
-+ * Copyright (C) 2009-2010 Virnik, 2011 Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include <QCheckBox>
-+#include <QLabel>
-+#include <QLayout>
-+#include <QLineEdit>
-+#include <QPushButton>
-+#include <QHBoxLayout>
-+#include <QVBoxLayout>
-+
-+#include "passdialog.h"
-+
-+
-+PassDialog::PassDialog(const QString& jid, QWidget *parent)
-+	: QDialog(parent)
-+{    
-+	setWindowTitle(tr("Wrong Account Password"));
-+
-+	QVBoxLayout *mainLayout = new QVBoxLayout(this);
-+	mainLayout->setMargin(6);
-+	mainLayout->setSpacing(6);
-+	QHBoxLayout *botLayout = new QHBoxLayout();
-+
-+	le_password = new QLineEdit();
-+	le_password->setEchoMode(QLineEdit::Password);
-+
-+	cb_savePassword = new QCheckBox(tr("Save Password"));
-+	botLayout->addWidget(cb_savePassword);
-+	botLayout->addStretch(1);
-+
-+	QPushButton *pb_ok = new QPushButton(tr("OK"));
-+	pb_ok->setDefault(true);
-+	botLayout->addWidget(pb_ok);
-+
-+	QPushButton *pb_cancel = new QPushButton(tr("Cancel"));
-+	botLayout->addWidget(pb_cancel);
-+
-+	mainLayout->addWidget(new QLabel(tr("Please enter your password for %1:").arg(jid)));
-+	mainLayout->addWidget(le_password);
-+	mainLayout->addLayout(botLayout);
-+
-+	connect(pb_cancel, SIGNAL(clicked()), this, SLOT(reject()));
-+	connect(pb_ok, SIGNAL(clicked()), this, SLOT(accept()));
-+}
-+
-+bool PassDialog::savePassword() const
-+{
-+	return cb_savePassword->isChecked();
-+}
-+
-+void PassDialog::setSavePassword(bool save)
-+{
-+	cb_savePassword->setChecked(save);
-+}
-+
-+QString PassDialog::password() const
-+{
-+	return le_password->text();
-+}
---- psi.orig/src/passdialog.h
-+++ psi/src/passdialog.h
-@@ -0,0 +1,44 @@
-+/*
-+ * passdialog.cpp
-+ * Copyright (C) 2009-2010 Virnik, 2011 Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef PASSDIALOG_H
-+#define PASSDIALOG_H
-+
-+#include <QDialog>
-+
-+class QCheckBox;
-+class QLineEdit;
-+
-+class PassDialog : public QDialog
-+{
-+	Q_OBJECT
-+public:
-+	PassDialog(const QString& jid = "", QWidget *parent = 0);
-+
-+	QString password() const;
-+	bool savePassword() const;
-+	void setSavePassword(bool save);
-+
-+private:
-+	QCheckBox *cb_savePassword;
-+	QLineEdit *le_password;
-+};
-+
-+#endif
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -136,6 +136,7 @@
- #include "rc.h"
- #include "tabdlg.h"
- #include "proxy.h"
-+#include "passdialog.h"
- #include "timeserver.h"
- #include "bobfilecache.h"
- #include "psicontactlist.h"
-@@ -1916,10 +1917,11 @@ void PsiAccount::cs_warning(int w)
- 	}
- }
- 
--void PsiAccount::getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure)
-+void PsiAccount::getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_badPass, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure)
- {
- 	QString str;
- 	bool reconn = false;
-+	bool badPass = false;
- 	bool disableAutoConnect = false;
- 	bool isAuthError = false;
- 	bool isTemporaryAuthFailure = false;
-@@ -2054,8 +2056,9 @@ void PsiAccount::getErrorInfo(int err, A
- 		} else if(x == XMPP::ClientStream::MechTooWeak) {
- 			s = tr("SASL mechanism too weak for this account");
- 		} else if(x == XMPP::ClientStream::NotAuthorized) {
--			s = tr("Not authorized");
--			isAuthError = true;
-+			s = tr("Wrong Password");
-+			badPass = true;
-+//			isAuthError = true;
- 		} else if(x == XMPP::ClientStream::TemporaryAuthFailure) {
- 			s = tr("Temporary auth failure");
- 			isAuthError = true;
-@@ -2073,6 +2076,7 @@ void PsiAccount::getErrorInfo(int err, A
- 	//printf("str[%s], reconn=%d\n", str.latin1(), reconn);
- 	*_str = str;
- 	*_reconn = reconn;
-+	*_badPass = badPass;
- 	*_disableAutoConnect = disableAutoConnect;
- 	*_isAuthError = isAuthError;
- 	*_isTemporaryAuthFailure = isTemporaryAuthFailure;
-@@ -2082,13 +2086,14 @@ void PsiAccount::cs_error(int err)
- {
- 	QString str;
- 	bool reconn;
-+	bool badPass;
- 	bool isAuthError;
- 	bool isTemporaryAuthFailure;
- 
- 	if (!isActive()) return; // all cleaned up already
- 
- 	bool disableAutoConnect;
--	getErrorInfo(err, d->conn, d->stream, d->tlsHandler, &str, &reconn, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
-+	getErrorInfo(err, d->conn, d->stream, d->tlsHandler, &str, &reconn, &badPass, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
- 	if (err != RECONNECT_TIMEOUT_ERROR) {
- 		d->currentConnectionError = str;
- 		d->currentConnectionErrorCondition = -1;
-@@ -2130,7 +2135,7 @@ void PsiAccount::cs_error(int err)
- 	presenceSent = false; // this stops the idle detector?? (FIXME)
- 
- 	// Auto-Reconnect?
--	if(d->acc.opt_reconn && reconn) {
-+	if(d->acc.opt_reconn && reconn && !badPass) {
- 		isDisconnecting = false;
- 		d->startReconnect();
- 		return;
-@@ -2142,6 +2147,12 @@ void PsiAccount::cs_error(int err)
- 	emit disconnected();
- 	isDisconnecting = false;
- 
-+	//If a password failure, prompt for correct password
-+	if (badPass) {
-+			passwordPrompt();
-+			return;
-+	}
-+
- 	QString title;
- 	if (d->psi->contactList()->enabledAccounts().count() > 1) {
- 		title = QString("%1: ").arg(name());
-@@ -2850,21 +2861,13 @@ void PsiAccount::setStatus(const Status
- 
- 		// if client is not active then attempt to login
- 		if(!isActive()) {
--			Jid j = d->jid;
--
--			if(!j.isValid()) {
--				QMessageBox::information(0, CAP(tr("Error")), tr("Unable to login.  Ensure your account information is filled out."));
--				modify();
--				return;
-+			if (!d->acc.opt_pass) {
-+				passwordPrompt();
- 			}
--
--			if(!d->acc.opt_pass) {
--				// will call back to us later
--				new AccountLoginPassword(this);
--			} else {
-+			else
- 				login();
--			}
- 		}
-+
- 		// change status
- 		else {
- 			if (!isConnected()) {
-@@ -2913,6 +2916,19 @@ int PsiAccount::defaultPriority(const XM
- 	return d->acc.defaultPriority(s);
- }
- 
-+void PsiAccount::passwordPrompt()
-+{
-+	PassDialog dialog(d->jid.full());
-+	dialog.setSavePassword(d->acc.opt_pass);
-+
-+	if(dialog.exec() == QDialog::Accepted && !dialog.password().isEmpty()) {
-+		d->acc.pass = dialog.password();
-+		d->acc.opt_pass = dialog.savePassword();
-+		login();
-+	}
-+}
-+
-+
- void PsiAccount::setStatusDirect(const Status &_s, bool withPriority)
- {
- 	Status s = _s;
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -250,7 +250,7 @@ public:
- 	bool ensureKey(const Jid &);
- 	void tryVerify(UserListItem *, UserResource *);
- 
--	static void getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure);
-+	static void getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_badPass, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure);
- 
- 	void deleteQueueFile();
- 	void sendFiles(const Jid&, const QStringList&, bool direct = false);
-@@ -511,6 +511,7 @@ private:
- 	void processEncryptedMessageNext();
- 	void processEncryptedMessageDone();
- 	void verifyStatus(const Jid &j, const Status &s);
-+	inline void passwordPrompt();
- 	void sentInitialPresence();
- 	void requestAvatarsForAllContacts();
- 
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -177,6 +177,7 @@ HEADERS += \
- 	$$PWD/pepmanager.h \
- 	$$PWD/pubsubsubscription.h \
- 	$$PWD/rc.h \
-+	$$PWD/passdialog.h \
- 	$$PWD/psihttpauthrequest.h \
- 	$$PWD/httpauthmanager.h \
- 	$$PWD/ahcommand.h \
-@@ -319,6 +320,7 @@ SOURCES += \
- 	$$PWD/pepmanager.cpp \
- 	$$PWD/pubsubsubscription.cpp \
- 	$$PWD/rc.cpp \
-+	$$PWD/passdialog.cpp \
- 	$$PWD/httpauthmanager.cpp \
- 	$$PWD/ahcommand.cpp \
- 	$$PWD/pongserver.cpp \

psi-plus-main-20130107.tar.xz/patches/0970-psi-add-bookmarks-to-join-conference-dlg.diff Deleted

@@ -1,173 +0,0 @@
---- git.orig/src/mucjoindlg.cpp
-+++ git/src/mucjoindlg.cpp
-@@ -29,6 +29,7 @@
- #include "mucjoindlg.h"
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
-+#include "bookmarkmanager.h"
- 
- MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
- 	: QDialog(0)
-@@ -66,6 +67,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 
- 	setWindowTitle(CAP(windowTitle()));
- 	connect(ui_.cb_recent, SIGNAL(activated(int)), SLOT(recent_activated(int)));
-+	connect(ui_.cb_bookmarks, SIGNAL(activated(int)), SLOT(bookmarksActivated(int)));
- 	if (!ui_.cb_recent->count()) {
- 		ui_.cb_recent->setEnabled(false);
- 		ui_.le_host->setFocus();
-@@ -73,6 +75,13 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	else {
- 		recent_activated(0);
- 	}
-+	if (!ui_.cb_bookmarks->count()) {
-+		ui_.cb_bookmarks->setEnabled(false);
-+		ui_.le_host->setFocus();
-+	}
-+	else {
-+		bookmarksActivated(0);
-+	}
- 
- 	setWidgetsEnabled(true);
- 	adjustSize();
-@@ -110,6 +119,8 @@ void MUCJoinDlg::updateIdentity(PsiAccou
- 		return;
- 	}
- 
-+	updateBookmarks(account_);
-+
- 	connect(account_, SIGNAL(disconnected()), this, SLOT(pa_disconnected()));
- }
- 
-@@ -138,6 +149,33 @@ void MUCJoinDlg::recent_activated(int x)
- 	ui_.le_nick->setText(jid.resource());
- }
- 
-+void MUCJoinDlg::bookmarksActivated(int x)
-+{
-+	Jid jid(ui_.cb_bookmarks->itemData(x).toString());
-+	if (jid.full().isEmpty())
-+		return;
-+
-+	ui_.le_host->setText(jid.domain());
-+	ui_.le_room->setText(jid.node());
-+	ui_.le_nick->setText(jid.resource());
-+}
-+
-+void MUCJoinDlg::updateBookmarks(PsiAccount *pa)
-+{
-+	ui_.cb_bookmarks->clear();
-+	if (pa && pa->bookmarkManager()->isAvailable()) {
-+		ui_.cb_bookmarks->setEnabled(true);
-+		foreach(ConferenceBookmark c, pa->bookmarkManager()->conferences()) {
-+			Jid jid = c.jid().withResource(c.nick());
-+			ui_.cb_bookmarks->addItem(JIDUtil::toString(jid, false));
-+			ui_.cb_bookmarks->setItemData(ui_.cb_bookmarks->count()-1, QVariant(jid.full()));
-+		}
-+	}
-+	else {
-+		ui_.cb_bookmarks->setEnabled(false);
-+	}
-+}
-+
- void MUCJoinDlg::doJoin()
- {
- 	if (!account_ || !account_->checkConnected(this))
-@@ -189,6 +227,7 @@ void MUCJoinDlg::setWidgetsEnabled(bool 
- {
- 	ui_.cb_ident->setEnabled(enabled);
- 	ui_.cb_recent->setEnabled(enabled && ui_.cb_recent->count() > 0);
-+	ui_.cb_bookmarks->setEnabled(enabled && ui_.cb_bookmarks->count() > 0);
- 	ui_.gb_info->setEnabled(enabled);
- 	joinButton_->setEnabled(enabled);
- }
---- git.orig/src/mucjoindlg.h
-+++ git/src/mucjoindlg.h
-@@ -58,6 +58,8 @@ private slots:
- 	void updateIdentityVisibility();
- 	void pa_disconnected();
- 	void recent_activated(int);
-+	void bookmarksActivated(int);
-+	void updateBookmarks(PsiAccount *pa);
- 
- private:
- 	Ui::MUCJoin ui_;
---- git.orig/src/mucjoin.ui
-+++ git/src/mucjoin.ui
-@@ -27,7 +27,7 @@
-    <item row="0" column="1">
-     <widget class="AccountsComboBox" name="cb_ident"/>
-    </item>
--   <item row="1" column="0">
-+   <item row="2" column="0">
-     <widget class="QLabel" name="TextLabel1_2">
-      <property name="text">
-       <string>Recent:</string>
-@@ -37,7 +37,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="1" column="1">
-+   <item row="2" column="1">
-     <widget class="QComboBox" name="cb_recent">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-@@ -47,7 +47,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="0" colspan="2">
-+   <item row="4" column="0" colspan="2">
-     <widget class="QGroupBox" name="gb_info">
-      <property name="title">
-       <string>Room information</string>
-@@ -119,7 +119,7 @@
-      </layout>
-     </widget>
-    </item>
--   <item row="3" column="0" colspan="2">
-+   <item row="5" column="0" colspan="2">
-     <spacer>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-@@ -135,7 +135,7 @@
-      </property>
-     </spacer>
-    </item>
--   <item row="4" column="0" colspan="2">
-+   <item row="6" column="0" colspan="2">
-     <widget class="Line" name="Line1">
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-@@ -148,16 +148,29 @@
-      </property>
-     </widget>
-    </item>
--   <item row="5" column="0">
-+   <item row="7" column="0">
-     <widget class="BusyWidget" name="busy" native="true"/>
-    </item>
--   <item row="5" column="1">
-+   <item row="7" column="1">
-     <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Cancel</set>
-      </property>
-     </widget>
-    </item>
-+   <item row="1" column="0">
-+    <widget class="QLabel" name="label">
-+     <property name="text">
-+      <string>Bookmarks:</string>
-+     </property>
-+     <property name="alignment">
-+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="1">
-+    <widget class="QComboBox" name="cb_bookmarks"/>
-+   </item>
-   </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11"/>

psi-plus-main-20130107.tar.xz/patches/0980-psi-add-contact-from-chat-dialog.diff Deleted

@@ -1,215 +0,0 @@
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -113,6 +113,7 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 	isComposing_ = false;
- 	composingTimer_ = 0;
- 	connect(URLObject::getInstance(), SIGNAL(vcardsig(QString)), SLOT(vcard(QString)));
-+	updateRealJid();
- }
- 
- void ChatDlg::vcard(const QString& string)
-@@ -377,6 +378,7 @@ void ChatDlg::setJid(const Jid &j)
- 	if (!j.compare(jid())) {
- 		account()->dialogUnregister(this);
- 		TabbableWidget::setJid(j);
-+		updateRealJid();
- 		account()->dialogRegister(this, jid());
- 		updateContact(jid(), false);
- 	}
-@@ -644,6 +646,16 @@ void ChatDlg::invalidateTab()
- 	TabbableWidget::invalidateTab();
- }
- 
-+void ChatDlg::updateRealJid()
-+{
-+	realJid_ = account()->realJid(jid());
-+}
-+
-+Jid ChatDlg::realJid() const
-+{
-+	return realJid_;
-+}
-+
- bool ChatDlg::isEncryptionEnabled() const
- {
- 	return false;
---- git.orig/src/chatdlg.h
-+++ git/src/chatdlg.h
-@@ -73,6 +73,7 @@ public:
- public:
- 	PsiAccount* account() const;
- 	void setText(const QString& );
-+	Jid realJid() const;
- 
- signals:
- 	void aInfo(const Jid &);
-@@ -142,6 +143,7 @@ protected:
- 	// reimplemented
- 	virtual void invalidateTab();
- 
-+	void updateRealJid();
- 	void resetComposing();
- 	void doneSend();
- 	virtual void setLooks();
-@@ -185,6 +187,7 @@ private:
- 	int transid_;
- 	Message m_;
- 	bool lastWasEncrypted_;
-+	Jid realJid_;
- 
- 	// Message Events & Chat States
- 	QTimer* composingTimer_;
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3539,6 +3539,20 @@ void PsiAccount::itemPublished(const Jid
- 	}*/
- }
- 
-+Jid PsiAccount::realJid(const Jid &j) const
-+{
-+	GCContact *c = findGCContact(j);
-+	if (c) {
-+		if (c->status.hasMUCItem()) {
-+			return c->status.mucItem().jid();
-+		} else {
-+			return Jid();
-+		}
-+	} else {
-+		return j;
-+	}
-+}
-+
- QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
- {
- 	QList<UserListItem*> list;
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -193,6 +193,7 @@ public:
- 	void groupChatChangeNick(const QString &host, const QString &room, const QString& nick, const Status &);
- 	void groupChatLeave(const QString &host, const QString &room);
- 
-+	Jid realJid(const Jid &j) const;
- 	PsiContact* selfContact() const;
- 	const QList<PsiContact*>& contactList() const;
- 	int onlineContactsCount() const;
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -40,6 +40,7 @@
- #include "capsmanager.h"
- #include "psicontactlist.h"
- #include "userlist.h"
-+#include "psicontact.h"
- #include "jidutil.h"
- #include "xmpp_tasks.h"
- #include "lastactivitytask.h"
-@@ -170,6 +171,9 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, P
- 		: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_)
- {
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
-+	connect(account(), SIGNAL(addedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
-+	connect(account(), SIGNAL(removedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
-+	connect(account(), SIGNAL(updateContact(const Jid &)), SLOT(updateContactAdding(const Jid &)));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
- 
- 	SendButtonTemplatesMenu* menu = getTemplateMenu();
-@@ -309,6 +313,7 @@ void PsiChatDlg::setLooks()
- 
- 	updateIdentityVisibility();
- 	updateCountVisibility();
-+	updateContactAdding();
- 
- 	// toolbuttons
- 	QIcon i;
-@@ -352,6 +357,26 @@ void PsiChatDlg::updateIdentityVisibilit
- 	}
- }
- 
-+void PsiChatDlg::updateContactAdding(PsiContact* c)
-+{
-+	if (!c || realJid().compare(c->jid(), false)) {
-+		Jid rj = realJid();
-+		UserListItem *uli;
-+		if (rj.isNull() || ((uli = account()->findFirstRelevant(rj)) && (uli->inList() || uli->isSelf()))) {
-+			act_add_contact->setVisible(false);
-+		} else {
-+			act_add_contact->setVisible(true);
-+		}
-+	}
-+}
-+
-+void PsiChatDlg::updateContactAdding(const Jid &j)
-+{
-+	if (realJid().compare(j, false)) {
-+		updateContactAdding();
-+	}
-+}
-+
- void PsiChatDlg::initToolButtons()
- {
- // typeahead find
-@@ -372,6 +397,9 @@ void PsiChatDlg::initToolButtons()
- 	act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
- 	connect(act_html_text, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
- 
-+	act_add_contact = new IconAction(tr("Add Contact To Roster"), "psi/addContact", tr("Add Contact"), 0, this);
-+	connect(act_add_contact, SIGNAL(triggered()), SLOT(addContact()));
-+
- 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
- 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
- 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
-@@ -430,6 +458,7 @@ void PsiChatDlg::initToolBar()
- 	if (AvCallManager::isSupported()) {
- 		ui_.toolbar->addAction(act_voice_);
- 	}
-+	ui_.toolbar->addAction(act_add_contact);
- }
- 
- void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
-@@ -687,6 +716,14 @@ void PsiChatDlg::doMiniCmd()
- 	mCmdManager_.open(new MCmdSimpleState(MCMDCHAT, tr("Command>")), QStringList() );
- }
- 
-+void PsiChatDlg::addContact()
-+{
-+	Jid j(realJid());
-+	UserListItem *uli = account()->findFirstRelevant(jid());
-+	QString name = uli && !uli->name().isEmpty()? uli->name() : j.node();
-+	account()->openAddUserDlg(j.withResource(""), name.isEmpty()?j.node():name, "");
-+}
-+
- void PsiChatDlg::doMinimize()
- {
- 	window()->showMinimized();
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -11,6 +11,7 @@
- #include "typeaheadfind.h"
- 
- class IconAction;
-+class PsiContact;
- 
- class PsiChatDlg : public ChatDlg
- {
-@@ -33,11 +34,14 @@ private slots:
- 	void toggleSmallChat();
- 	void doClearButton();
- 	void doMiniCmd();
-+	void addContact();
- 	void doMinimize();
- 	void buildMenu();
- 	void updateCounter();
- 	void updateIdentityVisibility();
- 	void updateCountVisibility();
-+	void updateContactAdding(PsiContact* c = 0);
-+	void updateContactAdding(const Jid &j);
- 
- 	// reimplemented
- 	void chatEditCreated();
-@@ -85,6 +89,7 @@ private:
- 	IconAction* act_ps_;
- 	IconAction* act_templates_;
- 	IconAction* act_html_text;
-+	IconAction* act_add_contact;
- 	QAction *act_mini_cmd_, *act_minimize_;
- 
- 	MCmdManager mCmdManager_;

psi-plus-main-20130107.tar.xz/patches/0990-psi-hide-or-close-tab-on-doubleclick.diff Deleted

@@ -1,26 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -459,6 +459,7 @@ QLineEdit#le_status_text {
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
- 				<use-tabs type="bool">true</use-tabs>
- 				<mouse-middle-button type="QString">close</mouse-middle-button>
-+				<mouse-doubleclick-action type="QString">detach</mouse-doubleclick-action>
- 				<size type="QString"></size> 
- 				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs. 'A' means using all in one window patch.">CM</grouping>
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -435,7 +435,12 @@ void TabDlg::detachCurrentTab()
- 
- void TabDlg::mouseDoubleClickTab(QWidget* widget)
- {
--	if(userManagement_)
-+	const QString act = PsiOptions::instance()->getOption("options.ui.tabs.mouse-doubleclick-action").toString();
-+	if(act == "hide")
-+		hideTab(static_cast<TabbableWidget*>(widget));
-+	else if(act == "close")
-+		closeTab(static_cast<TabbableWidget*>(widget));
-+	else if(act == "detach" && userManagement_)
- 		detachTab(static_cast<TabbableWidget*>(widget));
- }
-

psi-plus-main-20130107.tar.xz/patches/1030-psi-block-contact-from-menu.diff Deleted

@@ -1,762 +0,0 @@
---- git.orig/src/contactlistmodel.cpp
-+++ git/src/contactlistmodel.cpp
-@@ -540,6 +540,9 @@ QVariant ContactListModel::contactData(c
- 	else if (role == MucMessagesRole) {
- 		return QVariant(contact->userListItem().pending());
- 	}
-+	else if (role == BlockRole) {
-+		return QVariant(contact->isBlocked());
-+	}
- #ifdef YAPSI
- 	else if (role == Qt::ForegroundRole) {
- 		return QVariant(Ya::statusColor(contact->status().type()));
---- git.orig/src/contactlistmodel.h
-+++ git/src/contactlistmodel.h
-@@ -84,6 +84,7 @@ public:
- 		AvatarRole = Qt::UserRole + 28,
- 		IsMucRole = Qt::UserRole + 29,
- 		MucMessagesRole = Qt::UserRole + 30,
-+		BlockRole = Qt::UserRole + 31,
- 
- 		// groups
- 		ExpandedRole = Qt::UserRole + 12,
---- git.orig/src/privacy/privacydlg.cpp
-+++ git/src/privacy/privacydlg.cpp
-@@ -48,11 +48,11 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 	connect(ui_.cb_default,SIGNAL(activated(int)),SLOT(default_selected(int)));
- 	connect(ui_.cb_lists,SIGNAL(activated(int)),SLOT(list_selected(int)));
- 	connect(ui_.cb_lists,SIGNAL(currentIndexChanged(int)),SLOT(list_changed(int)));
--	connect(manager_,SIGNAL(changeActiveList_success()),SLOT(change_succeeded()));
-+	connect(manager_,SIGNAL(changeActiveList_success(QString)),SLOT(changeActiveList_succeeded(QString)));
- 	connect(manager_,SIGNAL(changeActiveList_error()),SLOT(change_failed()));
--	connect(manager_,SIGNAL(changeDefaultList_success()),SLOT(change_succeeded()));
-+	connect(manager_,SIGNAL(changeDefaultList_success(QString)),SLOT(changeDefaultList_succeeded(QString)));
- 	connect(manager_,SIGNAL(changeDefaultList_error()),SLOT(change_failed()));
--	connect(manager_,SIGNAL(changeList_success()),SLOT(changeList_succeeded()));
-+	connect(manager_,SIGNAL(changeList_success(QString)),SLOT(changeList_succeeded(QString)));
- 	connect(manager_,SIGNAL(changeList_error()),SLOT(changeList_failed()));
- 
- 	connect(ui_.pb_newList,SIGNAL(clicked()),SLOT(newList()));
-@@ -252,8 +252,29 @@ void PrivacyDlg::list_failed()
- 	setWidgetsEnabled(true);
- }
- 
--void PrivacyDlg::changeList_succeeded()
-+void PrivacyDlg::changeActiveList_succeeded(QString name)
- {
-+	if(!name.isEmpty() && ui_.cb_active->findText(name) == -1) {
-+		ui_.cb_active->addItem(name);
-+		ui_.cb_active->setCurrentIndex(ui_.cb_active->findText(name));
-+	}
-+	change_succeeded();
-+}
-+
-+void PrivacyDlg::changeDefaultList_succeeded(QString name)
-+{
-+	if(!name.isEmpty() && ui_.cb_default->findText(name) == -1) {
-+		ui_.cb_default->addItem(name);
-+		ui_.cb_default->setCurrentIndex(ui_.cb_default->findText(name));
-+	}
-+	change_succeeded();
-+}
-+
-+void PrivacyDlg::changeList_succeeded(QString name)
-+{
-+	if(!name.isEmpty() && ui_.cb_lists->findText(name) == -1) {
-+		ui_.cb_lists->addItem(name);
-+	}
- 	// If we just deleted a list, select the first list
- 	if (model_.list().isEmpty()) {
- 		ui_.cb_lists->setCurrentIndex(0);
---- git.orig/src/privacy/privacydlg.h
-+++ git/src/privacy/privacydlg.h
-@@ -55,9 +55,11 @@ protected slots:
- 	void list_selected(int i);
- 	void list_changed(int);
- 	void list_failed();
--	void changeList_succeeded();
-+	void changeList_succeeded(QString);
- 	void changeList_failed();
- 	void change_succeeded();
-+	void changeActiveList_succeeded(QString);
-+	void changeDefaultList_succeeded(QString);
- 	void change_failed();
- 	void close();
- 	void addRule();
---- git.orig/src/privacy/privacylist.cpp
-+++ git/src/privacy/privacylist.cpp
-@@ -51,6 +51,12 @@ void PrivacyList::insertItem(int index, 
- 	reNumber();
- }
- 
-+void PrivacyList::appendItem(const PrivacyListItem& item)
-+{
-+	insertItem(items_.count(), item);
-+}
-+
-+
- void PrivacyList::reNumber() 
- {
- 	unsigned int order = 100;
---- git.orig/src/privacy/privacylist.h
-+++ git/src/privacy/privacylist.h
-@@ -43,6 +43,7 @@ public:
- 	const PrivacyListItem& item(int index) const { return items_.at(index); }
- 	void removeItem(int index) { items_.removeAt(index); }
- 	void insertItem(int index, const PrivacyListItem& item);
-+	void appendItem(const PrivacyListItem& item);
- 	bool moveItemUp(int index);
- 	bool moveItemDown(int index);
- 	bool onlyBlockItems() const;
---- git.orig/src/privacy/privacymanager.h
-+++ git/src/privacy/privacymanager.h
-@@ -40,11 +40,11 @@ public:
- 	virtual void requestList(const QString& name) = 0;
- 
- signals:
--	void changeDefaultList_success();
-+	void changeDefaultList_success(QString);
- 	void changeDefaultList_error();
--	void changeActiveList_success();
-+	void changeActiveList_success(QString);
- 	void changeActiveList_error();
--	void changeList_success();
-+	void changeList_success(QString);
- 	void changeList_error();
- 	void defaultListAvailable(const PrivacyList&);
- 	void defaultListError();
---- git.orig/src/privacy/psiprivacymanager.cpp
-+++ git/src/privacy/psiprivacymanager.cpp
-@@ -23,12 +23,30 @@
- #include "xmpp_xmlcommon.h"
- #include "xmpp_task.h"
- #include "xmpp_jid.h"
-+#include "xmpp_tasks.h"
-+#include "userlist.h"
- #include "psiprivacymanager.h"
- #include "privacymanager.h"
- #include "privacylist.h"
-+#include "psicon.h"
-+#include "contactupdatesmanager.h"
-+#include "psiaccount.h"
- 
- #define PRIVACY_NS "jabber:iq:privacy"
- 
-+static const QString BLOCKED_LIST_NAME = "blocked";
-+
-+static XMPP::Jid processJid(const XMPP::Jid& jid)
-+{
-+	return jid.withResource("");
-+}
-+
-+static bool privacyListItemForJid(const PrivacyListItem& item, const Jid& jid)
-+{
-+	return item.type() == PrivacyListItem::JidType &&
-+	       processJid(item.value()) == processJid(jid);
-+}
-+
- using namespace XMPP;
- 
- // -----------------------------------------------------------------------------
-@@ -46,9 +64,12 @@ public:
- 			return false;
- 		
- 		QString ns = queryNS(e);
--		if(ns == "jabber:iq:privacy") {
--			// TODO: Do something with update
--			
-+		if (ns == PRIVACY_NS) {
-+			QDomElement listTag = findSubTag(queryTag(e), "list", 0);
-+			if (!listTag.isNull()) {
-+				emit privacyListChanged(listTag.attribute("name"));
-+			}
-+
- 			// Confirm receipt
- 			QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
- 			send(iq);
-@@ -57,6 +78,9 @@ public:
- 
- 		return false;
- 	}
-+
-+signals:
-+	void privacyListChanged(const QString& name);
- };
- 
- // -----------------------------------------------------------------------------
-@@ -205,6 +229,9 @@ public:
- 		}
- 		return true;
- 	}
-+	QString name() {
-+		return list_.name();
-+	}
- };
- 
- class GetPrivacyListTask : public Task
-@@ -262,14 +289,38 @@ public:
- 
- // -----------------------------------------------------------------------------
- 
--PsiPrivacyManager::PsiPrivacyManager(XMPP::Task* rootTask) : rootTask_(rootTask), getDefault_waiting_(false), block_waiting_(false)
--{
--   listener_ = new PrivacyListListener(rootTask_);	
-+PsiPrivacyManager::PsiPrivacyManager(PsiAccount* account, XMPP::Task* rootTask) : rootTask_(rootTask), getDefault_waiting_(false), block_waiting_(false)
-+		, account_(account)
-+		, accountAvailable_(false)
-+		, isAvailable_(false)
-+{
-+	blockedListName_ = BLOCKED_LIST_NAME;
-+	listener_ = new PrivacyListListener(rootTask_);
-+	connect(listener_, SIGNAL(privacyListChanged(const QString&)), SLOT(privacyListChanged(const QString&)));
-+
-+	connect(account, SIGNAL(updatedActivity()), SLOT(accountStateChanged()));
-+
-+	connect(this, SIGNAL(listReceived(const PrivacyList&)), SLOT(newListReceived(const PrivacyList&)));
-+	connect(this, SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)), SLOT(newListsReceived(const QString&, const QString&, const QStringList&)));
-+	connect(this, SIGNAL(listsError()), SLOT(newListsError()));
-+
-+	connect(this, SIGNAL(changeDefaultList_success(QString)), SLOT(newChangeDefaultList_success()));
-+	connect(this, SIGNAL(changeDefaultList_error()), SLOT(newChangeDefaultList_error()));
-+	connect(this, SIGNAL(changeActiveList_success(QString)), SLOT(newChangeActiveList_success()));
-+	connect(this, SIGNAL(changeActiveList_error()), SLOT(newChangeActiveList_error()));
- }
- 
- PsiPrivacyManager::~PsiPrivacyManager()
- {
- 	delete listener_;
-+
-+	qDeleteAll(lists_);
-+}
-+
-+void PsiPrivacyManager::privacyListChanged(const QString& name)
-+{
-+	if (!name.isEmpty())
-+		requestList(name);
- }
- 
- void PsiPrivacyManager::requestListNames()
-@@ -379,7 +430,7 @@ void PsiPrivacyManager::changeDefaultLis
- 	}
- 
- 	if (t->success()) {
--		emit changeDefaultList_success();
-+		emit changeDefaultList_success(t->name());
- 	}
- 	else {
- 		emit changeDefaultList_error();
-@@ -388,6 +439,7 @@ void PsiPrivacyManager::changeDefaultLis
- 
- void PsiPrivacyManager::changeActiveList(const QString& name)
- {
-+	tmpActiveListName_ = name;
- 	SetPrivacyListsTask* t = new SetPrivacyListsTask(rootTask_);
- 	t->setActive(name);
- 	connect(t,SIGNAL(finished()),SLOT(changeActiveList_finished()));
-@@ -403,7 +455,8 @@ void PsiPrivacyManager::changeActiveList
- 	}
- 
- 	if (t->success()) {
--		emit changeActiveList_success();
-+		blockedListName_ = tmpActiveListName_ .isEmpty() ? BLOCKED_LIST_NAME : tmpActiveListName_ ;
-+		emit changeActiveList_success(t->name());
- 	}
- 	else {
- 		emit changeActiveList_error();
-@@ -427,7 +480,7 @@ void PsiPrivacyManager::changeList_finis
- 	}
- 
- 	if (t->success()) {
--		emit changeList_success();
-+		emit changeList_success(t->name());
- 	}
- 	else {
- 		emit changeList_error();
-@@ -468,4 +521,229 @@ void PsiPrivacyManager::receiveList() 
- 	}
- }
- 
-+
-+bool PsiPrivacyManager::isAvailable() const
-+{
-+	return isAvailable_;
-+}
-+
-+void PsiPrivacyManager::setIsAvailable(bool available)
-+{
-+	if (available != isAvailable_) {
-+		isAvailable_ = available;
-+		emit availabilityChanged();
-+	}
-+}
-+
-+void PsiPrivacyManager::accountStateChanged()
-+{
-+	if (!account_->isAvailable()) {
-+		setIsAvailable(false);
-+	}
-+
-+	if (account_->isAvailable() && !accountAvailable_) {
-+		requestListNames();
-+	}
-+
-+	accountAvailable_ = account_->isAvailable();
-+}
-+
-+static QStringList findDifferences(QStringList previous, QStringList current)
-+{
-+	QStringList result;
-+	foreach(QString i, previous) {
-+		if (!current.contains(i))
-+			result += i;
-+	}
-+	return result;
-+}
-+
-+void PsiPrivacyManager::newListReceived(const PrivacyList& list)
-+{
-+	QStringList previouslyBlockedContacts = blockedContacts();
-+
-+	if (lists_.contains(list.name()))
-+		*lists_[list.name()] = list;
-+	else
-+		lists_[list.name()] = new PrivacyList(list);
-+
-+	if (list.name() == blockedListName_)
-+		invalidateBlockedListCache();
-+
-+	QStringList currentlyBlockedContacts = blockedContacts();
-+	QStringList updatedContacts;
-+	updatedContacts += findDifferences(previouslyBlockedContacts, currentlyBlockedContacts);
-+	updatedContacts += findDifferences(currentlyBlockedContacts, previouslyBlockedContacts);
-+
-+	foreach(QString contact, updatedContacts) {
-+		//emit simulateContactOffline(contact);
-+
-+		if (!isContactBlocked(contact)) {
-+			if (isAuthorized(contact)) {
-+				JT_Presence* p = new JT_Presence(account_->client()->rootTask());
-+				p->pres(processJid(contact), account_->status());
-+				p->go(true);
-+			}
-+
-+			{
-+				JT_Presence* p = new JT_Presence(account_->client()->rootTask());
-+				p->probe(processJid(contact));
-+				p->go(true);
-+			}
-+		}
-+	}
-+
-+	emit listChanged(updatedContacts);
-+}
-+
-+void PsiPrivacyManager::newListsReceived(const QString& defaultList, const QString& activeList, const QStringList& lists)
-+{
-+	if(!activeList.isEmpty())
-+		blockedListName_ = activeList;
-+
-+	if (!lists.contains(blockedListName_))
-+		createBlockedList();
-+	else
-+		requestList(blockedListName_);
-+
-+	if (defaultList.isEmpty())
-+		changeDefaultList(blockedListName_);
-+
-+	if(activeList.isEmpty())
-+		changeActiveList(blockedListName_);
-+
-+	setIsAvailable(true);
-+}
-+
-+void PsiPrivacyManager::newListsError()
-+{
-+	setIsAvailable(false);
-+}
-+
-+void PsiPrivacyManager::newChangeDefaultList_success()
-+{
-+}
-+
-+void PsiPrivacyManager::newChangeDefaultList_error()
-+{
-+	qWarning("YaPrivacyManager::changeDefaultList_error()");
-+}
-+
-+void PsiPrivacyManager::newChangeActiveList_success()
-+{
-+}
-+
-+void PsiPrivacyManager::newChangeActiveList_error()
-+{
-+	qWarning("YaPrivacyManager::changeActiveList_error()");
-+}
-+
-+void PsiPrivacyManager::createBlockedList()
-+{	
-+	PrivacyList list(blockedListName_);
-+	PrivacyListItem allowAll;
-+	allowAll.setType(PrivacyListItem::FallthroughType);
-+	allowAll.setAction(PrivacyListItem::Allow);
-+	allowAll.setAll();
-+
-+	list.insertItem(0, allowAll);
-+	changeList(list);
-+}
-+
-+PrivacyList* PsiPrivacyManager::blockedList() const
-+{
-+	if(lists_.contains(blockedListName_))
-+		return lists_[blockedListName_];
-+
-+	return 0;
-+}
-+
-+QStringList PsiPrivacyManager::blockedContacts() const
-+{
-+	QStringList result;
-+	if (blockedList()) {
-+		foreach(PrivacyListItem item, blockedList()->items()) {
-+			if (item.type() == PrivacyListItem::JidType &&
-+			    item.action() == PrivacyListItem::Deny) {
-+				result << processJid(item.value()).full();
-+			}
-+		}
-+	}
-+	return result;
-+}
-+
-+void PsiPrivacyManager::invalidateBlockedListCache()
-+{
-+	isBlocked_.clear();
-+
-+	if (!blockedList())
-+		return;
-+
-+	foreach(PrivacyListItem item, blockedList()->items()) {
-+		if (item.type() == PrivacyListItem::JidType &&
-+		    item.action() == PrivacyListItem::Deny) {
-+			isBlocked_[processJid(item.value()).full()] = true;
-+		}
-+	}
-+}
-+
-+bool PsiPrivacyManager::isContactBlocked(const XMPP::Jid& jid) const
-+{
-+	return isBlocked_.contains(processJid(jid).full());
-+}
-+
-+PrivacyListItem PsiPrivacyManager::blockItemFor(const XMPP::Jid& jid) const
-+{
-+	PrivacyListItem item;
-+	item.setType(PrivacyListItem::JidType);
-+	item.setValue(processJid(jid).full());
-+	item.setAction(PrivacyListItem::Deny);
-+	item.setAll();
-+	return item;
-+}
-+
-+void PsiPrivacyManager::setContactBlocked(const XMPP::Jid& jid, bool blocked)
-+{
-+	if (blocked) {
-+		account_->psi()->contactUpdatesManager()->contactBlocked(account_, jid);
-+	}
-+
-+	if(!blockedList()) {
-+		createBlockedList();
-+		return;
-+	}
-+
-+	if (isContactBlocked(jid) == blocked)
-+		return;
-+
-+	if (blocked && isAuthorized(jid)) {
-+		JT_Presence* p = new JT_Presence(account_->client()->rootTask());
-+		p->pres(processJid(jid), account_->loggedOutStatus());
-+		p->go(true);
-+	}
-+
-+	PrivacyList newList(*blockedList());
-+	newList.clear();
-+
-+	foreach(PrivacyListItem item, blockedList()->items()) {
-+		if (privacyListItemForJid(item, jid))
-+			continue;
-+
-+		newList.appendItem(item);
-+	}
-+
-+	if (blocked)
-+		newList.insertItem(0, blockItemFor(jid));
-+
-+	changeList(newList);
-+}
-+
-+bool PsiPrivacyManager::isAuthorized(const XMPP::Jid& jid) const
-+{
-+	UserListItem* u = account_->findFirstRelevant(processJid(jid));
-+	return u && (u->subscription().type() == Subscription::Both ||
-+		     u->subscription().type() == Subscription::From);
-+}
-+
-+
- #include "psiprivacymanager.moc"
---- git.orig/src/privacy/psiprivacymanager.h
-+++ git/src/privacy/psiprivacymanager.h
-@@ -23,11 +23,16 @@
- 
- #include <QObject>
- #include <QStringList>
-+#include <QHash>
- 
- #include "privacymanager.h"
- 
-+#include "xmpp_jid.h"
-+
- class QString;
-+class PsiAccount;
- class PrivacyList;
-+class PrivacyListItem;
- class PrivacyListListener;
- namespace XMPP {
- 	class Task;
-@@ -39,7 +44,7 @@ class PsiPrivacyManager : public Privacy
- 	Q_OBJECT
- 
- public:
--	PsiPrivacyManager(XMPP::Task* rootTask);
-+	PsiPrivacyManager(PsiAccount* account, XMPP::Task* rootTask);
- 	virtual ~PsiPrivacyManager();
- 
- 	void requestListNames();
-@@ -80,6 +85,52 @@ private:
- 
- 	QStringList block_targets_;
- 	bool block_waiting_;
-+
-+public:
-+	bool isAvailable() const;
-+
-+	bool isContactBlocked(const XMPP::Jid& jid) const;
-+	void setContactBlocked(const XMPP::Jid& jid, bool blocked);
-+
-+signals:
-+	void availabilityChanged();
-+	void listChanged(const QStringList& contacts);
-+
-+	//void simulateContactOffline(const XMPP::Jid& contact);
-+
-+private slots:
-+	void newListReceived(const PrivacyList& p);
-+	void newListsReceived(const QString& defaultList, const QString& activeList, const QStringList& lists);
-+	void newListsError();
-+
-+	void accountStateChanged();
-+
-+	void newChangeDefaultList_success();
-+	void newChangeDefaultList_error();
-+	void newChangeActiveList_success();
-+	void newChangeActiveList_error();
-+
-+private slots:
-+	void privacyListChanged(const QString& name);
-+
-+private:
-+	PsiAccount* account_;
-+	bool accountAvailable_;
-+	bool isAvailable_;
-+	QHash<QString, PrivacyList*> lists_;
-+	QHash<QString, bool> isBlocked_;
-+
-+	void invalidateBlockedListCache();
-+	void setIsAvailable(bool available);
-+
-+	void createBlockedList();
-+	PrivacyList* blockedList() const;
-+	PrivacyListItem blockItemFor(const XMPP::Jid& jid) const;
-+
-+	QStringList blockedContacts() const;
-+
-+	QString blockedListName_, tmpActiveListName_;
-+	bool isAuthorized(const XMPP::Jid& jid) const;
- };
- 
- #endif
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -1083,7 +1083,7 @@ PsiAccount::PsiAccount(const UserAccount
- 	connect(d->client, SIGNAL(xmlOutgoing(const QString &)), d, SLOT(client_xmlOutgoing(const QString &)));
- 
- 	// Privacy manager
--	d->privacyManager = new PsiPrivacyManager(d->client->rootTask());
-+	d->privacyManager = new PsiPrivacyManager(d->account, d->client->rootTask());
- 
- 	// Caps manager
- 	d->capsManager = new CapsManager(d->client->jid(), capsRegistry, new IrisProtocol::DiscoInfoQuerier(d->client));
---- git.orig/src/psicontact.cpp
-+++ git/src/psicontact.cpp
-@@ -44,6 +44,8 @@
- #include "yacommon.h"
- #include "yaprofile.h"
- #include "yatoastercentral.h"
-+#else
-+#include "psiprivacymanager.h"
- #endif
- #include "contactlistgroup.h"
- #include "desktoputil.h"
-@@ -653,6 +655,10 @@ void PsiContact::toggleBlockedStateConfi
- 
- 	bool blocked = privacyManager->isContactBlocked(jid());
- 	blockContactConfirmationHelper(!blocked);
-+#else
-+	PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
-+	bool blocked = privacyManager->isContactBlocked(jid());
-+	blockContactConfirmationHelper(!blocked);
- #endif
- }
- 
-@@ -667,8 +673,8 @@ void PsiContact::blockContactConfirmatio
- 
- 	privacyManager->setContactBlocked(jid(), block);
- #else
--	// FIXME
--	Q_UNUSED(block);
-+	PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
-+	privacyManager->setContactBlocked(jid(), block);
- #endif
- }
- 
-@@ -810,6 +816,10 @@ void PsiContact::addRemoveAuthBlockAvail
- 		YaPrivacyManager* privacyManager = dynamic_cast<YaPrivacyManager*>(account()->privacyManager());
- 		Q_ASSERT(privacyManager);
- 		*blockButton = *blockButton && privacyManager->isAvailable();
-+#else
-+		PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
-+		if(privacyManager)
-+			*blockButton = *blockButton && privacyManager->isAvailable();
- #endif
- 	}
- }
-@@ -910,6 +920,10 @@ bool PsiContact::isBlocked() const
- 	return account() && privacyManager(account()) &&
- 	       privacyManager(account())->isContactBlocked(jid());
- #else
-+	if(account()) {
-+		PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
-+		return privacyManager->isContactBlocked(jid());
-+	}
- 	return false;
- #endif
- }
---- git.orig/src/psicontactlistviewdelegate.cpp
-+++ git/src/psicontactlistviewdelegate.cpp
-@@ -269,6 +269,7 @@ void PsiContactListViewDelegate::drawCon
- 
- 	QStyleOptionViewItemV2 o = option;
- 	o.font = *font_;
-+	o.font.setItalic(index.data(ContactListModel::BlockRole).toBool());
- 	o.fontMetrics = *fontMetrics_;
- 	QPalette palette = o.palette;
- 	palette.setColor(QPalette::Text, textColor);
---- git.orig/src/psicontactmenu.cpp
-+++ git/src/psicontactmenu.cpp
-@@ -45,6 +45,8 @@
- 
- #ifdef YAPSI
- #include "yaprofile.h"
-+#else
-+#include "psiprivacymanager.h"
- #endif
- 
- #include "groupchatdlg.h"
-@@ -254,6 +256,7 @@ public:
- 	QAction* mucHideAction_;
- 	QAction* mucShowAction_;
- 	QAction* mucLeaveAction_;
-+	QAction* blockAction_;
- 
- #endif
- 
-@@ -421,6 +424,9 @@ public:
- 		connect(mucLeaveAction_, SIGNAL(triggered()), SLOT(mucLeave()));
- 		mucLeaveAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
- 
-+		blockAction_ = new IconAction(tr("Block"), "psi/stop", tr("Block"), 0, this, 0, true);
-+		connect(blockAction_, SIGNAL(triggered(bool)), SLOT(block(bool)));
-+
- 		if (!contact_->isConference()) {
- 			menu_->addAction(addAuthAction_);
- 			menu_->addSeparator();
-@@ -445,6 +451,7 @@ public:
- 			menu_->addMenu(groupMenu_);
- 			menu_->addAction(transportLogonAction_);
- 			menu_->addAction(transportLogoffAction_);
-+			menu_->addAction(blockAction_);
- 			authMenu_ = menu_->addMenu(tr("Authorization"));
- 			authMenu_->addAction(authResendAction_);
- 			authMenu_->addAction(authRerequestAction_);
-@@ -467,6 +474,7 @@ public:
- 			menu_->addAction(mucLeaveAction_);
- 			menu_->addSeparator();
- 			menu_->addAction(customStatusAction_);
-+			//menu_->addAction(blockAction_);
- 		}
- #endif
- 	}
-@@ -485,9 +493,14 @@ private slots:
- 
- 	void updateActions()
- 	{
--		if (!contact_ or contact_->isConference())
-+		if (!contact_)
- 			return;
- 
-+		if(contact_->isConference()) {
-+			updateBlockActionState();
-+			return;
-+		}
-+
- #ifdef YAPSI
- 		YaProfile* profile = YaProfile::create(contact_->account(), contact_->jid());
- 		openHistoryAction_->setEnabled(contact_->historyAvailable());
-@@ -554,6 +567,7 @@ private slots:
- 			authMenu_->menuAction()->setVisible(false);
- 		}
- 		authMenu_->setEnabled(contact_->account()->isAvailable());
-+		updateBlockActionState();
- 		removeAction_->setVisible(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()  && !contact_->isSelf());
- 		removeAction_->setEnabled(contact_->removeAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.contact.custom-picture").toBool()) {
-@@ -634,6 +648,14 @@ private slots:
- 		contact_->setGroups(QStringList() << group);
- 	}
- 
-+	void block(bool )
-+	{
-+		if (!contact_)
-+			return;
-+
-+		contact_->toggleBlockedStateConfirmation();
-+	}
-+
- 	void addAuth()
- 	{
- 		if (!contact_)
-@@ -840,6 +862,16 @@ private slots:
- 		contact_->account()->actionOpenChatSpecific(jid);
- 	}
- #endif
-+private:
-+	void updateBlockActionState()
-+	{
-+		if(!contact_)
-+			return;
-+		blockAction_->setVisible(!(contact_->isPrivate()/* || contact_->isAgent()*/ || contact_->isSelf()));
-+		blockAction_->setEnabled(contact_->account()->isAvailable() && dynamic_cast<PsiPrivacyManager*>(contact_->account()->privacyManager())->isAvailable());
-+		blockAction_->setChecked(contact_->isBlocked());
-+		blockAction_->setText(blockAction_->isChecked() ? tr("Unblock") : tr("Block"));
-+	}
- };
- 
- PsiContactMenu::PsiContactMenu(PsiContact* contact, ContactListModel* model)

psi-plus-main-20130107.tar.xz/patches/1050-psi-workaround-adhoc-form-closes.diff Deleted

@@ -1,32 +0,0 @@
---- git.orig/src/ahcexecutetask.cpp
-+++ git/src/ahcexecutetask.cpp
-@@ -48,14 +48,10 @@ bool AHCExecuteTask::take(const QDomElem
- 		QDomElement i = findSubTag(e, "command", &found);
- 		if (found) {
- 			AHCommand c(i);
--			if (c.status() == AHCommand::Executing) {
--				AHCFormDlg *w = new AHCFormDlg(c,receiver_,client());
--				w->show();
--			}
--			else if (c.status() == AHCommand::Completed && i.childNodes().count() > 0) {
--				AHCFormDlg *w = new AHCFormDlg(c,receiver_,client(), true);
--				w->show();
--			}
-+			if (c.status() == AHCommand::Executing)
-+				new AHCFormDlg(c,receiver_,client());
-+			else if (c.status() == AHCommand::Completed && i.childNodes().count() > 0)
-+				new AHCFormDlg(c,receiver_,client(), true);
- 			setSuccess();
- 			return true;
- 		}
---- git.orig/src/ahcformdlg.cpp
-+++ git/src/ahcformdlg.cpp
-@@ -133,6 +133,8 @@ AHCFormDlg::AHCFormDlg(const AHCommand& 
- 	}
- 
- 	adjustSize();
-+	show();
-+	setParent(0);
- }
- 
- void AHCFormDlg::doPrev()

psi-plus-main-20130107.tar.xz/patches/1060-psiplus-decorate-windows.diff Deleted

@@ -1,1120 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -446,6 +446,7 @@ QLineEdit#le_status_text {
- 				</sounds>
- 				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
-+			<decorate-windows type="bool">true</decorate-windows>
- 			<service-discovery>
- 				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -85,6 +85,7 @@
- #include "mcmdmanager.h"
- #include "lastactivitytask.h"
- #include "psirichtext.h"
-+#include "psiwindowheader.h"
- 
- #include "mcmdsimplesite.h"
- 
-@@ -237,9 +238,13 @@ public:
- 
- 	int logSize;
- 	int rosterSize;
-+
- public:
- 	bool trackBar;
- 
-+	bool tabmode;
-+	PsiWindowHeader *winHeader_;
-+
- public:
- 	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
- 	ChatView* te_log() const { return dlg->ui_.log; }
-@@ -631,6 +636,14 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.lb_ident->setAccount(account());
- 	ui_.lb_ident->setShowJid(false);
- 	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
-+	d->tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	if (!d->tabmode && !isBorder()) {
-+		d->winHeader_ = new PsiWindowHeader(this);
-+		ui_.vboxLayout1->insertWidget(0, d->winHeader_);
-+	}
-+	setMargins();
-+
- #ifdef WEBKIT
- 	ui_.log->setAccount(account());
- #endif
-@@ -2097,6 +2110,25 @@ void GCMainDlg::resizeEvent(QResizeEvent
- 	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
- }
- 
-+void GCMainDlg::setMargins()
-+{
-+	ui_.vboxLayout->setContentsMargins(0,0,0,0);
-+	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
-+	if (!d->tabmode) {
-+		ui_.hboxLayout->setContentsMargins(4,0,4,0);
-+		if (!isBorder()) {
-+			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
-+		}
-+		else {
-+			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
-+		}
-+	}
-+	else {
-+		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
-+		ui_.hboxLayout->setContentsMargins(2,0,4,0);
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -169,6 +169,8 @@ private:
- 
- 	PsiOptions* options_;
- 	QDateTime lastMsgTime_;
-+
-+	void setMargins();
- };
- 
- class GCFindDlg : public QDialog
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -147,6 +147,8 @@ public:
- 	QTimer *hideTimer;
- 	int hideTimerInterval; //interval in sec
- 	bool useAutohide;
-+	bool isHide;
-+
- 
- #ifdef Q_WS_WIN
- 	DWORD deactivationTickCount;
-@@ -572,6 +574,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
- 	d->hideTimer->setInterval(d->hideTimerInterval*1000);
- 	optionChanged("options.contactlist.use-autohide");
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	setMouseTracking(!isBorder());
- }
- 
- MainWin::~MainWin()
-@@ -628,6 +632,11 @@ void MainWin::optionChanged(const QStrin
- 		if(d->useAutohide)
- 			d->hideTimer->start();
- 	}
-+	else if (option == "options.ui.decorate-windows") {
-+		setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+		setMouseTracking(!isBorder());
-+		show();
-+	}
- }
- 
- void MainWin::hideTimerTimeout()
-@@ -797,14 +806,19 @@ void MainWin::setWindowOpts(bool _onTop,
- 	d->onTop = _onTop;
- 	d->asTool = _asTool;
- 
--	Qt::WFlags flags = 0;
-+	Qt::WFlags flags = windowFlags();
- 	if(d->onTop) {
- 		flags |= Qt::WindowStaysOnTopHint;
- 	}
-+	else {
-+		flags &= ~Qt::WindowStaysOnTopHint;
-+	}
- 	if(d->asTool) {
- 		flags |= Qt::Tool | TOOLW_FLAGS;
- 	}
--
-+	else {
-+		flags &= ~Qt::Tool;
-+	}
- 	setWindowFlags(flags);
- 	show();
- }
-@@ -1733,6 +1747,7 @@ void MainWin::statusClicked(int x)
- {
- 	if(x == Qt::MidButton) {
- 		recvNextEvent();
-+		d->isHide = false;
- 	}
- }
- 
-@@ -1986,4 +2001,32 @@ void MainWin::resizeEvent(QResizeEvent *
- 	}
- }
- 
-+void MainWin::mousePressEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder()) {
-+		d->isHide = true;
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mousePressEvent(e);
-+}
-+
-+void MainWin::mouseReleaseEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder() && d->isHide) {
-+		d->isHide = false;
-+		if (e->globalPos().x() >= geometry().left()
-+			&& e->globalPos().x() <= geometry().right()
-+			&& e->globalPos().y() >= geometry().top()
-+			&& e->globalPos().y() <= geometry().bottom()){
-+			if (d->asTool){
-+				d->mainWin->trayHide();
-+			} else {
-+				setWindowState(windowState() | Qt::WindowMinimized);
-+			}
-+		}
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mouseReleaseEvent(e);
-+}
-+
- //#endif
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -26,6 +26,7 @@
- #include <QList>
- #include <QString>
- #include <QStringList>
-+#include <QMouseEvent>
- 
- #include "advwidget.h"
- #include "xmpp_status.h"
-@@ -84,6 +85,8 @@ protected:
- #ifdef Q_WS_WIN
- 	bool winEvent(MSG *, long *);
- #endif
-+	void mousePressEvent(QMouseEvent *e);
-+	void mouseReleaseEvent(QMouseEvent *e);
- 
- signals:
- 	void statusChanged(XMPP::Status::Type);
---- git.orig/src/options/opt_application.cpp
-+++ git/src/options/opt_application.cpp
-@@ -43,7 +43,9 @@ QWidget *OptionsTabApplication::widget()
- 
- 	w = new OptApplicationUI();
- 	OptApplicationUI *d = (OptApplicationUI *)w;
--
-+	d->ck_winDecor->setWhatsThis(
-+		tr("Set or remove window decorations for roster and chats."
-+		" For chats there are special header with close, hide and maximize buttons"));
- 	// docklet
- 	d->ck_docklet->setWhatsThis(
- 		tr("Makes Psi use a docklet icon, also known as system tray icon."));
-@@ -90,6 +92,7 @@ void OptionsTabApplication::applyOptions
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
- 	PsiOptions::instance()->setOption("options.ui.contactlist.quit-on-close", d->ck_quitOnClose->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.decorate-windows", d->ck_winDecor->isChecked());
- 
- 	// Auto-update
- 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
-@@ -134,6 +137,7 @@ void OptionsTabApplication::restoreOptio
- 
- 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
- 	d->ck_quitOnClose->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool());
-+	d->ck_winDecor->setChecked(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- 
- 	// docklet
- 	d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
---- git.orig/src/options/opt_application.ui
-+++ git/src/options/opt_application.ui
-@@ -24,6 +24,16 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_winDecor" >
-+     <property name="text" >
-+      <string>Decorate windows</string>
-+     </property>
-+     <property name="checked" >
-+      <bool>true</bool>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QGroupBox" name="gb_docklet" >
-      <property name="title" >
-       <string>Docklet</string>
-@@ -227,6 +237,7 @@
-   <tabstop>ck_useleft</tabstop>
-   <tabstop>ck_showMenubar</tabstop>
-   <tabstop>ck_docklet</tabstop>
-+  <tabstop>ck_winDecor</tabstop>
-   <tabstop>ck_dockDCstyle</tabstop>
-   <tabstop>ck_dockHideMW</tabstop>
-   <tabstop>ck_dockToolMW</tabstop>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -175,6 +175,8 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, P
- 	connect(account(), SIGNAL(removedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
- 	connect(account(), SIGNAL(updateContact(const Jid &)), SLOT(updateContactAdding(const Jid &)));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
-+	tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- 
- 	SendButtonTemplatesMenu* menu = getTemplateMenu();
- 	if (menu) {
-@@ -255,6 +257,12 @@ void PsiChatDlg::initUi()
- 
- 	connect(act_minimize_, SIGNAL(triggered()), SLOT(doMinimize()));
- 	addAction(act_minimize_);
-+
-+	if (!tabmode) {
-+		winHeader_ = new PsiWindowHeader(this);
-+		ui_.vboxLayout1->insertWidget(0, winHeader_);
-+	}
-+	setMargins();
- }
- 
- void PsiChatDlg::updateCountVisibility()
-@@ -483,6 +491,22 @@ void PsiChatDlg::activated()
- 	ChatDlg::activated();
- 
- 	updateCountVisibility();
-+
-+	bool border = PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool();
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()){
-+		if (!winHeader_.isNull())
-+			winHeader_->setVisible(!border);
-+		setWindowBorder(border);
-+		setMargins();
-+#if defined(Q_WS_MAC) || defined(Q_WS_HAIKU)
-+		//
-+#else
-+		bringToFront(true);
-+#endif
-+	} else {
-+		if (!winHeader_.isNull())
-+			winHeader_->setVisible(false);
-+	}
- }
- 
- void PsiChatDlg::setContactToolTip(QString text)
-@@ -788,4 +812,23 @@ void PsiChatDlg::sendTemp(const QString
- 	}
- }
- 
-+void PsiChatDlg::setMargins()
-+{
-+	ui_.vboxLayout->setContentsMargins(0,0,0,0);
-+	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
-+	if (!tabmode) {
-+		ui_.hboxLayout->setContentsMargins(4,0,4,0);
-+		if (!isBorder()) {
-+			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
-+		}
-+		else {
-+			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
-+		}
-+	}
-+	else {
-+		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
-+		ui_.hboxLayout->setContentsMargins(2,0,4,0);
-+	}
-+}
-+
- #include "psichatdlg.moc"
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -9,6 +9,7 @@
- 
- #include "ui_chatdlg.h"
- #include "typeaheadfind.h"
-+#include "psiwindowheader.h"
- 
- class IconAction;
- class PsiContact;
-@@ -70,6 +71,7 @@ private:
- 	void appendSysMsg(const QString &);
- 	ChatView* chatView() const;
- 	ChatEdit* chatEdit() const;
-+	void setMargins();
- 
- private:
- 	Ui::ChatDlg ui_;
-@@ -99,6 +101,11 @@ private:
- 
- 	bool smallChat_;
- 	class ChatDlgMCmdProvider;
-+
-+private:
-+	bool tabmode;
-+	QPointer <PsiWindowHeader> winHeader_;
-+
- };
- 
- #endif
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -165,9 +165,19 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 		delegate_->tabWidgetCreated(this, tabWidget_);
- 
- 	QVBoxLayout *vert1 = new QVBoxLayout(this);
--	vert1->setMargin(1);
-+	//Add windowheader widget if window not decorated
-+	if (!PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool()
-+		&& !PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
-+		winHeader_ = new PsiWindowHeader(this);
-+		vert1->addWidget(winHeader_);
-+		vert1->setSpacing(0);
-+		vert1->setMargin(0);
-+	} else {
-+		vert1->setMargin(1);
-+	}
- 	vert1->addWidget(tabWidget_);
- 
-+
- 	setAcceptDrops(true);
- 
- 	X11WM_CLASS("tabs");
-@@ -198,6 +208,7 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 
- 	if(!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A'))
- 		setGeometryOptionPath(geometryOption);
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- }
- 
- TabDlg::~TabDlg()
---- git.orig/src/tabs/tabdlg.h
-+++ git/src/tabs/tabdlg.h
-@@ -29,6 +29,7 @@
- #include "advwidget.h"
- 
- #include "tabbablewidget.h"
-+#include "psiwindowheader.h"
- 
- class PsiCon;
- class ChatTabs;
-@@ -166,6 +167,7 @@ private:
- 	void extinguishFlashingTabs();
- 	void updateCaption();
- 	void updateTabBar();
-+	PsiWindowHeader *winHeader_;
- };
- 
- #endif
---- git.orig/src/tools/advwidget/advwidget.h
-+++ git/src/tools/advwidget/advwidget.h
-@@ -21,6 +21,7 @@
- #ifndef ADVWIDGET_H
- #define ADVWIDGET_H
- 
-+#include <QMouseEvent>
- #include <QWidget>
- 
- class GAdvancedWidget : public QObject
-@@ -65,6 +66,81 @@ class AdvancedWidget : public BaseClass
- {
- private:
- 	GAdvancedWidget *gAdvWidget;
-+#ifdef Q_OS_WIN
-+	Qt::WindowFlags deltaflags;
-+#endif
-+	QPoint movepath;
-+	bool isResize;
-+	bool isDrag;
-+	bool border;
-+	QMap <QString, bool> regions;
-+	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
-+	{
-+		const int top = geom.top();
-+		const int bottom = geom.bottom();
-+		const int left = geom.left();
-+		const int right = geom.right();
-+		const int delta = 10;
-+		const int maxtop = top + delta;
-+		const int minbottom = bottom -delta;
-+		if(mouse_y <= bottom
-+				&& mouse_y >= minbottom
-+				&& qAbs(mouse_x - left) < delta) {
-+			setMouseRegion("leftbottom");
-+		}
-+		else if (mouse_x > (left + delta)
-+			 && mouse_x < (right - delta)
-+			 && qAbs(mouse_y - bottom) < delta) {
-+			setMouseRegion("bottom");
-+		}
-+		else if ((bottom - mouse_y) < delta
-+			     && qAbs(mouse_x - right) < delta){
-+			setMouseRegion("rightbottom");
-+		}
-+		else if ((right - mouse_x) < delta
-+			 &&  mouse_y > maxtop
-+			 && mouse_y < minbottom) {
-+			setMouseRegion("right");
-+		}
-+		else if ((mouse_x - left) < delta
-+			 &&  mouse_y > maxtop
-+			 && mouse_y < minbottom) {
-+			setMouseRegion("left");
-+		}
-+		else if ((mouse_y - top) < delta
-+			 && mouse_x > (left + delta)
-+			 && mouse_x < (right -delta)){
-+			setMouseRegion("top");
-+		}
-+		else if ((top - mouse_y) < delta
-+			 && qAbs(mouse_x - right) < delta){
-+			setMouseRegion("righttop");
-+		}
-+		else if ((top - mouse_y) < delta
-+			 && qAbs(mouse_x - left) < delta){
-+			setMouseRegion("lefttop");
-+		}
-+		else {
-+			setMouseRegion("");
-+		}
-+	}
-+	void setMouseRegion(const QString &region)
-+	{
-+		foreach(const QString &item, regions.keys()) {
-+			regions.insert(item, false);
-+		}
-+		if (!region.isEmpty()) {
-+			regions.insert(region, true);
-+		}
-+	}
-+	bool getMouseRegion()
-+	{
-+		foreach(bool value, regions) {
-+			if (value)
-+				return value;
-+		}
-+		return false;
-+	}
- 
- public:
- 	AdvancedWidget(QWidget *parent = 0, Qt::WindowFlags f = 0)
-@@ -73,6 +149,7 @@ public:
- 	{
- 		if (f != 0)
- 			BaseClass::setWindowFlags(f);
-+		border = true;
- 		gAdvWidget = new GAdvancedWidget( this );
- 	}
- 
-@@ -151,6 +228,46 @@ public:
- 		windowTitleChanged();
- 	}
- 
-+	void setWindowBorder(bool isDecorated)
-+	{
-+		Qt::WindowFlags flags = BaseClass::windowFlags();
-+#ifdef Q_OS_WIN
-+		if (deltaflags == 0) {
-+			deltaflags = flags;
-+		}
-+		if (isDecorated) {
-+			if (flags != deltaflags) {
-+				flags |= Qt::WindowTitleHint;
-+				flags &= ~Qt::FramelessWindowHint;
-+				deltaflags = 0;
-+				if (flags != BaseClass::windowFlags()) {
-+					setWindowFlags(flags);
-+				}
-+			}
-+		} else {
-+			flags &= ~Qt::WindowTitleHint;
-+			flags |= Qt::FramelessWindowHint;
-+			if (flags != BaseClass::windowFlags()) {
-+				setWindowFlags(flags);
-+			}
-+
-+		}
-+#else
-+		if (isDecorated) {
-+			flags &= ~Qt::FramelessWindowHint;
-+		} else {
-+			flags |= Qt::FramelessWindowHint;
-+		}
-+		if (flags != BaseClass::windowFlags()) {
-+			setWindowFlags(flags);
-+		}
-+#endif
-+		border = isDecorated;
-+	}
-+	bool isBorder(){
-+		return border;
-+	}
-+
- protected:
- 	virtual void windowTitleChanged()
- 	{
-@@ -165,6 +282,122 @@ protected:
- 		}
- 		BaseClass::changeEvent(event);
- 	}
-+
-+protected:
-+	void setWindowFlags(Qt::WindowFlags flags){
-+		BaseClass::setWindowFlags(flags);
-+	}
-+	void mousePressEvent(QMouseEvent *event)
-+	{
-+		QWidget *window = BaseClass::window();
-+		if (!border && (event->button()==Qt::LeftButton)) {
-+			mouseEnterEvent(event->globalPos().x(), event->globalPos().y(), window->geometry());
-+			if (getMouseRegion()) {
-+				isResize = true;
-+			}
-+			else{
-+				movepath = event->globalPos() - window->pos();
-+				isResize = false;
-+			}
-+			isDrag = true;
-+			BaseClass::mousePressEvent(event);
-+		}
-+	}
-+	void mouseMoveEvent(QMouseEvent *event)
-+	{
-+		bool isLeftButton = (event->buttons() & Qt::LeftButton);
-+		const QPoint pg = event->globalPos();
-+		QWidget *window = BaseClass::window();
-+		int ypath = 0;
-+		int xpath = 0;
-+		const int right = window->geometry().right();
-+		const int left =  window->geometry().left();
-+		const int top =  window->geometry().top();
-+		const int bottom = window->geometry().bottom();
-+		if (isLeftButton && regions.value("leftbottom") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeBDiagCursor));
-+			ypath =  pg.y() - bottom;
-+			xpath = left - pg.x();
-+			if ((window->width() + xpath) < window->minimumWidth()) {
-+				xpath = window->minimumWidth() - window->width();
-+			}
-+			window->setGeometry(window->x() - xpath, window->y(), window->width() + xpath, window->height() + ypath);
-+
-+		}
-+		else if (isLeftButton && regions.value("rightbottom") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeFDiagCursor));
-+			ypath = pg.y() - bottom;
-+			xpath = pg.x() - right;
-+			window->resize(window->width() + xpath, window->height() + ypath);
-+
-+		}
-+		else if (isLeftButton && regions.value("lefttop") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeFDiagCursor));
-+			ypath =  top - pg.y();
-+			xpath = left - pg.x();
-+			if ((window->width() + xpath) < window->minimumWidth()) {
-+				xpath = window->minimumWidth() - window->width();
-+			}
-+			if ((window->height() + ypath) < window->minimumHeight()) {
-+				ypath = window->minimumHeight() - window->height();
-+			}
-+			window->setGeometry(window->x() - xpath, window->y() - ypath, window->width() + xpath, window->height() + ypath);
-+		}
-+		else if (isLeftButton && regions.value("righttop") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeBDiagCursor));
-+			ypath =  top - pg.y();
-+			xpath = pg.x() - right;
-+			if ((window->width() + xpath) < window->minimumWidth()) {
-+				xpath = window->minimumWidth() - window->width();
-+			}
-+			if ((window->height() + ypath) < window->minimumHeight()) {
-+				ypath = window->minimumHeight() - window->height();
-+			}
-+			window->setGeometry(window->x(), window->y() - ypath, window->width() + xpath, window->height() + ypath);
-+		}
-+		else if (isLeftButton && regions.value("bottom") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeVerCursor));
-+			ypath =  pg.y() - bottom;
-+			window->resize(window->width(), window->height() + ypath);
-+		}
-+		else if (isLeftButton && regions.value("right") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeHorCursor));
-+			xpath =  pg.x() - right;
-+			window->resize(window->width() + xpath, window->height());
-+		}
-+		else if (isLeftButton && regions.value("left") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeHorCursor));
-+			xpath =  left - pg.x();
-+			if ((window->width() + xpath) < window->minimumWidth()) {
-+				xpath = window->minimumWidth() - window->width();
-+			}
-+			window->setGeometry(window->x() - xpath, window->y(), window->width() + xpath, window->height());
-+		}
-+		else if (isLeftButton && regions.value("top") && isResize && !border) {
-+			window->setCursor(QCursor(Qt::SizeVerCursor));
-+			ypath =  top - pg.y();
-+			if ((window->height() + ypath) < window->minimumHeight()) {
-+				ypath = window->minimumHeight() - window->height();
-+			}
-+			window->setGeometry(window->x(), window->y() - ypath, window->width(), window->height() + ypath);
-+		}
-+		else if(isLeftButton && isDrag && !isResize && !border) {
-+			window->setCursor(QCursor(Qt::ArrowCursor));
-+			window->move( event->globalPos() - movepath );
-+		}
-+		BaseClass::mouseMoveEvent(event);
-+	}
-+	void mouseReleaseEvent(QMouseEvent *event)
-+	{
-+		QWidget *window = BaseClass::window();
-+		if (!border && (event->button() == Qt::LeftButton) && isDrag) {
-+			movepath = QPoint(0,0);
-+			isDrag = false;
-+			isResize = false;
-+			window->setCursor(QCursor(Qt::ArrowCursor));
-+			BaseClass::mouseReleaseEvent(event);
-+		}
-+	}
- };
- 
- #endif
---- git.orig/src/widgets/psiwindowheader.cpp
-+++ git/src/widgets/psiwindowheader.cpp
-@@ -0,0 +1,226 @@
-+/*
-+ * psiwindowheader.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+
-+#include <QIcon>
-+#include <QDesktopWidget>
-+
-+#include "psiwindowheader.h"
-+#include "psiiconset.h"
-+
-+PsiWindowHeader::PsiWindowHeader(QWidget *p)
-+	: QWidget(p),
-+	  maximized(false),
-+	  defaultSize(QSize(320, 280))
-+{
-+	parent_ = p->window();
-+	ui_.setupUi(this);
-+#ifdef Q_WS_MAC
-+	ui_.horiz->insertWidget(0, ui_.closeButton);
-+	ui_.horiz->insertWidget(1, ui_.hideButton);
-+	ui_.horiz->insertWidget(2, ui_.maximizeButton);
-+#endif
-+	ui_.hideButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMinButton));
-+	ui_.maximizeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMaxButton));
-+	ui_.closeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
-+	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-+
-+	connect(ui_.hideButton, SIGNAL(clicked()), SLOT(hidePressed()));
-+	connect(ui_.closeButton, SIGNAL(clicked()), SLOT(closePressed()));
-+	connect(ui_.maximizeButton, SIGNAL(clicked()), SLOT(maximizePressed()));
-+	setMouseTracking(true);
-+}
-+
-+PsiWindowHeader::~PsiWindowHeader()
-+{
-+}
-+
-+void PsiWindowHeader::hidePressed()
-+{
-+	parent_->setWindowState(parent_->windowState() | Qt::WindowMinimized);
-+}
-+
-+void PsiWindowHeader::closePressed()
-+{
-+	parent_->close();
-+}
-+
-+void PsiWindowHeader::maximizePressed()
-+{
-+	const QRect desktop = qApp->desktop()->availableGeometry(-1);
-+	if (!maximized) {
-+		if (parent_->window()->width() != qApp->desktop()->width()
-+			&& parent_->window()->height() != qApp->desktop()->height()) {
-+			oldSize = parent_->window()->geometry();
-+			parent_->window()->setGeometry(desktop);
-+			maximized = true;
-+		}
-+		else if (!oldSize.isNull() && !oldSize.isEmpty()) {
-+			parent_->window()->setGeometry(oldSize);
-+			maximized = false;
-+		}
-+		else {
-+			parent_->window()->resize(defaultSize);
-+			maximized = false;
-+		}
-+	} else {
-+		if (oldSize.top() < desktop.top()) {
-+			oldSize.setTop(desktop.top());
-+		}
-+		if (oldSize.left() < desktop.left() ) {
-+			oldSize.setLeft(desktop.left());
-+		}
-+		if (oldSize.right() > desktop.right()) {
-+			oldSize.setRight(desktop.right());
-+		}
-+		if (oldSize.bottom() > desktop.bottom()) {
-+			oldSize.setBottom(desktop.bottom());
-+		}
-+		parent_->window()->setGeometry(oldSize);
-+		maximized = false;
-+	}
-+}
-+
-+void PsiWindowHeader::mouseDoubleClickEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton) {
-+		maximizePressed();
-+		e->accept();
-+	}
-+}
-+
-+void PsiWindowHeader::mousePressEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton) {
-+		mouseEnterEvent(e->pos().x(),e->pos().y(),geometry());
-+		if (inVRect || inLDRect || inRDRect) {
-+			isResize = true;
-+		}
-+		else{
-+			movepath = e->pos();
-+			isResize = false;
-+		}
-+		isDrag = true;
-+		e->accept();
-+	}
-+}
-+
-+void PsiWindowHeader::mouseMoveEvent(QMouseEvent *e)
-+{
-+	bool isLeftButton = (e->buttons() & Qt::LeftButton);
-+	const QPoint pg = e->globalPos();
-+	int ypath = 0;
-+	int xpath = 0;
-+	if (isLeftButton && inLDRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeFDiagCursor));
-+		ypath = parent_->window()->y() - pg.y() ;
-+		xpath = parent_->window()->x() - pg.x();
-+		if ((parent_->window()->width() + xpath) < parent_->window()->minimumWidth()) {
-+			xpath = parent_->window()->minimumWidth() - parent_->window()->width();
-+		}
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x() - xpath,
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width() + xpath,
-+						parent_->window()->height() + ypath);
-+
-+	}
-+	else if (isLeftButton && inVRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeVerCursor));
-+		ypath = parent_->window()->y() - pg.y();
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x(),
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width(),
-+						parent_->window()->height() + ypath);
-+	}
-+	else if (isLeftButton && inRDRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeBDiagCursor));
-+		ypath = parent_->window()->y() - pg.y();
-+		xpath = pg.x() - parent_->window()->geometry().right();
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x(),
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width() + xpath,
-+						parent_->window()->height() + ypath);
-+
-+	}
-+	else if(isLeftButton && isDrag &&!isResize && !maximized) {
-+		setCursor(QCursor(Qt::ArrowCursor));
-+		parent_->window()->move( e->globalPos() - movepath );
-+	}
-+	e->accept();
-+}
-+
-+void PsiWindowHeader::mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
-+{
-+	if(mouse_y <= geom.top()+7
-+		&& qAbs(mouse_x - geom.left()) <= 4) {
-+		inLDRect = true;
-+		inRDRect = false;
-+		inVRect = false;
-+	}
-+	else if(mouse_y <= geom.top()+7
-+		&& qAbs(mouse_x - geom.right()) <= 4) {
-+		inRDRect = true;
-+		inLDRect = false;
-+		inVRect = false;
-+	}
-+	else if (mouse_x > (geom.left() + 4)
-+		&& mouse_x < (geom.right() - 4)
-+		&& qAbs(mouse_y - geom.top()) <= 4) {
-+		inVRect = true;
-+		inLDRect = false;
-+		inRDRect = false;
-+	}
-+	else {
-+		inVRect = false;
-+		inLDRect = false;
-+		inRDRect = false;
-+	}
-+}
-+
-+void PsiWindowHeader::mouseReleaseEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton && isDrag) {
-+		movepath.setX(0);
-+		movepath.setY(0);
-+		isDrag = false;
-+		isResize = false;
-+		setCursor(QCursor(Qt::ArrowCursor));
-+	}
-+	int min_x = qMin(ui_.hideButton->geometry().left(), qMin(ui_.maximizeButton->geometry().left(), ui_.closeButton->geometry().left()));
-+	int max_x = qMax(ui_.hideButton->geometry().right(), qMax(ui_.maximizeButton->geometry().right(), ui_.closeButton->geometry().right()));
-+	if (e->button() == Qt::MidButton) {
-+		if (((e->x() > geometry().left() && e->x() < min_x)
-+			|| (e->x() < geometry().right() && e->x() > max_x ))
-+			&& e->y() > geometry().top()
-+			&& e->y() < geometry().bottom()) {
-+			hidePressed();
-+		}
-+	}
-+	e->accept();
-+}
---- git.orig/src/widgets/psiwindowheader.h
-+++ git/src/widgets/psiwindowheader.h
-@@ -0,0 +1,65 @@
-+/*
-+ * psiwindowheader.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+
-+#ifndef PSIWINDOWHEADER_H
-+#define PSIWINDOWHEADER_H
-+
-+#include "ui_psiwindowheader.h"
-+
-+#include <QToolButton>
-+#include <QMouseEvent>
-+#include <QRect>
-+
-+class PsiWindowHeader : public QWidget
-+{
-+	Q_OBJECT
-+public:
-+	PsiWindowHeader(QWidget* p);
-+	~PsiWindowHeader();
-+
-+private:
-+	Ui::PsiWindowHeader ui_;
-+	QWidget *parent_;
-+	QPoint movepath;
-+	bool isDrag;
-+	bool isResize;
-+	bool inVRect;
-+	bool inLDRect;
-+	bool inRDRect;
-+	bool maximized;
-+	QRect oldSize;
-+	QSize defaultSize;
-+	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom);
-+
-+private slots:
-+	void hidePressed();
-+	void closePressed();
-+	void maximizePressed();
-+
-+protected:
-+	void mouseMoveEvent(QMouseEvent *e);
-+	void mousePressEvent(QMouseEvent *e);
-+	void mouseReleaseEvent(QMouseEvent *e);
-+	void mouseDoubleClickEvent(QMouseEvent *e);
-+
-+};
-+
-+#endif // PSIWINDOWHEADER_H
---- git.orig/src/widgets/psiwindowheader.ui
-+++ git/src/widgets/psiwindowheader.ui
-@@ -0,0 +1,120 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>PsiWindowHeader</class>
-+ <widget class="QWidget" name="PsiWindowHeader">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>130</width>
-+    <height>31</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="mouseTracking">
-+   <bool>true</bool>
-+  </property>
-+  <property name="windowTitle">
-+   <string>PsiWindowHeader</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <property name="spacing">
-+    <number>0</number>
-+   </property>
-+   <property name="margin">
-+    <number>0</number>
-+   </property>
-+   <item>
-+    <layout class="QHBoxLayout" name="horiz">
-+     <property name="spacing">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="QFrame" name="headerFrame">
-+       <property name="frameShape">
-+        <enum>QFrame::NoFrame</enum>
-+       </property>
-+       <property name="frameShadow">
-+        <enum>QFrame::Plain</enum>
-+       </property>
-+       <property name="lineWidth">
-+        <number>1</number>
-+       </property>
-+       <layout class="QHBoxLayout" name="horizontalLayout_3">
-+        <property name="spacing">
-+         <number>0</number>
-+        </property>
-+        <property name="margin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <layout class="QHBoxLayout" name="horiz1">
-+          <property name="spacing">
-+           <number>2</number>
-+          </property>
-+          <item>
-+           <spacer name="spacer">
-+            <property name="orientation">
-+             <enum>Qt::Horizontal</enum>
-+            </property>
-+            <property name="sizeHint" stdset="0">
-+             <size>
-+              <width>40</width>
-+              <height>20</height>
-+             </size>
-+            </property>
-+           </spacer>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="hideButton">
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="maximizeButton">
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="closeButton">
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/widgets/widgets.pri
-+++ git/src/widgets/widgets.pri
-@@ -16,6 +16,7 @@ SOURCES += \
- 	$$PWD/psitiplabel.cpp \
- 	$$PWD/psitabwidget.cpp \
- 	$$PWD/psitabbar.cpp \
-+	$$PWD/psiwindowheader.cpp \
- 	$$PWD/actionlineedit.cpp \
- 	$$PWD/typeaheadfind.cpp
- 
-@@ -43,10 +44,12 @@ HEADERS += \
- 	$$PWD/psitiplabel.h \
- 	$$PWD/psitabwidget.h \
- 	$$PWD/psitabbar.h \
-+	$$PWD/psiwindowheader.h \
- 	$$PWD/actionlineedit.h \
- 	$$PWD/typeaheadfind.h
- 
--FORMS += $$PWD/fancypopup.ui
-+FORMS += $$PWD/fancypopup.ui \
-+	$$PWD/psiwindowheader.ui
- 
- # to remove dependency on iconset and stuff
- #DEFINES += WIDGET_PLUGIN

psi-plus-main-20130107.tar.xz/patches/1080-psi-colors-for-tabs.diff Deleted

@@ -1,32 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -376,6 +376,8 @@ QLineEdit#le_status_text {
- 					<chat>
- 						<link-color type="QColor">#0000ff</link-color>
- 						<mailto-color type="QColor">#0000ff</mailto-color>
-+						<composing-color type="QColor">darkGreen</composing-color>
-+						<unread-message-color type="QColor">red</unread-message-color>
- 					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -636,15 +636,15 @@ void TabDlg::updateTab(TabbableWidget* c
- 	//now set text colour based upon whether there are new messages/composing etc
- 
- 	if (chat->state() == TabbableWidget::StateComposing) {
--		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
- 	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, Qt::red);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
- 	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().windowText().color());
-+		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
- 		tabWidget_->setTabIcon(chat, chat->icon());
- 	}
- 	updateCaption();

psi-plus-main-20130107.tar.xz/patches/1090-psi-video-option.diff Deleted

@@ -1,156 +0,0 @@
---- git.orig/src/avcall/avcall.cpp
-+++ git/src/avcall/avcall.cpp
-@@ -29,6 +29,7 @@
- #include "../psimedia/psimedia.h"
- #include "applicationinfo.h"
- #include "psiaccount.h"
-+#include "psioptions.h"
- 
- #define USE_THREAD
- 
-@@ -907,6 +908,9 @@ bool AvCallManager::isVideoSupported()
- 	if(!isSupported())
- 		return false;
- 
-+	if(PsiOptions::instance()->getOption("options.media.video-support").toBool())
-+		return true;
-+
- 	if(!QString::fromLatin1(qgetenv("PSI_ENABLE_VIDEO")).isEmpty())
- 		return true;
- 	else
---- git.orig/src/options/opt_avcall.cpp
-+++ git/src/options/opt_avcall.cpp
-@@ -201,6 +201,7 @@ void OptionsTabAvCall::applyOptions()
- 	PsiOptions::instance()->setOption("options.media.devices.audio-output", d->cb_audioOutDevice->itemData(d->cb_audioOutDevice->currentIndex()).toString());
- 	PsiOptions::instance()->setOption("options.media.devices.audio-input", d->cb_audioInDevice->itemData(d->cb_audioInDevice->currentIndex()).toString());
- 	PsiOptions::instance()->setOption("options.media.devices.video-input", d->cb_videoInDevice->itemData(d->cb_videoInDevice->currentIndex()).toString());
-+	PsiOptions::instance()->setOption("options.media.video-support", d->cb_videoSupport->isChecked());
- }
- 
- void OptionsTabAvCall::restoreOptions()
-@@ -246,4 +247,5 @@ void OptionsTabAvCall::restoreOptions()
- 	d->cb_audioOutDevice->setCurrentIndex(d->cb_audioOutDevice->findData(config.audioOutDeviceId));
- 	d->cb_audioInDevice->setCurrentIndex(d->cb_audioInDevice->findData(config.audioInDeviceId));
- 	d->cb_videoInDevice->setCurrentIndex(d->cb_videoInDevice->findData(config.videoInDeviceId));
-+	d->cb_videoSupport->setChecked(PsiOptions::instance()->getOption("options.media.video-support").toBool());
- }
---- git.orig/src/options/opt_avcall.ui
-+++ git/src/options/opt_avcall.ui
-@@ -1,74 +1,90 @@
--<ui version="4.0" >
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-  <class>OptAvCall</class>
-- <widget class="QWidget" name="OptAvCall" >
--  <property name="geometry" >
-+ <widget class="QWidget" name="OptAvCall">
-+  <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>400</width>
--    <height>108</height>
-+    <height>114</height>
-    </rect>
-   </property>
--  <property name="windowTitle" >
-+  <property name="windowTitle">
-    <string>Form</string>
-   </property>
--  <layout class="QGridLayout" >
--   <item row="0" column="0" >
--    <widget class="QLabel" name="label" >
--     <property name="text" >
-+  <layout class="QGridLayout">
-+   <item row="0" column="0">
-+    <widget class="QLabel" name="label">
-+     <property name="text">
-       <string>Audio output:</string>
-      </property>
-     </widget>
-    </item>
--   <item row="0" column="1" >
--    <widget class="QComboBox" name="cb_audioOutDevice" >
--     <property name="sizePolicy" >
--      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-+   <item row="0" column="2">
-+    <widget class="QComboBox" name="cb_audioOutDevice">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-    </item>
--   <item row="1" column="0" >
--    <widget class="QLabel" name="lb_audioInDevice" >
--     <property name="text" >
-+   <item row="1" column="0">
-+    <widget class="QLabel" name="lb_audioInDevice">
-+     <property name="text">
-       <string>Audio input:</string>
-      </property>
-     </widget>
-    </item>
--   <item row="1" column="1" >
--    <widget class="QComboBox" name="cb_audioInDevice" >
--     <property name="sizePolicy" >
--      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-+   <item row="1" column="2">
-+    <widget class="QComboBox" name="cb_audioInDevice">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="0" >
--    <widget class="QLabel" name="lb_videoInDevice" >
--     <property name="text" >
-+   <item row="3" column="0">
-+    <widget class="QLabel" name="lb_videoInDevice">
-+     <property name="text">
-       <string>Video input:</string>
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="1" >
--    <widget class="QComboBox" name="cb_videoInDevice" >
--     <property name="sizePolicy" >
--      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-+   <item row="3" column="2">
-+    <widget class="QComboBox" name="cb_videoInDevice">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-     </widget>
-    </item>
-+   <item row="2" column="0">
-+    <widget class="QLabel" name="label_2">
-+     <property name="text">
-+      <string>Video support:</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="2" column="2">
-+    <widget class="QCheckBox" name="cb_videoSupport">
-+     <property name="text">
-+      <string/>
-+     </property>
-+    </widget>
-+   </item>
-   </layout>
-  </widget>
-  <tabstops>
-   <tabstop>cb_audioOutDevice</tabstop>
-   <tabstop>cb_audioInDevice</tabstop>
-+  <tabstop>cb_videoSupport</tabstop>
-   <tabstop>cb_videoInDevice</tabstop>
-  </tabstops>
-  <resources/>

psi-plus-main-20130107.tar.xz/patches/1120-psi-chatview-quote-feature.diff Deleted

@@ -1,413 +0,0 @@
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -35,6 +35,8 @@
- #include <QTimer>
- #include <QKeyEvent>
- #include <QUrl>
-+#include <QMenu>
-+#include <QTextDocumentFragment>
- 
- static const char *infomrationalColorOpt = "options.ui.look.colors.messages.informational";
- 
-@@ -58,6 +60,12 @@ ChatView::ChatView(QWidget *parent)
- 	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
- 	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
- #endif
-+	actQuote_ = new QAction(tr("Quote"), this);
-+	actQuote_->setEnabled(false);
-+	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
-+	addAction(actQuote_);
-+	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
-+	connect(this, SIGNAL(selectionChanged()), SLOT(changeActQuoteState()));
- 
- 	useMessageIcons_ = PsiOptions::instance()->getOption("options.ui.chat.use-message-icons").toBool();
- 	if (useMessageIcons_) {
-@@ -123,10 +131,20 @@ void ChatView::contextMenuEvent(QContext
- 		e->accept();
- 	}
- 	else {
--		PsiTextView::contextMenuEvent(e);
-+		QMenu *menu = createStandardContextMenu(e->pos());
-+		menu->exec(e->globalPos());
-+		delete menu;
-+		e->accept();
- 	}
- }
- 
-+QMenu* ChatView::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = PsiTextView::createStandardContextMenu(position);
-+	menu->addAction(actQuote_);
-+	return menu;
-+}
-+
- void ChatView::addLogIconsResources()
- {
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
-@@ -188,6 +206,24 @@ void ChatView::autoCopy()
- }
- 
- /**
-+ * Make quote from any selected text and paste it in chat window
-+ */
-+
-+void ChatView::quoteEvent()
-+{
-+	emit quote(getPlainText());
-+}
-+
-+/**
-+ * Enable or disable actQuote_ in relations from hasSelection()
-+ */
-+
-+void ChatView::changeActQuoteState()
-+{
-+	actQuote_->setEnabled(textCursor().hasSelection());
-+}
-+
-+/**
-  * Handle KeyPress events that happen in ChatEdit widget. This is used
-  * to 'fix' the copy shortcut.
-  * \param object object that should receive the event
---- git.orig/src/chatview_te.h
-+++ git/src/chatview_te.h
-@@ -47,6 +47,7 @@ public:
- 	QSize sizeHint() const;
- 	void clear();
- 	void contextMenuEvent(QContextMenuEvent *e);
-+	QMenu* createStandardContextMenu(const QPoint &position);
- 
- 	void init();
- 	void setDialog(QWidget* dialog);
-@@ -80,12 +81,15 @@ protected:
- 
- protected slots:
- 	void autoCopy();
-+	void quoteEvent();
-+	void changeActQuoteState();
- 
- private slots:
- 	void slotScroll();
- 
- signals:
- 	void showNM(const QString&);
-+	void quote(const QString &text);
- 
- private:
- 	bool isMuc_;
-@@ -100,6 +104,7 @@ private:
- 	QPixmap logIconDelivered;
- 	QPixmap logIconTime;
- 	QPixmap logIconInfo;
-+	QAction *actQuote_;
- };
- 
- #endif
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -820,6 +820,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	invalidateTab();
- 	setConnecting();
- 	connect(URLObject::getInstance(), SIGNAL(vcardsig(QString)), SLOT(vcard(QString)));
-+
-+	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- }
- 
- void GCMainDlg::vcard(const QString& _str)
---- git.orig/src/msgmle.cpp
-+++ git/src/msgmle.cpp
-@@ -32,6 +32,7 @@
- #include <QTextCharFormat>
- #include <QTextDocument>
- #include <QTimer>
-+#include <QClipboard>
- 
- #include "shortcutmanager.h"
- #include "spellchecker/spellhighlighter.h"
-@@ -92,6 +93,13 @@ void ChatEdit::initActions()
- 	act_showMessageLast= new QAction(this);
- 	addAction(act_showMessageLast);
- 	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
-+
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_ = new QAction(tr("Paste As Quotation"), this);
-+	actPasteAsQuote_->setEnabled(!clipboard->text().isEmpty());
-+	addAction(actPasteAsQuote_);
-+	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
-+	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -118,6 +126,13 @@ void ChatEdit::setFont(const QFont &f)
- 	controller_->setFont(f);
- }
- 
-+QMenu* ChatEdit::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = QTextEdit::createStandardContextMenu(position);
-+	menu->addAction(actPasteAsQuote_);
-+	return menu;
-+}
-+
- bool ChatEdit::checkSpellingGloballyEnabled()
- {
- 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
-@@ -222,8 +237,10 @@ void ChatEdit::contextMenuEvent(QContext
- 		}
- 	}
- 
--	// Do normal menu
--	QTextEdit::contextMenuEvent(e);
-+	// Do custom menu
-+	QMenu *menu = createStandardContextMenu(e->pos());
-+	menu->exec(e->globalPos());
-+	delete menu;
- 	e->accept();
- }
- 
-@@ -298,6 +315,18 @@ void ChatEdit::showHistoryMessageNext()
- 	}
- }
- 
-+void ChatEdit::changeActPasteAsQuoteState()
-+{
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_->setEnabled(!clipboard->text().isEmpty());
-+}
-+
-+void ChatEdit::pasteAsQuote()
-+{
-+	QString text = QApplication::clipboard()->text();
-+	insertAsQuote(text);
-+}
-+
- void ChatEdit::showHistoryMessagePrev()
- {
- 	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
-@@ -407,6 +436,24 @@ void ChatEdit::setCssString(const QStrin
- 	controller_->setCssString(css);
- }
- 
-+void ChatEdit::insertAsQuote(const QString &text)
-+{
-+	int pos =  textCursor().position();
-+	QString prevLine = toPlainText().left(pos - 1);
-+	prevLine = prevLine.mid(prevLine.lastIndexOf("\n") + 1);
-+
-+	QString quote = QString::fromUtf8("» ") + text;
-+	quote.replace("\n", QString::fromUtf8("\n» "));
-+
-+	// Check for previous quote and merge if true
-+	if(!prevLine.startsWith(QString::fromUtf8("»"))) {
-+		quote.prepend("\n");
-+	}
-+	quote.append("\n");
-+	insertPlainText(quote);
-+}
-+
-+
- //----------------------------------------------------------------------------
- // LineEdit
- //----------------------------------------------------------------------------
---- git.orig/src/msgmle.h
-+++ git/src/msgmle.h
-@@ -49,6 +49,7 @@ public:
- 	// reimplemented
- 	QSize sizeHint() const;
- 	void setFont(const QFont &);
-+	QMenu* createStandardContextMenu(const QPoint &position);
- 
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
-@@ -59,6 +60,7 @@ public slots:
- 	void clearMessageHistory();
- 	void doHTMLTextMenu();
- 	void setCssString(const QString& css);
-+	void insertAsQuote(const QString& text);
- 
- protected slots:
-  	void applySuggestion();
-@@ -68,6 +70,8 @@ protected slots:
- 	void showHistoryMessagePrev();
- 	void showHistoryMessageFirst();
- 	void showHistoryMessageLast();
-+	void changeActPasteAsQuoteState();
-+	void pasteAsQuote();
- 
- protected:
- 	// override the tab/esc behavior
-@@ -92,6 +96,8 @@ private:
- 	QAction* act_showMessageNext;
- 	QAction* act_showMessageFirst;
- 	QAction* act_showMessageLast;
-+	QAction *actPasteAsQuote_;
-+
- 	QString currentText;
- 	HTMLTextController *controller_;
- };
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -263,6 +263,8 @@ void PsiChatDlg::initUi()
- 		ui_.vboxLayout1->insertWidget(0, winHeader_);
- 	}
- 	setMargins();
-+
-+	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- }
- 
- void PsiChatDlg::updateCountVisibility()
---- git.orig/src/webview.cpp
-+++ git/src/webview.cpp
-@@ -43,6 +43,11 @@ WebView::WebView(QWidget* parent) : QWeb
- 	connect(page()->action(QWebPage::Cut), SIGNAL(triggered()), SLOT(textCopiedEvent()));
- 	connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStartedEvent()));
- 	connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinishedEvent(bool)));
-+
-+	actQuote_ = new QAction(tr("Quote"), this);
-+	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
-+	addAction(actQuote_);
-+	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
- }
- 
- void WebView::linkClickedEvent(const QUrl& url)
-@@ -66,6 +71,11 @@ void WebView::loadFinishedEvent(bool suc
- 	isLoading_ = false;
- }
- 
-+void WebView::quoteEvent()
-+{
-+	emit quote(selectedText());
-+}
-+
- void WebView::contextMenuEvent(QContextMenuEvent* event)
- {
- 	if (isLoading_) return;
-@@ -83,6 +93,7 @@ void WebView::contextMenuEvent(QContextM
- 		menu = new QMenu(this);
- 		if (!page()->selectedText().isEmpty()) {
- 			menu->addAction(pageAction(QWebPage::Copy));
-+			menu->addAction(actQuote_);
- 		} else {
- 			if (!menu->isEmpty()) {
- 				menu->addSeparator();
---- git.orig/src/webview.h
-+++ git/src/webview.h
-@@ -93,13 +93,17 @@ private:
- 	bool isLoading_;
- 	QStringList jsBuffer_;
- 	QPoint dragStartPosition;
-+	QAction *actQuote_;
- 
-+signals:
-+	void quote(const QString &text);
- 
- protected slots:
- 	void linkClickedEvent(const QUrl& url);
- 	void textCopiedEvent();
- 	void loadStartedEvent();
- 	void loadFinishedEvent(bool);
-+	void quoteEvent();
- };
- 
- 
---- git.orig/src/widgets/psitextview.cpp
-+++ git/src/widgets/psitextview.cpp
-@@ -25,6 +25,7 @@
- #include <QAbstractTextDocumentLayout>
- #include <QTextDocumentFragment>
- #include <QTextFragment>
-+#include <QRegExp>
- 
- #include "urlobject.h"
- #include "psirichtext.h"
-@@ -48,6 +49,7 @@ public:
- 
- 	QString anchorOnMousePress;
- 	bool hadSelectionOnMousePress;
-+	bool rightClickSelection;
- 		
- 	QString fragmentToPlainText(const QTextFragment &fragment);
- 	QString blockToPlainText(const QTextBlock &block);
-@@ -79,6 +81,44 @@ PsiTextView::PsiTextView(QWidget *parent
- }
- 
- /**
-+ * Reimplemented createStandardContextMenu(const QPoint &position)
-+ * for creating of custom context menu
-+ */
-+
-+QMenu* PsiTextView::createStandardContextMenu(const QPoint &position)
-+{
-+	QTextCursor textcursor = cursorForPosition(position);
-+	QMenu *menu;
-+	QString anc = anchorAt(position);
-+	if (!anc.isEmpty()) {
-+		menu = URLObject::getInstance()->createPopupMenu(anc);
-+
-+		int posInBlock = textcursor.position() - textcursor.block().position();
-+		QString textblock = textcursor.block().text();
-+		int begin = textcursor.block().position() + textblock.lastIndexOf(QRegExp("\\s|^"), posInBlock) + 1;
-+		int end = textcursor.block().position() + textblock.indexOf(QRegExp("\\s|$"), posInBlock);
-+		textcursor.setPosition(begin);
-+		textcursor.setPosition(end, QTextCursor::KeepAnchor);
-+		setTextCursor(textcursor);
-+
-+		menu = URLObject::getInstance()->createPopupMenu(anc);
-+	}
-+	else {
-+		if (d->rightClickSelection || !textCursor().hasSelection()) { // only if no selection we select text block
-+			int begin = textcursor.block().position();
-+			int end = begin + textcursor.block().length() - 1;
-+			textcursor.setPosition(begin);
-+			textcursor.setPosition(end, QTextCursor::KeepAnchor);
-+			setTextCursor(textcursor);
-+			d->rightClickSelection = true;
-+		}
-+		menu = QTextEdit::createStandardContextMenu();
-+	}
-+	return menu;
-+}
-+
-+
-+/**
-  * This function returns true if vertical scroll bar is 
-  * at its maximum position.
-  */
-@@ -174,11 +214,7 @@ QString PsiTextView::getPlainText() cons
- 
- void PsiTextView::contextMenuEvent(QContextMenuEvent *e) 
- {
--	QMenu *menu;
--	if (!anchorAt(e->pos()).isEmpty())
--		menu = URLObject::getInstance()->createPopupMenu(anchorAt(e->pos()));
--	else
--		menu = createStandardContextMenu();
-+	QMenu *menu = createStandardContextMenu(e->pos());
- 	menu->exec(e->globalPos());
- 	e->accept();
- 	delete menu;
-@@ -217,9 +253,11 @@ void PsiTextView::mouseReleaseEvent(QMou
- {
- 	QTextEdit::mouseReleaseEvent(e);
- 
--	if (!(e->button() & Qt::LeftButton))
-+	if (!(e->button() & Qt::LeftButton)) {
- 		return;
-+	}
- 
-+	d->rightClickSelection = false;
- 	const QString anchor = anchorAt(e->pos());
- 
- 	if (anchor.isEmpty())
---- git.orig/src/widgets/psitextview.h
-+++ git/src/widgets/psitextview.h
-@@ -32,6 +32,9 @@ class PsiTextView : public QTextEdit
- public:
- 	PsiTextView(QWidget *parent = 0);
- 
-+	// Reimplemented
-+	QMenu* createStandardContextMenu(const QPoint &position);
-+
- 	bool atBottom();
- 
- 	virtual void appendText(const QString &text);

psi-plus-main-20130107.tar.xz/patches/1130-psi-resolve-nickname-by-N-for-adduserdlg.diff Deleted

@@ -1,37 +0,0 @@
---- git.orig/src/adduserdlg.cpp
-+++ git/src/adduserdlg.cpp
-@@ -329,10 +329,30 @@ void AddUserDlg::resolveNickFinished()
- 	JT_VCard *jt = (JT_VCard *)sender();
- 
- 	if(jt->success()) {
--		if ( !jt->vcard().nickName().isEmpty() )
--			le_nick->setText( jt->vcard().nickName() );
--		else if( !jt->vcard().fullName().isEmpty() )
--			le_nick->setText( jt->vcard().fullName() );
-+		QString nickname;
-+		const XMPP::VCard vcard = jt->vcard();
-+		if ( !vcard.nickName().isEmpty() ) {
-+			nickname = vcard.nickName();
-+		} else if ( !vcard.fullName().isEmpty() ) {
-+			nickname = vcard.fullName();
-+		} else {
-+			nickname = vcard.givenName();
-+			if ( nickname.isEmpty() ) {
-+				nickname = vcard.middleName();
-+			} else if ( !vcard.middleName().isEmpty() ) {
-+				nickname += " " + vcard.middleName();
-+			}
-+			if ( nickname.isEmpty() ) {
-+				nickname = vcard.familyName();
-+			} else if ( !vcard.familyName().isEmpty() ) {
-+				nickname += " " + vcard.familyName();
-+			}
-+		}
-+
-+		if ( nickname.isEmpty() ) {
-+			nickname = jt->jid().bare();
-+		}
-+		le_nick->setText(nickname);
- 	}
- }
-

psi-plus-main-20130107.tar.xz/patches/1140-psi-xmlconsole-filter-group-always-enable.diff Deleted

psi-plus-main-20130107.tar.xz/patches/1150-psi-nix-systemwatch-over-upower-service.diff Deleted

@@ -1,44 +0,0 @@
---- git.orig/src/libpsi/tools/systemwatch/systemwatch_unix.cpp
-+++ git/src/libpsi/tools/systemwatch/systemwatch_unix.cpp
-@@ -19,7 +19,25 @@
-  */
- 
- #include "systemwatch_unix.h"
-+#ifdef USE_DBUS
-+# include <QDBusConnection>
-+#endif
- 
- UnixSystemWatch::UnixSystemWatch()
- {
-+#ifdef USE_DBUS
-+	QDBusConnection conn = QDBusConnection::systemBus();
-+	conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Sleeping", this, SLOT(sleeping()));
-+	conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Resuming", this, SLOT(resuming()));
-+#endif
-+}
-+
-+void UnixSystemWatch::sleeping()
-+{
-+	emit sleep();
-+}
-+
-+void UnixSystemWatch::resuming()
-+{
-+	emit wakeup();
- }
---- git.orig/src/libpsi/tools/systemwatch/systemwatch_unix.h
-+++ git/src/libpsi/tools/systemwatch/systemwatch_unix.h
-@@ -25,8 +25,13 @@
- 
- class UnixSystemWatch : public SystemWatch
- {
-+	Q_OBJECT
- public:
- 	UnixSystemWatch();
-+
-+private slots:
-+	void sleeping();
-+	void resuming();
- };
- 
-

psi-plus-main-20130107.tar.xz/patches/1160-psi-add-trackbar-to-chats.diff Deleted

@@ -1,63 +0,0 @@
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -103,6 +103,7 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 	transid_ = -1;
- 	key_ = "";
- 	lastWasEncrypted_ = false;
-+	trackBar_ = false;
- 
- 	status_ = -1;
- 
-@@ -172,6 +173,12 @@ void ChatDlg::initComposing()
- 	chatEditCreated();
- }
- 
-+void ChatDlg::doTrackBar()
-+{
-+	trackBar_ = false;
-+	chatView()->doTrackBar();
-+}
-+
- void ChatDlg::initActions()
- {
- 	act_send_ = new QAction(this);
-@@ -327,6 +334,8 @@ void ChatDlg::logSelectionChanged()
- void ChatDlg::deactivated()
- {
- 	TabbableWidget::deactivated();
-+
-+	trackBar_ = true;
- }
- 
- void ChatDlg::activated()
-@@ -341,6 +350,8 @@ void ChatDlg::activated()
- 	doFlash(false);
- 
- 	chatEdit()->setFocus();
-+
-+	trackBar_ = false;
- }
- 
- void ChatDlg::dropEvent(QDropEvent* event)
-@@ -840,6 +851,9 @@ QString ChatDlg::whoNick(bool local) con
- 
- void ChatDlg::appendMessage(const Message &m, bool local)
- {
-+	if(trackBar_)
-+		doTrackBar();
-+
- 	// figure out the encryption state
- 	bool encChanged = false;
- 	bool encEnabled = false;
---- git.orig/src/chatdlg.h
-+++ git/src/chatdlg.h
-@@ -181,6 +181,9 @@ private:
- 	bool keepOpen_;
- 	bool warnSend_;
- 
-+	bool trackBar_;
-+	void doTrackBar();
-+
- 	QTimer* selfDestruct_;
- 
- 	QString key_;

psi-plus-main-20130107.tar.xz/patches/1170-psi-vert-splitter-position.diff Deleted

@@ -1,268 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -119,6 +119,8 @@
- 				<disable-paste-send type="bool">false</disable-paste-send>
- 				<hide-when-closing type="bool">false</hide-when-closing>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
-+				<log-height type="int">325</log-height>
-+				<chatedit-height type="int">10</chatedit-height>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
---- git.orig/src/chatsplitter.cpp
-+++ git/src/chatsplitter.cpp
-@@ -75,6 +75,15 @@ void ChatSplitter::setSizes(const QList<
- 		splitter_->setSizes(list);
- }
- 
-+QList<int> ChatSplitter::sizes()
-+{
-+	QList<int> list;
-+	if(splitter_)
-+		list = splitter_->sizes();
-+
-+	return list;
-+}
-+
- /**
-  * Moves \a child either to the real QSplitter, or adds it to the
-  * private layout.
-@@ -130,6 +139,8 @@ void ChatSplitter::updateLayout()
- 
- 	foreach(QWidget* child, children_)
- 		updateChildLayout(child);
-+
-+	connect(splitter_, SIGNAL(splitterMoved(int,int)), SIGNAL(splitterMoved(int,int)));
- }
- 
- /**
---- git.orig/src/chatsplitter.h
-+++ git/src/chatsplitter.h
-@@ -35,6 +35,7 @@ public:
- 	void setOrientation(Qt::Orientation orientation);
- 	void addWidget(QWidget* widget);
- 	void setSizes(const QList<int>& list);
-+	QList<int> sizes();
- 
- protected:
- 	/**
-@@ -49,6 +50,9 @@ public slots:
- private slots:
- 	void childDestroyed(QObject* obj);
- 
-+signals:
-+	void splitterMoved(int,int);
-+
- private:
- 	void updateChildLayout(QWidget* child);
- 	void updateLayout();
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -241,6 +241,9 @@ public:
- 	int logSize;
- 	int rosterSize;
- 
-+	int logHeight;
-+	int chateditHeight;
-+
- public:
- 	bool trackBar;
- 
-@@ -786,6 +789,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
- 	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
-+	connect(ui_.vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	// resize the horizontal splitter
- 	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
-@@ -803,10 +807,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
- 
- 	// resize the vertical splitter
--	list.clear();
--	list << 324;
--	list << 10;
--	ui_.vsplitter->setSizes(list);
-+	d->logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	d->chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(d->logHeight, d->chateditHeight);
- 
- 	X11WM_CLASS("groupchat");
- 
-@@ -869,6 +872,26 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.vsplitter->sizes();
-+	d->logHeight = list.first();
-+	d->chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", d->logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", d->chateditHeight);
-+
-+	emit vSplitterMoved(d->logHeight, d->chateditHeight);
-+}
-+
-+void GCMainDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	d->logHeight = log;
-+	d->chateditHeight = chat;
-+	list << log << chat;
-+	ui_.vsplitter->setSizes(list);
-+}
-+
- void GCMainDlg::doMinimize()
- {
- 	window()->showMinimized();
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -83,6 +83,7 @@ public:
- 	virtual TabbableWidget::State state() const;
- 	virtual int unreadMessageCount() const;
- 	virtual QString desiredCaption() const;
-+	virtual void setVSplitterPosition(int log,int chat);
- 
- protected:
- 	void setShortcuts();
-@@ -144,6 +145,7 @@ private slots:
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
- 	void horizSplitterMoved();
-+	void verticalSplitterMoved(int, int);
- 	void doMinimize();
- 
- 
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -236,10 +236,11 @@ void PsiChatDlg::initUi()
- 
- 	connect(account()->capsManager(), SIGNAL(capsChanged(const Jid&)), SLOT(capsChanged(const Jid&)));
- 
--	QList<int> list;
--	list << 324;
--	list << 96;
--	ui_.splitter->setSizes(list);
-+	logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(logHeight, chateditHeight);
-+
-+	connect(ui_.splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
-@@ -267,6 +268,26 @@ void PsiChatDlg::initUi()
- 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- }
- 
-+void PsiChatDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.splitter->sizes();
-+	logHeight = list.first();
-+	chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", chateditHeight);
-+
-+	emit vSplitterMoved(logHeight, chateditHeight);
-+}
-+
-+void PsiChatDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	logHeight = log;
-+	chateditHeight = chat;
-+	list << log << chat;
-+	ui_.splitter->setSizes(list);
-+}
-+
- void PsiChatDlg::updateCountVisibility()
- {
- 	if (PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && !smallChat_) {
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -21,6 +21,8 @@ public:
- 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
- 	~PsiChatDlg();
- 
-+	virtual void setVSplitterPosition(int log,int chat);
-+
- protected:
- 	// reimplemented
- 	void contextMenuEvent(QContextMenuEvent *);
-@@ -51,6 +53,7 @@ private slots:
- 	void doPasteAndSend();
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
-+	void verticalSplitterMoved(int, int);
- 
- private:
- 	void initToolBar();
-@@ -102,6 +105,9 @@ private:
- 	bool smallChat_;
- 	class ChatDlgMCmdProvider;
- 
-+	int logHeight;
-+	int chateditHeight;
-+
- private:
- 	bool tabmode;
- 	QPointer <PsiWindowHeader> winHeader_;
---- git.orig/src/tabs/tabbablewidget.h
-+++ git/src/tabs/tabbablewidget.h
-@@ -68,6 +68,7 @@ public:
- 	virtual State state() const = 0;
- 	virtual int unreadMessageCount() const = 0;
- 	virtual QString desiredCaption() const = 0;
-+	virtual void setVSplitterPosition(int,int){}; // default implementation do nothing
- 
- 	// Templates
- 	SendButtonTemplatesMenu* getTemplateMenu();
-@@ -78,6 +79,7 @@ signals:
- 	void invalidateTabInfo();
- 	void updateFlashState();
- 	void eventsRead(const Jid &);
-+	void vSplitterMoved(int,int);
- 
- public slots:
- 	virtual void deactivated();
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -412,6 +412,7 @@ void TabDlg::addTab(TabbableWidget* tab)
- 
- 	connect(tab, SIGNAL(invalidateTabInfo()), SLOT(updateTab()));
- 	connect(tab, SIGNAL(updateFlashState()), SLOT(updateFlashState()));
-+	connect(tab, SIGNAL(vSplitterMoved(int,int)), SLOT(updateVSplitters(int,int)));
- 
- 	updateTab(tab);
- 	setUpdatesEnabled(true);
-@@ -479,6 +480,7 @@ void TabDlg::removeTabWithNoChecks(Tabba
- {
- 	disconnect(tab, SIGNAL(invalidateTabInfo()), this, SLOT(updateTab()));
- 	disconnect(tab, SIGNAL(updateFlashState()), this, SLOT(updateFlashState()));
-+	disconnect(tab, SIGNAL(vSplitterMoved(int,int)), this, SLOT(updateVSplitters(int,int)));
- 
- 	tabs_.removeAll(tab);
- 	tabWidget_->removePage(tab);
-@@ -889,3 +891,10 @@ void TabDlg::setTabIcon(QWidget *widget,
- {
- 	tabWidget_->setTabIcon(widget, icon);
- }
-+
-+void TabDlg::updateVSplitters(int log, int chat)
-+{
-+	foreach(TabbableWidget *w, tabs_) {
-+		w->setVSplitterPosition(log, chat);
-+	}
-+}
---- git.orig/src/tabs/tabdlg.h
-+++ git/src/tabs/tabdlg.h
-@@ -144,6 +144,7 @@ private slots:
- 	void menu_sendTabTo(QAction *act);
- 	void queuedSendTabTo(TabbableWidget* chat, TabDlg *dest);
- 	void showTabMenu(int tab, QPoint pos, QContextMenuEvent * event);
-+	void updateVSplitters(int log, int chat);
- 
- private:
- 	TabDlgDelegate *delegate_;

psi-plus-main-20130107.tar.xz/patches/1180-psi-allow-accounts-reordering-in-manager.diff Deleted

@@ -1,226 +0,0 @@
---- git.orig/src/accountmanagedlg.cpp
-+++ git/src/accountmanagedlg.cpp
-@@ -260,6 +260,7 @@ public:
- 	{
- 		pa = _pa;
- 		Q_ASSERT(!pa.isNull());
-+		setFlags(flags() ^ Qt::ItemIsDropEnabled);
- 		connect(pa, SIGNAL(updatedActivity()), SLOT(updateInfo()));
- 		connect(pa, SIGNAL(updatedAccount()), SLOT(updateInfo()));
- 		updateInfo();
-@@ -289,6 +290,36 @@ private slots:
- 	}
- };
- 
-+
-+
-+AccountManageTree::AccountManageTree(QWidget *parent)
-+	: QTreeWidget(parent)
-+{
-+
-+}
-+
-+void AccountManageTree::dropEvent(QDropEvent *event)
-+{
-+	QTreeWidget::dropEvent(event);
-+	AccountManageTree *tree = qobject_cast<AccountManageTree *>(event->source());
-+
-+	if (tree) {
-+		QList<PsiAccount*> accountsList;
-+		foreach (QTreeWidgetItem *ami, tree->findItems("*", Qt::MatchWildcard)) {
-+			accountsList.append(((AccountManageItem *)ami)->pa.data());
-+		}
-+		emit orderChanged(accountsList);
-+	}
-+}
-+
-+void AccountManageTree::dragMoveEvent(QDragMoveEvent *event)
-+{
-+	QTreeWidget::dragMoveEvent(event);
-+	sortByColumn(-1);
-+}
-+
-+
-+
- AccountManageDlg::AccountManageDlg(PsiCon *_psi)
- :QDialog(0)
- {
-@@ -313,10 +344,15 @@ AccountManageDlg::AccountManageDlg(PsiCo
- 
- 	connect(lv_accs, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(modify(QTreeWidgetItem *)));
- 	connect(lv_accs, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(qlv_selectionChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
-+	connect(lv_accs, SIGNAL(orderChanged(QList<PsiAccount*>)), psi, SLOT(setAccountsOrder(QList<PsiAccount*>)));
- 	connect(psi, SIGNAL(accountAdded(PsiAccount *)), SLOT(accountAdded(PsiAccount *)));
- 	connect(psi, SIGNAL(accountRemoved(PsiAccount *)), SLOT(accountRemoved(PsiAccount *)));
- 
- 	lv_accs->header()->setResizeMode(QHeaderView::ResizeToContents);
-+	lv_accs->setDragDropMode(QAbstractItemView::InternalMove);
-+	lv_accs->setDragDropOverwriteMode(false);
-+	lv_accs->setSortingEnabled(true);
-+	lv_accs->sortByColumn(-1);
- 
- 	foreach(PsiAccount* pa, psi->contactList()->accounts())
- 		new AccountManageItem(lv_accs, pa);
---- git.orig/src/accountmanagedlg.h
-+++ git/src/accountmanagedlg.h
-@@ -21,7 +21,7 @@
- #ifndef ACCOUNTMANAGEDLG_H
- #define ACCOUNTMANAGEDLG_H
- 
--#include "ui_accountmanage.h"
-+#include <QTreeWidget>
- 
- namespace XMPP
- {
-@@ -33,6 +33,23 @@ class PsiCon;
- class PsiAccount;
- class QTreeWidgetItem;
- 
-+class AccountManageTree : public QTreeWidget
-+{
-+	Q_OBJECT
-+
-+public:
-+	AccountManageTree(QWidget *parent = 0);
-+
-+protected:
-+	void dropEvent(QDropEvent *event);
-+	void dragMoveEvent(QDragMoveEvent *event);
-+
-+signals:
-+	void orderChanged(QList<PsiAccount *> accountsList);
-+};
-+
-+#include "ui_accountmanage.h"
-+
- class AccountManageDlg : public QDialog, public Ui::AccountManage
- {
- 	Q_OBJECT
---- git.orig/src/accountmanage.ui
-+++ git/src/accountmanage.ui
-@@ -17,7 +17,7 @@
-    <item>
-     <layout class="QHBoxLayout">
-      <item>
--      <widget class="QTreeWidget" name="lv_accs">
-+      <widget class="AccountManageTree" name="lv_accs">
-        <property name="indentation">
-         <number>0</number>
-        </property>
-@@ -121,6 +121,11 @@
-    <extends>QWidget</extends>
-    <header>iconbutton.h</header>
-   </customwidget>
-+  <customwidget>
-+   <class>AccountManageTree</class>
-+   <extends>QTreeWidget</extends>
-+   <header>accountmanagedlg.h</header>
-+  </customwidget>
-  </customwidgets>
-  <resources/>
-  <connections>
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -240,11 +240,13 @@ public:
- 		accountTree.removeOption("accounts", true);
- 		// save accounts with known base
- 		QSet<QString> cbases;
-+		QStringList order;
- 		foreach(UserAccount ua, acc) {
- 			if (!ua.optionsBase.isEmpty()) {
- 				ua.toOptions(&accountTree);
- 				cbases += ua.optionsBase;
- 			}
-+			order.append(ua.id);
- 		}
- 		// save new accounts
- 		int idx = 0;
-@@ -258,6 +260,7 @@ public:
- 				ua.toOptions(&accountTree, base);
- 			}
- 		}
-+		accountTree.setOption("order", order);
- 		QFile accountsFile(pathToProfile(activeProfile, ApplicationInfo::ConfigLocation) + "/accounts.xml");
- 		accountTree.saveOptions(accountsFile.fileName(), "accounts", ApplicationInfo::optionsNS(), ApplicationInfo::version());;
- 		
-@@ -640,6 +643,17 @@ bool PsiCon::init()
- 			ua.fromOptions(&d->accountTree, base);
- 			accs += ua;
- 		}
-+		QStringList order = d->accountTree.getOption("order").toStringList();
-+		int start = 0;
-+		foreach (const QString &id, order) {
-+			for (int i = start; i < accs.size(); ++i) {
-+				if (accs[i].id == id) {
-+					accs.move(i, start);
-+					start++;
-+					break;
-+				}
-+			}
-+		}
- 		
- 		// Disable accounts if necessary, and overwrite locked properties
- 		if (PsiOptions::instance()->getOption("options.ui.account.single").toBool() || !PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) {
-@@ -1001,6 +1015,11 @@ void PsiCon::removeAccount(PsiAccount *p
- 	d->contactList->removeAccount(pa);
- }
- 
-+void PsiCon::setAccountsOrder(QList<PsiAccount*> accounts)
-+{
-+	d->contactList->setAccountsOrder(accounts);
-+}
-+
- void PsiCon::statusMenuChanged(XMPP::Status::Type x, bool forceDialog)
- {
- #ifndef YAPSI
---- git.orig/src/psicon.h
-+++ git/src/psicon.h
-@@ -148,6 +148,7 @@ public slots:
- 	void doToolbars();
- 	void doStatusPresets();
- 	void checkAccountsEmpty();
-+	void setAccountsOrder(QList<PsiAccount*>);
- 
- public slots:
- 	void doSleep();
---- git.orig/src/psicontactlist.cpp
-+++ git/src/psicontactlist.cpp
-@@ -280,6 +280,28 @@ UserAccountList PsiContactList::getUserA
- }
- 
- /**
-+ * Moves accounts from list to top. affects default account
-+ */
-+void PsiContactList::setAccountsOrder(QList<PsiAccount*> accounts)
-+{
-+	int start = 0;
-+	bool needSave = false;
-+	foreach (PsiAccount *account, accounts) {
-+		int index = accounts_.indexOf(account, start);
-+		if (index != -1) {
-+			accounts_.move(index, start);
-+			if (index != start) {
-+				needSave = true;
-+			}
-+			start++;
-+		}
-+	}
-+	if (needSave) {
-+		emit saveAccounts();
-+	}
-+}
-+
-+/**
-  * It's called by each and every PsiAccount on its creation.
-  */
- void PsiContactList::link(PsiAccount* account)
---- git.orig/src/psicontactlist.h
-+++ git/src/psicontactlist.h
-@@ -62,6 +62,7 @@ public:
- 	PsiAccount *defaultAccount() const;
- 
- 	UserAccountList getUserAccountList() const;
-+	void setAccountsOrder(QList<PsiAccount*> accounts);
- 
- 	PsiAccount* createAccount(const QString& name, const Jid& j = "", const QString& pass = "", bool opt_host = false, const QString& host = "", int port = 5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl = UserAccount::SSL_Auto, QString proxyID = "", const QString &tlsOverrideDomain="", const QByteArray &tlsOverrideCert=QByteArray());
- 	void createAccount(const UserAccount&);

psi-plus-main-20130107.tar.xz/patches/1190-psi-hide-muc-auto-join.diff Deleted

@@ -1,210 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -291,6 +291,7 @@ QLineEdit#le_status_text {
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-+				<hide-on-autojoin type="bool">false</hide-on-autojoin>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
- 				<log-width type="int">500</log-width>
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -48,6 +48,8 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	joinButton_ = ui_.buttonBox->addButton(tr("&Join"), QDialogButtonBox::AcceptRole);
- 	joinButton_->setDefault(true);
- 
-+	reason_ = MucCustomJoin;
-+
- 	updateIdentity(pa);
- 
- 	ui_.cb_ident->setController(controller_);
-@@ -176,11 +178,13 @@ void MUCJoinDlg::updateBookmarks(PsiAcco
- 	}
- }
- 
--void MUCJoinDlg::doJoin()
-+void MUCJoinDlg::doJoin(MucJoinReason r)
- {
- 	if (!account_ || !account_->checkConnected(this))
- 		return;
- 
-+	reason_ = r;
-+
- 	QString host = ui_.le_host->text();
- 	QString room = ui_.le_room->text();
- 	QString nick = ui_.le_nick->text();
-@@ -244,6 +248,9 @@ void MUCJoinDlg::joined()
- 
- void MUCJoinDlg::error(int, const QString &str)
- {
-+	if(!isVisible())
-+		show();
-+
- 	ui_.busy->stop();
- 	setWidgetsEnabled(true);
- 
---- psi.orig/src/mucjoindlg.h
-+++ psi/src/mucjoindlg.h
-@@ -36,6 +36,12 @@ class MUCJoinDlg : public QDialog
- 	Q_OBJECT
- 
- public:
-+
-+	enum MucJoinReason {
-+		MucAutoJoin,
-+		MucCustomJoin
-+	};
-+
- 	MUCJoinDlg(PsiCon *, PsiAccount *);
- 	~MUCJoinDlg();
- 
-@@ -48,11 +54,15 @@ public:
- 
- public slots:
- 	void done(int);
--	void doJoin();
-+	void doJoin(MucJoinReason reason = MucCustomJoin);
- 
- 	// reimplemented
- 	void accept();
- 
-+public:
-+	MucJoinReason getReason() const { return reason_; };
-+
-+
- private slots:
- 	void updateIdentity(PsiAccount *);
- 	void updateIdentityVisibility();
-@@ -67,6 +77,7 @@ private:
- 	PsiAccount* account_;
- 	QPushButton* joinButton_;
- 	XMPP::Jid jid_;
-+	MucJoinReason reason_;
- 
- 	void disableWidgets();
- 	void enableWidgets();
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -130,7 +130,6 @@
- #include "systeminfo.h"
- #include "avatars.h"
- #include "ahcommanddlg.h"
--#include "mucjoindlg.h"
- #include "ahcservermanager.h"
- #include "rc.h"
- #include "tabdlg.h"
-@@ -2310,7 +2309,7 @@ void PsiAccount::bookmarksAvailabilityCh
- 	foreach(ConferenceBookmark c, d->bookmarkManager->conferences()) {
- 		if (!findDialog<GCMainDlg*>(Jid(c.jid().bare())) && c.autoJoin()) {
- 			if  (!joinSkip.contains(c.jid().full().toUpper()))
--				actionJoin(c, true);
-+				actionJoin(c, true, MUCJoinDlg::MucAutoJoin);
- 		}
- 	}
- #endif
-@@ -3347,7 +3346,7 @@ void PsiAccount::actionJoin(const Jid& m
- 	           false);
- }
- 
--void PsiAccount::actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately)
-+void PsiAccount::actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately, MUCJoinDlg::MucJoinReason reason)
- {
- #ifdef GROUPCHAT
- 	MUCJoinDlg* w = new MUCJoinDlg(psi(), this);
-@@ -3356,9 +3355,11 @@ void PsiAccount::actionJoin(const Confer
- 	w->setNick(bookmark.nick().isEmpty() ? JIDUtil::nickOrJid(this->nick(), d->jid.node()) : bookmark.nick());
- 	w->setPassword(bookmark.password());
- 
--	w->show();
-+	if(reason != MUCJoinDlg::MucAutoJoin
-+	   || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool())
-+		w->show();
- 	if (connectImmediately) {
--		w->doJoin();
-+		w->doJoin(reason);
- 	}
- #else
- 	Q_UNUSED(bookmark);
-@@ -5487,16 +5488,18 @@ void PsiAccount::edb_finished()
- 	delete h;
- }
- 
--void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType)
-+void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType, MUCJoinDlg::MucJoinReason reason)
- {
- #ifdef GROUPCHAT
- 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
- 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
- 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
- 	connect(d->psi, SIGNAL(emitOptionsUpdate()), w, SLOT(optionsUpdate()));
--	w->ensureTabbedCorrectly();
--	if (activationType == UserAction)
--		w->bringToFront();
-+	if(reason != MUCJoinDlg::MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
-+		w->ensureTabbedCorrectly();
-+		if (activationType == UserAction)
-+			w->bringToFront();
-+	}
- #endif
- }
- 
-@@ -5571,10 +5574,17 @@ void PsiAccount::client_groupChatJoined(
- 	MUCJoinDlg *w = findDialog<MUCJoinDlg*>(j);
- 	if(!w)
- 		return;
-+	MUCJoinDlg::MucJoinReason r = w->getReason();
- 	w->joined();
- 
--	// TODO: Correctly handle auto-join groupchats
--	openGroupChat(j, UserAction);
-+	openGroupChat(j, UserAction, r);
-+//	if(r == MUCJoinDlg::MucAutoJoin && PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
-+//		m = findDialog<GCMainDlg*>(Jid(j.bare()));
-+//		if(m) {
-+//			QTimer::singleShot(0, m, SLOT(hideTab()));
-+//		}
-+//	}
-+
- #endif
- }
- 
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -35,6 +35,7 @@
- #include "mood.h"
- #include "activity.h"
- #include "geolocation.h"
-+#include "mucjoindlg.h"
- 
- namespace XMPP
- {
-@@ -198,7 +199,7 @@ public:
- 	void showXmlConsole();
- 	void openAddUserDlg();
- 	void openAddUserDlg(const XMPP::Jid &jid, const QString &nick, const QString &group);
--	void openGroupChat(const Jid &, ActivationType activationType);
-+	void openGroupChat(const Jid &, ActivationType activationType, MUCJoinDlg::MucJoinReason reason = MUCJoinDlg::MucCustomJoin);
- 	bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& pass, bool nohistory = false);
- 	void groupChatSetStatus(const QString &host, const QString &room, const Status &);
- 	void groupChatChangeNick(const QString &host, const QString &room, const QString& nick, const Status &);
-@@ -361,7 +362,7 @@ public slots:
- 	void actionSearch(const Jid &);
- 	void actionManageBookmarks();
- 	void actionJoin(const Jid& mucJid, const QString& password = QString());
--	void actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately);
-+	void actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately, MUCJoinDlg::MucJoinReason reason = MUCJoinDlg::MucCustomJoin);
- 	void actionDisco(const Jid &, const QString &);
- 	void actionInvite(const Jid &, const QString &);
- 	void actionVoice(const Jid&);
---- psi.orig/src/tabs/tabbablewidget.cpp
-+++ psi/src/tabs/tabbablewidget.cpp
-@@ -47,7 +47,7 @@ TabbableWidget::TabbableWidget(const Jid
- 		TabbableWidget::templateMenu->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
- 	}
- 	++TabbableWidget::chatsCount;
--	QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
-+	//QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
- }
- 
- void TabbableWidget::ensureTabbedCorrectly()

psi-plus-main-20130107.tar.xz/patches/1200-psi-auto-capitalizer.diff Deleted

@@ -1,239 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -106,6 +106,7 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
-+				<auto-capitalize type="bool">false</auto-capitalize>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
-@@ -551,6 +552,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<change-case type="QKeySequence" comment="Change case of letters in the chat edit" >Ctrl+Alt+x</change-case>
- 				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
---- git.orig/src/msgmle.cpp
-+++ git/src/msgmle.cpp
-@@ -40,6 +40,126 @@
- #include "psioptions.h"
- #include "htmltextcontroller.h"
- 
-+#include "qdebug.h"
-+
-+//----------------------------------------------------------------------------
-+// CapitalLettersController
-+//----------------------------------------------------------------------------
-+
-+class CapitalLettersController : public QObject
-+{
-+	Q_OBJECT
-+public:
-+	CapitalLettersController(QTextEdit* parent)
-+		: QObject()
-+		, te_(parent)
-+		, enabled_(true)
-+	{
-+		connect(te_->document(), SIGNAL(contentsChange(int,int,int)), SLOT(textChanged(int,int,int)));
-+	}
-+
-+	virtual ~CapitalLettersController() {};
-+
-+	void setAutoCapitalizeEnabled(bool enabled)
-+	{
-+		enabled_ = enabled;
-+	}
-+
-+private:
-+	void capitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toUpper());
-+	}
-+
-+	void decapitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toLower());
-+	}
-+
-+	void changeChar(int pos, QChar c)
-+	{
-+		QTextCursor cur = te_->textCursor();
-+		cur.setPosition(pos+1);
-+		const QTextCharFormat cf = cur.charFormat();
-+		cur.deletePreviousChar();
-+		cur.setCharFormat(cf);
-+		cur.insertText(c);
-+	}
-+
-+public slots:
-+	void textChanged(int pos, int /*charsRemoved*/, int charsAdded)
-+	{
-+		if(enabled_) {
-+			if(charsAdded == 0) {
-+				return;
-+			}
-+			if(!te_->textCursor().atEnd()) { //Editing the letter in the middle of the text
-+				return;
-+			}
-+			bool capitalizeNext_ = false;
-+
-+			if(pos == 0 && charsAdded < 3) { //the first letter after the previous message was sent
-+				capitalizeNext_ = true;
-+			}
-+			else if (charsAdded > 1) { //Insert a piece of text
-+				return;
-+			}
-+			else {
-+				QString txt = te_->toPlainText();
-+				QRegExp capitalizeAfter("(?:^[^.][.]+\\s+)|(?:\\s*[^.]{2,}[.]+\\s+)|(?:[!?]\\s+)");
-+				int index = txt.lastIndexOf(capitalizeAfter);
-+				if(index != -1 && index == pos-capitalizeAfter.matchedLength()) {
-+					capitalizeNext_ = true;
-+				}
-+			}
-+
-+			if(capitalizeNext_) {
-+				QChar ch = te_->document()->characterAt(pos);
-+				if(!ch.isLetter() || !ch.isLower()) {
-+					return;
-+				}
-+				else {
-+					capitalizeChar(pos, ch);
-+				}
-+			}
-+		}
-+	}
-+
-+	void changeCase()
-+	{
-+		bool tmpEnabled = enabled_;
-+		enabled_ = false;
-+		QTextCursor oldCur = te_->textCursor();
-+		int pos = oldCur.position();
-+		int begin = 0;
-+		int end = te_->document()->characterCount();
-+		if(oldCur.hasSelection()) {
-+			begin = oldCur.selectionStart();
-+			end = oldCur.selectionEnd();
-+		}
-+		for(; begin < end; begin++) {
-+			QChar ch = te_->document()->characterAt(begin);
-+			if(!ch.isLetter()) {
-+				continue;
-+			}
-+
-+			if(ch.isLower()) {
-+				capitalizeChar(begin, ch);
-+			}
-+			else {
-+				decapitalizeChar(begin, ch);
-+			}
-+		}
-+		oldCur.setPosition(pos);
-+		te_->setTextCursor(oldCur);
-+		enabled_ = tmpEnabled;
-+	}
-+
-+private:
-+	QTextEdit* te_;
-+	bool enabled_;
-+};
-+
- 
- //----------------------------------------------------------------------------
- // ChatEdit
-@@ -51,6 +171,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 	, spellhighlighter_(0)
- {
- 	controller_ = new HTMLTextController(this);
-+	capitalizer_ = new CapitalLettersController(this);
- 
- 	setWordWrapMode(QTextOption::WordWrap);
- 	setAcceptRichText(false);
-@@ -67,6 +188,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 
- 	initActions();
- 	setShortcuts();
-+	optionsChanged();
- }
- 
- ChatEdit::~ChatEdit()
-@@ -74,6 +196,12 @@ ChatEdit::~ChatEdit()
- 	clearMessageHistory();
- 	delete spellhighlighter_;
- 	delete controller_;
-+	delete capitalizer_;
-+}
-+
-+CapitalLettersController * ChatEdit::capitalizer()
-+{
-+	return capitalizer_;
- }
- 
- void ChatEdit::initActions()
-@@ -100,6 +228,10 @@ void ChatEdit::initActions()
- 	addAction(actPasteAsQuote_);
- 	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
- 	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
-+
-+	act_changeCase = new QAction(this);
-+	addAction(act_changeCase);
-+	connect(act_changeCase, SIGNAL(triggered()), capitalizer_, SLOT(changeCase()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -108,6 +240,7 @@ void ChatEdit::setShortcuts()
- 	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
- 	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
- 	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
-+	act_changeCase->setShortcuts(ShortcutManager::instance()->shortcuts("chat.change-case"));
- }
- 
- void ChatEdit::setDialog(QWidget* dialog)
-@@ -297,6 +430,7 @@ void ChatEdit::addToDictionary()
- void ChatEdit::optionsChanged()
- {
- 	setCheckSpelling(checkSpellingGloballyEnabled());
-+	capitalizer_->setAutoCapitalizeEnabled(PsiOptions::instance()->getOption("options.ui.chat.auto-capitalize").toBool());
- }
- 
- void ChatEdit::showHistoryMessageNext()
-@@ -507,3 +641,5 @@ void LineEdit::updateScrollBar()
- 	setVerticalScrollBarPolicy(sizeHint().height() > height() ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
- 	ensureCursorVisible();
- }
-+
-+#include "msgmle.moc"
---- git.orig/src/msgmle.h
-+++ git/src/msgmle.h
-@@ -34,6 +34,7 @@ class QResizeEvent;
- class QTimer;
- class SpellHighlighter;
- class HTMLTextController;
-+class CapitalLettersController;
- 
- 
- class ChatEdit : public QTextEdit
-@@ -54,6 +55,7 @@ public:
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
- 	XMPP::HTMLElement toHTMLElement();
-+	CapitalLettersController * capitalizer();
- 
- public slots:
- 	void appendMessageHistory(const QString& text);
-@@ -97,9 +99,11 @@ private:
- 	QAction* act_showMessageFirst;
- 	QAction* act_showMessageLast;
- 	QAction *actPasteAsQuote_;
-+	QAction *act_changeCase;
- 
- 	QString currentText;
- 	HTMLTextController *controller_;
-+	CapitalLettersController *capitalizer_;
- };
- 
-

psi-plus-main-20130107.tar.xz/patches/1210-psi-disable-show-status-changes-in-chat.diff Deleted

@@ -1,23 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -114,6 +114,7 @@
- 				<use-small-chats type="bool">false</use-small-chats>
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
-+				<show-status-changes type="bool">true</show-status-changes>
- 				<warn-before-clear type="bool">true</warn-before-clear>
- 				<css type="QString" />
- 				<only-paste-template type="bool">false</only-paste-template>
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -492,7 +492,9 @@ void ChatDlg::updateContact(const Jid &j
- 			key_ = userStatus.publicKeyID;
- 			updatePGP();
- 
--			if (fromPresence && statusChanged) {
-+			if (PsiOptions::instance()->getOption("options.ui.chat.show-status-changes").toBool()
-+				&& fromPresence && statusChanged)
-+			{
- 				chatView()->dispatchMessage(MessageView::statusMessage(
- 												dispNick_, status_,
- 												statusString_, priority_));

psi-plus-main-20130107.tar.xz/patches/1220-psi-autostart.diff Deleted

@@ -1,139 +0,0 @@
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -339,3 +339,28 @@ QString ApplicationInfo::currentProfileD
- {
- 	return pathToProfile(activeProfile, type);
- }
-+
-+QString ApplicationInfo::desktopFile()
-+{
-+	QString dFile;
-+	const QString execFileName = QFileInfo(qApp->applicationFilePath()).fileName();
-+	const QString desktopFile = QString("/usr/share/applications/%1.desktop").arg(execFileName);
-+	QFile f(desktopFile);
-+	if(f.open(QIODevice::ReadOnly)) {
-+		dFile = QString::fromUtf8(f.readAll());
-+	}
-+	else {
-+		dFile = "[Desktop Entry]\n";
-+		dFile += "Version=1.0\n";
-+		dFile += "Type=Application\n";
-+		dFile += QString("Name=%1\n").arg(name());
-+		dFile += "GenericName=Jabber Client\n";
-+		dFile += "Comment=Communicate over the Jabber network\n";
-+		dFile += QString("Icon=%1\n").arg(execFileName);
-+		dFile += QString("Exec=%1\n").arg(execFileName);
-+		dFile += "Terminal=false\n";
-+		dFile += "Categories=Network;InstantMessaging;Qt;";
-+	}
-+
-+	return dFile;
-+}
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -42,6 +42,9 @@ public:
- 	static QString optionsNS();
- 	static QString storageNS();
- 	static QString fileCacheNS();
-+
-+	// Common
-+	static QString desktopFile();
- };
- 
- #endif
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -13,9 +13,17 @@
- #include "qsettings.h"
- #include <QList>
- #include <QMessageBox>
-+#include <QDir>
- 
- #include "ui_opt_application.h"
- 
-+#ifdef Q_WS_WIN
-+	static const QString regString = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-+#endif
-+#ifdef Q_WS_X11
-+	static const QString psiAutoStart = "/.config/autostart/psi-plus.desktop";
-+#endif
-+
- class OptApplicationUI : public QWidget, public Ui::OptApplication
- {
- public:
-@@ -60,6 +68,7 @@ QWidget *OptionsTabApplication::widget()
- 
- #ifdef Q_WS_MAC
- 	d->gb_docklet->hide();
-+	d->ck_auto_load->hide();
- #endif
- 
- 	if (!haveAutoUpdater_) {
-@@ -126,6 +135,29 @@ void OptionsTabApplication::applyOptions
- 	}
- 	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
- 	s.setValue("last_lang", itemData);
-+
-+	//Auto-load
-+#ifdef Q_WS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	if(d->ck_auto_load->isChecked()) {
-+		set.setValue(ApplicationInfo::name(), QDir::toNativeSeparators(qApp->applicationFilePath()));
-+	}
-+	else {
-+		set.remove(ApplicationInfo::name());
-+	} 
-+#endif
-+#ifdef Q_WS_X11
-+	QDir home = QDir::home();
-+	if (!home.exists(".config/autostart")) {
-+		home.mkpath(".config/autostart");
-+	}
-+	QFile f(home.absolutePath() + psiAutoStart);
-+	if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
-+		const QString contents = ApplicationInfo::desktopFile().trimmed();
-+		f.write(contents.toUtf8());
-+		f.write(QString("\nHidden=%1").arg(d->ck_auto_load->isChecked() ? "false\n" : "true\n").toUtf8());
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -164,6 +196,21 @@ void OptionsTabApplication::restoreOptio
- 		d->cb_lang->setCurrentIndex( 0 );
- 	else if(!curLang.isEmpty() && lang.contains(curLang) )
- 		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
-+
-+	//Auto-load
-+#ifdef Q_WS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	const QString path = set.value(ApplicationInfo::name()).toString();
-+	d->ck_auto_load->setChecked( (path == QDir::toNativeSeparators(qApp->applicationFilePath())) );
-+#endif
-+#ifdef Q_WS_X11
-+	QFile desktop(QDir::homePath() + psiAutoStart);
-+	if (desktop.open(QIODevice::ReadOnly)
-+		&& QString(desktop.readAll()).contains(QRegExp("\\bhidden\\s*=\\s*false", Qt::CaseInsensitive)))
-+	{
-+		d->ck_auto_load->setChecked(true);
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -14,6 +14,13 @@
-   </property>
-   <layout class="QVBoxLayout" >
-    <item>
-+    <widget class="QCheckBox" name="ck_auto_load">
-+     <property name="text">
-+      <string>Automatically launch application when OS starts</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_docklet" >
-      <property name="text" >
-       <string>Enable docklet</string>

psi-plus-main-20130107.tar.xz/patches/1230-psi-fix-tunes.diff Deleted

@@ -1,1555 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -36,7 +36,7 @@
- 				<publish comment="Publish user tune information" type="bool">true</publish>
- 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
- 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
--				<controller-filter comment="List of disabled controllers" type="QString"></controller-filter>
-+				<controller-filter comment="List of disabled controllers" type="QString">WinAmp</controller-filter>
- 			</tune>
- 		</extended-presence>
- 		<muc comment="Multi-User Chat options">
---- git.orig/src/options/options.pri
-+++ git/src/options/options.pri
-@@ -27,7 +27,8 @@ HEADERS += \
- 	$$PWD/opt_avcall.h \
- 	$$PWD/opt_toolbars.h \
- 	$$PWD/opt_advanced.h \
--	$$PWD/opt_shortcuts.h
-+	$$PWD/opt_shortcuts.h \
-+	$$PWD/opt_statuspep.h
- 
- HEADERS += $$PWD/opt_tree.h
- 
-@@ -48,7 +49,8 @@ SOURCES += \
- 	$$PWD/opt_avcall.cpp \
- 	$$PWD/opt_toolbars.cpp \
- 	$$PWD/opt_advanced.cpp \
--	$$PWD/opt_shortcuts.cpp
-+	$$PWD/opt_shortcuts.cpp \
-+	$$PWD/opt_statuspep.cpp
- 
- SOURCES += $$PWD/opt_tree.cpp
- 
-@@ -75,7 +77,8 @@ FORMS += \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
--	$$PWD/opt_shortcuts.ui
-+	$$PWD/opt_shortcuts.ui \
-+	$$PWD/opt_statuspep.ui
- 
- psi_plugins {
- 	FORMS += $$PWD/opt_plugins.ui
---- git.orig/src/options/opt_status.cpp
-+++ git/src/options/opt_status.cpp
-@@ -1,6 +1,7 @@
- #include "opt_status.h"
- #include "opt_statusgeneral.h"
- #include "opt_statusauto.h"
-+#include "opt_statuspep.h"
- 
- OptionsTabStatus::OptionsTabStatus(QObject *parent)
- : MetaOptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
-@@ -10,4 +11,5 @@ OptionsTabStatus::OptionsTabStatus(QObje
- 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), parent, SLOT(enableCommonWidgets(bool)));
- 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), SLOT(enableOtherTabs(bool)));
- 	addTab(new OptionsTabStatusAuto(this));
-+	addTab(new OptionsTabStatusPep(this));
- }
---- git.orig/src/options/opt_statuspep.cpp
-+++ git/src/options/opt_statuspep.cpp
-@@ -0,0 +1,108 @@
-+#include "opt_statuspep.h"
-+#include "psioptions.h"
-+
-+#include <QListWidget>
-+#include <QCheckBox>
-+
-+#include "ui_opt_statuspep.h"
-+
-+static const char *tuneUrlFilterOptionPath = "options.extended-presence.tune.url-filter";
-+static const char *tuneControllerFilterOptionPath = "options.extended-presence.tune.controller-filter";
-+
-+class OptStatusPepUI : public QWidget, public Ui::OptStatusPep
-+{
-+public:
-+	OptStatusPepUI() : QWidget() { setupUi(this); }
-+};
-+
-+OptionsTabStatusPep::OptionsTabStatusPep(QObject *parent)
-+: OptionsTab(parent, "status_tunes", "", tr("PEP"), tr("Tunes no-video filter and controllers switcher"))
-+, w_(0)
-+, psi_(0)
-+, controllersChanged_(false)
-+{
-+}
-+
-+OptionsTabStatusPep::~OptionsTabStatusPep()
-+{
-+}
-+
-+QWidget *OptionsTabStatusPep::widget()
-+{
-+	if (w_) {
-+		return 0;
-+	}
-+
-+	w_ = new OptStatusPepUI();
-+	return w_;
-+}
-+
-+void OptionsTabStatusPep::applyOptions()
-+{
-+	if (!w_) {
-+		return;
-+	}
-+
-+	OptStatusPepUI *d = (OptStatusPepUI *)w_;
-+	PsiOptions* o = PsiOptions::instance();
-+	QStringList newTuneFilters = d->tuneExtensions->text().split(QRegExp("\\W+"));
-+	QString tuneExstensionsFilter;
-+	if (!newTuneFilters.isEmpty()) {
-+		newTuneFilters.removeDuplicates();
-+		qSort(newTuneFilters);
-+		tuneExstensionsFilter = newTuneFilters.join(" ").toLower();
-+		d->tuneExtensions->setText(tuneExstensionsFilter);
-+	}
-+	QString controllerFilter = blackList_.join(",");
-+	if (tuneExstensionsFilter != tuneFilters_) {
-+		o->setOption(tuneUrlFilterOptionPath, tuneExstensionsFilter);
-+	}
-+	if (controllersChanged_) {
-+		o->setOption(tuneControllerFilterOptionPath, controllerFilter);
-+	}
-+}
-+
-+void OptionsTabStatusPep::restoreOptions()
-+{
-+	if (!w_) {
-+		return;
-+	}
-+
-+	OptStatusPepUI *d = (OptStatusPepUI *)w_;
-+	PsiOptions* o = PsiOptions::instance();
-+	tuneFilters_ = o->getOption(tuneUrlFilterOptionPath).toString();
-+	d->tuneExtensions->setText(tuneFilters_);
-+	QStringList controllers = psi_->tuneManager()->controllerNames();
-+	blackList_ = o->getOption(tuneControllerFilterOptionPath).toString().split(QRegExp("[,]\\s*"), QString::SkipEmptyParts);
-+	foreach(const QString &name, controllers) {
-+		QCheckBox* cb = new QCheckBox(name);
-+		QString caption = name + " controller";
-+		cb->setText(caption);
-+		cb->setObjectName(name);
-+		int i = controllers.indexOf(name);
-+		d->gridLayout->addWidget(cb,i/3,i%3);
-+		cb->setChecked(!blackList_.contains(name));
-+		connect(cb, SIGNAL(toggled(bool)), SLOT(controllerSelected(bool)));
-+	}
-+}
-+
-+void OptionsTabStatusPep::controllerSelected(bool checked)
-+{
-+	QCheckBox *box = qobject_cast<QCheckBox*>(sender());
-+	QString name_ = box->objectName();
-+	if (!name_.isEmpty()) {
-+		if (!checked && !blackList_.contains(name_, Qt::CaseInsensitive)) {
-+			blackList_ << name_;
-+			controllersChanged_ = true;
-+		}
-+		else if (checked) {
-+			blackList_.removeAll(name_);
-+			controllersChanged_ = true;
-+		}
-+	}
-+}
-+
-+void OptionsTabStatusPep::setData(PsiCon *psi, QWidget *)
-+{
-+	psi_ = psi;
-+}
---- git.orig/src/options/opt_statuspep.h
-+++ git/src/options/opt_statuspep.h
-@@ -0,0 +1,36 @@
-+#ifndef OPT_STAUSPEP_H
-+#define OPT_STAUSPEP_H
-+
-+#include "optionstab.h"
-+#include "common.h"
-+#include "psicon.h"
-+
-+class QWidget;
-+
-+class OptionsTabStatusPep : public OptionsTab
-+{
-+	Q_OBJECT
-+
-+public:
-+
-+	OptionsTabStatusPep(QObject *parent);
-+	~OptionsTabStatusPep();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	void setData(PsiCon *psi, QWidget *);
-+
-+protected slots:
-+	void controllerSelected(bool);
-+
-+private:
-+	QWidget *w_;
-+	PsiCon *psi_;
-+	QStringList blackList_;
-+	QString tuneFilters_;
-+	bool controllersChanged_;
-+};
-+
-+
-+#endif // OPT_STAUSPEP_H
---- git.orig/src/options/opt_statuspep.ui
-+++ git/src/options/opt_statuspep.ui
-@@ -0,0 +1,108 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptStatusPep</class>
-+ <widget class="QWidget" name="OptStatusPep">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>588</width>
-+    <height>350</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Form</string>
-+  </property>
-+  <property name="autoFillBackground">
-+   <bool>false</bool>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-+      <string>Tunes</string>
-+     </property>
-+     <property name="alignment">
-+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+     </property>
-+     <property name="flat">
-+      <bool>false</bool>
-+     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout_4">
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item>
-+       <widget class="QLabel" name="label">
-+        <property name="text">
-+         <string>Enter media file extensions to ignore them on tune sending</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QLineEdit" name="tuneExtensions">
-+        <property name="toolTip">
-+         <string>Add extensions</string>
-+        </property>
-+        <property name="whatsThis">
-+         <string>Ignored media file extensions on psi tunes sending</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QGroupBox" name="rightGroupBox">
-+        <property name="sizePolicy">
-+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-+          <horstretch>0</horstretch>
-+          <verstretch>0</verstretch>
-+         </sizepolicy>
-+        </property>
-+        <property name="title">
-+         <string>Tune Controllers</string>
-+        </property>
-+        <property name="flat">
-+         <bool>false</bool>
-+        </property>
-+        <layout class="QVBoxLayout" name="verticalLayout_2">
-+         <property name="spacing">
-+          <number>0</number>
-+         </property>
-+         <property name="sizeConstraint">
-+          <enum>QLayout::SetDefaultConstraint</enum>
-+         </property>
-+         <property name="margin">
-+          <number>6</number>
-+         </property>
-+         <item>
-+          <layout class="QGridLayout" name="gridLayout"/>
-+         </item>
-+        </layout>
-+       </widget>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <spacer name="verticalSpacer">
-+     <property name="orientation">
-+      <enum>Qt::Vertical</enum>
-+     </property>
-+     <property name="sizeHint" stdset="0">
-+      <size>
-+       <width>20</width>
-+       <height>40</height>
-+      </size>
-+     </property>
-+    </spacer>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -29,7 +29,7 @@ pep {
- 	DEFINES += USE_PEP
- 	CONFIG += tc_psifile
- 	mac { CONFIG += tc_itunes }
--	windows { CONFIG += tc_winamp }
-+	windows { CONFIG += tc_aimp tc_winamp }
- 	unix:dbus:!mac { CONFIG += tc_mpris }
- }
- include($$PWD/tools/tunecontroller/tunecontroller.pri)
---- git.orig/src/tools/tunecontroller/aimptunecontroller.cpp
-+++ git/src/tools/tunecontroller/aimptunecontroller.cpp
-@@ -0,0 +1,138 @@
-+/*
-+ * aimptunecontroller.cpp
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "aimptunecontroller.h"
-+#include "plugins/aimp/third-party/AIMPSDKCommon.h"
-+#include "plugins/aimp/third-party/AIMPSDKRemote.h"
-+
-+/**
-+ * \class AimpTuneController
-+ * \brief A controller class for AIMP3 player.
-+ */
-+
-+static const int PLAYING = 2;
-+static const int STOPPED = 0;
-+static const WCHAR* AIMP_REMOTE_CLASS = (WCHAR *)L"AIMP2_RemoteInfo";
-+
-+AimpTuneController::AimpTuneController()
-+: PollingTuneController(),
-+  _tuneSent(false)
-+{
-+	startPoll();
-+}
-+
-+HWND AimpTuneController::findAimp() const
-+{
-+	return FindWindow(AIMP_REMOTE_CLASS, AIMP_REMOTE_CLASS);
-+}
-+
-+int AimpTuneController::getAimpStatus(const HWND &aimp) const
-+{
-+	if (aimp) {
-+		return (int)SendMessage(aimp, WM_AIMP_PROPERTY, AIMP_RA_PROPERTY_PLAYER_STATE | AIMP_RA_PROPVALUE_GET, 0);
-+	}
-+	return STOPPED;
-+}
-+
-+void AimpTuneController::check()
-+{
-+	HWND aimp = findAimp();
-+	if (getAimpStatus(aimp) == PLAYING) {
-+		sendTune(getTune());
-+	}
-+	else {
-+		clearTune();
-+	}
-+	PollingTuneController::check();
-+}
-+
-+Tune AimpTuneController::currentTune() const
-+{
-+	return _currentTune;
-+}
-+
-+Tune AimpTuneController::getTune() const
-+{
-+	HANDLE aFile=OpenFileMapping(FILE_MAP_READ, TRUE, AIMP_REMOTE_CLASS);
-+	TAIMPFileInfo *aInfo=(TAIMPFileInfo *)MapViewOfFile(aFile, FILE_MAP_READ, 0, 0, AIMPRemoteAccessMapFileSize);
-+	if (aInfo != NULL) {
-+		wchar_t *str = (wchar_t *)((char*)aInfo + aInfo->StructSize);
-+		QString album = QString::fromWCharArray(str, aInfo->AlbumLength);
-+		str += aInfo->AlbumLength;
-+		QString artist = QString::fromWCharArray(str, aInfo->ArtistLength);
-+		str += aInfo->ArtistLength + aInfo->DateLength;
-+		QString url = QString::fromWCharArray(str, aInfo->FileNameLength);
-+		str += aInfo->FileNameLength + aInfo->GenreLength;
-+		QString title = QString::fromWCharArray(str, aInfo->TitleLength);
-+		unsigned long trackNumber = aInfo->TrackNumber;
-+		unsigned long time = aInfo->Duration;
-+		Tune tune = Tune();
-+		if (!url.isEmpty()) {
-+			if (!title.isEmpty()) {
-+				tune.setName(title);
-+			}
-+			else {
-+				int index = url.replace("/", "\\").lastIndexOf("\\");
-+				if (index > 0) {
-+					QString filename = url.right(url.length()-index-1);
-+					index = filename.lastIndexOf(".");
-+					title = (index > 0) ? filename.left(index) : filename;
-+				}
-+				else {
-+					title = url;
-+				}
-+				tune.setName(title);
-+			}
-+			if (trackNumber > 0) {
-+				tune.setTrack(QString::number(trackNumber));
-+			}
-+			if (time > 0) {
-+				tune.setTime((uint)time);
-+			}
-+			if (!artist.isEmpty()) {
-+				tune.setArtist(artist);
-+			}
-+			if (!album.isEmpty()) {
-+				tune.setAlbum(album);
-+			}
-+			tune.setURL(url);
-+		}
-+		return tune;
-+	}
-+	UnmapViewOfFile(aInfo);
-+	CloseHandle(aFile);
-+	return Tune();
-+}
-+
-+void AimpTuneController::sendTune(const Tune &tune)
-+{
-+	if (tune != _currentTune && !tune.isNull()) {
-+		_currentTune = tune;
-+		_tuneSent = true;
-+	}
-+}
-+
-+void AimpTuneController::clearTune()
-+{
-+	if (_tuneSent) {
-+		_currentTune = Tune();
-+		_tuneSent = false;
-+	}
-+}
---- git.orig/src/tools/tunecontroller/aimptunecontroller.h
-+++ git/src/tools/tunecontroller/aimptunecontroller.h
-@@ -0,0 +1,51 @@
-+/*
-+ * aimptunecontroller.h
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef AIMPTUNECONTROLLER_H
-+#define AIMPTUNECONTROLLER_H
-+
-+#include "pollingtunecontroller.h"
-+#include "tune.h"
-+#include "windows.h"
-+
-+class AimpTuneController : public PollingTuneController
-+{
-+	Q_OBJECT
-+
-+public:
-+	AimpTuneController();
-+	Tune currentTune() const;
-+
-+protected slots:
-+	void check();
-+
-+private:
-+	Tune getTune() const;
-+	HWND findAimp() const;
-+	int getAimpStatus(const HWND &aimp) const;
-+	void sendTune(const Tune &tune);
-+	void clearTune();
-+
-+private:
-+	Tune _currentTune;
-+	bool _tuneSent;
-+};
-+
-+#endif
---- git.orig/src/tools/tunecontroller/itunestunecontroller.cpp
-+++ git/src/tools/tunecontroller/itunestunecontroller.cpp
-@@ -0,0 +1,113 @@
-+/*
-+ * itunescontroller.cpp 
-+ * Copyright (C) 2006  Remko Troncon
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QtGlobal>
-+#include <QString>
-+#include <QTime>
-+#include <QDebug>
-+
-+#include <CoreFoundation/CoreFoundation.h>
-+
-+#include "itunestunecontroller.h"
-+
-+/**
-+ * \class ITunesController
-+ * \brief A controller for the Mac OS X version of iTunes.
-+ */
-+
-+static QString CFStringToQString(CFStringRef s)
-+{
-+	QString result;
-+
-+	if (s != NULL) {
-+		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
-+		char* buffer = new char[length];
-+		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
-+			result = QString::fromUtf8(buffer);
-+		}
-+		else {
-+			qWarning("itunesplayer.cpp: CFString conversion failed.");
-+		}
-+		delete[] buffer;
-+	} 
-+    return result;
-+}
-+
-+
-+ITunesController::ITunesController()
-+{
-+	// TODO: Poll iTunes for current playing tune
-+	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
-+	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
-+}
-+
-+ITunesController::~ITunesController()
-+{
-+	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
-+	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
-+}
-+
-+Tune ITunesController::currentTune() const
-+{
-+	return currentTune_;
-+}
-+
-+void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
-+{
-+	Tune tune;
-+	ITunesController* controller = (ITunesController*) observer;
-+	
-+	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
-+	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Paused";
-+		emit controller->stopped();
-+	}
-+	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Stopped";
-+		emit controller->stopped();
-+	}
-+	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Playing";
-+		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
-+		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
-+		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
-+		
-+		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
-+		if (cf_track) {
-+			int tracknr;
-+			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
-+				qWarning("itunesplayer.cpp: Number value conversion failed.");
-+			}
-+			tune.setTrack(QString::number(tracknr));
-+		}
-+		
-+		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
-+		int time = 0;
-+		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
-+			qWarning("itunesplayer.cpp: Number value conversion failed.");
-+		}
-+		tune.setTime((unsigned int) (time / 1000));
-+		controller->currentTune_ = tune;
-+		emit controller->playing(tune);
-+	}
-+	else {
-+		qWarning("itunesplayer.cpp: Unknown state.");
-+	}
-+}
---- git.orig/src/tools/tunecontroller/itunestunecontroller.h
-+++ git/src/tools/tunecontroller/itunestunecontroller.h
-@@ -0,0 +1,22 @@
-+#ifndef ITUNESTUNECONTROLLER_H
-+#define ITUNESTUNECONTROLLER_H
-+
-+#include <QString>
-+#include <CoreFoundation/CoreFoundation.h>
-+
-+#include "tunecontrollerinterface.h"
-+
-+class ITunesController : public TuneController
-+{
-+public:
-+	ITunesController();
-+	~ITunesController();
-+
-+	virtual Tune currentTune() const;
-+
-+private:
-+	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
-+	Tune currentTune_;
-+};
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
-+++ git/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
-@@ -0,0 +1,56 @@
-+/*
-+ * aimpplugin.cpp
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef QT_STATICPLUGIN
-+#define QT_STATICPLUGIN
-+#endif
-+
-+#include <QtCore>
-+#include <QObject>
-+#include <QString>
-+
-+#include "aimptunecontroller.h"
-+#include "tunecontrollerplugin.h"
-+
-+class AIMPPlugin : public QObject, public TuneControllerPlugin
-+{
-+
-+	Q_OBJECT
-+
-+	Q_INTERFACES(TuneControllerPlugin)
-+
-+public:
-+	virtual QString name();
-+	virtual TuneController* createController();
-+};
-+
-+Q_EXPORT_PLUGIN2(aimpplugin, AIMPPlugin);
-+
-+QString AIMPPlugin::name()
-+{
-+	return "AIMP3";
-+}
-+
-+TuneController* AIMPPlugin::createController()
-+{
-+    return new AimpTuneController();
-+}
-+
-+#include "aimpplugin.moc"
---- git.orig/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKCommon.h
-+++ git/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKCommon.h
-@@ -0,0 +1,50 @@
-+/* ******************************************** */
-+/*                                              */
-+/*                AIMP Plugins API              */
-+/*             v3.00.960 (01.12.2011)           */
-+/*                Common Objects                */
-+/*                                              */
-+/*              (c) Artem Izmaylov              */
-+/*                 www.aimp.ru                  */
-+/*             Mail: artem@aimp.ru              */
-+/*              ICQ: 345-908-513                */
-+/*                                              */
-+/* ******************************************** */
-+
-+#ifndef AIMPSDKCommonH
-+#define AIMPSDKCommonH
-+
-+#include <windows.h>
-+#include <unknwn.h>
-+
-+#pragma pack(push, 1)
-+struct TAIMPFileInfo
-+{
-+	DWORD StructSize;
-+	//
-+	BOOL  Active;
-+	DWORD BitRate;
-+	DWORD Channels;
-+	DWORD Duration;
-+	INT64 FileSize;
-+	DWORD Rating;
-+	DWORD SampleRate;
-+	DWORD TrackNumber;
-+	//
-+	DWORD AlbumLength;
-+	DWORD ArtistLength;
-+	DWORD DateLength;
-+	DWORD FileNameLength;
-+	DWORD GenreLength;
-+	DWORD TitleLength;
-+	//
-+	PWCHAR Album;
-+	PWCHAR Artist;
-+	PWCHAR Date;
-+	PWCHAR FileName;
-+	PWCHAR Genre;
-+	PWCHAR Title;
-+};
-+#pragma pack(pop)
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKRemote.h
-+++ git/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKRemote.h
-@@ -0,0 +1,37 @@
-+/* ******************************************** */
-+/*                                              */
-+/*                AIMP Plugins API              */
-+/*             v3.00.960 (01.12.2011)           */
-+/*                 Remote Access                */
-+/*                                              */
-+/*              (c) Artem Izmaylov              */
-+/*                 www.aimp.ru                  */
-+/*             Mail: artem@aimp.ru              */
-+/*              ICQ: 345-908-513                */
-+/*                                              */
-+/* ******************************************** */
-+
-+/*
-+** This AIMP SDK file (AIMPSDKRemote.h) was changed specially for Psi+ aimptunecontroller
-+** Unused methods, comments and structures was removed from this file
-+** Do not use it in another projects
-+*/
-+
-+#ifndef AIMPSDKRemoteH
-+#define AIMPSDKRemoteH
-+
-+#include <windows.h>
-+
-+const char AIMPRemoteAccessClass[] = "AIMP2_RemoteInfo";
-+const int  AIMPRemoteAccessMapFileSize = 2048;
-+const int WM_AIMP_PROPERTY = WM_USER + 0x77;
-+const int AIMP_RA_PROPVALUE_GET = 0;
-+const int AIMP_RA_PROPERTY_MASK = 0xFFFFFFF0;
-+// !! ReadOnly
-+// Returns current player state
-+//  0 = Stopped
-+//  1 = Paused
-+//  2 = Playing
-+const int AIMP_RA_PROPERTY_PLAYER_STATE = 0x40;
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
-+++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
-@@ -1,113 +0,0 @@
--/*
-- * itunescontroller.cpp 
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include <QtGlobal>
--#include <QString>
--#include <QTime>
--#include <QDebug>
--
--#include <CoreFoundation/CoreFoundation.h>
--
--#include "itunescontroller.h"
--
--/**
-- * \class ITunesController
-- * \brief A controller for the Mac OS X version of iTunes.
-- */
--
--static QString CFStringToQString(CFStringRef s)
--{
--	QString result;
--
--	if (s != NULL) {
--		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
--		char* buffer = new char[length];
--		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
--			result = QString::fromUtf8(buffer);
--		}
--		else {
--			qWarning("itunesplayer.cpp: CFString conversion failed.");
--		}
--		delete[] buffer;
--	} 
--    return result;
--}
--
--
--ITunesController::ITunesController()
--{
--	// TODO: Poll iTunes for current playing tune
--	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
--	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
--}
--
--ITunesController::~ITunesController()
--{
--	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
--	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
--}
--
--Tune ITunesController::currentTune() const
--{
--	return currentTune_;
--}
--
--void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
--{
--	Tune tune;
--	ITunesController* controller = (ITunesController*) observer;
--	
--	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
--	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Paused";
--		emit controller->stopped();
--	}
--	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Stopped";
--		emit controller->stopped();
--	}
--	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Playing";
--		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
--		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
--		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
--		
--		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
--		if (cf_track) {
--			int tracknr;
--			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
--				qWarning("itunesplayer.cpp: Number value conversion failed.");
--			}
--			tune.setTrack(QString::number(tracknr));
--		}
--		
--		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
--		int time = 0;
--		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
--			qWarning("itunesplayer.cpp: Number value conversion failed.");
--		}
--		tune.setTime((unsigned int) (time / 1000));
--		controller->currentTune_ = tune;
--		emit controller->playing(tune);
--	}
--	else {
--		qWarning("itunesplayer.cpp: Unknown state.");
--	}
--}
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
-+++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
-@@ -1,22 +0,0 @@
--#ifndef ITUNESCONTROLLER_H
--#define ITUNESCONTROLLER_H
--
--#include <QString>
--#include <CoreFoundation/CoreFoundation.h>
--
--#include "tunecontrollerinterface.h"
--
--class ITunesController : public TuneController
--{
--public:
--	ITunesController();
--	~ITunesController();
--
--	virtual Tune currentTune() const;
--
--private:
--	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
--	Tune currentTune_;
--};
--
--#endif
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
-+++ git/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
-@@ -26,7 +26,7 @@
- #include <QObject>
- #include <QString>
- 
--#include "itunescontroller.h"
-+#include "itunestunecontroller.h"
- #include "tunecontrollerplugin.h"
- 
- class ITunesPlugin : public QObject, public TuneControllerPlugin
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
-+++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
-@@ -1,197 +0,0 @@
--/*
-- * winampcontroller.cpp 
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include <windows.h>
--
--#ifdef Q_CC_MSVC
--#pragma warning(push)
--#pragma warning(disable: 4100)
--#endif
--
--// this file generates eight C4100 warnings, when compiled with MSVC2003
--#include "third-party/wa_ipc.h"
--
--#ifdef Q_CC_MSVC
--#pragma warning(pop)
--#endif
--
--#include "winampcontroller.h"
--
--
--/**
-- * \class WinAmpController
-- * \brief A controller for WinAmp.
-- */
--
--static const int NormInterval = 3000;
--static const int AntiscrollInterval = 100;
--
--/**
-- * \brief Constructs the controller.
-- */
--WinAmpController::WinAmpController()
--: PollingTuneController(),
--  antiscrollCounter_(0)
--{
--	startPoll();
--	setInterval(NormInterval);
--}
--
--template <typename char_type> const size_t length (const char_type * begin)
--{
--	const char_type * end = begin;
--	for (; *end; ++end);
--	return end - begin;
--}
--
--// Returns a title of a track currently being played by WinAmp with given HWND (passed in waWnd)
--QPair<bool, QString> WinAmpController::getTrackTitle(const HWND &waWnd) const
--{
--	TCHAR waTitle[2048];
--	QString title;
--
--	// Get WinAmp window title. It always contains name of the track
--	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
--	// Now, waTitle contains WinAmp window title
--	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
--	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
--		// request to be called again soon.
--		return QPair<bool, QString>(false, QString());
--	}
--
--	// Check whether there is a need to do the all stuff
--	if (!title.length()) {
--		return QPair<bool, QString>(true,title);
--	}
--
--	QString winamp (" - Winamp ***");
--	int winampLength = winamp.length();
--
--	// Is title scrolling on the taskbar enabled?
--	title += title + title;
--	int waLast = title.indexOf (winamp, -1);
--	if (waLast != -1) {
--		if (title.length()) {
--			title.remove (waLast, title.length () - waLast);
--		}
--		int waFirst;
--		while ((waFirst = title.indexOf (winamp)) != -1) {
--			title.remove (0, waFirst + winampLength);
--		}
--	}
--	else {
--		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
--	}
--
--	// Remove leading and trailing spaces
--	title  = title.trimmed();
--
--	// Remove trailing " - Winamp" from title
--	if (title.length ()) {
--		winamp = " - Winamp";
--		winampLength = winamp.length ();
--		int waFirst = title.indexOf (winamp);
--		if (waFirst != -1)
--		{
--			title.remove (waFirst, waFirst + winampLength);
--		}
--	}
--
--	// Remove track number from title
--	if (title.length ()) {
--		QString dot(". ");
--		int dotFirst = title.indexOf (dot);
--		if (dotFirst != -1) {
--			// All symbols before the dot are digits?
--			bool allDigits = true;
--			for (int pos = dotFirst; pos > 0; --pos) {
--				allDigits = allDigits && title[pos].isNumber();
--			}
--			if (allDigits) {
--				title.remove(0, dotFirst + dot.length ());
--			}
--		}
--	}
--
--	// Remove leading and trailing spaces
--	if (title.length ()) {
--		while (title.length () && title[0] == ' ') {
--			title.remove (0, 1);
--		}
--		while (title.length () && title[title.length () - 1] == ' ') {
--			title.remove (title.length () - 1, 1);
--		}
--	}
--
--	return QPair<bool, QString>(true,title);
--}
--
--
--/**
-- * Polls for new song info.
-- */
--void WinAmpController::check()
--{
--
--	Tune tune;
--#ifdef UNICODE
--	HWND h = FindWindow(L"Winamp v1.x", NULL);
--#else
--	HWND h = FindWindow("Winamp v1.x", NULL);
--#endif
--	if (h && SendMessage(h, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
--		tune = getTune(h);
--	}
--	prevTune_ = tune;
--	setInterval(NormInterval);
--	PollingTuneController::check();
--}
--
--Tune WinAmpController::getTune(const HWND &hWnd)
--{
--	Tune tune = Tune();
--	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
--	if (position != -1) {
--		if (hWnd && SendMessage(hWnd,WM_WA_IPC,0,IPC_ISPLAYING) == 1) {
--			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
--			if (!trackpair.first) {
--				// getTrackTitle wants us to retry in a few ms...
--				int interval = AntiscrollInterval;
--				if (++antiscrollCounter_ > 10) {
--					antiscrollCounter_ = 0;
--					interval = NormInterval;
--				}
--				setInterval(interval);
--				return Tune();
--			}
--			antiscrollCounter_ = 0;
--			tune.setName(trackpair.second);
--			tune.setURL(trackpair.second);
--			tune.setTrack(QString::number(position + 1));
--			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
--		}
--	}
--	return tune;
--}
--
--Tune WinAmpController::currentTune() const
--{
--	return prevTune_;
--}
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
-+++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
-@@ -1,48 +0,0 @@
--/*
-- * winampcontroller.h
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#ifndef WINAMPCONTROLLER_H
--#define WINAMPCONTROLLER_H
--
--#include "pollingtunecontroller.h"
--
--#include <windows.h>
--#include <QPair>
--
--class WinAmpController : public PollingTuneController
--{
--	Q_OBJECT
--public:
--	WinAmpController();
--	virtual Tune currentTune() const;
--
--private:
--	Tune getTune(const HWND &hWnd);
--	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
--
--protected slots:
--	void check();
--
--private:
--	Tune prevTune_;
--	int antiscrollCounter_;
--};
--
--#endif
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
-+++ git/src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
-@@ -28,7 +28,7 @@ QString WinAmpPlugin::name()
- 
- TuneController* WinAmpPlugin::createController() 
- {
--	return new WinAmpController();
-+	return new WinAmpTuneController();
- }
- 
- Q_EXPORT_PLUGIN2(winampplugin, WinAmpPlugin);
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampplugin.h
-+++ git/src/tools/tunecontroller/plugins/winamp/winampplugin.h
-@@ -29,7 +29,7 @@
- #include <QObject>
- #include <QString>
- 
--#include "winampcontroller.h"
-+#include "winamptunecontroller.h"
- #include "tunecontrollerplugin.h"
- 
- class WinAmpPlugin : public QObject, public TuneControllerPlugin
---- git.orig/src/tools/tunecontroller/tunecontrollermanager.cpp
-+++ git/src/tools/tunecontroller/tunecontrollermanager.cpp
-@@ -164,6 +164,10 @@ Q_IMPORT_PLUGIN(itunesplugin)
- Q_IMPORT_PLUGIN(winampplugin)
- #endif
- 
-+#ifdef TC_AIMP
-+Q_IMPORT_PLUGIN(aimpplugin)
-+#endif
-+
- #ifdef TC_PSIFILE
- Q_IMPORT_PLUGIN(psifileplugin)
- #endif
---- git.orig/src/tools/tunecontroller/tunecontroller.pri
-+++ git/src/tools/tunecontroller/tunecontroller.pri
-@@ -25,10 +25,10 @@ tc_itunes {
- 		INCLUDEPATH += $$ITUNES_PLUGIN_PATH
- 
- 		HEADERS += \
--			$$ITUNES_PLUGIN_PATH/itunescontroller.h 
-+			$$PWD/itunestunecontroller.h 
- 			
- 		SOURCES += \
--			$$ITUNES_PLUGIN_PATH/itunescontroller.cpp \
-+			$$PWD/itunestunecontroller.cpp \
- 			$$ITUNES_PLUGIN_PATH/itunesplugin.cpp
- 
- 		QMAKE_LFLAGS += -framework CoreFoundation
-@@ -42,11 +42,11 @@ tc_winamp {
- 	INCLUDEPATH += $$WINAMP_PLUGIN_PATH
- 
- 	HEADERS += \
--		$$WINAMP_PLUGIN_PATH/winampcontroller.h \
-+		$$PWD/winamptunecontroller.h \
- 		$$WINAMP_PLUGIN_PATH/winampplugin.h 
- 		
- 	SOURCES += \
--		$$WINAMP_PLUGIN_PATH/winampcontroller.cpp \
-+		$$PWD/winamptunecontroller.cpp \
- 		$$WINAMP_PLUGIN_PATH/winampplugin.cpp
- 	
- 	LIBS += -lUser32
-@@ -78,3 +78,17 @@ tc_mpris {
- 		$$PWD/mpristunecontroller.cpp \
- 		$$MPRIS_PLUGIN_PATH/mprisplugin.cpp
- }
-+
-+#AIMP
-+tc_aimp {
-+	DEFINES += TC_AIMP
-+	AIMP_PLUGIN_PATH = $$PWD/plugins/aimp
-+	INCLUDEPATH += $$AIMP_PLUGIN_PATH
-+
-+	HEADERS += \
-+		$$PWD/aimptunecontroller.h
-+
-+	SOURCES += \
-+		$$PWD/aimptunecontroller.cpp \
-+		$$AIMP_PLUGIN_PATH/aimpplugin.cpp
-+}
---- git.orig/src/tools/tunecontroller/winamptunecontroller.cpp
-+++ git/src/tools/tunecontroller/winamptunecontroller.cpp
-@@ -0,0 +1,197 @@
-+/*
-+ * winamptunecontroller.cpp
-+ * Copyright (C) 2006  Remko Troncon
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <windows.h>
-+
-+#ifdef Q_CC_MSVC
-+#pragma warning(push)
-+#pragma warning(disable: 4100)
-+#endif
-+
-+// this file generates eight C4100 warnings, when compiled with MSVC2003
-+#include "plugins/winamp/third-party/wa_ipc.h"
-+
-+#ifdef Q_CC_MSVC
-+#pragma warning(pop)
-+#endif
-+
-+#include "winamptunecontroller.h"
-+
-+
-+/**
-+ * \class WinAmpTuneController
-+ * \brief A controller for WinAmp.
-+ */
-+
-+static const int NormInterval = 3000;
-+static const int AntiscrollInterval = 100;
-+
-+/**
-+ * \brief Constructs the controller.
-+ */
-+WinAmpTuneController::WinAmpTuneController()
-+: PollingTuneController(),
-+  antiscrollCounter_(0)
-+{
-+	startPoll();
-+	setInterval(NormInterval);
-+}
-+
-+template <typename char_type> const size_t length (const char_type * begin)
-+{
-+	const char_type * end = begin;
-+	for (; *end; ++end);
-+	return end - begin;
-+}
-+
-+// Returns a title of a track currently being played by WinAmp with given HWND (passed in waWnd)
-+QPair<bool, QString> WinAmpTuneController::getTrackTitle(const HWND &waWnd) const
-+{
-+	TCHAR waTitle[2048];
-+	QString title;
-+
-+	// Get WinAmp window title. It always contains name of the track
-+	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
-+	// Now, waTitle contains WinAmp window title
-+	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
-+	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
-+		// request to be called again soon.
-+		return QPair<bool, QString>(false, QString());
-+	}
-+
-+	// Check whether there is a need to do the all stuff
-+	if (!title.length()) {
-+		return QPair<bool, QString>(true,title);
-+	}
-+
-+	QString winamp (" - Winamp ***");
-+	int winampLength = winamp.length();
-+
-+	// Is title scrolling on the taskbar enabled?
-+	title += title + title;
-+	int waLast = title.indexOf (winamp, -1);
-+	if (waLast != -1) {
-+		if (title.length()) {
-+			title.remove (waLast, title.length () - waLast);
-+		}
-+		int waFirst;
-+		while ((waFirst = title.indexOf (winamp)) != -1) {
-+			title.remove (0, waFirst + winampLength);
-+		}
-+	}
-+	else {
-+		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
-+	}
-+
-+	// Remove leading and trailing spaces
-+	title  = title.trimmed();
-+
-+	// Remove trailing " - Winamp" from title
-+	if (title.length ()) {
-+		winamp = " - Winamp";
-+		winampLength = winamp.length ();
-+		int waFirst = title.indexOf (winamp);
-+		if (waFirst != -1)
-+		{
-+			title.remove (waFirst, waFirst + winampLength);
-+		}
-+	}
-+
-+	// Remove track number from title
-+	if (title.length ()) {
-+		QString dot(". ");
-+		int dotFirst = title.indexOf (dot);
-+		if (dotFirst != -1) {
-+			// All symbols before the dot are digits?
-+			bool allDigits = true;
-+			for (int pos = dotFirst; pos > 0; --pos) {
-+				allDigits = allDigits && title[pos].isNumber();
-+			}
-+			if (allDigits) {
-+				title.remove(0, dotFirst + dot.length ());
-+			}
-+		}
-+	}
-+
-+	// Remove leading and trailing spaces
-+	if (title.length ()) {
-+		while (title.length () && title[0] == ' ') {
-+			title.remove (0, 1);
-+		}
-+		while (title.length () && title[title.length () - 1] == ' ') {
-+			title.remove (title.length () - 1, 1);
-+		}
-+	}
-+
-+	return QPair<bool, QString>(true,title);
-+}
-+
-+
-+/**
-+ * Polls for new song info.
-+ */
-+void WinAmpTuneController::check()
-+{
-+
-+	Tune tune;
-+#ifdef UNICODE
-+	HWND h = FindWindow(L"Winamp v1.x", NULL);
-+#else
-+	HWND h = FindWindow("Winamp v1.x", NULL);
-+#endif
-+	if (h && SendMessage(h, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
-+		tune = getTune(h);
-+	}
-+	prevTune_ = tune;
-+	setInterval(NormInterval);
-+	PollingTuneController::check();
-+}
-+
-+Tune WinAmpTuneController::getTune(const HWND &hWnd)
-+{
-+	Tune tune = Tune();
-+	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
-+	if (position != -1) {
-+		if (hWnd && SendMessage(hWnd,WM_WA_IPC,0,IPC_ISPLAYING) == 1) {
-+			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
-+			if (!trackpair.first) {
-+				// getTrackTitle wants us to retry in a few ms...
-+				int interval = AntiscrollInterval;
-+				if (++antiscrollCounter_ > 10) {
-+					antiscrollCounter_ = 0;
-+					interval = NormInterval;
-+				}
-+				setInterval(interval);
-+				return Tune();
-+			}
-+			antiscrollCounter_ = 0;
-+			tune.setName(trackpair.second);
-+			tune.setURL(trackpair.second);
-+			tune.setTrack(QString::number(position + 1));
-+			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
-+		}
-+	}
-+	return tune;
-+}
-+
-+Tune WinAmpTuneController::currentTune() const
-+{
-+	return prevTune_;
-+}
---- git.orig/src/tools/tunecontroller/winamptunecontroller.h
-+++ git/src/tools/tunecontroller/winamptunecontroller.h
-@@ -0,0 +1,48 @@
-+/*
-+ * winamptunecontroller.h
-+ * Copyright (C) 2006  Remko Troncon
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef WINAMPTUNECONTROLLER_H
-+#define WINAMPTUNECONTROLLER_H
-+
-+#include "pollingtunecontroller.h"
-+
-+#include <windows.h>
-+#include <QPair>
-+
-+class WinAmpTuneController : public PollingTuneController
-+{
-+	Q_OBJECT
-+public:
-+	WinAmpTuneController();
-+	virtual Tune currentTune() const;
-+
-+private:
-+	Tune getTune(const HWND &hWnd);
-+	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
-+
-+protected slots:
-+	void check();
-+
-+private:
-+	Tune prevTune_;
-+	int antiscrollCounter_;
-+};
-+
-+#endif

psi-plus-main-20130107.tar.xz/patches/1240-psi-fix-psitooltiphandler.diff Deleted

@@ -1,47 +0,0 @@
---- git.orig/src/widgets/psitooltip.cpp
-+++ git/src/widgets/psitooltip.cpp
-@@ -40,7 +40,6 @@ class PsiToolTipHandler : public QObject
- public:
- 	static PsiToolTipHandler *getInstance()
- 	{
--		static PsiToolTipHandler *instance = 0;
- 		if (!instance)
- 			instance = new PsiToolTipHandler();
- 			
-@@ -49,8 +48,10 @@ public:
- 
- 	void install(QWidget *widget)
- 	{
-+		if(!watchedWidgets_.contains(widget)) {
-+			connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
-+		}
- 		watchedWidgets_[widget] = true;
--		connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
- 	}
- 
- private slots:
-@@ -58,10 +59,15 @@ private slots:
- 	{
- 		QWidget* widget = static_cast<QWidget*>(obj);
- 		watchedWidgets_.remove(widget);
-+		if(watchedWidgets_.isEmpty()) {
-+			instance->deleteLater();
-+			instance = 0;
-+		}
- 	}
- 
- private:
- 	QHash<QWidget*, bool> watchedWidgets_;
-+	static PsiToolTipHandler *instance;
- 
- 	PsiToolTipHandler()
- 		: QObject(qApp)
-@@ -87,6 +93,8 @@ private:
- 	}
- };
- 
-+PsiToolTipHandler* PsiToolTipHandler::instance = 0;
-+
- //----------------------------------------------------------------------------
- // ToolTipPosition
- //----------------------------------------------------------------------------

psi-plus-main-20130107.tar.xz/patches/1250-psi-options-reset-button.diff Deleted

@@ -1,124 +0,0 @@
---- git.orig/src/psioptions.cpp
-+++ git/src/psioptions.cpp
-@@ -334,6 +334,42 @@ void PsiOptions::getOptionsStorage_finis
- 	}
- }
- 
-+/**
-+ * Reset node \a name to default value
-+ * \return Nothing
-+ */
-+void PsiOptions::resetOption(const QString &name)
-+{
-+	defaults(); // to init defaults_
-+	QStringList nodes = getChildOptionNames(name);
-+
-+	if (!isInternalNode(name)) {
-+		const QVariant &dev = defaults_->getOption(name);
-+		if (!dev.isValid()) { // don't touch non exist nodes
-+			return;
-+		}
-+		const QVariant &prev = getOption(name);
-+		if (prev == dev) { // do nothing if values is identical
-+			return;
-+		}
-+		setOption(name, dev);
-+	}
-+	else { // internal node
-+		foreach(QString node, nodes) {
-+			const QVariant &dev = defaults_->getOption(node);
-+			if (!dev.isValid()) {
-+				continue;
-+			}
-+			const QVariant &prev = getOption(node);
-+			if (prev == dev) {
-+				continue;
-+			}
-+			setOption(node, dev);
-+		}
-+	}
-+}
-+
-+
- PsiOptions* PsiOptions::instance_ = NULL;
- PsiOptions* PsiOptions::defaults_ = NULL;
- 
---- git.orig/src/psioptions.h
-+++ git/src/psioptions.h
-@@ -47,6 +47,7 @@ public:
- 	bool newProfile();
- 	bool save(QString file);
- 	void autoSave(bool autoSave, QString autoFile = "");
-+	void resetOption(const QString &name);
- 
- // don't call this normally
- 	PsiOptions();
---- git.orig/src/psioptionseditor.cpp
-+++ git/src/psioptionseditor.cpp
-@@ -159,11 +159,13 @@ PsiOptionsEditor::PsiOptionsEditor(QWidg
- 
- 	buttonLine->addStretch(1);
- 
--	if (1) { // FIXME
--		pb_delete = new QPushButton(tr("Delete"), this);
--		buttonLine->addWidget(pb_delete);
--		connect(pb_delete, SIGNAL(clicked()), SLOT(deleteit()));
--	}
-+	pb_delete = new QPushButton(tr("Delete..."), this);
-+	buttonLine->addWidget(pb_delete);
-+	connect(pb_delete, SIGNAL(clicked()), SLOT(deleteit()));
-+
-+	pb_reset = new QPushButton(tr("Reset..."), this);
-+	buttonLine->addWidget(pb_reset);
-+	connect(pb_reset, SIGNAL(clicked()), SLOT(resetit()));
- 	
- 	pb_edit = new QPushButton(tr("Edit..."), this);
- 	buttonLine->addWidget(pb_edit);
-@@ -273,12 +275,28 @@ void PsiOptionsEditor::deleteit()
- 		sub = true;
- 		confirm = tr("Really delete all options starting with %1.?");
- 	}
--	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi: Option Editor"),
-+	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi+: Option Editor"),
-                    confirm.arg(option), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel)) {
- 		PsiOptions::instance()->removeOption( option, sub);
- 	}
- }
- 
-+void PsiOptionsEditor::resetit()
-+{
-+	QModelIndex idx = tv_->currentIndex();
-+	QString option = tm_->indexToOptionName(idx);
-+	bool sub = false;
-+	QString confirm = tr("Really reset options %1 to default value?");
-+	if (o_->isInternalNode(option)) {
-+		sub = true;
-+		confirm = tr("Really reset all options starting with %1. to default value?");
-+	}
-+	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi+: Option Editor"),
-+                   confirm.arg(option), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel)) {
-+		PsiOptions::instance()->resetOption(option);
-+	}
-+}
-+
- void PsiOptionsEditor::detach()
- {
- 	new PsiOptionsEditor();
---- git.orig/src/psioptionseditor.h
-+++ git/src/psioptionseditor.h
-@@ -27,6 +27,7 @@ private slots:
- 	void add();
- 	void edit();
- 	void deleteit();
-+	void resetit();
- 	void detach();
- 
- private:
-@@ -39,6 +40,7 @@ private:
- 	QLabel* lb_path;
- 	QLabel* lb_comment;
- 	QPushButton *pb_delete;
-+	QPushButton *pb_reset;
- 	QPushButton *pb_edit;
- 	QPushButton *pb_new;
- 	QToolButton *pb_detach;

psi-plus-main-20130107.tar.xz/patches/1270-psi-fix-pep-retraction.diff Deleted

@@ -1,356 +0,0 @@
---- git.orig/src/activity.cpp
-+++ git/src/activity.cpp
-@@ -84,8 +84,8 @@ bool Activity::isNull() const
- 
- QDomElement Activity::toXml(QDomDocument& doc)
- {
--	QDomElement activity = doc.createElement("activity");
--	activity.setAttribute("xmlns", "http://jabber.org/protocol/activity");
-+	QDomElement activity = doc.createElement(PEP_ACTIVITY_TN);
-+	activity.setAttribute("xmlns", PEP_ACTIVITY_NS);
- 
- 	if (!type() == Unknown) {
- 		ActivityCatalog* ac = ActivityCatalog::instance();
-@@ -98,9 +98,6 @@ QDomElement Activity::toXml(QDomDocument
- 
- 		activity.appendChild(el);
- 	}
--	else {
--		qWarning("activity.cpp: ERROR: Converting unknown activity");
--	}
- 
- 	if (!text().isEmpty()) {
- 		QDomElement el = doc.createElement("text");
-@@ -114,14 +111,17 @@ QDomElement Activity::toXml(QDomDocument
- 
- void Activity::fromXml(const QDomElement& element)
- {
--	if (element.tagName() != "activity")
--		return;
--
- 	type_ = Activity::Unknown;
- 	specificType_ = Activity::UnknownSpecific;
- 
-+	if (element.tagName() != PEP_ACTIVITY_TN)
-+		return;
-+
- 	for (QDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) {
- 		QDomElement child = node.toElement();
-+		if(child.isNull()) {
-+			continue;
-+		}
- 		if (child.tagName() == "text") {
- 			text_ = child.text();
- 		}
---- git.orig/src/activity.h
-+++ git/src/activity.h
-@@ -23,6 +23,9 @@
- 
- #include <QString>
- 
-+#define PEP_ACTIVITY_TN "activity"
-+#define PEP_ACTIVITY_NS "http://jabber.org/protocol/activity"
-+
- class QDomElement;
- class QDomDocument;
- 
---- git.orig/src/activitycatalog.cpp
-+++ git/src/activitycatalog.cpp
-@@ -27,6 +27,8 @@
- 		
- ActivityCatalog::Entry::Entry()
- {
-+	type_ = Activity::Unknown;
-+	specificType_ = Activity::UnknownSpecific;
- }
- 
- ActivityCatalog::Entry::Entry(Activity::Type type, const QString& value, const QString& text)
---- git.orig/src/activitydlg.cpp
-+++ git/src/activitydlg.cpp
-@@ -94,7 +94,7 @@ void ActivityDlg::setActivity()
- 
- 	foreach(PsiAccount *pa, pa_) {
- 		if (generalActivityStr == tr("<unset>")) {
--			pa->pepManager()->retract("http://jabber.org/protocol/activity", "current");
-+			pa->pepManager()->disable(PEP_ACTIVITY_TN, PEP_ACTIVITY_NS, "current");
- 		}
- 		else {
- 			ActivityCatalog* ac = ActivityCatalog::instance();
-@@ -104,7 +104,7 @@ void ActivityDlg::setActivity()
- 			if (specificActivityStr != tr("<unset>")) {
- 				specificType = ac->findEntryByText(specificActivityStr).specificType();
- 			}
--			pa->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+			pa->pepManager()->publish(PEP_ACTIVITY_NS, PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())));
- 		}
- 	}
- 	close();
---- git.orig/src/avatars.cpp
-+++ git/src/avatars.cpp
-@@ -241,7 +241,7 @@ signals:
- 
- protected:
- 	void requestAvatar() {
--		factory()->account()->pepManager()->get(jid_,"urn:xmpp:avatar:data",hash());
-+		factory()->account()->pepManager()->get(jid_,PEP_AVATAR_DATA_NS,hash());
- 	}
- 
- 	void avatarUpdated() 
-@@ -557,20 +557,16 @@ void AvatarFactory::setSelfAvatar(const 
- 			// Publish data
- 			QDomDocument* doc = account()->client()->doc();
- 			QString hash = Hash("sha1").hashToString(avatar_data);
--			QDomElement el = doc->createElement("data");
--			el.setAttribute("xmlns","urn:xmpp:avatar:data");
-+			QDomElement el = doc->createElement(PEP_AVATAR_DATA_TN);
-+			el.setAttribute("xmlns",PEP_AVATAR_DATA_NS);
- 			el.appendChild(doc->createTextNode(Base64().arrayToString(avatar_data)));
- 			selfAvatarData_ = avatar_data;
- 			selfAvatarHash_ = hash;
--			account()->pepManager()->publish("urn:xmpp:avatar:data",PubSubItem(hash,el));
-+			account()->pepManager()->publish(PEP_AVATAR_DATA_NS,PubSubItem(hash,el));
- 		}
- 	}
- 	else {
--		QDomDocument* doc = account()->client()->doc();
--		QDomElement meta_el =  doc->createElement("metadata");
--		meta_el.setAttribute("xmlns","urn:xmpp:avatar:metadata");
--		meta_el.appendChild(doc->createElement("stop"));
--		account()->pepManager()->publish("urn:xmpp:avatar:metadata",PubSubItem("current",meta_el));
-+		account()->pepManager()->disable(PEP_AVATAR_METADATA_TN, PEP_AVATAR_METADATA_NS, "current");
- 	}
- }
- 
-@@ -640,8 +636,8 @@ int AvatarFactory::maxAvatarSize()
- 
- void AvatarFactory::itemPublished(const Jid& jid, const QString& n, const PubSubItem& item)
- {
--	if (n == "urn:xmpp:avatar:data") {
--		if (item.payload().tagName() == "data") {
-+	if (n == PEP_AVATAR_DATA_NS) {
-+		if (item.payload().tagName() == PEP_AVATAR_DATA_TN) {
- 			if (pep_avatars_.contains(jid.bare())) {
- 				pep_avatars_[jid.bare()]->setData(item.id(),item.payload().text());
- 			}
-@@ -650,15 +646,17 @@ void AvatarFactory::itemPublished(const 
- 			qWarning("avatars.cpp: Unexpected item payload");
- 		}
- 	}
--	else if (n == "urn:xmpp:avatar:metadata") {
-+	else if (n == PEP_AVATAR_METADATA_NS) {
- 		if (!pep_avatars_.contains(jid.bare())) {
- 			pep_avatars_[jid.bare()] = new PEPAvatar(this, jid.bare());
- 			connect(pep_avatars_[jid.bare()],SIGNAL(avatarChanged(const Jid&)),this, SLOT(updateAvatar(const Jid&)));
- 		}
-+		// check for the deprecated <stop/> child element
- 		QDomElement e;
- 		bool found;
- 		e = findSubTag(item.payload(), "stop", &found);
--		if (found) {
-+		// if there's a <stop/> element or the <metadata/> element is empty, remove user's avatar
-+		if (found || !item.payload().hasChildNodes()) {
- 			pep_avatars_[jid.bare()]->updateHash("");
- 		}
- 		else {
-@@ -669,12 +667,12 @@ void AvatarFactory::itemPublished(const 
- 
- void AvatarFactory::publish_success(const QString& n, const PubSubItem& item)
- {
--	if (n == "urn:xmpp:avatar:data" && item.id() == selfAvatarHash_) {
-+	if (n == PEP_AVATAR_DATA_NS && item.id() == selfAvatarHash_) {
- 		// Publish metadata
- 		QDomDocument* doc = account()->client()->doc();
- 		QImage avatar_image = QImage::fromData(selfAvatarData_);
--		QDomElement meta_el = doc->createElement("metadata");
--		meta_el.setAttribute("xmlns","urn:xmpp:avatar:metadata");
-+		QDomElement meta_el = doc->createElement(PEP_AVATAR_METADATA_TN);
-+		meta_el.setAttribute("xmlns",PEP_AVATAR_METADATA_NS);
- 		QDomElement info_el = doc->createElement("info");
- 		info_el.setAttribute("id",selfAvatarHash_);
- 		info_el.setAttribute("bytes",avatar_image.numBytes());
-@@ -682,7 +680,7 @@ void AvatarFactory::publish_success(cons
- 		info_el.setAttribute("width",avatar_image.width());
- 		info_el.setAttribute("type",image2type(selfAvatarData_));
- 		meta_el.appendChild(info_el);
--		account()->pepManager()->publish("urn:xmpp:avatar:metadata",PubSubItem(selfAvatarHash_,meta_el));
-+		account()->pepManager()->publish(PEP_AVATAR_METADATA_NS,PubSubItem(selfAvatarHash_,meta_el));
- 	}
- }
- 
---- git.orig/src/avatars.h
-+++ git/src/avatars.h
-@@ -28,6 +28,12 @@
- 
- #include "iconset.h"
- 
-+#define PEP_AVATAR_DATA_TN     "data"
-+#define PEP_AVATAR_DATA_NS     "urn:xmpp:avatar:data"
-+
-+#define PEP_AVATAR_METADATA_TN "metadata"
-+#define PEP_AVATAR_METADATA_NS "urn:xmpp:avatar:metadata"
-+
- class PsiAccount;
- class Avatar;
- class VCardAvatar;
---- git.orig/src/geolocation.cpp
-+++ git/src/geolocation.cpp
-@@ -35,8 +35,8 @@ GeoLocation::GeoLocation(const QDomEleme
- 
- QDomElement GeoLocation::toXml(QDomDocument& doc)
- {
--	QDomElement geoloc = doc.createElement("geoloc");
--	geoloc.setAttribute("xmlns", "http://jabber.org/protocol/geoloc");
-+	QDomElement geoloc = doc.createElement(PEP_GEOLOC_TN);
-+	geoloc.setAttribute("xmlns", PEP_GEOLOC_NS);
- 	
- 	if (alt_.hasValue()) {
- 		QDomElement e = doc.createElement("alt");
-@@ -129,11 +129,14 @@ QDomElement GeoLocation::toXml(QDomDocum
- 
- void GeoLocation::fromXml(const QDomElement& e)
- {
--	if (e.tagName() != "geoloc")
-+	if (e.tagName() != PEP_GEOLOC_TN)
- 		return;
- 
- 	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
- 		QDomElement m = n.toElement();
-+		if (m.isNull()) {
-+			continue;
-+		}
- 		if (m.tagName() == "alt") 
- 			alt_ = Maybe<float>(m.text().toFloat());
- 		else if (m.tagName() == "bearing")
---- git.orig/src/geolocation.h
-+++ git/src/geolocation.h
-@@ -25,6 +25,9 @@
- 
- #include "maybe.h"
- 
-+#define PEP_GEOLOC_TN "geoloc"
-+#define PEP_GEOLOC_NS "http://jabber.org/protocol/geoloc"
-+
- class QDomElement;
- class QDomDocument;
- 
---- git.orig/src/geolocationdlg.cpp
-+++ git/src/geolocationdlg.cpp
-@@ -160,10 +160,10 @@ void GeoLocationDlg::setGeoLocation()
- 
- 	foreach(PsiAccount *pa, pa_) {
- 		if (geoloc.isNull()) {
--			pa->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
-+			pa->pepManager()->disable(PEP_GEOLOC_TN, PEP_GEOLOC_NS, "current");
- 		}
- 		else {
--			pa->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+			pa->pepManager()->publish(PEP_GEOLOC_NS, PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())));
- 		}
- 	}
- 	close();
---- git.orig/src/mood.cpp
-+++ git/src/mood.cpp
-@@ -65,16 +65,13 @@ bool Mood::isNull() const 
- 
- QDomElement Mood::toXml(QDomDocument& doc)
- {
--	QDomElement mood = doc.createElement("mood");
--	mood.setAttribute("xmlns", "http://jabber.org/protocol/mood");
-+	QDomElement mood = doc.createElement(PEP_MOOD_TN);
-+	mood.setAttribute("xmlns", PEP_MOOD_NS);
- 
- 	if (!type() == Unknown) {
- 		QDomElement el = doc.createElement(MoodCatalog::instance()->findEntryByType(type()).value());
- 		mood.appendChild(el);
- 	}
--	else {
--		qWarning("mood.cpp: ERROR: Converting unknown mood");
--	}
- 
- 	if (!text().isEmpty()) {
- 		QDomElement el = doc.createElement("text");
-@@ -88,11 +85,16 @@ QDomElement Mood::toXml(QDomDocument& do
- 
- void Mood::fromXml(const QDomElement& e)
- {
--	if (e.tagName() != "mood")
-+	type_ = Mood::Unknown;
-+
-+	if (e.tagName() != PEP_MOOD_TN)
- 		return;
- 
- 	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
- 		QDomElement m = n.toElement();
-+		if(m.isNull()) {
-+			continue;
-+		}
- 		if (m.tagName() == "text") {
- 			text_ = m.text();
- 		}
---- git.orig/src/mood.h
-+++ git/src/mood.h
-@@ -23,6 +23,9 @@
- 
- #include <QString>
- 
-+#define PEP_MOOD_TN "mood"
-+#define PEP_MOOD_NS "http://jabber.org/protocol/mood"
-+
- class QDomElement;
- class QDomDocument;
- 
---- git.orig/src/moodcatalog.cpp
-+++ git/src/moodcatalog.cpp
-@@ -27,6 +27,7 @@
- 		
- MoodCatalog::Entry::Entry()
- {
-+	type_ = Mood::Unknown;
- }
- 
- MoodCatalog::Entry::Entry(Mood::Type type, const QString& value, const QString& text) : type_(type), value_(value), text_(text)
---- git.orig/src/mooddlg.cpp
-+++ git/src/mooddlg.cpp
-@@ -58,11 +58,11 @@ void MoodDlg::setMood()
- 	QString moodstr = ui_.cb_type->currentText();
- 	foreach(PsiAccount *pa, pa_) {
- 		if (moodstr == tr("<unset>")) {
--			pa->pepManager()->retract("http://jabber.org/protocol/mood", "current");
-+			pa->pepManager()->disable(PEP_MOOD_TN, PEP_MOOD_NS, "current");
- 		}
- 		else {
- 			Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
--			pa->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
-+			pa->pepManager()->publish(PEP_MOOD_NS, PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())));
- 		}
- 	}
- 	close();
---- git.orig/src/pepmanager.cpp
-+++ git/src/pepmanager.cpp
-@@ -576,6 +576,16 @@ void PEPManager::retract(const QString& 
- }
- 
- 
-+void PEPManager::disable(const QString& tagName, const QString& node, const QString& id)
-+{
-+	// disable by publishing an empty element
-+	QDomElement element = client_->rootTask()->doc()->createElement(tagName);
-+	element.setAttribute("xmlns", node);
-+
-+	publish(node, PubSubItem(id,element));
-+}
-+
-+
- void PEPManager::publishFinished()
- {
- 	PEPPublishTask* task = (PEPPublishTask*) sender();
---- git.orig/src/pepmanager.h
-+++ git/src/pepmanager.h
-@@ -59,6 +59,7 @@ public:
- 
- 	void publish(const QString& node, const PubSubItem&, Access = DefaultAccess);
- 	void retract(const QString& node, const QString& id);
-+	void disable(const QString& tagName, const QString& node, const QString& id);
- 	void get(const Jid& jid, const QString& node, const QString& id);
- 
- 	//void getSubscriptions(const Jid& jid);

psi-plus-main-20130107.tar.xz/patches/1300-psi-remove-whiteboard-action-from-groupchat.diff Deleted

@@ -1,56 +0,0 @@
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -212,9 +212,9 @@ public:
- 	bool nonAnonymous;		 // got status code 100 ?
- 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
- 	TypeAheadFindBar *typeahead;
--#ifdef WHITEBOARDING
--	IconAction *act_whiteboard;
--#endif
-+//#ifdef WHITEBOARDING
-+//	IconAction *act_whiteboard;
-+//#endif
- 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
- 
- 	QAction *act_mini_cmd, *act_nick, *act_hide, *act_minimize;
-@@ -698,10 +698,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
- 	connect(d->act_html_text, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
- 
--#ifdef WHITEBOARDING
--	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
--	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
--#endif
-+//#ifdef WHITEBOARDING
-+//	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
-+//	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
-+//#endif
- 
- 	connect(pa->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), d, SLOT(addEmoticon(QString)));
- 	d->act_icon = new IconAction( tr( "Select Icon" ), "psi/smile", tr( "Select Icon" ), 0, this );
-@@ -745,9 +745,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.toolbar->addAction(d->act_find);
- 	ui_.toolbar->addAction(d->act_configure);
- 	ui_.toolbar->addAction(d->act_html_text);
--#ifdef WHITEBOARDING
--	ui_.toolbar->addAction(d->act_whiteboard);
--#endif
-+//#ifdef WHITEBOARDING
-+//	ui_.toolbar->addAction(d->act_whiteboard);
-+//#endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(d->act_icon);
- 	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
-@@ -1966,9 +1966,9 @@ void GCMainDlg::buildMenu()
- 
- 	d->act_clear->addTo( d->pm_settings );
- 	d->act_configure->addTo( d->pm_settings );
--#ifdef WHITEBOARDING
--	d->act_whiteboard->addTo( d->pm_settings );
--#endif
-+//#ifdef WHITEBOARDING
-+//	d->act_whiteboard->addTo( d->pm_settings );
-+//#endif
- 	d->pm_settings->addSeparator();
- 
- 	d->pm_settings->addAction(d->act_icon);

psi-plus-main-20130107.tar.xz/patches/1310-psi-disable-auto-scroll-to-bottom.diff Deleted

@@ -1,30 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -107,6 +107,7 @@
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
-+				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -346,7 +346,7 @@ void ChatView::renderMucMessage(const Me
- 		}
- 	}
- 
--	if(mv.isLocal()) {
-+	if(mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		scrollToBottom();
- 	}
- }
-@@ -372,7 +372,7 @@ void ChatView::renderMessage(const Messa
- 		}
- 	}
- 
--	if (mv.isLocal()) {
-+	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		deferredScroll();
- 	}
- }

psi-plus-main-20130107.tar.xz/patches/1350-psi-fix-pgp-icon-in-roster.diff Deleted

@@ -1,90 +0,0 @@
---- git.orig/src/contactlistmodel.cpp
-+++ git/src/contactlistmodel.cpp
-@@ -554,6 +554,9 @@ QVariant ContactListModel::contactData(c
- 	else if (role == BlockRole) {
- 		return QVariant(contact->isBlocked());
- 	}
-+	else if (role == IsSecureRole) {
-+		return QVariant(contact->userListItem().isSecure());
-+	}
- #ifdef YAPSI
- 	else if (role == Qt::ForegroundRole) {
- 		return QVariant(Ya::statusColor(contact->status().type()));
---- git.orig/src/contactlistmodel.h
-+++ git/src/contactlistmodel.h
-@@ -87,6 +87,7 @@ public:
- 		IsMucRole = Qt::UserRole + 29,
- 		MucMessagesRole = Qt::UserRole + 30,
- 		BlockRole = Qt::UserRole + 31,
-+		IsSecureRole = Qt::UserRole + 32,
- 
- 		// groups
- 		ExpandedRole = Qt::UserRole + 12,
---- git.orig/src/psicontactlistviewdelegate.cpp
-+++ git/src/psicontactlistviewdelegate.cpp
-@@ -356,6 +356,11 @@ void PsiContactListViewDelegate::drawCon
- 		rightPixs.push_back(pix);
- 		rightWidths.push_back(pix.width());
- 	}
-+	if (index.data(ContactListModel::IsSecureRole).toBool()) {
-+		const QPixmap &pix = IconsetFactory::iconPixmap("psi/pgp");
-+		rightPixs.push_back(pix);
-+		rightWidths.push_back(pix.width());
-+	}
- 	}
- 
- 	if(rightPixs.isEmpty() && mucMessages.isEmpty())
-@@ -392,29 +397,6 @@ void PsiContactListViewDelegate::drawCon
- 			painter->drawPixmap(iconRect.topRight(), pix);
- 		}
- 	}
--
--#if 0
--	int x;
--	if (d->status_single)
--		x = widthUsed();
--	else {
--		QFontMetrics fm(p->font());
--		const QPixmap *pix = pixmap(column);
--		x = fm.width(text(column)) + (pix ? pix->width() : 0) + 8;
--	}
--
--	if (d->u) {
--		UserResourceList::ConstIterator it = d->u->priority();
--		if (it != d->u->userResourceList().end()) {
--			if (d->u->isSecure((*it).name())) {
--				const QPixmap &pix = IconsetFactory::iconPixmap("psi/cryptoYes");
--				int y = (height() - pix.height()) / 2;
--				p->drawPixmap(x, y, pix);
--				x += 24;
--			}
--		}
--	}
--#endif
- }
- 
- void PsiContactListViewDelegate::drawGroup(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
---- git.orig/src/userlist.cpp
-+++ git/src/userlist.cpp
-@@ -1009,6 +1009,11 @@ void UserListItem::setPrivate(bool b)
- 	v_private = b;
- }
- 
-+bool UserListItem::isSecure() const
-+{
-+	return !secList.isEmpty();
-+}
-+
- bool UserListItem::isSecure(const QString &rname) const
- {
- 	for(QStringList::ConstIterator it = secList.begin(); it != secList.end(); ++it) {
---- git.orig/src/userlist.h
-+++ git/src/userlist.h
-@@ -152,6 +152,7 @@ public:
- 	const UserResourceList & userResourceList() const;
- 	UserResourceList::ConstIterator priority() const;
- 
-+	bool isSecure() const;
- 	bool isSecure(const QString &rname) const;
- 	void setSecure(const QString &rname, bool);
-

psi-plus-main-20130107.tar.xz/patches/1360-psi-remember-pgp-key.diff Deleted

@@ -1,173 +0,0 @@
---- git.orig/src/passphrasedlg.cpp
-+++ git/src/passphrasedlg.cpp
-@@ -42,3 +42,7 @@ QString PassphraseDlg::getPassphrase() c
- 	return ui_.le_pass->text();
- }
- 
-+bool PassphraseDlg::rememberPassPhrase() const
-+{
-+	return ui_.cb_savePass->isChecked();
-+}
---- git.orig/src/passphrasedlg.h
-+++ git/src/passphrasedlg.h
-@@ -32,6 +32,7 @@ public:
- 	void promptPassphrase(const QString& name);
- 
- 	QString getPassphrase() const;
-+	bool rememberPassPhrase() const;
- 
- private:
- 	Ui::Passphrase ui_;
---- git.orig/src/passphrase.ui
-+++ git/src/passphrase.ui
-@@ -74,6 +74,13 @@ Please enter your passphrase below:</str
-                   </property>
-                 </widget>
-               </item>
-+              <item>
-+                <widget class="QCheckBox" name="cb_savePass">
-+                  <property name="text">
-+                    <string>Remember passphrase</string>
-+                  </property>
-+               </widget>
-+              </item>
-             </layout>
-           </item>
-         </layout>
---- git.orig/src/pgputil.cpp
-+++ git/src/pgputil.cpp
-@@ -92,6 +92,9 @@ void PGPUtil::passphraseDone(int result)
- 		QString passphrase = passphraseDlg_->getPassphrase();
- 		if (!currentEntryId_.isEmpty()) {
- 			passphrases_[currentEntryId_] = passphrase;
-+			if(passphraseDlg_->rememberPassPhrase()) {
-+				emit newPassPhase(currentEntryId_, passphrase);
-+			}
- 		}
- 		qcaEventHandler_->submitPassword(currentEventId_,passphrase.toUtf8());
- 	}
-@@ -283,6 +286,11 @@ void PGPUtil::removePassphrase(const QSt
- 	passphrases_.remove(id);
- }
- 
-+void PGPUtil::addPassphrase(const QString &id, const QString &pass)
-+{
-+	passphrases_.insert(id, pass);
-+}
-+
- void PGPUtil::keyStoreAvailable(const QString& k)
- {
- 	QCA::KeyStore* ks = new QCA::KeyStore(k, &qcaKeyStoreManager_);
---- git.orig/src/pgputil.h
-+++ git/src/pgputil.h
-@@ -40,9 +40,11 @@ public:
- 	bool equals(QCA::PGPKey, QCA::PGPKey);
- 
- 	void removePassphrase(const QString& id);
-+	void addPassphrase(const QString& id, const QString& pass);
- 
- signals:
- 	void pgpKeysUpdated();
-+	void newPassPhase(const QString&, const QString&);
- 
- protected:
- 	PGPUtil();
---- git.orig/src/profiles.h
-+++ git/src/profiles.h
-@@ -77,6 +77,7 @@ public:
- 	QMap<QString, GroupData> groupState;
- 
- 	QCA::PGPKey pgpSecretKey;
-+	QString pgpPassPhrase;
- 
- 	VarList keybind;
- 
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -1174,6 +1174,7 @@ PsiAccount::PsiAccount(const UserAccount
- 	//connect(d->psi, SIGNAL(pgpToggled(bool)), SLOT(pgpToggled(bool)));
- #ifdef HAVE_PGPUTIL
- 	connect(&PGPUtil::instance(), SIGNAL(pgpKeysUpdated()), SLOT(pgpKeysUpdated()));
-+	connect(&PGPUtil::instance(), SIGNAL(newPassPhase(QString,QString)), SLOT(newPgpPassPhase(QString,QString)));
- #endif
- 
- 	d->setEnabled(enabled());
-@@ -5737,10 +5738,23 @@ void PsiAccount::pgpKeysUpdated()
- #endif
- }
- 
-+void PsiAccount::newPgpPassPhase(const QString &id, const QString &pass)
-+{
-+	const QString pgpSecretKeyID = (d->acc.pgpSecretKey.isNull() ? "" : d->acc.pgpSecretKey.keyId());
-+	if(pgpSecretKeyID == id) {
-+		d->acc.pgpPassPhrase = pass;
-+	}
-+}
-+
- void PsiAccount::trySignPresence()
- {
- 	QCA::SecureMessageKey skey;
- 	skey.setPGPSecretKey(d->cur_pgpSecretKey);
-+#ifdef HAVE_PGPUTIL
-+	if(!d->cur_pgpSecretKey.isNull() && !d->acc.pgpPassPhrase.isEmpty()) {
-+		PGPUtil::instance().addPassphrase(d->cur_pgpSecretKey.keyId(), d->acc.pgpPassPhrase);
-+	}
-+#endif
- 	QByteArray plain = d->loginStatus.status().toUtf8();
- 
- 	PGPTransaction *t = new PGPTransaction(new QCA::OpenPGP());
-@@ -5764,6 +5778,7 @@ void PsiAccount::pgp_signFinished()
- 	else {
- 		// Clear passphrase from cache
- 		if (t->errorCode() == QCA::SecureMessage::ErrorPassphrase) {
-+			d->acc.pgpPassPhrase.clear();
- 			QCA::KeyStoreEntry ke = PGPUtil::instance().getSecretKeyStoreEntry(d->cur_pgpSecretKey.keyId());
- 			if (!ke.isNull())
- 				PGPUtil::instance().removePassphrase(ke.id());
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -460,6 +460,7 @@ protected:
- private slots:
- 	void eventFromXml(PsiEvent* e);
- 	void simulateContactOffline(const XMPP::Jid& contact);
-+	void newPgpPassPhase(const QString& id, const QString& pass);
- 
- private:
- 	void handleEvent(PsiEvent* e, ActivationType activationType);
---- git.orig/src/psi_profiles.cpp
-+++ git/src/psi_profiles.cpp
-@@ -255,6 +255,11 @@ void UserAccount::fromOptions(OptionsTre
- 		QCA::KeyStoreEntry e = PGPUtil::instance().getSecretKeyStoreEntry(pgpSecretKeyID);
- 		if (!e.isNull())
- 			pgpSecretKey = e.pgpSecretKey();
-+
-+		pgpPassPhrase = o->getOption(base + ".pgp-pass-phrase").toString();
-+		if(!pgpPassPhrase.isEmpty()) {
-+			pgpPassPhrase = decodePassword(pgpPassPhrase, pgpSecretKeyID);
-+		}
- 	}
- #endif
- 
-@@ -382,8 +387,10 @@ void UserAccount::toOptions(OptionsTree 
- 	o->setOption(base + ".priority", priority);
- 	if (!pgpSecretKey.isNull()) {
- 		o->setOption(base + ".pgp-secret-key-id", pgpSecretKey.keyId());
-+		o->setOption(base + ".pgp-pass-phrase", encodePassword(pgpPassPhrase, pgpSecretKey.keyId()));
- 	} else {
- 		o->setOption(base + ".pgp-secret-key-id", "");
-+		o->setOption(base + ".pgp-pass-phrase", "");
- 	}
- 	switch (allow_plain) {
- 		case XMPP::ClientStream::NoAllowPlain:
-@@ -554,6 +561,11 @@ void UserAccount::fromXml(const QDomElem
- 		QCA::KeyStoreEntry e = PGPUtil::instance().getSecretKeyStoreEntry(pgpSecretKeyID);
- 		if (!e.isNull())
- 			pgpSecretKey = e.pgpSecretKey();
-+
-+		readEntry(a, "passphrase", &pgpPassPhrase);
-+		if(!pgpPassPhrase.isEmpty()) {
-+			pgpPassPhrase = decodePassword(pgpPassPhrase, pgpSecretKeyID);
-+		}
- 	}
- #endif
-

psi-plus-main-20130107.tar.xz/patches/1420-psi-save-button-for-muc-kickban-reasons.diff Deleted

@@ -1,78 +0,0 @@
---- git.orig/src/mucreasonseditor.cpp
-+++ git/src/mucreasonseditor.cpp
-@@ -16,11 +16,7 @@ MUCReasonsEditor::~MUCReasonsEditor()
- 
- void MUCReasonsEditor::accept()
- {
--	QStringList reasons;
--	int cnt=ui_.lstReasons->count();
--	for (int i=0; i<cnt; ++i)
--		reasons.append(ui_.lstReasons->item(i)->text());
--	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
-+	save();
- 	reason_=ui_.txtReason->text();
- 	QDialog::accept();
- }
-@@ -42,3 +38,11 @@ void MUCReasonsEditor::on_btnRemove_clic
- 	}
- }
- 
-+void MUCReasonsEditor::save()
-+{
-+	QStringList reasons;
-+	int cnt=ui_.lstReasons->count();
-+	for (int i=0; i<cnt; ++i)
-+		reasons.append(ui_.lstReasons->item(i)->text());
-+	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
-+}
---- git.orig/src/mucreasonseditor.h
-+++ git/src/mucreasonseditor.h
-@@ -18,6 +18,7 @@ private:
- private slots:
- 	void on_btnAdd_clicked();
- 	void on_btnRemove_clicked();
-+	void save();
- protected slots:
- 	void accept();
- };
---- git.orig/src/mucreasonseditor.ui
-+++ git/src/mucreasonseditor.ui
-@@ -77,6 +77,13 @@
-       <number>6</number>
-      </property>
-      <item>
-+      <widget class="QPushButton" name="btnSave">
-+       <property name="text">
-+        <string>Save</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-@@ -147,5 +154,24 @@
-     </hint>
-    </hints>
-   </connection>
-+  <connection>
-+   <sender>btnSave</sender>
-+   <signal>clicked()</signal>
-+   <receiver>MUCReasonsEditor</receiver>
-+   <slot>save()</slot>
-+   <hints>
-+    <hint type="sourcelabel" >
-+     <x>35</x>
-+     <y>282</y>
-+    </hint>
-+    <hint type="destinationlabel" >
-+     <x>199</x>
-+     <y>149</y>
-+    </hint>
-+   </hints>
-+  </connection>
-  </connections>
-+ <slots>
-+  <slot>save()</slot>
-+ </slots>
- </ui>

psi-plus-main-20130107.tar.xz/patches/1430-psi-one-chat-for-many-resources.diff Deleted

@@ -1,657 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
-diff --git a/options/default.xml b/options/default.xml
-index 4bc4093..96967b6 100644
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -124,6 +124,8 @@
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 				<log-height type="int">325</log-height>
- 				<chatedit-height type="int">10</chatedit-height>
-+				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
-+				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
-diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
-index 270d330..7b03451 100644
---- a/src/chatdlg.cpp
-+++ b/src/chatdlg.cpp
-@@ -107,6 +107,14 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
- 
- 	status_ = -1;
- 
-+	autoSelectContact_ = false;
-+	if (PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode").toString() == "auto") {
-+		UserListItem *uli = account()->findFirstRelevant(jid);
-+		if (!uli || !uli->isPrivate()) {
-+			autoSelectContact_ = true;
-+		}
-+	}
-+
- 	// Message events
- 	contactChatState_ = XMPP::StateNone;
- 	lastChatState_ = XMPP::StateNone;
-@@ -400,18 +408,7 @@ const QString& ChatDlg::getDisplayName()
- 	return dispNick_;
- }
- 
--struct UserStatus {
--	UserStatus()
--			: userListItem(0)
--			, statusType(XMPP::Status::Offline) {}
--	UserListItem* userListItem;
--	XMPP::Status::Type statusType;
--	QString status;
--	int priority;
--	QString publicKeyID;
--};
--
--UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource)
-+UserStatus ChatDlg::userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource)
- {
- 	if (ul.isEmpty())
- 		return UserStatus();
-@@ -470,12 +467,20 @@ void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- 	if (jid().compare(j, false)) {
- 		QList<UserListItem*> ul = account()->findRelevant(j);
- 		UserStatus userStatus = userStatusFor(jid(), ul, false);
-+
-+		Jid oldJid = jid();
-+		updateJidWidget(ul, userStatus.statusType, fromPresence);
-+		bool jidSwitched = !oldJid.compare(jid(), true);
-+		if (jidSwitched) {
-+			userStatus = userStatusFor(jid(), ul, false);
-+		}
-+
- 		if (userStatus.statusType == XMPP::Status::Offline)
- 			contactChatState_ = XMPP::StateNone;
- 
- 		bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.chat.status-with-priority").toBool();
- 		bool statusChanged = false;
--		if (status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
-+		if (jidSwitched || status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
- 			statusChanged = true;
- 			status_ = userStatus.statusType;
- 			statusString_ = userStatus.status;
-@@ -513,6 +518,13 @@ void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- 	}
- }
- 
-+void ChatDlg::updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence)
-+{
-+	Q_UNUSED(ul);
-+	Q_UNUSED(status);
-+	Q_UNUSED(fromPresence);
-+}
-+
- void ChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
- {
- 	Q_UNUSED(u);
-diff --git a/src/chatdlg.h b/src/chatdlg.h
-index ecea7e6..d3e57fd 100644
---- a/src/chatdlg.h
-+++ b/src/chatdlg.h
-@@ -48,6 +48,17 @@ class QDragEnterEvent;
- class ChatView;
- class ChatEdit;
- 
-+struct UserStatus {
-+	UserStatus()
-+			: userListItem(0)
-+			, statusType(XMPP::Status::Offline) {}
-+	UserListItem* userListItem;
-+	XMPP::Status::Type statusType;
-+	QString status;
-+	int priority;
-+	QString publicKeyID;
-+};
-+
- class ChatDlg : public TabbableWidget
- {
- 	Q_OBJECT
-@@ -74,6 +85,8 @@ public:
- 	PsiAccount* account() const;
- 	void setText(const QString& );
- 	Jid realJid() const;
-+	bool autoSelectContact() const {return autoSelectContact_;};
-+	static UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource);
- 
- signals:
- 	void aInfo(const Jid &);
-@@ -98,6 +111,7 @@ protected:
- 	void dropEvent(QDropEvent* event);
- 	void dragEnterEvent(QDragEnterEvent* event);
- 	bool eventFilter(QObject *obj, QEvent *event);
-+	bool autoSelectContact_;
- 
- public slots:
- 	// reimplemented
-@@ -152,6 +166,7 @@ protected:
- 
- 	virtual void initUi() = 0;
- 	virtual void capsChanged();
-+	virtual void updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence);
- 	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
- 
- 	void appendMessage(const Message &, bool local = false);
-diff --git a/src/chatdlg.ui b/src/chatdlg.ui
-index a0f3238..f99dd7b 100644
---- a/src/chatdlg.ui
-+++ b/src/chatdlg.ui
-@@ -71,10 +71,22 @@
-           </widget>
-          </item>
-          <item>
--          <widget class="QLineEdit" name="le_jid" >
--           <property name="readOnly" >
-+          <widget class="QComboBox" name="le_jid">
-+           <property name="sizePolicy">
-+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-+             <horstretch>1</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="editable">
-             <bool>true</bool>
-            </property>
-+           <property name="sizeAdjustPolicy">
-+            <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
-+           </property>
-+           <property name="minimumContentsLength">
-+            <number>10</number>
-+           </property>
-           </widget>
-          </item>
-          <item>
-@@ -397,6 +409,15 @@
-    <header>iconlabel.h</header>
-   </customwidget>
-  </customwidgets>
-+ <tabstops>
-+  <tabstop>le_jid</tabstop>
-+  <tabstop>tb_voice</tabstop>
-+  <tabstop>tb_pgp</tabstop>
-+  <tabstop>tb_emoticons</tabstop>
-+  <tabstop>tb_actions</tabstop>
-+  <tabstop>mle</tabstop>
-+  <tabstop>pb_send</tabstop>
-+ </tabstops>
-  <resources/>
-  <connections/>
- </ui>
-diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
-index 2215384..0c0ba0d 100644
---- a/src/psiaccount.cpp
-+++ b/src/psiaccount.cpp
-@@ -2695,9 +2695,9 @@ void PsiAccount::processIncomingMessage(const Message &_m)
- 		return;
- 	}
- 
--	c = findChatDialog(j);
-+	/*c = findChatDialog(j);
- 	if(!c)
--		c = findChatDialog(m.from().full());
-+		c = findChatDialog(m.from().full());*/
- 
- 	if(m.type() == "error") {
- 		Stanza::Error err = m.error();
-@@ -2719,6 +2719,13 @@ void PsiAccount::processIncomingMessage(const Message &_m)
- 		else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "chat")
- 			m.setType("chat");
- 		else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "current-open") {
-+			c = NULL;
-+			foreach (ChatDlg *cl, findChatDialogs(m.from(), false)) {
-+				if (cl->autoSelectContact() || cl->jid().resource().isEmpty() || m.from().resource() == cl->jid().resource()) {
-+					c = cl;
-+					break;
-+				}
-+			}
- 			if (c != NULL && !c->isHidden())
- 				m.setType("chat");
- 			else
-@@ -3172,9 +3179,33 @@ bool PsiAccount::validRosterExchangeItem(const RosterExchangeItem& item)
- 	return false;
- }
- 
--ChatDlg* PsiAccount::findChatDialog(const Jid& jid) const
-+ChatDlg* PsiAccount::findChatDialog(const Jid& jid, bool compareResource) const
-+{
-+	return findDialog<ChatDlg*>(jid, compareResource);
-+}
-+
-+ChatDlg* PsiAccount::findChatDialogEx(const Jid& jid) const
- {
--	return findDialog<ChatDlg*>(jid, true);
-+	ChatDlg* cm1 = NULL;
-+	ChatDlg* cm2 = NULL;
-+	foreach (ChatDlg *cl, findChatDialogs(jid, false)) {
-+		if (cl->autoSelectContact())
-+			return cl;
-+		if (!cm1 && jid.resource() == cl->jid().resource()) {
-+				cm1 = cl;
-+				continue;
-+		}
-+		if (!cm2 && cl->jid().resource().isEmpty())
-+			cm2 = cl;
-+	}
-+	if (cm1)
-+		return cm1;
-+	return cm2;
-+}
-+
-+QList<ChatDlg*> PsiAccount::findChatDialogs(const Jid& jid, bool compareResource) const
-+{
-+	return findDialogs<ChatDlg*>(jid, compareResource);
- }
- 
- QWidget* PsiAccount::findDialog(const QMetaObject& mo, const Jid& jid, bool compareResource) const
-@@ -3690,7 +3721,8 @@ EventDlg *PsiAccount::ensureEventDlg(const Jid &j)
- 
- ChatDlg *PsiAccount::ensureChatDlg(const Jid &j)
- {
--	ChatDlg *c = findChatDialog(j);
-+	/*ChatDlg *c = findChatDialog(j);*/
-+	ChatDlg *c = findChatDialogEx(j);
- 	if(!c) {
- 		// create the chatbox
- 		c = ChatDlg::create(j, this, d->tabManager);
-@@ -3708,6 +3740,7 @@ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j)
- #endif
- 	}
- 	else {
-+		c->setJid(j);
- 		// on X11, do a special reparent to open on the right desktop
- #ifdef Q_WS_X11
- 		/* KIS added an exception for tabs here. We do *not* want chats flying
-@@ -4871,12 +4904,12 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 		}
- 		else if (m.messageReceipt() == ReceiptReceived) {
- 			if (PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool()) {
--				ChatDlg *c = findChatDialog(e->from());
--				if (!c) {
--					c = findChatDialog(e->jid());
--				}
--				if (c) {
--					c->incomingMessage(m);
-+				foreach (ChatDlg *c, findChatDialogs(e->from(), false)) {
-+					if (c->autoSelectContact()  || c->jid().resource().isEmpty() || e->from().resource() == c->jid().resource()) {
-+						if (c->autoSelectContact())
-+							c->setJid(e->from());
-+						c->incomingMessage(m);
-+					}
- 				}
- 			}
- 			delete e;
-@@ -4886,11 +4919,9 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 		// Pass message events to chat window
- 		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
- 			if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) {
--				ChatDlg *c = findChatDialog(e->from());
--				if (!c) {
--					c = findChatDialog(e->jid());
--				}
-+				ChatDlg *c = findChatDialogEx(e->from());
- 				if (c) {
-+					c->setJid(e->from());
- 					c->incomingMessage(m);
- 				}
- 			}
-@@ -4907,13 +4938,11 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 
- 		// pass chat messages directly to a chat window if possible (and deal with sound)
- 		else if(m.type() == "chat") {
--			ChatDlg *c = findChatDialog(e->from());
--			if(!c)
--				c = findChatDialog(e->jid());
--
--			if(c)
-+			ChatDlg *c = findChatDialogEx(e->from());
-+			if (c)
- 				c->setJid(e->from());
- 
-+
- 			//if the chat exists, and is either open in a tab,
- 			//or in a window
- #ifdef YAPSI_ACTIVEX_SERVER
-@@ -5386,13 +5415,13 @@ void PsiAccount::processReadNext(const UserListItem &u)
- void PsiAccount::processChatsHelper(const Jid& j, bool removeEvents)
- {
- 	//printf("processing chats for [%s]\n", j.full().latin1());
--	ChatDlg *c = findChatDialog(j);
-+	ChatDlg *c = findChatDialogEx(j);
- 	if(!c)
- 		return;
- 
- 	// extract the chats
- 	QList<PsiEvent*> chatList;
--	bool compareResources = true;
-+	bool compareResources = !c->autoSelectContact();
- #ifdef YAPSI
- 	compareResources = false;
- #endif
-diff --git a/src/psiaccount.h b/src/psiaccount.h
-index b87b250..c8256b3 100644
---- a/src/psiaccount.h
-+++ b/src/psiaccount.h
-@@ -162,7 +162,9 @@ public:
- 	QHostAddress *localAddress() const;
- 	void passwordReady(QString password);
- 
--	ChatDlg* findChatDialog(const Jid& jid) const;
-+	ChatDlg* findChatDialog(const Jid& jid, bool compareResource = true) const;
-+	ChatDlg* findChatDialogEx(const Jid& jid) const;
-+	QList<ChatDlg*> findChatDialogs(const Jid& jid, bool compareResource = true) const;
- 
- 	template<typename T>
- 	inline T findDialog(const Jid& jid = Jid(), bool compareResource = true) const { 
-diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
-index e81f2eb..255093e 100644
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -199,6 +199,28 @@ PsiChatDlg::~PsiChatDlg()
- void PsiChatDlg::initUi()
- {
- 	ui_.setupUi(this);
-+
-+	le_autojid = new ActionLineEdit(ui_.le_jid);
-+	ui_.le_jid->setLineEdit(le_autojid);
-+	ui_.le_jid->lineEdit()->setReadOnly(true);
-+	if (autoSelectContact_) {
-+		QStringList excl = PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode-ignorelist").toString().toLower().split(",", QString::SkipEmptyParts);
-+		if (excl.indexOf(jid().bare()) == -1) {
-+			ui_.le_jid->insertItem(0, "auto", jid().full());
-+			ui_.le_jid->setCurrentIndex(0);
-+		} else {
-+			autoSelectContact_ = false;
-+		}
-+	}
-+	connect(ui_.le_jid, SIGNAL(activated(int)), this, SLOT(contactChanged()));
-+	UserListItem *ul = account()->findFirstRelevant(jid());
-+	if (!ul || !ul->isPrivate()) {
-+		act_autojid = new IconAction(this);
-+		updateAutojidIcon();
-+		connect(act_autojid, SIGNAL(triggered()), SLOT(doSwitchJidMode()));
-+		le_autojid->addAction(act_autojid);
-+	}
-+
- 	ui_.lb_ident->setAccount(account());
- 	ui_.lb_ident->setShowJid(false);
- 
-@@ -538,6 +560,110 @@ void PsiChatDlg::setContactToolTip(QString text)
- 	ui_.avatar->setToolTip(text);
- }
- 
-+void PsiChatDlg::updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence)
-+{
-+	static bool internal_change = false;
-+	if (!internal_change) {
-+		// Filling jid's combobox
-+		const UserListItem *u = ul.first();
-+		if (!u)
-+			return;
-+		UserResourceList resList = u->userResourceList();
-+		const QString name = u->name();
-+		QComboBox *jidCombo = ui_.le_jid;
-+		if (!u->isPrivate()) {
-+			// If no conference private chat
-+			const int combo_idx = jidCombo->currentIndex();
-+			Jid old_jid = (combo_idx != -1) ? Jid(jidCombo->itemData(combo_idx).toString()) : Jid();
-+			//if (fromPresence || jid() != old_jid) {
-+				bool auto_mode = autoSelectContact_;
-+				Jid new_auto_jid = jid();
-+				if (auto_mode) {
-+					if (fromPresence && !resList.isEmpty()) {
-+						UserResourceList::ConstIterator it = resList.priority();
-+						new_auto_jid = jid().withResource((*it).name());
-+					}
-+				}
-+				// Filling address combobox
-+				QString iconStr = "clients/unknown";
-+				const int resCnt = resList.size();
-+				if (resCnt == 1) {
-+					UserResourceList::ConstIterator it = resList.begin();
-+					if (it != resList.end() && (*it).name().isEmpty())
-+						// Empty resource,  but online. Transport?
-+						iconStr = "clients/" + u->findClient((*it).clientName().toLower());
-+				} else if (resCnt == 0) {
-+					iconStr = QString();
-+				}
-+				setJidComboItem(0, makeContactName(name, u->jid().bare()), u->jid().bare(), iconStr);
-+				int new_index = -1;
-+				int curr_index = 1;
-+				for (UserResourceList::ConstIterator it = resList.begin(); it != resList.end(); it++) {
-+					UserResource r = *it;
-+					if (!r.name().isEmpty()) {
-+						Jid tmp_jid(u->jid().withResource(r.name()));
-+						QString iconStr2 = "clients/" + u->findClient(r.clientName().toLower());
-+						setJidComboItem(curr_index, makeContactName(name, tmp_jid), tmp_jid, iconStr2);
-+						if (new_index == -1 && tmp_jid == new_auto_jid) {
-+							new_index = curr_index;
-+						}
-+						curr_index++;
-+					}
-+				}
-+				if (new_index == -1) {
-+					new_index = 0;
-+					if (autoSelectContact_) {
-+						new_auto_jid = jid().bare();
-+					} else {
-+						if (!jid().resource().isEmpty()) {
-+							new_index = jidCombo->count();
-+							setJidComboItem(curr_index, makeContactName(name, jid()), jid(), iconStr);
-+							new_index = curr_index++;
-+						}
-+					}
-+				}
-+				// Сlean combobox's tail
-+				while (curr_index < jidCombo->count())
-+					jidCombo->removeItem(curr_index);
-+
-+				ui_.le_jid->setCurrentIndex(new_index);
-+				if (new_auto_jid != jid()) {
-+					internal_change = true;
-+					setJid(new_auto_jid);
-+					if (old_jid != new_auto_jid) {
-+						if (autoSelectContact_ && (status != XMPP::Status::Offline || !new_auto_jid.resource().isEmpty())) {
-+							appendSysMsg(tr("Contact has been switched: %1").arg(JIDUtil::toString(new_auto_jid, true)));
-+						}
-+					}
-+				}
-+			//}
-+		} else {
-+			// Conference private chat
-+			QString iconStr;
-+			Jid tmp_jid = jid();
-+			UserResourceList::ConstIterator it = resList.begin();
-+			if (it != resList.end()) {
-+				iconStr = "clients/" + u->findClient((*it).clientName().toLower());
-+				tmp_jid = u->jid().withResource((*it).name());
-+			} else if (jidCombo->count() > 0) {
-+				tmp_jid = Jid(jidCombo->itemData(0).toString());
-+			}
-+			if (tmp_jid.isValid()) {
-+				if (iconStr == "clients/unknown")
-+					iconStr = QString(); // for disable the icon
-+				setJidComboItem(0, makeContactName(name, tmp_jid), tmp_jid, iconStr);
-+			}
-+			// Clean combobox's tail
-+			while (jidCombo->count() > 1)
-+				jidCombo->removeItem(1);
-+			//-
-+			jidCombo->setCurrentIndex(0);
-+		}
-+		jidCombo->setToolTip(jidCombo->currentText());
-+	}
-+	internal_change = false;
-+}
-+
- void PsiChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
- {
- 	Q_UNUSED(statusString);
-@@ -559,22 +685,6 @@ void PsiChatDlg::contactUpdated(UserListItem* u, int status, const QString& stat
- 	}
- 
- 	if (u) {
--		QString name;
--		QString j;
--		if (jid().resource().isEmpty())
--			j = JIDUtil::toString(u->jid(), true);
--		else
--			j = JIDUtil::toString(u->jid().bare(), false) + '/' + jid().resource();
--
--		if (!u->name().isEmpty())
--			name = u->name() + QString(" <%1>").arg(j);
--		else
--			name = j;
--
--		ui_.le_jid->setText(name);
--		ui_.le_jid->setCursorPosition(0);
--		ui_.le_jid->setToolTip(name);
--
- 		UserResourceList srl = u->userResourceList();
- 		if(!srl.isEmpty()) {			
- 			UserResource r;
-@@ -854,4 +964,76 @@ void PsiChatDlg::setMargins()
- 	}
- }
- 
-+QString PsiChatDlg::makeContactName(const QString &name, const Jid &jid) const
-+{
-+	QString name_;
-+	QString j = JIDUtil::toString(jid, true);
-+	if (!name.isEmpty())
-+		name_ = name + QString(" <%1>").arg(j);
-+	else
-+		name_ = j;
-+	return name_;
-+}
-+
-+void PsiChatDlg::contactChanged()
-+{
-+	int curr_index = ui_.le_jid->currentIndex();
-+	Jid jid_(ui_.le_jid->itemData(curr_index).toString());
-+	if (jid_ != jid()) {
-+		autoSelectContact_ = false;
-+		setJid(jid_);
-+		updateAutojidIcon();
-+	}
-+}
-+
-+void PsiChatDlg::updateAutojidIcon()
-+{
-+	QIcon icon(IconsetFactory::iconPixmap("psi/autojid"));
-+	QPixmap pix;
-+	QString text;
-+	if (autoSelectContact_) {
-+		pix = icon.pixmap(QSize(16, 16), QIcon::Normal, QIcon::Off);
-+		text = tr("turn off autojid");
-+	} else {
-+		pix = icon.pixmap(QSize(16, 16), QIcon::Disabled, QIcon::Off);
-+		text = tr("turn on autojid");
-+	}
-+	act_autojid->setIcon(QIcon(pix));
-+	act_autojid->setText(text);
-+	act_autojid->setToolTip(text);
-+	act_autojid->setStatusTip(text);
-+}
-+
-+void PsiChatDlg::setJidComboItem(int pos, const QString &text, const Jid &jid, const QString &icon_str)
-+{
-+	// Warning! If pos >= items count, the element will be added in a list tail
-+	//-
-+	QIcon icon;
-+	QComboBox *jid_combo = ui_.le_jid;
-+	if (!icon_str.isEmpty()) {
-+		const PsiIcon picon = IconsetFactory::icon(icon_str);
-+		icon = picon.icon();
-+	}
-+	if (jid_combo->count() > pos) {
-+		jid_combo->setItemText(pos, text);
-+		jid_combo->setItemData(pos, JIDUtil::toString(jid, true));
-+		jid_combo->setItemIcon(pos, icon);
-+	} else {
-+		jid_combo->addItem(icon, text, JIDUtil::toString(jid, true));
-+	}
-+}
-+
-+void PsiChatDlg::doSwitchJidMode()
-+{
-+	autoSelectContact_ = ! autoSelectContact_;
-+	updateAutojidIcon();
-+	if (autoSelectContact_) {
-+		const QList<UserListItem*> ul = account()->findRelevant(jid().bare());
-+		UserStatus userStatus = userStatusFor(jid(), ul, false);
-+		updateJidWidget(ul, userStatus.statusType, true);
-+		userStatus = userStatusFor(jid(), ul, false);
-+		contactUpdated(userStatus.userListItem, userStatus.statusType, userStatus.status);
-+	}
-+}
-+
- #include "psichatdlg.moc"
-diff --git a/src/psichatdlg.h b/src/psichatdlg.h
-index add8c0a..949893b 100644
---- a/src/psichatdlg.h
-+++ b/src/psichatdlg.h
-@@ -10,6 +10,8 @@
- #include "ui_chatdlg.h"
- #include "typeaheadfind.h"
- #include "psiwindowheader.h"
-+#include "widgets/actionlineedit.h"
-+
- 
- class IconAction;
- class PsiContact;
-@@ -54,6 +56,9 @@ private slots:
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
- 	void verticalSplitterMoved(int, int);
-+	void contactChanged();
-+	QString makeContactName(const QString &name, const Jid &jid) const;
-+	void doSwitchJidMode();
- 
- private:
- 	void initToolBar();
-@@ -63,6 +68,7 @@ private:
- 	void initUi();
- 	void capsChanged();
- 	bool isEncryptionEnabled() const;
-+	void updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence);
- 	void contactUpdated(UserListItem* u, int status, const QString& statusString);
- 	void updateAvatar();
- 	void optionsUpdate();
-@@ -75,6 +81,8 @@ private:
- 	ChatView* chatView() const;
- 	ChatEdit* chatEdit() const;
- 	void setMargins();
-+	void updateAutojidIcon();
-+	void setJidComboItem(int pos, const QString &text, const Jid &jid, const QString &icon_str);
- 
- private:
- 	Ui::ChatDlg ui_;
-@@ -97,6 +105,9 @@ private:
- 	IconAction* act_add_contact;
- 	QAction *act_mini_cmd_, *act_minimize_;
- 
-+	ActionLineEdit *le_autojid;
-+	IconAction *act_autojid;
-+
- 	MCmdManager mCmdManager_;
- 	MCmdSimpleSite mCmdSite_;
- 
-diff --git a/src/psicon.cpp b/src/psicon.cpp
-index fc73525..285e2da 100644
---- a/src/psicon.cpp
-+++ b/src/psicon.cpp
-@@ -1738,9 +1738,9 @@ void PsiCon::processEvent(PsiEvent *e, ActivationType activationType)
- 		if ( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && sentToChatWindow ) {
- 			// Message already displayed, need only to pop up chat dialog, so that
- 			// it will be read (or marked as read)
--			ChatDlg *c = account->findChatDialog(from);
-+			ChatDlg *c = account->findChatDialogEx(from);
- 			if(!c)
--				c = account->findChatDialog(e->jid());
-+				c = account->findChatDialogEx(e->jid());
- 			if(!c)
- 				return; // should never happen
-

psi-plus-main-20130107.tar.xz/patches/1440-psi-tab-highlight-color.diff Deleted

@@ -1,79 +0,0 @@
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -1132,9 +1132,15 @@ void ChatDlg::chatEditCreated()
- 
- TabbableWidget::State ChatDlg::state() const
- {
--	return contactChatState_ == XMPP::StateComposing ?
--	       TabbableWidget::StateComposing :
--	       TabbableWidget::StateNone;
-+	TabbableWidget::State state = TabbableWidget::StateNone;
-+	if(contactChatState_ == XMPP::StateComposing) {
-+		state = TabbableWidget::StateComposing;
-+	}
-+	else if(unreadMessageCount()) {
-+		state = TabbableWidget::StateHighlighted;
-+	}
-+
-+	return state;
- }
- 
- int ChatDlg::unreadMessageCount() const
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1994,7 +1994,7 @@ void GCMainDlg::chatEditCreated()
- 
- TabbableWidget::State GCMainDlg::state() const
- {
--	return TabbableWidget::StateNone;
-+	return d->hPending ? TabbableWidget::StateHighlighted : TabbableWidget::StateNone;
- }
- 
- int GCMainDlg::unreadMessageCount() const
---- git.orig/src/tabs/tabbablewidget.h
-+++ git/src/tabs/tabbablewidget.h
-@@ -63,7 +63,8 @@ public:
- 
- 	enum State {
- 		StateNone = 0,
--		StateComposing
-+		StateComposing,
-+		StateHighlighted
- 	};
- 	virtual State state() const = 0;
- 	virtual int unreadMessageCount() const = 0;
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -636,17 +636,25 @@ void TabDlg::updateTab(TabbableWidget* c
- 	tabWidget_->setTabText(chat, captionForTab(chat));
- 	//now set text colour based upon whether there are new messages/composing etc
- 
--	if (chat->state() == TabbableWidget::StateComposing) {
-+	TabbableWidget::State state = chat->state();
-+	if (state == TabbableWidget::StateComposing) {
- 		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
--	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
--		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
--	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
--		tabWidget_->setTabIcon(chat, chat->icon());
-+		if (state == TabbableWidget::StateHighlighted) {
-+			tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
-+		}
-+		else {
-+			tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
-+		}
-+
-+		if(chat->unreadMessageCount()) {
-+			tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
-+		}
-+		else {
-+			tabWidget_->setTabIcon(chat, chat->icon());
-+		}
- 	}
- 	updateCaption();
- }

psi-plus-main-20130107.tar.xz/patches/1450-psi-modern-muc-roster.diff Deleted

@@ -1,1230 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -297,6 +297,21 @@ QLineEdit#le_status_text {
- 			</menu>
- 			<muc comment="Multi-User Chat options">
- 				<hide-on-autojoin type="bool">false</hide-on-autojoin>
-+				<userlist comment="Userlist options">
-+					<show-groups type="bool">true</show-groups>
-+					<use-slim-group-headings type="bool">false</use-slim-group-headings>
-+					<nick-coloring type = "bool">true</nick-coloring>
-+					<show-client-icons type = "bool">true</show-client-icons>
-+					<show-affiliation-icons type = "bool">true</show-affiliation-icons>
-+					<contact-sort-style type = "QString">alpha</contact-sort-style>
-+					<show-status-icons type = "bool">true</show-status-icons>
-+					<avatars>
-+						<show type="bool">false</show>
-+						<size type="int">24</size>
-+						<avatars-at-left type="bool">true</avatars-at-left>
-+						<radius type="int">3</radius>
-+					</avatars>
-+				</userlist>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
- 				<log-width type="int">500</log-width>
-@@ -373,6 +388,10 @@ QLineEdit#le_status_text {
- 							<item>Purple</item>
- 							<item>Red</item>
- 						</nick-colors>
-+						<role-moderator type="QColor">#910000</role-moderator>
-+						<role-participant type="QColor">#00008a</role-participant>
-+						<role-visitor type="QColor">#336600</role-visitor>
-+						<role-norole type="QColor">black</role-norole>
- 					</muc>
- 					<messages comment="Message coloring.">
- 						<received type="QColor" comment="Color used to indicate received messages.">#0000ff</received>
---- psi.orig/src/avatars.cpp
-+++ psi/src/avatars.cpp
-@@ -42,6 +42,7 @@
- #include "xmpp_client.h"
- #include "xmpp_resource.h"
- #include "xmpp_pubsubitem.h"
-+#include "xmpp_tasks.h"
- #include "avatars.h"
- #include "applicationinfo.h"
- #include "psiaccount.h"
-@@ -275,7 +276,7 @@ protected:
- 	void avatarUpdated() 
- 		{ emit avatarChanged(jid_); }
- 
--private:
-+protected:
- 	Jid jid_;
- };
- 
-@@ -303,6 +304,48 @@ void VCardAvatar::receivedVCard()
- //------------------------------------------------------------------------------
- 
- //------------------------------------------------------------------------------
-+// VCardMucAvatar: Avatars coming from VCards of MUC contacts.
-+//------------------------------------------------------------------------------
-+
-+class VCardMucAvatar : public VCardAvatar
-+{
-+	Q_OBJECT
-+
-+public:
-+	VCardMucAvatar(AvatarFactory* factory, const Jid& jid);
-+
-+public slots:
-+	virtual void receivedVCard();
-+
-+protected:
-+	virtual void requestAvatar();
-+};
-+
-+
-+VCardMucAvatar::VCardMucAvatar(AvatarFactory* factory, const Jid& jid)
-+	: VCardAvatar(factory, jid)
-+{
-+}
-+
-+void VCardMucAvatar::requestAvatar()
-+{
-+	VCardFactory::instance()->getVCard(jid_.full(), factory()->account()->client()->rootTask(), this, SLOT(receivedVCard()), false);
-+}
-+
-+void VCardMucAvatar::receivedVCard()
-+{
-+	JT_VCard* task = static_cast<JT_VCard*>(sender());
-+	const VCard vcard = task->vcard();
-+	if (!vcard.isEmpty()) {
-+		saveToCache(vcard.photo());
-+		setImage(vcard.photo());
-+		emit avatarChanged(jid_);
-+	}
-+}
-+
-+//------------------------------------------------------------------------------
-+
-+//------------------------------------------------------------------------------
- // VCardStaticAvatar: VCard static photo avatar (not published through presence)
- //------------------------------------------------------------------------------
- 
-@@ -505,6 +548,25 @@ QPixmap AvatarFactory::getAvatar(const J
- 	return pm;
- }
- 
-+QPixmap AvatarFactory::getMucAvatar(const Jid& _jid)
-+{
-+	Jid jid = _jid;
-+	Avatar* av = 0;
-+	if (muc_vcard_avatars_.contains(jid.full()) && !muc_vcard_avatars_[jid.full()]->isEmpty()) {
-+		av = muc_vcard_avatars_[jid.full()];
-+	}
-+
-+	QPixmap pm = (av ? av->getPixmap() : QPixmap());	
-+	pm = ensureSquareAvatar(pm);
-+
-+	// Update iconset
-+	PsiIcon icon;
-+	icon.setImpix(pm);
-+	iconset_.setIcon(QString("avatars/%1").arg(jid.full()),icon);
-+
-+	return pm;
-+}
-+
- Avatar* AvatarFactory::retrieveAvatar(const Jid& jid)
- {
- 	//printf("Retrieving avatar of %s\n", jid.full().latin1());
-@@ -577,6 +639,12 @@ void AvatarFactory::updateAvatar(const J
- 	emit avatarChanged(j);
- }
- 
-+void AvatarFactory::updateMucAvatar(const Jid &j)
-+{
-+	getMucAvatar(j);
-+	emit avatarChanged(j);
-+}
-+
- void AvatarFactory::importManualAvatar(const Jid& j, const QString& fileName)
- {
- 	FileAvatar(this, j).import(fileName);
-@@ -609,6 +677,18 @@ void AvatarFactory::resourceAvailable(co
- 	}
- }
- 
-+void AvatarFactory::newMucItem(const Jid &fullJid, const Status &s)
-+{
-+	if (s.hasPhotoHash()) {
-+		const QString hash = s.photoHash();
-+		if (!muc_vcard_avatars_.contains(fullJid.full())) {
-+			muc_vcard_avatars_[fullJid.full()] = new VCardMucAvatar(this, fullJid);
-+			connect(muc_vcard_avatars_[fullJid.full()], SIGNAL(avatarChanged(const Jid&)), this, SLOT(updateMucAvatar(const Jid&)));
-+		}
-+		muc_vcard_avatars_[fullJid.full()]->updateHash(hash);
-+	}
-+}
-+
- QString AvatarFactory::getManualDir()
- {
- 	QDir avatars(pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/pictures");
-@@ -634,6 +714,37 @@ int AvatarFactory::maxAvatarSize()
- 	return MAX_AVATAR_SIZE;
- }
- 
-+QPixmap AvatarFactory::roundedAvatar(const QPixmap &pix, int rad, int avSize)
-+{
-+	QPixmap avatar_icon;
-+	QPixmap av = pix;
-+	if(!pix.isNull()) {
-+		if (avSize != 0) {
-+			if (rad != 0) {
-+				avSize = qMax(avSize, rad*2);
-+				av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+				int w = av.width(), h = av.height();
-+				QPainterPath pp;
-+				pp.addRoundedRect(0, 0, w, h, rad, rad);
-+				avatar_icon = QPixmap(w, h);
-+				avatar_icon.fill(QColor(0,0,0,0));
-+				QPainter mp(&avatar_icon);
-+				mp.setBackgroundMode(Qt::TransparentMode);
-+				mp.setRenderHints(QPainter::Antialiasing, true);
-+				mp.fillPath(pp, QBrush(av));
-+			}
-+			else {
-+				avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-+			}
-+		}
-+		else {
-+			avatar_icon = QPixmap();
-+		}
-+	}
-+
-+	return avatar_icon;
-+}
-+
- void AvatarFactory::itemPublished(const Jid& jid, const QString& n, const PubSubItem& item)
- {
- 	if (n == PEP_AVATAR_DATA_NS) {
---- psi.orig/src/avatars.h
-+++ psi/src/avatars.h
-@@ -37,6 +37,7 @@
- class PsiAccount;
- class Avatar;
- class VCardAvatar;
-+class VCardMucAvatar;
- class VCardStaticAvatar;
- class FileAvatar;
- class PEPAvatar;
-@@ -45,6 +46,7 @@ namespace XMPP {
- 	class Jid;
- 	class Resource;
- 	class PubSubItem;
-+	class Status;
- }
- 
- using namespace XMPP;
-@@ -65,16 +67,21 @@ public:
- 	void importManualAvatar(const Jid& j, const QString& fileName);
- 	void removeManualAvatar(const Jid& j);
- 	bool hasManualAvatar(const Jid& j);
-+
-+	void newMucItem(const Jid& fullJid, const Status& s);
-+	QPixmap getMucAvatar(const Jid& jid);
- 	
- 	static QString getManualDir();
- 	static QString getCacheDir();
- 	static int maxAvatarSize();
-+	static QPixmap roundedAvatar(const QPixmap& pix, int rad, int avatarSize);
- 
- signals:
- 	void avatarChanged(const Jid&);
- 
- public slots:
- 	void updateAvatar(const Jid&);
-+	void updateMucAvatar(const Jid&);
- 
- protected slots:
- 	void itemPublished(const Jid&, const QString&, const PubSubItem&);
-@@ -92,6 +99,7 @@ private:
- 	QMap<QString,PEPAvatar*> pep_avatars_;
- 	QMap<QString,FileAvatar*> file_avatars_;
- 	QMap<QString,VCardAvatar*> vcard_avatars_;
-+	QMap<QString,VCardMucAvatar*> muc_vcard_avatars_;
- 	QMap<QString,VCardStaticAvatar*> vcard_static_avatars_;
- 	PsiAccount* pa_;
- 	Iconset iconset_;
---- psi.orig/src/contactlistmodel.cpp
-+++ psi/src/contactlistmodel.cpp
-@@ -536,7 +536,9 @@ QVariant ContactListModel::contactData(c
- 		return QVariant(contact->userListItem().clients());
- 	}
- 	else if (role == AvatarRole) {
--		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
-+		QPixmap pix = contact->isPrivate() ?
-+			      contact->account()->avatarFactory()->getMucAvatar(contact->jid()) :
-+			      contact->account()->avatarFactory()->getAvatar(contact->jid());
- 		return QVariant(pix);
- 	}
- 	else if (role == IsMucRole) {
---- psi.orig/src/gcuserview.cpp
-+++ psi/src/gcuserview.cpp
-@@ -36,6 +36,8 @@
- #include "psioptions.h"
- #include "coloropt.h"
- #include "avcall/avcall.h"
-+#include "xmpp_muc.h"
-+#include "avatars.h"
- 
- static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
- {
-@@ -53,6 +55,31 @@ public:
- 	GCUserViewDelegate(QObject* p)
- 		: QItemDelegate(p)
- 	{
-+		updateSettings();
-+	}
-+
-+	void updateSettings()
-+	{
-+		colorForeground_ = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-foreground");
-+		colorBackground_ = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-background");
-+		colorModerator_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-moderator").value<QColor>();
-+		colorParticipant_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-participant").value<QColor>();
-+		colorVisitor_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-visitor").value<QColor>();
-+		colorNoRole_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-norole").value<QColor>();
-+		showGroups_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-groups").toBool();
-+		slimGroups_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.use-slim-group-headings").toBool();
-+		nickColoring_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.nick-coloring").toBool();
-+		showClients_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-client-icons").toBool();
-+		showAffiliations_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-affiliation-icons").toBool();
-+		showStatusIcons_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-status-icons").toBool();
-+		showAvatar_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.show").toBool();
-+		avatarSize_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.size").toInt();
-+		avatarAtLeft_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.avatars-at-left").toBool();
-+		avatarRadius_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.radius").toInt();
-+
-+		QFont font;
-+		font.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
-+		fontHeight_ = QFontMetrics(font).height()+2;
- 	}
- 
- 	void paint(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index) const
-@@ -65,52 +91,204 @@ public:
- 				paintGroup(mp, option, gi);
- 			}
- 			else {
--				paintContact(mp, option, index);
-+				paintContact(mp, option, index, (GCUserViewItem*)i);
- 			}
- 		}
- 	}
- 
- 	void paintGroup(QPainter* p, const QStyleOptionViewItem& o, GCUserViewGroupItem* gi) const
- 	{
-+		if(!showGroups_)
-+			return;
-+
--		bool slimGroups = PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool();
- 		QRect rect = o.rect;
- 		QFont f = o.font;
--		f.setPointSize(common_smallFontSize);
- 		p->setFont(f);
--		QColor colorForeground = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-foreground");
--		QColor colorBackground = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-background");
--		if (!slimGroups || (o.state & QStyle::State_Selected) ) {
--			p->fillRect(rect, colorBackground);
-+		if (!slimGroups_ || (o.state & QStyle::State_Selected) ) {
-+			p->fillRect(rect, colorBackground_);
- 		}
- 
--		p->setPen(QPen(colorForeground));
-+		p->setPen(QPen(colorForeground_));
- 		rect.translate(2, (rect.height() - o.fontMetrics.height())/2);
- 		p->drawText(rect, gi->text(0));
--		if (slimGroups	&& !(o.state & QStyle::State_Selected))
-+		if (slimGroups_	&& !(o.state & QStyle::State_Selected))
- 		{
- 			QFontMetrics fm(f);
- 			int x = fm.width(gi->text(0)) + 8;
- 			int width = rect.width();
- 			if(x < width - 8) {
- 				int h = rect.y() + (rect.height() / 2) - 1;
--				p->setPen(QPen(colorBackground));
-+				p->setPen(QPen(colorBackground_));
- 				p->drawLine(x, h, width - 8, h);
- 				h++;
--				p->setPen(QPen(colorForeground));
-+				p->setPen(QPen(colorForeground_));
- 				p->drawLine(x, h, width - 8, h);
- 			}
- 		}
- 	}
- 
--	void paintContact(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index) const
-+	void paintContact(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index, GCUserViewItem* item) const
- 	{
--		QItemDelegate::paint(mp, option, index);
-+		mp->save();
-+		QStyleOptionViewItem o = option;
-+		QPalette palette = o.palette;
-+		MUCItem::Role r = item->s.mucItem().role();
-+		QRect rect = o.rect;
-+
-+		if(nickColoring_) {
-+			if(r == MUCItem::Moderator)
-+				palette.setColor(QPalette::Text, colorModerator_);
-+			else if(r == MUCItem::Participant)
-+				palette.setColor(QPalette::Text, colorParticipant_);
-+			else if(r == MUCItem::Visitor)
-+				palette.setColor(QPalette::Text, colorVisitor_);
-+			else
-+				palette.setColor(QPalette::Text, colorNoRole_);
-+		}
-+
-+		mp->fillRect(rect, (o.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base));
-+
-+		if(showAvatar_) {
-+			QPixmap ava = item->avatar();
-+			if(ava.isNull()) {
-+				ava = IconsetFactory::iconPixmap("psi/default_avatar");
-+			}
-+			ava = AvatarFactory::roundedAvatar(ava, avatarRadius_, avatarSize_);
-+			QRect avaRect(rect);
-+			avaRect.setWidth(ava.width());
-+			avaRect.setHeight(ava.height());
-+			if(!avatarAtLeft_) {
-+				avaRect.moveTopRight(rect.topRight());
-+				avaRect.translate(-1, 1);
-+				rect.setRight(avaRect.left() - 1);
-+			}
-+			else {
-+				avaRect.translate(1, 1);
-+				rect.setLeft(avaRect.right() + 1);
-+			}
-+			mp->drawPixmap(avaRect, ava);
-+		}
-+
-+		QPixmap status = showStatusIcons_ ? item->icon() : QPixmap();
-+		int h = rect.height();
-+		int sh = status.isNull() ? 0 : status.height();
-+		rect.setHeight(qMax(sh, fontHeight_));
-+		rect.moveTop(rect.top() + (h - rect.height())/2);
-+		if(!status.isNull()) {
-+			QRect statusRect(rect);
-+			statusRect.setWidth(status.width());
-+			statusRect.setHeight(status.height());
-+			statusRect.translate(1, 1);
-+			mp->drawPixmap(statusRect, status);
-+			rect.setLeft(statusRect.right() + 2);
-+		}
-+		else
-+			rect.setLeft(rect.left() + 2);
-+
-+		mp->setPen(QPen((o.state & QStyle::State_Selected) ? palette.color(QPalette::HighlightedText) : palette.color(QPalette::Text)));
-+		mp->setFont(o.font);
-+		mp->setClipRect(rect);
-+		QTextOption to;
-+		to.setWrapMode(QTextOption::NoWrap);
-+		mp->drawText(rect, index.data(Qt::DisplayRole).toString(), to);
-+
-+		QList<QPixmap> rightPixs;
-+		if(showClients_) {
-+			GCUserView *gcuv = (GCUserView*)item->treeWidget();
-+			GCMainDlg* dlg = gcuv->mainDlg();
-+			QPixmap clientPix;
-+			if(dlg) {
-+				UserListItem u;
-+				const QString &nick = item->text(0);
-+				Jid caps_jid(/*s.mucItem().jid().isEmpty() ? */ dlg->jid().withResource(nick) /* : s.mucItem().jid()*/);
-+				QString client_name = dlg->account()->capsManager()->clientName(caps_jid);
-+				QString client_version = (client_name.isEmpty() ? QString() : dlg->account()->capsManager()->clientVersion(caps_jid));
-+				UserResource ur;
-+				ur.setClient(client_name,client_version,"");
-+				u.userResourceList().append(ur);
-+				QStringList clients = u.clients();
-+				if(!clients.isEmpty())
-+					clientPix = IconsetFactory::iconPixmap("clients/" + clients.takeFirst());
-+			}
-+			if(!clientPix.isNull())
-+				rightPixs.push_back(clientPix);
-+		}
-+
-+		if(showAffiliations_) {
-+			MUCItem::Affiliation a = item->s.mucItem().affiliation();
-+			QPixmap pix;
-+			if(a == MUCItem::Owner)
-+				pix = IconsetFactory::iconPixmap("affiliation/owner");
-+			else if(a == MUCItem::Admin)
-+				pix = IconsetFactory::iconPixmap("affiliation/admin");
-+			else if(a == MUCItem::Member)
-+				pix = IconsetFactory::iconPixmap("affiliation/member");
-+			else if(a == MUCItem::Outcast)
-+				pix = IconsetFactory::iconPixmap("affiliation/outcast");
-+			else
-+				pix = IconsetFactory::iconPixmap("affiliation/noaffiliation");
-+			if(!pix.isNull())
-+				rightPixs.push_back(pix);
-+		}
-+
-+		mp->restore();
-+
-+		if(rightPixs.isEmpty())
-+			return;
-+
-+		int sumWidth = 0;
-+		foreach (const QPixmap& pix, rightPixs) {
-+				sumWidth += pix.width();
-+		}
-+		sumWidth += rightPixs.count();
-+
-+		QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
-+		QColor tbgc = bgc;
-+		tbgc.setAlpha(0);
-+		QLinearGradient grad(rect.right() - sumWidth - 20, 0, rect.right() - sumWidth, 0);
-+		grad.setColorAt(0, tbgc);
-+		grad.setColorAt(1, bgc);
-+		QBrush tbakBr(grad);
-+		QRect gradRect(rect);
-+		gradRect.setLeft(gradRect.right() - sumWidth - 20);
-+		mp->fillRect(gradRect, tbakBr);
-+
-+		QRect iconRect(rect);
-+		for (int i=0; i<rightPixs.size(); i++) {
-+			const QPixmap pix = rightPixs[i];
-+			iconRect.setRight(iconRect.right() - pix.width() -1);
-+			mp->drawPixmap(iconRect.topRight(), pix);
-+		}
-+
- 	}
- 
- 	QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
- 	{
--		return QItemDelegate::sizeHint(option, index);
-+		if(!index.isValid())
-+			return QSize(0,0);
-+
-+		QSize size = QItemDelegate::sizeHint(option, index);
-+		GCUserView *uv = static_cast<GCUserView*>(parent());
-+		if(uv) {
-+			QTreeWidgetItem *i = uv->findEntry(index);
-+			GCUserViewItem *vi = dynamic_cast<GCUserViewItem*>(i);
-+			if(vi) {
-+				int rowH = qMax(fontHeight_, vi->icon().height() + 2);
-+				int h = showAvatar_ ? qMax(avatarSize_ + 2, rowH) : rowH;
-+				size.setHeight(h);
-+			}
-+			else {
-+				size.setHeight(showGroups_ ? fontHeight_ : 0);
-+			}
-+		}
-+
-+		return size;
- 	}
-+
-+private:
-+	QColor colorForeground_, colorBackground_, colorModerator_, colorParticipant_, colorVisitor_, colorNoRole_;
-+	bool showGroups_, slimGroups_, nickColoring_, showClients_, showAffiliations_, showStatusIcons_, showAvatar_, avatarAtLeft_;
-+	int avatarSize_, fontHeight_, avatarRadius_;
- };
- 
- 
-@@ -123,10 +303,21 @@ GCUserViewItem::GCUserViewItem(GCUserVie
- {
- }
- 
-+void GCUserViewItem::setAvatar(const QPixmap &pix)
-+{
-+	avatar_ = pix;
-+	treeWidget()->viewport()->update();
-+}
-+
-+void GCUserViewItem::setIcon(const QPixmap &icon)
-+{
-+	icon_ = icon;
-+}
-+
- bool GCUserViewItem::operator<(const QTreeWidgetItem& it) const
- {	
- 	GCUserViewItem *item = (GCUserViewItem*)(&it);
--	if(PsiOptions::instance()->getOption("options.ui.contactlist.contact-sort-style").toString() == "status") {
-+	if(PsiOptions::instance()->getOption("options.ui.muc.userlist.contact-sort-style").toString() == "status") {
- 		int rank = rankStatus(s.type()) - rankStatus(item->s.type());
- 		if (rank == 0)
- 			rank = QString::localeAwareCompare(text(0).toLower(), it.text(0).toLower());
-@@ -220,7 +412,7 @@ void GCUserView::updateAll()
- 		int count = j->childCount();
- 		for(int num = 0; num < count; num++) {
- 			GCUserViewItem *i = (GCUserViewItem*)j->child(num);
--			i->setIcon(0, PsiIconset::instance()->status(i->s).icon());
-+			i->setIcon(PsiIconset::instance()->status(i->s).pixmap());
- 		}
- 		j->sortChildren(0, Qt::AscendingOrder);
- 	}
-@@ -300,7 +492,7 @@ void GCUserView::updateEntry(const QStri
- 	}
- 
- 	lvi->s = s;
--	lvi->setIcon(0, PsiIconset::instance()->status(lvi->s).icon());
-+	lvi->setIcon(PsiIconset::instance()->status(lvi->s).pixmap());
- 	gr->sortChildren(0, Qt::AscendingOrder);
- }
- 
-@@ -365,6 +557,8 @@ bool GCUserView::maybeTip(const QPoint &
- 	ur.setClient(client_name,client_version,"");
- 	//ur.setClient(QString(),QString(),"");
- 	u.userResourceList().append(ur);
-+	u.setPrivate(true);
-+	u.setAvatarFactory(dlg->account()->avatarFactory());
- 
- 	PsiToolTip::showText(mapToGlobal(pos), u.makeTip(), this);
- 	return true;
-@@ -569,4 +763,10 @@ void GCUserView::mousePressEvent(QMouseE
- 		contextMenuRequested(event->pos());
- }
- 
-+void GCUserView::setLooks()
-+{
-+	((GCUserViewDelegate*)itemDelegate())->updateSettings();
-+	viewport()->update();
-+}
-+
- #include "gcuserview.moc"
---- psi.orig/src/gcuserview.h
-+++ psi/src/gcuserview.h
-@@ -39,10 +39,18 @@ class GCUserViewItem : public QObject, p
- {
- public:
- 	GCUserViewItem(GCUserViewGroupItem *);
-+	void setAvatar(const QPixmap& pix);
-+	QPixmap avatar() const { return avatar_; };
-+	void setIcon(const QPixmap &icon);
-+	QPixmap icon() const { return icon_; };
- 
- 	Status s;
- 
- 	virtual bool operator<  (const QTreeWidgetItem& it) const;
-+
-+private:
-+	QPixmap avatar_;
-+	QPixmap icon_;
- };
- 
- class GCUserViewGroupItem : public QTreeWidgetItem
-@@ -66,6 +74,7 @@ public:
- 	~GCUserView();
- 
- 	void setMainDlg(GCMainDlg* mainDlg);
-+	GCMainDlg* mainDlg() const { return gcDlg_; };
- 	virtual QMimeData* mimeData(const QList<QTreeWidgetItem*>items) const;
- 	void clear();
- 	void updateAll();
-@@ -76,6 +85,7 @@ public:
- 	void removeEntry(const QString &);
- 	QStringList nickList() const;
- 	void doContextMenu(QTreeWidgetItem* it);
-+	void setLooks();
- 
- protected:
- 	enum Role { Moderator = 0, Participant = 1, Visitor = 2 };
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -86,6 +86,7 @@
- #include "lastactivitytask.h"
- #include "psirichtext.h"
- #include "psiwindowheader.h"
-+#include "avatars.h"
- 
- #include "mcmdsimplesite.h"
- 
-@@ -817,6 +818,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 
- 	// Connect signals from MUC manager
- 	connect(d->mucManager,SIGNAL(action_error(MUCManager::Action, int, const QString&)), SLOT(action_error(MUCManager::Action, int, const QString&)));
-+	connect(d->mucManager, SIGNAL(action_success(MUCManager::Action)), ui_.lv_users, SLOT(update()));
- 
- 	setLooks();
- 	setShortcuts();
-@@ -825,6 +827,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(URLObject::getInstance(), SIGNAL(vcardsig(QString)), SLOT(vcard(QString)));
- 
- 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
-+
-+	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
- }
- 
- void GCMainDlg::vcard(const QString& _str)
-@@ -1485,6 +1489,8 @@ void GCMainDlg::presence(const QString &
- 			}
- 		}
- 		ui_.lv_users->updateEntry(nick, s);
-+		if(!nick.isEmpty())
-+			avatarUpdated(jidForNick(nick));
- 	} 
- 	else {
- 		// Unavailable
-@@ -1579,6 +1585,22 @@ void GCMainDlg::presence(const QString &
- 		account()->capsManager()->updateCaps(caps_jid,s.capsNode(),s.capsVersion(),s.capsExt());
- 	}
- 
-+	if(!nick.isEmpty())
-+		account()->avatarFactory()->newMucItem(jidForNick(nick), s);
-+}
-+
-+XMPP::Jid GCMainDlg::jidForNick(const QString &nick) const
-+{
-+	return Jid(jid()).withResource(nick);
-+}
-+
-+void GCMainDlg::avatarUpdated(const Jid &jid_)
-+{
-+	if(jid_.compare(jid(), false)) {
-+		GCUserViewItem *it = dynamic_cast<GCUserViewItem*>(ui_.lv_users->findEntry(jid_.resource()));
-+		if(it)
-+			it->setAvatar(account()->avatarFactory()->getMucAvatar(jid_));
-+	}
- }
- 
- void GCMainDlg::message(const Message &_m)
-@@ -1841,6 +1863,8 @@ void GCMainDlg::setLooks()
- #ifndef Q_WS_MAC
- 	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
- #endif
-+
-+	ui_.lv_users->setLooks();
- }
- 
- void GCMainDlg::optionsUpdate()
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -147,6 +147,7 @@ private slots:
- 	void horizSplitterMoved();
- 	void verticalSplitterMoved(int, int);
- 	void doMinimize();
-+	void avatarUpdated(const Jid& jid);
- 
- 
- 
-@@ -173,6 +174,7 @@ private:
- 	QDateTime lastMsgTime_;
- 
- 	void setMargins();
-+	inline XMPP::Jid jidForNick(const QString &nick) const;
- };
- 
- class GCFindDlg : public QDialog
---- psi.orig/src/options/opt_appearance.cpp
-+++ psi/src/options/opt_appearance.cpp
-@@ -99,6 +99,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
- 	addTab( new OptionsTabIconsetClients(this) );
- 	addTab( new OptionsTabIconsetRoster(this) );
- 	addTab( new OptionsTabIconsetSystem(this) );
-+	addTab( new OptionsTabIconsetAffiliations(this) );
- }
- 
- 
---- psi.orig/src/options/opt_iconset_affiliation.ui
-+++ psi/src/options/opt_iconset_affiliation.ui
-@@ -0,0 +1,88 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>IconsetAffiliation</class>
-+ <widget class="QWidget" name="IconsetAffiliation">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>256</width>
-+    <height>195</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>IconsetClientUI</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <property name="spacing">
-+    <number>6</number>
-+   </property>
-+   <property name="margin">
-+    <number>9</number>
-+   </property>
-+   <item>
-+    <widget class="QGroupBox" name="groupBox10">
-+     <property name="title">
-+      <string>Affiliation iconsets</string>
-+     </property>
-+     <layout class="QGridLayout">
-+      <property name="margin">
-+       <number>8</number>
-+      </property>
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item row="1" column="2">
-+       <spacer>
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+        <property name="sizeType">
-+         <enum>QSizePolicy::Expanding</enum>
-+        </property>
-+        <property name="sizeHint" stdset="0">
-+         <size>
-+          <width>204</width>
-+          <height>20</height>
-+         </size>
-+        </property>
-+       </spacer>
-+      </item>
-+      <item row="1" column="3">
-+       <widget class="IconButton" name="pb_affiliationDetails" native="true">
-+        <property name="text" stdset="0">
-+         <string>&amp;Show Details</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item row="0" column="0" colspan="4">
-+       <widget class="IconsetSelect" name="iss_affiliation" native="true"/>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QProgressBar" name="progress">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11"/>
-+ <customwidgets>
-+  <customwidget>
-+   <class>IconButton</class>
-+   <extends></extends>
-+   <header>iconbutton.h</header>
-+  </customwidget>
-+  <customwidget>
-+   <class>IconsetSelect</class>
-+   <extends></extends>
-+   <header>iconsetselect.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/options/opt_iconset.cpp
-+++ psi/src/options/opt_iconset.cpp
-@@ -28,6 +28,7 @@
- #include "ui_opt_iconset_client.h"
- #include "ui_opt_iconset_system.h"
- #include "ui_opt_iconset_roster.h"
-+#include "ui_opt_iconset_affiliation.h"
- #include "ui_ui_isdetails.h"
- 
- class IconsetEmoUI : public QWidget, public Ui::IconsetEmo
-@@ -60,6 +61,12 @@ public:
- 	IconsetSystemUI() : QWidget() { setupUi(this); }
- };
- 
-+class IconsetAffiliationUI : public QWidget, public Ui::IconsetAffiliation
-+{
-+  public:
-+    IconsetAffiliationUI() : QWidget() { setupUi(this); }
-+};
-+
- class IconsetRosterUI : public QWidget, public Ui::IconsetRoster
- {
- public:
-@@ -963,6 +970,153 @@ void OptionsTabIconsetActivity::cancelTh
- 		thread = 0;
- 	}
- }
-+//----------------------------------------------------------------------------
-+// OptionsTabIconsetAffiliations
-+//----------------------------------------------------------------------------
-+
-+OptionsTabIconsetAffiliations::OptionsTabIconsetAffiliations(QObject *parent)
-+	: OptionsTab(parent, "iconset_affiliations", "", tr("Affiliations"), tr("Select your affiliations iconset"))
-+	, w(0)
-+	, thread(0)
-+{
-+}
-+
-+OptionsTabIconsetAffiliations::~OptionsTabIconsetAffiliations()
-+{
-+	cancelThread();
-+}
-+
-+QWidget *OptionsTabIconsetAffiliations::widget()
-+{
-+	if ( w )
-+		return 0;
-+
-+	w = new IconsetAffiliationUI;
-+	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
-+
-+	connect(d->pb_affiliationDetails, SIGNAL(clicked()), SLOT(previewIconset()));
-+
-+	return w;
-+}
-+
-+void OptionsTabIconsetAffiliations::applyOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
-+
-+	const Iconset *is = d->iss_affiliation->iconset();
-+	if ( is ) {
-+		QFileInfo fi( is->fileName() );
-+		PsiOptions::instance()->setOption("options.iconsets.affiliations", fi.fileName());
-+	}
-+}
-+
-+void OptionsTabIconsetAffiliations::restoreOptions()
-+{
-+	if ( !w || thread )
-+		return;
-+
-+	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
-+
-+	d->iss_affiliation->clear();
-+	QStringList loaded;
-+
-+	d->setCursor(Qt::WaitCursor);
-+
-+	QPalette customPal = d->palette();
-+	customPal.setCurrentColorGroup(QPalette::Inactive);
-+	d->iss_affiliation->setEnabled(false);
-+	d->iss_affiliation->setPalette(customPal);
-+
-+	d->pb_affiliationDetails->setEnabled(false);
-+	d->pb_affiliationDetails->setPalette(customPal);
-+
-+	d->progress->show();
-+	d->progress->setValue( 0 );
-+
-+	numIconsets = countIconsets("/affiliations", loaded);
-+	iconsetsLoaded = 0;
-+
-+	cancelThread();
-+
-+	thread = new IconsetLoadThread(this, "/affiliations");
-+	thread->start();
-+}
-+
-+bool OptionsTabIconsetAffiliations::event(QEvent *e)
-+{
-+	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
-+	if ( e->type() == QEvent::User ) { // iconset load event
-+		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
-+
-+		if ( thread != le->thread() )
-+			return false;
-+
-+		if ( !numIconsets )
-+			numIconsets = 1;
-+		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
-+
-+		Iconset *i = le->iconset();
-+		if ( i ) {
-+			PsiIconset::instance()->stripFirstAnimFrame(i);
-+			d->iss_affiliation->insert(*i);
-+
-+			QFileInfo fi( i->fileName() );
-+			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.affiliations").toString() )
-+				d->iss_affiliation->setItemSelected(d->iss_affiliation->lastItem(), true);
-+
-+			delete i;
-+		}
-+
-+		return true;
-+	}
-+	else if ( e->type() == QEvent::User + 1 ) { // finish event
-+		d->iss_affiliation->setEnabled(true);
-+		d->iss_affiliation->setPalette(QPalette());
-+
-+		d->pb_affiliationDetails->setEnabled(true);
-+		d->pb_affiliationDetails->setPalette(QPalette());
-+
-+		connect(d->iss_affiliation, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
-+
-+		d->progress->hide();
-+
-+		d->unsetCursor();
-+		thread = 0;
-+
-+		return true;
-+	}
-+
-+	return false;
-+}
-+
-+void OptionsTabIconsetAffiliations::previewIconset()
-+{
-+	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
-+	const Iconset *is = d->iss_affiliation->iconset();
-+	if (is) {
-+		isDetails(*is, parentWidget->parentWidget(), psi);
-+	}
-+}
-+
-+void OptionsTabIconsetAffiliations::setData(PsiCon *psicon, QWidget *p)
-+{
-+	psi = psicon;
-+	parentWidget = p;
-+}
-+
-+void OptionsTabIconsetAffiliations::cancelThread()
-+{
-+	if ( thread ) {
-+		threadCancelled.lock();
-+		thread->cancelled = true;
-+		threadCancelled.unlock();
-+
-+		thread = 0;
-+	}
-+}
- 
- //----------------------------------------------------------------------------
- // OptionsTabIconsetClients
---- psi.orig/src/options/opt_iconset.h
-+++ psi/src/options/opt_iconset.h
-@@ -149,6 +149,34 @@ private:
- 	IconsetLoadThread *thread;
- };
- 
-+class OptionsTabIconsetAffiliations : public OptionsTab
-+{
-+	Q_OBJECT
-+public:
-+	OptionsTabIconsetAffiliations(QObject *parent);
-+	~OptionsTabIconsetAffiliations();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	bool stretchable() const { return true; }
-+
-+private slots:
-+	void setData(PsiCon *, QWidget *);
-+	void previewIconset();
-+
-+protected:
-+	bool event(QEvent *);
-+	void cancelThread();
-+
-+private:
-+	QWidget *w, *parentWidget;
-+	PsiCon *psi;
-+
-+	int numIconsets, iconsetsLoaded;
-+	IconsetLoadThread *thread;
-+};
-+
- class OptionsTabIconsetRoster : public OptionsTab
- {
- 	Q_OBJECT
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
-@@ -74,6 +74,7 @@ FORMS += \
- 	$$PWD/opt_iconset_mood.ui \
- 	$$PWD/opt_iconset_activity.ui \
- 	$$PWD/opt_iconset_client.ui \
-+	$$PWD/opt_iconset_affiliation.ui \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -6161,6 +6161,7 @@ void PsiAccount::invokeGCChat(const Jid 
- 	u->setInList(false);
- 	u->setName(j.resource());
- 	u->setPrivate(true);
-+	u->setAvatarFactory(avatarFactory());
- 
- 	// make a resource so the contact appears online
- 	UserResource ur;
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -716,6 +716,7 @@ void PsiChatDlg::updateAvatar()
- 	}
- 
- 	UserListItem *ul = account()->findFirstRelevant(jid());
-+	bool private_ = false;
- 	if (ul && !ul->userResourceList().isEmpty()) {
- 		UserResourceList::Iterator it = ul->userResourceList().find(jid().resource());
- 		if (it == ul->userResourceList().end())
-@@ -723,9 +724,12 @@ void PsiChatDlg::updateAvatar()
- 
- 		res = (*it).name();
- 		client = (*it).clientName();
-+		private_ = ul->isPrivate();
- 	}
- 	//QPixmap p = account()->avatarFactory()->getAvatar(jid().withResource(res),client);
--	QPixmap p = account()->avatarFactory()->getAvatar(jid().withResource(res));
-+	QPixmap p = private_ ?
-+			account()->avatarFactory()->getMucAvatar(jid().withResource(res)) :
-+			account()->avatarFactory()->getAvatar(jid().withResource(res));
- 	if (p.isNull()) {
- 		ui_.avatar->hide();
- 	}
---- psi.orig/src/psicontactlistviewdelegate.cpp
-+++ psi/src/psicontactlistviewdelegate.cpp
-@@ -28,6 +28,7 @@
- #include "coloropt.h"
- #include "contactlistview.h"
- #include "common.h"
-+#include "avatars.h"
- 
- static const QString contactListFontOptionPath = "options.ui.look.font.contactlist";
- static const QString slimGroupsOptionPath = "options.ui.look.contactlist.use-slim-group-headings";
-@@ -158,33 +159,12 @@ QList<QPixmap> PsiContactListViewDelegat
- 
- QPixmap PsiContactListViewDelegate::avatarIcon(const QModelIndex& index) const
- {
--	QPixmap avatar_icon;
- 	int avSize = showAvatars_ ? avatarSize_ : 0;
--	QPixmap av = qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
-+	QPixmap av = index.data(ContactListModel::IsMucRole).toBool() ? QPixmap() : qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
- 	if(av.isNull() && useDefaultAvatar_)
- 		av = IconsetFactory::iconPixmap("psi/default_avatar");
--	int radius;
--	if (avSize && !av.isNull()) {
--		if ( (radius = avatarRadius_) ) {
--			avSize = qMax(avSize, radius*2);
--			av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
--			int w = av.width(), h = av.height();
--			QPainterPath pp;
--			pp.addRoundedRect(0, 0, w, h, radius, radius);
--			avatar_icon = QPixmap(w, h);
--			avatar_icon.fill(QColor(0,0,0,0));
--			QPainter mp(&avatar_icon);
--			mp.setBackgroundMode(Qt::TransparentMode);
--			mp.setRenderHints(QPainter::Antialiasing, true);
--			mp.fillPath(pp, QBrush(av));
--		} else {
--			avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
--		}
--	} else {
--		avatar_icon = QPixmap();
--	}
- 
--	return avatar_icon;
-+	return AvatarFactory::roundedAvatar(av, avatarRadius_, avSize);
- }
- 
- QSize PsiContactListViewDelegate::sizeHint(const QStyleOptionViewItem& /*option*/, const QModelIndex& index) const
---- psi.orig/src/psiiconset.cpp
-+++ psi/src/psiiconset.cpp
-@@ -42,8 +42,8 @@ class PsiIconset::Private
- private:
- 	PsiIconset *psi;
- public:
--	Iconset system, moods, clients, activities;
--	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity;
-+	Iconset system, moods, clients, activities, affiliations;
-+	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity, cur_affiliations;
- 	QStringList cur_emoticons;
- 	QMap<QString, QString> cur_service_status;
- 	QMap<QString, QString> cur_custom_status;
-@@ -288,6 +288,23 @@ public:
- 		return def;
- 	}
- 
-+	Iconset affiliationsIconset(bool *ok)
-+	{
-+		Iconset def;
-+		*ok = def.load( iconsetPath("affiliations/default") );
-+
-+		if ( PsiOptions::instance()->getOption("options.iconsets.affiliations").toString() != "default" ) {
-+			Iconset is;
-+			is.load ( iconsetPath("affiliations/" + PsiOptions::instance()->getOption("options.iconsets.affiliations").toString()) );
-+
-+			loadIconset(&def, &is);
-+		}
-+
-+		stripFirstAnimFrame( def );
-+
-+		return def;
-+	}
-+
- 	QList<Iconset*> emoticons()
- 	{
- 		QList<Iconset*> emo;
-@@ -462,6 +479,21 @@ bool PsiIconset::loadClients()
- 	return ok;
- }
- 
-+bool PsiIconset::loadAffiliations()
-+{
-+	bool ok = true;
-+	QString cur_affiliations = PsiOptions::instance()->getOption("options.iconsets.affiliations").toString();
-+	if (d->cur_affiliations != cur_affiliations) {
-+		Iconset affiliations = d->affiliationsIconset(&ok);
-+		d->loadIconset(&d->affiliations, &affiliations);
-+		d->affiliations.addToFactory();
-+
-+		d->cur_affiliations = cur_affiliations;
-+	}
-+
-+	return ok;
-+}
-+
- bool PsiIconset::loadAll()
- {
- 	if (!loadSystem() || !loadRoster())
-@@ -471,6 +503,7 @@ bool PsiIconset::loadAll()
- 	loadMoods();
- 	loadActivity();
- 	loadClients();
-+	loadAffiliations();
- 	return true;
- }
- 
-@@ -491,6 +524,9 @@ void PsiIconset::optionChanged(const QSt
- 	else if (option == "options.iconsets.clients") {
- 		loadClients();
- 	}
-+	else if (option == "options.iconsets.affiliations") {
-+		loadAffiliations();
-+	}
- 
- 	// currently we rely on PsiCon calling reloadRoster() when
- 	// all options are already applied. otherwise we risk the chance
---- psi.orig/src/psiiconset.h
-+++ psi/src/psiiconset.h
-@@ -47,6 +47,7 @@ public:
- 	Iconset moods;
- 	Iconset activities;
- 	Iconset clients;
-+	Iconset affiliations;
- 	const Iconset &system() const;
- 	void stripFirstAnimFrame(Iconset *);
- 	static void removeAnimation(Iconset *);
-@@ -103,6 +104,8 @@ private:
- 	bool loadMoods();
- 	bool loadActivity();
- 	bool loadClients();
-+	bool loadAffiliations();
-+	
- };
- 
- QString status2name(int s);
---- psi.orig/src/userlist.cpp
-+++ psi/src/userlist.cpp
-@@ -767,14 +767,18 @@ QString UserListItem::makeBareTip(bool t
- 		mucItem = userResourceList()[0].status().hasMUCItem();
- 	}
- 
--	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
-+	if (v_avatarFactory
-+		&& (isPrivate() ? !v_avatarFactory->getMucAvatar(jid().full()).isNull() : !v_avatarFactory->getAvatar(jid().bare()).isNull())
-+		&& PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
-+	{
- 		useAvatar = true;
-+	}
- 	
- 	str += "<table cellspacing=\"3\"><tr>";
- 	str += "<td>";
- 
- 	if (useAvatar) {
--		str += QString("<icon name=\"avatars/%1\">").arg(jid().bare());
-+		str += QString("<icon name=\"avatars/%1\">").arg(isPrivate() ? TextUtil::escape(jid().full()) : jid().bare());
- 		str += "</td><td width=\"10\"></td>";
- 		str += "<td>";
- 	}

psi-plus-main-20130107.tar.xz/patches/1460-psi-filecache-for-avatars.diff Deleted

@@ -1,81 +0,0 @@
---- git.orig/src/avatars.cpp
-+++ git/src/avatars.cpp
-@@ -50,6 +50,7 @@
- #include "vcardfactory.h"
- #include "pepmanager.h"
- #include "pixmaputil.h"
-+#include "filecache.h"
- 
- #define MAX_AVATAR_SIZE 96
- #define MAX_AVATAR_DISPLAY_SIZE 64
-@@ -84,6 +85,34 @@ static QByteArray scaleAvatar(const QByt
- //------------------------------------------------------------------------------
- 
- //------------------------------------------------------------------------------
-+//  AvatarFileCache
-+//------------------------------------------------------------------------------
-+class AvatarFileCache : public FileCache
-+{
-+	Q_OBJECT
-+public:
-+	static AvatarFileCache *instance()
-+	{
-+		if (!_instance) {
-+			_instance = new AvatarFileCache();
-+		}
-+		return _instance;
-+	}
-+
-+private:
-+	AvatarFileCache()
-+		: FileCache(AvatarFactory::getCacheDir(), QApplication::instance())
-+	{
-+	}
-+
-+	static AvatarFileCache *_instance;
-+};
-+
-+AvatarFileCache* AvatarFileCache::_instance = 0;
-+
-+//------------------------------------------------------------------------------
-+
-+//------------------------------------------------------------------------------
- //  Avatar: Base class for avatars.
- //------------------------------------------------------------------------------
- 
-@@ -178,14 +207,15 @@ void CachedAvatar::updateHash(const QStr
- 
- bool CachedAvatar::isCached(const QString& h)
- {
--	return QDir(AvatarFactory::getCacheDir()).exists(h);
-+	return AvatarFileCache::instance()->get(h);
- }
- 
- void CachedAvatar::loadFromCache(const QString& h)
- {
- 	// printf("Loading avatar from cache\n");
- 	hash_ = h;
--	setImage(QImage(QDir(AvatarFactory::getCacheDir()).filePath(h)));
-+	QByteArray ar = AvatarFileCache::instance()->getData(h);
-+	setImage(QImage::fromData(ar));
- 	if (pixmap().isNull()) {
- 		qWarning("CachedAvatar::loadFromCache(): Null pixmap. Unsupported format ?");
- 	}
-@@ -194,16 +224,7 @@ void CachedAvatar::loadFromCache(const Q
- void CachedAvatar::saveToCache(const QByteArray& data)
- {
- 	QString hash = QCA::Hash("sha1").hashToString(data);
--	// printf("Saving %s to cache.\n",hash.latin1());
--	QString fn = QDir(AvatarFactory::getCacheDir()).filePath(hash);
--	QFile f(fn);
--	if (f.open(QIODevice::WriteOnly)) {
--		f.write(data);
--		f.close();
--	}
--	else
--		printf("Error opening %s for writing.\n", qPrintable(f.fileName()));
--	
-+	AvatarFileCache::instance()->append(hash, "img", data);
- }
- 
- //------------------------------------------------------------------------------

psi-plus-main-20130107.tar.xz/patches/1480-psi-always-visible-contacts.diff Deleted

@@ -1,296 +0,0 @@
---- git.orig/src/contactlistgroup.cpp
-+++ git/src/contactlistgroup.cpp
-@@ -334,6 +334,11 @@ bool ContactListGroup::haveOnlineContact
- 	return haveOnlineContacts_;
- }
- 
-+bool ContactListGroup::haveAlwaysVisibleContacts() const
-+{
-+	return haveAlwaysVisibleContacts_;
-+}
-+
- int ContactListGroup::onlineContactsCount() const
- {
- 	return onlineContactsCount_;
-@@ -356,6 +361,7 @@ void ContactListGroup::updateOnlineConta
- 		return;
- 
- 	bool haveOnlineContacts = false;
-+	bool haveAlwaysVisibleContacts = false;
- 	int onlineContactsCount = 0;
- 	int totalContactsCount = 0;
- 	foreach(ContactListItemProxy* item, items_) {
-@@ -368,6 +374,9 @@ void ContactListGroup::updateOnlineConta
- 				++onlineContactsCount;
- 				// break;
- 			}
-+			if (contact->isAlwaysVisible()) {
-+				haveAlwaysVisibleContacts = true;
-+			}
- 		}
- 		else if ((group = dynamic_cast<ContactListGroup*>(item->item()))) {
- 			totalContactsCount += group->totalContactsCount();
-@@ -387,6 +396,11 @@ void ContactListGroup::updateOnlineConta
- 		}
- 	}
- 
-+	if (haveAlwaysVisibleContacts != haveAlwaysVisibleContacts_) {
-+		haveAlwaysVisibleContacts_ = haveAlwaysVisibleContacts;
-+		model_->updatedGroupVisibility(this);
-+	}
-+
- 	if (onlineContactsCount != onlineContactsCount_ ||
- 	    totalContactsCount != totalContactsCount_)
- 	{
---- git.orig/src/contactlistgroup.h
-+++ git/src/contactlistgroup.h
-@@ -52,6 +52,7 @@ public:
- 
- 	bool isFake() const;
- 	bool haveOnlineContacts() const;
-+	bool haveAlwaysVisibleContacts() const;
- 	virtual int onlineContactsCount() const;
- 	virtual int totalContactsCount() const;
- 	int contactsCount() const;
-@@ -122,6 +123,7 @@ private:
- 	QVector<PsiContact*> contacts_;
- 	QVector<ContactListItemProxy*> items_;
- 	bool haveOnlineContacts_;
-+	bool haveAlwaysVisibleContacts_;
- 	int onlineContactsCount_;
- 	int totalContactsCount_;
- 
---- git.orig/src/contactlistproxymodel.cpp
-+++ git/src/contactlistproxymodel.cpp
-@@ -92,6 +92,9 @@ bool ContactListProxyModel::filterAccept
- 		else if (psiContact->isAgent()) {
- 			return showTransports();
- 		}
-+		else if (psiContact->isAlwaysVisible()) {
-+			return true;
-+		}
- 
- 		bool show = true;
- 		if (psiContact->isHidden()) {
-@@ -112,6 +115,10 @@ bool ContactListProxyModel::filterAccept
- 				if (specialGroupType == ContactListGroup::SpecialType_Transports)
- 					return showTransports();
- 			}
-+			ContactListGroup* group = static_cast<ContactListGroup*>(item);
-+			if (group->haveAlwaysVisibleContacts()) {
-+				return true;
-+			}
- 
- 			bool show = true;
- 			if (index.data(Qt::DisplayRole) == PsiContact::hiddenGroupName()) {
-@@ -119,7 +126,6 @@ bool ContactListProxyModel::filterAccept
- 			}
- 
- 			if (!showOffline()) {
--				ContactListGroup* group = static_cast<ContactListGroup*>(item);
- 				return show && group->haveOnlineContacts();
- 			}
- 			else {
---- git.orig/src/profiles.h
-+++ git/src/profiles.h
-@@ -84,6 +84,8 @@ public:
- 	XMPP::Jid dtProxy;
- 	bool ibbOnly;
- 
-+	QStringList alwaysVisibleContacts;
-+
- 	QString optionsBase;
- 
- 	QString stunHost;
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -870,6 +870,37 @@ public:
- 		avCallManager->setStunRelayTcpService(acc.stunHost, acc.stunPort, convert_proxy(acc, jid), acc.stunUser, acc.stunPass);
- 	}
- 
-+	bool isAlwaysVisibleContact(const Jid& jid) const
-+	{
-+		return acc.alwaysVisibleContacts.contains(jid.bare());
-+	}
-+
-+	void setAlwaysVisibleContact(const Jid& jid, bool visible)
-+	{
-+		if(!visible) {
-+			acc.alwaysVisibleContacts.removeAll(jid.bare());
-+		}
-+		else if(!acc.alwaysVisibleContacts.contains(jid.bare())) {
-+			acc.alwaysVisibleContacts.append(jid.bare());
-+		}
-+	}
-+
-+	void updateContacts()
-+	{
-+		QStringList jids;
-+		foreach(PsiContact *pc, contacts) {
-+			const Jid jid = pc->jid();
-+			jids.append(jid.bare());
-+			bool vis = isAlwaysVisibleContact(jid);
-+			if(vis != pc->isAlwaysVisible())
-+				pc->setAlwaysVisible(vis);
-+		}
-+		foreach(const QString& j,  acc.alwaysVisibleContacts) {
-+			if(!jids.contains(j))
-+				acc.alwaysVisibleContacts.removeAll(j);
-+		}
-+	}
-+
- private:
- 	Status lastManualStatus_;
- 
-@@ -1248,6 +1279,8 @@ PsiAccount::PsiAccount(const UserAccount
- 	QTimer::singleShot(0, d, SLOT(loadQueue()));
- 
- 	d->contactList->link(this);
-+
-+	d->updateContacts(); //update always visible contacts state
- }
- 
- PsiAccount::~PsiAccount()
-@@ -1313,6 +1346,11 @@ void PsiAccount::cleanupStream()
- 	d->localAddress = QHostAddress();
- }
- 
-+void PsiAccount::updateAlwaysVisibleContact(PsiContact *pc)
-+{
-+	d->setAlwaysVisibleContact(pc->jid(), pc->isAlwaysVisible());
-+}
-+
- bool PsiAccount::enabled() const
- {
- 	return d->acc.opt_enabled;
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -180,6 +180,8 @@ public:
- 
- 	bool notifyOnline() const;
- 
-+	void updateAlwaysVisibleContact(PsiContact* pc);
-+
- 	void modify();
- 	void reconfigureFTManager();
- 	void changeVCard();
---- git.orig/src/psicontact.cpp
-+++ git/src/psicontact.cpp
-@@ -67,6 +67,7 @@ public:
- 		, statusTimer_(0)
- 		, isValid_(true)
- 		, isAnimated_(false)
-+		, isAlwaysVisible_(false)
- 		, contact_(contact)
- #ifdef YAPSI
- 		, gender_(XMPP::VCard::UnknownGender)
-@@ -108,6 +109,7 @@ public:
- 	Status oldStatus_;
- 	bool isValid_;
- 	bool isAnimated_;
-+	bool isAlwaysVisible_;
- #ifdef YAPSI
- 	bool showOnlineTemporarily_;
- 	bool reconnecting_;
-@@ -550,6 +552,18 @@ bool PsiContact::shouldBeVisible() const
- 	// return ContactListItem::shouldBeVisible();
- }
- 
-+bool PsiContact::isAlwaysVisible() const
-+{
-+	return d->isAlwaysVisible_;
-+}
-+
-+void PsiContact::setAlwaysVisible(bool visible)
-+{
-+	d->isAlwaysVisible_ = visible;
-+	account()->updateAlwaysVisibleContact(this);
-+	emit updated();
-+}
-+
- /**
-  * Standard desired parent.
-  */
---- git.orig/src/psicontact.h
-+++ git/src/psicontact.h
-@@ -70,6 +70,9 @@ public:
- 
- 	virtual void setEditing(bool editing);
- 
-+	bool isAlwaysVisible() const;
-+	void setAlwaysVisible(bool visible);
-+
- 	bool addAvailable() const;
- 	bool removeAvailable() const;
- 	bool authAvailable() const;
---- git.orig/src/psicontactmenu.cpp
-+++ git/src/psicontactmenu.cpp
-@@ -257,6 +257,7 @@ public:
- 	QAction* mucShowAction_;
- 	QAction* mucLeaveAction_;
- 	QAction* blockAction_;
-+	QAction* visibleAction_;
- 
- #endif
- 
-@@ -427,6 +428,9 @@ public:
- 		blockAction_ = new IconAction(tr("Block"), "psi/stop", tr("Block"), 0, this, 0, true);
- 		connect(blockAction_, SIGNAL(triggered(bool)), SLOT(block(bool)));
- 
-+		visibleAction_ = new IconAction(tr("Always Visible"), "psi/eye", tr("Always Visible"), 0, this, 0, true);
-+		connect(visibleAction_, SIGNAL(triggered(bool)), SLOT(setAlwaysVisible(bool)));
-+
- 		if (!contact_->isConference()) {
- 			menu_->addAction(addAuthAction_);
- 			menu_->addSeparator();
-@@ -452,6 +456,7 @@ public:
- 			menu_->addAction(transportLogonAction_);
- 			menu_->addAction(transportLogoffAction_);
- 			menu_->addAction(blockAction_);
-+			menu_->addAction(visibleAction_);
- 			authMenu_ = menu_->addMenu(tr("Authorization"));
- 			authMenu_->addAction(authResendAction_);
- 			authMenu_->addAction(authRerequestAction_);
-@@ -568,6 +573,7 @@ private slots:
- 		}
- 		authMenu_->setEnabled(contact_->account()->isAvailable());
- 		updateBlockActionState();
-+		visibleAction_->setChecked(contact_->isAlwaysVisible());
- 		removeAction_->setVisible(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()  && !contact_->isSelf());
- 		removeAction_->setEnabled(contact_->removeAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.contact.custom-picture").toBool()) {
-@@ -656,6 +662,14 @@ private slots:
- 		contact_->toggleBlockedStateConfirmation();
- 	}
- 
-+	void setAlwaysVisible(bool visible)
-+	{
-+		if (!contact_)
-+			return;
-+
-+		contact_->setAlwaysVisible(visible);
-+	}
-+
- 	void addAuth()
- 	{
- 		if (!contact_)
---- git.orig/src/psi_profiles.cpp
-+++ git/src/psi_profiles.cpp
-@@ -326,6 +326,8 @@ void UserAccount::fromOptions(OptionsTre
- 		tlsOverrideCert = o->getOption(base + ".tls.override-certificate").toByteArray();
- 		tlsOverrideDomain = o->getOption(base + ".tls.override-domain").toString();
- 	}
-+
-+	alwaysVisibleContacts = o->getOption(base + ".always-visible-contacts").toStringList();
- }
- 
- void UserAccount::toOptions(OptionsTree *o, QString base)
-@@ -463,6 +465,8 @@ void UserAccount::toOptions(OptionsTree 
- 	o->setOption(base + ".tls.override-certificate", tlsOverrideCert);
- 	o->setOption(base + ".tls.override-domain", tlsOverrideDomain);
- 	saveLastStatus(o, base);
-+
-+	o->setOption(base + ".always-visible-contacts", alwaysVisibleContacts);
- }
- 
- void UserAccount::fromXml(const QDomElement &a)

psi-plus-main-20130107.tar.xz/patches/1500-psi-hide-any-group.diff Deleted

@@ -1,181 +0,0 @@
---- git.orig/src/contactlistgroup.cpp
-+++ git/src/contactlistgroup.cpp
-@@ -334,6 +334,17 @@ bool ContactListGroup::haveOnlineContact
- 	return haveOnlineContacts_;
- }
- 
-+bool ContactListGroup::isHidden() const
-+{
-+	return model()->groupState()->isHidden(this);
-+}
-+
-+void ContactListGroup::setHidden(bool hidden)
-+{
-+	model_->groupState()->setHidden(this, hidden);
-+	model_->updatedGroupVisibility(this);
-+}
-+
- bool ContactListGroup::haveAlwaysVisibleContacts() const
- {
- 	return haveAlwaysVisibleContacts_;
---- git.orig/src/contactlistgroup.h
-+++ git/src/contactlistgroup.h
-@@ -56,6 +56,8 @@ public:
- 	virtual int onlineContactsCount() const;
- 	virtual int totalContactsCount() const;
- 	int contactsCount() const;
-+	bool isHidden() const;
-+	void setHidden(bool hidden);
- 
- 	QList<PsiContact*> contacts() const;
- 
---- git.orig/src/contactlistgroupmenu.cpp
-+++ git/src/contactlistgroupmenu.cpp
-@@ -57,6 +57,7 @@ class ContactListGroupMenu::Private : pu
- 	QAction* actionMucHide_;
- 	QAction* actionMucShow_;
- 	QAction* actionMucLeave_;
-+	QAction* actionHide_;
- 
- public:
- 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
-@@ -108,6 +109,9 @@ public:
- 		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
- 		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
- 
-+		actionHide_ = new IconAction(tr("Hidden"), "psi/show_hidden", tr("Hidden"), 0, this, 0, true);
-+		connect(actionHide_, SIGNAL(triggered(bool)), SLOT(actHide(bool)));
-+
- 		authMenu_ = 0;
- 
- 		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
-@@ -120,6 +124,8 @@ public:
- 			menu->addAction(sendMessageAction_);
- 			menu->addAction(actionCustomStatus_);
- 			menu->addSeparator();
-+			menu->addAction(actionHide_);
-+			menu_->addSeparator();
- 			authMenu_ = menu->addMenu(tr("Authorization"));
- 			authMenu_->addAction(actionAuth_);
- 			authMenu_->addAction(actionAuthRequest_);
-@@ -152,6 +158,7 @@ private slots:
- 		renameAction_->setEnabled(group->isEditable());
- 		removeGroupAndContactsAction_->setEnabled(group->isRemovable());
- 		removeGroupWithoutContactsAction_->setEnabled(group->isRemovable());
-+		actionHide_->setChecked(group->isHidden());
- #ifdef YAPSI
- 		addGroupAction_->setEnabled(group->model()->contactList()->haveAvailableAccounts());
- #endif
-@@ -302,6 +309,14 @@ private slots:
- 		}
- 	}
- 
-+	void actHide(bool hide)
-+	{
-+		if (!group)
-+			return;
-+
-+		group->setHidden(hide);
-+	}
-+
- #ifdef YAPSI
- 	void addGroup()
- 	{
---- git.orig/src/contactlistgroupstate.cpp
-+++ git/src/contactlistgroupstate.cpp
-@@ -95,6 +95,23 @@ void ContactListGroupState::setGroupOrde
- 	order_[group->fullName()] = order;
- }
- 
-+bool ContactListGroupState::isHidden(const ContactListGroup* group) const
-+{
-+	const QString groupName = group->fullName();
-+	if(hidden_.contains(groupName)) {
-+		return hidden_.value(groupName);
-+	}
-+
-+	return false;
-+}
-+
-+void ContactListGroupState::setHidden(const ContactListGroup* group, bool hidden)
-+{
-+	saveGroupStateTimer_->start();
-+
-+	hidden_[group->fullName()] = hidden;
-+}
-+
- void ContactListGroupState::updateGroupList(const ContactListModel* model)
- {
- 	GroupExpandedState newExpanded;
-@@ -182,6 +199,20 @@ void ContactListGroupState::load(const Q
- 			}
- 		}
- 	}
-+	{
-+		QDomElement hidden = findSubTag(root, "hidden", 0);
-+		if (!hidden.isNull()) {
-+			for (QDomNode n = hidden.firstChild(); !n.isNull(); n = n.nextSibling()) {
-+				QDomElement e = n.toElement();
-+				if (e.isNull())
-+					continue;
-+
-+				if (e.tagName() == "item") {
-+					hidden_[e.attribute("fullName")] = e.text() == "true";
-+				}
-+			}
-+		}
-+	}
- }
- 
- void ContactListGroupState::save()
-@@ -220,6 +251,19 @@ void ContactListGroupState::save()
- 			}
- 		}
- 	}
-+	{
-+		QDomElement hidden = XMLHelper::emptyTag(&doc, "hidden");
-+		root.appendChild(hidden);
-+
-+		QMap<QString, bool>::iterator i = hidden_.begin();
-+		for (; i != hidden_.end(); ++i) {
-+			if (i.value() == true) {
-+				QDomElement item = textTag(&doc, "item", "true");
-+				item.setAttribute("fullName", i.key());
-+				hidden.appendChild(item);
-+			}
-+		}
-+	}
- 
- 	PsiOptions::instance()->setOption(groupStateOptionPath.arg(id_), doc.toString());
- }
---- git.orig/src/contactlistgroupstate.h
-+++ git/src/contactlistgroupstate.h
-@@ -50,6 +50,9 @@ public:
- 	int groupOrder(const ContactListGroup* group) const;
- 	void setGroupOrder(const ContactListGroup* group, int order);
- 
-+	bool isHidden(const ContactListGroup* group) const;
-+	void setHidden(const ContactListGroup* group, bool hidden);
-+
- 	void updateGroupList(const ContactListModel* model);
- 
- 	void load(const QString& id);
-@@ -66,6 +69,7 @@ private:
- 	QString id_;
- 	GroupExpandedState expanded_;
- 	QMap<QString, int> order_;
-+	QMap<QString, bool> hidden_;
- 
- 	QStringList groupNames(const ContactListModel* model, const QModelIndex& parent, QStringList parentName) const;
- };
---- git.orig/src/contactlistproxymodel.cpp
-+++ git/src/contactlistproxymodel.cpp
-@@ -121,7 +121,7 @@ bool ContactListProxyModel::filterAccept
- 			}
- 
- 			bool show = true;
--			if (index.data(Qt::DisplayRole) == PsiContact::hiddenGroupName()) {
-+			if (index.data(Qt::DisplayRole) == PsiContact::hiddenGroupName() || group->isHidden()) {
- 				show = showHidden();
- 			}
-

psi-plus-main-20130107.tar.xz/patches/1510-psi-set-window-icons.diff Deleted

@@ -1,285 +0,0 @@
---- git.orig/src/aboutdlg.cpp
-+++ git/src/aboutdlg.cpp
-@@ -24,12 +24,14 @@
- 
- #include "applicationinfo.h"
- #include "aboutdlg.h"
-+#include "iconset.h"
- 
- AboutDlg::AboutDlg(QWidget* parent)
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/psiplus_logo").icon());
- 
- 	setModal(false);
- 
---- git.orig/src/accountmanagedlg.cpp
-+++ git/src/accountmanagedlg.cpp
-@@ -41,6 +41,7 @@
- #include "psicontactlist.h"
- #include "iconaction.h"
- #include "shortcutmanager.h"
-+#include "iconset.h"
- 
- using namespace XMPP;
- 
-@@ -324,6 +325,7 @@ AccountManageDlg::AccountManageDlg(PsiCo
- :QDialog(0)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/account").icon());
- 	setModal(false);
- #if QT_VERSION >= 0x040500
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
---- git.orig/src/mucjoindlg.cpp
-+++ git/src/mucjoindlg.cpp
-@@ -30,6 +30,7 @@
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
- #include "bookmarkmanager.h"
-+#include "iconset.h"
- 
- MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
- 	: QDialog(0)
-@@ -40,6 +41,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- #endif
- 	setModal(false);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
- 	controller_ = psi;
- 	account_ = 0;
- 	controller_->dialogRegister(this);
---- git.orig/src/options/optionsdlg.cpp
-+++ git/src/options/optionsdlg.cpp
-@@ -499,6 +499,7 @@ OptionsDlg::OptionsDlg(PsiCon *psi, QWid
- 	: QDialog(parent)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/options").icon());
- 	pb_apply = buttonBox->button(QDialogButtonBox::Apply);
- 
- 	setAttribute(Qt::WA_DeleteOnClose);
---- git.orig/src/profiledlg.cpp
-+++ git/src/profiledlg.cpp
-@@ -81,6 +81,7 @@ ProfileOpenDlg::ProfileOpenDlg(const QSt
- 	setupUi(this);
- 	setModal(true);
- 	setWindowTitle(CAP(windowTitle()));
-+	setWindowIcon(IconsetFactory::icon("psi/profile").icon());
- 	pb_open->setDefault(true);
- 
- 	langs = _langs;
---- git.orig/src/statusdlg.cpp
-+++ git/src/statusdlg.cpp
-@@ -71,6 +71,7 @@ StatusShowDlg::StatusShowDlg(const UserL
- 	te->setText(u.makeDesc());
- 
- 	setWindowTitle(tr("Status for %1").arg(JIDUtil::nickOrJid(u.name(), u.jid().full())));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	resize(400,240);
- 
- 	pb->setFocus();
-@@ -112,6 +113,7 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi, 
- 	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: All accounts")));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	d->setStatusMode = setStatusForAccount;
- 	init();
- }
-@@ -128,6 +130,7 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
- 	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	d->setStatusMode = setStatusForAccount;
- 	init();
- }
---- git.orig/src/tipdlg.cpp
-+++ git/src/tipdlg.cpp
-@@ -27,6 +27,7 @@
- 
- #include "psioptions.h"
- #include "psicon.h"
-+#include "iconset.h"
- 
- void TipDlg::show(PsiCon* psi)
- {
-@@ -48,6 +49,7 @@ TipDlg::TipDlg(PsiCon* psi)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/tip").icon());
- 	setModal(false);
- 
- 	psi_->dialogRegister(this);
---- git.orig/src/xmlconsole.cpp
-+++ git/src/xmlconsole.cpp
-@@ -32,6 +32,7 @@
- #include "psiaccount.h"
- #include "psicon.h"
- #include "psicontactlist.h"
-+#include "iconset.h"
- 
- //----------------------------------------------------------------------------
- // XmlConsole
-@@ -40,7 +41,7 @@ XmlConsole::XmlConsole(PsiAccount *_pa)
- :QWidget()
- {
- 	ui_.setupUi(this);
--
-+	setWindowIcon(IconsetFactory::icon("psi/xml").icon());
- 	pa = _pa;
- 	pa->dialogRegister(this);
- 	connect(pa, SIGNAL(updatedAccount()), SLOT(updateCaption()));
---- git.orig/src/psioptionseditor.cpp
-+++ git/src/psioptionseditor.cpp
-@@ -183,6 +183,9 @@ PsiOptionsEditor::PsiOptionsEditor(QWidg
- 		pb_detach->setToolTip(tr("Open a detached option editor window."));
- 		buttonLine->addWidget(pb_detach);
- 		connect(pb_detach, SIGNAL(clicked()), SLOT(detach()));
-+	} else {
-+		setWindowIcon(IconsetFactory::icon("psi/advanced-plus").icon());
-+		setWindowTitle(CAP(tr("Advanced")));
- 	}
- 
- 	
---- git.orig/src/activitydlg.cpp
-+++ git/src/activitydlg.cpp
-@@ -33,7 +33,9 @@ ActivityDlg::ActivityDlg(QList<PsiAccoun
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("activities/other").icon());
- 	setModal(false);
-+
- 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
---- git.orig/src/avcall/calldlg.cpp
-+++ git/src/avcall/calldlg.cpp
-@@ -26,6 +26,7 @@
- #include "common.h"
- #include "psiaccount.h"
- #include "psioptions.h"
-+#include "iconset.h"
- 
- // from opt_avcall.cpp
- extern void options_avcall_update();
-@@ -63,6 +64,7 @@ public:
- 	{
- 		ui.setupUi(q);
- 		q->setWindowTitle(tr("Voice Call"));
-+		q->setWindowIcon(IconsetFactory::icon("psi/avcall").icon());
- 
- 		ui.lb_bandwidth->setEnabled(false);
- 		ui.cb_bandwidth->setEnabled(false);
---- git.orig/src/bookmarkmanagedlg.cpp
-+++ git/src/bookmarkmanagedlg.cpp
-@@ -26,6 +26,7 @@
- 
- #include "bookmarkmanager.h"
- #include "psiaccount.h"
-+#include "iconset.h"
- 
- BookmarkManageDlg::BookmarkManageDlg(PsiAccount* account)
- 	: QDialog()
-@@ -37,6 +38,8 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- #endif
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/bookmarks").icon());
-+
- 	account_->dialogRegister(this);
- 
- 	QAction* removeBookmarkAction = new QAction(this);
---- git.orig/src/contactmanager/contactmanagerdlg.cpp
-+++ git/src/contactmanager/contactmanagerdlg.cpp
-@@ -44,6 +44,7 @@ ContactManagerDlg::ContactManagerDlg(Psi
- 	ui_.setupUi(this);
- 	pa_->dialogRegister(this);
- 	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+	setWindowIcon(IconsetFactory::icon("psi/action_contacts_manager").icon());
- 
- 	um = new ContactManagerModel(this, pa_);
- 	um->reloadUsers();
---- git.orig/src/geolocationdlg.cpp
-+++ git/src/geolocationdlg.cpp
-@@ -27,6 +27,7 @@
- #include "pepmanager.h"
- #include "geolocation.h"
- #include <QLineEdit>
-+#include "iconset.h"
- 
- GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
- {
-@@ -34,7 +35,9 @@ GeoLocationDlg::GeoLocationDlg(QList<Psi
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("system/geolocation").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
- 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
---- git.orig/src/mooddlg.cpp
-+++ git/src/mooddlg.cpp
-@@ -34,7 +34,9 @@ MoodDlg::MoodDlg(QList<PsiAccount*> list
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("mood/").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));	
- 
---- git.orig/src/privacy/privacydlg.cpp
-+++ git/src/privacy/privacydlg.cpp
-@@ -26,6 +26,7 @@
- #include "privacylist.h"
- #include "privacymanager.h"
- #include "privacylistmodel.h"
-+#include "iconset.h"
- 
- // fixme: subscribe on the destroyed() signal of the manager
- 
-@@ -34,6 +35,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 	ui_.setupUi(this);
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setWindowTitle(tr("%1: Privacy Lists").arg(account_name));
-+	setWindowIcon(IconsetFactory::icon("psi/eye").icon());
- #if QT_VERSION >= 0x040500
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- #endif
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -635,7 +635,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	setAcceptDrops(true);
- 
- #ifndef Q_WS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.setupUi(this);
-@@ -1858,7 +1858,7 @@ void GCMainDlg::setLooks()
- 
- 	// update the widget icon
- #ifndef Q_WS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.lv_users->setLooks();
-@@ -2097,6 +2097,7 @@ void GCMainDlg::doBookmark()
- 	formLayout->addRow(tr("&Auto join:"), chkAJoin);
- 	layout->addLayout(formLayout);
- 	layout->addLayout(blayout);
-+	dlg->setWindowIcon(IconsetFactory::icon("psi/bookmark_remove").icon());
- 	dlg->setLayout(layout);
- 	dlg->setMinimumWidth(300);
- 	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));

psi-plus-main-20130107.tar.xz/patches/1520-psi-optionseditor-show-only-first-line.diff Deleted

psi-plus-main-20130107.tar.xz/patches/1530-psi-custom-chat-window-caption.diff Deleted

@@ -1,52 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -108,6 +108,7 @@
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
- 				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
-+				<caption type="QString"></caption>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -646,7 +646,10 @@ void ChatDlg::setSelfDestruct(int minute
- 
- QString ChatDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (pending_ > 0) {
- 		cap += "* ";
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1804,7 +1804,10 @@ void GCMainDlg::doAlert()
- 
- QString GCMainDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (d->pending > 0) {
- 		cap += "* ";
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -540,7 +540,10 @@ void TabDlg::activated()
- 
- QString TabDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 	uint pending = 0;
- 	foreach(TabbableWidget* tab, tabs_) {
- 		pending += tab->unreadMessageCount();

psi-plus-main-20130107.tar.xz/patches/1540-psi-muc-topic-context-menu.diff Deleted

@@ -1,64 +0,0 @@
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -53,6 +53,7 @@
- #include <QCheckBox>
- #include <QDialogButtonBox>
- #include <QFormLayout>
-+#include <QClipboard>
- 
- #include "psicon.h"
- #include "psiaccount.h"
-@@ -212,6 +213,7 @@ public:
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
- 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
-+	QAction *act_copy_muc_jid;
- 	TypeAheadFindBar *typeahead;
- //#ifdef WHITEBOARDING
- //	IconAction *act_whiteboard;
-@@ -731,6 +733,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	d->act_bookmark = new IconAction(this);
- 	connect(d->act_bookmark, SIGNAL(triggered()), SLOT(doBookmark()));
- 	ui_.le_topic->addAction(d->act_bookmark);
-+
-+	d->act_copy_muc_jid = new QAction(tr("Copy MUC JID"), this);
-+	connect(d->act_copy_muc_jid, SIGNAL(triggered()), SLOT(copyMucJid()));
-+	ui_.le_topic->addAction(d->act_copy_muc_jid);
-+
- 	BookmarkManager *bm = account()->bookmarkManager();
- 	d->act_bookmark->setVisible(bm->isAvailable());
- 	if (bm->isAvailable()) {
-@@ -2120,6 +2127,11 @@ void GCMainDlg::doBookmark()
- 	delete dlg;
- }
- 
-+void GCMainDlg::copyMucJid()
-+{
-+	QApplication::clipboard()->setText(jid().bare());
-+}
-+
- void GCMainDlg::doRemoveBookmark()
- {
- 	BookmarkManager *bm = account()->bookmarkManager();
---- git.orig/src/groupchatdlg.h
-+++ git/src/groupchatdlg.h
-@@ -141,6 +141,7 @@ private slots:
- 	void editTemplates();
- 	void doPasteAndSend();
- 	void doBookmark();
-+	void copyMucJid();
- 	void doRemoveBookmark();
- 	void sendTemp(const QString &);
- 	void psButtonEnabled();
---- git.orig/src/infodlg.cpp
-+++ git/src/infodlg.cpp
-@@ -159,7 +159,8 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	d->namesDlg->setLayout(fl);
- 	// end names editing dialog
- 
--	QAction *editnames = new QAction(IconsetFactory::icon(d->type == Self?"psi/options":"psi/info").icon(), "", this);
-+	QAction *editnames = new QAction(IconsetFactory::icon(d->type == Self ? "psi/options" : "psi/info").icon(),
-+									 d->type == Self ? tr("Edit names") : tr("View names") , this);
- 	ui_.le_fullname->addAction(editnames);
- 	ui_.le_fullname->widgetForAction(editnames)->setPopup(d->namesDlg);
- 	d->homepageAction = new QAction(IconsetFactory::icon("psi/arrowRight").icon(), tr("Open web browser"), this);

psi-plus-main-20130107.tar.xz/patches/1550-psi-reasons-for-roles-affiliations.diff Deleted

@@ -1,269 +0,0 @@
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -1470,6 +1470,7 @@ void GCMainDlg::presence(const QString &
- 			// Status change
- 			if ( !d->connecting && options_->getOption("options.muc.show-role-affiliation").toBool() ) {
- 				QString message;
-+				QString reason;
- 				if (contact->s.mucItem().role() != s.mucItem().role() && s.mucItem().role() != MUCItem::NoRole) {
- 					if (contact->s.mucItem().affiliation() != s.mucItem().affiliation()) {
- 						message = tr("%1 is now %2 and %3").arg(nick).arg(MUCManager::roleToString(s.mucItem().role(),true)).arg(MUCManager::affiliationToString(s.mucItem().affiliation(),true));
-@@ -1477,9 +1478,15 @@ void GCMainDlg::presence(const QString &
- 					else {
- 						message = tr("%1 is now %2").arg(nick).arg(MUCManager::roleToString(s.mucItem().role(),true));
- 					}
-+					reason = s.mucItem().reason();
- 				}
- 				else if (contact->s.mucItem().affiliation() != s.mucItem().affiliation()) {
- 					message += tr("%1 is now %2").arg(nick).arg(MUCManager::affiliationToString(s.mucItem().affiliation(),true));
-+					reason = s.mucItem().reason();
-+				}
-+
-+				if(!reason.isEmpty()) {
-+					message += tr(" (Reason: %1)").arg(reason);
- 				}
- 
- 				if (!message.isEmpty()) {
-@@ -1925,20 +1932,45 @@ void GCMainDlg::lv_action(const QString 
- 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
- 		d->mucManager->ban(contact->s.mucItem().jid());
- 	}
--	else if(x == 12) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().role() != MUCItem::Visitor)
--			d->mucManager->setRole(nick, MUCItem::Visitor);
--	}
--	else if(x == 13) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().role() != MUCItem::Participant)
--			d->mucManager->setRole(nick, MUCItem::Participant);
--	}
--	else if(x == 14) {
-+	else if(x > 11 && x < 19) {
-+		MUCReasonsEditor *editor = new MUCReasonsEditor(this);
-+		QString reason;
-+		if (editor->exec())
-+			reason = editor->reason();
-+		delete editor;
- 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().role() != MUCItem::Moderator)
--			d->mucManager->setRole(nick, MUCItem::Moderator);
-+		if (!contact)
-+			return;
-+		switch(x) {
-+		case 12:
-+			if (contact->s.mucItem().role() != MUCItem::Visitor)
-+				d->mucManager->setRole(nick, MUCItem::Visitor, reason);
-+			break;
-+		case 13:
-+			if (contact->s.mucItem().role() != MUCItem::Participant)
-+				d->mucManager->setRole(nick, MUCItem::Participant, reason);
-+			break;
-+		case 14:
-+			if (contact->s.mucItem().role() != MUCItem::Moderator)
-+				d->mucManager->setRole(nick, MUCItem::Moderator, reason);
-+			break;
-+		case 15:
-+			if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
-+				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation, reason);
-+			break;
-+		case 16:
-+			if (contact->s.mucItem().affiliation() != MUCItem::Member)
-+				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Member, reason);
-+			break;
-+		case 17:
-+			if (contact->s.mucItem().affiliation() != MUCItem::Admin)
-+				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Admin, reason);
-+			break;
-+		case 18:
-+			if (contact->s.mucItem().affiliation() != MUCItem::Owner)
-+				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner, reason);
-+			break;
-+		}
- 	}
- 	else if(x >= 100 && x<300) {
- 		// Kick || Ban with reason
-@@ -1966,26 +1998,6 @@ void GCMainDlg::lv_action(const QString 
- 		}
- 
- 	}
--	else if(x == 15) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
--			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation);
--	}
--	else if(x == 16) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().affiliation() != MUCItem::Member)
--			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Member);
--	}
--	else if(x == 17) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().affiliation() != MUCItem::Admin)
--			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Admin);
--	}
--	else if(x == 18) {
--		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
--		if (contact->s.mucItem().affiliation() != MUCItem::Owner)
--			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner);
--	}
- }
- 
- void GCMainDlg::contextMenuEvent(QContextMenuEvent *)
---- git.orig/src/mucreasonseditor.cpp
-+++ git/src/mucreasonseditor.cpp
-@@ -1,48 +1,82 @@
-+/*
-+ * mucreasonseditor.cpp
-+ * Copyright (C)
-+ * 2011 Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
- #include "mucreasonseditor.h"
- #include "common.h"
- #include "psioptions.h"
-+#include "ui_mucreasonseditor.h"
- 
- 
- MUCReasonsEditor::MUCReasonsEditor(QWidget* parent)
- 	: QDialog(parent)
-+	, ui_(new Ui::MUCReasonsEditor)
- {
--	ui_.setupUi(this);
--	ui_.lstReasons->addItems(PsiOptions::instance()->getOption("options.muc.reasons").toStringList());
-+	ui_->setupUi(this);
-+	ui_->lstReasons->addItems(PsiOptions::instance()->getOption("options.muc.reasons").toStringList());
-+
-+	connect(ui_->btnAdd, SIGNAL(clicked()), SLOT(addButtonClicked()));
-+	connect(ui_->btnRemove, SIGNAL(clicked()), SLOT(removeButtonClicked()));
-+	connect(ui_->lstReasons, SIGNAL(currentTextChanged(QString)), SLOT(currentChanged(QString)));
- }
- 
- MUCReasonsEditor::~MUCReasonsEditor()
--{	
-+{
-+	delete ui_;
- }
- 
- void MUCReasonsEditor::accept()
- {
- 	save();
--	reason_=ui_.txtReason->text();
-+	reason_ = ui_->txtReason->text();
- 	QDialog::accept();
- }
- 
--void MUCReasonsEditor::on_btnAdd_clicked()
-+void MUCReasonsEditor::currentChanged(const QString &r)
-+{
-+	ui_->txtReason->setText(r);
-+}
-+
-+void MUCReasonsEditor::addButtonClicked()
- {
--	reason_=ui_.txtReason->text().trimmed();
-+	reason_ = ui_->txtReason->text().trimmed();
- 	if (reason_.isEmpty())
- 		return;
--	ui_.lstReasons->addItem(reason_);
-+	ui_->lstReasons->addItem(reason_);
- }
- 
--void MUCReasonsEditor::on_btnRemove_clicked()
-+void MUCReasonsEditor::removeButtonClicked()
- {
--	int idx=ui_.lstReasons->currentRow();
--	if (idx>=0) {
--		QListWidgetItem *item =ui_.lstReasons->takeItem(idx);
--		if (item) delete item;
-+	int idx = ui_->lstReasons->currentRow();
-+	if (idx >= 0) {
-+		QListWidgetItem *item =ui_->lstReasons->takeItem(idx);
-+		if (item)
-+			delete item;
- 	}
- }
- 
- void MUCReasonsEditor::save()
- {
- 	QStringList reasons;
--	int cnt=ui_.lstReasons->count();
--	for (int i=0; i<cnt; ++i)
--		reasons.append(ui_.lstReasons->item(i)->text());
-+	int cnt = ui_->lstReasons->count();
-+	for (int i = 0; i < cnt; ++i)
-+		reasons.append(ui_->lstReasons->item(i)->text());
- 	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
- }
---- git.orig/src/mucreasonseditor.h
-+++ git/src/mucreasonseditor.h
-@@ -1,9 +1,32 @@
-+/*
-+ * mucreasonseditor.cpp
-+ * Copyright (C)
-+ * 2011 Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
- #ifndef MUCREASONSEDITOR_H
- #define MUCREASONSEDITOR_H
- 
- #include <QDialog>
- 
--#include "ui_mucreasonseditor.h"
-+namespace Ui {
-+	class MUCReasonsEditor;
-+}
- 
- class MUCReasonsEditor: public QDialog
- {
-@@ -12,13 +35,17 @@ public:
- 	MUCReasonsEditor(QWidget* parent = 0);
- 	~MUCReasonsEditor();
- 	QString reason() const { return reason_; }
-+
- private:
--	Ui::MUCReasonsEditor ui_;
-+	Ui::MUCReasonsEditor *ui_;
- 	QString reason_;
-+
- private slots:
--	void on_btnAdd_clicked();
--	void on_btnRemove_clicked();
-+	void addButtonClicked();
-+	void removeButtonClicked();
- 	void save();
-+	void currentChanged(const QString&);
-+
- protected slots:
- 	void accept();
- };

psi-plus-main-20130107.tar.xz/patches/1560-psi-filter-in-discodlg.diff Deleted

@@ -1,101 +0,0 @@
---- git.orig/src/discodlg.cpp
-+++ git/src/discodlg.cpp
-@@ -713,6 +713,9 @@ class DiscoListView : public QTreeWidget
- public:
- 	DiscoListView(QWidget *parent);
- 
-+public slots:
-+	void updateItemsVisibility(const QString& filter);
-+
- protected:
- 	bool maybeTip(const QPoint &);
- 
-@@ -843,6 +846,37 @@ bool DiscoListView::eventFilter(QObject*
- 	return QTreeWidget::eventFilter(o, e);
- }
- 
-+// returns false if parent item should not be hidden (it has visible children)
-+static bool updateItemsRecursively(QTreeWidgetItem* parent, const QString& filter)
-+{
-+	bool hidden = true;
-+	for(int j = 0; j < parent->childCount(); j++) {
-+		QTreeWidgetItem *i = parent->child(j);
-+		if(filter.isEmpty()) {
-+			i->setHidden(false);
-+			updateItemsRecursively(i, filter);
-+		}
-+		else {
-+			bool v = true;
-+			if(i->isExpanded()) {
-+				v = updateItemsRecursively(i, filter);
-+			}
-+			v &= !(i->text(0).contains(filter, Qt::CaseInsensitive) || i->text(1).contains(filter, Qt::CaseInsensitive));
-+			i->setHidden(v);
-+			hidden &= v;
-+		}
-+	}
-+	return hidden;
-+}
-+
-+void DiscoListView::updateItemsVisibility(const QString& filter)
-+{
-+	for(int n = 0; n < topLevelItemCount(); n++) {
-+		QTreeWidgetItem *it = topLevelItem(n);
-+		updateItemsRecursively(it, filter);
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // DiscoDlg::Private
- //----------------------------------------------------------------------------
-@@ -957,9 +991,11 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 	replaceWidget(lv_discoOld, dlg->lv_disco);
- 
- 	dlg->lv_disco->installEventFilter (this);
--	connect(dlg->lv_disco, SIGNAL(currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(itemSelected (QTreeWidgetItem *)));;
-+	dlg->le_filter->installEventFilter(this);
-+	connect(dlg->lv_disco, SIGNAL(currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(itemSelected (QTreeWidgetItem *)));
- 	connect(dlg->lv_disco, SIGNAL(itemExpanded (QTreeWidgetItem *)), SLOT(itemExpanded (QTreeWidgetItem *)));
--	connect(dlg->lv_disco, SIGNAL(itemDoubleClicked (QTreeWidgetItem *, int)), SLOT(itemDoubleclicked (QTreeWidgetItem *)));;
-+	connect(dlg->lv_disco, SIGNAL(itemDoubleClicked (QTreeWidgetItem *, int)), SLOT(itemDoubleclicked (QTreeWidgetItem *)));
-+	connect(dlg->le_filter, SIGNAL(textChanged(QString)), dlg->lv_disco, SLOT(updateItemsVisibility(QString)));
- 
- 	// protocol actions
- 	QSignalMapper *pm = new QSignalMapper(this);
-@@ -1362,6 +1398,13 @@ bool DiscoDlg::Private::eventFilter (QOb
- 			return true;
- 		}
- 	}
-+	else if(object == dlg->le_filter && event->type() == QEvent::KeyPress) {
-+		QKeyEvent *ke = static_cast<QKeyEvent*>(event);
-+		if(ke->key() == Qt::Key_Escape) {
-+			dlg->le_filter->clear();
-+			return true;
-+		}
-+	}
- 
- 	return false;
- }
---- git.orig/src/disco.ui
-+++ git/src/disco.ui
-@@ -120,6 +120,20 @@
-       <widget class="QTreeWidget" name="lv_disco" />
-      </item>
-      <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="label">
-+       <property name="text">
-+        <string>Filter by JID:</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QLineEdit" name="le_filter"/>
-+     </item>
-+    </layout>
-+   </item>
-+     <item>
-       <widget class="QCheckBox" name="ck_autoItems" >
-        <property name="text" >
-         <string>Auto-browse into objects</string>

psi-plus-main-20130107.tar.xz/patches/1580-psi-bookmark-nick-auto-comlition.diff Deleted

@@ -1,80 +0,0 @@
---- git.orig/src/mucjoindlg.cpp
-+++ git/src/mucjoindlg.cpp
-@@ -32,8 +32,12 @@
- #include "bookmarkmanager.h"
- #include "iconset.h"
- 
-+static const int nickConflictCode = 409;
-+static const QString additionalSymbol = "_";
-+
- MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
- 	: QDialog(0)
-+	, nickAlreadyCompleted_(false)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- #if QT_VERSION >= 0x040500
-@@ -243,22 +247,32 @@ void MUCJoinDlg::joined()
- 	controller_->recentGCAdd(jid_.full());
- 	ui_.busy->stop();
- 
-+	nickAlreadyCompleted_ = false;
- 	closeDialogs(this);
- 	deleteLater();
- 	account_->addMucItem(jid_.bare());
- }
- 
--void MUCJoinDlg::error(int, const QString &str)
-+void MUCJoinDlg::error(int error, const QString &str)
- {
--	if(!isVisible())
--		show();
--
- 	ui_.busy->stop();
- 	setWidgetsEnabled(true);
- 
- 	account_->dialogUnregister(this);
- 	controller_->dialogRegister(this);
- 
-+	if(!nickAlreadyCompleted_ && reason_ == MucAutoJoin && error == nickConflictCode) {
-+		nickAlreadyCompleted_ = true;
-+		ui_.le_nick->setText(ui_.le_nick->text() + additionalSymbol);
-+		doJoin(reason_);
-+		return;
-+	}
-+
-+	if(!isVisible())
-+		show();
-+
-+	nickAlreadyCompleted_ = false;
-+
- 	QMessageBox* msg = new QMessageBox(QMessageBox::Information, tr("Error"), tr("Unable to join groupchat.\nReason: %1").arg(str), QMessageBox::Ok, this);
- 	msg->setAttribute(Qt::WA_DeleteOnClose, true);
- 	msg->setModal(false);
-@@ -271,7 +285,7 @@ void MUCJoinDlg::setJid(const Jid& mucJi
- 	ui_.le_room->setText(mucJid.node());
- }
- 
--void MUCJoinDlg::setNick(const QString nick)
-+void MUCJoinDlg::setNick(const QString& nick)
- {
- 	ui_.le_nick->setText(nick);
- }
---- git.orig/src/mucjoindlg.h
-+++ git/src/mucjoindlg.h
-@@ -46,7 +46,7 @@ public:
- 	~MUCJoinDlg();
- 
- 	void setJid(const XMPP::Jid& jid);
--	void setNick(const QString nick);
-+	void setNick(const QString& nick);
- 	void setPassword(const QString& password);
- 
- 	void joined();
-@@ -78,6 +78,7 @@ private:
- 	QPushButton* joinButton_;
- 	XMPP::Jid jid_;
- 	MucJoinReason reason_;
-+	bool nickAlreadyCompleted_;
- 
- 	void disableWidgets();
- 	void enableWidgets();

psi-plus-main-20130107.tar.xz/patches/1590-psi-import-export-bookmarks.diff Deleted

@@ -1,151 +0,0 @@
---- git.orig/src/bookmarkmanagedlg.cpp
-+++ git/src/bookmarkmanagedlg.cpp
-@@ -23,10 +23,13 @@
- #include <QStandardItemModel>
- #include <QPushButton>
- #include <QAction>
-+#include <QFile>
-+#include <QMessageBox>
- 
- #include "bookmarkmanager.h"
- #include "psiaccount.h"
- #include "iconset.h"
-+#include "fileutil.h"
- 
- BookmarkManageDlg::BookmarkManageDlg(PsiAccount* account)
- 	: QDialog()
-@@ -47,6 +50,11 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
- 	removeBookmarkAction->setShortcuts(QKeySequence::Delete);
- 	ui_.listView->addAction(removeBookmarkAction);
- 
-+	ui_.pb_import->setIcon(IconsetFactory::icon("psi/cm_import").icon());
-+	ui_.pb_export->setIcon(IconsetFactory::icon("psi/cm_export").icon());
-+	connect(ui_.pb_import, SIGNAL(clicked()), SLOT(importBookmarks()));
-+	connect(ui_.pb_export, SIGNAL(clicked()), SLOT(exportBookmarks()));
-+
- 	addButton_    = ui_.bookmarkButtonBox->addButton(tr("&Add"),    QDialogButtonBox::ActionRole);
- 	removeButton_ = ui_.bookmarkButtonBox->addButton(tr("&Remove"), QDialogButtonBox::DestructiveRole);
- 	joinButton_   = ui_.bookmarkButtonBox->addButton(tr("&Join"),   QDialogButtonBox::ActionRole);
-@@ -221,3 +229,57 @@ void BookmarkManageDlg::appendItem(QStan
- 	item->setDropEnabled(false);
- 	model_->invisibleRootItem()->appendRow(item);
- }
-+
-+void BookmarkManageDlg::importBookmarks()
-+{
-+	QString fileName = FileUtil::getOpenFileName(this, tr("Import bookmarks"));
-+	if(fileName.isEmpty())
-+		return;
-+
-+	QFile file(fileName);
-+	if(file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-+		QDomDocument doc;
-+		QString error;
-+		if(doc.setContent(&file, &error)) {
-+			QDomElement root = doc.firstChildElement("bookmarks");
-+			if(root.isNull())
-+				return;
-+			QDomElement elem = root.firstChildElement("conference");
-+			while(!elem.isNull()) {
-+				ConferenceBookmark c(elem);
-+
-+				QStandardItem* item = new QStandardItem(c.name());
-+				item->setData(QVariant(c.jid().full()), JidRole);
-+				item->setData(QVariant(c.autoJoin()),   AutoJoinRole);
-+				item->setData(QVariant(c.nick()),       NickRole);
-+				item->setData(QVariant(c.password()),   PasswordRole);
-+				appendItem(item);
-+
-+				elem = elem.nextSiblingElement("conference");
-+			}
-+		}
-+		else {
-+			QMessageBox::warning(this, tr("Error!"), error);
-+		}
-+	}
-+}
-+
-+void BookmarkManageDlg::exportBookmarks()
-+{
-+	QString fileName = FileUtil::getSaveFileName(this, tr("Export bookmarks"), "bookmarks.txt");
-+	if(fileName.isEmpty())
-+		return;
-+
-+	QFile file(fileName);
-+	if(file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
-+		QDomDocument doc;
-+		QDomElement root = doc.createElement("bookmarks");
-+		doc.appendChild(root);
-+		for (int row = 0; row < model_->rowCount(); ++row) {
-+			QModelIndex index = model_->index(row, 0, QModelIndex());
-+			ConferenceBookmark cb = bookmarkFor(index);
-+			root.appendChild(cb.toXml(doc));
-+		}
-+		file.write(doc.toString().toLocal8Bit());
-+	}
-+}
---- git.orig/src/bookmarkmanagedlg.h
-+++ git/src/bookmarkmanagedlg.h
-@@ -68,6 +68,8 @@ private slots:
- 	void joinCurrentRoom();
- 	void closeEditor(QWidget* editor, QAbstractItemDelegate::EndEditHint hint);
- 	void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
-+	void importBookmarks();
-+	void exportBookmarks();
- 
- private:
- 	Ui::BookmarkManage ui_;
---- git.orig/src/bookmarkmanage.ui
-+++ git/src/bookmarkmanage.ui
-@@ -118,13 +118,50 @@
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="0" colspan="2" >
-+   <item row="2" column="1">
-     <widget class="QDialogButtonBox" name="buttonBox" >
-      <property name="standardButtons" >
-       <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-      </property>
-     </widget>
-    </item>
-+   <item row="2" column="0">
-+    <layout class="QHBoxLayout" name="importLayout">
-+     <item>
-+      <widget class="QPushButton" name="pb_import">
-+       <property name="toolTip">
-+        <string>Import bookmarks from file</string>
-+       </property>
-+       <property name="text">
-+        <string>&amp;Import</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_export">
-+       <property name="toolTip">
-+        <string>Export bookmarks to file</string>
-+       </property>
-+       <property name="text">
-+        <string>&amp;Export</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-   </layout>
-  </widget>
-  <resources/>

psi-plus-main-20130107.tar.xz/patches/1610-psi-improve-mini-comands.diff Deleted

@@ -1,93 +0,0 @@
---- git.orig/src/groupchatdlg.cpp
-+++ git/src/groupchatdlg.cpp
-@@ -355,7 +355,10 @@ public slots:
- 
- 	void doMiniCmd()
- 	{
--		mCmdManager.open(new MCmdSimpleState(MCMDMUC, tr("Command") + '>'), QStringList() );
-+		if(mCmdManager.isActive())
-+			mCmdManager.processCommand(QString());
-+		else
-+			mCmdManager.open(new MCmdSimpleState(MCMDMUC, tr("Command") + '>'), QStringList() );
- 	}
- 
- public:
-@@ -365,11 +368,7 @@ public:
- 			if (command.count() > 0) cmd = command[0].toLower();
- 	/*
- TODO:
--topic <topic>
--invite <jid>
- part [message]
--kick <jid|nickname> [comment]
--ban <jid|nickname>
- 
- Maybe?:
- join <channel>{,<channel>}
-@@ -399,6 +398,32 @@ join <channel>{,<channel>} [pass{,<pass>
- 			} else if(cmd == "sping") {
- 				doSPing();
- 				newstate = 0;
-+			} else if(cmd == "kick" && command.count() > 1) {
-+				command.removeFirst();
-+				const QString nick = command.takeFirst().trimmed();
-+				QString reason;
-+				if(!command.isEmpty()) {
-+					reason = command.join(" ");
-+				}
-+				mucManager->kick(nick, reason);
-+			} else if(cmd == "ban" && command.count() > 1) {
-+				command.removeFirst();
-+				QString nick = command.takeFirst().trimmed();
-+				GCUserViewItem *contact = dynamic_cast<GCUserViewItem*>( dlg->ui_.lv_users->findEntry(nick) );
-+				if(contact && !contact->s.mucItem().jid().isEmpty()) {
-+					nick = contact->s.mucItem().jid().bare();
-+				}
-+				QString reason;
-+				if(!command.isEmpty()) {
-+					reason = command.join(" ").trimmed();
-+				}
-+				mucManager->ban(Jid(nick), reason);
-+			} else if(cmd == "invite" && command.count() > 1) {
-+				dlg->account()->actionInvite(Jid(command[1].trimmed()), dlg->jid().bare());
-+			} else if(cmd == "topic" && command.count() > 1) {
-+				command.removeFirst();
-+				const QString topic = command.join(" ").trimmed();
-+				dlg->setTopic(topic);
- 			} else if (cmd == "version" && command.count() > 1) {
- 				QString nick = command[1].trimmed();
- 				Jid target = dlg->jid().withResource(nick);
-@@ -419,6 +444,8 @@ join <channel>{,<channel>} [pass{,<pass>
- 				preset = command;
- 				newstate = oldstate;
- 				return true;
-+			} else if (cmd == "leave") {
-+				dlg->close();
- 			} else if (!cmd.isEmpty()) {
- 				return false;
- 			}
-@@ -435,10 +462,21 @@ join <channel>{,<channel>} [pass{,<pass>
- 		if (state->getName() == MCMDMUC) {
- 			QString spaceAtEnd = QString(QChar(0));
- 			if (item == 0) {
--				all << "clear" + spaceAtEnd << "nick" + spaceAtEnd << "sping" + spaceAtEnd << "version" + spaceAtEnd << "idle" + spaceAtEnd << "quote" + spaceAtEnd;
--			} else if (item == 1 && (partcommand[0] == "version" || partcommand[0] == "idle")) {
--				all = dlg->ui_.lv_users->nickList();
-+				all << "clear" + spaceAtEnd << "nick" + spaceAtEnd << "kick" + spaceAtEnd << "leave" + spaceAtEnd
-+				<< "ban" + spaceAtEnd << "sping" + spaceAtEnd << "version" + spaceAtEnd  << "invite" + spaceAtEnd
-+				<< "idle" + spaceAtEnd << "quote" + spaceAtEnd  << "topic" + spaceAtEnd;
-+			} else if (item == 1) {
-+				if (partcommand[0] == "version" || partcommand[0] == "idle" || partcommand[0] == "kick" || partcommand[0] == "ban") {
-+					all = dlg->ui_.lv_users->nickList();
-+				} else if (partcommand[0] == "topic") {
-+					all << dlg->topic();
-+				}
-+			} else if (item == 2) {
-+				if (partcommand[0] == "kick" || partcommand[0] == "ban") {
-+					all << PsiOptions::instance()->getOption("options.muc.reasons").toStringList();
-+				}
- 			}
-+
- 		}
- 		QStringList res;
- 		foreach(QString cmd, all) {

psi-plus-main-20130107.tar.xz/patches/1620-psi-action-unregister-in-discodlg.diff Deleted

@@ -1,106 +0,0 @@
---- git.orig/src/discodlg.cpp
-+++ git/src/discodlg.cpp
-@@ -925,7 +925,7 @@ public: // data
- 	IconAction *actBrowse, *actBack, *actForward, *actRefresh, *actStop;
- 
- 	// custom actions, that will be added to toolbar and context menu
--	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
-+	IconAction *actRegister, *actUnregister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
- 
- 	typedef QList<History*> HistoryList;
- 	HistoryList backHistory, forwardHistory;
-@@ -1030,6 +1030,9 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 	actRegister = new IconAction (tr("Register"), "psi/register", tr("&Register"), 0, dlg);
- 	connect (actRegister, SIGNAL(triggered()), sm, SLOT(map()));
- 	sm->setMapping(actRegister, Features::FID_Register);
-+	actUnregister = new IconAction (tr("Unregister"), "psi/cancel", tr("&Unregister"), 0, dlg);
-+	connect (actUnregister, SIGNAL(triggered()), sm, SLOT(map()));
-+	sm->setMapping(actUnregister, Features::FID_Gateway);
- 	actSearch = new IconAction (tr("Search"), "psi/search", tr("&Search"), 0, dlg);
- 	connect (actSearch, SIGNAL(triggered()), sm, SLOT(map()));
- 	sm->setMapping(actSearch, Features::FID_Search);
-@@ -1067,6 +1070,7 @@ DiscoDlg::Private::Private(DiscoDlg *par
- 	// custom actions
- 	toolBar->addSeparator();
- 	toolBar->addAction(actRegister);
-+	toolBar->addAction(actUnregister);
- 	toolBar->addAction(actSearch);
- 	toolBar->addAction(actJoin);
- 
-@@ -1243,6 +1247,7 @@ void DiscoDlg::Private::enableButtons(co
- 	// custom actions
- 	Features f = it.features();
- 	actRegister->setEnabled( f.canRegister() );
-+	actUnregister->setEnabled( f.canRegister() );
- 	actSearch->setEnabled( f.canSearch() );
- 	actJoin->setEnabled( f.canGroupchat() );
- 	actAdd->setEnabled( itemSelected );
-@@ -1370,6 +1375,7 @@ bool DiscoDlg::Private::eventFilter (QOb
- 			// custom actions
- 			p.addSeparator();
- 			actRegister->addTo(&p);
-+			actUnregister->addTo(&p);
- 			actSearch->addTo(&p);
- 			actJoin->addTo(&p);
- 
-@@ -1378,7 +1384,7 @@ bool DiscoDlg::Private::eventFilter (QOb
- 			actVCard->addTo(&p);
- 			actAHCommand->addTo(&p);
- 			actQueryVersion->addTo(&p);
--			
-+
- 			// popup with all available features
- 			QMenu *fm = new QMenu(&p);
- 			QHash<QAction*, int> actions;
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3352,8 +3352,12 @@ void PsiAccount::featureActivated(QStrin
- 		actionExecuteCommand(jid, node);
- 	else if ( f.canDisco() )
- 		actionDisco(jid, node);
--	else if ( f.isGateway() )
--		; // TODO
-+	else if ( f.isGateway() ) {
-+		if(QMessageBox::question(0, tr("Unregister from %1").arg(jid.bare()),
-+					 tr("Are you sure?"),
-+					 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
-+			actionUnregister(jid);
-+	}
- 	else if ( f.haveVCard() )
- 		actionInfo(jid);
- 	else if ( f.id() == Features::FID_Add ) {
-@@ -4388,6 +4392,13 @@ void PsiAccount::actionRegister(const Ji
- 	}
- }
- 
-+void PsiAccount::actionUnregister(const Jid &j)
-+{
-+	JT_UnRegister *ju = new JT_UnRegister(d->client->rootTask());
-+	ju->unreg(j);
-+	ju->go(true);
-+}
-+
- void PsiAccount::actionSearch(const Jid &j)
- {
- 	if(!checkConnected())
-@@ -4750,9 +4761,7 @@ void PsiAccount::dj_remove(const Jid &j)
- 
- 		// if it looks like a transport, unregister (but not if it is the server!!)
- 		if(u->isTransport() && !Jid(d->client->host()).compare(u->jid())) {
--			JT_UnRegister *ju = new JT_UnRegister(d->client->rootTask());
--			ju->unreg(j);
--			ju->go(true);
-+			actionUnregister(j);
- 		}
- 	}
- }
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -352,6 +352,7 @@ public slots:
- 	void actionGroupsSet(const Jid &, const QStringList &);
- 	void actionHistoryBox(PsiEvent *);
- 	void actionRegister(const Jid &);
-+	void actionUnregister(const Jid &);
- 	void actionSearch(const Jid &);
- 	void actionManageBookmarks();
- 	void actionJoin(const Jid& mucJid, const QString& password = QString());

psi-plus-main-20130107.tar.xz/patches/1640-psi-idle-server.diff Deleted

@@ -1,144 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -678,6 +678,7 @@ QLineEdit#le_status_text {
- 		</p2p>
- 		<service-discovery>
- 			<enable-entity-capabilities type="bool">true</enable-entity-capabilities>
-+			<last-activity type="bool">true</last-activity>
- 		</service-discovery>
- 		<status>
- 			<ask-for-message-on-offline type="bool">false</ask-for-message-on-offline>
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -307,6 +307,48 @@ bool BlockTransportPopupList::find(const
- 	return false;
- }
- 
-+
-+//----------------------------------------------------------------------------
-+// IdleServer
-+//----------------------------------------------------------------------------
-+class IdleServer : public XMPP::Task
-+{
-+	Q_OBJECT
-+public:
-+	IdleServer(PsiAccount *pa, Task *parent)
-+		: Task(parent)
-+		, pa_(pa)
-+	{
-+	}
-+
-+	~IdleServer()
-+	{
-+	}
-+
-+	bool take(const QDomElement &e)
-+	{
-+		if (e.tagName() != "iq" || e.attribute("type") != "get")
-+			return false;
-+
-+		const QString ns = queryNS(e, "query");
-+		if (ns == "jabber:iq:last") {
-+			QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
-+			QDomElement query = doc()->createElement("query");
-+			query.setAttribute("xmlns", ns);
-+			iq.appendChild(query);
-+			query.setAttribute("seconds", pa_->psi()->idle());
-+
-+			send(iq);
-+			return true;
-+		}
-+		return false;
-+	}
-+
-+private:
-+	PsiAccount *pa_;
-+};
-+
-+
- //----------------------------------------------------------------------------
- // PsiAccount
- //----------------------------------------------------------------------------
-@@ -1191,6 +1233,12 @@ PsiAccount::PsiAccount(const UserAccount
- 	PluginManager::instance()->addAccount(this, d->client);
- #endif
- 
-+	//Idle server
-+	if(PsiOptions::instance()->getOption("options.service-discovery.last-activity").toBool()) {
-+		new IdleServer(this, d->client->rootTask());
-+		d->client->addExtension("last-act", QStringList("jabber:iq:last"));
-+	}
-+
- 	// HTML
- 	if(PsiOptions::instance()->getOption("options.html.chat.render").toBool())
- 		d->client->addExtension("html",Features("http://jabber.org/protocol/xhtml-im"));
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -309,7 +309,7 @@ public:
- 
- 	struct IdleSettings
- 	{
--		IdleSettings()
-+		IdleSettings() : secondsIdle(0)
- 		{}
- 
- 		void update()
-@@ -322,10 +322,13 @@ public:
- 			notAvailableAfter = o->getOption("options.status.auto-away.not-availible-after").toInt();
- 			awayAfter = o->getOption("options.status.auto-away.away-after").toInt();
- 			menuXA = o->getOption("options.ui.menu.status.xa").toBool();
-+			useIdleServer = o->getOption("options.service-discovery.last-activity").toBool();
- 		}
- 
- 		bool useOffline, useNotAvailable, useAway, menuXA;
- 		int offlineAfter, notAvailableAfter, awayAfter;
-+		int secondsIdle;
-+		bool useIdleServer;
- 	};
- 
- 	IdleSettings idleSettings_;
-@@ -1395,10 +1398,12 @@ void PsiCon::optionChanged(const QString
- 
- 	//Idle server
- 	d->idleSettings_.update();
--	if(d->idleSettings_.useAway || d->idleSettings_.useNotAvailable || d->idleSettings_.useOffline)
-+	if(d->idleSettings_.useAway || d->idleSettings_.useNotAvailable || d->idleSettings_.useOffline || d->idleSettings_.useIdleServer)
- 		d->idle.start();
--	else
-+	else {
- 		d->idle.stop();
-+		d->idleSettings_.secondsIdle = 0;
-+	}
- 
- 	if (option == "options.ui.notifications.alert-style") {
- 		alertIconUpdateAlertStyle();
-@@ -1911,6 +1916,7 @@ void PsiCon::aboutToQuit()
- 
- void PsiCon::secondsIdle(int sec)
- {
-+	d->idleSettings_.secondsIdle = sec;
- 	int minutes = sec / 60;
- 	PsiAccount::AutoAway aa;
- 
-@@ -1928,6 +1934,11 @@ void PsiCon::secondsIdle(int sec)
- 	}
- }
- 
-+int PsiCon::idle() const
-+{
-+	return d->idleSettings_.secondsIdle;
-+}
-+
- ContactUpdatesManager* PsiCon::contactUpdatesManager() const
- {
- 	return contactUpdatesManager_;
---- psi.orig/src/psicon.h
-+++ psi/src/psicon.h
-@@ -90,6 +90,7 @@ public:
- 	QWidget *dialogFind(const char *className);
- 	void dialogRegister(QWidget *w);
- 	void dialogUnregister(QWidget *w);
-+	int idle() const;
- 
- 	QMenuBar* defaultMenuBar() const;
-

psi-plus-main-20130107.tar.xz/patches/1650-psi-reasons-in-muc-config-dlg.diff Deleted

@@ -1,71 +0,0 @@
---- git.orig/src/mucaffiliationsmodel.cpp
-+++ git/src/mucaffiliationsmodel.cpp
-@@ -27,7 +27,7 @@
- using namespace XMPP;
- 
- 
--MUCAffiliationsModel::MUCAffiliationsModel() : QStandardItemModel(Unknown,1) 
-+MUCAffiliationsModel::MUCAffiliationsModel() : QStandardItemModel(Unknown,2)
- { 
- 	QFont font;
- 	font.setBold(true);
-@@ -37,8 +37,10 @@ MUCAffiliationsModel::MUCAffiliationsMod
- 		setData(ind,QVariant(affiliationlistindexToString((AffiliationListIndex) i)));
- 		setData(ind,font_variant,Qt::FontRole);
- 		insertColumns(0,1,ind);
-+		insertColumns(1,1,ind);
- 		enabled_[(AffiliationListIndex) i] = false;
- 	}
-+	setHorizontalHeaderLabels(QStringList() << tr("JID") << tr("Reason"));
- }
- 
- Qt::ItemFlags MUCAffiliationsModel::flags(const QModelIndex &index) const
-@@ -63,9 +65,13 @@ Qt::DropActions MUCAffiliationsModel::su
- 
- bool MUCAffiliationsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int, const QModelIndex &parent)
- {
--	if (!data || action != Qt::MoveAction || !(data->hasFormat("application/vnd.text.list") || data->hasFormat("text/plain")))
-+	if ( (parent.isValid() && parent.column() != 0)
-+		|| !data || action != Qt::MoveAction
-+		|| !( data->hasFormat("application/vnd.text.list") || data->hasFormat("text/plain") ) )
-+	{
- 		return false;
--	
-+	}
-+
- 	// Decode the data
- 	QStringList newItems;
- 	int nb_rows = 0;
-@@ -130,7 +136,7 @@ QMimeData* MUCAffiliationsModel::mimeDat
- 	QByteArray encodedData;
- 	QDataStream stream(&encodedData, QIODevice::WriteOnly);
- 	foreach (QModelIndex index, indexes) {
--		if (index.isValid()) {
-+		if (index.isValid() && index.column() == 0) {
- 			QString text = data(index, Qt::DisplayRole).toString();
- 			stream << text;
- 		}
-@@ -220,6 +226,7 @@ void MUCAffiliationsModel::addItems(cons
- 			}
- 			insertRows(row,1,list);
- 			setData(index(row,0,list),QVariant(item.jid().full()));
-+			setData(index(row,1,list),QVariant(item.reason()));
- 			MUCItem i(MUCItem::UnknownRole,item.affiliation());
- 			i.setJid(item.jid());
- 			items_ += i;
---- git.orig/src/mucaffiliationsview.cpp
-+++ git/src/mucaffiliationsview.cpp
-@@ -26,11 +26,12 @@
- MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent)
- {
- 	setRootIsDecorated(false);
--	header()->hide();
-+	header()->setResizeMode(QHeaderView::ResizeToContents);
- 	setItemsExpandable(false);
- 	setDragEnabled(true);
- 	setAcceptDrops(true);
- 	setDropIndicatorShown(true);
-+	setSelectionBehavior(QAbstractItemView::SelectRows);
- }
- 
- void MUCAffiliationsView::removeCurrent()

psi-plus-main-20130107.tar.xz/patches/1660-psi-chat-avatar.diff Deleted

@@ -1,40 +0,0 @@
---- git.orig/src/chatdlg.ui
-+++ git/src/chatdlg.ui
-@@ -372,6 +372,9 @@
-            <property name="text" >
-             <string>Avatar</string>
-            </property>
-+           <property name="alignment">
-+            <set>Qt::AlignCenter</set>
-+           </property>
-           </widget>
-          </item>
-         </layout>
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -731,13 +731,19 @@ void PsiChatDlg::updateAvatar()
- 			account()->avatarFactory()->getMucAvatar(jid().withResource(res)) :
- 			account()->avatarFactory()->getAvatar(jid().withResource(res));
- 	if (p.isNull()) {
--		ui_.avatar->hide();
--	}
--	else {
--		int size = PsiOptions::instance()->getOption("options.ui.chat.avatars.size").toInt();
--		ui_.avatar->setPixmap(p.scaled(QSize(size, size), Qt::KeepAspectRatio, Qt::SmoothTransformation));
--		ui_.avatar->show();
-+		if (!PsiOptions::instance()->getOption("options.ui.contactlist.avatars.use-default-avatar").toBool()) {
-+			ui_.avatar->hide();
-+			return;
-+		}
-+		p = IconsetFactory::iconPixmap("psi/default_avatar");
- 	}
-+	int optSize = PsiOptions::instance()->getOption("options.ui.chat.avatars.size").toInt();
-+	ui_.avatar->setFixedSize(optSize, optSize);
-+	int avatarSize = p.width(); //qMax(p.width(), p.height());
-+	if (avatarSize > optSize)
-+		avatarSize = optSize;
-+	ui_.avatar->setPixmap(p.scaled(QSize(avatarSize, avatarSize), Qt::KeepAspectRatio, Qt::SmoothTransformation));
-+	ui_.avatar->show();
- }
- 
- void PsiChatDlg::optionsUpdate()

psi-plus-main-20130107.tar.xz/patches/1670-psi-rename-privacy-list.diff Deleted

@@ -1,60 +0,0 @@
---- git.orig/src/privacy/privacydlg.cpp
-+++ git/src/privacy/privacydlg.cpp
-@@ -59,6 +59,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 
- 	connect(ui_.pb_newList,SIGNAL(clicked()),SLOT(newList()));
- 	connect(ui_.pb_deleteList,SIGNAL(clicked()),SLOT(removeList()));
-+	connect(ui_.pb_renameList,SIGNAL(clicked()),SLOT(renameList()));
- 	
- 	connect(ui_.pb_add,SIGNAL(clicked()),SLOT(addRule()));
- 	connect(ui_.pb_edit,SIGNAL(clicked()),SLOT(editCurrentRule()));
-@@ -357,3 +358,23 @@ void PrivacyDlg::removeList()
- 	manager_->changeList(model_.list());
- 	manager_->requestListNames();
- }
-+
-+void PrivacyDlg::renameList()
-+{
-+	QString newName = QInputDialog::getText(this, tr("Rename List"), tr("Input new name"));
-+	if(newName.isEmpty()) {
-+		return;
-+	}
-+	PrivacyList tmp = model_.list();
-+	model_.list().setName(newName);
-+	tmp.clear();
-+	manager_->changeList(model_.list());
-+	if(ui_.cb_default->currentText() == tmp.name()) {
-+		manager_->changeDefaultList(newName);
-+	}
-+	if(ui_.cb_active->currentText() == tmp.name()) {
-+		manager_->changeActiveList(newName);
-+	}
-+	manager_->changeList(tmp);
-+	manager_->requestListNames();
-+}
---- git.orig/src/privacy/privacydlg.h
-+++ git/src/privacy/privacydlg.h
-@@ -70,6 +70,7 @@ protected slots:
- 	void applyList();
- 	void newList();
- 	void removeList();
-+	void renameList();
- 
- private:
- 	Ui::Privacy ui_;
---- git.orig/src/privacy/privacy.ui
-+++ git/src/privacy/privacy.ui
-@@ -117,6 +117,13 @@
-          </widget>
-         </item>
-         <item>
-+         <widget class="QPushButton" name="pb_renameList">
-+          <property name="text">
-+           <string>Rename List</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-          <widget class="QPushButton" name="pb_deleteList">
-           <property name="text">
-            <string>Delete List</string>

psi-plus-main-20130107.tar.xz/patches/1680-psi-execute-command-in-muc-roster-menu.diff Deleted

psi-plus-main-20130107.tar.xz/patches/1690-psi-active-contacts-tool-button.diff Deleted

@@ -1,325 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -526,6 +526,7 @@ QLineEdit#le_status_text {
- 				<show_self type="QKeySequence" comment="Show Self"></show_self>
- 				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
- 				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
-+				<active_contacts type="QKeySequence" comment="Active contacts"/>
- 				<status_all type="QKeySequence" comment="Status All"></status_all>
- 				<status_group type="QKeySequence" comment="Status Group"></status_group>
- 				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
---- /dev/null
-+++ git/src/activecontactsmenu.cpp
-@@ -0,0 +1,70 @@
-+/*
-+ * activecontactsmenu.cpp
-+ * Copyright (C) 2011  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "activecontactsmenu.h"
-+#include "psiaccount.h"
-+#include "psicontact.h"
-+#include "psiiconset.h"
-+#include "psicon.h"
-+
-+
-+class ActiveContactAction : public QAction
-+{
-+	Q_OBJECT
-+public:
-+	ActiveContactAction(const QString& jid, const QString& nick, const QIcon& icon, PsiAccount* pa, QMenu* parent)
-+		: QAction(icon, nick, parent)
-+		, pa_(pa)
-+		, jid_(jid)
-+	{
-+		parent->addAction(this);
-+		connect(this, SIGNAL(triggered()), SLOT(actionActivated()));
-+	}
-+
-+private slots:
-+	void actionActivated()
-+	{
-+		pa_->actionDefault(Jid(jid_));
-+	}
-+
-+private:
-+	PsiAccount* pa_;
-+	QString jid_;
-+};
-+
-+
-+
-+ActiveContactsMenu::ActiveContactsMenu(PsiCon *psi, QWidget *parent)
-+	: QMenu(parent)
-+	, psi_(psi)
-+{
-+	foreach(PsiAccount *pa, psi_->contactList()->accounts()) {
-+		if(!pa->enabled())
-+			continue;
-+
-+		QList<PsiContact*> list = pa->activeContacts();
-+		foreach(PsiContact* pc, list) {
-+			new ActiveContactAction(pc->jid().full(), pc->name(), PsiIconset::instance()->statusPtr(pc->jid(), pc->status())->icon(), pa, this);
-+		}
-+	}
-+}
-+
-+
-+#include "activecontactsmenu.moc"
---- /dev/null
-+++ git/src/activecontactsmenu.h
-@@ -0,0 +1,38 @@
-+/*
-+ * activecontactsmenu.h
-+ * Copyright (C) 2011  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef ACTIVECONTACTSMENU_H
-+#define ACTIVECONTACTSMENU_H
-+
-+#include <QMenu>
-+
-+class PsiCon;
-+
-+class ActiveContactsMenu : public QMenu
-+{
-+	Q_OBJECT
-+public:
-+	ActiveContactsMenu(PsiCon* psi, QWidget* parent);
-+
-+private:
-+	PsiCon* psi_;
-+};
-+
-+#endif
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -75,6 +75,7 @@
- #include "mooddlg.h"
- #include "activitydlg.h"
- #include "geolocationdlg.h"
-+#include "activecontactsmenu.h"
- 
- #include "mainwin_p.h"
- 
-@@ -664,6 +665,8 @@ void MainWin::registerAction( IconAction
- 	} actionlist[] = {
- 		{ "choose_status", activated, this, SLOT( actChooseStatusActivated() ) },
- 		{ "reconnect_all", activated, this, SLOT( actReconnectActivated() ) },
-+
-+		{ "active_contacts",activated, this, SLOT( actActiveContacts() ) },
- #ifndef NEWCONTACTLIST
- 		{ "show_offline", toggled, cvlist, SLOT( setShowOffline(bool) ) },
- 		{ "show_away",    toggled, cvlist, SLOT( setShowAway(bool) ) },
-@@ -1250,6 +1253,14 @@ void MainWin::actSetGeolocActivated()
- 	}
- }
- 
-+void MainWin::actActiveContacts()
-+{
-+	ActiveContactsMenu* acm = new ActiveContactsMenu(d->psi, this);
-+	if(!acm->actions().isEmpty())
-+		acm->exec(QCursor::pos());
-+	delete acm;
-+}
-+
- void MainWin::activatedAccOption(PsiAccount* pa, int x)
- {
- 	if(x == 0) {
---- git.orig/src/mainwin.h
-+++ git/src/mainwin.h
-@@ -148,6 +148,7 @@ private slots:
- 	void actSetMoodActivated();
- 	void actSetActivityActivated();
- 	void actSetGeolocActivated();
-+	void actActiveContacts();
- 
- 	bool showDockMenu(const QPoint &);
- 	void dockActivated();
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -3266,6 +3266,17 @@ QList<ChatDlg*> PsiAccount::findChatDial
- 	return findDialogs<ChatDlg*>(jid, compareResource);
- }
- 
-+QList<PsiContact*> PsiAccount::activeContacts() const
-+{
-+	QList<PsiContact*> ret;
-+	foreach(PsiContact *pc, contactList()) {
-+		if(pc->isActiveContact()) {
-+			ret.append(pc);
-+		}
-+	}
-+	return ret;
-+}
-+
- QWidget* PsiAccount::findDialog(const QMetaObject& mo, const Jid& jid, bool compareResource) const
- {
- 	return d->findDialog(mo, jid, compareResource);
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -157,6 +157,8 @@ public:
- 	ChatDlg* findChatDialogEx(const Jid& jid) const;
- 	QList<ChatDlg*> findChatDialogs(const Jid& jid, bool compareResource = true) const;
- 
-+	QList<PsiContact*> activeContacts() const;
-+
- 	template<typename T>
- 	inline T findDialog(const Jid& jid = Jid(), bool compareResource = true) const { 
- 		return static_cast<T>(findDialog(((T)0)->staticMetaObject, jid, compareResource));
---- git.orig/src/psiactionlist.cpp
-+++ git/src/psiactionlist.cpp
-@@ -190,9 +190,13 @@ void PsiActionList::Private::createMainW
- 		IconAction *eventNotifier = new EventNotifierAction(this, "EventNotifierAction");
- 		eventNotifier->setWhatsThis (tr("Special item that displays number of pending events"));
- 
-+		IconAction *actActiveContacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
-+		actActiveContacts->setWhatsThis (tr("Simple way to find contacts with opened chats"));
-+
- 		ActionNames actions[] = {
- 			{ "button_options", optionsButton },
- 			{ "button_status",  statusButton  },
-+			{ "active_contacts",actActiveContacts},
- 			{ "event_notifier", eventNotifier },
- 			{ "", 0 }
- 		};
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -31,6 +31,7 @@
- #include "messageview.h"
- #include "iconselect.h"
- #include "avatars.h"
-+#include "activecontactsmenu.h"
- #include "psitooltip.h"
- #include "psioptions.h"
- #include "coloropt.h"
-@@ -483,6 +484,9 @@ void PsiChatDlg::initToolButtons()
- 
- 	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
- 	act_templates_->setMenu(getTemplateMenu());
-+
-+	act_active_contacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
-+	connect(act_active_contacts, SIGNAL(triggered()), SLOT(actActiveContacts()));
- }
- 
- void PsiChatDlg::initToolBar()
-@@ -512,6 +516,7 @@ void PsiChatDlg::initToolBar()
- 		ui_.toolbar->addAction(act_voice_);
- 	}
- 	ui_.toolbar->addAction(act_add_contact);
-+	ui_.toolbar->addAction(act_active_contacts);
- }
- 
- void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
-@@ -664,6 +669,14 @@ void PsiChatDlg::updateJidWidget(const Q
- 	internal_change = false;
- }
- 
-+void PsiChatDlg::actActiveContacts()
-+{
-+	ActiveContactsMenu* acm = new ActiveContactsMenu(account()->psi(), this);
-+	if(!acm->actions().isEmpty())
-+		acm->exec(QCursor::pos());
-+	delete acm;
-+}
-+
- void PsiChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
- {
- 	Q_UNUSED(statusString);
---- git.orig/src/psichatdlg.h
-+++ git/src/psichatdlg.h
-@@ -59,6 +59,7 @@ private slots:
- 	void contactChanged();
- 	QString makeContactName(const QString &name, const Jid &jid) const;
- 	void doSwitchJidMode();
-+	void actActiveContacts();
- 
- private:
- 	void initToolBar();
-@@ -107,6 +108,7 @@ private:
- 
- 	ActionLineEdit *le_autojid;
- 	IconAction *act_autojid;
-+	IconAction *act_active_contacts;
- 
- 	MCmdManager mCmdManager_;
- 	MCmdSimpleSite mCmdSite_;
---- git.orig/src/psicontact.cpp
-+++ git/src/psicontact.cpp
-@@ -540,6 +540,17 @@ bool PsiContact::isAnimated() const
- }
- 
- /**
-+ * Returns true if there is opened chat with this contact
-+ */
-+bool PsiContact::isActiveContact() const
-+{
-+	if(isConference()) {
-+		return false;
-+	}
-+	return account()->findChatDialog(jid(), isPrivate() ? true : false);
-+}
-+
-+/**
-  * Contact should always be visible if it's alerting.
-  */
- bool PsiContact::shouldBeVisible() const
---- git.orig/src/psicontact.h
-+++ git/src/psicontact.h
-@@ -66,6 +66,8 @@ public:
- 
- 	virtual bool isAnimated() const;
- 
-+	bool isActiveContact() const;
-+
- 	void activate();
- 
- 	virtual void setEditing(bool editing);
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -143,6 +143,7 @@ HEADERS += \
- 	$$PWD/statusdlg.h \
- 	$$PWD/statuscombobox.h \
- 	$$PWD/eventdlg.h \
-+	$$PWD/activecontactsmenu.h \
- 	$$PWD/chatdlg.h \
- 	$$PWD/psichatdlg.h \
- 	$$PWD/chatsplitter.h \
-@@ -288,6 +289,7 @@ SOURCES += \
- 	$$PWD/statusdlg.cpp \
- 	$$PWD/statuscombobox.cpp \
- 	$$PWD/eventdlg.cpp \
-+	$$PWD/activecontactsmenu.cpp \
- 	$$PWD/chatdlg.cpp \
- 	$$PWD/psichatdlg.cpp \
- 	$$PWD/chatsplitter.cpp \

psi-plus-main-20130107.tar.xz/patches/1700-psi-pgp-chat-icons.diff Deleted

@@ -1,207 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -46,6 +46,7 @@ static const char *infomrationalColorOpt
- ChatView::ChatView(QWidget *parent)
- 	: PsiTextView(parent)
- 	, isMuc_(false)
-+	, isEncryptionEnabled_(false)
- 	, oldTrackBarPosition(0)
- 	, dialog_(0)
- {
-@@ -74,12 +75,18 @@ ChatView::ChatView(QWidget *parent)
- 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconReceivePgp = IconsetFactory::iconPixmap("psi/notification_chat_receive_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconSendPgp = IconsetFactory::iconPixmap("psi/notification_chat_send_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 		} else {
- 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive");
- 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send");
- 			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok");
-+			logIconReceivePgp = IconsetFactory::iconPixmap("psi/notification_chat_receive_pgp");
-+			logIconSendPgp = IconsetFactory::iconPixmap("psi/notification_chat_send_pgp");
-+			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp");
- 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time");
- 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info");
- 		}
-@@ -109,6 +116,11 @@ void ChatView::setDialog(QWidget* dialog
- 	dialog_ = dialog;
- }
- 
-+void ChatView::setEncryptionEnabled(bool enabled)
-+{
-+	isEncryptionEnabled_ = enabled;
-+}
-+
- void ChatView::setSessionData(bool isMuc, const QString &jid, const QString name)
- {
- 	isMuc_ = isMuc;
-@@ -149,15 +161,18 @@ void ChatView::addLogIconsResources()
- {
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_send"), logIconSend);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive_pgp"), logIconReceivePgp);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_send_pgp"), logIconSendPgp);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_time"), logIconTime);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_info"), logIconInfo);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered"), logIconDelivered);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered_pgp"), logIconDeliveredPgp);
- }
- 
- void ChatView::markReceived(QString id)
- {
- 	if (useMessageIcons_) {
--		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + id), logIconDelivered);
-+		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + id), isEncryptionEnabled_? logIconDeliveredPgp : logIconDelivered);
- 		setLineWrapColumnOrWidth(lineWrapColumnOrWidth());
- 	}
- }
-@@ -356,11 +371,14 @@ void ChatView::renderMessage(const Messa
- 	QString timestr = formatTimeStamp(mv.dateTime());
- 	QString color = colorString(mv.isLocal(), mv.isSpooled());
- 	if (useMessageIcons_ && mv.isAwaitingReceipt()) {
--		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()), logIconSend);
-+		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()),
-+					isEncryptionEnabled_ ? logIconSendPgp : logIconSend);
- 	}
--	QString icon = useMessageIcons_?
-+	QString icon = useMessageIcons_ ?
- 		(QString("<img src=\"%1\" />").arg(mv.isLocal()?
--		(mv.isAwaitingReceipt()?QString("icon:delivery") + mv.messageId():"icon:log_icon_send"):"icon:log_icon_receive")):"";
-+		(mv.isAwaitingReceipt() ? QString("icon:delivery") + mv.messageId()
-+			: isEncryptionEnabled_ ? "icon:log_icon_send_pgp" : "icon:log_icon_send")
-+		: isEncryptionEnabled_ ? "icon:log_icon_receive_pgp" : "icon:log_icon_receive")) : "";
- 	if (mv.isEmote()) {
- 		appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
- 	} else {
---- git.orig/src/chatview_te.h
-+++ git/src/chatview_te.h
-@@ -64,6 +64,8 @@ public:
- 	bool internalFind(QString str, bool startFromBeginning = false);
- 	ChatView *textWidget();
- 
-+	void setEncryptionEnabled(bool enabled);
-+
- protected:
- 	// override the tab/esc behavior
- 	bool focusNextPrevChild(bool next);
-@@ -93,6 +95,7 @@ signals:
- 
- private:
- 	bool isMuc_;
-+	bool isEncryptionEnabled_;
- 	QString jid_;
- 	QString name_;
- 	int  oldTrackBarPosition;
-@@ -102,6 +105,9 @@ private:
- 	QPixmap logIconSend;
- 	QPixmap logIconReceive;
- 	QPixmap logIconDelivered;
-+	QPixmap logIconSendPgp;
-+	QPixmap logIconReceivePgp;
-+	QPixmap logIconDeliveredPgp;
- 	QPixmap logIconTime;
- 	QPixmap logIconInfo;
- 	QAction *actQuote_;
---- git.orig/src/chatview_webkit.cpp
-+++ git/src/chatview_webkit.cpp
-@@ -137,6 +137,7 @@ ChatView::ChatView(QWidget *parent)
- 	, sessionReady_(false)
- 	, dialog_(0)
- 	, isMuc_(false)
-+	, isEncryptionEnabled_(false)
- {
- 	jsObject = new ChatViewJSObject(this);
- 	webView = new WebView(this);
-@@ -180,6 +181,11 @@ void ChatView::init()
- 	);
- }
- 
-+void ChatView::setEncryptionEnabled(bool enabled)
-+{
-+	isEncryptionEnabled_ = enabled;
-+}
-+
- void ChatView::embedJsObject()
- {
- 	ChatViewTheme *theme = currentTheme();
-@@ -196,6 +202,7 @@ void ChatView::markReceived(QString id)
- 	QVariantMap m;
- 	m["type"] = "receipt";
- 	m["id"] = id;
-+	m["encrypted"] = isEncryptionEnabled_;
- 	sendJsObject(m);
- }
- 
-@@ -314,6 +321,7 @@ void ChatView::dispatchMessage(const Mes
- 	QVariantMap vm = mv.toVariantMap(isMuc_, true);
- 	vm["mtype"] = vm["type"];
- 	vm["type"] = "message";
-+	vm["encrypted"] = isEncryptionEnabled_;
- 	sendJsObject(vm);
- }
- 
---- git.orig/src/chatview_webkit.h
-+++ git/src/chatview_webkit.h
-@@ -67,6 +67,8 @@ public:
- 	bool internalFind(QString str, bool startFromBeginning = false);
- 	WebView * textWidget();
- 
-+	void setEncryptionEnabled(bool enabled);
-+
- protected:
- 	// override the tab/esc behavior
- 	bool focusNextPrevChild(bool next);
-@@ -98,6 +100,7 @@ private:
- 	bool sessionReady_;
- 	QPointer<QWidget> dialog_;
- 	bool isMuc_;
-+	bool isEncryptionEnabled_;
- 	QString jid_;
- 	QString name_;
- 	PsiAccount *account_;
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -781,6 +781,8 @@ void PsiChatDlg::updatePGP()
- 	ui_.tb_pgp->setVisible(account()->hasPGP() &&
- 	                       !smallChat_ &&
- 	                       !PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool());
-+
-+	ui_.log->setEncryptionEnabled(isEncryptionEnabled());
- }
- 
- void PsiChatDlg::doClearButton()
-@@ -810,6 +812,7 @@ void PsiChatDlg::doClearButton()
- void PsiChatDlg::setPGPEnabled(bool enabled)
- {
- 	act_pgp_->setChecked(enabled);
-+	ui_.log->setEncryptionEnabled(enabled);
- }
- 
- void PsiChatDlg::toggleSmallChat()
---- git.orig/themes/chatview/psi/classic/index.html
-+++ git/themes/chatview/psi/classic/index.html
-@@ -93,7 +93,7 @@ window[chatServer.jsNamespace()].theme =
- 				var img = document.getElementById("receipt"+shared.cdata.id);
- 				if (img) {
- 					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
--					img.src = "icon:psi/notification_chat_delivery_ok"+sizeUri;
-+					img.src = (shared.cdata.encrypted?"icon:psi/notification_chat_delivery_ok_pgp":"icon:psi/notification_chat_delivery_ok")+sizeUri;
- 				}
- 			}
- 			if (shared.cdata.mtype == "message") {
-@@ -130,6 +130,9 @@ window[chatServer.jsNamespace()].theme =
- 							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
- 								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
- 								: "psi/notification_chat_receive";
-+							if(shared.cdata.encrypted) {
-+								icon += "_pgp"
-+							}
- 							break;
- 						case "system":
- 						case "subject":

psi-plus-main-20130107.tar.xz/patches/1720-psi-fix-groupchat-options.diff Deleted

@@ -1,53 +0,0 @@
---- git.orig/src/options/opt_groupchat.cpp
-+++ git/src/options/opt_groupchat.cpp
-@@ -54,6 +54,10 @@ QWidget *OptionsTabGroupchat::widget()
- 	connect(d->pb_addNickColor,	   SIGNAL(clicked()), SLOT(addGCNickColor()));
- 	connect(d->pb_removeNickColor,	   SIGNAL(clicked()), SLOT(removeGCNickColor()));
- 
-+	connect(d->ck_gcHashNickColoring, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
-+	connect(d->ck_gcNickColoring, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
-+	connect(d->ck_gcHighlights, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
-+
- 	// TODO: add QWhatsThis for all controls on widget
- 
- 	return w;
-@@ -112,6 +116,29 @@ void OptionsTabGroupchat::restoreOptions
- 	d->le_newNickColor->setText("#FFFFFF");
- }
- 
-+void OptionsTabGroupchat::updateWidgetsState()
-+{
-+	GeneralGroupchatUI *d = (GeneralGroupchatUI *)w;
-+
-+	{
-+		bool enableHighlights = d->ck_gcHighlights->isChecked();
-+		d->lw_highlightWords->setEnabled(enableHighlights);
-+		d->le_newHighlightWord->setEnabled(enableHighlights);
-+		d->pb_addHighlightWord->setEnabled(enableHighlights);
-+		d->pb_removeHighlightWord->setEnabled(enableHighlights);
-+	}
-+
-+	{
-+		bool enableNickColors = d->ck_gcNickColoring->isChecked() && !d->ck_gcHashNickColoring->isChecked();
-+		d->ck_gcNickColoring->setEnabled(!d->ck_gcHashNickColoring->isChecked());
-+		d->lw_nickColors->setEnabled(enableNickColors);
-+		d->le_newNickColor->setEnabled(enableNickColors);
-+		d->pb_addNickColor->setEnabled(enableNickColors);
-+		d->pb_removeNickColor->setEnabled(enableNickColors);
-+		d->pb_nickColor->setEnabled(enableNickColors);
-+	}
-+}
-+
- static QPixmap name2color(QString name)
- {
- 	QColor c(name);
---- git.orig/src/options/opt_groupchat.h
-+++ git/src/options/opt_groupchat.h
-@@ -28,6 +28,7 @@ private slots:
- 	void chooseGCNickColor();
- 	void displayGCNickColor();
- 	void selectedGCNickColor(QListWidgetItem *item);
-+	void updateWidgetsState();
- 
- private:
- 	QWidget *w, *dlg;

psi-plus-main-20130107.tar.xz/patches/1730-psi-fix-eventnotifier.diff Deleted

@@ -1,45 +0,0 @@
---- psi.orig/src/mainwin_p.cpp
-+++ psi/src/mainwin_p.cpp
-@@ -22,7 +22,6 @@
- 
- #include <QApplication>
- #include <QStyle>
--#include <QToolBar>
- #include <QTimer>
- #include <QSignalMapper>
- #include <QObject>
-@@ -40,6 +39,7 @@
- #include "icontoolbutton.h"
- #include "alerticon.h"
- #include "psicontactlist.h"
-+#include "psitoolbar.h"
- 
- //----------------------------------------------------------------------------
- // PopupActionButton
-@@ -621,19 +621,23 @@ void EventNotifierAction::hide()
- 
- 	foreach(MLabel* label, d->labels) {
- 		label->hide();
--		QToolBar *toolBar = dynamic_cast<QToolBar*>(label->parent());
-+		PsiToolBar *toolBar = dynamic_cast<PsiToolBar*>(label->parent());
- 		if (toolBar) {
- 			int found = 0;
- 			foreach(QWidget* widget, toolBar->findChildren<QWidget*>()) {
- 				if (!widget->objectName().startsWith("qt_") &&
--				    !QString(widget->metaObject()->className()).startsWith("QToolBar"))
-+				    !QString(widget->metaObject()->className()).startsWith("QToolBar") &&
-+				    !QString(widget->metaObject()->className()).startsWith("QMenu") &&
-+				    QString(widget->metaObject()->className()) != "Oxygen::TransitionWidget") // dirty hack
- 				{
- 					found++;
- 				}
- 			}
- 
- 			if (found == 1)   // only MLabel is on ToolBar
--				toolBar->hide();
-+				//We should not hide toolbar, if it should be visible (user set `enabled` in options)
-+				//toolBar->hide();
-+				toolBar->updateVisibility();
- 		}
- 	}
- }

psi-plus-main-20130107.tar.xz/patches/1770-psi-autostart-pgp.diff Deleted

@@ -1,102 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -62,6 +62,7 @@
- 		</muc> 
- 		<pgp comment="PGP encryption options">
- 			<enable comment="Enable PGP globally" type="bool">true</enable>
-+			<auto-start comment="Automatically enable PGP encryption" type="bool">false</auto-start>
- 		</pgp>
- 		<ui comment="User interface options">
- 			<account comment="Account options">
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -169,7 +169,7 @@ private:
- 
- 
- PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
--		: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_)
-+	: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_), autoPGP_(true)
- {
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	connect(account(), SIGNAL(addedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
-@@ -469,6 +469,7 @@ void PsiChatDlg::initToolButtons()
- 
- 	act_pgp_ = new IconAction(tr("Toggle Encryption"), "", tr("Toggle Encryption"), 0, this, 0, true);
- 	ui_.tb_pgp->setDefaultAction(act_pgp_);
-+	connect(act_pgp_, SIGNAL(triggered()), SLOT(actPgpToggled()));
- 
- 	act_info_ = new IconAction(tr("User Info"), "psi/vCard", tr("User Info"), 0, this);
- 	connect(act_info_, SIGNAL(triggered()), SLOT(doInfo()));
-@@ -774,10 +775,12 @@ void PsiChatDlg::updatePGP()
- 		act_pgp_->setEnabled(true);
- 	}
- 	else {
--		act_pgp_->setChecked(false);
-+		setPGPEnabled(false);
- 		act_pgp_->setEnabled(false);
- 	}
- 
-+	checkPGPAutostart();
-+
- 	ui_.tb_pgp->setVisible(account()->hasPGP() &&
- 	                       !smallChat_ &&
- 	                       !PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool());
-@@ -785,6 +788,31 @@ void PsiChatDlg::updatePGP()
- 	ui_.log->setEncryptionEnabled(isEncryptionEnabled());
- }
- 
-+void PsiChatDlg::checkPGPAutostart()
-+{
-+	if(account()->hasPGP() && autoPGP_ && PsiOptions::instance()->getOption("options.pgp.auto-start").toBool()) {
-+		UserListItem *item = account()->findFirstRelevant(jid());
-+		if(item && !item->publicKeyID().isEmpty()) {
-+			if(!jid().resource().isEmpty()) {
-+				UserResourceList::Iterator rit = item->userResourceList().find(jid().resource());
-+				if(rit !=item->userResourceList().end()) {
-+					UserResource r = *rit;
-+					if(r.pgpVerifyStatus() != 0) {
-+						setPGPEnabled(false);
-+						return;
-+					}
-+				}
-+			}
-+			setPGPEnabled(true);
-+		}
-+	}
-+}
-+
-+void PsiChatDlg::actPgpToggled()
-+{
-+	autoPGP_ = false;
-+}
-+
- void PsiChatDlg::doClearButton()
- {
- 	if (PsiOptions::instance()->getOption("options.ui.chat.warn-before-clear").toBool()) {
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -60,6 +60,7 @@ private slots:
- 	QString makeContactName(const QString &name, const Jid &jid) const;
- 	void doSwitchJidMode();
- 	void actActiveContacts();
-+	void actPgpToggled();
- 
- private:
- 	void initToolBar();
-@@ -74,6 +75,7 @@ private:
- 	void updateAvatar();
- 	void optionsUpdate();
- 	void updatePGP();
-+	void checkPGPAutostart();
- 	void setPGPEnabled(bool enabled);
- 	void activated();
- 	void setLooks();
-@@ -121,6 +123,8 @@ private:
- 	int logHeight;
- 	int chateditHeight;
- 
-+	bool autoPGP_;
-+
- private:
- 	bool tabmode;
- 	QPointer <PsiWindowHeader> winHeader_;

psi-plus-main-20130107.tar.xz/patches/1810-psi-fix-trackbar.diff Deleted

@@ -1,108 +0,0 @@
---- git.orig/src/tabs/tabbablewidget.cpp
-+++ git/src/tabs/tabbablewidget.cpp
-@@ -37,10 +37,15 @@
- 
- TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabManager)
- 	: AdvancedWidget<QWidget>(0)
-+	, state_(Deactivated)
- 	, jid_(jid)
- 	, pa_(pa)
- 	, tabManager_(tabManager)
- {
-+	stateCommitTimer_.setInterval(100);
-+	stateCommitTimer_.setSingleShot(true);
-+	connect(&stateCommitTimer_, SIGNAL(timeout()), SLOT(commitState()));
-+
- 	if (TabbableWidget::chatsCount == 0) {
- 		TabbableWidget::templateMenu = new SendButtonTemplatesMenu(NULL);
- 		TabbableWidget::templateMenu->setParams(false);
-@@ -247,11 +252,22 @@ void TabbableWidget::changeEvent(QEvent*
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (isActiveTab()) {
--			activated();
-+			state_ = Activated;
- 		}
- 		else {
--			deactivated();
-+			state_ = Deactivated;
- 		}
-+		stateCommitTimer_.start();
-+	}
-+}
-+
-+void TabbableWidget::commitState()
-+{
-+	if(state_ == Activated) {
-+		activated();
-+	}
-+	else {
-+		deactivated();
- 	}
- }
- 
---- git.orig/src/tabs/tabbablewidget.h
-+++ git/src/tabs/tabbablewidget.h
-@@ -22,6 +22,7 @@
- #define TABBABLE_H
- 
- #include <QIcon>
-+#include <QTimer>
- #include "advwidget.h"
- #include "im.h" // ChatState
- #include "sendbuttonmenu.h"
-@@ -83,19 +84,26 @@ signals:
- 	void vSplitterMoved(int,int);
- 
- public slots:
--	virtual void deactivated();
--	virtual void activated();
- 	void bringToFront(bool raiseWindow = true);
- 	virtual void ensureTabbedCorrectly();
- 	void hideTab();
- 
- protected:
- 	virtual void setJid(const Jid&);
-+	virtual void deactivated();
-+	virtual void activated();
- 
- 	// reimplemented
- 	void changeEvent(QEvent* e);
- 
-+private slots:
-+	void commitState();
-+
- private:
-+	enum ActivationState { Activated, Deactivated };
-+	ActivationState state_;
-+	QTimer stateCommitTimer_;
-+
- 	Jid jid_;
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
---- git.orig/src/tabs/tabdlg.cpp
-+++ git/src/tabs/tabdlg.cpp
-@@ -382,12 +382,12 @@ void TabDlg::tabSelected(QWidget* _selec
- 	// _selected could be null when TabDlg is closing and deleting all its tabs
- 	TabbableWidget* selected = _selected ? qobject_cast<TabbableWidget*>(_selected) : 0;
- 	if (!selectedTab_.isNull()) {
--		selectedTab_->deactivated();
-+		QCoreApplication::postEvent(selectedTab_, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	selectedTab_ = selected;
- 	if (selected) {
--		selected->activated();
-+		QCoreApplication::postEvent(selected, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	updateCaption();
-@@ -502,7 +502,7 @@ void TabDlg::closeTab(TabbableWidget* ch
- 	chat->hide();
- 	removeTabWithNoChecks(chat);
- 	chat->setParent(0);
--	chat->deactivated();
-+	QCoreApplication::postEvent(chat, new QEvent(QEvent::ActivationChange));
- 	if (tabWidget_->count() > 0) {
- 		updateCaption();
- 	}

psi-plus-main-20130107.tar.xz/patches/1820-psi-muc-avatars-at-popups.diff Deleted

@@ -1,62 +0,0 @@
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1739,7 +1739,9 @@ void GCMainDlg::message(const Message &_
- 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
- 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
- 				MessageEvent *e = new MessageEvent(m, account());
--				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), 0, (PsiEvent *)e);
-+				UserListItem i;
-+				i.setPrivate(true);
-+				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), &i, (PsiEvent *)e);
- 				e->deleteLater();
- 			}
- 		}
---- psi.orig/src/psidbusnotifier.cpp
-+++ psi/src/psidbusnotifier.cpp
-@@ -185,7 +185,11 @@ void PsiDBusNotifier::popup(PsiAccount* 
- //	}
- 	QImage im;
- 	if(account) {
--		im = account->avatarFactory()->getAvatar(jid.bare()).toImage();
-+		if(uli && uli->isPrivate())
-+			im = account->avatarFactory()->getMucAvatar(jid).toImage();
-+		else
-+			im = account->avatarFactory()->getAvatar(jid).toImage();
-+
- 		if(!im.isNull()) {
- 			int size = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.avatar-size").toInt();
- 			im = im.scaledToWidth(size, Qt::SmoothTransformation);
---- psi.orig/src/psigrowlnotifier.cpp
-+++ psi/src/psigrowlnotifier.cpp
-@@ -120,8 +120,12 @@ void PsiGrowlNotifier::popup(PsiAccount*
- 		if (((int)statusMsg.length()) > len)
- 			statusMsg = statusMsg.left(len) + "...";
- 	QPixmap icon;
--	if(account)
--		icon = account->avatarFactory()->getAvatar(jid.bare());
-+	if(account) {
-+		if(uli && uli->isPrivate())
-+			icon = account->avatarFactory()->getMucAvatar(jid);
-+		else
-+			icon = account->avatarFactory()->getAvatar(jid);
-+	}
- 
- 	if (uli) {
- 		contact = uli->name();
---- psi.orig/src/psipopup.cpp
-+++ psi/src/psipopup.cpp
-@@ -400,7 +400,13 @@ void PsiPopup::setData(const Jid &j, con
- 			}
- 		}
- 	}
--	QPixmap avatar = d->account->avatarFactory()->getAvatar(jid);
-+	QPixmap avatar;
-+	if(d->account) {
-+		if(u && u->isPrivate())
-+			avatar = d->account->avatarFactory()->getMucAvatar(j);
-+		else
-+			avatar = d->account->avatarFactory()->getAvatar(j);
-+	}
- 	// show popup
- 	if ( d->popupType != PopupManager::AlertComposing && d->popupType != PopupManager::AlertHeadline &&
- 	     (d->popupType != PopupManager::AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) )

psi-plus-main-20130107.tar.xz/patches/1850-psi-safe-storage-fix.diff Deleted

@@ -1,56 +0,0 @@
---- psi.orig/src/libpsi/tools/atomicxmlfile/atomicxmlfile.cpp
-+++ psi/src/libpsi/tools/atomicxmlfile/atomicxmlfile.cpp
-@@ -61,16 +61,21 @@ QString AtomicXmlFile::backupFileName()
- bool AtomicXmlFile::saveDocument(const QDomDocument& doc, QString fileName) const
- {
- 	QFile file(fileName);
--	if (!file.open(QIODevice::WriteOnly)) {
-+	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
- 		return false;
- 	}
- 
--	QTextStream text;
--	text.setDevice(&file);
--	text.setCodec("UTF-8");
--	text << doc.toString();
-+	QTextStream *text = new QTextStream(&file);
-+	text->setCodec("UTF-8");
-+	*text << doc.toString();
-+	delete text;
- 
--	return file.error() == QFile::NoError;
-+	bool res = (file.error() == QFile::NoError);
-+	if (res)
-+		res = file.flush();
-+	file.close();
-+
-+	return res;
- }
- 
- bool AtomicXmlFile::loadDocument(QDomDocument* doc, QString fileName) const
---- psi.orig/src/libpsi/tools/atomicxmlfile/atomicxmlfile.h
-+++ psi/src/libpsi/tools/atomicxmlfile/atomicxmlfile.h
-@@ -60,10 +60,9 @@ public:
- 			return false;
- 		}
- 
--		if (QFile::exists(backupFileName()))
--			QFile::remove(backupFileName());
--
- 		if (QFile::exists(fileName_)) {
-+			if (QFile::exists(backupFileName()))
-+				QFile::remove(backupFileName());
- 			if (!QFile::rename(fileName_, backupFileName())) {
- 				qWarning("AtomicXmlFile::saveDocument(): Unable to rename '%s' to '%s'.",
- 				         qPrintable(fileName_), qPrintable(backupFileName()));
-@@ -91,6 +90,10 @@ public:
- 			if (loadDocument(reader, fileName)) {
- 				return true;
- 			}
-+			if (QFile::exists(fileName)) {
-+				// The file exists, but it is incorrect. Remove it. Otherwise, enter the backup.
-+				QFile::remove(fileName);
-+			}
- 		}
- 
- 		return false;

psi-plus-main-20130107.tar.xz/patches/1860-psi-ignoring-global-statuses.diff Deleted

@@ -1,154 +0,0 @@
---- psi.orig/src/accountstatusmenu.cpp
-+++ psi/src/accountstatusmenu.cpp
-@@ -30,4 +30,18 @@ void AccountStatusMenu::fill()
- {
- 	StatusMenu::fill();
- 	statusChanged(account->status());
-+	addIgnoreGlobalActions();
- }
-+
-+void AccountStatusMenu::addIgnoreGlobalActions()
-+{
-+	QAction *blockAction = new IconAction(tr("Ignore global actions"), this, "psi/ignore_global_actions");
-+	blockAction->setCheckable(true);
-+	blockAction->setChecked(account->accountOptions().ignore_global_actions);
-+	blockAction->setToolTip(tr("Ignore all global actions for this account. For example, autostatus, mood, activity etc."));
-+	connect(blockAction, SIGNAL(triggered(bool)), account, SLOT(actionSetBlock(bool)));
-+	addSeparator();
-+	addAction(blockAction);
-+
-+}
-+
---- psi.orig/src/accountstatusmenu.h
-+++ psi/src/accountstatusmenu.h
-@@ -20,6 +20,9 @@ protected:
- 	void addChoose();
- 	void addReconnect();
- 
-+private:
-+	void addIgnoreGlobalActions();
-+
- private slots:
- 	void chooseStatusActivated();
- 
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -1203,7 +1203,7 @@ void MainWin::actSetMoodActivated()
- {
- 	QList<PsiAccount*> l;
- 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
--		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
- 			l.append(pa);
- 	}
- 	if(l.isEmpty())
-@@ -1221,7 +1221,7 @@ void MainWin::actSetActivityActivated()
- {
- 	QList<PsiAccount*> l;
- 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
--		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
- 			l.append(pa);
- 	}
- 	if(l.isEmpty())
-@@ -1239,7 +1239,7 @@ void MainWin::actSetGeolocActivated()
- {
- 	QList<PsiAccount*> l;
- 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
--		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
-+		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
- 			l.append(pa);
- 	}
- 	if(l.isEmpty())
---- psi.orig/src/profiles.h
-+++ psi/src/profiles.h
-@@ -60,7 +60,7 @@ public:
- 	XMPP::ClientStream::AllowPlainType allow_plain;
- 	bool req_mutual_auth;
- 	bool legacy_ssl_probe;
--	bool opt_automatic_resource, priority_dep_on_status;
-+	bool opt_automatic_resource, priority_dep_on_status, ignore_global_actions;
- 	int security_level;
- 	enum SSLFlag { SSL_No = 0, SSL_Yes = 1, SSL_Auto = 2, SSL_Legacy = 3 } ssl;
- 
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -4032,6 +4032,11 @@ void PsiAccount::actionExecuteCommandSpe
- 	}
- }
- 
-+void PsiAccount::actionSetBlock(bool blocked)
-+{
-+	d->acc.ignore_global_actions = blocked;
-+}
-+
- void PsiAccount::actionSetMood()
- {
- 	QList<PsiAccount*> list;
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -377,6 +377,7 @@ public slots:
- 	void actionSendFiles(const Jid &, const QStringList&);
- 	void actionExecuteCommand(const Jid& j, const QString& = QString());
- 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
-+	void actionSetBlock(bool);
- 	void actionSetMood();
- 	void actionSetActivity();
- 	void actionSetGeoLocation();
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -1172,7 +1172,7 @@ void PsiCon::setGlobalStatus(const Statu
- 
- 	// globally set each account which is logged in
- 	foreach(PsiAccount* account, d->contactList->enabledAccounts())
--		if (allOffline || account->isActive())
-+		if ((allOffline || account->isActive()) && (!account->accountOptions().ignore_global_actions || s.type() == Status::Offline))
- 			account->setStatus(s, withPriority, isManualStatus);
- 
- 	emit statusMessageChanged(s.status());
-@@ -1930,6 +1930,9 @@ void PsiCon::secondsIdle(int sec)
- 		aa = PsiAccount::AutoAway_None;
- 
- 	foreach(PsiAccount* pa, d->contactList->enabledAccounts()) {
-+		if(pa->accountOptions().ignore_global_actions)
-+			continue;
-+
- 		pa->setAutoAwayStatus(aa);
- 	}
- }
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -134,6 +134,7 @@ void UserAccount::reset()
- 	ibbOnly = false;
- 	opt_automatic_resource = false;
- 	priority_dep_on_status = true;
-+	ignore_global_actions = false;
- 	resource = "Psi+";
- 	priority = 55;
- 	opt_keepAlive = true;
-@@ -184,6 +185,7 @@ void UserAccount::fromOptions(OptionsTre
- 	legacy_ssl_probe = o->getOption(base + ".legacy-ssl-probe").toBool();
- 	opt_automatic_resource = o->getOption(base + ".automatic-resource").toBool();
- 	priority_dep_on_status = o->getOption(base + ".priority-depends-on-status").toBool();
-+	ignore_global_actions = o->getOption(base + ".ignore-global-actions").toBool();
- 	opt_log = o->getOption(base + ".log").toBool();
- 	opt_reconn = o->getOption(base + ".reconn").toBool();
- 	opt_ignoreSSLWarnings = o->getOption(base + ".ignore-SSL-warnings").toBool();
-@@ -346,6 +348,7 @@ void UserAccount::toOptions(OptionsTree 
- 	o->setOption(base + ".legacy-ssl-probe", legacy_ssl_probe);
- 	o->setOption(base + ".automatic-resource", opt_automatic_resource);
- 	o->setOption(base + ".priority-depends-on-status", priority_dep_on_status);
-+	o->setOption(base + ".ignore-global-actions", ignore_global_actions);
- 	o->setOption(base + ".log", opt_log);
- 	o->setOption(base + ".reconn", opt_reconn);
- 	o->setOption(base + ".connect-after-sleep", opt_connectAfterSleep);
-@@ -494,7 +497,8 @@ void UserAccount::fromXml(const QDomElem
- 	//readBoolAttribute(a, "gpg", &opt_gpg);
- 	readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
- 	readBoolAttribute(a, "priority-depends-on-status", &priority_dep_on_status);
--	
-+	readBoolAttribute(a, "ignore-global-actions", &ignore_global_actions);
-+
- 	// Will be overwritten if there is a new option
- 	bool opt_plain = false;
- 	readBoolAttribute(a, "plain", &opt_plain);

psi-plus-main-20130107.tar.xz/patches/1870-psi-multilang-spelling-for-aspell.diff Deleted

@@ -1,238 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -334,6 +334,7 @@ QLineEdit#le_status_text {
- 			</show-deprecated>
- 			<spell-check comment="Options related to the spell checker">
- 				<enabled comment="Whether the spell checker is enabled" type="bool">true</enabled>
-+				<langs type="QString"></langs>
- 			</spell-check>
- 			<disable-send-button type="bool">false</disable-send-button>
- 			<systemtray comment="Options related to the system tray">
---- psi.orig/src/libpsi/tools/spellchecker/aspellchecker.cpp
-+++ psi/src/libpsi/tools/spellchecker/aspellchecker.cpp
-@@ -33,23 +33,15 @@
- #include "aspellchecker.h"
- 
- ASpellChecker::ASpellChecker()
-+	: config_(new_aspell_config())
- {
--	config_ = NULL;
--	speller_ = NULL;
--	config_ = new_aspell_config();
- 	aspell_config_replace(config_, "encoding", "utf-8");
- #ifdef Q_WS_WIN
- 	aspell_config_replace(config_, "conf-dir", QDir::homePath().toLocal8Bit().data());
- 	aspell_config_replace(config_, "data-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
- 	aspell_config_replace(config_, "dict-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
- #endif
--	AspellCanHaveError* ret = new_aspell_speller(config_);
--	if (aspell_error_number(ret) == 0) {
--		speller_ = to_aspell_speller(ret);
--	}
--	else {
--		qWarning() << QString("Aspell error: %1").arg(aspell_error_message(ret));
--	}
-+	setActiveLanguages(getAllLanguages());
- }
- 
- ASpellChecker::~ASpellChecker()
-@@ -59,30 +51,33 @@ ASpellChecker::~ASpellChecker()
- 		config_ = NULL;
- 	}
- 
--	if(speller_) {
--		delete_aspell_speller(speller_);
--		speller_ = NULL;
--	}
-+	clearSpellers();
- }
- 
- bool ASpellChecker::isCorrect(const QString& word)
- {
--	if(speller_) {
--		int correct = aspell_speller_check(speller_, word.toUtf8().constData(), -1);
--		return (correct != 0);
-+	if(spellers_.isEmpty())
-+		return true;
-+
-+	foreach(AspellSpeller* speller, spellers_) {
-+		if (aspell_speller_check(speller, word.toUtf8().constData(), -1) != 0)
-+			return true;
- 	}
--	return true;
-+	return false;
- }
- 
- QList<QString> ASpellChecker::suggestions(const QString& word)
- {
- 	QList<QString> words;
--	if (speller_) {
--		const AspellWordList* list = aspell_speller_suggest(speller_, word.toUtf8(), -1); 
-+
-+	foreach(AspellSpeller* speller, spellers_) {
-+		const AspellWordList* list = aspell_speller_suggest(speller, word.toUtf8(), -1);
- 		AspellStringEnumeration* elements = aspell_word_list_elements(list);
- 		const char *c_word;
- 		while ((c_word = aspell_string_enumeration_next(elements)) != NULL) {
--			words += QString::fromUtf8(c_word);
-+			QString suggestion = QString::fromUtf8(c_word);
-+			if(suggestion.size() > 2)
-+				words.append(suggestion);
- 		}
- 		delete_aspell_string_enumeration(elements);
- 	}
-@@ -92,11 +87,11 @@ QList<QString> ASpellChecker::suggestion
- bool ASpellChecker::add(const QString& word)
- {
- 	bool result = false;
--	if (config_ && speller_) {
-+	if (config_ && !spellers_.empty()) {
- 		QString trimmed_word = word.trimmed();
- 		if(!word.isEmpty()) {
--			aspell_speller_add_to_personal(speller_, trimmed_word.toUtf8(), trimmed_word.toUtf8().length());
--			aspell_speller_save_all_word_lists(speller_);
-+			aspell_speller_add_to_personal(spellers_.first(), trimmed_word.toUtf8(), trimmed_word.toUtf8().length());
-+			aspell_speller_save_all_word_lists(spellers_.first());
- 			result = true;
- 		}
- 	}
-@@ -105,10 +100,63 @@ bool ASpellChecker::add(const QString& w
- 
- bool ASpellChecker::available() const
- {
--	return (speller_ != NULL);
-+	return !spellers_.isEmpty();
- }
- 
- bool ASpellChecker::writable() const
- {
- 	return false;
- }
-+
-+QList<QString> ASpellChecker::getAllLanguages() const
-+{
-+	QList<QString> langs;
-+
-+	AspellDictInfoList* dict_info_list = get_aspell_dict_info_list(config_);
-+
-+	if (!aspell_dict_info_list_empty(dict_info_list))
-+	{
-+		AspellDictInfoEnumeration* dict_info_enum = aspell_dict_info_list_elements(dict_info_list);
-+
-+		while (!aspell_dict_info_enumeration_at_end(dict_info_enum)) {
-+			const AspellDictInfo* dict_info = aspell_dict_info_enumeration_next(dict_info_enum);
-+			QString lang(dict_info -> code);
-+			if (lang.contains('_'))
-+				lang.truncate(lang.indexOf('_'));
-+			if (!langs.contains(lang)) {
-+				langs.append(lang);
-+			}
-+		}
-+
-+		delete_aspell_dict_info_enumeration(dict_info_enum);
-+	}
-+
-+	return langs;
-+}
-+
-+void ASpellChecker::setActiveLanguages(const QList<QString>& langs)
-+{
-+	clearSpellers();
-+
-+	foreach(const QString& lang, langs)
-+	{
-+		AspellConfig* conf = aspell_config_clone(config_);
-+		aspell_config_replace(conf, "lang", lang.toUtf8().constData());
-+		AspellCanHaveError* ret = new_aspell_speller(conf);
-+		if (aspell_error_number(ret) == 0) {
-+			spellers_.append(to_aspell_speller(ret));
-+		}
-+		else {
-+			qDebug() << QString("Aspell error: %1").arg(aspell_error_message(ret));
-+		}
-+		delete_aspell_config(conf);
-+	}
-+}
-+
-+void ASpellChecker::clearSpellers()
-+{
-+	foreach(AspellSpeller* speller, spellers_)
-+		delete_aspell_speller(speller);
-+
-+	spellers_.clear();
-+}
---- psi.orig/src/libpsi/tools/spellchecker/aspellchecker.h
-+++ psi/src/libpsi/tools/spellchecker/aspellchecker.h
-@@ -46,9 +46,17 @@ public:
- 	virtual bool available() const;
- 	virtual bool writable() const;
- 
-+	virtual void setActiveLanguages(const QList<QString>& langs);
-+	virtual QList<QString> getAllLanguages() const;
-+
-+private:
-+	void clearSpellers();
-+
- private:
- 	AspellConfig* config_;
--	AspellSpeller* speller_;
-+
-+	typedef QList<AspellSpeller*> ASpellers;
-+	ASpellers spellers_;
- };
- 
- #endif
---- psi.orig/src/libpsi/tools/spellchecker/spellchecker.h
-+++ psi/src/libpsi/tools/spellchecker/spellchecker.h
-@@ -41,6 +41,9 @@ public:
- 	virtual bool isCorrect(const QString&);
- 	virtual bool add(const QString&);
- 
-+	virtual void setActiveLanguages(const QList<QString>& ) {}
-+	virtual QList<QString> getAllLanguages() const { return QList<QString>(); }
-+
- protected:
- 	SpellChecker();
- 	virtual ~SpellChecker();
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -81,6 +81,7 @@
- #include "accountscombobox.h"
- #include "tabdlg.h"
- #include "chatdlg.h"
-+#include "spellchecker/aspellchecker.h"
- #ifdef WEBKIT
- #include "avatars.h"
- #include "chatviewthemeprovider.h"
-@@ -710,6 +711,9 @@ bool PsiCon::init()
- 	optionChanged(tuneUrlFilterOptionPath);
- #endif
- 
-+	//init spellchecker
-+	optionChanged("options.ui.spell-check.langs");
-+
- 	return result;
- }
- 
-@@ -1397,6 +1401,21 @@ void PsiCon::optionChanged(const QString
- 		return;
- 	}
- 
-+	if (option == "options.ui.spell-check.langs") {
-+		QStringList langs = PsiOptions::instance()->getOption(option).toString().split(QRegExp("\\s+"), QString::SkipEmptyParts);
-+		if(langs.isEmpty()) {
-+			langs = SpellChecker::instance()->getAllLanguages();
-+			QString lang_env = getenv("LANG");
-+			if(!lang_env.isEmpty()) {
-+				lang_env = lang_env.split("_").first();
-+				if(langs.contains(lang_env, Qt::CaseInsensitive))
-+					langs = QStringList(lang_env);
-+			}
-+		}
-+		SpellChecker::instance()->setActiveLanguages(langs);
-+		return;
-+	}
-+
- #ifdef USE_PEP
- 	if (option == tuneUrlFilterOptionPath || option == tuneTitleFilterOptionPath) {
- 		d->tuneManager->setTuneFilters(PsiOptions::instance()->getOption(tuneUrlFilterOptionPath).toString().split(QRegExp("\\W+")),

psi-plus-main-20130107.tar.xz/patches/1880-psi-chat-not-in-list-fix.diff Deleted

@@ -1,29 +0,0 @@
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -4249,7 +4249,7 @@ void PsiAccount::actionHistoryBox(PsiEve
- 
- void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
- {
--	UserListItem *u = find(j);
-+	UserListItem *u = (findGCContact(j)) ? find(j) : find(j.bare());
- 	if(!u) {
- 		qWarning("[%s] not in userlist\n", qPrintable(j.full()));
- 		return;
-@@ -4257,7 +4257,7 @@ void PsiAccount::actionOpenChat(const Ji
- 
- 	// if 'j' is bare, we might want to switch to a specific resource
- 	QString res;
--	if(u && j.resource().isEmpty()) {
-+	if(j.resource().isEmpty()) {
- 		// first, are there any queued chats?
- 		/*PsiEvent *e = d->eventQueue->peekFirstChat(j, false);
- 		if(e) {
-@@ -4591,7 +4591,7 @@ void PsiAccount::openUri(const QUrl &uri
- 		QString body = uri.queryItemValue("body");
- 		QString type = uri.queryItemValue("type");
- 		if (type == "chat" && subject.isEmpty()) {
--			if (!find(entity)) {
-+			if (!find(entity.bare())) {
- 				addUserListItem(entity);
- 			}
- 			actionOpenChat(entity, body);

psi-plus-main-20130107.tar.xz/patches/1890-psi-dont-spellcheck-digits.diff Deleted

@@ -1,29 +0,0 @@
---- psi.orig/src/libpsi/tools/spellchecker/spellhighlighter.cpp
-+++ psi/src/libpsi/tools/spellchecker/spellhighlighter.cpp
-@@ -21,12 +21,14 @@ void SpellHighlighter::highlightBlock(co
- 
- 	// Match words (minimally)
- 	QRegExp expression("\\b\\w+\\b");
-+	QRegExp digit("\\d+");
- 
- 	// Iterate through all words
- 	int index = text.indexOf(expression);
- 	while (index >= 0) {
- 		int length = expression.matchedLength();
--		if (!SpellChecker::instance()->isCorrect(expression.cap()))
-+		QString word = expression.cap();
-+		if (!digit.exactMatch(word) && !SpellChecker::instance()->isCorrect(word))
- 			setFormat(index, length, tcf);
- 		index = text.indexOf(expression, index + length);
- 	}
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -348,7 +348,7 @@ void ChatEdit::contextMenuEvent(QContext
- 		tc.movePosition(QTextCursor::StartOfWord, QTextCursor::MoveAnchor);
- 		tc.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
- 		QString selected_word = tc.selectedText();
--		if (!selected_word.isEmpty() && !SpellChecker::instance()->isCorrect(selected_word)) {
-+		if (!selected_word.isEmpty() && !QRegExp("\\d+").exactMatch(selected_word) && !SpellChecker::instance()->isCorrect(selected_word)) {
- 			QList<QString> suggestions = SpellChecker::instance()->suggestions(selected_word);
- 			if (!suggestions.isEmpty() || SpellChecker::instance()->writable()) {
- 				QMenu spell_menu;

psi-plus-main-20130107.tar.xz/patches/1920-psi-fix-online-contacts-count-update.diff Deleted

@@ -1,45 +0,0 @@
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -437,6 +437,11 @@ public:
- 		reconnectTimeoutTimer_ = new QTimer(this);
- 		reconnectTimeoutTimer_->setSingleShot(true);
- 		connect(reconnectTimeoutTimer_, SIGNAL(timeout()), SLOT(reconnectTimerTimeout()));
-+
-+		updateOnlineContactsCountTimer_ = new QTimer(this);
-+		updateOnlineContactsCountTimer_->setInterval(500);
-+		updateOnlineContactsCountTimer_->setSingleShot(true);
-+		connect(updateOnlineContactsCountTimer_, SIGNAL(timeout()), SLOT(updateOnlineContactsCountTimeout()));
- 	}
- 
- 	PsiContactList* contactList;
-@@ -465,6 +470,7 @@ public:
- 	bool pepAvailable;
- 	QString currentConnectionError;
- 	int currentConnectionErrorCondition;
-+	QTimer *updateOnlineContactsCountTimer_;
- 
- 	// Tune
- 	Tune lastTune;
-@@ -631,7 +637,8 @@ public:
- 		return pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/events-" + JIDUtil::encode(acc.id).toLower() + ".xml";
- 	}
- 
--	void updateOnlineContactsCount()
-+private slots:
-+	void updateOnlineContactsCountTimeout()
- 	{
- 		int newOnlineContactsCount = 0;
- 		foreach(const PsiContact* c, contacts) {
-@@ -647,6 +654,12 @@ public:
- 		}
- 	}
- 
-+public:
-+	void updateOnlineContactsCount()
-+	{
-+		updateOnlineContactsCountTimer_->start();
-+	}
-+
- 	// FIXME: Rename updateEntry -> updateContact
- 	void updateEntry(const UserListItem& u)
- 	{

psi-plus-main-20130107.tar.xz/patches/1940-psi-remove-nick-entry-from-muc-stanzas.diff Deleted

psi-plus-main-20130107.tar.xz/patches/1950-psi-use-absolutefilepath-in-psireachtext.diff Deleted

psi-plus-main-20130107.tar.xz/patches/1960-psi-whiteboard-invitation-event.diff Deleted

@@ -1,374 +0,0 @@
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -1215,6 +1215,7 @@ PsiAccount::PsiAccount(const UserAccount
-  	d->sxeManager = new SxeManager(d->client, this);
- 	 // Initialize Whiteboard manager
- 	d->wbManager = new WbManager(d->client, this, d->sxeManager);
-+	connect(d->wbManager, SIGNAL(wbRequest(Jid,int)),SLOT(wbRequest(Jid,int)));
- #endif
- 
- 	// Avatars
-@@ -1548,7 +1549,12 @@ VoiceCaller* PsiAccount::voiceCaller() c
- {
- 	return d->voiceCaller;
- }
--
-+#ifdef WHITEBOARDING
-+WbManager* PsiAccount::wbManager() const
-+{
-+	return d->wbManager;
-+}
-+#endif
- PrivacyManager* PsiAccount::privacyManager() const
- {
- 	return d->privacyManager;
-@@ -2727,6 +2733,19 @@ void PsiAccount::client_messageReceived(
- 	processIncomingMessage(_m);
- }
- 
-+#ifdef WHITEBOARDING
-+void PsiAccount::wbRequest(const Jid &j, int id)
-+{
-+	SxeEvent *se = new SxeEvent(id, this);
-+	XMPP::Message m;
-+	m.setSubject(tr("Whiteboard invitation"));
-+	m.setFrom(j);
-+	se->setFrom(j);
-+	se->setMessage(m);
-+	handleEvent(se, IncomingStanza);
-+}
-+#endif
-+
- /**
-  * Handles the passed Message \param m. Also message's type could be modified
-  * here, if certain options are set.
-@@ -5162,6 +5181,13 @@ void PsiAccount::handleEvent(PsiEvent* e
- 	else if(e->type() == PsiEvent::HttpAuth) {
- 		soundType = eSystem;
- 	}
-+#ifdef WHITEBOARDING
-+	else if(e->type() == PsiEvent::Sxe) {
-+		soundType = eHeadline;
-+		doPopup = true;
-+		popupType = PopupManager::AlertHeadline;
-+	}
-+#endif
- 	else if(e->type() == PsiEvent::File) {
- 		soundType = eIncomingFT;
- 		doPopup = true;
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -91,6 +91,9 @@ class GoogleFileTransfer;
- #endif
- class PsiIcon;
- class QIcon;
-+#ifdef WHITEBOARDING
-+class WbManager;
-+#endif
- 
- // sick sick remove this someday please!
- struct GCContact;
-@@ -135,6 +138,9 @@ public:
- 	PrivacyManager* privacyManager() const;
- 	CapsManager* capsManager() const;
- 	VoiceCaller* voiceCaller() const;
-+#ifdef WHITEBOARDING
-+	WbManager* wbManager() const;
-+#endif
- 	Status status() const;
- 	static Status loggedOutStatus();
- 	int defaultPriority(const XMPP::Status &);
-@@ -440,6 +446,10 @@ private slots:
- 	void reconnect();
- 	void disconnect();
- 	void enableNotifyOnline();
-+
-+#ifdef WHITEBOARDING
-+	void wbRequest(const Jid& j, int id);
-+#endif
- 	
- 	void itemPublished(const Jid&, const QString&, const PubSubItem&);
- 	void itemRetracted(const Jid&, const QString&, const PubSubRetraction&);
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -112,6 +112,9 @@
- #include "alertmanager.h"
- #include "bosskey.h"
- #include "popupmanager.h"
-+#ifdef WHITEBOARDING
-+#include "whiteboarding/wbmanager.h"
-+#endif
- 
- #include "AutoUpdater/AutoUpdater.h"
- #ifdef HAVE_SPARKLE
-@@ -1783,6 +1786,16 @@ void PsiCon::processEvent(PsiEvent *e, A
- 		// as the event could be deleted just above, we're using cached account and from values
- 		account->openChat(from, activationType);
- 	}
-+#ifdef WHITEBOARDING
-+	else if (e->type() == PsiEvent::Sxe) {
-+		e->account()->eventQueue()->dequeue(e);
-+		e->account()->queueChanged();
-+		e->account()->cpUpdate(*u);
-+		e->account()->wbManager()->requestActivated(((SxeEvent*)e)->id());
-+		delete e;
-+		return;
-+	}
-+#endif
- 	else {
- 		// search for an already opened eventdlg
- 		EventDlg *w = e->account()->findDialog<EventDlg*>(u->jid());
---- psi.orig/src/psievent.h
-+++ psi/src/psievent.h
-@@ -53,6 +53,9 @@ public:
- 
- 	enum {
- 		Message,
-+#ifdef WHITEBOARDING
-+		Sxe,
-+#endif
- 		Auth,
- 		PGP,
- 		File,
-@@ -203,6 +206,26 @@ private:
- 	QString v_at;
- };
- 
-+#ifdef WHITEBOARDING
-+class SxeEvent : public MessageEvent
-+{
-+	Q_OBJECT
-+public:
-+	SxeEvent(int id, PsiAccount *acc)
-+		: MessageEvent(acc), id_(id) {}
-+	SxeEvent(const SxeEvent &from)
-+		: MessageEvent(from), id_(from.id()) {}
-+	~SxeEvent() {}
-+	int type() const { return Sxe; }
-+//	XMPP::Jid from() const { return jid(); }
-+//	void setFrom(const XMPP::Jid &) {  }
-+	int id() const { return id_; }
-+
-+private:
-+	int id_;
-+};
-+#endif
-+
- // request pgp passphrase
- class PGPEvent : public PsiEvent
- {
---- psi.orig/src/sxe/sxemanager.cpp
-+++ psi/src/sxe/sxemanager.cpp
-@@ -50,9 +50,9 @@ SxeManager::SxeManager(Client* client, P
- 	connect(&negotiationTimer_, SIGNAL(timeout()), SLOT(negotiationTimeout()));
- }
- 
--void SxeManager::addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features)) {
--	invitationCallbacks_ += callback;
--}
-+//void SxeManager::addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features)) {
-+//	invitationCallbacks_ += callback;
-+//}
- 
- void SxeManager::messageReceived(const Message &message) {
- 	// only process messages that contain a <sxe/> with a nonempty
-@@ -269,8 +269,9 @@ bool SxeManager::processNegotiationAsJoi
- 
- 		// check if one of the invitation callbacks accepts the invitation.
- 		const QString sessionId = negotiation->sessionId;
--		foreach(bool (*callback)(const Jid &peer, const QList<QString> &features), invitationCallbacks_) {
--			bool result = callback(negotiation->peer, negotiation->features);
-+//		foreach(bool (*callback)(const Jid &peer, const QList<QString> &features), invitationCallbacks_) {
-+			bool result = false; //callback(negotiation->peer, negotiation->features);
-+			emit invitationCallback(negotiation->peer, negotiation->features, &result);
- 			if (!negotiations_.contains(sessionId, negotiation)) { //FIXME that's wrong. negotiation can be replaced with new one with the same address
- 				return false;
- 			}
-@@ -279,7 +280,8 @@ bool SxeManager::processNegotiationAsJoi
- 				negotiation->state = SxeNegotiation::InvitationAccepted;
- 				return true;
- 			}
--		}
-+			return false;
-+//		}
- 		// othewise abort negotiation
- 		abortNegotiation(negotiation);
- 		return false;
---- psi.orig/src/sxe/sxemanager.h
-+++ psi/src/sxe/sxemanager.h
-@@ -101,8 +101,8 @@ public:
- 	 *  If such session doesn't exits, returns 0.
- 	 */
- 	QPointer<SxeSession> findSession(const QString &session);
--	/*! \brief Add a callback for invitations.*/
--	void addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features));
-+//	/*! \brief Add a callback for invitations.*/
-+//	void addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features));
- 	/*! \brief Starts a new session negotiation to the specified contact with given list of features.*/
- 	void startNewSession(const Jid &target, const Jid &ownJid, bool groupChat, const QDomDocument &initialDoc, QList<QString> features = QList<QString>());
- 	/*! \brief Join an existing session.*/
-@@ -118,6 +118,8 @@ signals:
- 	/*! \brief Emitted when \a an invitation to \a jid was declined and joining an alternative session \a session was suggested.*/
- 	void alternativeSession(const Jid &jid, const QString &session);
- 
-+	void invitationCallback(const Jid &peer, const QList<QString> &features, bool* result);
-+
- private:
- 	/*! \brief Process a message that contains a negotiation element.
- 	 *  Returns a pointer to the new session if negotiation finished.
-@@ -163,8 +165,8 @@ private:
- 	QList<DetectedSession> DetectedSessions_;
- 	/*! \brief A list of Jids corresponding to self.*/
- 	QList<QString> ownJids_;
--	/*! \brief A list of callbacks used to determine whether an invitation should be accepted.*/
--	QList<bool (*)(const Jid &peer, const QList<QString> &features)> invitationCallbacks_;
-+//	/*! \brief A list of callbacks used to determine whether an invitation should be accepted.*/
-+//	QList<bool (*)(const Jid &peer, const QList<QString> &features)> invitationCallbacks_;
- 	/*! \brief A counter used for including a unique id in each sent sxe element.*/
- 	int sxeId_;
- 	/*! \brief A list of messages waiting to be sent out.*/
---- psi.orig/src/whiteboarding/wbmanager.cpp
-+++ psi/src/whiteboarding/wbmanager.cpp
-@@ -32,8 +32,45 @@
- 
- using namespace XMPP;
- 
--// -----------------------------------------------------------------------------
- 
-+class WbRequest
-+{
-+public:
-+	WbRequest() : loop_(new QEventLoop), id_(lastRequetsId++)
-+	{}
-+
-+	~WbRequest()
-+	{
-+		if(loop_->isRunning())
-+			loop_->exit();
-+		delete loop_;
-+	}
-+
-+	void startLoop()
-+	{
-+		loop_->exec();
-+	}
-+
-+	void stopLoop()
-+	{
-+		loop_->exit();
-+	}
-+
-+	int id() const
-+	{
-+		return id_;
-+	}
-+
-+private:
-+	QEventLoop *loop_;
-+	int id_;
-+
-+	static int lastRequetsId;
-+};
-+
-+int WbRequest::lastRequetsId = 0;
-+
-+// -----------------------------------------------------------------------------
- WbManager::WbManager(XMPP::Client* client, PsiAccount* pa, SxeManager* sxemanager) {
- 	pa_ = pa;
- 	sxemanager_ = sxemanager;
-@@ -41,12 +78,14 @@ WbManager::WbManager(XMPP::Client* clien
- 	client->addExtension("whiteboard", Features(WBNS));
- 
- 	connect(sxemanager_, SIGNAL(sessionNegotiated(SxeSession*)), SLOT(createWbDlg(SxeSession*)));
--	sxemanager_->addInvitationCallback(WbManager::checkInvitation);
-+	//sxemanager_->addInvitationCallback(WbManager::checkInvitation);
-+	connect(sxemanager, SIGNAL(invitationCallback(Jid,QList<QString>,bool*)), this, SLOT(checkInvitation(Jid,QList<QString>,bool*)));
- }
- 
- WbManager::~WbManager()
- {
- 	qDeleteAll(dialogs_);
-+	qDeleteAll(requests_);
- }
- 
- void WbManager::openWhiteboard(const Jid &target, const Jid &ownJid, bool groupChat, bool promptInitialDoc) {
-@@ -143,13 +182,33 @@ void WbManager::createWbDlg(SxeSession*
- 	}
- }
- 
--bool WbManager::checkInvitation(const Jid &peer, const QList<QString> &features) {
--	if(!features.contains(WBNS))
--		return false;
-+void WbManager::checkInvitation(const Jid &peer, const QList<QString> &features, bool* result) {
-+	if(*result)
-+		return;
- 
--	return (QMessageBox::Yes == QMessageBox::question(NULL,
-+	if(!features.contains(WBNS)) {
-+		*result = false;
-+		return;
-+	}
-+
-+	WbRequest* wr = new WbRequest();
-+	requests_.append(wr);
-+	emit wbRequest(peer, wr->id());
-+	wr->startLoop();
-+	requests_.removeAll(wr);
-+	delete wr;
-+	*result = (QMessageBox::Yes == QMessageBox::question(NULL,
- 									tr("Whiteboarding Invitation?"),
- 									tr("%1 has invited you to a whiteboarding session. Would you like to join?").arg(peer.full()),
- 									QMessageBox::Yes | QMessageBox::No,
- 									QMessageBox::No));
- }
-+
-+void WbManager::requestActivated(int id) {
-+	foreach(WbRequest* wr, requests_) {
-+		if(wr->id() == id) {
-+			wr->stopLoop();
-+			return;
-+		}
-+	}
-+}
---- psi.orig/src/whiteboarding/wbmanager.h
-+++ psi/src/whiteboarding/wbmanager.h
-@@ -37,6 +37,7 @@ namespace XMPP {
- }
- 
- using namespace XMPP;
-+class WbRequest;
- 
- /*! \brief The manager for whiteboard dialogs.
-  *  The manager listen to SxeManager to pick up any new sessions negotiated by
-@@ -58,7 +59,8 @@ public:
- 	WbManager(XMPP::Client* client, PsiAccount* pa, SxeManager* sxemanager);
- 	~WbManager();
- 	/*! \brief Returns true if features contains WBNS and the user wishes to accept the invitation. */
--    static bool checkInvitation(const Jid &peer, const QList<QString> &features);
-+	//static bool checkInvitation(const Jid &peer, const QList<QString> &features);
-+	void requestActivated(int id);
- 
- public slots:
- 	/*! \brief Opens the existing dialog to the specified contact or starts a new session negotiation if necessary.*/
-@@ -75,13 +77,20 @@ private:
- 	/*! \brief A list of dialogs of established sessions.*/
- 	QList<WbDlg*> dialogs_;
- 	/*! \brief A pointer to the SxeManager used for negotiating sessions.*/
--    SxeManager* sxemanager_;
-+	SxeManager* sxemanager_;
-+
-+	QList<WbRequest*> requests_;
-+
-+signals:
-+	void wbRequest(const Jid &peer, int id);
- 
- private slots:
- 	/*! \brief Removes and deletes the dialog for the given session.*/
- 	void removeDialog(WbDlg* dialog);
- 	/*! \brief Returns a pointer to a new dialog to with given contact and session set.*/
- 	void createWbDlg(SxeSession* session);
-+
-+	void  checkInvitation(const Jid &peer, const QList<QString> &features, bool* result);
- };
- 
- #endif

psi-plus-main-20130107.tar.xz/patches/1970-psi-fix-display-status-icon.diff Deleted

@@ -1,60 +0,0 @@
---- psi.orig/src/userlist.cpp
-+++ psi/src/userlist.cpp
-@@ -23,6 +23,8 @@
- #include <QList>
- #include <QtCrypto>
- #include <QTextDocument> // for TextUtil::escape()
-+#include <QBuffer>
-+#include <QUrl>
- 
- #include "userlist.h"
- #include "avatars.h"
-@@ -848,33 +850,27 @@ QString UserListItem::makeBareTip(bool t
- 			else
- 				name = QObject::tr("[blank]");
- 
--			int status = makeSTATUS(r.status());
--			QString istr = "status/offline";
--			if(status == STATUS_ONLINE)
--				istr = "status/online";
--			else if(status == STATUS_AWAY)
--				istr = "status/away";
--			else if(status == STATUS_XA)
--				istr = "status/xa";
--			else if(status == STATUS_DND)
--				istr = "status/dnd";
--			else if(status == STATUS_CHAT)
--				istr = "status/chat";
--			else if(status == STATUS_INVISIBLE)
--				istr = "status/invisible"; //this shouldn't happen
--
- 			QString secstr;
- 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
- 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);
- 			QString hr;
- 			if (!mucItem)
- 				hr = "<hr/>";
--			if(r.status().mucItem().jid().isEmpty())
--				str += hr + QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
--				+ QString("(%1)").arg(r.priority()) + secstr + "</div>";
--			else
--				str += hr +  QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
--				+ QString("(%1) &lt;%2&gt;").arg(r.priority()).arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true))) + secstr + "</div>";
-+			str += hr + "<div style='white-space:pre'>";
-+
-+			PsiIcon *statusIcon = PsiIconset::instance()->statusPtr(jid(), makeSTATUS(r.status()));
-+			if (statusIcon) {
-+				QByteArray imageArray;
-+				QBuffer buff(&imageArray);
-+				statusIcon->image().save(&buff, "png");
-+				QString imgBase64(QUrl::toPercentEncoding(imageArray.toBase64()));
-+				str += QString("<img src=\"data:image/png;base64,%1\" alt=\"img\"/>").arg(imgBase64);
-+			}
-+
-+			str += QString(" <b>%1</b> ").arg(TextUtil::escape(name)) + QString("(%1)").arg(r.priority());
-+			if (!r.status().mucItem().jid().isEmpty())
-+				str += QString(" &lt;%1&gt;").arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true)));
-+			str += secstr + "</div>";
- 
- 			if(!r.publicKeyID().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool()) {
- 				int v = r.pgpVerifyStatus();

psi-plus-main-20130107.tar.xz/patches/1980-psi-fix-transports-group.diff Deleted

psi-plus-main-20130107.tar.xz/patches/9000-psi-more-effective-work-with-options.diff Deleted

@@ -1,671 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
-diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
-index 9440244..201bff0 100644
---- a/src/chatdlg.cpp
-+++ b/src/chatdlg.cpp
-@@ -270,14 +270,15 @@ bool ChatDlg::readyToHide()
- 	keepOpen_ = false; // tabdlg calls readyToHide twice on tabdlg close, only display message once.
- 
- 	// destroy the dialog if delChats is dcClose
--	if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "instant") {
-+	QString del = PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString();
-+	if (del == "instant") {
- 		setAttribute(Qt::WA_DeleteOnClose);
- 	}
- 	else {
--		if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "hour") {
-+		if (del == "hour") {
- 			setSelfDestruct(60);
- 		}
--		else if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "day") {
-+		else if (del == "day") {
- 			setSelfDestruct(60 * 24);
- 		}
- 	}
-@@ -574,15 +575,16 @@ void ChatDlg::optionsUpdate()
- 	setShortcuts();
- 
- 	if (!isTabbed() && isHidden()) {
--		if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "instant") {
-+		QString del = PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString();
-+		if (del == "instant") {
- 			deleteLater();
- 			return;
- 		}
- 		else {
--			if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "hour") {
-+			if (del == "hour") {
- 				setSelfDestruct(60);
- 			}
--			else if (PsiOptions::instance()->getOption("options.ui.chat.delete-contents-after").toString() == "day") {
-+			else if (del == "day") {
- 				setSelfDestruct(60 * 24);
- 			}
- 			else {
-diff --git a/src/gcuserview.cpp b/src/gcuserview.cpp
-index 164e2c5..7ad6ce7 100644
---- a/src/gcuserview.cpp
-+++ b/src/gcuserview.cpp
-@@ -60,25 +60,26 @@ public:
- 
- 	void updateSettings()
- 	{
-+		PsiOptions *o = PsiOptions::instance();
- 		colorForeground_ = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-foreground");
- 		colorBackground_ = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-background");
--		colorModerator_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-moderator").value<QColor>();
--		colorParticipant_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-participant").value<QColor>();
--		colorVisitor_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-visitor").value<QColor>();
--		colorNoRole_ = PsiOptions::instance()->getOption("options.ui.look.colors.muc.role-norole").value<QColor>();
--		showGroups_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-groups").toBool();
--		slimGroups_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.use-slim-group-headings").toBool();
--		nickColoring_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.nick-coloring").toBool();
--		showClients_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-client-icons").toBool();
--		showAffiliations_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-affiliation-icons").toBool();
--		showStatusIcons_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.show-status-icons").toBool();
--		showAvatar_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.show").toBool();
--		avatarSize_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.size").toInt();
--		avatarAtLeft_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.avatars-at-left").toBool();
--		avatarRadius_ = PsiOptions::instance()->getOption("options.ui.muc.userlist.avatars.radius").toInt();
-+		colorModerator_ = o->getOption("options.ui.look.colors.muc.role-moderator").value<QColor>();
-+		colorParticipant_ = o->getOption("options.ui.look.colors.muc.role-participant").value<QColor>();
-+		colorVisitor_ = o->getOption("options.ui.look.colors.muc.role-visitor").value<QColor>();
-+		colorNoRole_ = o->getOption("options.ui.look.colors.muc.role-norole").value<QColor>();
-+		showGroups_ = o->getOption("options.ui.muc.userlist.show-groups").toBool();
-+		slimGroups_ = o->getOption("options.ui.muc.userlist.use-slim-group-headings").toBool();
-+		nickColoring_ = o->getOption("options.ui.muc.userlist.nick-coloring").toBool();
-+		showClients_ = o->getOption("options.ui.muc.userlist.show-client-icons").toBool();
-+		showAffiliations_ = o->getOption("options.ui.muc.userlist.show-affiliation-icons").toBool();
-+		showStatusIcons_ = o->getOption("options.ui.muc.userlist.show-status-icons").toBool();
-+		showAvatar_ = o->getOption("options.ui.muc.userlist.avatars.show").toBool();
-+		avatarSize_ = o->getOption("options.ui.muc.userlist.avatars.size").toInt();
-+		avatarAtLeft_ = o->getOption("options.ui.muc.userlist.avatars.avatars-at-left").toBool();
-+		avatarRadius_ = o->getOption("options.ui.muc.userlist.avatars.radius").toInt();
- 
- 		QFont font;
--		font.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
-+		font.fromString(o->getOption("options.ui.look.font.contactlist").toString());
- 		fontHeight_ = QFontMetrics(font).height()+2;
- 	}
- 
-diff --git a/src/groupchatdlg.cpp b/src/groupchatdlg.cpp
-index 1b4bace..1ccd4fa 100644
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -654,8 +654,6 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	connect(account(), SIGNAL(updatedActivity()), SLOT(pa_updatedActivity()));
- 	d->mucManager = new MUCManager(account()->client(), jid());
- 
--	options_ = PsiOptions::instance();
--
- 	d->pending = 0;
- 	d->hPending = 0;
- 	d->connecting = false;
-@@ -1461,6 +1459,7 @@ void GCMainDlg::presence(const QString &nick, const Status &s)
- 		d->act_configure->setEnabled(s.mucItem().affiliation() >= MUCItem::Member);
- 	}
- 	
-+	PsiOptions *options_ = PsiOptions::instance();
- 
- 	if(s.isAvailable()) {
- 		// Available
-@@ -1536,7 +1535,7 @@ void GCMainDlg::presence(const QString &nick, const Status &s)
- 				}
- 			}
- 			if ( !d->connecting && options_->getOption("options.muc.show-status-changes").toBool() ) {
--				bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.muc.status-with-priority").toBool();
-+				bool statusWithPriority = options_->getOption("options.ui.muc.status-with-priority").toBool();
- 				if (s.status() != contact->s.status() || s.show() != contact->s.show() ||
- 						(statusWithPriority && s.priority() != contact->s.priority())) {
- 					ui_.log->dispatchMessage(MessageView::statusMessage(
-@@ -1678,12 +1677,13 @@ void GCMainDlg::message(const Message &_m)
- 		d->nonAnonymous = false;
- 	}
- 
-+	PsiOptions *options = PsiOptions::instance();
- 	if(!m.subject().isNull()) {
- 		QString subject = m.subject();
- 		d->topic = subject;
- 		QString subjectTooltip = TextUtil::plain2rich(subject);
- 		subjectTooltip = TextUtil::linkify(subjectTooltip);
--		if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool()) {
-+		if(options->getOption("options.ui.emoticons.use-emoticons").toBool()) {
- 			subjectTooltip = TextUtil::emoticonify(subjectTooltip);
- 		}
- 		ui_.le_topic->setText(subject.replace("\n\n", " || ").replace("\n", " | ").replace("\t", " ").replace(QRegExp("\\s{2,}"), " "));
-@@ -1717,8 +1717,8 @@ void GCMainDlg::message(const Message &_m)
- 	if (m.body().left(d->self.length()) == d->self)
- 		d->lastReferrer = m.from().resource();
- 
--	if(PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool()) {
--		QStringList highlightWords = PsiOptions::instance()->getOption("options.ui.muc.highlight-words").toStringList();
-+	if(options->getOption("options.ui.muc.use-highlighting").toBool()) {
-+		QStringList highlightWords = options->getOption("options.ui.muc.highlight-words").toStringList();
- 		foreach (QString word, highlightWords) {
- 			if(m.body().contains((word), Qt::CaseInsensitive)) {
- 				alert = true;
-@@ -1732,10 +1732,10 @@ void GCMainDlg::message(const Message &_m)
- 			account()->playSound(PsiAccount::eSend);
- 	}
- 	else {
--		if(alert || (PsiOptions::instance()->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
-+		if(alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
- 			account()->playSound(PsiAccount::eGroupChat);
- 
--		if(alert || (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
-+		if(alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
- 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
- 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
- 				MessageEvent *e = new MessageEvent(m, account());
-@@ -1809,9 +1809,8 @@ void GCMainDlg::appendSysMsg(const MessageView &mv)
- void GCMainDlg::appendMessage(const Message &m, bool alert)
- {
- 	MessageView mv(MessageView::Message);
--	if (m.containsHTML() && PsiOptions::instance()
--							->getOption("options.html.muc.render").toBool() &&
--							!m.html().text().isEmpty()) {
-+	if (m.containsHTML() && PsiOptions::instance()->getOption("options.html.muc.render").toBool() &&
-+					!m.html().text().isEmpty()) {
- 		mv.setHtml(m.html().toString("span"));
- 	} else {
- 		mv.setPlainText(m.body());
-diff --git a/src/groupchatdlg.h b/src/groupchatdlg.h
-index 61c0d27..79d94a8 100644
---- a/src/groupchatdlg.h
-+++ b/src/groupchatdlg.h
-@@ -171,7 +171,6 @@ private:
- 
- 	void contextMenuEvent(QContextMenuEvent *);
- 
--	PsiOptions* options_;
- 	QDateTime lastMsgTime_;
- 
- 	void setMargins();
-diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
-index 121c64f..5e90494 100644
---- a/src/psiaccount.cpp
-+++ b/src/psiaccount.cpp
-@@ -395,7 +395,6 @@ public:
- 		, selfContact(0)
- 		, psi(0)
- 		, account(parent)
--		, options(0)
- 		, client(0)
- 		, eventQueue(0)
- 		, xmlConsole(0)
-@@ -448,7 +447,6 @@ public:
- 	PsiSelfContact* selfContact;
- 	PsiCon *psi;
- 	PsiAccount *account;
--	PsiOptions *options;
- 	Client *client;
- 	UserAccount acc;
- 	Jid jid, nextJid;
-@@ -1088,7 +1086,6 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis
- 	d->contactList = parent;
- 	d->tabManager = tabManager;
- 	d->psi = parent->psi();
--	d->options = PsiOptions::instance();
- 	d->client = 0;
- 	d->userCounter = 0;
- 	d->avatarFactory = 0;
-@@ -1345,7 +1342,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis
- 	}
- 
- 	// Extended presence
--	if (d->options->getOption("options.extended-presence.notify").toBool()) {
-+	if (PsiOptions::instance()->getOption("options.extended-presence.notify").toBool()) {
- 		QStringList pepNodes;
- 		pepNodes += "http://jabber.org/protocol/mood+notify";
- 		pepNodes += "http://jabber.org/protocol/activity+notify";
-@@ -1818,7 +1815,7 @@ void PsiAccount::forceDisconnect(bool fast, const XMPP::Status &s)
- 
- 	if(loggedIn()) {
- 		// Extended Presence
--		if (d->options->getOption("options.extended-presence.tune.publish").toBool() && !d->lastTune.isNull())
-+		if (PsiOptions::instance()->getOption("options.extended-presence.tune.publish").toBool() && !d->lastTune.isNull())
- 			publishTune(Tune());
- 
- 		d->client->removeExtension("ep");
-@@ -2392,7 +2389,7 @@ void PsiAccount::setPEPAvailable(bool b)
- 	}
- 
- 	// Publish current tune information
--	if (b && d->psi->tuneManager() && d->options->getOption("options.extended-presence.tune.publish").toBool()) {
-+	if (b && d->psi->tuneManager() && PsiOptions::instance()->getOption("options.extended-presence.tune.publish").toBool()) {
- 		Tune current = d->psi->tuneManager()->currentTune();
- 		if (!current.isNull())
- 			publishTune(current);
-@@ -2825,11 +2822,12 @@ void PsiAccount::processIncomingMessage(const Message &_m)
- 		m.setType("chat");
- 	}
- 	else if (m.type() != "headline" && m.invite().isEmpty() && m.mucInvites().isEmpty()) {
--		if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "message")
-+		const QString type = PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString();
-+		if (type == "message")
- 			m.setType("");
--		else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "chat")
-+		else if (type == "chat")
- 			m.setType("chat");
--		else if (PsiOptions::instance()->getOption("options.messages.force-incoming-message-type").toString() == "current-open") {
-+		else if (type == "current-open") {
- 			c = NULL;
- 			foreach (ChatDlg *cl, findChatDialogs(m.from(), false)) {
- 				if (cl->autoSelectContact() || cl->jid().resource().isEmpty() || m.from().resource() == cl->jid().resource()) {
-@@ -3164,7 +3162,7 @@ void PsiAccount::tuneStopped()
- 
- void PsiAccount::tunePlaying(const Tune& tune)
- {
--	if (loggedIn() && d->options->getOption("options.extended-presence.tune.publish").toBool()) {
-+	if (loggedIn() && PsiOptions::instance()->getOption("options.extended-presence.tune.publish").toBool()) {
- 		publishTune(tune);
- 	}
- }
-@@ -4969,6 +4967,7 @@ void PsiAccount::createNewPluginEvent(const QString &jid, const QString &descr,
- // handle an incoming event
- void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- {
-+	PsiOptions *o = PsiOptions::instance();
- 	if (e && activationType != FromXml) {
- 		setEnabled();
- 	}
-@@ -5066,7 +5065,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 			return;
- 		}
- 		else if (m.messageReceipt() == ReceiptReceived) {
--			if (PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool()) {
-+			if (o->getOption("options.ui.notifications.request-receipts").toBool()) {
- 				foreach (ChatDlg *c, findChatDialogs(e->from(), false)) {
- 					if (c->autoSelectContact()  || c->jid().resource().isEmpty() || e->from().resource() == c->jid().resource()) {
- 						if (c->autoSelectContact())
-@@ -5081,7 +5080,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 
- 		// Pass message events to chat window
- 		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
--			if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) {
-+			if (o->getOption("options.messages.send-composing-events").toBool()) {
- 				ChatDlg *c = findChatDialogEx(e->from());
- 				if (c) {
- 					c->setJid(e->from());
-@@ -5117,7 +5116,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- #endif
- 				c->incomingMessage(m);
- 				soundType = eChat2;
--				if((PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab())
-+				if((o->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab())
- 					|| (c->isTabbed() && c->getManagingTabDlg()->isHidden()) ) {
- 					// to alert the chat also, we put it in the queue
- 					me->setSentToChatWindow(true);
-@@ -5125,7 +5124,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 				else {
- 					putToQueue = false;
- #ifdef YAPSI
--					if (!d->noPopup(activationType) && PsiOptions::instance()->getOption("options.ui.chat.auto-popup").toBool()) {
-+					if (!d->noPopup(activationType) && o->getOption("options.ui.chat.auto-popup").toBool()) {
- 						openChat(e->from(), activationType);
- 					}
- #endif
-@@ -5206,7 +5205,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 			}
- 			else if (userListItem && userListItem->inList()) {
- #else
--			if(PsiOptions::instance()->getOption("options.subscriptions.automatically-allow-authorization").toBool()) {
-+			if(o->getOption("options.subscriptions.automatically-allow-authorization").toBool()) {
- #endif
- 				// Check if we want to request auth as well
- 				UserListItem *u = d->userList.find(ae->from());
-@@ -5220,7 +5219,7 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 			}
- 		}
- 		else if(ae->authType() == "subscribed") {
--			if(!PsiOptions::instance()->getOption("options.ui.notifications.successful-subscription").toBool())
-+			if(!o->getOption("options.ui.notifications.successful-subscription").toBool())
- 				putToQueue = false;
- 		}
- 		else if(ae->authType() == "unsubscribe") {
-@@ -5253,12 +5252,12 @@ void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
- 			r = *(u->priority());
- 		}
- 
--		if ((popupType == PopupManager::AlertChat      && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool())     ||
--		    (popupType == PopupManager::AlertMessage   && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool())  ||
--		    (popupType == PopupManager::AlertHeadline  && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool()) ||
--		    (popupType == PopupManager::AlertFile      && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool()) ||
--		    (popupType == PopupManager::AlertAvCall    && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
--		    (popupType == PopupManager::AlertComposing && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.composing").toBool()))
-+		if ((popupType == PopupManager::AlertChat      && o->getOption("options.ui.notifications.passive-popups.incoming-chat").toBool())     ||
-+		    (popupType == PopupManager::AlertMessage   && o->getOption("options.ui.notifications.passive-popups.incoming-message").toBool())  ||
-+		    (popupType == PopupManager::AlertHeadline  && o->getOption("options.ui.notifications.passive-popups.incoming-headline").toBool()) ||
-+		    (popupType == PopupManager::AlertFile      && o->getOption("options.ui.notifications.passive-popups.incoming-file-transfer").toBool()) ||
-+		    (popupType == PopupManager::AlertAvCall    && o->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
-+		    (popupType == PopupManager::AlertComposing && o->getOption("options.ui.notifications.passive-popups.composing").toBool()))
- 		{
- #ifdef PSI_PLUGINS
- 			if(e->type() != PsiEvent::Plugin) {
-@@ -5735,7 +5734,7 @@ bool PsiAccount::groupChatJoin(const QString &host, const QString &room, const Q
- 	else {
- 		Status s = d->loginStatus;
- 		s.setXSigned("");
--		return d->client->groupChatJoin(host, room, nick, pass, d->options->getOption("options.muc.context.maxchars").toInt(),d->options->getOption("options.muc.context.maxstanzas").toInt(),d->options->getOption("options.muc.context.seconds").toInt(),s);
-+		return d->client->groupChatJoin(host, room, nick, pass, PsiOptions::instance()->getOption("options.muc.context.maxchars").toInt(),PsiOptions::instance()->getOption("options.muc.context.maxstanzas").toInt(),PsiOptions::instance()->getOption("options.muc.context.seconds").toInt(),s);
- 	}
- }
- 
-@@ -6261,11 +6260,12 @@ void PsiAccount::processEncryptedMessageDone()
- 
- void PsiAccount::optionsUpdate()
- {
-+	PsiOptions *o = PsiOptions::instance();
- 	profileUpdateEntry(d->self);
- 
- 	// Tune
- #ifdef USE_PEP // Tune cleaning not working. It's implemented in psicon.cpp in PsiCon::optionChanged
--	bool publish = d->options->getOption("options.extended-presence.tune.publish").toBool();
-+	bool publish = o->getOption("options.extended-presence.tune.publish").toBool();
- 	if (!d->lastTune.isNull() && !publish) {
- 		publishTune(Tune());
- 	}
-@@ -6277,19 +6277,19 @@ void PsiAccount::optionsUpdate()
- #endif
- 
- 	// Chat states
--	setSendChatState(PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool());
-+	setSendChatState(o->getOption("options.messages.send-composing-events").toBool());
- 
- 	//Receipts
--	setReceipts(PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool()); //FIXME second presence?
-+	setReceipts(o->getOption("options.ui.notifications.send-receipts").toBool()); //FIXME second presence?
- 
- 	// Remote Controlling
--	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
-+	setRCEnabled(o->getOption("options.external-control.adhoc-remote-control.enable").toBool());
- 
- 	// Roster item exchange
--	d->rosterItemExchangeTask->setIgnoreNonRoster(PsiOptions::instance()->getOption("options.messages.ignore-non-roster-contacts").toBool());
-+	d->rosterItemExchangeTask->setIgnoreNonRoster(o->getOption("options.messages.ignore-non-roster-contacts").toBool());
- 
- 	// Caps manager
--	d->capsManager->setEnabled(PsiOptions::instance()->getOption("options.service-discovery.enable-entity-capabilities").toBool());
-+	d->capsManager->setEnabled(o->getOption("options.service-discovery.enable-entity-capabilities").toBool());
- }
- 
- 
-diff --git a/src/psicon.cpp b/src/psicon.cpp
-index 4539fc5..22d2b05 100644
---- a/src/psicon.cpp
-+++ b/src/psicon.cpp
-@@ -502,13 +502,13 @@ bool PsiCon::init()
- #elif defined(USE_QDCHECKER)
- 	d->autoUpdater = new QDChecker();
- #endif
--	if (PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool() && d->autoUpdater)
-+	if (options->getOption("options.auto-update.check-on-startup").toBool() && d->autoUpdater)
- 		d->autoUpdater->checkForUpdates();
- 
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
--	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	const QString css = options->getOption("options.ui.chat.css").toString();
- 	if (!css.isEmpty())
- 		d->iconSelect->setStyleSheet(css);
- 
-@@ -543,8 +543,8 @@ bool PsiCon::init()
- 	Anim::setMainThread(QThread::currentThread());
- 
- 	// setup the main window
--	d->mainwin = new MainWin(PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool(), (PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() && PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool()), this);
--	d->mainwin->setUseDock(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool());
-+	d->mainwin = new MainWin(options->getOption("options.ui.contactlist.always-on-top").toBool(), (options->getOption("options.ui.systemtray.enable").toBool() && options->getOption("options.contactlist.use-toolwindow").toBool()), this);
-+	d->mainwin->setUseDock(options->getOption("options.ui.systemtray.enable").toBool());
- 	d->bossKey = new BossKey(d->mainwin);
- 
- 	Q_UNUSED(psiConObject);
-@@ -570,8 +570,8 @@ bool PsiCon::init()
- 	d->mainwin->setGeometryOptionPath("options.ui.contactlist.saved-window-geometry");
- 
- 	if (result &&
--	    !(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() &&
--	      PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool()))
-+	    !(options->getOption("options.ui.systemtray.enable").toBool() &&
-+	      options->getOption("options.contactlist.hide-on-start").toBool()))
- 	{
- 		d->mainwin->show();
- 	}
-@@ -671,15 +671,17 @@ bool PsiCon::init()
- 		}
- 		
- 		// Disable accounts if necessary, and overwrite locked properties
--		if (PsiOptions::instance()->getOption("options.ui.account.single").toBool() || !PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty()) {
-+		bool single = options->getOption("options.ui.account.single").toBool();
-+		QString domain = options->getOption("options.account.domain").toString();
-+		if (single || !domain.isEmpty()) {
- 			bool haveEnabled = false;
- 			for(UserAccountList::Iterator it = accs.begin(); it != accs.end(); ++it) {
- 				// With single accounts, only modify the first account
--				if (PsiOptions::instance()->getOption("options.ui.account.single").toBool()) {
-+				if (single) {
- 					if (!haveEnabled) {
- 						haveEnabled = it->opt_enabled;
- 						if (it->opt_enabled) {
--							if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty())
-+							if (!domain.isEmpty())
- 								it->jid = JIDUtil::accountFromString(Jid(it->jid).node()).bare();
- 						}
- 					}
-@@ -688,7 +690,7 @@ bool PsiCon::init()
- 				}
- 				else {
- 					// Overwirte locked properties
--					if (!PsiOptions::instance()->getOption("options.account.domain").toString().isEmpty())
-+					if (!domain.isEmpty())
- 						it->jid = JIDUtil::accountFromString(Jid(it->jid).node()).bare();
- 				}
- 			}
-@@ -706,7 +708,7 @@ bool PsiCon::init()
- 		emit statusMessageChanged(d->contactList->defaultAccount()->status().status());
- 
- 	// show tip of the day
--	if ( PsiOptions::instance()->getOption("options.ui.tip.show").toBool() ) {
-+	if ( options->getOption("options.ui.tip.show").toBool() ) {
- 		TipDlg::show(this);
- 	}
- 
-@@ -724,11 +726,11 @@ bool PsiCon::init()
- 
- 	if(AvCallManager::isSupported()) {
- 		options_avcall_update();
--		AvCallManager::setAudioOutDevice(PsiOptions::instance()->getOption("options.media.devices.audio-output").toString());
--		AvCallManager::setAudioInDevice(PsiOptions::instance()->getOption("options.media.devices.audio-input").toString());
--		AvCallManager::setVideoInDevice(PsiOptions::instance()->getOption("options.media.devices.video-input").toString());
--		AvCallManager::setBasePort(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt());
--		AvCallManager::setExternalAddress(PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString());
-+		AvCallManager::setAudioOutDevice(options->getOption("options.media.devices.audio-output").toString());
-+		AvCallManager::setAudioInDevice(options->getOption("options.media.devices.audio-input").toString());
-+		AvCallManager::setVideoInDevice(options->getOption("options.media.devices.video-input").toString());
-+		AvCallManager::setBasePort(options->getOption("options.p2p.bytestreams.listen-port").toInt());
-+		AvCallManager::setExternalAddress(options->getOption("options.p2p.bytestreams.external-address").toString());
- 	}
- 
- 
-@@ -1470,10 +1472,10 @@ void PsiCon::optionChanged(const QString& option)
- void PsiCon::slotApplyOptions()
- {
- 	PsiIconset::instance()->reloadRoster();
-+	PsiOptions *o = PsiOptions::instance();
- 
- #ifndef Q_WS_MAC
--	PsiOptions *o = PsiOptions::instance();
--	if (!PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool()) {
-+	if (!o->getOption("options.ui.contactlist.show-menubar").toBool()) {
- 		// check if all toolbars are disabled
- 		bool toolbarsVisible = false;
- 		foreach(QString base, o->getChildOptionNames("options.ui.contactlist.toolbars", true, true)) {
-@@ -1488,7 +1490,7 @@ void PsiCon::slotApplyOptions()
- 			QMessageBox::warning(0, tr("Warning"),
- 				tr("You can not disable <i>all</i> toolbars <i>and</i> the menubar. If you do so, you will be unable to enable them back, when you'll change your mind."),
- 				tr("I understand"));
--			PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", true);
-+			o->setOption("options.ui.contactlist.show-menubar", true);
- 		}
- 	}
- #endif
-@@ -1496,16 +1498,16 @@ void PsiCon::slotApplyOptions()
- 	updateS5BServerAddresses();
- 
- 	if(AvCallManager::isSupported()) {
--		AvCallManager::setAudioOutDevice(PsiOptions::instance()->getOption("options.media.devices.audio-output").toString());
--		AvCallManager::setAudioInDevice(PsiOptions::instance()->getOption("options.media.devices.audio-input").toString());
--		AvCallManager::setVideoInDevice(PsiOptions::instance()->getOption("options.media.devices.video-input").toString());
--		AvCallManager::setBasePort(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt());
--		AvCallManager::setExternalAddress(PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString());
-+		AvCallManager::setAudioOutDevice(o->getOption("options.media.devices.audio-output").toString());
-+		AvCallManager::setAudioInDevice(o->getOption("options.media.devices.audio-input").toString());
-+		AvCallManager::setVideoInDevice(o->getOption("options.media.devices.video-input").toString());
-+		AvCallManager::setBasePort(o->getOption("options.p2p.bytestreams.listen-port").toInt());
-+		AvCallManager::setExternalAddress(o->getOption("options.p2p.bytestreams.external-address").toString());
- 	}
- 
- 	// mainwin stuff
--	d->mainwin->setWindowOpts(PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool(), (PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() && PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool()));
--	d->mainwin->setUseDock(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool());
-+	d->mainwin->setWindowOpts(o->getOption("options.ui.contactlist.always-on-top").toBool(), (o->getOption("options.ui.systemtray.enable").toBool() && o->getOption("options.contactlist.use-toolwindow").toBool()));
-+	d->mainwin->setUseDock(o->getOption("options.ui.systemtray.enable").toBool());
- 	d->mainwin->buildToolbars();
- 
- 	// notify about options change
-@@ -1537,9 +1539,10 @@ void PsiCon::queueChanged()
- void PsiCon::startBounce()
- {
- #ifdef Q_WS_MAC
--	if (PsiOptions::instance()->getOption("options.ui.notifications.bounce-dock").toString() != "never") {
-+	QString bounce = PsiOptions::instance()->getOption("options.ui.notifications.bounce-dock").toString();
-+	if (bounce != "never") {
- 		MacDock::startBounce();
--		if (PsiOptions::instance()->getOption("options.ui.notifications.bounce-dock").toString() == "once") {
-+		if (bounce == "once") {
- 			MacDock::stopBounce();
- 		}
- 	}
-@@ -1597,7 +1600,8 @@ void PsiCon::recentGCAdd(const QString &str)
- 	recentList.prepend(str);
- 
- 	// trim the list if bigger than 10
--	while(recentList.count() > PsiOptions::instance()->getOption("options.muc.recent-joins.maximum").toInt()) {
-+	int max = PsiOptions::instance()->getOption("options.muc.recent-joins.maximum").toInt();
-+	while(recentList.count() > max) {
- 		recentList.takeLast();
- 	}
- 	
-@@ -1840,17 +1844,18 @@ void PsiCon::updateS5BServerAddresses()
- 		slist += (*hit).toString();
- 
- 	// add external
--	if(!PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString().isEmpty()) {
-+	QString extAddr = PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString();
-+	if(!extAddr.isEmpty()) {
- 		bool found = false;
- 		for(QStringList::ConstIterator sit = slist.begin(); sit != slist.end(); ++sit) {
- 			const QString &s = *sit;
--			if(s == PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString()) {
-+			if(s == extAddr) {
- 				found = true;
- 				break;
- 			}
- 		}
- 		if(!found)
--			slist += PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString();
-+			slist += extAddr;
- 	}
- 
- 	// set up the server
-@@ -1862,9 +1867,10 @@ void PsiCon::s5b_init()
- 	if(d->s5bServer->isActive())
- 		d->s5bServer->stop();
- 
--	if (PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) {
--		if(!d->s5bServer->start(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt())) {
--			QMessageBox::warning(0, tr("Warning"), tr("Unable to bind to port %1 for Data Transfer.\nThis may mean you are already running another instance of Psi. You may experience problems sending and/or receiving files.").arg(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()));
-+	int port = PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt();
-+	if (port) {
-+		if(!d->s5bServer->start(port)) {
-+			QMessageBox::warning(0, tr("Warning"), tr("Unable to bind to port %1 for Data Transfer.\nThis may mean you are already running another instance of Psi. You may experience problems sending and/or receiving files.").arg(port));
- 		}
- 	}
- }
-diff --git a/src/psicontactlistviewdelegate.cpp b/src/psicontactlistviewdelegate.cpp
-index dfbc74d..a4ff7c8 100644
---- a/src/psicontactlistviewdelegate.cpp
-+++ b/src/psicontactlistviewdelegate.cpp
-@@ -49,6 +49,8 @@ static const QString avatarAtLeftOptionPath = "options.ui.contactlist.avatars.av
- static const QString showStatusIconsPath = "options.ui.contactlist.show-status-icons";
- static const QString statusIconsOverAvatarsPath = "options.ui.contactlist.status-icon-over-avatar";
- static const QString statusIconsetOptionPath = "options.iconsets.status";
-+static const QString allClientsOptionPath = "options.ui.contactlist.show-all-client-icons";
-+static const QString enableGroupsOptionPath = "options.ui.contactlist.enable-groups";
- 
- PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
- 	: ContactListViewDelegate(parent)
-@@ -81,6 +83,8 @@ PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
- 	optionChanged(avatarAtLeftOptionPath);
- 	optionChanged(showStatusIconsPath);
- 	optionChanged(statusIconsOverAvatarsPath);
-+	optionChanged(allClientsOptionPath);
-+	optionChanged(enableGroupsOptionPath);
- }
- 
- PsiContactListViewDelegate::~PsiContactListViewDelegate()
-@@ -195,7 +199,7 @@ void PsiContactListViewDelegate::drawContact(QPainter* painter, const QStyleOpti
- 		int size = avatarSize_;
- 		avatarRect.setSize(QSize(size,size));
- 		if(avatarAtLeft_) {
--			avatarRect.translate(PsiOptions::instance()->getOption("options.ui.contactlist.enable-groups").toBool() ? -5:-1, 1);
-+			avatarRect.translate(enableGroups_ ? -5:-1, 1);
- 			r.setLeft(avatarRect.right() + 3);
- 		}
- 		else {
-@@ -303,14 +307,14 @@ void PsiContactListViewDelegate::drawContact(QPainter* painter, const QStyleOpti
- 	QList<int> rightWidths;
- 	if(!isMuc) {
- 	if (showClientIcons_) {
--		bool showAllClients = PsiOptions::instance()->getOption("options.ui.contactlist.show-all-client-icons").toBool();
- 		const QList<QPixmap> pixList = this->clientPixmap(index);
- 
- 		for (QList<QPixmap>::ConstIterator it = pixList.begin(); it != pixList.end(); ++it) {
- 			const QPixmap &pix = *it;
- 			rightPixs.push_back(pix);
- 			rightWidths.push_back(pix.width());
--			if(!showAllClients) break;
-+			if(!allClients_)
-+				break;
- 		}
- 	}
- 
-@@ -577,6 +581,14 @@ void PsiContactListViewDelegate::optionChanged(const QString& option)
- 		statusSingle_ = !PsiOptions::instance()->getOption(statusSingleOptionPath).toBool();
- 		contactList()->viewport()->update();
- 	}
-+	else if(option == allClientsOptionPath) {
-+		allClients_= PsiOptions::instance()->getOption(allClientsOptionPath).toBool();
-+		contactList()->viewport()->update();
-+	}
-+	else if(option == enableGroupsOptionPath) {
-+		enableGroups_ = PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool();
-+		contactList()->viewport()->update();
-+	}
- }
- 
- void PsiContactListViewDelegate::rosterIconsSizeChanged(int size)
-diff --git a/src/psicontactlistviewdelegate.h b/src/psicontactlistviewdelegate.h
-index 161fb0d..8cbe4e1 100644
---- a/src/psicontactlistviewdelegate.h
-+++ b/src/psicontactlistviewdelegate.h
-@@ -71,6 +71,7 @@ private:
- 	int avatarSize_, avatarRadius_,;
- 	mutable QHash<QModelIndex, bool> alertingIndexes_;
- 	int statusIconSize_;
-+	bool enableGroups_, allClients_;
- };
- 
- #endif

psi-plus-main-20130107.tar.xz/patches/dev/1020-psi-fix-encoding-of-command-line-arguments.diff Deleted

psi-plus-main-20130107.tar.xz/patches/dev/psi-fix-crash-when-going-offline.patch Deleted

psi-plus-main-20130107.tar.xz/patches/dev/psi-fix-tunes-dev.diff Deleted

@@ -1,2672 +0,0 @@
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -36,7 +36,7 @@
- 				<publish comment="Publish user tune information" type="bool">true</publish>
- 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
- 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
--				<controller-filter comment="List of disabled controllers" type="QString"></controller-filter>
-+				<controller-filter comment="List of disabled controllers" type="QString">WinAmp</controller-filter>
- 			</tune>
- 		</extended-presence>
- 		<muc comment="Multi-User Chat options">
---- git.orig/src/options/options.pri
-+++ git/src/options/options.pri
-@@ -27,7 +27,8 @@ HEADERS += \
- 	$$PWD/opt_avcall.h \
- 	$$PWD/opt_toolbars.h \
- 	$$PWD/opt_advanced.h \
--	$$PWD/opt_shortcuts.h
-+	$$PWD/opt_shortcuts.h \
-+	$$PWD/opt_statuspep.h
- 
- HEADERS += $$PWD/opt_tree.h
- 
-@@ -48,7 +49,8 @@ SOURCES += \
- 	$$PWD/opt_avcall.cpp \
- 	$$PWD/opt_toolbars.cpp \
- 	$$PWD/opt_advanced.cpp \
--	$$PWD/opt_shortcuts.cpp
-+	$$PWD/opt_shortcuts.cpp \
-+	$$PWD/opt_statuspep.cpp
- 
- SOURCES += $$PWD/opt_tree.cpp
- 
-@@ -75,7 +77,8 @@ FORMS += \
- 	$$PWD/opt_iconset_system.ui \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
--	$$PWD/opt_shortcuts.ui
-+	$$PWD/opt_shortcuts.ui \
-+	$$PWD/opt_statuspep.ui
- 
- psi_plugins {
- 	FORMS += $$PWD/opt_plugins.ui
---- git.orig/src/options/opt_status.cpp
-+++ git/src/options/opt_status.cpp
-@@ -1,6 +1,7 @@
- #include "opt_status.h"
- #include "opt_statusgeneral.h"
- #include "opt_statusauto.h"
-+#include "opt_statuspep.h"
- 
- OptionsTabStatus::OptionsTabStatus(QObject *parent)
- : MetaOptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
-@@ -10,4 +11,5 @@ OptionsTabStatus::OptionsTabStatus(QObje
- 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), parent, SLOT(enableCommonWidgets(bool)));
- 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), SLOT(enableOtherTabs(bool)));
- 	addTab(new OptionsTabStatusAuto(this));
-+	addTab(new OptionsTabStatusPep(this));
- }
---- git.orig/src/options/opt_statuspep.cpp
-+++ git/src/options/opt_statuspep.cpp
-@@ -0,0 +1,108 @@
-+#include "opt_statuspep.h"
-+#include "psioptions.h"
-+
-+#include <QListWidget>
-+#include <QCheckBox>
-+
-+#include "ui_opt_statuspep.h"
-+
-+static const char *tuneUrlFilterOptionPath = "options.extended-presence.tune.url-filter";
-+static const char *tuneControllerFilterOptionPath = "options.extended-presence.tune.controller-filter";
-+
-+class OptStatusPepUI : public QWidget, public Ui::OptStatusPep
-+{
-+public:
-+	OptStatusPepUI() : QWidget() { setupUi(this); }
-+};
-+
-+OptionsTabStatusPep::OptionsTabStatusPep(QObject *parent)
-+: OptionsTab(parent, "status_tunes", "", tr("PEP"), tr("Tunes no-video filter and controllers switcher"))
-+, w_(0)
-+, psi_(0)
-+, controllersChanged_(false)
-+{
-+}
-+
-+OptionsTabStatusPep::~OptionsTabStatusPep()
-+{
-+}
-+
-+QWidget *OptionsTabStatusPep::widget()
-+{
-+	if (w_) {
-+		return 0;
-+	}
-+
-+	w_ = new OptStatusPepUI();
-+	return w_;
-+}
-+
-+void OptionsTabStatusPep::applyOptions()
-+{
-+	if (!w_) {
-+		return;
-+	}
-+
-+	OptStatusPepUI *d = (OptStatusPepUI *)w_;
-+	PsiOptions* o = PsiOptions::instance();
-+	QStringList newTuneFilters = d->tuneExtensions->text().split(QRegExp("\\W+"));
-+	QString tuneExstensionsFilter;
-+	if (!newTuneFilters.isEmpty()) {
-+		newTuneFilters.removeDuplicates();
-+		qSort(newTuneFilters);
-+		tuneExstensionsFilter = newTuneFilters.join(" ").toLower();
-+		d->tuneExtensions->setText(tuneExstensionsFilter);
-+	}
-+	QString controllerFilter = blackList_.join(",");
-+	if (tuneExstensionsFilter != tuneFilters_) {
-+		o->setOption(tuneUrlFilterOptionPath, tuneExstensionsFilter);
-+	}
-+	if (controllersChanged_) {
-+		o->setOption(tuneControllerFilterOptionPath, controllerFilter);
-+	}
-+}
-+
-+void OptionsTabStatusPep::restoreOptions()
-+{
-+	if (!w_) {
-+		return;
-+	}
-+
-+	OptStatusPepUI *d = (OptStatusPepUI *)w_;
-+	PsiOptions* o = PsiOptions::instance();
-+	tuneFilters_ = o->getOption(tuneUrlFilterOptionPath).toString();
-+	d->tuneExtensions->setText(tuneFilters_);
-+	QStringList controllers = psi_->tuneManager()->controllerNames();
-+	blackList_ = o->getOption(tuneControllerFilterOptionPath).toString().split(QRegExp("[,]\\s*"), QString::SkipEmptyParts);
-+	foreach(const QString &name, controllers) {
-+		QCheckBox* cb = new QCheckBox(name);
-+		QString caption = name + " controller";
-+		cb->setText(caption);
-+		cb->setObjectName(name);
-+		int i = controllers.indexOf(name);
-+		d->gridLayout->addWidget(cb,i/3,i%3);
-+		cb->setChecked(!blackList_.contains(name));
-+		connect(cb, SIGNAL(toggled(bool)), SLOT(controllerSelected(bool)));
-+	}
-+}
-+
-+void OptionsTabStatusPep::controllerSelected(bool checked)
-+{
-+	QCheckBox *box = qobject_cast<QCheckBox*>(sender());
-+	QString name_ = box->objectName();
-+	if (!name_.isEmpty()) {
-+		if (!checked && !blackList_.contains(name_, Qt::CaseInsensitive)) {
-+			blackList_ << name_;
-+			controllersChanged_ = true;
-+		}
-+		else if (checked) {
-+			blackList_.removeAll(name_);
-+			controllersChanged_ = true;
-+		}
-+	}
-+}
-+
-+void OptionsTabStatusPep::setData(PsiCon *psi, QWidget *)
-+{
-+	psi_ = psi;
-+}
---- git.orig/src/options/opt_statuspep.h
-+++ git/src/options/opt_statuspep.h
-@@ -0,0 +1,36 @@
-+#ifndef OPT_STAUSPEP_H
-+#define OPT_STAUSPEP_H
-+
-+#include "optionstab.h"
-+#include "common.h"
-+#include "psicon.h"
-+
-+class QWidget;
-+
-+class OptionsTabStatusPep : public OptionsTab
-+{
-+	Q_OBJECT
-+
-+public:
-+
-+	OptionsTabStatusPep(QObject *parent);
-+	~OptionsTabStatusPep();
-+
-+	QWidget *widget();
-+	void applyOptions();
-+	void restoreOptions();
-+	void setData(PsiCon *psi, QWidget *);
-+
-+protected slots:
-+	void controllerSelected(bool);
-+
-+private:
-+	QWidget *w_;
-+	PsiCon *psi_;
-+	QStringList blackList_;
-+	QString tuneFilters_;
-+	bool controllersChanged_;
-+};
-+
-+
-+#endif // OPT_STAUSPEP_H
---- git.orig/src/options/opt_statuspep.ui
-+++ git/src/options/opt_statuspep.ui
-@@ -0,0 +1,108 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>OptStatusPep</class>
-+ <widget class="QWidget" name="OptStatusPep">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>588</width>
-+    <height>350</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Form</string>
-+  </property>
-+  <property name="autoFillBackground">
-+   <bool>false</bool>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-+      <string>Tunes</string>
-+     </property>
-+     <property name="alignment">
-+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-+     </property>
-+     <property name="flat">
-+      <bool>false</bool>
-+     </property>
-+     <layout class="QVBoxLayout" name="verticalLayout_4">
-+      <property name="spacing">
-+       <number>6</number>
-+      </property>
-+      <item>
-+       <widget class="QLabel" name="label">
-+        <property name="text">
-+         <string>Enter media file extensions to ignore them on tune sending</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QLineEdit" name="tuneExtensions">
-+        <property name="toolTip">
-+         <string>Add extensions</string>
-+        </property>
-+        <property name="whatsThis">
-+         <string>Ignored media file extensions on psi tunes sending</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="QGroupBox" name="rightGroupBox">
-+        <property name="sizePolicy">
-+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-+          <horstretch>0</horstretch>
-+          <verstretch>0</verstretch>
-+         </sizepolicy>
-+        </property>
-+        <property name="title">
-+         <string>Tune Controllers</string>
-+        </property>
-+        <property name="flat">
-+         <bool>false</bool>
-+        </property>
-+        <layout class="QVBoxLayout" name="verticalLayout_2">
-+         <property name="spacing">
-+          <number>0</number>
-+         </property>
-+         <property name="sizeConstraint">
-+          <enum>QLayout::SetDefaultConstraint</enum>
-+         </property>
-+         <property name="margin">
-+          <number>6</number>
-+         </property>
-+         <item>
-+          <layout class="QGridLayout" name="gridLayout"/>
-+         </item>
-+        </layout>
-+       </widget>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <spacer name="verticalSpacer">
-+     <property name="orientation">
-+      <enum>Qt::Vertical</enum>
-+     </property>
-+     <property name="sizeHint" stdset="0">
-+      <size>
-+       <width>20</width>
-+       <height>40</height>
-+      </size>
-+     </property>
-+    </spacer>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -29,7 +29,7 @@ pep {
- 	DEFINES += USE_PEP
- 	CONFIG += tc_psifile
- 	mac { CONFIG += tc_itunes }
--	windows { CONFIG += tc_winamp }
-+	windows { CONFIG += tc_aimp tc_winamp }
- 	unix:dbus:!mac { CONFIG += tc_mpris }
- }
- include($$PWD/tools/tunecontroller/tunecontroller.pri)
---- git.orig/src/tools/tunecontroller/aimptunecontroller.cpp
-+++ git/src/tools/tunecontroller/aimptunecontroller.cpp
-@@ -0,0 +1,138 @@
-+/*
-+ * aimptunecontroller.cpp
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#include "aimptunecontroller.h"
-+#include "plugins/aimp/third-party/AIMPSDKCommon.h"
-+#include "plugins/aimp/third-party/AIMPSDKRemote.h"
-+
-+/**
-+ * \class AIMPTuneController
-+ * \brief A controller class for AIMP3 player.
-+ */
-+
-+static const int PLAYING = 2;
-+static const int STOPPED = 0;
-+static const WCHAR* AIMP_REMOTE_CLASS = (WCHAR *)L"AIMP2_RemoteInfo";
-+
-+AIMPTuneController::AIMPTuneController()
-+: PollingTuneController(),
-+  _tuneSent(false)
-+{
-+	startPoll();
-+}
-+
-+HWND AIMPTuneController::findAimp() const
-+{
-+	return FindWindow(AIMP_REMOTE_CLASS, AIMP_REMOTE_CLASS);
-+}
-+
-+int AIMPTuneController::getAimpStatus(const HWND &aimp) const
-+{
-+	if (aimp) {
-+		return (int)SendMessage(aimp, WM_AIMP_PROPERTY, AIMP_RA_PROPERTY_PLAYER_STATE | AIMP_RA_PROPVALUE_GET, 0);
-+	}
-+	return STOPPED;
-+}
-+
-+void AIMPTuneController::check()
-+{
-+	HWND aimp = findAimp();
-+	if (getAimpStatus(aimp) == PLAYING) {
-+		sendTune(getTune());
-+	}
-+	else {
-+		clearTune();
-+	}
-+	PollingTuneController::check();
-+}
-+
-+Tune AIMPTuneController::currentTune() const
-+{
-+	return _currentTune;
-+}
-+
-+Tune AIMPTuneController::getTune() const
-+{
-+	HANDLE aFile=OpenFileMapping(FILE_MAP_READ, TRUE, AIMP_REMOTE_CLASS);
-+	TAIMPFileInfo *aInfo=(TAIMPFileInfo *)MapViewOfFile(aFile, FILE_MAP_READ, 0, 0, AIMPRemoteAccessMapFileSize);
-+	if (aInfo != NULL) {
-+		wchar_t *str = (wchar_t *)((char*)aInfo + aInfo->StructSize);
-+		QString album = QString::fromWCharArray(str, aInfo->AlbumLength);
-+		str += aInfo->AlbumLength;
-+		QString artist = QString::fromWCharArray(str, aInfo->ArtistLength);
-+		str += aInfo->ArtistLength + aInfo->DateLength;
-+		QString url = QString::fromWCharArray(str, aInfo->FileNameLength);
-+		str += aInfo->FileNameLength + aInfo->GenreLength;
-+		QString title = QString::fromWCharArray(str, aInfo->TitleLength);
-+		unsigned long trackNumber = aInfo->TrackNumber;
-+		unsigned long time = aInfo->Duration;
-+		Tune tune = Tune();
-+		if (!url.isEmpty()) {
-+			if (!title.isEmpty()) {
-+				tune.setName(title);
-+			}
-+			else {
-+				int index = url.replace("/", "\\").lastIndexOf("\\");
-+				if (index > 0) {
-+					QString filename = url.right(url.length()-index-1);
-+					index = filename.lastIndexOf(".");
-+					title = (index > 0) ? filename.left(index) : filename;
-+				}
-+				else {
-+					title = url;
-+				}
-+				tune.setName(title);
-+			}
-+			if (trackNumber > 0) {
-+				tune.setTrack(QString::number(trackNumber));
-+			}
-+			if (time > 0) {
-+				tune.setTime((uint)time);
-+			}
-+			if (!artist.isEmpty()) {
-+				tune.setArtist(artist);
-+			}
-+			if (!album.isEmpty()) {
-+				tune.setAlbum(album);
-+			}
-+			tune.setURL(url);
-+		}
-+		return tune;
-+	}
-+	UnmapViewOfFile(aInfo);
-+	CloseHandle(aFile);
-+	return Tune();
-+}
-+
-+void AIMPTuneController::sendTune(const Tune &tune)
-+{
-+	if (tune != _currentTune && !tune.isNull()) {
-+		_currentTune = tune;
-+		_tuneSent = true;
-+	}
-+}
-+
-+void AIMPTuneController::clearTune()
-+{
-+	if (_tuneSent) {
-+		_currentTune = Tune();
-+		_tuneSent = false;
-+	}
-+}
---- git.orig/src/tools/tunecontroller/aimptunecontroller.h
-+++ git/src/tools/tunecontroller/aimptunecontroller.h
-@@ -0,0 +1,51 @@
-+/*
-+ * aimptunecontroller.h
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef AIMPTUNECONTROLLER_H
-+#define AIMPTUNECONTROLLER_H
-+
-+#include "pollingtunecontroller.h"
-+#include "tune.h"
-+#include "windows.h"
-+
-+class AIMPTuneController : public PollingTuneController
-+{
-+	Q_OBJECT
-+
-+public:
-+	AIMPTuneController();
-+	Tune currentTune() const;
-+
-+protected slots:
-+	void check();
-+
-+private:
-+	Tune getTune() const;
-+	HWND findAimp() const;
-+	int getAimpStatus(const HWND &aimp) const;
-+	void sendTune(const Tune &tune);
-+	void clearTune();
-+
-+private:
-+	Tune _currentTune;
-+	bool _tuneSent;
-+};
-+
-+#endif
---- git.orig/src/tools/tunecontroller/itunestunecontroller.cpp
-+++ git/src/tools/tunecontroller/itunestunecontroller.cpp
-@@ -0,0 +1,113 @@
-+/*
-+ * itunescontroller.cpp 
-+ * Copyright (C) 2006  Remko Troncon
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QtGlobal>
-+#include <QString>
-+#include <QTime>
-+#include <QDebug>
-+
-+#include <CoreFoundation/CoreFoundation.h>
-+
-+#include "itunestunecontroller.h"
-+
-+/**
-+ * \class ITunesController
-+ * \brief A controller for the Mac OS X version of iTunes.
-+ */
-+
-+static QString CFStringToQString(CFStringRef s)
-+{
-+	QString result;
-+
-+	if (s != NULL) {
-+		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
-+		char* buffer = new char[length];
-+		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
-+			result = QString::fromUtf8(buffer);
-+		}
-+		else {
-+			qWarning("itunesplayer.cpp: CFString conversion failed.");
-+		}
-+		delete[] buffer;
-+	} 
-+    return result;
-+}
-+
-+
-+ITunesController::ITunesController()
-+{
-+	// TODO: Poll iTunes for current playing tune
-+	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
-+	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
-+}
-+
-+ITunesController::~ITunesController()
-+{
-+	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
-+	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
-+}
-+
-+Tune ITunesController::currentTune() const
-+{
-+	return currentTune_;
-+}
-+
-+void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
-+{
-+	Tune tune;
-+	ITunesController* controller = (ITunesController*) observer;
-+	
-+	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
-+	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Paused";
-+		emit controller->stopped();
-+	}
-+	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Stopped";
-+		emit controller->stopped();
-+	}
-+	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
-+		//qDebug() << "itunesplayer.cpp: Playing";
-+		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
-+		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
-+		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
-+		
-+		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
-+		if (cf_track) {
-+			int tracknr;
-+			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
-+				qWarning("itunesplayer.cpp: Number value conversion failed.");
-+			}
-+			tune.setTrack(QString::number(tracknr));
-+		}
-+		
-+		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
-+		int time = 0;
-+		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
-+			qWarning("itunesplayer.cpp: Number value conversion failed.");
-+		}
-+		tune.setTime((unsigned int) (time / 1000));
-+		controller->currentTune_ = tune;
-+		emit controller->playing(tune);
-+	}
-+	else {
-+		qWarning("itunesplayer.cpp: Unknown state.");
-+	}
-+}
---- git.orig/src/tools/tunecontroller/itunestunecontroller.h
-+++ git/src/tools/tunecontroller/itunestunecontroller.h
-@@ -0,0 +1,22 @@
-+#ifndef ITUNESTUNECONTROLLER_H
-+#define ITUNESTUNECONTROLLER_H
-+
-+#include <QString>
-+#include <CoreFoundation/CoreFoundation.h>
-+
-+#include "tunecontrollerinterface.h"
-+
-+class ITunesController : public TuneController
-+{
-+public:
-+	ITunesController();
-+	~ITunesController();
-+
-+	virtual Tune currentTune() const;
-+
-+private:
-+	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
-+	Tune currentTune_;
-+};
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
-+++ git/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
-@@ -0,0 +1,56 @@
-+/*
-+ * aimpplugin.cpp
-+ * Copyright (C) 2012 Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ */
-+
-+#ifndef QT_STATICPLUGIN
-+#define QT_STATICPLUGIN
-+#endif
-+
-+#include <QtCore>
-+#include <QObject>
-+#include <QString>
-+
-+#include "aimptunecontroller.h"
-+#include "tunecontrollerplugin.h"
-+
-+class AIMPPlugin : public QObject, public TuneControllerPlugin
-+{
-+
-+	Q_OBJECT
-+
-+	Q_INTERFACES(TuneControllerPlugin)
-+
-+public:
-+	virtual QString name();
-+	virtual TuneController* createController();
-+};
-+
-+Q_EXPORT_PLUGIN2(aimpplugin, AIMPPlugin);
-+
-+QString AIMPPlugin::name()
-+{
-+	return "AIMP3";
-+}
-+
-+TuneController* AIMPPlugin::createController()
-+{
-+	return new AIMPTuneController();
-+}
-+
-+#include "aimpplugin.moc"
---- git.orig/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKCommon.h
-+++ git/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKCommon.h
-@@ -0,0 +1,50 @@
-+/* ******************************************** */
-+/*                                              */
-+/*                AIMP Plugins API              */
-+/*             v3.00.960 (01.12.2011)           */
-+/*                Common Objects                */
-+/*                                              */
-+/*              (c) Artem Izmaylov              */
-+/*                 www.aimp.ru                  */
-+/*             Mail: artem@aimp.ru              */
-+/*              ICQ: 345-908-513                */
-+/*                                              */
-+/* ******************************************** */
-+
-+#ifndef AIMPSDKCommonH
-+#define AIMPSDKCommonH
-+
-+#include <windows.h>
-+#include <unknwn.h>
-+
-+#pragma pack(push, 1)
-+struct TAIMPFileInfo
-+{
-+	DWORD StructSize;
-+	//
-+	BOOL  Active;
-+	DWORD BitRate;
-+	DWORD Channels;
-+	DWORD Duration;
-+	INT64 FileSize;
-+	DWORD Rating;
-+	DWORD SampleRate;
-+	DWORD TrackNumber;
-+	//
-+	DWORD AlbumLength;
-+	DWORD ArtistLength;
-+	DWORD DateLength;
-+	DWORD FileNameLength;
-+	DWORD GenreLength;
-+	DWORD TitleLength;
-+	//
-+	PWCHAR Album;
-+	PWCHAR Artist;
-+	PWCHAR Date;
-+	PWCHAR FileName;
-+	PWCHAR Genre;
-+	PWCHAR Title;
-+};
-+#pragma pack(pop)
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKRemote.h
-+++ git/src/tools/tunecontroller/plugins/aimp/third-party/AIMPSDKRemote.h
-@@ -0,0 +1,37 @@
-+/* ******************************************** */
-+/*                                              */
-+/*                AIMP Plugins API              */
-+/*             v3.00.960 (01.12.2011)           */
-+/*                 Remote Access                */
-+/*                                              */
-+/*              (c) Artem Izmaylov              */
-+/*                 www.aimp.ru                  */
-+/*             Mail: artem@aimp.ru              */
-+/*              ICQ: 345-908-513                */
-+/*                                              */
-+/* ******************************************** */
-+
-+/*
-+** This AIMP SDK file (AIMPSDKRemote.h) was changed specially for Psi+ aimptunecontroller
-+** Unused methods, comments and structures was removed from this file
-+** Do not use it in another projects
-+*/
-+
-+#ifndef AIMPSDKRemoteH
-+#define AIMPSDKRemoteH
-+
-+#include <windows.h>
-+
-+const char AIMPRemoteAccessClass[] = "AIMP2_RemoteInfo";
-+const int  AIMPRemoteAccessMapFileSize = 2048;
-+const int WM_AIMP_PROPERTY = WM_USER + 0x77;
-+const int AIMP_RA_PROPVALUE_GET = 0;
-+const int AIMP_RA_PROPERTY_MASK = 0xFFFFFFF0;
-+// !! ReadOnly
-+// Returns current player state
-+//  0 = Stopped
-+//  1 = Paused
-+//  2 = Playing
-+const int AIMP_RA_PROPERTY_PLAYER_STATE = 0x40;
-+
-+#endif
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
-+++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
-@@ -1,113 +0,0 @@
--/*
-- * itunescontroller.cpp 
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include <QtGlobal>
--#include <QString>
--#include <QTime>
--#include <QDebug>
--
--#include <CoreFoundation/CoreFoundation.h>
--
--#include "itunescontroller.h"
--
--/**
-- * \class ITunesController
-- * \brief A controller for the Mac OS X version of iTunes.
-- */
--
--static QString CFStringToQString(CFStringRef s)
--{
--	QString result;
--
--	if (s != NULL) {
--		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
--		char* buffer = new char[length];
--		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
--			result = QString::fromUtf8(buffer);
--		}
--		else {
--			qWarning("itunesplayer.cpp: CFString conversion failed.");
--		}
--		delete[] buffer;
--	} 
--    return result;
--}
--
--
--ITunesController::ITunesController()
--{
--	// TODO: Poll iTunes for current playing tune
--	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
--	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
--}
--
--ITunesController::~ITunesController()
--{
--	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
--	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
--}
--
--Tune ITunesController::currentTune() const
--{
--	return currentTune_;
--}
--
--void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
--{
--	Tune tune;
--	ITunesController* controller = (ITunesController*) observer;
--	
--	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
--	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Paused";
--		emit controller->stopped();
--	}
--	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Stopped";
--		emit controller->stopped();
--	}
--	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
--		//qDebug() << "itunesplayer.cpp: Playing";
--		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
--		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
--		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
--		
--		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
--		if (cf_track) {
--			int tracknr;
--			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
--				qWarning("itunesplayer.cpp: Number value conversion failed.");
--			}
--			tune.setTrack(QString::number(tracknr));
--		}
--		
--		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
--		int time = 0;
--		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
--			qWarning("itunesplayer.cpp: Number value conversion failed.");
--		}
--		tune.setTime((unsigned int) (time / 1000));
--		controller->currentTune_ = tune;
--		emit controller->playing(tune);
--	}
--	else {
--		qWarning("itunesplayer.cpp: Unknown state.");
--	}
--}
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
-+++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
-@@ -1,22 +0,0 @@
--#ifndef ITUNESCONTROLLER_H
--#define ITUNESCONTROLLER_H
--
--#include <QString>
--#include <CoreFoundation/CoreFoundation.h>
--
--#include "tunecontrollerinterface.h"
--
--class ITunesController : public TuneController
--{
--public:
--	ITunesController();
--	~ITunesController();
--
--	virtual Tune currentTune() const;
--
--private:
--	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
--	Tune currentTune_;
--};
--
--#endif
---- git.orig/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
-+++ git/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
-@@ -26,7 +26,7 @@
- #include <QObject>
- #include <QString>
- 
--#include "itunescontroller.h"
-+#include "itunestunecontroller.h"
- #include "tunecontrollerplugin.h"
- 
- class ITunesPlugin : public QObject, public TuneControllerPlugin
---- git.orig/src/tools/tunecontroller/plugins/winamp/third-party/wa_ipc.h
-+++ git/src/tools/tunecontroller/plugins/winamp/third-party/wa_ipc.h
-@@ -1,5 +1,5 @@
- /*
--** Copyright (C) 2003 Nullsoft, Inc.
-+** Copyright (C) 1997-2008 Nullsoft, Inc.
- **
- ** This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held 
- ** liable for any damages arising from the use of this software. 
-@@ -16,1008 +16,56 @@
- **
- */
- 
--#ifndef _WA_IPC_H_
--#define _WA_IPC_H_
--
- /*
--** This is the modern replacement for the classic 'frontend.h'. Most of these 
--** updates are designed for in-process use, i.e. from a plugin.
--**
--*/
--
--/* message used to sent many messages to winamp's main window. 
--** most all of the IPC_* messages involve sending the message in the form of:
--**   result = SendMessage(hwnd_winamp,WM_WA_IPC,(parameter),IPC_*);
--*/
--#define WM_WA_IPC WM_USER
--/* but some of them use WM_COPYDATA. be afraid.
--*/
--
--#define IPC_GETVERSION 0
--/* int version = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETVERSION);
--**
--** Version will be 0x20yx for winamp 2.yx. versions previous to Winamp 2.0
--** typically (but not always) use 0x1zyx for 1.zx versions. Weird, I know.
--*/
--
--#define IPC_GETREGISTEREDVERSION 770
--
--
--typedef struct {
--  char *filename;
--  char *title;
--  int length;
--} enqueueFileWithMetaStruct; // send this to a IPC_PLAYFILE in a non WM_COPYDATA, 
--// and you get the nice desired result. if title is NULL, it is treated as a "thing",
--// otherwise it's assumed to be a file (for speed)
--
--#define IPC_PLAYFILE 100  // dont be fooled, this is really the same as enqueufile
--#define IPC_ENQUEUEFILE 100 
--/* sent as a WM_COPYDATA, with IPC_PLAYFILE as the dwData, and the string to play
--** as the lpData. Just enqueues, does not clear the playlist or change the playback
--** state.
--*/
--
--
--#define IPC_DELETE 101
--#define IPC_DELETE_INT 1101 // don't use this, it's used internally by winamp when 
--                            // dealing with some lame explorer issues.
--/* SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_DELETE);
--** Use IPC_DELETE to clear Winamp's internal playlist.
-+** This Winamp SDK file (wa_ipc.h) was changed specially for Psi+ winamptunecontroller
-+** Unused methods, comments and structures was removed from this file
-+** Do not use it in another projects
- */
- 
-+#ifndef _WA_IPC_H_
-+#define _WA_IPC_H_
- 
--#define IPC_STARTPLAY 102   // starts playback. almost like hitting play in Winamp.
--#define IPC_STARTPLAY_INT 1102 // used internally, don't bother using it (won't be any fun)
--
--
--#define IPC_CHDIR 103
--/* sent as a WM_COPYDATA, with IPC_CHDIR as the dwData, and the directory to change to
--** as the lpData. 
--*/
--
-+#include <windows.h>
-+#include <stddef.h>
-+#ifndef _WIN64
-+typedef int intptr_t;
-+#endif
- 
-+#define WM_WA_IPC WM_USER
- #define IPC_ISPLAYING 104
- /* int res = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISPLAYING);
--** If it returns 1, it is playing. if it returns 3, it is paused, 
--** if it returns 0, it is not playing.
-+** This is sent to retrieve the current playback state of Winamp.
-+** If it returns 1, Winamp is playing.
-+** If it returns 3, Winamp is paused.
-+** If it returns 0, Winamp is not playing.
- */
--
--
- #define IPC_GETOUTPUTTIME 105
- /* int res = SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETOUTPUTTIME);
--** returns the position in milliseconds of the current track (mode = 0), 
--** or the track length, in seconds (mode = 1). Returns -1 if not playing or error.
--*/
--
--
--#define IPC_JUMPTOTIME 106
--/* (requires Winamp 1.60+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,ms,IPC_JUMPTOTIME);
--** IPC_JUMPTOTIME sets the position in milliseconds of the 
--** current song (approximately).
--** Returns -1 if not playing, 1 on eof, or 0 if successful
--*/
--
--#define IPC_GETMODULENAME 109
--#define IPC_EX_ISRIGHTEXE 666
--/* usually shouldnt bother using these, but here goes:
--** send a WM_COPYDATA with IPC_GETMODULENAME, and an internal
--** flag gets set, which if you send a normal WM_WA_IPC message with
--** IPC_EX_ISRIGHTEXE, it returns whether or not that filename
--** matches. lame, I know.
--*/
--
--#define IPC_WRITEPLAYLIST 120
--/* (requires Winamp 1.666+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_WRITEPLAYLIST);
--**
--** IPC_WRITEPLAYLIST writes the current playlist to <winampdir>\\Winamp.m3u,
--** and returns the current playlist position.
--** Kinda obsoleted by some of the 2.x new stuff, but still good for when
--** using a front-end (instead of a plug-in)
--*/
--
--
--#define IPC_SETPLAYLISTPOS 121
--/* (requires Winamp 2.0+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,position,IPC_SETPLAYLISTPOS)
--** IPC_SETPLAYLISTPOS sets the playlist position to 'position'. It
--** does not change playback or anything, it just sets position, and
--** updates the view if necessary
--*/
--
--
--#define IPC_SETVOLUME 122
--/* (requires Winamp 2.0+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,volume,IPC_SETVOLUME);
--** IPC_SETVOLUME sets the volume of Winamp (from 0-255).
-+** If mode = 0 then it will return the position (in ms) of the currently playing track.
-+** Will return -1 if Winamp is not playing.
-+** If mode = 1 then it will return the current track length (in seconds).
-+** Will return -1 if there are no tracks (or possibly if Winamp cannot get the length).
-+** If mode = 2 then it will return the current track length (in milliseconds).
-+** Will return -1 if there are no tracks (or possibly if Winamp cannot get the length).
- */
--
--
--#define IPC_SETPANNING 123
--/* (requires Winamp 2.0+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,panning,IPC_SETPANNING);
--** IPC_SETPANNING sets the panning of Winamp (from 0 (left) to 255 (right)).
--*/
--
--
--#define IPC_GETLISTLENGTH 124
--/* (requires Winamp 2.0+)
--** int length = SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTLENGTH);
--** IPC_GETLISTLENGTH returns the length of the current playlist, in
--** tracks.
--*/
--
--
- #define IPC_GETLISTPOS 125
--/* (requires Winamp 2.05+)
--** int pos=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GETLISTPOS);
--** IPC_GETLISTPOS returns the playlist position. A lot like IPC_WRITEPLAYLIST
--** only faster since it doesn't have to write out the list. Heh, silly me.
--*/
--
--
--#define IPC_GETINFO 126
--/* (requires Winamp 2.05+)
--** int inf=SendMessage(hwnd_winamp,WM_WA_IPC,mode,IPC_GETINFO);
--** IPC_GETINFO returns info about the current playing song. The value
--** it returns depends on the value of 'mode'.
--** Mode      Meaning
--** ------------------
--** 0         Samplerate (i.e. 44100)
--** 1         Bitrate  (i.e. 128)
--** 2         Channels (i.e. 2)
--** 3 (5+)    Video LOWORD=w HIWORD=h
--** 4 (5+)    > 65536, string (video description)
--*/
--
--
--#define IPC_GETEQDATA 127
--/* (requires Winamp 2.05+)
--** int data=SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
--** IPC_GETEQDATA queries the status of the EQ. 
--** The value returned depends on what 'pos' is set to:
--** Value      Meaning
--** ------------------
--** 0-9        The 10 bands of EQ data. 0-63 (+20db - -20db)
--** 10         The preamp value. 0-63 (+20db - -20db)
--** 11         Enabled. zero if disabled, nonzero if enabled.
--** 12         Autoload. zero if disabled, nonzero if enabled.
--*/
--
--
--#define IPC_SETEQDATA 128
--/* (requires Winamp 2.05+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA);
--** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SETEQDATA);
--** IPC_SETEQDATA sets the value of the last position retrieved
--** by IPC_GETEQDATA. This is pretty lame, and we should provide
--** an extended version that lets you do a MAKELPARAM(pos,value).
--** someday...
--
--  new (2.92+): 
--    if the high byte is set to 0xDB, then the third byte specifies
--    which band, and the bottom word specifies the value.
--*/
--
--#define IPC_ADDBOOKMARK 129
--/* (requires Winamp 2.4+)
--** Sent as a WM_COPYDATA, using IPC_ADDBOOKMARK, adds the specified
--** file/url to the Winamp bookmark list.
--*/
--/*
--In winamp 5+, we use this as a normal WM_WA_IPC and the string:
--
--  "filename\0title\0"
--
--  to notify the library/bookmark editor that a bookmark
--was added. Note that using this message in this context does not
--actually add the bookmark.
--do not use :)
--*/
--
--
--#define IPC_INSTALLPLUGIN 130
--/* not implemented, but if it was you could do a WM_COPYDATA with 
--** a path to a .wpz, and it would install it.
--*/
--
--
--#define IPC_RESTARTWINAMP 135
--/* (requires Winamp 2.2+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_RESTARTWINAMP);
--** IPC_RESTARTWINAMP will restart Winamp (isn't that obvious ? :)
--*/
--
--
--#define IPC_ISFULLSTOP 400
--/* (requires winamp 2.7+ I think)
--** ret=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_ISFULLSTOP);
--** useful for when you're an output plugin, and you want to see
--** if the stop/close is a full stop, or just between tracks.
--** returns nonzero if it's full, zero if it's just a new track.
--*/
--
--
--#define IPC_INETAVAILABLE 242
--/* (requires Winamp 2.05+)
--** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_INETAVAILABLE);
--** IPC_INETAVAILABLE will return 1 if the Internet connection is available for Winamp.
--*/
--
--
--#define IPC_UPDTITLE 243
--/* (requires Winamp 2.2+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_UPDTITLE);
--** IPC_UPDTITLE will ask Winamp to update the informations about the current title.
--*/
--
--
--#define IPC_REFRESHPLCACHE 247
--/* (requires Winamp 2.2+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_REFRESHPLCACHE);
--** IPC_REFRESHPLCACHE will flush the playlist cache buffer.
--** (send this if you want it to go refetch titles for tracks)
--*/
--
--
--#define IPC_GET_SHUFFLE 250
--/* (requires Winamp 2.4+)
--** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_SHUFFLE);
--**
--** IPC_GET_SHUFFLE returns the status of the Shuffle option (1 if set)
--*/
--
--
--#define IPC_GET_REPEAT 251
--/* (requires Winamp 2.4+)
--** val=SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_GET_REPEAT);
--**
--** IPC_GET_REPEAT returns the status of the Repeat option (1 if set)
--*/
--
--
--#define IPC_SET_SHUFFLE 252
--/* (requires Winamp 2.4+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_SHUFFLE);
--**
--** IPC_SET_SHUFFLE sets the status of the Shuffle option (1 to turn it on)
--*/
--
--
--#define IPC_SET_REPEAT 253
--/* (requires Winamp 2.4+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_SET_REPEAT);
--**
--** IPC_SET_REPEAT sets the status of the Repeat option (1 to turn it on)
--*/
--
--
--#define IPC_ENABLEDISABLE_ALL_WINDOWS 259 // 0xdeadbeef to disable
--/* (requires Winamp 2.9+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,enable?0:0xdeadbeef,IPC_MBOPENREAL);
--** sending with 0xdeadbeef as the param disables all winamp windows, 
--** any other values will enable all winamp windows.
--*/
--
--
--#define IPC_GETWND 260
--/* (requires Winamp 2.9+)
--** HWND h=SendMessage(hwnd_winamp,WM_WA_IPC,IPC_GETWND_xxx,IPC_GETWND);
--** returns the HWND of the window specified.
--*/
--  #define IPC_GETWND_EQ 0 // use one of these for the param
--  #define IPC_GETWND_PE 1
--  #define IPC_GETWND_MB 2
--  #define IPC_GETWND_VIDEO 3
--#define IPC_ISWNDVISIBLE 261 // same param as IPC_GETWND
--
--
--
--
--/************************************************************************
--***************** in-process only (WE LOVE PLUGINS)
--************************************************************************/
--
--
--#define IPC_SETSKIN 200
--/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"skinname",IPC_SETSKIN);
--** IPC_SETSKIN sets the current skin to "skinname". Note that skinname 
--** can be the name of a skin, a skin .zip file, with or without path. 
--** If path isn't specified, the default search path is the winamp skins 
--** directory.
--*/
--
--
--#define IPC_GETSKIN 201
--/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)skinname_buffer,IPC_GETSKIN);
--** IPC_GETSKIN puts the directory where skin bitmaps can be found 
--** into  skinname_buffer.
--** skinname_buffer must be MAX_PATH characters in length.
--** When using a .zip'd skin file, it'll return a temporary directory
--** where the ZIP was decompressed.
--*/
--
--
--#define IPC_EXECPLUG 202
--/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)"vis_file.dll",IPC_EXECPLUG);
--** IPC_EXECPLUG executes a visualization plug-in pointed to by WPARAM.
--** the format of this string can be:
--** "vis_whatever.dll"
--** "vis_whatever.dll,0" // (first mod, file in winamp plug-in dir)
--** "C:\\dir\\vis_whatever.dll,1" 
--*/
--
--
- #define IPC_GETPLAYLISTFILE 211
--/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
--** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTFILE);
--** IPC_GETPLAYLISTFILE gets the filename of the playlist entry [index].
--** returns a pointer to it. returns NULL on error.
--*/
--
--
--#define IPC_GETPLAYLISTTITLE 212
--/* (requires Winamp 2.04+, only usable from plug-ins (not external apps))
--** char *name=SendMessage(hwnd_winamp,WM_WA_IPC,index,IPC_GETPLAYLISTTITLE);
--**
--** IPC_GETPLAYLISTTITLE gets the title of the playlist entry [index].
--** returns a pointer to it. returns NULL on error.
--*/
--
--
--#define IPC_GETHTTPGETTER 240
--/* retrieves a function pointer to a HTTP retrieval function.
--** if this is unsupported, returns 1 or 0.
--** the function should be:
--** int (*httpRetrieveFile)(HWND hwnd, char *url, char *file, char *dlgtitle);
--** if you call this function, with a parent window, a URL, an output file, and a dialog title,
--** it will return 0 on successful download, 1 on error.
--*/
--
--
--#define IPC_MBOPEN 241
--/* (requires Winamp 2.05+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,0,IPC_MBOPEN);
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPEN);
--** IPC_MBOPEN will open a new URL in the minibrowser. if url is NULL, it will open the Minibrowser window.
--*/
--
--
--
--#define IPC_CHANGECURRENTFILE 245
--/* (requires Winamp 2.05+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)file,IPC_CHANGECURRENTFILE);
--** IPC_CHANGECURRENTFILE will set the current playlist item.
--*/
--
--
--#define IPC_GETMBURL 246
--/* (requires Winamp 2.2+)
--** char buffer[4096]; // Urls can be VERY long
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)buffer,IPC_GETMBURL);
--** IPC_GETMBURL will retrieve the current Minibrowser URL into buffer.
--** buffer must be at least 4096 bytes long.
--*/
--
--
--#define IPC_MBBLOCK 248
--/* (requires Winamp 2.4+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,value,IPC_MBBLOCK);
--**
--** IPC_MBBLOCK will block the Minibrowser from updates if value is set to 1
--*/
--
--#define IPC_MBOPENREAL 249
--/* (requires Winamp 2.4+)
--** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)url,IPC_MBOPENREAL);
--**
--** IPC_MBOPENREAL works the same as IPC_MBOPEN except that it will works even if 
--** IPC_MBBLOCK has been set to 1
--*/
--
--#define IPC_ADJUST_OPTIONSMENUPOS 280
--/* (requires Winamp 2.9+)
--** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_OPTIONSMENUPOS);
--** moves where winamp expects the Options menu in the main menu. Useful if you wish to insert a
--** menu item above the options/skins/vis menus.
--*/
--
--#define IPC_GET_HMENU 281
--/* (requires Winamp 2.9+)
--** HMENU hMenu=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)0,IPC_GET_HMENU);
--** values for data:
--** 0 : main popup menu 
--** 1 : main menubar file menu
--** 2 : main menubar options menu
--** 3 : main menubar windows menu
--** 4 : main menubar help menu
--** other values will return NULL.
--*/
-+#define IPC_GETPLAYLISTFILEW 214
-+#define IPC_GET_EXTENDED_FILE_INFO 290
- 
--#define IPC_GET_EXTENDED_FILE_INFO 290 //pass a pointer to the following struct in wParam
--#define IPC_GET_EXTENDED_FILE_INFO_HOOKABLE 296
--/* (requires Winamp 2.9+)
--** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
--** filename and metadata field you wish to query, and ret to a buffer, with retlen to the
--** length of that buffer, and then SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_GET_EXTENDED_FILE_INFO);
--** the results should be in the buffer pointed to by ret.
--** returns 1 if the decoder supports a getExtendedFileInfo method
--*/
- typedef struct {
--  char *filename;
--  char *metadata;
--  char *ret;
--  int retlen;
-+	const char *filename;
-+	const char *metadata;
-+	char *ret;
-+	size_t retlen;
- } extendedFileInfoStruct;
- 
--#define IPC_GET_BASIC_FILE_INFO 291 //pass a pointer to the following struct in wParam
--typedef struct {
--  char *filename;
--
--  int quickCheck; // set to 0 to always get, 1 for quick, 2 for default (if 2, quickCheck will be set to 0 if quick wasnot used)
--
--  // filled in by winamp
--  int length;
--  char *title;
--  int titlelen;
--} basicFileInfoStruct;
--
--#define IPC_GET_EXTLIST 292 //returns doublenull delimited. GlobalFree() it when done. if data is 0, returns raw extlist, if 1, returns something suitable for getopenfilename
--
--#define IPC_INFOBOX 293
--typedef struct {
--  HWND parent;
--  char *filename;
--} infoBoxParam;
--
--#define IPC_SET_EXTENDED_FILE_INFO 294 //pass a pointer to the a extendedFileInfoStruct in wParam
--/* (requires Winamp 2.9+)
--** to use, create an extendedFileInfoStruct, point the values filename and metadata to the
--** filename and metadata field you wish to write in ret. (retlen is not used). and then 
--** SendMessage(hwnd_winamp,WM_WA_IPC,&struct,IPC_SET_EXTENDED_FILE_INFO);
--** returns 1 if the metadata is supported
--** Call IPC_WRITE_EXTENDED_FILE_INFO once you're done setting all the metadata you want to update
--*/
--
--#define IPC_WRITE_EXTENDED_FILE_INFO 295 
--/* (requires Winamp 2.9+)
--** writes all the metadata set thru IPC_SET_EXTENDED_FILE_INFO to the file
--** returns 1 if the file has been successfully updated, 0 if error
--*/
--
--#define IPC_FORMAT_TITLE 297
--typedef struct 
--{
--  char *spec; // NULL=default winamp spec
--  void *p;
--
--  char *out;
--  int out_len;
--
--  char * (*TAGFUNC)(char * tag, void * p); //return 0 if not found
--  void (*TAGFREEFUNC)(char * tag,void * p);
--} waFormatTitle;
--
--#define IPC_GETUNCOMPRESSINTERFACE 331
--/* returns a function pointer to uncompress().
--** int (*uncompress)(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
--** right out of zlib, useful for decompressing zlibbed data.
--** if you pass the parm of 0x10100000, it will return a wa_inflate_struct * to an inflate API.
--*/
--
--typedef struct {
--  int (*inflateReset)(void *strm);
--  int (*inflateInit_)(void *strm,const char *version, int stream_size);
--  int (*inflate)(void *strm, int flush);
--  int (*inflateEnd)(void *strm);
--  unsigned long (*crc32)(unsigned long crc, const unsigned  char *buf, unsigned int len);
--} wa_inflate_struct;
--
--
--#define IPC_ADD_PREFS_DLG 332
--#define IPC_REMOVE_PREFS_DLG 333
--/* (requires Winamp 2.9+)
--** to use, allocate a prefsDlgRec structure (either on the heap or some global
--** data, but NOT on the stack), initialze the members:
--** hInst to the DLL instance where the resource is located
--** dlgID to the ID of the dialog,
--** proc to the window procedure for the dialog
--** name to the name of the prefs page in the prefs.
--** where to 0 (eventually we may add more options)
--** then, SendMessage(hwnd_winamp,WM_WA_IPC,&prefsRec,IPC_ADD_PREFS_DLG);
--**
--** you can also IPC_REMOVE_PREFS_DLG with the address of the same prefsRec,
--** but you shouldn't really ever have to.
--**
--*/
--#define IPC_OPENPREFSTOPAGE 380 // pass an id of a builtin page, or a &prefsDlgRec of prefs page to open
--
--typedef struct _prefsDlgRec {
--  HINSTANCE hInst;
--  int dlgID;
--  void *proc;
--
--  char *name;
--  int where; // 0 for options, 1 for plugins, 2 for skins, 3 for bookmarks, 4 for prefs
--
--
--  int _id;
--  struct _prefsDlgRec *next;
--} prefsDlgRec;
--
--
--#define IPC_GETINIFILE 334 // returns a pointer to winamp.ini
--#define IPC_GETINIDIRECTORY 335 // returns a pointer to the directory to put config files in (if you dont want to use winamp.ini)
--
--#define IPC_SPAWNBUTTONPOPUP 361 // param =
--// 0 = eject
--// 1 = previous
--// 2 = next
--// 3 = pause
--// 4 = play
--// 5 = stop
--
--#define IPC_OPENURLBOX 360 // pass a HWND to a parent, returns a HGLOBAL that needs to be freed with GlobalFree(), if successful
--#define IPC_OPENFILEBOX 362 // pass a HWND to a parent
--#define IPC_OPENDIRBOX 363 // pass a HWND to a parent
--
--// pass an HWND to a parent. call this if you take over the whole UI so that the dialogs are not appearing on the
--// bottom right of the screen since the main winamp window is at 3000x3000, call again with NULL to reset
--#define IPC_SETDIALOGBOXPARENT 364 
--
--
--
--// pass 0 for a copy of the skin HBITMAP
--// pass 1 for name of font to use for playlist editor likeness
--// pass 2 for font charset
--// pass 3 for font size
--#define IPC_GET_GENSKINBITMAP 503
--
--
--#define IPC_GET_EMBEDIF 505 // pass an embedWindowState
--// returns an HWND embedWindow(embedWindowState *); if the data is NULL, otherwise returns the HWND directly
--typedef struct
--{
--  HWND me; //hwnd of the window
--
--  int flags;
--
--  RECT r;
--
--  void *user_ptr; // for application use
--
--  int extra_data[64]; // for internal winamp use
--} embedWindowState;
--
--#define EMBED_FLAGS_NORESIZE 1 // set this bit in embedWindowState.flags to keep window from being resizable
--#define EMBED_FLAGS_NOTRANSPARENCY 2 // set this bit in embedWindowState.flags to make gen_ff turn transparency off for this wnd
--
--
--#define IPC_EMBED_ENUM 532
--typedef struct embedEnumStruct
--{
--  int (*enumProc)(embedWindowState *ws, struct embedEnumStruct *param); // return 1 to abort
--  int user_data; // or more :)
--} embedEnumStruct;
--  // pass 
--
--#define IPC_EMBED_ISVALID 533
--
--#define IPC_CONVERTFILE 506
--/* (requires Winamp 2.92+)
--** Converts a given file to a different format (PCM, MP3, etc...)
--** To use, pass a pointer to a waFileConvertStruct struct
--** This struct can be either on the heap or some global
--** data, but NOT on the stack. At least, until the conversion is done.
--**
--** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE);
--**
--** Return value:
--** 0: Can't start the conversion. Look at myConvertStruct->error for details.
--** 1: Conversion started. Status messages will be sent to the specified callbackhwnd.
--**    Be sure to call IPC_CONVERTFILE_END when your callback window receives the
--**    IPC_CB_CONVERT_DONE message.
--*/
--typedef struct 
--{
--  char *sourcefile;  // "c:\\source.mp3"
--  char *destfile;    // "c:\\dest.pcm"
--  int destformat[8]; // like 'PCM ',srate,nch,bps
--  HWND callbackhwnd; // window that will receive the IPC_CB_CONVERT notification messages
--  
--  //filled in by winamp.exe
--  char *error;        //if IPC_CONVERTFILE returns 0, the reason will be here
--
--  int bytes_done;     //you can look at both of these values for speed statistics
--  int bytes_total;
--  int bytes_out;
--
--  int killswitch;     // don't set it manually, use IPC_CONVERTFILE_END
--  int extra_data[64]; // for internal winamp use
--} convertFileStruct;
--
--#define IPC_CONVERTFILE_END 507
--/* (requires Winamp 2.92+)
--** Stop/ends a convert process started from IPC_CONVERTFILE
--** You need to call this when you receive the IPC_CB_CONVERTDONE message or when you
--** want to abort a conversion process
--**
--** eg: SendMessage(hwnd_winamp,WM_WA_IPC,&myConvertStruct,IPC_CONVERTFILE_END);
--**
--** No return value
--*/
--
--typedef struct {
--  HWND hwndParent;
--  int format;
--
--  //filled in by winamp.exe
--  HWND hwndConfig;
--  int extra_data[8];
--} convertConfigStruct;
--#define IPC_CONVERT_CONFIG 508
--#define IPC_CONVERT_CONFIG_END 509
--
--typedef struct
--{
--  void (*enumProc)(int user_data, const char *desc, int fourcc);
--  int user_data;
--} converterEnumFmtStruct;
--#define IPC_CONVERT_CONFIG_ENUMFMTS 510
--/* (requires Winamp 2.92+)
--*/
--
--
--typedef struct
--{
--  char cdletter;
--  char *playlist_file;
--  HWND callback_hwnd;
--
--  //filled in by winamp.exe
--  char *error;
--} burnCDStruct;
--#define IPC_BURN_CD 511
--/* (requires Winamp 5.0+)
--*/
--
--typedef struct
--{
--  convertFileStruct *cfs;
--  int priority;
--} convertSetPriority;
--#define IPC_CONVERT_SET_PRIORITY 512
--
--typedef struct
--{
--  char *filename;
--  char *title; // 2048 bytes
--  int length;
--  int force_useformatting; // can set this to 1 if you want to force a url to use title formatting shit
--} waHookTitleStruct;
--// return TRUE if you hook this
--#define IPC_HOOK_TITLES 850
--
--#define IPC_GETSADATAFUNC 800 
--// 0: returns a char *export_sa_get() that returns 150 bytes of data
--// 1: returns a export_sa_setreq(int want);
--
--#define IPC_ISMAINWNDVISIBLE 900
--
--
--#define IPC_SETPLEDITCOLORS 920
--typedef struct
--{
--  int numElems;
--  int *elems;
--  HBITMAP bm; // set if you want to override
--} waSetPlColorsStruct;
--
--
--// the following IPC use waSpawnMenuParms as parameter
--#define IPC_SPAWNEQPRESETMENU 933
--#define IPC_SPAWNFILEMENU 934 //menubar
--#define IPC_SPAWNOPTIONSMENU 935 //menubar
--#define IPC_SPAWNWINDOWSMENU 936 //menubar
--#define IPC_SPAWNHELPMENU 937 //menubar
--#define IPC_SPAWNPLAYMENU 938 //menubar
--#define IPC_SPAWNPEFILEMENU 939 //menubar
--#define IPC_SPAWNPEPLAYLISTMENU 940 //menubar
--#define IPC_SPAWNPESORTMENU 941 //menubar
--#define IPC_SPAWNPEHELPMENU 942 //menubar
--#define IPC_SPAWNMLFILEMENU 943 //menubar
--#define IPC_SPAWNMLVIEWMENU 944 //menubar
--#define IPC_SPAWNMLHELPMENU 945 //menubar
--#define IPC_SPAWNPELISTOFPLAYLISTS 946
--
--typedef struct
--{
--  HWND wnd;
--  int xpos; // in screen coordinates
--  int ypos;
--} waSpawnMenuParms;
--
--// waSpawnMenuParms2 is used by the menubar submenus
--typedef struct
--{
--  HWND wnd;
--  int xpos; // in screen coordinates
--  int ypos;
--  int width;
--  int height;
--} waSpawnMenuParms2;
--
--
--// system tray sends this (you might want to simulate it)
--#define WM_WA_SYSTRAY WM_USER+1
--
--// input plugins send this when they are done playing back
--#define WM_WA_MPEG_EOF WM_USER+2
--
--
--
--//// video stuff
--
--#define IPC_IS_PLAYING_VIDEO 501 // returns >1 if playing, 0 if not, 1 if old version (so who knows):)
--#define IPC_GET_IVIDEOOUTPUT 500 // see below for IVideoOutput interface
--#define VIDEO_MAKETYPE(A,B,C,D) ((A) | ((B)<<8) | ((C)<<16) | ((D)<<24))
--#define VIDUSER_SET_INFOSTRING 0x1000
--#define VIDUSER_GET_VIDEOHWND  0x1001
--#define VIDUSER_SET_VFLIP      0x1002
--
--#ifndef NO_IVIDEO_DECLARE
--#ifdef __cplusplus
--
--class VideoOutput;
--class SubsItem;
--
--typedef	struct {
--	unsigned char*	baseAddr;
--	long			rowBytes;
--} YV12_PLANE;
--
--typedef	struct {
--	YV12_PLANE	y;
--	YV12_PLANE	u;
--	YV12_PLANE	v;
--} YV12_PLANES;
--
--class IVideoOutput
--{
--  public:
--    virtual ~IVideoOutput() { }
--    virtual int open(int w, int h, int vflip, double aspectratio, unsigned int fmt)=0;
--    virtual void setcallback(LRESULT (*msgcallback)(void *token, HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam), void *token) { }
--    virtual void close()=0;
--    virtual void draw(void *frame)=0;
--    virtual void drawSubtitle(SubsItem *item) { }
--    virtual void showStatusMsg(const char *text) { }
--    virtual int get_latency() { return 0; }
--    virtual void notifyBufferState(int bufferstate) { } /* 0-255*/
--
--    virtual int extended(int param1, int param2, int param3) { return 0; } // Dispatchable, eat this!
--};
--#endif //cplusplus
--#endif//NO_IVIDEO_DECLARE
--
--// these messages are callbacks that you can grab by subclassing the winamp window
--
--// wParam = 
--#define IPC_CB_WND_EQ 0 // use one of these for the param
--#define IPC_CB_WND_PE 1
--#define IPC_CB_WND_MB 2
--#define IPC_CB_WND_VIDEO 3
--#define IPC_CB_WND_MAIN 4
--
--#define IPC_CB_ONSHOWWND 600 
--#define IPC_CB_ONHIDEWND 601 
--
--#define IPC_CB_GETTOOLTIP 602
--
--#define IPC_CB_MISC 603
--    #define IPC_CB_MISC_TITLE 0
--    #define IPC_CB_MISC_VOLUME 1 // volume/pan
--    #define IPC_CB_MISC_STATUS 2
--    #define IPC_CB_MISC_EQ 3
--    #define IPC_CB_MISC_INFO 4
--    #define IPC_CB_MISC_VIDEOINFO 5
--
--#define IPC_CB_CONVERT_STATUS 604 // param value goes from 0 to 100 (percent)
--#define IPC_CB_CONVERT_DONE   605
--
--#define IPC_ADJUST_FFWINDOWSMENUPOS 606
--/* (requires Winamp 2.9+)
--** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFWINDOWSMENUPOS);
--** moves where winamp expects the freeform windows in the menubar windows main menu. Useful if you wish to insert a
--** menu item above extra freeform windows.
--*/
--
--#define IPC_ISDOUBLESIZE 608
--
--#define IPC_ADJUST_FFOPTIONSMENUPOS 609
--/* (requires Winamp 2.9+)
--** int newpos=SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)adjust_offset,IPC_ADJUST_FFOPTIONSMENUPOS);
--** moves where winamp expects the freeform preferences item in the menubar windows main menu. Useful if you wish to insert a
--** menu item above preferences item.
--*/
--
--#define IPC_GETTIMEDISPLAYMODE 610 // returns 0 if displaying elapsed time or 1 if displaying remaining time
--
--#define IPC_SETVISWND 611 // param is hwnd, setting this allows you to receive ID_VIS_NEXT/PREVOUS/RANDOM/FS wm_commands
--#define ID_VIS_NEXT                     40382
--#define ID_VIS_PREV                     40383
--#define ID_VIS_RANDOM                   40384
--#define ID_VIS_FS                       40389
--#define ID_VIS_CFG                      40390
--#define ID_VIS_MENU                     40391
--
--#define IPC_GETVISWND 612 // returns the vis cmd handler hwnd
--#define IPC_ISVISRUNNING 613
--#define IPC_CB_VISRANDOM 628 // param is status of random
--
--#define IPC_SETIDEALVIDEOSIZE 614 // sent by winamp to winamp, trap it if you need it. width=HIWORD(param), height=LOWORD(param)
--
--#define IPC_GETSTOPONVIDEOCLOSE 615
--#define IPC_SETSTOPONVIDEOCLOSE 616
--
--typedef struct {
--  HWND hwnd;
--  int uMsg;
--  int wParam;
--  int lParam;
--} transAccelStruct;
--
--#define IPC_TRANSLATEACCELERATOR 617
--
--typedef struct {
--  int cmd;
--  int x;
--  int y;
--  int align;
--} windowCommand; // send this as param to an IPC_PLCMD, IPC_MBCMD, IPC_VIDCMD
--
--#define IPC_CB_ONTOGGLEAOT 618 
--
--#define IPC_GETPREFSWND 619
--
--#define IPC_SET_PE_WIDTHHEIGHT 620 // data is a pointer to a POINT structure that holds width & height
--
--#define IPC_GETLANGUAGEPACKINSTANCE 621
--
--#define IPC_CB_PEINFOTEXT 622 // data is a string, ie: "04:21/45:02"
--
--#define IPC_CB_OUTPUTCHANGED 623 // output plugin was changed in config
--
--#define IPC_GETOUTPUTPLUGIN 625
--
--#define IPC_SETDRAWBORDERS 626
--#define IPC_DISABLESKINCURSORS 627
--#define IPC_CB_RESETFONT 629
--
--#define IPC_IS_FULLSCREEN 630 // returns 1 if video or vis is in fullscreen mode
--#define IPC_SET_VIS_FS_FLAG 631 // a vis should send this message with 1/as param to notify winamp that it has gone to or has come back from fullscreen mode
--
--#define IPC_SHOW_NOTIFICATION 632
--
--#define IPC_GETSKININFO 633
--
--// >>>>>>>>>>> Next is 634
--
--#define IPC_PLCMD  1000 
--
--#define PLCMD_ADD  0
--#define PLCMD_REM  1
--#define PLCMD_SEL  2
--#define PLCMD_MISC 3
--#define PLCMD_LIST 4
--
--#define IPC_MBCMD  1001 
--
--#define MBCMD_BACK    0
--#define MBCMD_FORWARD 1
--#define MBCMD_STOP    2
--#define MBCMD_RELOAD  3
--#define MBCMD_MISC  4
--
--#define IPC_VIDCMD 1002 
--
--#define VIDCMD_FULLSCREEN 0
--#define VIDCMD_1X         1
--#define VIDCMD_2X         2
--#define VIDCMD_LIB        3
--#define VIDPOPUP_MISC     4
--
--#define IPC_MBURL       1003 //sets the URL
--#define IPC_MBGETCURURL 1004 //copies the current URL into wParam (have a 4096 buffer ready)
--#define IPC_MBGETDESC   1005 //copies the current URL description into wParam (have a 4096 buffer ready)
--#define IPC_MBCHECKLOCFILE 1006 //checks that the link file is up to date (otherwise updates it). wParam=parent HWND
--#define IPC_MBREFRESH   1007 //refreshes the "now playing" view in the library
--#define IPC_MBGETDEFURL 1008 //copies the default URL into wParam (have a 4096 buffer ready)
--
--#define IPC_STATS_LIBRARY_ITEMCNT 1300 // updates library count status
--
--// IPC 2000-3000 reserved for freeform messages, see gen_ff/ff_ipc.h
--#define IPC_FF_FIRST 2000
--#define IPC_FF_LAST  3000
--
--#define IPC_GETDROPTARGET 3001
--
--#define IPC_PLAYLIST_MODIFIED 3002 // sent to main wnd whenever the playlist is modified
--
--#define IPC_PLAYING_FILE 3003 // sent to main wnd with the file as parm whenever a file is played
--#define IPC_FILE_TAG_MAY_HAVE_UPDATED 3004 // sent to main wnd with the file as parm whenever a file tag might be updated
--
--
--#define IPC_ALLOW_PLAYTRACKING 3007
--// send nonzero to allow, zero to disallow
--
--#define IPC_HOOK_OKTOQUIT 3010 // return 0 to abort a quit, nonzero if quit is OK
--
--#define IPC_WRITECONFIG 3011 // pass 2 to write all, 1 to write playlist + common, 0 to write common+less common
--
--// pass a string to be the name to register, and returns a value > 65536, which is a unique value you can use
--// for custom WM_WA_IPC messages. 
--#define IPC_REGISTER_WINAMP_IPCMESSAGE 65536 
--
--/**************************************************************************/
--
--/*
--** Finally there are some WM_COMMAND messages that you can use to send 
--** Winamp misc commands.
--** 
--** To send these, use:
--**
--** SendMessage(hwnd_winamp, WM_COMMAND,command_name,0);
--*/
--
--#define WINAMP_OPTIONS_EQ               40036 // toggles the EQ window
--#define WINAMP_OPTIONS_PLEDIT           40040 // toggles the playlist window
--#define WINAMP_VOLUMEUP                 40058 // turns the volume up a little
--#define WINAMP_VOLUMEDOWN               40059 // turns the volume down a little
--#define WINAMP_FFWD5S                   40060 // fast forwards 5 seconds
--#define WINAMP_REW5S                    40061 // rewinds 5 seconds
--
--// the following are the five main control buttons, with optionally shift 
--// or control pressed
--// (for the exact functions of each, just try it out)
--#define WINAMP_BUTTON1                  40044
--#define WINAMP_BUTTON2                  40045
--#define WINAMP_BUTTON3                  40046
--#define WINAMP_BUTTON4                  40047
--#define WINAMP_BUTTON5                  40048
--#define WINAMP_BUTTON1_SHIFT            40144
--#define WINAMP_BUTTON2_SHIFT            40145
--#define WINAMP_BUTTON3_SHIFT            40146
--#define WINAMP_BUTTON4_SHIFT            40147
--#define WINAMP_BUTTON5_SHIFT            40148
--#define WINAMP_BUTTON1_CTRL             40154
--#define WINAMP_BUTTON2_CTRL             40155
--#define WINAMP_BUTTON3_CTRL             40156
--#define WINAMP_BUTTON4_CTRL             40157
--#define WINAMP_BUTTON5_CTRL             40158
--
--#define WINAMP_FILE_PLAY                40029 // pops up the load file(s) box
--#define WINAMP_FILE_DIR                 40187 // pops up the load directory box
--#define WINAMP_OPTIONS_PREFS            40012 // pops up the preferences
--#define WINAMP_OPTIONS_AOT              40019 // toggles always on top
--#define WINAMP_HELP_ABOUT               40041 // pops up the about box :)
--
--#define ID_MAIN_PLAY_AUDIOCD1           40323 // starts playing the audio CD in the first CD reader
--#define ID_MAIN_PLAY_AUDIOCD2           40323 // plays the 2nd
--#define ID_MAIN_PLAY_AUDIOCD3           40323 // plays the 3nd
--#define ID_MAIN_PLAY_AUDIOCD4           40323 // plays the 4nd
--
--// IDs 42000 to 45000 are reserved for gen_ff
--// IDs from 45000 to 57000 are reserved for library 
-+typedef struct { //
-+	const wchar_t *filename;
-+	const wchar_t *metadata;
-+	wchar_t *ret;
-+	size_t retlen;
-+} extendedFileInfoStructW;
- 
-+#define IPC_GET_EXTENDED_FILE_INFOW 3026
- #endif//_WA_IPC_H_
--
--/*
--** EOF.. Enjoy.
--*/
--
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
-+++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
-@@ -1,197 +0,0 @@
--/*
-- * winampcontroller.cpp 
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include <windows.h>
--
--#ifdef Q_CC_MSVC
--#pragma warning(push)
--#pragma warning(disable: 4100)
--#endif
--
--// this file generates eight C4100 warnings, when compiled with MSVC2003
--#include "third-party/wa_ipc.h"
--
--#ifdef Q_CC_MSVC
--#pragma warning(pop)
--#endif
--
--#include "winampcontroller.h"
--
--
--/**
-- * \class WinAmpController
-- * \brief A controller for WinAmp.
-- */
--
--static const int NormInterval = 3000;
--static const int AntiscrollInterval = 100;
--
--/**
-- * \brief Constructs the controller.
-- */
--WinAmpController::WinAmpController()
--: PollingTuneController(),
--  antiscrollCounter_(0)
--{
--	startPoll();
--	setInterval(NormInterval);
--}
--
--template <typename char_type> const size_t length (const char_type * begin)
--{
--	const char_type * end = begin;
--	for (; *end; ++end);
--	return end - begin;
--}
--
--// Returns a title of a track currently being played by WinAmp with given HWND (passed in waWnd)
--QPair<bool, QString> WinAmpController::getTrackTitle(const HWND &waWnd) const
--{
--	TCHAR waTitle[2048];
--	QString title;
--
--	// Get WinAmp window title. It always contains name of the track
--	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
--	// Now, waTitle contains WinAmp window title
--	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
--	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
--		// request to be called again soon.
--		return QPair<bool, QString>(false, QString());
--	}
--
--	// Check whether there is a need to do the all stuff
--	if (!title.length()) {
--		return QPair<bool, QString>(true,title);
--	}
--
--	QString winamp (" - Winamp ***");
--	int winampLength = winamp.length();
--
--	// Is title scrolling on the taskbar enabled?
--	title += title + title;
--	int waLast = title.indexOf (winamp, -1);
--	if (waLast != -1) {
--		if (title.length()) {
--			title.remove (waLast, title.length () - waLast);
--		}
--		int waFirst;
--		while ((waFirst = title.indexOf (winamp)) != -1) {
--			title.remove (0, waFirst + winampLength);
--		}
--	}
--	else {
--		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
--	}
--
--	// Remove leading and trailing spaces
--	title  = title.trimmed();
--
--	// Remove trailing " - Winamp" from title
--	if (title.length ()) {
--		winamp = " - Winamp";
--		winampLength = winamp.length ();
--		int waFirst = title.indexOf (winamp);
--		if (waFirst != -1)
--		{
--			title.remove (waFirst, waFirst + winampLength);
--		}
--	}
--
--	// Remove track number from title
--	if (title.length ()) {
--		QString dot(". ");
--		int dotFirst = title.indexOf (dot);
--		if (dotFirst != -1) {
--			// All symbols before the dot are digits?
--			bool allDigits = true;
--			for (int pos = dotFirst; pos > 0; --pos) {
--				allDigits = allDigits && title[pos].isNumber();
--			}
--			if (allDigits) {
--				title.remove(0, dotFirst + dot.length ());
--			}
--		}
--	}
--
--	// Remove leading and trailing spaces
--	if (title.length ()) {
--		while (title.length () && title[0] == ' ') {
--			title.remove (0, 1);
--		}
--		while (title.length () && title[title.length () - 1] == ' ') {
--			title.remove (title.length () - 1, 1);
--		}
--	}
--
--	return QPair<bool, QString>(true,title);
--}
--
--
--/**
-- * Polls for new song info.
-- */
--void WinAmpController::check()
--{
--
--	Tune tune;
--#ifdef UNICODE
--	HWND h = FindWindow(L"Winamp v1.x", NULL);
--#else
--	HWND h = FindWindow("Winamp v1.x", NULL);
--#endif
--	if (h && SendMessage(h, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
--		tune = getTune(h);
--	}
--	prevTune_ = tune;
--	setInterval(NormInterval);
--	PollingTuneController::check();
--}
--
--Tune WinAmpController::getTune(const HWND &hWnd)
--{
--	Tune tune = Tune();
--	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
--	if (position != -1) {
--		if (hWnd && SendMessage(hWnd,WM_WA_IPC,0,IPC_ISPLAYING) == 1) {
--			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
--			if (!trackpair.first) {
--				// getTrackTitle wants us to retry in a few ms...
--				int interval = AntiscrollInterval;
--				if (++antiscrollCounter_ > 10) {
--					antiscrollCounter_ = 0;
--					interval = NormInterval;
--				}
--				setInterval(interval);
--				return Tune();
--			}
--			antiscrollCounter_ = 0;
--			tune.setName(trackpair.second);
--			tune.setURL(trackpair.second);
--			tune.setTrack(QString::number(position + 1));
--			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
--		}
--	}
--	return tune;
--}
--
--Tune WinAmpController::currentTune() const
--{
--	return prevTune_;
--}
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
-+++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
-@@ -1,48 +0,0 @@
--/*
-- * winampcontroller.h
-- * Copyright (C) 2006  Remko Troncon
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#ifndef WINAMPCONTROLLER_H
--#define WINAMPCONTROLLER_H
--
--#include "pollingtunecontroller.h"
--
--#include <windows.h>
--#include <QPair>
--
--class WinAmpController : public PollingTuneController
--{
--	Q_OBJECT
--public:
--	WinAmpController();
--	virtual Tune currentTune() const;
--
--private:
--	Tune getTune(const HWND &hWnd);
--	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
--
--protected slots:
--	void check();
--
--private:
--	Tune prevTune_;
--	int antiscrollCounter_;
--};
--
--#endif
---- git.orig/src/tools/tunecontroller/plugins/winamp/winampplugin.h
-+++ git/src/tools/tunecontroller/plugins/winamp/winampplugin.h
-@@ -29,7 +29,7 @@
- #include <QObject>
- #include <QString>
- 
--#include "winampcontroller.h"
-+#include "winamptunecontroller.h"
- #include "tunecontrollerplugin.h"
- 
- class WinAmpPlugin : public QObject, public TuneControllerPlugin
---- git.orig/src/tools/tunecontroller/tunecontrollermanager.cpp
-+++ git/src/tools/tunecontroller/tunecontrollermanager.cpp
-@@ -164,6 +164,10 @@ Q_IMPORT_PLUGIN(itunesplugin)
- Q_IMPORT_PLUGIN(winampplugin)
- #endif
- 
-+#ifdef TC_AIMP
-+Q_IMPORT_PLUGIN(aimpplugin)
-+#endif
-+
- #ifdef TC_PSIFILE
- Q_IMPORT_PLUGIN(psifileplugin)
- #endif
---- git.orig/src/tools/tunecontroller/tunecontroller.pri
-+++ git/src/tools/tunecontroller/tunecontroller.pri
-@@ -25,10 +25,10 @@ tc_itunes {
- 		INCLUDEPATH += $$ITUNES_PLUGIN_PATH
- 
- 		HEADERS += \
--			$$ITUNES_PLUGIN_PATH/itunescontroller.h 
-+			$$PWD/itunestunecontroller.h 
- 			
- 		SOURCES += \
--			$$ITUNES_PLUGIN_PATH/itunescontroller.cpp \
-+			$$PWD/itunestunecontroller.cpp \
- 			$$ITUNES_PLUGIN_PATH/itunesplugin.cpp
- 
- 		QMAKE_LFLAGS += -framework CoreFoundation
-@@ -42,11 +42,11 @@ tc_winamp {
- 	INCLUDEPATH += $$WINAMP_PLUGIN_PATH
- 
- 	HEADERS += \
--		$$WINAMP_PLUGIN_PATH/winampcontroller.h \
-+		$$PWD/winamptunecontroller.h \
- 		$$WINAMP_PLUGIN_PATH/winampplugin.h 
- 		
- 	SOURCES += \
--		$$WINAMP_PLUGIN_PATH/winampcontroller.cpp \
-+		$$PWD/winamptunecontroller.cpp \
- 		$$WINAMP_PLUGIN_PATH/winampplugin.cpp
- 	
- 	LIBS += -lUser32
-@@ -78,3 +78,17 @@ tc_mpris {
- 		$$PWD/mpristunecontroller.cpp \
- 		$$MPRIS_PLUGIN_PATH/mprisplugin.cpp
- }
-+
-+#AIMP
-+tc_aimp {
-+	DEFINES += TC_AIMP
-+	AIMP_PLUGIN_PATH = $$PWD/plugins/aimp
-+	INCLUDEPATH += $$AIMP_PLUGIN_PATH
-+
-+	HEADERS += \
-+		$$PWD/aimptunecontroller.h
-+
-+	SOURCES += \
-+		$$PWD/aimptunecontroller.cpp \
-+		$$AIMP_PLUGIN_PATH/aimpplugin.cpp
-+}
---- git.orig/src/tools/tunecontroller/winamptunecontroller.cpp
-+++ git/src/tools/tunecontroller/winamptunecontroller.cpp
-@@ -0,0 +1,271 @@
-+/*
-+ * winamptunecontroller.cpp
-+ * Copyright (C) 2006  Remko Troncon,
-+ * 2012  Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <windows.h>
-+
-+#ifdef Q_CC_MSVC
-+#pragma warning(push)
-+#pragma warning(disable: 4100)
-+#endif
-+
-+// this file generates eight C4100 warnings, when compiled with MSVC2003
-+#include "plugins/winamp/third-party/wa_ipc.h"
-+
-+#ifdef Q_CC_MSVC
-+#pragma warning(pop)
-+#endif
-+
-+#include "winamptunecontroller.h"
-+
-+#define TAGSIZE 100
-+#define FILENAMESIZE 512
-+
-+static const int NormInterval = 3000;
-+static const int AntiscrollInterval = 100;
-+const wchar_t *ALBUM_KEY = L"album";
-+const wchar_t *ARTIST_KEY = L"artist";
-+const wchar_t *TITLE_KEY = L"title";
-+
-+/**
-+ * \class WinAmpController
-+ * \brief A controller for WinAmp.
-+ */
-+
-+
-+/**
-+ * \brief Constructs the controller.
-+ */
-+WinAmpController::WinAmpController()
-+: PollingTuneController(),
-+  antiscrollCounter_(0)
-+{
-+	startPoll();
-+	setInterval(NormInterval);
-+}
-+
-+template <typename char_type> const size_t length (const char_type * begin)
-+{
-+	const char_type * end = begin;
-+	for (; *end; ++end);
-+	return end - begin;
-+}
-+
-+/**
-+ * Polls for new song info.
-+ */
-+void WinAmpController::check()
-+{
-+	Tune tune;
-+	HWND winamp = FindWindow(L"Winamp v1.x", NULL);
-+	if (winamp && SendMessage(winamp, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
-+		tune = getTune(winamp);
-+	}
-+	prevTune_ = tune;
-+	setInterval(NormInterval);
-+	PollingTuneController::check();
-+}
-+
-+Tune WinAmpController::getTune(const HWND &hWnd)
-+{
-+	Tune tune = Tune();
-+	QString album, artist, title, url;
-+//this part of code taken from pidgin-musictracker from http://code.google.com/p/pidgin-musictracker/
-+	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
-+	if (position != -1) {
-+		DWORD processId;
-+		GetWindowThreadProcessId(hWnd, &processId);
-+		LPCVOID address = (LPCVOID) SendMessage(hWnd, WM_WA_IPC, position, IPC_GETPLAYLISTFILEW);
-+		if ((quintptr)address > 1) {
-+			wchar_t fileNameW[FILENAMESIZE];
-+			HANDLE hP = OpenProcess(PROCESS_ALL_ACCESS, 0, processId);
-+			ReadProcessMemory(hP, address, fileNameW, FILENAMESIZE, 0);
-+//
-+			url = QString::fromWCharArray(fileNameW);
-+			if (!url.isEmpty()){
-+				wchar_t albumW[TAGSIZE], artistW[TAGSIZE], titleW[TAGSIZE];
-+				if (getData(hP, hWnd, fileNameW, ALBUM_KEY, albumW)) {
-+					album = QString::fromWCharArray(albumW);
-+					if (!album.isEmpty()) {
-+						tune.setAlbum(album);
-+					}
-+				}
-+				if (getData(hP, hWnd, fileNameW, ARTIST_KEY, artistW)) {
-+					artist = QString::fromWCharArray(artistW);
-+					if (!artist.isEmpty()) {
-+						tune.setArtist(artist);
-+					}
-+				}
-+				if (getData(hP, hWnd, fileNameW, TITLE_KEY, titleW)) {
-+					title = QString::fromWCharArray(titleW);
-+					if (title.isEmpty()) {
-+						int index = url.replace("/", "\\").lastIndexOf("\\");
-+						if (index > 0) {
-+							QString filename = url.right(url.length()-index-1);
-+							index = filename.lastIndexOf(".");
-+							title = (index > 0) ? filename.left(index) : filename;
-+						}
-+						else {
-+							title = url;
-+						}
-+					}
-+					tune.setName(title);
-+				}
-+				tune.setURL(url);
-+				tune.setTrack(QString::number(position + 1));
-+				tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
-+			}
-+			CloseHandle(hP);
-+		}
-+		else {
-+			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
-+			if (!trackpair.first) {
-+				// getTrackTitle wants us to retry in a few ms...
-+				int interval = AntiscrollInterval;
-+				if (++antiscrollCounter_ > 10) {
-+					antiscrollCounter_ = 0;
-+					interval = NormInterval;
-+				}
-+				setInterval(interval);
-+				return Tune();
-+			}
-+			antiscrollCounter_ = 0;
-+			tune.setName(trackpair.second);
-+			tune.setURL(trackpair.second);
-+			tune.setTrack(QString::number(position + 1));
-+			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
-+		}
-+	}
-+	return tune;
-+}
-+
-+QPair<bool, QString> WinAmpController::getTrackTitle(const HWND &waWnd) const
-+{
-+	TCHAR waTitle[2048];
-+	QString title;
-+
-+	// Get WinAmp window title. It always contains name of the track
-+	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
-+	// Now, waTitle contains WinAmp window title
-+	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
-+	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
-+		// request to be called again soon.
-+		return QPair<bool, QString>(false, QString());
-+	}
-+
-+	// Check whether there is a need to do the all stuff
-+	if (!title.length()) {
-+		return QPair<bool, QString>(true,title);
-+	}
-+
-+	QString winamp (" - Winamp ***");
-+	int winampLength = winamp.length();
-+
-+	// Is title scrolling on the taskbar enabled?
-+	title += title + title;
-+	int waLast = title.indexOf (winamp, -1);
-+	if (waLast != -1) {
-+		if (title.length()) {
-+			title.remove (waLast, title.length () - waLast);
-+		}
-+		int waFirst;
-+		while ((waFirst = title.indexOf (winamp)) != -1) {
-+			title.remove (0, waFirst + winampLength);
-+		}
-+	}
-+	else {
-+		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
-+	}
-+
-+	// Remove leading and trailing spaces
-+	title  = title.trimmed();
-+
-+	// Remove trailing " - Winamp" from title
-+	if (title.length ()) {
-+		winamp = " - Winamp";
-+		winampLength = winamp.length ();
-+		int waFirst = title.indexOf (winamp);
-+		if (waFirst != -1)
-+		{
-+			title.remove (waFirst, waFirst + winampLength);
-+		}
-+	}
-+
-+	// Remove track number from title
-+	if (title.length ()) {
-+		QString dot(". ");
-+		int dotFirst = title.indexOf (dot);
-+		if (dotFirst != -1) {
-+			// All symbols before the dot are digits?
-+			bool allDigits = true;
-+			for (int pos = dotFirst; pos > 0; --pos) {
-+				allDigits = allDigits && title[pos].isNumber();
-+			}
-+			if (allDigits) {
-+				title.remove(0, dotFirst + dot.length ());
-+			}
-+		}
-+	}
-+
-+	// Remove leading and trailing spaces
-+	if (title.length ()) {
-+		while (title.length () && title[0] == ' ') {
-+			title.remove (0, 1);
-+		}
-+		while (title.length () && title[title.length () - 1] == ' ') {
-+			title.remove (title.length () - 1, 1);
-+		}
-+	}
-+
-+	return QPair<bool, QString>(true,title);
-+}
-+
-+bool WinAmpController::getData(const HANDLE& hProcess, const HWND& hWnd, const wchar_t *filename, const wchar_t *metadata, wchar_t *wresult)
-+{
-+//this part of code taken from pidgin-musictracker plugin from http://code.google.com/p/pidgin-musictracker/
-+	char *winamp_info = (char *)VirtualAllocEx(hProcess, NULL, 4096, MEM_COMMIT, PAGE_READWRITE);
-+	if (!winamp_info)
-+	{
-+		return false;
-+	}
-+	wchar_t *winamp_filename = (wchar_t*)(winamp_info+1024);
-+	wchar_t *winamp_metadata = (wchar_t*)(winamp_info+2048);
-+	wchar_t *winamp_value = (wchar_t*)(winamp_info+3072);
-+	extendedFileInfoStructW info;
-+	info.filename = winamp_filename;
-+	info.metadata = winamp_metadata;
-+	info.ret = winamp_value;
-+	info.retlen = 1024/sizeof(wchar_t);
-+	WriteProcessMemory(hProcess, winamp_info, &info, sizeof(info), NULL);
-+	WriteProcessMemory(hProcess, winamp_filename, filename, sizeof(wchar_t)*(wcslen(filename)+1), NULL);
-+	WriteProcessMemory(hProcess, winamp_metadata, metadata, sizeof(wchar_t)*(wcslen(metadata)+1), NULL);
-+	int rc = (int)SendMessage(hWnd, WM_WA_IPC, (WPARAM)winamp_info, IPC_GET_EXTENDED_FILE_INFOW);
-+	SIZE_T bytesRead;
-+	ReadProcessMemory(hProcess, winamp_value, wresult, (TAGSIZE-1)*sizeof(wchar_t), &bytesRead);
-+	wresult[bytesRead/sizeof(wchar_t)] = 0;
-+	VirtualFreeEx(hProcess, winamp_info, 0, MEM_RELEASE);
-+//
-+	return (bool(rc));
-+}
-+
-+Tune WinAmpController::currentTune() const
-+{
-+	return prevTune_;
-+}
---- git.orig/src/tools/tunecontroller/winamptunecontroller.h
-+++ git/src/tools/tunecontroller/winamptunecontroller.h
-@@ -0,0 +1,50 @@
-+/*
-+ * winamptunecontroller.h
-+ * Copyright (C) 2006  Remko Troncon,
-+ * 2012  Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef WINAMPTUNECONTROLLER_H
-+#define WINAMPTUNECONTROLLER_H
-+
-+#include "pollingtunecontroller.h"
-+
-+#include <windows.h>
-+#include <QPair>
-+
-+class WinAmpController : public PollingTuneController
-+{
-+	Q_OBJECT
-+public:
-+	WinAmpController();
-+	virtual Tune currentTune() const;
-+
-+protected slots:
-+	void check();
-+
-+private:
-+	bool getData(const HANDLE& hProcess, const HWND& hWnd, const wchar_t *filename, const wchar_t *metadata, wchar_t *wresult);
-+	Tune getTune(const HWND &hWnd);
-+	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
-+
-+private:
-+	Tune prevTune_;
-+	int antiscrollCounter_;
-+};
-+
-+#endif

psi-plus-main-20130107.tar.xz/patches/dev/qca_qt5.patch Deleted

@@ -1,886 +0,0 @@
-Index: examples/cmssigner/certitem.cpp
-===================================================================
---- examples/cmssigner/certitem.cpp	(revision 1329650)
-+++ examples/cmssigner/certitem.cpp	(working copy)
-@@ -24,6 +24,7 @@
- #include <QtCore>
- #include <QtGui>
- #include <QtCrypto>
-+#include <QMessageBox>
- #include "prompter.h"
- 
- typedef QMap<CertItemStore::IconType,QPixmap> CertItemIconset;
-Index: examples/cmssigner/cmssigner.pro
-===================================================================
---- examples/cmssigner/cmssigner.pro	(revision 1329650)
-+++ examples/cmssigner/cmssigner.pro	(working copy)
-@@ -2,6 +2,9 @@
- CONFIG -= console
- CONFIG += app_bundle
- QT += gui
-+contains(QT_VERSION, ^5\\..*) {
-+  QT += widgets
-+}
- 
- include(pkcs11configdlg/pkcs11configdlg.pri)
- 
-Index: examples/cmssigner/keyselectdlg.cpp
-===================================================================
---- examples/cmssigner/keyselectdlg.cpp	(revision 1329650)
-+++ examples/cmssigner/keyselectdlg.cpp	(working copy)
-@@ -24,6 +24,9 @@
- #include <QtCore>
- #include <QtGui>
- #include <QtCrypto>
-+#include <QPushButton>
-+#include <QMenu>
-+#include <QMessageBox>
- #include "ui_keyselect.h"
- 
- #define ONLY_SHOW_KEYBUNDLE
-Index: examples/cmssigner/main.cpp
-===================================================================
---- examples/cmssigner/main.cpp	(revision 1329650)
-+++ examples/cmssigner/main.cpp	(working copy)
-@@ -22,6 +22,8 @@
- #include <QtCore>
- #include <QtGui>
- #include <QtCrypto>
-+#include <QMessageBox>
-+#include <QFileDialog>
- 
- #include "ui_mainwin.h"
- #include "certviewdlg.h"
-Index: examples/cmssigner/pkcs11configdlg/pkcs11configdlg.cpp
-===================================================================
---- examples/cmssigner/pkcs11configdlg/pkcs11configdlg.cpp	(revision 1329650)
-+++ examples/cmssigner/pkcs11configdlg/pkcs11configdlg.cpp	(working copy)
-@@ -24,6 +24,8 @@
- #include <QtCore>
- #include <QtGui>
- #include <QtCrypto>
-+#include <QMessageBox>
-+#include <QFileDialog>
- #include "ui_pkcs11config.h"
- 
- //----------------------------------------------------------------------------
-Index: examples/cmssigner/prompter.cpp
-===================================================================
---- examples/cmssigner/prompter.cpp	(revision 1329650)
-+++ examples/cmssigner/prompter.cpp	(working copy)
-@@ -24,6 +24,9 @@
- #include <QtCore>
- #include <QtGui>
- #include <QtCrypto>
-+#include <QMessageBox>
-+#include <QInputDialog>
-+#include <QApplication>
- 
- class Prompter::Private : public QObject
- {
-Index: examples/hashtest/hashtest.cpp
-===================================================================
---- examples/hashtest/hashtest.cpp	(revision 1329650)
-+++ examples/hashtest/hashtest.cpp	(working copy)
-@@ -44,7 +44,7 @@
- 	else {
- 		// this shows the "all in one" approach
- 		QString result = QCA::Hash("sha1").hashToString(arg);
--		printf("sha1(\"%s\") = [%s]\n", arg.data(), result.toAscii().data());
-+		printf("sha1(\"%s\") = [%s]\n", arg.data(), qPrintable(result));
- 	}
- 
- 	// must always check that an algorithm is supported before using it
-@@ -66,7 +66,7 @@
- 		QCA::SecureArray resultArray = hashObject.final();
- 		// convert the result into printable hexadecimal.
- 		QString result = QCA::arrayToHex(resultArray.toByteArray());
--		printf("md5(\"%s\") = [%s]\n", arg.data(), result.toAscii().data());
-+		printf("md5(\"%s\") = [%s]\n", arg.data(), qPrintable(result));
- 	}
- 
- 	return 0;
-Index: examples/randomtest/randomtest.cpp
-===================================================================
---- examples/randomtest/randomtest.cpp	(revision 1329650)
-+++ examples/randomtest/randomtest.cpp	(working copy)
-@@ -56,7 +56,7 @@
- 
- 	// To make this viewable, we convert to hexadecimal.
- 	std::cout << "A random 10 byte array (in hex): ";
--	std::cout << QCA::Hex().arrayToString(tenBytes).toAscii().data() << std::endl;
-+	std::cout << qPrintable(QCA::Hex().arrayToString(tenBytes)) << std::endl;
- 
- 	// Under some circumstances, you may want to create a
- 	// Random object, rather than a static public member function.
-Index: src/qca_keystore.cpp
-===================================================================
---- src/qca_keystore.cpp	(revision 1329650)
-+++ src/qca_keystore.cpp	(working copy)
-@@ -308,6 +308,16 @@
- 		if(at == -1)
- 			return QString();
- 		Item &i = items[at];
-+#if QT_VERSION >= 0x050000
-+		if(v.canConvert<KeyBundle>())
-+			return i.owner->writeEntry(i.storeContextId, v.value<KeyBundle>());
-+		else if(v.canConvert<Certificate>())
-+			return i.owner->writeEntry(i.storeContextId, v.value<Certificate>());
-+		else if(v.canConvert<CRL>())
-+			return i.owner->writeEntry(i.storeContextId, v.value<CRL>());
-+		else if(v.canConvert<PGPKey>())
-+			return i.owner->writeEntry(i.storeContextId, v.value<PGPKey>());
-+#else
- 		if(qVariantCanConvert<KeyBundle>(v))
- 			return i.owner->writeEntry(i.storeContextId, qVariantValue<KeyBundle>(v));
- 		else if(qVariantCanConvert<Certificate>(v))
-@@ -316,6 +326,7 @@
- 			return i.owner->writeEntry(i.storeContextId, qVariantValue<CRL>(v));
- 		else if(qVariantCanConvert<PGPKey>(v))
- 			return i.owner->writeEntry(i.storeContextId, qVariantValue<PGPKey>(v));
-+#endif
- 		else
- 			return QString();
- 	}
-@@ -783,7 +794,11 @@
- {
- 	QString storeId = this->storeId();
- 	QString entryId = id();
-+#if QT_VERSION >= 0x050000
-+	KeyStoreEntryContext *c = (KeyStoreEntryContext *)trackercall("entry", QVariantList() << storeId << entryId).value<void*>();
-+#else
- 	KeyStoreEntryContext *c = (KeyStoreEntryContext *)qVariantValue<void*>(trackercall("entry", QVariantList() << storeId << entryId));
-+#endif
- 	if(c)
- 		change(c);
- 	return isAvailable();
-@@ -977,11 +992,25 @@
- 	virtual void run()
- 	{
- 		if(type == EntryList)
-+#if QT_VERSION >= 0x050000
-+			entryList = trackercall("entryList", QVariantList() << trackerId).value< QList<KeyStoreEntry> >();
-+#else
- 			entryList = qVariantValue< QList<KeyStoreEntry> >(trackercall("entryList", QVariantList() << trackerId));
-+#endif
- 		else if(type == WriteEntry)
- 		{
- 			QVariant arg;
-+#if QT_VERSION >= 0x050000
- 			if(wentry.type == KeyStoreWriteEntry::TypeKeyBundle)
-+				arg.setValue<KeyBundle>(wentry.keyBundle);
-+			else if(wentry.type == KeyStoreWriteEntry::TypeCertificate)
-+				arg.setValue<Certificate>(wentry.cert);
-+			else if(wentry.type == KeyStoreWriteEntry::TypeCRL)
-+				arg.setValue<CRL>(wentry.crl);
-+			else if(wentry.type == KeyStoreWriteEntry::TypePGPKey)
-+				arg.setValue<PGPKey>(wentry.pgpKey);
-+#else
-+			if(wentry.type == KeyStoreWriteEntry::TypeKeyBundle)
- 				qVariantSetValue<KeyBundle>(arg, wentry.keyBundle);
- 			else if(wentry.type == KeyStoreWriteEntry::TypeCertificate)
- 				qVariantSetValue<Certificate>(arg, wentry.cert);
-@@ -989,6 +1018,7 @@
- 				qVariantSetValue<CRL>(arg, wentry.crl);
- 			else if(wentry.type == KeyStoreWriteEntry::TypePGPKey)
- 				qVariantSetValue<PGPKey>(arg, wentry.pgpKey);
-+#endif
- 
- 			// note: each variant in the argument list is resolved
- 			//   to its native type.  so even though it looks like
-@@ -1205,7 +1235,11 @@
- 
- 	if(d->trackerId == -1)
- 		return QList<KeyStoreEntry>();
-+#if QT_VERSION >= 0x050000
-+	return trackercall("entryList", QVariantList() << d->trackerId).value< QList<KeyStoreEntry> >();
-+#else
- 	return qVariantValue< QList<KeyStoreEntry> >(trackercall("entryList", QVariantList() << d->trackerId));
-+#endif
- }
- 
- bool KeyStore::holdsTrustedCertificates() const
-@@ -1213,7 +1247,11 @@
- 	QList<KeyStoreEntry::Type> list;
- 	if(d->trackerId == -1)
- 		return false;
-+#if QT_VERSION >= 0x050000
-+	list = trackercall("entryTypes", QVariantList() << d->trackerId).value< QList<KeyStoreEntry::Type> >();
-+#else
- 	list = qVariantValue< QList<KeyStoreEntry::Type> >(trackercall("entryTypes", QVariantList() << d->trackerId));
-+#endif
- 	if(list.contains(KeyStoreEntry::TypeCertificate) || list.contains(KeyStoreEntry::TypeCRL))
- 		return true;
- 	return false;
-@@ -1224,7 +1262,11 @@
- 	QList<KeyStoreEntry::Type> list;
- 	if(d->trackerId == -1)
- 		return false;
-+#if QT_VERSION >= 0x050000
-+	list = trackercall("entryTypes", QVariantList() << d->trackerId).value< QList<KeyStoreEntry::Type> >();
-+#else
- 	list = qVariantValue< QList<KeyStoreEntry::Type> >(trackercall("entryTypes", QVariantList() << d->trackerId));
-+#endif
- 	if(list.contains(KeyStoreEntry::TypeKeyBundle) || list.contains(KeyStoreEntry::TypePGPSecretKey))
- 		return true;
- 	return false;
-@@ -1235,7 +1277,11 @@
- 	QList<KeyStoreEntry::Type> list;
- 	if(d->trackerId == -1)
- 		return false;
-+#if QT_VERSION >= 0x050000
-+	list = trackercall("entryTypes", QVariantList() << d->trackerId).value< QList<KeyStoreEntry::Type> >();
-+#else
- 	list = qVariantValue< QList<KeyStoreEntry::Type> >(trackercall("entryTypes", QVariantList() << d->trackerId));
-+#endif
- 	if(list.contains(KeyStoreEntry::TypePGPPublicKey))
- 		return true;
- 	return false;
-Index: src/support/console.cpp
-===================================================================
---- src/support/console.cpp	(revision 1329650)
-+++ src/support/console.cpp	(working copy)
-@@ -278,7 +278,11 @@
- 
- 	SecureArray readSecure(int bytes = -1)
- 	{
-+#if QT_VERSION >= 0x050000
-+		return mycall(worker, "readSecure", QVariantList() << bytes).value<SecureArray>();
-+#else
- 		return qVariantValue<SecureArray>(mycall(worker, "readSecure", QVariantList() << bytes));
-+#endif
- 	}
- 
- 	void writeSecure(const SecureArray &a)
-Index: src/support/synchronizer.cpp
-===================================================================
---- src/support/synchronizer.cpp	(revision 1329650)
-+++ src/support/synchronizer.cpp	(working copy)
-@@ -58,7 +58,7 @@
- 
- 	static bool haveFixer(QObject *obj)
- 	{
--		return (qFindChild<TimerFixer *>(obj) ? true: false);
-+		return obj->findChild<TimerFixer *>() ? true : false;
- 	}
- 
- 	TimerFixer(QObject *_target, TimerFixer *_fp = 0) : QObject(_target)
-@@ -180,7 +180,11 @@
- 			int timeLeft = qMax(info.interval - info.time.elapsed(), 0);
- 			info.fixInterval = true;
- 			ed->unregisterTimer(info.id);
-+#if QT_VERSION >= 0x050000
-+			ed->registerTimer(info.id, timeLeft, Qt::CoarseTimer, target);
-+#else
- 			ed->registerTimer(info.id, timeLeft, target);
-+#endif
- 
- #ifdef TIMERFIXER_DEBUG
- 			printf("TimerFixer[%p] adjusting [%d] to %d\n", this, info.id, timeLeft);
-@@ -239,7 +243,11 @@
- #endif
- 			info.fixInterval = false;
- 			ed->unregisterTimer(info.id);
-+#if QT_VERSION >= 0x050000
-+			ed->registerTimer(info.id, info.interval, Qt::CoarseTimer, target);
-+#else
- 			ed->registerTimer(info.id, info.interval, target);
-+#endif
- 		}
- 
- 		info.time.start();
-@@ -258,7 +266,11 @@
- 			int id = timers[n].id;
- 			for(int i = 0; i < edtimers.count(); ++i)
- 			{
-+#if QT_VERSION >= 0x050000
-+				if(edtimers[i].timerId == id)
-+#else
- 				if(edtimers[i].first == id)
-+#endif
- 				{
- 					found = true;
- 					break;
-@@ -278,7 +290,11 @@
- 		// added?
- 		for(int n = 0; n < edtimers.count(); ++n)
- 		{
-+#if QT_VERSION >= 0x050000
-+			int id = edtimers[n].timerId;
-+#else
- 			int id = edtimers[n].first;
-+#endif
- 			bool found = false;
- 			for(int i = 0; i < timers.count(); ++i)
- 			{
-@@ -293,7 +309,11 @@
- 			{
- 				TimerInfo info;
- 				info.id = id;
-+#if QT_VERSION >= 0x050000
-+				info.interval = edtimers[n].interval;
-+#else
- 				info.interval = edtimers[n].second;
-+#endif
- 				info.time.start();
- 				timers += info;
- #ifdef TIMERFIXER_DEBUG
-Index: src/support/syncthread.cpp
-===================================================================
---- src/support/syncthread.cpp	(revision 1329650)
-+++ src/support/syncthread.cpp	(working copy)
-@@ -32,11 +32,15 @@
- 	for(int n = 0; n < obj->methodCount(); ++n)
- 	{
- 		QMetaMethod m = obj->method(n);
-+#if QT_VERSION >= 0x050000
-+		QByteArray name = m.name();
-+#else
- 		QByteArray sig = m.signature();
- 		int offset = sig.indexOf('(');
- 		if(offset == -1)
- 			continue;
- 		QByteArray name = sig.mid(0, offset);
-+#endif
- 		if(name != method)
- 			continue;
- 		if(m.parameterTypes() != argTypes)
-@@ -73,7 +77,8 @@
- 
- 	QGenericReturnArgument retarg;
- 	QVariant retval;
--	if(metatype != 0)
-+
-+	if(metatype && metatype != QMetaType::Void)
- 	{
- 		retval = QVariant(metatype, (const void *)0);
- 		retarg = QGenericReturnArgument(retval.typeName(), retval.data());
-Index: tools/qcatool/main.cpp
-===================================================================
---- tools/qcatool/main.cpp	(revision 1329650)
-+++ tools/qcatool/main.cpp	(working copy)
-@@ -1301,14 +1301,22 @@
- 
- static bool variant_is_bool(const QVariant &in)
- {
-+#if QT_VERSION >= 0x050000
-+	if(in.canConvert<QString>() && string_is_bool(in.toString()))
-+#else
- 	if(qVariantCanConvert<QString>(in) && string_is_bool(in.toString()))
-+#endif
- 		return true;
- 	return false;
- }
- 
- static bool variant_is_int(const QVariant &in)
- {
-+#if QT_VERSION >= 0x050000
-+	if(in.canConvert<QString>() && string_is_int(in.toString()))
-+#else
- 	if(qVariantCanConvert<QString>(in) && string_is_int(in.toString()))
-+#endif
- 		return true;
- 	return false;
- }
-@@ -1418,7 +1426,11 @@
- 			newval = prompt_for_bool(QString("bool   ") + prompt, val.toBool());
- 		else if(variant_is_int(val))
- 			newval = prompt_for_int(QString("int    ") + prompt, val.toInt());
-+#if QT_VERSION >= 0x050000
-+		else if(val.canConvert<QString>())
-+#else
- 		else if(qVariantCanConvert<QString>(val))
-+#endif
- 			newval = prompt_for_string(QString("string ") + prompt, val.toString());
- 		else
- 			continue; // skip bogus fields
-Index: unittest/certunittest/certunittest.cpp
-===================================================================
---- unittest/certunittest/certunittest.cpp	(revision 1329650)
-+++ unittest/certunittest/certunittest.cpp	(working copy)
-@@ -129,24 +129,24 @@
- 	    QCOMPARE( ca1.notValidBefore().toString(), QDateTime( QDate( 2001, 8, 17 ), QTime( 8, 30, 39 ), Qt::UTC ).toString() );
- 	    QCOMPARE( ca1.notValidAfter().toString(), QDateTime( QDate( 2011, 8, 15 ), QTime( 8, 30, 39 ), Qt::UTC ).toString() );
- 
--	    QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::CRLSign), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::CRLSign), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    // no policies on this cert
- 	    QCOMPARE( ca1.policies().count(), 0 );
-@@ -184,24 +184,24 @@
- 
- 	    QCOMPARE( ca1.pathLimit(), 0 );
- 
--	    QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::CRLSign), (QBool)true );
--	    QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::CRLSign), true );
-+	    QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), false );
- 	}
-     }
- }
-@@ -230,39 +230,39 @@
- 	    QCOMPARE( client1.notValidBefore().toString(), QDateTime( QDate( 2001, 8, 17 ), QTime( 8, 32, 38 ), Qt::UTC ).toString() );
- 	    QCOMPARE( client1.notValidAfter().toString(), QDateTime( QDate( 2006, 8, 16 ), QTime( 8, 32, 38 ), Qt::UTC ).toString() );
- 
--	    QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::CRLSign), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::ServerAuth), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::ClientAuth), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::EmailProtection), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::CRLSign), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::ServerAuth), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::ClientAuth), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::EmailProtection), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    // no policies on this cert
- 	    QCOMPARE( client1.policies().count(), 0 );
- 
- 	    QCA::CertificateInfo subject1 = client1.subjectInfo();
- 	    QCOMPARE( subject1.isEmpty(), false );
--	    QCOMPARE( subject1.values(QCA::Country).contains("de"), (QBool)true );
--	    QCOMPARE( subject1.values(QCA::Organization).contains("InsecureTestCertificate"), (QBool)true );
--	    QCOMPARE( subject1.values(QCA::CommonName).contains("Insecure User Test Cert"), (QBool)true );
-+	    QCOMPARE( subject1.values(QCA::Country).contains("de"), true );
-+	    QCOMPARE( subject1.values(QCA::Organization).contains("InsecureTestCertificate"), true );
-+	    QCOMPARE( subject1.values(QCA::CommonName).contains("Insecure User Test Cert"), true );
- 
- 	    QCA::CertificateInfo issuer1 = client1.issuerInfo();
- 	    QCOMPARE( issuer1.isEmpty(), false );
--	    QCOMPARE( issuer1.values(QCA::Country).contains("de"), (QBool)true );
--	    QCOMPARE( issuer1.values(QCA::Organization).contains("InsecureTestCertificate"), (QBool)true );
--	    QCOMPARE( issuer1.values(QCA::CommonName).contains("For Tests Only"), (QBool)true );
-+	    QCOMPARE( issuer1.values(QCA::Country).contains("de"), true );
-+	    QCOMPARE( issuer1.values(QCA::Organization).contains("InsecureTestCertificate"), true );
-+	    QCOMPARE( issuer1.values(QCA::CommonName).contains("For Tests Only"), true );
- 
- 	    QByteArray subjectKeyID = QCA::Hex().stringToArray("889E7EF729719D7B280F361AAE6D00D39DE1AADB").toByteArray();
- 	    QCOMPARE( client1.subjectKeyId(), subjectKeyID );
-@@ -338,24 +338,24 @@
- 	    QCOMPARE( client2.notValidBefore().toString(), QDateTime( QDate( 2007, 7, 22 ), QTime( 3, 30, 29 ), Qt::UTC ).toString() );
- 	    QCOMPARE( client2.notValidAfter().toString(), QDateTime( QDate( 2012, 7, 20 ), QTime( 3, 30, 29 ), Qt::UTC ).toString() );
- 
--	    QCOMPARE( client2.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::DataEncipherment), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::CRLSign), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::ServerAuth), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::ClientAuth), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::EmailProtection), (QBool)true );
--	    QCOMPARE( client2.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( client2.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( client2.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( client2.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::DataEncipherment), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::KeyCertificateSign), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::CRLSign), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::ServerAuth), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::ClientAuth), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::EmailProtection), true );
-+	    QCOMPARE( client2.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( client2.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( client2.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    // no policies on this cert
- 	    QCOMPARE( client2.policies().count(), 0 );
-@@ -470,24 +470,24 @@
-             QCOMPARE( ca1.notValidBefore().toString(), QDateTime( QDate( 2001, 8, 17 ), QTime( 8, 30, 39 ), Qt::UTC ).toString() );
-             QCOMPARE( ca1.notValidAfter().toString(), QDateTime( QDate( 2011, 8, 15 ), QTime( 8, 30, 39 ), Qt::UTC ).toString() );
- 
--            QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--            QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--            QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--            QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), (QBool)true );
--            QCOMPARE( ca1.constraints().contains(QCA::CRLSign), (QBool)true );
--            QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--            QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), (QBool)false );
--            QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+            QCOMPARE( ca1.constraints().contains(QCA::DigitalSignature), true );
-+            QCOMPARE( ca1.constraints().contains(QCA::NonRepudiation), true );
-+            QCOMPARE( ca1.constraints().contains(QCA::KeyEncipherment), true );
-+            QCOMPARE( ca1.constraints().contains(QCA::DataEncipherment), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::KeyAgreement), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::KeyCertificateSign), true );
-+            QCOMPARE( ca1.constraints().contains(QCA::CRLSign), true );
-+            QCOMPARE( ca1.constraints().contains(QCA::EncipherOnly), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::DecipherOnly), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::ServerAuth), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::ClientAuth), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::CodeSigning), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::EmailProtection), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::IPSecEndSystem), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::IPSecTunnel), false);
-+            QCOMPARE( ca1.constraints().contains(QCA::IPSecUser), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::TimeStamping), false );
-+            QCOMPARE( ca1.constraints().contains(QCA::OCSPSigning), false );
- 
-             // no policies on this cert
-             QCOMPARE( ca1.policies().count(), 0 );
-@@ -518,24 +518,24 @@
- 
- 	    QCOMPARE( client1.commonName(), QString("Valid RFC822 nameConstraints EE Certificate Test21") );
- 
--	    QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), (QBool)true );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::CRLSign), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::ServerAuth), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::ClientAuth), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::EmailProtection), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( client1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), true );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::CRLSign), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::ServerAuth), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::ClientAuth), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::EmailProtection), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( client1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    QCOMPARE( client1.policies().count(), 1 );
- 	    QCOMPARE( client1.policies().at(0), QString("2.16.840.1.101.3.2.1.48.1") );
-@@ -636,24 +636,24 @@
- 
-             QCOMPARE( client1.commonName(), QString("sip1.su.se") );
- 
--            QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--            QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--            QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--            QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::CRLSign), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::ServerAuth), (QBool)true );
--            QCOMPARE( client1.constraints().contains(QCA::ClientAuth), (QBool)true );
--            QCOMPARE( client1.constraints().contains(QCA::CodeSigning), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::EmailProtection), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--            QCOMPARE( client1.constraints().contains(QCA::IPSecUser), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::TimeStamping), (QBool)false );
--            QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+            QCOMPARE( client1.constraints().contains(QCA::DigitalSignature), true );
-+            QCOMPARE( client1.constraints().contains(QCA::NonRepudiation), true );
-+            QCOMPARE( client1.constraints().contains(QCA::KeyEncipherment), true );
-+            QCOMPARE( client1.constraints().contains(QCA::DataEncipherment), false );
-+            QCOMPARE( client1.constraints().contains(QCA::KeyAgreement), false );
-+            QCOMPARE( client1.constraints().contains(QCA::KeyCertificateSign), false );
-+            QCOMPARE( client1.constraints().contains(QCA::CRLSign), false );
-+            QCOMPARE( client1.constraints().contains(QCA::EncipherOnly), false );
-+            QCOMPARE( client1.constraints().contains(QCA::DecipherOnly), false );
-+            QCOMPARE( client1.constraints().contains(QCA::ServerAuth), true );
-+            QCOMPARE( client1.constraints().contains(QCA::ClientAuth), true );
-+            QCOMPARE( client1.constraints().contains(QCA::CodeSigning), false );
-+            QCOMPARE( client1.constraints().contains(QCA::EmailProtection), false );
-+            QCOMPARE( client1.constraints().contains(QCA::IPSecEndSystem), false );
-+            QCOMPARE( client1.constraints().contains(QCA::IPSecTunnel), false);
-+            QCOMPARE( client1.constraints().contains(QCA::IPSecUser), false );
-+            QCOMPARE( client1.constraints().contains(QCA::TimeStamping), false );
-+            QCOMPARE( client1.constraints().contains(QCA::OCSPSigning), false );
- 
-             QCOMPARE( client1.policies().count(), 1 );
- 
-@@ -773,39 +773,39 @@
- 	    QCOMPARE( server1.notValidBefore().toString(), QDateTime( QDate( 2001, 8, 17 ), QTime( 8, 46, 24 ), Qt::UTC ).toString() );
- 	    QCOMPARE( server1.notValidAfter().toString(), QDateTime( QDate( 2006, 8, 16 ), QTime( 8, 46, 24 ), Qt::UTC ).toString() );
- 
--	    QCOMPARE( server1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::NonRepudiation), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyAgreement), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::CRLSign), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::ServerAuth), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::ClientAuth), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::EmailProtection), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( server1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::NonRepudiation), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::DataEncipherment), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyAgreement), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyCertificateSign), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::CRLSign), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::ServerAuth), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::ClientAuth), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::EmailProtection), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    // no policies on this cert
- 	    QCOMPARE( server1.policies().count(), 0 );
- 
- 	    QCA::CertificateInfo subject1 = server1.subjectInfo();
- 	    QCOMPARE( subject1.isEmpty(), false );
--	    QCOMPARE( subject1.values(QCA::Country).contains("de"), (QBool)true );
--	    QCOMPARE( subject1.values(QCA::Organization).contains("InsecureTestCertificate"), (QBool)true );
--	    QCOMPARE( subject1.values(QCA::CommonName).contains("Insecure Server Cert"), (QBool)true );
-+	    QCOMPARE( subject1.values(QCA::Country).contains("de"), true );
-+	    QCOMPARE( subject1.values(QCA::Organization).contains("InsecureTestCertificate"), true );
-+	    QCOMPARE( subject1.values(QCA::CommonName).contains("Insecure Server Cert"), true );
- 
- 	    QCA::CertificateInfo issuer1 = server1.issuerInfo();
- 	    QCOMPARE( issuer1.isEmpty(), false );
--	    QCOMPARE( issuer1.values(QCA::Country).contains("de"), (QBool)true );
--	    QCOMPARE( issuer1.values(QCA::Organization).contains("InsecureTestCertificate"), (QBool)true );
--	    QCOMPARE( issuer1.values(QCA::CommonName).contains("For Tests Only"), (QBool)true );
-+	    QCOMPARE( issuer1.values(QCA::Country).contains("de"), true );
-+	    QCOMPARE( issuer1.values(QCA::Organization).contains("InsecureTestCertificate"), true );
-+	    QCOMPARE( issuer1.values(QCA::CommonName).contains("For Tests Only"), true );
- 
- 	    QByteArray subjectKeyID = QCA::Hex().stringToArray("0234E2C906F6E0B44253BE04C0CBA7823A6DB509").toByteArray();
- 	    QCOMPARE( server1.subjectKeyId(), subjectKeyID );
-@@ -876,24 +876,24 @@
- 	    QCOMPARE( server1.notValidBefore().toString(), QDateTime( QDate( 2007, 7, 22 ), QTime( 6, 5, 39 ), Qt::UTC ).toString() );
- 	    QCOMPARE( server1.notValidAfter().toString(), QDateTime( QDate( 2012, 7, 20 ), QTime( 6, 5, 39 ), Qt::UTC ).toString() );
- 
--	    QCOMPARE( server1.constraints().contains(QCA::DigitalSignature), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::NonRepudiation), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyEncipherment), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::DataEncipherment), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyAgreement), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::KeyCertificateSign), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::CRLSign), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::EncipherOnly), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::DecipherOnly), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::ServerAuth), (QBool)true );
--	    QCOMPARE( server1.constraints().contains(QCA::ClientAuth), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::CodeSigning), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::EmailProtection), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecEndSystem), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecTunnel), (QBool)false);
--	    QCOMPARE( server1.constraints().contains(QCA::IPSecUser), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::TimeStamping), (QBool)false );
--	    QCOMPARE( server1.constraints().contains(QCA::OCSPSigning), (QBool)false );
-+	    QCOMPARE( server1.constraints().contains(QCA::DigitalSignature), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::NonRepudiation), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyEncipherment), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::DataEncipherment), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyAgreement), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::KeyCertificateSign), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::CRLSign), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::EncipherOnly), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::DecipherOnly), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::ServerAuth), true );
-+	    QCOMPARE( server1.constraints().contains(QCA::ClientAuth), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::CodeSigning), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::EmailProtection), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecEndSystem), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecTunnel), false);
-+	    QCOMPARE( server1.constraints().contains(QCA::IPSecUser), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::TimeStamping), false );
-+	    QCOMPARE( server1.constraints().contains(QCA::OCSPSigning), false );
- 
- 	    // no policies on this cert
- 	    QCOMPARE( server1.policies().count(), 0 );
-Index: unittest/hashunittest/hashunittest.cpp
-===================================================================
---- unittest/hashunittest/hashunittest.cpp	(revision 1329650)
-+++ unittest/hashunittest/hashunittest.cpp	(working copy)
-@@ -114,7 +114,11 @@
- 
-     foreach(QString provider, providersToTest) {
- 	if(!QCA::isSupported("md2", provider))
-+#if QT_VERSION >= 0x050000
-+	    QSKIP(QString("MD2 not supported for "+provider).toLocal8Bit());
-+#else
- 	    QSKIP(QString("MD2 not supported for "+provider).toLocal8Bit(), SkipSingle);
-+#endif
- 	QString hashResult = QCA::Hash("md2", provider).hashToString(input);
- 	QCOMPARE( hashResult, expectedHash );
-     }
-Index: unittest/keygenunittest/keygenunittest.cpp
-===================================================================
---- unittest/keygenunittest/keygenunittest.cpp	(revision 1329650)
-+++ unittest/keygenunittest/keygenunittest.cpp	(working copy)
-@@ -61,7 +61,11 @@
-     if(!QCA::isSupported("pkey") ||
-        !QCA::PKey::supportedTypes().contains(QCA::PKey::RSA) ||
-        !QCA::PKey::supportedIOTypes().contains(QCA::PKey::RSA))
-+#if QT_VERSION >= 0x050000
-+        QSKIP("RSA not supported!");
-+#else
-         QSKIP("RSA not supported!", SkipAll);
-+#endif
- 
-     QCA::PrivateKey priv1 = keygen.createRSA( 1024, 65537 );
-     QCA::RSAPrivateKey rsa1 = priv1.toRSA();
-@@ -91,7 +95,11 @@
-     if(!QCA::isSupported("pkey") ||
-        !QCA::PKey::supportedTypes().contains(QCA::PKey::DSA) ||
-        !QCA::PKey::supportedIOTypes().contains(QCA::PKey::DSA))
-+#if QT_VERSION >= 0x050000
-+	QSKIP("DSA not supported!");
-+#else
- 	QSKIP("DSA not supported!", SkipAll);
-+#endif
- 
-     QCA::DLGroup group = keygen.createDLGroup( QCA::DSA_512 );
-     QCA::PrivateKey priv2 = keygen.createDSA( group );
-@@ -121,7 +129,11 @@
-     if(!QCA::isSupported("pkey") ||
-        !QCA::PKey::supportedTypes().contains(QCA::PKey::DH) ||
-        !QCA::PKey::supportedIOTypes().contains(QCA::PKey::DH))
--        QSKIP("DH not supported!", SkipAll);
-+#if QT_VERSION >= 0x050000
-+	QSKIP("DH not supported!");
-+#else
-+	QSKIP("DH not supported!", SkipAll);
-+#endif
- 
-     QCA::DLGroup group = keygen.createDLGroup( QCA::IETF_1024 );
-     QCA::PrivateKey priv3 = keygen.createDH( group );

psi-plus-main-20130107.tar.xz/changelog.txt -> psi-plus-main-20141106.tar.xz/changelog.txt Changed

@@ -1,4 +1,672 @@
-2012-10-28  zet
+2014-05-02  zet
+v0.16.361
+  ! [коммит в upstream] psi: разрешено автозаполнение поля с паролем в форме присоединения
+    к конференции
+  ! [коммит в upstream] psi: исправлено некорректное поведение при перетаскивании объектов
+    в ростере конференции
+  ! [коммит в upstream] psi: исправлена работа поиска в ростере (задача 107,
+    https://github.com/psi-im/psi/issues/107)
+  ! [коммит в upstream] psi: сворачивание/разворачивание групп ростера при одиночном клике на
+    иконке группы
+  ! [коммит в upstream] psi: более эффективная работа с опциями
+  ! [коммит в upstream] psi: некоторые улучшения при перерисовке элементов ростера
+  ! [коммит в upstream] psi: небольшие исправления для диалоговых окон с историей переписки
+    (задача 109, https://github.com/psi-im/psi/issues/109 и другие)
+  ! [коммит в upstream] psi: решена задача 108, https://github.com/psi-im/psi/issues/108
+  ! [коммит в upstream] psi: 2014 год в окне "О программе"
+  ! [коммит в upstream] psi: попытка исправить некорректное отображение иконки в трее
+  ! [коммит в upstream] psi: решена задача 102, https://github.com/psi-im/psi/issues/102
+  ! [коммит в upstream] psi: всегда отображать в ростере контакт с непрочитанным сообщением/событием
+    (https://github.com/psi-im/psi/issues/42)
+  ! [коммит в upstream] psi: исправлена ошибка при смене ника после кика в конференции
+  ! [коммит в upstream] psi: сглаживание шрифтов в WebKit-версии
+  ! [коммит в upstream] psi: фикс получения имени клиента в случае когда в капсах содержится 'https'
+  ! [коммит в upstream] psi: теперь используется внешний qjdns
+  ! [коммит в upstream] psi: возможность сделать масштабируемую область видеоокна для видеозвонков
+  ! [коммит в upstream] psi: показывать продолжительность вызова в строке состояния
+  ! [коммит в upstream] iris: добавлен qcm-модуль для проверки наличия внешнего qjdns. если внешний
+    qjdns не найден, то будет использоваться встроенная версия. также встроенная версии qjdns будет
+    использоваться в Windows и в Mac OS X без проверки наличия внешнего qjdns
+  + добавлен новый патч для решения задачи 524, https://code.google.com/p/psi-dev/issues/detail?id=524
+    (psi-fix-selection-behavior-groupchat-dlg.diff)
+  + добавлен новый патч для решения задачи 574, https://code.google.com/p/psi-dev/issues/detail?id=574
+    (fix-muc-roster-drag-and-drop.diff)
+  - убран патч fix-muc-roster-drag-and-drop.diff -> принят в upstream
+  + добавлен новый патч для поддержки проверки правописания при использовании нескольких словарей
+    в случае когда Psi+ скомпилирован с enchant (psi-enchant-multidicts.diff)
+  + добавлен новый патч для решения задачи 575, https://code.google.com/p/psi-dev/issues/detail?id=575
+    для работы фичи необходимо опцию "options.ui.muc.allow-highlight-events" установить в положение
+    "true" (psi-muc-highlight-events.diff)
+  * исправлена утечка памяти при очистке очереди событий. память текла при удалении контакта, если у
+    него были непрочитанные сообщения или другие необработанные события (psi-fix-memory-leaks.diff)
+  * исправлена ошибка, в результате которой отображалось событие composing для конференций
+    (если какой нибудь клиент его отправлял), также теперь используется одинаковая иконка
+    для события и для чатов (psi-muc-highlight-events.diff)
+  * решена проблема с повреждением открытых вкладок, содержащих приватные чаты конференций,
+    при появлении нового события для конференции. ник и заголовок вкладки приватного чата менялись
+    на название конференции (psi-muc-highlight-events.diff)
+  * теперь события конференции подгружаются при запуске Psi+ (если таковые существуют)
+    [psi-muc-highlight-events.diff]
+  - убраны патчи psi-more-effective-work-with-options.diff и
+    some-improvments-for-contactlist-repaiting.diff -> приняты в upstream
+  * попытка исправить патч psi-improve-tray-tooltip.diff
+  * обновлён патч psi-hide-any-group.diff
+  * решена задача 578, https://code.google.com/p/psi-dev/issues/detail?id=578
+    (psi-reasons-for-roles-affiliations.diff)
+  + добавлен новый патч psi-disable-messages-correct-behavior.diff: патч меняет поведение опции
+    "options.message.enabled". теперь при включённой опции входящие сообщения и другие события
+    отображаются в диалоге, события не "зависают". исходящие сообщения запрещены и отключены в меню.
+    также решена задача 560, https://code.google.com/p/psi-dev/issues/detail?id=560
+  + добавлен новый патч psi-transfer-dlg-improvement.diff: доработка диалогового окна передачи файлов,
+    подробнее https://github.com/psi-plus/main/commit/1d5659b572e5a5dae39a245a66b5c71553adfa67#commitcomment-5454136
+  + добавлены новые патчи для ОС Haiku (спасибо Diger) [fix-psiplus-build-in-haiku.patch,
+    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch]
+  * добавлены новые капсы и ресурсы для Jabber-клиентов из списка отсюда:
+    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (спасибо aon17@mail.ru)
+    [psi-client-icons.diff]
+  * обновлены наборы иконок Jabber-клиентов "fingerprint.jisp" и "fingerprint-22.jisp"
+    (спасибо aon17@mail.ru)
+  * добавлена поддержка действия detach при клике средней кнопкой мыши по табу. для неизвестных
+    значений настройки теперь используется действие по умолчанию "none" (спасибо Hamper)
+    [psi-tab-action-on-mouse-click.diff]
+  * исправлена недоработка, в результате которой в консоль выводились предупреждения
+    об отсутствующей опции (задача 563, пункт 0) [psi-tunable-chattoolbar.diff]
+  * исправлено поведение при выделении элементов в обычных чатах. теперь это происходит таким же
+    способом, как и в MUC (https://code.google.com/p/psi-dev/issues/detail?id=524)
+    [psi-fix-selection-behavior-chat-dlg.diff]
+  * убраны ненужные переменные в патчах psi-modern-roster.diff и psi-options-reset-button.diff
+  * добавлена проверка на пустые аватары в патче psi-roster-avatar-frame.diff
+  * чистка лишних отладочных сообщений в коде для решения задачи 563,
+    https://code.google.com/p/psi-dev/issues/detail?id=563 (psi-extend-plugins-interface.diff)
+  * теперь центральная панель инструментов в чатах включена по умолчанию
+    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
+  * решена проблема, описанная здесь: http://code.google.com/p/psi-dev/issues/detail?id=106#c35.
+    теперь в диалоге чата, запущенном по команде из контекстного меню, будет выбран правильный
+    ресурс. если ресурс у контакта только один, то режим autojid останется включённым. если
+    несколько ресурсов - то даже, если был выбран ресурс с максимальным приоритетом, этот режим
+    будет отключён (psi-one-chat-for-many-resources.diff)
+  * исправлен двойной вызов vcard из контекстного меню при клике на jid в ростере
+    (psi-muc-nickclick-chat.diff)
+  * исправлен регистр в названиях ресурсов, т.к. для данного патча в переменной name не может быть
+    символов верхнего регистра (psi-client-icons.diff)
+  * обновлена ссылка для скачивания свежего инсталлятора Psi+, а также обновлены прямые ссылки на
+    changelog и version в патче на автоматическое обнаружение новых версий Psi+
+    (psi-dirty-check.diff)
+  * обновлён OTR plugin до версии 1.0.2,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
+  * обновлён extended menu plugin до версии 0.1.3,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
+  * обновлён video status plugin до версии 0.2.5,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
+  * обновлён extended options plugin до версии 0.4.0,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
+  * обновлён content downloader plugin до версии 0.2.5,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
+  ! обновлены библиотеки шифрования OpenSSL до версии 1.0.1g,
+    http://www.openssl.org/news/changelog.html
+  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.352)
+    https://github.com/psi-plus/psi-plus-l10n
+  --
+  ! [upstream commit] psi: allowed autofill password for muc join dialog
+  ! [upstream commit] psi: fixed drag and drop action in the muc roster
+  ! [upstream commit] psi: fix search in roster (https://github.com/psi-im/psi/issues/107)
+  ! [upstream commit] psi: expand/collapse roster groups on group icon singleclick
+  ! [upstream commit] psi: more effenctive work with options
+  ! [upstream commit] psi: some improvements for contactlist repainting
+  ! [upstream commit] psi: some fixes for history
+    (https://github.com/psi-im/psi/issues/109 and other)
+  ! [upstream commit] psi: fixed https://github.com/psi-im/psi/issues/108
+  ! [upstream commit] psi: 2014 at aboutdlg
+  ! [upstream commit] psi: try to fix wrong tray icon
+  ! [upstream commit] psi: fix handling + at url (https://github.com/psi-im/psi/issues/102)
+  ! [upstream commit] psi: always show contacts with events
+    (https://github.com/psi-im/psi/issues/42)
+  ! [upstream commit] psi: fix nick changing after kick from muc
+  ! [upstream commit] psi: round pixel font size in WebKit
+  ! [upstream commit] psi: fixed to obtain the client's name, if the caps node contains https
+  ! [upstream commit] psi: use external qjdns
+  ! [upstream commit] psi: make scalable video area for video calls
+  ! [upstream commit] psi: show call duration in status string
+  ! [upstream commit] iris: added qcm module to check for external qjdns. if external qjdns not
+    found will be used bundled version. also bundled qjdns will be used on Windows and Mac OS X
+    without checking for external qjdns
+  + added new psi-fix-selection-behavior-groupchat-dlg.diff patch
+  + added new patch for fix issue 574, https://code.google.com/p/psi-dev/issues/detail?id=574
+    (fix-muc-roster-drag-and-drop.diff)
+  - removed fix-muc-roster-drag-and-drop.diff patch -> went to upstream
+  + added new patch for support check spelling with multiple dictionaries when Psi+ compiled with
+    enchant (psi-enchant-multidicts.diff)
+  + added new patch for fix issue 575, https://code.google.com/p/psi-dev/issues/detail?id=575. for
+    enable this feature you need 'options.ui.muc.allow-highlight-events' option switch to 'true'
+    position (psi-muc-highlight-events.diff)
+  * fixed a memory leak (psi-fix-memory-leaks.diff)
+  * updated psi-muc-highlight-events.diff patch
+  - removed psi-more-effective-work-with-options.diff and
+    some-improvments-for-contactlist-repaiting.diff patches -> went to upstream
+  * try to fix psi-improve-tray-tooltip.diff patch
+  * updated psi-hide-any-group.diff patch
+  * fixed issue 578, https://code.google.com/p/psi-dev/issues/detail?id=578
+    (psi-reasons-for-roles-affiliations.diff)
+  + added new psi-disable-messages-correct-behavior.diff patch
+  + added new psi-transfer-dlg-improvement.diff patch
+  + added patches for Haiku (thanks to Diger) [fix-psiplus-build-in-haiku.patch,
+    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch]
+  * added new client caps and resources to src/userlist.cpp from
+    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (thanks to aon17@mail.ru)
+    [psi-client-icons.diff]
+  * updated client iconsets 'fingerprint.jisp' and 'fingerprint-22.jisp' (thanks to aon17@mail.ru)
+  * added some actions on the mouse middle button (thanks to Hamper)
+    [psi-tab-action-on-mouse-click.diff]
+  * updated psi-tunable-chattoolbar.diff patch
+  * fixed a selection behavior in the psichatdlg (psi-fix-selection-behavior-chat-dlg.diff)
+  * removed unused variables in psi-modern-roster.diff and psi-options-reset-button.diff patches
+  * updated psi-roster-avatar-frame.diff patch
+  * updated psi-extend-plugins-interface.diff patch for fix issue 563,
+    https://code.google.com/p/psi-dev/issues/detail?id=563
+  * enable central toolbar by default
+    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
+  * updated psi-one-chat-for-many-resources.diff patch
+  * fixed double vcards from context menu on jid (psi-muc-nickclick-chat.diff)
+  * fixed capital letters in comparisions in psi-client-icons.diff patch
+  * updated downloads location and changelog/version raw files locations for auto updater
+    (psi-dirty-check.diff)
+  * updated OTR plugin to v1.0.2,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
+  * updated extended menu plugin to v0.1.3,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
+  * updated video status plugin to v0.2.5,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
+  * updated extended options plugin to v0.4.0,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
+  * updated content downloader plugin to v0.2.5,
+    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
+  ! updated OpenSSL win32 binary files to v1.0.1g, http://www.openssl.org/news/changelog.html
+  ! updated translations to v0.16.355 (https://github.com/psi-plus/psi-plus-l10n)
+
+
+2013-11-24  zet
+v0.16.261
+  ! [коммит в upstream] psi: dbus отключён в MS Windows по умолчанию
+  ! [коммит в upstream] psi: теперь не показывается лишняя история сообщений при перезаходе в
+    конференцию (спасибо Dmitriy Deshevoy)
+  ! [коммит в upstream] psi: исправлен порядок расположения панелей инструментов в настройках
+    приложения. Теперь новые панели появляются всегда в конце списка (снизу)
+  ! [коммит в upstream] psi: улучшена раскраска ников в чатлоге конференции. Патч от команды Psi+
+  ! [коммит в upstream] psi: исправлено падение приложения при вызове AlertManager
+  ! [коммит в upstream] psi: улучшено определение версии ОС семейства MS Windows в SystemInfo
+  + добавлен новый патч psi-tunable-chattoolbar.diff
+  * теперь используется слово "Groupchat" вместо "MUC"  или "Conference"
+    (psi-muc-and-user-topic-context-menu.diff)
+  * убрана ненужная опция "disable-paste-and-send". Теперь настройка тулбара осуществляется через
+    соответствующую вкладку в настройках приложения (psi-send-button-context-menu.diff,
+    psi-muc-minimize-to-roster.diff, psi-tunable-chattoolbar.diff)
+  * исправлено падение приложения при вызове findOnlineAccountForContact когда *account = 0
+    (psi-extend-plugins-interface.diff)
+  * фиксы для локализации в патче psi-tunable-chattoolbar.diff
+  + добавлен новый патч для коррекции dpi в webkit-версии (psi-webkit-dpi.diff)
+  + добавлен новый патч для корректной сортировки панелей инструментов в настройках приложения
+    (psi-toolbars-sorted.diff)
+  + добавлен новый патч psi-x11-class-name.diff
+  - убран патч psi-x11-class-name.diff -> принят в upstream
+  * улучшена раскраска ников в чатлоге конференции (psi-muc-nick-hash-color.diff)
+  - убран патч psi-muc-nick-hash-color.diff -> принят в upstream
+  - убран патч psi-webkit-dpi.diff -> принят в upstream
+  * правильная установка цветовой палитры для всплывающих подсказок (psi-coloring-tooltip.diff)
+  + добавлен новый патч psi-unity-menubar.diff
+  + добавлен новый плагин для Psi+ -- Off-The-Record-Messaging plugin, подробнее по ссылке:
+    https://github.com/psi-plus/plugins/tree/master/generic/otrplugin
+  * обновлены некоторые плагины: теперь используется слово "Groupchat" вместо "MUC" или "Conference"
+    (client switcher plugin, conference logger plugin, extended options plugin, gomoku game plugin,
+    stop spam plugin)
+  * обновлён extended options plugin: убраны опции, которые отображают тулбар чата и кнопку
+    "Вставить и отправить"
+  * обновлён juick plugin: добавлена обработка изображений в формате *.png
+  * обновлён watcher plugin: убрана опция "Отображать на панели чата". Теперь это настраивается в
+    настройках приложения (вкладка "Панель инструментов")
+  * обновлён GnuPG plugin: уменьшен размер иконки плагина, убрана опция "Отображать на панели чата"
+  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.257)
+    https://github.com/psi-plus/psi-plus-l10n
+  --
+  ! [upstream commit] psi: disable dbus on MS Windows by default
+  ! [upstream commit] psi: MUC history since (thx:Dmitriy Deshevoy)
+  ! [upstream commit] psi: fixed toolbars order in Toolbar Options. New toolbars added to the
+    bottom. After reopen options a new toolbar was on the top. Now new toolbars always in the bottom
+  ! [upstream commit] psi: improve palette for nicknames coloring in group chats. Patch from Psi+
+  ! [upstream commit] psi: fixed crash in AlertManager (double free)
+  ! [upstream commit] psi: allow no text in html message content. for example if it's image
+  ! [upstream commit] psi: update checks of MS Windows versions in SystemInfo
+  ! [upstream commit] iris: ignore /[\r\n]+/ in vcard base64 photo
+  + added new psi-tunable-chattoolbar.diff patch
+  * 'Groupchat' instead of 'MUC' or 'Conference' (psi-muc-and-user-topic-context-menu.diff)
+  * no disable-paste-and-send option (psi-send-button-context-menu.diff,
+    psi-muc-minimize-to-roster.diff, psi-tunable-chattoolbar.diff)
+  * don't crash in findOnlineAccountForContact when *account = 0 (psi-extend-plugins-interface.diff)
+  * split Toolbar from Chat Toolbar
+    (psi-tunable-chattoolbar.diff, psi-extend-plugins-interface.diff)
+  * fix with translations of Chat Toolbar (psi-tunable-chattoolbar.diff)
+  * fix text strings in psi-tunable-chattoolbar.diff patch
+  + added new patch for fix webkit's dpi (psi-webkit-dpi.diff)
+  + added new patch for fix Toolbar Options. Options internally uses QHash so they has no order.
+    Before putting toolbars in combobox they must be sorted (psi-toolbars-sorted.diff)
+  + added new patch for fix bug with changing of X11 window class name. Such class name is used for
+    grouping windows and for some WM (psi-x11-class-name.diff)
+  - removed psi-x11-class-name.diff patch -> went to upstream
+  * updated psi-muc-nick-hash-color.diff patch. Now nicknames should look much better in group chats
+  * fixed color palette in psi-muc-nick-hash-color.diff patch
+  * improved psi-muc-nick-hash-color.diff patch
+  - removed psi-muc-nick-hash-color.diff patch -> went to upstream
+  - removed psi-webkit-dpi.diff patch -> went to upstream
+  * set palette colors for tooltips proper way (psi-coloring-tooltip.diff)
+  + added new psi-unity-menubar.diff patch. This workaround. Need to fix Unity bug with Status Menu
+    in indicator. When a menu is used on the application menu bar it can no be shown anywhere else.
+    Need to use clone of the menu on the menu bar
+  + added new plugin - Off-The-Record-Messaging plugin for Psi+, see the link for details
+    https://github.com/psi-plus/plugins/tree/master/generic/otrplugin
+  * updated some plugins: use Groupchat word instead of MUC or Conference (client switcher plugin,
+    conference logger plugin, extended options plugin, gomoku game plugin, stop spam plugin)
+  * updated extended options plugin: dropped two chat options
+  * updated juick plugin: handle *.png photos
+  * updated watcher plugin: dropped show no chat toolbar option. Now there is a way to setup chat
+    toolbar. That option has no any sense anymore
+  * updated GnuPG plugin: shrinked plugin icon; dropped show no chat toolbar option
+  ! updated translations to v0.16.257 (https://github.com/psi-plus/psi-plus-l10n)
+
+
+2013-09-01  zet
+v0.16.204
+  ! [коммит в upstream] psi: добавлена поддержка Webkit от команды Psi+
+    (со встроенной поддержкой adium)
+  * [коммит в upstream] psi: улучшенное окно для ввода текста при установке топика конференции
+  + [коммит в upstream] psi: добавлено отображение уведомлений о доставке сообщений
+  * [коммит в upstream] psi: добавлена иконка для отображения уведомлений о доставке сообщений
+  * [коммит в upstream] psi: фикс для работы через proxy-сервер
+  + [коммит в upstream] psi: добавлена иконка для отображения уведомления о написании сообщения
+  * [коммит в upstream] psi: фикс для growlnotifier
+  * [коммит в upstream] psi: чтение файлов тем adium вне зависимости от регистра файла
+  + [коммит в upstream] psi: добавлена поддержка мониторов Retina
+  + [коммит в upstream] psi: начальная поддержка adium messageClasses
+  + [коммит в upstream] psi: добавлена тема new_classic psi (с аватарами)
+  * [коммит в upstream] iris: не показывать способность в передаче файлов в обзоре сервисов, если
+    поддержка передачи файлов отключена
+  * [коммит в upstream] iris: исправлена ошибка в механизме передачи файлов методом s5b
+  * добавлено опеределение клиента Xabber (psi-client-icons.diff, fingerprint.jisp)
+  + добавлен новый патч для улучшения перерисовки ростера
+    (some-improvments-for-contactlist-repaiting.diff)
+  - убраны патчи psi-webkit.diff, psi-muc-topic.diff and psi-receipts.diff -> приняты в upstream
+  * фикс в патче psi-fix-pep-retraction.diff
+  * небольшие улучшения в патче psi-extend-plugins-interface.diff
+  * иконка для уведомления о написании сообщения принята в upstream (psi-iconsets.diff)
+  * улучшенные иконки для клиентов jTalk и Xabber (спасибо vados)
+    [fingerprint.jisp, fingerprint-22.jisp]
+  * иконка 'theme_title_texture.png' принята в upstream (psi-iconsets.diff)
+  * обновлён патч psi-extend-plugins-interface.diff: добавлена поддержка отображения иконки для
+    каждого плагина в выпадающем списке выбора плагина (настройки приложения -> вкладка Плагины)
+  + добавлен новый патч для исправления отображения аватарки во всплывающей подсказке на приватных
+    чатах конференции в основном ростере (psi-fix-tooltip-avatar-on-privates-in-main-roster.diff)
+  * серая (бледная) иконка для отключенных плагинов в выпадающем списке плагинов на странице
+    настроек (psi-extend-plugins-interface.diff)
+  * добавлена поддержка плагинного интерфейса в табах чатов и конференций, также объединены
+    ChatTabAccessor и GCTabAccessor (psi-extend-plugins-interface.diff)
+  * juick plugin: попытка исправить заползание длинной ссылки за пределы видимой области экрана
+  + content downloader plugin: добавлен набор смайлов 'Nimbuzz' (Nimbuzz22.jisp)
+  + content downloader plugin: добавлен набор смайлов 'Android 4 blue' (Android4blue.jisp)
+  * content downloader plugin (v0.2.3): кликабельные ссылки на странице описания набора иконок
+  * watcher plugin (v0.4.2): исправлен выбор Jid'а для удаления из списка наблюдения
+  * watcher plugin (v0.4.3):
+    + добавлена кнопка в панель инструментов чата для добавления контакта в список слежения
+    * изменена иконка в контекстном меню контакта
+    * теперь в настройках 1-ая колонка используется для включения правила
+    + добавлена настройка для отображения кнопок "Следить за JID'ом"
+  + к каждому плагину Psi+ добавлена его иконка (для отображения в выпадающем списке плагинов в
+    настройках приложения)
+  - убран yandex narod plugin, т.к. Яндекс закрыл свой сервис "Яндекс.Народ"
+  * gnupg plugin (v0.3.4): теперь используется основная иконка плагина размером 16x16
+  * translate plugin: теперь используется новый плагинный интерфейс ChatTabAccessor
+  * juick plugin (v0.11.4): изменения в интерфейсе плагинов
+  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.179)
+    https://github.com/psi-plus/psi-plus-l10n
+  --
+  ! [upstream commit] psi: added Webkit support from Psi+ (support for adium themes inside)
+  * [upstream commit] psi: improved dialog for setting MUC topic
+  + [upstream commit] psi: added receipts support to ui
+  * [upstream commit] psi: updated iconset to support message icons
+  * [upstream commit] psi: fix for proxy
+  + [upstream commit] psi: add typing icon
+  * [upstream commit] psi: fix for growlnotifier
+  * [upstream commit] psi: case insensitive read of adium theme files
+  + [upstream commit] psi: retina displays support
+  + [upstream commit] psi: basic support for adium messageClasses
+  + [upstream commit] psi: added new_classic psi theme (with avatars). slotted scrollUp/Down
+  * [upstream commit] iris: don't show filetransfer features in disco if filetransfer disabled
+  * [upstream commit] iris: make all ByteStream based classes. fixes bug in s5b file transfer
+  * added Xabber detection (psi-client-icons.diff, fingerprint.jisp)
+  + added new patch for some improvments for contactlist repaiting
+    (some-improvments-for-contactlist-repaiting.diff)
+  - removed psi-webkit.diff, psi-muc-topic.diff and psi-receipts.diff patches -> went to upstream
+  * fixed psi-fix-pep-retraction.diff patch
+  * small improvement for psi-extend-plugins-interface.diff patch
+  * typing icon went to upstream (psi-iconsets.diff)
+  * better jTalk and Xabber client icons (from vados)
+    [iconsets/clients/fingerprint.jisp, fingerprint-22.jisp]
+  * moved 'theme_title_texture.png' icon to upstream (psi-iconsets.diff)
+  * updated psi-extend-plugins-interface.diff patch: added plugin icon. added new function icon to
+    PsiPlugin. also added that icon to plugins combobox
+  + added new patch for fix tooltip avatar on privates in main roster
+    (psi-fix-tooltip-avatar-on-privates-in-main-roster.diff)
+  * grayscale icons for disabled plugins in plugins combobox (psi-extend-plugins-interface.diff)
+  * added plugin interfaces for chat tabs and groupchat tabs, merged ChatTabAccessor and
+    GCTabAccessor (psi-extend-plugins-interface.diff)
+  * juick plugin: try to fix out of screen long links
+  + content downloader plugin: added 'Nimbuzz' emoticons (Nimbuzz22.jisp)
+  + content downloader plugin: added 'Android 4 blue' emoticons (Android4blue.jisp)
+  * content downloader plugin (v0.2.3): clickable links in iconpack description
+  * watcher plugin (v0.4.2): fix with jid checking for deleting from watcher list
+  * watcher plugin (v0.4.3):
+    + added Watch for JID button on chat toolbar
+    * new icon for Watch for JID button
+    * first column in settings now uses for enable/disable rule
+    + added setting to show/hide Watch for JID buttons
+  + added plugin icon for all Psi+ Plugins
+  - removed yandex narod plugin
+  * gnupg plugin (v0.3.4): use 16x16 image for plugin icon
+  * translate plugin: use new plugin interface ChatTabAccessor, tabify sources
+  * juick plugin (v0.11.4): changes in plugin interface
+  ! updated translations to v0.16.179 (https://github.com/psi-plus/psi-plus-l10n)
+
+
+2013-07-28  zet
+v0.16.150
+  * [коммит в upstream] psi: оптимизация кода в HistoryDlg::displayResult
+  * [коммит в upstream] psi: исправлено описание OS в system info. актуально только для *nix-систем,
+    в которых не установлен lsb_release
+  * [коммит в upstream] psi: добавлено определение OS RFRemix в методе unixHeuristicDetect().
+    актуально только для *nix-систем, в которых не установлен lsb_release
+  * [коммит в upstream] psi: обновлён psi.desktop
+  * [коммит в upstream] psi: добавлено несколько патчей от команды Kopete
+  * [коммит в upstream] psi: PongServer перемещён в iris
+  * [коммит в upstream] psi: добавлена поддержка XEP-0264: File Transfer Thumbnails
+  * [коммит в upstream] psi: исправлено поведение при двойном щелчке на элементе ростера для KDE.
+    оригинальный патч от Petr Gregor
+  * [коммит в upstream] psi: новые всплывающие окна (патч от команды Psi+): добавлена поддержка
+    dbus-popups, в настройках приложения добавлена новая вкладка с настройками всплывающих окон,
+    добавлена поддержка аватаров во всплывающих окнах и много других улучшений и исправлений
+  * [коммит в upstream] iris: добавлена поддержка XEP-0184 v1.2 (спасибо команде Kopete)
+  * [коммит в upstream] iris: добавлена поддержка XEP-0199 (urn:xmpp:ping)
+  ! [коммит в upstream] iris: теперь в комплекте нет libidn
+  * [коммит в upstream] iris: много фиксов от команд Kadu и Kopete
+  * [коммит в upstream] iris: добавлена поддержка XEP-0264: File Transfer Thumbnails
+  * [коммит в upstream] iris: возвращена поддержка уведомлений о доставке сообщений старого образца
+  * небольшие исправления в патче small fix for psi-presets-in-status-menu.diff
+  - убран патч psi-rfremix-sysinfo.diff -> принят в upstream
+  * обновлён патч psiplus-application-info.diff: небольшой фикс для psi.desktop
+  * плагинная система: стабилизация про поиске контактов в аккаунтах
+    (psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
+  * реализован метод findOnlieAccountForContact (требуется тестирование)
+    [psi-extend-plugins-interface.diff]
+  * исправлен патч psi-chatview-quote-feature.diff
+  * добавлено определение клиента Google Hangouts (psi-client-icons.diff)
+  * обновлён патч psi-receipts.diff для поддержки нового API
+  * небольшие фиксы для классической темы webkit (psi-webkit.diff, psi-receipts.diff)
+  * исправления в способах соединения для Mac OS X (psi-webkit.diff)
+  * webkit: убраны лишние пробелы и переносы строк при копирование текста (psi-webkit.diff)
+  * webkit: исправлен копипаст отдельных иконок (psi-webkit.diff)
+  * webkit: убрана излишняя высота строки для классической темы. не работает с крупными шрифтами
+    (psi-webkit.diff)
+  - убран патч psi-KDEfix-doubleclick-on-roster.diff -> принят в upstream
+  - убран патч psi-extend-popups.diff -> убран в upstream
+  * gnupg plugin (v0.3.1): добавлен диалог подтверждения при удалении ключа/ключей
+  * gnupg plugin (v0.3.2): косметические фиксы в окне диалога создания ключевой пары
+  * gnupg plugin (v0.3.3): улучшен алгоритм поиска gpg бинарника, иконка критической ошибки в окне
+    информации в случае ошибки
+  ! в состав дистрибутива включён новый необходимый компонент - библиотеки LibIDN, v1.28
+    (взяты отсюда http://ftp.gnu.org/gnu/libidn/libidn-1.28-win32.zip)
+  ! обновлена системная библиотека Zlib, v1.2.8 (скомпилировано в MinGW из исходников, взятых
+    отсюда http://zlib.net/zlib-1.2.8.tar.gz)
+  ! пропатчены и скомпилированы заново библиотеки QCA (патч взят отсюда
+    http://websvn.kde.org/?view=revision&revision=1357590)
+  ! обновлены системные библиотеки Qt, v4.8.5 (включая QtWebKit4.dll),
+    подробнее - http://blog.qt.digia.com/blog/2013/07/02/qt-4-8-5-released/
+  --
+  * [upstream commit] psi: code optimization in HistoryDlg::displayResult
+  * [upstream commit] psi: fixed OS description in system info. affects only *nix systems where
+    lsb_release is not installed
+  * [upstream commit] psi: added detection of RFRemix into unixHeuristicDetect(). affects only *nix
+    systems where lsb_release is not installed
+  * [upstream commit] psi: updated psi.desktop
+  * [upstream commit] psi: added few patches from kopete
+  * [upstream commit] psi: PongServer moved to iris
+  * [upstream commit] psi: added XEP-0264: File Transfer Thumbnails support
+  * [upstream commit] psi: fixed doubleclick roster items activation for KDE. original patch by
+    Petr Gregor
+  * [upstream commit] psi: new popups. add dbus popups, add new tab at settings, add avatars at
+    popups, many other changes
+  * [upstream commit] iris: XEP-0184 v1.2 implementation (thanks to kopete team)
+  * [upstream commit] iris: don't hide Qt's virtual reset functions (thanks to kopete team)
+  * [upstream commit] iris: added abstract socket access function (thanks to kopete team)
+  * [upstream commit] iris: added XEP-0199 (urn:xmpp:ping) implementation
+  * [upstream commit] iris: handle jabber:x:signed tin message stanzas as well
+    (thanks to kopete team)
+  ! [upstream commit] iris: removed bundled libidn
+  * [upstream commit] iris: more fixes from kadu and kopete
+  * [upstream commit] iris: added XEP-0264: File Transfer Thumbnails support
+  * [upstream commit] iris: now understands a received receipts of the old format
+  * small fix for psi-presets-in-status-menu.diff patch
+  - removed psi-rfremix-sysinfo.diff patch -> went to upstream
+  * updated psiplus-application-info.diff patch. small fix for psi.desktop
+  * plugins: stub for search for contact in accounts
+    (psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
+  * implemented findOnlieAccountForContact. probably buggy a bit (psi-extend-plugins-interface.diff)
+  * fixed psi-chatview-quote-feature.diff patch
+  * updated psi-client-icons.diff patch ("android.com" res)
+  * updated receipts patch to follow new API (psi-receipts.diff)
+  * small fixes to webkit cassic theme (psi-webkit.diff, psi-receipts.diff)
+  * selectionChanged connection commented out on mac (psi-webkit.diff)
+  * webkit: fixed spaces collapse while copying (psi-webkit.diff)
+  * webkit: fixed copypaste of single icon (psi-webkit.diff)
+  * removed line-height from classic theme. doesn't work with big fonts (psi-webkit.diff)
+  - removed psi-KDEfix-doubleclick-on-roster.diff patch -> went to upstream
+  - removed psi-extend-popups.diff -> went to upstream
+  * gnupg plugin: added a confirmation dialog for keys deleting
+  * gnupg plugin: cosmetics in 'A new key pair' dialog
+  * updated gnupg plugin to v0.3.3: improved gpg binary search. error icon in "Info" dialog
+    when error
+  ! added new required Psi+ component - LibIDN binary libs v1.28
+    (based on http://ftp.gnu.org/gnu/libidn/libidn-1.28-win32.zip)
+  ! updated Zlib Libs to v1.2.8 (compiled by MinGW from sources at http://zlib.net/zlib-1.2.8.tar.gz)
+  ! patched Psi+ Crypto Libs (QCA + patch http://websvn.kde.org/?view=revision&revision=1357590)
+  ! updated Qt libs to v4.8.5 (QtWebKit4.dll included)
+
+
+2013-05-01  zet
+v0.16.116
+  * [коммит в upstream] psi: работать с хэшем паролей, если сервер поддерживает аутентификацию SCRAM
+  * [коммит в upstream] psi: найден обходной путь для решения проблемы QTBUG-26351 в диалоге с
+    историей переписки (спасибо taurus)
+  * [коммит в upstream] psi: небольшие исправления в форме редактора аккаунта: улучшения для
+    отображения текста и элементов
+  * [коммит в upstream] iris: установить состояние ReadOnly для SockClient при дисконнекте
+    tcp-соединения (разрешить чтение из буфера)
+  * [коммит в upstream] iris: исправлен сломанный ранее механизм передачи файлов (IBB) после
+    портирования на QIODevice
+  * [коммит в upstream] iris: исправлены ошибки в работе DIGEST-MD5 аутентификации
+  * [коммит в upstream] iris: исправлен текст лицензии в некоторых файлах
+  * обновлена иконка jabber-клиента digsby
+  * обновлены иконки для клиента leechcraft-azoth
+  * обновлён патч psi-client-icons.diff для поддержки свежих иконок клиентов
+  * обновлены наборы иконок для отображения jabber-клиентов в ростере Psi+
+    (fingerprint.jisp, fingerprint-22.jisp)
+  * исправлена ошибка при открытии чата по правой кнопке мыши на контакте в случае использования
+    открытия чата по одиночному клику (psi-KDEfix-doubleclick-on-roster.diff)
+  - убран патч qca_qt5.patch -> принят в upstream
+    http://websvn.kde.org/?view=revision&revision=1347515
+  * исправлен показ версии для Mac OS X 10.8 (patches/mac/3060-psi-update-mac-versions.diff)
+  * новый механизм определения версии для Mac OS (patches/mac/3060-psi-update-mac-versions.diff)
+  - убран патч psi-history-dlg-fix-keyboard.diff -> принят в upstream
+  * обновлён gnupg plugin до версии 0.3.0: добавлена функция автоимпорта ключа из тела сообщения, в
+    панель инструментов чата добавлена кнопка отправки публичного ключа, в диалоге генерации
+    ключевой пары по умолчанию срок действия ключа 1 год. подробнее -
+    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
+  + добавлена персидская локализация Psi+ (translations/psi_fa.qm)
+  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.115)
+    https://github.com/psi-plus/psi-plus-l10n
+  --
+  * [upstream commit] psi: salted hash passwords when scram is available
+  * [upstream commit] psi: get rid of couple compilation warnings
+  * [upstream commit] psi: disabled 822 encoding/decoding since jids are already passed stringprep
+    and double encoding/decoding breaks jids. probably bad solution
+  * [upstream commit] psi: workaround for QTBUG-26351 in history dialog (thx: taurus)
+  * [upstream commit] psi: small fixes in Account Properties Dialog: improved text and layouts of
+    elements
+  * [upstream commit] iris: set ReadOnly state for SockClient on tcp disconnect (allow read from
+    buffer)
+  * [upstream commit] iris: fixed IBB regression after portig to QIODevice
+  * [upstream commit] iris: no qca-static anymore
+  * [upstream commit] iris: fixed regression in DIGEST-MD5 auth
+  * [upstream commit] iris: fix license descriptions
+  * updated digsby client icon
+  * updated leechcraft-azoth clients icon
+  * updated psi-client-icons.diff patch
+  * updated 'fingerprint.jisp' and 'fingerprint-22.jisp' clients iconsets
+  * fix opening chat on rightclick on contact when use singlclick option is enabled
+    (psi-KDEfix-doubleclick-on-roster.diff)
+  - removed qca_qt5.patch -> went to upstream http://websvn.kde.org/?view=revision&revision=1347515
+  * corrected OS X 10.8 version (patches/mac/3060-psi-update-mac-versions.diff)
+  * a new approach to get Mac OS VERSION (patches/mac/3060-psi-update-mac-versions.diff)
+  - removed psi-history-dlg-fix-keyboard.diff patch -> went to upstream
+  * updated gnupg plugin auto import function: button to send publik key on chat toolbar, expiration
+    data in an year by default
+  * updated gnupg plugin: do not handle incoming stanza if plugin is disabled
+  + added persian translation (translations/psi_fa.qm)
+  ! updated translations to version 0.16.115 (https://github.com/psi-plus/psi-plus-l10n)
+
+
+2013-03-17  zet
+v0.16.105
+  * [коммит в upstream] psi: небольшой фикс для filetunecontroller
+  * [коммит в upstream] psi: фикс xhtml-im formatting
+  * [коммит в upstream] psi: фиксы для совместимости с Qt5
+  * [коммит в upstream] psi: частичная поддержка mediaelement + фиксы совместимости с Qt4
+  * [коммит в upstream] psi: обновлён год в диалоге Меню -> Справка -> О программе
+  * [коммит в upstream] psi: добавлено корректное определение MS Windows 8
+  * [коммит в upstream] psi: исправления багов при переименовании профиля
+  * [коммит в upstream] iris: фиксы для совместимости с Qt5
+  * [коммит в upstream] iris: исправлены ошибки для поддержки socks proxy
+  * [коммит в upstream] iris: некоторые фиксы в s5b
+  * [коммит в upstream] libpsi: фиксы для совместимости с Qt5
+  * [коммит в upstream] libpsi: исправлена сломанная ранее совместимость с Qt4
+  * изменён алгоритм раскраски ников в конференциях (psi-muc-nick-hash-color.diff)
+  - убран патч psi-filetunecontroller-fix.diff -> принят в upstream
+  * возврат к прежнему алгоритму winamptunecontroller (из upstream) [psi-fix-tunes.diff]
+  + добавлен новый патч psi-fix-display-status-icon.diff
+  + добавлен новый патч psi-fix-showing-xml-chars-in-contacts-popup.diff
+  * исправлен патч psi-small-tooltip-fix.diff
+  + добавлен новый патч psi-fix-transports-group.diff
+  * фиксы в патче psi-modern-roster.diff
+  - убран патч fix-showing-xml-chars-in-contacts-popup.diff -> принят в upstream
+  * часть патча psi-send-xhtml-im.diff принята в upstream
+  - убран патч psi-data-forms-media-element.diff -> принят в upstream
+  * обновлён состав команды Psi+ (Меню -> Справка -> О программе -> О Psi+) [psiplus-aboutdlg.diff]
+  * решена задача 532 (http://code.google.com/p/psi-dev/issues/detail?id=532)
+    [psi-autostart-pgp.diff]
+  * обновлён патч psi-one-chat-for-many-resources.diff: исправлено отображение xml-символов в SysMsg
+  * исправлена ошибочная опция в options/macosx.xml (psi-extend-popups.diff)
+  * обновлён патч psi-muc-and-user-topic-context-menu.diff: добавлена команда Copy user JID для меню
+    на списке ресурсов в окне чата
+  + добавлен новый патч для вызова выпадающего списка с известными stun-серверами в редакторе
+    аккаунта (psi-stun-hosts-combobox.diff)
+  * показывать команду Copy user JID только для пользователей с реальными JID
+    (psi-muc-and-user-topic-context-menu.diff)
+  + добавлен новый патч fix-showing-xml-chars-in-group-popup.diff
+  * исправления в патче psi-fix-transports-group.diff
+  + добавлен новый патч для устранения утечки памяти (psi-fix-memory-leaks.diff)
+  * небольшие фиксы в патчах psi-always-visible-contacts.diff и psi-presets-in-status-menu.diff
+  + добавлен новый патч для исправления вызова элементов ростера по двойному клику в KDE. автор
+    патча - Petr Gregor (psi-KDEfix-doubleclick-on-roster.diff)
+  + добавлен новый патч для поддержки нового дистрибутива семейства Linux в systeminfo
+    (psi-rfremix-sysinfo.diff)
+  + добавлен новый патч psi-switch-tab-on-new-message.diff
+  * корректная работа с изменяемыми полями в редакторе закладок
+    (psi-muc-bookmark-toolbar-button.diff)
+  * корректировка в написании команды в меню цитирования в окне чата
+    (psi-chatview-quote-feature.diff)
+  * обновлён client switcher plugin (v0.0.16)
+  * обновлён screenshot plugin (v0.6.4)
+  + добавлен новый плагин -- GnuPG Key Manager (v0.2.1), подробнее -
+    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
+  * фикс в коде icq die plugin (v0.1.5)
+  ! обновлены системные библиотеки Qt до версии 4.8.4
+    (http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/)
+  ! обновлены библиотеки OpenSSL до версии 1.0.1e (http://www.openssl.org/news/changelog.html)
+  ! перекомпилирована библиотека Zlib (v1.2.7)
+  ! добавлены новые и обновлены существующие файлы локализации для поддержки различных языков в Psi+
+    (версия локализации 0.16.103.1) [https://github.com/psi-plus/psi-plus-l10n]
+  --
+  * [upstream commit] psi: small fix for filetunecontroller
+  * [upstream commit] psi: some escaping at contacts tooltip
+  * [upstream commit] psi: fix xhtml-im formatting
+  * [upstream commit] psi: Qt5 compatibility fixes
+  * [upstream commit] psi: incomplete support for mediaelement + Qt4 compat fixes
+  * [upstream commit] psi: update years in dialog about program
+  * [upstream commit] psi: add correct checks of MS Windows 8 in SystemInfo
+  * [upstream commit] psi: fix profile renaming
+  * [upstream commit] iris: Qt5 compatibility fixes
+  * [upstream commit] iris: use QIODevice as base class for ByteStream. started some work on
+    NetworkAccessManager. added partial support for mediaelement
+  * [upstream commit] iris: NAM in progress. dropped idea with socket factory
+  * [upstream commit] iris: fixed socks proxy support
+  * [upstream commit] iris: fixed double memory free in StunTransactionPool destructor
+  * [upstream commit] iris: the previous fix for double free was wrong. so here is another fix
+  * [upstream commit] iris: fixed regression in http proxy handling code
+  * [upstream commit] iris: a try to fix socks regression after porting to qiodevice
+  * [upstream commit] iris: more s5b fixes
+  * [upstream commit] libpsi: Qt5 compatibility fixes
+  * [upstream commit] libpsi: fixed broken Qt4 compatibility
+  * [upstream commit] libpsi: use PWD for x11info in *.pri
+  * [upstream commit] libpsi: added forgotten license to x11info.* files
+  * [upstream commit] libpsi: partial rollback of x11 global shortcut manager code
+  * changed nick hashing algo (psi-muc-nick-hash-color.diff)
+  - removed psi-filetunecontroller-fix.diff patch -> went to upstream
+  * new winamptunecontroller moved to dev. reverted winamptunecontroller from upstream
+    (psi-fix-tunes.diff)
+  + added new psi-fix-display-status-icon.diff patch
+  + added new psi-fix-showing-xml-chars-in-contacts-popup.diff patch
+  * fixed psi-small-tooltip-fix.diff patch
+  + added new psi-fix-transports-group.diff patch
+  * removed extra comma from psi-modern-roster.diff patch
+  - removed psi-fix-showing-xml-chars-in-contacts-popup.diff patch -> went to upstream
+  * part of psi-send-xhtml-im.diff patch went to upstream
+  - removed psi-data-forms-media-element.diff patch -> went to upstream
+  * updated Psi+ about dialog (psiplus-aboutdlg.diff)
+  * fixed issue 532 (http://code.google.com/p/psi-dev/issues/detail?id=532) [psi-autostart-pgp.diff]
+  * updated psi-one-chat-for-many-resources.diff patch. fixed showing xml chars in SysMsg
+  * fixed invalid options/macosx.xml (psi-extend-popups.diff)
+  * updated psi-muc-and-user-topic-context-menu.diff patch: added Copy user JID from user JID
+    context menu
+  + added new psi-stun-hosts-combobox.diff patch
+  * show copy user JID only for normal users (psi-muc-and-user-topic-context-menu.diff)
+  + added new fix-showing-xml-chars-in-group-popup.diff patch
+  * fixed psi-fix-transports-group.diff patch
+  + added new psi-fix-memory-leaks.diff patch
+  * small fix for psi-always-visible-contacts.diff patch
+  * small fix for psi-presets-in-status-menu.diff patch
+  + added new patch for fix activation roster items by doubleclick on KDE. patch by Petr Gregor
+    (psi-KDEfix-doubleclick-on-roster.diff)
+  + added new patch for support new Linux distro in systeminfo (psi-rfremix-sysinfo.diff)
+  + added new psi-switch-tab-on-new-message.diff patch
+  * must be Edit Bookmark (psi-muc-bookmark-toolbar-button.diff)
+  * corrected English grammitcs (psi-chatview-quote-feature.diff)
+  * updated client switcher plugin (v0.0.16)
+  * updated screenshot plugin (v0.6.4)
+  + added new plugin -- GnuPG Key Manager (v0.2.1),
+    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
+  * fixed icq die plugin (v0.1.5)
+  ! updated Qt libs to version 4.8.4 (http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/)
+  ! updated OpenSSL libs to version 1.0.1e (http://www.openssl.org/news/changelog.html)
+  ! recompiled windows zlib (v1.2.7)
+  ! updated translations to version 0.16.103.1 (https://github.com/psi-plus/psi-plus-l10n)
+
+
+2012-10-28  zet
 v0.16.25
   * улучшения в патче psi-autostart-pgp.diff: запрет автоматического включения PGP для чата, если
     PGP был включён/отключён вручную

psi-plus-main-20130107.tar.xz/iconsets/clients/default/android.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/android.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/antihack-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/arabic-fake.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/asterisk.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/asterisk.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bayanicq.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bayanicq.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/beem.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bitlbee.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bitlbee.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/blacksmith-bot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bluejabb.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bluejabb.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombus-avalon-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombus-avalon.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombus-avalon.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombus-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombus.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombus.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusklub.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombuslime.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusmod-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombusng-md.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusng-md.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombusng.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusng.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombuspl.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombuspl.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombusplus.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusplus.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusqd-ng.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bombusqd.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bombusqd.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/bot.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/bot.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/capsula-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/chatopus.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/climm.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/coccinella.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/coccinella.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/cudumar.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/emclient.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/emess-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/emess.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/emess.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/erlim.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/exodus.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/exodus.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/fatal-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/fj.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/freeswitch.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/freize.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/freo.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/freq-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/freqbot-old.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gamebot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gamebot2.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gloox.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gmail.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gtalk-android.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/gtalk.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/habahaba.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/hipchat.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/historian-bot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/icondef.xml -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/icondef.xml Changed

@@ -2,24 +2,20 @@
 <icondef>                                                         
         <meta>                                                    
                 <name>Psi+ Fingerprint - size 16</name>
-                <version>0.3.10</version>
-                <creation>2011-06-26</creation>
+                <version>0.4.1</version>
+                <creation>2014-05-02</creation>
                 <home>http://psi-dev.googlecode.com/</home>
                 <author email='maksim.maj@gmail.com'>maj</author>
                 <author email='vladimir.shelukhin@gmail.com'>zet</author>
-                <description>Icons number: 172
+                <description>Icons number: 260
 
-Based on Fingeprint Plus plugin
-for Miranda IM by Angeli-Ka
+Based on Fingeprint Plus plugin for Miranda IM by Angeli-Ka
 http://angeli-ka.my1.ru/
 http://miranda-im.org/
 
-Additional icons were taken from
-http://qipim.cz/viewtopic.php?t=2123
+Additional icons from http://qipim.cz/viewtopic.php?t=2123
 
-Thanks to all authors of iconpacks
-and members of
-psi-dev@conference.jabber.ru</description>
+Thanks to ALL iconpacks authors and xmpp:psi-dev@conference.jabber.ru members</description>
            </meta>
 
         <icon>
@@ -58,6 +54,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/antihack-bot</x>
+                <object mime='image/png'>antihack-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/apple</x>
                 <object mime='image/png'>apple.png</object>
         </icon>
@@ -68,6 +69,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/arabic-fake</x>
+                <object mime='image/png'>arabic-fake.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/asterisk</x>
                 <object mime='image/png'>asterisk.png</object>
         </icon>
@@ -93,8 +99,8 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/bluejabb</x>
-                <object mime='image/png'>bluejabb.png</object>
+                <x xmlns='name'>clients/beem</x>
+                <object mime='image/png'>beem.png</object>
         </icon>
 
         <icon>
@@ -103,13 +109,13 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/bombus-avalon</x>
-                <object mime='image/png'>bombus-avalon.png</object>
+                <x xmlns='name'>clients/blacksmith-bot</x>
+                <object mime='image/png'>blacksmith-bot.png</object>
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/bombus-klub</x>
-                <object mime='image/png'>bombus-klub.png</object>
+                <x xmlns='name'>clients/bluejabb</x>
+                <object mime='image/png'>bluejabb.png</object>
         </icon>
 
         <icon>
@@ -118,8 +124,28 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/bombus</x>
-                <object mime='image/png'>bombus.png</object>
+                <x xmlns='name'>clients/bombus-avalon</x>
+                <object mime='image/png'>bombus-avalon.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/bombus-avalon-old</x>
+                <object mime='image/png'>bombus-avalon-old.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/bombusklub</x>
+                <object mime='image/png'>bombusklub.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/bombus-klub</x>
+                <object mime='image/png'>bombus-klub.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/bombuslime</x>
+                <object mime='image/png'>bombuslime.png</object>
         </icon>
 
         <icon>
@@ -128,8 +154,8 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/bombusng-md</x>
-                <object mime='image/png'>bombusng-md.png</object>
+                <x xmlns='name'>clients/bombusmod-old</x>
+                <object mime='image/png'>bombusmod-old.png</object>
         </icon>
 
         <icon>
@@ -138,6 +164,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/bombusng-md</x>
+                <object mime='image/png'>bombusng-md.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/bombus-old</x>
+                <object mime='image/png'>bombus-old.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/bombuspl.png</x>
                 <object mime='image/png'>bombuspl.png</object>
         </icon>
@@ -153,6 +189,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/bombusqd-ng</x>
+                <object mime='image/png'>bombusqd-ng.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/bot</x>
                 <object mime='image/png'>bot.png</object>
         </icon>
@@ -163,6 +204,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/capsula-bot</x>
+                <object mime='image/png'>capsula-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/centericq</x>
                 <object mime='image/png'>centericq.png</object>
         </icon>
@@ -173,11 +219,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/chatopus</x>
+                <object mime='image/png'>chatopus.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/citron</x>
                 <object mime='image/png'>citron.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/climm</x>
+                <object mime='image/png'>climm.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/coccinella</x>
                 <object mime='image/png'>coccinella.png</object>
         </icon>
@@ -193,6 +249,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/cudumar</x>
+                <object mime='image/png'>cudumar.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/dichat</x>
                 <object mime='image/png'>dichat.png</object>
         </icon>
@@ -218,21 +279,71 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/emclient</x>
+                <object mime='image/png'>emclient.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/emess</x>
                 <object mime='image/png'>emess.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/emess-old</x>
+                <object mime='image/png'>emess-old.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/erlim</x>
+                <object mime='image/png'>erlim.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/exodus</x>
                 <object mime='image/png'>exodus.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/fatal-bot</x>
+                <object mime='image/png'>fatal-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/fj</x>
+                <object mime='image/png'>fj.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/freeswitch</x>
+                <object mime='image/png'>freeswitch.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/freize</x>
+                <object mime='image/png'>freize.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/freo</x>
+                <object mime='image/png'>freo.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/freqbot</x>
                 <object mime='image/png'>freqbot.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/freq-bot</x>
+                <object mime='image/png'>freq-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/freqbot-old</x>
+                <object mime='image/png'>freqbot-old.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/fring</x>
                 <object mime='image/png'>fring.png</object>
         </icon>
@@ -258,6 +369,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/gamebot</x>
+                <object mime='image/png'>gamebot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/gamebot2</x>
+                <object mime='image/png'>gamebot2.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/gismeteo</x>
                 <object mime='image/png'>gismeteo.png</object>
         </icon>
@@ -268,6 +389,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/gloox</x>
+                <object mime='image/png'>gloox.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/glu</x>
                 <object mime='image/png'>glu.png</object>
         </icon>
@@ -278,6 +404,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/gmail</x>
+                <object mime='image/png'>gmail.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/goim</x>
                 <object mime='image/png'>goim.png</object>
         </icon>
@@ -293,11 +424,36 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/gtalk</x>
+                <object mime='image/png'>gtalk.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/gtalk-android</x>
+                <object mime='image/png'>gtalk-android.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/gush</x>
                 <object mime='image/png'>gush.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/habahaba</x>
+                <object mime='image/png'>habahaba.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/hipchat</x>
+                <object mime='image/png'>hipchat.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/historian-bot</x>
+                <object mime='image/png'>historian-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/ichabber</x>
                 <object mime='image/png'>ichabber.png</object>
         </icon>
@@ -318,6 +474,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/imformer-bot</x>
+                <object mime='image/png'>imformer-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/imov</x>
                 <object mime='image/png'>imov.png</object>
         </icon>
@@ -348,8 +509,18 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/jabbroid</x>
-                <object mime='image/png'>jabbroid.png</object>
+                <x xmlns='name'>clients/jabber</x>
+                <object mime='image/png'>jabber.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/jabber2</x>
+                <object mime='image/png'>jabber2.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/jabber-popov</x>
+                <object mime='image/png'>jabber-popov.png</object>
         </icon>
 
         <icon>
@@ -358,11 +529,16 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/jabbin</x>
+                <x xmlns='name'>clients/jabbin.el</x>
                 <object mime='image/png'>jabbin.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jabbroid</x>
+                <object mime='image/png'>jabbroid.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jabiru</x>
                 <object mime='image/png'>jabiru.png</object>
         </icon>
@@ -373,6 +549,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jamebot</x>
+                <object mime='image/png'>jamebot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jappix</x>
                 <object mime='image/png'>jappix.png</object>
         </icon>
@@ -383,6 +564,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jasmine</x>
+                <object mime='image/png'>jasmine.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jbother</x>
                 <object mime='image/png'>jbother.png</object>
         </icon>
@@ -403,6 +589,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jimm-android</x>
+                <object mime='image/png'>jimm-android.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jimm-aspro</x>
                 <object mime='image/png'>jimm-aspro.png</object>
         </icon>
@@ -413,11 +604,26 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jitsi</x>
+                <object mime='image/png'>jitsi.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jmiranda</x>
                 <object mime='image/png'>jmiranda.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/jtalk</x>
+                <object mime='image/png'>jtalk.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/jtalkmod</x>
+                <object mime='image/png'>jtalkmod.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/jubo</x>
                 <object mime='image/png'>jubo.png</object>
         </icon>
@@ -428,6 +634,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/juick-bot</x>
+                <object mime='image/png'>juick-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/kadu</x>
                 <object mime='image/png'>kadu.png</object>
         </icon>
@@ -448,6 +659,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/leechcraft</x>
+                <object mime='image/png'>leechcraft.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/leechcraft-azoth</x>
                 <object mime='image/png'>leechcraft-azoth.png</object>
         </icon>
@@ -458,6 +674,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/libpurple-old</x>
+                <object mime='image/png'>libpurple-old.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/loudmouth</x>
                 <object mime='image/png'>loudmouth.png</object>
         </icon>
@@ -468,13 +689,18 @@
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/mail.google.com</x>
-                <object mime='image/png'>mail.google.com.png</object>
+                <x xmlns='name'>clients/m-agent</x>
+                <object mime='image/png'>m-agent.png</object>
         </icon>
 
         <icon>
-                <x xmlns='name'>clients/mailruagent</x>
-                <object mime='image/png'>mailruagent.png</object>
+                <x xmlns='name'>clients/magnet2-bot</x>
+                <object mime='image/png'>magnet2-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/mail.google.com</x>
+                <object mime='image/png'>mail.google.com.png</object>
         </icon>
 
         <icon>
@@ -483,11 +709,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/mailruagent</x>
+                <object mime='image/png'>mailruagent.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/mailruagent.sis</x>
                 <object mime='image/png'>mailruagent.sis.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/mandarin</x>
+                <object mime='image/png'>mandarin.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/mcabber</x>
                 <object mime='image/png'>mcabber.png</object>
         </icon>
@@ -503,11 +739,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/meegim</x>
+                <object mime='image/png'>meegim.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/meetro</x>
                 <object mime='image/png'>meetro.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/megafon</x>
+                <object mime='image/png'>megafon.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/mig33</x>
                 <object mime='image/png'>mig33.png</object>
         </icon>
@@ -528,6 +774,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/miranda-ng</x>
+                <object mime='image/png'>miranda-ng.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/monal</x>
+                <object mime='image/png'>monal.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/morange</x>
                 <object mime='image/png'>morange.png</object>
         </icon>
@@ -548,11 +804,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/mundu</x>
+                <object mime='image/png'>mundu.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/naticq</x>
                 <object mime='image/png'>naticq.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/nekbot</x>
+                <object mime='image/png'>nekbot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/nicq</x>
                 <object mime='image/png'>nicq.png</object>
         </icon>
@@ -573,6 +839,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/oneim</x>
+                <object mime='image/png'>oneim.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/oneteam</x>
                 <object mime='image/png'>oneteam.png</object>
         </icon>
@@ -583,11 +854,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/oneteam-iphone</x>
+                <object mime='image/png'>oneteam-iphone.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/osiris</x>
                 <object mime='image/png'>osiris.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/osiris-bot</x>
+                <object mime='image/png'>osiris-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/ovi-chat</x>
                 <object mime='image/png'>ovi-chat.png</object>
         </icon>
@@ -623,6 +904,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/poezio</x>
+                <object mime='image/png'>poezio.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/psi</x>
                 <object mime='image/png'>psi.png</object>
         </icon>
@@ -643,6 +929,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/qip</x>
+                <object mime='image/png'>qip.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/qip2010</x>
+                <object mime='image/png'>qip2010.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/qipinfium</x>
                 <object mime='image/png'>qipinfium.png</object>
         </icon>
@@ -653,11 +949,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/qip-mobile</x>
+                <object mime='image/png'>qip-mobile.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/qippda</x>
                 <object mime='image/png'>qippda.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/qip-pda</x>
+                <object mime='image/png'>qip-pda.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/qnext</x>
                 <object mime='image/png'>qnext.png</object>
         </icon>
@@ -668,21 +974,46 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/quizer-bot</x>
+                <object mime='image/png'>quizer-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/qutim</x>
                 <object mime='image/png'>qutim.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/qutim-old</x>
+                <object mime='image/png'>qutim-old.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/radio-t</x>
                 <object mime='image/png'>radio-t.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/rankoid-bot</x>
+                <object mime='image/png'>rankoid-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/riddim</x>
+                <object mime='image/png'>riddim.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/rnq</x>
                 <object mime='image/png'>rnq.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/robot</x>
+                <object mime='image/png'>robot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/rq</x>
                 <object mime='image/png'>rq.png</object>
         </icon>
@@ -703,6 +1034,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/sawim</x>
+                <object mime='image/png'>sawim.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/security-bot</x>
+                <object mime='image/png'>security-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/shield-bot</x>
+                <object mime='image/png'>shield-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/siejc</x>
                 <object mime='image/png'>siejc.png</object>
         </icon>
@@ -723,6 +1069,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/smack</x>
+                <object mime='image/png'>smack.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/smack-api</x>
                 <object mime='image/png'>smack-api.png</object>
         </icon>
@@ -733,6 +1084,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/snapi-snup-bot</x>
+                <object mime='image/png'>snapi-snup-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/sonic-revolution</x>
+                <object mime='image/png'>sonic-revolution.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/spark</x>
                 <object mime='image/png'>spark.png</object>
         </icon>
@@ -753,6 +1114,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/talisman-bot</x>
+                <object mime='image/png'>talisman-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/talisman-bot2</x>
+                <object mime='image/png'>talisman-bot2.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/talk.google.com</x>
                 <object mime='image/png'>talk.google.com.png</object>
         </icon>
@@ -773,6 +1144,16 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/telepathy</x>
+                <object mime='image/png'>telepathy.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/tigase</x>
+                <object mime='image/png'>tigase.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/tipicim</x>
                 <object mime='image/png'>tipicim.png</object>
         </icon>
@@ -803,16 +1184,36 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/ultimate-bot</x>
+                <object mime='image/png'>ultimate-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/unknown</x>
                 <object mime='image/png'>unknown.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/utah-bot</x>
+                <object mime='image/png'>utah-bot.png</object>
+        </icon>
+
+        <icon>
+                <x xmlns='name'>clients/utalk</x>
+                <object mime='image/png'>utalk.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/vacuum</x>
                 <object mime='image/png'>vacuum.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/verse</x>
+                <object mime='image/png'>verse.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/vkontakte</x>
                 <object mime='image/png'>vkontakte.png</object>
         </icon>
@@ -833,6 +1234,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/webclient</x>
+                <object mime='image/png'>webclient.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/webicq</x>
                 <object mime='image/png'>webicq.png</object>
         </icon>
@@ -843,11 +1249,21 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/wod-xmpp</x>
+                <object mime='image/png'>wod-xmpp.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/wtw</x>
                 <object mime='image/png'>wtw.png</object>
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/xabber</x>
+                <object mime='image/png'>xabber.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/xeus</x>
                 <object mime='image/png'>xeus.png</object>
         </icon>
@@ -858,6 +1274,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/xu6-bot</x>
+                <object mime='image/png'>xu6-bot.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/yabber</x>
                 <object mime='image/png'>yabber.png</object>
         </icon>
@@ -868,6 +1289,11 @@
         </icon>
 
         <icon>
+                <x xmlns='name'>clients/yandex-webchat</x>
+                <object mime='image/png'>yandex-webchat.png</object>
+        </icon>
+
+        <icon>
                 <x xmlns='name'>clients/yaonline</x>
                 <object mime='image/png'>yaonline.png</object>
         </icon>
@@ -887,4 +1313,9 @@
                 <object mime='image/png'>yapp.png</object>
         </icon>
 
+        <icon>
+                <x xmlns='name'>clients/zeus-bot</x>
+                <object mime='image/png'>zeus-bot.png</object>
+        </icon>
+
 </icondef>

psi-plus-main-20130107.tar.xz/iconsets/clients/default/imadering.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/imadering.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/imformer-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jabber-popov.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jabber.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jabber2.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/jabbroid.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/jabbroid.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/jajc.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/jajc.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jamebot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/jappix.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/jappix.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jasmine.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jimm-android.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/jimm-aspro.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/jimm-aspro.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jitsi.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jtalk.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/jtalkmod.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/jubo.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/jubo.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/juick-bot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/juick.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/juick.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/kadu.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/kadu.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/lampiro.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/lampiro.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/leechcraft-azoth.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/leechcraft-azoth.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/leechcraft.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/libpurple-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/libpurple.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/libpurple.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/m-agent.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/magnet2-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/mandarin.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/mcabber.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/mcabber.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/meegim.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/megafon.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/miranda-ng.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/miranda.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/miranda.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/monal.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/mundu.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/nekbot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/omnipresence.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/omnipresence.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/oneim.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/oneteam-iphone.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/oneteam.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/oneteam.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/osiris-bot.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/ovi-chat.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/ovi-chat.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/poezio.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/qip-mobile.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/qip-pda.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/qip.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/qip2010.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/quizer-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/qutim-old.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/qutim.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/qutim.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/rankoid-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/riddim.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/robot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/sawim.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/security-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/shield-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/smack.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/snapi-snup-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/sonic-revolution.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/spectrum.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/spectrum.png Changed

psi-plus-main-20130107.tar.xz/iconsets/clients/default/swift.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/swift.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/talisman-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/talisman-bot2.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/telepathy.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/tigase.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/tkabber.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/tkabber.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/ultimate-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/utah-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/utalk.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/vacuum.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/vacuum.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/verse.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/webclient.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/wod-xmpp.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/wtw.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/wtw.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/xabber.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/xu6-bot.png Added

psi-plus-main-20141106.tar.xz/iconsets/clients/default/yandex-webchat.png Added

psi-plus-main-20130107.tar.xz/iconsets/clients/default/yaonline.png -> psi-plus-main-20141106.tar.xz/iconsets/clients/default/yaonline.png Changed

psi-plus-main-20141106.tar.xz/iconsets/clients/default/zeus-bot.png Added

psi-plus-main-20141106.tar.xz/patches/0010-psi-dont-send-composing-events.diff Added

@@ -0,0 +1,123 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -451,6 +451,7 @@
+ 			<ignore-non-roster-contacts type="bool">false</ignore-non-roster-contacts>
+ 			<send-composing-events type="bool">true</send-composing-events>
+ 			<send-inactivity-events type="bool">false</send-inactivity-events>
++			<dont-send-composing-events type="bool">false</dont-send-composing-events>
+ 		</messages>
+ 		<p2p>
+ 			<bytestreams>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -916,36 +916,38 @@ void ChatDlg::setChatState(ChatState sta
+ 		}
+ 
+ 		// Build event message
+-		Message m(jid());
+-		if (sendComposingEvents_) {
+-			m.setEventId(eventId_);
+-			if (state == XMPP::StateComposing) {
+-				m.addEvent(ComposingEvent);
+-			}
+-			else if (lastChatState_ == XMPP::StateComposing) {
+-				m.addEvent(CancelEvent);
++		if( !PsiOptions::instance()->getOption("options.messages.dont-send-composing-events").toBool() ) {
++			Message m(jid());
++			if (sendComposingEvents_) {
++				m.setEventId(eventId_);
++				if (state == XMPP::StateComposing) {
++					m.addEvent(ComposingEvent);
++				}
++				else if (lastChatState_ == XMPP::StateComposing) {
++					m.addEvent(CancelEvent);
++				}
+ 			}
+-		}
+-		if (contactChatState_ != XMPP::StateNone) {
+-			if (lastChatState_ != XMPP::StateGone) {
+-				if ((state == XMPP::StateInactive && lastChatState_ == XMPP::StateComposing) || (state == XMPP::StateComposing && lastChatState_ == XMPP::StateInactive)) {
+-					// First go to the paused state
+-					Message tm(jid());
+-					m.setType("chat");
+-					m.setChatState(XMPP::StatePaused);
+-					if (account()->isAvailable()) {
+-						account()->dj_sendMessage(m, false);
++			if (contactChatState_ != XMPP::StateNone) {
++				if (lastChatState_ != XMPP::StateGone) {
++					if ((state == XMPP::StateInactive && lastChatState_ == XMPP::StateComposing) || (state == XMPP::StateComposing && lastChatState_ == XMPP::StateInactive)) {
++						// First go to the paused state
++						Message tm(jid());
++						m.setType("chat");
++						m.setChatState(XMPP::StatePaused);
++						if (account()->isAvailable()) {
++							account()->dj_sendMessage(m, false);
++						}
+ 					}
++					m.setChatState(state);
+ 				}
+-				m.setChatState(state);
+ 			}
+-		}
+ 
+-		// Send event message
+-		if (m.containsEvents() || m.chatState() != XMPP::StateNone) {
+-			m.setType("chat");
+-			if (account()->isAvailable()) {
+-				account()->dj_sendMessage(m, false);
++			// Send event message
++			if (m.containsEvents() || m.chatState() != XMPP::StateNone) {
++				m.setType("chat");
++				if (account()->isAvailable()) {
++					account()->dj_sendMessage(m, false);
++				}
+ 			}
+ 		}
+ 
+--- git.orig/src/options/opt_advanced.cpp
++++ git/src/options/opt_advanced.cpp
+@@ -96,7 +96,9 @@ QWidget *OptionsTabAdvanced::widget()
+ 		" like system-wide news on MSN, announcements, etc."));
+ 
+ 	connect(d->ck_messageevents,SIGNAL(toggled(bool)),d->ck_inactiveevents,SLOT(setEnabled(bool)));
++	connect(d->ck_messageevents,SIGNAL(toggled(bool)),d->ck_sendComposingEvents,SLOT(setEnabled(bool)));
+ 	d->ck_inactiveevents->setEnabled(d->ck_messageevents->isChecked());
++	d->ck_sendComposingEvents->setEnabled(d->ck_messageevents->isChecked());
+ 
+ 	return w;
+ }
+@@ -112,6 +114,7 @@ void OptionsTabAdvanced::applyOptions()
+ 	PsiOptions::instance()->setOption("options.messages.send-inactivity-events", d->ck_inactiveevents->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.notifications.request-receipts", d->ck_requestReceipts->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.notifications.send-receipts", d->ck_sendReceipts->isChecked());
++	PsiOptions::instance()->setOption("options.messages.dont-send-composing-events", d->ck_sendComposingEvents->isChecked());
+ 	PsiOptions::instance()->setOption("options.external-control.adhoc-remote-control.enable", d->ck_rc->isChecked());
+ 	if ( SpellChecker::instance()->available() )
+ 		PsiOptions::instance()->setOption("options.ui.spell-check.enabled",d->ck_spell->isChecked());
+@@ -140,6 +143,7 @@ void OptionsTabAdvanced::restoreOptions(
+ 	d->ck_inactiveevents->setChecked( PsiOptions::instance()->getOption("options.messages.send-inactivity-events").toBool() );
+ 	d->ck_requestReceipts->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.request-receipts").toBool() );
+ 	d->ck_sendReceipts->setChecked( PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool() );
++	d->ck_sendComposingEvents->setChecked( PsiOptions::instance()->getOption("options.messages.dont-send-composing-events").toBool() );
+ 	d->ck_rc->setChecked( PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool() );
+ 	if ( !SpellChecker::instance()->available() )
+ 		d->ck_spell->setChecked(false);
+--- git.orig/src/options/opt_advanced.ui
++++ git/src/options/opt_advanced.ui
+@@ -48,6 +48,16 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_sendComposingEvents">
++     <property name="whatsThis">
++      <string>Disables the sending of message events such as &quot;Contact is Typing...&quot;</string>
++     </property>
++     <property name="text">
++      <string>Do not send composing events</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QCheckBox" name="ck_rc" >
+      <property name="text" >
+       <string>Enable remote controlling from other locations</string>

psi-plus-main-20130107.tar.xz/patches/0020-psi-iconsets.diff -> psi-plus-main-20141106.tar.xz/patches/0020-psi-iconsets.diff Changed

@@ -1,83 +1,6 @@
---- git.orig/iconsets.qrc
-+++ git/iconsets.qrc
-@@ -21,6 +21,7 @@
- 		<file>iconsets/roster/default/perr.png</file>
- 		<file>iconsets/roster/default/system.png</file>
- 		<file>iconsets/roster/default/xa.png</file>
-+		<file>iconsets/roster/default/typing.png</file>
- 
- 		<file>iconsets/system/default/account.png</file>
- 		<file>iconsets/system/default/add.png</file>
-@@ -64,7 +65,7 @@
- 		<file>iconsets/system/default/pgp.png</file>
- 		<file>iconsets/system/default/play.png</file>
- 		<file>iconsets/system/default/play_sounds.png</file>
--		<file>iconsets/system/default/psilogo.png</file>
-+		<file>iconsets/system/default/psiplus/psilogo.png</file>
- 		<file>iconsets/system/default/psimain.png</file>
- 		<file>iconsets/system/default/quit.png</file>
- 		<file>iconsets/system/default/register.png</file>
-@@ -90,6 +91,57 @@
- 		<file>iconsets/system/default/vcard.png</file>
- 		<file>iconsets/system/default/xml.png</file>
- 		<file>iconsets/system/default/publish_tune.png</file>
-+		<file>iconsets/system/default/psiplus/activity.png</file>
-+		<file>iconsets/system/default/psiplus/mood.png</file>
-+		<file>iconsets/system/default/psiplus/geolocation.png</file>
-+		<file>iconsets/system/default/psiplus/psiplus_icon.png</file>
-+		<file>iconsets/system/default/psiplus/action_button_send.png</file>
-+		<file>iconsets/system/default/psiplus/action_direct_presence.png</file>
-+		<file>iconsets/system/default/psiplus/action_muc_hide.png</file>
-+		<file>iconsets/system/default/psiplus/action_muc_leave.png</file>
-+		<file>iconsets/system/default/psiplus/action_muc_show.png</file>
-+		<file>iconsets/system/default/psiplus/action_paste_and_send.png</file>
-+		<file>iconsets/system/default/psiplus/action_templates_edit.png</file>
-+		<file>iconsets/system/default/psiplus/action_templates.png</file>
-+		<file>iconsets/system/default/psiplus/action_vcard_restore.png</file>
-+		<file>iconsets/system/default/psiplus/action_vcard_save_as.png</file>
-+		<file>iconsets/system/default/psiplus/advanced.png</file>
-+		<file>iconsets/system/default/psiplus/avcall.png</file>
-+		<file>iconsets/system/default/psiplus/bookmark_add.png</file>
-+		<file>iconsets/system/default/psiplus/bookmark_remove.png</file>
-+		<file>iconsets/system/default/psiplus/bookmarks.png</file>
-+		<file>iconsets/system/default/psiplus/cm_check.png</file>
-+		<file>iconsets/system/default/psiplus/cm_export.png</file>
-+		<file>iconsets/system/default/psiplus/cm_import.png</file>
-+		<file>iconsets/system/default/psiplus/cm_invertcheck.png</file>
-+		<file>iconsets/system/default/psiplus/cm_uncheck.png</file>
-+		<file>iconsets/system/default/psiplus/default_avatar.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_delivery_ok.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_delivery_ok_pgp.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_info.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_receive.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_receive_pgp.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_send.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_send_pgp.png</file>
-+		<file>iconsets/system/default/psiplus/notification_chat_time.png</file>
-+		<file>iconsets/system/default/psiplus/notification_roster_tune.png</file>
-+		<file>iconsets/system/default/psiplus/plugins.png</file>
-+		<file>iconsets/system/default/psiplus/roster_icon.png</file>
-+		<file>iconsets/system/default/psiplus/psiplus_logo.png</file>
-+		<file>iconsets/system/default/psiplus/action_contacts_manager.png</file>
-+		<file>iconsets/system/default/psiplus/enable-groups.png</file>
-+		<file>iconsets/system/default/psiplus/doublenextarrow.png</file>
-+		<file>iconsets/system/default/psiplus/doublebackarrow.png</file>
-+		<file>iconsets/system/default/psiplus/theme_title_texture.png</file>
-+		<file>iconsets/system/default/psiplus/crop.png</file>
-+		<file>iconsets/system/default/psiplus/draw.png</file>
-+		<file>iconsets/system/default/psiplus/frame.png</file>
-+		<file>iconsets/system/default/psiplus/palette.png</file>
-+		<file>iconsets/system/default/psiplus/text.png</file>
-+		<file>iconsets/system/default/psiplus/undo.png</file>
-+		<file>iconsets/system/default/psiplus/print.png</file>
-+		<file>iconsets/system/default/psiplus/autojid.png</file>
-+		<file>iconsets/system/default/psiplus/ignore_global_actions.png</file>
- 		<file>iconsets/system/default/whiteboarding/whiteboard.png</file>
- 		<file>iconsets/system/default/whiteboarding/save.png</file>
- 		<file>iconsets/system/default/whiteboarding/select.png</file>
---- git.orig/iconsets/system/default/icondef.xml
-+++ git/iconsets/system/default/icondef.xml
-@@ -257,7 +257,7 @@
+--- psi.orig/iconsets/system/default/icondef.xml
++++ psi/iconsets/system/default/icondef.xml
+@@ -292,7 +292,7 @@
  
  	<icon>
  		<x xmlns='name'>psi/psiLogo</x>
@@ -86,7 +9,7 @@
  	</icon>
  
  	<icon>
-@@ -498,4 +498,270 @@
+@@ -549,4 +549,230 @@
  		<object mime='image/png'>whiteboarding/ungroup.png</object>
  	</icon>
  	
@@ -97,41 +20,36 @@
 +		<object mime='image/png'>history.png</object>
 +	</icon>
 +    
-+	
++
 +	
 +    <icon>
 +		<x xmlns='name'>system/geolocation</x>
 +		<object mime='image/png'>psiplus/geolocation.png</object>
 +	</icon>
 +    
-+	
++
 +	
 +	<icon>
 +		<x xmlns='name'>mood/</x>
 +		<object mime='image/png'>psiplus/mood.png</object>
 +	</icon>
-+	
++
 +	<icon>
 +		<x xmlns='name'>activities/other</x>
 +		<object mime='image/png'>psiplus/activity.png</object>
 +	</icon>
 +	
-+	
++
 +	
 +	<icon>
 +		<x xmlns='name'>psi/action_templates</x>
 +		<object mime='image/png'>psiplus/action_templates.png</object>
 +	</icon>
-+	
++
 +	<icon>
 +		<x xmlns='name'>psi/action_paste_and_send</x>
 +		<object mime='image/png'>psiplus/action_paste_and_send.png</object>
 +	</icon>
-+	
-+	<icon>
-+		<x xmlns='name'>psi/action_button_send</x>
-+		<object mime='image/png'>psiplus/action_button_send.png</object>
-+    </icon>
 +
 +	<icon>
 +		<x xmlns='name'>psi/action_contacts_manager</x>
@@ -224,36 +142,11 @@
 +	</icon>
 +
 +	<icon>
-+		<x xmlns='name'>psi/default_avatar</x>
-+		<object mime='image/png'>psiplus/default_avatar.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/notification_chat_delivery_ok</x>
-+		<object mime='image/png'>psiplus/notification_chat_delivery_ok.png</object>
-+	</icon>
-+
-+	<icon>
 +		<x xmlns='name'>psi/notification_chat_delivery_ok_pgp</x>
 +		<object mime='image/png'>psiplus/notification_chat_delivery_ok_pgp.png</object>
 +	</icon>
 +
 +	<icon>
-+		<x xmlns='name'>psi/notification_chat_info</x>
-+		<object mime='image/png'>psiplus/notification_chat_info.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/notification_chat_receive</x>
-+		<object mime='image/png'>psiplus/notification_chat_receive.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/notification_chat_send</x>
-+		<object mime='image/png'>psiplus/notification_chat_send.png</object>
-+	</icon>
-+
-+	<icon>
 +		<x xmlns='name'>psi/notification_chat_receive_pgp</x>
 +		<object mime='image/png'>psiplus/notification_chat_receive_pgp.png</object>
 +	</icon>
@@ -264,11 +157,6 @@
 +	</icon>
 +
 +	<icon>
-+		<x xmlns='name'>psi/notification_chat_time</x>
-+		<object mime='image/png'>psiplus/notification_chat_time.png</object>
-+	</icon>
-+
-+	<icon>
 +		<x xmlns='name'>psi/notification_roster_tune</x>
 +		<object mime='image/png'>psiplus/notification_roster_tune.png</object>
 +	</icon>
@@ -287,28 +175,23 @@
 +		<x xmlns='name'>psi/psiplus_logo</x>
 +		<object mime='image/png'>psiplus/psiplus_logo.png</object>
 +	</icon>
-+	
++
 +	<icon>
 +		<x xmlns='name'>psi/enable-groups</x>
 +		<object mime='image/png'>psiplus/enable-groups.png</object>
 +	</icon>
-+	
++
 +	<icon>
 +		<x xmlns='name'>psi/doubleNextArrow</x>
 +		<object mime='image/png'>psiplus/doublenextarrow.png</object>
 +	</icon>
-+	
++
 +	<icon>
 +		<x xmlns='name'>psi/doubleBackArrow</x>
 +		<object mime='image/png'>psiplus/doublebackarrow.png</object>
 +	</icon>
 +
 +	<icon>
-+		<x xmlns='name'>psi/themeTitleTexture</x>
-+		<object mime='image/png'>psiplus/theme_title_texture.png</object>
-+	</icon>	
-+
-+	<icon>
 +		<x xmlns='name'>psi/autojid</x>
 +		<object mime='image/png'>psiplus/autojid.png</object>
 +	</icon>
@@ -318,54 +201,103 @@
 +		<object mime='image/png'>psiplus/ignore_global_actions.png</object>
 +	</icon>
 +	
-+		
++
 +	
 +	<icon>
 +		<x xmlns='name'>psi/crop</x>
 +		<object mime='image/png'>psiplus/crop.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/draw</x>
 +		<object mime='image/png'>psiplus/draw.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/frame</x>
 +		<object mime='image/png'>psiplus/frame.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/palette</x>
 +		<object mime='image/png'>psiplus/palette.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/text</x>
 +		<object mime='image/png'>psiplus/text.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/undo</x>
 +		<object mime='image/png'>psiplus/undo.png</object>
-+	</icon>	
-+	
++	</icon>
++
 +	<icon>
 +		<x xmlns='name'>psi/print</x>
 +		<object mime='image/png'>psiplus/print.png</object>
-+	</icon>	
++	</icon>
 +	
 +
  </icondef>
---- git.orig/iconsets/roster/default/icondef.xml
-+++ git/iconsets/roster/default/icondef.xml
-@@ -124,4 +124,9 @@
- 		<x xmlns='name'>psi/groupOpen</x>
- 		<object mime='image/png'>groupopen.png</object>
- 	</icon>
-+	
-+	<icon>
-+		<x xmlns='name'>psi/typing</x>
-+		<object mime='image/png'>typing.png</object>
-+	</icon>
- </icondef>
+--- psi.orig/iconsets.qrc
++++ psi/iconsets.qrc
+@@ -64,7 +64,7 @@
+         <file>iconsets/system/default/pgp.png</file>
+         <file>iconsets/system/default/play.png</file>
+         <file>iconsets/system/default/play_sounds.png</file>
+-        <file>iconsets/system/default/psilogo.png</file>
++        <file>iconsets/system/default/psiplus/psilogo.png</file>
+         <file>iconsets/system/default/psimain.png</file>
+         <file>iconsets/system/default/quit.png</file>
+         <file>iconsets/system/default/register.png</file>
+@@ -99,6 +99,49 @@
+         <file>iconsets/system/default/throbber.png</file>
+         <file>iconsets/system/default/theme_title_texture.png</file>
+ 	<file>iconsets/system/default/action_button_send.png</file>
++        <file>iconsets/system/default/psiplus/activity.png</file>
++        <file>iconsets/system/default/psiplus/mood.png</file>
++        <file>iconsets/system/default/psiplus/geolocation.png</file>
++        <file>iconsets/system/default/psiplus/psiplus_icon.png</file>
++        <file>iconsets/system/default/psiplus/action_direct_presence.png</file>
++        <file>iconsets/system/default/psiplus/action_muc_hide.png</file>
++        <file>iconsets/system/default/psiplus/action_muc_leave.png</file>
++        <file>iconsets/system/default/psiplus/action_muc_show.png</file>
++        <file>iconsets/system/default/psiplus/action_paste_and_send.png</file>
++        <file>iconsets/system/default/psiplus/action_templates_edit.png</file>
++        <file>iconsets/system/default/psiplus/action_templates.png</file>
++        <file>iconsets/system/default/psiplus/action_vcard_restore.png</file>
++        <file>iconsets/system/default/psiplus/action_vcard_save_as.png</file>
++        <file>iconsets/system/default/psiplus/advanced.png</file>
++        <file>iconsets/system/default/psiplus/avcall.png</file>
++        <file>iconsets/system/default/psiplus/bookmark_add.png</file>
++        <file>iconsets/system/default/psiplus/bookmark_remove.png</file>
++        <file>iconsets/system/default/psiplus/bookmarks.png</file>
++        <file>iconsets/system/default/psiplus/cm_check.png</file>
++        <file>iconsets/system/default/psiplus/cm_export.png</file>
++        <file>iconsets/system/default/psiplus/cm_import.png</file>
++        <file>iconsets/system/default/psiplus/cm_invertcheck.png</file>
++        <file>iconsets/system/default/psiplus/cm_uncheck.png</file>
++        <file>iconsets/system/default/psiplus/notification_chat_delivery_ok_pgp.png</file>
++        <file>iconsets/system/default/psiplus/notification_chat_receive_pgp.png</file>
++        <file>iconsets/system/default/psiplus/notification_chat_send_pgp.png</file>
++        <file>iconsets/system/default/psiplus/notification_roster_tune.png</file>
++        <file>iconsets/system/default/psiplus/plugins.png</file>
++        <file>iconsets/system/default/psiplus/roster_icon.png</file>
++        <file>iconsets/system/default/psiplus/psiplus_logo.png</file>
++        <file>iconsets/system/default/psiplus/action_contacts_manager.png</file>
++        <file>iconsets/system/default/psiplus/enable-groups.png</file>
++        <file>iconsets/system/default/psiplus/doublenextarrow.png</file>
++        <file>iconsets/system/default/psiplus/doublebackarrow.png</file>
++        <file>iconsets/system/default/psiplus/crop.png</file>
++        <file>iconsets/system/default/psiplus/draw.png</file>
++        <file>iconsets/system/default/psiplus/frame.png</file>
++        <file>iconsets/system/default/psiplus/palette.png</file>
++        <file>iconsets/system/default/psiplus/text.png</file>
++        <file>iconsets/system/default/psiplus/undo.png</file>
++        <file>iconsets/system/default/psiplus/print.png</file>
++        <file>iconsets/system/default/psiplus/autojid.png</file>
++        <file>iconsets/system/default/psiplus/ignore_global_actions.png</file>
+         <file>iconsets/system/default/whiteboarding/whiteboard.png</file>
+         <file>iconsets/system/default/whiteboarding/save.png</file>
+         <file>iconsets/system/default/whiteboarding/select.png</file>

psi-plus-main-20141106.tar.xz/patches/0030-psi-entity-time.diff Added

@@ -0,0 +1,577 @@
+--- git.orig/src/entitytimetask.cpp
++++ git/src/entitytimetask.cpp
+@@ -0,0 +1,122 @@
++/*
++ * entitytimetask.cpp - Entity time fetching task
++ * Copyright (C) 2007  Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include <QTime>
++#include "entitytimetask.h"
++#include "xmpp_xmlcommon.h"
++
++using namespace XMPP;
++
++/**
++ * \class EntityTimeTask
++ * \brief Gets entity time
++ *
++ * This task can be used to get time zone information of an entity.
++ */
++
++
++// convert [+|-]hh:mm to minutes
++static Maybe<int> stringToOffset(const QString &off)
++{
++	QTime t = QTime::fromString(off.mid(1), "hh:mm");
++
++	if (t.isValid() && (off[0] == '+' || off[0] == '-')) {
++		int m = t.hour() * 60 + t.minute();
++		if (off[0] == '-')
++			m = -m;
++		return m;
++	}
++	else {
++		return Maybe<int>();
++	}
++}
++
++/**
++ * \brief Create new task.
++ */
++EntityTimeTask::EntityTimeTask(Task* parent) : Task(parent)
++{
++}
++
++/**
++ * \brief Queried entity's JID.
++ */
++const Jid & EntityTimeTask::jid() const
++{
++	return jid_;
++}
++
++/**
++ * \brief Prepares the task to get information from JID.
++ */
++void EntityTimeTask::get(const Jid &jid)
++{
++	jid_ = jid;
++	iq_ = createIQ(doc(), "get", jid_.full(), id());
++	QDomElement time = doc()->createElement("time");
++	time.setAttribute("xmlns", "urn:xmpp:time");
++	iq_.appendChild(time);
++}
++
++void EntityTimeTask::onGo()
++{
++	send(iq_);
++}
++
++bool EntityTimeTask::take(const QDomElement &x)
++{
++	if (!iqVerify(x, jid_, id()))
++		return false;
++
++	if (x.attribute("type") == "result") {
++		QDomElement q = x.firstChildElement("time");
++		QDomElement tag;
++		tag = q.firstChildElement("utc");
++		if (!tag.isNull())
++			utc_ = tagContent(tag);
++		tag = q.firstChildElement("tzo");
++		if (!tag.isNull()) {
++			tzoString_ = tagContent(tag);
++			tzo_ = stringToOffset(tzoString_);
++		}
++		setSuccess();
++	}
++	else {
++		setError(x);
++	}
++
++	return true;
++}
++
++/**
++ * \brief Timezone offset in [+|-]hh:mm format (or empty string if no data).
++ */
++const QString& EntityTimeTask::timezoneOffsetString() const
++{
++	return tzoString_;
++}
++
++/**
++ * \brief Timezone offset in minutes (if available).
++ */
++Maybe<int> EntityTimeTask::timezoneOffset() const
++{
++	return tzo_;
++}
+--- git.orig/src/entitytimetask.h
++++ git/src/entitytimetask.h
+@@ -0,0 +1,49 @@
++/*
++ * entitytimetask.h - Entity time fetching task
++ * Copyright (C) 2007  Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ENTITYTIMETASK_H
++#define ENTITYTIMETASK_H
++
++#include <QDomElement>
++#include "xmpp_task.h"
++#include "xmpp_jid.h"
++#include "maybe.h"
++
++class EntityTimeTask : public XMPP::Task
++{
++public:
++	EntityTimeTask(Task*);
++
++	void onGo();
++	bool take(const QDomElement &);
++	void get(const XMPP::Jid &jid);
++	const XMPP::Jid & jid() const;
++
++	const QString& timezoneOffsetString() const;
++	Maybe<int> timezoneOffset() const;
++
++private:
++	QDomElement iq_;
++	XMPP::Jid jid_;
++	QString utc_, tzoString_;
++	Maybe<int> tzo_;
++};
++
++#endif
+--- git.orig/src/infodlg.cpp
++++ git/src/infodlg.cpp
+@@ -45,6 +45,7 @@
+ #include "iconset.h"
+ #include "common.h"
+ #include "lastactivitytask.h"
++#include "entitytimetask.h"
+ #include "vcardfactory.h"
+ #include "iconwidget.h"
+ #ifndef NEWCONTACTLIST
+@@ -242,7 +243,7 @@ InfoDlg::InfoDlg(int type, const Jid &j,
+ 	updateStatus();
+ 	foreach(UserListItem* u, d->findRelevant(j)) {
+ 		foreach(UserResource r, u->userResourceList()) {
+-			requestClientVersion(d->jid.withResource(r.name()));
++			requestResourceInfo(d->jid.withResource(r.name()));
+ 		}
+ 		if (u->userResourceList().isEmpty() && u->lastAvailable().isNull()) {
+ 			requestLastActivity();
+@@ -776,13 +777,24 @@ void InfoDlg::setStatusVisibility(bool v
+ 	}
+ }
+ 
+-void InfoDlg::requestClientVersion(const Jid& j)
++/**
++ * \brief Requests per-resource information.
++ *
++ * Gets information about client version and time.
++ */
++void InfoDlg::requestResourceInfo(const Jid& j)
+ {
+ 	d->infoRequested += j.full();
++
+ 	JT_ClientVersion *jcv = new JT_ClientVersion(d->pa->client()->rootTask());
+ 	connect(jcv, SIGNAL(finished()), SLOT(clientVersionFinished()));
+ 	jcv->get(j);
+ 	jcv->go(true);
++
++	EntityTimeTask *jet = new EntityTimeTask(d->pa->client()->rootTask());
++	connect(jet, SIGNAL(finished()), SLOT(entityTimeFinished()));
++	jet->get(j);
++	jet->go(true);
+ }
+ 
+ void InfoDlg::clientVersionFinished()
+@@ -803,6 +815,23 @@ void InfoDlg::clientVersionFinished()
+ 	}
+ }
+ 
++void InfoDlg::entityTimeFinished()
++{
++	EntityTimeTask *j = (EntityTimeTask *)sender();
++	if(j->success()) {
++		foreach(UserListItem* u, d->findRelevant(j->jid())) {
++			UserResourceList::Iterator rit = u->userResourceList().find(j->jid().resource());
++			bool found = (rit == u->userResourceList().end()) ? false: true;
++			if(!found)
++				continue;
++
++			(*rit).setTimezone(j->timezoneOffset());
++			d->updateEntry(*u);
++			updateStatus();
++		}
++	}
++}
++
+ void InfoDlg::requestLastActivity()
+ {
+ 	LastActivityTask *jla = new LastActivityTask(d->jid.bare(),d->pa->client()->rootTask());
+@@ -828,7 +857,7 @@ void InfoDlg::contactAvailable(const Jid
+ {
+ 	if (d->jid.compare(j,false)) {
+ 		if (!d->infoRequested.contains(j.withResource(r.name()).full())) {
+-			requestClientVersion(j.withResource(r.name()));
++			requestResourceInfo(j.withResource(r.name()));
+ 		}
+ 	}
+ }
+--- git.orig/src/infodlg.h
++++ git/src/infodlg.h
+@@ -59,6 +59,7 @@ private slots:
+ 	void contactUnavailable(const Jid &, const Resource &);
+ 	void contactUpdated(const Jid &);
+ 	void clientVersionFinished();
++	void entityTimeFinished();
+ 	void requestLastActivityFinished();
+ 	void jt_finished();
+ 	void doSubmit();
+@@ -87,7 +88,7 @@ private:
+ 	bool edited();
+ 	void setEdited(bool);
+ 	void setPreviewPhoto(const QString& str);
+-	void requestClientVersion(const XMPP::Jid& j);
++	void requestResourceInfo(const XMPP::Jid& j);
+ 	void requestLastActivity();
+ };
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -132,6 +132,7 @@
+ #include "rc.h"
+ #include "tabdlg.h"
+ #include "proxy.h"
++#include "timeserver.h"
+ #include "bobfilecache.h"
+ #include "psicontactlist.h"
+ #include "psicontact.h"
+@@ -1133,6 +1134,10 @@ PsiAccount::PsiAccount(const UserAccount
+ 	d->httpAuthManager = new HttpAuthManager(d->client->rootTask());
+ 	connect(d->httpAuthManager, SIGNAL(confirmationRequest(const PsiHttpAuthRequest &)), SLOT(incomingHttpAuthRequest(const PsiHttpAuthRequest &)));
+ 
++	// Time server
++	new TimeServer(d->client->rootTask());
++	d->client->addExtension("e-time", QStringList("urn:xmpp:time"));
++
+ 	// Initialize Adhoc Commands server
+ 	d->ahcManager = new AHCServerManager(this);
+ 	d->rcSetStatusServer = 0;
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -160,6 +160,8 @@ HEADERS += \
+ 	$$PWD/xdata_widget.h \
+ 	$$PWD/statuspreset.h \
+ 	$$PWD/lastactivitytask.h \
++	$$PWD/entitytimetask.h \
++	$$PWD/timeserver.h \
+ 	$$PWD/bobfilecache.h \
+ 	$$PWD/mucmanager.h \
+ 	$$PWD/mucconfigdlg.h \
+@@ -292,6 +294,8 @@ SOURCES += \
+ 	$$PWD/psiactionlist.cpp \
+ 	$$PWD/xdata_widget.cpp \
+ 	$$PWD/lastactivitytask.cpp \
++	$$PWD/entitytimetask.cpp \
++	$$PWD/timeserver.cpp \
+ 	$$PWD/bobfilecache.cpp \
+ 	$$PWD/statuspreset.cpp \
+ 	$$PWD/mucmanager.cpp \
+--- git.orig/src/systeminfo.cpp
++++ git/src/systeminfo.cpp
+@@ -13,6 +13,7 @@
+ #include <QSysInfo>
+ #include <QProcess>
+ #include <QTextStream>
++#include <QByteArray>
+ 
+ #if defined(HAVE_X11) || defined(Q_OS_MAC)
+ #include <time.h>
+@@ -176,14 +177,13 @@ SystemInfo::SystemInfo() : QObject(QCore
+ 	time(&x);
+ 	char str[256];
+ 	char fmt[32];
++	int size;
+ 	strcpy(fmt, "%z");
+-	strftime(str, 256, fmt, localtime(&x));
+-	if(strcmp(fmt, str)) {
+-		QString s = str;
+-		if(s.at(0) == '+')
+-			s.remove(0,1);
+-		s.truncate(s.length()-2);
+-		timezone_offset_ = s.toInt();
++	size = strftime(str, 256, fmt, localtime(&x));
++	if(size && strncmp(fmt, str, size)) {
++		timezone_offset_ = QByteArray::fromRawData(str + 1, 2).toInt() * 60 + QByteArray::fromRawData(str + 3, 2).toInt();
++		if(str[0] == '-')
++			timezone_offset_ = -timezone_offset_;
+ 	}
+ 	strcpy(fmt, "%Z");
+ 	strftime(str, 256, fmt, localtime(&x));
+@@ -229,14 +229,12 @@ SystemInfo::SystemInfo() : QObject(QCore
+ 
+ #if defined(Q_OS_WIN)
+ 	TIME_ZONE_INFORMATION i;
+-	//GetTimeZoneInformation(&i);
+-	//timezone_offset_ = (-i.Bias) / 60;
+ 	memset(&i, 0, sizeof(i));
+ 	bool inDST = (GetTimeZoneInformation(&i) == TIME_ZONE_ID_DAYLIGHT);
+ 	int bias = i.Bias;
+ 	if(inDST)
+ 		bias += i.DaylightBias;
+-	timezone_offset_ = (-bias) / 60;
++	timezone_offset_ = -bias;
+ 	timezone_str_ = "";
+ 	for(int n = 0; n < 32; ++n) {
+ 		int w = inDST ? i.DaylightName[n] : i.StandardName[n];
+@@ -295,3 +293,13 @@ SystemInfo* SystemInfo::instance()
+ }
+ 
+ SystemInfo* SystemInfo::instance_ = NULL;
++
++/**
++ * \fn int SystemInfo::timezoneOffset()
++ * \brief Local timezone offset in minutes.
++ */
++
++/**
++ * \fn const QString& SystemInfo::timezoneString() const
++ * \brief Local timezone name.
++ */
+--- git.orig/src/timeserver.cpp
++++ git/src/timeserver.cpp
+@@ -0,0 +1,71 @@
++/*
++ * timeserver.cpp - Entity time server
++ * Copyright (C) 2001, 2002, 2007  Justin Karneges, Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "timeserver.h"
++#include "systeminfo.h"
++#include "xmpp_xmlcommon.h"
++#include <QDateTime>
++
++using namespace XMPP;
++
++
++/**
++ * \class TimeServer
++ * \brief Server current time
++ *
++ * This serving task answers XEP-0202 and XEP-0090 queries
++ */
++
++TimeServer::TimeServer(Task *parent)
++:Task(parent)
++{
++}
++
++TimeServer::~TimeServer()
++{
++}
++
++bool TimeServer::take(const QDomElement &e)
++{
++	if (e.tagName() != "iq" || e.attribute("type") != "get")
++		return false;
++
++	QString ns = e.firstChildElement("time").attribute("xmlns");
++	if (ns == "urn:xmpp:time") {
++		QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
++		QDomElement time = doc()->createElement("time");
++		time.setAttribute("xmlns", ns);
++		iq.appendChild(time);
++
++		QDateTime local = QDateTime::currentDateTime();
++		int off = SystemInfo::instance()->timezoneOffset();
++		QTime t = QTime(0, 0).addSecs(qAbs(off)*60);
++		QString tzo = (off < 0 ? "-" : "+") + t.toString("HH:mm");
++		time.appendChild(textTag(doc(), "tzo", tzo));
++		QString localTimeStr = local.toUTC().toString(Qt::ISODate);
++		if (!localTimeStr.endsWith("Z"))
++			localTimeStr.append("Z");
++		time.appendChild(textTag(doc(), "utc", localTimeStr));
++
++		send(iq);
++		return true;
++	}
++	return false;
++}
+--- git.orig/src/timeserver.h
++++ git/src/timeserver.h
+@@ -0,0 +1,35 @@
++/*
++ * timeserver.h - Entity time server
++ * Copyright (C) 2007  Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef TIMESERVER_H
++#define TIMESERVER_H
++
++#include "xmpp_task.h"
++
++class TimeServer : public XMPP::Task
++{
++	Q_OBJECT
++public:
++	TimeServer(Task *);
++	~TimeServer();
++	bool take(const QDomElement &);
++};
++
++#endif
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -102,6 +102,43 @@ void UserResource::setClient(const QStri
+ 	}
+ }
+ 
++/**
++ * \brief Timezone offset in minutes (if available).
++ */
++Maybe<int> UserResource::timezoneOffset() const
++{
++	return v_tzo;
++}
++
++/**
++ * \brief Timezone offset as string (or empty string if no data).
++ *
++ * String is formatted as "UTC[+|-]h[:mm]".
++ */
++const QString& UserResource::timezoneOffsetString() const
++{
++	return v_tzoString;
++}
++
++/**
++ * \brief Set timezone offset (in minutes).
++ */
++void UserResource::setTimezone(Maybe<int> off)
++{
++	v_tzo = off;
++
++	if (off.hasValue()) {
++		QTime t = QTime(0, 0).addSecs(abs(off.value())*60);
++		QString u = QString("UTC") + (off.value() < 0 ? "-" : "+");
++		u += QString::number(t.hour());
++		if (t.minute())
++			u += QString(":%1").arg(t.minute());
++		v_tzoString = u;
++	}
++	else
++		v_tzoString = "";
++}
++
+ const QString & UserResource::publicKeyID() const
+ {
+ 	return v_keyID;
+@@ -565,6 +602,12 @@ QString UserListItem::makeBareTip(bool t
+ 			if (!r.geoLocation().isNull())
+ 				str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(r.geoLocation().lat().value()) + "/" + QString::number(r.geoLocation().lon().value()) + "</div>";
+ 
++			// Entity Time
++			if (r.timezoneOffset().hasValue()) {
++				QDateTime dt = QDateTime::currentDateTime().toUTC().addSecs(r.timezoneOffset().value()*60);
++				str += QString("<br><nobr>") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::TextDate)).arg(r.timezoneOffsetString()) + "</nobr>";
++			}
++
+ 			// client
+ 			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
+ 				QString ver = r.versionString();
+--- git.orig/src/userlist.h
++++ git/src/userlist.h
+@@ -30,6 +30,7 @@
+ #include "mood.h"
+ #include "geolocation.h"
+ #include "physicallocation.h"
++#include "maybe.h"
+ 
+ class AvatarFactory;
+ namespace XMPP {
+@@ -51,6 +52,10 @@ public:
+ 	const QString& clientOS() const;
+ 	void setClient(const QString& name, const QString& version, const QString& os);
+ 
++	Maybe<int> timezoneOffset() const;
++	const QString& timezoneOffsetString() const;
++	void setTimezone(Maybe<int> tzo);
++
+ 	const QString & publicKeyID() const;
+ 	int pgpVerifyStatus() const;
+ 	QDateTime sigTimestamp() const;
+@@ -67,6 +72,8 @@ public:
+ 
+ private:
+ 	QString v_ver, v_clientName, v_clientVersion, v_clientOS, v_keyID;
++	Maybe<int> v_tzo;
++	QString v_tzoString;
+ 	QString v_tune;
+ 	GeoLocation v_geoLocation;
+ 	PhysicalLocation v_physicalLocation;

psi-plus-main-20141106.tar.xz/patches/0040-psi-mood-icons-and-description.diff Added

@@ -0,0 +1,659 @@
+--- git.orig/src/moodcatalog.cpp
++++ git/src/moodcatalog.cpp
+@@ -53,11 +53,22 @@ bool MoodCatalog::Entry::isNull() const
+ 	return type_ == Mood::Unknown && text_.isNull() && value_.isNull();
+ }
+ 
++bool MoodCatalog::Entry::operator<(const MoodCatalog::Entry &m) const
++{
++	if ( type_ == Mood::Undefined )
++		return false;
++	if ( m.type_ == Mood::Undefined )
++		return true;
++	int result = QString::localeAwareCompare ( text_, m.text_ );
++	return result<0;
++}
++
+ MoodCatalog::MoodCatalog() : QObject(QCoreApplication::instance())
+ {
+ 	entries_ += Entry(Mood::Afraid, "afraid", QObject::tr("Afraid"));
+ 	entries_ += Entry(Mood::Amazed, "amazed", QObject::tr("Amazed"));
+ 	entries_ += Entry(Mood::Angry, "angry", QObject::tr("Angry"));
++	entries_ += Entry(Mood::Amorous, "amorous", QObject::tr("Amorous"));
+ 	entries_ += Entry(Mood::Annoyed, "annoyed", QObject::tr("Annoyed"));
+ 	entries_ += Entry(Mood::Anxious, "anxious", QObject::tr("Anxious"));
+ 	entries_ += Entry(Mood::Aroused, "aroused", QObject::tr("Aroused"));
+@@ -65,22 +76,31 @@ MoodCatalog::MoodCatalog() : QObject(QCo
+ 	entries_ += Entry(Mood::Bored, "bored", QObject::tr("Bored"));
+ 	entries_ += Entry(Mood::Brave, "brave", QObject::tr("Brave"));
+ 	entries_ += Entry(Mood::Calm, "calm", QObject::tr("Calm"));
++	entries_ += Entry(Mood::Cautious, "cautious", QObject::tr("Cautious"));
+ 	entries_ += Entry(Mood::Cold, "cold", QObject::tr("Cold"));
++	entries_ += Entry(Mood::Confident, "confident", QObject::tr("Confident"));
+ 	entries_ += Entry(Mood::Confused, "confused", QObject::tr("Confused"));
++	entries_ += Entry(Mood::Contemplative, "contemplative", QObject::tr("Contemplative"));
+ 	entries_ += Entry(Mood::Contented, "contented", QObject::tr("Contented"));
+ 	entries_ += Entry(Mood::Cranky, "cranky", QObject::tr("Cranky"));
++	entries_ += Entry(Mood::Crazy, "crazy", QObject::tr("Crazy"));
++	entries_ += Entry(Mood::Creative, "creative", QObject::tr("Creative"));
+ 	entries_ += Entry(Mood::Curious, "curious", QObject::tr("Curious"));
++	entries_ += Entry(Mood::Dejected, "dejected", QObject::tr("Dejected"));
+ 	entries_ += Entry(Mood::Depressed, "depressed", QObject::tr("Depressed"));
+ 	entries_ += Entry(Mood::Disappointed, "disappointed", QObject::tr("Disappointed"));
+ 	entries_ += Entry(Mood::Disgusted, "disgusted", QObject::tr("Disgusted"));
++	entries_ += Entry(Mood::Dismayed, "dismayed", QObject::tr("Dismayed"));
+ 	entries_ += Entry(Mood::Distracted, "distracted", QObject::tr("Distracted"));
+ 	entries_ += Entry(Mood::Embarrassed, "embarrassed", QObject::tr("Embarrassed"));
++	entries_ += Entry(Mood::Envious, "envious", QObject::tr("Envious"));
+ 	entries_ += Entry(Mood::Excited, "excited", QObject::tr("Excited"));
+ 	entries_ += Entry(Mood::Flirtatious, "flirtatious", QObject::tr("Flirtatious"));
+ 	entries_ += Entry(Mood::Frustrated, "frustrated", QObject::tr("Frustrated"));
+ 	entries_ += Entry(Mood::Grumpy, "grumpy", QObject::tr("Grumpy"));
+ 	entries_ += Entry(Mood::Guilty, "guilty", QObject::tr("Guilty"));
+ 	entries_ += Entry(Mood::Happy, "happy", QObject::tr("Happy"));
++	entries_ += Entry(Mood::Hopeful, "hopeful", QObject::tr("Hopeful"));
+ 	entries_ += Entry(Mood::Hot, "hot", QObject::tr("Hot"));
+ 	entries_ += Entry(Mood::Humbled, "humbled", QObject::tr("Humbled"));
+ 	entries_ += Entry(Mood::Humiliated, "humiliated", QObject::tr("Humiliated"));
+@@ -95,13 +115,16 @@ MoodCatalog::MoodCatalog() : QObject(QCo
+ 	entries_ += Entry(Mood::Invincible, "invincible", QObject::tr("Invincible"));
+ 	entries_ += Entry(Mood::Jealous, "jealous", QObject::tr("Jealous"));
+ 	entries_ += Entry(Mood::Lonely, "lonely", QObject::tr("Lonely"));
++	entries_ += Entry(Mood::Lucky, "lucky", QObject::tr("Lucky"));
+ 	entries_ += Entry(Mood::Mean, "mean", QObject::tr("Mean"));
+ 	entries_ += Entry(Mood::Moody, "moody", QObject::tr("Moody"));
+ 	entries_ += Entry(Mood::Nervous, "nervous", QObject::tr("Nervous"));
+ 	entries_ += Entry(Mood::Neutral, "neutral", QObject::tr("Neutral"));
+ 	entries_ += Entry(Mood::Offended, "offended", QObject::tr("Offended"));
++	entries_ += Entry(Mood::Outraged, "outraged", QObject::tr("Outraged"));
+ 	entries_ += Entry(Mood::Playful, "playful", QObject::tr("Playful"));
+ 	entries_ += Entry(Mood::Proud, "proud", QObject::tr("Proud"));
++	entries_ += Entry(Mood::Relaxed, "relaxed", QObject::tr("Relaxed"));
+ 	entries_ += Entry(Mood::Relieved, "relieved", QObject::tr("Relieved"));
+ 	entries_ += Entry(Mood::Remorseful, "remorseful", QObject::tr("Remorseful"));
+ 	entries_ += Entry(Mood::Restless, "restless", QObject::tr("Restless"));
+@@ -112,10 +135,17 @@ MoodCatalog::MoodCatalog() : QObject(QCo
+ 	entries_ += Entry(Mood::Shy, "shy", QObject::tr("Shy"));
+ 	entries_ += Entry(Mood::Sick, "sick", QObject::tr("Sick"));
+ 	entries_ += Entry(Mood::Sleepy, "sleepy", QObject::tr("Sleepy"));
++	entries_ += Entry(Mood::Spontaneous, "spontaneous", QObject::tr("Spontaneous"));
+ 	entries_ += Entry(Mood::Stressed, "stressed", QObject::tr("Stressed"));
++	entries_ += Entry(Mood::Strong, "strong", QObject::tr("Strong"));
+ 	entries_ += Entry(Mood::Surprised, "surprised", QObject::tr("Surprised"));
++	entries_ += Entry(Mood::Thankful, "thankful", QObject::tr("Thankful"));
+ 	entries_ += Entry(Mood::Thirsty, "thirsty", QObject::tr("Thirsty"));
++	entries_ += Entry(Mood::Tired, "tired", QObject::tr("Tired"));
++	entries_ += Entry(Mood::Undefined, "undefined", QObject::tr("Else"));
++	entries_ += Entry(Mood::Weak, "weak", QObject::tr("Weak"));
+ 	entries_ += Entry(Mood::Worried, "worried", QObject::tr("Worried"));
++	qSort(entries_);
+ }
+ 
+ MoodCatalog* MoodCatalog::instance()
+--- git.orig/src/moodcatalog.h
++++ git/src/moodcatalog.h
+@@ -39,6 +39,7 @@ public:
+ 			const QString& value() const;
+ 			const QString& text() const;
+ 			bool isNull() const;
++			bool operator<(const MoodCatalog::Entry &m) const;
+ 
+ 		private:
+ 			Mood::Type type_;
+--- git.orig/src/mood.cpp
++++ git/src/mood.cpp
+@@ -48,6 +48,11 @@ QString Mood::typeText() const
+ 	return MoodCatalog::instance()->findEntryByType(type_).text();
+ }
+ 
++QString Mood::typeValue() const
++{
++	return MoodCatalog::instance()->findEntryByType(type_).value();
++}
++
+ const QString& Mood::text() const
+ {
+ 	return text_;
+--- git.orig/src/mooddlg.cpp
++++ git/src/mooddlg.cpp
+@@ -25,6 +25,7 @@
+ #include "moodcatalog.h"
+ #include "psiaccount.h"
+ #include "pepmanager.h"
++#include "psiiconset.h"
+ 
+ MoodDlg::MoodDlg(PsiAccount* pa)
+ 	: QDialog(0), pa_(pa)
+@@ -36,9 +37,16 @@ MoodDlg::MoodDlg(PsiAccount* pa)
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));
+ 
+ 	ui_.cb_type->addItem(tr("<unset>"));
++	Mood::Type mt = pa->mood().type();
++	int i=1;
+ 	foreach(MoodCatalog::Entry e, MoodCatalog::instance()->entries()) {
+-		ui_.cb_type->addItem(e.text());
++        	ui_.cb_type->addItem(IconsetFactory::icon("mood/"+e.value()).icon(), e.text());
++		if (e.type() == mt) {
++			ui_.cb_type->setCurrentIndex(i);
++		}
++		i++;
+ 	}
++	ui_.le_text->setText(pa->mood().text());
+ }
+ 
+ 
+--- git.orig/src/mood.h
++++ git/src/mood.h
+@@ -31,14 +31,16 @@ class Mood
+ public:
+ 	enum Type {
+ 		Unknown,
+-		Afraid, Amazed, Angry, Annoyed, Anxious, Aroused, Ashamed, Bored,
+-    	Brave, Calm, Cold, Confused, Contented, Cranky, Curious, Depressed,
+-    	Disappointed, Disgusted, Distracted, Embarrassed, Excited, Flirtatious,
+-		Frustrated, Grumpy, Guilty, Happy, Hot, Humbled, Humiliated, Hungry,
++		Afraid, Amazed, Angry, Amorous, Annoyed, Anxious, Aroused, Ashamed, Bored,
++		Brave, Calm, Cautious, Cold, Confident, Confused, Contemplative, Contented,
++		Cranky, Crazy, Creative, Curious, Dejected, Depressed, Disappointed,
++		Disgusted, Dismayed, Distracted, Embarrassed, Envious, Excited, Flirtatious,
++		Frustrated, Grumpy, Guilty, Happy, Hopeful, Hot, Humbled, Humiliated, Hungry,
+ 		Hurt, Impressed, In_awe, In_love, Indignant, Interested, Intoxicated,
+-		Invincible, Jealous, Lonely, Mean, Moody, Nervous, Neutral, Offended,
+-		Playful, Proud, Relieved, Remorseful, Restless, Sad, Sarcastic, Serious,
+-		Shocked, Shy, Sick, Sleepy, Stressed, Surprised, Thirsty, Worried
++		Invincible, Jealous, Lonely, Lucky, Mean, Moody, Nervous, Neutral, Offended,
++		Outraged, Playful, Proud, Relaxed, Relieved, Remorseful, Restless, Sad,
++		Sarcastic, Serious, Shocked, Shy, Sick, Sleepy, Spontaneous, Stressed, Strong,
++		Surprised, Thankful, Thirsty, Tired, Undefined, Weak, Worried
+ 	};
+ 
+ 	Mood();
+@@ -47,6 +49,7 @@ public:
+ 
+ 	Type type() const;
+ 	QString typeText() const;
++	QString typeValue() const;
+ 	const QString& text() const;
+ 	bool isNull() const;
+ 
+--- git.orig/src/options/opt_appearance.cpp
++++ git/src/options/opt_appearance.cpp
+@@ -94,6 +94,7 @@ OptionsTabAppearance::OptionsTabAppearan
+ OptionsTabIconset::OptionsTabIconset(QObject *parent) : MetaOptionsTab(parent, "iconsets", "", tr("Icons"), tr("Icons"))
+ {
+ 	addTab( new OptionsTabIconsetEmoticons(this) );
++	addTab( new OptionsTabIconsetMoods(this) );
+ 	addTab( new OptionsTabIconsetRoster(this) );
+ 	addTab( new OptionsTabIconsetSystem(this) );
+ }
+--- git.orig/src/options/opt_iconset.cpp
++++ git/src/options/opt_iconset.cpp
+@@ -23,6 +23,7 @@
+ #include <QTreeWidget>
+ 
+ #include "ui_opt_iconset_emo.h"
++#include "ui_opt_iconset_mood.h"
+ #include "ui_opt_iconset_system.h"
+ #include "ui_opt_iconset_roster.h"
+ #include "ui_ui_isdetails.h"
+@@ -33,6 +34,12 @@ public:
+ 	IconsetEmoUI() : QWidget() { setupUi(this); }
+ };
+ 
++class IconsetMoodUI : public QWidget, public Ui::IconsetMood
++{
++public:
++	IconsetMoodUI() : QWidget() { setupUi(this); }
++};
++
+ class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
+ {
+ public:
+@@ -640,6 +647,155 @@ void OptionsTabIconsetEmoticons::cancelT
+ {
+ 	if ( thread ) {
+ 		threadCancelled.lock();
++		thread->cancelled = true;
++		threadCancelled.unlock();
++
++		thread = 0;
++	}
++}
++
++
++//----------------------------------------------------------------------------
++// OptionsTabIconsetMoods
++//----------------------------------------------------------------------------
++
++OptionsTabIconsetMoods::OptionsTabIconsetMoods(QObject *parent)
++	: OptionsTab(parent, "iconset_moods", "", tr("Moods"), tr("Select your mood iconset"))
++	, w(0)
++	, thread(0)
++{
++}
++
++OptionsTabIconsetMoods::~OptionsTabIconsetMoods()
++{
++	cancelThread();
++}
++
++QWidget *OptionsTabIconsetMoods::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new IconsetMoodUI;
++	IconsetMoodUI *d = (IconsetMoodUI *)w;
++
++	connect(d->pb_moodDetails, SIGNAL(clicked()), SLOT(previewIconset()));
++
++	return w;
++}
++
++void OptionsTabIconsetMoods::applyOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetMoodUI *d = (IconsetMoodUI *)w;
++
++	const Iconset *is = d->iss_moods->iconset();
++	if ( is ) {
++		QFileInfo fi( is->fileName() );
++		PsiOptions::instance()->setOption("options.iconsets.moods", fi.fileName());
++	}
++}
++
++void OptionsTabIconsetMoods::restoreOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetMoodUI *d = (IconsetMoodUI *)w;
++
++	d->iss_moods->clear();
++	QStringList loaded;
++
++	d->setCursor(Qt::WaitCursor);
++
++	QPalette customPal = d->palette();
++	customPal.setCurrentColorGroup(QPalette::Inactive);
++	d->iss_moods->setEnabled(false);
++	d->iss_moods->setPalette(customPal);
++
++	d->pb_moodDetails->setEnabled(false);
++	d->pb_moodDetails->setPalette(customPal);
++
++	d->progress->show();
++	d->progress->setValue( 0 );
++
++	numIconsets = countIconsets("/moods", loaded);
++	iconsetsLoaded = 0;
++
++	cancelThread();
++
++	thread = new IconsetLoadThread(this, "/moods");
++	thread->start();
++}
++
++bool OptionsTabIconsetMoods::event(QEvent *e)
++{
++	IconsetMoodUI *d = (IconsetMoodUI *)w;
++	if ( e->type() == QEvent::User ) { // iconset load event
++		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
++
++		if ( thread != le->thread() )
++			return false;
++
++		if ( !numIconsets )
++			numIconsets = 1;
++		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
++
++		Iconset *i = le->iconset();
++		if ( i ) {
++			PsiIconset::instance()->stripFirstAnimFrame(i);
++			d->iss_moods->insert(*i);
++
++			QFileInfo fi( i->fileName() );
++			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.moods").toString() )
++				d->iss_moods->setItemSelected(d->iss_moods->lastItem(), true);
++
++			delete i;
++		}
++
++		return true;
++	}
++	else if ( e->type() == QEvent::User + 1 ) { // finish event
++		d->iss_moods->setEnabled(true);
++		d->iss_moods->setPalette(QPalette());
++
++		d->pb_moodDetails->setEnabled(true);
++		d->pb_moodDetails->setPalette(QPalette());
++
++		connect(d->iss_moods, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
++
++		d->progress->hide();
++
++		d->unsetCursor();
++		thread = 0;
++
++		return true;
++	}
++
++	return false;
++}
++
++void OptionsTabIconsetMoods::previewIconset()
++{
++	IconsetMoodUI *d = (IconsetMoodUI *)w;
++	const Iconset *is = d->iss_moods->iconset();
++	if (is) {
++		isDetails(*is, parentWidget->parentWidget(), psi);
++	}
++}
++
++void OptionsTabIconsetMoods::setData(PsiCon *psicon, QWidget *p)
++{
++	psi = psicon;
++	parentWidget = p;
++}
++
++void OptionsTabIconsetMoods::cancelThread()
++{
++	if ( thread ) {
++		threadCancelled.lock();
+ 		thread->cancelled = true;
+ 		threadCancelled.unlock();
+ 
+--- git.orig/src/options/opt_iconset.h
++++ git/src/options/opt_iconset.h
+@@ -65,6 +65,34 @@ private:
+ 	IconsetLoadThread *thread;
+ };
+ 
++class OptionsTabIconsetMoods : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabIconsetMoods(QObject *parent);
++	~OptionsTabIconsetMoods();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++	bool stretchable() const { return true; }
++
++private slots:
++	void setData(PsiCon *, QWidget *);
++	void previewIconset();
++
++protected:
++	bool event(QEvent *);
++	void cancelThread();
++
++private:
++	QWidget *w, *parentWidget;
++	PsiCon *psi;
++
++	int numIconsets, iconsetsLoaded;
++	IconsetLoadThread *thread;
++};
++
+ class OptionsTabIconsetRoster : public OptionsTab
+ {
+ 	Q_OBJECT
+--- git.orig/src/options/opt_iconset_mood.ui
++++ git/src/options/opt_iconset_mood.ui
+@@ -0,0 +1,88 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>IconsetMood</class>
++ <widget class="QWidget" name="IconsetMood">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>256</width>
++    <height>195</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>IconsetMoodUI</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
++   <item>
++    <widget class="QGroupBox" name="groupBox9">
++     <property name="title">
++      <string>Mood iconsets</string>
++     </property>
++     <layout class="QGridLayout">
++      <property name="margin">
++       <number>8</number>
++      </property>
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <item row="1" column="2">
++       <spacer>
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeType">
++         <enum>QSizePolicy::Expanding</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>204</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++      <item row="1" column="3">
++       <widget class="IconButton" name="pb_moodDetails" native="true">
++        <property name="text" stdset="0">
++         <string>&amp;Show Details</string>
++        </property>
++       </widget>
++      </item>
++      <item row="0" column="0" colspan="4">
++       <widget class="IconsetSelect" name="iss_moods" native="true"/>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QProgressBar" name="progress">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <customwidgets>
++  <customwidget>
++   <class>IconButton</class>
++   <extends></extends>
++   <header>iconbutton.h</header>
++  </customwidget>
++  <customwidget>
++   <class>IconsetSelect</class>
++   <extends></extends>
++   <header>iconsetselect.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -61,6 +61,7 @@ FORMS += \
+ 	$$PWD/opt_lookfeel_toolbars.ui \
+ 	$$PWD/ui_isdetails.ui \
+ 	$$PWD/opt_iconset_emo.ui \
++	$$PWD/opt_iconset_mood.ui \
+ 	$$PWD/opt_iconset_system.ui \
+ 	$$PWD/opt_iconset_roster.ui \
+ 	$$PWD/opt_general_groupchat.ui \
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -5508,6 +5508,11 @@ QString PsiAccount::nick() const
+ 	return d->self.name();
+ }
+ 
++const Mood &PsiAccount::mood() const
++{
++	return d->self.mood();
++}
++
+ //void PsiAccount::pgpToggled(bool b)
+ //{
+ //	QCA::PGPKey oldkey = d->cur_pgpSecretKey;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -33,6 +33,7 @@
+ #include "xmpp_status.h"
+ #include "psiactions.h"
+ #include "psievent.h"
++#include "mood.h"
+ 
+ namespace XMPP
+ {
+@@ -149,6 +150,7 @@ public:
+ 	bool loggedIn() const;
+ 	void setNick(const QString &);
+ 	QString nick() const;
++	const Mood &mood() const;
+ 	void forceDisconnect(bool fast, const XMPP::Status &s);
+ 	bool hasPGP() const;
+ 	QHostAddress *localAddress() const;
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -42,8 +42,8 @@ class PsiIconset::Private
+ private:
+ 	PsiIconset *psi;
+ public:
+-	Iconset system;
+-	QString cur_system, cur_status;
++	Iconset system, moods;
++	QString cur_system, cur_status, cur_moods;
+ 	QStringList cur_emoticons;
+ 	QMap<QString, QString> cur_service_status;
+ 	QMap<QString, QString> cur_custom_status;
+@@ -230,6 +230,23 @@ public:
+ 		return def;
+ 	}
+ 
++	Iconset moodsIconset(bool *ok)
++	{
++		Iconset def;
++		*ok = def.load( iconsetPath("moods/default") );
++
++		if ( PsiOptions::instance()->getOption("options.iconsets.moods").toString() != "default" ) {
++			Iconset is;
++			is.load ( iconsetPath("moods/" + PsiOptions::instance()->getOption("options.iconsets.moods").toString()) );
++
++			loadIconset(&def, &is);
++		}
++
++		stripFirstAnimFrame( def );
++
++		return def;
++	}
++
+ 	QList<Iconset*> emoticons()
+ 	{
+ 		QList<Iconset*> emo;
+@@ -354,12 +371,28 @@ void PsiIconset::loadEmoticons()
+ 	}
+ }
+ 
++bool PsiIconset::loadMoods()
++{
++	bool ok = true;
++	QString cur_moods = PsiOptions::instance()->getOption("options.iconsets.moods").toString();
++	if (d->cur_moods != cur_moods) {
++		Iconset moods = d->moodsIconset(&ok);
++		d->loadIconset(&d->moods, &moods);
++		d->moods.addToFactory();
++
++		d->cur_moods = cur_moods;
++	}
++
++	return ok;
++}
++
+ bool PsiIconset::loadAll()
+ {
+ 	if (!loadSystem() || !loadRoster())
+ 		return false;
+ 
+ 	loadEmoticons();
++	loadMoods();
+ 	return true;
+ }
+ 
+@@ -371,6 +404,9 @@ void PsiIconset::optionChanged(const QSt
+ 	else if (option == "options.iconsets.emoticons") {
+ 		loadEmoticons();
+ 	}
++	else if (option == "options.iconsets.moods") {
++		loadMoods();
++	}
+ 
+ 	// currently we rely on PsiCon calling reloadRoster() when
+ 	// all options are already applied. otherwise we risk the chance
+--- git.orig/src/psiiconset.h
++++ git/src/psiiconset.h
+@@ -44,6 +44,7 @@ public:
+ 
+ 	QHash<QString, Iconset*> roster;
+ 	QList<Iconset*> emoticons;
++	Iconset moods;
+ 	const Iconset &system() const;
+ 	void stripFirstAnimFrame(Iconset *);
+ 	static void removeAnimation(Iconset *);
+@@ -95,6 +96,7 @@ private:
+ 
+ 	bool loadRoster();
+ 	void loadEmoticons();
++	bool loadMoods();
+ };
+ 
+ #endif
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -466,6 +466,7 @@ QString UserListItem::makeBareTip(bool t
+ 	// you most probably want to wrap it with TextUtil::escape()
+ 
+ 	QString str;
++	QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
+ 	bool useAvatar = false;
+ 	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
+ 		useAvatar = true;
+@@ -493,7 +494,8 @@ QString UserListItem::makeBareTip(bool t
+ 
+ 	// User Mood
+ 	if (!mood().isNull()) {
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " + mood().typeText();
++		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
++			QString("<%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + mood().typeText();
+ 		if (!mood().text().isEmpty())
+ 			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
+ 		str += "</div>";
+@@ -539,7 +541,6 @@ QString UserListItem::makeBareTip(bool t
+ 			else if(status == STATUS_INVISIBLE)
+ 				istr = "status/invisible"; //this shouldn't happen
+ 
+-			QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
+ 			QString secstr;
+ 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
+ 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);

psi-plus-main-20141106.tar.xz/patches/0050-psi-muc-change-affiliation.diff Added

@@ -0,0 +1,38 @@
+--- git.temp.orig/src/gcuserview.cpp
++++ git.temp/src/gcuserview.cpp
+@@ -487,7 +487,6 @@ void GCUserView::contextMenuRequested(co
+ 	act->setEnabled( (!self || lvi->s.mucItem().role() == MUCItem::Moderator) && MUCManager::canSetRole(c->s.mucItem(),lvi->s.mucItem(),MUCItem::Moderator));
+ 	pm->addMenu(rm);
+ 
+-	/*
+ 	QMenu* am = new QMenu(tr("Change Affiliation"), pm);
+ 	act = am->addAction(tr("Unaffiliated"));
+ 	act->setData(15);
+@@ -514,7 +513,6 @@ void GCUserView::contextMenuRequested(co
+ 	act->setEnabled((!self || lvi->s.mucItem().affiliation() == MUCItem::Owner) && MUCManager::canSetAffiliation(c->s.mucItem(),lvi->s.mucItem(),MUCItem::Owner));
+ 
+ 	pm->addMenu(am);
+-	*/
+ 	pm->addSeparator();
+ 	//pm->insertItem(tr("Send &File"), 4);
+ 	//pm->insertSeparator();
+--- git.temp.orig/src/groupchatdlg.cpp
++++ git.temp/src/groupchatdlg.cpp
+@@ -1671,7 +1671,7 @@ void GCMainDlg::lv_action(const QString
+ 		}
+ 
+ 	}
+-	/*else if(x == 15) {
++	else if(x == 15) {
+ 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+ 		if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
+ 			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation);
+@@ -1690,7 +1690,7 @@ void GCMainDlg::lv_action(const QString
+ 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+ 		if (contact->s.mucItem().affiliation() != MUCItem::Owner)
+ 			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner);
+-	}*/
++	}
+ }
+ 
+ void GCMainDlg::contextMenuEvent(QContextMenuEvent *)

psi-plus-main-20141106.tar.xz/patches/0060-psi-muc-nickclick-chat.diff Added

@@ -0,0 +1,299 @@
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -114,6 +114,19 @@ void ChatView::clear()
+ 	addLogIconsResources();
+ }
+ 
++void ChatView::contextMenuEvent(QContextMenuEvent *e)
++{
++	const QUrl anc = QUrl::fromEncoded(anchorAt(e->pos()).toLatin1());
++
++	if ( anc.scheme() == "addnick" ) {
++		showNM(anc.path().mid(1));
++		e->accept();
++	}
++	else {
++		PsiTextView::contextMenuEvent(e);
++	}
++}
++
+ void ChatView::addLogIconsResources()
+ {
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
+@@ -282,16 +295,18 @@ void ChatView::renderMucMessage(const Me
+ 	} else {
+ 		nickcolor = getMucNickColor(mv.nick(), mv.isLocal());
+ 	}
++	QString nick = QString("<a href=\"addnick://psi/") + QUrl::toPercentEncoding(mv.nick()) +
++				   "\" style=\"color: "+nickcolor+"; text-decoration: none; \">"+TextUtil::escape(mv.nick())+"</a>";
+ 
+ 	if(mv.isEmote()) {
+-		appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
++		appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(nick) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
+ 	}
+ 	else {
+ 		if(PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
+-			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(TextUtil::escape(mv.nick())) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
++			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] ").arg(timestr) + QString("%1 says:").arg(nick) + "</font><br>" + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc + "</font>");
+ 		}
+ 		else {
+-			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
++			appendText(icon + QString("<font color=\"%1\">").arg(nickcolor) + QString("[%1] &lt;").arg(timestr) + nick + QString("&gt;</font> ") + QString("<font color=\"%1\">").arg(textcolor) + alerttagso + mv.formattedText() + alerttagsc +"</font>");
+ 		}
+ 	}
+ 
+--- git.orig/src/chatview_te.h
++++ git/src/chatview_te.h
+@@ -24,6 +24,7 @@
+ #include <QWidget>
+ #include <QDateTime>
+ #include <QPointer>
++#include <QContextMenuEvent>
+ 
+ #include "psitextview.h"
+ #include "chatviewcommon.h"
+@@ -45,6 +46,7 @@ public:
+ 	// reimplemented
+ 	QSize sizeHint() const;
+ 	void clear();
++	void contextMenuEvent(QContextMenuEvent *e);
+ 
+ 	void init();
+ 	void setDialog(QWidget* dialog);
+@@ -83,6 +85,9 @@ protected slots:
+ private slots:
+ 	void slotScroll();
+ 
++signals:
++	void showNM(const QString&);
++
+ private:
+ 	bool isMuc_;
+ 	QString jid_;
+--- git.orig/src/chatview_webkit.cpp
++++ git/src/chatview_webkit.cpp
+@@ -230,6 +230,15 @@ void ChatView::setSessionData(bool isMuc
+ 			SLOT(init()));
+ }
+ 
++void ChatView::contextMenuEvent(QContextMenuEvent *e)
++{
++	QWebHitTestResult r = webView->page()->mainFrame()->hitTestContent(e->pos());
++	if ( r.linkUrl().scheme() == "addnick" ) {
++		showNM(r.linkUrl().path().mid(1));
++		e->accept();
++	}
++}
++
+ bool ChatView::focusNextPrevChild(bool next)
+ {
+ 	return QWidget::focusNextPrevChild(next);
+--- git.orig/src/chatview_webkit.h
++++ git/src/chatview_webkit.h
+@@ -53,6 +53,7 @@ public:
+ 	void setSessionData(bool isMuc, const QString &jid, const QString name);
+ 	void setAccount(PsiAccount *acc) { account_ = acc; }
+ 
++	void contextMenuEvent(QContextMenuEvent* event);
+ 	void sendJsObject(const QVariantMap &);
+ 	void sendJsCommand(const QString &cmd);
+ 	bool handleCopyEvent(QObject *object, QEvent *event, ChatEdit *chatEdit);
+@@ -85,6 +86,9 @@ private slots:
+ 	void checkJsBuffer();
+ 	void sessionInited();
+ 
++signals:
++	void showNM(const QString&);
++
+ private:
+ 	friend class ChatViewJSObject;
+ 	ChatViewTheme* currentTheme();
+--- git.orig/src/desktoputil.cpp
++++ git/src/desktoputil.cpp
+@@ -87,6 +87,7 @@ static bool doOpenUrl(const QUrl& url)
+  */
+ bool DesktopUtil::openUrl(const QString& url)
+ {
++	if (url.startsWith("addnick://")) return true;
+ 	QByteArray ascii = url.toLatin1();
+ 	if (ascii == url)
+ 		return doOpenUrl(QUrl::fromEncoded(ascii));
+--- git.orig/src/gcuserview.cpp
++++ git/src/gcuserview.cpp
+@@ -397,13 +397,8 @@ void GCUserView::qlv_doubleClicked(const
+ 	}
+ }
+ 
+-void GCUserView::contextMenuRequested(const QPoint &p)
++void GCUserView::doContextMenu(QTreeWidgetItem *i)
+ {
+-	QTreeWidgetItem *i = itemAt(p);
+-
+-	if(!i || !i->parent() || !gcDlg_)
+-		return;
+-
+ 	QPointer<GCUserViewItem> lvi = (GCUserViewItem *)i;
+ 	bool self = gcDlg_->nick() == i->text(0);
+ 	GCUserViewItem* c = (GCUserViewItem*) findEntry(gcDlg_->nick());
+@@ -536,6 +531,16 @@ void GCUserView::contextMenuRequested(co
+ 	action(lvi->text(0), lvi->s, x);
+ }
+ 
++void GCUserView::contextMenuRequested(const QPoint &p)
++{
++	QTreeWidgetItem *i = itemAt(p);
++
++	if(!i || !i->parent() || !gcDlg_)
++		return;
++
++	doContextMenu(i);
++}
++
+ void GCUserView::mousePressEvent(QMouseEvent *event)
+ {
+ 	QTreeWidget::mousePressEvent(event);
+--- git.orig/src/gcuserview.h
++++ git/src/gcuserview.h
+@@ -75,6 +75,7 @@ public:
+ 	void updateEntry(const QString &, const Status &);
+ 	void removeEntry(const QString &);
+ 	QStringList nickList() const;
++	void doContextMenu(QTreeWidgetItem* it);
+ 
+ protected:
+ 	enum Role { Moderator = 0, Participant = 1, Visitor = 2 };
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -71,6 +71,7 @@
+ #include "psitooltip.h"
+ #include "psioptions.h"
+ #include "coloropt.h"
++#include "urlobject.h"
+ #include "shortcutmanager.h"
+ #include "psicontactlist.h"
+ #include "accountlabel.h"
+@@ -560,6 +561,28 @@ public:
+ 
+ };
+ 
++void GCMainDlg::openURL(const QString& url)
++{
++	if (url.startsWith("addnick://") && isActiveTab()) {
++		const QString nick = QUrl::fromPercentEncoding(url.mid(14).toLatin1());
++		if (ui_.mle->chatEdit()->toPlainText().length() == 0) {
++			ui_.mle->chatEdit()->insertPlainText(nick + QString(": "));
++		}
++		else {
++			ui_.mle->chatEdit()->insertPlainText(QString(" %1 ").arg(nick));
++		}
++		ui_.mle->chatEdit()->setFocus();
++	}
++}
++
++void GCMainDlg::showNM(const QString& nick)
++{
++	QTreeWidgetItem* itm = ui_.lv_users->findEntry(nick);
++	if (itm) {
++		ui_.lv_users->doContextMenu(itm);
++	}
++}
++
+ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	: TabbableWidget(j.bare(), pa, tabManager)
+ {
+@@ -593,6 +616,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.log->setAccount(account());
+ #endif
+ 
++	connect(ui_.log, SIGNAL(showNM(QString)), this, SLOT(showNM(QString)));
++	connect(URLObject::getInstance(), SIGNAL(openURL(QString)), SLOT(openURL(QString)));
++
+ 	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(openTopic()));
+ 	PsiToolTip::install(ui_.le_topic);
+ 
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -107,6 +107,8 @@ public slots:
+ 	void optionsUpdate();
+ 
+ private slots:
++	void showNM(const QString&);
++	void openURL(const QString&);
+ 	void scrollUp();
+ 	void scrollDown();
+ 	void mle_returnPressed();
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -4267,6 +4267,9 @@ void PsiAccount::openUri(const QUrl &uri
+ 		} else {
+ 			dj_newMessage(entity, body, subject, "");
+ 		}
++	} else if (querytype == "vcard") {
++		actionInfo(entity);
++
+ 		// thread, from, id
+ 	//} else if (querytype == "pubsub") {
+ 	//	// action, node
+--- git.orig/src/webview.cpp
++++ git/src/webview.cpp
+@@ -75,6 +75,10 @@ void WebView::contextMenuEvent(QContextM
+ 	QMenu *menu;
+ 
+ 	if (!r.linkUrl().isEmpty()) {
++		if (r.linkUrl().scheme() == "addnick") {
++			event->ignore();
++			return;
++		}
+ 		menu = URLObject::getInstance()->createPopupMenu(r.linkUrl().toEncoded());
+ 		//menu->addAction(pageAction(QWebPage::CopyLinkToClipboard));
+ 	} else {
+--- git.orig/src/widgets/urlobject.cpp
++++ git/src/widgets/urlobject.cpp
+@@ -37,7 +37,7 @@ class URLObject::Private : QObject
+ 	Q_OBJECT
+ public:
+ 	QString link;
+-	IconAction *act_xmpp, *act_mailto, *act_join_groupchat, *act_send_message, *act_chat, *act_browser, *act_add_to_roster, *act_copy;
++	IconAction *act_xmpp, *act_mailto, *act_join_groupchat, *act_send_message, *act_chat, *act_browser, *act_add_to_roster, *act_copy, *act_info;
+ 	URLObject *urlObject;
+ 	QSignalMapper xmppActionMapper;
+ 
+@@ -85,6 +85,10 @@ public:
+ 		act_copy = new IconAction(tr, tr, 0, this);
+ 		connect(act_copy, SIGNAL(triggered()), SLOT(popupCopy()));
+ 
++		tr = qApp->translate("URLLabel", "User Info");
++		act_info = new IconAction(tr, "psi/vCard", tr, 0, this);
++		connectXmppAction(act_info, "vcard");
++
+ 		connect(&xmppActionMapper, SIGNAL(mapped(const QString&)), SLOT(xmppAction(const QString&)));
+ 	}
+ 
+@@ -210,6 +214,7 @@ QMenu *URLObject::createPopupMenu(const
+ 		if (service == "x-psi-atstyle") {
+ 			m->addSeparator();
+ 		}
++		m->addAction(d->act_info);
+ 		m->addAction(d->act_xmpp);
+ 		m->addAction(d->act_chat);
+ 		m->addAction(d->act_send_message);
+--- git.orig/themes/chatview/psi/classic/index.html
++++ git/themes/chatview/psi/classic/index.html
+@@ -17,6 +17,7 @@ body > div > img:first-child { vertical-
+ .usertext {}
+ .alert {font-weight:bold; color:red;}
+ .trackbar { height:1px; border:1px solid black; border-color:#bbf #66f #66f #bbf }
++.nicklink { text-decoration:none; color:inherit; }
+   </style>
+ </head>
+ <body>
+@@ -107,6 +108,9 @@ window[chatServer.jsNamespace()].theme =
+ 			},
+ 			sender : function() {
+ 				var nick = chat.util.escapeHtml(shared.cdata.sender);
++				nick = shared.cdata.mtype == "message" && shared.isMuc?
++					'<a href="addnick://psi/'+encodeURIComponent(shared.cdata.sender)+
++					'" class="nicklink">'+nick+'</a>' : nick;
+ 				return shared.cdata.emote?"*"+nick:"&lt;"+nick+"&gt;";
+ 			},
+ 			alertedmessage : function() {

psi-plus-main-20141106.tar.xz/patches/0070-psi-bookmark-skip.diff Added

psi-plus-main-20141106.tar.xz/patches/0080-psi-icon-actions-shortcuts.diff Added

@@ -0,0 +1,120 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -363,6 +363,52 @@
+ 			</tabs>
+ 		</ui>
+ 		<shortcuts comment="Shortcuts">
++			<alist comment="Action List" >
++				<menu_disco type="QKeySequence" comment="Service Discovery"></menu_disco>
++				<menu_add_contact type="QKeySequence" comment="Add Contact"></menu_add_contact>
++				<menu_new_message type="QKeySequence" comment="New Message"></menu_new_message>
++				<menu_join_groupchat type="QKeySequence" comment="Join Group Chat"></menu_join_groupchat>
++				<menu_account_setup type="QKeySequence" comment="Account Setup"></menu_account_setup>
++				<menu_options type="QKeySequence" comment="Options"></menu_options>
++				<menu_file_transfer type="QKeySequence" comment="File Transfer"></menu_file_transfer>
++				<menu_toolbars type="QKeySequence" comment="Toolbars"></menu_toolbars>
++				<menu_xml_console type="QKeySequence" comment="XML Console"></menu_xml_console>
++				<menu_change_profile type="QKeySequence" comment="Change Profile"></menu_change_profile>
++				<menu_play_sounds type="QKeySequence" comment="Play Sounds"></menu_play_sounds>
++				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
++				<button_options type="QKeySequence" comment="Options"></button_options>
++				<button_status type="QKeySequence" comment="Status"></button_status>
++				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
++				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
++				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
++				<show_away type="QKeySequence" comment="Show Away Contacts"></show_away>
++				<show_hidden type="QKeySequence" comment="Show Hidden Contacts"></show_hidden>
++				<show_agents type="QKeySequence" comment="Show Agents"></show_agents>
++				<show_self type="QKeySequence" comment="Show Self"></show_self>
++				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
++				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
++				<status_all type="QKeySequence" comment="Status All"></status_all>
++				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
++				<status_online type="QKeySequence" comment="Status Online"></status_online>
++				<status_away type="QKeySequence" comment="Status Away"></status_away>
++				<status_xa type="QKeySequence" comment="Status XA"></status_xa>
++				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
++				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
++				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
++				<help_readme type="QKeySequence" comment="README"></help_readme>
++				<help_tip type="QKeySequence" comment="Tips"></help_tip>
++				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
++				<help_online_help type="QKeySequence" comment="Open Help"></help_online_help>
++				<help_online_wiki type="QKeySequence" comment="Open Wiki"></help_online_wiki>
++				<help_online_home type="QKeySequence" comment="Open Home Page"></help_online_home>
++				<help_psi_muc type="QKeySequence" comment="Help Psi MUC"></help_psi_muc>
++				<help_report_bug type="QKeySequence" comment="Report Bug"></help_report_bug>
++				<help_about type="QKeySequence" comment="About Psi"></help_about>
++				<help_about_psimedia type="QKeySequence" comment="About PsiMedia" />
++				<help_about_qt type="QKeySequence" comment="About Qt"></help_about_qt>
++				<help_diag_qcaplugin type="QKeySequence" comment="QCA plugin diag"></help_diag_qcaplugin>
++				<help_diag_qcakeystore type="QKeySequence" comment="QCA key store diag"></help_diag_qcakeystore>
++			</alist>
+ 			<chat comment="Shortcuts in the chat dialog">
+ 				<next-tab type="QVariantList" comment="Switch to the next tab">
+ 					<item type="QKeySequence">Ctrl+PgDown</item>
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -19,15 +19,20 @@
+  */
+ 
+ #include "psiactionlist.h"
++#include "shortcutmanager.h"
+ 
+ #include <QObject>
+ #include <QPointer>
++#include <map>
++#include <utility>
+ 
+ #include "iconset.h"
+ #include "psioptions.h"
+ 
+ #include "mainwin_p.h"
+ 
++using namespace std;
++
+ //----------------------------------------------------------------------------
+ // PsiActionList::Private
+ //----------------------------------------------------------------------------
+@@ -43,6 +48,7 @@ private:
+ 	PsiActionList *list;
+ 	PsiCon *psi;
+ 	QPointer<ActionList> statusActionList;
++	map<QString,IconAction*> actionmap;
+ 
+ 	void createCommon();
+ 	void createMainWin();
+@@ -90,13 +96,21 @@ PsiActionList::Private::~Private()
+ 
+ ActionList* PsiActionList::Private::createActionList( QString name, int id, ActionNames *actionlist )
+ {
++	static const QStringList skipList = QStringList() << "separator" << "spacer";
++
+ 	ActionList *actions = new ActionList( name, id, false );
+ 
+ 	QString aName;
+ 	for ( int i = 0; !(aName = QString(actionlist[i].name)).isEmpty(); i++ ) {
+ 		IconAction *action = actionlist[i].action;
+ 		if (action)
++		{
+ 			actions->addAction( aName, action );
++			if(!skipList.contains(aName)) {
++				action->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + aName));
++				actionmap[aName] = action;
++			}
++		}
+ 	}
+ 
+ 	list->addList( actions );
+@@ -411,6 +425,11 @@ void PsiActionList::Private::optionsChan
+ 	statusActionList->action("status_chat")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool());
+ 	statusActionList->action("status_xa")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool());
+ 	statusActionList->action("status_invisible")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool());
++
++	for(map<QString,IconAction*>::iterator i=actionmap.begin(); i!=actionmap.end(); i++)
++	{
++		 i->second->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + i->first));
++	}
+ }
+ 
+ //----------------------------------------------------------------------------

psi-plus-main-20141106.tar.xz/patches/0090-psi-xmpp-uri-in-chat-mode.diff Added

@@ -0,0 +1,201 @@
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -994,6 +994,12 @@ void ChatDlg::addEmoticon(QString text)
+ 	PsiRichText::addEmoticon(chatEdit(), text);
+ }
+ 
++void ChatDlg::setText(const QString& text)
++{
++	chatEdit()->clear();
++	chatEdit()->insertHtml(text + ' ');
++}
++
+ /**
+  * Records that the user is composing
+  */
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -74,6 +74,7 @@ public:
+ 
+ public:
+ 	PsiAccount* account() const;
++	void setText(const QString& );
+ 
+ signals:
+ 	void aInfo(const Jid &);
+--- git.orig/src/common.cpp
++++ git/src/common.cpp
+@@ -25,6 +25,7 @@
+ #include "psiiconset.h"
+ #include "applicationinfo.h"
+ #include "psioptions.h"
++#include "tabdlg.h"
+ 
+ #include <QUrl>
+ #include <QProcess>
+@@ -381,6 +382,32 @@ void closeDialogs(QWidget *w)
+ 	}
+ }
+ 
++TabbableWidget* findActiveTab()
++{
++	QWidget* chat = QApplication::activeWindow();
++	TabbableWidget* tw = 0;
++	if(chat) {
++		TabDlg* td = qobject_cast<TabDlg*>(chat);
++		if(td) {
++			tw = td->getCurrentTab();
++		}
++		else {
++			tw = qobject_cast<TabbableWidget*>(chat);
++			if (!tw) {
++				QList<TabDlg*> tmp = chat->findChildren<TabDlg*>(); // all-in-one
++				while(!tmp.isEmpty()) {
++					TabDlg* td = tmp.takeFirst();
++					tw = td->getCurrentTab();
++					if(tw) {
++						break;
++					}
++				}
++			}
++		}
++	}
++	return tw;
++}
++
+ #ifdef HAVE_X11
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h> // needed for WM_CLASS hinting
+--- git.orig/src/common.h
++++ git/src/common.h
+@@ -29,6 +29,7 @@
+ #include <QColor>
+ 
+ class QMenu;
++class TabbableWidget;
+ 
+ #include "statuspreset.h"
+ 
+@@ -147,6 +148,7 @@ void clearMenu(QMenu *m); // deletes all
+ void bringToFront(QWidget *w, bool grabFocus = true);
+ void replaceWidget(QWidget *, QWidget *);
+ void closeDialogs(QWidget *);
++TabbableWidget* findActiveTab();
+ #ifdef HAVE_X11
+ #include <QWidget>
+ #include "x11info.h"
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3930,7 +3930,7 @@ void PsiAccount::actionHistoryBox(const
+ 	w->show();
+ }
+ 
+-void PsiAccount::actionOpenChat(const Jid &j)
++void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
+ {
+ 	UserListItem *u = find(j);
+ 	if(!u) {
+@@ -3964,9 +3964,9 @@ void PsiAccount::actionOpenChat(const Ji
+ 	}
+ 
+ 	if(!res.isEmpty())
+-		openChat(j.withResource(res), UserAction);
++		openChat(j.withResource(res), UserAction, body);
+ 	else
+-		openChat(j, UserAction);
++		openChat(j, UserAction, body);
+ }
+ 
+ // unlike actionOpenChat(), this function will work on jids that aren't
+@@ -4270,11 +4270,11 @@ void PsiAccount::openUri(const QUrl &uri
+ 		QString subject = uri.queryItemValue("subject");
+ 		QString body = uri.queryItemValue("body");
+ 		QString type = uri.queryItemValue("type");
+-		if (type == "chat" && subject.isEmpty() && body.isEmpty()) {
++		if (type == "chat" && subject.isEmpty()) {
+ 			if (!find(entity)) {
+ 				addUserListItem(entity);
+ 			}
+-			actionOpenChat(entity);
++			actionOpenChat(entity, body);
+ 		} else {
+ 			dj_newMessage(entity, body, subject, "");
+ 		}
+@@ -5251,7 +5251,7 @@ void PsiAccount::processChats(const Jid
+ 	processChatsHelper(j, true);
+ }
+ 
+-void PsiAccount::openChat(const Jid& j, ActivationType activationType)
++void PsiAccount::openChat(const Jid& j, ActivationType activationType, const QString& body)
+ {
+ 	ChatDlg* chat = ensureChatDlg(j);
+ 	chat->ensureTabbedCorrectly();
+@@ -5267,6 +5267,9 @@ void PsiAccount::openChat(const Jid& j,
+ 			QTimer::singleShot(1000, dlg, SLOT(showTabWithoutActivation()));
+ 		}
+ 	}
++	if (!body.isEmpty()) {
++		chat->setText(body);
++	}
+ }
+ 
+ void PsiAccount::chatMessagesRead(const Jid &j)
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -329,7 +329,7 @@ public slots:
+ 	void actionRename(const Jid &, const QString &);
+ 	void actionGroupRename(const QString &, const QString &);
+ 	void actionHistory(const Jid &);
+-	void actionOpenChat(const Jid &);
++	void actionOpenChat(const Jid &,const QString & body = QString());
+ 	void actionOpenSavedChat(const Jid &);
+ 	void actionOpenChat2(const Jid &);
+ 	void actionOpenChatSpecific(const Jid &);
+@@ -505,7 +505,7 @@ private:
+ 
+ 	void processChatsHelper(const Jid& jid, bool removeEvents);
+ 	void processChats(const Jid &);
+-	void openChat(const Jid &, ActivationType activationType);
++	void openChat(const Jid &, ActivationType activationType, const QString & body = QString());
+ 	EventDlg *ensureEventDlg(const Jid &);
+ 	friend class PsiCon;
+ 
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -1233,7 +1233,14 @@ void PsiCon::openUri(const QUrl &uri)
+ 	// authority
+ 	PsiAccount *pa = 0;
+ 	//if (uri.authority().isEmpty()) {
+-		pa = d->contactList->defaultAccount();
++		TabbableWidget* tw = findActiveTab();
++		if (tw) {
++			pa = tw->account();
++		}
++		if (!pa) {
++			pa = d->contactList->defaultAccount();
++		}
++
+ 		if (!pa) {
+ 			QMessageBox::critical(0, tr("Error"), QString("You need to have an account configured and enabled to open URIs (links)."));
+ 			return;
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -812,3 +812,8 @@ void TabDlg::setSimplifiedCaptionEnabled
+ 	simplifiedCaption_ = enabled;
+ 	updateCaption();
+ }
++
++TabbableWidget* TabDlg::getCurrentTab() const
++{
++	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
++}
+--- git.orig/src/tabs/tabdlg.h
++++ git/src/tabs/tabdlg.h
+@@ -86,6 +86,7 @@ public:
+ 	void setUserManagementEnabled(bool enabled); // default enabled
+ 	void setTabBarShownForSingles(bool enabled); // default enabled
+ 	void setSimplifiedCaptionEnabled(bool enabled); // default disabled
++	TabbableWidget* getCurrentTab() const;
+ 
+ protected:
+ 	void setShortcuts();

psi-plus-main-20141106.tar.xz/patches/0100-psi-user-activity.diff Added

@@ -0,0 +1,1084 @@
+--- git.orig/src/activitycatalog.cpp
++++ git/src/activitycatalog.cpp
+@@ -0,0 +1,216 @@
++/*
++ * activitycatalog.cpp
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include <QString>
++#include <QObject>
++#include <QCoreApplication>
++
++#include "activity.h"
++#include "activitycatalog.h"
++
++ActivityCatalog::Entry::Entry()
++{
++}
++
++ActivityCatalog::Entry::Entry(Activity::Type type, const QString& value, const QString& text)
++{
++	type_  = type;
++	specificType_ = Activity::UnknownSpecific;
++	value_ = value;
++	text_  = text;
++}
++
++ActivityCatalog::Entry::Entry(Activity::Type type, Activity::SpecificType specificType, const QString& value, const QString& text)
++{
++	type_ = type;
++	specificType_ = specificType;
++	value_ = value;
++	text_  = text;
++}
++
++Activity::Type ActivityCatalog::Entry::type() const
++{
++	return type_;
++}
++
++Activity::SpecificType ActivityCatalog::Entry::specificType() const
++{
++	return specificType_;
++}
++
++const QString& ActivityCatalog::Entry::value() const
++{
++	return value_;
++}
++
++const QString& ActivityCatalog::Entry::text() const
++{
++	return text_;
++}
++
++bool ActivityCatalog::Entry::isNull() const
++{
++	return type_ == Activity::Unknown && text_.isNull() && value_.isNull();
++}
++
++ActivityCatalog::ActivityCatalog() : QObject(QCoreApplication::instance())
++{
++	entries_ += Entry(Activity::DoingChores, "doing_chores", QObject::tr("Doing Chores"));
++	entries_ += Entry(Activity::DoingChores, Activity::BuyingGroceries, "buying_groceries", QObject::tr("Buying Groceries"));
++	entries_ += Entry(Activity::DoingChores, Activity::Cleaning, "cleaning", QObject::tr("Cleaning"));
++	entries_ += Entry(Activity::DoingChores, Activity::Cooking, "cooking", QObject::tr("Cooking"));
++	entries_ += Entry(Activity::DoingChores, Activity::DoingMaintenance, "doing_maintenance", QObject::tr("Doing Maintenance"));
++	entries_ += Entry(Activity::DoingChores, Activity::DoingTheDishes, "doing_the_dishes", QObject::tr("Doing The Dishes"));
++	entries_ += Entry(Activity::DoingChores, Activity::DoingTheLaundry, "doing_the_laundry", QObject::tr("Doing The Laundry"));
++	entries_ += Entry(Activity::DoingChores, Activity::Gardening, "gardening", QObject::tr("Gardening"));
++	entries_ += Entry(Activity::DoingChores, Activity::RunningAnErrand, "running_an_errand", QObject::tr("Running An Errand"));
++	entries_ += Entry(Activity::DoingChores, Activity::WalkingTheDog, "walking_the_dog", QObject::tr("Walking The Dog"));
++
++	entries_ += Entry(Activity::Drinking, "drinking", QObject::tr("Drinking"));
++	entries_ += Entry(Activity::Drinking, Activity::HavingABeer, "having_a_beer", QObject::tr("Having A Beer"));
++	entries_ += Entry(Activity::Drinking, Activity::HavingCoffee, "having_coffee", QObject::tr("Having Coffee"));
++	entries_ += Entry(Activity::Drinking, Activity::HavingTea, "having_tea", QObject::tr("Having Tea"));
++
++	entries_ += Entry(Activity::Eating, "eating", QObject::tr("Eating"));
++	entries_ += Entry(Activity::Eating, Activity::HavingASnack, "having_a_snack", QObject::tr("Having A Snack"));
++	entries_ += Entry(Activity::Eating, Activity::HavingBreakfast, "having_breakfast", QObject::tr("Having Breakfast"));
++	entries_ += Entry(Activity::Eating, Activity::HavingLunch, "having_lunch", QObject::tr("Having Lunch"));
++	entries_ += Entry(Activity::Eating, Activity::HavingDinner, "having_dinner", QObject::tr("Having Dinner"));
++
++	entries_ += Entry(Activity::Exercising, "exercising", QObject::tr("Exercising"));
++	entries_ += Entry(Activity::Exercising, Activity::Cycling, "cycling", QObject::tr("Cycling"));
++	entries_ += Entry(Activity::Exercising, Activity::Dancing, "dancing", QObject::tr("Dancing"));
++	entries_ += Entry(Activity::Exercising, Activity::Hiking, "hiking", QObject::tr("Hiking"));
++	entries_ += Entry(Activity::Exercising, Activity::Jogging, "jogging", QObject::tr("Jogging"));
++	entries_ += Entry(Activity::Exercising, Activity::PlayingSports, "playing_sports", QObject::tr("Playing Sports"));
++	entries_ += Entry(Activity::Exercising, Activity::Running, "running", QObject::tr("Running"));
++	entries_ += Entry(Activity::Exercising, Activity::Skiing, "skiing", QObject::tr("Skiing"));
++	entries_ += Entry(Activity::Exercising, Activity::Swimming, "swimming", QObject::tr("Swimming"));
++	entries_ += Entry(Activity::Exercising, Activity::WorkingOut, "working_out", QObject::tr("Working Out"));
++
++	entries_ += Entry(Activity::Grooming, "grooming", QObject::tr("Grooming"));
++	entries_ += Entry(Activity::Grooming, Activity::AtTheSpa, "at_the_spa", QObject::tr("At The Spa"));
++	entries_ += Entry(Activity::Grooming, Activity::BrushingTeeth, "brushing_teeth", QObject::tr("Brushing Teeth"));
++	entries_ += Entry(Activity::Grooming, Activity::GettingAHaircut, "getting_a_haircut", QObject::tr("Getting A Haircut"));
++	entries_ += Entry(Activity::Grooming, Activity::Shaving, "shaving", QObject::tr("Shaving"));
++	entries_ += Entry(Activity::Grooming, Activity::TakingABath, "taking_a_bath", QObject::tr("Taking A Bath"));
++	entries_ += Entry(Activity::Grooming, Activity::TakingAShower, "taking_a_shower", QObject::tr("Taking A Shower"));
++
++	entries_ += Entry(Activity::HavingAppointment, "having_appointment", QObject::tr("Having Appointment"));
++
++	entries_ += Entry(Activity::Inactive, "inactive", QObject::tr("Inactive"));
++	entries_ += Entry(Activity::Inactive, Activity::DayOff, "day_off", QObject::tr("Day Off"));
++	entries_ += Entry(Activity::Inactive, Activity::HangingOut, "hanging_out", QObject::tr("Hanging Out"));
++	entries_ += Entry(Activity::Inactive, Activity::Hiding, "hiding", QObject::tr("Hiding"));
++	entries_ += Entry(Activity::Inactive, Activity::OnVacation, "on_vacation", QObject::tr("On Vacation"));
++	entries_ += Entry(Activity::Inactive, Activity::Praying, "praying", QObject::tr("Praying"));
++	entries_ += Entry(Activity::Inactive, Activity::ScheduledHoliday, "scheduled_holiday", QObject::tr("Scheduled Holiday"));
++	entries_ += Entry(Activity::Inactive, Activity::Sleeping, "sleeping", QObject::tr("Sleeping"));
++	entries_ += Entry(Activity::Inactive, Activity::Thinking, "thinking", QObject::tr("Thinking"));
++
++	entries_ += Entry(Activity::Relaxing, "relaxing", QObject::tr("Relaxing"));
++	entries_ += Entry(Activity::Relaxing, Activity::Fishing, "fishing", QObject::tr("Fishing"));
++	entries_ += Entry(Activity::Relaxing, Activity::Gaming, "gaming", QObject::tr("Gaming"));
++	entries_ += Entry(Activity::Relaxing, Activity::GoingOut, "going_out", QObject::tr("Going Out"));
++	entries_ += Entry(Activity::Relaxing, Activity::Partying, "partying", QObject::tr("Partying"));
++	entries_ += Entry(Activity::Relaxing, Activity::Reading, "reading", QObject::tr("Reading"));
++	entries_ += Entry(Activity::Relaxing, Activity::Rehearsing, "rehearsing", QObject::tr("Rehearsing"));
++	entries_ += Entry(Activity::Relaxing, Activity::Shopping, "shopping", QObject::tr("Shopping"));
++	entries_ += Entry(Activity::Relaxing, Activity::Smoking, "smoking", QObject::tr("Smoking"));
++	entries_ += Entry(Activity::Relaxing, Activity::Socializing, "socializing", QObject::tr("Socializing"));
++	entries_ += Entry(Activity::Relaxing, Activity::Sunbathing, "sunbathing", QObject::tr("Sunbathing"));
++	entries_ += Entry(Activity::Relaxing, Activity::WatchingTv, "watching_tv", QObject::tr("Watching TV"));
++	entries_ += Entry(Activity::Relaxing, Activity::WatchingAMovie, "watching_a_movie", QObject::tr("Watching A Movie"));
++
++	entries_ += Entry(Activity::Talking, "talking", QObject::tr("Talking"));
++	entries_ += Entry(Activity::Talking, Activity::InRealLife, "in_real_life", QObject::tr("In Real Life"));
++	entries_ += Entry(Activity::Talking, Activity::OnThePhone, "on_the_phone", QObject::tr("On The Phone"));
++	entries_ += Entry(Activity::Talking, Activity::OnVideoPhone, "on_video_phone", QObject::tr("On Video Phone"));
++
++	entries_ += Entry(Activity::Traveling, "traveling", QObject::tr("Traveling"));
++	entries_ += Entry(Activity::Traveling, Activity::Commuting, "commuting", QObject::tr("Commuting"));
++	entries_ += Entry(Activity::Traveling, Activity::Cycling, "cycling", QObject::tr("Cycling"));
++	entries_ += Entry(Activity::Traveling, Activity::Driving, "driving", QObject::tr("Driving"));
++	entries_ += Entry(Activity::Traveling, Activity::InACar, "in_a_car", QObject::tr("In A Car"));
++	entries_ += Entry(Activity::Traveling, Activity::OnABus, "on_a_bus", QObject::tr("On A Bus"));
++	entries_ += Entry(Activity::Traveling, Activity::OnAPlane, "on_a_plane", QObject::tr("On A Plane"));
++	entries_ += Entry(Activity::Traveling, Activity::OnATrain, "on_a_train", QObject::tr("On A Train"));
++	entries_ += Entry(Activity::Traveling, Activity::OnATrip, "on_a_trip", QObject::tr("On A Trip"));
++	entries_ += Entry(Activity::Traveling, Activity::Walking, "walking", QObject::tr("Walking"));
++
++	entries_ += Entry(Activity::Working, "working", QObject::tr("Working"));
++	entries_ += Entry(Activity::Working, Activity::Coding, "coding", QObject::tr("Coding"));
++	entries_ += Entry(Activity::Working, Activity::InAMeeting, "in_a_meeting", QObject::tr("In A Meeting"));
++	entries_ += Entry(Activity::Working, Activity::Studying, "studying", QObject::tr("Studying"));
++	entries_ += Entry(Activity::Working, Activity::Writing, "writing", QObject::tr("Writing"));
++
++	// Undefined specific activity
++	entries_ += Entry(Activity::Unknown, Activity::Other, "other", QObject::tr("Other"));
++}
++
++ActivityCatalog* ActivityCatalog::instance()
++{
++	if (!instance_)
++		instance_ = new  ActivityCatalog();
++	return instance_;
++}
++
++ActivityCatalog::Entry ActivityCatalog::findEntryByType(Activity::Type type) const
++{
++	foreach(Entry e, entries_) {
++		if (e.type() == type)
++			return e;
++	}
++	return Entry();
++}
++
++ActivityCatalog::Entry ActivityCatalog::findEntryByType(Activity::SpecificType specificType) const
++{
++	foreach(Entry e, entries_) {
++		if (e.specificType() == specificType)
++			return e;
++	}
++	return Entry();
++}
++
++ActivityCatalog::Entry ActivityCatalog::findEntryByValue(const QString& value) const
++{
++	foreach(Entry e, entries_) {
++		if (e.value() == value)
++			return e;
++	}
++	return Entry();
++}
++
++ActivityCatalog::Entry ActivityCatalog::findEntryByText(const QString& text) const
++{
++	foreach(Entry e, entries_) {
++		if (e.text() == text)
++			return e;
++	}
++	return Entry();
++}
++
++const QList<ActivityCatalog::Entry>& ActivityCatalog::entries() const
++{
++	return entries_;
++}
++
++ActivityCatalog* ActivityCatalog::instance_ = 0;
+--- git.orig/src/activitycatalog.h
++++ git/src/activitycatalog.h
+@@ -0,0 +1,69 @@
++/*
++ * activitycatalog.h
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ACTIVITYCATALOG_H
++#define ACTIVITYCATALOG_H
++
++#include <QList>
++#include <QObject>
++
++#include "activity.h"
++
++class QString;
++
++class ActivityCatalog : public QObject
++{
++public:
++	class Entry {
++		public:
++			Entry();
++			Entry(Activity::Type, const QString&, const QString&);
++			Entry(Activity::Type, Activity::SpecificType, const QString&, const QString&);
++			Activity::Type type() const;
++			Activity::SpecificType specificType() const;
++			const QString& value() const;
++			const QString& text() const;
++			bool isNull() const;
++
++		private:
++			Activity::Type type_;
++			Activity::SpecificType specificType_;
++			QString value_;
++			QString text_;
++	};
++
++	static ActivityCatalog* instance();
++
++	Entry findEntryByType(Activity::Type) const;
++	Entry findEntryByType(Activity::SpecificType) const;
++	Entry findEntryByValue(const QString&) const;
++	Entry findEntryByText(const QString& text) const;
++
++	const QList<Entry>& entries() const;
++
++private:
++	ActivityCatalog();
++
++	QList<Entry> entries_;
++	static ActivityCatalog* instance_;
++
++};
++
++#endif
+--- git.orig/src/activity.cpp
++++ git/src/activity.cpp
+@@ -0,0 +1,130 @@
++/*
++ * activity.cpp
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include <QDomDocument>
++#include <QDomElement>
++
++#include "activity.h"
++#include "activitycatalog.h"
++
++Activity::Activity()
++{
++	type_ = Unknown;
++	specificType_ = UnknownSpecific;
++}
++
++Activity::Activity(Activity::Type type, Activity::SpecificType specificType, const QString& text)
++{
++	type_ = type;
++	specificType_ = specificType;
++	text_ = text;
++}
++
++Activity::Activity(const QDomElement& e)
++{
++	fromXml(e);
++}
++
++Activity::Type Activity::type() const
++{
++	return type_;
++}
++
++QString Activity::typeText() const
++{
++	return ActivityCatalog::instance()->findEntryByType(type_).text();
++}
++
++Activity::SpecificType Activity::specificType() const
++{
++	return specificType_;
++}
++
++QString Activity::specificTypeText() const
++{
++	return ActivityCatalog::instance()->findEntryByType(specificType_).text();
++}
++
++const QString& Activity::text() const
++{
++	return text_;
++}
++
++bool Activity::isNull() const
++{
++	return type_ == Unknown && text().isEmpty();
++}
++
++QDomElement Activity::toXml(QDomDocument& doc)
++{
++	QDomElement activity = doc.createElement("activity");
++	activity.setAttribute("xmlns", "http://jabber.org/protocol/activity");
++
++	if (!type() == Unknown) {
++		ActivityCatalog* ac = ActivityCatalog::instance();
++		QDomElement el = doc.createElement(ac->findEntryByType(type()).value());
++
++		if (!specificType() == UnknownSpecific) {
++			QDomElement elChild = doc.createElement(ac->findEntryByType(specificType()).value());
++			el.appendChild(elChild);
++		}
++
++		activity.appendChild(el);
++	}
++	else {
++		qWarning("activity.cpp: ERROR: Converting unknown activity");
++	}
++
++	if (!text().isEmpty()) {
++		QDomElement el = doc.createElement("text");
++		QDomText t = doc.createTextNode(text());
++		el.appendChild(t);
++		activity.appendChild(el);
++	}
++
++	return activity;
++}
++
++void Activity::fromXml(const QDomElement& element)
++{
++	if (element.tagName() != "activity")
++		return;
++
++	type_ = Activity::Unknown;
++	specificType_ = Activity::UnknownSpecific;
++
++	for (QDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) {
++		QDomElement child = node.toElement();
++		if (child.tagName() == "text") {
++			text_ = child.text();
++		}
++		else {
++			ActivityCatalog* ac = ActivityCatalog::instance();
++			type_ = ac->findEntryByValue(child.tagName()).type();
++
++			if (child.hasChildNodes()) {
++				QDomElement specificTypeElement = child.firstChildElement();
++				if (!specificTypeElement.isNull()) {
++					specificType_ = ac->findEntryByValue(specificTypeElement.tagName()).specificType();
++				}
++			}
++		}
++	}
++}
+--- git.orig/src/activitydlg.cpp
++++ git/src/activitydlg.cpp
+@@ -0,0 +1,90 @@
++/*
++ * activitydlg.cpp
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "xmpp_pubsubitem.h"
++#include "xmpp_client.h"
++#include "xmpp_task.h"
++#include "activitydlg.h"
++#include "activitycatalog.h"
++#include "psiaccount.h"
++#include "pepmanager.h"
++
++ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
++{
++	setAttribute(Qt::WA_DeleteOnClose);
++	ui_.setupUi(this);
++	setModal(false);
++	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
++	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
++	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
++
++	ui_.cb_general_type->addItem(tr("<unset>"));
++	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
++		if (e.specificType() == Activity::UnknownSpecific) {
++			// The entry e is for a 'general' type.
++			ui_.cb_general_type->addItem(e.text());
++		}
++	}
++}
++
++void ActivityDlg::loadSpecificActivities(const QString& generalActivityStr)
++{
++	ui_.cb_specific_type->clear();
++
++	if (generalActivityStr == tr("<unset>")) {
++		return;
++	}
++	else {
++		ui_.cb_specific_type->addItem(tr("<unset>"));
++		ActivityCatalog* ac = ActivityCatalog::instance();
++		foreach(ActivityCatalog::Entry e, ac->entries()) {
++			if (e.specificType() != Activity::UnknownSpecific) {
++				// The entry e is for a 'specific' type.
++				ActivityCatalog::Entry ge = ac->findEntryByText(generalActivityStr);
++				if (e.type() == ge.type()) {
++					ui_.cb_specific_type->addItem(e.text());
++				}
++			}
++		}
++	}
++
++	ui_.cb_specific_type->addItem(tr("Other"));
++}
++
++void ActivityDlg::setActivity()
++{
++	QString generalActivityStr  = ui_.cb_general_type->currentText();
++	QString specificActivityStr = ui_.cb_specific_type->currentText();
++
++	if (generalActivityStr == tr("<unset>")) {
++		pa_->pepManager()->retract("http://jabber.org/protocol/activity", "current");
++	}
++	else {
++		ActivityCatalog* ac = ActivityCatalog::instance();
++		Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
++
++		Activity::SpecificType specificType = Activity::UnknownSpecific;
++		if (specificActivityStr != tr("<unset>")) {
++			specificType = ac->findEntryByText(specificActivityStr).specificType();
++		}
++		pa_->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++	}
++	close();
++}
+--- git.orig/src/activitydlg.h
++++ git/src/activitydlg.h
+@@ -0,0 +1,46 @@
++/*
++ * activitydlg.h
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ACTIVITYDLG_H
++#define ACTIVITYDLG_H
++
++#include <QDialog>
++
++#include "ui_activity.h"
++
++class PsiAccount;
++
++class ActivityDlg : public QDialog
++{
++	Q_OBJECT
++
++public:
++	ActivityDlg(PsiAccount*);
++
++protected slots:
++	void setActivity();
++	void loadSpecificActivities(const QString&);
++
++private:
++	Ui::Activity ui_;
++	PsiAccount* pa_;
++};
++
++#endif
+--- git.orig/src/activity.h
++++ git/src/activity.h
+@@ -0,0 +1,94 @@
++/*
++ * activiy.h
++ * Copyright (C) 2008 Armando Jagucki
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ACTIVITY_H
++#define ACTIVITY_H
++
++#include <QString>
++
++class QDomElement;
++class QDomDocument;
++
++class Activity
++{
++public:
++	enum Type {
++		Unknown,
++		DoingChores, Drinking, Eating, Exercising, Grooming,
++		HavingAppointment, Inactive, Relaxing, Talking, Traveling,
++		Working
++	};
++
++	enum SpecificType {
++		UnknownSpecific,
++		// under 'doing_chores'
++		BuyingGroceries, Cleaning, Cooking, DoingMaintenance,
++		DoingTheDishes, DoingTheLaundry, Gardening, RunningAnErrand,
++		WalkingTheDog,
++		// under 'drinking'
++		HavingABeer, HavingCoffee, HavingTea,
++		// under 'eating'
++		HavingASnack, HavingBreakfast, HavingLunch, HavingDinner,
++		// under 'excercising'
++		Cycling, Dancing, Hiking, Jogging, PlayingSports, Running, Skiing,
++		Swimming, WorkingOut,
++		// under 'grooming'
++		AtTheSpa, BrushingTeeth, GettingAHaircut, Shaving, TakingABath,
++		TakingAShower,
++		// under 'having_appointment'
++		// under 'inactive'
++		DayOff, HangingOut, Hiding, OnVacation, Praying, ScheduledHoliday, Sleeping, Thinking,
++		// under 'relaxing'
++		Fishing, Gaming, GoingOut, Partying, Reading, Rehearsing, Shopping, Smoking,
++		Socializing, Sunbathing, WatchingTv, WatchingAMovie,
++		// under 'talking'
++		InRealLife, OnThePhone, OnVideoPhone,
++		// under 'traveling'
++		Commuting, /* Cycling (already included), */ Driving, InACar,
++		OnABus, OnAPlane, OnATrain, OnATrip, Walking,
++		// under 'working'
++		Coding, InAMeeting, Studying, Writing,
++		// undefined specific activity
++		Other
++	};
++
++	Activity();
++	Activity(Type, SpecificType, const QString& = QString());
++	Activity(const QDomElement&);
++
++	Type type() const;
++	QString typeText() const;
++	SpecificType specificType() const;
++	QString specificTypeText() const;
++	const QString& text() const;
++	bool isNull() const;
++
++	QDomElement toXml(QDomDocument&);
++
++protected:
++	void fromXml(const QDomElement&);
++
++private:
++	Type type_;
++	SpecificType specificType_;
++	QString text_;
++};
++
++#endif
+--- git.orig/src/activity.ui
++++ git/src/activity.ui
+@@ -0,0 +1,113 @@
++<ui version="4.0" >
++ <class>Activity</class>
++ <widget class="QDialog" name="Activity" >
++  <property name="geometry" >
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>313</width>
++    <height>162</height>
++   </rect>
++  </property>
++  <property name="windowTitle" >
++   <string>User Activity</string>
++  </property>
++  <layout class="QVBoxLayout" >
++   <item>
++    <layout class="QGridLayout" >
++     <item row="0" column="0" >
++      <widget class="QLabel" name="label" >
++       <property name="text" >
++        <string>General:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="0" column="1" >
++      <widget class="QComboBox" name="cb_general_type" />
++     </item>
++     <item row="1" column="0" >
++      <widget class="QLabel" name="label_3" >
++       <property name="text" >
++        <string>Specific:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="1" column="1" >
++      <widget class="QComboBox" name="cb_specific_type" />
++     </item>
++     <item row="2" column="0" >
++      <widget class="QLabel" name="label_2" >
++       <property name="text" >
++        <string>Description:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="2" column="1" >
++      <widget class="QLineEdit" name="le_description" />
++     </item>
++    </layout>
++   </item>
++   <item>
++    <spacer>
++     <property name="orientation" >
++      <enum>Qt::Vertical</enum>
++     </property>
++     <property name="sizeHint" >
++      <size>
++       <width>223</width>
++       <height>16</height>
++      </size>
++     </property>
++    </spacer>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" >
++     <property name="spacing" >
++      <number>6</number>
++     </property>
++     <property name="leftMargin" >
++      <number>0</number>
++     </property>
++     <property name="topMargin" >
++      <number>0</number>
++     </property>
++     <property name="rightMargin" >
++      <number>0</number>
++     </property>
++     <property name="bottomMargin" >
++      <number>0</number>
++     </property>
++     <item>
++      <spacer>
++       <property name="orientation" >
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" >
++        <size>
++         <width>131</width>
++         <height>31</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="QPushButton" name="pb_ok" >
++       <property name="text" >
++        <string>OK</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="pb_cancel" >
++       <property name="text" >
++        <string>Cancel</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/contactlistaccountmenu.cpp
++++ git/src/contactlistaccountmenu.cpp
+@@ -37,6 +37,7 @@ class ContactListAccountMenu::Private :
+ 	QPointer<ContactListAccountGroup> account;
+ 	StatusMenu* statusMenu_;
+ 	QAction* moodAction_;
++	QAction* activityAction_;
+ 	QAction* setAvatarAction_;
+ 	QMenu* avatarMenu_;
+ 	QAction* unsetAvatarAction_;
+@@ -72,6 +73,9 @@ public:
+ 		moodAction_ = new QAction(tr("Mood"), this);
+ 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
+ 
++		activityAction_ = new QAction(tr("Activity"), this);
++		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
++
+ 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
+ 		connect(setAvatarAction_, SIGNAL(triggered()), SLOT(setAvatar()));
+ 
+@@ -113,6 +117,7 @@ public:
+ 
+ 		menu->addMenu(statusMenu_);
+ 		menu->addAction(moodAction_);
++		menu->addAction(activityAction_);
+ 		avatarMenu_ = menu->addMenu(tr("Avatar"));
+ 		avatarMenu_->addAction(setAvatarAction_);
+ 		avatarMenu_->addAction(unsetAvatarAction_);
+@@ -150,9 +155,11 @@ private slots:
+ 		statusMenu_->setStatus(account->account()->status().type());
+ #ifndef USE_PEP
+ 		moodAction_->setVisible(false);
++		activityAction_->setVisible(false);
+ 		avatarMenu_->setVisible(false);
+ #else
+ 		moodAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
++		activityAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
+ 		avatarMenu_->setEnabled(account->account()->serverInfoManager()->hasPEP());
+ #endif
+ 		bookmarksMenu_->clear();
+@@ -204,6 +211,14 @@ private slots:
+ 		account->account()->actionSetMood();
+ 	}
+ 
++	void setActivity()
++	{
++		if (!account)
++			return;
++
++		account->account()->actionSetActivity();
++	}
++
+ 	void setAvatar()
+ 	{
+ 		if (!account)
+--- git.orig/src/contactview.cpp
++++ git/src/contactview.cpp
+@@ -954,11 +954,14 @@ void ContactProfile::doContextMenu(Conta
+ 		pm.insertItem(tr("Mood"), 11);
+ 		pm.setItemEnabled(11, d->pa->serverInfoManager()->hasPEP());
+ 
++		pm.insertItem(tr("Activity"), 12);
++		pm.setItemEnabled(12, d->pa->serverInfoManager()->hasPEP());
++
+ 		QMenu *avatarm = new QMenu (&pm);
+-		avatarm->insertItem(tr("Set Avatar"), 12);
+-		avatarm->insertItem(tr("Unset Avatar"), 13);
+-		pm.insertItem(tr("Avatar"), avatarm, 14);
+-		pm.setItemEnabled(14, d->pa->serverInfoManager()->hasPEP());
++		avatarm->insertItem(tr("Set Avatar"), 13);
++		avatarm->insertItem(tr("Unset Avatar"), 14);
++		pm.insertItem(tr("Avatar"), avatarm, 15);
++		pm.setItemEnabled(15, d->pa->serverInfoManager()->hasPEP());
+ #endif
+ 		const int bookmarks_start = STATUS_CHAT + status_start + 1; // STATUS_CHAT is the highest value of the states
+ 		QMenu *bookmarks = new QMenu(&pm);
+@@ -1038,10 +1041,13 @@ void ContactProfile::doContextMenu(Conta
+ 		else if(x == 11 && pm.isItemEnabled(11)) {
+ 			emit actionSetMood();
+ 		}
+-		else if(x == 12  && pm.isItemEnabled(14)) {
++		else if(x == 12 && pm.isItemEnabled(12)) {
++			emit actionSetActivity();
++		}
++		else if(x == 13  && pm.isItemEnabled(15)) {
+ 			emit actionSetAvatar();
+ 		}
+-		else if(x == 13  && pm.isItemEnabled(14)) {
++		else if(x == 14  && pm.isItemEnabled(15)) {
+ 			emit actionUnsetAvatar();
+ 		}
+ 		else if(x >= status_start && x <= STATUS_CHAT + status_start) { // STATUS_CHAT is the highest value of the states
+--- git.orig/src/contactview.h
++++ git/src/contactview.h
+@@ -124,6 +124,7 @@ signals:
+ 	void actionAssignKey(const Jid &);
+ 	void actionUnassignKey(const Jid &);
+ 	void actionSetMood();
++	void actionSetActivity();
+ 	void actionSetAvatar();
+ 	void actionUnsetAvatar();
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -83,6 +83,7 @@
+ # include "contactview.h"
+ #endif
+ #include "mood.h"
++#include "activity.h"
+ #include "tune.h"
+ #ifdef GROUPCHAT
+ #include "groupchatdlg.h"
+@@ -116,6 +117,7 @@
+ #include "vcardfactory.h"
+ //#include "qssl.h"
+ #include "mooddlg.h"
++#include "activitydlg.h"
+ #include "qwextend.h"
+ #include "geolocation.h"
+ #include "physicallocation.h"
+@@ -1240,6 +1242,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	if (PsiOptions::instance()->getOption("options.extended-presence.notify").toBool()) {
+ 		QStringList pepNodes;
+ 		pepNodes += "http://jabber.org/protocol/mood+notify";
++		pepNodes += "http://jabber.org/protocol/activity+notify";
+ 		pepNodes += "http://jabber.org/protocol/tune+notify";
+ 		pepNodes += "http://jabber.org/protocol/physloc+notify";
+ 		pepNodes += "http://jabber.org/protocol/geoloc+notify";
+@@ -2244,6 +2247,7 @@ void PsiAccount::setPEPAvailable(bool b)
+ 	if (b && !d->client->extensions().contains("ep")) {
+ 		QStringList pepNodes;
+ 		pepNodes += "http://jabber.org/protocol/mood";
++		pepNodes += "http://jabber.org/protocol/activity";
+ 		pepNodes += "http://jabber.org/protocol/tune";
+ 		pepNodes += "http://jabber.org/protocol/physloc";
+ 		pepNodes += "http://jabber.org/protocol/geoloc";
+@@ -3421,6 +3425,12 @@ void PsiAccount::itemRetracted(const Jid
+ 			cpUpdate(*u);
+ 		}
+ 	}
++	else if (n == "http://jabber.org/protocol/activity") {
++		foreach(UserListItem* u, findRelevant(j)) {
++			u->setActivity(Activity());
++			cpUpdate(*u);
++		}
++	}
+ 	else if (n == "http://jabber.org/protocol/geoloc") {
+ 		// FIXME: try to find the right resource using JEP-33 'replyto'
+ 		// see tune case above
+@@ -3473,6 +3483,13 @@ void PsiAccount::itemPublished(const Jid
+ 			cpUpdate(*u);
+ 		}
+ 	}
++	else if (n == "http://jabber.org/protocol/activity") {
++		Activity activity(item.payload());
++		foreach(UserListItem* u, findRelevant(j)) {
++			u->setActivity(activity);
++			cpUpdate(*u);
++		}
++	}
+ 	else if (n == "http://jabber.org/protocol/geoloc") {
+ 		// FIXME: try to find the right resource using JEP-33 'replyto'
+ 		// see tune case above
+@@ -3789,6 +3806,12 @@ void PsiAccount::actionSetMood()
+ 	w->show();
+ }
+ 
++void PsiAccount::actionSetActivity()
++{
++	ActivityDlg *w = new ActivityDlg(this);
++	w->show();
++}
++
+ void PsiAccount::actionSetAvatar()
+ {
+ 	QString str = FileUtil::getImageFileName(0);
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -361,6 +361,7 @@ public slots:
+ 	void actionExecuteCommand(const Jid& j, const QString& = QString());
+ 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
+ 	void actionSetMood();
++	void actionSetActivity();
+ 	void actionSetAvatar();
+ 	void actionUnsetAvatar();
+ 	void featureActivated(QString feature, Jid jid, QString node);
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -607,6 +607,7 @@ bool PsiCon::init()
+ 
+ 	registerCaps("ep", QStringList()
+ 				 << "http://jabber.org/protocol/mood"
++				 << "http://jabber.org/protocol/activity"
+ 				 << "http://jabber.org/protocol/tune"
+ 				 << "http://jabber.org/protocol/physloc"
+ 				 << "http://jabber.org/protocol/geoloc"
+@@ -616,6 +617,7 @@ bool PsiCon::init()
+ 
+ 	registerCaps("ep-notify-2", QStringList()
+ 				 << "http://jabber.org/protocol/mood+notify"
++				 << "http://jabber.org/protocol/activity+notify"
+ 				 << "http://jabber.org/protocol/tune+notify"
+ 				 << "http://jabber.org/protocol/physloc+notify"
+ 				 << "http://jabber.org/protocol/geoloc+notify"
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -173,6 +173,9 @@ HEADERS += \
+ 	$$PWD/mood.h \
+ 	$$PWD/moodcatalog.h \
+ 	$$PWD/mooddlg.h \
++	$$PWD/activity.h \
++	$$PWD/activitycatalog.h \
++	$$PWD/activitydlg.h \
+ 	$$PWD/geolocation.h \
+ 	$$PWD/physicallocation.h \
+ 	$$PWD/urlbookmark.h \
+@@ -308,6 +311,9 @@ SOURCES += \
+ 	$$PWD/mood.cpp \
+ 	$$PWD/moodcatalog.cpp \
+ 	$$PWD/mooddlg.cpp \
++	$$PWD/activity.cpp \
++	$$PWD/activitycatalog.cpp \
++	$$PWD/activitydlg.cpp \
+ 	$$PWD/geolocation.cpp \
+ 	$$PWD/physicallocation.cpp \
+ 	$$PWD/urlbookmark.cpp \
+@@ -562,6 +568,7 @@ FORMS += \
+ 	$$PWD/disco.ui \
+ 	$$PWD/tip.ui \
+ 	$$PWD/mood.ui \
++	$$PWD/activity.ui \
+ 	$$PWD/voicecall.ui \
+ 	$$PWD/chatdlg.ui \
+ 	$$PWD/bookmarkmanage.ui \
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -319,6 +319,16 @@ const Mood& UserListItem::mood() const
+ 	return v_mood;
+ }
+ 
++void UserListItem::setActivity(const Activity& activity)
++{
++	v_activity = activity;
++}
++
++const Activity& UserListItem::activity() const
++{
++	return v_activity;
++}
++
+ void UserListItem::setTune(const QString& t)
+ {
+ 	v_tune = t;
+@@ -492,6 +502,17 @@ QString UserListItem::makeBareTip(bool t
+ 	if(!v_keyID.isEmpty())
+ 		str += QString("<div style='white-space:pre'>") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
+ 
++	// User Activity
++	if (!activity().isNull()) {
++		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " + activity().typeText();
++		if (activity().specificType() != Activity::UnknownSpecific) {
++			str += QString(" - ") + activity().specificTypeText();
++		}
++		if (!activity().text().isEmpty())
++			str += QString(" (") + activity().text() + QString(")");
++		str += "</div>";
++	}
++
+ 	// User Mood
+ 	if (!mood().isNull()) {
+ 		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
+--- git.orig/src/userlist.h
++++ git/src/userlist.h
+@@ -28,6 +28,7 @@
+ #include "xmpp_resource.h"
+ #include "xmpp_liverosteritem.h"
+ #include "mood.h"
++#include "activity.h"
+ #include "geolocation.h"
+ #include "physicallocation.h"
+ #include "maybe.h"
+@@ -123,6 +124,7 @@ public:
+ 	QString makeDesc() const;
+ 	bool isPrivate() const;
+ 	const Mood& mood() const;
++	const Activity& activity() const;
+ 
+ 	void setJid(const XMPP::Jid &);
+ 	void setInList(bool);
+@@ -130,6 +132,7 @@ public:
+ 	void setPresenceError(const QString &);
+ 	void setPrivate(bool);
+ 	void setMood(const Mood&);
++	void setActivity(const Activity&);
+ 	void setTune(const QString&);
+ 	const QString& tune() const;
+ 	void setGeoLocation(const GeoLocation&);
+@@ -161,6 +164,7 @@ private:
+ 	QString v_keyID;
+ 	QPixmap v_avatar;
+ 	Mood v_mood;
++	Activity v_activity;
+ 	QString v_tune;
+ 	GeoLocation v_geoLocation;
+ 	PhysicalLocation v_physicalLocation;

psi-plus-main-20141106.tar.xz/patches/0110-psi-tab-status-icon.diff Added

@@ -0,0 +1,304 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -353,6 +353,7 @@
+ 				<recent-jids type="QStringList" />
+ 			</service-discovery>
+ 			<tabs>
++				<show-tab-icons type="bool">true</show-tab-icons>
+ 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
+ 				<use-tabs type="bool">false</use-tabs>
+ 				<size type="QString"></size> 
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -182,15 +182,6 @@ void ChatDlg::initActions()
+ 	connect(act_scrolldown_, SIGNAL(triggered()), chatView(), SLOT(scrollDown()));
+ }
+ 
+-void ChatDlg::ensureTabbedCorrectly()
+-{
+-	TabbableWidget::ensureTabbedCorrectly();
+-	setShortcuts();
+-	if(!isTabbed() && geometryOptionPath().isEmpty()) {
+-		setGeometryOptionPath(geometryOption);
+-	}
+-}
+-
+ void ChatDlg::ackLastMessages(int a)
+ {
+ 	Q_UNUSED(a);
+@@ -423,6 +414,18 @@ UserStatus userStatusFor(const Jid& jid,
+ 	return u;
+ }
+ 
++void ChatDlg::ensureTabbedCorrectly()
++{
++	TabbableWidget::ensureTabbedCorrectly();
++	setShortcuts();
++	QList<UserListItem*> ul = account()->findRelevant(jid());
++	UserStatus userStatus = userStatusFor(jid(), ul, false);
++	setTabIcon(PsiIconset::instance()->statusPtr(jid(), userStatus.statusType)->icon());
++	if(!isTabbed() && geometryOptionPath().isEmpty()) {
++		setGeometryOptionPath(geometryOption);
++	}
++}
++
+ void ChatDlg::updateContact(const Jid &j, bool fromPresence)
+ {
+ 	// if groupchat, only update if the resource matches
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -751,6 +751,13 @@ void GCMainDlg::ensureTabbedCorrectly()
+ 	QList<int> tmp = ui_.hsplitter->sizes();
+ 	ui_.hsplitter->setSizes(QList<int>() << 0);
+ 	ui_.hsplitter->setSizes(tmp);
++	UserListItem* u = account()->find(jid().bare());
++	if(u) {
++		setTabIcon(PsiIconset::instance()->statusPtr(u)->icon());
++	}
++	else {
++		setStatusTabIcon((d->state == Private::Connected ? STATUS_ONLINE : STATUS_OFFLINE));
++	}
+ 	if(!isTabbed() && geometryOptionPath().isEmpty()) {
+ 		setGeometryOptionPath(geometryOption);
+ 	}
+@@ -1045,6 +1052,7 @@ void GCMainDlg::goDisc()
+ 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
+ 		d->state = Private::Idle;
+ 		ui_.pb_topic->setEnabled(false);
++		setStatusTabIcon(STATUS_OFFLINE);
+ 		appendSysMsg(tr("Disconnected."), true);
+ 		ui_.mle->chatEdit()->setEnabled(false);
+ 	}
+@@ -1137,6 +1145,7 @@ PsiAccount* GCMainDlg::account() const
+ void GCMainDlg::error(int, const QString &str)
+ {
+ 	ui_.pb_topic->setEnabled(false);
++	setStatusTabIcon(STATUS_ERROR);
+ 
+ 	if(d->state == Private::Connecting)
+ 		appendSysMsg(tr("Unable to join groupchat.	Reason: %1").arg(str), true);
+@@ -1190,6 +1199,8 @@ void GCMainDlg::presence(const QString &
+ 	}
+ 
+ 	if (nick == d->self) {
++		if(s.isAvailable())
++			setStatusTabIcon(s.type());
+ 		// Update configuration dialog
+ 		if (d->configDlg) {
+ 			d->configDlg->setRoleAffiliation(s.mucItem().role(),s.mucItem().affiliation());
+@@ -1465,6 +1476,7 @@ void GCMainDlg::joined()
+ 		ui_.lv_users->clear();
+ 		d->state = Private::Connected;
+ 		ui_.pb_topic->setEnabled(true);
++		setStatusTabIcon(STATUS_ONLINE);
+ 		ui_.mle->chatEdit()->setEnabled(true);
+ 		setConnecting();
+ 		appendSysMsg(tr("Connected."), true);
+@@ -1772,6 +1784,11 @@ int GCMainDlg::unreadMessageCount() cons
+ 	return d->pending;
+ }
+ 
++void GCMainDlg::setStatusTabIcon(int status)
++{
++	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
++}
++
+ //----------------------------------------------------------------------------
+ // GCFindDlg
+ //----------------------------------------------------------------------------
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -94,6 +94,7 @@ protected:
+ 	void dropEvent(QDropEvent *);
+ 	void closeEvent(QCloseEvent *);
+ 	void mucInfoDialog(const QString& title, const QString& message, const Jid& actor, const QString& reason);
++	void setStatusTabIcon(int status);
+ 
+ signals:
+ 	void aSend(const Message &);
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -180,6 +180,7 @@ void PsiChatDlg::initUi()
+ 
+ 	PsiToolTip::install(ui_.lb_status);
+ 	ui_.lb_status->setPsiIcon(IconsetFactory::iconPtr("status/noauth"));
++	setTabIcon(IconsetFactory::iconPtr("status/noauth")->icon());
+ 
+ 	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
+ 
+@@ -413,6 +414,7 @@ void PsiChatDlg::contactUpdated(UserList
+ 
+ 	if (unacked_messages == 0) {
+ 		ui_.lb_status->setPsiIcon(current_status_icon);
++		setTabIcon(current_status_icon->icon());//FIXME
+ 	} else {
+ 		ui_.lb_status->setPsiIcon(throbber_icon);
+ 	}
+--- git.orig/src/tabs/tabbablewidget.cpp
++++ git/src/tabs/tabbablewidget.cpp
+@@ -209,3 +209,20 @@ void TabbableWidget::changeEvent(QEvent*
+ 		}
+ 	}
+ }
++
++/**
++ * Set the icon of the tab.
++ */
++void TabbableWidget::setTabIcon(const QIcon &icon)
++{
++	icon_ = icon;
++	TabDlg* tabDlg = tabManager_->getManagingTabs(this);
++	if (tabDlg) {
++		tabDlg->setTabIcon(this, icon);
++	}
++}
++
++const QIcon &TabbableWidget::icon() const
++{
++	return icon_;
++}
+--- git.orig/src/tabs/tabbablewidget.h
++++ git/src/tabs/tabbablewidget.h
+@@ -21,6 +21,7 @@
+ #ifndef TABBABLE_H
+ #define TABBABLE_H
+ 
++#include <QIcon>
+ #include "advwidget.h"
+ #include "im.h" // ChatState
+ 
+@@ -42,6 +43,8 @@ public:
+ 	~TabbableWidget();
+ 
+ 	PsiAccount* account() const;
++	void setTabIcon(const QIcon &);
++	const QIcon &icon() const;
+ 
+ 	virtual Jid jid() const;
+ 	virtual const QString & getDisplayName();
+@@ -86,6 +89,7 @@ private:
+ 	Jid jid_;
+ 	PsiAccount *pa_;
+ 	TabManager *tabManager_;
++	QIcon icon_;
+ };
+ 
+ #endif
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -398,7 +398,7 @@ void TabDlg::addTab(TabbableWidget* tab)
+ {
+ 	setUpdatesEnabled(false);
+ 	tabs_.append(tab);
+-	tabWidget_->addTab(tab, captionForTab(tab));
++	tabWidget_->addTab(tab, captionForTab(tab), tab->icon());
+ 
+ 	connect(tab, SIGNAL(invalidateTabInfo()), SLOT(updateTab()));
+ 	connect(tab, SIGNAL(updateFlashState()), SLOT(updateFlashState()));
+@@ -593,12 +593,15 @@ void TabDlg::updateTab(TabbableWidget* c
+ 
+ 	if (chat->state() == TabbableWidget::StateComposing) {
+ 		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
++		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
+ 	}
+ 	else if (chat->unreadMessageCount()) {
+ 		tabWidget_->setTabTextColor(chat, Qt::red);
++		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
+ 	}
+ 	else {
+ 		tabWidget_->setTabTextColor(chat, palette().windowText().color());
++		tabWidget_->setTabIcon(chat, chat->icon());
+ 	}
+ 	updateCaption();
+ }
+@@ -817,3 +820,11 @@ TabbableWidget* TabDlg::getCurrentTab()
+ {
+ 	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
+ }
++
++/**
++ * Set the icon of the tab.
++ */
++void TabDlg::setTabIcon(QWidget *widget,const QIcon &icon)
++{
++	tabWidget_->setTabIcon(widget, icon);
++}
+--- git.orig/src/tabs/tabdlg.h
++++ git/src/tabs/tabdlg.h
+@@ -87,6 +87,7 @@ public:
+ 	void setTabBarShownForSingles(bool enabled); // default enabled
+ 	void setSimplifiedCaptionEnabled(bool enabled); // default disabled
+ 	TabbableWidget* getCurrentTab() const;
++	void setTabIcon(QWidget *,const QIcon &);
+ 
+ protected:
+ 	void setShortcuts();
+--- git.orig/src/widgets/psitabwidget.cpp
++++ git/src/widgets/psitabwidget.cpp
+@@ -21,6 +21,7 @@
+ #include "psitabwidget.h"
+ #include "psitabbar.h"
+ #include "common.h"
++#include "psioptions.h"
+ #include <QWidget>
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+@@ -155,14 +156,18 @@ int PsiTabWidget::currentPageIndex() {
+ /**
+  * Add the Widget to the tab stack.
+  */
+-void PsiTabWidget::addTab(QWidget *widget, QString name) {
++void PsiTabWidget::addTab(QWidget *widget, QString name, const QIcon &icon)
++{
+ 	Q_ASSERT(widget);
+ 	if (widgets_.contains(widget)) {
+ 		return;
+ 	}
+ 	widgets_.append(widget);
+ 	stacked_->addWidget(widget);
+-	tabBar_->addTab(name);
++	if (PsiOptions::instance()->getOption("options.ui.tabs.show-tab-icons").toBool())
++		tabBar_->addTab(icon, name);
++	else
++		tabBar_->addTab(name);
+ 	showPage(currentPage());
+ }
+ 
+@@ -230,6 +235,18 @@ void PsiTabWidget::setTabText(QWidget* w
+ 	tabBar_->setTabText(index, label);
+ }
+ 
++/**
++ * Set the icon of the tab.
++ */
++void PsiTabWidget::setTabIcon(QWidget *widget, const QIcon &icon)
++{
++	int index = getIndex(widget);
++	if (index == -1 || !PsiOptions::instance()->getOption("options.ui.tabs.show-tab-icons").toBool()) {
++		return;
++	}
++	tabBar_->setTabIcon(index, icon);
++}
++
+ void PsiTabWidget::setCurrentPage(int index) {
+ 	if (index >= 0 && index < count()) {
+ 		showPage(widgets_[index]);
+--- git.orig/src/widgets/psitabwidget.h
++++ git/src/widgets/psitabwidget.h
+@@ -48,7 +48,7 @@ public:
+ 	QWidget *currentPage();
+ 	int currentPageIndex();
+ 	QWidget *widget(int index);
+-	void addTab(QWidget *, QString);
++	void addTab(QWidget *, QString, const QIcon &icon = QIcon());
+ 	void showPage(QWidget *);
+ 	void showPageDirectly(QWidget *);
+ 
+@@ -56,6 +56,7 @@ public:
+ 	QWidget* page(int index);
+ 	int getIndex(QWidget *);
+ 	void setTabText(QWidget *, const QString &);
++	void setTabIcon(QWidget *, const QIcon &);
+ 	void setTabPosition(QTabWidget::TabPosition pos);
+ 	void setCloseIcon(const QIcon &);
+

psi-plus-main-20141106.tar.xz/patches/0120-psi-typed-history.diff Added

@@ -0,0 +1,227 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -426,6 +426,10 @@
+ 				</send>
+ 				<clear type="QKeySequence" comment="Clear the text"/>
+ 				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
++				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
++				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
++				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
++				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
+ 			</chat>
+ 			<contactlist comment="Shortcuts in the contactlist">
+ 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -693,6 +693,7 @@ void ChatDlg::doSend()
+ 	}
+ 
+ 	m_ = m;
++	emit chatEdit()->appendMessageHistory(m.body());
+ 
+ 	// Request events
+ 	if (PsiOptions::instance()->getOption("options.messages.send-composing-events").toBool()) {
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -936,6 +936,7 @@ void GCMainDlg::mle_returnPressed()
+ 	m.setType("groupchat");
+ 	m.setBody(str);
+ 	m.setTimeStamp(QDateTime::currentDateTime());
++	emit d->mle()->appendMessageHistory(m.body());
+ 
+ 	aSend(m);
+ 
+--- git.orig/src/msgmle.cpp
++++ git/src/msgmle.cpp
+@@ -58,13 +58,45 @@ ChatEdit::ChatEdit(QWidget *parent)
+ 	previous_position_ = 0;
+ 	setCheckSpelling(checkSpellingGloballyEnabled());
+ 	connect(PsiOptions::instance(),SIGNAL(optionChanged(const QString&)),SLOT(optionsChanged()));
++	typedMsgsIndex = 0;
++
++	initActions();
++	setShortcuts();
+ }
+ 
+ ChatEdit::~ChatEdit()
+ {
++	clearMessageHistory();
+ 	delete spellhighlighter_;
+ }
+ 
++void ChatEdit::initActions()
++{
++	act_showMessagePrev = new QAction(this);
++	addAction(act_showMessagePrev);
++	connect(act_showMessagePrev, SIGNAL(triggered()), SLOT(showHistoryMessagePrev()));
++
++	act_showMessageNext= new QAction(this);
++	addAction(act_showMessageNext);
++	connect(act_showMessageNext, SIGNAL(triggered()), SLOT(showHistoryMessageNext()));
++
++	act_showMessageFirst = new QAction(this);
++	addAction(act_showMessageFirst);
++	connect(act_showMessageFirst, SIGNAL(triggered()), SLOT(showHistoryMessageFirst()));
++
++	act_showMessageLast= new QAction(this);
++	addAction(act_showMessageLast);
++	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
++}
++
++void ChatEdit::setShortcuts()
++{
++	act_showMessagePrev->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messagePrev"));
++	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
++	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
++	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
++}
++
+ void ChatEdit::setDialog(QWidget* dialog)
+ {
+ 	dialog_ = dialog;
+@@ -239,6 +271,90 @@ void ChatEdit::optionsChanged()
+ 	setCheckSpelling(checkSpellingGloballyEnabled());
+ }
+ 
++void ChatEdit::showHistoryMessageNext()
++{
++	if (!typedMsgsHistory.isEmpty()) {
++		if (typedMsgsIndex + 1 < typedMsgsHistory.size()) {
++			++typedMsgsIndex;
++			showMessageHistory();
++		} else {
++			if(typedMsgsIndex != typedMsgsHistory.size()) {
++				typedMsgsIndex = typedMsgsHistory.size();
++				// Restore last typed text
++				setEditText(currentText);
++			}
++		}
++	}
++}
++
++void ChatEdit::showHistoryMessagePrev()
++{
++	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
++		// Save current typed text
++		if (typedMsgsIndex == typedMsgsHistory.size())
++			currentText = toPlainText();
++		--typedMsgsIndex;
++		showMessageHistory();
++	}
++}
++
++void ChatEdit::showHistoryMessageFirst()
++{
++	if (!typedMsgsHistory.isEmpty()) {
++		if (currentText.isEmpty()) {
++			typedMsgsIndex = typedMsgsHistory.size() - 1;
++			showMessageHistory();
++		} else {
++			typedMsgsIndex = typedMsgsHistory.size();
++			// Restore last typed text
++			setEditText(currentText);
++		}
++	}
++}
++
++void ChatEdit::showHistoryMessageLast()
++{
++	if (!typedMsgsHistory.isEmpty()) {
++		typedMsgsIndex = 0;
++		showMessageHistory();
++	}
++}
++
++void ChatEdit::setEditText(const QString& text)
++{
++	setPlainText(text);
++	moveCursor(QTextCursor::End);
++}
++
++void ChatEdit::showMessageHistory()
++{
++	setEditText(typedMsgsHistory.at(typedMsgsIndex));
++}
++
++void ChatEdit::appendMessageHistory(const QString& text)
++{
++	if (!text.simplified().isEmpty()) {
++		if (currentText == text)
++			// Remove current typed text only if we want to add it to history
++			currentText.clear();
++		long index = typedMsgsHistory.indexOf(text);
++		if (index >=0) {
++			typedMsgsHistory.removeAt(index);
++		}
++		if (typedMsgsHistory.size() >= MAX_MESSAGE_HISTORY) {
++			typedMsgsHistory.removeAt(0);
++		}
++		typedMsgsHistory += text;
++		typedMsgsIndex = typedMsgsHistory.size();
++	}
++}
++
++void ChatEdit::clearMessageHistory()
++{
++	typedMsgsHistory.clear();
++	typedMsgsIndex = 0;
++}
++
+ //----------------------------------------------------------------------------
+ // LineEdit
+ //----------------------------------------------------------------------------
+--- git.orig/src/msgmle.h
++++ git/src/msgmle.h
+@@ -23,6 +23,8 @@
+ 
+ #include <QTextEdit>
+ 
++#define MAX_MESSAGE_HISTORY 50
++
+ class ChatEdit;
+ class QEvent;
+ class QKeyEvent;
+@@ -47,10 +49,18 @@ public:
+ 	static bool checkSpellingGloballyEnabled();
+ 	void setCheckSpelling(bool);
+ 
++public slots:
++	void appendMessageHistory(const QString& text);
++	void clearMessageHistory();
++
+ protected slots:
+  	void applySuggestion();
+  	void addToDictionary();
+ 	void optionsChanged();
++	void showHistoryMessageNext();
++	void showHistoryMessagePrev();
++	void showHistoryMessageFirst();
++	void showHistoryMessageLast();
+ 
+ protected:
+ 	// override the tab/esc behavior
+@@ -58,6 +68,10 @@ protected:
+ 	void keyPressEvent(QKeyEvent *);
+ 	bool event(QEvent * event);
+ 	void contextMenuEvent(QContextMenuEvent *e);
++	void showMessageHistory();
++	void initActions();
++	void setShortcuts();
++	void setEditText(const QString& text);
+ 
+ private:
+ 	QWidget	*dialog_;
+@@ -65,6 +79,13 @@ private:
+ 	SpellHighlighter* spellhighlighter_;
+ 	QPoint last_click_;
+ 	int previous_position_;
++	QStringList typedMsgsHistory;
++	long typedMsgsIndex;
++	QAction* act_showMessagePrev;
++	QAction* act_showMessageNext;
++	QAction* act_showMessageFirst;
++	QAction* act_showMessageLast;
++	QString currentText;
+ };
+ 
+

psi-plus-main-20141106.tar.xz/patches/0130-psi-status-align-center.diff Added

psi-plus-main-20141106.tar.xz/patches/0140-psi-default-application-settings.diff Added

@@ -0,0 +1,226 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -33,7 +33,7 @@
+ 		<extended-presence comment="Extended presence options">
+ 			<notify comment="Get notified of extended presence changes" type="bool">true</notify>
+ 			<tune comment="Tune options">
+-				<publish comment="Publish user tune information" type="bool">false</publish>
++				<publish comment="Publish user tune information" type="bool">true</publish>
+ 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
+ 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
+ 				<controller-filter comment="List of disabled controllers" type="QString"></controller-filter>
+@@ -45,7 +45,7 @@
+ 			</bookmarks>
+ 			<show-joins comment="Display notices of users joining and leaving conferences" type="bool">true</show-joins>
+ 			<show-role-affiliation comment="Include role and affiliation changes in join messages, and display notices of changes" type="bool">true</show-role-affiliation>
+-			<show-status-changes comment="Show status changes in groupchat window" type="bool">false</show-status-changes>
++			<show-status-changes comment="Show status changes in groupchat window" type="bool">true</show-status-changes>
+ 			<accept-defaults comment="Automatically accept the default room configuration when a new room is created." type="bool">true</accept-defaults>
+ 			<auto-configure comment="Automatically open the configuration dialog when a new room is created. This option only has effect if accept-defaults is false." type="bool">true</auto-configure>
+ 			<context comment="Options regarding the context being sent when joining a room">
+@@ -88,14 +88,14 @@
+ 				<auto-grab-urls-from-clipboard type="bool">false</auto-grab-urls-from-clipboard>
+ 				<auto-popup type="bool">false</auto-popup>
+ 				<auto-popup-headlines type="bool">false</auto-popup-headlines>
+-				<show-character-count type="bool">false</show-character-count>
++				<show-character-count type="bool">true</show-character-count>
+ 				<show-subjects type="bool">true</show-subjects>
+ 				<use-jid-auto-completion type="bool">true</use-jid-auto-completion>
+ 				<size type="QString"></size> 
+ 			</message>
+ 			<chat comment="Chat dialog options">
+ 				<theme comment="The theme used for chat messages rendering" type="QString">psi/classic</theme>
+-				<central-toolbar comment="Have a central toolbar" type="bool">false</central-toolbar>
++				<central-toolbar comment="Have a central toolbar" type="bool">true</central-toolbar>
+ 				<size comment="Remembered window size" type="QSize">
+ 				</size>
+ 				<opacity comment="Opacity percentage of chat dialogs" type="int">100</opacity>
+@@ -106,10 +106,10 @@
+ 				</avatars>
+ 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
+ 				<auto-popup type="bool">false</auto-popup>
+-				<delete-contents-after type="QString">hour</delete-contents-after>
++				<delete-contents-after type="QString">never</delete-contents-after>
+ 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
+ 				<use-chat-says-style type="bool">false</use-chat-says-style>
+-				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
++				<use-expanding-line-edit type="bool">false</use-expanding-line-edit>
+ 				<use-small-chats type="bool">false</use-small-chats>
+ 				<use-message-icons type="bool">true</use-message-icons>
+ 				<scaled-message-icons type="bool">false</scaled-message-icons>
+@@ -160,7 +160,7 @@
+ 				<use-left-click type="bool">false</use-left-click>
+ 				<use-single-click type="bool">false</use-single-click>
+ 				<use-status-change-animation type="bool">true</use-status-change-animation>
+-				<use-transport-icons type="bool">false</use-transport-icons>
++				<use-transport-icons type="bool">true</use-transport-icons>
+ 				<saved-window-geometry type="QRect" >
+ 					<x>64</x>
+ 					<y>64</y>
+@@ -195,7 +195,7 @@
+ 					<invisible comment="Enable invisibility" type="bool">false</invisible>
+ 				</status>
+ 				<view comment="Options for the view menu">
+-					<show-away comment="Show the 'show away/xa' toggle" type="bool">false</show-away>
++					<show-away comment="Show the 'show away/xa' toggle" type="bool">true</show-away>
+ 				</view>
+ 			</menu>
+ 			<muc comment="Multi-User Chat options">
+@@ -326,8 +326,8 @@
+ 					</status>
+ 				</passive-popups>
+ 				<popup-dialogs>
+-					<suppress-when-not-on-roster type="bool">false</suppress-when-not-on-roster>
+-					<suppress-while-away type="bool">false</suppress-while-away>
++					<suppress-when-not-on-roster type="bool">true</suppress-when-not-on-roster>
++					<suppress-while-away type="bool">true</suppress-while-away>
+ 				</popup-dialogs>
+ 				<sounds>
+ 					<chat-message type="QString">sound/chat2.wav</chat-message>
+@@ -346,19 +346,19 @@
+ 					<system-message type="QString">sound/chat2.wav</system-message>
+ 					<unix-sound-player type="QString"/>
+ 				</sounds>
+-				<successful-subscription type="bool">false</successful-subscription>
++				<successful-subscription type="bool">true</successful-subscription>
+ 			</notifications>
+ 			<service-discovery>
+-				<automatically-get-info type="bool">true</automatically-get-info>
++				<automatically-get-info type="bool">false</automatically-get-info>
+ 				<automatically-get-items type="bool">false</automatically-get-items>
+ 				<recent-jids type="QStringList" />
+ 			</service-discovery>
+ 			<tabs>
+ 				<show-tab-icons type="bool">true</show-tab-icons>
+ 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
+-				<use-tabs type="bool">false</use-tabs>
++				<use-tabs type="bool">true</use-tabs>
+ 				<size type="QString"></size> 
+-				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">C:M</grouping>
++				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">CM</grouping>
+ 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
+ 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
+ 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
+@@ -426,7 +426,7 @@
+ 					<item type="QKeySequence">Enter</item>
+ 				</send>
+ 				<clear type="QKeySequence" comment="Clear the text"/>
+-				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
++				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+Space</quick-command>
+ 				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
+ 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
+ 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
+@@ -435,7 +435,7 @@
+ 			<contactlist comment="Shortcuts in the contactlist">
+ 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
+ 				<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/>
+-				<delete type="QKeySequence" comment="Delete the selected contact">Del</delete>
++				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
+ 				<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
+ 				<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
+ 				<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
+@@ -479,7 +479,7 @@
+ 		</shortcuts>
+ 		<contactlist>
+ 			<hide-on-start type="bool">false</hide-on-start>
+-			<resolve-nicks-on-contact-add type="bool">false</resolve-nicks-on-contact-add>
++			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
+ 			<use-toolwindow type="bool">false</use-toolwindow>
+ 		</contactlist>
+ 		<external-control>
+@@ -495,6 +495,10 @@
+ 			</emoticons>
+ 			<status type="QString">default</status>
+ 			<system type="QString">default</system>
++			<moods type="QString">default</moods>
++			<clients type="QString">default</clients>
++			<activities type="QString">default</activities>
++			<affiliations type="QString">default</affiliations>
+ 		</iconsets>
+ 		<messages>
+ 			<default-outgoing-message-type type="QString">chat</default-outgoing-message-type>
+--- git.orig/options/macosx.xml
++++ git/options/macosx.xml
+@@ -16,14 +16,25 @@
+ 		</ui>
+ 		<shortcuts comment="Shortcuts">
+ 			<contactlist comment="Shortcuts in the contactlist">
+-				<delete type="QVariantList" comment="Delete the selected contact">
+-					<item type="QKeySequence">Backspace</item>
+-					<item type="QKeySequence">Del</item>
+-				</delete>
++				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
+ 			</contactlist>
+ 			<common comment="Common actions" >
+ 				<history type="QKeySequence" comment="Open the message history">Ctrl+Shift+H</history>
+ 			</common>
++			<chat comment="Shortcuts in the chat dialog">
++				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
++			</chat>
+ 		</shortcuts>
++		<ui comment="User interface options">
++			<disable-send-button type="bool">true</disable-send-button>
++			<look>
++				<font>
++					<chat type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</chat>
++					<contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</contactlist>
++					<message type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</message>
++					<passive-popup type="QString">Lucida Grande,9,-1,5,50,0,0,0,0,0</passive-popup>
++				</font>
++			</look>
++		</ui>
+ 	</options>
+ </psi>
+--- git.orig/options/windows.xml
++++ git/options/windows.xml
+@@ -6,6 +6,9 @@
+ 				<enable type="bool">true</enable>
+ 				<use-double-click type="bool">true</use-double-click>
+ 			</systemtray>
++			<spell-check comment="Options related to the spell checker">
++				<enabled comment="Whether the spell checker is enabled" type="bool">false</enabled>
++			</spell-check>
+ 		</ui>
+ 	</options>
+ </psi>
+--- git.orig/src/psioptions.cpp
++++ git/src/psioptions.cpp
+@@ -192,10 +192,12 @@ bool PsiOptions::newProfile()
+ 		buttons.dock = Qt3Dock_Bottom;
+ 
+ 		ToolbarPrefs showContacts;
++		showContacts.on = true;
+ 		showContacts.name = tr("Show contacts");
+-		showContacts.keys << "show_offline" << "show_hidden" << "show_agents" << "show_self" << "show_statusmsg";
++		showContacts.keys << "view_groups" << "menu_add_contact" << "menu_disco" << "menu_options" << "menu_play_sounds" <<"menu_xml_console";
+ 
+ 		ToolbarPrefs eventNotifier;
++		eventNotifier.on = true;
+ 		eventNotifier.name = tr("Event notifier");
+ 		eventNotifier.keys << "event_notifier";
+ 		eventNotifier.dock = Qt3Dock_Bottom;
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -130,17 +130,17 @@ void UserAccount::reset()
+ 	port = 5222;
+ 	opt_host = false;
+ 	host = "";
+-	opt_automatic_resource = true;
++	opt_automatic_resource = false;
+ 	resource = ApplicationInfo::name();
+-	priority = 5;
++	priority = 55;
+ 	ibbOnly = false;
+ 	opt_keepAlive = true;
+ 	allow_plain = XMPP::ClientStream::AllowPlainOverTLS;
+-	opt_compress = false;
++	opt_compress = true;
+ 	opt_log = true;
+-	opt_reconn = false;
++	opt_reconn = true;
+ 	opt_connectAfterSleep = false;
+-	opt_ignoreSSLWarnings = false;
++	opt_ignoreSSLWarnings = true;
+ 
+ 	proxy_index = 0;
+ 	proxy_type = PROXY_NONE;

psi-plus-main-20141106.tar.xz/patches/0150-psi-roster-settings.diff Added

@@ -0,0 +1,511 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -154,7 +154,16 @@
+ 					<self-contact type="bool">true</self-contact>
+ 				</show>
+ 				<show-group-counts type="bool">true</show-group-counts>
+-				<show-menubar type="bool">true</show-menubar>
++				<show-menubar type="bool">false</show-menubar>
++				<disable-scrollbar type="bool">true</disable-scrollbar>
++				<avatars>
++					<show type="bool">true</show>
++					<size type="int">24</size>
++					<radius type="int">5</radius>
++				</avatars>
++				<show-mood-icons type="bool">true</show-mood-icons>
++				<show-tune-icons type="bool">true</show-tune-icons>
++				<show-client-icons type="bool">true</show-client-icons>
+ 				<toolbars/>
+ 				<toolbars-state type="QByteArray"/>
+ 				<use-left-click type="bool">false</use-left-click>
+--- git.orig/src/options/opt_application.cpp
++++ git/src/options/opt_application.cpp
+@@ -39,16 +39,6 @@ QWidget *OptionsTabApplication::widget()
+ 	w = new OptApplicationUI();
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
+-	d->ck_alwaysOnTop->setWhatsThis(
+-		tr("Makes the main Psi window always be in front of other windows."));
+-	d->ck_autoRosterSize->setWhatsThis(
+-		tr("Makes the main Psi window resize automatically to fit all contacts."));
+-	d->ck_useleft->setWhatsThis(
+-		tr("Normally, right-clicking with the mouse on a contact will activate the context-menu."
+-		"  Check this option if you'd rather use a left-click."));
+-	d->ck_showMenubar->setWhatsThis(
+-		tr("Shows the menubar in the application window."));
+-
+ 	// docklet
+ 	d->ck_docklet->setWhatsThis(
+ 		tr("Makes Psi use a docklet icon, also known as system tray icon."));
+@@ -62,8 +52,6 @@ QWidget *OptionsTabApplication::widget()
+ 		"window use a small titlebar."));
+ 
+ #ifdef Q_OS_MAC
+-	d->ck_alwaysOnTop->hide();
+-	d->ck_showMenubar->hide();
+ 	d->gb_docklet->hide();
+ #endif
+ 
+@@ -95,11 +83,6 @@ void OptionsTabApplication::applyOptions
+ 
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
+-	PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked());
+-	PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked());
+-	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
+-	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
+-
+ 	// Auto-update
+ 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
+ 
+@@ -124,11 +107,6 @@ void OptionsTabApplication::restoreOptio
+ 
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
+-	d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() );
+-	d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() );
+-	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
+-	d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() );
+-	d->ck_useleft->setVisible(false); //currently useless
+ 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
+ 
+ 	// docklet
+--- git.orig/src/options/opt_application.ui
++++ git/src/options/opt_application.ui
+@@ -14,37 +14,6 @@
+   </property>
+   <layout class="QVBoxLayout" >
+    <item>
+-    <widget class="QCheckBox" name="ck_alwaysOnTop" >
+-     <property name="text" >
+-      <string>Roster window always on top</string>
+-     </property>
+-    </widget>
+-   </item>
+-   <item>
+-    <widget class="QCheckBox" name="ck_autoRosterSize" >
+-     <property name="text" >
+-      <string>Auto-resize contact list</string>
+-     </property>
+-    </widget>
+-   </item>
+-   <item>
+-    <widget class="QCheckBox" name="ck_useleft" >
+-     <property name="enabled" >
+-      <bool>true</bool>
+-     </property>
+-     <property name="text" >
+-      <string>Use left-click for menu</string>
+-     </property>
+-    </widget>
+-   </item>
+-   <item>
+-    <widget class="QCheckBox" name="ck_showMenubar" >
+-     <property name="text" >
+-      <string>Show menubar</string>
+-     </property>
+-    </widget>
+-   </item>
+-   <item>
+     <widget class="QCheckBox" name="ck_docklet" >
+      <property name="text" >
+       <string>Enable docklet</string>
+@@ -219,10 +188,6 @@
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <tabstops>
+-  <tabstop>ck_alwaysOnTop</tabstop>
+-  <tabstop>ck_autoRosterSize</tabstop>
+-  <tabstop>ck_useleft</tabstop>
+-  <tabstop>ck_showMenubar</tabstop>
+   <tabstop>ck_docklet</tabstop>
+   <tabstop>ck_dockDCstyle</tabstop>
+   <tabstop>ck_dockHideMW</tabstop>
+--- git.orig/src/options/optionsdlg.cpp
++++ git/src/options/optionsdlg.cpp
+@@ -39,6 +39,7 @@
+ // tabs
+ #include "opt_toolbars.h"
+ #include "opt_application.h"
++#include "opt_roster.h"
+ #include "opt_appearance.h"
+ #include "opt_chat.h"
+ #include "opt_events.h"
+@@ -270,6 +271,7 @@ void OptionsDlg::Private::createTabs()
+ 	OptionsTabApplication* applicationTab = new OptionsTabApplication(this);
+ 	applicationTab->setHaveAutoUpdater(psi->haveAutoUpdater());
+ 	tabs.append( applicationTab );
++	tabs.append( new OptionsTabRoster(this) );
+ 	tabs.append( new OptionsTabChat(this) );
+ 	tabs.append( new OptionsTabEvents(this) );
+ 	tabs.append( new OptionsTabPopups(this) );
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -12,6 +12,7 @@ FORMS += \
+ # additional tabs
+ HEADERS += \
+ 	$$PWD/opt_application.h \
++	$$PWD/opt_roster.h \
+ 	$$PWD/opt_chat.h \
+ 	$$PWD/opt_events.h \
+ 	$$PWD/opt_popups.h \
+@@ -30,6 +31,7 @@ HEADERS += $$PWD/opt_tree.h
+ 
+ SOURCES += \
+ 	$$PWD/opt_application.cpp \
++	$$PWD/opt_roster.cpp \
+ 	$$PWD/opt_chat.cpp \
+ 	$$PWD/opt_events.cpp \
+ 	$$PWD/opt_popups.cpp \
+@@ -48,6 +50,7 @@ SOURCES += $$PWD/opt_tree.cpp
+ 
+ FORMS += \
+ 	$$PWD/opt_application.ui \
++	$$PWD/opt_roster.ui \
+ 	$$PWD/opt_chat.ui \
+ 	$$PWD/opt_events.ui \
+ 	$$PWD/opt_popups.ui \
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -0,0 +1,103 @@
++#include "opt_roster.h"
++#include "common.h"
++#include "iconwidget.h"
++#include "psioptions.h"
++
++
++#include "ui_opt_roster.h"
++
++class OptRosterUI : public QWidget, public Ui::OptRoster
++{
++public:
++	OptRosterUI() : QWidget() { setupUi(this); }
++};
++
++//----------------------------------------------------------------------------
++// OptionsTabRoster
++//----------------------------------------------------------------------------
++
++OptionsTabRoster::OptionsTabRoster(QObject *parent)
++	: OptionsTab(parent, "roster", "", tr("Roster"), tr("Roster window options"), "psi/roster_icon")
++	, w(0)
++{
++}
++
++OptionsTabRoster::~OptionsTabRoster()
++{
++}
++
++QWidget *OptionsTabRoster::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new OptRosterUI();
++	OptRosterUI *d = (OptRosterUI *)w;
++
++	d->ck_alwaysOnTop->setWhatsThis(
++		tr("Makes the main Psi window always be in front of other windows."));
++	d->ck_autoRosterSize->setWhatsThis(
++		tr("Makes the main Psi window resize automatically to fit all contacts."));
++	d->ck_useleft->setWhatsThis(
++		tr("Normally, right-clicking with the mouse on a contact will activate the context-menu."
++		"  Check this option if you'd rather use a left-click."));
++	d->ck_showMenubar->setWhatsThis(
++		tr("Shows the menubar in the application window."));
++
++
++#ifdef Q_OS_MAC
++	d->ck_alwaysOnTop->hide();
++	d->ck_showMenubar->hide();
++#endif
++
++	return w;
++}
++
++void OptionsTabRoster::applyOptions()
++{
++	if ( !w )
++		return;
++
++	OptRosterUI *d = (OptRosterUI *)w;
++
++	PsiOptions::instance()->setOption("options.ui.contactlist.always-on-top", d->ck_alwaysOnTop->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.automatically-resize-roster", d->ck_autoRosterSize->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
++
++	//enabled icons
++	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
++
++	//avatars settings
++	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.size", d->sb_avatarsSize->value());
++	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.radius", d->sb_avatarsRadius->value());
++}
++
++void OptionsTabRoster::restoreOptions()
++{
++	if ( !w )
++		return;
++
++	OptRosterUI *d = (OptRosterUI *)w;
++
++	d->ck_alwaysOnTop->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool() );
++	d->ck_autoRosterSize->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.automatically-resize-roster").toBool() );
++	d->ck_useleft->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.use-left-click").toBool() );
++	d->ck_useleft->setVisible(false);
++	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
++	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
++
++	//enabled icons
++	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
++	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
++	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
++	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
++
++	//avatars settings
++	d->sb_avatarsSize->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.size").toInt() );
++	d->sb_avatarsRadius->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt() );
++}
+--- git.orig/src/options/opt_roster.h
++++ git/src/options/opt_roster.h
+@@ -0,0 +1,24 @@
++#ifndef OPT_ROSTER_H
++#define OPT_ROSTER_H
++
++#include "optionstab.h"
++
++class QWidget;
++class QButtonGroup;
++
++class OptionsTabRoster : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabRoster(QObject *parent);
++	~OptionsTabRoster();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++
++private:
++	QWidget *w;
++};
++
++#endif
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -0,0 +1,208 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>OptRoster</class>
++ <widget class="QWidget" name="OptRoster">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>343</width>
++    <height>401</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>OptApplicationUI</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
++   <item>
++    <widget class="QCheckBox" name="ck_alwaysOnTop">
++     <property name="text">
++      <string>Roster window always on top</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QCheckBox" name="ck_autoRosterSize">
++     <property name="text">
++      <string>Auto-resize contact list</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QCheckBox" name="ck_useleft">
++     <property name="enabled">
++      <bool>true</bool>
++     </property>
++     <property name="text">
++      <string>Use left-click for menu</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QCheckBox" name="ck_showMenubar">
++     <property name="text">
++      <string>Show menubar</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QCheckBox" name="ck_disableScrollbar">
++     <property name="whatsThis">
++      <string>Disables scrollbar in the application window.</string>
++     </property>
++     <property name="text">
++      <string>Disable scrollbar</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QGroupBox" name="gb_docklet">
++     <property name="title">
++      <string>Icons</string>
++     </property>
++     <layout class="QVBoxLayout">
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <property name="margin">
++       <number>10</number>
++      </property>
++      <item>
++       <widget class="QCheckBox" name="ck_showAvatarIcons">
++        <property name="whatsThis">
++         <string>Show avatars in roster</string>
++        </property>
++        <property name="text">
++         <string>Avatars</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QCheckBox" name="ck_showMoodIcons">
++        <property name="whatsThis">
++         <string>Show moods in roster</string>
++        </property>
++        <property name="text">
++         <string>Moods</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QCheckBox" name="ck_showTuneIcons">
++        <property name="whatsThis">
++         <string>Show icon when contact is listening to music</string>
++        </property>
++        <property name="text">
++         <string>Now playing</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QCheckBox" name="ck_showClientIcons">
++        <property name="whatsThis">
++         <string>Show icon of user client</string>
++        </property>
++        <property name="text">
++         <string>Clients</string>
++        </property>
++       </widget>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QGroupBox" name="gb_avatarsSettings">
++     <property name="title">
++      <string>Avatar settings</string>
++     </property>
++     <property name="checkable">
++      <bool>false</bool>
++     </property>
++     <layout class="QVBoxLayout" name="verticalLayout">
++      <item>
++       <layout class="QHBoxLayout" name="horizontalLayout">
++        <item>
++         <widget class="QLabel" name="lbl_avatarsSize">
++          <property name="text">
++           <string>Size</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QSpinBox" name="sb_avatarsSize">
++          <property name="maximumSize">
++           <size>
++            <width>60</width>
++            <height>16777215</height>
++           </size>
++          </property>
++          <property name="suffix">
++           <string>px</string>
++          </property>
++          <property name="prefix">
++           <string/>
++          </property>
++          <property name="minimum">
++           <number>8</number>
++          </property>
++          <property name="maximum">
++           <number>64</number>
++          </property>
++          <property name="value">
++           <number>24</number>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <layout class="QHBoxLayout" name="horizontalLayout_2">
++        <item>
++         <widget class="QLabel" name="lbl_avatarsRadius">
++          <property name="text">
++           <string>Radius of corners</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QSpinBox" name="sb_avatarsRadius">
++          <property name="maximumSize">
++           <size>
++            <width>60</width>
++            <height>16777215</height>
++           </size>
++          </property>
++          <property name="suffix">
++           <string>px</string>
++          </property>
++          <property name="value">
++           <number>5</number>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </item>
++     </layout>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <tabstops>
++  <tabstop>ck_alwaysOnTop</tabstop>
++  <tabstop>ck_autoRosterSize</tabstop>
++  <tabstop>ck_useleft</tabstop>
++  <tabstop>ck_showMenubar</tabstop>
++  <tabstop>ck_showAvatarIcons</tabstop>
++  <tabstop>ck_showMoodIcons</tabstop>
++  <tabstop>ck_showTuneIcons</tabstop>
++ </tabstops>
++ <resources/>
++ <connections/>
++</ui>

psi-plus-main-20141106.tar.xz/patches/0160-psi-client-icons.diff Added

@@ -0,0 +1,894 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -164,6 +164,7 @@
+ 				<show-mood-icons type="bool">true</show-mood-icons>
+ 				<show-tune-icons type="bool">true</show-tune-icons>
+ 				<show-client-icons type="bool">true</show-client-icons>
++				<show-all-client-icons type="bool">false</show-all-client-icons>
+ 				<toolbars/>
+ 				<toolbars-state type="QByteArray"/>
+ 				<use-left-click type="bool">false</use-left-click>
+--- git.orig/src/options/opt_appearance.cpp
++++ git/src/options/opt_appearance.cpp
+@@ -95,6 +95,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
+ {
+ 	addTab( new OptionsTabIconsetEmoticons(this) );
+ 	addTab( new OptionsTabIconsetMoods(this) );
++	addTab( new OptionsTabIconsetClients(this) );
+ 	addTab( new OptionsTabIconsetRoster(this) );
+ 	addTab( new OptionsTabIconsetSystem(this) );
+ }
+--- git.orig/src/options/opt_iconset_client.ui
++++ git/src/options/opt_iconset_client.ui
+@@ -0,0 +1,88 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>IconsetClient</class>
++ <widget class="QWidget" name="IconsetClient">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>256</width>
++    <height>195</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>IconsetClientUI</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
++   <item>
++    <widget class="QGroupBox" name="groupBox9">
++     <property name="title">
++      <string>Client iconsets</string>
++     </property>
++     <layout class="QGridLayout">
++      <property name="margin">
++       <number>8</number>
++      </property>
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <item row="1" column="2">
++       <spacer>
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeType">
++         <enum>QSizePolicy::Expanding</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>204</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++      <item row="1" column="3">
++       <widget class="IconButton" name="pb_clientDetails" native="true">
++        <property name="text" stdset="0">
++         <string>&amp;Show Details</string>
++        </property>
++       </widget>
++      </item>
++      <item row="0" column="0" colspan="4">
++       <widget class="IconsetSelect" name="iss_clients" native="true"/>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QProgressBar" name="progress">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <customwidgets>
++  <customwidget>
++   <class>IconButton</class>
++   <extends></extends>
++   <header>iconbutton.h</header>
++  </customwidget>
++  <customwidget>
++   <class>IconsetSelect</class>
++   <extends></extends>
++   <header>iconsetselect.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/opt_iconset.cpp
++++ git/src/options/opt_iconset.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include "ui_opt_iconset_emo.h"
+ #include "ui_opt_iconset_mood.h"
++#include "ui_opt_iconset_client.h"
+ #include "ui_opt_iconset_system.h"
+ #include "ui_opt_iconset_roster.h"
+ #include "ui_ui_isdetails.h"
+@@ -40,6 +41,12 @@ public:
+ 	IconsetMoodUI() : QWidget() { setupUi(this); }
+ };
+ 
++class IconsetClientUI : public QWidget, public Ui::IconsetClient
++{
++public:
++	IconsetClientUI() : QWidget() { setupUi(this); }
++};
++
+ class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
+ {
+ public:
+@@ -796,6 +803,154 @@ void OptionsTabIconsetMoods::cancelThrea
+ {
+ 	if ( thread ) {
+ 		threadCancelled.lock();
++		thread->cancelled = true;
++		threadCancelled.unlock();
++
++		thread = 0;
++	}
++}
++
++//----------------------------------------------------------------------------
++// OptionsTabIconsetClients
++//----------------------------------------------------------------------------
++
++OptionsTabIconsetClients::OptionsTabIconsetClients(QObject *parent)
++	: OptionsTab(parent, "iconset_clients", "", tr("Clients"), tr("Select your clients iconset"))
++	, w(0)
++	, thread(0)
++{
++}
++
++OptionsTabIconsetClients::~OptionsTabIconsetClients()
++{
++	cancelThread();
++}
++
++QWidget *OptionsTabIconsetClients::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new IconsetClientUI;
++	IconsetClientUI *d = (IconsetClientUI *)w;
++
++	connect(d->pb_clientDetails, SIGNAL(clicked()), SLOT(previewIconset()));
++
++	return w;
++}
++
++void OptionsTabIconsetClients::applyOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetClientUI *d = (IconsetClientUI *)w;
++
++	const Iconset *is = d->iss_clients->iconset();
++	if ( is ) {
++		QFileInfo fi( is->fileName() );
++		PsiOptions::instance()->setOption("options.iconsets.clients", fi.fileName());
++	}
++}
++
++void OptionsTabIconsetClients::restoreOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetClientUI *d = (IconsetClientUI *)w;
++
++	d->iss_clients->clear();
++	QStringList loaded;
++
++	d->setCursor(Qt::WaitCursor);
++
++	QPalette customPal = d->palette();
++	customPal.setCurrentColorGroup(QPalette::Inactive);
++	d->iss_clients->setEnabled(false);
++	d->iss_clients->setPalette(customPal);
++
++	d->pb_clientDetails->setEnabled(false);
++	d->pb_clientDetails->setPalette(customPal);
++
++	d->progress->show();
++	d->progress->setValue( 0 );
++
++	numIconsets = countIconsets("/clients", loaded);
++	iconsetsLoaded = 0;
++
++	cancelThread();
++
++	thread = new IconsetLoadThread(this, "/clients");
++	thread->start();
++}
++
++bool OptionsTabIconsetClients::event(QEvent *e)
++{
++	IconsetClientUI *d = (IconsetClientUI *)w;
++	if ( e->type() == QEvent::User ) { // iconset load event
++		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
++
++		if ( thread != le->thread() )
++			return false;
++
++		if ( !numIconsets )
++			numIconsets = 1;
++		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
++
++		Iconset *i = le->iconset();
++		if ( i ) {
++			PsiIconset::instance()->stripFirstAnimFrame(i);
++			d->iss_clients->insert(*i);
++
++			QFileInfo fi( i->fileName() );
++			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.clients").toString() )
++				d->iss_clients->setItemSelected(d->iss_clients->lastItem(), true);
++
++			delete i;
++		}
++
++		return true;
++	}
++	else if ( e->type() == QEvent::User + 1 ) { // finish event
++		d->iss_clients->setEnabled(true);
++		d->iss_clients->setPalette(QPalette());
++
++		d->pb_clientDetails->setEnabled(true);
++		d->pb_clientDetails->setPalette(QPalette());
++
++		connect(d->iss_clients, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
++
++		d->progress->hide();
++
++		d->unsetCursor();
++		thread = 0;
++
++		return true;
++	}
++
++	return false;
++}
++
++void OptionsTabIconsetClients::previewIconset()
++{
++	IconsetClientUI *d = (IconsetClientUI *)w;
++	const Iconset *is = d->iss_clients->iconset();
++	if (is) {
++		isDetails(*is, parentWidget->parentWidget(), psi);
++	}
++}
++
++void OptionsTabIconsetClients::setData(PsiCon *psicon, QWidget *p)
++{
++	psi = psicon;
++	parentWidget = p;
++}
++
++void OptionsTabIconsetClients::cancelThread()
++{
++	if ( thread ) {
++		threadCancelled.lock();
+ 		thread->cancelled = true;
+ 		threadCancelled.unlock();
+ 
+--- git.orig/src/options/opt_iconset.h
++++ git/src/options/opt_iconset.h
+@@ -93,6 +93,34 @@ private:
+ 	IconsetLoadThread *thread;
+ };
+ 
++class OptionsTabIconsetClients : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabIconsetClients(QObject *parent);
++	~OptionsTabIconsetClients();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++	bool stretchable() const { return true; }
++
++private slots:
++	void setData(PsiCon *, QWidget *);
++	void previewIconset();
++
++protected:
++	bool event(QEvent *);
++	void cancelThread();
++
++private:
++	QWidget *w, *parentWidget;
++	PsiCon *psi;
++
++	int numIconsets, iconsetsLoaded;
++	IconsetLoadThread *thread;
++};
++
+ class OptionsTabIconsetRoster : public OptionsTab
+ {
+ 	Q_OBJECT
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -65,6 +65,7 @@ FORMS += \
+ 	$$PWD/ui_isdetails.ui \
+ 	$$PWD/opt_iconset_emo.ui \
+ 	$$PWD/opt_iconset_mood.ui \
++	$$PWD/opt_iconset_client.ui \
+ 	$$PWD/opt_iconset_system.ui \
+ 	$$PWD/opt_iconset_roster.ui \
+ 	$$PWD/opt_general_groupchat.ui \
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -44,7 +44,7 @@ QWidget *OptionsTabRoster::widget()
+ 	d->ck_showMenubar->setWhatsThis(
+ 		tr("Shows the menubar in the application window."));
+ 
+-
++	connect(d->ck_showClientIcons, SIGNAL(toggled(bool)), d->cb_showAllClientIcons, SLOT(setEnabled(bool)));
+ #ifdef Q_OS_MAC
+ 	d->ck_alwaysOnTop->hide();
+ 	d->ck_showMenubar->hide();
+@@ -71,6 +71,7 @@ void OptionsTabRoster::applyOptions()
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
+ 
+ 	//avatars settings
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.size", d->sb_avatarsSize->value());
+@@ -96,7 +97,8 @@ void OptionsTabRoster::restoreOptions()
+ 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
+ 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
+ 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
+-
++	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
++	d->cb_showAllClientIcons->setCurrentIndex(PsiOptions::instance()->getOption("options.ui.contactlist.show-all-client-icons").toBool()?0:1);
+ 	//avatars settings
+ 	d->sb_avatarsSize->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.size").toInt() );
+ 	d->sb_avatarsRadius->setValue( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt() );
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -1,4 +1,3 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+ <ui version="4.0">
+  <class>OptRoster</class>
+  <widget class="QWidget" name="OptRoster">
+@@ -104,6 +103,11 @@
+        </widget>
+       </item>
+       <item>
++       <layout class="QHBoxLayout" >
++        <property name="spacing" >
++         <number>5</number>
++        </property>
++        <item>
+        <widget class="QCheckBox" name="ck_showClientIcons">
+         <property name="whatsThis">
+          <string>Show icon of user client</string>
+@@ -113,6 +117,22 @@
+         </property>
+        </widget>
+       </item>
++        <item>
++         <widget class="QComboBox" name="cb_showAllClientIcons" >
++          <item>
++           <property name="text" >
++            <string>all client icons</string>
++           </property>
++          </item>
++          <item>
++           <property name="text" >
++            <string>only highest priority client icon</string>
++           </property>
++          </item>
++         </widget>
++        </item>
++       </layout>
++      </item>
+      </layout>
+     </widget>
+    </item>
+@@ -204,5 +224,4 @@
+   <tabstop>ck_showTuneIcons</tabstop>
+  </tabstops>
+  <resources/>
+- <connections/>
+ </ui>
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -42,8 +42,8 @@ class PsiIconset::Private
+ private:
+ 	PsiIconset *psi;
+ public:
+-	Iconset system, moods;
+-	QString cur_system, cur_status, cur_moods;
++	Iconset system, moods, clients;
++	QString cur_system, cur_status, cur_moods, cur_clients;
+ 	QStringList cur_emoticons;
+ 	QMap<QString, QString> cur_service_status;
+ 	QMap<QString, QString> cur_custom_status;
+@@ -247,6 +247,23 @@ public:
+ 		return def;
+ 	}
+ 
++	Iconset clientsIconset(bool *ok)
++	{
++		Iconset def;
++		*ok = def.load( iconsetPath("clients/default") );
++
++		if ( PsiOptions::instance()->getOption("options.iconsets.clients").toString() != "default" ) {
++			Iconset is;
++			is.load ( iconsetPath("clients/" + PsiOptions::instance()->getOption("options.iconsets.clients").toString()) );
++
++			loadIconset(&def, &is);
++		}
++
++		stripFirstAnimFrame( def );
++
++		return def;
++	}
++
+ 	QList<Iconset*> emoticons()
+ 	{
+ 		QList<Iconset*> emo;
+@@ -386,6 +403,21 @@ bool PsiIconset::loadMoods()
+ 	return ok;
+ }
+ 
++bool PsiIconset::loadClients()
++{
++	bool ok = true;
++	QString cur_clients = PsiOptions::instance()->getOption("options.iconsets.clients").toString();
++	if (d->cur_clients != cur_clients) {
++		Iconset clients = d->clientsIconset(&ok);
++		d->loadIconset(&d->clients, &clients);
++		d->clients.addToFactory();
++
++		d->cur_clients = cur_clients;
++	}
++
++	return ok;
++}
++
+ bool PsiIconset::loadAll()
+ {
+ 	if (!loadSystem() || !loadRoster())
+@@ -393,6 +425,7 @@ bool PsiIconset::loadAll()
+ 
+ 	loadEmoticons();
+ 	loadMoods();
++	loadClients();
+ 	return true;
+ }
+ 
+@@ -407,6 +440,9 @@ void PsiIconset::optionChanged(const QSt
+ 	else if (option == "options.iconsets.moods") {
+ 		loadMoods();
+ 	}
++	else if (option == "options.iconsets.clients") {
++		loadClients();
++	}
+ 
+ 	// currently we rely on PsiCon calling reloadRoster() when
+ 	// all options are already applied. otherwise we risk the chance
+--- git.orig/src/psiiconset.h
++++ git/src/psiiconset.h
+@@ -45,6 +45,7 @@ public:
+ 	QHash<QString, Iconset*> roster;
+ 	QList<Iconset*> emoticons;
+ 	Iconset moods;
++	Iconset clients;
+ 	const Iconset &system() const;
+ 	void stripFirstAnimFrame(Iconset *);
+ 	static void removeAnimation(Iconset *);
+@@ -97,6 +98,7 @@ private:
+ 	bool loadRoster();
+ 	void loadEmoticons();
+ 	bool loadMoods();
++	bool loadClients();
+ };
+ 
+ #endif
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -319,6 +319,363 @@ const Mood& UserListItem::mood() const
+ 	return v_mood;
+ }
+ 
++QStringList UserListItem::clients() const
++{
++	QStringList res;
++
++	//if(isMuc()) return res; //temporary commented out until necessary patches will be fixed
++	if(!userResourceList().isEmpty()) {
++		UserResourceList srl = userResourceList();
++		srl.sort();
++
++		for(UserResourceList::ConstIterator rit = srl.begin(); rit != srl.end(); ++rit) {
++			QString name = (*rit).clientName().toLower();
++			res += findClient(name);
++		}
++	}
++	return res;
++}
++
++QString UserListItem::findClient(QString name) const
++{
++	QString res;
++	if(name.startsWith("adium"))
++		res = "adium";
++	else if(name.startsWith("google talk user account") || name.contains("android.com"))
++		res = "android";
++	else if(name.startsWith("simpleapps.ru"))
++		res = "antihack-bot";
++	else if(name.startsWith("aqq"))
++		res = "aqq";
++	else if(name.startsWith("asterisk"))
++		res = "asterisk";
++	else if(name.startsWith("bayanicq") || name.startsWith("barobin.com"))
++		res = "bayanicq";
++	else if(name.startsWith("barracuda"))
++		res = "barracuda-im";
++	else if(name.startsWith("beem-project"))
++		res = "beem";
++	else if(name.startsWith("bitlbee"))
++		res = "bitlbee";
++	else if((name.startsWith("simpleapps.ru") && name.contains("blacksmith")) || name.startsWith("blacksmith"))
++		res = "blacksmith-bot";
++	else if(name.startsWith("bluejabb"))
++		res = "bluejabb";
++	else if(name.startsWith("[bombus]") || name.contains("avalon"))
++		res = "bombus-avalon";
++	else if(name.startsWith("java.util.random"))
++		res = "bombus-avalon-old";
++	else if(name.startsWith("klub54.wen.ru") || name.startsWith("bombusklub") || name.startsWith("jabber.pdg.pl"))
++		res = "bombus-klub";
++	else if(name.startsWith("bombus-im.org") && name.contains("java"))
++		res = "bombus-old";
++	else if(name.startsWith("bombusmod-qd.wen.ru") || name.startsWith("bombusqd"))
++		res = "bombusqd";
++	else if(name.startsWith("bombusng-qd.googlecode.com"))
++		res = "bombusqd-ng";
++	else if(name.startsWith("bombus-im.org") && name.contains("android"))
++		res = "bombuslime";
++	else if(name.startsWith("bombusmod"))
++		res = "bombusmod";
++	else if(name.startsWith("bombusmod.net.ru") || name.startsWith("ex-im.name"))
++		res = "bombusmod-old";
++	else if(name.startsWith("bombusng-md"))
++		res = "bombusng-md";
++	else if(name.startsWith("bombus-ng"))
++		res = "bombusng";
++	else if(name.startsWith("bombus.pl"))
++		res = "bombuspl";
++	else if(name.startsWith("bombus+") || name.startsWith("voffk.org.ru"))
++		res = "bombusplus";
++	else if(name.startsWith("bombus-im.org") || name.startsWith("bombus"))
++		res = "bombus";
++	else if(name.startsWith("jame") || name.startsWith("jabrss") || name.startsWith("pako bot") || name.startsWith("fatal-bot") || name.startsWith("storm") || name.startsWith("sulci") || name.startsWith("sleekbot") || name.startsWith("sofserver") || name.startsWith("neutrina") || name.startsWith("yamaneko") || name.startsWith("talisman") || name.contains(QString::fromUtf8(QByteArray::fromHex("efbbbfd0b3d0bed0b2d0bdd0bed0b1d0bed182"))) || name.startsWith(QString::fromUtf8(QByteArray::fromHex("efbbbfcf84ceb1cebbceb9cf82cebcceb1ceb7"))))
++		res = "bot";
++	else if(name.startsWith("buddydroid"))
++		res = "buddydroid";
++	else if(name.startsWith("fin.jabber.ru"))
++		res = "capsula-bot";
++	else if(name.startsWith("centerim"))
++		res = "centerim";
++	else if(name.startsWith("chatopus.com"))
++		res = "chatopus";
++	else if(name.startsWith("coccinella"))
++		res = "coccinella";
++	else if(name.startsWith("dictbot"))
++		res = "dictbot";
++	else if(name.startsWith("digsby client"))
++		res = "digsby";
++	else if(name.startsWith("ekg2"))
++		res = "ekg2";
++	else if(name.startsWith("emess"))
++		res = "emess";
++	else if(name.startsWith("emess.eqx.su"))
++		res = "emess-old";
++	else if(name.startsWith("erlim.a7x-im.com"))
++		res = "erlim";
++	else if(name.startsWith("exodus"))
++		res = "exodus";
++	else if((name.startsWith("svn.posix.ru") && name.contains("fatal-bot")) || name.startsWith("fatal-"))
++		res = "fatal-bot";
++	else if(name.startsWith("hat.freize.org"))
++		res = "freize";
++	else if(name.startsWith("freomessenger.com"))
++		res = "freo";
++	else if(name.startsWith("freqbot"))
++		res = "freqbot";
++	else if(name.startsWith("google.com 1.0.0.66"))
++		res = "fring";
++	else if(name.startsWith("gaim"))
++		res = "gaim";
++	else if(name.startsWith("gajim"))
++		res = "gajim";
++	else if(name.startsWith("j-cool.ru"))
++		res = "gamebot";
++	else if(name.startsWith("weather2jabber") || name.contains("gismeteo.ru"))
++		res = "gismeteo";
++	else if(name.startsWith("gizmo"))
++		res = "gizmo";
++	else if(name.startsWith("camaya.net") && name.contains("gloox"))
++		res = "gloox";
++	else if(name.startsWith("glu.net"))
++		res = "glu";
++	else if(name.startsWith("gluxibot"))
++		res = "gluxibot";
++	else if(name.startsWith("google.com") && name.contains("client"))
++		res = "gtalk";
++	else if(name.startsWith("android.com") && name.contains("gtalk"))
++		res = "gtalk-android";
++	else if(name.startsWith("habahaba.im"))
++		res = "habahaba";
++	else if(name.startsWith("hipchat.com"))
++		res = "hipchat";
++	else if(name.startsWith("aspro.users.ru") && name.contains("historian-bot"))
++		res = "historian-bot";
++	else if(name.startsWith("ichat") || name.contains("apple.com"))
++		res = "ichat";
++	else if(name.startsWith("icq mobile"))
++		res = "icq-mobile";
++	else if(name.startsWith("imadering"))
++		res = "imadering";
++	else if(name.startsWith("imov"))
++		res = "imov";
++	else if(name.startsWith("imformer.ru"))
++		res = "imformer-bot";
++	else if(name.startsWith("isida"))
++		res = "isida-bot";
++	else if(name.startsWith("jabber.el"))
++		res = "jabber.el";
++	else if(name.startsWith("memegenerator.net") && name.contains("bolgenos-popov"))
++		res = "jabber-popov";
++	else if(name.contains("jabbim"))
++		res = "jabbim";
++	else if(name.startsWith("jabbin"))
++		res = "jabbin";
++	else if(name.startsWith("jabbroid"))
++		res = "jabbroid";
++	else if(name.startsWith("jabiru"))
++		res = "jabiru";
++	else if(name.startsWith("jajc") || name.startsWith("just another jabber client"))
++		res = "jajc";
++	else if(name.startsWith("qabber.ru") && name.contains("jame-bot"))
++		res = "jamebot";
++	else if(name.startsWith("jappix"))
++		res = "jappix";
++	else if(name.contains("japyt"))
++		res = "japyt";
++	else if(name.startsWith("jasmineicq.ru"))
++		res = "jasmine";
++	else if(name.startsWith("jimm.net.ru") && name.contains("android"))
++		res = "jimm-android";
++	else if(name.startsWith("jimm"))
++		res = "jimm-aspro";
++	else if(name.startsWith("jitsi.org"))
++		res = "jitsi";
++	else if(name.startsWith("jbot"))
++		res = "jbother";
++	else if(name.startsWith("pjc"))
++		res = "jubo";
++	else if(name.startsWith("jtalk"))
++		res = "jtalk";
++	else if(name.startsWith("juick"))
++		res = "juick";
++	else if(name.startsWith("kadu"))
++		res = "kadu";
++	else if(name.startsWith("bluendo") || name.startsWith("lampiro"))
++		res = "lampiro";
++	else if(name.startsWith("leechcraft"))
++		res = "leechcraft-azoth";
++	else if(name.startsWith("libpurple"))
++		res = "libpurple";
++	else if(name.startsWith("pidgin.im"))
++		res = "libpurple-old";
++	else if(name.startsWith("irssi-xmpp"))
++		res = "loudmouth";
++	else if(name.startsWith("kopete"))
++		res = "kopete";
++	else if(name.startsWith("magnet2.ru"))
++		res = "magnet2-bot";
++	else if(name.startsWith("mail.google.com"))
++		res = "mail.google.com";
++	else if(name.startsWith("mrim") || name.startsWith("svn.xmpp.ru") || name.startsWith("none") || name.contains("mail.ru") || name.contains("list.ru") || name.contains("bk.ru") || name.contains("inbox.ru"))
++		res = "mailruagent";
++	else if(name.startsWith("mobileagent"))
++		res = "mailruagent.sis";
++	else if(name.startsWith("mobile mail agent"))
++		res = "mailruagent.mob";
++	else if(name.startsWith("tomclaw.com") && name.contains("mandarin_im"))
++		res = "mandarin";
++	else if(name.startsWith("mcabber"))
++		res = "mcabber";
++	else if(name.startsWith("mchat"))
++		res = "mchat";
++	else if(name.startsWith("meebo"))
++		res = "meebo";
++	else if(name.startsWith("code.google.com") && name.contains("qxmpp"))
++		res = "meegim";
++	else if(name.startsWith("megafonvolga.ru"))
++		res = "megafon";
++	else if(name.startsWith("miranda"))
++		res = "miranda";
++	else if(name.startsWith("nightly.miranda.im") || name.startsWith("miranda-ng.org"))
++		res = "miranda-ng";
++	else if(name.startsWith("hotcoffee"))
++		res = "mirandahotcoffee";
++	else if(name.startsWith("monal.im"))
++		res = "monal";
++	else if(name.startsWith("movamessenger"))
++		res = "movamessenger.sis";
++	else if(name.startsWith("msn") || name.startsWith("delx.net.au"))
++		res = "msnmessenger";
++	else if(name.startsWith("sleekxmpp.com") && name.contains("1.1.10"))
++		res = "nekbot";
++	else if(name.startsWith("nimbuzz"))
++		res = "nimbuzz";
++	else if(name.startsWith("omnipresence") || name.startsWith("home.gna.org"))
++		res = "omnipresence";
++	else if(name.startsWith("om"))
++		res = "om.beeonline.ru";
++	else if(name.startsWith("process-one.net"))
++		res = "oneteamiphone";
++	else if(name.startsWith("oneteam"))
++		res = "oneteam";
++	else if(name.startsWith("osiris"))
++		res = "osiris";
++	else if(name.startsWith("chat.ovi.com") || name.startsWith("chat.nokia.com") || name.startsWith("nokiachat") || name.startsWith("ovi contacts"))
++		res = "ovi-chat";
++	else if(name.startsWith("pandion"))
++		res = "pandion";
++	else if(name.startsWith("palringo"))
++		res = "palringo";
++	else if(name.startsWith("sleekxmpp.com"))
++		res = "poezio";
++	else if(name.startsWith("psi+") || name.startsWith("psi-dev"))
++		res = "psiplus";
++	else if(name.startsWith("psi"))
++		res = "psi";
++	else if(name.startsWith("pidgin") || name.startsWith(QString::fromUtf8(QByteArray::fromHex("d0bfd0b8d0b4d0b6d0b8d0bd"))))
++		res = "pidgin";
++	else if(name.startsWith("pyicqt.googlecode.com") || name.startsWith("icq transport"))
++		res = "pyicq-t";
++	else if(name.startsWith("qip.ru"))
++		res = "qip";
++	else if(name.startsWith("pda.qip.ru") || name.startsWith("qip pda"))
++		res = "qippda";
++	else if(name.startsWith("qip mobile") || (name.startsWith("qip.ru") && name.contains("qip")))
++		res = "qipmobile";
++	else if(name.startsWith("qip infium") || name.startsWith("qip 2010") || name.startsWith("qip 2012") || name.startsWith("2010.qip.ru"))
++		res = "qipinfium";
++	else if(name.startsWith("qutim"))
++		res = "qutim";
++	else if(name.startsWith("apps.radio-t.com"))
++		res = "radio-t";
++	else if(name.startsWith("code.matthewwild.co.uk") && name.contains("riddim"))
++		res = "riddim";
++	else if(name.startsWith("xmpp4moz") || name.startsWith("hyperstruct.net"))
++		res = "sameplace";
++	else if(name.startsWith("sapo messenger mac") || name.startsWith("messenger.sapo.pt"))
++		res = "sapo";
++	else if(name.startsWith("sawim.ru"))
++		res = "sawim";
++	else if(name.startsWith("simpleapps.ru") && name.contains("security-bot"))
++		res = "security-bot";
++	else if(name.startsWith("siemens native jabber client"))
++		res = "siejc";
++	else if(name.startsWith("sim"))
++		res = "sim";
++	else if(name.startsWith("sip-communicator") || name.startsWith("sip communicator") || name.startsWith("jitsi"))
++		res = "sip-communicator";
++	else if((name.startsWith("igniterealtime.org") && name.contains("smack")) || name.startsWith("smack"))
++		res = "smack-api";
++	else if(name.startsWith("snapi-bot.googlecode.com") || (name.startsWith("github.com") && name.contains("")))
++		res = "snapi-snup-bot";
++	else if(name.startsWith("sonicrevolution"))
++		res = "sonic-revolution";
++	else if(name.startsWith("spark im client"))
++		res = "spark";
++	else if(name.startsWith("spectrum") || name.startsWith("binarytransport"))
++		res = "spectrum";
++	else if(name.startsWith("swift"))
++		res = "swift";
++	else if((name.startsWith("jabber-net.ru") && name.contains("talisman-bot")) || name.startsWith("j-tmb.ru"))
++		res = "talisman-bot";
++	else if(name.startsWith("talkonaut") || name.startsWith("google.com 1.0.0.84"))
++		res = "talkonaut";
++	else if(name.startsWith("talkgadget.google.com"))
++		res = "talkgadget.google.com";
++	else if(name.startsWith("talk.google.com") || name.startsWith("google.com 1.0.0.104"))
++		res = "talk.google.com";
++	else if(name.startsWith("google.com"))
++		res = "google.com";
++	else if(name.startsWith("tkabber"))
++		res = "tkabber";
++	else if(name.startsWith("telepathy"))
++		res = "telepathy.freedesktop.org";
++	else if(name.startsWith("tigase.org"))
++		res = "tigase";
++	else if(name.startsWith("trillian"))
++		res = "trillian";
++	else if(name.startsWith("ultimate-bot.googlecode.com"))
++		res = "ultimate-bot";
++	else if(name.startsWith("jabbrik.ru") || name.startsWith("jabrvista.net.ru"))
++		res = "utah-bot";
++	else if(name.startsWith("palringo.com"))
++		res = "utalk";
++	else if(name.startsWith("jabber weather.com transport"))
++		res = "weather.com";
++	else if(name.startsWith("chat.jabbercity.ru") || name.startsWith("web-am31.dyndns-ip.com"))
++		res = "webclient";
++	else if(name.startsWith("weonlydo"))
++		res = "weonlydo";
++	else if(name.startsWith("weonlydo.com") && name.contains("xmpp"))
++		res = "wod-xmpp";
++	else if(name.startsWith("wtw"))
++		res = "wtw";
++	else if(name.contains("vacuum"))
++		res = "vacuum";
++	else if(name.startsWith("vk.com") || name.startsWith("pyvk-t") || name.contains("vkontakte"))
++		res = "vkontakte";
++	else if(name.startsWith(QString::fromUtf8(QByteArray::fromHex("d18f2ed0bed0bdd0bbd0b0d0b9d0bd"))) || name.startsWith("online.yandex.ru"))
++		res = "yaonline";
++	else if(name.startsWith("ya.online"))
++		res = "yaonlinej2me";
++	else if(name.startsWith("yandexmail"))
++		res = "yaonlinesymbian";
++	else if(name.startsWith("yabber instant messenger"))
++		res = "yabber";
++	else if(name.startsWith("yaonline"))
++		res = "yaonlinesymbian";
++	else if(name.startsWith("xabber"))
++		res = "xabber";
++	else if(name.startsWith("xu-6.jabbrik.ru"))
++		res = "xu6-bot";
++	else if(name.startsWith("botx.ir"))
++		res = "zeus-bot";
++	else res = "unknown";
++
++return res;
++}
++
+ void UserListItem::setActivity(const Activity& activity)
+ {
+ 	v_activity = activity;
+@@ -636,7 +993,7 @@ QString UserListItem::makeBareTip(bool t
+ 				if(trim)
+ 					ver = dot_truncate(ver, 80);
+ 				ver = TextUtil::escape(ver);
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": %1").arg(ver) + "</div>";
++				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": <%1=\"%2\"> %3").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())).arg(ver) + "</div>";
+ 			}
+ 
+ 			// status message
+--- git.orig/src/userlist.h
++++ git/src/userlist.h
+@@ -124,6 +124,8 @@ public:
+ 	QString makeDesc() const;
+ 	bool isPrivate() const;
+ 	const Mood& mood() const;
++	QStringList clients() const;
++	QString findClient(QString name) const;
+ 	const Activity& activity() const;
+ 
+ 	void setJid(const XMPP::Jid &);

psi-plus-main-20141106.tar.xz/patches/0170-psi-send-custom-status.diff Added

@@ -0,0 +1,314 @@
+--- a/src/contactlistgroupmenu.cpp
++++ b/src/contactlistgroupmenu.cpp
+@@ -32,6 +32,8 @@
+ #include "iconaction.h"
+ #include "psicontact.h"
+ #include "psiaccount.h"
++#include "statusdlg.h"
++#include "xmpp_tasks.h"
+ 
+ class ContactListGroupMenu::Private : public QObject
+ {
+@@ -45,6 +47,11 @@ class ContactListGroupMenu::Private : public QObject
+ #endif
+ 	QAction* sendMessageAction_;
+ 	QAction* removeGroupWithoutContactsAction_;
++	QMenu* authMenu_;
++	QAction* actionAuth_;
++	QAction* actionAuthRequest_;
++	QAction* actionAuthRemove_;
++	QAction* actionCustomStatus_;
+ 
+ public:
+ 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
+@@ -57,6 +64,18 @@ public:
+ 		renameAction_ = new IconAction("", tr("Re&name"), menu->shortcuts("contactlist.rename"), this, "act_rename");
+ 		connect(renameAction_, SIGNAL(triggered()), this, SLOT(rename()));
+ 
++		actionAuth_ = new QAction(tr("Resend Authorization to Group"), this);
++		connect(actionAuth_, SIGNAL(triggered()), this, SLOT(authResend()));
++
++		actionAuthRequest_ = new QAction(tr("Request Authorization from Group"), this);
++		connect(actionAuthRequest_, SIGNAL(triggered()), this, SLOT(authRequest()));
++
++		actionAuthRemove_ = new QAction(tr("Remove Authorization from Group"), this);
++		connect(actionAuthRemove_, SIGNAL(triggered()), this, SLOT(authRemove()));
++
++		actionCustomStatus_ = new IconAction(tr("Send Status to Group"), this, "psi/action_direct_presence");
++		connect(actionCustomStatus_, SIGNAL(triggered()), this, SLOT(customStatus()));
++
+ 		removeGroupAndContactsAction_ = new IconAction(tr("Remove Group and Contacts"), this, "psi/remove");
+ #ifdef YAPSI
+ 		removeGroupAndContactsAction_->setText(tr("&Remove"));
+@@ -84,7 +103,12 @@ public:
+ #else
+ 		menu->addAction(renameAction_);
+ 		menu->addAction(sendMessageAction_);
++		menu->addAction(actionCustomStatus_);
+ 		menu->addSeparator();
++		authMenu_ = menu->addMenu(tr("Authorization"));
++		authMenu_->addAction(actionAuth_);
++		authMenu_->addAction(actionAuthRequest_);
++		authMenu_->addAction(actionAuthRemove_);
+ 		menu->addAction(removeGroupWithoutContactsAction_);
+ 		menu->addAction(removeGroupAndContactsAction_);
+ #endif
+@@ -121,6 +145,73 @@ private slots:
+ 		emit menu_->removeSelection();
+ 	}
+ 
++	void authResend()
++	{
++		if (!group)
++			return;
++
++		QList<PsiContact*> contacts = group->contacts();
++		if (!contacts.isEmpty()) {
++			foreach(PsiContact* contact, contacts) {
++				contact->account()->actionAuth(contact->jid());
++			}
++		}
++	}
++
++	void authRequest()
++	{
++		if (!group)
++		return;
++
++		QList<PsiContact*> contacts = group->contacts();
++		if (!contacts.isEmpty()) {
++			foreach(PsiContact* contact, contacts) {
++				contact->account()->actionAuthRequest(contact->jid());
++			}
++		}
++	}
++
++	void authRemove()
++	{
++		if (!group)
++			return;
++
++		QList<PsiContact*> contacts = group->contacts();
++		if (!contacts.isEmpty()) {
++			foreach(PsiContact* contact, contacts) {
++				contact->account()->actionAuthRemove(contact->jid());
++			}
++		}
++	}
++
++	void customStatus()
++	{
++		if (!group)
++			return;
++
++		PsiAccount *pa = group->contacts().first()->account();
++		StatusSetDlg *w = new StatusSetDlg(pa->psi(), pa->status());
++		QList<XMPP::Jid> list;
++		foreach(PsiContact* contact, group->contacts()) {
++			if(contact->isPrivate()) continue;
++			list << contact->jid();
++		}
++		w->setJidList(list);
++		connect(w, SIGNAL(setJidList(const QList<XMPP::Jid> &, const Status &)), SLOT(setStatusFromDialog(const QList<XMPP::Jid> &, const Status &)));
++		w->show();
++	}
++
++	void setStatusFromDialog(const QList<XMPP::Jid> &j, const Status &s)
++	{
++		PsiAccount *pa = group->contacts().first()->account();
++		for(QList<Jid>::const_iterator it = j.begin(); it != j.end(); ++it)
++		{
++			JT_Presence *p = new JT_Presence(pa->client()->rootTask());
++			p->pres(*it,s);
++			p->go(true);
++		}
++	}
++
+ 	void removeGroupWithoutContacts()
+ 	{
+ 		if (!group)
+--- a/src/psicontactmenu.cpp
++++ b/src/psicontactmenu.cpp
+@@ -36,6 +36,8 @@
+ #include "psicon.h"
+ #include "avatars.h"
+ #include "userlist.h"
++#include "statusdlg.h"
++#include "xmpp_tasks.h"
+ #ifdef HAVE_PGPUTIL
+ #include "pgputil.h"
+ #endif
+@@ -233,6 +235,7 @@ public:
+ 	ResourceMenu* activeChatsMenu_;
+ 	QAction* voiceCallAction_;
+ 	QAction* sendFileAction_;
++	QAction* customStatusAction_;
+ 	InviteToGroupChatMenu* inviteToGroupchatMenu_;
+ 	QMenu* mngMenu_;
+ 	GroupMenu* groupMenu_;
+@@ -351,6 +354,9 @@ public:
+ 		authRemoveAction_ = new IconAction(tr("Re&move Authorization From"), this, "");
+ 		connect(authRemoveAction_, SIGNAL(triggered()), SLOT(authRemove()));
+ 
++		customStatusAction_ = new IconAction(tr("Sen&d Status"), this, "psi/action_direct_presence");
++		connect(customStatusAction_, SIGNAL(triggered()), SLOT(customStatus()));
++
+ 		pictureAssignAction_ = new IconAction(tr("&Assign Custom Picture"), this, "");
+ 		connect(pictureAssignAction_, SIGNAL(triggered()), SLOT(pictureAssign()));
+ 		pictureAssignAction_->setShortcuts(ShortcutManager::instance()->shortcuts("contactlist.assign-custom-avatar"));
+@@ -426,6 +432,7 @@ public:
+ 		authMenu_->addAction(authRerequestAction_);
+ 		authMenu_->addAction(authRemoveAction_);
+ 		mngMenu_->addAction(removeAction_);
++		menu_->addAction(customStatusAction_);
+ 		menu_->addSeparator();
+ 		pictureMenu_ = mngMenu_->addMenu(tr("&Picture"));
+ 		pictureMenu_->addAction(pictureAssignAction_);
+@@ -478,6 +485,7 @@ private slots:
+ 
+ 		addAuthAction_->setVisible(!contact_->isSelf() && !contact_->inList() && !PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool());
+ 		addAuthAction_->setEnabled(contact_->account()->isAvailable());
++		customStatusAction_->setEnabled(contact_->account()->isAvailable() && !contact_->isPrivate());
+ 		receiveIncomingEventAction_->setVisible(contact_->alerting());
+ 		if (!PsiOptions::instance()->getOption("options.ui.message.enabled").toBool()) {
+ 			sendMessageAction_->setVisible(false);
+@@ -672,6 +680,24 @@ private slots:
+ 			contact_->account()->actionAuthRemove(contact_->jid());
+ 	}
+ 
++	void customStatus()
++	{
++		if (!contact_)
++			return;
++
++		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), contact_->account()->status());
++		w->setJid(contact_->jid());
++		connect(w, SIGNAL(setJid(const Jid &, const Status &)), SLOT(setStatusFromDialog(const Jid &, const Status &)));
++		w->show();
++	}
++
++	void setStatusFromDialog(const Jid &j, const Status &s)
++	{
++		JT_Presence *p = new JT_Presence(contact_->account()->client()->rootTask());
++		p->pres(j,s);
++		p->go(true);
++	}
++
+ 	void pictureAssign()
+ 	{
+ 		if (!contact_)
+--- a/src/statusdlg.cpp
++++ b/src/statusdlg.cpp
+@@ -94,6 +94,9 @@ public:
+ 	QComboBox *cb_preset;
+ 	QLineEdit *le_priority;
+ 	QCheckBox *save;
++	Jid j;
++	QList<XMPP::Jid> jl;
++	setStatusEnum setStatusMode;
+ };
+ 
+ StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s)
+@@ -107,6 +110,7 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s)
+ 	d->s = s;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: All accounts")));
++	d->setStatusMode = setStatusForAccount;
+ 	init();
+ }
+ 
+@@ -121,9 +125,24 @@ StatusSetDlg::StatusSetDlg(PsiAccount *pa, const Status &s)
+ 	d->s = s;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
++	d->setStatusMode = setStatusForAccount;
+ 	init();
+ }
+ 
++void StatusSetDlg::setJid(const Jid &j)
++{
++	d->j = j;
++	setWindowTitle(CAP(tr("Set Status for %1").arg(j.full())));
++	d->setStatusMode = setStatusForJid;
++}
++
++void StatusSetDlg::setJidList(const QList<XMPP::Jid> &jl)
++{
++	d->jl = jl;
++	setWindowTitle(CAP(tr("Set Status for group")));
++	d->setStatusMode = setStatusForJidList;
++}
++
+ void StatusSetDlg::init()
+ {
+ 	int type = makeSTATUS(d->s);
+@@ -247,9 +266,31 @@ void StatusSetDlg::doButton()
+ 	QString str = d->te->toPlainText();
+ 
+  	if (d->le_priority->text().isEmpty())
+- 		emit set(makeStatus(type, str), false, true);
++ 		//emit set(makeStatus(type, str), false, true);
++		switch(d->setStatusMode) {
++			case setStatusForAccount:
++                                emit set(makeStatus(type,str), false, true);
++				break;
++			case setStatusForJid:
++				emit setJid(d->j, makeStatus(type,str));
++				break;
++			case setStatusForJidList:
++				emit setJidList(d->jl, makeStatus(type,str));
++				break;
++		}
+  	else
+- 		emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
++ 		//emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
++		switch(d->setStatusMode) {
++			case setStatusForAccount:
++                                emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
++				break;
++			case setStatusForJid:
++				emit setJid(d->j, makeStatus(type,str, d->le_priority->text().toInt()));
++				break;
++			case setStatusForJidList:
++				emit setJidList(d->jl, makeStatus(type,str, d->le_priority->text().toInt()));
++				break;
++		}
+ 
+ 	close();
+ }
+--- a/src/statusdlg.h
++++ b/src/statusdlg.h
+@@ -23,6 +23,9 @@
+ 
+ #include <QDialog>
+ 
++#include <QList>
++#include "xmpp_jid.h"
++
+ class PsiCon;
+ class PsiAccount;
+ class UserListItem;
+@@ -33,6 +36,8 @@ namespace XMPP {
+ 
+ using namespace XMPP;
+ 
++enum setStatusEnum{setStatusForAccount = 0, setStatusForJid, setStatusForJidList};
++
+ class StatusShowDlg : public QDialog
+ {
+ 	Q_OBJECT
+@@ -48,9 +53,14 @@ public:
+ 	StatusSetDlg(PsiAccount *, const Status &);
+ 	~StatusSetDlg();
+ 
++	void setJid(const Jid &);
++	void setJidList(const QList<XMPP::Jid> &);
++
+ signals:
+ 	void set(const XMPP::Status &, bool withPriority, bool isManualStatus);
+ 	void cancelled();
++	void setJid(const Jid &, const Status &);
++	void setJidList(const QList<XMPP::Jid> &, const Status &);
+ 
+ private slots:
+ 	void doButton();

psi-plus-main-20141106.tar.xz/patches/0180-psi-all-in-one-window.diff Added

@@ -0,0 +1,498 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -115,6 +115,11 @@
+ 				<scaled-message-icons type="bool">false</scaled-message-icons>
+ 				<warn-before-clear type="bool">true</warn-before-clear>
+ 			</chat>
++			<save>
++				<toolbars-state type="QByteArray"/>
++				<log-width type="int">500</log-width>
++				<roster-width type="int">180</roster-width>
++			</save>
+ 			<history comment="History dialog options">
+ 				<size comment="Remembered window size" type="QSize">
+ 					<width>640</width>
+@@ -166,10 +171,10 @@
+ 				<show-client-icons type="bool">true</show-client-icons>
+ 				<show-all-client-icons type="bool">false</show-all-client-icons>
+ 				<toolbars/>
+-				<toolbars-state type="QByteArray"/>
+ 				<use-left-click type="bool">false</use-left-click>
+ 				<use-single-click type="bool">false</use-single-click>
+ 				<use-status-change-animation type="bool">true</use-status-change-animation>
++				<roster-at-left-when-all-in-one-window type="bool">false</roster-at-left-when-all-in-one-window>
+ 				<use-transport-icons type="bool">true</use-transport-icons>
+ 				<saved-window-geometry type="QRect" >
+ 					<x>64</x>
+@@ -368,7 +373,7 @@
+ 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
+ 				<use-tabs type="bool">true</use-tabs>
+ 				<size type="QString"></size> 
+-				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs">CM</grouping>
++				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs. 'A' means using all in one window patch.">CM</grouping>
+ 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
+ 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
+ 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -33,6 +33,7 @@
+ #include <QKeyEvent>
+ #include <QEvent>
+ #include <QVBoxLayout>
++#include <QSplitter>
+ #include <QMenu>
+ #include <QtAlgorithms>
+ #include <QShortcut>
+@@ -41,6 +42,8 @@
+ #include <windows.h>
+ #endif
+ 
++#include "tabmanager.h"
++#include "tabdlg.h"
+ #include "common.h"
+ #include "showtextdlg.h"
+ #include "psicon.h"
+@@ -96,14 +99,20 @@ public:
+ 	Private(PsiCon *, MainWin *);
+ 	~Private();
+ 
+-	QVBoxLayout* vb_main;
+ 	bool onTop, asTool;
+ 	QMenu* mainMenu, *statusMenu, *optionsMenu, *toolsMenu;
+ 	int sbState;
+ 	QString nickname;
+ 	PsiTrayIcon* tray;
+ 	QMenu* trayMenu;
++	QVBoxLayout *vb_roster;
++	QSplitter *splitter;
++	TabDlg *mainTabs;
+ 	QString statusTip;
++	PsiToolBar *viewToolBar;
++	int tabsSize;
++	int rosterSize;
++	bool isLeftRoster;
+ 
+ 	PopupAction* optionsButton, *statusButton;
+ 	IconActionGroup* statusGroup;
+@@ -135,7 +144,7 @@ public:
+ 	void updateMenu(QStringList actions, QMenu* menu);
+ };
+ 
+-MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : psi(_psi), mainWin(_mainWin)
++MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
+ {
+ 
+ 	statusGroup   = (IconActionGroup *)getAction("status_all");
+@@ -256,6 +265,10 @@ void MainWin::Private::updateMenu(QStrin
+ #define TOOLW_FLAGS ((Qt::WindowFlags) 0)
+ #endif
+ 
++const QString toolbarsStateOptionPath = "options.ui.save.toolbars-state";
++const QString rosterGeometryPath      = "options.ui.save.roster-width";
++const QString tabsGeometryPath        = "options.ui.save.log-width";
++
+ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon* psi)
+ :AdvancedWidget<QMainWindow>(0, (_onTop ? Qt::WindowStaysOnTopHint : Qt::Widget) | (_asTool ? (Qt::Tool |TOOLW_FLAGS) : Qt::Widget))
+ {
+@@ -281,14 +294,43 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	d->statusTip = "";
+ 	d->nickname = "";
+ 
+-	QWidget* center = new QWidget (this);
+-	setCentralWidget ( center );
++	QWidget *rosterBar = new QWidget(this);
++	bool allInOne = false;
++
++	if ( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() && PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
++		d->splitter = new QSplitter(this);
++		d->splitter->setObjectName("onewindowsplitter");
++		connect(d->splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(splitterMoved()));
++		setCentralWidget(d->splitter);
++		allInOne = true;
++
++		d->mainTabs = d->psi->tabManager()->newTabs(0);
++		d->psi->tabManager()->setPreferredTabsForKind('C', d->mainTabs);
++		d->psi->tabManager()->setPreferredTabsForKind('M', d->mainTabs);
++
++		QList<int> sizes;
++		d->rosterSize = PsiOptions::instance()->getOption(rosterGeometryPath).toInt();
++		d->tabsSize = PsiOptions::instance()->getOption(tabsGeometryPath).toInt();
++		d->isLeftRoster = PsiOptions::instance()->getOption("options.ui.contactlist.roster-at-left-when-all-in-one-window").toBool();
++		if (d->isLeftRoster) {
++			d->splitter->addWidget(rosterBar);
++			d->splitter->addWidget(d->mainTabs);
++			sizes << d->rosterSize << d->tabsSize;
++		} else {
++			d->splitter->addWidget(d->mainTabs);
++			d->splitter->addWidget(rosterBar);
++			sizes << d->tabsSize << d->rosterSize;
++		}
++
++		d->splitter->setSizes(sizes);
++	} else
++		setCentralWidget(rosterBar);
+ 
+-	d->vb_main = new QVBoxLayout(center);
++	d->vb_roster = new QVBoxLayout(rosterBar);
+ #ifndef NEWCONTACTLIST
+-	cvlist = new ContactView(center);
++	cvlist = new ContactView(rosterBar);
+ #else
+-	d->rosterWidget_ = new PsiRosterWidget(center);
++	d->rosterWidget_ = new PsiRosterWidget(rosterBar);
+ 	d->rosterWidget_->setContactList(psi->contactList());
+ #endif
+ 
+@@ -302,13 +344,31 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	// d->contactListView_->setFrameShape(QFrame::NoFrame);
+ #endif
+ #endif
+-	d->vb_main->setMargin(layoutMargin);
+-	d->vb_main->setSpacing(layoutMargin);
++	QMenu* viewMenu = new QMenu(tr("View"), this);
++
++
++	d->vb_roster->setMargin(layoutMargin);
++	d->vb_roster->setSpacing(layoutMargin);
++
++	if (allInOne) {
++		QString toolOpt = "options.ui.contactlist.toolbars";
++		foreach(QString base, PsiOptions::instance()->getChildOptionNames(toolOpt, true, true)) {
++			// toolbar "Show contacts" is second, so check m1
++			if (base == toolOpt + ".m1") {
++				d->viewToolBar = new PsiToolBar(base, rosterBar, d->psi->actionList());
++				d->viewToolBar->initialize();
++				connect(d->viewToolBar, SIGNAL(customize()), d->psi, SLOT(doToolbars()));
++				d->vb_roster->addWidget(d->viewToolBar);
++				break;
++			}
++		}
++	}
++
+ 
+ #ifndef NEWCONTACTLIST
+ 	// create search bar
+-	d->searchWidget = new QWidget(centralWidget());
+-	d->vb_main->addWidget(d->searchWidget);
++	d->searchWidget = new QWidget(rosterBar);
++	d->vb_roster->addWidget(d->searchWidget);
+ 	QHBoxLayout* searchLayout = new QHBoxLayout(d->searchWidget);
+ 	searchLayout->setMargin(0);
+ 	searchLayout->setSpacing(0);
+@@ -325,15 +385,15 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 
+ 	//add contact view
+ #ifndef NEWCONTACTLIST
+-	d->vb_main->addWidget(cvlist);
++	d->vb_roster->addWidget(cvlist);
+ # ifdef Q_OS_MAC
+ 	// Disable the empty vertical scrollbar:
+ 	// it's here because of weird code in q3scrollview.cpp
+ 	// Q3ScrollView::updateScrollBars() around line 877
+-	d->vb_main->addSpacing(4);
++	d->vb_roster->addSpacing(4);
+ # endif
+ #else
+-	d->vb_main->addWidget(d->rosterWidget_);
++	d->vb_roster->addWidget(d->rosterWidget_);
+ #endif
+ 
+ 	d->statusMenu = new QMenu(tr("Status"), this);
+@@ -390,7 +450,6 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 
+ 	mainMenuBar()->addMenu(d->statusMenu);
+ 
+-	QMenu* viewMenu = new QMenu(tr("View"), this);
+ 	mainMenuBar()->addMenu(viewMenu);
+ 	d->getAction("show_offline")->addTo(viewMenu);
+ 	// if (PsiOptions::instance()->getOption("options.ui.menu.view.show-away").toBool()) {
+@@ -457,9 +516,22 @@ MainWin::~MainWin()
+ 	}
+ 
+ 	saveToolbarsState();
++
++	if(d->splitter) {
++		PsiOptions::instance()->setOption(rosterGeometryPath, d->rosterSize);
++		PsiOptions::instance()->setOption(tabsGeometryPath, d->tabsSize);
++	}
++
+ 	delete d;
+ }
+ 
++void MainWin::splitterMoved()
++{
++	QList<int> list = d->splitter->sizes();
++	d->rosterSize = !d->isLeftRoster ? list.last() : list.first();
++	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
++}
++
+ void MainWin::registerAction( IconAction* action )
+ {
+ 	const char *activated  = SIGNAL( triggered() );
+@@ -691,8 +763,6 @@ QMenuBar* MainWin::mainMenuBar() const
+ 	return menuBar();
+ }
+ 
+-const QString toolbarsStateOptionPath = "options.ui.contactlist.toolbars-state";
+-
+ void MainWin::saveToolbarsState()
+ {
+ 	PsiOptions::instance()->setOption(toolbarsStateOptionPath, saveState());
+@@ -713,8 +783,21 @@ void MainWin::buildToolbars()
+ 	qDeleteAll(toolbars_);
+ 	toolbars_.clear();
+ 
++	bool allInOne = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A');
+ 	foreach(QString base, PsiOptions::instance()->getChildOptionNames("options.ui.contactlist.toolbars", true, true)) {
+-		PsiToolBar* tb = new PsiToolBar(base, this, d->psi->actionList());
++		PsiToolBar* tb;
++		if (allInOne) {
++			if (d && d->viewToolBar && (d->viewToolBar->base() == base))
++				continue;
++			tb = new PsiToolBar(base, this, d->psi->actionList());
++			d->vb_roster->addWidget(tb);
++		} else {
++			if (d && d->viewToolBar) {
++				delete d->viewToolBar;
++				d->viewToolBar = 0;
++			}
++			tb = new PsiToolBar(base, this, d->psi->actionList());
++		}
+ 		tb->initialize();
+ 		connect(tb, SIGNAL(customize()), d->psi, SLOT(doToolbars()));
+ 		toolbars_ << tb;
+@@ -736,6 +819,11 @@ void MainWin::buildToolbars()
+ 	foreach(PsiToolBar* tb, toolbars_) {
+ 		tb->setUpdatesEnabled(true);
+ 	}
++
++	if (allInOne && d && d->viewToolBar) {
++		d->viewToolBar->updateVisibility();
++		d->viewToolBar->setUpdatesEnabled(true);
++	}
+ }
+ 
+ bool MainWin::showDockMenu(const QPoint &)
+@@ -1089,6 +1177,17 @@ void MainWin::closeEvent(QCloseEvent* e)
+ #endif
+ }
+ 
++void MainWin::changeEvent(QEvent *event)
++{
++    if (event->type() == QEvent::ActivationChange ||
++	    event->type() == QEvent::WindowStateChange)
++	{
++		if (d->mainTabs) {
++			QCoreApplication::sendEvent(d->mainTabs, event);
++		}
++	}
++}
++
+ void MainWin::keyPressEvent(QKeyEvent* e)
+ {
+ #ifdef Q_OS_MAC
+@@ -1527,4 +1626,26 @@ void MainWin::avcallConfig()
+ 		AvCallManager::config();
+ }
+ 
++void MainWin::resizeEvent(QResizeEvent *e)
++{
++	AdvancedWidget<QMainWindow>::resizeEvent(e);
++
++	if(d->splitter && isVisible()) {
++		QList<int> sizes = d->splitter->sizes();
++		int tabsWidth = !d->isLeftRoster ? sizes.first() : sizes.last();
++		int rosterWidth = d->isLeftRoster ? sizes.first() : sizes.last();
++		int dw = rosterWidth - d->rosterSize;
++		sizes.clear();
++		sizes.append(tabsWidth + dw);
++		if(d->isLeftRoster) {
++			sizes.prepend(d->rosterSize);
++		}
++		else {
++			sizes.append(d->rosterSize);
++		}
++		d->splitter->setSizes(sizes);
++		d->tabsSize = tabsWidth + dw;
++	}
++}
++
+ //#endif
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -72,7 +72,9 @@ public:
+ 
+ protected:
+ 	// reimplemented
++	void resizeEvent(QResizeEvent *e);
+ 	void closeEvent(QCloseEvent *);
++	void changeEvent(QEvent *event);
+ 	void keyPressEvent(QKeyEvent *);
+ 	QMenuBar* mainMenuBar() const;
+ #ifdef Q_OS_WIN
+@@ -141,6 +143,7 @@ private slots:
+ 	void searchTextStarted(QString const &text);
+ 
+ 	void registerAction( IconAction * );
++	void splitterMoved();
+ 
+ public slots:
+ 	void setWindowIcon(const QPixmap&);
+--- git.orig/src/options/opt_chat.cpp
++++ git/src/options/opt_chat.cpp
+@@ -136,12 +136,15 @@ void OptionsTabChat::applyOptions()
+ 		case 3:
+ 			tabGrouping = "CM";
+ 			break;
++		case 4:
++			tabGrouping = "ACM";
++			break;
+ 	}
+ 	if (!tabGrouping.isEmpty()) {
+ 		PsiOptions::instance()->setOption("options.ui.tabs.grouping", tabGrouping);
+ 	} else {
+-		if (d->cb_tabGrouping->count() == 5) {
+-			d->cb_tabGrouping->removeItem(4);
++		if (d->cb_tabGrouping->count() == 6) {
++			d->cb_tabGrouping->removeItem(5);
+ 		}
+ 	}
+ 
+@@ -188,16 +191,18 @@ void OptionsTabChat::restoreOptions()
+ 		d->cb_tabGrouping->setCurrentIndex(2);
+ 	} else if (tabGrouping == "CM") {
+ 		d->cb_tabGrouping->setCurrentIndex(3);
++	} else if (tabGrouping == "ACM") {
++		d->cb_tabGrouping->setCurrentIndex(4);
+ 	} else {
+-		if (d->cb_tabGrouping->count() == 5) {
+-			d->cb_tabGrouping->setCurrentIndex(4);
++		if (d->cb_tabGrouping->count() == 6) {
++			d->cb_tabGrouping->setCurrentIndex(5);
+ 		} else {
+ 			d->cb_tabGrouping->setCurrentIndex(-1);
+ 		}
+ 		custom = true;
+ 	}
+-	if (!custom && d->cb_tabGrouping->count() == 5) {
+-		d->cb_tabGrouping->removeItem(4);
++	if (!custom && d->cb_tabGrouping->count() == 6) {
++		d->cb_tabGrouping->removeItem(5);
+ 	}
+ 	d->ck_autoResize->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-expanding-line-edit").toBool() );
+ 	d->ck_tabShortcuts->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tab-shortcuts").toBool() );
+--- git.orig/src/options/opt_chat.ui
++++ git/src/options/opt_chat.ui
+@@ -92,6 +92,11 @@
+          <string>for mucs and chats in one window</string>
+         </property>
+        </item>
++	   <item>
++		<property name="text" >
++		 <string>for mucs, chats and roster in one window</string>
++		</property>
++	   </item>
+        <item>
+         <property name="text" >
+          <string>[customized]</string>
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -1323,7 +1323,8 @@ void PsiCon::optionChanged(const QString
+ 		alertIconUpdateAlertStyle();
+ 	}
+ 
+-	if (option == "options.ui.tabs.use-tabs") {
++	if (option == "options.ui.tabs.use-tabs" ||
++		option == "options.ui.tabs.grouping") {
+ 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
+ 		//notifyRestart = false;
+ 	}
+--- git.orig/src/psicon.h
++++ git/src/psicon.h
+@@ -47,6 +47,7 @@ class QThread;
+ class PsiActionList;
+ class PsiToolBar;
+ class TabDlg;
++class TabManager;
+ class AccountsComboBox;
+ class ChatDlg;
+ class AlertManager;
+--- git.orig/src/psitoolbar.cpp
++++ git/src/psitoolbar.cpp
+@@ -54,7 +54,7 @@ Qt::ToolBarArea dockPositionToToolBarAre
+ 	return Qt::NoToolBarArea;
+ }
+ 
+-PsiToolBar::PsiToolBar(const QString& base, QMainWindow* mainWindow, MetaActionList* actionList)
++PsiToolBar::PsiToolBar(const QString& base, QWidget* mainWindow, MetaActionList* actionList)
+ 	: QToolBar(mainWindow)
+ 	, actionList_(actionList)
+ 	, base_(base)
+@@ -81,6 +81,11 @@ void PsiToolBar::contextMenuEvent(QConte
+ 	menu.exec(e->globalPos());
+ }
+ 
++QString PsiToolBar::base() const
++{
++	return base_;
++}
++
+ void PsiToolBar::initialize()
+ {
+ 	PsiOptions* o = PsiOptions::instance();
+@@ -108,11 +113,13 @@ void PsiToolBar::initialize()
+ 		}
+ 	}
+ 
+-	QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parentWidget());
+-	mainWindow->addToolBar(dockPositionToToolBarArea((Qt3Dock)o->getOption(base_ + ".dock.position").toInt()),
+-	                       this);
+-	if (mainWindow && o->getOption(base_ + ".dock.nl").toBool()) {
+-		mainWindow->insertToolBarBreak(this);
++	if (!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
++		QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parentWidget());
++		if (mainWindow) {
++			mainWindow->addToolBar(dockPositionToToolBarArea((Qt3Dock)o->getOption(base_ + ".dock.position").toInt()), this);
++			if (o->getOption(base_ + ".dock.nl").toBool())
++				mainWindow->insertToolBarBreak(this);
++		}
+ 	}
+ 
+ 	updateVisibility();
+--- git.orig/src/psitoolbar.h
++++ git/src/psitoolbar.h
+@@ -35,11 +35,12 @@ class PsiToolBar : public QToolBar
+ 	Q_OBJECT
+ 
+ public:
+-	PsiToolBar(const QString& base, QMainWindow* mainWindow, MetaActionList* actionList);
++	PsiToolBar(const QString& base, QWidget* mainWindow, MetaActionList* actionList);
+ 	~PsiToolBar();
+ 
+ 	void initialize();
+ 	void updateVisibility();
++	QString base() const;
+ 
+ 	static void structToOptions(PsiOptions* options, const ToolbarPrefs& s);
+ 
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -186,7 +186,8 @@ TabDlg::TabDlg(TabManager* tabManager, c
+ 
+ 	setShortcuts();
+ 
+-	setGeometryOptionPath(geometryOption);
++	if(!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A'))
++		setGeometryOptionPath(geometryOption);
+ }
+ 
+ TabDlg::~TabDlg()
+@@ -487,7 +488,7 @@ void TabDlg::selectTab(TabbableWidget* c
+ 
+ void TabDlg::checkHasChats()
+ {
+-	if (tabWidget_->count() > 0)
++	if (tabWidget_->count() > 0 || this != window())
+ 		return;
+ 	deleteLater();
+ }

psi-plus-main-20141106.tar.xz/patches/0190-psi-tabs-button-killer.diff Added

@@ -0,0 +1,80 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -377,6 +377,7 @@
+ 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
+ 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
+ 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
++				<show-tab-buttons type="bool">true</show-tab-buttons>
+ 			</tabs>
+ 		</ui>
+ 		<shortcuts comment="Shortcuts">
+--- git.orig/src/options/opt_chat.cpp
++++ git/src/options/opt_chat.cpp
+@@ -103,6 +103,7 @@ void OptionsTabChat::applyOptions()
+ 	PsiOptions::instance()->setOption("options.ui.chat.alert-for-already-open-chats", d->ck_alertOpenChats->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked());
++	PsiOptions::instance()->setOption("options.ui.tabs.show-tab-buttons", d->ck_showTabButtons->isChecked());
+ 
+ 	QString delafter;
+ 	switch (bg_delChats->buttons().indexOf( bg_delChats->checkedButton() )) {
+@@ -179,6 +180,7 @@ void OptionsTabChat::restoreOptions()
+ 	d->ck_alertOpenChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() );
+ 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
+ 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
++	d->ck_showTabButtons->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool() );
+ 	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
+ 	d->cb_tabGrouping->setEnabled(PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool());
+ 	QString tabGrouping = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString();
+--- git.orig/src/options/opt_chat.ui
++++ git/src/options/opt_chat.ui
+@@ -120,6 +120,13 @@
+     </layout>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_showTabButtons" >
++     <property name="text" >
++      <string>Show tab buttons</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QCheckBox" name="ck_autoResize" >
+      <property name="text" >
+       <string>Auto-resize text input field</string>
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -1324,7 +1324,8 @@ void PsiCon::optionChanged(const QString
+ 	}
+ 
+ 	if (option == "options.ui.tabs.use-tabs" ||
+-		option == "options.ui.tabs.grouping") {
++		option == "options.ui.tabs.grouping" ||
++		option == "options.ui.tabs.show-tab-buttons") {
+ 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
+ 		//notifyRestart = false;
+ 	}
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -781,7 +781,7 @@ void TabDlg::setUserManagementEnabled(bo
+ 	}
+ 
+ 	userManagement_ = enabled;
+-	tabWidget_->setTabButtonsShown(enabled);
++	tabWidget_->setTabButtonsShown(PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool());
+ 	tabWidget_->setDragsEnabled(enabled);
+ }
+ 
+--- git.orig/src/widgets/psitabwidget.cpp
++++ git/src/widgets/psitabwidget.cpp
+@@ -75,6 +75,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
+ 
+ 	setTabPosition(QTabWidget::North);
+ 
++	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
++		closeButton_->hide();
++		downButton_->hide();
++	}
+ 	connect( tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
+ 	connect( tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
+ 	connect( tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));

psi-plus-main-20141106.tar.xz/patches/0200-psi-plugins-qcm-fix.diff Added

@@ -0,0 +1,43 @@
+--- git.temp.orig/qcm/plugins.qcm
++++ git.temp/qcm/plugins.qcm
+@@ -1,8 +1,6 @@
+ /*
+ -----BEGIN QCMOD-----
+-name: Plugins
+-arg: enable-plugins,Enable Psi Plugin support
+-
++name: Psi Plugin support
+ -----END QCMOD-----
+ */
+ 
+@@ -13,17 +11,10 @@ class qc_plugins : public ConfObj
+ {
+ public:
+ 	qc_plugins(Conf *c) : ConfObj(c) {}
+-	QString name() const { return "Plugins"; }
+-	QString shortname() const { return "Plugins"; }
++	QString name() const { return "Psi Plugin support"; }
++	QString shortname() const { return "plugins"; }
+ 	bool exec()
+ 	{
+-		QString s;
+-
+-		// Check if Jingle was enabled explicitly
+-		s = conf->getenv("QC_ENABLE_PLUGINS");
+-		if(s.isEmpty())
+-			return false;
+-
+ 		conf->addDefine("PSI_PLUGINS");
+ 
+ 		// Finish
+--- git.temp.orig/psi.qc
++++ git.temp/psi.qc
+@@ -44,7 +44,7 @@
+   <dep type='spell'>
+     <required/>
+   </dep>
+-  
++  <dep type='plugins'><disabled/></dep>
+   <dep type='conf'>
+     <required/>
+   </dep>

psi-plus-main-20141106.tar.xz/patches/0210-psi-avcalls-addons.diff Added

@@ -0,0 +1,152 @@
+--- git.orig/src/chatdlg.ui
++++ git/src/chatdlg.ui
+@@ -121,6 +121,22 @@
+           </widget>
+          </item>
+          <item>
++          <widget class="QToolButton" name="tb_voice" >
++           <property name="toolTip" >
++            <string>Voice Call</string>
++           </property>
++           <property name="text" >
++            <string/>
++           </property>
++           <property name="iconSize" >
++            <size>
++             <width>16</width>
++             <height>16</height>
++            </size>
++           </property>
++          </widget>
++         </item>
++         <item>
+           <widget class="QToolButton" name="tb_pgp">
+            <property name="toolTip">
+             <string>Toggle encryption</string>
+--- git.orig/src/gcuserview.cpp
++++ git/src/gcuserview.cpp
+@@ -36,6 +36,7 @@
+ #include "common.h"
+ #include "psioptions.h"
+ #include "coloropt.h"
++#include "avcall/avcall.h"
+ 
+ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
+ {
+@@ -414,6 +415,11 @@ void GCUserView::doContextMenu(QTreeWidg
+ 	act = new QAction(IconsetFactory::icon("psi/start-chat").icon(), tr("Open &Chat Window"), pm);
+ 	pm->addAction(act);
+ 	act->setData(1);
++	if (AvCallManager::isSupported()) {
++		act = new QAction(IconsetFactory::icon("psi/avcall").icon(), tr("Voice Call"), pm);
++		pm->addAction(act);
++		act->setData(5);
++	}
+ 	pm->addSeparator();
+ 
+ 	// Kick and Ban submenus
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1675,6 +1675,9 @@ void GCMainDlg::lv_action(const QString
+ 	else if(x == 4) {
+ 		account()->invokeGCFile(jid().withResource(nick));
+ 	}
++	else if(x == 5) {
++		account()->actionVoice(jid().withResource(nick));
++	}
+ 	else if(x == 10) {
+ 		d->mucManager->kick(nick);
+ 	}
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -43,6 +43,7 @@
+ #include "jidutil.h"
+ #include "xmpp_tasks.h"
+ #include "lastactivitytask.h"
++#include "avcall/avcall.h"
+ 
+ 
+ #define MCMDCHAT		"http://psi-im.org/ids/mcmd#chatmain"
+@@ -258,6 +259,7 @@ void PsiChatDlg::setLooks()
+ 		ui_.tb_actions->hide();
+ 		ui_.tb_emoticons->hide();
+ 		ui_.toolbar->hide();
++		ui_.tb_voice->hide();
+ 	}
+ 	else {
+ 		ui_.lb_status->show();
+@@ -266,11 +268,13 @@ void PsiChatDlg::setLooks()
+ 			ui_.toolbar->show();
+ 			ui_.tb_actions->hide();
+ 			ui_.tb_emoticons->hide();
++			ui_.tb_voice->hide();
+ 		}
+ 		else {
+ 			ui_.toolbar->hide();
+ 			ui_.tb_emoticons->setVisible(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool());
+ 			ui_.tb_actions->show();
++			ui_.tb_voice->setVisible(AvCallManager::isSupported());
+ 		}
+ 	}
+ 
+@@ -327,7 +331,8 @@ void PsiChatDlg::initToolButtons()
+ 
+ 	act_voice_ = new IconAction(tr("Voice Call"), "psi/voice", tr("Voice Call"), 0, this);
+ 	connect(act_voice_, SIGNAL(triggered()), SLOT(doVoice()));
+-	act_voice_->setEnabled(false);
++	//act_voice_->setEnabled(false);
++	ui_.tb_voice->setDefaultAction(act_voice_);
+ 
+ 	act_file_ = new IconAction(tr("Send File"), "psi/upload", tr("Send File"), 0, this);
+ 	connect(act_file_, SIGNAL(triggered()), SLOT(doFile()));
+@@ -358,7 +363,7 @@ void PsiChatDlg::initToolBar()
+ 	}
+ 	ui_.toolbar->addAction(act_info_);
+ 	ui_.toolbar->addAction(act_history_);
+-	if (account()->voiceCaller()) {
++	if (AvCallManager::isSupported()) {
+ 		ui_.toolbar->addAction(act_voice_);
+ 	}
+ }
+@@ -377,7 +382,7 @@ void PsiChatDlg::capsChanged()
+ 	if (resource.isEmpty() && ul && !ul->userResourceList().isEmpty()) {
+ 		resource = (*(ul->userResourceList().priority())).name();
+ 	}
+-	act_voice_->setEnabled(!account()->capsManager()->isEnabled() || (ul && ul->isAvailable() && account()->capsManager()->features(jid().withResource(resource)).canVoice()));
++	//act_voice_->setEnabled(!account()->capsManager()->isEnabled() || (ul && ul->isAvailable() && account()->capsManager()->features(jid().withResource(resource)).canVoice()));
+ }
+ 
+ void PsiChatDlg::activated()
+@@ -544,8 +549,9 @@ void PsiChatDlg::buildMenu()
+ 
+ 	pm_settings_->addAction(act_icon_);
+ 	pm_settings_->addAction(act_file_);
+-	if (account()->voiceCaller())
+-		act_voice_->addTo(pm_settings_);
++	if (AvCallManager::isSupported()) {
++		pm_settings_->addAction(act_voice_);
++	}
+ 	pm_settings_->addAction(act_pgp_);
+ 	pm_settings_->addSeparator();
+ 
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -38,6 +38,7 @@
+ #include "userlist.h"
+ #include "statusdlg.h"
+ #include "xmpp_tasks.h"
++#include "avcall/avcall.h"
+ #ifdef HAVE_PGPUTIL
+ #include "pgputil.h"
+ #endif
+@@ -419,7 +420,9 @@ public:
+ 		menu_->addMenu(openWhiteboardToMenu_);
+ 		menu_->addMenu(executeCommandMenu_);
+ 		menu_->addMenu(activeChatsMenu_);
+-		menu_->addAction(voiceCallAction_);
++		if(AvCallManager::isSupported()) {
++			menu_->addAction(voiceCallAction_);
++		}
+ 		menu_->addSeparator();
+ 		menu_->addAction(sendFileAction_);
+ 		menu_->addMenu(inviteToGroupchatMenu_);

psi-plus-main-20141106.tar.xz/patches/0220-psi-send-button-context-menu.diff Added

@@ -0,0 +1,1408 @@
+--- a/options/default.xml
++++ b/options/default.xml
+@@ -114,6 +114,7 @@
+ 				<use-message-icons type="bool">true</use-message-icons>
+ 				<scaled-message-icons type="bool">false</scaled-message-icons>
+ 				<warn-before-clear type="bool">true</warn-before-clear>
++				<only-paste-template type="bool">false</only-paste-template>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+--- a/src/chatdlg.ui
++++ b/src/chatdlg.ui
+@@ -292,6 +292,9 @@
+            <property name="toolTip">
+             <string>Send</string>
+            </property>
++           <property name="contextMenuPolicy" >
++            <enum>Qt::CustomContextMenu</enum>
++           </property>
+           </widget>
+          </item>
+          <item>
+--- a/src/groupchatdlg.cpp
++++ b/src/groupchatdlg.cpp
+@@ -203,7 +203,7 @@ public:
+ 	QString password;
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+-	IconAction *act_find, *act_clear, *act_icon, *act_configure;
++	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates;
+ #ifdef WHITEBOARDING
+ 	IconAction *act_whiteboard;
+ #endif
+@@ -602,6 +602,13 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 
+ 	d->state = Private::Connected;
+ 
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
++		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
++		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
++	}
++
+ 	setAcceptDrops(true);
+ 
+ #ifndef Q_OS_MAC
+@@ -669,6 +676,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	connect(d->act_mini_cmd, SIGNAL(triggered()), d, SLOT(doMiniCmd()));
+ 	addAction(d->act_mini_cmd);
+ 
++	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
++	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
++
++	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
++	d->act_templates->setMenu(getTemplateMenu());
+ 	ui_.toolbar->setIconSize(QSize(16,16));
+ 	ui_.toolbar->addAction(d->act_clear);
+ 	ui_.toolbar->addAction(d->act_configure);
+@@ -677,6 +689,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ #endif
+ 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+ 	ui_.toolbar->addAction(d->act_icon);
++	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
++	ui_.toolbar->addAction(d->act_templates);
++	((QToolButton *)ui_.toolbar->widgetForAction(d->act_templates))->setPopupMode(QToolButton::InstantPopup);
++	ui_.toolbar->addAction(d->act_ps);
+ 	ui_.toolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
+ 
+ 	// Common actions
+@@ -685,6 +701,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	connect(d->act_send,SIGNAL(triggered()), SLOT(mle_returnPressed()));
+  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
+ 	connect(ui_.pb_send, SIGNAL(clicked()), SLOT(mle_returnPressed()));
++	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
+ 	d->act_close = new QAction(this);
+ 	addAction(d->act_close);
+ 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
+@@ -743,6 +760,13 @@ GCMainDlg::~GCMainDlg()
+ 	account()->dialogUnregister(this);
+ 	delete d->mucManager;
+ 	delete d;
++
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
++		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
++		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
++	}
+ }
+ 
+ void GCMainDlg::ensureTabbedCorrectly()
+@@ -1766,6 +1790,8 @@ void GCMainDlg::buildMenu()
+ 	d->pm_settings->addSeparator();
+ 
+ 	d->pm_settings->addAction(d->act_icon);
++	d->pm_settings->addAction(d->act_templates);
++	d->pm_settings->addAction(d->act_ps);
+ 	d->pm_settings->addAction(d->act_nick);
+ }
+ 
+@@ -1797,6 +1823,50 @@ void GCMainDlg::setStatusTabIcon(int status)
+ 	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
+ }
+ 
++void GCMainDlg::sendButtonMenu()
++{
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		menu->setParams(true);
++		menu->exec(QCursor::pos());
++		menu->setParams(false);
++		d->mle()->setFocus();
++	}
++}
++
++void GCMainDlg::editTemplates()
++{
++	if(TabbableWidget::isActiveTab()) {
++		showTemplateEditor();
++	}
++}
++
++void GCMainDlg::doPasteAndSend()
++{
++	if(TabbableWidget::isActiveTab()) {
++		d->mle()->paste();
++		mle_returnPressed();
++		d->act_ps->setEnabled(false);
++		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
++	}
++}
++
++void GCMainDlg::psButtonEnabled()
++{
++	d->act_ps->setEnabled(true);
++}
++
++void GCMainDlg::sendTemp(const QString &templText)
++{
++	if(TabbableWidget::isActiveTab()) {
++		if (!templText.isEmpty()) {
++			d->mle()->textCursor().insertText(templText);
++			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
++				mle_returnPressed();
++		}
++	}
++}
++
+ //----------------------------------------------------------------------------
+ // GCFindDlg
+ //----------------------------------------------------------------------------
+--- a/src/groupchatdlg.h
++++ b/src/groupchatdlg.h
+@@ -135,6 +135,11 @@ private slots:
+ 	void openWhiteboard();
+ #endif
+ 	void chatEditCreated();
++	void sendButtonMenu();
++	void editTemplates();
++	void doPasteAndSend();
++	void sendTemp(const QString &);
++	void psButtonEnabled();
+ 
+ public:
+ 	class Private;
+--- a/src/groupchatdlg.ui
++++ b/src/groupchatdlg.ui
+@@ -286,6 +286,9 @@
+            <property name="toolTip">
+             <string>Send</string>
+            </property>
++           <property name="contextMenuPolicy" >
++            <enum>Qt::CustomContextMenu</enum>
++           </property>
+           </widget>
+          </item>
+         </layout>
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
+@@ -18,6 +18,7 @@
+ #include <QDragEnterEvent>
+ #include <QMessageBox>
+ #include <QDebug>
++#include <QTimer>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"
+@@ -171,6 +172,22 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
+ {
+ 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
+ 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
++		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
++		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
++	}
++}
++
++PsiChatDlg::~PsiChatDlg()
++{
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
++		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
++		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
++	}
+ }
+ 
+ void PsiChatDlg::initUi()
+@@ -221,6 +238,7 @@ void PsiChatDlg::initUi()
+ 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
+  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
+ 	connect(ui_.pb_send, SIGNAL(clicked()), this, SLOT(doSend()));
++	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
+ 
+ 	act_mini_cmd_ = new QAction(this);
+ 	act_mini_cmd_->setText(tr("Input command..."));
+@@ -348,6 +366,12 @@ void PsiChatDlg::initToolButtons()
+ 
+ 	act_compact_ = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
+ 	connect(act_compact_, SIGNAL(triggered()), SLOT(toggleSmallChat()));
++
++	act_ps_ = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
++	connect(act_ps_, SIGNAL(triggered()), SLOT(doPasteAndSend()));
++
++	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
++	act_templates_->setMenu(getTemplateMenu());
+ }
+ 
+ void PsiChatDlg::initToolBar()
+@@ -357,6 +381,10 @@ void PsiChatDlg::initToolBar()
+ 	ui_.toolbar->addAction(act_clear_);
+ 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+ 	ui_.toolbar->addAction(act_icon_);
++	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
++	ui_.toolbar->addAction(act_templates_);
++	((QToolButton *)ui_.toolbar->widgetForAction(act_templates_))->setPopupMode(QToolButton::InstantPopup);
++	ui_.toolbar->addAction(act_ps_);
+ 	ui_.toolbar->addAction(act_file_);
+ 	if (PsiOptions::instance()->getOption("options.pgp.enable").toBool()) {
+ 		ui_.toolbar->addAction(act_pgp_);
+@@ -548,6 +576,8 @@ void PsiChatDlg::buildMenu()
+ 	pm_settings_->addSeparator();
+ 
+ 	pm_settings_->addAction(act_icon_);
++	pm_settings_->addAction(act_templates_);
++	pm_settings_->addAction(act_ps_);
+ 	pm_settings_->addAction(act_file_);
+ 	if (AvCallManager::isSupported()) {
+ 		pm_settings_->addAction(act_voice_);
+@@ -646,5 +676,48 @@ bool PsiChatDlg::eventFilter( QObject *obj, QEvent *ev ) {
+ 	return ChatDlg::eventFilter( obj, ev );
+ }
+ 
++void PsiChatDlg::sendButtonMenu()
++{
++	SendButtonTemplatesMenu* menu = getTemplateMenu();
++	if (menu) {
++		menu->setParams(true);
++		menu->exec(QCursor::pos());
++		menu->setParams(false);
++		chatEdit()->setFocus();
++	}
++}
++
++void PsiChatDlg::editTemplates()
++{
++	if(ChatDlg::isActiveTab()) {
++		showTemplateEditor();
++	}
++}
++
++void PsiChatDlg::doPasteAndSend()
++{
++	if(ChatDlg::isActiveTab()) {
++		chatEdit()->paste();
++		doSend();
++		act_ps_->setEnabled(false);
++		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
++	}
++}
++
++void PsiChatDlg::psButtonEnabled()
++{
++	act_ps_->setEnabled(true);
++}
++
++void PsiChatDlg::sendTemp(const QString &templText)
++{
++	if(ChatDlg::isActiveTab()) {
++		if (!templText.isEmpty()) {
++			chatEdit()->textCursor().insertText(templText);
++			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
++				doSend();
++		}
++	}
++}
+ 
+ #include "psichatdlg.moc"
+--- a/src/psichatdlg.h
++++ b/src/psichatdlg.h
+@@ -17,6 +17,7 @@ class PsiChatDlg : public ChatDlg
+ 	Q_OBJECT
+ public:
+ 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
++	~PsiChatDlg();
+ 
+ protected:
+ 	// reimplemented
+@@ -39,6 +40,11 @@ private slots:
+ 
+ 	// reimplemented
+ 	void chatEditCreated();
++	void sendButtonMenu();
++	void editTemplates();
++	void doPasteAndSend();
++	void sendTemp(const QString &);
++	void psButtonEnabled();
+ 
+ private:
+ 	void initToolBar();
+@@ -73,7 +79,8 @@ private:
+ 	IconAction* act_file_;
+ 	IconAction* act_compact_;
+ 	IconAction* act_voice_;
+-
++	IconAction* act_ps_;
++	IconAction* act_templates_;
+ 	QAction *act_mini_cmd_;
+ 
+ 	MCmdManager mCmdManager_;
+new file mode 100644
+index 0000000..7ea870b
+--- /dev/null
++++ b/src/sendbuttonmenu.cpp
+@@ -0,0 +1,495 @@
++#include <QInputDialog>
++#include <QMessageBox>
++
++#include "sendbuttonmenu.h"
++#include "psioptions.h"
++#include "psiiconset.h"
++#include "common.h"
++
++SendButtonTemplatesEditor::SendButtonTemplatesEditor(QWidget* parent)
++	: QDialog(parent)
++{
++	ui_.setupUi(this);
++	setAttribute(Qt::WA_DeleteOnClose);
++	// Create actions
++	QAction *addRootTemplAction = new QAction(tr("Add template string"), this);
++	connect(addRootTemplAction, SIGNAL(triggered()), this, SLOT(addRootTemplate()));
++	addChildTemplAction = new QAction(tr("Add template string as submenu"), this);
++	connect(addChildTemplAction, SIGNAL(triggered()), this, SLOT(addChildTemplate()));
++	QAction *addRootSeparatorAction = new QAction(tr("Add separator"), this);
++	connect(addRootSeparatorAction, SIGNAL(triggered()), this, SLOT(addRootSeparator()));
++	addChildSeparatorAction = new QAction(tr("Add separator as submenu"), this);
++	connect(addChildSeparatorAction, SIGNAL(triggered()), this, SLOT(addChildSeparator()));
++	editAction = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("Edit"), this);
++	removeAction = new QAction(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), this);
++	upAction = new QAction(IconsetFactory::icon("psi/arrowUp").icon(), tr("Up"), this);
++	downAction = new QAction(IconsetFactory::icon("psi/arrowDown").icon(), tr("Down"), this);
++	// Create Add button menu
++	QMenu *add_menu = new QMenu(this);
++	add_menu->addAction(addRootTemplAction);
++	add_menu->addAction(addChildTemplAction);
++	add_menu->addAction(addRootSeparatorAction);
++	add_menu->addAction(addChildSeparatorAction);
++	ui_.btnAdd->setMenu(add_menu);
++	//--
++	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
++	int templ_cnt = templ_list.size();
++	QHash<QString, QTreeWidgetItem *> subitems;
++	for (int i = 0; i < templ_cnt; i++) {
++		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
++		if (menu_list.size() == 0)
++			continue;
++		// find subitems if exists
++		QTreeWidgetItem *item = NULL;
++		QString menu_str = "";
++		int j = menu_list.size() - 2;
++		for (; j >= 0; j--) {
++			menu_str = "";
++			QString menu_str2 = "";
++			for (int k = 0; k <= j; k++) {
++				menu_str = menu_str2;
++				menu_str2.append("/" + menu_list.at(k));
++			}
++			item = subitems.value(menu_str2, NULL);
++			if (item) {
++				menu_str = menu_str2;
++				++j;
++				break;
++			}
++		}
++		if (j < 0)
++			j = 0;
++		// create subitems
++		int sub_cnt = menu_list.size();
++		for (; j < sub_cnt; j++) {
++			QString str1 = menu_list.at(j);
++			QTreeWidgetItem::ItemType type = QTreeWidgetItem::Type;
++			if (j == (sub_cnt - 1) && str1 == "\\-") {
++				str1 = tr("<separator>");
++				type = QTreeWidgetItem::UserType;
++			}
++			if (j == 0) {
++				// toplevel item
++				item = new QTreeWidgetItem(ui_.lstTemplates, type);
++			} else {
++				item = new QTreeWidgetItem(item, type);
++			}
++			if (type == QTreeWidgetItem::UserType) {
++				item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
++			}
++			item->setText(0, SendButtonTemplatesMenu::stripSlashes(str1));
++			if (j < (sub_cnt - 1)) {
++				menu_str.append("/" + str1);
++				subitems[menu_str] = item;
++			}
++		}
++	}
++}
++
++void SendButtonTemplatesEditor::addRootTemplate()
++{
++	QString t = ui_.txtTemplate->text();
++	if (t.isEmpty())
++		return;
++	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(t), QTreeWidgetItem::Type);
++	ui_.lstTemplates->addTopLevelItem(item);
++	ui_.txtTemplate->setText("");
++}
++
++void SendButtonTemplatesEditor::addChildTemplate()
++{
++	QString t = ui_.txtTemplate->text();
++	if (t.isEmpty())
++		return;
++	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
++	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
++		curr_item->addChild(new QTreeWidgetItem(QStringList(t), QTreeWidgetItem::Type));
++		ui_.txtTemplate->setText("");
++	}
++}
++
++void SendButtonTemplatesEditor::addRootSeparator()
++{
++	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
++	item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
++	ui_.lstTemplates->addTopLevelItem(item);
++}
++
++void SendButtonTemplatesEditor::addChildSeparator()
++{
++	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
++	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
++		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
++		item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
++		curr_item->addChild(item);
++	}
++}
++
++void SendButtonTemplatesEditor::removeTemplate()
++{
++	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
++	if (item) {
++		delete item;
++	}
++}
++
++void SendButtonTemplatesEditor::editTemplate()
++{
++	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
++	if (item && item->type() == QTreeWidgetItem::Type) {
++		QString templ_str = item->text(0);
++		QInputDialog *editBox = new QInputDialog(this, Qt::Dialog);
++		editBox->setWindowTitle(tr("Edit template"));
++		editBox->setLabelText(tr("Input new template text"));
++		editBox->setTextEchoMode(QLineEdit::Normal);
++		editBox->setTextValue(templ_str);
++		editBox->setWindowModality(Qt::WindowModal);
++		if (editBox->exec() == QInputDialog::Accepted) {
++			QString new_templ_str = editBox->textValue();
++			if (!new_templ_str.isEmpty() && new_templ_str != templ_str) {
++				item->setText(0, new_templ_str);
++			}
++		}
++		delete editBox;
++	}
++}
++
++void SendButtonTemplatesEditor::upTemplate()
++{
++	swapItem(-1);
++}
++
++void SendButtonTemplatesEditor::downTemplate()
++{
++	swapItem(1);
++}
++
++void SendButtonTemplatesEditor::selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem */*previous*/)
++{
++	bool up_e = false;
++	bool dw_e = false;
++	bool ed_e = false;
++	bool dl_e = false;
++	QModelIndex index = ui_.lstTemplates->currentIndex();
++	if (current && index.isValid()) {
++		QTreeWidgetItem *parent = current->parent();
++		int cnt = 0;
++		if (parent) {
++			cnt = parent->childCount();
++		} else {
++			cnt = ui_.lstTemplates->topLevelItemCount();
++		}
++		int row = index.row();
++		if (cnt > 0) {
++			if (row > 0)
++				up_e = true;
++			if (row < cnt - 1)
++				dw_e = true;
++			if (current->type() == QTreeWidgetItem::Type)
++				ed_e = true;
++			dl_e = true;
++		}
++
++	}
++	addChildTemplAction->setEnabled(ed_e);
++	addChildSeparatorAction->setEnabled(ed_e);
++	ui_.btnEdit->setEnabled(ed_e);
++	editAction->setEnabled(ed_e);
++	ui_.btnRemove->setEnabled(dl_e);
++	removeAction->setEnabled(ed_e);
++	ui_.btnUp->setEnabled(up_e);
++	upAction->setEnabled(up_e);
++	ui_.btnDown->setEnabled(dw_e);
++	downAction->setEnabled(dw_e);
++}
++
++void SendButtonTemplatesEditor::contextMenu(QPoint pos)
++{
++	QMenu* menu = new QMenu(this);
++	menu->addAction(editAction);
++	menu->addAction(removeAction);
++	menu->addSeparator();
++	menu->addAction(upAction);
++	menu->addAction(downAction);
++	QAction *result = menu->exec(ui_.lstTemplates->mapToGlobal(pos));
++	if (result == editAction) {
++		editTemplate();
++	} else if (result == removeAction) {
++		removeTemplate();
++	} else if (result == upAction) {
++		upTemplate();
++	} else if (result == downAction) {
++		downTemplate();
++	}
++	delete menu;
++}
++
++void SendButtonTemplatesEditor::swapItem(int updown)
++{
++	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
++	QModelIndex index = ui_.lstTemplates->currentIndex();
++	if (item && index.isValid()) {
++		int row = index.row();
++		int new_pos = row + updown;
++		QTreeWidgetItem * parent = item->parent();
++		int cnt = 0;
++		if (parent) {
++			cnt = parent->childCount();
++		} else {
++			cnt = ui_.lstTemplates->topLevelItemCount();
++		}
++		if (new_pos >= 0 && new_pos < cnt) {
++			if (parent) {
++				parent->removeChild(item);
++				parent->insertChild(new_pos, item);
++			} else {
++				ui_.lstTemplates->takeTopLevelItem(row);
++				ui_.lstTemplates->insertTopLevelItem(new_pos, item);
++			}
++			ui_.lstTemplates->setCurrentItem(item);
++			selectionChanged(item, item); // needed update buttons
++		}
++	}
++}
++
++QStringList SendButtonTemplatesEditor::genTemplatesList(QTreeWidgetItem* item, QString base_path)
++{
++	QStringList res_lst;
++	QString new_base = base_path;
++	if (!new_base.isEmpty())
++		new_base.append("/");
++	QString item_text = SendButtonTemplatesMenu::addSlashes(item->text(0));
++	int child_cnt = item->childCount();
++	if (child_cnt == 0) {
++		if (item->type() != QTreeWidgetItem::Type)
++			item_text = "\\-"; // Separator
++		res_lst.push_back(new_base + item_text);
++		return res_lst;
++	}
++	new_base.append(item_text);
++	for (int idx = 0; idx < child_cnt; idx++) {
++		res_lst.append(genTemplatesList(item->child(idx), new_base));
++	}
++	return res_lst;
++}
++
++void SendButtonTemplatesEditor::accept()
++{
++	QString t = ui_.txtTemplate->text().trimmed();
++	if (!t.isEmpty()) {
++		QMessageBox *msgBox = new QMessageBox(this);
++		msgBox->setIcon(QMessageBox::Warning);
++		msgBox->setWindowTitle(tr("Save templates"));
++		msgBox->setText(tr("The template \"%1\" hasn't been saved!").arg(t));
++		msgBox->setInformativeText(tr("Continue?"));
++		msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
++		msgBox->setDefaultButton(QMessageBox::No);
++		msgBox->setWindowModality(Qt::WindowModal);
++		int res = msgBox->exec();
++		delete msgBox;
++		if (res == QMessageBox::No) {
++			return;
++		}
++	}
++	QStringList templates;
++	int top_cnt = ui_.lstTemplates->topLevelItemCount();
++	for (int idx = 0; idx < top_cnt; idx++) {
++		templates.append(genTemplatesList(ui_.lstTemplates->topLevelItem(idx)));
++	}
++	PsiOptions::instance()->setOption("options.ui.chat.templates", templates);
++	QDialog::accept();
++	close();
++}
++
++void SendButtonTemplatesEditor::reject()
++{
++	QDialog::reject();
++	close();
++}
++
++//------------------------------
++
++SendButtonTemplatesMenu::SendButtonTemplatesMenu(QWidget* parent)
++	: QMenu(parent)
++	, mapper(NULL)
++	, ps_(false)
++{
++	setSeparatorsCollapsible(true);
++	update();
++	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
++}
++
++void SendButtonTemplatesMenu::setParams(bool ps)
++{
++	if (ps_ != ps) {
++		ps_ = ps;
++		updatePsAction();
++	}
++}
++
++void SendButtonTemplatesMenu::updatePsAction()
++{
++	bool ps_v = false;
++	if (ps_ && !PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
++		ps_v = true;
++	pasteSendAct->setVisible(ps_v);
++}
++
++/**
++ * Split menu text string as submenu. Char '/' used as separator.
++ */
++QStringList SendButtonTemplatesMenu::getMenuItems(const QString text)
++{
++	QStringList res_list;
++	int str_len = text.length();
++	unsigned int sl_cnt = 0;
++	int str_pos = 0;
++	for (int i = 0; i < str_len; i++) {
++		QChar ch = text.at(i);
++		if (ch == '\\') {
++			sl_cnt++;
++		} else if (ch == '/') {
++			if ((sl_cnt & 1) == 0) {
++				QString str1 = text.mid(str_pos, i - str_pos).trimmed();
++				if (!str1.isEmpty()) {
++					res_list.push_back(str1);
++					str_pos = i + 1;
++				}
++				str_pos = i + 1;
++			}
++			sl_cnt = 0;
++		} else {
++			sl_cnt = 0;
++		}
++	}
++	if (str_pos < str_len) {
++		QString str1 = text.mid(str_pos);
++		if (!str1.isEmpty()) {
++			res_list.push_back(str1);
++		}
++	}
++	return res_list;
++}
++
++QAction *SendButtonTemplatesMenu::makeAction(QString text)
++{
++	QString str1;
++	if (text.length() > 30) {
++		str1 = text.left(30).replace("&", "&&") + "...";
++	} else {
++		str1 = text.replace("&", "&&");
++	}
++	QAction *act = new QAction(str1, this);
++	return act;
++}
++
++void SendButtonTemplatesMenu::update()
++{
++	clearMenu(this);
++	if (mapper)
++		delete mapper;
++	mapper = new QSignalMapper(this);
++
++	pasteSendAct = new QAction(IconsetFactory::icon("psi/action_paste_and_send").icon(), tr("Paste and &Send"), this);
++	connect(pasteSendAct, SIGNAL(triggered()), SIGNAL(doPasteAndSend()));
++	addAction(pasteSendAct);
++	updatePsAction();
++	addSeparator();
++
++	QAction *editTemplatesAct = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("&Edit Templates"), this);
++	connect(editTemplatesAct, SIGNAL(triggered()), SIGNAL(doEditTemplates()));
++	addAction(editTemplatesAct);
++
++	onlyPaste = new QAction(tr("Only &Paste"), this);
++	onlyPaste->setCheckable(true);
++	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
++	connect(onlyPaste, SIGNAL(triggered()), SLOT(clickOnlyPaste()));
++	addAction(onlyPaste);
++	addSeparator();
++
++	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
++	int templ_cnt = templ_list.size();
++	QHash<QString, QAction *> submenus;
++	for (int i = 0; i < templ_cnt; i++) {
++		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
++		if (menu_list.size() == 0)
++			continue;
++		// find submenus if exists
++		QAction *m_act = NULL;
++		QString menu_str = "";
++		int j = menu_list.size() - 2;
++		for (; j >= 0; j--) {
++			menu_str = "";
++			QString menu_str2 = "";
++			for (int k = 0; k <= j; k++) {
++				menu_str = menu_str2;
++				menu_str2.append("/" + menu_list.at(k));
++			}
++			m_act = submenus.value(menu_str2, NULL);
++			if (m_act) {
++				menu_str = menu_str2;
++				++j;
++				break;
++			}
++		}
++		if (j < 0)
++			j = 0;
++		// create submenus
++		QMenu *smenu = this;
++		if (m_act) {
++			smenu = m_act->menu();
++			if (!smenu)
++				smenu = new QMenu(this);
++		}
++		int sub_cnt = menu_list.size();
++		for (; ; j++) {
++			QString str1 = menu_list.at(j);
++			if (j == (sub_cnt - 1) && str1 == "\\-") {
++				smenu->addSeparator();
++				break;
++			}
++			QAction *c_act = makeAction(SendButtonTemplatesMenu::stripSlashes(str1));
++			smenu->addAction(c_act);
++			if (j == (sub_cnt - 1)) {
++				connect(c_act, SIGNAL(triggered()), mapper, SLOT(map()));
++				mapper->setMapping(c_act, SendButtonTemplatesMenu::stripSlashes(str1));
++				break;
++			} else {
++				smenu = new QMenu(this);
++				c_act->setMenu(smenu);
++				menu_str.append("/" + str1);
++				submenus[menu_str] = c_act;
++			}
++		}
++	}
++	connect(mapper, SIGNAL(mapped(const QString &)), SIGNAL(doTemplateText(const QString &)));
++}
++
++void SendButtonTemplatesMenu::clickOnlyPaste()
++{
++	if (PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
++		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", false);
++	else
++		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", true);
++}
++
++void SendButtonTemplatesMenu::optionChanged(const QString& option)
++{
++	if (option == "options.ui.chat.disable-paste-send") {
++		updatePsAction();
++	} else if (option == "options.ui.chat.css") {
++		setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
++	//} else if (option == "options.ui.chat.only-paste-template") {
++	//	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
++	}
++}
++
++QString SendButtonTemplatesMenu::addSlashes(QString str)
++{
++	return str.replace("\\", "\\\\", Qt::CaseSensitive).replace("/", "\\/");
++}
++
++QString SendButtonTemplatesMenu::stripSlashes(QString str)
++{
++	return str.replace("\\/", "/").replace("\\\\", "\\");
++}
+new file mode 100644
+--- /dev/null
++++ b/src/sendbuttonmenu.h
+@@ -0,0 +1,77 @@
++#ifndef SENDBUTTONMENU_H
++#define SENDBUTTONMENU_H
++
++#include <QDialog>
++#include <QMenu>
++#include <QPointer>
++#include <QSignalMapper>
++
++#include "ui_sendbuttontemplateseditor.h"
++
++class SendButtonTemplatesEditor : public QDialog
++{
++	Q_OBJECT
++public:
++	SendButtonTemplatesEditor(QWidget* parent = 0);
++
++private:
++	Ui::SendButtonTemplatesEditor ui_;
++	//QString t;
++	QAction *addChildTemplAction;
++	QAction *addChildSeparatorAction;
++	QAction *editAction;
++	QAction *removeAction;
++	QAction *upAction;
++	QAction *downAction;
++	void swapItem(int);
++	QStringList genTemplatesList(QTreeWidgetItem* item, QString base_path = "");
++
++private slots:
++	void addRootTemplate();
++	void addChildTemplate();
++	void addRootSeparator();
++	void addChildSeparator();
++	void removeTemplate();
++	void editTemplate();
++	void upTemplate();
++	void downTemplate();
++	void selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
++	void contextMenu(QPoint);
++
++protected slots:
++	void accept();
++	void reject();
++
++};
++
++class SendButtonTemplatesMenu : public QMenu
++{
++	Q_OBJECT
++public:
++	SendButtonTemplatesMenu(QWidget* parent);
++	void setParams(bool ps);
++	static QStringList getMenuItems(const QString);
++	static QString addSlashes(QString);
++	static QString stripSlashes(QString);
++
++private:
++	QSignalMapper *mapper;
++	bool ps_;
++	QAction *pasteSendAct;
++	QAction *onlyPaste;
++	void updatePsAction();
++	QAction *makeAction(const QString);
++
++private slots:
++	void update();
++	void clickOnlyPaste();
++	void optionChanged(const QString& option);
++
++signals:
++	void doPasteAndSend();
++	void doEditTemplates();
++	void doTemplateText(const QString &);
++
++};
++
++#endif
+new file mode 100644
+--- /dev/null
++++ b/src/sendbuttontemplateseditor.ui
+@@ -0,0 +1,364 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>SendButtonTemplatesEditor</class>
++ <widget class="QDialog" name="SendButtonTemplatesEditor">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>464</width>
++    <height>407</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>Template editor</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <item>
++    <widget class="QGroupBox" name="groupBox">
++     <property name="title">
++      <string>Templates</string>
++     </property>
++     <layout class="QVBoxLayout">
++      <item>
++       <widget class="QLineEdit" name="txtTemplate">
++        <property name="text">
++         <string/>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="Line" name="line1">
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <layout class="QHBoxLayout">
++        <item>
++         <widget class="QTreeWidget" name="lstTemplates">
++          <property name="contextMenuPolicy">
++           <enum>Qt::CustomContextMenu</enum>
++          </property>
++          <property name="dragEnabled">
++           <bool>true</bool>
++          </property>
++          <property name="dragDropMode">
++           <enum>QAbstractItemView::InternalMove</enum>
++          </property>
++          <property name="defaultDropAction">
++           <enum>Qt::MoveAction</enum>
++          </property>
++          <attribute name="headerVisible">
++           <bool>false</bool>
++          </attribute>
++          <attribute name="headerVisible">
++           <bool>false</bool>
++          </attribute>
++          <column>
++           <property name="text">
++            <string notr="true">1</string>
++           </property>
++          </column>
++         </widget>
++        </item>
++        <item>
++         <layout class="QVBoxLayout">
++          <item>
++           <widget class="QToolButton" name="btnUp">
++            <property name="enabled">
++             <bool>false</bool>
++            </property>
++            <property name="sizePolicy">
++             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
++              <horstretch>0</horstretch>
++              <verstretch>0</verstretch>
++             </sizepolicy>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>26</width>
++              <height>51</height>
++             </size>
++            </property>
++            <property name="styleSheet">
++             <string notr="true">margin:0;padding:0;</string>
++            </property>
++            <property name="arrowType">
++             <enum>Qt::UpArrow</enum>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QToolButton" name="btnDown">
++            <property name="enabled">
++             <bool>false</bool>
++            </property>
++            <property name="sizePolicy">
++             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
++              <horstretch>0</horstretch>
++              <verstretch>0</verstretch>
++             </sizepolicy>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>26</width>
++              <height>51</height>
++             </size>
++            </property>
++            <property name="styleSheet">
++             <string notr="true">margin:0;padding:0;</string>
++            </property>
++            <property name="arrowType">
++             <enum>Qt::DownArrow</enum>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <widget class="Line" name="line2">
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <layout class="QHBoxLayout">
++        <property name="spacing">
++         <number>6</number>
++        </property>
++        <property name="margin">
++         <number>0</number>
++        </property>
++        <item>
++         <widget class="QPushButton" name="btnAdd">
++          <property name="text">
++           <string>Add</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QPushButton" name="btnEdit">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="text">
++           <string>Edit</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QPushButton" name="btnRemove">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="text">
++           <string>Remove</string>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout">
++     <property name="spacing">
++      <number>6</number>
++     </property>
++     <property name="margin">
++      <number>0</number>
++     </property>
++     <item>
++      <spacer>
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>40</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="QPushButton" name="btnOk">
++       <property name="text">
++        <string>Ok</string>
++       </property>
++       <property name="autoDefault">
++        <bool>false</bool>
++       </property>
++       <property name="default">
++        <bool>true</bool>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="btnCancel">
++       <property name="text">
++        <string>Cancel</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <tabstops>
++  <tabstop>txtTemplate</tabstop>
++  <tabstop>lstTemplates</tabstop>
++  <tabstop>btnUp</tabstop>
++  <tabstop>btnDown</tabstop>
++  <tabstop>btnAdd</tabstop>
++  <tabstop>btnEdit</tabstop>
++  <tabstop>btnRemove</tabstop>
++  <tabstop>btnOk</tabstop>
++  <tabstop>btnCancel</tabstop>
++ </tabstops>
++ <resources/>
++ <connections>
++  <connection>
++   <sender>btnOk</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>accept()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>265</x>
++     <y>271</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>-2</x>
++     <y>287</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnCancel</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>reject()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>341</x>
++     <y>283</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>81</x>
++     <y>272</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnRemove</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>removeTemplate()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>290</x>
++     <y>227</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>199</x>
++     <y>149</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnEdit</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>editTemplate()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>231</x>
++     <y>269</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>231</x>
++     <y>162</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnUp</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>upTemplate()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>439</x>
++     <y>120</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>231</x>
++     <y>162</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnDown</sender>
++   <signal>clicked()</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>downTemplate()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>439</x>
++     <y>196</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>231</x>
++     <y>162</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>lstTemplates</sender>
++   <signal>customContextMenuRequested(QPoint)</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>contextMenu(QPoint)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>219</x>
++     <y>158</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>231</x>
++     <y>162</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>lstTemplates</sender>
++   <signal>currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)</signal>
++   <receiver>SendButtonTemplatesEditor</receiver>
++   <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>219</x>
++     <y>158</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>231</x>
++     <y>162</y>
++    </hint>
++   </hints>
++  </connection>
++ </connections>
++ <slots>
++  <slot>removeTemplate()</slot>
++  <slot>editTemplate()</slot>
++  <slot>upTemplate()</slot>
++  <slot>downTemplate()</slot>
++  <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
++  <slot>contextMenu(QPoint)</slot>
++ </slots>
++</ui>
+--- a/src/src.pri
++++ b/src/src.pri
+@@ -206,7 +206,9 @@ HEADERS += \
+ 	$$PWD/bookmarkmanagedlg.h \
+ 	$$PWD/vcardphotodlg.h \
+ 	$$PWD/psicli.h \
+-	$$PWD/coloropt.h
++	$$PWD/coloropt.h \
++	$$PWD/sendbuttonmenu.h
++
+ 
+ 
+ HEADERS += tabcompletion.h
+@@ -342,7 +344,9 @@ SOURCES += \
+ 	$$PWD/accountlabel.cpp \
+ 	$$PWD/bookmarkmanagedlg.cpp \
+ 	$$PWD/vcardphotodlg.cpp \
+-	$$PWD/coloropt.cpp
++	$$PWD/coloropt.cpp \
++	$$PWD/sendbuttonmenu.cpp
++
+ 
+ CONFIG += filetransfer
+ filetransfer {
+@@ -573,7 +577,8 @@ FORMS += \
+ 	$$PWD/chatdlg.ui \
+ 	$$PWD/bookmarkmanage.ui \
+ 	$$PWD/ahcommanddlg.ui \
+-	$$PWD/ahcformdlg.ui
++	$$PWD/ahcformdlg.ui \
++	$$PWD/sendbuttontemplateseditor.ui
+ 
+ # options dialog
+ include($$PWD/options/options.pri)
+--- a/src/tabs/tabbablewidget.cpp
++++ b/src/tabs/tabbablewidget.cpp
+@@ -41,6 +41,12 @@ TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabMa
+ 	, pa_(pa)
+ 	, tabManager_(tabManager)
+ {
++	if (TabbableWidget::chatsCount == 0) {
++		TabbableWidget::templateMenu = new SendButtonTemplatesMenu(NULL);
++		TabbableWidget::templateMenu->setParams(false);
++		TabbableWidget::templateMenu->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
++	}
++	++TabbableWidget::chatsCount;
+ 	QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
+ }
+ 
+@@ -100,6 +106,42 @@ TabbableWidget::~TabbableWidget()
+ 	if (isTabbed()) {
+ 		getManagingTabDlg()->removeTabWithNoChecks(this);
+ 	}
++	--TabbableWidget::chatsCount;
++	if (TabbableWidget::chatsCount == 0) {
++		if (TabbableWidget::templateMenu != NULL) {
++			delete TabbableWidget::templateMenu;
++			TabbableWidget::templateMenu = NULL;
++		}
++		if (!TabbableWidget::templateEditDlg.isNull()) {
++			delete (TabbableWidget::templateEditDlg);
++			TabbableWidget::templateEditDlg = NULL;
++		}
++	}
++}
++
++int TabbableWidget::chatsCount = 0;
++SendButtonTemplatesMenu *TabbableWidget::templateMenu = NULL;
++QPointer<SendButtonTemplatesEditor> TabbableWidget::templateEditDlg = NULL;
++
++SendButtonTemplatesMenu* TabbableWidget::getTemplateMenu()
++{
++	return TabbableWidget::templateMenu;
++}
++
++void TabbableWidget::showTemplateEditor()
++{
++	bool new_window = false;
++	if (TabbableWidget::templateEditDlg.isNull()) {
++		new_window = true;
++		TabbableWidget::templateEditDlg = new SendButtonTemplatesEditor(NULL);
++		if (TabbableWidget::templateMenu) {
++			TabbableWidget::templateEditDlg->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
++			connect(TabbableWidget::templateEditDlg.data(), SIGNAL(accepted()), TabbableWidget::templateMenu, SLOT(update()));
++		}
++	}
++	TabbableWidget::templateEditDlg->show();
++	if (!new_window)
++		::bringToFront(TabbableWidget::templateEditDlg);
+ }
+ 
+ /**
+--- a/src/tabs/tabbablewidget.h
++++ b/src/tabs/tabbablewidget.h
+@@ -24,6 +24,7 @@
+ #include <QIcon>
+ #include "advwidget.h"
+ #include "im.h" // ChatState
++#include "sendbuttonmenu.h"
+ 
+ namespace XMPP {
+ 	class Jid;
+@@ -68,6 +69,11 @@ public:
+ 	virtual int unreadMessageCount() const = 0;
+ 	virtual QString desiredCaption() const = 0;
+ 
++	// Templates
++	SendButtonTemplatesMenu* getTemplateMenu();
++	void showTemplateEditor();
++	// ---
++
+ signals:
+ 	void invalidateTabInfo();
+ 	void updateFlashState();
+@@ -90,6 +96,11 @@ private:
+ 	PsiAccount *pa_;
+ 	TabManager *tabManager_;
+ 	QIcon icon_;
++	// Templates
++	static int chatsCount;
++	static SendButtonTemplatesMenu *templateMenu;
++	static QPointer<SendButtonTemplatesEditor> templateEditDlg;
++	// ---
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/0230-psi-quit-on-close-option.diff Added

@@ -0,0 +1,95 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -152,6 +152,7 @@
+ 				<group-sort-style type="QString">alpha</group-sort-style>
+ 				<lockdown-roster type="bool">false</lockdown-roster>
+ 				<raise-on-new-event type="bool">false</raise-on-new-event>
++				<quit-on-close type="bool">false</quit-on-close>
+ 				<show>
+ 					<agent-contacts type="bool">true</agent-contacts>
+ 					<away-contacts type="bool">true</away-contacts>
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -1161,7 +1161,7 @@ void MainWin::closeEvent(QCloseEvent* e)
+ 	trayHide();
+ 	e->accept();
+ #else
+-	if(d->tray) {
++	if(d->tray && !PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool()) {
+ 		trayHide();
+ 		e->accept();
+ 		return;
+--- git.orig/src/options/opt_application.cpp
++++ git/src/options/opt_application.cpp
+@@ -67,6 +67,7 @@ QWidget *OptionsTabApplication::widget()
+ 
+ 
+ 	connect(d->le_dtPort, SIGNAL(textChanged(QString)), this, SLOT(updatePortLabel()));
++	connect(d->ck_docklet, SIGNAL(stateChanged(int)), this, SLOT(doEnableQuitOnClose(int)));
+ 
+ 	return w;
+ }
+@@ -83,6 +84,8 @@ void OptionsTabApplication::applyOptions
+ 
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
++	PsiOptions::instance()->setOption("options.ui.contactlist.quit-on-close", d->ck_quitOnClose->isChecked());
++
+ 	// Auto-update
+ 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
+ 
+@@ -108,18 +111,26 @@ void OptionsTabApplication::restoreOptio
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
+ 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
++	d->ck_quitOnClose->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool());
+ 
+ 	// docklet
+ 	d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
+ 	d->ck_dockDCstyle->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool() );
+ 	d->ck_dockHideMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.hide-on-start").toBool() );
+ 	d->ck_dockToolMW->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-toolwindow").toBool() );
++	doEnableQuitOnClose(d->ck_docklet->isChecked()?1:0);
+ 
+ 	// data transfer
+ 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
+ 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
+ }
+ 
++void OptionsTabApplication::doEnableQuitOnClose(int state)
++{
++	OptApplicationUI *d = (OptApplicationUI *)w;
++	d->ck_quitOnClose->setEnabled(state>0);
++}
++
+ void OptionsTabApplication::updatePortLabel()
+ {
+ 	if ( !w )
+--- git.orig/src/options/opt_application.h
++++ git/src/options/opt_application.h
+@@ -25,6 +25,9 @@ private slots:
+ private:
+ 	QWidget *w;
+ 	bool haveAutoUpdater_;
++
++private slots:
++	void doEnableQuitOnClose(int);
+ };
+ 
+ #endif
+--- git.orig/src/options/opt_application.ui
++++ git/src/options/opt_application.ui
+@@ -79,6 +79,13 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_quitOnClose" >
++     <property name="text" >
++      <string>Quit when closing the roster window</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <layout class="QHBoxLayout" >
+      <item>
+       <widget class="QLabel" name="textLabel1" >

psi-plus-main-20141106.tar.xz/patches/0240-psi-change-some-icons.diff Added

@@ -0,0 +1,86 @@
+--- git.orig/src/contactlistaccountmenu.cpp
++++ git/src/contactlistaccountmenu.cpp
+@@ -121,7 +121,7 @@ public:
+ 		avatarMenu_ = menu->addMenu(tr("Avatar"));
+ 		avatarMenu_->addAction(setAvatarAction_);
+ 		avatarMenu_->addAction(unsetAvatarAction_);
+-		bookmarksMenu_ = menu->addMenu(tr("Bookmarks"));
++		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));
+ 		bookmarksMenu_->addAction(bookmarksManageAction_);
+ 		menu->addSeparator();
+ 		menu->addAction(addContactAction_);
+--- git.orig/src/contactview.cpp
++++ git/src/contactview.cpp
+@@ -978,7 +978,7 @@ void ContactProfile::doContextMenu(Conta
+ 			bookmarks->setEnabled(false);
+ 		}
+ 
+-		pm.insertItem(tr("Bookmarks"), bookmarks);
++		pm.insertItem(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"), bookmarks);
+ 
+ 		pm.insertSeparator();
+ 		pm.insertItem(IconsetFactory::icon("psi/addContact").icon(), tr("&Add a Contact"), 7);
+@@ -1266,7 +1266,7 @@ void ContactProfile::doContextMenu(Conta
+ 		// Voice call
+ 		if(d->pa->avCallManager() && !isAgent) {
+ 		//if(d->pa->voiceCaller() && !isAgent) {
+-			pm.insertItem(IconsetFactory::icon("psi/voice").icon(), tr("Voice Call"), 24);
++			pm.insertItem(IconsetFactory::icon("psi/avcall").icon(), tr("Voice Call"), 24);
+ 			if(!online) {
+ 				pm.setItemEnabled(24, false);
+ 			}
+--- git.orig/src/options/opt_avcall.cpp
++++ git/src/options/opt_avcall.cpp
+@@ -166,7 +166,7 @@ void options_avcall_update()
+ //----------------------------------------------------------------------------
+ 
+ OptionsTabAvCall::OptionsTabAvCall(QObject *parent)
+-: OptionsTab(parent, "avcall", "", tr("Voice Calling"), AvCallManager::isVideoSupported() ? tr("Audio and video device configuration") : tr("Audio device configuration"), "psi/voice")
++: OptionsTab(parent, "avcall", "", tr("Voice Calling"), AvCallManager::isVideoSupported() ? tr("Audio and video device configuration") : tr("Audio device configuration"), "psi/avcall")
+ {
+ 	w = 0;
+ }
+--- git.orig/src/options/opt_plugins.cpp
++++ git/src/options/opt_plugins.cpp
+@@ -23,7 +23,7 @@ public:
+ //----------------------------------------------------------------------------
+ 
+ OptionsTabPlugins::OptionsTabPlugins(QObject *parent)
+-: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/advanced")
++: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/plugins")
+ {
+ 	w = 0;
+ }
+--- git.orig/src/options/opt_tree.cpp
++++ git/src/options/opt_tree.cpp
+@@ -5,7 +5,7 @@
+ #include "psioptionseditor.h"
+ 
+ OptionsTabTree::OptionsTabTree(QObject *parent)
+-		: OptionsTab(parent, "tree", "", tr("Advanced"), tr("Options for advanced users"), "psi/advanced")
++		: OptionsTab(parent, "tree", "", tr("Advanced"), tr("Options for advanced users"), "psi/advanced-plus")
+ {
+ 	w = 0;
+ }
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -347,7 +347,7 @@ void PsiChatDlg::initToolButtons()
+ 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
+ 	ui_.tb_emoticons->setMenu(account()->psi()->iconSelectPopup());
+ 
+-	act_voice_ = new IconAction(tr("Voice Call"), "psi/voice", tr("Voice Call"), 0, this);
++	act_voice_ = new IconAction(tr("Voice Call"), "psi/avcall", tr("Voice Call"), 0, this);
+ 	connect(act_voice_, SIGNAL(triggered()), SLOT(doVoice()));
+ 	//act_voice_->setEnabled(false);
+ 	ui_.tb_voice->setDefaultAction(act_voice_);
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -340,7 +340,7 @@ public:
+ 		openWhiteboardAction_ = new IconAction(tr("Open a &Whiteboard"), this, "psi/whiteboard");
+ 		connect(openWhiteboardAction_, SIGNAL(triggered()), SLOT(openWhiteboard()));
+ 
+-		voiceCallAction_ = new IconAction(tr("Voice Call"), this, "psi/voice");
++		voiceCallAction_ = new IconAction(tr("Voice Call"), this, "psi/avcall");
+ 		connect(voiceCallAction_, SIGNAL(triggered()), SLOT(voiceCall()));
+ 
+ 		sendFileAction_ = new IconAction(tr("Send &File"), this, "psi/upload");

psi-plus-main-20141106.tar.xz/patches/0250-psi-fix-ns-correcting.diff Added

psi-plus-main-20141106.tar.xz/patches/0260-psi-implements-iq-version-stuff-in-discodlg.diff Added

@@ -0,0 +1,101 @@
+--- git.orig/src/discodlg.cpp
++++ git/src/discodlg.cpp
+@@ -885,7 +885,7 @@ public: // data
+ 	IconAction *actBrowse, *actBack, *actForward, *actRefresh, *actStop;
+ 
+ 	// custom actions, that will be added to toolbar and context menu
+-	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd;
++	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
+ 
+ 	typedef QList<History*> HistoryList;
+ 	HistoryList backHistory, forwardHistory;
+@@ -1003,6 +1003,9 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 	actAdd = new IconAction (tr("Add to roster"), "psi/addContact", tr("&Add to roster"), 0, dlg);
+ 	connect (actAdd, SIGNAL(triggered()), sm, SLOT(map()));
+ 	sm->setMapping(actAdd, Features::FID_Add);
++	actQueryVersion = new IconAction (tr("Query version"), "psi/info", tr("&Query version"), 0, dlg);
++	connect (actQueryVersion, SIGNAL(triggered()), sm, SLOT(map()));
++	sm->setMapping(actQueryVersion, Features::FID_QueryVersion);
+ 
+ 	// create toolbar
+ 	toolBar = new QToolBar(tr("Service Discovery toolbar"), dlg);
+@@ -1028,6 +1031,7 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 	toolBar->addAction(actAdd);
+ 	toolBar->addAction(actVCard);
+ 	toolBar->addAction(actAHCommand);
++	toolBar->addAction(actQueryVersion);
+ 
+ 	// select protocol
+ 	if (PsiOptions::instance()->getOption("options.ui.show-deprecated.service-discovery.protocol-selector").toBool()) {
+@@ -1201,6 +1205,7 @@ void DiscoDlg::Private::enableButtons(co
+ 	actAdd->setEnabled( itemSelected );
+ 	actVCard->setEnabled( f.haveVCard() );
+ 	actAHCommand->setEnabled( f.canCommand() );
++	actQueryVersion->setEnabled( f.hasVersion() );
+ }
+ 
+ void DiscoDlg::Private::itemSelected (QTreeWidgetItem *item)
+@@ -1329,6 +1334,7 @@ bool DiscoDlg::Private::eventFilter (QOb
+ 			actAdd->addTo(&p);
+ 			actVCard->addTo(&p);
+ 			actAHCommand->addTo(&p);
++			actQueryVersion->addTo(&p);
+ 
+ 			// popup with all available features
+ 			QMenu *fm = new QMenu(&p);
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3279,6 +3279,9 @@ void PsiAccount::featureActivated(QStrin
+ 		QStringList sl;
+ 		dj_add(jid, QString::null, sl, true);
+ 	}
++	else if ( f.hasVersion() ) {
++		actionQueryVersion(jid);
++	}
+ }
+ 
+ void PsiAccount::actionManageBookmarks()
+@@ -3777,6 +3780,25 @@ void PsiAccount::actionSendFiles(const J
+ 	sendFiles(j, l);
+ }
+ 
++void PsiAccount::actionQueryVersion(const Jid& j)
++{
++	JT_ClientVersion *task = new JT_ClientVersion(d->client->rootTask());
++	task->get(j);
++	connect(task, SIGNAL(finished()), SLOT(queryVersionFinished()));
++	task->go(true);
++}
++
++void PsiAccount::queryVersionFinished()
++{
++	JT_ClientVersion* j = static_cast<JT_ClientVersion*>(sender());
++	QString text;
++	text += tr("Name:\t") + j->name();
++	text += "\n" + tr("Version:\t") + j->version();
++	text += "\n" + tr("Os:\t") + j->os();
++
++	QMessageBox::information(NULL, QString(tr("Version Query Information")), text);
++}
++
+ void PsiAccount::actionExecuteCommand(const Jid& j, const QString& node)
+ {
+ 	Jid j2 = j;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -364,6 +364,7 @@ public slots:
+ 	void actionSetActivity();
+ 	void actionSetAvatar();
+ 	void actionUnsetAvatar();
++	void actionQueryVersion(const Jid& j);
+ 	void featureActivated(QString feature, Jid jid, QString node);
+ 
+ 	void actionAssignKey(const Jid &);
+@@ -436,6 +437,7 @@ private slots:
+ 
+ 	void processReadNext(const UserListItem &);
+ 	void processReadNext(const Jid &);
++	void queryVersionFinished();
+ 
+ 	void messageStanzasAcked(int n);
+ protected:

psi-plus-main-20141106.tar.xz/patches/0270-psi-add-feature-jabber-iq-version-to-psi-s-feature-list.diff Added

psi-plus-main-20141106.tar.xz/patches/0280-psi-add-iq-version-feature-stuff.diff Added

@@ -0,0 +1,110 @@
+From 36ef2857c30dea683d61b30eb4aaec423201a66d Mon Sep 17 00:00:00 2001
+From: Thilo Cestonaro <thilo@cestona.ro>
+Date: Wed, 8 Jul 2009 20:59:07 +0200
+Subject: [PATCH] add iq:version Feature stuff
+
+---
+ source/iris/src/xmpp/xmpp-im/xmpp_features.cpp |   49 ++++++++++++++++++++++-------------
+ work/iris/src/xmpp/xmpp-im/xmpp_features.h   |    2 +
+ 2 files changed, 33 insertions(+), 18 deletions(-)
+
+--- git.temp.orig/iris/src/xmpp/xmpp-im/xmpp_features.cpp
++++ git.temp/iris/src/xmpp/xmpp-im/xmpp_features.cpp
+@@ -138,6 +138,15 @@ bool Features::isGateway() const
+ 	return test(ns);
+ }
+ 
++#define FID_QUERYVERSION "jabber:iq:version"
++bool Features::hasVersion() const
++{
++	QStringList ns;
++	ns << FID_QUERYVERSION;
++
++	return test(ns);
++}
++
+ #define FID_DISCO "http://jabber.org/protocol/disco"
+ bool Features::canDisco() const
+ {
+@@ -178,34 +187,36 @@ public:
+ 	FeatureName()
+ 	: QObject(QCoreApplication::instance())
+ 	{
+-		id2s[FID_Invalid]	= tr("ERROR: Incorrect usage of Features class");
+-		id2s[FID_None]		= tr("None");
+-		id2s[FID_Register]	= tr("Register");
+-		id2s[FID_Search]	= tr("Search");
+-		id2s[FID_Groupchat]	= tr("Groupchat");
+-		id2s[FID_Gateway]	= tr("Gateway");
+-		id2s[FID_Disco]		= tr("Service Discovery");
+-		id2s[FID_VCard]		= tr("VCard");
+-		id2s[FID_AHCommand]	= tr("Execute command");
++		id2s[FID_Invalid]		= tr("ERROR: Incorrect usage of Features class");
++		id2s[FID_None]			= tr("None");
++		id2s[FID_Register]		= tr("Register");
++		id2s[FID_Search]		= tr("Search");
++		id2s[FID_Groupchat]		= tr("Groupchat");
++		id2s[FID_Gateway]		= tr("Gateway");
++		id2s[FID_Disco]			= tr("Service Discovery");
++		id2s[FID_VCard]			= tr("VCard");
++		id2s[FID_AHCommand]		= tr("Execute command");
++		id2s[FID_QueryVersion]	= tr("Query version");
+ 
+ 		// custom Psi actions
+-		id2s[FID_Add]		= tr("Add to roster");
++		id2s[FID_Add]			= tr("Add to roster");
+ 
+ 		// compute reverse map
+ 		//QMap<QString, long>::Iterator it = id2s.begin();
+ 		//for ( ; it != id2s.end(); ++it)
+ 		//	s2id[it.data()] = it.key();
+ 
+-		id2f[FID_Register]	= FID_REGISTER;
+-		id2f[FID_Search]	= FID_SEARCH;
+-		id2f[FID_Groupchat]	= FID_GROUPCHAT;
+-		id2f[FID_Gateway]	= FID_GATEWAY;
+-		id2f[FID_Disco]		= FID_DISCO;
+-		id2f[FID_VCard]		= FID_VCARD;
+-		id2f[FID_AHCommand]	= FID_AHCOMMAND;
++		id2f[FID_Register]		= FID_REGISTER;
++		id2f[FID_Search]		= FID_SEARCH;
++		id2f[FID_Groupchat]		= FID_GROUPCHAT;
++		id2f[FID_Gateway]		= FID_GATEWAY;
++		id2f[FID_Disco]			= FID_DISCO;
++		id2f[FID_VCard]			= FID_VCARD;
++		id2f[FID_AHCommand]		= FID_AHCOMMAND;
++		id2f[FID_QueryVersion]	= FID_QUERYVERSION;
+ 
+ 		// custom Psi actions
+-		id2f[FID_Add]		= FID_ADD;
++		id2f[FID_Add]			= FID_ADD;
+ 	}
+ 
+ 	//QMap<QString, long> s2id;
+@@ -235,6 +246,8 @@ long Features::id() const
+ 		return FID_AHCommand;
+ 	else if ( test(QStringList(FID_ADD)) )
+ 		return FID_Add;
++	else if ( hasVersion() )
++		return FID_QueryVersion;
+ 
+ 	return FID_None;
+ }
+--- git.temp.orig/iris/src/xmpp/xmpp-im/xmpp_features.h
++++ git.temp/iris/src/xmpp/xmpp-im/xmpp_features.h
+@@ -49,6 +49,7 @@ namespace XMPP
+ 		bool canChatState() const;
+ 		bool canCommand() const;
+ 		bool isGateway() const;
++		bool hasVersion() const;
+ 		bool haveVCard() const;
+ 
+ 		enum FeatureID {
+@@ -61,6 +62,7 @@ namespace XMPP
+ 			FID_Gateway,
+ 			FID_VCard,
+ 			FID_AHCommand,
++			FID_QueryVersion,
+ 
+ 			// private Psi actions
+ 			FID_Add

psi-plus-main-20141106.tar.xz/patches/0290-psi-add-options-color-highliting.diff Added

@@ -0,0 +1,96 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -288,6 +288,7 @@
+ 						<sent type="QColor" comment="Color used to indicate sent messages.">#ff0000</sent>
+ 						<informational type="QColor" comment="Color used to indicate informational (status change, spooled) messages.">#008000</informational>
+ 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
++						<highlighting type="QColor">#FF0000</highlighting>
+ 					</messages>
+ 					<passive-popup>
+ 						<border type="QColor">#5297f9</border>
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -285,7 +285,7 @@ void ChatView::renderMucMessage(const Me
+ 	QString icon = useMessageIcons_?
+ 					(QString("<img src=\"%1\" />").arg(mv.isLocal()?"icon:log_icon_delivered":"icon:log_icon_receive")):"";
+ 	if(mv.isAlert()) {
+-		textcolor = "#FF0000";
++		textcolor = PsiOptions::instance()->getOption("options.ui.look.colors.messages.highlighting").value<QColor>().name();
+ 		alerttagso = "<b>";
+ 		alerttagsc = "</b>";
+ 	}
+--- git.orig/themes/chatview/psi/classic/index.html
++++ git/themes/chatview/psi/classic/index.html
+@@ -15,7 +15,7 @@ body > div > img:first-child { vertical-
+ .received {}
+ .infmsg {}
+ .usertext {}
+-.alert {font-weight:bold; color:red;}
++.alert {font-weight:bold;}
+ .trackbar { height:1px; border:1px solid black; border-color:#bbf #66f #66f #bbf }
+ .nicklink { text-decoration:none; color:inherit; }
+   </style>
+@@ -35,6 +35,7 @@ window[chatServer.jsNamespace()].theme =
+ 	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
+ 	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
+ 	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
++	var cssAlertMsg = chat.util.findStyleSheet(document.styleSheets[0], ".alert").style;
+ 	var useMessageIcons, messageIconsSize = 0;
+ 
+ 	var applyPsiSettings = function() {
+@@ -45,6 +46,7 @@ window[chatServer.jsNamespace()].theme =
+ 		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
+ 		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
+ 		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
++		cssAlertMsg.color = shared.psiOption("options.ui.look.colors.messages.highlighting");
+ 		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
+ 		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
+ 			var d = document.createElement("div");
+--- a/src/options/opt_appearance.cpp
++++ b/src/options/opt_appearance.cpp
+@@ -248,8 +248,8 @@ QWidget *OptionsTabAppearanceGeneral::widget()
+ 		{d->ck_cMessageSent,     d->pb_cMessageSent,     "messages.sent", ""},
+ 		{d->ck_cMessageReceived, d->pb_cMessageReceived, "messages.received", ""},
+ 		{d->ck_cSysMsg,          d->pb_cSysMsg,          "messages.informational", ""},
+-		{d->ck_cUserText,        d->pb_cUserText,        "messages.usertext", ""}
+-
++		{d->ck_cUserText,        d->pb_cUserText,        "messages.usertext", ""},
++		{d->ck_highlight,        d->pb_highlight,        "messages.highlighting", ""}
+ 	};
+ 
+ 	bg_color = new QButtonGroup(this);
+--- a/src/options/opt_appearance.ui
++++ b/src/options/opt_appearance.ui
+@@ -455,6 +455,32 @@
+             </property>
+            </widget>
+           </item>
++          <item row="16" column="0">
++           <widget class="QCheckBox" name="ck_highlight">
++            <property name="text">
++             <string>Highlight:</string>
++            </property>
++           </widget>
++          </item>
++          <item row="16" column="1">
++           <widget class="QToolButton" name="pb_highlight">
++            <property name="sizePolicy">
++             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
++              <horstretch>0</horstretch>
++              <verstretch>0</verstretch>
++             </sizepolicy>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>20</width>
++              <height>20</height>
++             </size>
++            </property>
++            <property name="text">
++             <string/>
++            </property>
++           </widget>
++          </item>
+           <item row="9" column="0">
+            <widget class="QCheckBox" name="ck_cUserText">
+             <property name="whatsThis">

psi-plus-main-20141106.tar.xz/patches/0300-psi-muc-bookmark-toolbar-button.diff Added

@@ -0,0 +1,282 @@
+--- git.temp.orig/src/bookmarkmanager.cpp
++++ git.temp/src/bookmarkmanager.cpp
+@@ -138,6 +138,24 @@ void BookmarkManager::setIsAvailable(boo
+ 	}
+ }
+ 
++bool BookmarkManager::isBookmarked(const XMPP::Jid &j)
++{
++	return indexOfConference(j) >= 0;
++}
++
++void BookmarkManager::removeConference(const XMPP::Jid &j)
++{
++	if (isAvailable_) {
++		QList<ConferenceBookmark> confs;
++		foreach (ConferenceBookmark c, conferences_) {
++			if (!c.jid().compare(j, false)) {
++				confs.push_back(c);
++			}
++		}
++		setBookmarks(confs);
++	}
++}
++
+ QList<URLBookmark> BookmarkManager::urls() const
+ {
+ 	return urls_;
+@@ -148,6 +166,20 @@ QList<ConferenceBookmark> BookmarkManage
+ 	return conferences_;
+ }
+ 
++int BookmarkManager::indexOfConference(const XMPP::Jid &j) const
++{
++	if (isAvailable_) {
++		int i = 0;
++		foreach(ConferenceBookmark c, conferences_) {
++			if (c.jid().compare(j, false)) {
++				return i;
++			}
++			i++;
++		}
++	}
++	return -1;
++}
++
+ void BookmarkManager::accountStateChanged()
+ {
+ 	if (!account_->isAvailable()) {
+@@ -214,4 +246,5 @@ void BookmarkManager::setBookmarks_finis
+ {
+ 	BookmarkTask* t = static_cast<BookmarkTask*>(sender());
+ 	Q_UNUSED(t);
++	emit bookmarksSaved();
+ }
+--- git.temp.orig/src/bookmarkmanager.h
++++ git.temp/src/bookmarkmanager.h
+@@ -37,18 +37,22 @@ public:
+ 	BookmarkManager(PsiAccount* account);
+ 
+ 	bool isAvailable() const;
++	bool isBookmarked(const XMPP::Jid &);
+ 
+ 	QList<URLBookmark> urls() const;
+ 	QList<ConferenceBookmark> conferences() const;
++	int indexOfConference(const XMPP::Jid &) const;
+ 
+ 	void setBookmarks(const QList<URLBookmark>&, const QList<ConferenceBookmark>&);
+ 	void setBookmarks(const QList<URLBookmark>&);
+ 	void setBookmarks(const QList<ConferenceBookmark>&);
++	void removeConference(const XMPP::Jid &);
+ 
+ signals:
+ 	void availabilityChanged();
+ 	void urlsChanged(const QList<URLBookmark>&);
+ 	void conferencesChanged(const QList<ConferenceBookmark>&);
++	void bookmarksSaved();
+ 
+ private slots:
+ 	void getBookmarks_finished();
+--- git.temp.orig/src/groupchatdlg.cpp
++++ git.temp/src/groupchatdlg.cpp
+@@ -49,6 +49,9 @@
+ #include <QTextDocument> // for TextUtil::escape()
+ #include <QToolTip>
+ #include <QScrollBar>
++#include <QCheckBox>
++#include <QDialogButtonBox>
++#include <QFormLayout>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"
+@@ -76,6 +79,7 @@
+ #include "psicontactlist.h"
+ #include "accountlabel.h"
+ #include "gcuserview.h"
++#include "bookmarkmanager.h"
+ #include "mucreasonseditor.h"
+ #include "mcmdmanager.h"
+ #include "lastactivitytask.h"
+@@ -203,7 +207,7 @@ public:
+ 	QString password;
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+-	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates;
++	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
+ #ifdef WHITEBOARDING
+ 	IconAction *act_whiteboard;
+ #endif
+@@ -681,6 +685,19 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ 	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
+ 	d->act_templates->setMenu(getTemplateMenu());
++
++	d->act_bookmark = new IconAction(this);
++	connect(d->act_bookmark, SIGNAL(triggered()), SLOT(doBookmark()));
++	ui_.le_topic->addAction(d->act_bookmark);
++	BookmarkManager *bm = account()->bookmarkManager();
++	d->act_bookmark->setVisible(bm->isAvailable());
++	if (bm->isAvailable()) {
++		updateBookmarkIcon();
++	}
++	connect(bm, SIGNAL(availabilityChanged()), SLOT(updateBookmarkIcon()));
++	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
++	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
++
+ 	ui_.toolbar->setIconSize(QSize(16,16));
+ 	ui_.toolbar->addAction(d->act_clear);
+ 	ui_.toolbar->addAction(d->act_configure);
+@@ -883,6 +900,25 @@ void GCMainDlg::updateIdentityVisibility
+ 	ui_.lb_ident->setVisible(account()->psi()->contactList()->enabledAccounts().count() > 1);
+ }
+ 
++void GCMainDlg::updateBookmarkIcon()
++{
++	BookmarkManager *bm = account()->bookmarkManager();
++	d->act_bookmark->setVisible(bm->isAvailable());
++	if (bm->isAvailable()) {
++		QString text;
++		if (bm->isBookmarked(jid())) {
++			text = tr("Edit Bookmark");
++			d->act_bookmark->setPsiIcon("psi/bookmark_remove");
++		} else {
++			text = tr("Add to bookmarks");
++			d->act_bookmark->setPsiIcon("psi/bookmark_add");
++		}
++		d->act_bookmark->setToolTip(text);
++		d->act_bookmark->setText(text);
++		d->act_bookmark->setStatusTip(text);
++	}
++}
++
+ #ifdef WHITEBOARDING
+ void GCMainDlg::openWhiteboard()
+ {
+@@ -1793,6 +1829,7 @@ void GCMainDlg::buildMenu()
+ 	d->pm_settings->addAction(d->act_templates);
+ 	d->pm_settings->addAction(d->act_ps);
+ 	d->pm_settings->addAction(d->act_nick);
++	d->pm_settings->addAction(d->act_bookmark);
+ }
+ 
+ void GCMainDlg::chatEditCreated()
+@@ -1851,6 +1888,71 @@ void GCMainDlg::doPasteAndSend()
+ 	}
+ }
+ 
++void GCMainDlg::doBookmark()
++{
++	BookmarkManager *bm = account()->bookmarkManager();
++	if (!bm->isAvailable()) {
++		return;
++	}
++	QList<ConferenceBookmark> confs =  bm->conferences();
++	int confInd = bm->indexOfConference(jid());
++	if (confInd < 0) { // not found
++		ConferenceBookmark conf(jid().bare(), jid(), false, nick(), d->password);
++		confs.push_back(conf);
++		bm->setBookmarks(confs);
++		return;
++	}
++	ConferenceBookmark &b = confs[confInd];
++	QDialog *dlg = new QDialog(this);
++	QVBoxLayout *layout = new QVBoxLayout;
++	QHBoxLayout *blayout = new QHBoxLayout;
++	QFormLayout *formLayout = new QFormLayout;
++	QLineEdit *txtName = new QLineEdit;
++	QLineEdit *txtNick = new QLineEdit;
++	QCheckBox *chkAJoin = new QCheckBox;
++	QPushButton *saveBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogSaveButton), tr("Save"), dlg);
++	QPushButton *deleteBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogDiscardButton), tr("Delete"), dlg);
++	QPushButton *cancelBtn = new QPushButton(dlg->style()->standardIcon(QStyle::SP_DialogCancelButton), tr("Cancel"), dlg);
++
++	blayout->insertStretch(0);
++	blayout->addWidget(saveBtn);
++	blayout->addWidget(deleteBtn);
++	blayout->addWidget(cancelBtn);
++	txtName->setText(b.name());
++	txtNick->setText(b.nick());
++	chkAJoin->setChecked(b.autoJoin());
++	formLayout->addRow(tr("&Name:"), txtName);
++	formLayout->addRow(tr("N&ick:"), txtNick);
++	formLayout->addRow(tr("&Auto join:"), chkAJoin);
++	layout->addLayout(formLayout);
++	layout->addLayout(blayout);
++	dlg->setLayout(layout);
++	dlg->setMinimumWidth(300);
++	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));
++	dlg->connect(deleteBtn, SIGNAL(clicked()), dlg, SLOT(reject()));
++	dlg->connect(cancelBtn, SIGNAL(clicked()), dlg, SLOT(reject()));
++	connect(deleteBtn, SIGNAL(clicked()), this, SLOT(doRemoveBookmark()));
++
++	dlg->setWindowTitle(tr("Bookmark conference"));
++	dlg->adjustSize();
++	dlg->move(ui_.le_topic->mapToGlobal(QPoint(
++			ui_.le_topic->width() - dlg->width(), ui_.le_topic->height())));
++	if (dlg->exec() == QDialog::Accepted) {
++		ConferenceBookmark conf(txtName->text(), jid(), chkAJoin->checkState() == Qt::Checked, txtNick->text(), d->password);
++		confs[confInd] = conf;
++		bm->setBookmarks(confs);
++	}
++	delete dlg;
++}
++
++void GCMainDlg::doRemoveBookmark()
++{
++	BookmarkManager *bm = account()->bookmarkManager();
++	if (bm->isAvailable()) {
++		bm->removeConference(jid());
++	}
++}
++
+ void GCMainDlg::psButtonEnabled()
+ {
+ 	d->act_ps->setEnabled(true);
+--- git.temp.orig/src/groupchatdlg.h
++++ git.temp/src/groupchatdlg.h
+@@ -131,6 +131,7 @@ private slots:
+ 	void unsetConnecting();
+ 	void action_error(MUCManager::Action, int, const QString&);
+ 	void updateIdentityVisibility();
++	void updateBookmarkIcon();
+ #ifdef WHITEBOARDING
+ 	void openWhiteboard();
+ #endif
+@@ -138,6 +139,8 @@ private slots:
+ 	void sendButtonMenu();
+ 	void editTemplates();
+ 	void doPasteAndSend();
++	void doBookmark();
++	void doRemoveBookmark();
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
+ 
+--- git.temp.orig/src/groupchatdlg.ui
++++ git.temp/src/groupchatdlg.ui
+@@ -71,10 +71,13 @@
+            </widget>
+           </item>
+           <item>
+-           <widget class="QLineEdit" name="le_topic" >
++           <widget class="ActionLineEdit" name="le_topic" >
+             <property name="readOnly" >
+              <bool>true</bool>
+             </property>
++            <property name="toolButtonStyle" >
++             <enum>Qt::ToolButtonIconOnly</enum>
++            </property>
+            </widget>
+           </item>
+           <item>
+@@ -325,6 +328,11 @@
+    <extends>QTextEdit</extends>
+    <header>chateditproxy.h</header>
+   </customwidget>
++  <customwidget>
++   <class>ActionLineEdit</class>
++   <extends>QLineEdit</extends>
++   <header>actionlineedit.h</header>
++  </customwidget>
+  </customwidgets>
+  <resources/>
+  <connections/>

psi-plus-main-20141106.tar.xz/patches/0310-psi-configure-hyperlink-color.diff Added

@@ -0,0 +1,35 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -290,6 +290,10 @@
+ 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
+ 						<highlighting type="QColor">#FF0000</highlighting>
+ 					</messages>
++					<chat>
++						<link-color type="QColor">#0000ff</link-color>
++						<mailto-color type="QColor">#0000ff</mailto-color>
++					</chat>
+ 					<passive-popup>
+ 						<border type="QColor">#5297f9</border>
+ 					</passive-popup>
+--- git.orig/src/textutil.cpp
++++ git/src/textutil.cpp
+@@ -411,7 +411,8 @@ QString TextUtil::linkify(const QString
+ 			href = escape(href);
+ 			href = linkify_htmlsafe(href);
+ 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
+-			linked = QString("<a href=\"%1\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
++			QColor lcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.link-color").toString();
++			linked = QString("<a href=\"%1\" style=\"color:"+lcolor.name()+"\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
+ 			out.replace(x1, len, linked);
+ 			n = x1 + linked.length() - 1;
+ 		}
+@@ -444,7 +445,8 @@ QString TextUtil::linkify(const QString
+ 
+ 			href += link;
+ 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
+-			linked = QString("<a href=\"%1\">").arg(href) + link + "</a>";
++			QColor mcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.mailto-color").toString();
++			linked = QString("<a href=\"%1\" style=\"color:"+mcolor.name()+"\">").arg(href) + link + "</a>";
+ 			out.replace(x1, len, linked);
+ 			n = x1 + linked.length() - 1;
+ 		}

psi-plus-main-20141106.tar.xz/patches/0320-psi-adhoc-leave-muc.diff Added

@@ -0,0 +1,88 @@
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -377,6 +377,7 @@ public:
+ 		, rcSetStatusServer(0)
+ 		, rcSetOptionsServer(0)
+ 		, rcForwardServer(0)
++		, rcLeaveMucServer(0)
+ 		, avatarFactory(0)
+ 		, voiceCaller(0)
+ 		, avCallManager(0)
+@@ -441,6 +442,7 @@ public:
+ 	RCSetStatusServer* rcSetStatusServer;
+ 	RCSetOptionsServer* rcSetOptionsServer;
+ 	RCForwardServer* rcForwardServer;
++	RCLeaveMucServer* rcLeaveMucServer;
+ 
+ 	// Avatars
+ 	AvatarFactory* avatarFactory;
+@@ -1147,6 +1149,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	d->rcSetStatusServer = 0;
+ 	d->rcSetOptionsServer = 0;
+ 	d->rcForwardServer = 0;
++	d->rcLeaveMucServer =0;
+ 	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
+ 
+ 	// Plugins
+@@ -5912,6 +5915,7 @@ void PsiAccount::setRCEnabled(bool b)
+ 	if (b && !d->rcSetStatusServer) {
+ 		d->rcSetStatusServer = new RCSetStatusServer(d->ahcManager);
+ 		d->rcForwardServer = new RCForwardServer(d->ahcManager);
++		d->rcLeaveMucServer = new RCLeaveMucServer(d->ahcManager);
+ 		d->rcSetOptionsServer = new RCSetOptionsServer(d->ahcManager, d->psi);
+ 	}
+ 	else if (!b && d->rcSetStatusServer) {
+@@ -5919,6 +5923,8 @@ void PsiAccount::setRCEnabled(bool b)
+ 		d->rcSetStatusServer = 0;
+ 		delete d->rcForwardServer;
+ 		d->rcForwardServer = 0;
++		delete d->rcLeaveMucServer;
++		d->rcLeaveMucServer = 0;
+ 		delete d->rcSetOptionsServer;
+ 		d->rcSetOptionsServer = 0;
+ 	}
+--- git.orig/src/rc.cpp
++++ git/src/rc.cpp
+@@ -27,6 +27,7 @@
+ #include "xmpp_xdata.h"
+ #include "ahcservermanager.h"
+ #include "ahcommand.h"
++#include "groupchatdlg.h"
+ 
+ using namespace XMPP;
+ 
+@@ -245,3 +246,16 @@ AHCommand RCSetOptionsServer::execute(co
+ 		return AHCommand::completedReply(c);
+ 	}
+ }
++
++AHCommand RCLeaveMucServer::execute(const AHCommand& c, const Jid& /*j*/)
++{
++	foreach (QString gc, manager()->account()->groupchats()) {
++		Jid mj(gc);
++		GCMainDlg *gcDlg = manager()->account()->findDialog<GCMainDlg*>(mj.bare());
++		if (gcDlg) gcDlg->close();
++	}
++	XData form;
++	form.setTitle(QObject::tr("Leave All Conferences"));
++	form.setType(XData::Data_Form);
++	return AHCommand::completedReply(c);
++}
+--- git.orig/src/rc.h
++++ git/src/rc.h
+@@ -54,6 +54,15 @@ public:
+ 	virtual AHCommand execute(const AHCommand& c, const Jid&);
+ };
+ 
++class RCLeaveMucServer : public RCCommandServer
++{
++public:
++	RCLeaveMucServer(AHCServerManager* m) : RCCommandServer(m) { }
++	virtual QString name() const { return "Leave All Conferences"; }
++	virtual QString rcNode() const { return "leave-muc"; }
++	virtual AHCommand execute(const AHCommand& c, const Jid&);
++};
++
+ class RCSetOptionsServer : public RCCommandServer
+ {
+ public:

psi-plus-main-20141106.tar.xz/patches/0330-psi-movable-tabs-qt45-and-custom-style.diff Added

@@ -0,0 +1,313 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -377,6 +377,9 @@
+ 			</service-discovery>
+ 			<tabs>
+ 				<show-tab-icons type="bool">true</show-tab-icons>
++				<disable-wheel-scroll type="bool">false</disable-wheel-scroll>
++				<can-close-inactive-tab type="bool">true</can-close-inactive-tab>
++				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
+ 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
+ 				<use-tabs type="bool">true</use-tabs>
+ 				<size type="QString"></size> 
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -161,6 +161,7 @@ TabDlg::TabDlg(TabManager* tabManager, c
+ 	connect(tabWidget_, SIGNAL(tabContextMenu(int, QPoint, QContextMenuEvent*)), SLOT(showTabMenu(int, QPoint, QContextMenuEvent*)));
+ 	connect(tabWidget_, SIGNAL(closeButtonClicked()), SLOT(closeCurrentTab()));
+ 	connect(tabWidget_, SIGNAL(currentChanged(QWidget*)), SLOT(tabSelected(QWidget*)));
++	connect(tabWidget_, SIGNAL(tabCloseRequested(int)), SLOT(tabCloseRequested(int)));
+ 
+ 	if(delegate_)
+ 		delegate_->tabWidgetCreated(this, tabWidget_);
+@@ -817,6 +818,23 @@ void TabDlg::setSimplifiedCaptionEnabled
+ 	updateCaption();
+ }
+ 
++/**
++  * the slot is invoked, when small close button is clicked on a tab
++  * dont close tabs, that are not active.
++  * \param tab number requested to close
++  */
++void TabDlg::tabCloseRequested(int i)
++{
++	if (tabWidget_->currentPageIndex() == i)
++		closeTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
++	else {
++		if (PsiOptions::instance()->getOption("options.ui.tabs.can-close-inactive-tab").toBool())
++			closeTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
++		else
++			selectTab(static_cast<TabbableWidget*>(tabWidget_->page(i)));
++	}
++}
++
+ TabbableWidget* TabDlg::getCurrentTab() const
+ {
+ 	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
+--- git.orig/src/tabs/tabdlg.h
++++ git/src/tabs/tabdlg.h
+@@ -122,6 +122,7 @@ public slots:
+ 	void optionsUpdate();
+ 	void detachTab(TabbableWidget*);
+ 	void sendTabTo(TabbableWidget*, TabDlg *);
++	void tabCloseRequested(int i);
+ 
+ signals:
+ 	void resized(QSize size);
+--- git.orig/src/widgets/psitabbar.cpp
++++ git/src/widgets/psitabbar.cpp
+@@ -24,6 +24,9 @@
+ #include <QApplication>
+ #include <QDrag>
+ #include <QMimeData>
++#include <QPainter>
++
++#include "psioptions.h"
+ 
+ /**
+  * Constructor
+@@ -32,6 +35,13 @@ PsiTabBar::PsiTabBar(PsiTabWidget *paren
+ 		: QTabBar(parent)
+ 		, dragsEnabled_(true) {
+ 	//setAcceptDrops(true);
++
++#if QT_VERSION >= 0x040500
++	setMovable(true);
++	setTabsClosable(true);
++	setSelectionBehaviorOnRemove ( QTabBar::SelectPreviousTab );
++#endif
++	currTab=-1;
+ }
+ 
+ /**
+@@ -71,20 +81,42 @@ int PsiTabBar::findTabUnder(const QPoint
+ }
+ 
+ void PsiTabBar::mousePressEvent(QMouseEvent *event) {
+-	int tabno = findTabUnder(event->pos());
+-	if (event->button() == Qt::LeftButton) {
+-		dragStartPosition_ = event->pos();
+-		dragTab_ = tabno;
+-		if (tabno != -1) {
+-			setCurrentIndex(tabno);
++	QTabBar::mousePressEvent(event);
++	event->accept();
++}
++
++void PsiTabBar::mouseReleaseEvent ( QMouseEvent * event )
++{
++	if (event->button() == Qt::MidButton && findTabUnder(event->pos())!=-1) {
++		emit mouseMiddleClickTab(findTabUnder(event->pos()));
++		event->accept();
++	}
++	QTabBar::mouseReleaseEvent(event);
++
++#if QT_VERSION >= 0x040500
++	if ((dragTab_ != -1) && (event->button() != Qt::MidButton)) {
++		this->setCurrentIndex(currentIndex());
++	}
++#else
++	if ((dragTab_ != currTab)&&(currTab!=-1)&&(dragTab_!=-1)) {
++		if (dragTab_ < currTab) {
++			this->insertTab(isOnTheLeft ? currTab : currTab+1, this->tabIcon(dragTab_), this->tabText(dragTab_));
++			this->removeTab(dragTab_);
++			emit tabMoved(dragTab_, isOnTheLeft ? currTab-1 : currTab);
+ 		}
+-	} else if (event->button() == Qt::MidButton) {
+-		if (tabno != -1) {
+-			emit mouseMiddleClickTab(tabno);
++		else {
++			this->insertTab(isOnTheLeft ? currTab : currTab+1, this->tabIcon(dragTab_), this->tabText(dragTab_));
++			this->removeTab(dragTab_+1);
++			emit tabMoved(dragTab_, isOnTheLeft ? currTab : currTab+1);
+ 		}
+ 	}
++
++	dragTab_ = -1;
++	currTab = -1;
++	this->update();
+ 	event->accept();
+-}
++#endif
++};
+ 
+ /*
+  * Used for starting drags of tabs
+@@ -94,6 +126,7 @@ void PsiTabBar::mouseMoveEvent(QMouseEve
+ 		return;
+ 	}
+ 	if (!(event->buttons() & Qt::LeftButton)) {
++		currTab=-1;
+ 		return;
+ 	}
+ 	if ((event->pos() - dragStartPosition_).manhattanLength()
+@@ -102,22 +135,21 @@ void PsiTabBar::mouseMoveEvent(QMouseEve
+ 	}
+ 
+ 	if (dragTab_ != -1) {
+-		QDrag *drag = new QDrag(this);
+-		QMimeData *mimeData = new QMimeData;
+-		QByteArray data;
+-		QPixmap icon;
+-
+-		data.setNum(dragTab_);
+-
+-		mimeData->setData(PSITABDRAGMIMETYPE, data);
+-		drag->setMimeData(mimeData);
+-		drag->setPixmap(icon);
+-
+-		Qt::DropAction dropAction = drag->start(Qt::MoveAction);
+-		Q_UNUSED(dropAction);
+-	}
+-
++#if QT_VERSION < 0x040500
++	currTab = findTabUnder(event->pos());
++	this->update(this->tabRect(currTab));
++
++	if (tabRect(currTab).center().x() - event->pos().x() > 0)
++		isOnTheLeft = 1;
++	else
++		isOnTheLeft = 0;
++#endif
++	}
++#if QT_VERSION >= 0x040500
++	QTabBar::mouseMoveEvent(event);
++#else
+ 	event->accept();
++#endif
+ }
+ 
+ void PsiTabBar::contextMenuEvent(QContextMenuEvent *event) {
+@@ -126,6 +158,9 @@ void PsiTabBar::contextMenuEvent(QContex
+ }
+ 
+ void PsiTabBar::wheelEvent(QWheelEvent *event) {
++	if (PsiOptions::instance()->getOption("options.ui.tabs.disable-wheel-scroll").toBool())
++		return;
++
+ 	int numDegrees = event->delta() / 8;
+ 	int numSteps = numDegrees / 15;
+ 
+@@ -147,3 +182,28 @@ void PsiTabBar::wheelEvent(QWheelEvent *
+ void PsiTabBar::setDragsEnabled(bool enabled) {
+ 	dragsEnabled_ = enabled;
+ }
++
++void PsiTabBar::paintEvent(QPaintEvent *event)
++{
++	QTabBar::paintEvent(event);
++#if QT_VERSION < 0x040500
++	QPainter painter(this);
++	QPen pen(Qt::cyan);
++	pen.setWidth(4);
++	pen.setStyle(Qt::SolidLine);
++	painter.setPen(pen);
++	if ( currTab != -1) {
++		if (isOnTheLeft)
++			painter.drawLine(tabRect(currTab).topLeft().x()+3, tabRect(currTab).topLeft().y(),
++			tabRect(currTab).bottomLeft().x()+3, tabRect(currTab ).bottomLeft().y());
++		else
++			painter.drawLine(tabRect(currTab).topRight().x(), tabRect(currTab).topRight().y(),
++			tabRect(currTab).bottomRight().x(), tabRect(currTab ).bottomRight().y());
++	}
++#endif
++};
++
++void PsiTabBar::resizeEvent(QResizeEvent * event)
++{
++	QTabBar::resizeEvent(event);
++};
+--- git.orig/src/widgets/psitabbar.h
++++ git/src/widgets/psitabbar.h
+@@ -41,6 +41,9 @@ signals:
+ 	void mouseDoubleClickTab(int tab);
+ 	void mouseMiddleClickTab(int tab);
+ 	void tabDropped(int tab, PsiTabBar *source);
++#if QT_VERSION <= 0x040500
++	void tabMoved(int from, int to);
++#endif
+ 	// context menu on the blank space will have tab==-1
+ 	void contextMenu(QContextMenuEvent *event, int tab);
+ 
+@@ -52,11 +55,16 @@ protected:
+ 	void mousePressEvent(QMouseEvent *event);
+ 	void contextMenuEvent(QContextMenuEvent *event);
+ 	void wheelEvent(QWheelEvent *event);
++	void paintEvent(QPaintEvent *event);
++	void mouseReleaseEvent ( QMouseEvent * event );
++	void resizeEvent(QResizeEvent * event);
+ 
+ private:
+ 	int findTabUnder(const QPoint &pos);
+ 	QPoint dragStartPosition_;
+ 	int dragTab_;
++	int currTab;
++	bool isOnTheLeft;
+ 	bool dragsEnabled_;
+ };
+ 
+--- git.orig/src/widgets/psitabwidget.cpp
++++ git/src/widgets/psitabwidget.cpp
+@@ -79,11 +79,18 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
+ 		closeButton_->hide();
+ 		downButton_->hide();
+ 	}
++#if QT_VERSION >= 0x040500
++	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
++		tabBar_->setTabsClosable(false);
++	}
++#endif
+ 	connect( tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
+ 	connect( tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
+ 	connect( tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));
+ 	connect( tabBar_, SIGNAL( contextMenu(QContextMenuEvent*,int)), SLOT( tab_contextMenu(QContextMenuEvent*,int)));
+ 	connect( closeButton_, SIGNAL(clicked()), SIGNAL(closeButtonClicked()));
++	connect(tabBar_, SIGNAL(tabMoved(int,int)),SLOT(widgetMoved(int,int)));
++	connect(tabBar_, SIGNAL(tabCloseRequested(int)),SIGNAL(tabCloseRequested(int)));
+ }
+ 
+ void PsiTabWidget::setCloseIcon(const QIcon& icon) {
+@@ -348,3 +355,25 @@ void PsiTabWidget::setTabButtonsShown(bo
+ void PsiTabWidget::setDragsEnabled(bool enabled) {
+ 	((PsiTabBar *)tabBar_)->setDragsEnabled(enabled);
+ }
++
++void PsiTabWidget::widgetMoved(int from, int to)
++{
++	if (from > to) {
++		stacked_->removeWidget(widgets_[from]);
++		widgets_.insert(to, 1, widgets_[from]);
++		widgets_.remove(from+1);
++		stacked_->insertWidget(to,widgets_[to]);
++	}
++	else {
++		stacked_->removeWidget(widgets_[from]);
++		widgets_.insert(to+1, 1, widgets_[from]);
++		widgets_.remove(from,1);
++		stacked_->insertWidget(to,widgets_[to]);
++	}
++
++#if QT_VERSION <= 0x040500
++	setCurrentPage(to);
++#endif
++	emit currentChanged(currentPage());
++
++};
+--- git.orig/src/widgets/psitabwidget.h
++++ git/src/widgets/psitabwidget.h
+@@ -74,6 +74,7 @@ signals:
+ 	void currentChanged(QWidget *selected);
+ 	void closeButtonClicked();
+ 	void aboutToShowMenu(QMenu *);
++	void tabCloseRequested(int i);
+ 
+ 	// context menu on the blank space will have tab==-1
+ 	void tabContextMenu(int tab, QPoint pos, QContextMenuEvent *event);
+@@ -85,6 +86,7 @@ private slots:
+ 	void tab_contextMenu(QContextMenuEvent *event, int tab);
+ 	void menu_aboutToShow();
+ 	void menu_triggered(QAction *act);
++	void widgetMoved(int from, int to);
+ 
+ private:
+ 	QVector<QWidget*> widgets_;

psi-plus-main-20141106.tar.xz/patches/0340-psi-account-menu-privacy-item.diff Added

@@ -0,0 +1,65 @@
+--- git.temp.orig/src/contactlistaccountmenu.cpp
++++ git.temp/src/contactlistaccountmenu.cpp
+@@ -29,6 +29,7 @@
+ #include "bookmarkmanager.h"
+ #include "psioptions.h"
+ #include "iconaction.h"
++#include "privacy/privacydlg.h"
+ 
+ class ContactListAccountMenu::Private : public QObject
+ {
+@@ -48,6 +49,7 @@ class ContactListAccountMenu::Private :
+ 	QAction* serviceDiscoveryAction_;
+ 	QAction* newMessageAction_;
+ 	QAction* xmlConsoleAction_;
++	QAction* privacyListsAction_;
+ 	QAction* modifyAccountAction_;
+ 	QMenu* adminMenu_;
+ 	QAction* adminOnlineUsersAction_;
+@@ -94,6 +96,9 @@ public:
+ 		newMessageAction_ = new IconAction(tr("New &Blank Message"), this, "psi/sendMessage");
+ 		connect(newMessageAction_, SIGNAL(triggered()), SLOT(newMessage()));
+ 
++		privacyListsAction_ = new IconAction(tr("Privacy Lists"), this, "psi/eye");
++		connect(privacyListsAction_, SIGNAL(triggered()), SLOT(privacyLists()));
++
+ 		xmlConsoleAction_ = new IconAction(tr("&XML Console"), this, "psi/xml");
+ 		connect(xmlConsoleAction_, SIGNAL(triggered()), SLOT(xmlConsole()));
+ 
+@@ -127,6 +132,7 @@ public:
+ 		menu->addAction(addContactAction_);
+ 		menu->addAction(serviceDiscoveryAction_);
+ 		menu->addAction(newMessageAction_);
++		menu->addAction(privacyListsAction_);
+ 		menu->addSeparator();
+ 		menu->addAction(xmlConsoleAction_);
+ 		menu->addSeparator();
+@@ -185,6 +191,7 @@ private slots:
+ 		newMessageAction_->setEnabled(account->account()->isAvailable());
+ 		addContactAction_->setEnabled(account->account()->isAvailable());
+ 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
++		privacyListsAction_->setEnabled(account->account()->isAvailable());
+ 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
+ 			adminMenu_->menuAction()->setVisible(false);
+ 		}
+@@ -278,6 +285,20 @@ private slots:
+ 		account->account()->actionSendMessage("");
+ 	}
+ 
++	void privacyLists()
++	{
++		if (!account)
++			return;
++
++		PrivacyDlg *dlg = account->account()->findDialog<PrivacyDlg*>();
++		if(!dlg) {
++			dlg = new PrivacyDlg(account->account()->name(), account->account()->privacyManager());
++			account->account()->dialogRegister(dlg);
++			dlg->show();
++		} else
++			bringToFront(dlg);
++	}
++
+ 	void xmlConsole()
+ 	{
+ 		if (!account)

psi-plus-main-20141106.tar.xz/patches/0350-psi-muc-finddlg-swap-buttons.diff Added

psi-plus-main-20141106.tar.xz/patches/0360-psi-muc-roster-size-and-location.diff Added

@@ -0,0 +1,150 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -216,6 +216,9 @@
+ 				</view>
+ 			</menu>
+ 			<muc comment="Multi-User Chat options">
++				<log-width type="int">500</log-width>
++				<roster-width type="int">80</roster-width>
++				<roster-at-left type="bool">false</roster-at-left>
+ 				<theme comment="The theme used for groupchat messages rendering" type="QString">psi/classic</theme>
+ 				<highlight-words type="QStringList" />
+ 				<size comment="Remembered window size" type="QSize">
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -232,6 +232,9 @@ public:
+ 
+ 	QPointer<MUCConfigDlg> configDlg;
+ 	QPointer<GroupchatTopicDlg> topicDlg;
++
++	int logSize;
++	int rosterSize;
+ public:
+ 	bool trackBar;
+ 
+@@ -740,12 +743,24 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.tb_actions->setIcon(IconsetFactory::icon("psi/select").icon());
+ 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
+ 
++	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
++
+ 	// resize the horizontal splitter
++	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
++	d->rosterSize = PsiOptions::instance()->getOption("options.ui.muc.roster-width").toInt();
+ 	QList<int> list;
+-	list << 500;
+-	list << 80;
++	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
++	if(leftRoster)
++		list << d->rosterSize << d->logSize;
++	else
++		list <<  d->logSize << d->rosterSize;
++
+ 	ui_.hsplitter->setSizes(list);
+ 
++	if (leftRoster)
++		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
++
++	// resize the vertical splitter
+ 	list.clear();
+ 	list << 324;
+ 	list << 10;
+@@ -766,6 +781,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ GCMainDlg::~GCMainDlg()
+ {
++	//  Save splitters size
++	PsiOptions::instance()->setOption("options.ui.muc.log-width", d->logSize);
++	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
++
+ 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
+ 		account()->groupChatLeave(jid().domain(), jid().node());
+ 	}
+@@ -786,6 +805,17 @@ GCMainDlg::~GCMainDlg()
+ 	}
+ }
+ 
++void GCMainDlg::horizSplitterMoved()
++{
++	QList<int> list = ui_.hsplitter->sizes();
++	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
++	d->rosterSize = !leftRoster ? list.last() : list.first();
++	d->logSize = leftRoster ? list.last() : list.first();
++
++	PsiOptions::instance()->setOption("options.ui.muc.log-width", d->logSize);
++	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
++}
++
+ void GCMainDlg::ensureTabbedCorrectly()
+ {
+ 	TabbableWidget::ensureTabbedCorrectly();
+@@ -793,9 +823,15 @@ void GCMainDlg::ensureTabbedCorrectly()
+ 	// QSplitter is broken again, force resize so that
+ 	// lv_users gets initizalised properly and context menu
+ 	// works in tabs too.
+-	QList<int> tmp = ui_.hsplitter->sizes();
++	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
++	d->rosterSize = PsiOptions::instance()->getOption("options.ui.muc.roster-width").toInt();
++	QList<int> list;
++	if(PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool())
++		list << d->rosterSize << d->logSize;
++	else
++		list <<  d->logSize << d->rosterSize;
+ 	ui_.hsplitter->setSizes(QList<int>() << 0);
+-	ui_.hsplitter->setSizes(tmp);
++	ui_.hsplitter->setSizes(list);
+ 	UserListItem* u = account()->find(jid().bare());
+ 	if(u) {
+ 		setTabIcon(PsiIconset::instance()->statusPtr(u)->icon());
+@@ -1969,6 +2005,33 @@ void GCMainDlg::sendTemp(const QString &
+ 	}
+ }
+ 
++
++
++void GCMainDlg::resizeEvent(QResizeEvent *e)
++{
++	TabbableWidget::resizeEvent(e);
++
++	if(!isVisible())
++		return;
++
++	QList<int> sizes = ui_.hsplitter->sizes();
++	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
++	int logWidth = !leftRoster ? sizes.first() : sizes.last();
++	int rosterWidth = leftRoster ? sizes.first() : sizes.last();
++	int dw = rosterWidth - d->rosterSize;
++	sizes.clear();
++	sizes.append(logWidth + dw);
++	if(leftRoster) {
++		sizes.prepend(d->rosterSize);
++	}
++	else {
++		sizes.append(d->rosterSize);
++	}
++
++	ui_.hsplitter->setSizes(sizes);
++	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
++}
++
+ //----------------------------------------------------------------------------
+ // GCFindDlg
+ //----------------------------------------------------------------------------
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -90,6 +90,7 @@ protected:
+ 	void setShortcuts();
+ 
+ 	// reimplemented
++	void resizeEvent(QResizeEvent *e);
+ 	void dragEnterEvent(QDragEnterEvent *);
+ 	void dropEvent(QDropEvent *);
+ 	void closeEvent(QCloseEvent *);
+@@ -143,6 +144,7 @@ private slots:
+ 	void doRemoveBookmark();
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
++	void horizSplitterMoved();
+ 
+ public:
+ 	class Private;

psi-plus-main-20141106.tar.xz/patches/0370-psi-dirty-check.diff Added

@@ -0,0 +1,295 @@
+--- git.temp.orig/src/AutoUpdater/AutoUpdater.pri
++++ git.temp/src/AutoUpdater/AutoUpdater.pri
+@@ -16,3 +16,16 @@ Sparkle {
+ 
+ 	LIBS += -framework Sparkle
+ }
++
++QuickDirtyChecker {
++        DEFINES += USE_QDCHECKER
++
++        HEADERS += \
++                $$PWD/QDChecker.h
++
++        SOURCES += \
++                $$PWD/QDChecker.cpp
++
++        FORMS += \
++                $$PWD/QDChangeLog.ui
++}
+--- /dev/null
++++ git.temp/src/AutoUpdater/QDChangeLog.ui
+@@ -0,0 +1,71 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>ShowChangeLogForm</class>
++ <widget class="QWidget" name="ShowChangeLogForm">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>400</width>
++    <height>300</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>New version is available!</string>
++  </property>
++  <layout class="QGridLayout" name="gridLayout">
++   <property name="margin">
++    <number>6</number>
++   </property>
++   <property name="spacing">
++    <number>2</number>
++   </property>
++   <item row="0" column="0">
++    <widget class="QTextEdit" name="logText">
++     <property name="readOnly">
++      <bool>true</bool>
++     </property>
++     <property name="textInteractionFlags">
++      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
++     </property>
++    </widget>
++   </item>
++   <item row="1" column="0">
++    <layout class="QHBoxLayout" name="horizontalLayout">
++     <item>
++      <spacer name="horizontalSpacer">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>40</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="QLabel" name="label">
++       <property name="text">
++        <string>Open download page?</string>
++       </property>
++       <property name="alignment">
++        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QDialogButtonBox" name="buttonBox">
++       <property name="standardButtons">
++        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- /dev/null
++++ git.temp/src/AutoUpdater/QDChecker.cpp
+@@ -0,0 +1,100 @@
++/*
++ * Quick-and-dirty checker for updates.
++ * Written by Aleksey Palazhchenko.
++ * No rights reserved for this ugly code. This file is in public domain.
++ */
++
++#include "QDChecker.h"
++#include "ui_QDChangeLog.h"
++
++#include <QUrl>
++#include <QDesktopServices>
++#include <QNetworkAccessManager>
++#include <QNetworkRequest>
++#include <QNetworkReply>
++#include <QNetworkProxy>
++
++#include "psioptions.h"
++#include "proxy.h"
++
++const QUrl QDChecker::updateCheckUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/version.txt");
++const QUrl QDChecker::changelogUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/changelog.txt");
++const QUrl QDChecker::downloadPageUrl_ = QUrl("http://sourceforge.net/projects/psiplus/files/MS-Windows/Installers/0.16/");
++
++const QString QDChecker::settingsKey_ = QLatin1String("options.auto-update.last-check-value");
++
++QDChecker::QDChecker()
++	: manager_(new QNetworkAccessManager(this)), logForm_(0)
++{
++	ProxyItem it = ProxyManager::instance()->getItemForObject("Auto Updater");
++	ProxySettings ps = it.settings;
++	if(!ps.host.isEmpty()) {
++		QNetworkProxy prx(QNetworkProxy::HttpCachingProxy, ps.host, ps.port, ps.user, ps.pass);
++		if(it.type == "socks")
++			prx.setType(QNetworkProxy::Socks5Proxy);
++		manager_->setProxy(prx);
++	}
++}
++
++QDChecker::~QDChecker()
++{
++	delete logForm_;
++}
++
++void QDChecker::checkForUpdates()
++{
++	QNetworkRequest request(updateCheckUrl_);
++	QNetworkReply* reply = manager_->get(request);
++	connect(reply, SIGNAL(finished()), this, SLOT(onCheckFinished()));
++}
++
++void QDChecker::onCheckFinished()
++{
++	qDebug("onCheckFinished");
++	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
++	if(reply && reply->error() == QNetworkReply::NoError) {
++		const QByteArray data = reply->readAll();
++		const quint16 newValue = qChecksum(data.constData(), data.size());
++		const quint16 oldValue = PsiOptions::instance()->getOption(settingsKey_).toUInt();
++
++		if(newValue != oldValue) {
++			QNetworkRequest request(changelogUrl_);
++			QNetworkReply* reply = manager_->get(request);
++			connect(reply, SIGNAL(finished()), this, SLOT(onDownloadLogFinished()));
++			PsiOptions::instance()->setOption(settingsKey_, newValue);
++		}
++
++		reply->deleteLater();
++	} else {
++		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
++	}
++}
++
++void QDChecker::onDownloadLogFinished()
++{
++	qDebug("onDownloadLogFinished");
++	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
++	if(reply && reply->error() == QNetworkReply::NoError) {
++		if(logForm_) {
++			logForm_->deleteLater();
++		}
++		Ui::ShowChangeLogForm ui;
++		logForm_ = new QWidget;
++		ui.setupUi(logForm_);
++
++		ui.logText->setText(QString::fromUtf8(reply->readAll()));
++
++		connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(onOpenDownloadPage()));
++		connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), logForm_, SLOT(hide()));
++		logForm_->show();
++
++		reply->deleteLater();
++	} else {
++		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
++	}
++}
++
++void QDChecker::onOpenDownloadPage()
++{
++	QDesktopServices::openUrl(downloadPageUrl_);
++}
+--- /dev/null
++++ git.temp/src/AutoUpdater/QDChecker.h
+@@ -0,0 +1,44 @@
++/*
++ * Quick-and-dirty checker for updates.
++ * Written by Aleksey Palazhchenko.
++ * No rights reserved for this ugly code. This file is in public domain.
++ */
++
++#ifndef QDCHECKER_H
++#define QDCHECKER_H
++
++#include <QObject>
++class QWidget;
++class QUrl;
++class QNetworkAccessManager;
++
++#include "AutoUpdater.h"
++
++class QDChecker : public QObject, public AutoUpdater
++{
++	Q_OBJECT
++
++public:
++	QDChecker();
++	virtual ~QDChecker();
++
++	// from AutoUpdater
++	virtual void checkForUpdates();
++
++private slots:
++	void onCheckFinished();
++	void onDownloadLogFinished();
++	void onOpenDownloadPage();
++
++private:
++	QNetworkAccessManager* manager_;
++	QWidget* logForm_;
++
++	static const QUrl updateCheckUrl_;
++	static const QUrl changelogUrl_;
++	static const QUrl downloadPageUrl_;
++
++	static const QString settingsKey_;
++};
++
++#endif // QDCHECKER_H
+--- git.temp.orig/src/psicon.cpp
++++ git.temp/src/psicon.cpp
+@@ -115,6 +115,8 @@
+ #include "AutoUpdater/AutoUpdater.h"
+ #ifdef HAVE_SPARKLE
+ #include "AutoUpdater/SparkleAutoUpdater.h"
++#elif defined(USE_QDCHECKER)
++#	include "AutoUpdater/QDChecker.h"
+ #endif
+ 
+ #ifdef Q_OS_MAC
+@@ -452,14 +454,6 @@ bool PsiCon::init()
+ 	d->tuneManager = new TuneControllerManager();
+ #endif
+ 
+-	// Auto updater initialization
+-#ifdef HAVE_SPARKLE
+-	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
+-#endif
+-	if (d->autoUpdater && options->getOption("options.auto-update.check-on-startup").toBool()) {
+-		d->autoUpdater->checkForUpdates();
+-	}
+-
+ 	// calculate the small font size
+ 	const int minimumFontSize = 7;
+ 	common_smallFontSize = qApp->font().pointSize();
+@@ -495,6 +489,15 @@ bool PsiCon::init()
+ 	QDir profileDir( pathToProfile(activeProfile, ApplicationInfo::DataLocation) );
+ 	profileDir.rmdir( "info" ); // remove unused dir
+ 
++	// Auto updater initialization
++#ifdef HAVE_SPARKLE
++	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
++#elif defined(USE_QDCHECKER)
++	d->autoUpdater = new QDChecker();
++#endif
++	if (PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool() && d->autoUpdater)
++		d->autoUpdater->checkForUpdates();
++
+ 	d->iconSelect = new IconSelectPopup(0);
+ 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
+ 
+--- git.temp.orig/src/src.pri
++++ git.temp/src/src.pri
+@@ -48,6 +48,7 @@ use_crash {
+ }
+ 
+ # AutoUpdater
++win32:CONFIG += QuickDirtyChecker
+ include($$PWD/AutoUpdater/AutoUpdater.pri)
+ 
+ # Widgets

psi-plus-main-20141106.tar.xz/patches/0380-psi-temp-show-caps.diff Added

@@ -0,0 +1,46 @@
+--- git.orig/src/gcuserview.cpp
++++ git/src/gcuserview.cpp
+@@ -366,8 +366,8 @@ bool GCUserView::maybeTip(const QPoint &
+ 	UserResource ur;
+ 	ur.setName(nick);
+ 	ur.setStatus(s);
+-	//ur.setClient(client_name,client_version,"");
+-	ur.setClient(QString(),QString(),"");
++	ur.setClient(client_name,client_version,"");
++	//ur.setClient(QString(),QString(),"");
+ 	u.userResourceList().append(ur);
+ 
+ 	PsiToolTip::showText(mapToGlobal(pos), u.makeTip(), this);
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -2404,6 +2404,8 @@ void PsiAccount::client_resourceAvailabl
+ 			//ur.setSecurityEnabled(true);
+ 			if(local)
+ 				ur.setClient(ApplicationInfo::name(),ApplicationInfo::version(),SystemInfo::instance()->os());
++			else
++				ur.setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
+ 
+ 			u->userResourceList().append(ur);
+ 			rp = &u->userResourceList().last();
+@@ -2473,8 +2475,8 @@ void PsiAccount::client_resourceAvailabl
+ 		foreach(UserListItem* u, findRelevant(j)) {
+ 			UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
+ 			if (rit != u->userResourceList().end()) {
+-				//(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
+-				(*rit).setClient(QString(),QString(),"");
++				(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
++				//(*rit).setClient(QString(),QString(),"");
+ 				cpUpdate(*u,(*rit).name());
+ 			}
+ 		}
+@@ -2989,8 +2991,8 @@ void PsiAccount::capsChanged(const Jid&
+ 		bool found = (rit == u->userResourceList().end()) ? false: true;
+ 		if(!found)
+ 			continue;
+-		//(*rit).setClient(name,version,"");
+-		(*rit).setClient(QString(),QString(),"");
++		(*rit).setClient(name,version,"");
++		//(*rit).setClient(QString(),QString(),"");
+ 		cpUpdate(*u);
+ 	}
+ }

psi-plus-main-20141106.tar.xz/patches/0390-psi-typeahead-find.diff Added

@@ -0,0 +1,683 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -449,6 +449,8 @@
+ 					<item type="QKeySequence">Ctrl+PgUp</item>
+ 					<item type="QKeySequence">Ctrl+Shift+Tab</item>
+ 				</previous-tab>
++				<find-next type="QKeySequence" comment="Find text next"></find-next>
++				<find-prev type="QKeySequence" comment="Find text previous"></find-prev>
+ 				<find type="QKeySequence" comment="Find text">Ctrl+F</find>
+ 				<send type="QVariantList" comment="Sends the message">
+ 					<item type="QKeySequence">Return</item>
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -452,3 +452,8 @@ bool ChatView::internalFind(QString str,
+ 
+ 	return true;
+ }
++
++ChatView * ChatView::textWidget()
++{
++	return this;
++}
+--- git.orig/src/chatview_te.h
++++ git/src/chatview_te.h
+@@ -59,6 +59,7 @@ public:
+ 	void deferredScroll();
+ 	void doTrackBar();
+ 	bool internalFind(QString str, bool startFromBeginning = false);
++	ChatView *textWidget();
+ 
+ public slots:
+ 	void scrollUp();
+--- git.orig/src/chatview_webkit.cpp
++++ git/src/chatview_webkit.cpp
+@@ -366,4 +366,9 @@ bool ChatView::internalFind(QString str,
+ 	return found;
+ }
+ 
++WebView* ChatView::textWidget()
++{
++	return webView;
++}
++
+ #include "chatview_webkit.moc"
+--- git.orig/src/chatview_webkit.h
++++ git/src/chatview_webkit.h
+@@ -63,6 +63,7 @@ public:
+ 	void clear();
+ 	void doTrackBar();
+ 	bool internalFind(QString str, bool startFromBeginning = false);
++	WebView * textWidget();
+ 
+ public slots:
+ 	void scrollUp();
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -103,7 +103,7 @@ static const QString geometryOption = "o
+ 
+ 
+ #include "groupchattopicdlg.h"
+-
++#include "typeaheadfind.h"
+ //----------------------------------------------------------------------------
+ // StatusPingTask
+ //----------------------------------------------------------------------------
+@@ -208,6 +208,7 @@ public:
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+ 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
++	TypeAheadFindBar *typeahead;
+ #ifdef WHITEBOARDING
+ 	IconAction *act_whiteboard;
+ #endif
+@@ -227,8 +228,8 @@ public:
+ 	QStringList hist;
+ 	int histAt;
+ 
+-	QPointer<GCFindDlg> findDlg;
+-	QString lastSearch;
++	//QPointer<GCFindDlg> findDlg;
++	//QString lastSearch;
+ 
+ 	QPointer<MUCConfigDlg> configDlg;
+ 	QPointer<GroupchatTopicDlg> topicDlg;
+@@ -604,7 +605,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	d->connecting = false;
+ 
+ 	d->histAt = 0;
+-	d->findDlg = 0;
++	//d->findDlg = 0;
+ 	d->configDlg = 0;
+ 
+ 	d->state = Private::Connected;
+@@ -638,11 +639,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
+ 	updateIdentityVisibility();
+-
++/*
+ 	d->act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this);
+ 	connect(d->act_find, SIGNAL(triggered()), SLOT(openFind()));
+ 	ui_.tb_find->setDefaultAction(d->act_find);
+-
++*/
+ 	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
+ 
+ #ifdef Q_OS_MAC
+@@ -658,9 +659,18 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(ui_.lv_users, SIGNAL(action(const QString &, const Status &, int)), SLOT(lv_action(const QString &, const Status &, int)));
+ 	connect(ui_.lv_users, SIGNAL(insertNick(const QString&)), d, SLOT(insertNick(const QString&)));
+ 
++	// typeahead find bar
++	QHBoxLayout *hb3a = new QHBoxLayout();
++	d->typeahead = new TypeAheadFindBar(ui_.log->textWidget(), tr("Find toolbar"), 0);
++	hb3a->addWidget( d->typeahead );
++	ui_.vboxLayout1->addLayout(hb3a);
++
+ 	d->act_clear = new IconAction (tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
+ 	connect( d->act_clear, SIGNAL(triggered()), SLOT(doClearButton()));
+ 
++	d->act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
++	connect(d->act_find, SIGNAL(triggered()), d->typeahead, SLOT(toggleVisibility()));
++
+ 	d->act_configure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("&Configure Room"), 0, this);
+ 	connect(d->act_configure, SIGNAL(triggered()), SLOT(configureRoom()));
+ 
+@@ -703,6 +713,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ 	ui_.toolbar->setIconSize(QSize(16,16));
+ 	ui_.toolbar->addAction(d->act_clear);
++	ui_.toolbar->addAction(d->act_find);
+ 	ui_.toolbar->addAction(d->act_configure);
+ #ifdef WHITEBOARDING
+ 	ui_.toolbar->addAction(d->act_whiteboard);
+@@ -1113,7 +1124,7 @@ void GCMainDlg::doClearButton()
+ 		doClear();
+ 	}
+ }
+-
++/*
+ void GCMainDlg::openFind()
+ {
+ 	if(d->findDlg)
+@@ -1124,7 +1135,7 @@ void GCMainDlg::openFind()
+ 		d->findDlg->show();
+ 	}
+ }
+-
++*/
+ void GCMainDlg::configureRoom()
+ {
+ 	if(d->configDlg)
+@@ -1138,7 +1149,7 @@ void GCMainDlg::configureRoom()
+ 		d->configDlg->show();
+ 	}
+ }
+-
++/*
+ void GCMainDlg::doFind(const QString &str)
+ {
+ 	d->lastSearch = str;
+@@ -1147,7 +1158,7 @@ void GCMainDlg::doFind(const QString &st
+ 	else
+ 		d->findDlg->error(str);
+ }
+-
++*/
+ void GCMainDlg::goDisc()
+ {
+ 	if(d->state != Private::Idle && d->state != Private::ForcedLeave) {
+@@ -1738,7 +1749,7 @@ void GCMainDlg::optionsUpdate()
+ 
+ 	setLooks();
+ 	setShortcuts();
+-
++	d->typeahead->optionsUpdate();
+ 	// update status icons
+ 	ui_.lv_users->updateAll();
+ }
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -116,9 +116,9 @@ private slots:
+ 	void mle_returnPressed();
+ 	void openTopic();
+ 	void setTopic(const QString &);
+-	void openFind();
++	//void openFind();
+ 	void configureRoom();
+-	void doFind(const QString &);
++	//void doFind(const QString &);
+ 	void pa_updatedActivity();
+ 	void goDisc();
+ 	void goConn();
+--- git.orig/src/groupchatdlg.ui
++++ git/src/groupchatdlg.ui
+@@ -96,25 +96,6 @@
+            </widget>
+           </item>
+           <item>
+-           <widget class="QToolButton" name="tb_find" >
+-            <property name="toolTip" >
+-             <string>Select icon</string>
+-            </property>
+-            <property name="text" >
+-             <string/>
+-            </property>
+-            <property name="iconSize" >
+-             <size>
+-              <width>16</width>
+-              <height>16</height>
+-             </size>
+-            </property>
+-            <property name="popupMode" >
+-             <enum>QToolButton::InstantPopup</enum>
+-            </property>
+-           </widget>
+-          </item>
+-          <item>
+            <widget class="QToolButton" name="tb_emoticons" >
+             <property name="toolTip" >
+              <string>Select icon</string>
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -312,6 +312,9 @@ void PsiChatDlg::setShortcuts()
+ 	ChatDlg::setShortcuts();
+ 
+ 	act_clear_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
++// typeahead find bar
++	act_find->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
++// -- typeahead
+ 	act_info_->setShortcuts(ShortcutManager::instance()->shortcuts("common.user-info"));
+ 	act_history_->setShortcuts(ShortcutManager::instance()->shortcuts("common.history"));
+ 
+@@ -339,9 +342,21 @@ void PsiChatDlg::updateIdentityVisibilit
+ 
+ void PsiChatDlg::initToolButtons()
+ {
++// typeahead find
++	QHBoxLayout *hb3a = new QHBoxLayout();
++	typeahead = new TypeAheadFindBar(ui_.log->textWidget(), tr("Find toolbar"), 0);
++	hb3a->addWidget( typeahead );
++	ui_.vboxLayout1->addLayout(hb3a);
++// -- typeahead
++
+ 	act_clear_ = new IconAction(tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
+ 	connect(act_clear_, SIGNAL(triggered()), SLOT(doClearButton()));
+ 
++// typeahead find
++	act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
++	connect(act_find, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
++// -- typeahead
++
+ 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
+ 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
+ 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
+@@ -379,6 +394,9 @@ void PsiChatDlg::initToolBar()
+ 	ui_.toolbar->setWindowTitle(tr("Chat Toolbar"));
+ 	ui_.toolbar->setIconSize(QSize(16, 16));
+ 	ui_.toolbar->addAction(act_clear_);
++// typeahead find bar
++	ui_.toolbar->addAction(act_find);
++// -- typeahead
+ 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+ 	ui_.toolbar->addAction(act_icon_);
+ 	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
+@@ -515,6 +533,8 @@ void PsiChatDlg::optionsUpdate()
+ 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
+ 
+ 	ChatDlg::optionsUpdate();
++// typeahead find bar
++	typeahead->optionsUpdate();
+ }
+ 
+ void PsiChatDlg::updatePGP()
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -9,6 +9,7 @@
+ #include "applicationinfo.h"
+ 
+ #include "ui_chatdlg.h"
++#include "typeaheadfind.h"
+ 
+ class IconAction;
+ 
+@@ -79,6 +80,8 @@ private:
+ 	IconAction* act_file_;
+ 	IconAction* act_compact_;
+ 	IconAction* act_voice_;
++	TypeAheadFindBar *typeahead;
++	IconAction* act_find;
+ 	IconAction* act_ps_;
+ 	IconAction* act_templates_;
+ 	QAction *act_mini_cmd_;
+--- git.orig/src/widgets/typeaheadfind.cpp
++++ git/src/widgets/typeaheadfind.cpp
+@@ -0,0 +1,292 @@
++/*
++ * typeaheadfind.cpp - Typeahead find toolbar
++ * Copyright (C) 2006  Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "typeaheadfind.h"
++
++#include <QAction>
++#include <QLineEdit>
++#include <QCheckBox>
++#include <QLabel>
++#include <QTextEdit>
++
++#include "iconaction.h"
++#include "stretchwidget.h"
++#include "shortcutmanager.h"
++#include "psioptions.h"
++
++/**
++ * \class TypeAheadFindBar
++ * \brief The TypeAheadFindBar class provides a toolbar for typeahead finding.
++ */
++
++class TypeAheadFindBar::Private
++{
++public:
++	// setup search and react to search results
++	void doFind(bool backward = false)
++	{
++		QTextDocument::FindFlags options;
++
++		if (caseSensitive)
++			options |= QTextDocument::FindCaseSensitively;
++
++		if (backward) {
++			options |= QTextDocument::FindBackward;
++
++			if (widgetType == TypeAheadFindBar::WebViewType) {
++				//FIXME make it work with web
++			} else {
++				// move cursor before currect selection
++				// to prevent finding the same occurence again
++				QTextCursor cursor = te->textCursor();
++				cursor.setPosition(cursor.selectionStart());
++				cursor.movePosition(QTextCursor::Left);
++				te->setTextCursor(cursor);
++			}
++		}
++
++		if (find(text, options)) {
++			le_find->setStyleSheet("");
++		}
++		else {
++			le_find->setStyleSheet("QLineEdit { background: #ff6666; color: #ffffff }");
++		}
++	}
++
++	// real search code
++
++	bool find(const QString &str, QTextDocument::FindFlags options, QTextCursor::MoveOperation start = QTextCursor::NoMove)
++	{
++		if (widgetType == TypeAheadFindBar::WebViewType) {
++#ifdef WEBKIT
++			QWebPage::FindFlags wkOptions;
++			wkOptions |= options & QTextDocument::FindBackward? QWebPage::FindBackward : (QWebPage::FindFlags)0;
++			wkOptions |= options & QTextDocument::FindCaseSensitively? QWebPage::FindCaseSensitively : (QWebPage::FindFlags)0;
++			return wv->findText(str, wkOptions);
++#else
++			Q_UNUSED(str);
++#endif
++		}
++		if (start != QTextCursor::NoMove) {
++			QTextCursor cursor = te->textCursor();
++			cursor.movePosition(start);
++			te->setTextCursor(cursor);
++		}
++
++		bool found = te->find(text, options);
++		if (!found) {
++			if (start == QTextCursor::NoMove)
++				return find(text, options, options & QTextDocument::FindBackward ? QTextCursor::End : QTextCursor::Start);
++
++			return false;
++		}
++
++		return true;
++	}
++
++	QString text;
++	bool caseSensitive;
++	TypeAheadFindBar::Type widgetType;
++
++	QTextEdit *te;
++#ifdef WEBKIT
++	WebView *wv;
++#endif
++	QLineEdit *le_find;
++	QAction *act_next;
++	QAction *act_prev;
++	QCheckBox *cb_case;
++};
++
++/**
++ * \brief Creates new find toolbar, hidden by default.
++ * \param textedit, QTextEdit that this toolbar will operate on.
++ * \param title, toolbar's title
++ * \param parent, toolbar's parent
++ */
++TypeAheadFindBar::TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent)
++: QToolBar(title, parent)
++{
++	d = new Private();
++	d->widgetType = TextEditType;
++	d->te = textedit;
++	init();
++}
++
++#ifdef WEBKIT
++TypeAheadFindBar::TypeAheadFindBar(WebView *webView, const QString &/*title*/, QWidget */*parent*/)
++{
++	d = new Private();
++	d->widgetType = WebViewType;
++	d->wv = webView;
++	init();
++}
++#endif
++
++void TypeAheadFindBar::init()
++{
++	setIconSize(QSize(16,16));
++	setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
++
++	d->caseSensitive = false;
++	d->text = "";
++
++	d->le_find = new QLineEdit(this);
++	d->le_find->setMaximumWidth(200);
++	d->le_find->setToolTip(tr("Search"));
++	connect(d->le_find, SIGNAL(textEdited(const QString &)), SLOT(textChanged(const QString &)));
++	addWidget(d->le_find);
++
++	d->act_next = new IconAction(tr("Find next"), "psi/arrowDown", "", 0, this);
++	d->act_next->setEnabled(false);
++	d->act_next->setToolTip(tr("Find next"));
++	connect(d->act_next, SIGNAL(triggered()), SLOT(findNext()));
++	addAction(d->act_next);
++
++	d->act_prev = new IconAction(tr("Find previous"), "psi/arrowUp", "", 0, this);
++	d->act_prev->setEnabled(false);
++	d->act_prev->setToolTip(tr("Find previous"));
++	connect(d->act_prev, SIGNAL(triggered()), SLOT(findPrevious()));
++	addAction(d->act_prev);
++
++	d->cb_case = new QCheckBox(tr("&Case sensitive"), this);
++	connect(d->cb_case, SIGNAL(stateChanged(int)), SLOT(caseToggled(int)));
++	addWidget(d->cb_case);
++
++	addWidget(new StretchWidget(this));
++
++	optionsUpdate();
++
++	hide();
++}
++
++/**
++ * \brief Destroys the toolbar.
++ */
++TypeAheadFindBar::~TypeAheadFindBar()
++{
++	delete d;
++	d = 0;
++}
++
++/**
++ * \brief Should be called when application options are changed.
++ * This slot updates toolbar's shortcuts.
++ */
++void TypeAheadFindBar::optionsUpdate()
++{
++	d->act_next->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find-next"));
++	d->act_prev->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find-prev"));
++}
++
++/**
++ * \brief Opens (shows) the toolbar.
++ */
++void TypeAheadFindBar::open()
++{
++	show();
++	d->le_find->setFocus();
++	d->le_find->selectAll();
++	emit visibilityChanged(true);
++}
++
++/**
++ * \brief Closes (hides) the toolbar.
++ */
++void TypeAheadFindBar::close()
++{
++	hide();
++	emit visibilityChanged(false);
++}
++
++/**
++ * \brief Switched between visible and hidden state.
++ */
++void TypeAheadFindBar::toggleVisibility()
++{
++	if (isVisible())
++		hide();
++	else
++		//show();
++		open();
++}
++
++/**
++ * \brief Private slot activated when find text chagnes.
++ */
++void TypeAheadFindBar::textChanged(const QString &str)
++{
++	QTextCursor cursor;
++	if (d->widgetType == TextEditType) {
++		cursor = d->te->textCursor();
++	}
++
++	if (str.isEmpty()) {
++		d->act_next->setEnabled(false);
++		d->act_prev->setEnabled(false);
++		d->le_find->setStyleSheet("");
++		if (d->widgetType == WebViewType) {
++#ifdef WEBKIT
++			d->wv->page()->findText(""); //its buggy in qt-4.6.0
++#endif
++		} else { //TextEditType
++			cursor.clearSelection();
++			d->te->setTextCursor(cursor);
++		}
++		d->le_find->setStyleSheet("");
++	}
++	else {
++		d->act_next->setEnabled(true);
++		d->act_prev->setEnabled(true);
++
++		if (d->widgetType == TextEditType) {
++			// don't jump to next word occurence after appending new charater
++			cursor.setPosition(cursor.selectionStart());
++			d->te->setTextCursor(cursor);
++		}
++
++		d->text = str;
++		d->doFind();
++	}
++}
++
++/**
++ * \brief Private slot activated when find-next is requested.
++ */
++void TypeAheadFindBar::findNext()
++{
++	d->doFind();
++}
++
++/**
++ * \brief Private slot activated when find-prev is requested.
++ */
++void TypeAheadFindBar::findPrevious()
++{
++	d->doFind(true);
++}
++
++/**
++ * \brief Private slot activated when case-sensitive box is toggled.
++ */
++void TypeAheadFindBar::caseToggled(int state)
++{
++	d->caseSensitive = (state == Qt::Checked);
++}
+--- git.orig/src/widgets/typeaheadfind.h
++++ git/src/widgets/typeaheadfind.h
+@@ -0,0 +1,69 @@
++/*
++ * typeaheadfind.h - Typeahead find toolbar
++ * Copyright (C) 2006  Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef TYPEAHEADFIND_H
++#define TYPEAHEADFIND_H
++
++#include <QToolBar>
++
++#ifdef WEBKIT
++#include <webview.h>
++#endif
++
++class QTextEdit;
++class QString;
++
++class TypeAheadFindBar : public QToolBar
++{
++	Q_OBJECT
++public:
++	enum Type {
++		TextEditType,
++		WebViewType
++	};
++
++	TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent = 0);
++#ifdef WEBKIT
++	TypeAheadFindBar(WebView *webView, const QString &title, QWidget *parent = 0);
++#endif
++	~TypeAheadFindBar();
++	void init();
++
++public slots:
++	void open();
++	void close();
++	void toggleVisibility();
++	void optionsUpdate();
++
++signals:
++	void visibilityChanged(bool visible);
++
++private slots:
++	void textChanged(const QString &);
++	void findNext();
++	void findPrevious();
++	void caseToggled(int);
++
++private:
++	class Private;
++	Private *d;
++};
++
++#endif
+--- git.orig/src/widgets/widgets.pri
++++ git/src/widgets/widgets.pri
+@@ -16,7 +16,9 @@ SOURCES += \
+ 	$$PWD/psitiplabel.cpp \
+ 	$$PWD/psitabwidget.cpp \
+ 	$$PWD/psitabbar.cpp \
+-	$$PWD/actionlineedit.cpp
++	$$PWD/actionlineedit.cpp \
++	$$PWD/typeaheadfind.cpp
++
+ 
+ HEADERS += \
+ 	$$PWD/stretchwidget.h \
+@@ -41,7 +43,8 @@ HEADERS += \
+ 	$$PWD/psitiplabel.h \
+ 	$$PWD/psitabwidget.h \
+ 	$$PWD/psitabbar.h \
+-	$$PWD/actionlineedit.h
++	$$PWD/actionlineedit.h \
++	$$PWD/typeaheadfind.h
+ 
+ FORMS += $$PWD/fancypopup.ui
+

psi-plus-main-20141106.tar.xz/patches/0400-psi-improve-tray-tooltip.diff Added

@@ -0,0 +1,256 @@
+--- git.temp.orig/src/mainwin.cpp
++++ git.temp/src/mainwin.cpp
+@@ -47,6 +47,7 @@
+ #include "common.h"
+ #include "showtextdlg.h"
+ #include "psicon.h"
++#include "textutil.h"
+ #ifndef NEWCONTACTLIST
+ #include "contactview.h"
+ #endif
+@@ -54,6 +55,8 @@
+ #include "serverinfomanager.h"
+ #include "applicationinfo.h"
+ #include "psiaccount.h"
++#include "psievent.h"
++#include "psitooltip.h"
+ #include "psitrayicon.h"
+ #include "psitoolbar.h"
+ #include "aboutdlg.h"
+@@ -142,6 +145,8 @@ public:
+ 	void registerActions();
+ 	IconAction* getAction( QString name );
+ 	void updateMenu(QStringList actions, QMenu* menu);
++
++	QString ToolTipText;
+ };
+ 
+ MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
+@@ -710,7 +715,8 @@ void MainWin::setUseDock(bool use)
+ 		connect(d->tray, SIGNAL(clicked(const QPoint &, int)), SLOT(trayClicked(const QPoint &, int)));
+ 		connect(d->tray, SIGNAL(doubleClicked(const QPoint &)), SLOT(trayDoubleClicked()));
+ 		d->tray->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
+-		d->tray->setToolTip(ApplicationInfo::name());
++		setTrayToolTip();
++		connect(d->tray, SIGNAL(doToolTip(QObject *, QPoint)), this, SLOT(doTrayToolTip(QObject *, QPoint)));
+ 
+ 		updateReadNext(d->nextAnim, d->nextAmount);
+ 
+@@ -1093,12 +1099,87 @@ void MainWin::buildTrayMenu()
+ #endif
+ }
+ 
+-void MainWin::setTrayToolTip(int status)
++void MainWin::setTrayToolTip()
+ {
+ 	if (!d->tray) {
+ 		return;
+ 	}
+-	d->tray->setToolTip(QString("Psi - " + status2txt(status)));
++	QString s = ApplicationInfo::name();
++	QString str = "<qt>";
++	QString imgTag = "icon name";
++	str += QString("<div style='white-space:pre'><b>%1</b></div>").arg(TextUtil::escape(ApplicationInfo::name()));
++	QString Tip = "";
++	QString TipPlain = "";
++	QString Events = "";
++	QString EventsPlain = "";
++	foreach(PsiAccount *pa, d->psi->contactList()->enabledAccounts()) {
++		Status stat = pa->status();
++		int status = makeSTATUS(stat);
++		QString istr = "status/offline";
++		if(status == STATUS_ONLINE)
++			istr = "status/online";
++		else if(status == STATUS_AWAY)
++			istr = "status/away";
++		else if(status == STATUS_XA)
++			istr = "status/xa";
++		else if(status == STATUS_DND)
++			istr = "status/dnd";
++		else if(status == STATUS_CHAT)
++ 			istr = "status/chat";
++		else if(status == STATUS_INVISIBLE)
++			istr = "status/invisible";
++		Tip += QString("<div style='white-space:pre'>") + QString("<%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b>").arg(TextUtil::escape(pa->name())) + "</div>";
++		TipPlain += "\n" + pa->name() + " (" + stat.typeString() + ")";
++		QString text = stat.status();
++		if(!text.isEmpty()) {
++			text = clipStatus(text, 40, 1);
++			Tip += QString("<div style='white-space:pre'>%1: %2</div>").arg(tr("Status Message")).arg(TextUtil::escape(text));
++		}
++
++		PsiEvent::Ptr e;
++		e = pa->eventQueue()->peekNext();
++		if(e) {
++			Jid jid = e->jid();
++			QString from;
++			if(!jid.isEmpty()) {
++				LiveRoster Roster = pa->client()->roster();
++				while(!Roster.isEmpty()) {
++					LiveRosterItem item = Roster.takeFirst();
++					if(item.jid().compare(jid)) {
++						from = item.name();
++						break;
++					}
++				}
++				if(from.isEmpty()) {
++					from = jid.full();
++				}
++			}
++			if(!from.isEmpty()) {
++				Events += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(from));
++				EventsPlain += "\n" + from;
++			}
++		}
++	}
++
++	if(!Tip.isEmpty()) {
++		str += QString("<div style='white-space:pre'><u><b>%1</b></u></div>").arg(TextUtil::escape(tr("Active accounts:"))) + Tip;
++		s += tr("\nActive accounts:") + TipPlain;
++	}
++
++	if(!Events.isEmpty()) {
++		str += QString("<div style='white-space:pre'><u><b>%1</b></u></div>").arg(TextUtil::escape(tr("Incoming event(s) from:"))) + Events;
++		s += tr("\nIncoming event(s) from:") + EventsPlain;
++	}
++
++	str += "</qt>";
++
++	d->ToolTipText = str;
++	d->tray->setToolTip(s);
++}
++
++void MainWin::doTrayToolTip(QObject *, QPoint p)
++{
++	PsiToolTip::showText(p, d->ToolTipText);
+ }
+ 
+ void MainWin::decorateButton(int status)
+@@ -1109,6 +1190,8 @@ void MainWin::decorateButton(int status)
+ 		action->setChecked ( d->statusActions[action] == status );
+ 	}
+ 
++	setTrayToolTip();
++
+ 	if(d->lastStatus == status) {
+ 		return;
+ 	}
+@@ -1295,20 +1378,7 @@ void MainWin::setTrayToolTip(const Statu
+ 	if (!d->tray) {
+ 		return;
+ 	}
+-	QString s = ApplicationInfo::name();
+-
+-	QString show = status.show();
+-	if(!show.isEmpty()) {
+-		show[0] = show[0].toUpper();
+-		s += " - "+show;
+-	}
+-
+-	QString text = status.status();
+-	if(!text.isEmpty()) {
+-		s += ": "+text;
+-	}
+-
+-	d->tray->setToolTip(s);
++	setTrayToolTip();
+ }
+ 
+ void MainWin::trayClicked(const QPoint &, int button)
+@@ -1383,6 +1453,7 @@ void MainWin::updateReadNext(PsiIcon* an
+ 
+ 	updateTray();
+ 	updateCaption();
++	setTrayToolTip();
+ }
+ 
+ QString MainWin::numEventsString(int x) const
+@@ -1441,6 +1512,7 @@ PsiTrayIcon *MainWin::psiTrayIcon()
+ void MainWin::numAccountsChanged()
+ {
+ 	d->statusButton->setEnabled(d->psi->contactList()->haveEnabledAccounts());
++	setTrayToolTip();
+ }
+ 
+ void MainWin::accountFeaturesChanged()
+--- git.temp.orig/src/mainwin.h
++++ git.temp/src/mainwin.h
+@@ -101,7 +101,7 @@ private slots:
+ 	void buildMainMenu();
+ 	void buildToolsMenu();
+ 
+-	void setTrayToolTip(int);
++	void setTrayToolTip();
+ 
+ 	void activatedStatusAction(int);
+ 
+@@ -145,6 +145,8 @@ private slots:
+ 	void registerAction( IconAction * );
+ 	void splitterMoved();
+ 
++	void doTrayToolTip(QObject *, QPoint);
++
+ public slots:
+ 	void setWindowIcon(const QPixmap&);
+ 	void showNoFocus();
+--- git.temp.orig/src/psitrayicon.cpp
++++ git.temp/src/psitrayicon.cpp
+@@ -2,6 +2,7 @@
+ #include <QPixmapCache>
+ #include <QApplication> // old
+ #include <QSystemTrayIcon>
++#include <QHelpEvent>
+ 
+ #include "psitrayicon.h"
+ #include "iconset.h"
+@@ -19,6 +20,7 @@ PsiTrayIcon::PsiTrayIcon(const QString &
+ 	trayicon_->setContextMenu(popup);
+ 	setToolTip(tip);
+ 	connect(trayicon_,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
++	trayicon_->installEventFilter(this);
+ }
+ 
+ PsiTrayIcon::~PsiTrayIcon()
+@@ -38,7 +40,11 @@ void PsiTrayIcon::setContextMenu(QMenu*
+ 
+ void PsiTrayIcon::setToolTip(const QString &str)
+ {
++#ifndef HAVE_X11
+ 	trayicon_->setToolTip(str);
++#else
++	Q_UNUSED(str)
++#endif
+ }
+ 
+ void PsiTrayIcon::setIcon(const PsiIcon *icon, bool alert)
+@@ -193,3 +199,12 @@ void PsiTrayIcon::animate()
+ 	}
+ 	trayicon_->setIcon(p);
+ }
++
++bool PsiTrayIcon::eventFilter(QObject *obj, QEvent *event)
++{
++	if(obj == trayicon_ && event->type() == QEvent::ToolTip) {
++		doToolTip(obj, ((QHelpEvent*)event)->globalPos());
++		return true;
++	}
++	return QObject::eventFilter(obj, event);
++}
+--- git.temp.orig/src/psitrayicon.h
++++ git.temp/src/psitrayicon.h
+@@ -29,6 +29,7 @@ signals:
+ 	void clicked(const QPoint &, int);
+ 	void doubleClicked(const QPoint &);
+ 	void closed();
++	void doToolTip(QObject *, QPoint);
+ 
+ public slots:
+ 	void show();
+@@ -41,6 +42,7 @@ private slots:
+ protected:
+ 	QPixmap makeIcon();
+ 	QRgb pixelBlend(QRgb p1, QRgb p2);
++	bool eventFilter( QObject *, QEvent * );
+ 
+ private:
+ 	PsiIcon* icon_;

psi-plus-main-20141106.tar.xz/patches/0410-psi-activity-icons-and-description.diff Added

@@ -0,0 +1,676 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -169,6 +169,7 @@
+ 					<radius type="int">5</radius>
+ 				</avatars>
+ 				<show-mood-icons type="bool">true</show-mood-icons>
++				<show-activity-icons type="bool">true</show-activity-icons>
+ 				<show-tune-icons type="bool">true</show-tune-icons>
+ 				<show-client-icons type="bool">true</show-client-icons>
+ 				<show-all-client-icons type="bool">false</show-all-client-icons>
+--- git.orig/src/activity.cpp
++++ git/src/activity.cpp
+@@ -67,6 +67,16 @@ const QString& Activity::text() const
+ 	return text_;
+ }
+ 
++QString Activity::typeValue() const
++{
++	return ActivityCatalog::instance()->findEntryByType(type_).value();
++}
++
++QString Activity::specificTypeValue() const
++{
++	return ActivityCatalog::instance()->findEntryByType(specificType_).value();
++}
++
+ bool Activity::isNull() const
+ {
+ 	return type_ == Unknown && text().isEmpty();
+--- git.orig/src/activitydlg.cpp
++++ git/src/activitydlg.cpp
+@@ -25,6 +25,7 @@
+ #include "activitycatalog.h"
+ #include "psiaccount.h"
+ #include "pepmanager.h"
++#include "psiiconset.h"
+ 
+ ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
+ {
+@@ -36,12 +37,20 @@ ActivityDlg::ActivityDlg(PsiAccount* pa)
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
+ 
+ 	ui_.cb_general_type->addItem(tr("<unset>"));
++	Activity::Type at = pa->activity().type();
++	int i=1;
+ 	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
+ 		if (e.specificType() == Activity::UnknownSpecific) {
+ 			// The entry e is for a 'general' type.
+-			ui_.cb_general_type->addItem(e.text());
++			ui_.cb_general_type->addItem(IconsetFactory::icon("activities/"+e.value()).icon(), e.text());
++			if (e.type() == at) {
++				ui_.cb_general_type->setCurrentIndex(i);
++				loadSpecificActivities(ui_.cb_general_type->currentText());
++			}
++			i++;
+ 		}
+ 	}
++	ui_.le_description->setText(pa->activity().text());
+ }
+ 
+ void ActivityDlg::loadSpecificActivities(const QString& generalActivityStr)
+@@ -53,13 +62,19 @@ void ActivityDlg::loadSpecificActivities
+ 	}
+ 	else {
+ 		ui_.cb_specific_type->addItem(tr("<unset>"));
++		Activity::SpecificType at = pa_->activity().specificType();
++		int i=1;
+ 		ActivityCatalog* ac = ActivityCatalog::instance();
+ 		foreach(ActivityCatalog::Entry e, ac->entries()) {
+ 			if (e.specificType() != Activity::UnknownSpecific) {
+ 				// The entry e is for a 'specific' type.
+ 				ActivityCatalog::Entry ge = ac->findEntryByText(generalActivityStr);
+ 				if (e.type() == ge.type()) {
+-					ui_.cb_specific_type->addItem(e.text());
++					ui_.cb_specific_type->addItem(IconsetFactory::icon("activities/"+ge.value()+"_"+e.value()).icon(), e.text());
++					if (e.specificType() == at) {
++						ui_.cb_specific_type->setCurrentIndex(i);
++					}
++					i++;
+ 				}
+ 			}
+ 		}
+--- git.orig/src/activity.h
++++ git/src/activity.h
+@@ -75,6 +75,8 @@ public:
+ 
+ 	Type type() const;
+ 	QString typeText() const;
++	QString typeValue() const;
++	QString specificTypeValue() const;
+ 	SpecificType specificType() const;
+ 	QString specificTypeText() const;
+ 	const QString& text() const;
+--- git.orig/src/options/opt_appearance.cpp
++++ git/src/options/opt_appearance.cpp
+@@ -95,6 +95,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
+ {
+ 	addTab( new OptionsTabIconsetEmoticons(this) );
+ 	addTab( new OptionsTabIconsetMoods(this) );
++	addTab( new OptionsTabIconsetActivity(this) );
+ 	addTab( new OptionsTabIconsetClients(this) );
+ 	addTab( new OptionsTabIconsetRoster(this) );
+ 	addTab( new OptionsTabIconsetSystem(this) );
+--- git.orig/src/options/opt_iconset_activity.ui
++++ git/src/options/opt_iconset_activity.ui
+@@ -0,0 +1,88 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>IconsetActivity</class>
++ <widget class="QWidget" name="IconsetActivity">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>256</width>
++    <height>195</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>IconsetActivityUI</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
++   <item>
++    <widget class="QGroupBox" name="groupBox9">
++     <property name="title">
++      <string>Activity iconsets</string>
++     </property>
++     <layout class="QGridLayout">
++      <property name="margin">
++       <number>8</number>
++      </property>
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <item row="1" column="2">
++       <spacer>
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeType">
++         <enum>QSizePolicy::Expanding</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>204</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++      <item row="1" column="3">
++       <widget class="IconButton" name="pb_activityDetails" native="true">
++        <property name="text" stdset="0">
++         <string>&amp;Show Details</string>
++        </property>
++       </widget>
++      </item>
++      <item row="0" column="0" colspan="4">
++       <widget class="IconsetSelect" name="iss_activity" native="true"/>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QProgressBar" name="progress">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <customwidgets>
++  <customwidget>
++   <class>IconButton</class>
++   <extends></extends>
++   <header>iconbutton.h</header>
++  </customwidget>
++  <customwidget>
++   <class>IconsetSelect</class>
++   <extends></extends>
++   <header>iconsetselect.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/opt_iconset.cpp
++++ git/src/options/opt_iconset.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include "ui_opt_iconset_emo.h"
+ #include "ui_opt_iconset_mood.h"
++#include "ui_opt_iconset_activity.h"
+ #include "ui_opt_iconset_client.h"
+ #include "ui_opt_iconset_system.h"
+ #include "ui_opt_iconset_roster.h"
+@@ -47,6 +48,12 @@ public:
+ 	IconsetClientUI() : QWidget() { setupUi(this); }
+ };
+ 
++class IconsetActivityUI : public QWidget, public Ui::IconsetActivity
++{
++public:
++	IconsetActivityUI() : QWidget() { setupUi(this); }
++};
++
+ class IconsetSystemUI : public QWidget, public Ui::IconsetSystem
+ {
+ public:
+@@ -803,6 +810,153 @@ void OptionsTabIconsetMoods::cancelThrea
+ {
+ 	if ( thread ) {
+ 		threadCancelled.lock();
++		thread->cancelled = true;
++		threadCancelled.unlock();
++
++		thread = 0;
++	}
++}
++//----------------------------------------------------------------------------
++// OptionsTabIconsetActivity
++//----------------------------------------------------------------------------
++
++OptionsTabIconsetActivity::OptionsTabIconsetActivity(QObject *parent)
++	: OptionsTab(parent, "iconset_activities", "", tr("Activity"), tr("Select your activity iconset"))
++	, w(0)
++	, thread(0)
++{
++}
++
++OptionsTabIconsetActivity::~OptionsTabIconsetActivity()
++{
++	cancelThread();
++}
++
++QWidget *OptionsTabIconsetActivity::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new IconsetActivityUI;
++	IconsetActivityUI *d = (IconsetActivityUI *)w;
++
++	connect(d->pb_activityDetails, SIGNAL(clicked()), SLOT(previewIconset()));
++
++	return w;
++}
++
++void OptionsTabIconsetActivity::applyOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetActivityUI *d = (IconsetActivityUI *)w;
++
++	const Iconset *is = d->iss_activity->iconset();
++	if ( is ) {
++		QFileInfo fi( is->fileName() );
++		PsiOptions::instance()->setOption("options.iconsets.activities", fi.fileName());
++	}
++}
++
++void OptionsTabIconsetActivity::restoreOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetActivityUI *d = (IconsetActivityUI *)w;
++
++	d->iss_activity->clear();
++	QStringList loaded;
++
++	d->setCursor(Qt::WaitCursor);
++
++	QPalette customPal = d->palette();
++	customPal.setCurrentColorGroup(QPalette::Inactive);
++	d->iss_activity->setEnabled(false);
++	d->iss_activity->setPalette(customPal);
++
++	d->pb_activityDetails->setEnabled(false);
++	d->pb_activityDetails->setPalette(customPal);
++
++	d->progress->show();
++	d->progress->setValue( 0 );
++
++	numIconsets = countIconsets("/activities", loaded);
++	iconsetsLoaded = 0;
++
++	cancelThread();
++
++	thread = new IconsetLoadThread(this, "/activities");
++	thread->start();
++}
++
++bool OptionsTabIconsetActivity::event(QEvent *e)
++{
++	IconsetActivityUI *d = (IconsetActivityUI *)w;
++	if ( e->type() == QEvent::User ) { // iconset load event
++		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
++
++		if ( thread != le->thread() )
++			return false;
++
++		if ( !numIconsets )
++			numIconsets = 1;
++		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
++
++		Iconset *i = le->iconset();
++		if ( i ) {
++			PsiIconset::instance()->stripFirstAnimFrame(i);
++			d->iss_activity->insert(*i);
++
++			QFileInfo fi( i->fileName() );
++			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.activities").toString() )
++				d->iss_activity->setItemSelected(d->iss_activity->lastItem(), true);
++
++			delete i;
++		}
++
++		return true;
++	}
++	else if ( e->type() == QEvent::User + 1 ) { // finish event
++		d->iss_activity->setEnabled(true);
++		d->iss_activity->setPalette(QPalette());
++
++		d->pb_activityDetails->setEnabled(true);
++		d->pb_activityDetails->setPalette(QPalette());
++
++		connect(d->iss_activity, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
++
++		d->progress->hide();
++
++		d->unsetCursor();
++		thread = 0;
++
++		return true;
++	}
++
++	return false;
++}
++
++void OptionsTabIconsetActivity::previewIconset()
++{
++	IconsetActivityUI *d = (IconsetActivityUI *)w;
++	const Iconset *is = d->iss_activity->iconset();
++	if (is) {
++		isDetails(*is, parentWidget->parentWidget(), psi);
++	}
++}
++
++void OptionsTabIconsetActivity::setData(PsiCon *psicon, QWidget *p)
++{
++	psi = psicon;
++	parentWidget = p;
++}
++
++void OptionsTabIconsetActivity::cancelThread()
++{
++	if ( thread ) {
++		threadCancelled.lock();
+ 		thread->cancelled = true;
+ 		threadCancelled.unlock();
+ 
+--- git.orig/src/options/opt_iconset.h
++++ git/src/options/opt_iconset.h
+@@ -93,6 +93,34 @@ private:
+ 	IconsetLoadThread *thread;
+ };
+ 
++class OptionsTabIconsetActivity : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabIconsetActivity(QObject *parent);
++	~OptionsTabIconsetActivity();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++	bool stretchable() const { return true; }
++
++private slots:
++	void setData(PsiCon *, QWidget *);
++	void previewIconset();
++
++protected:
++	bool event(QEvent *);
++	void cancelThread();
++
++private:
++	QWidget *w, *parentWidget;
++	PsiCon *psi;
++
++	int numIconsets, iconsetsLoaded;
++	IconsetLoadThread *thread;
++};
++
+ class OptionsTabIconsetClients : public OptionsTab
+ {
+ 	Q_OBJECT
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -65,6 +65,7 @@ FORMS += \
+ 	$$PWD/ui_isdetails.ui \
+ 	$$PWD/opt_iconset_emo.ui \
+ 	$$PWD/opt_iconset_mood.ui \
++	$$PWD/opt_iconset_activity.ui \
+ 	$$PWD/opt_iconset_client.ui \
+ 	$$PWD/opt_iconset_system.ui \
+ 	$$PWD/opt_iconset_roster.ui \
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -69,6 +69,7 @@ void OptionsTabRoster::applyOptions()
+ 	//enabled icons
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-activity-icons", d->ck_showActivityIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
+@@ -95,6 +96,7 @@ void OptionsTabRoster::restoreOptions()
+ 	//enabled icons
+ 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
+ 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
++	d->ck_showActivityIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-activity-icons").toBool() );
+ 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
+ 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
+ 	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -1,3 +1,4 @@
++<?xml version="1.0" encoding="UTF-8"?>
+ <ui version="4.0">
+  <class>OptRoster</class>
+  <widget class="QWidget" name="OptRoster">
+@@ -5,8 +6,8 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>343</width>
+-    <height>401</height>
++    <width>357</width>
++    <height>452</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -65,13 +66,7 @@
+      <property name="title">
+       <string>Icons</string>
+      </property>
+-     <layout class="QVBoxLayout">
+-      <property name="spacing">
+-       <number>6</number>
+-      </property>
+-      <property name="margin">
+-       <number>10</number>
+-      </property>
++     <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QCheckBox" name="ck_showAvatarIcons">
+         <property name="whatsThis">
+@@ -93,30 +88,40 @@
+        </widget>
+       </item>
+       <item>
+-       <widget class="QCheckBox" name="ck_showTuneIcons">
++       <widget class="QCheckBox" name="ck_showActivityIcons">
+         <property name="whatsThis">
+-         <string>Show icon when contact is listening to music</string>
++         <string>Show activities in roster</string>
+         </property>
+         <property name="text">
+-         <string>Now playing</string>
++         <string>Activities</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+-       <layout class="QHBoxLayout" >
+-        <property name="spacing" >
+-         <number>5</number>
+-        </property>
+-        <item>
+-       <widget class="QCheckBox" name="ck_showClientIcons">
++       <widget class="QCheckBox" name="ck_showTuneIcons">
+         <property name="whatsThis">
+-         <string>Show icon of user client</string>
++         <string>Show icon when contact is listening to music</string>
+         </property>
+         <property name="text">
+-         <string>Clients</string>
++         <string>Now playing</string>
+         </property>
+        </widget>
+       </item>
++      <item>
++       <layout class="QHBoxLayout">
++        <property name="spacing">
++         <number>5</number>
++        </property>
++        <item>
++         <widget class="QCheckBox" name="ck_showClientIcons">
++          <property name="whatsThis">
++           <string>Show icon of user client</string>
++          </property>
++          <property name="text">
++           <string>Clients</string>
++          </property>
++         </widget>
++        </item>
+         <item>
+          <widget class="QComboBox" name="cb_showAllClientIcons" >
+           <item>
+@@ -224,4 +229,5 @@
+   <tabstop>ck_showTuneIcons</tabstop>
+  </tabstops>
+  <resources/>
++ <connections/>
+ </ui>
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -5576,6 +5576,11 @@ QString PsiAccount::nick() const
+ 	return d->self.name();
+ }
+ 
++const Activity &PsiAccount::activity() const
++{
++	return d->self.activity();
++}
++
+ const Mood &PsiAccount::mood() const
+ {
+ 	return d->self.mood();
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -34,6 +34,7 @@
+ #include "psiactions.h"
+ #include "psievent.h"
+ #include "mood.h"
++#include "activity.h"
+ 
+ namespace XMPP
+ {
+@@ -151,6 +152,7 @@ public:
+ 	void setNick(const QString &);
+ 	QString nick() const;
+ 	const Mood &mood() const;
++	const Activity &activity() const;
+ 	void forceDisconnect(bool fast, const XMPP::Status &s);
+ 	bool hasPGP() const;
+ 	QHostAddress *localAddress() const;
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -42,8 +42,8 @@ class PsiIconset::Private
+ private:
+ 	PsiIconset *psi;
+ public:
+-	Iconset system, moods, clients;
+-	QString cur_system, cur_status, cur_moods, cur_clients;
++	Iconset system, moods, clients, activities;
++	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity;
+ 	QStringList cur_emoticons;
+ 	QMap<QString, QString> cur_service_status;
+ 	QMap<QString, QString> cur_custom_status;
+@@ -247,6 +247,23 @@ public:
+ 		return def;
+ 	}
+ 
++	Iconset activityIconset(bool *ok)
++	{
++		Iconset def;
++		*ok = def.load( iconsetPath("activities/default") );
++
++		if ( PsiOptions::instance()->getOption("options.iconsets.activities").toString() != "default" ) {
++			Iconset is;
++			is.load ( iconsetPath("activities/" + PsiOptions::instance()->getOption("options.iconsets.activities").toString()) );
++
++			loadIconset(&def, &is);
++		}
++
++		stripFirstAnimFrame( def );
++
++		return def;
++	}
++
+ 	Iconset clientsIconset(bool *ok)
+ 	{
+ 		Iconset def;
+@@ -403,6 +420,21 @@ bool PsiIconset::loadMoods()
+ 	return ok;
+ }
+ 
++bool PsiIconset::loadActivity()
++{
++	bool ok = true;
++	QString cur_activity = PsiOptions::instance()->getOption("options.iconsets.activities").toString();
++	if (d->cur_activity != cur_activity) {
++		Iconset activities = d->activityIconset(&ok);
++		d->loadIconset(&d->activities, &activities);
++		d->activities.addToFactory();
++
++		d->cur_activity = cur_activity;
++	}
++
++	return ok;
++}
++
+ bool PsiIconset::loadClients()
+ {
+ 	bool ok = true;
+@@ -425,6 +457,7 @@ bool PsiIconset::loadAll()
+ 
+ 	loadEmoticons();
+ 	loadMoods();
++	loadActivity();
+ 	loadClients();
+ 	return true;
+ }
+@@ -440,6 +473,9 @@ void PsiIconset::optionChanged(const QSt
+ 	else if (option == "options.iconsets.moods") {
+ 		loadMoods();
+ 	}
++	else if (option == "options.iconsets.activities") {
++		loadActivity();
++	}
+ 	else if (option == "options.iconsets.clients") {
+ 		loadClients();
+ 	}
+--- git.orig/src/psiiconset.h
++++ git/src/psiiconset.h
+@@ -45,6 +45,7 @@ public:
+ 	QHash<QString, Iconset*> roster;
+ 	QList<Iconset*> emoticons;
+ 	Iconset moods;
++	Iconset activities;
+ 	Iconset clients;
+ 	const Iconset &system() const;
+ 	void stripFirstAnimFrame(Iconset *);
+@@ -98,6 +99,7 @@ private:
+ 	bool loadRoster();
+ 	void loadEmoticons();
+ 	bool loadMoods();
++	bool loadActivity();
+ 	bool loadClients();
+ };
+ 
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -861,12 +861,17 @@ QString UserListItem::makeBareTip(bool t
+ 
+ 	// User Activity
+ 	if (!activity().isNull()) {
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " + activity().typeText();
++		QString act = activity().typeValue();
++		if (activity().specificType() != Activity::UnknownSpecific && activity().specificType() != Activity::Other && !activity().specificTypeValue().isEmpty()) {
++			act += "_" + activity().specificTypeValue();
++		}
++		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " +
++			QString("<%1=\"activities/%2\"> ").arg(imgTag).arg(act) + activity().typeText();
+ 		if (activity().specificType() != Activity::UnknownSpecific) {
+ 			str += QString(" - ") + activity().specificTypeText();
+ 		}
+ 		if (!activity().text().isEmpty())
+-			str += QString(" (") + activity().text() + QString(")");
++			str += QString(" (") + TextUtil::escape(activity().text()) + QString(")");
+ 		str += "</div>";
+ 	}
+

psi-plus-main-20141106.tar.xz/patches/0420-psi-add-view-groups-to-tray-menu.diff Added

psi-plus-main-20141106.tar.xz/patches/0430-psi-geolocation.diff Added

@@ -0,0 +1,1332 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -137,6 +137,7 @@
+ 				<tooltip comment="Display options for the contact list tooltips">
+ 					<avatar comment="Display avatar" type="bool">true</avatar>
+ 					<client-version comment="Display client version information" type="bool">true</client-version>
++					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
+ 					<last-status comment="Display the last status" type="bool">true</last-status>
+ 					<pgp comment="Display PGP information" type="bool">true</pgp>
+ 				</tooltip>
+@@ -170,6 +171,7 @@
+ 				</avatars>
+ 				<show-mood-icons type="bool">true</show-mood-icons>
+ 				<show-activity-icons type="bool">true</show-activity-icons>
++				<show-geolocation-icons type="bool">true</show-geolocation-icons>
+ 				<show-tune-icons type="bool">true</show-tune-icons>
+ 				<show-client-icons type="bool">true</show-client-icons>
+ 				<show-all-client-icons type="bool">false</show-all-client-icons>
+--- git.orig/src/contactlistaccountmenu.cpp
++++ git/src/contactlistaccountmenu.cpp
+@@ -39,6 +39,7 @@ class ContactListAccountMenu::Private :
+ 	StatusMenu* statusMenu_;
+ 	QAction* moodAction_;
+ 	QAction* activityAction_;
++	QAction* geolocationAction_;
+ 	QAction* setAvatarAction_;
+ 	QMenu* avatarMenu_;
+ 	QAction* unsetAvatarAction_;
+@@ -78,6 +79,9 @@ public:
+ 		activityAction_ = new QAction(tr("Activity"), this);
+ 		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
+ 
++		geolocationAction_ = new QAction(tr("GeoLocation"), this);
++		connect(geolocationAction_, SIGNAL(triggered()), SLOT(setGeolocation()));
++
+ 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
+ 		connect(setAvatarAction_, SIGNAL(triggered()), SLOT(setAvatar()));
+ 
+@@ -123,6 +127,7 @@ public:
+ 		menu->addMenu(statusMenu_);
+ 		menu->addAction(moodAction_);
+ 		menu->addAction(activityAction_);
++		menu->addAction(geolocationAction_);
+ 		avatarMenu_ = menu->addMenu(tr("Avatar"));
+ 		avatarMenu_->addAction(setAvatarAction_);
+ 		avatarMenu_->addAction(unsetAvatarAction_);
+@@ -162,10 +167,12 @@ private slots:
+ #ifndef USE_PEP
+ 		moodAction_->setVisible(false);
+ 		activityAction_->setVisible(false);
++		geolocationAction_->setVisible(false);
+ 		avatarMenu_->setVisible(false);
+ #else
+ 		moodAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
+ 		activityAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
++		geolocationAction_->setEnabled(account->account()->serverInfoManager()->hasPEP());
+ 		avatarMenu_->setEnabled(account->account()->serverInfoManager()->hasPEP());
+ #endif
+ 		bookmarksMenu_->clear();
+@@ -226,6 +233,14 @@ private slots:
+ 		account->account()->actionSetActivity();
+ 	}
+ 
++	void setGeolocation()
++	{
++		if (!account)
++			return;
++
++		account->account()->actionSetGeoLocation();
++	}
++
+ 	void setAvatar()
+ 	{
+ 		if (!account)
+--- git.orig/src/geolocation.cpp
++++ git/src/geolocation.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QDomDocument>
+ #include <QDomElement>
++#include <QApplication>
+ 
+ #include "geolocation.h"
+ 
+@@ -72,6 +73,56 @@ QDomElement GeoLocation::toXml(QDomDocum
+ 		e.appendChild(doc.createTextNode(description_));
+ 		geoloc.appendChild(e);
+ 	}
++	if (!country_.isEmpty()) {
++		QDomElement e = doc.createElement("country");
++		e.appendChild(doc.createTextNode(country_));
++		geoloc.appendChild(e);
++	}
++	if (!region_.isEmpty()) {
++		QDomElement e = doc.createElement("region");
++		e.appendChild(doc.createTextNode(region_));
++		geoloc.appendChild(e);
++	}
++	if (!locality_.isEmpty()) {
++		QDomElement e = doc.createElement("locality");
++		e.appendChild(doc.createTextNode(locality_));
++		geoloc.appendChild(e);
++	}
++	if (!area_.isEmpty()) {
++		QDomElement e = doc.createElement("area");
++		e.appendChild(doc.createTextNode(area_));
++		geoloc.appendChild(e);
++	}
++	if (!street_.isEmpty()) {
++		QDomElement e = doc.createElement("street");
++		e.appendChild(doc.createTextNode(street_));
++		geoloc.appendChild(e);
++	}
++	if (!building_.isEmpty()) {
++		QDomElement e = doc.createElement("building");
++		e.appendChild(doc.createTextNode(building_));
++		geoloc.appendChild(e);
++	}
++	if (!floor_.isEmpty()) {
++		QDomElement e = doc.createElement("floor");
++		e.appendChild(doc.createTextNode(floor_));
++		geoloc.appendChild(e);
++	}
++	if (!room_.isEmpty()) {
++		QDomElement e = doc.createElement("room");
++		e.appendChild(doc.createTextNode(room_));
++		geoloc.appendChild(e);
++	}
++	if (!postalcode_.isEmpty()) {
++		QDomElement e = doc.createElement("postalcode");
++		e.appendChild(doc.createTextNode(postalcode_));
++		geoloc.appendChild(e);
++	}
++	if (!text_.isEmpty()) {
++		QDomElement e = doc.createElement("text");
++		e.appendChild(doc.createTextNode(text_));
++		geoloc.appendChild(e);
++	}
+ 
+ 	return geoloc;
+ }
+@@ -85,18 +136,38 @@ void GeoLocation::fromXml(const QDomElem
+ 		QDomElement m = n.toElement();
+ 		if (m.tagName() == "alt")
+ 			alt_ = Maybe<float>(m.text().toFloat());
+-		if (m.tagName() == "bearing")
++		else if (m.tagName() == "bearing")
+ 			bearing_ = Maybe<float>(m.text().toFloat());
+-		if (m.tagName() == "error")
++		else if (m.tagName() == "error")
+ 			error_ = Maybe<float>(m.text().toFloat());
+-		if (m.tagName() == "lat")
++		else if (m.tagName() == "lat")
+ 			lat_ = Maybe<float>(m.text().toFloat());
+-		if (m.tagName() == "lon")
++		else if (m.tagName() == "lon")
+ 			lon_ = Maybe<float>(m.text().toFloat());
+-		if (m.tagName() == "datum")
++		else if (m.tagName() == "datum")
+ 			datum_ = m.text();
+-		if (m.tagName() == "description")
++		else if (m.tagName() == "description")
+ 			description_ = m.text();
++		else if (m.tagName() == "country")
++			country_ = m.text();
++		else if (m.tagName() == "region")
++			region_ = m.text();
++		else if (m.tagName() == "locality")
++			locality_ = m.text();
++		else if (m.tagName() == "area")
++			area_ = m.text();
++		else if (m.tagName() == "street")
++			street_ = m.text();
++		else if (m.tagName() == "building")
++			building_ = m.text();
++		else if (m.tagName() == "floor")
++			floor_ = m.text();
++		else if (m.tagName() == "room")
++			room_ = m.text();
++		else if (m.tagName() == "postalcode")
++			postalcode_ = m.text();
++		else if (m.tagName() == "text")
++			text_ = m.text();
+ 	}
+ }
+ 
+@@ -169,9 +240,60 @@ const QString& GeoLocation::description(
+ 	return description_;
+ }
+ 
++const QString& GeoLocation::country() const
++{
++	return country_;
++}
++
++const QString& GeoLocation::region() const
++{
++	return region_;
++}
++
++const QString& GeoLocation::locality() const
++{
++	return locality_;
++}
++
++const QString& GeoLocation::area() const
++{
++	return area_;
++}
++
++const QString& GeoLocation::street() const
++{
++	return street_;
++}
++
++const QString& GeoLocation::building() const
++{
++	return building_;
++}
++
++const QString& GeoLocation::floor() const
++{
++	return floor_;
++}
++
++const QString& GeoLocation::room() const
++{
++	return room_;
++}
++
++const QString& GeoLocation::postalcode() const
++{
++	return postalcode_;
++}
++
++const QString& GeoLocation::text() const
++{
++	return text_;
++}
++
+ bool GeoLocation::isNull() const
+ {
+-	return !lat_.hasValue() || !lon_.hasValue();
++	return !lat_.hasValue() && !lon_.hasValue() && !alt_.hasValue() && !bearing_.hasValue() && !error_.hasValue() && country_.isNull() && region_.isNull() && locality_.isNull()
++		&& area_.isNull() && street_.isNull() && building_.isNull() && floor_.isNull() && room_.isNull() && postalcode_.isNull() && text_.isNull() && description_.isNull() && datum_.isNull();
+ }
+ 
+ bool GeoLocation::operator==(const GeoLocation& o) const
+@@ -180,6 +302,13 @@ bool GeoLocation::operator==(const GeoLo
+ 	bool equal = true;
+ 	equal = equal && (lat_.hasValue() ? lat_.value() == o.lat().value() : !o.lat().hasValue());
+ 	equal = equal && (lon_.hasValue() ? lon_.value() == o.lon().value() : !o.lon().hasValue());
++	equal = equal && (alt_.hasValue() ? alt_.value() == o.alt().value() : !o.alt().hasValue());
++	equal = equal && (bearing_.hasValue() ? bearing_.value() == o.bearing().value() : !o.bearing().hasValue());
++	equal = equal && (error_.hasValue() ? error_.value() == o.error().value() : !o.error().hasValue());
++	equal == equal && country() == o.country() && region() == o.region() && locality() == o.locality()
++			&& area() == o.area() && street() == o.street() && datum() == o.datum() && building() == o.building()
++			&& floor() == o.floor() && room() == o.room() && postalcode() == o.postalcode() && text() == o.text()
++			&& description() == o.description();
+ 	return equal;
+ }
+ 
+@@ -187,3 +316,123 @@ bool GeoLocation::operator!=(const GeoLo
+ {
+ 	return !((*this) == o);
+ }
++
++void GeoLocation::setCountry(const QString& s)
++{
++	country_ = s;
++}
++
++void GeoLocation::setRegion(const QString& s)
++{
++	region_ = s;
++}
++
++void GeoLocation::setLocality(const QString& s)
++{
++	locality_ = s;
++}
++
++void GeoLocation::setArea(const QString& s)
++{
++	area_ = s;
++}
++
++void GeoLocation::setStreet(const QString& s)
++{
++	street_ = s;
++}
++
++void GeoLocation::setBuilding(const QString& s)
++{
++	building_ = s;
++}
++
++void GeoLocation::setFloor(const QString& s)
++{
++	floor_ = s;
++}
++
++void GeoLocation::setRoom(const QString& s)
++{
++	room_ = s;
++}
++
++void GeoLocation::setPostalcode(const QString& s)
++{
++	postalcode_ = s;
++}
++
++void GeoLocation::setText(const QString& s)
++{
++	text_ = s;
++}
++
++QString GeoLocation::toString() const
++{
++	QString loc;
++
++	if(alt_.hasValue() || lon_.hasValue() || lat_.hasValue()) {
++
++		loc += QObject::tr("Latitude/Longitude/Altitude: ");
++
++		if(lat_.hasValue())
++			loc += QString::number(lat_.value()) + "/";
++		else
++			loc += "0/";
++
++		if(lon_.hasValue())
++			loc += QString::number(lon_.value()) + "/";
++		else
++			loc += "0/";
++
++		if(alt_.hasValue())
++			loc += QString::number(alt_.value());
++		else
++			loc += "0";
++
++	}
++
++	if(bearing_.hasValue())
++		loc += QObject::tr("\nBearing: ") + QString::number(bearing_.value());
++
++	if(error_.hasValue())
++		loc += QObject::tr("\nError: ") + QString::number(error_.value());
++
++	if (!datum().isEmpty())
++		loc += QObject::tr("\nDatum: ") + datum();
++
++	if (!country().isEmpty())
++		loc += QObject::tr("\nCountry: ") + country();
++
++	if (!postalcode().isEmpty())
++		loc += QObject::tr("\nPostalcode: ") + postalcode();
++
++	if (!region().isEmpty())
++		loc += QObject::tr("\nRegion: ") + region();
++
++	if (!locality().isEmpty())
++		loc += QObject::tr("\nLocality: ") + locality();
++
++	if (!area().isEmpty())
++		loc += QObject::tr("\nArea: ") + area();
++
++	if (!street().isEmpty())
++		loc += QObject::tr("\nStreet: ") + street();
++
++	if (!building().isEmpty() && (!area().isEmpty() || !street().isEmpty()))
++		loc += ", " + building();
++
++	if (!floor().isEmpty())
++		loc += QObject::tr("\nFloor: ") + floor();
++
++	if (!room().isEmpty())
++		loc += QObject::tr("\nRoom: ") + room();
++
++	if (!description().isEmpty())
++		loc += QObject::tr("\nDescription: ") + description();
++
++	if (!text().isEmpty())
++		loc += "\n" + text();
++
++	return loc;
++}
+--- git.orig/src/geolocationdlg.cpp
++++ git/src/geolocationdlg.cpp
+@@ -0,0 +1,166 @@
++/*
++ * geolocationdlg.cpp
++ * Copyright (C) 2009  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "geolocationdlg.h"
++
++#include "xmpp_pubsubitem.h"
++#include "xmpp_client.h"
++#include "xmpp_task.h"
++#include "psiaccount.h"
++#include "pepmanager.h"
++#include "geolocation.h"
++#include <QLineEdit>
++
++GeoLocationDlg::GeoLocationDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
++{
++	setAttribute(Qt::WA_DeleteOnClose);
++	ui_.setupUi(this);
++	setModal(false);
++	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
++ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
++	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
++
++	GeoLocation geoloc = pa_->geolocation();
++	if(geoloc.isNull())
++		return;
++
++	if (geoloc.alt().hasValue())
++		ui_.le_altitude->setText(QString::number(geoloc.alt().value()));
++
++	if (!geoloc.area().isEmpty())
++		ui_.le_area->setText(geoloc.area());
++
++	if (geoloc.bearing().hasValue())
++		ui_.le_bearing->setText(QString::number(geoloc.bearing().value()));
++
++	if (!geoloc.building().isEmpty())
++		ui_.le_building->setText(geoloc.building());
++
++	if (!geoloc.country().isEmpty())
++		ui_.le_country->setText(geoloc.country());
++
++	if (!geoloc.datum().isEmpty())
++		ui_.le_datum->setText(geoloc.datum());
++
++	if (!geoloc.description().isEmpty())
++		ui_.le_description->setText(geoloc.description());
++
++	if (geoloc.error().hasValue())
++		ui_.le_error->setText(QString::number(geoloc.error().value()));
++
++	if (!geoloc.floor().isEmpty())
++		ui_.le_floor->setText(geoloc.floor());
++
++	if (geoloc.lat().hasValue())
++		ui_.le_latitude->setText(QString::number(geoloc.lat().value()));
++
++	if (!geoloc.locality().isEmpty())
++		ui_.le_locality->setText(geoloc.locality());
++
++	if (geoloc.lon().hasValue())
++		ui_.le_longitude->setText(QString::number(geoloc.lon().value()));
++
++	if (!geoloc.postalcode().isEmpty())
++		ui_.le_postalcode->setText(geoloc.postalcode());
++
++	if (!geoloc.region().isEmpty())
++		ui_.le_region->setText(geoloc.region());
++
++	if (!geoloc.room().isEmpty())
++		ui_.le_room->setText(geoloc.room());
++
++	if (!geoloc.street().isEmpty())
++		ui_.le_street->setText(geoloc.street());
++
++	if (!geoloc.text().isEmpty())
++		ui_.le_text->setText(geoloc.text());
++}
++
++void GeoLocationDlg::reset()
++{
++	foreach(QLineEdit *le, this->findChildren<QLineEdit*>()) {
++		le->setText("");
++	}
++}
++
++void GeoLocationDlg::setGeoLocation()
++{
++	GeoLocation geoloc;
++
++	if(!ui_.le_altitude->text().isEmpty())
++		geoloc.setAlt(ui_.le_altitude->text().toFloat());
++
++	if(!ui_.le_bearing->text().isEmpty())
++		geoloc.setBearing(ui_.le_bearing->text().toFloat());
++
++	if(!ui_.le_error->text().isEmpty())
++		geoloc.setError(ui_.le_error->text().toFloat());
++
++	if(!ui_.le_latitude->text().isEmpty())
++		geoloc.setLat(ui_.le_latitude->text().toFloat());
++
++	if(!ui_.le_longitude->text().isEmpty())
++		geoloc.setLon(ui_.le_longitude->text().toFloat());
++
++	if(!ui_.le_datum->text().isEmpty())
++		geoloc.setDatum(ui_.le_datum->text());
++
++	if(!ui_.le_description->text().isEmpty())
++		geoloc.setDescription(ui_.le_description->text());
++
++	if(!ui_.le_country->text().isEmpty())
++		geoloc.setCountry(ui_.le_country->text());
++
++	if(!ui_.le_region->text().isEmpty())
++		geoloc.setRegion(ui_.le_region->text());
++
++	if(!ui_.le_locality->text().isEmpty())
++		geoloc.setLocality(ui_.le_locality->text());
++
++	if(!ui_.le_area->text().isEmpty())
++		geoloc.setArea(ui_.le_area->text());
++
++	if(!ui_.le_street->text().isEmpty())
++		geoloc.setStreet(ui_.le_street->text());
++
++	if(!ui_.le_building->text().isEmpty())
++		geoloc.setBuilding(ui_.le_building->text());
++
++	if(!ui_.le_floor->text().isEmpty())
++		geoloc.setFloor(ui_.le_floor->text());
++
++	if(!ui_.le_room->text().isEmpty())
++		geoloc.setRoom(ui_.le_room->text());
++
++	if(!ui_.le_postalcode->text().isEmpty())
++		geoloc.setPostalcode(ui_.le_postalcode->text());
++
++	if(!ui_.le_text->text().isEmpty())
++		geoloc.setText(ui_.le_text->text());
++
++	if (geoloc.isNull()) {
++ 		pa_->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
++	}
++	else {
++		pa_->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++	}
++	close();
++}
++
+--- git.orig/src/geolocationdlg.h
++++ git/src/geolocationdlg.h
+@@ -0,0 +1,45 @@
++/*
++ * geolocationdlg.h
++ * Copyright (C) 2009  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef GEOLOCATIONDLG_H
++#define GEOLOCATIONDLG_H
++
++#include <QDialog>
++
++#include "ui_geolocation.h"
++
++class PsiAccount;
++
++class GeoLocationDlg : public QDialog
++{
++	Q_OBJECT
++
++public:
++	GeoLocationDlg(PsiAccount*);
++
++protected slots:
++	void setGeoLocation();
++	void reset();
++
++private:
++	Ui::GeoLocation ui_;
++ 	PsiAccount* pa_;
++};
++
++#endif // GEOLOCATIONDLG_H
+--- git.orig/src/geolocation.h
++++ git/src/geolocation.h
+@@ -52,7 +52,30 @@ public:
+ 	void setDatum(const QString&);
+ 	void setDescription(const QString&);
+ 
++	const QString& country() const;
++	const QString& region() const;
++	const QString& locality() const;
++	const QString& area() const;
++	const QString& street() const;
++	const QString& building() const;
++	const QString& floor() const;
++	const QString& room() const;
++	const QString& postalcode() const;
++	const QString& text() const;
++
++	void setCountry(const QString& s);
++ 	void setRegion(const QString& s);
++	void setLocality(const QString& s);
++	void setArea(const QString& s);
++	void setStreet(const QString& s);
++	void setBuilding(const QString& s);
++	void setFloor(const QString& s);
++	void setRoom(const QString& s);
++	void setPostalcode(const QString& s);
++	void setText(const QString& s);
++
+ 	QDomElement toXml(QDomDocument&);
++	QString toString() const;
+ 
+ 	bool operator==(const GeoLocation&) const;
+ 	bool operator!=(const GeoLocation&) const;
+@@ -63,6 +86,7 @@ protected:
+ private:
+ 	Maybe<float> alt_, bearing_, error_, lat_, lon_;
+ 	QString datum_, description_;
++	QString country_, region_, locality_, area_, street_, building_, floor_, room_, postalcode_, text_;
+ };
+ 
+ #endif
+--- git.orig/src/geolocation.ui
++++ git/src/geolocation.ui
+@@ -0,0 +1,320 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>GeoLocation</class>
++ <widget class="QDialog" name="GeoLocation">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>400</width>
++    <height>533</height>
++   </rect>
++  </property>
++  <property name="sizePolicy">
++   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
++    <horstretch>0</horstretch>
++    <verstretch>0</verstretch>
++   </sizepolicy>
++  </property>
++  <property name="windowTitle">
++   <string>Set GeoLocation</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout">
++   <item>
++    <layout class="QGridLayout" name="gridLayout" columnstretch="0,0">
++     <item row="0" column="0">
++      <widget class="QLabel" name="lb_altitude">
++       <property name="text">
++        <string>Altitude:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="0" column="1">
++      <widget class="QLineEdit" name="le_altitude">
++       <property name="toolTip">
++        <string>Altitude in meters above or below sea level</string>
++       </property>
++      </widget>
++     </item>
++     <item row="1" column="0">
++      <widget class="QLabel" name="lb_area">
++       <property name="text">
++        <string>Area:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="1" column="1">
++      <widget class="QLineEdit" name="le_area">
++       <property name="toolTip">
++        <string>A named area such as a campus or neighborhood</string>
++       </property>
++      </widget>
++     </item>
++     <item row="2" column="0">
++      <widget class="QLabel" name="lb_bearing">
++       <property name="text">
++        <string>Bearing:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="2" column="1">
++      <widget class="QLineEdit" name="le_bearing">
++       <property name="toolTip">
++        <string>GPS bearing (direction in which the entity is heading to reach its next waypoint), measured in decimal degrees relative to true north</string>
++       </property>
++      </widget>
++     </item>
++     <item row="3" column="0">
++      <widget class="QLabel" name="lb_building">
++       <property name="text">
++        <string>Building:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="3" column="1">
++      <widget class="QLineEdit" name="le_building">
++       <property name="toolTip">
++        <string>A specific building on a street or in an area</string>
++       </property>
++      </widget>
++     </item>
++     <item row="4" column="0">
++      <widget class="QLabel" name="lb_country">
++       <property name="text">
++        <string>Country:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="4" column="1">
++      <widget class="QLineEdit" name="le_country">
++       <property name="toolTip">
++        <string>The nation where the user is located</string>
++       </property>
++      </widget>
++     </item>
++     <item row="5" column="0">
++      <widget class="QLabel" name="lb_datum">
++       <property name="text">
++        <string>Datum:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="5" column="1">
++      <widget class="QLineEdit" name="le_datum">
++       <property name="toolTip">
++        <string>GPS datum</string>
++       </property>
++      </widget>
++     </item>
++     <item row="6" column="0">
++      <widget class="QLabel" name="lb_description">
++       <property name="text">
++        <string>Description:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="6" column="1">
++      <widget class="QLineEdit" name="le_description">
++       <property name="toolTip">
++        <string>A natural-language name for or description of the location</string>
++       </property>
++      </widget>
++     </item>
++     <item row="7" column="0">
++      <widget class="QLabel" name="lb_error">
++       <property name="text">
++        <string>Error:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="7" column="1">
++      <widget class="QLineEdit" name="le_error">
++       <property name="toolTip">
++        <string>Horizontal GPS error in arc minutes; this element is deprecated in favor of &lt;accuracy/&gt;</string>
++       </property>
++      </widget>
++     </item>
++     <item row="8" column="0">
++      <widget class="QLabel" name="lb_floor">
++       <property name="text">
++        <string>Floor:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="8" column="1">
++      <widget class="QLineEdit" name="le_floor">
++       <property name="toolTip">
++        <string>A particular floor in a building</string>
++       </property>
++      </widget>
++     </item>
++     <item row="9" column="0">
++      <widget class="QLabel" name="lb_latitude">
++       <property name="text">
++        <string>Latitude:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="9" column="1">
++      <widget class="QLineEdit" name="le_latitude">
++       <property name="toolTip">
++        <string>Latitude in decimal degrees North</string>
++       </property>
++      </widget>
++     </item>
++     <item row="10" column="0">
++      <widget class="QLabel" name="lb_locality">
++       <property name="text">
++        <string>Locality:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="10" column="1">
++      <widget class="QLineEdit" name="le_locality">
++       <property name="toolTip">
++        <string>A locality within the administrative region, such as a town or city</string>
++       </property>
++      </widget>
++     </item>
++     <item row="11" column="0">
++      <widget class="QLabel" name="lb_longitude">
++       <property name="text">
++        <string>Longitude:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="11" column="1">
++      <widget class="QLineEdit" name="le_longitude">
++       <property name="toolTip">
++        <string>Longitude in decimal degrees East</string>
++       </property>
++      </widget>
++     </item>
++     <item row="12" column="0">
++      <widget class="QLabel" name="lb_postalcode">
++       <property name="text">
++        <string>Postalcode:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="12" column="1">
++      <widget class="QLineEdit" name="le_postalcode">
++       <property name="toolTip">
++        <string>A code used for postal delivery</string>
++       </property>
++      </widget>
++     </item>
++     <item row="13" column="0">
++      <widget class="QLabel" name="lb_region">
++       <property name="text">
++        <string>Region:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="13" column="1">
++      <widget class="QLineEdit" name="le_region">
++       <property name="toolTip">
++        <string>An administrative region of the nation, such as a state or province</string>
++       </property>
++      </widget>
++     </item>
++     <item row="14" column="0">
++      <widget class="QLabel" name="lb_room">
++       <property name="text">
++        <string>Room:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="14" column="1">
++      <widget class="QLineEdit" name="le_room">
++       <property name="toolTip">
++        <string>A particular room in a building</string>
++       </property>
++      </widget>
++     </item>
++     <item row="15" column="0">
++      <widget class="QLabel" name="lb_street">
++       <property name="text">
++        <string>Street:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="15" column="1">
++      <widget class="QLineEdit" name="le_street">
++       <property name="toolTip">
++        <string>A thoroughfare within the locality, or a crossing of two thoroughfares</string>
++       </property>
++      </widget>
++     </item>
++     <item row="16" column="0">
++      <widget class="QLabel" name="lb_text">
++       <property name="text">
++        <string>Text:</string>
++       </property>
++      </widget>
++     </item>
++     <item row="16" column="1">
++      <widget class="QLineEdit" name="le_text">
++       <property name="toolTip">
++        <string>A catch-all element that captures any other information about the location</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++   <item>
++    <spacer name="verticalSpacer">
++     <property name="orientation">
++      <enum>Qt::Vertical</enum>
++     </property>
++     <property name="sizeHint" stdset="0">
++      <size>
++       <width>0</width>
++       <height>0</height>
++      </size>
++     </property>
++    </spacer>
++   </item>
++   <item>
++    <layout class="QHBoxLayout">
++     <item>
++      <widget class="QPushButton" name="pb_reset">
++       <property name="text">
++        <string>Reset</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <spacer>
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>0</width>
++         <height>0</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="QPushButton" name="pb_ok">
++       <property name="text">
++        <string>OK</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="pb_cancel">
++       <property name="text">
++        <string>Cancel</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -70,6 +70,7 @@ void OptionsTabRoster::applyOptions()
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-mood-icons", d->ck_showMoodIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-activity-icons", d->ck_showActivityIcons->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-geolocation-icons", d->ck_showGeoLocationIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-tune-icons", d->ck_showTuneIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-client-icons", d->ck_showClientIcons->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-all-client-icons", (d->cb_showAllClientIcons->currentIndex() == 0)?true:false);
+@@ -97,6 +98,7 @@ void OptionsTabRoster::restoreOptions()
+ 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
+ 	d->ck_showMoodIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-mood-icons").toBool() );
+ 	d->ck_showActivityIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-activity-icons").toBool() );
++	d->ck_showGeoLocationIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-geolocation-icons").toBool() );
+ 	d->ck_showTuneIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-tune-icons").toBool() );
+ 	d->ck_showClientIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool() );
+ 	d->cb_showAllClientIcons->setEnabled(PsiOptions::instance()->getOption("options.ui.contactlist.show-client-icons").toBool());
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -7,7 +7,7 @@
+     <x>0</x>
+     <y>0</y>
+     <width>357</width>
+-    <height>452</height>
++    <height>481</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -97,6 +97,16 @@
+         </property>
+        </widget>
+       </item>
++      <item>
++       <widget class="QCheckBox" name="ck_showGeoLocationIcons">
++        <property name="whatsThis">
++         <string>Show geolocation in roster</string>
++        </property>
++        <property name="text">
++         <string>GeoLocation</string>
++        </property>
++       </widget>
++      </item>
+       <item>
+        <widget class="QCheckBox" name="ck_showTuneIcons">
+         <property name="whatsThis">
+--- git.orig/src/physicallocation.cpp
++++ git/src/physicallocation.cpp
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  *
+  */
+-
++/*
+ #include <QDomDocument>
+ #include <QDomElement>
+ #include <QStringList>
+@@ -268,3 +268,5 @@ QString PhysicalLocation::toString() con
+ 
+ 	return str;
+ }
++
++*/
+--- git.orig/src/physicallocation.h
++++ git/src/physicallocation.h
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  *
+  */
+-
++/*
+ #ifndef PHYSICALOCATION_H
+ #define PHYSICALOCATION_H
+ 
+@@ -69,3 +69,4 @@ private:
+ };
+ 
+ #endif
++*/
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -119,8 +119,8 @@
+ #include "mooddlg.h"
+ #include "activitydlg.h"
+ #include "qwextend.h"
+-#include "geolocation.h"
+-#include "physicallocation.h"
++#include "geolocationdlg.h"
++//#include "physicallocation.h"
+ #include "translationmanager.h"
+ #include "irisprotocol/iris_discoinfoquerier.h"
+ #include "iconwidget.h"
+@@ -1248,7 +1248,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 		pepNodes += "http://jabber.org/protocol/mood+notify";
+ 		pepNodes += "http://jabber.org/protocol/activity+notify";
+ 		pepNodes += "http://jabber.org/protocol/tune+notify";
+-		pepNodes += "http://jabber.org/protocol/physloc+notify";
++	//	pepNodes += "http://jabber.org/protocol/physloc+notify";
+ 		pepNodes += "http://jabber.org/protocol/geoloc+notify";
+ 		pepNodes += "urn:xmpp:avatar:metadata+notify";
+ 		d->client->addExtension("ep-notify-2",Features(pepNodes));
+@@ -2253,7 +2253,7 @@ void PsiAccount::setPEPAvailable(bool b)
+ 		pepNodes += "http://jabber.org/protocol/mood";
+ 		pepNodes += "http://jabber.org/protocol/activity";
+ 		pepNodes += "http://jabber.org/protocol/tune";
+-		pepNodes += "http://jabber.org/protocol/physloc";
++	//	pepNodes += "http://jabber.org/protocol/physloc";
+ 		pepNodes += "http://jabber.org/protocol/geoloc";
+ 		pepNodes += "urn:xmpp:avatar:data";
+ 		pepNodes += "urn:xmpp:avatar:metadata";
+@@ -3448,14 +3448,14 @@ void PsiAccount::itemRetracted(const Jid
+ 			cpUpdate(*u);
+ 		}
+ 	}
+-	else if (n == "http://jabber.org/protocol/physloc") {
++	/*else if (n == "http://jabber.org/protocol/physloc") {
+ 		// FIXME: try to find the right resource using JEP-33 'replyto'
+ 		// see tune case above
+ 		foreach(UserListItem* u, findRelevant(j)) {
+ 			u->setPhysicalLocation(PhysicalLocation());
+ 			cpUpdate(*u);
+ 		}
+-	}
++	}*/
+ }
+ 
+ void PsiAccount::itemPublished(const Jid& j, const QString& n, const PubSubItem& item)
+@@ -3508,7 +3508,7 @@ void PsiAccount::itemPublished(const Jid
+ 			cpUpdate(*u);
+ 		}
+ 	}
+-	else if (n == "http://jabber.org/protocol/physloc") {
++	/*else if (n == "http://jabber.org/protocol/physloc") {
+ 		// FIXME: try to find the right resource using JEP-33 'replyto'
+ 		// see tune case above
+ 		PhysicalLocation physloc(item.payload());
+@@ -3516,7 +3516,7 @@ void PsiAccount::itemPublished(const Jid
+ 			u->setPhysicalLocation(physloc);
+ 			cpUpdate(*u);
+ 		}
+-	}
++	}*/
+ }
+ 
+ QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
+@@ -3840,6 +3840,12 @@ void PsiAccount::actionSetActivity()
+ 	w->show();
+ }
+ 
++void PsiAccount::actionSetGeoLocation()
++{
++	GeoLocationDlg *w = new GeoLocationDlg(this);
++	w->show();
++}
++
+ void PsiAccount::actionSetAvatar()
+ {
+ 	QString str = FileUtil::getImageFileName(0);
+@@ -5581,6 +5587,11 @@ const Activity &PsiAccount::activity() c
+ 	return d->self.activity();
+ }
+ 
++const GeoLocation &PsiAccount::geolocation() const
++{
++	return d->self.geoLocation();
++}
++
+ const Mood &PsiAccount::mood() const
+ {
+ 	return d->self.mood();
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -35,6 +35,7 @@
+ #include "psievent.h"
+ #include "mood.h"
+ #include "activity.h"
++#include "geolocation.h"
+ 
+ namespace XMPP
+ {
+@@ -153,6 +154,7 @@ public:
+ 	QString nick() const;
+ 	const Mood &mood() const;
+ 	const Activity &activity() const;
++	const GeoLocation &geolocation() const;
+ 	void forceDisconnect(bool fast, const XMPP::Status &s);
+ 	bool hasPGP() const;
+ 	QHostAddress *localAddress() const;
+@@ -364,6 +366,7 @@ public slots:
+ 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
+ 	void actionSetMood();
+ 	void actionSetActivity();
++	void actionSetGeoLocation();
+ 	void actionSetAvatar();
+ 	void actionUnsetAvatar();
+ 	void actionQueryVersion(const Jid& j);
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -612,7 +612,7 @@ bool PsiCon::init()
+ 				 << "http://jabber.org/protocol/mood"
+ 				 << "http://jabber.org/protocol/activity"
+ 				 << "http://jabber.org/protocol/tune"
+-				 << "http://jabber.org/protocol/physloc"
++				// << "http://jabber.org/protocol/physloc"
+ 				 << "http://jabber.org/protocol/geoloc"
+ 				 << "urn:xmpp:avatar:data"
+ 				 << "urn:xmpp:avatar:metadata"
+@@ -622,7 +622,7 @@ bool PsiCon::init()
+ 				 << "http://jabber.org/protocol/mood+notify"
+ 				 << "http://jabber.org/protocol/activity+notify"
+ 				 << "http://jabber.org/protocol/tune+notify"
+-				 << "http://jabber.org/protocol/physloc+notify"
++				// << "http://jabber.org/protocol/physloc+notify"
+ 				 << "http://jabber.org/protocol/geoloc+notify"
+ 				 << "urn:xmpp:avatar:metadata+notify"
+ 				);
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -208,6 +208,7 @@ HEADERS += \
+ 	$$PWD/vcardphotodlg.h \
+ 	$$PWD/psicli.h \
+ 	$$PWD/coloropt.h \
++	$$PWD/geolocationdlg.h \
+ 	$$PWD/sendbuttonmenu.h
+ 
+ 
+@@ -346,6 +347,7 @@ SOURCES += \
+ 	$$PWD/bookmarkmanagedlg.cpp \
+ 	$$PWD/vcardphotodlg.cpp \
+ 	$$PWD/coloropt.cpp \
++	$$PWD/geolocationdlg.cpp \
+ 	$$PWD/sendbuttonmenu.cpp
+ 
+ 
+@@ -579,6 +581,7 @@ FORMS += \
+ 	$$PWD/bookmarkmanage.ui \
+ 	$$PWD/ahcommanddlg.ui \
+ 	$$PWD/ahcformdlg.ui \
++	$$PWD/geolocation.ui \
+ 	$$PWD/sendbuttontemplateseditor.ui
+ 
+ # options dialog
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -189,7 +189,7 @@ const GeoLocation& UserResource::geoLoca
+ 	return v_geoLocation;
+ }
+ 
+-void UserResource::setPhysicalLocation(const PhysicalLocation& physicalLocation)
++/*void UserResource::setPhysicalLocation(const PhysicalLocation& physicalLocation)
+ {
+ 	v_physicalLocation = physicalLocation;
+ }
+@@ -197,7 +197,7 @@ void UserResource::setPhysicalLocation(c
+ const PhysicalLocation& UserResource::physicalLocation() const
+ {
+ 	return v_physicalLocation;
+-}
++}*/
+ 
+ 
+ bool operator<(const UserResource &r1, const UserResource &r2)
+@@ -706,7 +706,7 @@ const GeoLocation& UserListItem::geoLoca
+ 	return v_geoLocation;
+ }
+ 
+-void UserListItem::setPhysicalLocation(const PhysicalLocation& physicalLocation)
++/*void UserListItem::setPhysicalLocation(const PhysicalLocation& physicalLocation)
+ {
+ 	v_physicalLocation = physicalLocation;
+ }
+@@ -714,7 +714,7 @@ void UserListItem::setPhysicalLocation(c
+ const PhysicalLocation& UserListItem::physicalLocation() const
+ {
+ 	return v_physicalLocation;
+-}
++}*/
+ 
+ void UserListItem::setAvatarFactory(AvatarFactory* av)
+ {
+@@ -889,12 +889,12 @@ QString UserListItem::makeBareTip(bool t
+ 		str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
+ 
+ 	// User Physical Location
+-	if (!physicalLocation().isNull())
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(physicalLocation().toString()) + "</div>";
++	//if (!physicalLocation().isNull())
++	//	str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(physicalLocation().toString()) + "</div>";
+ 
+ 	// User Geolocation
+-	if (!geoLocation().isNull())
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(geoLocation().lat().value()) + "/" + QString::number(geoLocation().lon().value()) + "</div>";
++	if (!geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
++		str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
+ 
+ 	// resources
+ 	if(!userResourceList().isEmpty()) {
+@@ -979,12 +979,12 @@ QString UserListItem::makeBareTip(bool t
+ 				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(r.tune()) + "</div>";
+ 
+ 			// User Physical Location
+-			if (!r.physicalLocation().isNull())
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
++		//	if (!r.physicalLocation().isNull())
++		//		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
+ 
+ 			// User Geolocation
+-			if (!r.geoLocation().isNull())
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Geolocation") + ": " + QString::number(r.geoLocation().lat().value()) + "/" + QString::number(r.geoLocation().lon().value()) + "</div>";
++			if (!r.geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
++				str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
+ 
+ 			// Entity Time
+ 			if (r.timezoneOffset().hasValue()) {
+--- git.orig/src/userlist.h
++++ git/src/userlist.h
+@@ -30,7 +30,7 @@
+ #include "mood.h"
+ #include "activity.h"
+ #include "geolocation.h"
+-#include "physicallocation.h"
++//#include "physicallocation.h"
+ #include "maybe.h"
+ 
+ class AvatarFactory;
+@@ -68,8 +68,8 @@ public:
+ 	const QString& tune() const;
+ 	void setGeoLocation(const GeoLocation&);
+ 	const GeoLocation& geoLocation() const;
+-	void setPhysicalLocation(const PhysicalLocation&);
+-	const PhysicalLocation& physicalLocation() const;
++	//void setPhysicalLocation(const PhysicalLocation&);
++	//const PhysicalLocation& physicalLocation() const;
+ 
+ private:
+ 	QString v_ver, v_clientName, v_clientVersion, v_clientOS, v_keyID;
+@@ -77,7 +77,7 @@ private:
+ 	QString v_tzoString;
+ 	QString v_tune;
+ 	GeoLocation v_geoLocation;
+-	PhysicalLocation v_physicalLocation;
++	//PhysicalLocation v_physicalLocation;
+ 	int v_pgpVerifyStatus;
+ 	QDateTime sigts;
+ };
+@@ -139,8 +139,8 @@ public:
+ 	const QString& tune() const;
+ 	void setGeoLocation(const GeoLocation&);
+ 	const GeoLocation& geoLocation() const;
+-	void setPhysicalLocation(const PhysicalLocation&);
+-	const PhysicalLocation& physicalLocation() const;
++	//void setPhysicalLocation(const PhysicalLocation&);
++	//const PhysicalLocation& physicalLocation() const;
+ 	void setAvatarFactory(AvatarFactory*);
+ 
+ 	UserResourceList & userResourceList();
+@@ -169,7 +169,7 @@ private:
+ 	Activity v_activity;
+ 	QString v_tune;
+ 	GeoLocation v_geoLocation;
+-	PhysicalLocation v_physicalLocation;
++	//PhysicalLocation v_physicalLocation;
+ 	AvatarFactory* v_avatarFactory;
+ };
+

psi-plus-main-20141106.tar.xz/patches/0440-psi-add-standard-transports.diff Added

@@ -0,0 +1,51 @@
+--- git.temp.orig/src/options/opt_iconset.cpp
++++ git.temp/src/options/opt_iconset.cpp
+@@ -1146,12 +1146,22 @@ QWidget *OptionsTabIconsetRoster::widget
+ 
+ 	// Initialize transport iconsets
+ 	addService("aim", "AIM");
++	addService("muc", "Chat (MUC)");
+ 	addService("gadugadu", "Gadu-Gadu");
+ 	addService("icq", "ICQ");
++	addService("irc", "IRC");
++	addService("disk", "Jabber Disk");
++	addService("mrim", "Mail.Ru-IM");
+ 	addService("msn", "MSN");
++	addService("rss", "RSS");
+ 	addService("sms", "SMS");
+-	addService("yahoo", "Yahoo!");
++	addService("smtp", "SMTP");
+ 	addService("transport", tr("Transport"));
++	addService("vkontakte", tr("vk.com"));
++	addService("weather", tr("Weather"));
++	addService("xmpp", "XMPP");
++	addService("yahoo", "Yahoo!");
++
+ 	d->tw_isServices->resizeColumnToContents(0);
+ 
+ 	connect(d->pb_defRosterDetails, SIGNAL(clicked()), SLOT(defaultDetails()));
+--- git.temp.orig/src/psiiconset.cpp
++++ git.temp/src/psiiconset.cpp
+@@ -132,11 +132,20 @@ public:
+ 		if ( jid.node().isEmpty() || PsiOptions::instance()->getOption("options.ui.contactlist.use-transport-icons").toBool() ) {
+ 			QMap<QString, QRegExp> services;
+ 			services["aim"]		= QRegExp("^aim");
++			services["disk"]		= QRegExp("^disk");
+ 			services["gadugadu"]	= QRegExp("^gg");
+-			services["icq"]		= QRegExp("^icq");
++			services["icq"]		= QRegExp("^icq|^jit");
++			services["irc"]		= QRegExp("^irc");
++			services["xmpp"]		= QRegExp("^j2j|^xmpp\\.[a-z1-9]+\\..*");
++			services["mrim"]		= QRegExp("^mrim");
+ 			services["msn"]		= QRegExp("^msn");
+-			services["yahoo"]	= QRegExp("^yahoo");
++			services["muc"]		= QRegExp("^conference|^rooms");
++			services["rss"]		= QRegExp("^rss");
+ 			services["sms"]		= QRegExp("^sms");
++			services["smtp"]		= QRegExp("^smtp");
++			services["vkontakte"]		= QRegExp("^vk.com|^vkontakte|^vk-t");
++			services["weather"]		= QRegExp("^weather|^gism");
++			services["yahoo"]	= QRegExp("^yahoo");
+ 
+ 			bool found = false;
+

psi-plus-main-20141106.tar.xz/patches/0450-psi-more-icons-in-account-menu.diff Added

@@ -0,0 +1,44 @@
+--- git.temp.orig/src/contactlistaccountmenu.cpp
++++ git.temp/src/contactlistaccountmenu.cpp
+@@ -30,6 +30,8 @@
+ #include "psioptions.h"
+ #include "iconaction.h"
+ #include "privacy/privacydlg.h"
++#include "psiiconset.h"
++#include "common.h"
+ 
+ class ContactListAccountMenu::Private : public QObject
+ {
+@@ -71,15 +73,20 @@ public:
+ 
+ 		statusMenu_ = new StatusMenu(0);
+ 		statusMenu_->setTitle(tr("&Status"));
++		statusMenu_->setIcon(PsiIconset::instance()->status(makeSTATUS(account->account()->status())).icon());
+ 		connect(statusMenu_, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusChanged(XMPP::Status::Type)));
+ 
+-		moodAction_ = new QAction(tr("Mood"), this);
++		moodAction_ = new IconAction(tr("Mood"), this, QString(("mood/%1")).arg(account->account()->mood().typeValue()));
+ 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
+ 
+-		activityAction_ = new QAction(tr("Activity"), this);
++		QString act = account->account()->activity().typeValue();
++		if (account->account()->activity().specificType() != Activity::UnknownSpecific && account->account()->activity().specificType() != Activity::Other) {
++			act += "_" + account->account()->activity().specificTypeValue();
++		}
++		activityAction_ = new IconAction(tr("Activity"), this, QString(("activities/%1")).arg(act));
+ 		connect(activityAction_, SIGNAL(triggered()), SLOT(setActivity()));
+ 
+-		geolocationAction_ = new QAction(tr("GeoLocation"), this);
++		geolocationAction_ = new IconAction(tr("GeoLocation"), this, "system/geolocation");
+ 		connect(geolocationAction_, SIGNAL(triggered()), SLOT(setGeolocation()));
+ 
+ 		setAvatarAction_ = new QAction(tr("Set Avatar"), this);
+@@ -128,7 +135,7 @@ public:
+ 		menu->addAction(moodAction_);
+ 		menu->addAction(activityAction_);
+ 		menu->addAction(geolocationAction_);
+-		avatarMenu_ = menu->addMenu(tr("Avatar"));
++		avatarMenu_ = menu->addMenu(IconsetFactory::icon("psi/vCard").icon(), tr("Avatar"));
+ 		avatarMenu_->addAction(setAvatarAction_);
+ 		avatarMenu_->addAction(unsetAvatarAction_);
+ 		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));

psi-plus-main-20141106.tar.xz/patches/0460-psi-modern-roster.diff Added

@@ -0,0 +1,434 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -166,12 +166,16 @@
+ 				<disable-scrollbar type="bool">true</disable-scrollbar>
+ 				<avatars>
+ 					<show type="bool">true</show>
++					<avatars-at-left type="bool">false</avatars-at-left>
++					<use-default-avatar type="bool">true</use-default-avatar>
+ 					<size type="int">24</size>
+ 					<radius type="int">5</radius>
+ 				</avatars>
+ 				<show-mood-icons type="bool">true</show-mood-icons>
+ 				<show-activity-icons type="bool">true</show-activity-icons>
+ 				<show-geolocation-icons type="bool">true</show-geolocation-icons>
++				<show-status-icons type="bool">true</show-status-icons>
++				<status-icon-over-avatar type="bool">false</status-icon-over-avatar>
+ 				<show-tune-icons type="bool">true</show-tune-icons>
+ 				<show-client-icons type="bool">true</show-client-icons>
+ 				<show-all-client-icons type="bool">false</show-all-client-icons>
+--- git.orig/src/contactlistmodel.cpp
++++ git/src/contactlistmodel.cpp
+@@ -38,6 +38,7 @@
+ #include "contactlistmodelupdater.h"
+ #include "contactlistspecialgroup.h"
+ #include "userlist.h"
++#include "avatars.h"
+ #ifdef YAPSI
+ #include "yacommon.h"
+ #endif
+@@ -524,6 +525,36 @@ QVariant ContactListModel::contactData(c
+ 	else if (role == PhaseRole) {
+ 		return QVariant(false);
+ 	}
++	else if (role == MoodRole) {
++		if(contact->userListItem().mood().isNull())
++			return QVariant();
++		return QVariant(contact->userListItem().mood().typeValue());
++	}
++	else if (role == ActivityRole) {
++		if (contact->userListItem().activity().isNull())
++			return QVariant();
++		QString act = contact->userListItem().activity().typeValue();
++		if (contact->userListItem().activity().specificType() != Activity::UnknownSpecific
++			&& contact->userListItem().activity().specificType() != Activity::Other
++			&& !contact->userListItem().activity().specificTypeValue().isEmpty())
++		{
++			act += "_" + contact->userListItem().activity().specificTypeValue();
++		}
++		return QVariant(act);
++	}
++	else if (role == GeolocationRole) {
++		return QVariant(!contact->userListItem().geoLocation().isNull());
++	}
++	else if (role == TuneRole) {
++		return QVariant(!contact->userListItem().tune().isEmpty());
++	}
++	else if (role == ClientRole) {
++		return QVariant(contact->userListItem().clients());
++	}
++	else if (role == AvatarRole) {
++		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
++		return QVariant(pix);
++	}
+ #ifdef YAPSI
+ 	else if (role == Qt::ForegroundRole) {
+ 		return QVariant(Ya::statusColor(contact->status().type()));
+--- git.orig/src/contactlistmodel.h
++++ git/src/contactlistmodel.h
+@@ -78,6 +78,12 @@ public:
+ 		AlertPictureRole = Qt::UserRole + 11,
+ 		IsAnimRole = Qt::UserRole + 21,
+ 		PhaseRole = Qt::UserRole + 22,
++		MoodRole = Qt::UserRole + 23,
++		ActivityRole = Qt::UserRole + 24,
++		GeolocationRole = Qt::UserRole + 25,
++		ClientRole = Qt::UserRole + 26,
++		TuneRole = Qt::UserRole + 27,
++		AvatarRole = Qt::UserRole + 28,
+ 
+ 		// groups
+ 		ExpandedRole = Qt::UserRole + 12,
+--- git.orig/src/contactlistviewdelegate.cpp
++++ git/src/contactlistviewdelegate.cpp
+@@ -197,7 +197,9 @@ void ContactListViewDelegate::drawText(Q
+ 		txt = option.fontMetrics.elidedText(text, option.textElideMode, rect.width());
+ #endif
+ 		painter->save();
+-		painter->setClipRect(rect);
++		QRect txtRect(rect);
++		txtRect.setHeight(option.fontMetrics.height());
++		painter->setClipRect(txtRect);
+ 	}
+ 
+ 	// painter->save();
+--- git.orig/src/psicontactlistviewdelegate.cpp
++++ git/src/psicontactlistviewdelegate.cpp
+@@ -35,6 +35,20 @@ static const QString outlinedGroupsOptio
+ static const QString contactListBackgroundOptionPath = "options.ui.look.colors.contactlist.background";
+ static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
+ static const QString statusSingleOptionPath = "options.ui.contactlist.status-messages.single-line";
++static const QString showClientIconsPath = "options.ui.contactlist.show-client-icons";
++static const QString showMoodIconsPath = "options.ui.contactlist.show-mood-icons";
++static const QString showGeolocIconsPath = "options.ui.contactlist.show-geolocation-icons";
++static const QString showActivityIconsPath = "options.ui.contactlist.show-activity-icons";
++static const QString showTuneIconsPath = "options.ui.contactlist.show-tune-icons";
++static const QString avatarSizeOptionPath = "options.ui.contactlist.avatars.size";
++static const QString avatarRadiusOptionPath = "options.ui.contactlist.avatars.radius";
++static const QString showAvatarsPath = "options.ui.contactlist.avatars.show";
++static const QString useDefaultAvatarPath = "options.ui.contactlist.avatars.use-default-avatar";
++static const QString avatarAtLeftOptionPath = "options.ui.contactlist.avatars.avatars-at-left";
++static const QString showStatusIconsPath = "options.ui.contactlist.show-status-icons";
++static const QString statusIconsOverAvatarsPath = "options.ui.contactlist.status-icon-over-avatar";
++static const QString allClientsOptionPath = "options.ui.contactlist.show-all-client-icons";
++static const QString enableGroupsOptionPath = "options.ui.contactlist.enable-groups";
+ 
+ PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
+ 	: ContactListViewDelegate(parent)
+@@ -53,6 +67,20 @@ PsiContactListViewDelegate::PsiContactLi
+ 	optionChanged(contactListBackgroundOptionPath);
+ 	optionChanged(showStatusMessagesOptionPath);
+ 	optionChanged(statusSingleOptionPath);
++	optionChanged(showClientIconsPath);
++	optionChanged(showMoodIconsPath);
++	optionChanged(showGeolocIconsPath);
++	optionChanged(showActivityIconsPath);
++	optionChanged(showTuneIconsPath);
++	optionChanged(avatarSizeOptionPath);
++	optionChanged(avatarRadiusOptionPath);
++	optionChanged(showAvatarsPath);
++	optionChanged(useDefaultAvatarPath);
++	optionChanged(avatarAtLeftOptionPath);
++	optionChanged(showStatusIconsPath);
++	optionChanged(statusIconsOverAvatarsPath);
++	optionChanged(allClientsOptionPath);
++	optionChanged(enableGroupsOptionPath);
+ }
+ 
+ PsiContactListViewDelegate::~PsiContactListViewDelegate()
+@@ -63,7 +91,8 @@ PsiContactListViewDelegate::~PsiContactL
+ 
+ int PsiContactListViewDelegate::avatarSize() const
+ {
+-	return rowHeight_;
++	return showAvatars_ ?
++		qMax(avatarSize_ + 2, rowHeight_) : rowHeight_;
+ }
+ 
+ QPixmap PsiContactListViewDelegate::statusPixmap(const QModelIndex& index) const
+@@ -91,6 +120,9 @@ QPixmap PsiContactListViewDelegate::stat
+ 		}
+ 	}
+ 
++	if (!showStatusIcons_)
++		return QPixmap();
++
+ 	if (type == ContactListModel::ContactType) {
+ 		if (!index.data(ContactListModel::PresenceErrorRole).toString().isEmpty())
+ 			s = STATUS_ERROR;
+@@ -105,6 +137,57 @@ QPixmap PsiContactListViewDelegate::stat
+ 	return PsiIconset::instance()->statusPtr(index.data(ContactListModel::JidRole).toString(), s)->pixmap();
+ }
+ 
++QList<QPixmap> PsiContactListViewDelegate::clientPixmap(const QModelIndex& index) const
++{
++	QList<QPixmap> pixList;
++	ContactListModel::Type type = ContactListModel::indexType(index);
++	if (type != ContactListModel::ContactType)
++		return pixList;
++
++	QStringList vList = index.data(ContactListModel::ClientRole).toStringList();
++	if(vList.isEmpty())
++		return pixList;
++
++	foreach(QString client, vList) {
++		const QPixmap &pix = IconsetFactory::iconPixmap("clients/" + client);
++		if(!pix.isNull())
++			pixList.push_back(pix);
++	}
++
++	return pixList;
++}
++
++QPixmap PsiContactListViewDelegate::avatarIcon(const QModelIndex& index) const
++{
++	QPixmap avatar_icon;
++	int avSize = showAvatars_ ? avatarSize_ : 0;
++	QPixmap av = qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
++	if(av.isNull() && useDefaultAvatar_)
++		av = IconsetFactory::iconPixmap("psi/default_avatar");
++	int radius;
++	if (avSize && !av.isNull()) {
++		if ( (radius = avatarRadius_) ) {
++			avSize = qMax(avSize, radius*2);
++			av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++			int w = av.width(), h = av.height();
++			QPainterPath pp;
++			pp.addRoundedRect(0, 0, w, h, radius, radius);
++			avatar_icon = QPixmap(w, h);
++			avatar_icon.fill(QColor(0,0,0,0));
++			QPainter mp(&avatar_icon);
++			mp.setBackgroundMode(Qt::TransparentMode);
++			mp.setRenderHints(QPainter::Antialiasing, true);
++			mp.fillPath(pp, QBrush(av));
++		} else {
++			avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++		}
++	} else {
++		avatar_icon = QPixmap();
++	}
++
++	return avatar_icon;
++}
++
+ QSize PsiContactListViewDelegate::sizeHint(const QStyleOptionViewItem& /*option*/, const QModelIndex& index) const
+ {
+ 	if (index.isValid()) {
+@@ -128,12 +211,51 @@ void PsiContactListViewDelegate::drawCon
+ 	QRect r = option.rect;
+ 
+ 	QRect avatarRect(r);
+-	const QPixmap statusPixmap = this->statusPixmap(index);
+-	avatarRect.translate(1, 1);
+-	avatarRect.setSize(statusPixmap.size());
+-	painter->drawPixmap(avatarRect.topLeft(), statusPixmap);
++	if(showAvatars_) {
++		const QPixmap avatarPixmap = avatarIcon(index);
++		int size = avatarSize_;
++		avatarRect.setSize(QSize(size,size));
++		if(avatarAtLeft_) {
++			avatarRect.translate(enableGroups_ ? -5:-1, 1);
++			r.setLeft(avatarRect.right() + 3);
++		}
++		else {
++			avatarRect.moveTopRight(r.topRight());
++			avatarRect.translate(-1,1);
++			r.setRight(avatarRect.left() - 3);
++		}
++		int row = (statusSingle_ && showStatusMessages_) ? rowHeight_*3/2 : rowHeight_;
++		int h = (size - row)/2;
++		if(h > 0) {
++			r.setTop(r.top() + h);
++			r.setHeight(row);
++		}
++		else {
++			avatarRect.setTop(avatarRect.top() - h);
++		}
+ 
+-	r.setLeft(avatarRect.right() + 3);
++		if(!avatarPixmap.isNull()) {
++			painter->drawPixmap(avatarRect.topLeft(), avatarPixmap);
++		}
++	}
++
++	QRect statusRect(r);
++	QPixmap statusPixmap = this->statusPixmap(index);
++	if(!statusPixmap.isNull()) {
++		if(statusIconsOverAvatars_ && showAvatars_) {
++			statusPixmap = statusPixmap.scaled(12,12, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++			statusRect.setSize(statusPixmap.size());
++			statusRect.moveBottomRight(avatarRect.bottomRight());
++			statusRect.translate(-1,-2);
++			r.setLeft(r.left() + 3);
++		} else {
++			statusRect.translate(1, 1);
++			statusRect.setSize(statusPixmap.size());
++			r.setLeft(statusRect.right() + 3);
++		}
++		painter->drawPixmap(statusRect.topLeft(), statusPixmap);
++	} else
++		r.setLeft(r.left() + 3);
+ 
+ 	QColor textColor;
+ 	if(index.data(ContactListModel::IsAnimRole).toBool()) {
+@@ -189,6 +311,74 @@ void PsiContactListViewDelegate::drawCon
+ 		drawText(painter, o, r, text, index);
+ 	}
+ 
++	QRect iconRect(r);
++	QList<QPixmap> rightPixs;
++	QList<int> rightWidths;
++	if (showClientIcons_) {
++		const QList<QPixmap> pixList = this->clientPixmap(index);
++
++		for (QList<QPixmap>::ConstIterator it = pixList.begin(); it != pixList.end(); ++it) {
++			const QPixmap &pix = *it;
++			rightPixs.push_back(pix);
++			rightWidths.push_back(pix.width());
++			if(!allClients_)
++				break;
++		}
++	}
++
++	if (showMoodIcons_ && !index.data(ContactListModel::MoodRole).isNull()) {
++		const QPixmap &pix = IconsetFactory::iconPixmap(QString("mood/%1").arg(index.data(ContactListModel::MoodRole).toString()));
++		if(!pix.isNull()) {
++			rightPixs.push_back(pix);
++			rightWidths.push_back(pix.width());
++		}
++	}
++
++	if (showActivityIcons_ && !index.data(ContactListModel::ActivityRole).isNull()) {
++		const QPixmap &pix = IconsetFactory::iconPixmap(QString("activities/%1").arg(index.data(ContactListModel::ActivityRole).toString()));
++		if(!pix.isNull()) {
++			rightPixs.push_back(pix);
++			rightWidths.push_back(pix.width());
++		}
++	}
++
++	if (showTuneIcons_ && index.data(ContactListModel::TuneRole).toBool()) {
++		const QPixmap &pix = IconsetFactory::iconPixmap("psi/notification_roster_tune");
++		rightPixs.push_back(pix);
++		rightWidths.push_back(pix.width());
++	}
++
++        if (showGeolocIcons_ && index.data(ContactListModel::GeolocationRole).toBool()) {
++		const QPixmap &pix = IconsetFactory::iconPixmap("system/geolocation");
++		rightPixs.push_back(pix);
++		rightWidths.push_back(pix.width());
++	}
++
++	if(rightPixs.isEmpty())
++		return;
++
++	int sumWidth = 0;
++	foreach (int w, rightWidths) {
++		sumWidth += w;
++	}
++	QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
++	QColor tbgc = bgc;
++	tbgc.setAlpha(0);
++	sumWidth+=rightPixs.count();
++	QLinearGradient grad(r.right() - sumWidth - 20, 0, r.right() - sumWidth, 0);
++	grad.setColorAt(0, tbgc);
++	grad.setColorAt(1, bgc);
++	QBrush tbakBr(grad);
++	QRect gradRect(r);
++	gradRect.setLeft(gradRect.right() - sumWidth - 20);
++	painter->fillRect(gradRect, tbakBr);
++
++	for (int i=0; i<rightPixs.size(); i++) {
++		const QPixmap pix = rightPixs[i];
++		iconRect.setRight(iconRect.right() - pix.width() -1);
++		painter->drawPixmap(iconRect.topRight(), pix);
++	}
++
+ #if 0
+ 	int x;
+ 	if (d->status_single)
+@@ -346,6 +536,62 @@ void PsiContactListViewDelegate::optionC
+ 		showStatusMessages_ = PsiOptions::instance()->getOption(showStatusMessagesOptionPath).toBool();
+ 		contactList()->viewport()->update();
+ 	}
++	else if(option == showClientIconsPath) {
++		showClientIcons_ = PsiOptions::instance()->getOption(showClientIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == showMoodIconsPath) {
++		showMoodIcons_ = PsiOptions::instance()->getOption(showMoodIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == showActivityIconsPath) {
++		showActivityIcons_ = PsiOptions::instance()->getOption(showActivityIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == showTuneIconsPath) {
++		showTuneIcons_ = PsiOptions::instance()->getOption(showTuneIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == showGeolocIconsPath) {
++		showGeolocIcons_ = PsiOptions::instance()->getOption(showGeolocIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == showAvatarsPath) {
++		showAvatars_ = PsiOptions::instance()->getOption(showAvatarsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == useDefaultAvatarPath) {
++		useDefaultAvatar_ = PsiOptions::instance()->getOption(useDefaultAvatarPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == avatarAtLeftOptionPath) {
++		avatarAtLeft_ = PsiOptions::instance()->getOption(avatarAtLeftOptionPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == avatarSizeOptionPath) {
++		avatarSize_ = PsiOptions::instance()->getOption(avatarSizeOptionPath).toInt();
++		contactList()->viewport()->update();
++	}
++	else if(option == avatarRadiusOptionPath) {
++		avatarRadius_ = PsiOptions::instance()->getOption(avatarRadiusOptionPath).toInt();
++		contactList()->viewport()->update();
++	}
++	else if(option == showStatusIconsPath) {
++		showStatusIcons_ = PsiOptions::instance()->getOption(showStatusIconsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == statusIconsOverAvatarsPath) {
++		statusIconsOverAvatars_ = PsiOptions::instance()->getOption(statusIconsOverAvatarsPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == allClientsOptionPath) {
++		allClients_= PsiOptions::instance()->getOption(allClientsOptionPath).toBool();
++		contactList()->viewport()->update();
++	}
++	else if(option == enableGroupsOptionPath) {
++		enableGroups_ = PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool();
++		contactList()->viewport()->update();
++	}
+ 	else if(option == slimGroupsOptionPath) {
+ 		slimGroup_ = PsiOptions::instance()->getOption(slimGroupsOptionPath).toBool();
+ 		contactList()->viewport()->update();
+--- git.orig/src/psicontactlistviewdelegate.h
++++ git/src/psicontactlistviewdelegate.h
+@@ -52,6 +52,8 @@ protected:
+ 	virtual QRect editorRect(const QRect& nameRect) const;
+ 
+ 	virtual QPixmap statusPixmap(const QModelIndex& index) const;
++	virtual QList<QPixmap> clientPixmap(const QModelIndex& index) const;
++	virtual QPixmap avatarIcon(const QModelIndex& index) const;
+ 
+ private slots:
+ 	void optionChanged(const QString& option);
+@@ -63,7 +65,10 @@ private:
+ 	QFontMetrics* fontMetrics_;
+ 	bool statusSingle_;
+ 	int rowHeight_;
+-	bool showStatusMessages_, slimGroup_, outlinedGroup_;
++	bool showStatusMessages_, slimGroup_, outlinedGroup_, showClientIcons_, showMoodIcons_, showActivityIcons_, showGeolocIcons_, showTuneIcons_;
++	bool showAvatars_, useDefaultAvatar_, avatarAtLeft_, showStatusIcons_, statusIconsOverAvatars_;
++	int avatarSize_, avatarRadius_;
++	bool enableGroups_, allClients_;
+ 	mutable QHash<QModelIndex, bool> alertingIndexes_;
+ };
+

psi-plus-main-20141106.tar.xz/patches/0470-psi-contact-manager.diff Added

@@ -0,0 +1,1217 @@
+--- git.temp.orig/src/contactlistaccountmenu.cpp
++++ git.temp/src/contactlistaccountmenu.cpp
+@@ -32,6 +32,7 @@
+ #include "privacy/privacydlg.h"
+ #include "psiiconset.h"
+ #include "common.h"
++#include "contactmanager/contactmanagerdlg.h"
+ 
+ class ContactListAccountMenu::Private : public QObject
+ {
+@@ -45,6 +46,7 @@ class ContactListAccountMenu::Private :
+ 	QAction* setAvatarAction_;
+ 	QMenu* avatarMenu_;
+ 	QAction* unsetAvatarAction_;
++	QAction* contactManagerAction_;
+ 	QMenu* bookmarksMenu_;
+ 	QAction* bookmarksManageAction_;
+ 	QList<QAction*> bookmarksJoinActions_;
+@@ -95,6 +97,9 @@ public:
+ 		unsetAvatarAction_ = new QAction(tr("Unset Avatar"), this);
+ 		connect(unsetAvatarAction_, SIGNAL(triggered()), SLOT(unsetAvatar()));
+ 
++		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
++		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
++
+ 		bookmarksManageAction_ = new QAction(tr("Manage..."), this);
+ 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
+ 
+@@ -144,6 +149,7 @@ public:
+ 		menu->addAction(addContactAction_);
+ 		menu->addAction(serviceDiscoveryAction_);
+ 		menu->addAction(newMessageAction_);
++		menu->addAction(contactManagerAction_);
+ 		menu->addAction(privacyListsAction_);
+ 		menu->addSeparator();
+ 		menu->addAction(xmlConsoleAction_);
+@@ -205,6 +211,7 @@ private slots:
+ 		newMessageAction_->setEnabled(account->account()->isAvailable());
+ 		addContactAction_->setEnabled(account->account()->isAvailable());
+ 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
++		contactManagerAction_->setEnabled(account->account()->isAvailable());
+ 		privacyListsAction_->setEnabled(account->account()->isAvailable());
+ 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
+ 			adminMenu_->menuAction()->setVisible(false);
+@@ -319,6 +326,19 @@ private slots:
+ 			dlg->show();
+ 		} else
+ 			bringToFront(dlg);
++	}
++
++	void contactManager()
++	{
++		if (!account)
++			return;
++
++		ContactManagerDlg *dlg = account->account()->findDialog<ContactManagerDlg*>();
++		if(!dlg) {
++			dlg = new ContactManagerDlg(account->account());
++			dlg->show();
++		} else
++			bringToFront(dlg);
+ 	}
+ 
+ 	void xmlConsole()
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanager.pri
+@@ -0,0 +1,7 @@
++HEADERS += $$PWD/contactmanagerdlg.h \
++    $$PWD/contactmanagermodel.h \
++	$$PWD/contactmanagerview.h
++SOURCES += $$PWD/contactmanagerdlg.cpp \
++    $$PWD/contactmanagermodel.cpp \
++	$$PWD/contactmanagerview.cpp
++FORMS += $$PWD/contactmanagerdlg.ui
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagerdlg.cpp
+@@ -0,0 +1,318 @@
++/*
++ * contactmanagerdlg.cpp
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include <QMessageBox>
++#include <QItemSelectionModel>
++#include <QFileDialog>
++#include <QFile>
++#include <QScrollArea>
++#include <QCheckBox>
++
++#include "contactmanagerdlg.h"
++
++#include "psiaccount.h"
++#include "userlist.h"
++#include "xmpp_tasks.h"
++#include "psiiconset.h"
++#include "vcardfactory.h"
++//#include "contactview.h"
++
++
++ContactManagerDlg::ContactManagerDlg(PsiAccount *pa) :
++	QDialog(0, Qt::Window),
++	pa_(pa),
++	um(0)
++{
++	setAttribute(Qt::WA_DeleteOnClose, true);
++	ui_.setupUi(this);
++	pa_->dialogRegister(this);
++	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
++
++	um = new ContactManagerModel(this, pa_);
++	um->reloadUsers();
++	ui_.usersView->setModel(um);
++	ui_.usersView->init();
++
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/sendMessage").icon(), tr("Message"), 1);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), 2);
++	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth request"), 3);
++	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth grant"), 4);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/command").icon(), tr("Change domain"), 5);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/info").icon(), tr("Resolve nicks"), 6);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/browse").icon(), tr("Move to group"), 7);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/cm_export").icon(), tr("Export"), 8);
++	ui_.cbAction->addItem(IconsetFactory::icon("psi/cm_import").icon(), tr("Import"), 9);
++	connect(ui_.cbAction, SIGNAL(currentIndexChanged(int)), this, SLOT(showParamField(int)));
++	showParamField(0); // 0 - default index of combobox
++
++	ui_.cmbField->insertItems(0, um->manageableFields());
++	ui_.cmbMatchType->addItem(tr("Simple"), ContactManagerModel::SimpleMatch);
++	ui_.cmbMatchType->addItem(tr("RegExp"), ContactManagerModel::RegexpMatch);
++	connect(ui_.btnExecute, SIGNAL(clicked()), this, SLOT(executeCurrent()));
++	connect(ui_.btnSelect, SIGNAL(clicked()), this, SLOT(doSelect()));
++
++	connect(pa_->client(), SIGNAL(rosterRequestFinished(bool,int,QString)), this, SLOT(client_rosterUpdated(bool,int,QString)));
++}
++
++
++
++ContactManagerDlg::~ContactManagerDlg()
++{
++	pa_->dialogUnregister(this);
++}
++
++void ContactManagerDlg::changeEvent(QEvent *e)
++{
++    switch (e->type()) {
++    case QEvent::LanguageChange:
++		ui_.retranslateUi(this);
++        break;
++    default:
++        break;
++    }
++}
++
++void ContactManagerDlg::doSelect()
++{
++	int type = ui_.cmbMatchType->itemData(ui_.cmbMatchType->currentIndex()).toInt();
++	int coumnIndex = ui_.cmbField->currentIndex();
++	um->invertByMatch(coumnIndex + 1, type,  ui_.edtMatch->text());
++}
++
++void ContactManagerDlg::executeCurrent()
++{
++	int action = ui_.cbAction->itemData(ui_.cbAction->currentIndex()).toInt();
++	QList<UserListItem *> users = um->checkedUsers();
++	if (!users.count() && action != 9) {
++		return;
++	}
++	switch (action) {
++		case 1: //message
++			{
++				QList<XMPP::Jid> list;
++				foreach (UserListItem *u, users) {
++					list.append(u->jid().full());
++				}
++				pa_->actionSendMessage(list);
++			}
++			break;
++		case 2: //remove
++			{
++				if (QMessageBox::question(this, tr("Removal confirmation"),
++										  tr("Are you sure want to delete selected contacts?"),
++										  QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
++					return;
++				}
++				um->startBatch();
++				foreach (UserListItem *u, users) {
++					if(u->isTransport() && !Jid(pa_->client()->host()).compare(u->jid())) {
++						JT_UnRegister *ju = new JT_UnRegister(pa_->client()->rootTask());
++						ju->unreg(u->jid());
++						ju->go(true);
++					}
++					JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
++					r->remove(u->jid());
++					r->go(true);
++				}
++				um->clear();
++				pa_->client()->rosterRequest();
++			}
++			break;
++		case 3: //Auth request
++			foreach (UserListItem *u, users) {
++				pa_->dj_authReq(u->jid());
++			}
++			break;
++		case 4: //Auth grant
++			foreach (UserListItem *u, users) {
++				pa_->dj_auth(u->jid());
++			}
++			break;
++		case 5: //change domain
++			changeDomain(users);
++			break;
++		case 6: //resolve nicks
++			foreach (UserListItem *u, users) {
++				VCardFactory::instance()->getVCard(u->jid(), pa_->client()->rootTask(), pa_, SLOT(resolveContactName()));
++			}
++			break;
++		case 7:
++			changeGroup(users);
++			break;
++		case 8: //export
++			exportRoster(users);
++			break;
++		case 9: //import
++			importRoster();
++			break;
++		default:
++			QMessageBox::warning(this, tr("Invalid"), tr("This action is not supported atm"));
++	}
++}
++
++void ContactManagerDlg::showParamField(int index)
++{
++	int action = ui_.cbAction->itemData(index).toInt();
++	ui_.edtActionParam->hide();
++	ui_.cmbActionParam->hide();
++	switch (action) {
++		case 5:
++			ui_.edtActionParam->show();
++			break;
++		case 7:
++			ui_.cmbActionParam->clear();
++			ui_.cmbActionParam->addItems(pa_->groupList());
++			ui_.cmbActionParam->show();
++			break;
++	}
++}
++
++void ContactManagerDlg::changeDomain(QList<UserListItem *>& users)
++{
++	QString domain = ui_.edtActionParam->text();
++	if (domain.size()) {
++		um->startBatch();
++		um->clear();
++		foreach (UserListItem *u, users) {
++			JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
++			if (!u->jid().node().isEmpty()) {
++				r->set(u->jid().withDomain(domain), u->name(), u->groups());
++				r->remove(u->jid());
++			}
++			r->go(true);
++		}
++		pa_->client()->rosterRequest();
++	} else {
++		QMessageBox::warning(this, tr("Invalid"), tr("Please fill parameter field with new domain name"));
++	}
++}
++
++void ContactManagerDlg::changeGroup(QList<UserListItem *>& users)
++{
++	QStringList groups(ui_.cmbActionParam->currentText());
++
++	foreach (UserListItem *u, users) {
++		JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
++		r->set(u->jid(), u->name(), groups);
++		r->go(true);
++	}
++}
++
++void ContactManagerDlg::client_rosterUpdated(bool success, int statusCode,QString statusString)
++{
++	if (success) {
++		um->reloadUsers();
++	}
++	ui_.usersView->viewport()->update();
++	Q_UNUSED(statusCode);
++	Q_UNUSED(statusString);
++	um->stopBatch();
++}
++
++void ContactManagerDlg::exportRoster(QList<UserListItem *>& users)
++{
++	QString fileName = QFileDialog::getSaveFileName(this, tr("Roster file"), QDir::homePath());
++	if (!fileName.isEmpty()) {
++		QDomDocument doc;
++		QString nick;
++		QDomElement root = doc.createElement("roster");
++		doc.appendChild(root);
++		foreach (UserListItem *u, users) {
++			QDomElement contact = root.appendChild(doc.createElement("contact")).toElement();
++			contact.setAttribute("jid", u->jid().bare());
++			foreach (QString group, u->groups()) {
++				contact.appendChild(doc.createElement("group")).appendChild(doc.createTextNode(group));
++			}
++			nick = u->name();
++			if (!nick.isEmpty()) {
++				contact.appendChild(doc.createElement("nick")).appendChild(doc.createTextNode(nick));
++			}
++		}
++		QFile file(fileName);
++		if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
++			QMessageBox::critical(this, tr("Save error!"), tr("Can't open file %1 for writing").arg(fileName));
++			return;
++		}
++		file.write(doc.toString().toLocal8Bit());
++		file.close();
++	}
++}
++
++void ContactManagerDlg::importRoster()
++{
++	QString fileName = QFileDialog::getOpenFileName(this, tr("Roster file"), QDir::homePath());
++	if (!fileName.isEmpty()) {
++		QFile file(fileName);
++		if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
++			QMessageBox::critical(this, tr("Open error!"), tr("Can't open file %1 for reading").arg(fileName));
++			return;
++		}
++		QDomDocument doc;
++		if (!doc.setContent(&file)) {
++			QMessageBox::critical(this, tr("Open error!"), tr("File %1 is not xml file").arg(fileName));
++			return;
++		}
++		QDomNodeList domContacts = doc.documentElement().elementsByTagName("contact");
++		if (domContacts.isEmpty()) {
++			QMessageBox::warning(this, tr("Nothing to do.."), tr("No contacts found in file %1").arg(fileName));
++		}
++
++		QHash<QString, QString>nicks;
++		QHash<QString, QStringList>groups;
++		QString jid, nick;
++		QStringList jids;
++		QStringList labelContent;
++		for (unsigned i=0; i<domContacts.length(); i++) {
++			QDomElement contact = domContacts.item(i).toElement();
++			jid = contact.attribute("jid");
++			jids.append(jid);
++			QDomNodeList props = contact.childNodes();
++			for (unsigned j=0; j<props.length(); j++) {
++				if (!props.item(j).isElement()) {
++					continue;
++				}
++				QDomElement el = props.item(j).toElement();
++				if (el.tagName() == "nick") {
++					nicks[jid] = el.text();
++				}
++				if (el.tagName() == "group") {
++					groups[jid].append(el.text());
++				}
++			}
++			labelContent.append(QString("%1 (%2)").arg(jid).arg(nicks[jid]));
++		}
++
++		QMessageBox confirmDlg(
++				QMessageBox::Question,tr("Confirm contacts importing"),
++				tr("Do you really want to import these contacts?"), QMessageBox::Cancel | QMessageBox::Yes);
++		confirmDlg.setDetailedText(labelContent.join("\n"));
++		if (confirmDlg.exec() == QMessageBox::Yes) {
++			um->startBatch();
++			um->clear();
++			foreach (QString jid, jids) {
++				JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
++				r->set(Jid(jid), nicks[jid], groups[jid]);
++				r->go(true);
++			}
++			pa_->client()->rosterRequest(); // через ж.., но пускай пока так.
++		}
++		file.close();
++	}
++}
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagerdlg.h
+@@ -0,0 +1,60 @@
++/*
++ * contactmanagerdlg.h
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef CONTACTMANAGERDLG_H
++#define CONTACTMANAGERDLG_H
++#include "ui_contactmanagerdlg.h"
++
++#include <QDialog>
++#include "contactmanagermodel.h"
++class PsiAccount;
++
++namespace Ui {
++    class ContactManagerDlg;
++}
++
++class ContactManagerDlg : public QDialog {
++    Q_OBJECT
++    Q_DISABLE_COPY(ContactManagerDlg)
++public:
++	explicit ContactManagerDlg(PsiAccount *pa);
++    virtual ~ContactManagerDlg();
++
++protected:
++    virtual void changeEvent(QEvent *e);
++
++private:
++	void changeDomain(QList<UserListItem *>& users);
++	void changeGroup(QList<UserListItem *>& users);
++	void exportRoster(QList<UserListItem *>& users);
++	void importRoster();
++
++	Ui::ContactManagerDlg ui_;
++	PsiAccount *pa_;
++	ContactManagerModel *um;
++
++private slots:
++	void doSelect();
++	void executeCurrent();
++	void showParamField(int index);
++	void client_rosterUpdated(bool,int,QString);
++};
++
++#endif // CONTACTMANAGERDLG_H
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagerdlg.ui
+@@ -0,0 +1,203 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>ContactManagerDlg</class>
++ <widget class="QDialog" name="ContactManagerDlg">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>600</width>
++    <height>390</height>
++   </rect>
++  </property>
++  <property name="sizePolicy">
++   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
++    <horstretch>0</horstretch>
++    <verstretch>0</verstretch>
++   </sizepolicy>
++  </property>
++  <property name="windowTitle">
++   <string>Contacts Manager</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout">
++   <item>
++    <widget class="ContactManagerView" name="usersView">
++     <property name="selectionBehavior">
++      <enum>QAbstractItemView::SelectRows</enum>
++     </property>
++     <property name="sortingEnabled">
++      <bool>true</bool>
++     </property>
++     <attribute name="horizontalHeaderCascadingSectionResizes">
++      <bool>true</bool>
++     </attribute>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout">
++     <item>
++      <widget class="QLabel" name="lblField">
++       <property name="text">
++        <string>Field</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QComboBox" name="cmbField"/>
++     </item>
++     <item>
++      <widget class="QComboBox" name="cmbMatchType"/>
++     </item>
++     <item>
++      <widget class="QLineEdit" name="edtMatch">
++       <property name="maximumSize">
++        <size>
++         <width>32000</width>
++         <height>16777215</height>
++        </size>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="btnSelect">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
++         <horstretch>0</horstretch>
++         <verstretch>0</verstretch>
++        </sizepolicy>
++       </property>
++       <property name="maximumSize">
++        <size>
++         <width>32</width>
++         <height>16777215</height>
++        </size>
++       </property>
++       <property name="text">
++        <string notr="true">+/-</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout_2">
++     <item>
++      <widget class="QLabel" name="lblAction">
++       <property name="text">
++        <string>Action</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QComboBox" name="cbAction"/>
++     </item>
++     <item>
++      <widget class="QLineEdit" name="edtActionParam">
++       <property name="whatsThis">
++        <string extracomment="Action's parameter"/>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QComboBox" name="cmbActionParam">
++       <property name="editable">
++        <bool>true</bool>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="btnExecute">
++       <property name="text">
++        <string>Execute</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <spacer name="horizontalSpacer">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>40</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++    </layout>
++   </item>
++   <item>
++    <widget class="QDialogButtonBox" name="buttonBox">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++     <property name="standardButtons">
++      <set>QDialogButtonBox::Close</set>
++     </property>
++     <property name="centerButtons">
++      <bool>false</bool>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <customwidgets>
++  <customwidget>
++   <class>ContactManagerView</class>
++   <extends>QTableView</extends>
++   <header>contactmanager/contactmanagerview.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections>
++  <connection>
++   <sender>buttonBox</sender>
++   <signal>accepted()</signal>
++   <receiver>ContactManagerDlg</receiver>
++   <slot>accept()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>257</x>
++     <y>380</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>157</x>
++     <y>274</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>buttonBox</sender>
++   <signal>rejected()</signal>
++   <receiver>ContactManagerDlg</receiver>
++   <slot>reject()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>325</x>
++     <y>380</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>286</x>
++     <y>274</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>edtMatch</sender>
++   <signal>returnPressed()</signal>
++   <receiver>btnSelect</receiver>
++   <slot>click()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>343</x>
++     <y>292</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>386</x>
++     <y>302</y>
++    </hint>
++   </hints>
++  </connection>
++ </connections>
++</ui>
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagermodel.cpp
+@@ -0,0 +1,304 @@
++/*
++ * contactmanagermodel.cpp
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include "contactmanagermodel.h"
++#include "psiaccount.h"
++#include "userlist.h"
++#include "xmpp_tasks.h"
++#include "QDebug"
++
++
++ContactManagerModel::ContactManagerModel(QObject * parent, PsiAccount *pa) :
++		QAbstractTableModel(parent),
++		pa_(pa)
++{
++	columnNames
++			<<""
++			<<tr("Nick")
++			<<tr("Group")
++			<<tr("Node")
++			<<tr("Domain")
++			<<tr("Subscription");
++	roles	<<CheckRole
++			<<NickRole
++			<<GroupRole
++			<<NodeRole
++			<<DomainRole
++			<<SubscriptionRole;
++	connect(pa_, SIGNAL(updateContact(UserListItem)), this, SLOT(view_contactUpdated(UserListItem)));
++	connect(pa_->client(), SIGNAL(rosterItemUpdated(const RosterItem &)), this, SLOT(client_rosterItemUpdated(const RosterItem &)));
++}
++
++void ContactManagerModel::reloadUsers()
++{
++	beginResetModel();
++	clear();
++	UserList *ul = pa_->userList();
++	foreach (UserListItem *u, *ul) {
++		if (u->inList()) {
++			addContact(u);
++		}
++	}
++	endResetModel();
++}
++
++void ContactManagerModel::clear()
++{
++	_userList.clear();
++	checks.clear();
++}
++
++int ContactManagerModel::rowCount(const QModelIndex &parent) const
++{
++	if (parent.isValid()) return 0;
++	return _userList.count();
++}
++
++int ContactManagerModel::columnCount ( const QModelIndex & parent) const
++{
++	Q_UNUSED(parent);
++	return columnNames.count();
++}
++
++QVariant ContactManagerModel::data(const QModelIndex &index, int role) const
++{
++	Role columnRole = roles[index.column()];
++	UserListItem *u = _userList.at(index.row());
++	if (u) {
++		switch (columnRole) {
++			case CheckRole: //checkbox
++				if (role == Qt::CheckStateRole) {
++					return checks.contains(u->jid().full())?2:0;
++				} else if (role == Qt::TextAlignmentRole) {
++					return (int)(Qt::AlignRight | Qt::AlignVCenter);
++				}
++				break;
++			case NodeRole:
++				if (role == Qt::TextAlignmentRole) {
++					return (int)(Qt::AlignRight | Qt::AlignVCenter);
++				}
++			default:
++				if (role == Qt::DisplayRole) {
++					return userFieldString(u, columnRole);
++				}
++		}
++	}
++	return QVariant();
++}
++
++QString ContactManagerModel::userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const
++{
++	QString data;
++	switch (columnRole) {
++		case NodeRole: //node
++			data = u->jid().node();
++			break;
++		case DomainRole: //domain
++			data = u->jid().domain();
++			break;
++		case NickRole: //nick
++			data = u->name();
++			break;
++		case GroupRole: //group
++			if (u->groups().isEmpty()) {
++				data = "";
++			} else {
++				data = u->groups().first();
++			}
++			break;
++		case SubscriptionRole: //subscription
++			data = u->subscription().toString();
++			break;
++		default:
++			break;
++	}
++	return data;
++}
++
++QVariant ContactManagerModel::headerData(int section, Qt::Orientation orientation,
++					 int role) const
++{
++	if (role == Qt::DisplayRole) {
++		if (orientation == Qt::Horizontal) {
++			return columnNames[section];
++		} else {
++			return section+1;
++		}
++	}
++	return QVariant();
++}
++
++
++QStringList ContactManagerModel::manageableFields()
++{
++	QStringList ret = columnNames;
++	ret.removeFirst();
++	return ret;
++}
++
++void ContactManagerModel::addContact(UserListItem *u)
++{
++	_userList.append(u);
++}
++
++Qt::ItemFlags ContactManagerModel::flags ( const QModelIndex & index ) const
++{
++	Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
++	Role columnRole = roles[index.column()];
++	if ( columnRole == CheckRole ) {
++		flags |= ( Qt::ItemIsUserCheckable );
++	}
++	return flags;
++}
++
++bool ContactManagerModel::setData ( const QModelIndex & index, const QVariant & value, int role )
++{
++	Q_UNUSED(role);
++	if (index.isValid()) {
++		Role columnRole = roles[index.column()];
++		if ( columnRole == CheckRole ) {
++			QString jid = _userList.at(index.row())->jid().full();
++			if (value.toInt() == 3) { //iversion
++				if (checks.contains(jid)) {
++					checks.remove(jid);
++				} else {
++					checks.insert(jid);
++				}
++				emit dataChanged ( index, index );
++			} else {
++				if (checks.contains(jid)) {
++					if (!value.toBool()) {
++						checks.remove(jid);
++						emit dataChanged ( index, index );
++					}
++				} else {
++					if (value.toBool()) {
++						checks.insert(jid);
++						emit dataChanged ( index, index );
++					}
++				}
++			}
++		}
++	}
++	return false;
++}
++
++ContactManagerModel::Role ContactManagerModel::sortRole;
++Qt::SortOrder ContactManagerModel::sortOrder = Qt::AscendingOrder;
++
++void ContactManagerModel::sort ( int column, Qt::SortOrder order = Qt::AscendingOrder )
++{
++	Role columnRole = roles[column];
++	ContactManagerModel::sortRole = columnRole;
++	ContactManagerModel::sortOrder = order;
++	if (columnRole != CheckRole) {
++		emit layoutAboutToBeChanged();
++		qSort(_userList.begin(), _userList.end(), ContactManagerModel::sortLessThan);
++		emit layoutChanged();
++	}
++}
++
++bool ContactManagerModel::sortLessThan(UserListItem *u1, UserListItem *u2)
++{
++	QString g1, g2;
++	bool result = false;
++	switch (ContactManagerModel::sortRole) {
++		case NodeRole: //node
++			result = u1->jid().node() < u2->jid().node();
++			break;
++		case DomainRole: //domain
++			result = u1->jid().domain() < u2->jid().domain();
++			break;
++		case NickRole: //nick
++			result = u1->name() < u2->name();
++			break;
++		case GroupRole: //group
++			if (!u1->groups().isEmpty()) {
++				g1 = u1->groups().first();
++			}
++			if (!u2->groups().isEmpty()) {
++				g2 = u2->groups().first();
++			}
++			result = g1 < g2;
++			break;
++		case SubscriptionRole: //subscription
++			result = u1->subscription().toString() < u2->subscription().toString();
++			break;
++		default:
++			break;
++	}
++	return ContactManagerModel::sortOrder == Qt::AscendingOrder? result : !result;
++}
++
++QList<UserListItem *> ContactManagerModel::checkedUsers()
++{
++	QList<UserListItem *> users;
++	foreach (UserListItem *u, _userList) {
++		if (checks.contains(u->jid().full())) {
++			users.append(u);
++		}
++	}
++	return users;
++}
++
++void ContactManagerModel::invertByMatch(int columnIndex, int matchType, const QString &str)
++{
++	emit layoutAboutToBeChanged();
++	Role columnRole = roles[columnIndex];
++	QString data;
++	QRegExp reg;
++	if (matchType == ContactManagerModel::RegexpMatch) {
++		reg = QRegExp(str);
++	}
++	foreach (UserListItem *u, _userList) {
++		data = userFieldString(u, columnRole);
++		if ((matchType == ContactManagerModel::SimpleMatch && str == data) ||
++			(matchType == ContactManagerModel::RegexpMatch && reg.indexIn(data) != -1)) {
++			QString jid = u->jid().full();
++			if (checks.contains(jid)) {
++				checks.remove(jid);
++			} else {
++				checks.insert(jid);
++			}
++		}
++	}
++	emit layoutChanged();
++}
++
++void ContactManagerModel::view_contactUpdated(const UserListItem &u)
++{
++	contactUpdated(u.jid());
++}
++
++void ContactManagerModel::client_rosterItemUpdated(const RosterItem &item)
++{
++	contactUpdated(item.jid());
++}
++
++void  ContactManagerModel::contactUpdated(const Jid &jid)
++{
++	int i = 0;
++	foreach (UserListItem *lu, _userList) {
++		if (lu->jid() == jid) {
++			dataChanged(index(i, 1), index(i, columnNames.count()-1));
++		}
++		i++;
++	}
++}
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagermodel.h
+@@ -0,0 +1,93 @@
++/*
++ * contactmanagermodel.h
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef CONTACTMANAGERMODEL_H
++#define CONTACTMANAGERMODEL_H
++
++#include <QAbstractTableModel>
++#include <QStringList>
++#include <QSet>
++
++class UserListItem;
++class PsiAccount;
++namespace XMPP
++{
++	class RosterItem;
++	class Jid;
++}
++using namespace XMPP;
++
++class ContactManagerModel : public QAbstractTableModel
++{
++	Q_OBJECT
++public:
++	enum Role {
++		// DisplayRole / EditRole
++		CheckRole,
++		NickRole,
++		GroupRole,
++		NodeRole,
++		DomainRole,
++		SubscriptionRole
++	};
++	const static int SimpleMatch = 1;
++	const static int RegexpMatch = 2;
++
++	ContactManagerModel(QObject * parent, PsiAccount *pa);
++	int rowCount(const QModelIndex &parent = QModelIndex()) const;
++	int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
++	QVariant data(const QModelIndex &index, int role) const;
++	QVariant headerData(int section, Qt::Orientation orientation,
++						 int role = Qt::DisplayRole) const;
++	Qt::ItemFlags flags ( const QModelIndex & index ) const;
++	bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
++	void sort ( int column, Qt::SortOrder order );
++	static bool sortLessThan(UserListItem *u1, UserListItem *u2);
++	static Role sortRole;
++	static Qt::SortOrder sortOrder;
++
++
++	QStringList manageableFields();
++	void reloadUsers();
++	void clear();
++	void addContact(UserListItem *u);
++	QList<UserListItem *> checkedUsers();
++	void invertByMatch(int columnIndex, int matchType, const QString &str);
++
++	void startBatch() { layoutAboutToBeChanged(); }
++	void stopBatch() { layoutChanged(); }
++
++
++private:
++	PsiAccount *pa_;
++	QList<UserListItem *> _userList;
++	QStringList columnNames;
++	QList<Role> roles;
++	QSet<QString> checks;
++
++	QString userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const;
++	void contactUpdated(const Jid &);
++
++private slots:
++	void view_contactUpdated(const UserListItem &);
++	void client_rosterItemUpdated(const RosterItem &);
++};
++
++#endif // CONTACTMANAGERMODEL_H
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagerview.cpp
+@@ -0,0 +1,96 @@
++/*
++ * contactmanagerview.cpp
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include <QMenu>
++#include <QContextMenuEvent>
++#include <QHeaderView>
++
++#include "contactmanagerview.h"
++#include "psiiconset.h"
++
++ContactManagerView::ContactManagerView( QWidget * parent )
++		: QTableView(parent)
++{
++
++}
++
++void ContactManagerView::init()
++{
++	resizeColumnsToContents();
++#ifdef HAVE_QT5
++	horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
++#else
++	horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
++#endif
++	horizontalHeader()->setStretchLastSection(true);
++	horizontalHeader()->setSortIndicator(-1, Qt::AscendingOrder);
++	verticalHeader()->setDefaultAlignment( Qt::AlignHCenter );
++
++	connect(horizontalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(sortByColumn(int)));
++}
++
++void ContactManagerView::contextMenuEvent( QContextMenuEvent * e )
++{
++	QMenu *popup = new QMenu(this);
++	QList<QAction *> actions;
++	actions <<new QAction(IconsetFactory::icon("psi/cm_check").icon(), tr("Check"), popup)
++			<<new QAction(IconsetFactory::icon("psi/cm_uncheck").icon(), tr("Uncheck"), popup)
++			<<new QAction(IconsetFactory::icon("psi/cm_invertcheck").icon(), tr("Invert"), popup);
++	popup->addActions(actions);
++	QAction *result = popup->exec(e->globalPos());
++	int iresult;
++	if (result) {
++		iresult = actions.indexOf(result);
++		const QVariant value(2);
++		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
++			switch (iresult) {
++				case 0: //check
++					model()->setData(check, 2);
++					break;
++				case 1: //uncheck
++					model()->setData(check, 0);
++					break;
++				case 2: //invert
++					model()->setData(check, 3);
++					break;
++			}
++		}
++	}
++	delete popup;
++}
++
++void ContactManagerView::keyPressEvent( QKeyEvent * e )
++{
++	if (e->key() == Qt::Key_Space) {
++		int data = 2; //check
++		if (e->modifiers() & Qt::ControlModifier) {
++			data = 3; //invert
++		} else if (e->modifiers() & Qt::ShiftModifier) {
++			data = 0; //uncheck
++		}
++		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
++			model()->setData(check, data);
++		}
++		e->accept();
++	} else {
++		QTableView::keyPressEvent(e);
++		e->ignore();
++	}
++}
+--- /dev/null
++++ git.temp/src/contactmanager/contactmanagerview.h
+@@ -0,0 +1,38 @@
++/*
++ * contactmanagerview.h
++ * Copyright (C) 2010 Rion
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef CONTACTMANAGERVIEW_H
++#define CONTACTMANAGERVIEW_H
++
++#include <QTableView>
++
++class ContactManagerView : public QTableView
++{
++	Q_OBJECT
++public:
++	ContactManagerView( QWidget * parent = 0 );
++	void init();
++
++protected:
++	void contextMenuEvent( QContextMenuEvent * e );
++	void keyPressEvent( QKeyEvent * e );
++};
++
++#endif // CONTACTMANAGERVIEW_H
+--- git.temp.orig/src/src.pri
++++ git.temp/src/src.pri
+@@ -15,6 +15,7 @@ include($$PWD/privacy/privacy.pri)
+ include($$PWD/capabilities/capabilities.pri)
+ include($$PWD/tabs/tabs.pri)
+ include($$PWD/Certificates/Certificates.pri)
++include($$PWD/contactmanager/contactmanager.pri)
+ 
+ # tools
+ # include($$PWD/tools/trayicon/trayicon.pri)

psi-plus-main-20141106.tar.xz/patches/0480-psi-asterisk-allow-multiple-payload-types.diff Added

@@ -0,0 +1,93 @@
+From 414e49698a7fb64741d4b64ce01139a4bb31db2a Mon Sep 17 00:00:00 2001
+From: Julius Schwartzenberg <julius.schwartzenberg@gmail.com>
+Date: Wed, 24 Feb 2010 00:12:51 +0100
+Subject: Allow multiple payload types
+
+---
+ src/avcall/avcall.cpp |   63 ++++++++++++++++++------------------------------
+ 1 files changed, 24 insertions(+), 39 deletions(-)
+
+--- git.temp.orig/src/avcall/avcall.cpp
++++ git.temp/src/avcall/avcall.cpp
+@@ -625,34 +625,37 @@ private slots:
+ 
+ 		printf("rtp_started\n");
+ 
+-		PsiMedia::PayloadInfo audio, *pAudio;
+-		PsiMedia::PayloadInfo video, *pVideo;
++		if(!incoming)
++		{
++			sess = manager->rtpManager->createOutgoing();
++			setup_sess();
++		}
+ 
+-		pAudio = 0;
+-		pVideo = 0;
+-		if(transmitAudio)
++		if(transmitAudio && !rtp.localAudioPayloadInfo().isEmpty())
+ 		{
+-			// confirm transmitting of audio is actually possible,
+-			//   in the case that a file is used as input
+-			if(rtp.canTransmitAudio())
++			QList<JingleRtpPayloadType> pis;
++			foreach(PsiMedia::PayloadInfo pi, rtp.localAudioPayloadInfo())
+ 			{
+-				audio = rtp.localAudioPayloadInfo().first();
+-				pAudio = &audio;
++				JingleRtpPayloadType pt = payloadInfoToPayloadType(pi);
++				pis << pt;
+ 			}
+-			else
+-				transmitAudio = false;
++			sess->setLocalAudioPayloadTypes(pis);
+ 		}
+-		if(transmitVideo)
++		else
++			transmitAudio = false;
++
++		if(transmitVideo && !rtp.localVideoPayloadInfo().isEmpty())
+ 		{
+-			// same for video
+-			if(rtp.canTransmitVideo())
++			QList<JingleRtpPayloadType> pis;
++			foreach(PsiMedia::PayloadInfo pi, rtp.localVideoPayloadInfo())
+ 			{
+-				video = rtp.localVideoPayloadInfo().first();
+-				pVideo = &video;
++				JingleRtpPayloadType pt = payloadInfoToPayloadType(pi);
++				pis << pt;
+ 			}
+-			else
+-				transmitVideo = false;
++			sess->setLocalVideoPayloadTypes(pis);
+ 		}
++		else
++			transmitVideo = false;
+ 
+ 		if(transmitAudio && transmitVideo)
+ 			mode = AvCall::Both;
+@@ -667,24 +670,6 @@ private slots:
+ 		}
+ 
+ 		if(!incoming)
+-		{
+-			sess = manager->rtpManager->createOutgoing();
+-			setup_sess();
+-		}
+-
+-		if(pAudio)
+-		{
+-			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pAudio);
+-			sess->setLocalAudioPayloadTypes(QList<JingleRtpPayloadType>() << pt);
+-		}
+-
+-		if(pVideo)
+-		{
+-			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pVideo);
+-			sess->setLocalVideoPayloadTypes(QList<JingleRtpPayloadType>() << pt);
+-		}
+-
+-		if(!incoming)
+ 			sess->connectToJid(peer);
+ 		else
+ 			sess->localMediaUpdate();

psi-plus-main-20141106.tar.xz/patches/0490-psi-coloring-tooltip.diff Added

@@ -0,0 +1,70 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -284,6 +284,11 @@
+ 						<status-change-animation2 type="QColor">#969696</status-change-animation2>
+ 						<status-messages type="QColor">#808080</status-messages>
+ 					</contactlist>
++					<tooltip>
++						<enable comment="Enable tooltip coloring feature" type="bool">true</enable>
++						<background comment="Tooltip background color" type="QColor">#e9ecc7</background>
++						<text comment="Tooltip text color" type="QColor">#000000</text>
++					</tooltip>
+ 					<muc>
+ 						<nick-colors type="QStringList" >
+ 							<item>Blue</item>
+--- git.orig/src/widgets/psitiplabel.cpp
++++ git/src/widgets/psitiplabel.cpp
+@@ -11,6 +11,7 @@
+ #include <QTextEdit>
+ 
+ #include "psirichtext.h"
++#include "psioptions.h"
+ 
+ PsiTipLabel *PsiTipLabel::instance_ = 0;
+ 
+@@ -38,6 +39,22 @@ void PsiTipLabel::init(const QString& te
+ 	setForegroundRole(QPalette::ToolTipText);
+ 	setBackgroundRole(QPalette::ToolTipBase);
+ 	setPalette(QToolTip::palette());
++
++	enableColoring_ = PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.enable").toBool();
++	if(enableColoring_){
++		QColor textColor(PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.text").toString());
++		QColor baseColor(PsiOptions::instance()->getOption("options.ui.look.colors.tooltip.background").toString());
++		if(textColor.isValid() && baseColor.isValid() && textColor != baseColor) { //looks fine
++			QPalette palette(QToolTip::palette());
++			palette.setColor(QPalette::ToolTipText, textColor);
++			palette.setColor(QPalette::ToolTipBase, baseColor);
++			palette.setColor(QPalette::WindowText, textColor);
++			palette.setColor(QPalette::Window, baseColor);
++			setPalette(palette);
++		} else {
++			enableColoring_ = false;
++		}
++	}
+ }
+ 
+ void PsiTipLabel::setText(const QString& text)
+@@ -160,7 +177,11 @@ void PsiTipLabel::paintEvent(QPaintEvent
+ 	QStylePainter p(this);
+ 	QStyleOptionFrame opt;
+ 	opt.init(this);
+-	p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
++	if(enableColoring_) {
++		p.drawPrimitive(QStyle::PE_Frame, opt);
++	} else {
++		p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
++	}
+ 	p.end();
+ 
+ 	// stolen from QLabel::paintEvent
+--- git.orig/src/widgets/psitiplabel.h
++++ git/src/widgets/psitiplabel.h
+@@ -40,6 +40,7 @@ private:
+ 	QString theText_;
+ 	bool isRichText;
+ 	int margin;
++	bool enableColoring_;
+ 	// int indent;
+ 
+ 	virtual void initUi();

psi-plus-main-20141106.tar.xz/patches/0500-psiplus-more-compatibility-with-skinsplugin.diff Added

@@ -0,0 +1,37 @@
+--- git.temp.orig/src/mainwin.cpp
++++ git.temp/src/mainwin.cpp
+@@ -332,6 +332,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	} else
+ 		setCentralWidget(rosterBar);
+ 
++	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
++
+ 	d->vb_roster = new QVBoxLayout(rosterBar);
+ #ifndef NEWCONTACTLIST
+ 	cvlist = new ContactView(rosterBar);
+@@ -538,6 +540,14 @@ void MainWin::splitterMoved()
+ 	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
+ }
+ 
++void MainWin::optionChanged(const QString& option)
++{
++	if (option == toolbarsStateOptionPath) { //for compatibility with skins plugin
++		loadToolbarsState();
++		//buildToolbars(); //FIXME!!! not a very good solution
++	}
++}
++
+ void MainWin::registerAction( IconAction* action )
+ {
+ 	const char *activated  = SIGNAL( triggered() );
+--- git.temp.orig/src/mainwin.h
++++ git.temp/src/mainwin.h
+@@ -147,6 +147,8 @@ private slots:
+ 
+ 	void doTrayToolTip(QObject *, QPoint);
+ 
++	void optionChanged(const QString&);
++
+ public slots:
+ 	void setWindowIcon(const QPixmap&);
+ 	void showNoFocus();

psi-plus-main-20141106.tar.xz/patches/0510-psi-css-style-sheet.diff Added

@@ -0,0 +1,323 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -114,6 +114,7 @@
+ 				<use-message-icons type="bool">true</use-message-icons>
+ 				<scaled-message-icons type="bool">false</scaled-message-icons>
+ 				<warn-before-clear type="bool">true</warn-before-clear>
++				<css type="QString" />
+ 				<only-paste-template type="bool">false</only-paste-template>
+ 			</chat>
+ 			<save>
+@@ -135,6 +136,7 @@
+ 					<show comment="Show status messages" type="bool">false</show>
+ 				</status-messages>
+ 				<tooltip comment="Display options for the contact list tooltips">
++					<css type="QString"></css>
+ 					<avatar comment="Display avatar" type="bool">true</avatar>
+ 					<client-version comment="Display client version information" type="bool">true</client-version>
+ 					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
+@@ -143,6 +145,58 @@
+ 				</tooltip>
+ 				<temp-no-roster-animation comment="Disable animated icons. This option will be removed as soon as the contactlist code is optimized enough" type="bool">false</temp-no-roster-animation>
+ 				<account-sort-style type="QString">alpha</account-sort-style>
++				<css type="QString">/* frame of avatar - general settings */
++/* фрейм с аватаром - общие настройки */
++RosterAvatarFrame * {
++	margin: 1px;
++}
++
++/* frame of avatar - avatar */
++/* фрейм с аватаром - аватар */
++QLabel#lb_avatar {
++	margin-left: 0px;
++	margin-top: 2px;
++	margin-bottom: 2px;
++	border: 1px solid #949494;
++	border-radius: 3px;
++}
++
++/* frame of avatar - nick */
++/* фрейм с аватаром - ник */
++QLabel#lb_nick {
++	margin: 2px;
++	margin-right: 1px;
++	margin-bottom: 3px;
++	border: 1px solid #949494;
++	border-radius: 3px;
++}
++
++/* frame of avatar - buttons of PEP and status */
++/* фрейм с аватаром - кнопки PEP и статуса */
++QToolButton#tb_status, #tb_mood, #tb_activity {
++	margin-left: 1px;
++	margin-right: 1px;
++	margin-bottom: 2px;
++	width: 100%;
++}
++
++QToolButton#tb_status {
++	margin-top: 0px;
++	margin-bottom: 1px;
++}
++
++/* frame of avatar - button of status, arrow */
++/* фрейм с аватаром - кнопка статуса, стрелка */
++QToolButton#tb_status::menu-indicator {
++	background: argb(0,0,0,0);
++}
++
++/* frame of avatar - field of status message */
++/* фрейм с аватаром - строка статусного сообщения */
++QLineEdit#le_status_text {
++	margin-right: 0px;
++	margin-bottom: 2px;
++}</css>
+ 				<always-on-top type="bool">false</always-on-top>
+ 				<automatically-resize-roster type="bool">false</automatically-resize-roster>
+ 				<grow-roster-upwards type="bool">true</grow-roster-upwards>
+@@ -323,6 +377,7 @@
+ 					<message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</message>
+ 					<passive-popup type="QString">Sans Serif,7,-1,5,50,0,0,0,0,0</passive-popup>
+ 				</font>
++				<css type="QString" />
+ 			</look>
+ 			<notifications>
+ 				<send-receipts type="bool" >true</send-receipts>
+@@ -339,6 +394,7 @@
+ 						<status type="int">2000</status>
+ 					</delays>
+ 					<enabled type="bool">false</enabled>
++					<css type="QString"></css>
+ 					<top-to-bottom type="bool">false</top-to-bottom>
+ 					<at-left-corner type="bool">false</at-left-corner>
+ 					<incoming-chat type="bool">true</incoming-chat>
+--- git.orig/src/contactlistitemmenu.cpp
++++ git/src/contactlistitemmenu.cpp
+@@ -21,12 +21,17 @@
+ #include "contactlistitemmenu.h"
+ 
+ #include "shortcutmanager.h"
++#include "psioptions.h"
+ 
+ ContactListItemMenu::ContactListItemMenu(ContactListItem* item, ContactListModel* model)
+ 	: QMenu(0)
+ 	, item_(item)
+ 	, model_(model)
+ {
++	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
+ }
+ 
+ ContactListItemMenu::~ContactListItemMenu()
+--- git.orig/src/gcuserview.cpp
++++ git/src/gcuserview.cpp
+@@ -523,6 +523,10 @@ void GCUserView::doContextMenu(QTreeWidg
+ 	pm->addAction(act);
+ 	act->setData(3);
+ 
++	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty()) {
++		pm->setStyleSheet(css);
++	}
+ 	int x = -1;
+ 	bool enabled = false;
+ 	act = pm->exec(QCursor::pos());
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1703,6 +1703,10 @@ QString GCMainDlg::desiredCaption() cons
+ 
+ void GCMainDlg::setLooks()
+ {
++	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
+ 	ui_.vsplitter->optionsChanged();
+ 	ui_.mle->optionsChanged();
+ 
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -514,6 +514,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 
+ 		/*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
+ 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
++	optionChanged("options.ui.contactlist.css");
+ }
+ 
+ MainWin::~MainWin()
+@@ -546,6 +547,12 @@ void MainWin::optionChanged(const QStrin
+ 		loadToolbarsState();
+ 		//buildToolbars(); //FIXME!!! not a very good solution
+ 	}
++	else if (option == "options.ui.contactlist.css") {
++		const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
++		if (!css.isEmpty()) {
++			setStyleSheet(css);
++		}
++	}
+ }
+ 
+ void MainWin::registerAction( IconAction* action )
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -267,6 +267,10 @@ void PsiChatDlg::setLooks()
+ {
+ 	ChatDlg::setLooks();
+ 
++	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
+ 	ui_.splitter->optionsChanged();
+ 	ui_.mle->optionsChanged();
+ 
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -501,6 +501,10 @@ bool PsiCon::init()
+ 	d->iconSelect = new IconSelectPopup(0);
+ 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
+ 
++	const QString css = options->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty())
++		d->iconSelect->setStyleSheet(css);
++
+ 	// first thing, try to load the iconset
+ 	bool result = true;;
+ 	if( !PsiIconset::instance()->loadAll() ) {
+@@ -1337,6 +1341,13 @@ void PsiCon::optionChanged(const QString
+ 	if (option == "options.p2p.bytestreams.listen-port") {
+ 		s5b_init();
+ 	}
++	if (option == "options.ui.chat.css") {
++		QString css = PsiOptions::instance()->getOption(option).toString();
++		if (!css.isEmpty())
++			d->iconSelect->setStyleSheet(css);
++		return;
++	}
++
+ #ifdef USE_PEP
+ 	if (option == tuneUrlFilterOptionPath || option == tuneTitleFilterOptionPath) {
+ 		d->tuneManager->setTuneFilters(PsiOptions::instance()->getOption(tuneUrlFilterOptionPath).toString().split(QRegExp("\\W+")),
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -368,6 +368,11 @@ void TabDlg::setLooks()
+ 		tabWidget_->setTabPosition(QTabWidget::South);
+ 
+ 	setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
++
++	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
+ }
+ 
+ void TabDlg::tabSelected(QWidget* _selected)
+--- git.orig/src/widgets/fancypopup.cpp
++++ git/src/widgets/fancypopup.cpp
+@@ -213,6 +213,11 @@ void FancyPopup::Private::initContents(Q
+ 	ui_.closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
+ 	ui_.closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
+ 	connect(ui_.closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
++
++	const QString css = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.css").toString();
++	if (!css.isEmpty()) {
++		popup->setStyleSheet(css);
++	}
+ }
+ 
+ bool FancyPopup::Private::eventFilter(QObject *o, QEvent *e)
+--- git.orig/src/widgets/iconaction.cpp
++++ git/src/widgets/iconaction.cpp
+@@ -30,6 +30,8 @@ class PsiIcon;
+ class Iconset;
+ #endif
+ 
++#include "psioptions.h"
++
+ #include <QLayout>
+ #include <QMenu>
+ #include <QTimer>
+@@ -441,6 +443,11 @@ IconActionGroup::IconActionGroup(QObject
+ 	d->updatePopup();
+ 
+ 	d->exclusive = exclusive;
++
++	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
++	if (!css.isEmpty()) {
++		d->popup->setStyleSheet(css);
++	}
+ }
+ 
+ IconActionGroup::~IconActionGroup()
+--- git.orig/src/widgets/psitabwidget.cpp
++++ git/src/widgets/psitabwidget.cpp
+@@ -74,6 +74,7 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
+ 	stacked_ = new QStackedLayout(layout_);
+ 
+ 	setTabPosition(QTabWidget::North);
++	setLooks();
+ 
+ 	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
+ 		closeButton_->hide();
+@@ -179,9 +180,18 @@ void PsiTabWidget::addTab(QWidget *widge
+ 		tabBar_->addTab(icon, name);
+ 	else
+ 		tabBar_->addTab(name);
++	setLooks();
+ 	showPage(currentPage());
+ }
+ 
++void PsiTabWidget::setLooks()
++{
++	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
++}
++
+ /**
+  * Selects the page for the specified widget.
+  */
+--- git.orig/src/widgets/psitabwidget.h
++++ git/src/widgets/psitabwidget.h
+@@ -67,6 +67,7 @@ public:
+ public slots:
+ 	void setCurrentPage(int);
+ 	void removeCurrentPage();
++	void setLooks();
+ 
+ signals:
+ 	void mouseDoubleClickTab(QWidget *tab);
+--- git.orig/src/widgets/psitiplabel.cpp
++++ git/src/widgets/psitiplabel.cpp
+@@ -55,6 +55,10 @@ void PsiTipLabel::init(const QString& te
+ 			enableColoring_ = false;
+ 		}
+ 	}
++	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
+ }
+ 
+ void PsiTipLabel::setText(const QString& text)
+--- git.orig/src/widgets/urlobject.cpp
++++ git/src/widgets/urlobject.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "urlobject.h"
++#include "psioptions.h"
+ 
+ #include <QApplication>
+ #include <QClipboard>
+@@ -229,6 +230,7 @@ QMenu *URLObject::createPopupMenu(const
+ 	}
+ 
+ 	m->addAction(d->act_copy);
++	m->setStyleSheet(PsiOptions::instance()->getOption("options.ui.look.css").toString());
+ 	return m;
+ }
+

psi-plus-main-20141106.tar.xz/patches/0520-psi-roster-groups-disable.diff Added

@@ -0,0 +1,109 @@
+--- psi.orig/options/default.xml
++++ psi/options/default.xml
+@@ -203,6 +203,7 @@ QLineEdit#le_status_text {
+ 				<disable-scrollbar type="bool">true</disable-scrollbar>
+ 				<contact-sort-style type="QString">status</contact-sort-style>
+ 				<disable-service-discovery type="bool">false</disable-service-discovery>
++				<enable-groups type="bool">true</enable-groups>
+ 				<ensure-contact-visible-on-event type="bool">true</ensure-contact-visible-on-event>
+ 				<group-sort-style type="QString">alpha</group-sort-style>
+ 				<lockdown-roster type="bool">false</lockdown-roster>
+@@ -477,6 +478,7 @@ QLineEdit#le_status_text {
+ 				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
+ 				<button_options type="QKeySequence" comment="Options"></button_options>
+ 				<button_status type="QKeySequence" comment="Status"></button_status>
++				<enable_groups type="QKeySequence" comment="Enable Groups"></enable_groups>
+ 				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
+ 				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
+ 				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
+--- psi.orig/src/mainwin.cpp
++++ psi/src/mainwin.cpp
+@@ -583,6 +583,7 @@ void MainWin::registerAction( IconAction
+ 		{ "show_agents",    toggled, contactList, SLOT( setShowAgents(bool) ) },
+ 		{ "show_self",      toggled, contactList, SLOT( setShowSelf(bool) ) },
+ 		{ "show_statusmsg", toggled, d->rosterWidget_, SLOT( setShowStatusMsg(bool) ) },
++		{ "enable_groups",  toggled,   this, SLOT( actEnableGroupsActivated(bool) ) },
+ #endif
+ 
+ 		{ "button_options", activated, this, SIGNAL( doOptions() ) },
+@@ -644,6 +645,9 @@ void MainWin::registerAction( IconAction
+ 			if ( aName == "menu_play_sounds" ) {
+ 				action->setChecked(PsiOptions::instance()->getOption("options.ui.notifications.sounds.enable").toBool());
+ 			}
++			else if ( aName == "enable_groups" ) {
++				action->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.enable-groups").toBool());
++			}
+ 			//else if ( aName == "foobar" )
+ 			//	;
+ 		}
+@@ -1080,6 +1084,11 @@ void MainWin::actPublishTuneActivated (b
+ 	PsiOptions::instance()->setOption("options.extended-presence.tune.publish",state);
+ }
+ 
++void MainWin::actEnableGroupsActivated (bool state)
++{
++	PsiOptions::instance()->setOption("options.ui.contactlist.enable-groups", state);
++}
++
+ void MainWin::activatedAccOption(PsiAccount* pa, int x)
+ {
+ 	if(x == 0) {
+--- psi.orig/src/mainwin.h
++++ psi/src/mainwin.h
+@@ -131,6 +131,7 @@ private slots:
+ 	void actAboutPsiMediaActivated ();
+ 	void actPlaySoundsActivated (bool);
+ 	void actPublishTuneActivated (bool);
++	void actEnableGroupsActivated (bool);
+ 	void actTipActivated();
+ 	void actDiagQCAPluginActivated();
+ 	void actDiagQCAKeyStoreActivated();
+--- psi.orig/src/psiactionlist.cpp
++++ psi/src/psiactionlist.cpp
+@@ -140,6 +140,9 @@ void PsiActionList::Private::createMainW
+ 		viewGroups->setUsesDropDown(true);
+ 		viewGroups->setExclusive(false);
+ 
++		IconAction *actEnableGroups = new IconAction(tr("Show Roster Groups"), "psi/enable-groups", tr("Show Roster Groups"), 0, viewGroups, 0, true);
++		actEnableGroups->setWhatsThis(tr("Enable/disable groups in roster"));
++
+ 		IconAction *showOffline = new IconAction(tr("Show Offline Contacts"), "psi/show_offline", tr("Show Offline Contacts"), 0, viewGroups, 0, true);
+ 		showOffline->setWhatsThis(tr("Toggles visibility of offline contacts in roster"));
+ 
+@@ -161,6 +164,7 @@ void PsiActionList::Private::createMainW
+ 
+ 		ActionNames actions[] = {
+ 			{ "view_groups",  viewGroups  },
++			{ "enable_groups",   actEnableGroups  },
+ 			{ "show_offline", showOffline },
+ 			//{ "show_away",    showAway    },
+ 			{ "show_hidden",  showHidden  },
+--- psi.orig/src/psirosterwidget.cpp
++++ psi/src/psirosterwidget.cpp
+@@ -49,6 +49,7 @@ static const QString showSelfOptionPath
+ static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
+ static const QString allowAutoResizeOptionPath = "options.ui.contactlist.automatically-resize-roster";
+ static const QString showScrollBarOptionPath = "options.ui.contactlist.disable-scrollbar";
++static const QString enableGroupsOptionPath = "options.ui.contactlist.enable-groups";
+ 
+ //----------------------------------------------------------------------------
+ // PsiRosterFilterProxyModel
+@@ -179,7 +180,7 @@ void PsiRosterWidget::setContactList(Psi
+ 
+ 	contactListModel_ = new PsiContactListModel(contactList_);
+ 	contactListModel_->invalidateLayout();
+-	contactListModel_->setGroupsEnabled(true);
++	contactListModel_->setGroupsEnabled(PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool());
+ 	contactListModel_->setAccountsEnabled(true);
+ 	contactListModel_->storeGroupState("contacts");
+ #ifdef MODELTEST
+@@ -242,6 +243,9 @@ void PsiRosterWidget::optionChanged(cons
+ 			PsiOptions::instance()->getOption(showScrollBarOptionPath).toBool() ?
+ 			Qt::ScrollBarAlwaysOff : Qt::ScrollBarAsNeeded );
+ 	}
++	else if (option == enableGroupsOptionPath) {
++		contactListModel_->setGroupsEnabled(PsiOptions::instance()->getOption(enableGroupsOptionPath).toBool());
++	}
+ }
+ 
+ void PsiRosterWidget::removeSelection(QMimeData* selection)

psi-plus-main-20141106.tar.xz/patches/0530-psi-muc-minimize-to-roster.diff Added

@@ -0,0 +1,1089 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -116,6 +116,7 @@
+ 				<warn-before-clear type="bool">true</warn-before-clear>
+ 				<css type="QString" />
+ 				<only-paste-template type="bool">false</only-paste-template>
++				<hide-when-closing type="bool">false</hide-when-closing>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+@@ -547,9 +548,13 @@ QLineEdit#le_status_text {
+ 				<scroll-up type="QKeySequence" comment="Scroll up">Shift+PgUp</scroll-up>
+ 				<scroll-down type="QKeySequence" comment="Scroll down">Shift+PgDown</scroll-down>
+ 				<close type="QVariantList" comment="Close the current window/tab">
+-					<item type="QKeySequence">Esc</item>
++					<item type="QKeySequence">Ctrl+Q</item>
+ 					<item type="QKeySequence">Ctrl+W</item>
+ 				</close>
++				<hide type="QVariantList" comment="Hide the current window/tab">
++					<item type="QKeySequence">ESC</item>
++					<item type="QKeySequence">Alt+H</item>
++				</hide>
+ 				<history type="QKeySequence" comment="Open the message history">Ctrl+H</history>
+ 				<user-info type="QKeySequence" comment="Show the user info of the contact">Ctrl+I</user-info>
+ 			</common>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -173,6 +173,10 @@ void ChatDlg::initActions()
+ 	addAction(act_close_);
+ 	connect(act_close_, SIGNAL(triggered()), SLOT(close()));
+ 
++	act_hide_ = new QAction(this);
++	addAction(act_hide_);
++	connect(act_hide_, SIGNAL(triggered()), SLOT(hideTab()));
++
+ 	act_scrollup_ = new QAction(this);
+ 	addAction(act_scrollup_);
+ 	connect(act_scrollup_, SIGNAL(triggered()), chatView(), SLOT(scrollUp()));
+@@ -202,6 +206,7 @@ void ChatDlg::setShortcuts()
+ 	act_send_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.send"));
+ 	act_scrollup_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
+ 	act_scrolldown_->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
++	act_hide_->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
+ 
+ 	if(!isTabbed()) {
+ 		act_close_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -172,6 +172,7 @@ private:
+ 	QAction* act_scrollup_;
+ 	QAction* act_scrolldown_;
+ 	QAction* act_close_;
++	QAction* act_hide_;
+ 
+ 	int pending_;
+ 	bool keepOpen_;
+--- git.orig/src/contactlistgroup.h
++++ git/src/contactlistgroup.h
+@@ -93,7 +93,8 @@ public:
+ 		SpecialType_General,
+ 		SpecialType_NotInList,
+ 		SpecialType_Transports,
+-		SpecialType_MUCPrivateChats
++		SpecialType_MUCPrivateChats,
++		SpecialType_Conference
+ 	};
+ 
+ 	virtual bool isSpecial() const;
+--- git.orig/src/contactlistgroupmenu.cpp
++++ git/src/contactlistgroupmenu.cpp
+@@ -35,6 +35,8 @@
+ #include "statusdlg.h"
+ #include "xmpp_tasks.h"
+ 
++#include "groupchatdlg.h"
++
+ class ContactListGroupMenu::Private : public QObject
+ {
+ 	Q_OBJECT
+@@ -52,6 +54,9 @@ class ContactListGroupMenu::Private : pu
+ 	QAction* actionAuthRequest_;
+ 	QAction* actionAuthRemove_;
+ 	QAction* actionCustomStatus_;
++	QAction* actionMucHide_;
++	QAction* actionMucShow_;
++	QAction* actionMucLeave_;
+ 
+ public:
+ 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
+@@ -94,23 +99,41 @@ public:
+ 		connect(addGroupAction_, SIGNAL(triggered()), SLOT(addGroup()));
+ #endif
+ 
++		actionMucHide_ = new IconAction(tr("Hide All"), this, "psi/action_muc_hide");
++		connect(actionMucHide_, SIGNAL(triggered()), SLOT(mucHide()));
++
++		actionMucShow_ = new IconAction(tr("Show All"), this, "psi/action_muc_show");
++		connect(actionMucShow_, SIGNAL(triggered()), SLOT(mucShow()));
++
++		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
++		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
++
+ 		updateActions();
+ 
++		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
+ #ifdef YAPSI
+-		menu->addAction(renameAction_);
+-		menu->addAction(removeGroupAndContactsAction_);
+-		menu->addAction(addGroupAction_);
++			menu->addAction(renameAction_);
++			menu->addAction(removeGroupAndContactsAction_);
++			menu->addAction(addGroupAction_);
+ #else
+-		menu->addAction(renameAction_);
+-		menu->addAction(sendMessageAction_);
+-		menu->addAction(actionCustomStatus_);
+-		menu->addSeparator();
+-		authMenu_ = menu->addMenu(tr("Authorization"));
+-		authMenu_->addAction(actionAuth_);
+-		authMenu_->addAction(actionAuthRequest_);
+-		authMenu_->addAction(actionAuthRemove_);
+-		menu->addAction(removeGroupWithoutContactsAction_);
+-		menu->addAction(removeGroupAndContactsAction_);
++			menu->addAction(renameAction_);
++			menu->addAction(sendMessageAction_);
++			menu->addAction(actionCustomStatus_);
++			menu->addSeparator();
++			authMenu_ = menu->addMenu(tr("Authorization"));
++			authMenu_->addAction(actionAuth_);
++			authMenu_->addAction(actionAuthRequest_);
++			authMenu_->addAction(actionAuthRemove_);
++			menu->addAction(removeGroupWithoutContactsAction_);
++			menu->addAction(removeGroupAndContactsAction_);
++		}
++		else {
++			menu->addAction(actionMucHide_);
++			menu->addAction(actionMucShow_);
++			menu->addAction(actionMucLeave_);
++			menu->addSeparator();
++			menu->addAction(actionCustomStatus_);
++		}
+ #endif
+ 	}
+ 
+@@ -129,6 +152,41 @@ private slots:
+ #endif
+ 	}
+ 
++	void mucHide()
++	{
++		PsiAccount *pa = group->contacts().first()->account();
++		foreach (QString gc, pa->groupchats()) {
++			Jid j(gc);
++			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
++			if (gcDlg && (gcDlg->isTabbed() || !gcDlg->isHidden()))
++				gcDlg->hideTab();
++		}
++	}
++
++	void mucShow()
++	{
++		PsiAccount *pa = group->contacts().first()->account();
++		foreach (QString gc, pa->groupchats()) {
++			Jid j(gc);
++			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
++			if (gcDlg) {
++				gcDlg->ensureTabbedCorrectly();
++				gcDlg->bringToFront();
++			}
++		}
++	}
++
++	void mucLeave()
++	{
++		PsiAccount *pa = group->contacts().first()->account();
++		foreach (QString gc, pa->groupchats()) {
++			Jid j(gc);
++			GCMainDlg *gcDlg = pa->findDialog<GCMainDlg*>(j.bare());
++			if (gcDlg)
++				gcDlg->close();
++		}
++	}
++
+ 	void rename()
+ 	{
+ 		if (!group)
+--- git.orig/src/contactlistmodel.cpp
++++ git/src/contactlistmodel.cpp
+@@ -555,6 +555,12 @@ QVariant ContactListModel::contactData(c
+ 		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
+ 		return QVariant(pix);
+ 	}
++	else if (role == IsMucRole) {
++		return QVariant(contact->userListItem().isConference());
++	}
++	else if (role == MucMessagesRole) {
++		return QVariant(contact->userListItem().pending());
++	}
+ #ifdef YAPSI
+ 	else if (role == Qt::ForegroundRole) {
+ 		return QVariant(Ya::statusColor(contact->status().type()));
+--- git.orig/src/contactlistmodel.h
++++ git/src/contactlistmodel.h
+@@ -84,6 +84,8 @@ public:
+ 		ClientRole = Qt::UserRole + 26,
+ 		TuneRole = Qt::UserRole + 27,
+ 		AvatarRole = Qt::UserRole + 28,
++		IsMucRole = Qt::UserRole + 29,
++		MucMessagesRole = Qt::UserRole + 30,
+ 
+ 		// groups
+ 		ExpandedRole = Qt::UserRole + 12,
+--- git.orig/src/contactlistnestedgroup.cpp
++++ git/src/contactlistnestedgroup.cpp
+@@ -298,6 +298,9 @@ ContactListGroup* ContactListNestedGroup
+ 	else if (contact->isAgent()) {
+ 		type = ContactListGroup::SpecialType_Transports;
+ 	}
++	else if (contact->isConference()) {
++		type = ContactListGroup::SpecialType_Conference;
++	}
+ 	else if (contact->noGroups()) {
+ 		type = ContactListGroup::SpecialType_General;
+ 	}
+--- git.orig/src/contactlistspecialgroup.cpp
++++ git/src/contactlistspecialgroup.cpp
+@@ -45,6 +45,10 @@ ContactListSpecialGroup::ContactListSpec
+ 		name_ += "mucprivatechats";
+ 		displayName_ = tr("Private messages");
+ 		break;
++	case SpecialType_Conference:
++		name_ += "conferences";
++		displayName_ = tr("Conferences");
++		break;
+ 	default:
+ 		Q_ASSERT(false);
+ 	}
+@@ -102,8 +106,9 @@ bool ContactListSpecialGroup::compare(co
+ 		rank[SpecialType_General]         = 0;
+ 		rank[SpecialType_None]            = 1;
+ 		rank[SpecialType_MUCPrivateChats] = 2;
+-		rank[SpecialType_Transports]      = 3;
++		rank[SpecialType_Conference]      = 3;
+ 		rank[SpecialType_NotInList]       = 4;
++		rank[SpecialType_Transports]      = 5;
+ 		Q_ASSERT(rank.contains(specialGroupType()));
+ 		Q_ASSERT(rank.contains(group->specialGroupType()));
+ 		return rank[specialGroupType()] < rank[group->specialGroupType()];
+--- git.orig/src/eventdlg.cpp
++++ git/src/eventdlg.cpp
+@@ -1380,6 +1380,8 @@ void EventDlg::keyPressEvent(QKeyEvent *
+ 		close();
+ 	else if(ShortcutManager::instance()->shortcuts("message.send").contains(key))
+ 		doSend();
++	else if(ShortcutManager::instance()->shortcuts("common.hide").contains(key))
++		hide();
+ 	else
+ 		e->ignore();
+ }
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -214,7 +214,7 @@ public:
+ #endif
+ 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
+ 
+-	QAction *act_mini_cmd, *act_nick;
++	QAction *act_mini_cmd, *act_nick, *act_hide;
+ 
+ 	MCmdSimpleSite mCmdSite;
+ 	MCmdManager mCmdManager;
+@@ -223,6 +223,7 @@ public:
+ 
+ 	QMenu *pm_settings;
+ 	int pending;
++	int hPending; // highlight pending
+ 	bool connecting;
+ 
+ 	QStringList hist;
+@@ -602,6 +603,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	d->mucManager = new MUCManager(account()->client(), jid());
+ 
+ 	d->pending = 0;
++	d->hPending = 0;
+ 	d->connecting = false;
+ 
+ 	d->histAt = 0;
+@@ -736,6 +738,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	d->act_close = new QAction(this);
+ 	addAction(d->act_close);
+ 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
++	d->act_hide = new QAction(this);
++	addAction(d->act_hide);
++	connect(d->act_hide,SIGNAL(triggered()), SLOT(hideTab()));
+ 	d->act_scrollup = new QAction(this);
+ 	addAction(d->act_scrollup);
+ 	connect(d->act_scrollup,SIGNAL(triggered()), SLOT(scrollUp()));
+@@ -865,6 +870,7 @@ void GCMainDlg::setShortcuts()
+ 	} else {
+ 		d->act_close->QAction::setShortcuts (QList<QKeySequence>());
+ 	}
++	d->act_hide->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
+ 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
+ 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
+ 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
+@@ -883,6 +889,8 @@ void GCMainDlg::scrollDown()
+ void GCMainDlg::closeEvent(QCloseEvent *e)
+ {
+ 	e->accept();
++	if (d->state != Private::Connected)
++		account()->groupChatLeave(d->dlg->jid().domain(),d->dlg->jid().node());
+ }
+ 
+ void GCMainDlg::deactivated()
+@@ -898,6 +906,12 @@ void GCMainDlg::activated()
+ 
+ 	if(d->pending > 0) {
+ 		d->pending = 0;
++		d->hPending = 0;
++		UserListItem* u = account()->find(d->dlg->jid().bare());
++		if (u) {
++			u->setPending(d->pending, d->hPending);
++			account()->updateEntry(*u);
++		}
+ 		invalidateTab();
+ 	}
+ 	doFlash(false);
+@@ -1313,6 +1327,14 @@ void GCMainDlg::presence(const QString &
+ 	if (nick == d->self) {
+ 		if(s.isAvailable())
+ 			setStatusTabIcon(s.type());
++		UserListItem* u = account()->find(d->dlg->jid().bare());
++		if(u) {
++			Resource r;
++			r.setName("Muc");
++			r.setStatus(s);
++			u->userResourceList().replace(0, r);
++			account()->updateEntry(*u);
++		}
+ 		// Update configuration dialog
+ 		if (d->configDlg) {
+ 			d->configDlg->setRoleAffiliation(s.mucItem().role(),s.mucItem().affiliation());
+@@ -1593,6 +1615,7 @@ void GCMainDlg::joined()
+ 		setConnecting();
+ 		appendSysMsg(tr("Connected."), true);
+ 	}
++	account()->addMucItem(d->dlg->jid().bare());
+ }
+ 
+ void GCMainDlg::setPassword(const QString& p)
+@@ -1664,6 +1687,13 @@ void GCMainDlg::appendMessage(const Mess
+ 	// if we're not active, notify the user by changing the title
+ 	if(!isActiveTab() && !mv.isLocal()) {
+ 		++d->pending;
++		if(alert)
++			++d->hPending;
++		UserListItem* u = account()->find(d->dlg->jid().bare());
++		if (u) {
++			u->setPending(d->pending, d->hPending);
++			account()->updateEntry(*u);
++		}
+ 		invalidateTab();
+ 	}
+ 
+--- git.orig/src/historydlg.cpp
++++ git/src/historydlg.cpp
+@@ -225,7 +225,8 @@ void HistoryDlg::loadContacts()
+ 	ui_.msgLog->clear();
+ 	foreach (PsiContact* contact, d->pa->contactList())
+ 	{
+-		if(contact->isPrivate()
++		if(contact->isConference()
++		|| contact->isPrivate()
+ 		|| jids_.contains(contact->jid().bare()))
+ 			continue;
+ 
+--- git.orig/src/mucjoindlg.cpp
++++ git/src/mucjoindlg.cpp
+@@ -161,6 +161,8 @@ void MUCJoinDlg::doJoin()
+ 
+ 	GCMainDlg *gc = account_->findDialog<GCMainDlg*>(j.bare());
+ 	if (gc) {
++		if(gc->isHidden() && !gc->isTabbed())
++			gc->ensureTabbedCorrectly();
+ 		gc->bringToFront();
+ 		if (gc->isInactive()) {
+ 			if(gc->jid() != j)
+@@ -200,6 +202,7 @@ void MUCJoinDlg::joined()
+ 
+ 	closeDialogs(this);
+ 	deleteLater();
++	account_->addMucItem(jid_.bare());
+ }
+ 
+ void MUCJoinDlg::error(int, const QString &str)
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -641,10 +641,11 @@ public:
+ 	void removeEntry(const Jid& jid)
+ 	{
+ 		PsiContact* contact = findContact(jid);
+-		Q_ASSERT(contact);
+-		delete contact;
+-		emit account->removeContact(jid);
+-
++		if (contact) {
++			Q_ASSERT(contact);
++			delete contact;
++			emit account->removeContact(jid);
++		}
+ 		updateOnlineContactsCount();
+ 	}
+ 
+@@ -3867,6 +3868,14 @@ void PsiAccount::actionDefault(const Jid
+ 
+ 	if(d->eventQueue->count(u->jid()) > 0)
+ 		openNextEvent(*u, UserAction);
++	else if (groupchats().contains(j.full()))
++	{
++		TabbableWidget *tab = findDialog<TabbableWidget*>(Jid(j.full()));
++		if(tab) {
++			tab->ensureTabbedCorrectly();
++			tab->bringToFront();
++		}
++	}
+ 	else {
+ 		if(PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message")
+ 			actionSendMessage(u->jid());
+@@ -4831,7 +4840,8 @@ void PsiAccount::handleEvent(const PsiEv
+ #endif
+ 				c->incomingMessage(m);
+ 				soundType = eChat2;
+-				if(o->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab()) {
++				if((o->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && !c->isActiveTab())
++					|| (c->isTabbed() && c->getManagingTabDlg()->isHidden()) ) {
+ 					// to alert the chat also, we put it in the queue
+ 					me->setSentToChatWindow(true);
+ 				}
+@@ -5018,6 +5028,7 @@ UserListItem* PsiAccount::addUserListIte
+ 	u->setInList(false);
+ 	u->setAvatarFactory(avatarFactory());
+ 	u->setName(nick);
++	u->setConference(groupchats().contains(jid.full()));
+ 
+ 	// is it a private groupchat?
+ 	Jid j = u->jid();
+@@ -5033,6 +5044,21 @@ UserListItem* PsiAccount::addUserListIte
+ 		u->userResourceList().append(ur);
+ 	}
+ 
++	if(u->isConference()) {
++		// make a resource so the contact appears online
++		QString name = j.node();
++		UserResource ur;
++		foreach(ConferenceBookmark c, d->bookmarkManager->conferences())
++		{
++			if(c.jid().full() == j.bare()) name = c.name();
++		}
++		u->setInList(true);
++		u->setName(name);
++		ur.setName("Muc");
++		ur.setStatus(status());
++		u->userResourceList().append(ur);
++	}
++
+ 	// treat it like a push  [pushinfo]
+ 	//VCard info;
+ 	//if(readUserInfo(item->jid, &info) && !info.field[vNickname].isEmpty())
+@@ -5047,6 +5073,20 @@ UserListItem* PsiAccount::addUserListIte
+ 	return u;
+ }
+ 
++void PsiAccount::addMucItem(const Jid& jid)
++{
++	if (jid.isEmpty())
++		return;
++	UserListItem *u = find(jid);
++	if (u) {
++		d->removeEntry(jid);
++		d->userList.removeAll(u);
++	}
++	if (!d->groupchats.contains(jid.bare()))
++		d->groupchats += jid.bare();
++	addUserListItem(jid.bare(), "");
++}
++
+ // put an event into the event queue, and update the related alerts
+ void PsiAccount::queueEvent(const PsiEvent::Ptr &e, ActivationType activationType)
+ {
+@@ -5139,8 +5179,12 @@ void PsiAccount::openNextEvent(Activatio
+ 	}
+ 
+ 	UserListItem *u = find(e->jid());
+-	if(!u)
+-		return;
++	if(!u) {
++		u = new UserListItem();
++		u->setJid(e->jid());
++		u->setInList(false);
++		d->userList.append(u);
++	}
+ 	openNextEvent(*u, activationType);
+ }
+ 
+@@ -5331,9 +5375,9 @@ void PsiAccount::openChat(const Jid& j,
+ 
+ void PsiAccount::chatMessagesRead(const Jid &j)
+ {
+-	if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) {
++//	if(PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool()) {
+ 		processChats(j);
+-	}
++//	}
+ }
+ 
+ void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e)
+@@ -5355,17 +5399,6 @@ void PsiAccount::edb_finished()
+ void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType)
+ {
+ #ifdef GROUPCHAT
+-	QString str = j.bare();
+-	bool found = false;
+-	for(QStringList::ConstIterator it = d->groupchats.begin(); it != d->groupchats.end(); ++it) {
+-		if((*it) == str) {
+-			found = true;
+-			break;
+-		}
+-	}
+-	if(!found)
+-		d->groupchats += str;
+-
+ 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
+ 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
+ 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
+@@ -5405,8 +5438,14 @@ void PsiAccount::groupChatSetStatus(cons
+ 
+ void PsiAccount::groupChatLeave(const QString &host, const QString &room)
+ {
+-	d->groupchats.removeAll(room + '@' + host);
++	Jid j(room + '@' + host);
++	d->groupchats.removeAll(j.bare());
+ 	d->client->groupChatLeave(host, room);
++	UserListItem *u = find(j);
++	if (u) {
++		d->removeEntry(j);
++		d->userList.removeAll(u);
++	}
+ }
+ 
+ GCContact *PsiAccount::findGCContact(const Jid &j) const
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -268,6 +268,7 @@ public:
+ 	class xmlRingElem { public: int type; QDateTime time; QString xml; };
+ 	QList< xmlRingElem > dumpRingbuf();
+ 	void clearRingbuf();
++	void addMucItem(const Jid&);
+ 
+ signals:
+ 	void accountDestroyed();
+--- git.orig/src/psicontact.cpp
++++ git/src/psicontact.cpp
+@@ -369,7 +369,8 @@ bool PsiContact::isDragEnabled() const
+ {
+ 	return isEditable()
+ 	       && !isPrivate()
+-	       && !isAgent();
++	       && !isAgent()
++	       && !isConference();
+ }
+ 
+ /**
+@@ -950,6 +951,11 @@ bool PsiContact::isAgent() const
+ 	return userListItem().isTransport();
+ }
+ 
++bool PsiContact::isConference() const
++{
++	return userListItem().isConference();
++}
++
+ bool PsiContact::inList() const
+ {
+ 	return userListItem().inList();
+--- git.orig/src/psicontact.h
++++ git/src/psicontact.h
+@@ -55,6 +55,7 @@ public:
+ 	virtual bool isAgent() const;
+ 	virtual bool inList() const;
+ 	virtual bool isPrivate() const;
++	virtual bool isConference() const;
+ 	virtual bool noGroups() const;
+ 	virtual bool authorized() const;
+ 	virtual bool authorizesToSeeStatus() const;
+--- git.orig/src/psicontactlistviewdelegate.cpp
++++ git/src/psicontactlistviewdelegate.cpp
+@@ -301,7 +301,9 @@ void PsiContactListViewDelegate::drawCon
+ 			txtRect.setHeight(r.height() - txtRect.height());
+ 			o.font.setPointSize(qMax(o.font.pointSize()-2, 7));
+ 			o.fontMetrics = QFontMetrics(o.font);
++			painter->save();
+ 			drawText(painter, o, txtRect, statusMsg, index);
++			painter->restore();
+ 		}
+ 	}
+ 	else {
+@@ -311,9 +313,15 @@ void PsiContactListViewDelegate::drawCon
+ 		drawText(painter, o, r, text, index);
+ 	}
+ 
++	bool isMuc = index.data(ContactListModel::IsMucRole).toBool();
++	QString mucMessages;
++	if(isMuc)
++		mucMessages = index.data(ContactListModel::MucMessagesRole).toString();
++
+ 	QRect iconRect(r);
+ 	QList<QPixmap> rightPixs;
+ 	QList<int> rightWidths;
++	if(!isMuc) {
+ 	if (showClientIcons_) {
+ 		const QList<QPixmap> pixList = this->clientPixmap(index);
+ 
+@@ -353,18 +361,23 @@ void PsiContactListViewDelegate::drawCon
+ 		rightPixs.push_back(pix);
+ 		rightWidths.push_back(pix.width());
+ 	}
++	}
+ 
+-	if(rightPixs.isEmpty())
++	if(rightPixs.isEmpty() && mucMessages.isEmpty())
+ 		return;
+ 
+ 	int sumWidth = 0;
+-	foreach (int w, rightWidths) {
+-		sumWidth += w;
++	if(isMuc)
++		sumWidth = fontMetrics_->width(mucMessages);
++	else {
++		foreach (int w, rightWidths) {
++			sumWidth += w;
++		}
++		sumWidth+=rightPixs.count();
+ 	}
+ 	QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
+ 	QColor tbgc = bgc;
+ 	tbgc.setAlpha(0);
+-	sumWidth+=rightPixs.count();
+ 	QLinearGradient grad(r.right() - sumWidth - 20, 0, r.right() - sumWidth, 0);
+ 	grad.setColorAt(0, tbgc);
+ 	grad.setColorAt(1, bgc);
+@@ -373,10 +386,16 @@ void PsiContactListViewDelegate::drawCon
+ 	gradRect.setLeft(gradRect.right() - sumWidth - 20);
+ 	painter->fillRect(gradRect, tbakBr);
+ 
+-	for (int i=0; i<rightPixs.size(); i++) {
+-		const QPixmap pix = rightPixs[i];
+-		iconRect.setRight(iconRect.right() - pix.width() -1);
+-		painter->drawPixmap(iconRect.topRight(), pix);
++	if(isMuc) {
++		iconRect.setLeft(iconRect.right() - sumWidth - 1);
++		painter->drawText(iconRect, mucMessages);
++	}
++	else {
++		for (int i=0; i<rightPixs.size(); i++) {
++			const QPixmap pix = rightPixs[i];
++			iconRect.setRight(iconRect.right() - pix.width() -1);
++			painter->drawPixmap(iconRect.topRight(), pix);
++		}
+ 	}
+ 
+ #if 0
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -47,6 +47,8 @@
+ #include "yaprofile.h"
+ #endif
+ 
++#include "groupchatdlg.h"
++
+ //----------------------------------------------------------------------------
+ // GroupMenu
+ //----------------------------------------------------------------------------
+@@ -251,6 +253,10 @@ public:
+ 	QAction* gpgUnassignKeyAction_;
+ 	QAction* vcardAction_;
+ 	QAction* historyAction_;
++	QAction* mucHideAction_;
++	QAction* mucShowAction_;
++	QAction* mucLeaveAction_;
++
+ #endif
+ 
+ public:
+@@ -314,6 +320,7 @@ public:
+ 		menu->addAction(blockAction_);
+ 		menu_->addSeparator();
+ 		menu_->addAction(disableMoodNotificationsAction_);
++		updateActions();
+ #else
+ 		addAuthAction_ = new IconAction(tr("Add/Authorize to Contact List"), this, "psi/addContact");
+ 		connect(addAuthAction_, SIGNAL(triggered()), SLOT(addAuth()));
+@@ -405,48 +412,68 @@ public:
+ 		activeChatsMenu_->setActiveChatsMode(true);
+ 		connect(activeChatsMenu_, SIGNAL(resourceActivated(PsiContact*, const XMPP::Jid&)), SLOT(openActiveChat(PsiContact*, const XMPP::Jid&)));
+ 
+-		menu_->addAction(addAuthAction_);
+-		menu_->addAction(transportLogonAction_);
+-		menu_->addAction(transportLogoffAction_);
+-		menu_->addSeparator();
+-		menu_->addAction(receiveIncomingEventAction_);
+-		menu_->addSeparator();
+-		msgMenu_ = menu_->addMenu(IconsetFactory::icon("psi/sendMessage").icon(), tr("Send &Message"));
+-		msgMenu_->addAction(sendMessageAction_);
+-		msgMenu_->addMenu(sendMessageToMenu_);
+-		msgMenu_->addAction(openChatAction_);
+-		msgMenu_->addMenu(openChatToMenu_);
+-		menu_->addAction(openWhiteboardAction_);
+-		menu_->addMenu(openWhiteboardToMenu_);
+-		menu_->addMenu(executeCommandMenu_);
+-		menu_->addMenu(activeChatsMenu_);
+-		if(AvCallManager::isSupported()) {
+-			menu_->addAction(voiceCallAction_);
++		mucHideAction_ = new IconAction(tr("Hide"), this, "psi/action_muc_hide");
++		connect(mucHideAction_, SIGNAL(triggered()), SLOT(mucHide()));
++		mucHideAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.hide"));
++
++		mucShowAction_ = new IconAction(tr("Show"), this, "psi/action_muc_show");
++		connect(mucShowAction_, SIGNAL(triggered()), SLOT(mucShow()));
++		mucShowAction_->setShortcuts(ShortcutManager::instance()->shortcuts("contactlist.chat"));
++
++		mucLeaveAction_ = new IconAction(tr("Leave"), this, "psi/action_muc_leave");
++		connect(mucLeaveAction_, SIGNAL(triggered()), SLOT(mucLeave()));
++		mucLeaveAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
++
++		if (!contact_->isConference()) {
++			menu_->addAction(addAuthAction_);
++			menu_->addAction(transportLogonAction_);
++			menu_->addAction(transportLogoffAction_);
++			menu_->addSeparator();
++			menu_->addAction(receiveIncomingEventAction_);
++			menu_->addSeparator();
++			msgMenu_ = menu_->addMenu(IconsetFactory::icon("psi/sendMessage").icon(), tr("Send &Message"));
++			msgMenu_->addAction(sendMessageAction_);
++			msgMenu_->addMenu(sendMessageToMenu_);
++			msgMenu_->addAction(openChatAction_);
++			msgMenu_->addMenu(openChatToMenu_);
++			menu_->addAction(openWhiteboardAction_);
++			menu_->addMenu(openWhiteboardToMenu_);
++			menu_->addMenu(executeCommandMenu_);
++			menu_->addMenu(activeChatsMenu_);
++			if(AvCallManager::isSupported()) {
++				menu_->addAction(voiceCallAction_);
++			}
++			menu_->addSeparator();
++			menu_->addAction(sendFileAction_);
++			menu_->addMenu(inviteToGroupchatMenu_);
++			menu_->addSeparator();
++			mngMenu_ = menu_->addMenu(IconsetFactory::icon("psi/manageContact").icon(), tr("Manage &Contact"));
++			mngMenu_->addAction(renameAction_);
++			mngMenu_->addMenu(groupMenu_);
++			authMenu_ = mngMenu_->addMenu(tr("&Authorization"));
++			authMenu_->addAction(authResendAction_);
++			authMenu_->addAction(authRerequestAction_);
++			authMenu_->addAction(authRemoveAction_);
++			mngMenu_->addAction(removeAction_);
++			menu_->addAction(customStatusAction_);
++			menu_->addSeparator();
++			pictureMenu_ = mngMenu_->addMenu(tr("&Picture"));
++			pictureMenu_->addAction(pictureAssignAction_);
++			pictureMenu_->addAction(pictureClearAction_);
++			mngMenu_->addAction(gpgAssignKeyAction_);
++			mngMenu_->addAction(gpgUnassignKeyAction_);
++			menu_->addAction(vcardAction_);
++			menu_->addAction(historyAction_);
++			updateActions();
++		}
++		else {
++			menu_->addAction(mucHideAction_);
++			menu_->addAction(mucShowAction_);
++			menu_->addAction(mucLeaveAction_);
++			menu_->addSeparator();
++			menu_->addAction(customStatusAction_);
+ 		}
+-		menu_->addSeparator();
+-		menu_->addAction(sendFileAction_);
+-		menu_->addMenu(inviteToGroupchatMenu_);
+-		menu_->addSeparator();
+-		mngMenu_ = menu_->addMenu(IconsetFactory::icon("psi/manageContact").icon(), tr("Manage &Contact"));
+-		mngMenu_->addAction(renameAction_);
+-		mngMenu_->addMenu(groupMenu_);
+-		authMenu_ = mngMenu_->addMenu(tr("&Authorization"));
+-		authMenu_->addAction(authResendAction_);
+-		authMenu_->addAction(authRerequestAction_);
+-		authMenu_->addAction(authRemoveAction_);
+-		mngMenu_->addAction(removeAction_);
+-		menu_->addAction(customStatusAction_);
+-		menu_->addSeparator();
+-		pictureMenu_ = mngMenu_->addMenu(tr("&Picture"));
+-		pictureMenu_->addAction(pictureAssignAction_);
+-		pictureMenu_->addAction(pictureClearAction_);
+-		mngMenu_->addAction(gpgAssignKeyAction_);
+-		mngMenu_->addAction(gpgUnassignKeyAction_);
+-		menu_->addAction(vcardAction_);
+-		menu_->addAction(historyAction_);
+ #endif
+-
+-		updateActions();
+ 	}
+ 
+ private slots:
+@@ -463,7 +490,7 @@ private slots:
+ 
+ 	void updateActions()
+ 	{
+-		if (!contact_)
++		if (!contact_ or contact_->isConference())
+ 			return;
+ 
+ #ifdef YAPSI
+@@ -549,6 +576,30 @@ private slots:
+ 	}
+ #endif
+ 
++
++	void mucHide()
++	{
++		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
++		if (gc && (gc->isTabbed() || !gc->isHidden()))
++			gc->hideTab();
++	}
++
++	void mucShow()
++	{
++		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
++		if (gc) {
++			gc->ensureTabbedCorrectly();
++			gc->bringToFront();
++		}
++	}
++
++	void mucLeave()
++	{
++		GCMainDlg *gc = contact_->account()->findDialog<GCMainDlg*>(contact_->jid());
++		if (gc)
++			gc->close();
++	}
++
+ 	void rename()
+ 	{
+ 		if (!contact_)
+--- git.orig/src/tabs/tabbablewidget.cpp
++++ git/src/tabs/tabbablewidget.cpp
+@@ -56,6 +56,9 @@ void TabbableWidget::ensureTabbedCorrect
+ 		if (!isTabbed()) {
+ 			tabManager_->getTabs(this)->addTab(this);
+ 		}
++		else {
++			QTimer::singleShot(0, tabManager_->getTabs(this), SLOT(showTabWithoutActivation()));
++		}
+ 	}
+ 	else {
+ 		if (PsiOptions::instance()->getOption("options.ui.tabs.tab-singles").toString().contains(tabManager_->tabKind(this))) {
+@@ -268,3 +271,11 @@ const QIcon &TabbableWidget::icon() cons
+ {
+ 	return icon_;
+ }
++
++void TabbableWidget::hideTab()
++{
++	if(isTabbed())
++		getManagingTabDlg()->hideTab(this);
++	else
++		hide();
++}
+--- git.orig/src/tabs/tabbablewidget.h
++++ git/src/tabs/tabbablewidget.h
+@@ -84,6 +84,7 @@ public slots:
+ 	virtual void activated();
+ 	void bringToFront(bool raiseWindow = true);
+ 	virtual void ensureTabbedCorrectly();
++	void hideTab();
+ 
+ protected:
+ 	virtual void setJid(const Jid&);
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -260,6 +260,7 @@ void TabDlg::showTabMenu(int tab, QPoint
+ 
+ 	if (tab != -1) {
+ 		QAction *d = 0;
++		QAction *h = tabMenu_->addAction(tr("Hide Tab"));
+ 		if(userManagement_) {
+ 			d = tabMenu_->addAction(tr("Detach Tab"));
+ 		}
+@@ -288,6 +289,9 @@ void TabDlg::showTabMenu(int tab, QPoint
+ 		else if (act == d) {
+ 			detachTab(getTab(tab));
+ 		}
++		else if(act == h) {
++			hideTab(getTab(tab));
++		}
+ 		else {
+ 			TabDlg* target = sentTos[act];
+ 			if (target)
+@@ -299,6 +303,8 @@ void TabDlg::showTabMenu(int tab, QPoint
+ void TabDlg::tab_aboutToShowMenu(QMenu *menu)
+ {
+ 	menu->addSeparator();
++	menu->addAction(tr("Hide Current Tab"), this, SLOT(hideCurrentTab()));
++	menu->addAction(tr("Hide All Tabs"), this, SLOT(hideAllTab()));
+ 	menu->addAction(tr("Detach Current Tab"), this, SLOT(detachCurrentTab()));
+ 	menu->addAction(tr("Close Current Tab"), this, SLOT(closeCurrentTab()));
+ 
+@@ -420,6 +426,22 @@ void TabDlg::showTabWithoutActivation()
+ 	showWithoutActivation();
+ }
+ 
++void TabDlg::hideCurrentTab()
++{
++	hideTab(static_cast<TabbableWidget*>(tabWidget_->currentPage()));
++}
++
++void TabDlg::hideTab(TabbableWidget* tab)
++{
++	closeTab(tab, false);
++}
++
++void TabDlg::hideAllTab()
++{
++	foreach(TabbableWidget* tab, tabs_)
++		hideTab(tab);
++}
++
+ void TabDlg::detachCurrentTab()
+ {
+ 	detachTab(static_cast<TabbableWidget*>(tabWidget_->currentPage()));
+@@ -474,6 +496,7 @@ void TabDlg::closeTab(TabbableWidget* ch
+ 	chat->hide();
+ 	removeTabWithNoChecks(chat);
+ 	chat->setParent(0);
++	chat->deactivated();
+ 	if (tabWidget_->count() > 0) {
+ 		updateCaption();
+ 	}
+@@ -496,6 +519,10 @@ void TabDlg::checkHasChats()
+ {
+ 	if (tabWidget_->count() > 0 || this != window())
+ 		return;
++	if (tabs_.count() > 0) {
++		hide();
++		return;
++	}
+ 	deleteLater();
+ }
+ 
+@@ -548,8 +575,13 @@ void TabDlg::closeEvent(QCloseEvent* clo
+ 			return;
+ 		}
+ 	}
+-	foreach(TabbableWidget* tab, tabs_) {
+-		closeTab(tab);
++	if(PsiOptions::instance()->getOption("options.ui.chat.hide-when-closing").toBool()) {
++		hide();
++	}
++	else {
++		foreach(TabbableWidget* tab, tabs_) {
++			closeTab(tab);
++		}
+ 	}
+ }
+ 
+--- git.orig/src/tabs/tabdlg.h
++++ git/src/tabs/tabdlg.h
+@@ -123,6 +123,9 @@ public slots:
+ 	void detachTab(TabbableWidget*);
+ 	void sendTabTo(TabbableWidget*, TabDlg *);
+ 	void tabCloseRequested(int i);
++	void hideTab(TabbableWidget*);
++	void hideCurrentTab();
++	void hideAllTab();
+ 
+ signals:
+ 	void resized(QSize size);
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -296,8 +296,11 @@ UserListItem::UserListItem(bool self)
+ 	v_inList = false;
+ 	v_self = self;
+ 	v_private = false;
++	v_isConference = false;
+ 	v_avatarFactory = NULL;
+ 	lastmsgtype = -1;
++	v_pending = 0;
++	v_hPending = 0;
+ }
+ 
+ UserListItem::~UserListItem()
+@@ -737,6 +740,32 @@ bool UserListItem::isTransport() const
+ 	return v_isTransport;
+ }
+ 
++bool UserListItem::isConference() const
++{
++	return v_isConference;
++}
++
++void UserListItem::setConference(bool b)
++{
++	v_isConference = b;
++}
++
++void UserListItem::setPending(int p, int h)
++{
++	v_pending = p;
++	v_hPending = h;
++}
++
++QString UserListItem::pending() const
++{
++	QString str;
++	if (v_hPending)
++		str = QString("[%1/%2]").arg(v_pending).arg(v_hPending);
++	else if (v_pending)
++		str = QString("[%1]").arg(v_pending);
++	return str;
++}
++
+ bool UserListItem::isAvailable() const
+ {
+ 	return !v_url.isEmpty();
+@@ -853,7 +882,7 @@ QString UserListItem::makeBareTip(bool t
+ 		str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
+ 
+ 	// subscription
+-	if(!v_self && subscription().type() != Subscription::Both)
++	if(!v_self && !v_isConference && subscription().type() != Subscription::Both)
+ 		str += QString("<div style='white-space:pre'>") + QObject::tr("Subscription") + ": " + subscription().toString() + "</div>";
+ 
+ 	if(!v_keyID.isEmpty())
+@@ -957,7 +986,7 @@ QString UserListItem::makeBareTip(bool t
+ 			}
+ 
+ 			// MUC
+-			if(r.status().hasMUCItem()) {
++			if(!v_isConference && r.status().hasMUCItem()) {
+ 				if(!r.status().mucItem().jid().isEmpty())
+ 					str += QString("<div style='white-space:pre'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
+ 				if(r.status().mucItem().role() != MUCItem::NoRole)
+--- git.orig/src/userlist.h
++++ git/src/userlist.h
+@@ -111,6 +111,7 @@ public:
+ 
+ 	bool inList() const;
+ 	bool isTransport() const;
++	bool isConference() const;
+ 	bool isAvailable() const;
+ 	bool isHidden() const;
+ 	bool isAway() const;
+@@ -127,6 +128,7 @@ public:
+ 	QStringList clients() const;
+ 	QString findClient(QString name) const;
+ 	const Activity& activity() const;
++	QString pending() const;
+ 
+ 	void setJid(const XMPP::Jid &);
+ 	void setInList(bool);
+@@ -136,6 +138,8 @@ public:
+ 	void setMood(const Mood&);
+ 	void setActivity(const Activity&);
+ 	void setTune(const QString&);
++	void setConference(bool);
++	void setPending(int p, int h);
+ 	const QString& tune() const;
+ 	void setGeoLocation(const GeoLocation&);
+ 	const GeoLocation& geoLocation() const;
+@@ -155,12 +159,12 @@ public:
+ 	void setPublicKeyID(const QString &);
+ 
+ private:
+-	int lastmsgtype;
++	int lastmsgtype, v_pending, v_hPending;
+ 	bool v_inList;
+ 	QDateTime v_t;
+ 	UserResourceList v_url;
+ 	QString v_perr;
+-	bool v_self, v_isTransport;
++	bool v_self, v_isTransport, v_isConference;
+ 	bool v_private;
+ 	QStringList secList;
+ 	QString v_keyID;

psi-plus-main-20141106.tar.xz/patches/0540-psi-avcalls-enable-video.diff Added

@@ -0,0 +1,50 @@
+From 76f57a003af752fb712b01f2ca62bc0f2c036b28 Mon Sep 17 00:00:00 2001
+From: Julius Schwartzenberg <julius.schwartzenberg@gmail.com>
+Date: Tue, 13 Apr 2010 13:29:26 +0200
+Subject: Video patch by Arseniy Lartsev, unified version for the original see: http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-March/009046.html
+
+---
+ src/avcall/jinglertp.cpp |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+--- git.temp.orig/src/avcall/jinglertp.cpp
++++ git.temp/src/avcall/jinglertp.cpp
+@@ -621,12 +621,10 @@ public:
+ 				if((types & JingleRtp::Audio) && c.desc.media == "audio" && !audioContent)
+ 				{
+ 					audioContent = &c;
+-					break;
+ 				}
+ 				else if((types & JingleRtp::Video) && c.desc.media == "video" && !videoContent)
+ 				{
+ 					videoContent = &c;
+-					break;
+ 				}
+ 			}
+ 
+@@ -670,12 +668,10 @@ public:
+ 				if((types & JingleRtp::Audio) && c.desc.media == "audio" && c.name == audioName && !audioContent)
+ 				{
+ 					audioContent = &c;
+-					break;
+ 				}
+ 				else if((types & JingleRtp::Video) && c.desc.media == "video" && c.name == videoName && !videoContent)
+ 				{
+ 					videoContent = &c;
+-					break;
+ 				}
+ 			}
+ 
+@@ -743,12 +739,10 @@ public:
+ 				if((types & JingleRtp::Audio) && c.name == audioName && !audioContent)
+ 				{
+ 					audioContent = &c;
+-					break;
+ 				}
+ 				else if((types & JingleRtp::Video) && c.name == videoName && !videoContent)
+ 				{
+ 					videoContent = &c;
+-					break;
+ 				}
+ 			}
+

psi-plus-main-20141106.tar.xz/patches/0550-psi-deactivation-some-menu-items.diff Added

@@ -0,0 +1,30 @@
+--- git.temp.orig/src/contactlistgroupmenu.cpp
++++ git.temp/src/contactlistgroupmenu.cpp
+@@ -108,7 +108,7 @@ public:
+ 		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
+ 		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
+ 
+-		updateActions();
++		authMenu_ = 0;
+ 
+ 		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
+ #ifdef YAPSI
+@@ -135,6 +135,7 @@ public:
+ 			menu->addAction(actionCustomStatus_);
+ 		}
+ #endif
++		updateActions();
+ 	}
+ 
+ private slots:
+@@ -144,6 +145,10 @@ private slots:
+ 			return;
+ 
+ 		sendMessageAction_->setVisible(PsiOptions::instance()->getOption("options.ui.message.enabled").toBool());
++		sendMessageAction_->setEnabled(group->contacts().first()->account()->isAvailable());
++		actionCustomStatus_->setEnabled(group->contacts().first()->account()->isAvailable());
++		if(authMenu_)
++			authMenu_->setEnabled(group->contacts().first()->account()->isAvailable());
+ 		renameAction_->setEnabled(group->isEditable());
+ 		removeGroupAndContactsAction_->setEnabled(group->isRemovable());
+ 		removeGroupWithoutContactsAction_->setEnabled(group->isRemovable());

psi-plus-main-20141106.tar.xz/patches/0560-psi-fix-client-version-in-muc-roster-tooltip.diff Added

psi-plus-main-20141106.tar.xz/patches/0570-psi-add-client-icon-to-chatdlg.diff Added

@@ -0,0 +1,66 @@
+--- git.orig/src/chatdlg.ui
++++ git/src/chatdlg.ui
+@@ -71,6 +71,25 @@
+           </widget>
+          </item>
+          <item>
++          <widget class="QLabel" name="lb_client">
++           <property name="minimumSize">
++            <size>
++             <width>16</width>
++             <height>16</height>
++            </size>
++           </property>
++           <property name="maximumSize">
++            <size>
++             <width>16</width>
++             <height>16</height>
++            </size>
++           </property>
++           <property name="text">
++            <string/>
++           </property>
++          </widget>
++         </item>
++         <item>
+           <widget class="QLabel" name="lb_count">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -282,8 +282,10 @@ void PsiChatDlg::setLooks()
+ 		ui_.tb_emoticons->hide();
+ 		ui_.toolbar->hide();
+ 		ui_.tb_voice->hide();
++		ui_.lb_client->hide();
+ 	}
+ 	else {
++		ui_.lb_client->show();
+ 		ui_.lb_status->show();
+ 		ui_.le_jid->show();
+ 		if (PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
+@@ -498,6 +500,24 @@ void PsiChatDlg::contactUpdated(UserList
+ 		ui_.le_jid->setText(name);
+ 		ui_.le_jid->setCursorPosition(0);
+ 		ui_.le_jid->setToolTip(name);
++
++		UserResourceList srl = u->userResourceList();
++		if(!srl.isEmpty()) {
++			UserResource r;
++			if(!jid().resource().isEmpty()) {
++				QString res = jid().resource();
++				UserResourceList::ConstIterator it = srl.find(res);
++				if(it != srl.end())
++					r = *it;
++			}
++			if(r.clientName().isEmpty()) {
++				srl.sort();
++				r = srl.first();
++			}
++			const QPixmap &pix = IconsetFactory::iconPixmap("clients/" + u->findClient(r.clientName().toLower()) );
++			ui_.lb_client->setPixmap(pix);
++			ui_.lb_client->setToolTip(r.versionString());
++		}
+ 	}
+ }
+

psi-plus-main-20141106.tar.xz/patches/0580-psi-add-join-groupchat-item-to-account-menu.diff Added

@@ -0,0 +1,82 @@
+--- git.temp.orig/src/contactlistaccountmenu.cpp
++++ git.temp/src/contactlistaccountmenu.cpp
+@@ -33,6 +33,7 @@
+ #include "psiiconset.h"
+ #include "common.h"
+ #include "contactmanager/contactmanagerdlg.h"
++#include "mucjoindlg.h"
+ 
+ class ContactListAccountMenu::Private : public QObject
+ {
+@@ -62,6 +63,7 @@ class ContactListAccountMenu::Private :
+ 	QAction* adminSetMotdAction_;
+ 	QAction* adminUpdateMotdAction_;
+ 	QAction* adminDeleteMotdAction_;
++	QAction *doGroupChatAction_;
+ 
+ public:
+ 	Private(ContactListAccountMenu* menu, ContactListAccountGroup* _account)
+@@ -100,9 +102,12 @@ public:
+ 		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
+ 		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
+ 
+-		bookmarksManageAction_ = new QAction(tr("Manage..."), this);
++		bookmarksManageAction_ = new QAction(tr("Manage Bookmarks"), this);
+ 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
+ 
++		doGroupChatAction_ = new IconAction(tr("Join Groupchat"), this, "psi/groupChat");
++		connect(doGroupChatAction_, SIGNAL(triggered()), SLOT(doGroupChat()));
++
+ 		addContactAction_ = new IconAction(tr("&Add a Contact"), this, "psi/addContact");
+ 		connect(addContactAction_, SIGNAL(triggered()), SLOT(addContact()));
+ 
+@@ -143,7 +148,9 @@ public:
+ 		avatarMenu_ = menu->addMenu(IconsetFactory::icon("psi/vCard").icon(), tr("Avatar"));
+ 		avatarMenu_->addAction(setAvatarAction_);
+ 		avatarMenu_->addAction(unsetAvatarAction_);
+-		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Bookmarks"));
++		bookmarksMenu_ = menu->addMenu(IconsetFactory::icon("psi/bookmarks").icon(), tr("Groupchat"));
++		bookmarksMenu_->addAction(doGroupChatAction_);
++		bookmarksMenu_->addSeparator();
+ 		bookmarksMenu_->addAction(bookmarksManageAction_);
+ 		menu->addSeparator();
+ 		menu->addAction(addContactAction_);
+@@ -191,9 +198,12 @@ private slots:
+ 		bookmarksMenu_->clear();
+ 		qDeleteAll(bookmarksJoinActions_);
+ 		bookmarksJoinActions_.clear();
++		bookmarksMenu_->addAction(doGroupChatAction_);
++		bookmarksMenu_->addSeparator();
+ 		bookmarksMenu_->addAction(bookmarksManageAction_);
++		bookmarksMenu_->setEnabled(true);
+ 		if (account->account()->bookmarkManager()->isAvailable()) {
+-			bookmarksMenu_->setEnabled(true);
++			bookmarksManageAction_->setEnabled(true);
+ 			bookmarksMenu_->addSeparator();
+ 			foreach(ConferenceBookmark c, account->account()->bookmarkManager()->conferences()) {
+ 				QAction* joinAction = new QAction(QString(tr("Join %1")).arg(c.name()), this);
+@@ -204,7 +214,7 @@ private slots:
+ 			}
+ 		}
+ 		else {
+-			bookmarksMenu_->setEnabled(false);
++			bookmarksManageAction_->setEnabled(false);
+ 		}
+ 
+ 		newMessageAction_->setVisible(PsiOptions::instance()->getOption("options.ui.message.enabled").toBool());
+@@ -279,6 +289,15 @@ private slots:
+ 		account->account()->actionManageBookmarks();
+ 	}
+ 
++	void doGroupChat()
++	{
++		if (!account)
++			return;
++
++		MUCJoinDlg *w = new MUCJoinDlg(account->account()->psi(), account->account());
++		w->show();
++	}
++
+ 	void bookmarksJoin()
+ 	{
+ 		if (!account)

psi-plus-main-20141106.tar.xz/patches/0590-psi-pep-toolbar-buttons.diff Added

@@ -0,0 +1,384 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -497,6 +497,9 @@ QLineEdit#le_status_text {
+ 				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
+ 				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
+ 				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
++				<set_mood type="QKeySequence" comment="Set Mood"/>
++				<set_activity type="QKeySequence" comment="Set Activity"/>
++				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
+ 				<help_readme type="QKeySequence" comment="README"></help_readme>
+ 				<help_tip type="QKeySequence" comment="Tips"></help_tip>
+ 				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
+--- git.orig/src/activitydlg.cpp
++++ git/src/activitydlg.cpp
+@@ -27,9 +27,11 @@
+ #include "pepmanager.h"
+ #include "psiiconset.h"
+ 
+-ActivityDlg::ActivityDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
++ActivityDlg::ActivityDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
++	if(pa_.isEmpty())
++		close();
+ 	ui_.setupUi(this);
+ 	setModal(false);
+ 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
+@@ -37,6 +39,7 @@ ActivityDlg::ActivityDlg(PsiAccount* pa)
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
+ 
+ 	ui_.cb_general_type->addItem(tr("<unset>"));
++	PsiAccount* pa = pa_.first();
+ 	Activity::Type at = pa->activity().type();
+ 	int i=1;
+ 	foreach(ActivityCatalog::Entry e, ActivityCatalog::instance()->entries()) {
+@@ -62,7 +65,8 @@ void ActivityDlg::loadSpecificActivities
+ 	}
+ 	else {
+ 		ui_.cb_specific_type->addItem(tr("<unset>"));
+-		Activity::SpecificType at = pa_->activity().specificType();
++		PsiAccount* pa = pa_.first();
++		Activity::SpecificType at = pa->activity().specificType();
+ 		int i=1;
+ 		ActivityCatalog* ac = ActivityCatalog::instance();
+ 		foreach(ActivityCatalog::Entry e, ac->entries()) {
+@@ -88,18 +92,20 @@ void ActivityDlg::setActivity()
+ 	QString generalActivityStr  = ui_.cb_general_type->currentText();
+ 	QString specificActivityStr = ui_.cb_specific_type->currentText();
+ 
+-	if (generalActivityStr == tr("<unset>")) {
+-		pa_->pepManager()->retract("http://jabber.org/protocol/activity", "current");
+-	}
+-	else {
+-		ActivityCatalog* ac = ActivityCatalog::instance();
+-		Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
+-
+-		Activity::SpecificType specificType = Activity::UnknownSpecific;
+-		if (specificActivityStr != tr("<unset>")) {
+-			specificType = ac->findEntryByText(specificActivityStr).specificType();
++	foreach(PsiAccount *pa, pa_) {
++		if (generalActivityStr == tr("<unset>")) {
++			pa->pepManager()->retract("http://jabber.org/protocol/activity", "current");
++		}
++		else {
++			ActivityCatalog* ac = ActivityCatalog::instance();
++			Activity::Type generalType = ac->findEntryByText(generalActivityStr).type();
++
++			Activity::SpecificType specificType = Activity::UnknownSpecific;
++			if (specificActivityStr != tr("<unset>")) {
++				specificType = ac->findEntryByText(specificActivityStr).specificType();
++			}
++			pa->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
+ 		}
+-		pa_->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
+ 	}
+ 	close();
+ }
+--- git.orig/src/activitydlg.h
++++ git/src/activitydlg.h
+@@ -32,7 +32,7 @@ class ActivityDlg : public QDialog
+ 	Q_OBJECT
+ 
+ public:
+-	ActivityDlg(PsiAccount*);
++	ActivityDlg(QList<PsiAccount*>);
+ 
+ protected slots:
+ 	void setActivity();
+@@ -40,7 +40,7 @@ protected slots:
+ 
+ private:
+ 	Ui::Activity ui_;
+-	PsiAccount* pa_;
++	QList<PsiAccount*> pa_;
+ };
+ 
+ #endif
+--- git.orig/src/geolocationdlg.cpp
++++ git/src/geolocationdlg.cpp
+@@ -28,16 +28,19 @@
+ #include "geolocation.h"
+ #include <QLineEdit>
+ 
+-GeoLocationDlg::GeoLocationDlg(PsiAccount* pa) : QDialog(0), pa_(pa)
++GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
++	if(pa_.isEmpty())
++		close();
+ 	ui_.setupUi(this);
+ 	setModal(false);
+ 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
+  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
+ 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
+ 
+-	GeoLocation geoloc = pa_->geolocation();
++	PsiAccount *pa = pa_.first();
++	GeoLocation geoloc = pa->geolocation();
+ 	if(geoloc.isNull())
+ 		return;
+ 
+@@ -155,11 +158,13 @@ void GeoLocationDlg::setGeoLocation()
+ 	if(!ui_.le_text->text().isEmpty())
+ 		geoloc.setText(ui_.le_text->text());
+ 
+-	if (geoloc.isNull()) {
+- 		pa_->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
+-	}
+-	else {
+-		pa_->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++	foreach(PsiAccount *pa, pa_) {
++		if (geoloc.isNull()) {
++			pa->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
++		}
++		else {
++			pa->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++		}
+ 	}
+ 	close();
+ }
+--- git.orig/src/geolocationdlg.h
++++ git/src/geolocationdlg.h
+@@ -31,7 +31,7 @@ class GeoLocationDlg : public QDialog
+ 	Q_OBJECT
+ 
+ public:
+-	GeoLocationDlg(PsiAccount*);
++	GeoLocationDlg(QList<PsiAccount*>);
+ 
+ protected slots:
+ 	void setGeoLocation();
+@@ -39,7 +39,7 @@ protected slots:
+ 
+ private:
+ 	Ui::GeoLocation ui_;
+- 	PsiAccount* pa_;
++	QList<PsiAccount*> pa_;
+ };
+ 
+ #endif // GEOLOCATIONDLG_H
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -69,6 +69,9 @@
+ #ifdef NEWCONTACTLIST
+ #include "psirosterwidget.h"
+ #endif
++#include "mooddlg.h"
++#include "activitydlg.h"
++#include "geolocationdlg.h"
+ 
+ #include "mainwin_p.h"
+ 
+@@ -147,6 +150,10 @@ public:
+ 	void updateMenu(QStringList actions, QMenu* menu);
+ 
+ 	QString ToolTipText;
++
++	QPointer<MoodDlg> moodDlg;
++	QPointer<ActivityDlg> activityDlg;
++	QPointer<GeoLocationDlg> geolocationDlg;
+ };
+ 
+ MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
+@@ -605,6 +612,9 @@ void MainWin::registerAction( IconAction
+ 		{ "menu_play_sounds",    toggled,   this, SLOT( actPlaySoundsActivated(bool) ) },
+ #ifdef USE_PEP
+ 		{ "publish_tune",        toggled,   this, SLOT( actPublishTuneActivated(bool) ) },
++		{ "set_mood",		 activated,   this, SLOT( actSetMoodActivated() ) },
++		{ "set_activity",        activated,   this, SLOT( actSetActivityActivated() ) },
++		{ "set_geoloc",		 activated,   this, SLOT( actSetGeolocActivated() ) },
+ #endif
+ 
+ 		{ "event_notifier", SIGNAL( clicked(int) ), this, SLOT( statusClicked(int) ) },
+@@ -1089,6 +1099,60 @@ void MainWin::actEnableGroupsActivated (
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.enable-groups", state);
+ }
+ 
++void MainWin::actSetMoodActivated()
++{
++	QList<PsiAccount*> l;
++	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++			l.append(pa);
++	}
++	if(l.isEmpty())
++		return;
++
++	if(d->moodDlg)
++		bringToFront(d->moodDlg);
++	else {
++		d->moodDlg = new MoodDlg(l);
++		d->moodDlg->show();
++	}
++}
++
++void MainWin::actSetActivityActivated()
++{
++	QList<PsiAccount*> l;
++	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++			l.append(pa);
++	}
++	if(l.isEmpty())
++		return;
++
++	if(d->activityDlg)
++		bringToFront(d->activityDlg);
++	else {
++		d->activityDlg = new ActivityDlg(l);
++		d->activityDlg->show();
++	}
++}
++
++void MainWin::actSetGeolocActivated()
++{
++	QList<PsiAccount*> l;
++	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++			l.append(pa);
++	}
++	if(l.isEmpty())
++		return;
++
++	if(d->geolocationDlg)
++		bringToFront(d->geolocationDlg);
++	else {
++		d->geolocationDlg = new GeoLocationDlg(l);
++		d->geolocationDlg->show();
++	}
++}
++
+ void MainWin::activatedAccOption(PsiAccount* pa, int x)
+ {
+ 	if(x == 0) {
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -135,6 +135,9 @@ private slots:
+ 	void actTipActivated();
+ 	void actDiagQCAPluginActivated();
+ 	void actDiagQCAKeyStoreActivated();
++	void actSetMoodActivated();
++	void actSetActivityActivated();
++	void actSetGeolocActivated();
+ 
+ 	bool showDockMenu(const QPoint &);
+ 	void dockActivated();
+--- git.orig/src/mooddlg.cpp
++++ git/src/mooddlg.cpp
+@@ -27,16 +27,19 @@
+ #include "pepmanager.h"
+ #include "psiiconset.h"
+ 
+-MoodDlg::MoodDlg(PsiAccount* pa)
+-	: QDialog(0), pa_(pa)
++MoodDlg::MoodDlg(QList<PsiAccount*> list)
++	: QDialog(0), pa_(list)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
++	if(pa_.isEmpty())
++		close();
+ 	ui_.setupUi(this);
+ 	setModal(false);
+ 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));
+ 
+ 	ui_.cb_type->addItem(tr("<unset>"));
++	PsiAccount *pa = pa_.first();
+ 	Mood::Type mt = pa->mood().type();
+ 	int i=1;
+ 	foreach(MoodCatalog::Entry e, MoodCatalog::instance()->entries()) {
+@@ -53,11 +56,14 @@ MoodDlg::MoodDlg(PsiAccount* pa)
+ void MoodDlg::setMood()
+ {
+ 	QString moodstr = ui_.cb_type->currentText();
+-	if (moodstr == tr("<unset>")) {
+-		pa_->pepManager()->retract("http://jabber.org/protocol/mood", "current");
+-	} else {
+-		Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
+-		pa_->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa_->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++	foreach(PsiAccount *pa, pa_) {
++		if (moodstr == tr("<unset>")) {
++			pa->pepManager()->retract("http://jabber.org/protocol/mood", "current");
++		}
++		else {
++			Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
++			pa->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++		}
+ 	}
+ 	close();
+ }
+--- git.orig/src/mooddlg.h
++++ git/src/mooddlg.h
+@@ -32,14 +32,14 @@ class MoodDlg : public QDialog
+ 	Q_OBJECT
+ 
+ public:
+-	MoodDlg(PsiAccount*);
++	MoodDlg(QList<PsiAccount*>);
+ 
+ protected slots:
+ 	void setMood();
+ 
+ private:
+ 	Ui::Mood ui_;
+-	PsiAccount* pa_;
++	QList<PsiAccount*> pa_;
+ };
+ 
+ #endif
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3831,19 +3831,25 @@ void PsiAccount::actionExecuteCommandSpe
+ 
+ void PsiAccount::actionSetMood()
+ {
+-	MoodDlg *w = new MoodDlg(this);
++	QList<PsiAccount*> list;
++	list.append(this);
++	MoodDlg *w = new MoodDlg(list);
+ 	w->show();
+ }
+ 
+ void PsiAccount::actionSetActivity()
+ {
+-	ActivityDlg *w = new ActivityDlg(this);
++	QList<PsiAccount*> list;
++	list.append(this);
++	ActivityDlg *w = new ActivityDlg(list);
+ 	w->show();
+ }
+ 
+ void PsiAccount::actionSetGeoLocation()
+ {
+-	GeoLocationDlg *w = new GeoLocationDlg(this);
++	QList<PsiAccount*> list;
++	list.append(this);
++	GeoLocationDlg *w = new GeoLocationDlg(list);
+ 	w->show();
+ }
+ 
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -275,8 +275,20 @@ void PsiActionList::Private::createMainW
+ 		IconAction *actPublishTune = new IconAction (tr("Publish Tune"), "psi/publishTune", tr("Publish &Tune"), 0, this, 0, true);
+ 		actPublishTune->setWhatsThis (tr("Toggles whether the currently playing tune should be published or not"));
+ 
++		IconAction *actSetMood = new IconAction (tr("Set Mood"), "mood/", tr("Set Mood"), 0, this);
++		actSetMood->setWhatsThis (tr("Set Mood for all active accounts"));
++
++		IconAction *actSetActivity = new IconAction (tr("Set Activity"), "activities/other", tr("Set Activity"), 0, this);
++		actSetActivity->setWhatsThis (tr("Set Activity for all active accounts"));
++
++		IconAction *actSetGeoloc = new IconAction (tr("Set Geolocation"), "system/geolocation", tr("Set Geolocation"), 0, this);
++		actSetGeoloc->setWhatsThis (tr("Set Geolocation for all active accounts"));
++
+ 		ActionNames actions[] = {
+-			{ "publish_tune", actPublishTune },
++			{ "publish_tune",	actPublishTune },
++			{ "set_mood",		actSetMood },
++			{ "set_activity",	actSetActivity },
++			{ "set_geoloc",		actSetGeoloc },
+ 			{ "", 0 }
+ 		};
+

psi-plus-main-20141106.tar.xz/patches/0600-psi-roster-avatar-frame.diff Added

@@ -0,0 +1,666 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -210,6 +210,7 @@ QLineEdit#le_status_text {
+ 				<lockdown-roster type="bool">false</lockdown-roster>
+ 				<raise-on-new-event type="bool">false</raise-on-new-event>
+ 				<quit-on-close type="bool">false</quit-on-close>
++				<show-roster-avatar-frame type="bool">false</show-roster-avatar-frame>
+ 				<show>
+ 					<agent-contacts type="bool">true</agent-contacts>
+ 					<away-contacts type="bool">true</away-contacts>
+@@ -256,6 +257,12 @@ QLineEdit#le_status_text {
+ 				<saved-window-geometry-screen type="int">0</saved-window-geometry-screen>
+ 				<saved-window-geometry-maximized type="bool">false</saved-window-geometry-maximized>
+ 				<saved-window-geometry-fullscreen type="bool">false</saved-window-geometry-fullscreen>
++				<roster-avatar-frame comment="Options for roster avatar frame">
++					<avatar>
++						<size type="int">52</size>
++						<margin type="int">0</margin>
++					</avatar>
++				</roster-avatar-frame>
+ 			</contactlist>
+ 			<menu comment="Options for the menu">
+ 				<account comment="Options for the account-specific menu">
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -78,6 +78,9 @@
+ #include "psimedia/psimedia.h"
+ #include "avcall/avcall.h"
+ 
++#include "rosteravatarframe.h"
++#include "avatars.h"
++
+ using namespace XMPP;
+ 
+ static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
+@@ -125,6 +128,8 @@ public:
+ 	EventNotifierAction* eventNotifier;
+ 	PsiCon* psi;
+ 	MainWin* mainWin;
++	RosterAvatarFrame* rosterAvatar;
++	QPointer<PsiAccount> defaultAccount;
+ 
+ 	QLineEdit* searchText;
+ 	QToolButton* searchPb;
+@@ -306,6 +311,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	d->trayMenu = 0;
+ 	d->statusTip = "";
+ 	d->nickname = "";
++	d->defaultAccount = 0;
+ 
+ 	QWidget *rosterBar = new QWidget(this);
+ 	bool allInOne = false;
+@@ -398,6 +404,16 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	d->searchWidget->setVisible(false);
+ #endif
+ 
++
++	// create rosteravatarframe
++	d->rosterAvatar = new RosterAvatarFrame(this);
++	d->vb_roster->addWidget(d->rosterAvatar);
++	d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
++	connect(d->rosterAvatar, SIGNAL(statusMessageChanged(QString)), this, SIGNAL(statusMessageChanged(QString)));
++	connect(psiCon(), SIGNAL(statusMessageChanged(QString)), d->rosterAvatar, SLOT(setStatusMessage(QString)));
++	connect(d->rosterAvatar, SIGNAL(setMood()), this, SLOT(actSetMoodActivated()));
++	connect(d->rosterAvatar, SIGNAL(setActivity()), this, SLOT(actSetActivityActivated()));
++
+ 	//add contact view
+ #ifndef NEWCONTACTLIST
+ 	d->vb_roster->addWidget(cvlist);
+@@ -510,6 +526,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ #endif
+ 	d->optionsButton->setMenu( d->optionsMenu );
+ 	d->statusButton->setMenu( d->statusMenu );
++	d->rosterAvatar->setStatusMenu( d->statusMenu );
+ 
+ 	buildToolbars();
+ 	// setUnifiedTitleAndToolBarOnMac(true);
+@@ -560,6 +577,9 @@ void MainWin::optionChanged(const QStrin
+ 			setStyleSheet(css);
+ 		}
+ 	}
++	else if (option == "options.ui.contactlist.show-roster-avatar-frame") {
++		d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
++	}
+ }
+ 
+ void MainWin::registerAction( IconAction* action )
+@@ -1298,6 +1318,7 @@ void MainWin::decorateButton(int status)
+ 		else {
+ 			d->statusButton->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
+ 			d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
++			d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE)->icon());
+ 		}
+ 
+ 		setWindowIcon(PsiIconset::instance()->status(STATUS_OFFLINE).impix());
+@@ -1306,6 +1327,7 @@ void MainWin::decorateButton(int status)
+ 		d->statusButton->setText(status2txt(status));
+ 		d->statusButton->setIcon(PsiIconset::instance()->statusPtr(status));
+ 		d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(status));
++		d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(status)->icon());
+ 
+ 		setWindowIcon(PsiIconset::instance()->status(status).impix());
+ 	}
+@@ -1605,6 +1627,38 @@ void MainWin::numAccountsChanged()
+ {
+ 	d->statusButton->setEnabled(d->psi->contactList()->haveEnabledAccounts());
+ 	setTrayToolTip();
++	PsiAccount *acc = d->psi->contactList()->defaultAccount();
++	if(acc && acc != d->defaultAccount) {
++		if(d->defaultAccount) {
++			disconnect(d->defaultAccount, SIGNAL(nickChanged()), this, SLOT(nickChanged()));
++//			disconnect(d->defaultAccount->avatarFactory(), SIGNAL(avatarChanged(Jid)), this, SLOT(avatarChanged()));
++		}
++		d->defaultAccount = acc;
++		avatarChanged();
++		nickChanged();
++		d->rosterAvatar->setStatusMessage(acc->status().status());
++		connect(acc->avatarFactory(), SIGNAL(avatarChanged(Jid)), this, SLOT(avatarChanged()));
++		connect(acc, SIGNAL(nickChanged()), this, SLOT(nickChanged()));
++	}
++}
++
++void MainWin::nickChanged()
++{
++	if(d->defaultAccount)
++		d->rosterAvatar->setNick(d->defaultAccount->nick());
++}
++
++void MainWin::avatarChanged()
++{
++	if(d->defaultAccount) {
++		QPixmap pix = d->defaultAccount->avatarFactory()->getAvatar(d->defaultAccount->jid());
++		if(pix.isNull())
++			pix = IconsetFactory::iconPixmap("psi/default_avatar");
++		d->rosterAvatar->setAvatar(pix);
++	}
++	else {
++		d->rosterAvatar->setAvatar(IconsetFactory::iconPixmap("psi/default_avatar"));
++	}
+ }
+ 
+ void MainWin::accountFeaturesChanged()
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -83,6 +83,7 @@ protected:
+ 
+ signals:
+ 	void statusChanged(int);
++	void statusMessageChanged(QString);
+ 	void changeProfile();
+ 	void blankMessage();
+ 	void closeProgram();
+@@ -153,6 +154,9 @@ private slots:
+ 
+ 	void optionChanged(const QString&);
+ 
++	void nickChanged();
++	void avatarChanged();
++
+ public slots:
+ 	void setWindowIcon(const QPixmap&);
+ 	void showNoFocus();
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -65,6 +65,7 @@ void OptionsTabRoster::applyOptions()
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.use-left-click", d->ck_useleft->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
++	PsiOptions::instance()->setOption("options.ui.contactlist.show-roster-avatar-frame", d->ck_roster_avatar->isChecked());
+ 
+ 	//enabled icons
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
+@@ -93,6 +94,7 @@ void OptionsTabRoster::restoreOptions()
+ 	d->ck_useleft->setVisible(false);
+ 	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
+ 	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
++	d->ck_roster_avatar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool() );
+ 
+ 	//enabled icons
+ 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -62,6 +62,16 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_roster_avatar">
++     <property name="whatsThis">
++      <string>Enables avatar frame at the top of roster</string>
++     </property>
++     <property name="text">
++      <string>Enable roster avatar frame</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QGroupBox" name="gb_docklet">
+      <property name="title">
+       <string>Icons</string>
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -548,6 +548,7 @@ bool PsiCon::init()
+ 	connect(d->mainwin, SIGNAL(doGroupChat()), SLOT(doGroupChat()));
+ 	connect(d->mainwin, SIGNAL(blankMessage()), SLOT(doNewBlankMessage()));
+ 	connect(d->mainwin, SIGNAL(statusChanged(int)), SLOT(statusMenuChanged(int)));
++	connect(d->mainwin, SIGNAL(statusMessageChanged(QString)), SLOT(setStatusMessage(QString)));
+ 	connect(d->mainwin, SIGNAL(doOptions()), SLOT(doOptions()));
+ 	connect(d->mainwin, SIGNAL(doToolbars()), SLOT(doToolbars()));
+ 	connect(d->mainwin, SIGNAL(doFileTransDlg()), SLOT(doFileTransDlg()));
+@@ -682,6 +683,8 @@ bool PsiCon::init()
+ 	foreach(PsiAccount* account, d->contactList->accounts()) {
+ 		account->autoLogin();
+ 	}
++	if(d->contactList->defaultAccount())
++		emit statusMessageChanged(d->contactList->defaultAccount()->status().status());
+ 
+ 	// show tip of the day
+ 	if ( options->getOption("options.ui.tip.show").toBool() ) {
+@@ -1132,6 +1135,16 @@ void PsiCon::setGlobalStatus(const Statu
+ 	foreach(PsiAccount* account, d->contactList->enabledAccounts())
+ 		if (allOffline || account->isActive())
+ 			account->setStatus(s, withPriority, isManualStatus);
++
++	emit statusMessageChanged(s.status());
++}
++
++void PsiCon::setStatusMessage(QString message)
++{
++	XMPP::Status s;
++	s.setType(currentStatusType());
++	s.setStatus(message);
++	setGlobalStatus(s, false, true);
+ }
+ 
+ void PsiCon::pa_updatedActivity()
+--- git.orig/src/psicon.h
++++ git/src/psicon.h
+@@ -139,6 +139,7 @@ signals:
+ 	void accountActivityChanged();
+ 	void emitOptionsUpdate();
+ 	void restoringSavedChatsChanged();
++	void statusMessageChanged(QString);
+ 
+ public slots:
+ 	void setGlobalStatus(const Status &, bool withPriority = false, bool isManualStatus = false);
+@@ -156,6 +157,7 @@ public slots:
+ 	void doOptions();
+ 	void doFileTransDlg();
+ 	void statusMenuChanged(int);
++	void setStatusMessage(QString message);
+ 	void pa_updatedActivity();
+ 	void pa_updatedAccount();
+ 	void slotApplyOptions();
+--- git.orig/src/rosteravatarframe.cpp
++++ git/src/rosteravatarframe.cpp
+@@ -0,0 +1,148 @@
++/*
++ * rosteravatarframe.cpp
++ * Copyright (C) 2010  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "rosteravatarframe.h"
++#include "psioptions.h"
++#include "iconset.h"
++#include "qpainter.h"
++
++
++RosterAvatarFrame::RosterAvatarFrame(QWidget *parent)
++	: QFrame(parent)
++	, statusMessage_("")
++{
++	ui_.setupUi(this);
++	layout()->setMargin(PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.margin").toInt());
++	layout()->setSpacing(0);
++	setMoodIcon("mood/");
++	setActivityIcon("activities/other");
++	setFont();
++
++	connect(ui_.le_status_text, SIGNAL(returnPressed()), this, SLOT(statusMessageReturnPressed()));
++	connect(ui_.tb_mood, SIGNAL(pressed()), this, SIGNAL(setMood()));
++	connect(ui_.tb_activity, SIGNAL(pressed()), this, SIGNAL(setActivity()));
++	connect(PsiOptions::instance(), SIGNAL(optionChanged(QString)),this, SLOT(optionChanged(QString)));
++}
++
++void RosterAvatarFrame::setStatusMessage(const QString &message)
++{
++	ui_.le_status_text->setText(message);
++	ui_.le_status_text->setCursorPosition(0);
++	statusMessage_ = message;
++}
++
++void RosterAvatarFrame::setAvatar(const QPixmap &avatar)
++{
++	avatarPixmap = avatar;
++	drawAvatar();
++}
++
++void RosterAvatarFrame::setMoodIcon(const QString &mood)
++{
++	ui_.tb_mood->setIcon(QIcon(IconsetFactory::iconPixmap(mood)));
++}
++
++void RosterAvatarFrame::setActivityIcon(const QString &activity)
++{
++	ui_.tb_activity->setIcon(QIcon(IconsetFactory::iconPixmap(activity)));
++}
++
++void RosterAvatarFrame::drawAvatar()
++{
++	int avSize = PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.size").toInt();
++	QPixmap av = avatarPixmap;
++	if(!av.isNull()) {
++		int radius = PsiOptions::instance()->getOption("options.ui.contactlist.avatars.radius").toInt();
++		if(!radius)
++			av = av.scaled(avSize,avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++		else {
++			avSize = qMax(avSize, radius*2);
++			av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++			int w = av.width(), h = av.height();
++			QPainterPath pp;
++			pp.addRoundedRect(0, 0, w, h, radius, radius);
++			QPixmap avatar_icon = QPixmap(w, h);
++			avatar_icon.fill(QColor(0,0,0,0));
++			QPainter mp(&avatar_icon);
++			mp.setBackgroundMode(Qt::TransparentMode);
++			mp.setRenderHints(QPainter::Antialiasing, true);
++			mp.fillPath(pp, QBrush(av));
++			av = avatar_icon;
++		}
++	}
++	ui_.lb_avatar->setPixmap(av);
++	ui_.lb_avatar->setFixedSize(avSize,avSize);
++}
++
++void RosterAvatarFrame::setStatusIcon(const QIcon &ico)
++{
++	ui_.tb_status->setIcon(ico);
++}
++
++void RosterAvatarFrame::setNick(const QString &nick)
++{
++	ui_.lb_nick->setText(nick);
++}
++
++void RosterAvatarFrame::setFont()
++{
++	QFont f;
++	f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
++	ui_.lb_nick->setFont(f);
++	ui_.le_status_text->setFont(f);
++}
++
++void RosterAvatarFrame::statusMessageReturnPressed()
++{
++	statusMessage_ = ui_.le_status_text->text();
++	ui_.le_status_text->setCursorPosition(0);
++	ui_.lb_nick->setFocus(); //remove focus from lineedit
++	emit statusMessageChanged(statusMessage_);
++}
++
++void RosterAvatarFrame::setStatusMenu(QMenu *menu)
++{
++	statusMenu_ = menu;
++	ui_.tb_status->setMenu(statusMenu_);
++	ui_.tb_status->setPopupMode(QToolButton::InstantPopup);
++}
++
++void RosterAvatarFrame::keyPressEvent(QKeyEvent *e)
++{
++	if(e->key() == Qt::Key_Escape) {
++		ui_.le_status_text->setText(statusMessage_);
++		ui_.le_status_text->setCursorPosition(0);
++		ui_.lb_nick->setFocus(); //remove focus from lineedit
++		e->accept();
++	}
++	else {
++		e->ignore();
++	}
++}
++
++void RosterAvatarFrame::optionChanged(QString option)
++{
++	if(option == "options.ui.contactlist.avatars.radius" or "options.ui.contactlist.roster-avatar-frame.avatar.size")
++		drawAvatar();
++	if (option == "options.ui.look.font.contactlist")
++		setFont();
++	if (option == "options.ui.contactlist.roster-avatar-frame.avatar.margin")
++		layout()->setMargin(PsiOptions::instance()->getOption("options.ui.contactlist.roster-avatar-frame.avatar.margin").toInt());
++}
+--- git.orig/src/rosteravatarframe.h
++++ git/src/rosteravatarframe.h
+@@ -0,0 +1,65 @@
++/*
++ * rosteravatarframe.h
++ * Copyright (C) 2010  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ROSTERAVATARFRAME_H
++#define ROSTERAVATARFRAME_H
++
++#include "ui_rosteravatarframe.h"
++
++#include <QKeyEvent>
++
++class RosterAvatarFrame : public QFrame
++{
++	Q_OBJECT
++	public:
++		RosterAvatarFrame(QWidget *parent);
++		void setAvatar(const QPixmap &avatar);
++		void setStatusIcon(const QIcon &ico);
++		void setNick(const QString &nick);
++		void setStatusMenu(QMenu *menu);
++
++	signals:
++		void statusMessageChanged(QString);
++		void setMood();
++		void setActivity();
++
++	protected:
++		void keyPressEvent(QKeyEvent *event);
++
++	private slots:
++		void statusMessageReturnPressed();
++		void optionChanged(QString);
++
++	public slots:
++		void setStatusMessage(const QString &message);
++		void setMoodIcon(const QString &mood);
++		void setActivityIcon(const QString &activity);
++
++	private:
++		Ui::RosterAvatarFrame ui_;
++		QString statusMessage_;
++		QMenu *statusMenu_;
++		QPixmap avatarPixmap;
++
++		void drawAvatar();
++		void setFont();
++};
++
++#endif
+--- git.orig/src/rosteravatarframe.ui
++++ git/src/rosteravatarframe.ui
+@@ -0,0 +1,165 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>RosterAvatarFrame</class>
++ <widget class="QFrame" name="RosterAvatarFrame">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>260</width>
++    <height>81</height>
++   </rect>
++  </property>
++  <property name="maximumSize">
++   <size>
++    <width>16777215</width>
++    <height>81</height>
++   </size>
++  </property>
++  <property name="windowTitle">
++   <string>Form</string>
++  </property>
++  <layout class="QHBoxLayout" name="horizontalLayout_3">
++   <property name="sizeConstraint">
++    <enum>QLayout::SetNoConstraint</enum>
++   </property>
++   <item>
++    <widget class="QLabel" name="lb_avatar">
++     <property name="minimumSize">
++      <size>
++       <width>32</width>
++       <height>32</height>
++      </size>
++     </property>
++     <property name="maximumSize">
++      <size>
++       <width>64</width>
++       <height>64</height>
++      </size>
++     </property>
++     <property name="text">
++      <string/>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <layout class="QVBoxLayout" name="verticalLayout">
++     <item>
++      <layout class="QHBoxLayout" name="horizontalLayout_2">
++       <item>
++        <widget class="QLabel" name="lb_nick">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="toolTip">
++          <string>Nick</string>
++         </property>
++         <property name="text">
++          <string/>
++         </property>
++         <property name="alignment">
++          <set>Qt::AlignCenter</set>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <widget class="QToolButton" name="tb_mood">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>28</width>
++           <height>28</height>
++          </size>
++         </property>
++         <property name="toolTip">
++          <string>Set Mood for all active accounts</string>
++         </property>
++         <property name="text">
++          <string/>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <widget class="QToolButton" name="tb_activity">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>28</width>
++           <height>28</height>
++          </size>
++         </property>
++         <property name="toolTip">
++          <string>Set Activity for all active accounts</string>
++         </property>
++         <property name="text">
++          <string/>
++         </property>
++        </widget>
++       </item>
++      </layout>
++     </item>
++     <item>
++      <layout class="QHBoxLayout" name="horizontalLayout">
++       <item>
++        <widget class="QToolButton" name="tb_status">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>28</width>
++           <height>28</height>
++          </size>
++         </property>
++         <property name="toolTip">
++          <string>Set Status for all active accounts</string>
++         </property>
++         <property name="text">
++          <string/>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <widget class="QLineEdit" name="le_status_text">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>16777215</width>
++           <height>25</height>
++          </size>
++         </property>
++         <property name="toolTip">
++          <string>Status Message</string>
++         </property>
++        </widget>
++       </item>
++      </layout>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -210,6 +210,7 @@ HEADERS += \
+ 	$$PWD/psicli.h \
+ 	$$PWD/coloropt.h \
+ 	$$PWD/geolocationdlg.h \
++	$$PWD/rosteravatarframe.h \
+ 	$$PWD/sendbuttonmenu.h
+ 
+ 
+@@ -349,6 +350,7 @@ SOURCES += \
+ 	$$PWD/vcardphotodlg.cpp \
+ 	$$PWD/coloropt.cpp \
+ 	$$PWD/geolocationdlg.cpp \
++	$$PWD/rosteravatarframe.cpp \
+ 	$$PWD/sendbuttonmenu.cpp
+ 
+ 
+@@ -583,6 +585,7 @@ FORMS += \
+ 	$$PWD/ahcommanddlg.ui \
+ 	$$PWD/ahcformdlg.ui \
+ 	$$PWD/geolocation.ui \
++	$$PWD/rosteravatarframe.ui \
+ 	$$PWD/sendbuttontemplateseditor.ui
+ 
+ # options dialog

psi-plus-main-20141106.tar.xz/patches/0610-psi-add-dbus-status.diff Added

@@ -0,0 +1,59 @@
+--- git.temp.orig/src/dbus.cpp
++++ git.temp/src/dbus.cpp
+@@ -31,6 +31,14 @@ public Q_SLOTS:
+ 	void raise();
+ 	void sleep();
+ 	void wake();
++
++	void setstatusonline(const QString &message);
++	void setstatusaway(const QString &message);
++	void setstatusffc(const QString &message);
++	void setstatusxa(const QString &message);
++	void setstatusdnd(const QString &message);
++	void setstatusoffline(const QString &message);
++
+ /*Q_SIGNALS:
+ 	void psi_pong();
+ */
+@@ -74,6 +82,41 @@ void PsiConAdapter::wake()
+ 	psicon->doWakeup();
+ }
+ 
++void PsiConAdapter::setstatusonline(const QString &message)
++{
++	Status s(Status::Online, message);
++	psicon->setGlobalStatus(s);
++}
++
++void PsiConAdapter::setstatusaway(const QString &message)
++{
++	Status s(Status::Away, message);
++	psicon->setGlobalStatus(s);
++}
++
++void PsiConAdapter::setstatusffc(const QString &message)
++{
++	Status s(Status::FFC, message);
++	psicon->setGlobalStatus(s);
++}
++
++void PsiConAdapter::setstatusxa(const QString &message)
++{
++	Status s(Status::XA, message);
++	psicon->setGlobalStatus(s);
++}
++
++void PsiConAdapter::setstatusdnd(const QString &message)
++{
++	Status s(Status::DND, message);
++	psicon->setGlobalStatus(s);
++}
++
++void PsiConAdapter::setstatusoffline(const QString &message)
++{
++	Status s(Status::Offline, message);
++	psicon->setGlobalStatus(s);
++}
+ 
+ void addPsiConAdapter(PsiCon *psicon)
+ {

psi-plus-main-20141106.tar.xz/patches/0620-psi-roster-autohide.diff Added

@@ -0,0 +1,256 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -597,6 +597,8 @@ QLineEdit#le_status_text {
+ 			<hide-on-start type="bool">false</hide-on-start>
+ 			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
+ 			<use-toolwindow type="bool">false</use-toolwindow>
++			<use-autohide type="bool">false</use-autohide>
++			<autohide-interval type="int">600</autohide-interval>
+ 		</contactlist>
+ 		<external-control>
+ 			<adhoc-remote-control>
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -135,6 +135,10 @@ public:
+ 	QToolButton* searchPb;
+ 	QWidget* searchWidget;
+ 
++	QTimer *hideTimer;
++	int hideTimerInterval; //interval in sec
++	bool useAutohide;
++
+ 	QSignalMapper* statusMapper;
+ 
+ 	PsiIcon* nextAnim;
+@@ -180,10 +184,13 @@ MainWin::Private::Private(PsiCon* _psi,
+ 
+ 	char* squishStr = getenv("SQUISH_ENABLED");
+ 	squishEnabled = squishStr != 0;
++
++	hideTimer = new QTimer();
+ }
+ 
+ MainWin::Private::~Private()
+ {
++	delete(hideTimer);
+ }
+ 
+ void MainWin::Private::registerActions()
+@@ -532,6 +539,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	// setUnifiedTitleAndToolBarOnMac(true);
+ 
+ 	connect(qApp, SIGNAL(dockActivated()), SLOT(dockActivated()));
++	qApp->installEventFilter(this);
+ 
+ 	connect(psi, SIGNAL(emitOptionsUpdate()), SLOT(optionsUpdate()));
+ 	optionsUpdate();
+@@ -539,6 +547,11 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 		/*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
+ 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
+ 	optionChanged("options.ui.contactlist.css");
++
++	connect(d->hideTimer, SIGNAL(timeout()), SLOT(hideTimerTimeout()));
++	d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
++	d->hideTimer->setInterval(d->hideTimerInterval*1000);
++	optionChanged("options.contactlist.use-autohide");
+ }
+ 
+ MainWin::~MainWin()
+@@ -580,6 +593,28 @@ void MainWin::optionChanged(const QStrin
+ 	else if (option == "options.ui.contactlist.show-roster-avatar-frame") {
+ 		d->rosterAvatar->setVisible(PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool());
+ 	}
++	else if (option == "options.contactlist.use-autohide") {
++		d->useAutohide = PsiOptions::instance()->getOption("options.contactlist.use-autohide").toBool();
++		if(d->useAutohide)
++			d->hideTimer->start();
++		else
++			d->hideTimer->stop();
++	}
++	else if (option == "options.contactlist.autohide-interval") {
++		d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
++		d->hideTimer->setInterval(d->hideTimerInterval*1000);
++		if(d->useAutohide)
++			d->hideTimer->start();
++	}
++}
++
++void MainWin::hideTimerTimeout()
++{
++	d->hideTimer->stop();
++	if(d->tray)
++		trayHide();
++	else
++		setWindowState(Qt::WindowMinimized);
+ }
+ 
+ void MainWin::registerAction( IconAction* action )
+@@ -1419,6 +1454,31 @@ void MainWin::keyPressEvent(QKeyEvent* e
+ 	QWidget::keyPressEvent(e);
+ }
+ 
++void MainWin::enterEvent(QEvent *e)
++{
++	if(d->useAutohide)
++		d->hideTimer->stop();
++	QMainWindow::enterEvent(e);
++}
++
++void MainWin::leaveEvent(QEvent *e)
++{
++	if(d->useAutohide)
++		d->hideTimer->start();
++	QMainWindow::leaveEvent(e);
++}
++
++bool MainWin::eventFilter(QObject *o, QEvent *e)
++{
++	if(e->type() == QEvent::KeyPress
++	   && o->isWidgetType()
++	   && isAncestorOf( (QWidget*)o ) ) {
++		if(d->hideTimer->isActive())
++			d->hideTimer->start();
++	}
++	return false;
++}
++
+ #ifdef Q_OS_WIN
+ #include <windows.h>
+ bool MainWin::winEvent(MSG* msg, long* result)
+@@ -1537,6 +1597,8 @@ void MainWin::trayDoubleClicked()
+ void MainWin::trayShow()
+ {
+ 	bringToFront(this);
++	if(d->useAutohide)
++		d->hideTimer->start();
+ }
+ 
+ void MainWin::trayHide()
+@@ -1836,6 +1898,8 @@ void MainWin::showNoFocus()
+ void MainWin::showNoFocus()
+ {
+ 	bringToFront(this);
++	if(d->useAutohide)
++		d->hideTimer->start();
+ }
+ 
+ void MainWin::avcallConfig()
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -72,9 +72,12 @@ public:
+ 
+ protected:
+ 	// reimplemented
++	bool eventFilter(QObject* o, QEvent* e);
+ 	void resizeEvent(QResizeEvent *e);
+ 	void closeEvent(QCloseEvent *);
+ 	void changeEvent(QEvent *event);
++	void enterEvent(QEvent *e);
++	void leaveEvent(QEvent *e);
+ 	void keyPressEvent(QKeyEvent *);
+ 	QMenuBar* mainMenuBar() const;
+ #ifdef Q_OS_WIN
+@@ -157,6 +160,8 @@ private slots:
+ 	void nickChanged();
+ 	void avatarChanged();
+ 
++	void hideTimerTimeout();
++
+ public slots:
+ 	void setWindowIcon(const QPixmap&);
+ 	void showNoFocus();
+--- git.orig/src/options/opt_roster.cpp
++++ git/src/options/opt_roster.cpp
+@@ -66,6 +66,8 @@ void OptionsTabRoster::applyOptions()
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-menubar", d->ck_showMenubar->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.disable-scrollbar", d->ck_disableScrollbar->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.show-roster-avatar-frame", d->ck_roster_avatar->isChecked());
++	PsiOptions::instance()->setOption("options.contactlist.use-autohide", d->cb_autohide->isChecked());
++	PsiOptions::instance()->setOption("options.contactlist.autohide-interval", d->sb_hideInterval->value());
+ 
+ 	//enabled icons
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.avatars.show", d->ck_showAvatarIcons->isChecked());
+@@ -95,6 +97,9 @@ void OptionsTabRoster::restoreOptions()
+ 	d->ck_showMenubar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-menubar").toBool() );
+ 	d->ck_disableScrollbar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() );
+ 	d->ck_roster_avatar->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.show-roster-avatar-frame").toBool() );
++	d->cb_autohide->setChecked( PsiOptions::instance()->getOption("options.contactlist.use-autohide").toBool() );
++	d->sb_hideInterval->setValue( PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt() );
++	d->sb_hideInterval->setEnabled(d->cb_autohide->isChecked());
+ 
+ 	//enabled icons
+ 	d->ck_showAvatarIcons->setChecked( PsiOptions::instance()->getOption("options.ui.contactlist.avatars.show").toBool() );
+--- git.orig/src/options/opt_roster.ui
++++ git/src/options/opt_roster.ui
+@@ -72,6 +72,47 @@
+     </widget>
+    </item>
+    <item>
++    <layout class="QHBoxLayout" name="horizontalLayout_3">
++     <item>
++      <widget class="QCheckBox" name="cb_autohide">
++       <property name="text">
++        <string>Autohide roster after</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QSpinBox" name="sb_hideInterval">
++       <property name="minimum">
++        <number>1</number>
++       </property>
++       <property name="maximum">
++        <number>9999</number>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QLabel" name="label_2">
++       <property name="text">
++        <string>seconds</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <spacer name="horizontalSpacer">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>0</width>
++         <height>0</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++    </layout>
++   </item>
++   <item>
+     <widget class="QGroupBox" name="gb_docklet">
+      <property name="title">
+       <string>Icons</string>
+@@ -249,5 +290,22 @@
+   <tabstop>ck_showTuneIcons</tabstop>
+  </tabstops>
+  <resources/>
+- <connections/>
++ <connections>
++  <connection>
++   <sender>cb_autohide</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>sb_hideInterval</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>92</x>
++     <y>190</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>208</x>
++     <y>191</y>
++    </hint>
++   </hints>
++  </connection>
++ </connections>
+ </ui>

psi-plus-main-20141106.tar.xz/patches/0630-psiplus-nix-application-icon-and-name.diff Added

@@ -0,0 +1,34 @@
+--- git.temp.orig/psi.desktop
++++ git.temp/psi.desktop
+@@ -2,7 +2,7 @@
+ # This is the spec version, *not* the application version
+ Version=1.0
+ Type=Application
+-Name=Psi
++Name=Psi+
+ GenericName=XMPP Client
+ Comment=Communicate over the XMPP network
+ Icon=psi
+--- git.temp.orig/src/src.pro
++++ git.temp/src/src.pro
+@@ -45,15 +45,15 @@ unix {
+ 	dt.path=$$PREFIX/share/applications/
+ 	dt.files = ../psi.desktop
+ 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
+-	icon1.extra = cp -f ../iconsets/system/default/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
++	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
+ 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
+-	icon2.extra = cp -f ../iconsets/system/default/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
++	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
+ 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
+-	icon3.extra = cp -f ../iconsets/system/default/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
++	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
+ 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
+-	icon4.extra = cp -f ../iconsets/system/default/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
++	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
+ 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
+-	icon5.extra = cp -f ../iconsets/system/default/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
++	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
+ 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
+ }
+

psi-plus-main-20141106.tar.xz/patches/0640-psi-presets-in-status-menu.diff Added

@@ -0,0 +1,5346 @@
+--- git.orig/iris/src/xmpp/xmpp-im/types.cpp
++++ git/iris/src/xmpp/xmpp-im/types.cpp
+@@ -2283,24 +2283,29 @@ void Status::setType(Status::Type _type)
+ 	setIsInvisible(invisible);
+ }
+ 
++Status::Type Status::txt2type(const QString& stat)
++{
++      if (stat == "offline")
++              return XMPP::Status::Offline;
++      else if (stat == "online")
++              return XMPP::Status::Online;
++      else if (stat == "away")
++              return XMPP::Status::Away;
++      else if (stat == "xa")
++              return XMPP::Status::XA;
++      else if (stat == "dnd")
++              return XMPP::Status::DND;
++      else if (stat == "invisible")
++              return XMPP::Status::Invisible;
++      else if (stat == "chat")
++              return XMPP::Status::FFC;
++      else
++              return XMPP::Status::Away;
++}
++
+ void Status::setType(QString stat)
+ {
+-	if (stat == "offline")
+-		setType(XMPP::Status::Offline);
+-	else if (stat == "online")
+-		setType(XMPP::Status::Online);
+-	else if (stat == "away")
+-		setType(XMPP::Status::Away);
+-	else if (stat == "xa")
+-		setType(XMPP::Status::XA);
+-	else if (stat == "dnd")
+-		setType(XMPP::Status::DND);
+-	else if (stat == "invisible")
+-		setType(XMPP::Status::Invisible);
+-	else if (stat == "chat")
+-		setType(XMPP::Status::FFC);
+-	else
+-		setType(XMPP::Status::Away);
++      setType(txt2type(stat));
+ }
+ 
+ void Status::setShow(const QString & _show)
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_status.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_status.h
+@@ -73,6 +73,8 @@ namespace XMPP
+ 		int mucHistorySeconds() const;
+ 		const QDateTime & mucHistorySince() const;
+ 
++		static Type txt2type(const QString& stat);
++
+ 		void setPriority(int);
+ 		void setType(Type);
+ 		void setType(QString);
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -58,6 +58,7 @@
+ 				<maximum comment="The maximum number of recently joined rooms that should be remembered" type="int">10</maximum>
+ 			</recent-joins>
+ 			<reasons type="QStringList" />
++			<leave-status-message comment="Leave status message" type="QString"></leave-status-message>
+ 		</muc>
+ 		<pgp comment="PGP encryption options">
+ 			<enable comment="Enable PGP globally" type="bool">true</enable>
+@@ -117,6 +118,7 @@
+ 				<css type="QString" />
+ 				<only-paste-template type="bool">false</only-paste-template>
+ 				<hide-when-closing type="bool">false</hide-when-closing>
++				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+@@ -286,6 +288,8 @@ QLineEdit#le_status_text {
+ 				</view>
+ 			</menu>
+ 			<muc comment="Multi-User Chat options">
++				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
++				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
+ 				<log-width type="int">500</log-width>
+ 				<roster-width type="int">80</roster-width>
+ 				<roster-at-left type="bool">false</roster-at-left>
+@@ -497,6 +501,7 @@ QLineEdit#le_status_text {
+ 				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
+ 				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
+ 				<status_all type="QKeySequence" comment="Status All"></status_all>
++				<status_group type="QKeySequence" comment="Status Group"></status_group>
+ 				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
+ 				<status_online type="QKeySequence" comment="Status Online"></status_online>
+ 				<status_away type="QKeySequence" comment="Status Away"></status_away>
+@@ -504,6 +509,8 @@ QLineEdit#le_status_text {
+ 				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
+ 				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
+ 				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
++				<choose_status type="QKeySequence" comment="Choose status"></choose_status>
++				<reconnect_all type="QKeySequence" comment="Reconnect all accounts"></reconnect_all>
+ 				<set_mood type="QKeySequence" comment="Set Mood"/>
+ 				<set_activity type="QKeySequence" comment="Set Activity"/>
+ 				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
+@@ -640,17 +647,41 @@ QLineEdit#le_status_text {
+ 		<status>
+ 			<ask-for-message-on-offline type="bool">false</ask-for-message-on-offline>
+ 			<ask-for-message-on-online type="bool">false</ask-for-message-on-online>
++			<ask-for-message-on-chat type="bool">true</ask-for-message-on-chat>
++			<ask-for-message-on-away type="bool">true</ask-for-message-on-away>
++			<ask-for-message-on-xa type="bool">true</ask-for-message-on-xa>
++			<ask-for-message-on-dnd type="bool">true</ask-for-message-on-dnd>
+ 			<auto-away>
+ 				<away-after type="int">10</away-after>
+ 				<force-priority type="bool">false</force-priority>
++				<force-xa-priority type="bool">false</force-xa-priority>
+ 				<not-availible-after type="int">30</not-availible-after>
+ 				<offline-after type="int">0</offline-after>
+ 				<use-away type="bool">true</use-away>
+ 				<use-not-availible type="bool">true</use-not-availible>
+ 				<use-offline type="bool">false</use-offline>
+ 			</auto-away>
+-			<last-message type="QString"/>
++			<last-message comment="Last status message" type="QString"/>
++			<last-priority comment="Last priority" type="QString"/>
++			<last-status comment="Last status" type="QString">away</last-status>
++			<last-overwrite>
++				<by-template type="bool">true</by-template>
++				<by-status type="bool">false</by-status>
++			</last-overwrite>
+ 			<presets/>
++			<presets-in-status-menus type="QString" comment="'yes', 'no' or 'submenu'">submenu</presets-in-status-menus>
++			<show-only-online-offline type="bool">false</show-only-online-offline>
++			<show-choose type="bool">true</show-choose>
++			<show-edit-presets type="bool">true</show-edit-presets>
++			<show-reconnect comment="Show Reconnect in status menus" type="bool">false</show-reconnect>
++			<default-priority>
++				<online type="int">50</online>
++				<chat type="int">50</chat>
++				<away type="int">40</away>
++				<xa type="int">30</xa>
++				<dnd type="int">20</dnd>
++				<invisible type="int">10</invisible>
++			</default-priority>
+ 		</status>
+ 		<subscriptions>
+ 			<automatically-allow-authorization type="bool">false</automatically-allow-authorization>
+--- git.orig/src/accountmodifydlg.cpp
++++ git/src/accountmodifydlg.cpp
+@@ -86,8 +86,6 @@ void AccountModifyDlg::init()
+ 	connect(pb_key, SIGNAL(clicked()), SLOT(chooseKey()));
+ 	connect(pb_keyclear, SIGNAL(clicked()), SLOT(clearKey()));
+ 	connect(buttonBox->button(QDialogButtonBox::Save), SIGNAL(clicked()), SLOT(save()));
+-	connect(ck_automatic_resource, SIGNAL(toggled(bool)), le_resource, SLOT(setDisabled(bool)));
+-	connect(ck_automatic_resource, SIGNAL(toggled(bool)), lb_resource, SLOT(setDisabled(bool)));
+ 
+ 	gb_pgp->setEnabled(false);
+ 
+@@ -124,9 +122,18 @@ void AccountModifyDlg::init()
+ 	le_port->setText(QString::number(acc.port));
+ 	ck_req_mutual->setChecked(acc.req_mutual_auth);
+ 
+-	ck_automatic_resource->setChecked(acc.opt_automatic_resource);
++	connect(cb_resource, SIGNAL(currentIndexChanged(int)), SLOT(resourceCbChanged(int)));
++	connect(cb_priority, SIGNAL(currentIndexChanged(int)), SLOT(priorityCbChanged(int)));
++	connect(ck_auto, SIGNAL(clicked()), SLOT(autoconnectCksChanged()));
++	connect(ck_connectAfterSleep, SIGNAL(clicked()), SLOT(autoconnectCksChanged()));
++	cb_resource->addItem(tr("Manual"));
++	cb_resource->addItem(tr("Use host name"));
++	cb_resource->setCurrentIndex(acc.opt_automatic_resource ? 1 : 0);
+ 	le_resource->setText(acc.resource);
+-	le_priority->setText(QString::number(acc.priority));
++	cb_priority->addItem(tr("Fixed"));
++	cb_priority->addItem(tr("Depends on status"));
++	cb_priority->setCurrentIndex(acc.priority_dep_on_status ? 1 : 0);
++	sb_priority->setValue(acc.priority);
+ 
+ 	connect(ck_custom_auth,SIGNAL(toggled(bool)), lb_authid, SLOT(setEnabled(bool)));
+ 	connect(ck_custom_auth,SIGNAL(toggled(bool)), le_authid, SLOT(setEnabled(bool)));
+@@ -140,6 +147,7 @@ void AccountModifyDlg::init()
+ 	ck_auto->setChecked(acc.opt_auto);
+ 	ck_reconn->setChecked(acc.opt_reconn);
+ 	ck_connectAfterSleep->setChecked(acc.opt_connectAfterSleep);
++	ck_autoSameStatus->setChecked(acc.opt_autoSameStatus);
+ 	ck_log->setChecked(acc.opt_log);
+ 	ck_keepAlive->setChecked(acc.opt_keepAlive);
+ 	ck_ibbOnly->setChecked(acc.ibbOnly);
+@@ -148,6 +156,7 @@ void AccountModifyDlg::init()
+ 	le_stunPort->setText(QString::number(acc.stunPort));
+ 	le_stunUser->setText(acc.stunUser);
+ 	le_stunPass->setText(acc.stunPass);
++	autoconnectCksChanged();
+ 	connect(ck_ibbOnly, SIGNAL(toggled(bool)), SLOT(ibbOnlyToggled(bool)));
+ 	ibbOnlyToggled(acc.ibbOnly);
+ 
+@@ -251,7 +260,7 @@ void AccountModifyDlg::init()
+ 		tr("This option sets the user (and realm) you want to "
+ 			"authenticate as. This overrides the XMPP address you are logging in "
+ 			"as."));
+-	le_priority->setWhatsThis(
++	sb_priority->setWhatsThis(
+ 		tr("<p>You can have multiple clients connected to the XMPP "
+ 		"server with your single account.  In such a situation, "
+ 		"the client with the highest priority (that is specified in "
+@@ -311,7 +320,7 @@ void AccountModifyDlg::init()
+ 	}
+ 
+ 	if (!PsiOptions::instance()->getOption("options.ui.account.resource").toBool()) {
+-		ck_automatic_resource->hide();
++		cb_resource->hide();
+ 		lb_resource->hide();
+ 		le_resource->hide();
+ 	}
+@@ -326,7 +335,8 @@ void AccountModifyDlg::init()
+ 
+ 	if (!PsiOptions::instance()->getOption("options.ui.account.priority").toBool()) {
+ 		lb_priority->hide();
+-		le_priority->hide();
++		cb_priority->hide();
++		sb_priority->hide();
+ 	}
+ 
+ 	if (!PsiOptions::instance()->getOption("options.ui.account.data-proxy").toBool()) {
+@@ -513,9 +523,10 @@ void AccountModifyDlg::save()
+ 	acc.req_mutual_auth = ck_req_mutual->isChecked();
+ 	acc.security_level = cb_security_level->itemData(cb_security_level->currentIndex()).toInt();
+ 
+-	acc.opt_automatic_resource = ck_automatic_resource->isChecked();
++	acc.opt_automatic_resource = (cb_resource->currentIndex() == 1);
+ 	acc.resource = le_resource->text();
+-	acc.priority = le_priority->text().toInt();
++	acc.priority_dep_on_status = (cb_priority->currentIndex() == 1);
++	acc.priority = sb_priority->value();
+ 	acc.customAuth = ck_custom_auth->isChecked();
+ 	acc.authid = le_authid->text();
+ 	acc.realm = le_realm->text();
+@@ -524,6 +535,7 @@ void AccountModifyDlg::save()
+ 	acc.opt_compress = ck_compress->isChecked();
+ 	acc.opt_auto = ck_auto->isChecked();
+ 	acc.opt_connectAfterSleep = ck_connectAfterSleep->isChecked();
++	acc.opt_autoSameStatus = ck_autoSameStatus->isChecked();
+ 	acc.opt_reconn = ck_reconn->isChecked();
+ 	acc.opt_log = ck_log->isChecked();
+ 	acc.opt_keepAlive = ck_keepAlive->isChecked();
+@@ -651,3 +663,22 @@ void AccountModifyDlg::getDefaultList_er
+ 	setPrivacyTabEnabled(false);
+ }
+ 
++void AccountModifyDlg::resourceCbChanged(int index)
++{
++	le_resource->setEnabled(index == 0);
++}
++
++void AccountModifyDlg::priorityCbChanged(int index)
++{
++	sb_priority->setEnabled(index == 0);
++}
++
++void AccountModifyDlg::autoconnectCksChanged()
++{
++	if (ck_auto->isChecked() || ck_connectAfterSleep->isChecked()) {
++		ck_autoSameStatus->setEnabled(true);
++	}
++	else {
++		ck_autoSameStatus->setEnabled(false);
++	}
++}
+--- git.orig/src/accountmodifydlg.h
++++ git/src/accountmodifydlg.h
+@@ -73,6 +73,10 @@ private slots:
+  	void getDefaultList_error();
+  	void changeList_error();
+ 
++	void resourceCbChanged(int index);
++	void priorityCbChanged(int index);
++	void autoconnectCksChanged();
++
+ private:
+ 	PsiCon *psi;
+ 	PsiAccount *pa;
+--- git.orig/src/accountmodify.ui
++++ git/src/accountmodify.ui
+@@ -150,6 +150,13 @@
+            </widget>
+           </item>
+           <item>
++           <widget class="QCheckBox" name="ck_autoSameStatus">
++            <property name="text">
++             <string>Restore last status</string>
++            </property>
++           </widget>
++          </item>
++          <item>
+            <widget class="QCheckBox" name="ck_reconn">
+             <property name="text">
+              <string>Automatically reconnect if disconnected</string>
+@@ -791,20 +798,7 @@
+       </attribute>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+-        <widget class="QCheckBox" name="ck_automatic_resource">
+-         <property name="text">
+-          <string>Use hostname as resource</string>
+-         </property>
+-        </widget>
+-       </item>
+-       <item>
+-        <layout class="QHBoxLayout">
+-         <property name="spacing">
+-          <number>6</number>
+-         </property>
+-         <property name="margin">
+-          <number>0</number>
+-         </property>
++        <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <widget class="QLabel" name="lb_resource">
+            <property name="text">
+@@ -813,6 +807,9 @@
+           </widget>
+          </item>
+          <item>
++          <widget class="QComboBox" name="cb_resource"/>
++         </item>
++         <item>
+           <widget class="QLineEdit" name="le_resource">
+            <property name="minimumSize">
+             <size>
+@@ -822,33 +819,46 @@
+            </property>
+           </widget>
+          </item>
++        </layout>
++       </item>
++       <item>
++        <layout class="QHBoxLayout">
++         <property name="spacing">
++          <number>6</number>
++         </property>
++         <property name="margin">
++          <number>0</number>
++         </property>
+          <item>
+           <widget class="QLabel" name="lb_priority">
+            <property name="text">
+-            <string>Priority:</string>
++            <string>Default priority:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+-          <widget class="QLineEdit" name="le_priority">
+-           <property name="sizePolicy">
+-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+-             <horstretch>0</horstretch>
+-             <verstretch>0</verstretch>
+-            </sizepolicy>
+-           </property>
++          <widget class="QComboBox" name="cb_priority"/>
++         </item>
++         <item>
++          <widget class="QSpinBox" name="sb_priority">
+            <property name="minimumSize">
+             <size>
+-             <width>56</width>
++             <width>60</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+-             <width>56</width>
+-             <height>32767</height>
++             <width>60</width>
++             <height>16777215</height>
+             </size>
+            </property>
++           <property name="minimum">
++            <number>-128</number>
++           </property>
++           <property name="maximum">
++            <number>127</number>
++           </property>
+           </widget>
+          </item>
+         </layout>
+@@ -1119,9 +1129,6 @@ When you enable this option you will not
+   <tabstop>cb_plain</tabstop>
+   <tabstop>ck_req_mutual</tabstop>
+   <tabstop>cb_security_level</tabstop>
+-  <tabstop>ck_automatic_resource</tabstop>
+-  <tabstop>le_resource</tabstop>
+-  <tabstop>le_priority</tabstop>
+   <tabstop>le_dtProxy</tabstop>
+   <tabstop>le_stunHost</tabstop>
+   <tabstop>le_stunPort</tabstop>
+--- git.orig/src/accountstatusmenu.cpp
++++ git/src/accountstatusmenu.cpp
+@@ -0,0 +1,33 @@
++#include "accountstatusmenu.h"
++
++#include "psiiconset.h"
++#include "psioptions.h"
++#include "iconaction.h"
++#include "common.h"
++#include "statusdlg.h"
++
++void AccountStatusMenu::addChoose()
++{
++	//Action will be automatically added to menu, because we set "this" as parent for it
++	IconAction *action = new IconAction(tr("Choose status..."), "psi/action_direct_presence", tr("Choose..."), 0, this);
++	connect(action, SIGNAL(triggered()), SLOT(chooseStatusActivated()));
++}
++
++void AccountStatusMenu::chooseStatusActivated()
++{
++	XMPP::Status::Type lastStatus = XMPP::Status::txt2type(PsiOptions::instance()->getOption("options.status.last-status").toString());
++	StatusSetDlg *w = new StatusSetDlg(account, makeLastStatus(lastStatus), lastPriorityNotEmpty());
++	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), account, SLOT(setStatus(const XMPP::Status &, bool, bool)));
++	w->show();
++}
++
++void AccountStatusMenu::addReconnect() {
++	IconAction *action = new IconAction(tr("Reconnect"), "psi/reload", tr("Reconnect"), 0, this);
++	connect(action, SIGNAL(triggered()), SIGNAL(reconnectActivated()));
++}
++
++void AccountStatusMenu::fill()
++{
++	StatusMenu::fill();
++	statusChanged(account->status());
++}
+--- git.orig/src/accountstatusmenu.h
++++ git/src/accountstatusmenu.h
+@@ -0,0 +1,31 @@
++#ifndef ACCOUNTSTATUSMENU_H
++#define ACCOUNTSTATUSMENU_H
++
++#include "statusmenu.h"
++#include "psiaccount.h"
++#include "psicon.h"
++
++class AccountStatusMenu : public StatusMenu {
++	Q_OBJECT
++private:
++	PsiAccount* account;
++
++public:
++	AccountStatusMenu(QWidget* parent, PsiCon* _psi, PsiAccount* _account)
++		: StatusMenu(parent, _psi), account(_account) {};
++
++	void fill();
++
++protected:
++	void addChoose();
++	void addReconnect();
++
++private slots:
++	void chooseStatusActivated();
++
++signals:
++	void reconnectActivated();
++
++};
++
++#endif // ACCOUNTSTATUSMENU_H
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -392,6 +392,7 @@ struct UserStatus {
+ 	UserListItem* userListItem;
+ 	XMPP::Status::Type statusType;
+ 	QString status;
++	int priority;
+ 	QString publicKeyID;
+ };
+ 
+@@ -409,6 +410,7 @@ UserStatus userStatusFor(const Jid& jid,
+ 			const UserResource &r = *u.userListItem->userResourceList().priority();
+ 			u.statusType = r.status().type();
+ 			u.status = r.status().status();
++			u.priority = r.status().priority();
+ 			u.publicKeyID = r.publicKeyID();
+ 		}
+ 	}
+@@ -418,12 +420,15 @@ UserStatus userStatusFor(const Jid& jid,
+ 		if (rit != u.userListItem->userResourceList().end()) {
+ 			u.statusType = (*rit).status().type();
+ 			u.status = (*rit).status().status();
++			u.priority = (*rit).status().priority();
+ 			u.publicKeyID = (*rit).publicKeyID();
+ 		}
+ 	}
+ 
+-	if (u.statusType == XMPP::Status::Offline)
++	if (u.statusType == XMPP::Status::Offline) {
+ 		u.status = u.userListItem->lastUnavailableStatus().status();
++		u.priority = 0;
++	}
+ 
+ 	return u;
+ }
+@@ -453,11 +458,13 @@ void ChatDlg::updateContact(const Jid &j
+ 		if (userStatus.statusType == XMPP::Status::Offline)
+ 			contactChatState_ = XMPP::StateNone;
+ 
++		bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.chat.status-with-priority").toBool();
+ 		bool statusChanged = false;
+-		if (status_ != userStatus.statusType || statusString_ != userStatus.status) {
++		if (status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
+ 			statusChanged = true;
+ 			status_ = userStatus.statusType;
+ 			statusString_ = userStatus.status;
++			priority_ = userStatus.priority;
+ 		}
+ 
+ 		contactUpdated(userStatus.userListItem, userStatus.statusType, userStatus.status);
+@@ -471,7 +478,9 @@ void ChatDlg::updateContact(const Jid &j
+ 			updatePGP();
+ 
+ 			if (fromPresence && statusChanged) {
+-				chatView()->dispatchMessage(MessageView::statusMessage(dispNick_, status_, statusString_));
++				chatView()->dispatchMessage(MessageView::statusMessage(
++												dispNick_, status_,
++												statusString_, priority_));
+ 			}
+ 		}
+ 
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -164,7 +164,7 @@ protected:
+ private:
+ 	bool highlightersInstalled_;
+ 	QString dispNick_;
+-	int status_;
++	int status_, priority_;
+ 	QString statusString_;
+ 
+ 	void initActions();
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -348,9 +348,13 @@ void ChatView::renderSysMessage(const Me
+ 	QString color = ColorOpt::instance()->color(informationalColorOpt).name();
+ 	QString userTextColor = ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name();
+ 	appendText(QString(useMessageIcons_?"<img src=\"icon:log_icon_info\" />":"") +
+-			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) + mv.formattedText() +
+-						(ut.isEmpty()?"":":") + "</font>" +
+-						(ut.isEmpty()?"":QString(" <span style=\"color:%1;\">%2</span>").arg(userTextColor, ut)));
++			   QString("<font color=\"%1\">[%2] *** ").arg(color, timestr) +
++			   mv.formattedText() +
++			   (ut.isEmpty()?"":QString(": <span style=\"color:%1;\">%2</span>")
++									  .arg(userTextColor, ut)) +
++			   (mv.type() == MessageView::Status && mv.statusPriority() ?
++					QString(" [%1]").arg(mv.statusPriority()) :  "") +
++			   "</font>");
+ }
+ 
+ void ChatView::renderSubject(const MessageView &mv)
+--- git.orig/src/common.cpp
++++ git/src/common.cpp
+@@ -296,6 +296,23 @@ void soundPlay(const QString &s)
+ #endif
+ }
+ 
++bool lastPriorityNotEmpty()
++{
++	QString lastPriority = PsiOptions::instance()->getOption("options.status.last-priority").toString();
++	return (lastPriority != "");
++}
++
++XMPP::Status makeLastStatus(int x)
++{
++	PsiOptions* o = PsiOptions::instance();
++	if (lastPriorityNotEmpty()) {
++		return makeStatus(x, o->getOption("options.status.last-message").toString(), o->getOption("options.status.last-priority").toInt());
++	}
++	else {
++		return makeStatus(x, o->getOption("options.status.last-message").toString());
++	}
++}
++
+ XMPP::Status makeStatus(int x, const QString &str, int priority)
+ {
+ 	XMPP::Status s = makeStatus(x,str);
+@@ -408,6 +425,35 @@ TabbableWidget* findActiveTab()
+ 	return tw;
+ }
+ 
++void reorderGridLayout(QGridLayout* layout, int maxCols)
++{
++	QList<QLayoutItem*> items;
++	for (int i = 0; i < layout->rowCount(); i++) {
++		for (int j = 0; j < layout->columnCount(); j++) {
++			QLayoutItem* item = layout->itemAtPosition(i, j);
++			if (item) {
++				layout->removeItem(item);
++				if (item->isEmpty()) {
++					delete item;
++				}
++				else {
++					items.append(item);
++				}
++			}
++		}
++	}
++	int col = 0, row = 0;
++	while (!items.isEmpty()) {
++		QLayoutItem* item = items.takeAt(0);
++		layout->addItem(item, row, col);
++		col++;
++		if (col >= maxCols) {
++			col = 0;
++			row++;
++		}
++	}
++}
++
+ #ifdef HAVE_X11
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h> // needed for WM_CLASS hinting
+--- git.orig/src/common.h
++++ git/src/common.h
+@@ -27,6 +27,7 @@
+ #include <QStringList>
+ #include <QList>
+ #include <QColor>
++#include <QGridLayout>
+ 
+ class QMenu;
+ class TabbableWidget;
+@@ -112,6 +113,8 @@ enum { EventPriorityDontCare = -1 };
+ #define STATUS_ERROR	 102
+ 
+ QString status2txt(int status);
++bool lastPriorityNotEmpty();
++XMPP::Status makeLastStatus(int);
+ XMPP::Status makeStatus(int, const QString &);
+ XMPP::Status makeStatus(int, const QString &, int);
+ XMPP::Status::Type makeSTATUS(const XMPP::Status &);
+@@ -157,6 +160,7 @@ void x11wmClass(Display *dsp, WId wid, Q
+ #else
+ #define X11WM_CLASS(x)	/* dummy */
+ #endif
++void reorderGridLayout(QGridLayout* layout, int maxCols);
+ 
+ // -----------------------------------------------------------------------------
+ // History utilities
+--- git.orig/src/contactlistaccountmenu.cpp
++++ git/src/contactlistaccountmenu.cpp
+@@ -24,7 +24,7 @@
+ 
+ #include "psiaccount.h"
+ #include "contactlistaccountgroup.h"
+-#include "statusmenu.h"
++#include "accountstatusmenu.h"
+ #include "serverinfomanager.h"
+ #include "bookmarkmanager.h"
+ #include "psioptions.h"
+@@ -40,7 +40,7 @@ class ContactListAccountMenu::Private :
+ 	Q_OBJECT
+ 
+ 	QPointer<ContactListAccountGroup> account;
+-	StatusMenu* statusMenu_;
++	AccountStatusMenu* statusMenu_;
+ 	QAction* moodAction_;
+ 	QAction* activityAction_;
+ 	QAction* geolocationAction_;
+@@ -75,10 +75,14 @@ public:
+ 		connect(account->account(), SIGNAL(updatedActivity()), SLOT(updateActions()));
+ 		connect(account->account(), SIGNAL(updatedAccount()), SLOT(updateActions()));
+ 
+-		statusMenu_ = new StatusMenu(0);
++		statusMenu_ = new AccountStatusMenu(0, account->account()->psi(), account->account());
++		statusMenu_->fill();
+ 		statusMenu_->setTitle(tr("&Status"));
+ 		statusMenu_->setIcon(PsiIconset::instance()->status(makeSTATUS(account->account()->status())).icon());
+-		connect(statusMenu_, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusChanged(XMPP::Status::Type)));
++		connect(statusMenu_, SIGNAL(statusSelected(XMPP::Status::Type, bool)), SLOT(statusChanged(XMPP::Status::Type, bool)));
++		connect(statusMenu_, SIGNAL(statusPresetSelected(const XMPP::Status &, bool, bool)), account->account(), SLOT(setStatus(const XMPP::Status &, bool, bool)));
++		connect(statusMenu_, SIGNAL(statusPresetDialogForced(const QString &)), account->account(), SLOT(showStatusDialog(const QString &)));
++		connect(statusMenu_, SIGNAL(reconnectActivated()), account->account(), SLOT(reconnectOnce()));
+ 
+ 		moodAction_ = new IconAction(tr("Mood"), this, QString(("mood/%1")).arg(account->account()->mood().typeValue()));
+ 		connect(moodAction_, SIGNAL(triggered()), SLOT(setMood()));
+@@ -183,7 +187,7 @@ private slots:
+ 		if (!account)
+ 			return;
+ 
+-		statusMenu_->setStatus(account->account()->status().type());
++		statusMenu_->statusChanged(account->account()->status());
+ #ifndef USE_PEP
+ 		moodAction_->setVisible(false);
+ 		activityAction_->setVisible(false);
+@@ -233,12 +237,12 @@ private slots:
+ 		adminDeleteMotdAction_->setVisible(newMessageAction_->isVisible());
+ 	}
+ 
+-	void statusChanged(XMPP::Status::Type statusType)
++	void statusChanged(XMPP::Status::Type statusType, bool forceDialog)
+ 	{
+ 		if (!account)
+ 			return;
+ 
+-		account->account()->changeStatus(static_cast<int>(statusType));
++		account->account()->changeStatus(static_cast<int>(statusType), forceDialog);
+ 	}
+ 
+ 	void setMood()
+--- git.orig/src/contactlistgroupmenu.cpp
++++ git/src/contactlistgroupmenu.cpp
+@@ -253,7 +253,7 @@ private slots:
+ 			return;
+ 
+ 		PsiAccount *pa = group->contacts().first()->account();
+-		StatusSetDlg *w = new StatusSetDlg(pa->psi(), pa->status());
++		StatusSetDlg *w = new StatusSetDlg(pa->psi(), makeLastStatus(pa->status().type()), lastPriorityNotEmpty());
+ 		QList<XMPP::Jid> list;
+ 		foreach(PsiContact* contact, group->contacts()) {
+ 			if(contact->isPrivate()) continue;
+--- git.orig/src/globalstatusmenu.cpp
++++ git/src/globalstatusmenu.cpp
+@@ -0,0 +1,42 @@
++#include "globalstatusmenu.h"
++
++#include "psiactionlist.h"
++
++void GlobalStatusMenu::addChoose()
++{
++	ActionList actions = psi->actionList()->suitableActions(PsiActionList::Actions_MainWin);
++	IconAction* action = actions.action( "choose_status" );
++
++	if ( !action ) {
++		qWarning("GlobalStatusMenu::addChoose(): action choose_status not found!");
++	}
++
++	addAction(static_cast<QAction*>(action));
++}
++
++void GlobalStatusMenu::addReconnect()
++{
++	ActionList actions = psi->actionList()->suitableActions(PsiActionList::Actions_MainWin);
++	IconAction* action = actions.action( "reconnect_all" );
++	if ( !action ) {
++		qWarning("GlobalStatusMenu::addReconnect(): action reconnect_all not found!");
++	}
++	addAction(static_cast<QAction*>(action));
++}
++
++void GlobalStatusMenu::fill()
++{
++	StatusMenu::fill();
++	//TODO: Find another way to prevent manual toggling
++	foreach (QAction* action, statusActs)
++		connect(action, SIGNAL(triggered(bool)), SLOT(preventStateChange(bool)));
++	foreach (QAction* action, presetActs)
++		connect(action, SIGNAL(triggered(bool)), SLOT(preventStateChange(bool)));
++	statusChanged(makeStatus(psi->currentStatusType(), psi->currentStatusMessage()));
++}
++
++void GlobalStatusMenu::preventStateChange(bool checked)
++{
++	QAction* action = static_cast<QAction*>(sender());
++	action->setChecked(!checked);
++}
+--- git.orig/src/globalstatusmenu.h
++++ git/src/globalstatusmenu.h
+@@ -0,0 +1,23 @@
++#ifndef GLOBALSTATUSMENU_H
++#define GLOBALSTATUSMENU_H
++
++#include "psicon.h"
++#include "statusmenu.h"
++
++class GlobalStatusMenu : public StatusMenu {
++	Q_OBJECT
++private:
++	void addChoose();
++	void addReconnect();
++
++public:
++	GlobalStatusMenu(QWidget* parent, PsiCon* _psi)
++		: StatusMenu(parent, _psi) { };
++
++	void fill();
++
++public slots:
++	void preventStateChange(bool checked);
++};
++
++#endif // GLOBALSTATUSMENU_H
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1358,9 +1358,8 @@ void GCMainDlg::presence(const QString &
+ 		GCUserViewItem* contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+ 		if (contact == NULL) {
+ 			//contact joining
+-			if ( !d->connecting && options_->getOption("options.muc.show-joins").toBool() ) {
++			if ((!d->connecting || options_->getOption("options.ui.muc.show-initial-joins").toBool()) && options_->getOption("options.muc.show-joins").toBool() ) {
+ 				QString message = tr("%1 has joined the room");
+-
+ 				if ( options_->getOption("options.muc.show-role-affiliation").toBool() ) {
+ 					if (s.mucItem().role() != MUCItem::NoRole) {
+ 						if (s.mucItem().affiliation() != MUCItem::NoAffiliation) {
+@@ -1379,6 +1378,15 @@ void GCMainDlg::presence(const QString &
+ 				} else {
+ 					message = message.arg(nick);
+ 				}
++				if (options_->getOption("options.muc.show-status-changes").toBool()) {
++					message += tr(" and now is %1").arg(status2txt(s.type()));
++					if (!s.status().isEmpty()) {
++						message += QString(" (%1)").arg(s.status());
++					}
++					if (options_->getOption("options.ui.muc.status-with-priority").toBool() && s.priority() != 0) {
++						message += QString(" [%1]").arg(s.priority());
++					}
++				}
+ 				appendSysMsg(message);
+ 			}
+ 		}
+@@ -1403,14 +1411,11 @@ void GCMainDlg::presence(const QString &
+ 				}
+ 			}
+ 			if ( !d->connecting && options_->getOption("options.muc.show-status-changes").toBool() ) {
+-				if (s.status() != contact->s.status() || s.show() != contact->s.show())	{
+-					QString st;
+-					if (s.show().isEmpty()) {
+-						st=tr("online");
+-					} else {
+-						st=s.show();
+-					}
+-					ui_.log->dispatchMessage(MessageView::statusMessage(nick, (int)s.type(), s.status()));
++				bool statusWithPriority = options_->getOption("options.ui.muc.status-with-priority").toBool();
++				if (s.status() != contact->s.status() || s.show() != contact->s.show() ||
++						(statusWithPriority && s.priority() != contact->s.priority())) {
++					ui_.log->dispatchMessage(MessageView::statusMessage(
++												 nick, (int)s.type(), s.status(), s.priority()));
+ 				}
+ 			}
+ 		}
+--- git.orig/src/libpsi/tools/priorityvalidator.cpp
++++ git/src/libpsi/tools/priorityvalidator.cpp
+@@ -0,0 +1,41 @@
++/*
++ * priorityvalidator.cpp - XMPP priority validator
++ * Copyright (C) 2010 Dmitriy.trt
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "priorityvalidator.h"
++
++QValidator::State PriorityValidator::validate(QString &input, int &/*pos*/) const
++{
++      if (input.isEmpty()) {
++              return QValidator::Acceptable;
++      }
++      else if (input == "-") {
++              return QValidator::Intermediate;
++      }
++      else {
++              bool ok = false;
++              int val = input.toInt(&ok);
++              if (ok && val >= -128 && val <= 127) {
++                      return QValidator::Acceptable;
++              }
++              else {
++                      return QValidator::Invalid;
++              }
++      }
++}
+--- git.orig/src/libpsi/tools/priorityvalidator.h
++++ git/src/libpsi/tools/priorityvalidator.h
+@@ -0,0 +1,34 @@
++/*
++ * priorityvalidator.h - XMPP priority validator
++ * Copyright (C) 2010 Dmitriy.trt
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef PRIORITYVALIDATOR_H
++#define PRIORITYVALIDATOR_H
++
++#include <QValidator>
++
++class PriorityValidator : public QValidator
++{
++      Q_OBJECT
++public:
++      PriorityValidator(QObject* parent = 0) : QValidator(parent) { };
++      virtual State validate(QString &input, int &pos) const;
++};
++
++#endif // PRIORITYVALIDATOR_H
+--- git.orig/src/libpsi/tools/tools.pri
++++ git/src/libpsi/tools/tools.pri
+@@ -18,9 +18,11 @@ mac {
+ 
+ HEADERS += \
+ 	$$PWD/maybe.h \
++	$$PWD/priorityvalidator.h \
+ 	$$PWD/iodeviceopener.h
+ 
+ SOURCES += \
++	$$PWD/priorityvalidator.cpp \
+ 	$$PWD/iodeviceopener.cpp
+ 
+ unix:!mac {
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -66,6 +66,8 @@
+ #include "mucjoindlg.h"
+ #include "psicontactlist.h"
+ #include "desktoputil.h"
++#include "statusdlg.h"
++#include "globalstatusmenu.h"
+ #ifdef NEWCONTACTLIST
+ #include "psirosterwidget.h"
+ #endif
+@@ -109,7 +111,8 @@ public:
+ 	~Private();
+ 
+ 	bool onTop, asTool;
+-	QMenu* mainMenu, *statusMenu, *optionsMenu, *toolsMenu;
++	QMenu* mainMenu, *optionsMenu, *toolsMenu;
++	GlobalStatusMenu *statusMenu;
+ 	int sbState;
+ 	QString nickname;
+ 	PsiTrayIcon* tray;
+@@ -125,6 +128,7 @@ public:
+ 
+ 	PopupAction* optionsButton, *statusButton;
+ 	IconActionGroup* statusGroup, *viewGroups;
++	IconAction* statusSmallerAlt;
+ 	EventNotifierAction* eventNotifier;
+ 	PsiCon* psi;
+ 	MainWin* mainWin;
+@@ -168,12 +172,13 @@ public:
+ MainWin::Private::Private(PsiCon* _psi, MainWin* _mainWin) : splitter(0), mainTabs(0), viewToolBar(0), isLeftRoster(false), psi(_psi), mainWin(_mainWin)
+ {
+ 
+-	statusGroup   = (IconActionGroup *)getAction("status_all");
++	statusGroup   = (IconActionGroup *)getAction("status_group");
+ 	viewGroups    = (IconActionGroup *)getAction("view_groups");
+ 	eventNotifier = (EventNotifierAction *)getAction("event_notifier");
+ 
+ 	optionsButton = (PopupAction *)getAction("button_options");
+ 	statusButton  = (PopupAction *)getAction("button_status");
++	statusSmallerAlt = getAction("status_all");
+ 
+ 	statusMapper = new QSignalMapper(mainWin);
+ 	mainWin->connect(statusMapper, SIGNAL(mapped(int)), mainWin, SLOT(activatedStatusAction(int)));
+@@ -434,8 +439,12 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	d->vb_roster->addWidget(d->rosterWidget_);
+ #endif
+ 
+-	d->statusMenu = new QMenu(tr("Status"), this);
++	d->statusMenu = new GlobalStatusMenu((QWidget*)this, d->psi);
++	d->statusMenu->setTitle(tr("Status"));
+ 	d->statusMenu->setObjectName("statusMenu");
++	connect(d->statusMenu, SIGNAL(statusSelected(XMPP::Status::Type, bool)), d->psi, SLOT(statusMenuChanged(XMPP::Status::Type, bool)));
++	connect(d->statusMenu, SIGNAL(statusPresetSelected(XMPP::Status,bool,bool)), d->psi, SLOT(setGlobalStatus(XMPP::Status,bool,bool)));
++	connect(d->statusMenu, SIGNAL(statusPresetDialogForced(const QString &)), d->psi, SLOT(showStatusDialog(const QString &)));
+ 	d->optionsMenu = new QMenu(tr("General"), this);
+ 	d->optionsMenu->setObjectName("optionsMenu");
+ #ifdef Q_OS_MAC
+@@ -534,6 +543,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	d->optionsButton->setMenu( d->optionsMenu );
+ 	d->statusButton->setMenu( d->statusMenu );
+ 	d->rosterAvatar->setStatusMenu( d->statusMenu );
++	d->getAction("status_all")->setMenu(d->statusMenu);
+ 
+ 	buildToolbars();
+ 	// setUnifiedTitleAndToolBarOnMac(true);
+@@ -631,6 +641,8 @@ void MainWin::registerAction( IconAction
+ 		QObject* receiver;
+ 		const char* slot;
+ 	} actionlist[] = {
++		{ "choose_status", activated, this, SLOT( actChooseStatusActivated() ) },
++		{ "reconnect_all", activated, this, SLOT( actReconnectActivated() ) },
+ #ifndef NEWCONTACTLIST
+ 		{ "show_offline", toggled, cvlist, SLOT( setShowOffline(bool) ) },
+ 		{ "show_away",    toggled, cvlist, SLOT( setShowAway(bool) ) },
+@@ -814,22 +826,7 @@ void MainWin::setUseDock(bool use)
+ void MainWin::buildStatusMenu()
+ {
+ 	d->statusMenu->clear();
+-	d->getAction("status_online")->addTo(d->statusMenu);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool()) {
+-		d->getAction("status_chat")->addTo(d->statusMenu);
+-	}
+-	d->statusMenu->addSeparator();
+-	d->getAction("status_away")->addTo(d->statusMenu);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
+-		d->getAction("status_xa")->addTo(d->statusMenu);
+-	}
+-	d->getAction("status_dnd")->addTo(d->statusMenu);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool()) {
+-		d->statusMenu->addSeparator();
+-		d->getAction("status_invisible")->addTo(d->statusMenu);
+-	}
+-	d->statusMenu->addSeparator();
+-	d->getAction("status_offline")->addTo(d->statusMenu);
++	d->statusMenu->fill();
+ #ifdef USE_PEP
+ 	d->statusMenu->addSeparator();
+ 	d->getAction("publish_tune")->addTo(d->statusMenu);
+@@ -840,10 +837,10 @@ void MainWin::activatedStatusAction(int
+ {
+ 	QList<IconAction*> l = d->statusGroup->findChildren<IconAction*>();
+ 	foreach(IconAction* action, l) {
+-		action->setChecked ( d->statusActions[action] == id );
++		action->setChecked ( d->statusActions.contains(action) && d->statusActions[action] == id );
+ 	}
+ 
+-	statusChanged(id);
++	statusChanged(static_cast<XMPP::Status::Type>(id));
+ }
+ 
+ QMenuBar* MainWin::mainMenuBar() const
+@@ -1139,6 +1136,25 @@ void MainWin::actDiagQCAKeyStoreActivate
+ 	w->show();
+ }
+ 
++void MainWin::actChooseStatusActivated()
++{
++	PsiOptions* o = PsiOptions::instance();
++	XMPP::Status::Type lastStatus = XMPP::Status::txt2type(PsiOptions::instance()->getOption("options.status.last-status").toString());
++	StatusSetDlg *w = new StatusSetDlg(d->psi, makeLastStatus(lastStatus), lastPriorityNotEmpty());
++	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->psi, SLOT(setGlobalStatus(const XMPP::Status &,bool,bool)));
++	connect(w, SIGNAL(cancelled()), d->psi, SLOT(updateMainwinStatus()));
++	if(o->getOption("options.ui.systemtray.enable").toBool() == true)
++		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
++	w->show();
++}
++
++void MainWin::actReconnectActivated()
++{
++	foreach (PsiAccount *pa, d->psi->contactList()->accounts()) {
++		pa->reconnectOnce();
++	}
++}
++
+ void MainWin::actPlaySoundsActivated (bool state)
+ {
+ 	PsiOptions::instance()->setOption("options.ui.notifications.sounds.enable", state);
+@@ -1338,31 +1354,30 @@ void MainWin::decorateButton(int status)
+ 	}
+ 
+ 	setTrayToolTip();
+-
+-	if(d->lastStatus == status) {
+-		return;
+-	}
+ 	d->lastStatus = status;
+ 
+ 	if(status == -1) {
+ 		d->statusButton->setText(tr("Connecting"));
+ 		if (PsiOptions::instance()->getOption("options.ui.notifications.alert-style").toString() != "no") {
+ 			d->statusButton->setAlert(IconsetFactory::iconPtr("psi/connect"));
+-			d->statusGroup->setPsiIcon(IconsetFactory::iconPtr("psi/connect"));
++			d->statusSmallerAlt->setPsiIcon(IconsetFactory::iconPtr("psi/connect"));
+ 		}
+ 		else {
+ 			d->statusButton->setIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
+-			d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
++			d->statusSmallerAlt->setPsiIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE));
+ 			d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE)->icon());
+ 		}
+ 
++		d->statusMenu->statusChanged(makeStatus(STATUS_OFFLINE, ""));
++
+ 		setWindowIcon(PsiIconset::instance()->status(STATUS_OFFLINE).impix());
+ 	}
+ 	else {
+ 		d->statusButton->setText(status2txt(status));
+ 		d->statusButton->setIcon(PsiIconset::instance()->statusPtr(status));
+-		d->statusGroup->setPsiIcon(PsiIconset::instance()->statusPtr(status));
++		d->statusSmallerAlt->setPsiIcon(PsiIconset::instance()->statusPtr(status));
+ 		d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(status)->icon());
++		d->statusMenu->statusChanged(makeStatus(status, d->psi->currentStatusMessage()));
+ 
+ 		setWindowIcon(PsiIconset::instance()->status(status).impix());
+ 	}
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -28,6 +28,7 @@
+ #include <QStringList>
+ 
+ #include "advwidget.h"
++#include "xmpp_status.h"
+ 
+ class QMenuBar;
+ class QAction;
+@@ -85,7 +86,7 @@ protected:
+ #endif
+ 
+ signals:
+-	void statusChanged(int);
++	void statusChanged(XMPP::Status::Type);
+ 	void statusMessageChanged(QString);
+ 	void changeProfile();
+ 	void blankMessage();
+@@ -139,6 +140,8 @@ private slots:
+ 	void actTipActivated();
+ 	void actDiagQCAPluginActivated();
+ 	void actDiagQCAKeyStoreActivated();
++	void actChooseStatusActivated();
++	void actReconnectActivated();
+ 	void actSetMoodActivated();
+ 	void actSetActivityActivated();
+ 	void actSetGeolocActivated();
+--- git.orig/src/mainwin_p.cpp
++++ git/src/mainwin_p.cpp
+@@ -301,7 +301,6 @@ void PopupAction::setIcon (const PsiIcon
+ 
+ void PopupAction::setText (const QString &text)
+ {
+-	IconAction::setText (text);
+ 	foreach(PopupActionButton* btn, d->buttons) {
+ 		btn->setLabel (text);
+ 	}
+--- git.orig/src/messageview.cpp
++++ git/src/messageview.cpp
+@@ -35,6 +35,7 @@ MessageView::MessageView(Type t)
+ 	, _spooled(false)
+ 	, _awaitingReceipt(false)
+ 	, _status(0)
++	, _statusPriority(0)
+ 	, _dateTime(QDateTime::currentDateTime())
+ {
+ 
+@@ -71,13 +72,14 @@ MessageView MessageView::subjectMessage(
+ }
+ 
+ MessageView MessageView::statusMessage(const QString &nick, int status,
+-									   const QString &statusText)
++									   const QString &statusText, int priority)
+ {
+ 	MessageView mv = MessageView::fromPlainText(QObject::tr("%1 is now %2")
+ 												.arg(nick, status2txt(status)),
+ 												Status);
+ 	mv.setNick(nick);
+ 	mv.setStatus(status);
++	mv.setStatusPriority(priority);
+ 	mv.setUserText(statusText);
+ 	return mv;
+ }
+@@ -166,6 +168,7 @@ QVariantMap MessageView::toVariantMap(bo
+ 		case Status:
+ 			m["sender"] = _nick;
+ 			m["status"] = _status;
++			m["priority"] = _statusPriority;
+ 			m["message"] = _text;
+ 			m["usertext"] = formatted?formattedUserText():_userText;
+ 			break;
+--- git.orig/src/messageview.h
++++ git/src/messageview.h
+@@ -52,7 +52,8 @@ public:
+ 
+ 	// accepts plain/text nick, plain/text status and rich/text statusText
+ 	static MessageView statusMessage(const QString &nick, int status,
+-									 const QString &statusText = QString());
++									 const QString &statusText = QString(),
++									 int priority = 0);
+ 
+ 	inline Type type() const { return _type; }
+ 	inline const QString &text() const { return _text; }
+@@ -75,6 +76,8 @@ public:
+ 	inline bool isSpooled() const { return _spooled; }
+ 	inline void setStatus(int s) { _status = s; }
+ 	inline int status() const { return _status; }
++	inline void setStatusPriority(int s) { _statusPriority = s; }
++	inline int statusPriority() const { return _statusPriority; }
+ 	inline void setAwaitingReceipt(bool b) { _awaitingReceipt = b; }
+ 	inline bool isAwaitingReceipt() const { return _awaitingReceipt; }
+ 	inline void setNick(const QString &nick) { _nick = nick; }
+@@ -97,6 +100,7 @@ private:
+ 	bool _spooled;
+ 	bool _awaitingReceipt;
+ 	int _status;
++	int _statusPriority;
+ 	QString _messageId;
+ 	QString _userId;
+ 	QString _nick; // rich / as is
+--- git.orig/src/options/optionsdlg.cpp
++++ git/src/options/optionsdlg.cpp
+@@ -176,6 +176,7 @@ public:
+ public slots:
+ 	void doApply();
+ 	void openTab(QString id);
++	void enableCommonWidgets(bool enable);
+ 
+ private slots:
+ 	void currentItemChanged(QListWidgetItem* current, QListWidgetItem* previous);
+@@ -425,6 +426,13 @@ void OptionsDlg::Private::openTab(QStrin
+ 	}
+ }
+ 
++// enable/disable list widget and dialog buttons
++void OptionsDlg::Private::enableCommonWidgets(bool enable)
++{
++	dlg->buttonBox->setEnabled(enable);
++	dlg->lv_tabs->setEnabled(enable);
++}
++
+ void OptionsDlg::Private::connectDataChanged(QWidget *widget)
+ {
+ 	foreach(QWidget* w, widget->findChildren<QWidget*>()) {
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -17,6 +17,8 @@ HEADERS += \
+ 	$$PWD/opt_events.h \
+ 	$$PWD/opt_popups.h \
+ 	$$PWD/opt_status.h \
++	$$PWD/opt_statusgeneral.h \
++	$$PWD/opt_statusauto.h \
+ 	$$PWD/opt_appearance.h \
+ 	$$PWD/opt_iconset.h \
+ 	$$PWD/opt_theme.h \
+@@ -36,6 +38,8 @@ SOURCES += \
+ 	$$PWD/opt_events.cpp \
+ 	$$PWD/opt_popups.cpp \
+ 	$$PWD/opt_status.cpp \
++	$$PWD/opt_statusgeneral.cpp \
++	$$PWD/opt_statusauto.cpp \
+ 	$$PWD/opt_appearance.cpp \
+ 	$$PWD/opt_iconset.cpp \
+ 	$$PWD/opt_theme.cpp \
+@@ -54,7 +58,8 @@ FORMS += \
+ 	$$PWD/opt_chat.ui \
+ 	$$PWD/opt_events.ui \
+ 	$$PWD/opt_popups.ui \
+-	$$PWD/opt_status.ui \
++	$$PWD/opt_statusgeneral.ui \
++	$$PWD/opt_statusauto.ui \
+ 	$$PWD/opt_appearance.ui \
+ 	$$PWD/opt_appearance_misc.ui \
+ 	$$PWD/opt_theme.ui \
+--- git.orig/src/options/optionstab.cpp
++++ git/src/options/optionstab.cpp
+@@ -109,6 +109,7 @@ public:
+ 	OptionsTabWidget(QWidget *parent);
+ 	void addTab(OptionsTab *);
+ 	void restoreOptions();
++	void enableOtherTabs(bool);
+ 
+ signals:
+ 	void connectDataChanged(QWidget *);
+@@ -196,6 +197,15 @@ void OptionsTabWidget::restoreOptions()
+ 	emit noDirty(false);
+ }
+ 
++void OptionsTabWidget::enableOtherTabs(bool enable)
++{
++	for (int i = 0; i < count(); i++)
++	{
++		if (i != currentIndex())
++			setTabEnabled(i, enable);
++	}
++}
++
+ //----------------------------------------------------------------------------
+ // MetaOptionsTab
+ //----------------------------------------------------------------------------
+@@ -235,6 +245,13 @@ void MetaOptionsTab::addTab(OptionsTab *
+ 	tabs.append(tab);
+ }
+ 
++void MetaOptionsTab::enableOtherTabs(bool enable)
++{
++	if (!w)
++		return;
++	static_cast<OptionsTabWidget*>(w)->enableOtherTabs(enable);
++}
++
+ QWidget *MetaOptionsTab::widget()
+ {
+ 	if ( w )
+--- git.orig/src/options/optionstab.h
++++ git/src/options/optionstab.h
+@@ -65,6 +65,9 @@ public:
+ 
+ 	void addTab(OptionsTab *);
+ 
++public slots:
++	void enableOtherTabs(bool);
++
+ private:
+ 	void init();
+ 	QWidget *w;
+--- git.orig/src/options/opt_statusauto.cpp
++++ git/src/options/opt_statusauto.cpp
+@@ -0,0 +1,168 @@
++#include "opt_statusauto.h"
++#include "psioptions.h"
++#include "priorityvalidator.h"
++
++#include <limits.h>
++#include <QWhatsThis>
++#include <QCheckBox>
++#include <QLineEdit>
++#include <QSpinBox>
++#include <QTextEdit>
++
++#include "ui_opt_statusauto.h"
++
++class OptStatusAutoUI : public QWidget, public Ui::OptStatusAuto
++{
++public:
++	OptStatusAutoUI() : QWidget() { setupUi(this); }
++};
++
++OptionsTabStatusAuto::OptionsTabStatusAuto(QObject *parent)
++	: OptionsTab(parent, "status_auto", "", tr("Auto status and priority"), tr("Auto status and priority preferences"))
++	, w(0)
++{
++}
++
++OptionsTabStatusAuto::~OptionsTabStatusAuto()
++{
++}
++
++QWidget *OptionsTabStatusAuto::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new OptStatusAutoUI();
++	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
++
++	PriorityValidator* prValidator = new PriorityValidator(d->le_asPriority);
++	d->le_asPriority->setValidator(prValidator);
++	prValidator = new PriorityValidator(d->le_asXaPriority);
++	d->le_asXaPriority->setValidator(prValidator);
++
++	QString s = tr("Makes Psi automatically set your status to \"away\" if your"
++		" computer is idle for the specified amount of time.");
++	d->ck_asAway->setWhatsThis(s);
++	d->sb_asAway->setWhatsThis(s);
++	s = tr("Makes Psi automatically set your status to \"extended away\" if your"
++		" computer is idle for the specified amount of time.");
++	d->ck_asXa->setWhatsThis(s);
++	d->sb_asXa->setWhatsThis(s);
++	s = tr("Makes Psi automatically set your status to \"offline\" if your"
++		" computer is idle for the specified amount of time."
++		"  This will disconnect you from the Jabber server.");
++	PsiOptions* o = PsiOptions::instance();
++	int dpCount = 6;
++	if (!o->getOption("options.ui.menu.status.chat").toBool()) {
++		d->sb_dpChat->hide();
++		d->lb_dpChat->hide();
++		dpCount--;
++	}
++
++	if (!o->getOption("options.ui.menu.status.xa").toBool()) {
++		d->ck_asXa->hide();
++		d->sb_asXa->hide();
++		d->lb_asXaPriority->hide();
++		d->le_asXaPriority->hide();
++		d->sb_dpXa->hide();
++		d->lb_dpXa->hide();
++		dpCount--;
++	}
++	if (!o->getOption("options.ui.menu.status.invisible").toBool()) {
++		d->sb_dpInvisible->hide();
++		d->lb_dpInvisible->hide();
++		dpCount--;
++	}
++
++	if (dpCount != 6) {
++		reorderGridLayout(d->gridLayout, dpCount == 4 ? 2 : 3); //4 items in 2 columns look better
++	}
++
++	d->ck_asOffline->setWhatsThis( s);
++	d->sb_asOffline->setWhatsThis( s);
++
++	d->te_asMessage->setWhatsThis(
++		tr("Specifies an extended message to use if you allow Psi"
++		" to set your status automatically.  See options above."));
++	d->le_asPriority->setWhatsThis(
++		tr("Specifies priority of auto-away status. "
++		"If empty, Psi will use account's default priority."));
++
++	return w;
++}
++
++void OptionsTabStatusAuto::applyOptions()
++{
++	if ( !w )
++		return;
++
++	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
++	PsiOptions* o = PsiOptions::instance();
++
++	o->setOption("options.status.auto-away.away-after", d->sb_asAway->value());
++	o->setOption("options.status.auto-away.not-availible-after", d->sb_asXa->value());
++	o->setOption("options.status.auto-away.offline-after", d->sb_asOffline->value());
++	o->setOption("options.status.auto-away.use-away", d->ck_asAway->isChecked());
++	o->setOption("options.status.auto-away.use-not-availible", d->ck_asXa->isChecked());
++	o->setOption("options.status.auto-away.use-offline", d->ck_asOffline->isChecked());
++	o->setOption("options.status.auto-away.message", d->te_asMessage->toPlainText());
++	bool forcePriority = false;
++	o->setOption("options.status.auto-away.priority", d->le_asPriority->text().toInt(&forcePriority));
++	o->setOption("options.status.auto-away.force-priority", forcePriority);
++	forcePriority = false;
++	o->setOption("options.status.auto-away.xa-priority", d->le_asXaPriority->text().toInt(&forcePriority));
++	o->setOption("options.status.auto-away.force-xa-priority", forcePriority);
++
++	o->setOption("options.status.default-priority.online", d->sb_dpOnline->value());
++	o->setOption("options.status.default-priority.chat", d->sb_dpChat->value());
++	o->setOption("options.status.default-priority.away", d->sb_dpAway->value());
++	o->setOption("options.status.default-priority.xa", d->sb_dpXa->value());
++	o->setOption("options.status.default-priority.dnd", d->sb_dpDnd->value());
++	o->setOption("options.status.default-priority.invisible", d->sb_dpInvisible->value());
++}
++
++void OptionsTabStatusAuto::restoreOptions()
++{
++	if ( !w )
++		return;
++
++	OptStatusAutoUI *d = (OptStatusAutoUI *)w;
++	PsiOptions* o = PsiOptions::instance();
++
++	d->sb_asAway->setMinimum(0);
++	d->sb_asAway->setMaximum(INT_MAX);
++	d->sb_asAway->setValue( o->getOption("options.status.auto-away.away-after").toInt() );
++	d->sb_asXa->setMinimum(0);
++	d->sb_asXa->setMaximum(INT_MAX);
++	d->sb_asXa->setValue( o->getOption("options.status.auto-away.not-availible-after").toInt() );
++	d->sb_asOffline->setMinimum(0);
++	d->sb_asOffline->setMaximum(INT_MAX);
++	d->sb_asOffline->setValue( o->getOption("options.status.auto-away.offline-after").toInt() );
++	d->ck_asAway->setChecked( o->getOption("options.status.auto-away.use-away").toBool() );
++	d->ck_asXa->setChecked( o->getOption("options.status.auto-away.use-not-availible").toBool() );
++	d->ck_asOffline->setChecked( o->getOption("options.status.auto-away.use-offline").toBool() );
++	d->te_asMessage->setPlainText( o->getOption("options.status.auto-away.message").toString() );
++	if (o->getOption("options.status.auto-away.force-priority").toBool()) {
++		d->le_asPriority->setText(QString::number(o->getOption("options.status.auto-away.priority").toInt()));
++	} else {
++		d->le_asPriority->clear();
++	}
++	if (o->getOption("options.status.auto-away.force-xa-priority").toBool()) {
++		d->le_asXaPriority->setText(QString::number(o->getOption("options.status.auto-away.xa-priority").toInt()));
++	} else {
++		d->le_asXaPriority->clear();
++	}
++
++	d->sb_dpOnline->setValue(o->getOption("options.status.default-priority.online").toInt());
++	d->sb_dpChat->setValue(o->getOption("options.status.default-priority.chat").toInt());
++	d->sb_dpAway->setValue(o->getOption("options.status.default-priority.away").toInt());
++	d->sb_dpXa->setValue(o->getOption("options.status.default-priority.xa").toInt());
++	d->sb_dpDnd->setValue(o->getOption("options.status.default-priority.dnd").toInt());
++	d->sb_dpInvisible->setValue(o->getOption("options.status.default-priority.invisible").toInt());
++}
++
++void OptionsTabStatusAuto::setData(PsiCon *, QWidget *parentDialog)
++{
++	parentWidget = parentDialog;
++}
++
+--- git.orig/src/options/opt_statusauto.h
++++ git/src/options/opt_statusauto.h
+@@ -0,0 +1,26 @@
++#ifndef OPT_STATUSAUTO_H
++#define OPT_STATUSAUTO_H
++
++#include "optionstab.h"
++#include "common.h"
++
++class QWidget;
++
++class OptionsTabStatusAuto : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabStatusAuto(QObject *parent);
++	~OptionsTabStatusAuto();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++
++	void setData(PsiCon *, QWidget *parentDialog);
++
++private:
++	QWidget *w, *parentWidget;
++};
++
++#endif // OPT_STATUSAUTO_H
+--- git.orig/src/options/opt_statusauto.ui
++++ git/src/options/opt_statusauto.ui
+@@ -0,0 +1,565 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>OptStatusAuto</class>
++ <widget class="QWidget" name="OptStatusAuto">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>491</width>
++    <height>379</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>Form</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout_2">
++   <item>
++    <widget class="QGroupBox" name="groupBox">
++     <property name="title">
++      <string>Auto status</string>
++     </property>
++     <layout class="QVBoxLayout" name="verticalLayout">
++      <item>
++       <layout class="QGridLayout" name="_2">
++        <property name="margin">
++         <number>0</number>
++        </property>
++        <property name="spacing">
++         <number>6</number>
++        </property>
++        <item row="2" column="1">
++         <widget class="QSpinBox" name="sb_asOffline">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="suffix">
++           <string> minutes</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="1">
++         <widget class="QSpinBox" name="sb_asXa">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="suffix">
++           <string> minutes</string>
++          </property>
++         </widget>
++        </item>
++        <item row="2" column="0">
++         <widget class="QCheckBox" name="ck_asOffline">
++          <property name="text">
++           <string>Auto offline after:</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="0">
++         <widget class="QCheckBox" name="ck_asXa">
++          <property name="text">
++           <string>Auto XA after:</string>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="0">
++         <widget class="QCheckBox" name="ck_asAway">
++          <property name="text">
++           <string>Auto away after:</string>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="1">
++         <widget class="QSpinBox" name="sb_asAway">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="suffix">
++           <string> minutes</string>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="3">
++         <widget class="QLineEdit" name="le_asPriority">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="maximumSize">
++           <size>
++            <width>50</width>
++            <height>16777215</height>
++           </size>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="3">
++         <widget class="QLineEdit" name="le_asXaPriority">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="maximumSize">
++           <size>
++            <width>50</width>
++            <height>16777215</height>
++           </size>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="4">
++         <spacer name="horizontalSpacer">
++          <property name="orientation">
++           <enum>Qt::Horizontal</enum>
++          </property>
++          <property name="sizeHint" stdset="0">
++           <size>
++            <width>10</width>
++            <height>20</height>
++           </size>
++          </property>
++         </spacer>
++        </item>
++        <item row="0" column="2">
++         <widget class="QLabel" name="lb_asPriority">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="text">
++           <string>Priority:</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="2">
++         <widget class="QLabel" name="lb_asXaPriority">
++          <property name="enabled">
++           <bool>false</bool>
++          </property>
++          <property name="text">
++           <string>Priority:</string>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <widget class="QLabel" name="TextLabel1_8">
++        <property name="text">
++         <string>Status message:</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="ChatEdit" name="te_asMessage">
++        <property name="acceptRichText">
++         <bool>false</bool>
++        </property>
++        <property name="maximumSize">
++         <size>
++          <width>32767</width>
++          <height>100</height>
++         </size>
++        </property>
++        <property name="tabChangesFocus">
++         <bool>true</bool>
++        </property>
++       </widget>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QGroupBox" name="gb_defPriority">
++     <property name="title">
++      <string>Default priority</string>
++     </property>
++     <layout class="QHBoxLayout" name="horizontalLayout_7">
++      <item>
++       <layout class="QGridLayout" name="gridLayout">
++        <item row="0" column="0">
++         <layout class="QHBoxLayout" name="horizontalLayout">
++          <item>
++           <widget class="QLabel" name="lb_dpOnline">
++            <property name="text">
++             <string>Online:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpOnline">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item row="0" column="2">
++         <layout class="QHBoxLayout" name="horizontalLayout_5">
++          <item>
++           <widget class="QLabel" name="lb_dpAway">
++            <property name="text">
++             <string>Away:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpAway">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item row="0" column="1">
++         <layout class="QHBoxLayout" name="horizontalLayout_2">
++          <item>
++           <widget class="QLabel" name="lb_dpChat">
++            <property name="text">
++             <string>Free For Chat:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpChat">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item row="1" column="0">
++         <layout class="QHBoxLayout" name="horizontalLayout_3">
++          <item>
++           <widget class="QLabel" name="lb_dpXa">
++            <property name="text">
++             <string>XA:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpXa">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item row="1" column="1">
++         <layout class="QHBoxLayout" name="horizontalLayout_4">
++          <item>
++           <widget class="QLabel" name="lb_dpDnd">
++            <property name="text">
++             <string>Do Not Disturb:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpDnd">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item row="1" column="2">
++         <layout class="QHBoxLayout" name="horizontalLayout_6">
++          <item>
++           <widget class="QLabel" name="lb_dpInvisible">
++            <property name="text">
++             <string>Invisible:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QSpinBox" name="sb_dpInvisible">
++            <property name="minimumSize">
++             <size>
++              <width>60</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>60</width>
++              <height>16777215</height>
++             </size>
++            </property>
++            <property name="minimum">
++             <number>-128</number>
++            </property>
++            <property name="maximum">
++             <number>127</number>
++            </property>
++            <property name="value">
++             <number>0</number>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <spacer name="horizontalSpacer_2">
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>40</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <spacer name="verticalSpacer">
++     <property name="orientation">
++      <enum>Qt::Vertical</enum>
++     </property>
++     <property name="sizeHint" stdset="0">
++      <size>
++       <width>20</width>
++       <height>40</height>
++      </size>
++     </property>
++    </spacer>
++   </item>
++  </layout>
++ </widget>
++ <customwidgets>
++  <customwidget>
++   <class>ChatEdit</class>
++   <extends>QTextEdit</extends>
++   <header>msgmle.h</header>
++  </customwidget>
++ </customwidgets>
++ <tabstops>
++  <tabstop>ck_asAway</tabstop>
++  <tabstop>sb_asAway</tabstop>
++  <tabstop>le_asPriority</tabstop>
++  <tabstop>ck_asXa</tabstop>
++  <tabstop>sb_asXa</tabstop>
++  <tabstop>le_asXaPriority</tabstop>
++  <tabstop>ck_asOffline</tabstop>
++  <tabstop>sb_asOffline</tabstop>
++  <tabstop>te_asMessage</tabstop>
++  <tabstop>sb_dpOnline</tabstop>
++  <tabstop>sb_dpChat</tabstop>
++  <tabstop>sb_dpAway</tabstop>
++  <tabstop>sb_dpXa</tabstop>
++  <tabstop>sb_dpDnd</tabstop>
++  <tabstop>sb_dpInvisible</tabstop>
++ </tabstops>
++ <resources/>
++ <connections>
++  <connection>
++   <sender>ck_asAway</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>sb_asAway</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>87</x>
++     <y>27</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>210</x>
++     <y>28</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asXa</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>sb_asXa</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>87</x>
++     <y>62</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>210</x>
++     <y>63</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asOffline</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>sb_asOffline</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>87</x>
++     <y>97</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>210</x>
++     <y>98</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asAway</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>lb_asPriority</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>104</x>
++     <y>48</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>346</x>
++     <y>82</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asAway</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>le_asPriority</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>104</x>
++     <y>48</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>404</x>
++     <y>48</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asXa</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>lb_asXaPriority</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>104</x>
++     <y>82</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>346</x>
++     <y>48</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>ck_asXa</sender>
++   <signal>toggled(bool)</signal>
++   <receiver>le_asXaPriority</receiver>
++   <slot>setEnabled(bool)</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>104</x>
++     <y>82</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>404</x>
++     <y>82</y>
++    </hint>
++   </hints>
++  </connection>
++ </connections>
++</ui>
+--- git.orig/src/options/opt_status.cpp
++++ git/src/options/opt_status.cpp
+@@ -1,360 +1,13 @@
+ #include "opt_status.h"
+-#include "common.h"
+-#include "iconwidget.h"
+-#include "psioptions.h"
+-
+-#include <limits.h>
+-#include <QButtonGroup>
+-#include <QMessageBox>
+-#include <QWhatsThis>
+-#include <QCheckBox>
+-#include <QRadioButton>
+-#include <QComboBox>
+-#include <QLineEdit>
+-#include <QSpinBox>
+-#include <QTextEdit>
+-#include <QInputDialog>
+-
+-#include "ui_opt_status.h"
+-
+-class OptStatusUI : public QWidget, public Ui::OptStatus
+-{
+-public:
+-	OptStatusUI() : QWidget() { setupUi(this); }
+-};
+-
+-//----------------------------------------------------------------------------
+-// OptionsTabStatus
+-//----------------------------------------------------------------------------
++#include "opt_statusgeneral.h"
++#include "opt_statusauto.h"
+ 
+ OptionsTabStatus::OptionsTabStatus(QObject *parent)
+-: OptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
+-{
+-	w = 0;
+-}
+-
+-OptionsTabStatus::~OptionsTabStatus()
+-{
+-}
+-
+-QWidget *OptionsTabStatus::widget()
+-{
+-	if ( w )
+-		return 0;
+-
+-	w = new OptStatusUI();
+-	OptStatusUI *d = (OptStatusUI *)w;
+-
+-	QString s = tr("Makes Psi automatically set your status to \"away\" if your"
+-		" computer is idle for the specified amount of time.");
+-	d->ck_asAway->setWhatsThis(s);
+-	d->sb_asAway->setWhatsThis(s);
+-	s = tr("Makes Psi automatically set your status to \"extended away\" if your"
+-		" computer is idle for the specified amount of time.");
+-	d->ck_asXa->setWhatsThis(s);
+-	d->sb_asXa->setWhatsThis(s);
+-	s = tr("Makes Psi automatically set your status to \"offline\" if your"
+-		" computer is idle for the specified amount of time."
+-		"  This will disconnect you from the XMPP server.");
+-	if (!PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
+-		d->ck_asXa->hide();
+-		d->sb_asXa->hide();
+-		d->lb_asXa->hide();
+-	}
+-	d->ck_asOffline->setWhatsThis( s);
+-	d->sb_asOffline->setWhatsThis( s);
+-
+-	d->te_asMessage->setWhatsThis(
+-		tr("Specifies an extended message to use if you allow Psi"
+-		" to set your status automatically.  See options above."));
+-	d->le_asPriority->setWhatsThis(
+-		tr("Specifies priority of auto-away status. "
+-		"If empty, Psi will use account's default priority."));
+-
+-	setStatusPresetWidgetsEnabled(false);
+-	connect(d->pb_spNew, SIGNAL(clicked()), SLOT(newStatusPreset()));
+-	connect(d->pb_spDelete, SIGNAL(clicked()), SLOT(removeStatusPreset()));
+-	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(selectStatusPreset(int)));
+-	connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
+-	connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
+-	connect(d->cb_sp_status, SIGNAL(activated(int)), SLOT(changeStatusPreset()));
+-
+-	d->pb_spNew->setWhatsThis(
+-		tr("Press this button to create a new status message preset."));
+-	d->pb_spDelete->setWhatsThis(
+-		tr("Press this button to delete a status message preset."));
+-	d->cb_preset->setWhatsThis(
+-		tr("Use this list to select a status message preset"
+-		" to view or edit in the box to the bottom."));
+-	d->te_sp->setWhatsThis(
+-		tr("You may edit the message here for the currently selected"
+-		" status message preset in the list to the above."));
+-	d->cb_sp_status->setWhatsThis(
+-		tr("Use this to choose the status that will be assigned to this preset"));
+-	d->le_sp_priority->setWhatsThis(
+-		tr("Fill in the priority that will be assigned to this preset."
+-		   " If no priority is given, the default account priority will be used."));
+-
+-	d->ck_askOnline->setWhatsThis(
+-		tr("XMPP allows you to put extended status messages on"
+-		" all status types.  Normally, Psi does not prompt you for"
+-		" an extended message when you set your status to \"online\"."
+-		"  Check this option if you want to have this prompt."));
+-
+-	return w;
+-}
+-
+-void OptionsTabStatus::applyOptions()
+-{
+-	if ( !w )
+-		return;
+-
+-	OptStatusUI *d = (OptStatusUI *)w;
+-
+-	PsiOptions::instance()->setOption("options.status.auto-away.away-after", d->sb_asAway->value());
+-	PsiOptions::instance()->setOption("options.status.auto-away.not-availible-after", d->sb_asXa->value());
+-	PsiOptions::instance()->setOption("options.status.auto-away.offline-after", d->sb_asOffline->value());
+-	PsiOptions::instance()->setOption("options.status.auto-away.use-away", d->ck_asAway->isChecked());
+-	PsiOptions::instance()->setOption("options.status.auto-away.use-not-availible", d->ck_asXa->isChecked());
+-	PsiOptions::instance()->setOption("options.status.auto-away.use-offline", d->ck_asOffline->isChecked());
+-	PsiOptions::instance()->setOption("options.status.auto-away.message", d->te_asMessage->toPlainText());
+-	bool forcePriority = false;
+-	PsiOptions::instance()->setOption("options.status.auto-away.priority", d->le_asPriority->text().toInt(&forcePriority));
+-	PsiOptions::instance()->setOption("options.status.auto-away.force-priority", forcePriority);
+-
+-	foreach (QString name, deletedPresets) {
+-		QString base = PsiOptions::instance()->mapLookup("options.status.presets", name);
+-		PsiOptions::instance()->removeOption(base , true);
+-	}
+-	deletedPresets.clear();
+-	foreach (QString name, dirtyPresets.toList() + newPresets.keys()) {
+-		StatusPreset sp;
+-		if (newPresets.contains(name)) {
+-			sp = newPresets[name];
+-		} else {
+-			sp = presets[name];
+-		}
+-		PsiOptions *o = PsiOptions::instance();
+-		sp.toOptions(o);
+-	}
+-	dirtyPresets.clear();
+-	presets.unite(newPresets);
+-	newPresets.clear();
+-
+-	PsiOptions::instance()->setOption("options.status.ask-for-message-on-online", d->ck_askOnline->isChecked());
+-	PsiOptions::instance()->setOption("options.status.ask-for-message-on-offline", d->ck_askOffline->isChecked());
+-}
+-
+-void OptionsTabStatus::restoreOptions()
+-{
+-	if ( !w )
+-		return;
+-
+-	OptStatusUI *d = (OptStatusUI *)w;
+-
+-	d->sb_asAway->setMinimum(0);
+-	d->sb_asAway->setMaximum(INT_MAX);
+-	d->sb_asAway->setValue( PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() );
+-	d->sb_asXa->setMinimum(0);
+-	d->sb_asXa->setMaximum(INT_MAX);
+-	d->sb_asXa->setValue( PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() );
+-	d->sb_asOffline->setMinimum(0);
+-	d->sb_asOffline->setMaximum(INT_MAX);
+-	d->sb_asOffline->setValue( PsiOptions::instance()->getOption("options.status.auto-away.offline-after").toInt() );
+-	/*if (PsiOptions::instance()->getOption("options.status.auto-away.away-after").toInt() <= 0 )
+-		PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() = false;
+-	if (PsiOptions::instance()->getOption("options.status.auto-away.not-availible-after").toInt() <= 0 )
+-		PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() = false;
+-	if(d->opt.asOffline <= 0)
+-		PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() = false;*/
+-	d->ck_asAway->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-away").toBool() );
+-	d->ck_asXa->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-not-availible").toBool() );
+-	d->ck_asOffline->setChecked( PsiOptions::instance()->getOption("options.status.auto-away.use-offline").toBool() );
+-	d->te_asMessage->setPlainText( PsiOptions::instance()->getOption("options.status.auto-away.message").toString() );
+-	if (PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
+-		d->le_asPriority->setText(QString::number(PsiOptions::instance()->getOption("options.status.auto-away.priority").toInt()));
+-	} else {
+-		d->le_asPriority->clear();
+-	}
+-
+-
+-	QStringList presetNames;
+-
+-	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) {
+-		QString base =  PsiOptions::instance()->mapLookup("options.status.presets", name.toString());
+-		StatusPreset sp;
+-		sp.setName(name.toString());
+-		sp.setMessage(PsiOptions::instance()->getOption(base+".message").toString());
+-		if (PsiOptions::instance()->getOption(base+".force-priority").toBool()) {
+-			sp.setPriority(PsiOptions::instance()->getOption(base+".priority").toInt());
+-		}
+-
+-		XMPP::Status status;
+-		status.setType(PsiOptions::instance()->getOption(base+".status").toString());
+-		sp.setStatus(status.type());
+-
+-		presets[name.toString()] = sp;
+-		presetNames += name.toString();
+-	}
+-
+-
+-	d->cb_preset->addItems(presetNames);
+-
+-	if(d->cb_preset->count() >= 1) {
+-		d->cb_preset->setCurrentIndex(0);
+-		selectStatusPreset(0);
+-	}
+-
+-	d->ck_askOnline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool() );
+-	d->ck_askOffline->setChecked( PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool() );
+-}
+-
+-void OptionsTabStatus::setData(PsiCon *, QWidget *parentDialog)
+-{
+-	parentWidget = parentDialog;
+-}
+-
+-void OptionsTabStatus::selectStatusPreset(int x)
+-{
+-	OptStatusUI *d = (OptStatusUI *)w;
+-
+-	//noDirty = true;
+-	disconnect(d->te_sp, SIGNAL(textChanged()), 0, 0);
+-	disconnect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), 0, 0);
+-	if ( x == -1 ) {
+-		setStatusPresetWidgetsEnabled(false);
+-		d->te_sp->setPlainText("");
+-		d->le_sp_priority->clear();
+-
+-		//noDirty = false;
+-		connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
+-		connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
+-		return;
+-	}
+-
+-	StatusPreset preset;
+-	QString name = d->cb_preset->itemText(x);
+-
+-	if (newPresets.contains(name)) {
+-		preset = newPresets[name];
+-	} else {
+-		preset = presets[name];
+-	}
+-
+-	d->te_sp->setPlainText(preset.message());
+-	if (preset.priority().hasValue())
+-		d->le_sp_priority->setText(QString::number(preset.priority().value()));
+-	else
+-		d->le_sp_priority->clear();
+-	d->cb_sp_status->setStatus(preset.status());
+-
+-	//noDirty = false;
+-	connect(d->te_sp, SIGNAL(textChanged()), SLOT(changeStatusPreset()));
+-	connect(d->le_sp_priority, SIGNAL(textChanged(const QString&)), SLOT(changeStatusPreset()));
+-
+-	setStatusPresetWidgetsEnabled(true);
+-}
+-
+-void OptionsTabStatus::newStatusPreset()
+-{
+-	OptStatusUI *d = (OptStatusUI *)w;
+-
+-	QString text;
+-
+-	while(1) {
+-		bool ok = false;
+-		text = QInputDialog::getText(parentWidget,
+-			CAP(tr("New Status Preset")),
+-			tr("Please enter a name for the new status preset:"),
+-			QLineEdit::Normal, text, &ok);
+-		if(!ok) {
+-			return;
+-		}
+-
+-		if(text.isEmpty()) {
+-			QMessageBox::information(parentWidget, tr("Error"), tr("Can't create a blank preset!"));
+-		} else if(presets.contains(text) || newPresets.contains(text)) {
+-			QMessageBox::information(parentWidget, tr("Error"), tr("You already have a preset with that name!"));
+-		} else {
+-			break;
+-		}
+-	}
+-
+-	newPresets[text].setName(text);
+-	d->cb_preset->addItem(text);
+-	d->cb_preset->setCurrentIndex(d->cb_preset->count()-1);
+-	selectStatusPreset(d->cb_preset->count()-1);
+-	d->te_sp->setFocus();
+-
+-	emit dataChanged();
+-}
+-
+-void OptionsTabStatus::removeStatusPreset()
+-{
+-	OptStatusUI *d = (OptStatusUI *)w;
+-	int id = d->cb_preset->currentIndex();
+-	if(id == -1)
+-		return;
+-
+-	emit dataChanged();
+-
+-	QString name = d->cb_preset->itemText(id);
+-
+-	if (newPresets.contains(name)) {
+-		newPresets.remove(name);
+-	} else {
+-		deletedPresets += d->cb_preset->itemText(id);
+-		presets.remove(d->cb_preset->itemText(id));
+-	}
+-	d->cb_preset->removeItem(id);
+-
+-	// select a new entry if possible
+-	if(d->cb_preset->count() == 0) {
+-		selectStatusPreset(-1);
+-		return;
+-	}
+-
+-	if(id >= (int)d->cb_preset->count())
+-		id = d->cb_preset->count()-1;
+-
+-	d->cb_preset->setCurrentIndex(id);
+-	selectStatusPreset(id);
+-}
+-
+-void OptionsTabStatus::changeStatusPreset()
+-{
+-	OptStatusUI *d = (OptStatusUI *)w;
+-	int id = d->cb_preset->currentIndex();
+-	if(id == -1)
+-		return;
+-
+-	StatusPreset sp;
+-	sp.setMessage(d->te_sp->toPlainText());
+-	if (d->le_sp_priority->text().isEmpty())
+-		sp.clearPriority();
+-	else
+-		sp.setPriority(d->le_sp_priority->text().toInt());
+-	sp.setStatus(d->cb_sp_status->status());
+-
+-	QString name = d->cb_preset->itemText(id);
+-
+-	sp.setName(name);
+-	if (newPresets.contains(name)) {
+-		newPresets[name] = sp;
+-	} else {
+-		dirtyPresets += name;
+-		presets[name] = sp;
+-	}
+-
+-	emit dataChanged();
+-}
+-
+-void OptionsTabStatus::setStatusPresetWidgetsEnabled(bool enabled)
++: MetaOptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
+ {
+-	OptStatusUI *d = (OptStatusUI *)w;
+-	d->cb_preset->setEnabled(enabled);
+-	d->pb_spDelete->setEnabled(enabled);
+-	d->cb_sp_status->setEnabled(enabled);
+-	d->le_sp_priority->setEnabled(enabled);
+-	d->te_sp->setEnabled(enabled);
++	OptionsTabStatusGeneral* general = new OptionsTabStatusGeneral(this);
++	addTab(general);
++	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), parent, SLOT(enableCommonWidgets(bool)));
++	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), SLOT(enableOtherTabs(bool)));
++	addTab(new OptionsTabStatusAuto(this));
+ }
+--- git.orig/src/options/opt_statusgeneral.cpp
++++ git/src/options/opt_statusgeneral.cpp
+@@ -0,0 +1,398 @@
++#include "opt_statusgeneral.h"
++#include "common.h"
++#include "psioptions.h"
++#include "psiiconset.h"
++#include "priorityvalidator.h"
++
++#include <QMessageBox>
++#include <QInputDialog>
++#include <QWhatsThis>
++#include <QCheckBox>
++#include <QComboBox>
++#include <QLineEdit>
++#include <QTextEdit>
++
++#include "ui_opt_statusgeneral.h"
++
++class OptStatusGeneralUI : public QWidget, public Ui::OptStatusGeneral
++{
++public:
++	OptStatusGeneralUI() : QWidget() { setupUi(this); }
++};
++
++OptionsTabStatusGeneral::OptionsTabStatusGeneral(QObject *parent)
++	: OptionsTab(parent, "status_general", "", tr("General"), tr("General status preferences"))
++	, w(0)
++{
++}
++
++OptionsTabStatusGeneral::~OptionsTabStatusGeneral()
++{
++}
++
++QWidget *OptionsTabStatusGeneral::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new OptStatusGeneralUI();
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	connect(d->lw_presets, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), SLOT(currentItemChanged(QListWidgetItem *, QListWidgetItem *)));
++	connect(d->lw_presets, SIGNAL(doubleClicked(const QModelIndex &)), SLOT(presetDoubleClicked(const QModelIndex &)));
++	connect(d->pb_spNew, SIGNAL(clicked()), SLOT(newStatusPreset()));
++	connect(d->pb_spEdit, SIGNAL(clicked()), SLOT(editStatusPreset()));
++	connect(d->pb_spDelete, SIGNAL(clicked()), SLOT(deleteStatusPreset()));
++	connect(d->cb_presetsMenus, SIGNAL(currentIndexChanged(int)), SLOT(statusMenusIndexChanged(int)));
++	connect(d->bb_selPreset, SIGNAL(accepted()), SLOT(statusPresetAccepted()));
++	connect(d->bb_selPreset, SIGNAL(rejected()), SLOT(statusPresetRejected()));
++
++	PriorityValidator* prValidator = new PriorityValidator(d->le_sp_priority);
++	d->le_sp_priority->setValidator(prValidator);
++
++	spContextMenu = new QMenu(w);
++	spContextMenu->addAction(tr("Edit"), this, SLOT(editStatusPreset()));
++	spContextMenu->addAction(tr("Delete"), this, SLOT(deleteStatusPreset()));
++	connect(d->lw_presets, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showMenuForPreset(const QPoint &)));
++
++	PsiOptions* o = PsiOptions::instance();
++	int askCount = 6;
++	if (!o->getOption("options.ui.menu.status.chat").toBool()) {
++		d->ck_askChat->hide();
++		askCount--;
++	}
++	if (!o->getOption("options.ui.menu.status.xa").toBool()) {
++		d->ck_askXa->hide();
++		askCount--;
++	}
++
++	if (askCount != 6) {
++		reorderGridLayout(d->gridLayout, askCount == 4 ? 2 : 3); //4 items in 2 columns look better
++	}
++
++	d->pb_spNew->setWhatsThis(
++		tr("Press this button to create a new status message preset."));
++	d->pb_spDelete->setWhatsThis(
++		tr("Press this button to delete a status message preset."));
++	/*TODO d->cb_preset->setWhatsThis(
++		tr("Use this list to select a status message preset"
++		" to view or edit in the box to the right. You can"
++		" also sort them manually with drag and drop."));*/
++	d->te_sp->setWhatsThis(
++		tr("You may edit the message here for the currently selected"
++		" status message preset in the list to the above."));
++	d->cb_sp_status->setWhatsThis(
++		tr("Use this to choose the status that will be assigned to this preset"));
++	d->le_sp_priority->setWhatsThis(
++		tr("Fill in the priority that will be assigned to this preset."
++		   " If no priority is given, the default account priority will be used."));
++
++	d->ck_askOnline->setWhatsThis(
++		tr("Jabber allows you to put extended status messages on"
++		" all status types.  Normally, Psi does not prompt you for"
++		" an extended message when you set your status to \"online\"."
++		"  Check this option if you want to have this prompt."));
++	//TODO write whatsthis messages for other widgets
++	return w;
++}
++
++void OptionsTabStatusGeneral::applyOptions()
++{
++	if ( !w )
++		return;
++
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	OptionsTree* o = PsiOptions::instance();
++
++	if (d->gbSelectedPreset->isEnabled())
++	{
++		statusPresetRejected();
++		switchPresetMode(false);
++	}
++	//Unselect items
++	d->lw_presets->setCurrentRow(-1);
++
++	//Delete all presets
++	foreach(QString key, o->getChildOptionNames("options.status.presets", true, true)) {
++		o->removeOption(key, true);
++	}
++
++	//Recreate presets considering order from list widget
++	for (int i = 0; i < d->lw_presets->count(); i++)
++	{
++		QListWidgetItem* item = d->lw_presets->item(i);
++		StatusPreset sp = presets[item->text()];
++		sp.filterStatus();
++		sp.toOptions(o);
++	}
++
++	o->setOption("options.status.ask-for-message-on-online", d->ck_askOnline->isChecked());
++	o->setOption("options.status.ask-for-message-on-chat", d->ck_askChat->isChecked());
++	o->setOption("options.status.ask-for-message-on-away", d->ck_askAway->isChecked());
++	o->setOption("options.status.ask-for-message-on-xa", d->ck_askXa->isChecked());
++	o->setOption("options.status.ask-for-message-on-dnd", d->ck_askDnd->isChecked());
++	o->setOption("options.status.ask-for-message-on-offline", d->ck_askOffline->isChecked());
++
++	o->setOption("options.status.presets-in-status-menus", d->cb_presetsMenus->itemData(d->cb_presetsMenus->currentIndex()).toString());
++
++	o->setOption("options.status.show-only-online-offline", d->ck_onlyOnOff->isChecked());
++	o->setOption("options.status.show-choose", d->ck_showChoose->isChecked());
++	o->setOption("options.status.show-reconnect", d->ck_showReconnect->isChecked());
++	o->setOption("options.status.show-edit-presets", d->ck_showEditPresets->isChecked());
++}
++
++void OptionsTabStatusGeneral::restoreOptions()
++{
++	if ( !w )
++		return;
++
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	OptionsTree* o = PsiOptions::instance();
++
++	//TODO: Restore function is calling 3 times! Do something with it! Or maybe it's normal?
++	d->lw_presets->clear();
++	presets.clear();
++
++	foreach(QVariant name, o->mapKeyList("options.status.presets", true)) {
++		StatusPreset sp;
++		sp.fromOptions(o, name.toString());
++		sp.filterStatus();
++
++		presets[name.toString()] = sp;
++#ifdef Q_OS_MAC
++		QListWidgetItem* item = new QListWidgetItem(sp.name(), d->lw_presets);
++#else
++		QListWidgetItem* item = new QListWidgetItem(PsiIconset::instance()->status(sp.status()).icon(), sp.name(), d->lw_presets);
++#endif
++		d->lw_presets->addItem(item);
++	}
++
++	cleanupSelectedPresetGroup();
++	switchPresetMode(false);
++
++	d->ck_askOnline->setChecked( o->getOption("options.status.ask-for-message-on-online").toBool() );
++	d->ck_askChat->setChecked( o->getOption("options.status.ask-for-message-on-chat").toBool() );
++	d->ck_askAway->setChecked( o->getOption("options.status.ask-for-message-on-away").toBool() );
++	d->ck_askXa->setChecked( o->getOption("options.status.ask-for-message-on-xa").toBool() );
++	d->ck_askDnd->setChecked( o->getOption("options.status.ask-for-message-on-dnd").toBool() );
++	d->ck_askOffline->setChecked( o->getOption("options.status.ask-for-message-on-offline").toBool() );
++
++	d->cb_presetsMenus->setItemData(0, "submenu");
++	d->cb_presetsMenus->setItemData(1, "yes");
++	d->cb_presetsMenus->setItemData(2, "no");
++	int mode = d->cb_presetsMenus->findData(o->getOption("options.status.presets-in-status-menus").toString());
++	d->cb_presetsMenus->setCurrentIndex(mode == -1 ? 0 : mode);
++
++	d->ck_onlyOnOff->setChecked( o->getOption("options.status.show-only-online-offline").toBool() );
++	d->ck_showChoose->setChecked( o->getOption("options.status.show-choose").toBool() );
++	d->ck_showReconnect->setChecked( o->getOption("options.status.show-reconnect").toBool() );
++	d->ck_showEditPresets->setChecked( o->getOption("options.status.show-edit-presets").toBool() );
++}
++
++void OptionsTabStatusGeneral::setData(PsiCon *, QWidget *parentDialog)
++{
++	parentWidget = parentDialog;
++}
++
++void OptionsTabStatusGeneral::currentItemChanged(QListWidgetItem * current, QListWidgetItem * /*previous*/ )
++{
++	OptStatusGeneralUI *d = static_cast<OptStatusGeneralUI*>(w);
++	d->pb_spEdit->setEnabled(current != 0);
++	d->pb_spDelete->setEnabled(current != 0);
++	if (current)
++		loadStatusPreset();
++	else
++		cleanupSelectedPresetGroup();
++}
++
++void OptionsTabStatusGeneral::loadStatusPreset()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	QListWidgetItem* item = d->lw_presets->currentItem();
++	if (!item)
++		return;
++
++	StatusPreset preset = presets[item->text()];
++	preset.filterStatus();
++	d->le_spName->setText(preset.name());
++	d->le_spName->home(false);
++	d->te_sp->setPlainText(preset.message());
++	if (preset.priority().hasValue())
++		d->le_sp_priority->setText(QString::number(preset.priority().value()));
++	else
++		d->le_sp_priority->clear();
++	d->cb_sp_status->setStatus(preset.status());
++}
++
++void OptionsTabStatusGeneral::saveStatusPreset()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	QListWidgetItem* item = d->lw_presets->currentItem();
++	if (!item)
++		return;
++
++	QString oldName = item->text();
++
++	StatusPreset sp;
++	sp.setName(d->le_spName->text());
++	sp.setMessage(d->te_sp->toPlainText());
++	sp.setPriority(d->le_sp_priority->text());
++	sp.setStatus(d->cb_sp_status->status());
++	sp.filterStatus();
++	if (oldName != sp.name())
++	{
++		presets.remove(oldName);
++		item->setText(sp.name());
++	}
++#ifndef Q_OS_MAC
++	item->setIcon(PsiIconset::instance()->status(sp.status()).icon());
++#endif
++	presets[sp.name()] = sp;
++}
++
++void OptionsTabStatusGeneral::newStatusPreset()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	presets[""] = StatusPreset();
++	d->lw_presets->addItem("");
++	d->lw_presets->setCurrentRow(d->lw_presets->count()-1);
++
++	loadStatusPreset();
++
++	switchPresetMode(true);
++}
++
++void OptionsTabStatusGeneral::deleteStatusPreset()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	int current = d->lw_presets->currentRow();
++	if (current == -1)
++		return;
++
++	QListWidgetItem* item = d->lw_presets->takeItem(current);
++	presets.remove(item->text());
++
++	// select a new entry if possible
++	if(d->lw_presets->count() > 0) {
++		d->lw_presets->setCurrentRow(d->lw_presets->count()-1);
++	}
++	else
++		cleanupSelectedPresetGroup();
++
++	//Emit dataChanged only if we delete existing item and not cancelling creating of new one
++	if (!item->text().isEmpty())
++		emit dataChanged();
++
++	delete item;
++}
++
++void OptionsTabStatusGeneral::statusMenusIndexChanged ( int index )
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	if (index == -1 || d->cb_presetsMenus->itemData(d->cb_presetsMenus->currentIndex()).toString() == "no")
++		d->ck_showEditPresets->setEnabled(false);
++	else
++		d->ck_showEditPresets->setEnabled(true);
++}
++
++void OptionsTabStatusGeneral::showMenuForPreset(const QPoint &point)
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	QListWidgetItem* item = d->lw_presets->itemAt(point);
++	if (item)
++	{
++		//paranoia: we must be sure item is selected
++		d->lw_presets->setCurrentItem(item);
++
++		//Show menu
++		spContextMenu->exec(d->lw_presets->mapToGlobal(point));
++	}
++}
++
++void OptionsTabStatusGeneral::editStatusPreset()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	int current = d->lw_presets->currentRow();
++	if (current == -1)
++		return;
++
++	loadStatusPreset();
++
++	switchPresetMode(true);
++}
++
++void OptionsTabStatusGeneral::cleanupSelectedPresetGroup()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	d->le_spName->setText("");
++	d->te_sp->setPlainText("");
++	d->le_sp_priority->setText("");
++	d->cb_sp_status->setStatus(XMPP::Status::Online);
++}
++
++void OptionsTabStatusGeneral::statusPresetAccepted()
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++	QListWidgetItem* item = d->lw_presets->currentItem();
++	if (!item)
++		return;
++
++	QString newName = d->le_spName->text();
++	if(newName.trimmed().isEmpty())
++	{
++		QMessageBox::critical(parentWidget, tr("Error"), tr("Can't create a blank preset!"));
++	}
++	else if(newName != item->text() && presets.contains(newName))
++	{
++		QMessageBox::critical(parentWidget, tr("Error"), tr("You already have a preset with that name!"));
++	}
++	else
++	{
++		saveStatusPreset();
++		switchPresetMode(false);
++		loadStatusPreset();
++		emit dataChanged();
++	}
++}
++
++void OptionsTabStatusGeneral::statusPresetRejected()
++{
++	//TODO almost all functions have this line, GET RID OF IT
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	switchPresetMode(false);
++	QListWidgetItem* item = d->lw_presets->currentItem();
++	if (!item)
++		return;
++
++	if (item->text().isEmpty())
++	{
++		//Cancel creating new item
++		deleteStatusPreset();
++	}
++	else
++	{
++		//Cancel editing, just refresh Selected Preset group for viewing
++		loadStatusPreset();
++	}
++}
++
++void OptionsTabStatusGeneral::switchPresetMode(bool toEdit)
++{
++	OptStatusGeneralUI *d = (OptStatusGeneralUI *)w;
++
++	d->gbSelectedPreset->setEnabled(toEdit);
++	d->gbPresets->setEnabled(!toEdit);
++	d->gbStatusMenus->setEnabled(!toEdit);
++	d->gbPrompts->setEnabled(!toEdit);
++
++	emit enableDlgCommonWidgets(!toEdit);
++}
++
++void OptionsTabStatusGeneral::presetDoubleClicked(const QModelIndex & /*index*/ )
++{
++	editStatusPreset();
++}
+--- git.orig/src/options/opt_statusgeneral.h
++++ git/src/options/opt_statusgeneral.h
+@@ -0,0 +1,52 @@
++#ifndef OPT_STATUSGENERAL_H
++#define OPT_STATUSGENERAL_H
++
++#include <QMap>
++#include <QListWidgetItem>
++#include <QMenu>
++
++#include "optionstab.h"
++#include "statuspreset.h"
++
++class QWidget;
++
++class OptionsTabStatusGeneral : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabStatusGeneral(QObject *parent);
++	~OptionsTabStatusGeneral();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++
++	void setData(PsiCon *, QWidget *parentDialog);
++	bool stretchable() const { return true; }
++
++signals:
++	void enableDlgCommonWidgets(bool);
++
++private slots:
++	void currentItemChanged(QListWidgetItem * current, QListWidgetItem * previous );
++	void newStatusPreset();
++	void deleteStatusPreset();
++	void statusMenusIndexChanged( int index );
++	void showMenuForPreset(const QPoint &);
++	void editStatusPreset();
++	void statusPresetAccepted();
++	void statusPresetRejected();
++	void presetDoubleClicked(const QModelIndex &);
++
++private:
++	void loadStatusPreset();
++	void saveStatusPreset();
++	void switchPresetMode(bool toEdit);
++	void cleanupSelectedPresetGroup();
++
++	QWidget *w, *parentWidget;
++	QMap<QString, StatusPreset> presets;
++	QMenu *spContextMenu;
++};
++
++#endif // OPT_STATUSGENERAL_H
+--- git.orig/src/options/opt_statusgeneral.ui
++++ git/src/options/opt_statusgeneral.ui
+@@ -0,0 +1,453 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>OptStatusGeneral</class>
++ <widget class="QWidget" name="OptStatusGeneral">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>629</width>
++    <height>508</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>Form</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout_4">
++   <item>
++    <widget class="QGroupBox" name="gbPrompts">
++     <property name="sizePolicy">
++      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
++       <horstretch>0</horstretch>
++       <verstretch>0</verstretch>
++      </sizepolicy>
++     </property>
++     <property name="maximumSize">
++      <size>
++       <width>16777215</width>
++       <height>16777215</height>
++      </size>
++     </property>
++     <property name="title">
++      <string>Prompt for status message when choosing</string>
++     </property>
++     <layout class="QHBoxLayout" name="horizontalLayout_5">
++      <item>
++       <layout class="QGridLayout" name="gridLayout">
++        <property name="horizontalSpacing">
++         <number>30</number>
++        </property>
++        <item row="0" column="0">
++         <widget class="QCheckBox" name="ck_askOnline">
++          <property name="text">
++           <string>Online</string>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="1">
++         <widget class="QCheckBox" name="ck_askChat">
++          <property name="text">
++           <string>Free for Chat</string>
++          </property>
++         </widget>
++        </item>
++        <item row="0" column="2">
++         <widget class="QCheckBox" name="ck_askAway">
++          <property name="text">
++           <string>Away</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="0">
++         <widget class="QCheckBox" name="ck_askXa">
++          <property name="text">
++           <string>Not Available</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="1">
++         <widget class="QCheckBox" name="ck_askDnd">
++          <property name="text">
++           <string>Do not Disturb</string>
++          </property>
++         </widget>
++        </item>
++        <item row="1" column="2">
++         <widget class="QCheckBox" name="ck_askOffline">
++          <property name="text">
++           <string>Offline</string>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <spacer name="horizontalSpacer_4">
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>40</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QGroupBox" name="gbStatusMenus">
++     <property name="title">
++      <string>Status menus</string>
++     </property>
++     <layout class="QVBoxLayout" name="verticalLayout_2">
++      <item>
++       <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0">
++        <item>
++         <widget class="QLabel" name="label_4">
++          <property name="sizePolicy">
++           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
++            <horstretch>0</horstretch>
++            <verstretch>0</verstretch>
++           </sizepolicy>
++          </property>
++          <property name="text">
++           <string>Show presets in menus:</string>
++          </property>
++          <property name="alignment">
++           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QComboBox" name="cb_presetsMenus">
++          <property name="enabled">
++           <bool>true</bool>
++          </property>
++          <property name="sizePolicy">
++           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
++            <horstretch>0</horstretch>
++            <verstretch>0</verstretch>
++           </sizepolicy>
++          </property>
++          <property name="minimumSize">
++           <size>
++            <width>40</width>
++            <height>0</height>
++           </size>
++          </property>
++          <item>
++           <property name="text">
++            <string>As submenu</string>
++           </property>
++          </item>
++          <item>
++           <property name="text">
++            <string>With standard statuses</string>
++           </property>
++          </item>
++          <item>
++           <property name="text">
++            <string>No</string>
++           </property>
++          </item>
++         </widget>
++        </item>
++        <item>
++         <spacer name="horizontalSpacer_2">
++          <property name="orientation">
++           <enum>Qt::Horizontal</enum>
++          </property>
++          <property name="sizeHint" stdset="0">
++           <size>
++            <width>40</width>
++            <height>20</height>
++           </size>
++          </property>
++         </spacer>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <widget class="QCheckBox" name="ck_onlyOnOff">
++        <property name="toolTip">
++         <string>Hide Free for Chat, Away, Not Available and Do not Disturb</string>
++        </property>
++        <property name="text">
++         <string>Hide standard statuses (Chat, Away, XA, DND)</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <layout class="QHBoxLayout" name="horizontalLayout_6">
++        <property name="topMargin">
++         <number>0</number>
++        </property>
++        <item>
++         <widget class="QCheckBox" name="ck_showEditPresets">
++          <property name="text">
++           <string>Show &quot;Edit presets...&quot;</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <spacer name="horizontalSpacer_3">
++          <property name="orientation">
++           <enum>Qt::Horizontal</enum>
++          </property>
++          <property name="sizeHint" stdset="0">
++           <size>
++            <width>40</width>
++            <height>20</height>
++           </size>
++          </property>
++         </spacer>
++        </item>
++       </layout>
++      </item>
++      <item>
++       <layout class="QHBoxLayout" name="horizontalLayout">
++        <property name="spacing">
++         <number>30</number>
++        </property>
++        <item>
++         <widget class="QCheckBox" name="ck_showChoose">
++          <property name="text">
++           <string>Show &quot;Choose...&quot;</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QCheckBox" name="ck_showReconnect">
++          <property name="text">
++           <string>Show &quot;Reconnect&quot;</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <spacer name="horizontalSpacer">
++          <property name="orientation">
++           <enum>Qt::Horizontal</enum>
++          </property>
++          <property name="sizeHint" stdset="0">
++           <size>
++            <width>40</width>
++            <height>20</height>
++           </size>
++          </property>
++         </spacer>
++        </item>
++       </layout>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout_3">
++     <item>
++      <widget class="QGroupBox" name="gbPresets">
++       <property name="title">
++        <string>Presets</string>
++       </property>
++       <layout class="QVBoxLayout" name="verticalLayout">
++        <item>
++         <widget class="QListWidget" name="lw_presets">
++          <property name="sizePolicy">
++           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
++            <horstretch>0</horstretch>
++            <verstretch>0</verstretch>
++           </sizepolicy>
++          </property>
++          <property name="contextMenuPolicy">
++           <enum>Qt::CustomContextMenu</enum>
++          </property>
++          <property name="dragEnabled">
++           <bool>true</bool>
++          </property>
++          <property name="dragDropMode">
++           <enum>QAbstractItemView::InternalMove</enum>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <layout class="QHBoxLayout" name="_2">
++          <property name="spacing">
++           <number>6</number>
++          </property>
++          <property name="margin">
++           <number>0</number>
++          </property>
++          <item>
++           <widget class="QPushButton" name="pb_spNew">
++            <property name="text">
++             <string>Add</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QPushButton" name="pb_spEdit">
++            <property name="enabled">
++             <bool>false</bool>
++            </property>
++            <property name="text">
++             <string>Edit</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QPushButton" name="pb_spDelete">
++            <property name="enabled">
++             <bool>false</bool>
++            </property>
++            <property name="text">
++             <string>Delete</string>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++       </layout>
++      </widget>
++     </item>
++     <item>
++      <widget class="QGroupBox" name="gbSelectedPreset">
++       <property name="enabled">
++        <bool>false</bool>
++       </property>
++       <property name="title">
++        <string>Selected preset</string>
++       </property>
++       <layout class="QVBoxLayout" name="verticalLayout_3">
++        <item>
++         <layout class="QHBoxLayout" name="horizontalLayout_4">
++          <item>
++           <widget class="QLabel" name="label_3">
++            <property name="text">
++             <string>Name:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QLineEdit" name="le_spName"/>
++          </item>
++         </layout>
++        </item>
++        <item>
++         <layout class="QHBoxLayout" name="_3">
++          <property name="spacing">
++           <number>6</number>
++          </property>
++          <property name="margin">
++           <number>0</number>
++          </property>
++          <item>
++           <widget class="QLabel" name="label_2">
++            <property name="text">
++             <string>Status:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="StatusComboBox" name="cb_sp_status"/>
++          </item>
++          <item>
++           <spacer>
++            <property name="orientation">
++             <enum>Qt::Horizontal</enum>
++            </property>
++            <property name="sizeHint" stdset="0">
++             <size>
++              <width>97</width>
++              <height>20</height>
++             </size>
++            </property>
++           </spacer>
++          </item>
++          <item>
++           <widget class="QLabel" name="label">
++            <property name="text">
++             <string>Priority:</string>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QLineEdit" name="le_sp_priority">
++            <property name="minimumSize">
++             <size>
++              <width>50</width>
++              <height>0</height>
++             </size>
++            </property>
++            <property name="maximumSize">
++             <size>
++              <width>50</width>
++              <height>16777215</height>
++             </size>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++        <item>
++         <widget class="ChatEdit" name="te_sp">
++          <property name="acceptRichText">
++           <bool>false</bool>
++          </property>
++          <property name="sizePolicy">
++           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
++            <horstretch>0</horstretch>
++            <verstretch>0</verstretch>
++           </sizepolicy>
++          </property>
++          <property name="maximumSize">
++           <size>
++            <width>32767</width>
++            <height>32767</height>
++           </size>
++          </property>
++          <property name="tabChangesFocus">
++           <bool>true</bool>
++          </property>
++          <property name="html">
++           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
++&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
++p, li { white-space: pre-wrap; }
++&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
++&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
++          </property>
++         </widget>
++        </item>
++        <item>
++         <widget class="QDialogButtonBox" name="bb_selPreset">
++          <property name="standardButtons">
++           <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
++          </property>
++          <property name="centerButtons">
++           <bool>false</bool>
++          </property>
++         </widget>
++        </item>
++       </layout>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <customwidgets>
++  <customwidget>
++   <class>StatusComboBox</class>
++   <extends>QComboBox</extends>
++   <header>statuscombobox.h</header>
++  </customwidget>
++  <customwidget>
++   <class>ChatEdit</class>
++   <extends>QTextEdit</extends>
++   <header>msgmle.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/opt_status.h
++++ git/src/options/opt_status.h
+@@ -1,43 +1,13 @@
+ #ifndef OPT_STATUS_H
+ #define OPT_STATUS_H
+ 
+-#include <QMap>
+-#include <QSet>
+-#include <QStringList>
+-
+ #include "optionstab.h"
+-#include "statuspreset.h"
+-
+-class QWidget;
+ 
+-class OptionsTabStatus : public OptionsTab
++class OptionsTabStatus : public MetaOptionsTab
+ {
+ 	Q_OBJECT
+ public:
+ 	OptionsTabStatus(QObject *parent);
+-	~OptionsTabStatus();
+-
+-	QWidget *widget();
+-	void applyOptions();
+-	void restoreOptions();
+-
+-	void setData(PsiCon *, QWidget *parentDialog);
+-	//bool stretchable() const { return true; }
+-
+-private slots:
+-	void selectStatusPreset(int x);
+-	void newStatusPreset();
+-	void removeStatusPreset();
+-	void changeStatusPreset();
+-
+-private:
+-	void setStatusPresetWidgetsEnabled(bool);
+-
+-	QWidget *w, *parentWidget;
+-	QMap<QString, StatusPreset> presets;
+-	QSet<QString> dirtyPresets;
+-	QStringList deletedPresets;
+-	QMap<QString, StatusPreset> newPresets;
+ };
+ 
+ #endif
+--- git.orig/src/options/opt_status.ui
++++ git/src/options/opt_status.ui
+@@ -1,408 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<ui version="4.0">
+- <class>OptStatus</class>
+- <widget class="QWidget" name="OptStatus">
+-  <property name="geometry">
+-   <rect>
+-    <x>0</x>
+-    <y>0</y>
+-    <width>407</width>
+-    <height>559</height>
+-   </rect>
+-  </property>
+-  <property name="windowTitle">
+-   <string>OptStatusUI</string>
+-  </property>
+-  <layout class="QVBoxLayout">
+-   <property name="spacing">
+-    <number>6</number>
+-   </property>
+-   <property name="margin">
+-    <number>9</number>
+-   </property>
+-   <item>
+-    <widget class="QGroupBox" name="groupBox1">
+-     <property name="title">
+-      <string>Prompt for status message when choosing</string>
+-     </property>
+-     <layout class="QHBoxLayout">
+-      <property name="spacing">
+-       <number>0</number>
+-      </property>
+-      <property name="margin">
+-       <number>9</number>
+-      </property>
+-      <item>
+-       <widget class="QCheckBox" name="ck_askOnline">
+-        <property name="text">
+-         <string>Online</string>
+-        </property>
+-       </widget>
+-      </item>
+-      <item>
+-       <widget class="QCheckBox" name="ck_askOffline">
+-        <property name="text">
+-         <string>Offline</string>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-   <item>
+-    <widget class="QGroupBox" name="groupBox">
+-     <property name="title">
+-      <string>Auto status</string>
+-     </property>
+-     <layout class="QVBoxLayout" name="verticalLayout">
+-      <property name="margin">
+-       <number>9</number>
+-      </property>
+-      <item>
+-       <layout class="QGridLayout">
+-        <property name="margin">
+-         <number>0</number>
+-        </property>
+-        <property name="spacing">
+-         <number>6</number>
+-        </property>
+-        <item row="2" column="1">
+-         <widget class="QSpinBox" name="sb_asOffline">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="2" column="2">
+-         <widget class="QLabel" name="lb_asOffline">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-          <property name="text">
+-           <string>Minutes</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="1" column="2">
+-         <widget class="QLabel" name="lb_asXa">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-          <property name="text">
+-           <string>Minutes</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="1" column="1">
+-         <widget class="QSpinBox" name="sb_asXa">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="0" column="2">
+-         <widget class="QLabel" name="lb_asAway">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-          <property name="text">
+-           <string>Minutes</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="2" column="0">
+-         <widget class="QCheckBox" name="ck_asOffline">
+-          <property name="text">
+-           <string>Auto offline after:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="1" column="0">
+-         <widget class="QCheckBox" name="ck_asXa">
+-          <property name="text">
+-           <string>Auto XA after:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="0" column="0">
+-         <widget class="QCheckBox" name="ck_asAway">
+-          <property name="text">
+-           <string>Auto away after:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item row="0" column="1">
+-         <widget class="QSpinBox" name="sb_asAway">
+-          <property name="enabled">
+-           <bool>false</bool>
+-          </property>
+-         </widget>
+-        </item>
+-       </layout>
+-      </item>
+-      <item>
+-       <widget class="QLabel" name="TextLabel1_8">
+-        <property name="text">
+-         <string>Status message:</string>
+-        </property>
+-       </widget>
+-      </item>
+-      <item>
+-       <widget class="ChatEdit" name="te_asMessage">
+-        <property name="acceptRichText">
+-         <bool>false</bool>
+-        </property>
+-        <property name="maximumSize">
+-         <size>
+-          <width>32767</width>
+-          <height>50</height>
+-         </size>
+-        </property>
+-        <property name="tabChangesFocus">
+-         <bool>true</bool>
+-        </property>
+-       </widget>
+-      </item>
+-      <item>
+-       <layout class="QHBoxLayout" name="horizontalLayout">
+-        <item>
+-         <widget class="QLabel" name="label_4">
+-          <property name="text">
+-           <string>Priority:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item>
+-         <widget class="QLineEdit" name="le_asPriority"/>
+-        </item>
+-       </layout>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-   <item>
+-    <widget class="QGroupBox" name="groupBox10">
+-     <property name="title">
+-      <string>Presets</string>
+-     </property>
+-     <layout class="QVBoxLayout">
+-      <property name="spacing">
+-       <number>6</number>
+-      </property>
+-      <property name="margin">
+-       <number>9</number>
+-      </property>
+-      <item>
+-       <layout class="QHBoxLayout">
+-        <property name="spacing">
+-         <number>6</number>
+-        </property>
+-        <property name="margin">
+-         <number>0</number>
+-        </property>
+-        <item>
+-         <widget class="QLabel" name="label_3">
+-          <property name="text">
+-           <string>Preset:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item>
+-         <widget class="QComboBox" name="cb_preset"/>
+-        </item>
+-        <item>
+-         <spacer>
+-          <property name="orientation">
+-           <enum>Qt::Horizontal</enum>
+-          </property>
+-          <property name="sizeHint" stdset="0">
+-           <size>
+-            <width>40</width>
+-            <height>20</height>
+-           </size>
+-          </property>
+-         </spacer>
+-        </item>
+-        <item>
+-         <widget class="QPushButton" name="pb_spNew">
+-          <property name="text">
+-           <string>New</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item>
+-         <widget class="QPushButton" name="pb_spDelete">
+-          <property name="text">
+-           <string>Delete</string>
+-          </property>
+-         </widget>
+-        </item>
+-       </layout>
+-      </item>
+-      <item>
+-       <layout class="QHBoxLayout">
+-        <property name="spacing">
+-         <number>6</number>
+-        </property>
+-        <property name="margin">
+-         <number>0</number>
+-        </property>
+-        <item>
+-         <widget class="QLabel" name="label_2">
+-          <property name="text">
+-           <string>Status:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item>
+-         <widget class="StatusComboBox" name="cb_sp_status"/>
+-        </item>
+-        <item>
+-         <spacer>
+-          <property name="orientation">
+-           <enum>Qt::Horizontal</enum>
+-          </property>
+-          <property name="sizeHint" stdset="0">
+-           <size>
+-            <width>97</width>
+-            <height>20</height>
+-           </size>
+-          </property>
+-         </spacer>
+-        </item>
+-        <item>
+-         <widget class="QLabel" name="label">
+-          <property name="text">
+-           <string>Priority:</string>
+-          </property>
+-         </widget>
+-        </item>
+-        <item>
+-         <widget class="QLineEdit" name="le_sp_priority">
+-          <property name="maximumSize">
+-           <size>
+-            <width>50</width>
+-            <height>16777215</height>
+-           </size>
+-          </property>
+-         </widget>
+-        </item>
+-       </layout>
+-      </item>
+-      <item>
+-       <widget class="QLabel" name="TextLabel2_2">
+-        <property name="text">
+-         <string>Content:</string>
+-        </property>
+-       </widget>
+-      </item>
+-      <item>
+-       <widget class="ChatEdit" name="te_sp">
+-        <property name="acceptRichText">
+-         <bool>false</bool>
+-        </property>
+-        <property name="sizePolicy">
+-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+-          <horstretch>0</horstretch>
+-          <verstretch>0</verstretch>
+-         </sizepolicy>
+-        </property>
+-        <property name="maximumSize">
+-         <size>
+-          <width>32767</width>
+-          <height>90</height>
+-         </size>
+-        </property>
+-        <property name="tabChangesFocus">
+-         <bool>true</bool>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+-  </layout>
+- </widget>
+- <layoutdefault spacing="6" margin="11"/>
+- <customwidgets>
+-  <customwidget>
+-   <class>StatusComboBox</class>
+-   <extends>QComboBox</extends>
+-   <header>statuscombobox.h</header>
+-  </customwidget>
+-  <customwidget>
+-   <class>ChatEdit</class>
+-   <extends>QTextEdit</extends>
+-   <header>msgmle.h</header>
+-  </customwidget>
+- </customwidgets>
+- <tabstops>
+-  <tabstop>ck_askOnline</tabstop>
+-  <tabstop>ck_askOffline</tabstop>
+-  <tabstop>ck_asAway</tabstop>
+-  <tabstop>sb_asAway</tabstop>
+-  <tabstop>ck_asXa</tabstop>
+-  <tabstop>sb_asXa</tabstop>
+-  <tabstop>ck_asOffline</tabstop>
+-  <tabstop>sb_asOffline</tabstop>
+-  <tabstop>te_asMessage</tabstop>
+-  <tabstop>le_asPriority</tabstop>
+-  <tabstop>cb_preset</tabstop>
+-  <tabstop>pb_spNew</tabstop>
+-  <tabstop>pb_spDelete</tabstop>
+-  <tabstop>cb_sp_status</tabstop>
+-  <tabstop>le_sp_priority</tabstop>
+-  <tabstop>te_sp</tabstop>
+- </tabstops>
+- <resources/>
+- <connections>
+-  <connection>
+-   <sender>ck_asOffline</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>sb_asOffline</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>65</x>
+-     <y>109</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>171</x>
+-     <y>112</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>ck_asXa</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>sb_asXa</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>95</x>
+-     <y>77</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>172</x>
+-     <y>78</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>ck_asAway</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>sb_asAway</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>61</x>
+-     <y>46</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>180</x>
+-     <y>42</y>
+-    </hint>
+-   </hints>
+-  </connection>
+- </connections>
+-</ui>
+--- git.orig/src/profiles.h
++++ git/src/profiles.h
+@@ -49,6 +49,8 @@ public:
+ 
+ 	void fromOptions(OptionsTree *o, QString base);
+ 	void toOptions(OptionsTree *o, QString base=QString());
++	int defaultPriority(const XMPP::Status &s);
++	void saveLastStatus(OptionsTree *o, QString base);
+ 
+ 	QString id;
+ 	QString name;
+@@ -57,17 +59,19 @@ public:
+ 	bool storeSaltedHashedPassword;
+ 	QString scramSaltedHashPassword;
+ 	int port, priority;
+- 	bool opt_enabled, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_log, opt_connectAfterSleep, opt_reconn, opt_ignoreSSLWarnings, opt_compress;
++	bool opt_enabled, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_log, opt_connectAfterSleep, opt_autoSameStatus, opt_reconn, opt_ignoreSSLWarnings, opt_compress;
+ 	XMPP::ClientStream::AllowPlainType allow_plain;
+ 	bool req_mutual_auth;
+ 	bool legacy_ssl_probe;
+-	bool opt_automatic_resource;
++	bool opt_automatic_resource, priority_dep_on_status;
+ 	int security_level;
+ 	enum SSLFlag { SSL_No = 0, SSL_Yes = 1, SSL_Auto = 2, SSL_Legacy = 3 } ssl;
+ 
+ 	QString proxyID;
+ 
+ 	XMPP::Roster roster;
++	XMPP::Status lastStatus;
++	bool lastStatusWithPriority;
+ 
+ 	struct GroupData {
+ 		bool open;
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -367,6 +367,7 @@ public:
+ 		, psi(0)
+ 		, account(parent)
+ 		, client(0)
++		, reconnectingOnce(false)
+ 		, eventQueue(0)
+ 		, xmlConsole(0)
+ 		, blockTransportPopupList(0)
+@@ -418,6 +419,7 @@ public:
+ 	Jid jid, nextJid;
+ 	Status loginStatus;
+ 	bool loginWithPriority;
++	bool reconnectingOnce;
+ 	EventQueue *eventQueue;
+ 	XmlConsole *xmlConsole;
+ 	UserList userList;
+@@ -872,11 +874,9 @@ public:
+ 	{
+ 		if (!account->isAvailable())
+ 			return;
+-		Status status = autoAwayStatus(autoAway);
+-		if (status.type() != loginStatus.type() ||
+-			status.status() != loginStatus.status())
+-		{
+-			bool withPriority = autoAway == AutoAway_Away || autoAway == AutoAway_XA;
++		bool withPriority = false;
++		Status status = autoAwayStatus(autoAway, withPriority);
++		if (status.type() != loginStatus.type() || status.status() != loginStatus.status()) {
+ 			account->setStatusDirect(status, withPriority);
+ 		}
+ 	}
+@@ -901,14 +901,26 @@ public:
+ private:
+ 	Status lastManualStatus_;
+ 
+-	XMPP::Status autoAwayStatus(AutoAway autoAway)
++	XMPP::Status autoAwayStatus(AutoAway autoAway, bool &withPriority)
+ 	{
++		withPriority = loginWithPriority;
+ 		if (!lastManualStatus().isAway() && !lastManualStatus().isInvisible()) {
+ 			int priority;
+-			if (PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
++			if (autoAway == AutoAway_Away && PsiOptions::instance()->getOption("options.status.auto-away.force-priority").toBool()) {
+ 				priority = PsiOptions::instance()->getOption("options.status.auto-away.priority").toInt();
+-			} else {
++				withPriority = true;
++			}
++			else if (autoAway == AutoAway_XA && PsiOptions::instance()->getOption("options.status.auto-away.force-xa-priority").toBool()) {
++				priority = PsiOptions::instance()->getOption("options.status.auto-away.xa-priority").toInt();
++				withPriority = true;
++			}
++			else {
+ 				priority = acc.priority;
++				if (autoAway == AutoAway_Away || autoAway == AutoAway_XA) {
++					//We reach here when function was called for auto-status (not recover after it)
++					// and priority for this auto-status was not set, so we force:
++					withPriority = false;
++				}
+ 			}
+ 
+ 			switch (autoAway) {
+@@ -1558,13 +1570,35 @@ void PsiAccount::autoLogin()
+ 	if (enabled()) {
+ 		bool autoLogin = d->acc.opt_auto;
+ 		if (autoLogin) {
+-#ifndef YAPSI
+-			// FIXME: we should remember last used status
+-			setStatus(Status(Status::Online, "", d->acc.priority), false, true);
+-#else
+-			setStatus(Status(d->psi->lastLoggedInStatusType(), d->psi->currentStatusMessage(), d->acc.priority), false, true);
+-#endif
++			if (d->acc.opt_autoSameStatus) {
++				setStatus(d->acc.lastStatus, d->acc.lastStatusWithPriority, true);
++			}
++			else {
++				setStatus(makeStatus(XMPP::Status::Online, ""), false, true);
++			}
++		}
++	}
++}
++
++void PsiAccount::reconnectOnce()
++{
++	if (isActive()) {
++		if (d->reconnectingOnce) {
++			//To be sure phase2 will be called just once
++			QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
+ 		}
++		d->reconnectingOnce = true;
++		connect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
++		logout(false, Status(Status::Offline, tr("Reconnecting"), 0));
++	}
++}
++
++void PsiAccount::reconnectOncePhase2()
++{
++	if (d->reconnectingOnce) {
++		d->reconnectingOnce = false;
++		QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
++		setStatus(d->lastManualStatus(), d->loginWithPriority, false);
+ 	}
+ }
+ 
+@@ -1701,7 +1735,7 @@ void PsiAccount::forceDisconnect(bool fa
+ 		d->client->removeExtension("pep");
+ 
+ 		// send logout status
+-		d->client->groupChatLeaveAll();
++		d->client->groupChatLeaveAll(PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
+ 		d->client->setPresence(s);
+ 
+ 		// we are not going to restore session if we a here?
+@@ -2810,7 +2844,7 @@ Status PsiAccount::loggedOutStatus()
+ #ifdef YAPSI
+ 	return Status(Status::Offline);
+ #else
+-	return Status(Status::Offline, "Logged out", 0);
++	return Status(Status::Offline, tr("Logged out"), 0);
+ #endif
+ }
+ 
+@@ -2818,10 +2852,16 @@ void PsiAccount::setStatus(const Status
+ {
+ 	Status s = _s;
+ 	if (!withPriority)
+-		s.setPriority(d->acc.priority);
++		s.setPriority(d->acc.defaultPriority(s));
+ 
+ 	if (isManualStatus) {
+ 		d->setManualStatus(s);
++
++		if (s.isAvailable()) {
++			//Save only non-offline status for reconnect use
++			d->acc.lastStatus = s;
++			d->acc.lastStatusWithPriority = withPriority;
++		}
+ 	}
+ 
+ 	// Block all transports' contacts' status change popups from popping
+@@ -2889,18 +2929,37 @@ void PsiAccount::setStatus(const Status
+ 	}
+ }
+ 
++void PsiAccount::showStatusDialog(const QString& presetName)
++{
++	StatusPreset preset;
++	preset.fromOptions(PsiOptions::instance(), presetName);
++	Status status(preset.status(), preset.message(), preset.priority().hasValue() ? preset.priority().value() : this->status().priority());
++	StatusSetDlg *w = new StatusSetDlg(this, status, preset.priority().hasValue());
++	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
++	w->show();
++}
++
+ void PsiAccount::passwordReady(QString password) {
+ 	d->acc.pass = password;
+ 	login();
+ }
+ 
++int PsiAccount::defaultPriority(const XMPP::Status &s)
++{
++	return d->acc.defaultPriority(s);
++}
++
+ void PsiAccount::setStatusDirect(const Status &_s, bool withPriority)
+ {
+ 	Status s = _s;
+ 	if (!withPriority)
+-		s.setPriority(d->acc.priority);
++		s.setPriority(defaultPriority(s));
+ 
+-	//printf("setting status to [%s]\n", s.status().latin1());
++	if (d->reconnectingOnce) {
++		//If we reconnect once and got here, user chosen status and we must stop reconnecting
++		d->reconnectingOnce = false;
++		QObject::disconnect(this, SIGNAL(disconnected()), this, SLOT(reconnectOncePhase2()));
++	}
+ 
+ 	// using pgp?
+ 	if(!d->cur_pgpSecretKey.isNull()) {
+@@ -3681,25 +3740,61 @@ ChatDlg *PsiAccount::ensureChatDlg(const
+ 	return c;
+ }
+ 
+-void PsiAccount::changeStatus(int x)
++void PsiAccount::changeStatus(int x, bool forceDialog)
+ {
+-	if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) {
+-		setStatus(loggedOutStatus(), false, true);
++	QString optionName;
++	if (!forceDialog)
++	{
++		switch (x) {
++		case STATUS_OFFLINE:
++			optionName = "offline";
++			break;
++		case STATUS_ONLINE:
++			optionName = "online";
++			break;
++		case STATUS_CHAT:
++			optionName = "chat";
++			break;
++		case STATUS_AWAY:
++			optionName = "away";
++			break;
++		case STATUS_XA:
++			optionName = "xa";
++			break;
++		case STATUS_DND:
++			optionName = "dnd";
++			break;
++		}
++	}
++
++	PsiOptions* o = PsiOptions::instance();
++
++	//If option name is not empty (it is empty for Invisible) and option is set to ask for message, show dialog
++	if (forceDialog || (!optionName.isEmpty() && o->getOption("options.status.ask-for-message-on-" + optionName).toBool())) {
++		StatusSetDlg *w = new StatusSetDlg(this, makeLastStatus(x), lastPriorityNotEmpty());
++		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
++		w->show();
+ 	}
+ 	else {
+-		if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) {
+-			setStatus(Status(), false, true);
+-		}
+-		else if(x == STATUS_INVISIBLE){
+-			Status s("","",0,true);
+-			s.setIsInvisible(true);
+-			setStatus(s, false, true);
+-		}
+-		else {
+-			StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, ""));
+-			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatus(const XMPP::Status &, bool, bool)));
+-			w->show();
++		Status status;
++		switch (x) {
++		case STATUS_OFFLINE:
++			status = PsiAccount::loggedOutStatus();
++			break;
++		case STATUS_INVISIBLE:
++			status = Status("","",0,true);
++			status.setIsInvisible(true);
++			break;
++		default:
++			status = Status((XMPP::Status::Type)x, "", 0);
++			break;
++		}
++		if (o->getOption("options.status.last-overwrite.by-status").toBool()) {
++			o->setOption("options.status.last-priority", "");
++			o->setOption("options.status.last-message", "");
++			o->setOption("options.status.last-status", status.typeString());
+ 		}
++		setStatus(status, false, true);
+ 	}
+ }
+ 
+@@ -5446,7 +5541,7 @@ void PsiAccount::groupChatLeave(const QS
+ {
+ 	Jid j(room + '@' + host);
+ 	d->groupchats.removeAll(j.bare());
+-	d->client->groupChatLeave(host, room);
++	d->client->groupChatLeave(host, room, PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
+ 	UserListItem *u = find(j);
+ 	if (u) {
+ 		d->removeEntry(j);
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -136,6 +136,7 @@ public:
+ 	VoiceCaller* voiceCaller() const;
+ 	Status status() const;
+ 	static Status loggedOutStatus();
++	int defaultPriority(const XMPP::Status &);
+ 	void setStatusDirect(const XMPP::Status &, bool withPriority = false);
+ 	void setStatusActual(const XMPP::Status &);
+ 
+@@ -191,7 +192,7 @@ public:
+ 	void reconfigureFTManager();
+ 	void changeVCard();
+ 	void changePW();
+-	void changeStatus(int);
++	void changeStatus(int, bool forceDialog = false);
+ 	void doDisco();
+ 
+ 	void showXmlConsole();
+@@ -290,6 +291,7 @@ signals:
+ 
+ public slots:
+ 	void setStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
++	void showStatusDialog(const QString& presetName);
+ 
+ 	void capsChanged(const Jid&);
+ 	void tuneStopped();
+@@ -300,6 +302,7 @@ public slots:
+ 	void openNextEvent(ActivationType activationType);
+ 	int forwardPendingEvents(const Jid &jid);
+ 	void autoLogin();
++	void reconnectOnce();
+ 
+ 	void showCert();
+ 
+@@ -419,6 +422,7 @@ private slots:
+ 
+ 	void incomingHttpAuthRequest(const PsiHttpAuthRequest &);
+ 
++	void reconnectOncePhase2();
+ 	void reconnect();
+ 	void disconnect();
+ 	void enableNotifyOnline();
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -299,10 +299,11 @@ void PsiActionList::Private::createMainW
+ 	{
+ 		// status actions
+ 		IconActionGroup *statusGroup = new IconActionGroup ( this );
+-		statusGroup->setText (tr("Set Status"));
+-		statusGroup->setWhatsThis (tr("Smaller alternative to the Status button"));
+-		statusGroup->setExclusive(false);
+-		statusGroup->setUsesDropDown (true);
++		statusGroup->setVisible(false);
++
++		IconAction* statusSmallerAlt = new IconAction(this);
++		statusSmallerAlt->setText (tr("Set Status"));
++		statusSmallerAlt->setWhatsThis (tr("Smaller alternative to the Status button"));
+ 
+ 		QString setStatusStr = tr("Changes your global status to '%1'");
+ 
+@@ -326,6 +327,14 @@ void PsiActionList::Private::createMainW
+ 
+ 		statusGroup->addSeparator();
+ 
++		IconAction *chooseStatus = new IconAction(tr("Choose status..."), "psi/action_direct_presence", tr("Choose..."), 0, statusGroup);
++		chooseStatus->setWhatsThis(tr("Show dialog to set your status"));
++
++		IconAction *reconnectAll = new IconAction(tr("Reconnect"), "psi/reload", tr("Reconnect"), 0, statusGroup);
++		reconnectAll->setWhatsThis(tr("Reconnect all active accounts"));
++
++		statusGroup->addSeparator();
++
+ 		IconAction *statusInvisible = new IconAction (status2txt(STATUS_INVISIBLE), "status/invisible", status2txt(STATUS_INVISIBLE), 0, statusGroup, QString::number(STATUS_INVISIBLE), statusExl);
+ 		statusInvisible->setWhatsThis (setStatusStr.arg(tr("Invisible")));
+ 
+@@ -335,7 +344,8 @@ void PsiActionList::Private::createMainW
+ 		statusOffline->setWhatsThis (setStatusStr.arg(tr("Offline")));
+ 
+ 		ActionNames actions[] = {
+-			{ "status_all",       statusGroup     },
++			{ "status_group",     statusGroup     },
++			{ "status_all",       statusSmallerAlt},
+ 			{ "status_chat",      statusChat      },
+ 			{ "status_online",    statusOnline    },
+ 			{ "status_away",      statusAway      },
+@@ -343,6 +353,8 @@ void PsiActionList::Private::createMainW
+ 			{ "status_dnd",       statusDnd       },
+ 			{ "status_invisible", statusInvisible },
+ 			{ "status_offline",   statusOffline   },
++			{ "choose_status",    chooseStatus    },
++			{ "reconnect_all",    reconnectAll    },
+ 			{ "", 0 }
+ 		};
+ 
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -547,7 +547,7 @@ bool PsiCon::init()
+ 	connect(d->mainwin, SIGNAL(doManageAccounts()), SLOT(doManageAccounts()));
+ 	connect(d->mainwin, SIGNAL(doGroupChat()), SLOT(doGroupChat()));
+ 	connect(d->mainwin, SIGNAL(blankMessage()), SLOT(doNewBlankMessage()));
+-	connect(d->mainwin, SIGNAL(statusChanged(int)), SLOT(statusMenuChanged(int)));
++	connect(d->mainwin, SIGNAL(statusChanged(XMPP::Status::Type)), SLOT(statusMenuChanged(XMPP::Status::Type)));
+ 	connect(d->mainwin, SIGNAL(statusMessageChanged(QString)), SLOT(setStatusMessage(QString)));
+ 	connect(d->mainwin, SIGNAL(doOptions()), SLOT(doOptions()));
+ 	connect(d->mainwin, SIGNAL(doToolbars()), SLOT(doToolbars()));
+@@ -726,6 +726,11 @@ bool PsiCon::haveAutoUpdater() const
+ 	return d->autoUpdater != 0;
+ }
+ 
++void PsiCon::updateStatusPresets()
++{
++	emit statusPresetsChanged();
++}
++
+ void PsiCon::registerCaps(const QString& ext, const QStringList& features)
+ {
+ 	DiscoItem::Identity identity = { "client", ApplicationInfo::name(), "pc" };
+@@ -851,7 +856,7 @@ void PsiCon::changeProfile()
+ 		if (messageBox.clickedButton() == cancel)
+ 			return;
+ 
+-		setStatusFromDialog(XMPP::Status::Offline, false, true);
++		setGlobalStatus(XMPP::Status::Offline, false, true);
+ 	}
+ 
+ 	doQuit(QuitProfile);
+@@ -1014,37 +1019,67 @@ void PsiCon::removeAccount(PsiAccount *p
+ 	d->contactList->removeAccount(pa);
+ }
+ 
+-void PsiCon::statusMenuChanged(int x)
++void PsiCon::statusMenuChanged(XMPP::Status::Type x, bool forceDialog)
+ {
+ #ifndef YAPSI
+-	if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) {
+-		setGlobalStatus(PsiAccount::loggedOutStatus(), false, true);
+-		if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
+-			d->mainwin->setTrayToolTip(Status(Status::Offline, "", 0));
++	QString optionName;
++	if (!forceDialog)
++	{
++		switch (x) {
++		case STATUS_OFFLINE:
++			optionName = "offline";
++			break;
++		case STATUS_ONLINE:
++			optionName = "online";
++			break;
++		case STATUS_CHAT:
++			optionName = "chat";
++			break;
++		case STATUS_AWAY:
++			optionName = "away";
++			break;
++		case STATUS_XA:
++			optionName = "xa";
++			break;
++		case STATUS_DND:
++			optionName = "dnd";
++			break;
++		default:
++			break;
++		}
++	}
++	PsiOptions* o = PsiOptions::instance();
++	//If option name is not empty (it is empty for Invisible) and option is set to ask for message, show dialog
++	if (forceDialog || (!optionName.isEmpty() && o->getOption("options.status.ask-for-message-on-" + optionName).toBool())) {
++		StatusSetDlg *w = new StatusSetDlg(this, makeLastStatus(x), lastPriorityNotEmpty());
++		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setGlobalStatus(const XMPP::Status &, bool, bool)));
++		connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
++		if(o->getOption("options.ui.systemtray.enable").toBool() == true)
++			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
++		w->show();
+ 	}
+ 	else {
+-		if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) {
+-			setGlobalStatus(Status(), false, true);
+-			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
+-				d->mainwin->setTrayToolTip(Status());
+-		}
+-		else if(x == STATUS_INVISIBLE){
+-			Status s("","",0,true);
+-			s.setIsInvisible(true);
+-			setGlobalStatus(s, false, true);
+-			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
+-				d->mainwin->setTrayToolTip(s);
++		Status status;
++		switch (x) {
++		case STATUS_OFFLINE:
++			status = PsiAccount::loggedOutStatus();
++			break;
++		case STATUS_INVISIBLE:
++			status = Status("","",0,true);
++			status.setIsInvisible(true);
++			break;
++		default:
++			status = Status((XMPP::Status::Type)x, "", 0);
++			break;
+ 		}
+-		else {
+-			// Create a dialog with the last status message
+-			StatusSetDlg *w = new StatusSetDlg(this, makeStatus(x, currentStatusMessage()));
+-			connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setStatusFromDialog(const XMPP::Status &, bool, bool)));
+-			connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
+-			if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
+-				connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
+-			w->show();
++		if (o->getOption("options.status.last-overwrite.by-status").toBool()) {
++			o->setOption("options.status.last-priority", "");
++			o->setOption("options.status.last-message", "");
++			o->setOption("options.status.last-status", status.typeString());
+ 		}
++		setGlobalStatus(status, false, true);
+ 	}
++
+ #else
+ 	setGlobalStatus(makeStatus(x, currentStatusMessage()), false, true);
+ #endif
+@@ -1077,16 +1112,6 @@ XMPP::Status::Type PsiCon::currentStatus
+ #endif
+ }
+ 
+-XMPP::Status::Type PsiCon::lastLoggedInStatusType() const
+-{
+-#ifdef YAPSI
+-	return d->mainwin->lastLoggedInStatusType();
+-#else
+-// FIXME: Has to use status type from global status type selector
+-	return XMPP::Status::Online;
+-#endif
+-}
+-
+ QString PsiCon::currentStatusMessage() const
+ {
+ #ifdef YAPSI
+@@ -1094,16 +1119,15 @@ QString PsiCon::currentStatusMessage() c
+ 		return QString();
+ 	return d->mainwin->statusMessage();
+ #else
+-	return PsiOptions::instance()->getOption("options.status.last-message").toString();
+-#endif
+-}
+-
+-void PsiCon::setStatusFromDialog(const XMPP::Status &s, bool withPriority, bool isManualStatus)
+-{
+-	if (isManualStatus) {
+-		PsiOptions::instance()->setOption("options.status.last-message", s.status());
++	QString message = "";
++	foreach(PsiAccount* account, d->contactList->enabledAccounts()) {
++		if(account->loggedIn()) {
++			message = account->status().status();
++			break;
++		}
+ 	}
+-	setGlobalStatus(s, withPriority, isManualStatus);
++	return message;
++#endif
+ }
+ 
+ void PsiCon::setStatusFromCommandline(const QString &status, const QString &message)
+@@ -1139,6 +1163,20 @@ void PsiCon::setGlobalStatus(const Statu
+ 	emit statusMessageChanged(s.status());
+ }
+ 
++void PsiCon::showStatusDialog(const QString& presetName)
++{
++	StatusPreset preset;
++	preset.fromOptions(PsiOptions::instance(), presetName);
++	int priority = preset.priority().hasValue() ? preset.priority().value() : 0;
++	Status status(preset.status(), preset.message(), priority);
++	StatusSetDlg *w = new StatusSetDlg(this, status, preset.priority().hasValue());
++	connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), SLOT(setGlobalStatus(const XMPP::Status &, bool, bool)));
++	connect(w, SIGNAL(cancelled()), SLOT(updateMainwinStatus()));
++	if(PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() == true)
++		connect(w, SIGNAL(set(const XMPP::Status &, bool, bool)), d->mainwin, SLOT(setTrayToolTip(const XMPP::Status &, bool, bool)));
++	w->show();
++}
++
+ void PsiCon::setStatusMessage(QString message)
+ {
+ 	XMPP::Status s;
+@@ -1325,6 +1363,21 @@ void PsiCon::doToolbars()
+ 	}
+ }
+ 
++void PsiCon::doStatusPresets()
++{
++	OptionsDlg *w = (OptionsDlg *)dialogFind("OptionsDlg");
++	if (w) {
++		w->openTab("status");
++		bringToFront(w);
++	}
++	else {
++		w = new OptionsDlg(this);
++		connect(w, SIGNAL(applyOptions()), SLOT(slotApplyOptions()));
++		w->openTab("status");
++		w->show();
++	}
++}
++
+ void PsiCon::optionChanged(const QString& option)
+ {
+ 	//bool notifyRestart = true;
+@@ -1776,7 +1829,14 @@ void PsiCon::doWakeup()
+ 	foreach(PsiAccount* account, d->contactList->enabledAccounts()) {
+ 		if (account->userAccount().opt_connectAfterSleep) {
+ 			// Should we do this when the network comes up ?
+-			account->setStatus(Status("", "", account->userAccount().priority));
++			if (account->accountOptions().opt_autoSameStatus) {
++				Status s = account->accountOptions().lastStatus;
++				account->setStatus(s, account->accountOptions().lastStatusWithPriority, true);
++				emit statusMessageChanged(s.status());
++			}
++			else {
++				account->setStatus(makeStatus(XMPP::Status::Online, ""), false, true);
++			}
+ 		}
+ 	}
+ }
+--- git.orig/src/psicon.h
++++ git/src/psicon.h
+@@ -123,10 +123,10 @@ public:
+ 	void removeEvent(const PsiEvent::Ptr &e);
+ 
+ 	Status::Type currentStatusType() const;
+-	Status::Type lastLoggedInStatusType() const;
+ 	QString currentStatusMessage() const;
+ 
+ 	bool haveAutoUpdater() const;
++	void updateStatusPresets();
+ 
+ 	PopupManager* popupManager() const;
+ 
+@@ -140,10 +140,13 @@ signals:
+ 	void emitOptionsUpdate();
+ 	void restoringSavedChatsChanged();
+ 	void statusMessageChanged(QString);
++	void statusPresetsChanged();
+ 
+ public slots:
+-	void setGlobalStatus(const Status &, bool withPriority = false, bool isManualStatus = false);
++	void setGlobalStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
++	void showStatusDialog(const QString& presetName);
+ 	void doToolbars();
++	void doStatusPresets();
+ 	void checkAccountsEmpty();
+ 
+ public slots:
+@@ -156,14 +159,13 @@ public slots:
+ 	void doNewBlankMessage();
+ 	void doOptions();
+ 	void doFileTransDlg();
+-	void statusMenuChanged(int);
++	void statusMenuChanged(XMPP::Status::Type, bool forceDialog = false);
+ 	void setStatusMessage(QString message);
+ 	void pa_updatedActivity();
+ 	void pa_updatedAccount();
+ 	void slotApplyOptions();
+ 	void queueChanged();
+ 	void recvNextEvent();
+-	void setStatusFromDialog(const XMPP::Status &, bool withPriority, bool isManualStatus);
+ 	void setStatusFromCommandline(const QString &status, const QString &message);
+ 	void proxy_settingsChanged();
+ 	void updateMainwinStatus();
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -739,7 +739,7 @@ private slots:
+ 		if (!contact_)
+ 			return;
+ 
+-		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), contact_->account()->status());
++		StatusSetDlg *w = new StatusSetDlg(contact_->account()->psi(), makeLastStatus(contact_->account()->status().type()), lastPriorityNotEmpty());
+ 		w->setJid(contact_->jid());
+ 		connect(w, SIGNAL(setJid(const Jid &, const Status &)), SLOT(setStatusFromDialog(const Jid &, const Status &)));
+ 		w->show();
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -625,7 +625,7 @@ PsiIcon *PsiIconset::event2icon(const Ps
+ 	return d->jid2icon(e->from(), icon);
+ }
+ 
+-static QString status2name(int s)
++QString status2name(int s)
+ {
+ 	QString name;
+ 	switch ( s ) {
+--- git.orig/src/psiiconset.h
++++ git/src/psiiconset.h
+@@ -103,4 +103,6 @@ private:
+ 	bool loadClients();
+ };
+ 
++QString status2name(int s);
++
+ #endif
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -102,6 +102,7 @@ void migrateRectEntry(const QDomElement&
+ 
+ 
+ UserAccount::UserAccount()
++	: lastStatus(XMPP::Status::Online)
+ {
+ 	reset();
+ }
+@@ -131,6 +132,7 @@ void UserAccount::reset()
+ 	opt_host = false;
+ 	host = "";
+ 	opt_automatic_resource = false;
++	priority_dep_on_status = true;
+ 	resource = ApplicationInfo::name();
+ 	priority = 55;
+ 	ibbOnly = false;
+@@ -140,6 +142,8 @@ void UserAccount::reset()
+ 	opt_log = true;
+ 	opt_reconn = true;
+ 	opt_connectAfterSleep = false;
++	opt_autoSameStatus = true;
++	lastStatusWithPriority = false;
+ 	opt_ignoreSSLWarnings = true;
+ 
+ 	proxy_index = 0;
+@@ -179,6 +183,7 @@ void UserAccount::fromOptions(OptionsTre
+ 	req_mutual_auth = o->getOption(base + ".require-mutual-auth").toBool();
+ 	legacy_ssl_probe = o->getOption(base + ".legacy-ssl-probe").toBool();
+ 	opt_automatic_resource = o->getOption(base + ".automatic-resource").toBool();
++	priority_dep_on_status = o->getOption(base + ".priority-depends-on-status").toBool();
+ 	opt_log = o->getOption(base + ".log").toBool();
+ 	opt_reconn = o->getOption(base + ".reconn").toBool();
+ 	opt_ignoreSSLWarnings = o->getOption(base + ".ignore-SSL-warnings").toBool();
+@@ -235,6 +240,19 @@ void UserAccount::fromOptions(OptionsTre
+ 	resource = o->getOption(base + ".resource").toString();
+ 	priority = o->getOption(base + ".priority").toInt();
+ 
++	if (allSetOptions.contains(base + ".auto-same-status")) {
++		opt_autoSameStatus = o->getOption(base + ".auto-same-status").toBool();
++		lastStatus.setType(o->getOption(base + ".last-status").toString());
++		lastStatus.setStatus(o->getOption(base + ".last-status-message").toString());
++		lastStatusWithPriority = o->getOption(base + ".last-with-priority").toBool();
++		if (lastStatusWithPriority) {
++			lastStatus.setPriority(o->getOption(base + ".last-priority").toInt());
++		}
++		else {
++			lastStatus.setPriority(defaultPriority(lastStatus));
++		}
++	}
++
+ #ifdef HAVE_PGPUTIL
+ 	QString pgpSecretKeyID = o->getOption(base + ".pgp-secret-key-id").toString();
+ 	if (!pgpSecretKeyID.isEmpty()) {
+@@ -324,9 +342,11 @@ void UserAccount::toOptions(OptionsTree
+ 	o->setOption(base + ".require-mutual-auth", req_mutual_auth);
+ 	o->setOption(base + ".legacy-ssl-probe", legacy_ssl_probe);
+ 	o->setOption(base + ".automatic-resource", opt_automatic_resource);
++	o->setOption(base + ".priority-depends-on-status", priority_dep_on_status);
+ 	o->setOption(base + ".log", opt_log);
+ 	o->setOption(base + ".reconn", opt_reconn);
+ 	o->setOption(base + ".connect-after-sleep", opt_connectAfterSleep);
++	o->setOption(base + ".auto-same-status", opt_autoSameStatus);
+ 	o->setOption(base + ".ignore-SSL-warnings", opt_ignoreSSLWarnings);
+ 
+ 	o->setOption(base + ".id", id);
+@@ -442,6 +462,7 @@ void UserAccount::toOptions(OptionsTree
+ 
+ 	o->setOption(base + ".tls.override-certificate", tlsOverrideCert);
+ 	o->setOption(base + ".tls.override-domain", tlsOverrideDomain);
++	saveLastStatus(o, base);
+ }
+ 
+ void UserAccount::fromXml(const QDomElement &a)
+@@ -465,12 +486,8 @@ void UserAccount::fromXml(const QDomElem
+ 	readBoolAttribute(a, "reconn", &opt_reconn);
+ 	readBoolAttribute(a, "ignoreSSLWarnings", &opt_ignoreSSLWarnings);
+ 	//readBoolAttribute(a, "gpg", &opt_gpg);
+-	if (a.hasAttribute("automatic-resource")) {
+-		readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
+-	}
+-	else {
+-		opt_automatic_resource = false;
+-	}
++	readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
++	readBoolAttribute(a, "priority-depends-on-status", &priority_dep_on_status);
+ 
+ 	// Will be overwritten if there is a new option
+ 	bool opt_plain = false;
+@@ -596,6 +613,37 @@ void UserAccount::fromXml(const QDomElem
+ 	dtProxy = str;
+ }
+ 
++int UserAccount::defaultPriority(const XMPP::Status &s)
++{
++	if (priority_dep_on_status) {
++		if (s.isAvailable()) {
++			return PsiOptions::instance()->getOption("options.status.default-priority." + s.typeString()).toInt();
++		}
++		else {
++			return 0; //Priority for Offline status, it is not used
++		}
++	}
++	else {
++		return priority;
++	}
++}
++
++void UserAccount::saveLastStatus(OptionsTree *o, QString base=QString())
++{
++	if (base.isEmpty()) {
++		base = optionsBase;
++	}
++
++	o->setOption(base + ".last-status", lastStatus.typeString());
++	o->setOption(base + ".last-status-message", lastStatus.status());
++	o->setOption(base + ".last-with-priority", lastStatusWithPriority);
++	if (lastStatusWithPriority) {
++		o->setOption(base + ".last-priority", lastStatus.priority());
++	}
++	else {
++		o->removeOption(base + ".last-priority");
++	}
++}
+ 
+ static ToolbarPrefs loadToolbarData( const QDomElement &e )
+ {
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -470,6 +470,8 @@ newcontactlist {
+ 		$$PWD/contactlistitemproxy.h \
+ 		$$PWD/contactupdatesmanager.h \
+ 		$$PWD/statusmenu.h \
++		$$PWD/globalstatusmenu.h \
++		$$PWD/accountstatusmenu.h \
+ 		$$PWD/psirosterwidget.h \
+ 		$$PWD/psifilteredcontactlistview.h
+ 
+@@ -500,6 +502,8 @@ newcontactlist {
+ 		$$PWD/contactlistitemproxy.cpp \
+ 		$$PWD/contactupdatesmanager.cpp \
+ 		$$PWD/statusmenu.cpp \
++		$$PWD/globalstatusmenu.cpp \
++		$$PWD/accountstatusmenu.cpp \
+ 		$$PWD/psirosterwidget.cpp \
+ 		$$PWD/psifilteredcontactlistview.cpp
+ 
+--- git.orig/src/statuscombobox.cpp
++++ git/src/statuscombobox.cpp
+@@ -21,6 +21,7 @@
+ #include "statuscombobox.h"
+ 
+ #include "psioptions.h"
++#include "psiiconset.h"
+ #include "common.h"
+ 
+ /**
+@@ -31,10 +32,10 @@
+ StatusComboBox::StatusComboBox(QWidget* parent, XMPP::Status::Type type)
+ 	: QComboBox(parent)
+ {
++	addStatus(XMPP::Status::Online);
+ 	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool()) {
+ 		addStatus(XMPP::Status::FFC);
+ 	}
+-	addStatus(XMPP::Status::Online);
+ 	addStatus(XMPP::Status::Away);
+ 	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool()) {
+ 		addStatus(XMPP::Status::XA);
+@@ -81,7 +82,11 @@ XMPP::Status::Type StatusComboBox::statu
+ // private
+ 
+ void StatusComboBox::addStatus(XMPP::Status::Type status){
++#ifdef Q_OS_MAC
+ 	addItem(status2txt(status), status);
++#else
++	addItem(PsiIconset::instance()->status(status).icon(), status2txt(status), status);
++#endif
+ }
+ 
+ void StatusComboBox::onCurrentIndexChanged(int index)
+--- git.orig/src/statusdlg.cpp
++++ git/src/statusdlg.cpp
+@@ -34,6 +34,7 @@
+ #include "jidutil.h"
+ #include "psicon.h"
+ #include "psioptions.h"
++#include "psiiconset.h"
+ #include "psiaccount.h"
+ #include "userlist.h"
+ #include "common.h"
+@@ -42,7 +43,7 @@
+ #include "statuspreset.h"
+ #include "statuscombobox.h"
+ #include "shortcutmanager.h"
+-
++#include "priorityvalidator.h"
+ 
+ //----------------------------------------------------------------------------
+ // StatusShowDlg
+@@ -89,6 +90,7 @@ public:
+ 	PsiCon *psi;
+ 	PsiAccount *pa;
+ 	Status s;
++	bool withPriority;
+ 	ChatEdit *te;
+ 	StatusComboBox *cb_type;
+ 	QComboBox *cb_preset;
+@@ -99,7 +101,7 @@ public:
+ 	setStatusEnum setStatusMode;
+ };
+ 
+-StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s)
++StatusSetDlg::StatusSetDlg(PsiCon *psi, const Status &s, bool withPriority)
+ 	: QDialog(0)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
+@@ -108,13 +110,14 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi,
+ 	d->pa = 0;
+ 	d->psi->dialogRegister(this);
+ 	d->s = s;
++	d->withPriority = withPriority;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: All accounts")));
+ 	d->setStatusMode = setStatusForAccount;
+ 	init();
+ }
+ 
+-StatusSetDlg::StatusSetDlg(PsiAccount *pa, const Status &s)
++StatusSetDlg::StatusSetDlg(PsiAccount *pa, const Status &s, bool withPriority)
+ 	: QDialog(0)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
+@@ -123,6 +126,7 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
+ 	d->pa = pa;
+ 	d->pa->dialogRegister(this);
+ 	d->s = s;
++	d->withPriority = withPriority;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
+ 	d->setStatusMode = setStatusForAccount;
+@@ -165,6 +169,8 @@ void StatusSetDlg::init()
+ 	hb1->addWidget(l);
+ 	d->le_priority = new QLineEdit(this);
+ 	d->le_priority->setMinimumWidth(30);
++	PriorityValidator* prValidator = new PriorityValidator(d->le_priority);
++	d->le_priority->setValidator(prValidator);
+ 	hb1->addWidget(d->le_priority,1);
+ 
+ 	// Status preset
+@@ -172,12 +178,17 @@ void StatusSetDlg::init()
+ 	hb1->addWidget(l);
+ 	d->cb_preset = new QComboBox(this);
+ 	d->cb_preset->addItem(tr("<None>"));
+-	QStringList presets;
+-	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets")) {
+-		presets += name.toString();
++	foreach(QVariant name, PsiOptions::instance()->mapKeyList("options.status.presets", true)) {
++		StatusPreset sp;
++		sp.fromOptions(PsiOptions::instance(), name.toString());
++		sp.filterStatus();
++#ifdef Q_OS_MAC
++		d->cb_preset->addItem(sp.name());
++#else
++		d->cb_preset->addItem(PsiIconset::instance()->status(sp.status()).icon(), sp.name());
++#endif
++
+ 	}
+-	presets.sort();
+-	d->cb_preset->addItems(presets);
+ 	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(chooseStatusPreset(int)));
+ 	hb1->addWidget(d->cb_preset,3);
+ 
+@@ -202,6 +213,9 @@ void StatusSetDlg::init()
+ 	d->te->setAcceptRichText(false);
+ 	d->te->setPlainText(d->s.status());
+ 	d->te->selectAll();
++	if (d->withPriority) {
++		d->le_priority->setText(QString::number(d->s.priority()));
++	}
+ 	connect(pb1, SIGNAL(clicked()), SLOT(doButton()));
+ 	connect(pb2, SIGNAL(clicked()), SLOT(cancel()));
+ 	d->te->setFocus();
+@@ -258,18 +272,24 @@ void StatusSetDlg::doButton()
+ 		}
+ 
+ 		sp.toOptions(PsiOptions::instance());
+-		QString base = PsiOptions::instance()->mapPut("options.status.presets", text);
++		PsiOptions::instance()->mapPut("options.status.presets", text);
++
++		//PsiCon will emit signal to refresh presets in all status menus
++		(d->psi ? d->psi : d->pa->psi())->updateStatusPresets();
+ 	}
+ 
+ 	// Set status
+ 	int type = d->cb_type->status();
+ 	QString str = d->te->toPlainText();
+ 
+- 	if (d->le_priority->text().isEmpty())
+- 		//emit set(makeStatus(type, str), false, true);
++	PsiOptions::instance()->setOption("options.status.last-priority", d->le_priority->text());
++	PsiOptions::instance()->setOption("options.status.last-message", str);
++	PsiOptions::instance()->setOption("options.status.last-status", XMPP::Status(d->cb_type->status()).typeString());
++
++	if (d->le_priority->text().isEmpty())
+ 		switch(d->setStatusMode) {
+ 			case setStatusForAccount:
+-                                emit set(makeStatus(type,str), false, true);
++				emit set(makeStatus(type,str), false, true);
+ 				break;
+ 			case setStatusForJid:
+ 				emit setJid(d->j, makeStatus(type,str));
+@@ -278,11 +298,10 @@ void StatusSetDlg::doButton()
+ 				emit setJidList(d->jl, makeStatus(type,str));
+ 				break;
+ 		}
+- 	else
+- 		//emit set(makeStatus(type, str, d->le_priority->text().toInt()), true, true);
++	else {
+ 		switch(d->setStatusMode) {
+ 			case setStatusForAccount:
+-                                emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
++				emit set(makeStatus(type,str, d->le_priority->text().toInt()), true, true);
+ 				break;
+ 			case setStatusForJid:
+ 				emit setJid(d->j, makeStatus(type,str, d->le_priority->text().toInt()));
+@@ -291,7 +310,7 @@ void StatusSetDlg::doButton()
+ 				emit setJidList(d->jl, makeStatus(type,str, d->le_priority->text().toInt()));
+ 				break;
+ 		}
+-
++	}
+ 	close();
+ }
+ 
+--- git.orig/src/statusdlg.h
++++ git/src/statusdlg.h
+@@ -49,8 +49,8 @@ class StatusSetDlg : public QDialog
+ {
+ 	Q_OBJECT
+ public:
+-	StatusSetDlg(PsiCon *, const Status &);
+-	StatusSetDlg(PsiAccount *, const Status &);
++	StatusSetDlg(PsiCon *, const Status &, bool withPriority = true);
++	StatusSetDlg(PsiAccount *, const Status &, bool withPriority = true);
+ 	~StatusSetDlg();
+ 
+ 	void setJid(const Jid &);
+--- git.orig/src/statusmenu.cpp
++++ git/src/statusmenu.cpp
+@@ -26,62 +26,223 @@
+ #include "xmpp_status.h"
+ #include "common.h"
+ 
++#include <cassert>
++
+ /**
+  * \class StatusMenu
+  * Helper class that displays available statuses using QMenu.
+  */
+ 
+-StatusMenu::StatusMenu(QWidget* parent)
+-	: QMenu(parent), currentStatus_(XMPP::Status::Offline)
++StatusMenu::StatusMenu(QWidget* parent, PsiCon* _psi )
++	: QMenu(parent), psi(_psi)
++{
++	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
++	if (!css.isEmpty()) {
++		setStyleSheet(css);
++	}
++	connect(psi, SIGNAL(statusPresetsChanged()), this, SLOT(presetsChanged()));
++	installEventFilter(this);
++}
++
++void StatusMenu::fill()
+ {
++	PsiOptions* o = PsiOptions::instance();
++
+ 	addStatus(XMPP::Status::Online);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool())
+-		addStatus(XMPP::Status::FFC);
+-	addSeparator();
+-	addStatus(XMPP::Status::Away);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool())
+-		addStatus(XMPP::Status::XA);
+-	addStatus(XMPP::Status::DND);
+-	if (PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool()) {
++	if (!o->getOption("options.status.show-only-online-offline").toBool()) {
++		if (o->getOption("options.ui.menu.status.chat").toBool())
++			addStatus(XMPP::Status::FFC);
++		addSeparator();
++		addStatus(XMPP::Status::Away);
++		if (o->getOption("options.ui.menu.status.xa").toBool())
++			addStatus(XMPP::Status::XA);
++		addStatus(XMPP::Status::DND);
++		if (o->getOption("options.ui.menu.status.invisible").toBool()) {
++			addSeparator();
++			addStatus(XMPP::Status::Invisible);
++		}
++	}
++
++	QString statusInMenus = o->getOption("options.status.presets-in-status-menus").toString();
++	if (statusInMenus == "submenu") {
++		addSeparator();
++		IconActionGroup* submenu = new IconActionGroup(this);
++		submenu->setText(tr("Presets"));
++		submenu->setPsiIcon("psi/action_templates");
++		const QString css = o->getOption("options.ui.contactlist.css").toString();
++		if (!css.isEmpty()) {
++			submenu->popup()->setStyleSheet(css);
++		}
++		addPresets(submenu);
++		submenu->popup()->installEventFilter(this);
++	}
++	else if (statusInMenus == "yes") {
++		addPresets();
++	}
++
++	bool showChoose = o->getOption("options.status.show-choose").toBool();
++	bool showReconnect = o->getOption("options.status.show-reconnect").toBool();
++	if (showChoose || showReconnect) {
+ 		addSeparator();
+-		addStatus(XMPP::Status::Invisible);
++		if (showChoose) {
++			addChoose();
++		}
++		if (showReconnect) {
++			addReconnect();
++		}
+ 	}
+-#ifndef YAPSI_ACTIVEX_SERVER
++
+ 	addSeparator();
+ 	addStatus(XMPP::Status::Offline);
+-#endif
+ }
+ 
+-void StatusMenu::setStatus(XMPP::Status::Type status)
++void StatusMenu::clear()
+ {
+-	if (currentStatus_ == status)
+-		return;
++	statusActs.clear();
++	presetActs.clear();
++	QMenu::clear();
++}
+ 
+-	currentStatus_ = status;
+-	foreach(QAction* action, actions())
+-		action->setChecked(actionStatus(action) == status);
++void StatusMenu::addPresets(IconActionGroup* parent)
++{
++	QObject* parentMenu = parent ? parent : static_cast<QObject*>(this);
++	PsiOptions* o = PsiOptions::instance();
++	QVariantList presets = o->mapKeyList("options.status.presets", true);
++	bool showEditPresets = o->getOption("options.status.show-edit-presets").toBool();
++	if ((showEditPresets || presets.count() > 0) && !parent)
++		this->addSeparator();
++	if (presets.count() > 0) {
++		foreach(QVariant name, presets) {
++			StatusPreset preset;
++			preset.fromOptions(o,name.toString());
++			preset.filterStatus();
++
++			IconAction* action = new IconAction(name.toString().replace("&", "&&"), parentMenu, status2name(preset.status()));
++			action->setCheckable(true);
++			action->setProperty("preset", name);
++			action->setProperty("message", preset.message());
++			action->setProperty("status", QVariant(preset.status()));
++			connect(action, SIGNAL(triggered()), SLOT(presetActivated()));
++			presetActs.append(action);
++		}
++	}
++	if (showEditPresets) {
++		IconAction* action = new IconAction(tr("Edit presets..."), parentMenu, "psi/action_templates_edit");
++		connect(action, SIGNAL(triggered()), SLOT(changePresetsActivated()));
++	}
+ }
+ 
+-XMPP::Status::Type StatusMenu::actionStatus(const QAction* action) const
++void StatusMenu::presetsChanged()
+ {
+-	Q_ASSERT(action);
+-	return static_cast<XMPP::Status::Type>(action->property("type").toInt());
++	if (PsiOptions::instance()->getOption("options.status.presets-in-status-menus").toString() != "no")
++	{
++		//TODO Maybe refresh only presets?...
++		clear();
++		fill();
++	}
++}
++
++void StatusMenu::statusChanged(const Status& status)
++{
++	bool presetFound = false;
++	foreach(IconAction* action, presetActs)
++	{
++		//Maybe we should compare with priority too
++		int st = static_cast<int>(status.type());
++		QString message = action->property("message").toString();
++		if (!presetFound && action->property("status").toInt() == st && message == status.status())
++		{
++			action->setChecked(true);
++			presetFound = true;
++		}
++		else
++			action->setChecked(false);
++	}
++	bool statusFound = false;
++	foreach(IconAction* action, statusActs)
++	{
++		if (!statusFound && !presetFound && action->property("type").toInt() == static_cast<int>(status.type()))
++		{
++			action->setChecked(true);
++			statusFound = true;
++		}
++		else
++			action->setChecked(false);
++	}
++}
++
++void StatusMenu::presetActivated()
++{
++	QAction* action = static_cast<QAction*>(sender());
++	QString name = action->property("preset").toString();
++	PsiOptions* o = PsiOptions::instance();
++	QString base = o->mapLookup("options.status.presets", name);
++	XMPP::Status status;
++	status.setType(o->getOption(base + ".status").toString());
++	status.setStatus(o->getOption(base + ".message").toString());
++	bool withPriority = false;
++	if (o->getOption(base + ".force-priority").toBool()) {
++		withPriority = true;
++		status.setPriority(o->getOption(base + ".priority").toInt());
++	}
++	if (o->getOption("options.status.last-overwrite.by-template").toBool()) {
++		o->setOption("options.status.last-priority", withPriority ? QString::number(status.priority()) : "");
++		o->setOption("options.status.last-message", status.status());
++		o->setOption("options.status.last-status", status.typeString());
++	}
++	emit statusPresetSelected(status, withPriority, true);
++}
++
++void StatusMenu::changePresetsActivated()
++{
++	psi->doStatusPresets();
+ }
+ 
+ void StatusMenu::addStatus(XMPP::Status::Type type)
+ {
+-	QAction* action = new QAction(status2txt(type), this);
++	IconAction* action = new IconAction(status2txt(type), this, status2name(type));
+ 	action->setCheckable(true);
+-	action->setChecked(currentStatus_ == type);
+-	action->setIcon(PsiIconset::instance()->status(type).icon());
+ 	action->setProperty("type", QVariant(type));
+-	connect(action, SIGNAL(triggered()), SLOT(actionActivated()));
+-	addAction(action);
++	connect(action, SIGNAL(triggered()), SLOT(statusActivated()));
++	statusActs.append(action);
+ }
+ 
+-void StatusMenu::actionActivated()
++XMPP::Status::Type StatusMenu::actionStatus(const QAction* action) const
++{
++	Q_ASSERT(action);
++	return static_cast<XMPP::Status::Type>(action->property("type").toInt());
++}
++
++void StatusMenu::statusActivated()
+ {
+ 	QAction* action = static_cast<QAction*>(sender());
+-	setStatus(actionStatus(action));
+-	emit statusChanged(currentStatus_);
++	XMPP::Status::Type status = actionStatus(action);
++	emit statusSelected(status, false);
++}
++
++bool StatusMenu::eventFilter(QObject *obj, QEvent *event)
++{
++	if (event->type() == QEvent::MouseButtonRelease)
++	{
++		QMouseEvent* e = static_cast<QMouseEvent*>(event); //We sure event is QMouseEvent
++		QMenu* menu = dynamic_cast<QMenu*>(obj); //Event filter can be installed on anything, so do dynamic_cast
++		assert(menu != 0); //Dynamic cast on wrong type will return 0
++		QAction* action = menu->actionAt(e->pos());
++		if (action && e->button() == Qt::RightButton)
++		{
++			if (!action->property("type").isNull())
++			{
++				XMPP::Status::Type status = actionStatus(action);
++				emit statusSelected(status, true);
++				return true;
++			}
++			else if (!action->property("preset").isNull())
++			{
++				QString presetName = action->property("preset").toString();
++				emit statusPresetDialogForced(presetName);
++				return true;
++			}
++		}
++	}
++	return false;
+ }
+--- git.orig/src/statusmenu.h
++++ git/src/statusmenu.h
+@@ -22,30 +22,48 @@
+ #define STATUSMENU_H
+ 
+ #include <QMenu>
++#include <QMouseEvent>
+ 
++#include "psicon.h"
++#include "iconaction.h"
+ #include "xmpp_status.h"
+ 
+ class StatusMenu : public QMenu
+ {
+ 	Q_OBJECT
+-public:
+-	StatusMenu(QWidget* parent);
++protected:
++	PsiCon* psi;
++	QList<IconAction*> statusActs, presetActs;
++
++	bool eventFilter(QObject *obj, QEvent *event);
+ 
+-	void setStatus(XMPP::Status::Type);
++public:
++	StatusMenu(QWidget* parent, PsiCon* _psi );
++	void fill();
++	void clear();
++
++public slots:
++	void presetsChanged();
++	void statusChanged(const XMPP::Status& status);
+ 
+ signals:
+-	void statusChanged(XMPP::Status::Type);
++	void statusSelected(XMPP::Status::Type, bool);
++	void statusPresetSelected(const XMPP::Status &status, bool withPriority, bool isManualStatus);
++	void statusPresetDialogForced(const QString& presetName);
+ 
+ private:
++	//It is empty here, because in global menu we'll use global action, but for account menu we'll create new action
++	virtual void addChoose() = 0;
++	virtual void addReconnect() = 0;
++
+ 	void addStatus(XMPP::Status::Type type);
++	void addPresets(IconActionGroup* parent = 0);
++	XMPP::Status::Type actionStatus(const QAction* action) const;
+ 
+ private slots:
+-	void actionActivated();
+-
+-private:
+-	XMPP::Status::Type currentStatus_;
+-
+-	XMPP::Status::Type actionStatus(const QAction* action) const;
++	void presetActivated();
++	void changePresetsActivated();
++	void statusActivated();
+ };
+ 
+ #endif
+--- git.orig/src/statuspreset.cpp
++++ git/src/statuspreset.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "maybe.h"
+ #include "statuspreset.h"
++#include "psioptions.h"
+ 
+ //-----------------------------------------------------------------------------
+ // StatusPreset
+@@ -88,6 +89,16 @@ void StatusPreset::setPriority(int prior
+ 	priority_ = Maybe<int>(priority);
+ }
+ 
++void StatusPreset::setPriority(const QString& priority)
++{
++	bool ok = false;
++	int p = priority.toInt(&ok);
++	if (ok)
++		setPriority(p);
++	else
++		clearPriority();
++}
++
+ void StatusPreset::clearPriority()
+ {
+ 	priority_ = Maybe<int>();
+@@ -128,6 +139,30 @@ void StatusPreset::fromXml(const QDomEle
+ 	setStatus(status.type());
+ }
+ 
++void StatusPreset::filterStatus()
++{
++	PsiOptions* o = PsiOptions::instance();
++	switch (status_) {
++	case XMPP::Status::FFC:
++		if (!o->getOption("options.ui.menu.status.chat").toBool()) {
++			status_ = XMPP::Status::Online;
++		}
++		break;
++	case XMPP::Status::XA:
++		if (!o->getOption("options.ui.menu.status.xa").toBool()) {
++			status_ = XMPP::Status::Away;
++		}
++		break;
++	case XMPP::Status::Invisible:
++		if (!o->getOption("options.ui.menu.status.invisible").toBool()) {
++			status_ = XMPP::Status::DND;
++		}
++		break;
++	default:
++		break;
++	}
++}
++
+ void StatusPreset::toOptions(OptionsTree *o)
+ {
+ 	QString base = o->mapPut("options.status.presets", name());
+@@ -138,3 +173,14 @@ void StatusPreset::toOptions(OptionsTree
+ 		o->setOption(base + ".priority", priority().value());
+ 	}
+ }
++
++void StatusPreset::fromOptions(OptionsTree *o, QString name)
++{
++	QString path = o->mapLookup("options.status.presets", name);
++	name_ = name;
++	bool forcePriority = o->getOption(path + ".force-priority").toBool();
++	message_ = o->getOption(path + ".message").toString();
++	status_ = XMPP::Status::txt2type(o->getOption(path + ".status").toString());
++	if (forcePriority)
++		priority_ = o->getOption(path + ".priority").toInt();
++}
+--- git.orig/src/statuspreset.h
++++ git/src/statuspreset.h
+@@ -46,9 +46,12 @@ public:
+ 	void setStatus(XMPP::Status::Type);
+ 	Maybe<int> priority() const;
+ 	void setPriority(int priority);
++	void setPriority(const QString& priority);
+ 	void clearPriority();
++	void filterStatus();
+ 
+ 	void toOptions(OptionsTree *o);
++	void fromOptions(OptionsTree *o, QString name);
+ 	QDomElement toXml(QDomDocument&) const;
+ 	void fromXml(const QDomElement&);
+ 
+--- git.orig/src/tools/optionstree/optionstree.cpp
++++ git/src/tools/optionstree/optionstree.cpp
+@@ -205,10 +205,34 @@ void OptionsTree::mapPut(const QString &
+ 	setOption(mapPut(basename, key) + '.' + node, value);
+ }
+ 
+-QVariantList OptionsTree::mapKeyList(const QString &basename) const
++bool mapKeyListLessThanByNumber(const QString &s1, const QString &s2)
++{
++	int dotpos = s1.lastIndexOf('.');
++	if (s1.leftRef(dotpos+1).compare(s2.leftRef(dotpos+1)) == 0)
++	{
++		QString name1 = s1.mid(dotpos+1), name2 = s2.mid(dotpos+1);
++		if (name1[0] == 'm' && name2[0] == 'm')
++		{
++			bool ok1 = false, ok2 = false;
++			unsigned int n1 = name1.mid(1).toUInt(&ok1), n2 = name2.mid(1).toUInt(&ok2);
++			if (ok1 && ok2)
++			{
++				return n1 < n2;
++			}
++		}
++	}
++	//fallback to string comparison
++	return s1 < s2;
++}
++
++QVariantList OptionsTree::mapKeyList(const QString &basename, bool sortedByNumbers) const
+ {
+ 	QVariantList ret;
+ 	QStringList children = getChildOptionNames( basename, true, true);
++	if (sortedByNumbers)
++	{
++		qSort(children.begin(), children.end(), mapKeyListLessThanByNumber);
++	}
+ 	foreach (QString path, children) {
+ 		ret << getOption(path+".key");
+ 	}
+--- git.orig/src/tools/optionstree/optionstree.h
++++ git/src/tools/optionstree/optionstree.h
+@@ -54,7 +54,7 @@ public:
+ 	void mapPut(const QString &basename, const QVariant &key, const QString &node, const QVariant &value);
+ 	QVariant mapGet(const QString &basename, const QVariant &key, const QString &node) const;
+ 	QVariant mapGet(const QString &basename, const QVariant &key, const QString &node, const QVariant &def) const;
+-	QVariantList mapKeyList(const QString &basename) const;
++	QVariantList mapKeyList(const QString &basename, bool sortedByNumbers = false) const;
+ 
+ 
+ 	bool saveOptions(const QString& fileName, const QString& configName, const QString& configNS, const QString& configVersion, bool streamWriter = false) const;
+--- git.orig/src/widgets/iconaction.cpp
++++ git/src/widgets/iconaction.cpp
+@@ -524,4 +524,9 @@ void IconActionGroup::addingToolButton(I
+ 	btn->setPopupMode( QToolButton::MenuButtonPopup );
+ }
+ 
++QMenu* IconActionGroup::popup()
++{
++	return d->popup;
++}
++
+ #include "iconaction.moc"
+--- git.orig/src/widgets/iconaction.h
++++ git/src/widgets/iconaction.h
+@@ -109,6 +109,8 @@ public:
+ 
+ 	IconAction *copy() const;
+ 
++	QMenu* popup();
++
+ public:
+ 	class Private;
+ private:

psi-plus-main-20141106.tar.xz/patches/0650-psi-tray-act-bring-to-front.diff Added

@@ -0,0 +1,438 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -212,6 +212,7 @@ QLineEdit#le_status_text {
+ 				<lockdown-roster type="bool">false</lockdown-roster>
+ 				<raise-on-new-event type="bool">false</raise-on-new-event>
+ 				<quit-on-close type="bool">false</quit-on-close>
++				<raise-inactive type="bool">true</raise-inactive>
+ 				<show-roster-avatar-frame type="bool">false</show-roster-avatar-frame>
+ 				<show>
+ 					<agent-contacts type="bool">true</agent-contacts>
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -83,6 +83,10 @@
+ #include "rosteravatarframe.h"
+ #include "avatars.h"
+ 
++#ifdef HAVE_X11
++#include <x11windowsystem.h>
++#endif
++
+ using namespace XMPP;
+ 
+ static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
+@@ -143,6 +147,10 @@ public:
+ 	int hideTimerInterval; //interval in sec
+ 	bool useAutohide;
+ 
++#ifdef Q_OS_WIN
++	DWORD deactivationTickCount;
++#endif
++
+ 	QSignalMapper* statusMapper;
+ 
+ 	PsiIcon* nextAnim;
+@@ -1426,7 +1434,23 @@ void MainWin::closeEvent(QCloseEvent* e)
+ 
+ void MainWin::changeEvent(QEvent *event)
+ {
+-    if (event->type() == QEvent::ActivationChange ||
++#ifdef Q_OS_WIN
++	if (event->type() == QEvent::ActivationChange
++		&& PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()
++		&& PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool()) {
++		//On Windows app window loose active state when you
++		//  click on tray icon. Workaround is to use timer:
++		//  we'll keep activated == true within 300 msec
++		//  (+ doubleClickInterval, if double click is enabled)
++		//  after deactivation.
++		if (!isActiveWindow())
++		{
++			d->deactivationTickCount = GetTickCount();
++		}
++	}
++#endif
++
++	if (event->type() == QEvent::ActivationChange ||
+ 	    event->type() == QEvent::WindowStateChange)
+ 	{
+ 		if (d->mainTabs) {
+@@ -1552,18 +1576,42 @@ void MainWin::optionsUpdate()
+ 	updateTray();
+ }
+ 
+-void MainWin::toggleVisible()
++void MainWin::toggleVisible(bool fromTray)
+ {
+-	if(!isHidden()) {
+-		trayHide();
+-	}
+-	else {
+-		trayShow();
++	if (PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool())
++	{
++		bool hidden = false;
++#ifdef Q_OS_WIN
++		if (fromTray) {
++			int timeout = 300;
++			if (PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool())
++				timeout += qApp->doubleClickInterval();
++			hidden = isHidden() || (GetTickCount() - d->deactivationTickCount > timeout);
++		}
++		else {
++			hidden = isHidden() || !isActiveWindow();
++		}
++#elif defined(HAVE_X11)
++		Q_UNUSED(fromTray);
++		hidden = isHidden() || X11WindowSystem::instance()->isWindowObscured(this, PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool());
++#else
++		Q_UNUSED(fromTray);
++		hidden = isHidden() || !isActiveWindow();
++#endif
++		if(hidden) {
++			trayShow();
++		}
++		else {
++			trayHide();
++		}
+ 	}
++	else
++		isHidden() ? trayShow() : trayHide();
+ }
+ 
+ void MainWin::setTrayToolTip(const Status& status, bool, bool)
+ {
++	Q_UNUSED (status);
+ 	if (!d->tray) {
+ 		return;
+ 	}
+@@ -1581,32 +1629,21 @@ void MainWin::trayClicked(const QPoint &
+ 		return;
+ 	}
+ 
+-	if(!isHidden()) {
+-		trayHide();
+-	}
+-	else {
+-		trayShow();
+-	}
++	toggleVisible(true);
+ }
+ 
+ void MainWin::trayDoubleClicked()
+ {
+-	if(!PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
+-		return;
+-	}
++	//Double click works like second single click now if "double-click" style is disabled
+ 
+-	if(d->nextAmount > 0) {
+-		doRecvNextEvent();
+-		return;
++	if(PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
++		if(d->nextAmount > 0) {
++			doRecvNextEvent();
++			return;
++		}
+ 	}
+ 
+-
+-	if(!isHidden()) {
+-		trayHide();
+-	}
+-	else {
+-		trayShow();
+-	}
++	toggleVisible(true);
+ }
+ 
+ void MainWin::trayShow()
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -175,7 +175,7 @@ public slots:
+ 	void optionsUpdate();
+ 	void setTrayToolTip(const XMPP::Status &, bool usePriority = false, bool isManualStatus = false);
+ 
+-	void toggleVisible();
++	void toggleVisible(bool fromTray = false);
+ 
+ 	void avcallConfig();
+ 
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -353,6 +353,10 @@ SOURCES += \
+ 	$$PWD/rosteravatarframe.cpp \
+ 	$$PWD/sendbuttonmenu.cpp
+ 
++unix:!macx:!haiku {
++	HEADERS += $$PWD/x11windowsystem.h
++	SOURCES += $$PWD/x11windowsystem.cpp
++}
+ 
+ CONFIG += filetransfer
+ filetransfer {
+--- git.orig/src/x11windowsystem.cpp
++++ git/src/x11windowsystem.cpp
+@@ -0,0 +1,215 @@
++#include "x11windowsystem.h"
++
++#include "x11info.h"
++#include <X11/Xlib.h>
++
++const long MAX_PROP_SIZE = 100000;
++X11WindowSystem* X11WindowSystem::_instance = 0;
++
++X11WindowSystem::X11WindowSystem()
++{
++	const int atomsCount = 10;
++	const char* names[atomsCount] = {
++		"_NET_CLIENT_LIST_STACKING",
++		"_NET_FRAME_EXTENTS",
++
++		"_NET_WM_WINDOW_TYPE",
++		"_NET_WM_WINDOW_TYPE_NORMAL",
++		"_NET_WM_WINDOW_TYPE_DIALOG",
++		"_NET_WM_WINDOW_TYPE_UTILITY",
++		"_NET_WM_WINDOW_TYPE_SPLASH",
++
++		"_NET_WM_STATE",
++		"_NET_WM_STATE_ABOVE",
++		"_NET_WM_STATE_HIDDEN"
++	};
++	Atom atoms[atomsCount], *atomsp[atomsCount] = {
++		&net_client_list_stacking,
++		&net_frame_extents,
++
++		&net_wm_window_type,
++		&net_wm_window_type_normal,
++		&net_wm_window_type_dialog,
++		&net_wm_window_type_utility,
++		&net_wm_window_type_splash,
++
++		&net_wm_state,
++		&net_wm_state_above,
++		&net_wm_state_hidden
++	};
++	int i = atomsCount;
++	while (i--)
++		atoms[i] = 0;
++
++	XInternAtoms(X11Info::display(), (char**)names, atomsCount, true, atoms);
++
++	i = atomsCount;
++	while (i--)
++		*atomsp[i] = atoms[i];
++
++	if (net_wm_window_type_normal != None)
++		normalWindows.insert(net_wm_window_type_normal);
++	if (net_wm_window_type_dialog != None)
++		normalWindows.insert(net_wm_window_type_dialog);
++	if (net_wm_window_type_utility != None)
++		normalWindows.insert(net_wm_window_type_utility);
++	if (net_wm_window_type_splash != None)
++		normalWindows.insert(net_wm_window_type_splash);
++
++	if (net_wm_state_hidden != None)
++		ignoredWindowStates.insert(net_wm_state_hidden);
++}
++
++X11WindowSystem* X11WindowSystem::instance()
++{
++	if (!_instance)
++		_instance = new X11WindowSystem();
++	return X11WindowSystem::_instance;
++}
++
++// Get window coords relative to desktop window
++QRect X11WindowSystem::windowRect(Window win)
++{
++	Window w_unused;
++	int x, y;
++	unsigned int w, h, junk;
++	XGetGeometry(X11Info::display(), win, &w_unused, &x, &y, &w, &h, &junk, &junk);
++	XTranslateCoordinates(X11Info::display(), win, X11Info::appRootWindow(), 0, 0, &x, &y, &w_unused);
++
++	Atom type_ret;
++	int format_ret;
++	unsigned char *data_ret;
++	unsigned long nitems_ret, unused;
++	const Atom XA_CARDINAL = (Atom) 6;
++	if (net_frame_extents != None && XGetWindowProperty(X11Info::display(), win, net_frame_extents,
++														0l, 4l, False, XA_CARDINAL, &type_ret, &format_ret,
++														&nitems_ret, &unused, &data_ret) == Success)
++	{
++		if (type_ret == XA_CARDINAL && format_ret == 32 && nitems_ret == 4) {
++			//Struts array: 0 - left, 1 - right, 2 - top, 3 - bottom
++			long *d = (long *) data_ret;
++			x -= d[0];
++			y -= d[2];
++			w += d[0] + d[1];
++			h += d[2] + d[3];
++		}
++		if ( data_ret )
++			XFree(data_ret);
++	}
++
++	return QRect(x, y, w, h);
++}
++
++// Determine if window is obscured by other windows
++bool X11WindowSystem::isWindowObscured(QWidget *widget, bool alwaysOnTop)
++{
++	if (net_wm_state_above != None)
++	{
++		if (!alwaysOnTop)
++			ignoredWindowStates.insert(net_wm_state_above);
++		else
++			ignoredWindowStates.remove(net_wm_state_above);
++	}
++
++	//TODO Is it correct to use X11Info::appRootWindow() as root window?
++	Q_ASSERT(widget);
++	QWidget* w = widget->window();
++	Window win = w->winId();
++
++	const Atom XA_WINDOW= (Atom) 33;
++	Atom type_ret;
++	int format_ret;
++	unsigned char *data_ret;
++	unsigned long nitems_ret, unused;
++
++	if (net_client_list_stacking != None)
++	{
++		QRect winRect = windowRect(win);
++		if (XGetWindowProperty(X11Info::display(), X11Info::appRootWindow(), net_client_list_stacking,
++					   0, MAX_PROP_SIZE, False, XA_WINDOW, &type_ret,
++					   &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
++			if (type_ret == XA_WINDOW && format_ret == 32) {
++				Window *wins = (Window *) data_ret;
++
++				//Enumerate windows in reverse order (from most foreground window)
++				while (nitems_ret--)
++				{
++					Window current = wins[nitems_ret];
++
++					//We are not interested in underlying windows
++					if (current == win)
++						break;
++
++					//If our window in not alwaysOnTop ignore such windows, because we can't raise on top of them
++					if (windowHasAnyOfStates(current, ignoredWindowStates))
++						continue;
++
++					if (!windowHasOnlyTypes(current, normalWindows))
++						continue;
++
++					QRect rect = windowRect(current);
++					if (winRect.intersects(rect))
++						return true;
++				}
++			}
++			if (data_ret)
++				XFree(data_ret);
++		}
++	}
++	return false;
++}
++
++//If window has any type other than allowed_types return false, else return true
++bool X11WindowSystem::windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes)
++{
++	const Atom XA_ATOM = (Atom) 4;
++	Atom type_ret;
++	int format_ret;
++	unsigned char *data_ret;
++	unsigned long nitems_ret, unused;
++
++	if (net_wm_window_type != None && XGetWindowProperty(X11Info::display(), win, net_wm_window_type,
++														 0l, 2048l, False, XA_ATOM, &type_ret,
++														 &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
++		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
++			Atom *types = (Atom *) data_ret;
++			for (unsigned long i = 0; i < nitems_ret; i++)
++			{
++				if (!allowedTypes.contains(types[i]))
++				{
++					return false;
++				}
++			}
++		}
++		if (data_ret)
++			XFree(data_ret);
++		return true;
++	}
++	else
++		return false;
++}
++
++//If window has any of filteredStates return
++bool X11WindowSystem::windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates)
++{
++	const Atom XA_ATOM = (Atom) 4;
++	Atom type_ret;
++	int format_ret;
++	unsigned char *data_ret;
++	unsigned long nitems_ret, unused;
++	if (net_wm_state != None && XGetWindowProperty(X11Info::display(), win, net_wm_state, 0l, 2048l,
++												   False, XA_ATOM, &type_ret, &format_ret,
++												   &nitems_ret, &unused, &data_ret) == Success) {
++		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
++			Atom *states = (Atom *) data_ret;
++			for (unsigned long i = 0; i < nitems_ret; i++) {
++
++				if (filteredStates.contains(states[i]))
++					return true;
++			}
++		}
++		if ( data_ret )
++			XFree(data_ret);
++	}
++	return false;
++}
+--- git.orig/src/x11windowsystem.h
++++ git/src/x11windowsystem.h
+@@ -0,0 +1,44 @@
++#ifndef X11WINDOWSYSTEM_H
++#define X11WINDOWSYSTEM_H
++
++#include <QtCore>
++#include <QWidget>
++#include <QRect>
++#include <QSet>
++
++//TODO: Find a way to include Xlib here and not redefine Atom and Window types
++typedef unsigned long Atom;
++typedef unsigned long Window;
++
++class X11WindowSystem {
++private:
++	Atom net_client_list_stacking;
++	Atom net_frame_extents;
++
++	Atom net_wm_window_type;
++	Atom net_wm_window_type_normal;
++	Atom net_wm_window_type_dialog;
++	Atom net_wm_window_type_utility;
++	Atom net_wm_window_type_splash;
++
++	Atom net_wm_state;
++	Atom net_wm_state_above;
++	Atom net_wm_state_hidden;
++
++	QSet<Atom> normalWindows, ignoredWindowStates;
++
++	static X11WindowSystem* _instance;
++	X11WindowSystem();
++	~X11WindowSystem() {}
++	X11WindowSystem(const X11WindowSystem& ) {};
++	X11WindowSystem & operator=(const X11WindowSystem &) {return *this;};
++
++public:
++	static X11WindowSystem* instance();
++	QRect windowRect(Window win);
++	bool isWindowObscured(QWidget *widget, bool alwaysOnTop);
++	bool windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes);
++	bool windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates);
++};
++
++#endif // X11WINDOWSYSTEM_H

psi-plus-main-20141106.tar.xz/patches/0660-psi-custom-icons-size.diff Added

@@ -0,0 +1,264 @@
+--- psi.orig/src/discodlg.cpp
++++ psi/src/discodlg.cpp
+@@ -1009,7 +1009,8 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 
+ 	// create toolbar
+ 	toolBar = new QToolBar(tr("Service Discovery toolbar"), dlg);
+-	toolBar->setIconSize(QSize(16,16));
++	int s = PsiIconset::instance()->system().iconSize();
++	toolBar->setIconSize(QSize(s,s));
+ 	toolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ 	replaceWidget(dlg->toolBarPlaceholder, toolBar);
+ 
+--- psi.orig/src/groupchatdlg.cpp
++++ psi/src/groupchatdlg.cpp
+@@ -717,7 +717,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
+ 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
+ 
+-	ui_.toolbar->setIconSize(QSize(16,16));
++	int s = PsiIconset::instance()->system().iconSize();
++	ui_.toolbar->setIconSize(QSize(s,s));
+ 	ui_.toolbar->addAction(d->act_clear);
+ 	ui_.toolbar->addAction(d->act_find);
+ 	ui_.toolbar->addAction(d->act_configure);
+--- psi.orig/src/options/optionsdlg.cpp
++++ psi/src/options/optionsdlg.cpp
+@@ -25,6 +25,7 @@
+ #include "fancylabel.h"
+ #include "iconset.h"
+ #include "iconwidget.h"
++#include "psiiconset.h"
+ 
+ #include <QLayout>
+ #include <QLabel>
+@@ -88,7 +89,8 @@ public:
+ 			iconSize = icon.availableSizes().first();
+ 		else
+ #endif
+-			iconSize = QSize(16, 16);
++			int s = PsiIconset::instance()->system().iconSize();
++			iconSize = QSize(s,s);
+ 		QRect iconRect = opt.rect;
+ 		QRect textRect = opt.rect;
+ 		iconRect.setWidth(iconSize.width());
+@@ -154,7 +156,8 @@ public:
+ 			iconSize = icon.availableSizes().first();
+ 		else
+ #endif
+-			iconSize = QSize(16, 16);
++			int s = PsiIconset::instance()->system().iconSize();
++			iconSize = QSize(s,s);
+ 
+ 		int width = iconSize.width();
+ 		width += 8;
+--- psi.orig/src/psichatdlg.cpp
++++ psi/src/psichatdlg.cpp
+@@ -274,6 +274,10 @@ void PsiChatDlg::setLooks()
+ 	ui_.splitter->optionsChanged();
+ 	ui_.mle->optionsChanged();
+ 
++	int s = PsiIconset::instance()->system().iconSize();
++	ui_.lb_status->setFixedSize(s,s);
++	ui_.lb_client->setFixedSize(s,s);
++
+ 	ui_.tb_pgp->hide();
+ 	if (smallChat_) {
+ 		ui_.lb_status->hide();
+@@ -398,7 +402,8 @@ void PsiChatDlg::initToolButtons()
+ void PsiChatDlg::initToolBar()
+ {
+ 	ui_.toolbar->setWindowTitle(tr("Chat Toolbar"));
+-	ui_.toolbar->setIconSize(QSize(16, 16));
++	int s = PsiIconset::instance()->system().iconSize();
++	ui_.toolbar->setIconSize(QSize(s, s));
+ 	ui_.toolbar->addAction(act_clear_);
+ // typeahead find bar
+ 	ui_.toolbar->addAction(act_find);
+--- psi.orig/src/psicontactlistviewdelegate.cpp
++++ psi/src/psicontactlistviewdelegate.cpp
+@@ -49,6 +49,7 @@ static const QString showStatusIconsPath
+ static const QString statusIconsOverAvatarsPath = "options.ui.contactlist.status-icon-over-avatar";
+ static const QString allClientsOptionPath = "options.ui.contactlist.show-all-client-icons";
+ static const QString enableGroupsOptionPath = "options.ui.contactlist.enable-groups";
++static const QString statusIconsetOptionPath = "options.iconsets.status";
+ 
+ PsiContactListViewDelegate::PsiContactListViewDelegate(ContactListView* parent)
+ 	: ContactListViewDelegate(parent)
+@@ -61,6 +62,8 @@ PsiContactListViewDelegate::PsiContactLi
+ 	connect(alertTimer_, SIGNAL(timeout()), SLOT(updateAlerts()));
+ 
+ 	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
++	connect(PsiIconset::instance(), SIGNAL(rosterIconsSizeChanged(int)), SLOT(rosterIconsSizeChanged(int)));
++	statusIconSize_ = PsiIconset::instance()->roster.value(PsiOptions::instance()->getOption(statusIconsetOptionPath).toString())->iconSize();
+ 	optionChanged(slimGroupsOptionPath);
+ 	optionChanged(outlinedGroupsOptionPath);
+ 	optionChanged(contactListFontOptionPath);
+@@ -542,7 +545,7 @@ void PsiContactListViewDelegate::optionC
+ 		font_ = new QFont();
+ 		font_->fromString(PsiOptions::instance()->getOption(contactListFontOptionPath).toString());
+ 		fontMetrics_ = new QFontMetrics(*font_);
+-		rowHeight_ = qMax(fontMetrics_->height()+2, 18); // 18 - default row height
++		rowHeight_ = qMax(fontMetrics_->height()+2, statusIconSize_+2);
+ 		contactList()->viewport()->update();
+ 	}
+ 	else if (option == contactListBackgroundOptionPath) {
+@@ -625,6 +628,13 @@ void PsiContactListViewDelegate::optionC
+ 	}
+ }
+ 
++void PsiContactListViewDelegate::rosterIconsSizeChanged(int size)
++{
++	statusIconSize_ = size;
++	rowHeight_ = qMax(fontMetrics_->height()+2, statusIconSize_+2);
++	contactList()->viewport()->update();
++}
++
+ void PsiContactListViewDelegate::drawText(QPainter* painter, const QStyleOptionViewItem& o, const QRect& rect, const QString& text, const QModelIndex& index) const
+ {
+ 	QRect r(rect);
+--- psi.orig/src/psicontactlistviewdelegate.h
++++ psi/src/psicontactlistviewdelegate.h
+@@ -58,6 +58,7 @@ protected:
+ private slots:
+ 	void optionChanged(const QString& option);
+ 	void updateAlerts();
++	void rosterIconsSizeChanged(int size);
+ 
+ private:
+ 	QTimer* alertTimer_;
+@@ -70,6 +71,7 @@ private:
+ 	int avatarSize_, avatarRadius_;
+ 	bool enableGroups_, allClients_;
+ 	mutable QHash<QModelIndex, bool> alertingIndexes_;
++	int statusIconSize_;
+ };
+ 
+ #endif
+--- psi.orig/src/psiiconset.cpp
++++ psi/src/psiiconset.cpp
+@@ -335,6 +335,11 @@ bool PsiIconset::loadSystem()
+ 	QString cur_system = PsiOptions::instance()->getOption("options.iconsets.system").toString();
+ 	if (d->cur_system != cur_system) {
+ 		Iconset sys = d->systemIconset(&ok);
++
++		if(sys.iconSize() != d->system.iconSize()) {
++			emit systemIconsSizeChanged(sys.iconSize());
++		}
++
+ 		d->loadIconset(&d->system, &sys);
+ 
+ 		//d->system = d->systemIconset();
+@@ -509,6 +514,10 @@ void PsiIconset::reloadRoster()
+ 	if (d->cur_status != cur_status) {
+ 		Iconset *newDef = d->defaultRosterIconset(&ok);
+ 		Iconset *oldDef = roster[d->cur_status];
++
++		if(oldDef->iconSize() != newDef->iconSize())
++			emit rosterIconsSizeChanged(newDef->iconSize());
++
+ 		d->loadIconset(oldDef, newDef);
+ 
+ 		roster.remove(d->cur_status);
+--- psi.orig/src/psiiconset.h
++++ psi/src/psiiconset.h
+@@ -80,6 +80,8 @@ public:
+ 
+ signals:
+ 	void emoticonsChanged();
++	void systemIconsSizeChanged(int);
++	void rosterIconsSizeChanged(int);
+ 
+ public slots:
+ 	static void reset();
+--- psi.orig/src/psitoolbar.cpp
++++ psi/src/psitoolbar.cpp
+@@ -29,6 +29,7 @@
+ #include <QToolButton>
+ 
+ #include "iconset.h"
++#include "psiiconset.h"
+ #include "iconaction.h"
+ #include "psioptions.h"
+ #include "options/opt_toolbars.h"
+@@ -63,7 +64,8 @@ PsiToolBar::PsiToolBar(const QString& ba
+ 	Q_ASSERT(mainWindow);
+ 	Q_ASSERT(actionList_);
+ 
+-	setIconSize(QSize(16, 16));
++	int s = PsiIconset::instance()->system().iconSize();
++	setIconSize(QSize(s, s));
+ 
+ 	customizeAction_ = new QAction(tr("&Configure Toolbar..."), this);
+ 	connect(customizeAction_, SIGNAL(triggered()), this, SIGNAL(customize()));
+--- psi.orig/src/tools/iconset/iconset.cpp
++++ psi/src/tools/iconset/iconset.cpp
+@@ -1028,6 +1028,7 @@ private:
+ 		//authors << "I. M. Anonymous";
+ 		//creation = "1900-01-01";
+ 		homeUrl = QString::null;
++		iconSize_ = 16;
+ 	}
+ 
+ public:
+@@ -1036,6 +1037,7 @@ public:
+ 	QHash<QString, PsiIcon *> dict; // unsorted hash for fast search
+ 	QList<PsiIcon *> list;          // sorted list
+ 	QHash<QString, QString> info;
++	int iconSize_;
+ 
+ public:
+ 	Private()
+@@ -1129,6 +1131,8 @@ public:
+ 	{
+ 		Q_UNUSED(dir);
+ 
++		iconSize_ = 16;
++
+ 		for (QDomNode node = i.firstChild(); !node.isNull(); node = node.nextSibling()) {
+ 			QDomElement e = node.toElement();
+ 			if( e.isNull() ) {
+@@ -1139,6 +1143,10 @@ public:
+ 			if ( tag == "name" ) {
+ 				name = e.text();
+ 			}
++			else if( tag == "size") {
++				QString str = e.text();
++				iconSize_ = str.toInt();
++			}
+ 			else if ( tag == "version" ) {
+ 				version = e.text();
+ 			}
+@@ -1410,6 +1418,7 @@ public:
+ 		filename = from.filename;
+ 		authors = from.authors;
+ 		info = from.info;
++		iconSize_ = from.iconSize_;
+ 	}
+ };
+ //! \endif
+@@ -1599,6 +1608,14 @@ const QString &Iconset::name() const
+ }
+ 
+ /**
++ * Returns the icons size from Iconset.
++ */
++const int &Iconset::iconSize() const
++{
++	return d->iconSize_;
++}
++
++/**
+  * Returns the Iconset version.
+  */
+ const QString &Iconset::version() const
+--- psi.orig/src/tools/iconset/iconset.h
++++ psi/src/tools/iconset/iconset.h
+@@ -207,6 +207,7 @@ public:
+ 	const QStringList &authors() const;
+ 	const QString &creation() const;
+ 	const QString &homeUrl() const;
++	const int &iconSize() const;
+ 
+ 	const QString &fileName() const;
+ 	void setFileName(const QString &);

psi-plus-main-20141106.tar.xz/patches/0670-psi-options-language-select.diff Added

@@ -0,0 +1,101 @@
+--- git.temp.orig/src/options/opt_application.cpp
++++ git.temp/src/options/opt_application.cpp
+@@ -3,11 +3,16 @@
+ #include "iconwidget.h"
+ #include "psioptions.h"
+ #include "proxy.h"
++#include "translationmanager.h"
++#include "varlist.h"
++#include "applicationinfo.h"
+ 
+ #include <QCheckBox>
+ #include <QComboBox>
+ #include <QLineEdit>
++#include "qsettings.h"
+ #include <QList>
++#include <QMessageBox>
+ 
+ #include "ui_opt_application.h"
+ 
+@@ -101,6 +106,23 @@ void OptionsTabApplication::applyOptions
+ 
+ 	//Proxy
+ 	ProxyManager::instance()->proxyForObject()->save();
++
++	// Language
++	QString curLang = TranslationManager::instance()->currentLanguage();
++	QString lang = d->cb_lang->currentText();
++	QString itemData;
++	foreach(VarListItem it, TranslationManager::instance()->availableTranslations() ) {
++		if(it.data() == lang) {
++			itemData = it.key();
++			break;
++		}
++	}
++	if(curLang != itemData && !itemData.isEmpty()) {
++		TranslationManager::instance()->loadTranslation(itemData);
++		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
++	}
++	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
++	s.setValue("last_lang", itemData);
+ }
+ 
+ void OptionsTabApplication::restoreOptions()
+@@ -123,6 +145,21 @@ void OptionsTabApplication::restoreOptio
+ 	// data transfer
+ 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
+ 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
++
++	// Language
++	VarList vList = TranslationManager::instance()->availableTranslations();
++	QStringList lang = vList.varsToStringList();
++	d->cb_lang->addItem(tr("Default"));
++	foreach(QString item, lang) {
++		d->cb_lang->addItem(vList.get(item));
++	}
++	QString curLang = TranslationManager::instance()->currentLanguage();
++	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
++	QString curL = s.value("last_lang", "").toString();
++	if (curL.isEmpty())
++		d->cb_lang->setCurrentIndex( 0 );
++	else if(!curLang.isEmpty() && lang.contains(curLang) )
++		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
+ }
+ 
+ void OptionsTabApplication::doEnableQuitOnClose(int state)
+--- git.temp.orig/src/options/opt_application.ui
++++ git.temp/src/options/opt_application.ui
+@@ -179,6 +179,33 @@
+     </widget>
+    </item>
+    <item>
++    <layout class="QHBoxLayout" name="horizontalLayout">
++     <item>
++      <widget class="QLabel" name="label_2">
++       <property name="text">
++        <string>Language</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QComboBox" name="cb_lang"/>
++     </item>
++     <item>
++      <spacer name="horizontalSpacer">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>40</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++    </layout>
++   </item>
++   <item>
+     <spacer>
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>

psi-plus-main-20141106.tar.xz/patches/0680-psi-small-tooltip-fix.diff Added

@@ -0,0 +1,289 @@
+Entering 'iris'
+Entering 'src/libpsi'
+--- git.temp.orig/src/userlist.cpp
++++ git.temp/src/userlist.cpp
+@@ -31,6 +31,7 @@
+ #include "mucmanager.h"
+ #include "psioptions.h"
+ #include "jidutil.h"
++#include "psiiconset.h"
+ 
+ using namespace XMPP;
+ 
+@@ -862,31 +863,54 @@ QString UserListItem::makeBareTip(bool t
+ 	// you most probably want to wrap it with TextUtil::escape()
+ 
+ 	QString str;
++	int s = PsiIconset::instance()->system().iconSize();
++	str +=QString("<style type='text/css'> \
++		.layer1 { white-space:pre; margin-left:%1px;} \
++		.layer2 { white-space:normal; margin-left:%1px;} \
++	</style>").arg(s+2);
++
+ 	QString imgTag = "icon name"; // or 'img src' if appropriate QMimeSourceFactory is installed. but mblsha noticed that QMimeSourceFactory unloads sometimes
+ 	bool useAvatar = false;
++	bool mucItem = false;
++
++	if(!userResourceList().isEmpty()) {
++		mucItem = userResourceList()[0].status().hasMUCItem();
++	}
++
+ 	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
+ 		useAvatar = true;
+ 
++	str += "<table cellspacing=\"3\"><tr>";
++	str += "<td>";
++
+ 	if (useAvatar) {
+-		str += "<table cellspacing=\"0\"><tr>";
+-		str += "<td>";
+ 		str += QString("<icon name=\"avatars/%1\">").arg(jid().bare());
+ 		str += "</td><td width=\"10\"></td>";
+ 		str += "<td>";
+ 	}
+ 
+ 	QString nick = JIDUtil::nickOrJid(name(), jid().full());
+-	if(jid().full() != nick)
+-		str += QString("<div style='white-space:pre'>%1 &lt;%2&gt;</div>").arg(TextUtil::escape(nick)).arg(TextUtil::escape(JIDUtil::toString(jid(),true)));
+-	else
+-		str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
++	if (!mucItem) {
++		if(jid().full() != nick)
++			str += QString("<div style='white-space:pre'>%1 &lt;%2&gt;</div>").arg(TextUtil::escape(nick)).arg(TextUtil::escape(JIDUtil::toString(jid(),true)));
++		else
++			str += QString("<div style='white-space:pre'>%1</div>").arg(TextUtil::escape(nick));
++	}
+ 
+ 	// subscription
+-	if(!v_self && !v_isConference && subscription().type() != Subscription::Both)
++	if(!v_self && !v_isConference && subscription().type() != Subscription::Both && !mucItem)
+ 		str += QString("<div style='white-space:pre'>") + QObject::tr("Subscription") + ": " + subscription().toString() + "</div>";
+ 
+-	if(!v_keyID.isEmpty())
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
++	if(!v_keyID.isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
++		str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/pgp") + QObject::tr("OpenPGP") + ": " + v_keyID.right(8) + "</div>";
++
++	// User Mood
++	if (!mood().isNull()) {
++		str += QString("<div style='white-space:pre'><%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + QObject::tr("Mood") + ": " + mood().typeText();
++		if (!mood().text().isEmpty())
++			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
++		str += "</div>";
++	}
+ 
+ 	// User Activity
+ 	if (!activity().isNull()) {
+@@ -894,8 +918,7 @@ QString UserListItem::makeBareTip(bool t
+ 		if (activity().specificType() != Activity::UnknownSpecific && activity().specificType() != Activity::Other && !activity().specificTypeValue().isEmpty()) {
+ 			act += "_" + activity().specificTypeValue();
+ 		}
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Activity") + ": " +
+-			QString("<%1=\"activities/%2\"> ").arg(imgTag).arg(act) + activity().typeText();
++		str += QString("<div style='white-space:pre'><%1=\"activities/%2\"> ").arg(imgTag).arg(act) + QObject::tr("Activity") + ": " + activity().typeText();
+ 		if (activity().specificType() != Activity::UnknownSpecific) {
+ 			str += QString(" - ") + activity().specificTypeText();
+ 		}
+@@ -904,18 +927,9 @@ QString UserListItem::makeBareTip(bool t
+ 		str += "</div>";
+ 	}
+ 
+-	// User Mood
+-	if (!mood().isNull()) {
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Mood") + ": " +
+-			QString("<%1=\"mood/%2\"> ").arg(imgTag).arg(mood().typeValue()) + mood().typeText();
+-		if (!mood().text().isEmpty())
+-			str += QString(" (") + TextUtil::escape(mood().text()) + QString(")");
+-		str += "</div>";
+-	}
+-
+ 	// User Tune
+ 	if (!tune().isEmpty())
+-		str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
++		str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/notification_roster_tune") + QObject::tr("Listening to") + ": " + TextUtil::escape(tune()) + "</div>";
+ 
+ 	// User Physical Location
+ 	//if (!physicalLocation().isNull())
+@@ -923,7 +937,8 @@ QString UserListItem::makeBareTip(bool t
+ 
+ 	// User Geolocation
+ 	if (!geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
+-		str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
++		str += QString("<div style='white-space:pre'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div>%3</div></td></tr></table></div>") \
++		.arg(imgTag).arg("system/geolocation").arg(TextUtil::escape(geoLocation().toString().trimmed()));
+ 
+ 	// resources
+ 	if(!userResourceList().isEmpty()) {
+@@ -932,6 +947,7 @@ QString UserListItem::makeBareTip(bool t
+ 
+ 		for(UserResourceList::ConstIterator rit = srl.begin(); rit != srl.end(); ++rit) {
+ 			const UserResource &r = *rit;
++
+ 			QString name;
+ 			if(!r.name().isEmpty())
+ 				name = r.name();
+@@ -956,21 +972,29 @@ QString UserListItem::makeBareTip(bool t
+ 			QString secstr;
+ 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
+ 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);
+-			str += QString("<div style='white-space:pre'>") + QString("<%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) + QString("(%1)").arg(r.priority()) + secstr + "</div>";
++			QString hr;
++			if (!mucItem)
++				hr = "<hr/>";
++			if(r.status().mucItem().jid().isEmpty())
++				str += hr + QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
++				+ QString("(%1)").arg(r.priority()) + secstr + "</div>";
++			else
++				str += hr +  QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
++				+ QString("(%1) &lt;%2&gt;").arg(r.priority()).arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true))) + secstr + "</div>";
+ 
+ 			if(!r.publicKeyID().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool()) {
+ 				int v = r.pgpVerifyStatus();
+ 				if(v == QCA::SecureMessageSignature::Valid || v == QCA::SecureMessageSignature::InvalidSignature || v == QCA::SecureMessageSignature::InvalidKey || v == QCA::SecureMessageSignature::NoKey) {
+ 					if(v == QCA::SecureMessageSignature::Valid) {
+-						QString d = r.sigTimestamp().toString(Qt::TextDate);
+-						str += QString("<div style='white-space:pre'>") + QObject::tr("Signed") + " @ " + "<font color=\"#2A993B\">" + d + "</font>";
++						QString d = r.sigTimestamp().toString(Qt::DefaultLocaleShortDate);
++						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/gpg-yes") + QObject::tr("Signed") + ": " + "<font color=\"#2A993B\">" + d + "</font>";
+ 					}
+ 					else if(v == QCA::SecureMessageSignature::NoKey) {
+-						QString d = r.sigTimestamp().toString(Qt::TextDate);
+-						str += QString("<div style='white-space:pre'>") + QObject::tr("Signed") + " @ " + d;
++						QString d = r.sigTimestamp().toString(Qt::DefaultLocaleShortDate);
++						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/keyUnknown") + QObject::tr("Signed") + ": " + d;
+ 					}
+ 					else if(v == QCA::SecureMessageSignature::InvalidSignature || v == QCA::SecureMessageSignature::InvalidKey) {
+-						str += QString("<div style='white-space:pre'>") + "<font color=\"#810000\">" + QObject::tr("Bad signature") + "</font>";
++						str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/keyBad") + "<font color=\"#810000\">" + QObject::tr("Bad signature") + "</font>";
+ 					}
+ 
+ 					if(v_keyID != r.publicKeyID())
+@@ -979,55 +1003,48 @@ QString UserListItem::makeBareTip(bool t
+ 				}
+ 			}
+ 
+-			// last status
+-			if(r.status().timeStamp().isValid() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.last-status").toBool()) {
+-				QString d = r.status().timeStamp().toString(Qt::TextDate);
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Last Status") + " @ " + d + "</div>";
+-			}
+-
+-			// MUC
+-			if(!v_isConference && r.status().hasMUCItem()) {
+-				if(!r.status().mucItem().jid().isEmpty())
+-					str += QString("<div style='white-space:pre'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
+-				if(r.status().mucItem().role() != MUCItem::NoRole)
+-					str += QString("<div style='white-space:pre'>") + QObject::tr("Role: %1").arg(MUCManager::roleToString(r.status().mucItem().role())) + QString("</div>");
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Affiliation: %1").arg(MUCManager::affiliationToString(r.status().mucItem().affiliation())) + QString("</div>");
+-			}
+-
+-			// gabber music
+-			if(!r.status().songTitle().isEmpty()) {
+-				QString s = r.status().songTitle();
++			// client
++			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
++				QString ver = r.versionString();
+ 				if(trim)
+-					s = dot_truncate(s, 80);
+-				s = TextUtil::escape(s);
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + QString(": %1").arg(s) + "</div>";
++					ver = dot_truncate(ver, 80);
++				ver = TextUtil::escape(ver);
++				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())) + QObject::tr("Using") + QString(": %3").arg(ver) + "</div>";
+ 			}
+ 
+-			// User Tune
+-			if (!r.tune().isEmpty())
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Listening to") + ": " + TextUtil::escape(r.tune()) + "</div>";
+-
+-			// User Physical Location
+-		//	if (!r.physicalLocation().isNull())
+-		//		str += QString("<div style='white-space:pre'>") + QObject::tr("Location") + ": " + TextUtil::escape(r.physicalLocation().toString()) + "</div>";
+-
+-			// User Geolocation
+-			if (!r.geoLocation().isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.geolocation").toBool())
+-				str += QString("<div style='white-space:pre'>") + TextUtil::escape(geoLocation().toString()) + "</div>";
+ 
+ 			// Entity Time
+ 			if (r.timezoneOffset().hasValue()) {
+ 				QDateTime dt = QDateTime::currentDateTime().toUTC().addSecs(r.timezoneOffset().value()*60);
+-				str += QString("<br><nobr>") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::TextDate)).arg(r.timezoneOffsetString()) + "</nobr>";
++				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/time") + QObject::tr("Time") + QString(": %1 (%2)").arg(dt.toString(Qt::DefaultLocaleShortDate)).arg(r.timezoneOffsetString()) + "</div>";
+ 			}
+ 
+-			// client
+-			if(!r.versionString().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.client-version").toBool()) {
+-				QString ver = r.versionString();
+-				if(trim)
+-					ver = dot_truncate(ver, 80);
+-				ver = TextUtil::escape(ver);
+-				str += QString("<div style='white-space:pre'>") + QObject::tr("Using") + QString(": <%1=\"%2\"> %3").arg(imgTag).arg("clients/" + findClient(r.clientName().toLower())).arg(ver) + "</div>";
++			// MUC
++			if(!v_isConference && r.status().hasMUCItem()) {
++				MUCItem::Affiliation a = r.status().mucItem().affiliation();
++				QString aff;
++				if(a == MUCItem::Owner)
++					aff = "affiliation/owner";
++				else if(a == MUCItem::Admin)
++					aff = "affiliation/admin";
++				else if(a == MUCItem::Member)
++					aff = "affiliation/member";
++				else if(a == MUCItem::Outcast)
++					aff = "affiliation/outcast";
++				else
++					aff = "affiliation/noaffiliation";
++				//if(!r.status().mucItem().jid().isEmpty())
++				//	str += QString("<div class='layer1'>") + QObject::tr("JID: %1").arg(JIDUtil::toString(r.status().mucItem().jid(),true)) + QString("</div>");
++				if(r.status().mucItem().role() != MUCItem::NoRole)
++					str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td>").arg(imgTag).arg(aff);
++					str += QString("<div style='white-space:pre'>") + QObject::tr("Role: %1").arg(MUCManager::roleToString(r.status().mucItem().role())) + QString("</div>");
++					str += QString("<div style='white-space:pre'>") + QObject::tr("Affiliation: %1").arg(MUCManager::affiliationToString(r.status().mucItem().affiliation())) + QString("</td></tr></table></div>");
++			}
++
++			// last status
++			if(r.status().timeStamp().isValid() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.last-status").toBool()) {
++				QString d = r.status().timeStamp().toString(Qt::DefaultLocaleShortDate);
++				str += QString("<div class='layer1'><%1=\"%2\"> ").arg(imgTag).arg("psi/info") + QObject::tr("Last Status") + ": " + d + "</div>";
+ 			}
+ 
+ 			// status message
+@@ -1044,15 +1061,17 @@ QString UserListItem::makeBareTip(bool t
+ 					s = TextUtil::emoticonify(s);
+ 				if( !doLinkify && PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() )
+ 					s = TextUtil::legacyFormat(s);
+-				str += QString("<div style='white-space:pre'><u>%1</u></div><div>%2</div>").arg(head).arg(s);
++
++				str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div><u>%3</u>: %4</div></td></tr></table></div>") \
++				.arg(imgTag).arg("psi/action_templates_edit").arg(head).arg(s);
+ 			}
+ 		}
+ 	}
+ 	else {
+ 		// last available
+ 		if(!lastAvailable().isNull()) {
+-			QString d = lastAvailable().toString(Qt::TextDate);
+-			str += QString("<div style='white-space:pre'>") + QObject::tr("Last Available") + " @ " + d + "</div>";
++			QString d = lastAvailable().toString(Qt::DefaultLocaleShortDate);
++			str += QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg("psi/info") + QObject::tr("Last Available") + ": " + d + "</div>";
+ 		}
+ 
+ 		// presence error
+@@ -1075,14 +1094,13 @@ QString UserListItem::makeBareTip(bool t
+ 				if ( doLinkify )
+ 					s = TextUtil::linkify(s);
+ 			}
+-			str += QString("<div style='white-space:pre'><u>%1</u></div><div>%2</div>").arg(head).arg(s);
++			str += QString("<div class='layer2'><table cellspacing=\"0\"><tr><td><%1=\"%2\"> </td><td><div><u>%3</u>: %4</div></td></tr></table></div>") \
++			.arg(imgTag).arg("psi/action_templates_edit").arg(head).arg(s);
+ 		}
+ 	}
+ 
+-	if (useAvatar) {
+-		str += "</td>";
+-		str += "</tr></table>";
+-	}
++	str += "</td>";
++	str += "</tr></table>";
+ 
+ 	return str;
+ }

psi-plus-main-20141106.tar.xz/patches/0690-psi-minimize-chat-hotkey.diff Added

@@ -0,0 +1,108 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -551,6 +551,7 @@ QLineEdit#le_status_text {
+ 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
+ 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
+ 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
++				<minimize type="QKeySequence" comment="Minimize active chat window"/>
+ 			</chat>
+ 			<contactlist comment="Shortcuts in the contactlist">
+ 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -214,7 +214,7 @@ public:
+ #endif
+ 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
+ 
+-	QAction *act_mini_cmd, *act_nick, *act_hide;
++	QAction *act_mini_cmd, *act_nick, *act_hide, *act_minimize;
+ 
+ 	MCmdSimpleSite mCmdSite;
+ 	MCmdManager mCmdManager;
+@@ -695,6 +695,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(d->act_mini_cmd, SIGNAL(triggered()), d, SLOT(doMiniCmd()));
+ 	addAction(d->act_mini_cmd);
+ 
++	d->act_minimize = new QAction(this);
++	connect(d->act_minimize, SIGNAL(triggered()), SLOT(doMinimize()));
++	addAction(d->act_minimize);
++
+ 	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
+ 	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
+ 
+@@ -833,6 +837,11 @@ void GCMainDlg::horizSplitterMoved()
+ 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
+ }
+ 
++void GCMainDlg::doMinimize()
++{
++	window()->showMinimized();
++}
++
+ void GCMainDlg::ensureTabbedCorrectly()
+ {
+ 	TabbableWidget::ensureTabbedCorrectly();
+@@ -875,6 +884,7 @@ void GCMainDlg::setShortcuts()
+ 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
+ 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
+ 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
++	d->act_minimize->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
+ }
+ 
+ void GCMainDlg::scrollUp()
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -145,6 +145,9 @@ private slots:
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
+ 	void horizSplitterMoved();
++	void doMinimize();
++
++
+ 
+ public:
+ 	class Private;
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -330,6 +330,11 @@ void PsiChatDlg::setShortcuts()
+ 
+ 	act_mini_cmd_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
+ 
++	act_minimize_ = new QAction(this);
++
++	connect(act_minimize_, SIGNAL(triggered()), SLOT(doMinimize()));
++	addAction(act_minimize_);
++	act_minimize_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
+ }
+ 
+ void PsiChatDlg::updateIdentityVisibility()
+@@ -709,6 +714,10 @@ void PsiChatDlg::doMiniCmd()
+ 	mCmdManager_.open(new MCmdSimpleState(MCMDCHAT, tr("Command>")), QStringList() );
+ }
+ 
++void PsiChatDlg::doMinimize()
++{
++	window()->showMinimized();
++}
+ 
+ bool PsiChatDlg::eventFilter( QObject *obj, QEvent *ev ) {
+ 	if ( obj == chatEdit() && ev->type() == QEvent::KeyPress ) {
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -34,6 +34,7 @@ private slots:
+ 	void toggleSmallChat();
+ 	void doClearButton();
+ 	void doMiniCmd();
++	void doMinimize();
+ 	void buildMenu();
+ 	void updateCounter();
+ 	void updateIdentityVisibility();
+@@ -84,7 +85,7 @@ private:
+ 	IconAction* act_find;
+ 	IconAction* act_ps_;
+ 	IconAction* act_templates_;
+-	QAction *act_mini_cmd_;
++	QAction *act_mini_cmd_, *act_minimize_;
+ 
+ 	MCmdManager mCmdManager_;
+ 	MCmdSimpleSite mCmdSite_;

psi-plus-main-20141106.tar.xz/patches/0700-psi-send-xhtml-im.diff Added

@@ -0,0 +1,653 @@
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -690,6 +690,11 @@ void ChatDlg::doSend()
+ 	if (isEncryptionEnabled()) {
+ 		m.setWasEncrypted(true);
+ 	}
++
++	HTMLElement html = chatEdit()->toHTMLElement();
++	if(!html.body().isNull())
++		m.setHTML(html);
++
+ 	QString id = account()->client()->genUniqueId();
+ 	m.setId(id); // we need id early for message manipulations in chatview
+ 
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -207,7 +207,7 @@ public:
+ 	QString password;
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+-	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark;
++	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
+ 	TypeAheadFindBar *typeahead;
+ #ifdef WHITEBOARDING
+ 	IconAction *act_whiteboard;
+@@ -676,6 +676,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	d->act_configure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("&Configure Room"), 0, this);
+ 	connect(d->act_configure, SIGNAL(triggered()), SLOT(configureRoom()));
+ 
++	d->act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
++	connect(d->act_html_text, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
++
+ #ifdef WHITEBOARDING
+ 	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
+ 	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
+@@ -722,6 +725,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.toolbar->addAction(d->act_clear);
+ 	ui_.toolbar->addAction(d->act_find);
+ 	ui_.toolbar->addAction(d->act_configure);
++	ui_.toolbar->addAction(d->act_html_text);
+ #ifdef WHITEBOARDING
+ 	ui_.toolbar->addAction(d->act_whiteboard);
+ #endif
+@@ -1071,6 +1075,11 @@ void GCMainDlg::mle_returnPressed()
+ 	Message m(jid());
+ 	m.setType("groupchat");
+ 	m.setBody(str);
++
++	HTMLElement html = d->mle()->toHTMLElement();
++	if(!html.body().isNull())
++		m.setHTML(html);
++
+ 	m.setTimeStamp(QDateTime::currentDateTime());
+ 	emit d->mle()->appendMessageHistory(m.body());
+ 
+@@ -1752,6 +1761,7 @@ void GCMainDlg::setLooks()
+ 	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
+ 	if (!css.isEmpty()) {
+ 		setStyleSheet(css);
++		d->mle()->setCssString(css);
+ 	}
+ 	ui_.vsplitter->optionsChanged();
+ 	ui_.mle->optionsChanged();
+--- git.orig/src/htmltextcontroller.cpp
++++ git/src/htmltextcontroller.cpp
+@@ -0,0 +1,320 @@
++/*
++ * htmltextcontroller.cpp
++ * Copyright (C) 2010  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++#include "htmltextcontroller.h"
++#include <QMenu>
++#include <QFontDialog>
++#include <QColorDialog>
++
++class HTMLTextMenu : public QMenu
++{
++	Q_OBJECT
++public:
++	HTMLTextMenu(QWidget* parent = 0): QMenu(parent)
++	{
++		actBold = addAction(tr("Bold"));
++		actBold->setCheckable(true);
++		actBold->setData(QVariant(HTMLTextController::StateBold));
++
++		actItalic = addAction(tr("Italic"));
++		actItalic->setCheckable(true);
++		actItalic->setData(QVariant(HTMLTextController::StateItalic));
++
++		actUnderline = addAction(tr("Underline"));
++		actUnderline->setCheckable(true);
++		actUnderline->setData(QVariant(HTMLTextController::StateUnderline));
++
++		actStrikeOut = addAction(tr("Strike Out"));
++		actStrikeOut->setCheckable(true);
++		actStrikeOut->setData(QVariant(HTMLTextController::StateStrikeOut));
++
++		actTextColor = addAction(tr("Text Color"));
++		actTextColor->setCheckable(true);
++		actTextColor->setData(QVariant(HTMLTextController::StateTextColorChanged));
++
++		actBackgroundColor = addAction(tr("Background Color"));
++		actBackgroundColor->setCheckable(true);
++		actBackgroundColor->setData(QVariant(HTMLTextController::StateBackgroundColorChanged));
++
++		actText = addAction(tr("Font"));
++		actText->setCheckable(true);
++		actText->setData(QVariant(HTMLTextController::StateTextStyleChanged));
++
++		addSeparator();
++
++		actReset = addAction(tr("Reset"));
++		actReset->setData(QVariant(HTMLTextController::StateNone));
++	};
++
++	void setMenuState(QList<HTMLTextController::TextEditState> list)
++	{
++		foreach(HTMLTextController::TextEditState state, list) {
++			switch(state) {
++			case HTMLTextController::StateBold:
++				actBold->setChecked(true);
++				break;
++			case HTMLTextController::StateItalic:
++				actItalic->setChecked(true);
++				break;
++			case HTMLTextController::StateUnderline:
++				actUnderline->setChecked(true);
++				break;
++			case HTMLTextController::StateStrikeOut:
++				actStrikeOut->setChecked(true);
++				break;
++			case HTMLTextController::StateTextStyleChanged:
++				//actText->setChecked(true);
++				break;
++			case HTMLTextController::StateTextColorChanged:
++				actTextColor->setChecked(true);
++				break;
++			case HTMLTextController::StateBackgroundColorChanged:
++				actBackgroundColor->setChecked(true);
++				break;
++			default:
++				break;
++			}
++		}
++	};
++
++private:
++	QAction *actBold;
++	QAction *actUnderline;
++	QAction *actItalic;
++	QAction *actStrikeOut;
++	QAction *actText;
++	QAction *actTextColor;
++	QAction *actBackgroundColor;
++	QAction *actReset;
++
++};
++
++//----------------------------------------------------------------------------
++// HTMLTextController
++//----------------------------------------------------------------------------
++HTMLTextController::HTMLTextController(QTextEdit *parent)
++	: QObject()
++	, te_(parent)
++{
++	font_ = te_->font();
++	currentFont_ = font_;
++	background_ = te_->currentCharFormat().background();
++	currentBackground_ = background_;
++	foreground_ = te_->currentCharFormat().foreground();
++	currentForeground_ = foreground_;
++}
++
++void HTMLTextController::addState(TextEditState state)
++{
++	QTextCharFormat tcf;
++	switch(state) {
++	case StateBold:
++		tcf.setFontWeight(QFont::Bold);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateItalic:
++		tcf.setFontItalic(true);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateUnderline:
++		tcf.setFontUnderline(true);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateStrikeOut:
++		tcf.setFontStrikeOut(true);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateTextStyleChanged:
++		tcf.setFont(currentFont_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateTextColorChanged:
++		tcf.setForeground(currentForeground_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateBackgroundColorChanged:
++		tcf.setBackground(currentBackground_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateNone:
++		tcf.setFontWeight(QFont::Normal);
++		tcf.setFontItalic(false);
++		tcf.setFontUnderline(false);
++		tcf.setFontStrikeOut(false);
++		tcf.setFont(font_);
++		tcf.setBackground(background_);
++		tcf.setForeground(foreground_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++
++	default:
++		break;
++	}
++}
++
++void HTMLTextController::removeState(TextEditState state)
++{
++	QTextCharFormat tcf;
++	switch(state) {
++	case StateBold:
++		tcf.setFontWeight(QFont::Normal);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateItalic:
++		tcf.setFontItalic(false);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateUnderline:
++		tcf.setFontUnderline(false);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateStrikeOut:
++		tcf.setFontStrikeOut(false);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateTextStyleChanged:
++		tcf.setFont(font_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateTextColorChanged:
++		tcf.setForeground(foreground_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	case StateBackgroundColorChanged:
++		tcf.setBackground(background_);
++		te_->mergeCurrentCharFormat(tcf);
++		break;
++	default:
++		break;
++	}
++}
++
++QList<HTMLTextController::TextEditState>  HTMLTextController::state()
++{
++	QList<TextEditState> list;
++	const QTextCharFormat tcf = te_->textCursor().charFormat();
++	if(tcf.fontWeight() == QFont::Bold)
++		list.push_back(StateBold);
++	if(tcf.fontItalic())
++		list.push_back(StateItalic);
++	if(tcf.fontUnderline())
++		list.push_back(StateUnderline);
++	if(tcf.fontStrikeOut())
++		list.push_back(StateStrikeOut);
++	if(tcf.font() != font_)
++		list.push_back(StateTextStyleChanged);
++	if(tcf.background() != background_)
++		list.push_back(StateBackgroundColorChanged);
++	if(tcf.foreground() != foreground_)
++		list.push_back(StateTextColorChanged);
++
++	return list;
++}
++
++void HTMLTextController::doMenu()
++{
++	HTMLTextMenu *menu = new HTMLTextMenu();
++	menu->setMenuState(state());
++	if(!cssString_.isEmpty())
++		menu->setStyleSheet(cssString_);
++	QAction *act = menu->exec(QCursor::pos());
++	if(!act) {
++		delete menu;
++		return;
++	}
++	int data = act->data().toInt();
++	if(data == StateBold) {
++		if(act->isChecked())
++			addState(StateBold);
++		else
++			removeState(StateBold);
++	}
++	if(data == StateItalic) {
++		if(act->isChecked())
++			addState(StateItalic);
++		else
++			removeState(StateItalic);
++	}
++	else if(data == StateUnderline) {
++		if(act->isChecked())
++			addState(StateUnderline);
++		else
++			removeState(StateUnderline);
++	}
++	else if(data == StateStrikeOut) {
++		if(act->isChecked())
++			addState(StateStrikeOut);
++		else
++			removeState(StateStrikeOut);
++	}
++	else if(data == StateTextStyleChanged) {
++		if(act->isChecked()) {
++			bool ok;
++			QFont tmpFont = QFontDialog::getFont(&ok, font_);
++			if(ok) {
++				currentFont_ = tmpFont;
++				addState(StateTextStyleChanged);
++			}
++		}
++		else {
++			currentFont_ = font_;
++			removeState(StateTextStyleChanged);
++		}
++	}
++	else if(data == StateTextColorChanged) {
++		if(act->isChecked()) {
++			QColor color = QColorDialog::getColor(currentForeground_.color());
++			if(color.isValid()) {
++				currentForeground_ = QBrush(color);
++				addState(StateTextColorChanged);
++			}
++		}
++		else {
++			currentForeground_ = foreground_;
++			removeState(StateTextColorChanged);
++		}
++	}
++	else if(data == StateBackgroundColorChanged) {
++		if(act->isChecked()) {
++			QColor color = QColorDialog::getColor(currentBackground_.color());
++			if(color.isValid()) {
++				currentBackground_ = QBrush(color);
++				addState(StateBackgroundColorChanged);
++			}
++		}
++		else {
++			currentBackground_ = background_;
++			removeState(StateBackgroundColorChanged);
++		}
++	}
++	else if(data == StateNone)
++		addState(StateNone);
++
++	delete menu;
++	te_->window()->activateWindow();
++	te_->setFocus(Qt::MouseFocusReason);
++
++}
++
++void HTMLTextController::setFont(const QFont &f)
++{
++	font_ = f;
++}
++
++#include "htmltextcontroller.moc"
+--- git.orig/src/htmltextcontroller.h
++++ git/src/htmltextcontroller.h
+@@ -0,0 +1,58 @@
++/*
++ * htmltextcontroller.h
++ * Copyright (C) 2010  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++#ifndef HTMLTEXTCONTROLLER_H
++#define HTMLTEXTCONTROLLER_H
++
++#include  <QTextEdit>
++
++class HTMLTextController : public QObject
++{
++	Q_OBJECT
++public:
++	enum TextEditState {
++		StateNone = 0,
++		StateBold = 1,
++		StateItalic = 2,
++		StateUnderline = 4,
++		StateTextStyleChanged = 8,
++		StateTextColorChanged = 16,
++		StateBackgroundColorChanged = 32,
++		StateStrikeOut = 64
++	};
++
++	HTMLTextController(QTextEdit *parent);
++	void doMenu();
++	void setFont(const QFont &);
++	void setCssString(const QString& css) { cssString_ = css; };
++
++private:
++	void addState(TextEditState state);
++	void removeState(TextEditState state);
++	QList<TextEditState> state();
++	QString cssString_;
++
++private:
++	QTextEdit *te_;
++	QFont font_, currentFont_;
++	QBrush background_ ,currentBackground_;
++	QBrush foreground_, currentForeground_;
++};
++
++#endif // HTMLTEXTCONTROLLER_H
+--- git.orig/src/messageview.cpp
++++ git/src/messageview.cpp
+@@ -102,7 +102,12 @@ void MessageView::setPlainText(const QSt
+ void MessageView::setHtml(const QString &text)
+ {
+ 	if (_type == Message) {
+-		_emote = text.trimmed().startsWith(me_cmd);
++		QString str = TextUtil::rich2plain(text).trimmed();
++		_emote = str.startsWith(me_cmd);
++		if(_emote) {
++			setPlainText(str);
++			return;
++		}
+ 	}
+ 	_text = text;
+ }
+--- git.orig/src/msgmle.cpp
++++ git/src/msgmle.cpp
+@@ -37,6 +37,8 @@
+ #include "spellchecker/spellhighlighter.h"
+ #include "spellchecker/spellchecker.h"
+ #include "psioptions.h"
++#include "htmltextcontroller.h"
++
+ 
+ //----------------------------------------------------------------------------
+ // ChatEdit
+@@ -47,6 +49,8 @@ ChatEdit::ChatEdit(QWidget *parent)
+ 	, check_spelling_(false)
+ 	, spellhighlighter_(0)
+ {
++	controller_ = new HTMLTextController(this);
++
+ 	setWordWrapMode(QTextOption::WordWrap);
+ 	setAcceptRichText(false);
+ 
+@@ -68,6 +72,7 @@ ChatEdit::~ChatEdit()
+ {
+ 	clearMessageHistory();
+ 	delete spellhighlighter_;
++	delete controller_;
+ }
+ 
+ void ChatEdit::initActions()
+@@ -107,6 +112,12 @@ QSize ChatEdit::sizeHint() const
+ 	return minimumSizeHint();
+ }
+ 
++void ChatEdit::setFont(const QFont &f)
++{
++	QTextEdit::setFont(f);
++	controller_->setFont(f);
++}
++
+ bool ChatEdit::checkSpellingGloballyEnabled()
+ {
+ 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
+@@ -355,6 +366,47 @@ void ChatEdit::clearMessageHistory()
+ 	typedMsgsIndex = 0;
+ }
+ 
++XMPP::HTMLElement ChatEdit::toHTMLElement() {
++	XMPP::HTMLElement elem;
++	QString html = toHtml();
++	int index = html.indexOf("<body");
++	int lastIndex = html.lastIndexOf("</body>");
++	if(index == -1 || lastIndex == -1)
++		return elem;
++	lastIndex += 7;
++	html = html.mid(index, lastIndex-index);
++	QDomDocument doc;
++	if(!doc.setContent(html))
++		return elem;
++	QDomElement htmlElem = doc.firstChildElement("body");
++	QDomElement p = htmlElem.firstChildElement("p");
++	QDomElement body = doc.createElementNS("http://www.w3.org/1999/xhtml", "body");
++	bool foundSpan = false;
++	int paraCnt = 0;
++	while(!p.isNull()) {
++		p.setAttribute("style", "margin:0;padding:0;"); //p.removeAttribute("style");
++		body.appendChild(p.cloneNode(true).toElement());
++		if(!p.firstChildElement("span").isNull())
++			foundSpan = true;
++		p = p.nextSiblingElement("p");
++		++paraCnt;
++	}
++	if(foundSpan) {
++		if (paraCnt == 1)
++			body.firstChildElement("p").setTagName("span");
++		elem.setBody(body);
++	}
++	return elem;
++}
++
++void ChatEdit::doHTMLTextMenu() {
++	controller_->doMenu();
++}
++
++void ChatEdit::setCssString(const QString &css) {
++	controller_->setCssString(css);
++}
++
+ //----------------------------------------------------------------------------
+ // LineEdit
+ //----------------------------------------------------------------------------
+--- git.orig/src/msgmle.h
++++ git/src/msgmle.h
+@@ -23,6 +23,8 @@
+ 
+ #include <QTextEdit>
+ 
++#include "xmpp_htmlelement.h"
++
+ #define MAX_MESSAGE_HISTORY 50
+ 
+ class ChatEdit;
+@@ -31,6 +33,7 @@ class QKeyEvent;
+ class QResizeEvent;
+ class QTimer;
+ class SpellHighlighter;
++class HTMLTextController;
+ 
+ 
+ class ChatEdit : public QTextEdit
+@@ -45,13 +48,17 @@ public:
+ 
+ 	// reimplemented
+ 	QSize sizeHint() const;
++	void setFont(const QFont &);
+ 
+ 	static bool checkSpellingGloballyEnabled();
+ 	void setCheckSpelling(bool);
++	XMPP::HTMLElement toHTMLElement();
+ 
+ public slots:
+ 	void appendMessageHistory(const QString& text);
+ 	void clearMessageHistory();
++	void doHTMLTextMenu();
++	void setCssString(const QString& css);
+ 
+ protected slots:
+  	void applySuggestion();
+@@ -86,6 +93,7 @@ private:
+ 	QAction* act_showMessageFirst;
+ 	QAction* act_showMessageLast;
+ 	QString currentText;
++	HTMLTextController *controller_;
+ };
+ 
+ 
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -270,6 +270,7 @@ void PsiChatDlg::setLooks()
+ 	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
+ 	if (!css.isEmpty()) {
+ 		setStyleSheet(css);
++		chatEdit()->setCssString(css);
+ 	}
+ 	ui_.splitter->optionsChanged();
+ 	ui_.mle->optionsChanged();
+@@ -372,6 +373,9 @@ void PsiChatDlg::initToolButtons()
+ 	connect(act_find, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
+ // -- typeahead
+ 
++	act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
++	connect(act_html_text, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
++
+ 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
+ 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
+ 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
+@@ -413,6 +417,7 @@ void PsiChatDlg::initToolBar()
+ // typeahead find bar
+ 	ui_.toolbar->addAction(act_find);
+ // -- typeahead
++	ui_.toolbar->addAction(act_html_text);
+ 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+ 	ui_.toolbar->addAction(act_icon_);
+ 	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -85,6 +85,7 @@ private:
+ 	IconAction* act_find;
+ 	IconAction* act_ps_;
+ 	IconAction* act_templates_;
++	IconAction* act_html_text;
+ 	QAction *act_mini_cmd_, *act_minimize_;
+ 
+ 	MCmdManager mCmdManager_;
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -122,6 +122,7 @@ HEADERS += \
+ 	$$PWD/accountregdlg.h \
+ 	$$PWD/accountmodifydlg.h \
+ 	$$PWD/changepwdlg.h \
++	$$PWD/htmltextcontroller.h \
+ 	$$PWD/msgmle.h \
+ 	$$PWD/chatviewcommon.h \
+ 	$$PWD/chatview.h \
+@@ -267,6 +268,7 @@ SOURCES += \
+ 	$$PWD/accountregdlg.cpp \
+ 	$$PWD/accountmodifydlg.cpp \
+ 	$$PWD/changepwdlg.cpp \
++	$$PWD/htmltextcontroller.cpp \
+ 	$$PWD/msgmle.cpp \
+ 	$$PWD/chatviewcommon.cpp \
+ 	$$PWD/messageview.cpp \

psi-plus-main-20141106.tar.xz/patches/0710-psi-improve-adhoc-forms.diff Added

@@ -0,0 +1,825 @@
+--- git.temp.orig/src/registrationdlg.cpp
++++ git.temp/src/registrationdlg.cpp
+@@ -159,6 +159,7 @@ RegistrationDlg::RegistrationDlg(const J
+ 	QVBoxLayout *vb1 = new QVBoxLayout(this);
+ 	vb1->setMargin(4);
+ 	d->lb_top = new QLabel(this);
++	d->lb_top->setWordWrap(true);
+ 	d->lb_top->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+ 	d->lb_top->hide();
+ 	vb1->addWidget(d->lb_top);
+--- git.temp.orig/src/searchdlg.cpp
++++ git.temp/src/searchdlg.cpp
+@@ -160,6 +160,8 @@ public:
+ 	QList<QLineEdit*> le_field;
+ 	XDataWidget *xdata;
+ 	XData xdata_form;
++	QScrollArea *scrollArea;
++
+ };
+ 
+ SearchDlg::SearchDlg(const Jid &jid, PsiAccount *pa)
+@@ -174,6 +176,8 @@ SearchDlg::SearchDlg(const Jid &jid, Psi
+ 	d->pa->dialogRegister(this, d->jid);
+ 	d->jt = 0;
+ 	d->xdata = 0;
++	d->scrollArea = scrollArea;
++
+ 
+ 	setWindowTitle(windowTitle().arg(d->jid.full()));
+ 
+@@ -184,8 +188,8 @@ SearchDlg::SearchDlg(const Jid &jid, Psi
+ 
+ 	d->gr_form = new QWidget(gb_search);
+ 	d->gr_form_layout = new QGridLayout(d->gr_form);
+-	d->gr_form_layout->setSpacing(4);
+-	replaceWidget(lb_form, d->gr_form);
++	d->gr_form_layout->setSpacing(0);
++	d->scrollArea->setWidget(d->gr_form);
+ 	d->gr_form->hide();
+ 
+ 	pb_add->setEnabled(false);
+--- git.temp.orig/src/search.ui
++++ git.temp/src/search.ui
+@@ -1,308 +1,315 @@
+-<ui version="4.0" stdsetdef="1" >
+-  <author></author>
+-  <comment></comment>
+-  <exportmacro></exportmacro>
+-  <class>Search</class>
+-  <widget class="QWidget" name="Search" >
+-    <property name="geometry" >
+-      <rect>
+-        <x>0</x>
+-        <y>0</y>
+-        <width>568</width>
+-        <height>422</height>
+-      </rect>
+-    </property>
+-    <property name="windowTitle" >
+-      <string>Search: %1</string>
+-    </property>
+-    <layout class="QVBoxLayout" >
+-      <property name="margin" >
+-        <number>11</number>
+-      </property>
+-      <property name="spacing" >
+-        <number>6</number>
+-      </property>
+-      <item>
+-        <layout class="QHBoxLayout" >
+-          <property name="margin" >
+-            <number>0</number>
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>Search</class>
++ <widget class="QWidget" name="Search">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>780</width>
++    <height>480</height>
++   </rect>
++  </property>
++  <property name="minimumSize">
++   <size>
++    <width>640</width>
++    <height>480</height>
++   </size>
++  </property>
++  <property name="windowTitle">
++   <string>Search: %1</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="margin">
++    <number>5</number>
++   </property>
++   <item>
++    <layout class="QHBoxLayout">
++     <property name="margin">
++      <number>0</number>
++     </property>
++     <item>
++      <widget class="QGroupBox" name="gb_search">
++       <property name="minimumSize">
++        <size>
++         <width>280</width>
++         <height>0</height>
++        </size>
++       </property>
++       <property name="maximumSize">
++        <size>
++         <width>256</width>
++         <height>32767</height>
++        </size>
++       </property>
++       <property name="title">
++        <string>Search Fields</string>
++       </property>
++       <layout class="QVBoxLayout">
++        <property name="margin">
++         <number>1</number>
++        </property>
++        <item>
++         <layout class="QVBoxLayout">
++          <property name="margin">
++           <number>0</number>
+           </property>
+           <item>
+-            <widget class="QGroupBox" name="gb_search" >
+-              <property name="maximumSize" >
+-                <size>
+-                  <width>256</width>
+-                  <height>32767</height>
+-                </size>
+-              </property>
+-              <property name="title" >
+-                <string>Search Fields</string>
+-              </property>
+-              <layout class="QVBoxLayout" >
+-                <property name="margin" >
+-                  <number>11</number>
+-                </property>
+-                <property name="spacing" >
+-                  <number>6</number>
+-                </property>
+-                <item>
+-                  <layout class="QVBoxLayout" >
+-                    <property name="margin" >
+-                      <number>0</number>
+-                    </property>
+-                    <item>
+-                      <widget class="QLabel" name="lb_instructions" >
+-                        <property name="frameShape" >
+-                          <enum>QFrame::Panel</enum>
+-                        </property>
+-                        <property name="frameShadow" >
+-                          <enum>QFrame::Sunken</enum>
+-                        </property>
+-                        <property name="text" >
+-                          <string>Instructions go here.</string>
+-                        </property>
+-                        <property name="wordWrap" >
+-                          <bool>true</bool>
+-                        </property>
+-                      </widget>
+-                    </item>
+-                    <item>
+-                      <widget class="QLabel" name="lb_form" >
+-                        <property name="text" >
+-                          <string>form</string>
+-                        </property>
+-                      </widget>
+-                    </item>
+-                    <item>
+-                      <layout class="QHBoxLayout" >
+-                        <property name="margin" >
+-                          <number>0</number>
+-                        </property>
+-                        <item>
+-                          <widget class="IconButton" name="pb_search" >
+-                            <property name="text" >
+-                              <string>&amp;Search</string>
+-                            </property>
+-                            <property name="psiIconName" stdset="0" >
+-                              <string>psi/search</string>
+-                            </property>
+-                            <property name="default" >
+-                              <bool>true</bool>
+-                            </property>
+-                          </widget>
+-                        </item>
+-                        <item>
+-                          <spacer name="Spacer1" >
+-                            <property name="sizeHint" >
+-                              <size>
+-                                <width>30</width>
+-                                <height>16</height>
+-                              </size>
+-                            </property>
+-                            <property name="sizeType" >
+-                              <enum>Expanding</enum>
+-                            </property>
+-                            <property name="orientation" >
+-                              <enum>Horizontal</enum>
+-                            </property>
+-                          </spacer>
+-                        </item>
+-                        <item>
+-                          <widget class="IconButton" name="pb_stop" >
+-                            <property name="text" >
+-                              <string>&amp;Stop</string>
+-                            </property>
+-                            <property name="psiIconName" stdset="0" >
+-                              <string>psi/stop</string>
+-                            </property>
+-                          </widget>
+-                        </item>
+-                      </layout>
+-                    </item>
+-                  </layout>
+-                </item>
+-              </layout>
+-            </widget>
++           <widget class="QLabel" name="lb_instructions">
++            <property name="frameShape">
++             <enum>QFrame::StyledPanel</enum>
++            </property>
++            <property name="frameShadow">
++             <enum>QFrame::Sunken</enum>
++            </property>
++            <property name="text">
++             <string>Instructions go here.</string>
++            </property>
++            <property name="wordWrap">
++             <bool>true</bool>
++            </property>
++           </widget>
+           </item>
+           <item>
+-            <layout class="QVBoxLayout" >
+-              <property name="margin" >
+-                <number>0</number>
+-              </property>
+-              <item>
+-                <widget class="QTreeWidget" name="lv_results" >
+-                  <property name="alternatingRowColors" >
+-                    <bool>true</bool>
+-                  </property>
+-                  <property name="selectionMode" >
+-                    <enum>QAbstractItemView::ExtendedSelection</enum>
+-                  </property>
+-                  <property name="selectionBehavior" >
+-                    <enum>QAbstractItemView::SelectRows</enum>
+-                  </property>
+-                  <property name="indentation" >
+-                    <number>0</number>
+-                  </property>
+-                  <property name="uniformRowHeights" >
+-                    <bool>true</bool>
+-                  </property>
+-                  <property name="itemsExpandable" >
+-                    <bool>false</bool>
+-                  </property>
+-                  <property name="allColumnsShowFocus" >
+-                    <bool>true</bool>
+-                  </property>
+-                  <property name="sortingEnabled" >
+-                    <bool>true</bool>
+-                  </property>
+-                  <column>
+-                    <property name="text" >
+-                      <string>Nickname</string>
+-                    </property>
+-                    <property name="clickable" >
+-                      <bool>true</bool>
+-                    </property>
+-                    <property name="resizable" >
+-                      <bool>true</bool>
+-                    </property>
+-                  </column>
+-                  <column>
+-                    <property name="text" >
+-                      <string>First Name</string>
+-                    </property>
+-                    <property name="clickable" >
+-                      <bool>true</bool>
+-                    </property>
+-                    <property name="resizable" >
+-                      <bool>true</bool>
+-                    </property>
+-                  </column>
+-                  <column>
+-                    <property name="text" >
+-                      <string>Last Name</string>
+-                    </property>
+-                    <property name="clickable" >
+-                      <bool>true</bool>
+-                    </property>
+-                    <property name="resizable" >
+-                      <bool>true</bool>
+-                    </property>
+-                  </column>
+-                  <column>
+-                    <property name="text" >
+-                      <string>E-Mail Address</string>
+-                    </property>
+-                    <property name="clickable" >
+-                      <bool>true</bool>
+-                    </property>
+-                    <property name="resizable" >
+-                      <bool>true</bool>
+-                    </property>
+-                  </column>
+-                  <column>
+-                    <property name="text" >
+-                      <string>XMPP Address</string>
+-                    </property>
+-                    <property name="clickable" >
+-                      <bool>true</bool>
+-                    </property>
+-                    <property name="resizable" >
+-                      <bool>true</bool>
+-                    </property>
+-                  </column>
+-                </widget>
+-              </item>
+-              <item>
+-                <layout class="QHBoxLayout" >
+-                  <property name="margin" >
+-                    <number>0</number>
+-                  </property>
+-                  <item>
+-                    <spacer name="Spacer3" >
+-                      <property name="sizeHint" >
+-                        <size>
+-                          <width>222</width>
+-                          <height>16</height>
+-                        </size>
+-                      </property>
+-                      <property name="sizeType" >
+-                        <enum>Expanding</enum>
+-                      </property>
+-                      <property name="orientation" >
+-                        <enum>Horizontal</enum>
+-                      </property>
+-                    </spacer>
+-                  </item>
+-                  <item>
+-                    <widget class="IconButton" name="pb_add" >
+-                      <property name="text" >
+-                        <string>&amp;Add Contact</string>
+-                      </property>
+-                      <property name="psiIconName" stdset="0" >
+-                        <string>psi/addContact</string>
+-                      </property>
+-                    </widget>
+-                  </item>
+-                  <item>
+-                    <widget class="IconButton" name="pb_info" >
+-                      <property name="text" >
+-                        <string>User &amp;Info</string>
+-                      </property>
+-                      <property name="psiIconName" stdset="0" >
+-                        <string>psi/vCard</string>
+-                      </property>
+-                    </widget>
+-                  </item>
+-                </layout>
+-              </item>
+-            </layout>
+-          </item>
+-        </layout>
+-      </item>
+-      <item>
+-        <widget class="Line" name="line" >
+-          <property name="frameShape" >
+-            <enum>QFrame::HLine</enum>
+-          </property>
+-          <property name="frameShadow" >
+-            <enum>QFrame::Sunken</enum>
+-          </property>
+-        </widget>
+-      </item>
+-      <item>
+-        <layout class="QHBoxLayout" >
+-          <property name="margin" >
+-            <number>0</number>
+-          </property>
+-          <item>
+-            <widget class="BusyWidget" name="busy" />
++           <widget class="QScrollArea" name="scrollArea">
++            <property name="sizePolicy">
++             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
++              <horstretch>0</horstretch>
++              <verstretch>0</verstretch>
++             </sizepolicy>
++            </property>
++            <property name="horizontalScrollBarPolicy">
++             <enum>Qt::ScrollBarAlwaysOff</enum>
++            </property>
++            <property name="widgetResizable">
++             <bool>true</bool>
++            </property>
++            <widget class="QWidget" name="scrollAreaWidgetContents_2">
++             <property name="geometry">
++              <rect>
++               <x>0</x>
++               <y>0</y>
++               <width>270</width>
++               <height>363</height>
++              </rect>
++             </property>
++            </widget>
++           </widget>
+           </item>
+           <item>
+-            <spacer name="Spacer2" >
+-              <property name="sizeHint" >
+-                <size>
+-                  <width>485</width>
+-                  <height>16</height>
+-                </size>
++           <layout class="QHBoxLayout">
++            <property name="margin">
++             <number>0</number>
++            </property>
++            <item>
++             <widget class="IconButton" name="pb_search" native="true">
++              <property name="text" stdset="0">
++               <string>&amp;Search</string>
+               </property>
+-              <property name="sizeType" >
+-                <enum>Expanding</enum>
++              <property name="psiIconName" stdset="0">
++               <string>psi/search</string>
+               </property>
+-              <property name="orientation" >
+-                <enum>Horizontal</enum>
++              <property name="default" stdset="0">
++               <bool>true</bool>
+               </property>
+-            </spacer>
+-          </item>
+-          <item>
+-            <widget class="IconButton" name="pb_close" >
+-              <property name="text" >
+-                <string>&amp;Close</string>
++             </widget>
++            </item>
++            <item>
++             <spacer name="Spacer1">
++              <property name="orientation">
++               <enum>Qt::Horizontal</enum>
+               </property>
+-            </widget>
++              <property name="sizeType">
++               <enum>QSizePolicy::Expanding</enum>
++              </property>
++              <property name="sizeHint" stdset="0">
++               <size>
++                <width>30</width>
++                <height>16</height>
++               </size>
++              </property>
++             </spacer>
++            </item>
++            <item>
++             <widget class="IconButton" name="pb_stop" native="true">
++              <property name="text" stdset="0">
++               <string>&amp;Stop</string>
++              </property>
++              <property name="psiIconName" stdset="0">
++               <string>psi/stop</string>
++              </property>
++             </widget>
++            </item>
++           </layout>
+           </item>
++         </layout>
++        </item>
++       </layout>
++      </widget>
++     </item>
++     <item>
++      <layout class="QVBoxLayout">
++       <property name="margin">
++        <number>0</number>
++       </property>
++       <item>
++        <widget class="QTreeWidget" name="lv_results">
++         <property name="alternatingRowColors">
++          <bool>true</bool>
++         </property>
++         <property name="selectionMode">
++          <enum>QAbstractItemView::ExtendedSelection</enum>
++         </property>
++         <property name="selectionBehavior">
++          <enum>QAbstractItemView::SelectRows</enum>
++         </property>
++         <property name="indentation">
++          <number>0</number>
++         </property>
++         <property name="uniformRowHeights">
++          <bool>true</bool>
++         </property>
++         <property name="itemsExpandable">
++          <bool>false</bool>
++         </property>
++         <property name="sortingEnabled">
++          <bool>true</bool>
++         </property>
++         <property name="allColumnsShowFocus">
++          <bool>true</bool>
++         </property>
++         <column>
++          <property name="text">
++           <string>Nickname</string>
++          </property>
++         </column>
++         <column>
++          <property name="text">
++           <string>First Name</string>
++          </property>
++         </column>
++         <column>
++          <property name="text">
++           <string>Last Name</string>
++          </property>
++         </column>
++         <column>
++          <property name="text">
++           <string>E-Mail Address</string>
++          </property>
++         </column>
++         <column>
++          <property name="text">
++           <string>XMPP Address</string>
++          </property>
++         </column>
++        </widget>
++       </item>
++       <item>
++        <layout class="QHBoxLayout">
++         <property name="margin">
++          <number>0</number>
++         </property>
++         <item>
++          <spacer name="Spacer3">
++           <property name="orientation">
++            <enum>Qt::Horizontal</enum>
++           </property>
++           <property name="sizeType">
++            <enum>QSizePolicy::Expanding</enum>
++           </property>
++           <property name="sizeHint" stdset="0">
++            <size>
++             <width>222</width>
++             <height>16</height>
++            </size>
++           </property>
++          </spacer>
++         </item>
++         <item>
++          <widget class="IconButton" name="pb_add" native="true">
++           <property name="text" stdset="0">
++            <string>&amp;Add Contact</string>
++           </property>
++           <property name="psiIconName" stdset="0">
++            <string>psi/addContact</string>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="IconButton" name="pb_info" native="true">
++           <property name="text" stdset="0">
++            <string>User &amp;Info</string>
++           </property>
++           <property name="psiIconName" stdset="0">
++            <string>psi/vCard</string>
++           </property>
++          </widget>
++         </item>
+         </layout>
+-      </item>
++       </item>
++      </layout>
++     </item>
++    </layout>
++   </item>
++   <item>
++    <widget class="Line" name="line">
++     <property name="frameShape">
++      <enum>QFrame::HLine</enum>
++     </property>
++     <property name="frameShadow">
++      <enum>QFrame::Sunken</enum>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout">
++     <property name="margin">
++      <number>0</number>
++     </property>
++     <item>
++      <widget class="BusyWidget" name="busy" native="true"/>
++     </item>
++     <item>
++      <spacer name="Spacer2">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeType">
++        <enum>QSizePolicy::Expanding</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>485</width>
++         <height>16</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++     <item>
++      <widget class="IconButton" name="pb_close" native="true">
++       <property name="text" stdset="0">
++        <string>&amp;Close</string>
++       </property>
++      </widget>
++     </item>
+     </layout>
+-  </widget>
+-  <layoutdefault spacing="6" margin="11" />
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <customwidgets>
++  <customwidget>
++   <class>IconButton</class>
++   <extends>QWidget</extends>
++   <header>iconbutton.h</header>
++  </customwidget>
++  <customwidget>
++   <class>BusyWidget</class>
++   <extends>QWidget</extends>
++   <header>busywidget.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
+ </ui>
+--- git.temp.orig/src/xdata_widget.cpp
++++ git.temp/src/xdata_widget.cpp
+@@ -33,6 +33,7 @@
+ #include <QNetworkAccessManager>
+ #include <QNetworkRequest>
+ #include <QNetworkReply>
++#include <QSpacerItem>
+ 
+ #include "desktoputil.h"
+ #include "xmpp_xdata.h"
+@@ -148,12 +149,12 @@ public:
+ 		return _field;
+ 	}
+ 
+-	QString labelText() const
++	QString labelText(QString str=": ") const
+ 	{
+ 		QString text = _field.label();
+ 		if ( text.isEmpty() )
+ 			text = _field.var();
+-		return text + ": ";
++		return text + str;
+ 	}
+ 
+ 	QString reqText() const
+@@ -208,15 +209,21 @@ public:
+ 				checked = true;
+ 		}
+ 
+-		QLabel *label = new QLabel(labelText(), parent);
+-		grid->addWidget(label, row, 0);
++		QHBoxLayout *layout = new QHBoxLayout;
++		QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+ 
+ 		check = new QCheckBox(parent);
+ 		check->setChecked(checked);
+-		grid->addWidget(check, row, 1);
++		layout->addWidget(check);
++
++		QLabel *label = new QLabel(labelText(""), parent);
++		layout->addWidget(label);
++		layout->addSpacerItem(spacerItem);
++
++		grid->addLayout(layout, row, 0);
+ 
+ 		QLabel *req = new QLabel(reqText(), parent);
+-		grid->addWidget(req, row, 2);
++		grid->addWidget(req, row, 1);
+ 
+ 		if ( !f.desc().isEmpty() ) {
+ 			label->setToolTip(f.desc());
+@@ -256,8 +263,9 @@ public:
+ 			text += *it;
+ 		}
+ 
+-		QLabel *fixed = new QLabel("<qt>" + text + "</qt>", parent);
+-		grid->addWidget(fixed, row, 0, 2, 0);
++		QLabel *fixed = new QLabel("<qt>" + text + "<br/></qt>", parent);
++		fixed->setWordWrap(true);
++		grid->addWidget(fixed, row, 0);
+ 
+ 		if ( !f.desc().isEmpty() ) {
+ 			fixed->setToolTip(f.desc());
+@@ -294,16 +302,20 @@ public:
+ 		QString text;
+ 		if ( f.value().count() )
+ 			text = f.value().first();
++		QVBoxLayout *layout = new QVBoxLayout;
+ 
+ 		QLabel *label = new QLabel(labelText(), parent);
+-		grid->addWidget(label, row, 0);
++		label->setWordWrap(true);
++		layout->addWidget(label);
+ 
+ 		edit = new QLineEdit(parent);
+ 		edit->setText(text);
+-		grid->addWidget(edit, row, 1);
++		layout->addWidget(edit);
++
++		grid->addLayout(layout, row, 0);
+ 
+ 		QLabel *req = new QLabel(reqText(), parent);
+-		grid->addWidget(req, row, 2);
++		grid->addWidget(req, row, 1);
+ 
+ 		if ( !f.desc().isEmpty() ) {
+ 			label->setToolTip(f.desc());
+@@ -357,14 +369,19 @@ public:
+ 	XDataField_ListSingle(XData::Field f, QGridLayout *grid, QWidget *parent)
+ 	: XDataField(f, ((XDataWidget *)parent)->client())
+ 	{
++		QHBoxLayout *layout = new QHBoxLayout;
++
+ 		int row = grid->rowCount();
+ 		QLabel *label = new QLabel(labelText(), parent);
+-		grid->addWidget(label, row, 0);
++		label->setWordWrap(true);
++		layout->addWidget(label);
+ 
+ 		combo = new QComboBox(parent);
+-		grid->addWidget(combo, row, 1);
++		layout->addWidget(combo);
+ 		combo->setInsertPolicy(QComboBox::NoInsert);
+ 
++		grid->addLayout(layout, row, 0);
++
+ 		QString sel;
+ 		if ( !f.value().isEmpty() )
+ 			sel = f.value().first();
+@@ -382,7 +399,7 @@ public:
+ 		}
+ 
+ 		QLabel *req = new QLabel(reqText(), parent);
+-		grid->addWidget(req, row, 2);
++		grid->addWidget(req, row, 1);
+ 
+ 		if ( !f.desc().isEmpty() ) {
+ 			label->setToolTip(f.desc());
+@@ -425,6 +442,7 @@ public:
+ 	{
+ 		int row = grid->rowCount();
+ 		QLabel *label = new QLabel(labelText(), parent);
++		label->setWordWrap(true);
+ 		grid->addWidget(label, row, 0);
+ 
+ 		list = new QListWidget(parent);
+@@ -494,11 +512,14 @@ public:
+ 	: XDataField(f, ((XDataWidget *)parent)->client())
+ 	{
+ 		int row = grid->rowCount();
++		QHBoxLayout *layout = new QHBoxLayout;
++
+ 		QLabel *label = new QLabel(labelText(), parent);
+-		grid->addWidget(label, row, 0);
++		label->setWordWrap(true);
++		layout->addWidget(label);
+ 
+ 		edit = new QTextEdit(parent);
+-		grid->addWidget(edit, row, 1);
++		layout->addWidget(edit);
+ 
+ 		QString text;
+ 		QStringList val = f.value();
+@@ -510,8 +531,10 @@ public:
+ 		}
+ 		edit->setText(text);
+ 
++		grid->addLayout(layout, row, 0);
++
+ 		QLabel *req = new QLabel(reqText(), parent);
+-		grid->addWidget(req, row, 2);
++		grid->addWidget(req, row, 1);
+ 
+ 		if ( !f.desc().isEmpty() ) {
+ 			label->setToolTip(f.desc());
+@@ -554,6 +577,8 @@ XDataWidget::XDataWidget(QWidget *parent
+ {
+ 	owner_ = owner;
+ 	layout_ = new QVBoxLayout(this);
++	layout_->setContentsMargins(0,0,0,0);
++
+ }
+ 
+ XDataWidget::~XDataWidget()
+@@ -684,6 +709,7 @@ void XDataWidget::setFields(const XData:
+ 	if ( f.count() ) {
+ 		// FIXME
+ 		QGridLayout *grid = new QGridLayout(fields);
++		grid->setSpacing(3);
+ 
+ 		XData::FieldList::ConstIterator it = f.begin();
+ 		for ( ; it != f.end(); ++it) {

psi-plus-main-20141106.tar.xz/patches/0720-psi-change-password-dialog.diff Added

@@ -0,0 +1,307 @@
+--- git.orig/src/miniclient.cpp
++++ git/src/miniclient.cpp
+@@ -258,11 +258,12 @@ void MiniClient::cs_error(int err)
+ {
+ 	QString str;
+ 	bool reconn;
++	bool badPass;
+ 	bool disableAutoConnect;
+ 	bool isAuthError;
+ 	bool isTemporaryAuthFailure;
+ 
+-	PsiAccount::getErrorInfo(err, conn, stream, tlsHandler, &str, &reconn, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
++	PsiAccount::getErrorInfo(err, conn, stream, tlsHandler, &str, &reconn, &badPass, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
+ 	close();
+ 
+ 	QMessageBox::critical(0, tr("Server Error"), tr("There was an error communicating with the XMPP server.\nDetails: %1").arg(str));
+--- git.orig/src/passdialog.cpp
++++ git/src/passdialog.cpp
+@@ -0,0 +1,77 @@
++/*
++ * passdialog.cpp
++ * Copyright (C) 2009-2010 Virnik, 2011 Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include <QCheckBox>
++#include <QLabel>
++#include <QLayout>
++#include <QLineEdit>
++#include <QPushButton>
++#include <QHBoxLayout>
++#include <QVBoxLayout>
++
++#include "passdialog.h"
++
++
++PassDialog::PassDialog(const QString& jid, QWidget *parent)
++	: QDialog(parent)
++{
++	setWindowTitle(tr("Wrong Account Password"));
++
++	QVBoxLayout *mainLayout = new QVBoxLayout(this);
++	mainLayout->setMargin(6);
++	mainLayout->setSpacing(6);
++	QHBoxLayout *botLayout = new QHBoxLayout();
++
++	le_password = new QLineEdit();
++	le_password->setEchoMode(QLineEdit::Password);
++
++	cb_savePassword = new QCheckBox(tr("Save Password"));
++	botLayout->addWidget(cb_savePassword);
++	botLayout->addStretch(1);
++
++	QPushButton *pb_ok = new QPushButton(tr("OK"));
++	pb_ok->setDefault(true);
++	botLayout->addWidget(pb_ok);
++
++	QPushButton *pb_cancel = new QPushButton(tr("Cancel"));
++	botLayout->addWidget(pb_cancel);
++
++	mainLayout->addWidget(new QLabel(tr("Please enter your password for %1:").arg(jid)));
++	mainLayout->addWidget(le_password);
++	mainLayout->addLayout(botLayout);
++
++	connect(pb_cancel, SIGNAL(clicked()), this, SLOT(reject()));
++	connect(pb_ok, SIGNAL(clicked()), this, SLOT(accept()));
++}
++
++bool PassDialog::savePassword() const
++{
++	return cb_savePassword->isChecked();
++}
++
++void PassDialog::setSavePassword(bool save)
++{
++	cb_savePassword->setChecked(save);
++}
++
++QString PassDialog::password() const
++{
++	return le_password->text();
++}
+--- git.orig/src/passdialog.h
++++ git/src/passdialog.h
+@@ -0,0 +1,44 @@
++/*
++ * passdialog.cpp
++ * Copyright (C) 2009-2010 Virnik, 2011 Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef PASSDIALOG_H
++#define PASSDIALOG_H
++
++#include <QDialog>
++
++class QCheckBox;
++class QLineEdit;
++
++class PassDialog : public QDialog
++{
++	Q_OBJECT
++public:
++	PassDialog(const QString& jid = "", QWidget *parent = 0);
++
++	QString password() const;
++	bool savePassword() const;
++	void setSavePassword(bool save);
++
++private:
++	QCheckBox *cb_savePassword;
++	QLineEdit *le_password;
++};
++
++#endif
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -135,6 +135,7 @@
+ #include "rc.h"
+ #include "tabdlg.h"
+ #include "proxy.h"
++#include "passdialog.h"
+ #include "timeserver.h"
+ #include "bobfilecache.h"
+ #include "psicontactlist.h"
+@@ -1964,10 +1965,11 @@ void PsiAccount::cs_warning(int w)
+ 	}
+ }
+ 
+-void PsiAccount::getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure)
++void PsiAccount::getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_badPass, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure)
+ {
+ 	QString str;
+ 	bool reconn = false;
++	bool badPass = false;
+ 	bool disableAutoConnect = false;
+ 	bool isAuthError = false;
+ 	bool isTemporaryAuthFailure = false;
+@@ -2102,8 +2104,9 @@ void PsiAccount::getErrorInfo(int err, A
+ 		} else if(x == XMPP::ClientStream::MechTooWeak) {
+ 			s = tr("SASL mechanism too weak for this account");
+ 		} else if(x == XMPP::ClientStream::NotAuthorized) {
+-			s = tr("Not authorized");
+-			isAuthError = true;
++			s = tr("Wrong Password");
++			badPass = true;
++//			isAuthError = true;
+ 		} else if(x == XMPP::ClientStream::TemporaryAuthFailure) {
+ 			s = tr("Temporary auth failure");
+ 			isAuthError = true;
+@@ -2121,6 +2124,7 @@ void PsiAccount::getErrorInfo(int err, A
+ 	//printf("str[%s], reconn=%d\n", str.latin1(), reconn);
+ 	*_str = str;
+ 	*_reconn = reconn;
++	*_badPass = badPass;
+ 	*_disableAutoConnect = disableAutoConnect;
+ 	*_isAuthError = isAuthError;
+ 	*_isTemporaryAuthFailure = isTemporaryAuthFailure;
+@@ -2130,13 +2134,14 @@ void PsiAccount::cs_error(int err)
+ {
+ 	QString str;
+ 	bool reconn;
++	bool badPass;
+ 	bool isAuthError;
+ 	bool isTemporaryAuthFailure;
+ 
+ 	if (!isActive()) return; // all cleaned up already
+ 
+ 	bool disableAutoConnect;
+-	getErrorInfo(err, d->conn, d->stream, d->tlsHandler, &str, &reconn, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
++	getErrorInfo(err, d->conn, d->stream, d->tlsHandler, &str, &reconn, &badPass, &disableAutoConnect, &isAuthError, &isTemporaryAuthFailure);
+ 	if (err != RECONNECT_TIMEOUT_ERROR) {
+ 		d->currentConnectionError = str;
+ 		d->currentConnectionErrorCondition = -1;
+@@ -2178,7 +2183,7 @@ void PsiAccount::cs_error(int err)
+ 	presenceSent = false; // this stops the idle detector?? (FIXME)
+ 
+ 	// Auto-Reconnect?
+-	if(d->acc.opt_reconn && reconn) {
++	if(d->acc.opt_reconn && reconn && !badPass) {
+ 		isDisconnecting = false;
+ 		d->startReconnect();
+ 		return;
+@@ -2190,6 +2195,12 @@ void PsiAccount::cs_error(int err)
+ 	emit disconnected();
+ 	isDisconnecting = false;
+ 
++	//If a password failure, prompt for correct password
++	if (badPass) {
++			passwordPrompt();
++			return;
++	}
++
+ 	QString title;
+ 	if (d->psi->contactList()->enabledAccounts().count() > 1) {
+ 		title = QString("%1: ").arg(name());
+@@ -2886,21 +2897,13 @@ void PsiAccount::setStatus(const Status
+ 
+ 		// if client is not active then attempt to login
+ 		if(!isActive()) {
+-			Jid j = d->jid;
+-
+-			if(!j.isValid()) {
+-				QMessageBox::information(0, CAP(tr("Error")), tr("Unable to login.  Ensure your account information is filled out."));
+-				modify();
+-				return;
++			if (!d->acc.opt_pass && !d->acc.storeSaltedHashedPassword) {
++				passwordPrompt();
+ 			}
+-
+-			if(!d->acc.opt_pass && !d->acc.storeSaltedHashedPassword) {
+-				// will call back to us later
+-				new AccountLoginPassword(this);
+-			} else {
++			else
+ 				login();
+-			}
+ 		}
++
+ 		// change status
+ 		else {
+ 			if (!isConnected()) {
+@@ -2949,6 +2952,19 @@ int PsiAccount::defaultPriority(const XM
+ 	return d->acc.defaultPriority(s);
+ }
+ 
++void PsiAccount::passwordPrompt()
++{
++	PassDialog dialog(d->jid.full());
++	dialog.setSavePassword(d->acc.opt_pass);
++
++	if(dialog.exec() == QDialog::Accepted && !dialog.password().isEmpty()) {
++		d->acc.pass = dialog.password();
++		d->acc.opt_pass = dialog.savePassword();
++		login();
++	}
++}
++
++
+ void PsiAccount::setStatusDirect(const Status &_s, bool withPriority)
+ {
+ 	Status s = _s;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -251,7 +251,7 @@ public:
+ 	bool ensureKey(const Jid &);
+ 	void tryVerify(UserListItem *, UserResource *);
+ 
+-	static void getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure);
++	static void getErrorInfo(int err, AdvancedConnector *conn, Stream *stream, QCATLSHandler *tlsHandler, QString *_str, bool *_reconn, bool *_badPass, bool *_disableAutoConnect, bool *_isAuthError, bool *_isTemporaryAuthFailure);
+ 
+ 	void deleteQueueFile();
+ 	void sendFiles(const Jid&, const QStringList&, bool direct = false);
+@@ -513,6 +513,7 @@ private:
+ 	void processEncryptedMessageNext();
+ 	void processEncryptedMessageDone();
+ 	void verifyStatus(const Jid &j, const Status &s);
++	inline void passwordPrompt();
+ 	void sentInitialPresence();
+ 	void requestAvatarsForAllContacts();
+ 
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -187,6 +187,7 @@ HEADERS += \
+ 	$$PWD/pepmanager.h \
+ 	$$PWD/pubsubsubscription.h \
+ 	$$PWD/rc.h \
++	$$PWD/passdialog.h \
+ 	$$PWD/psihttpauthrequest.h \
+ 	$$PWD/httpauthmanager.h \
+ 	$$PWD/ahcommand.h \
+@@ -330,6 +331,7 @@ SOURCES += \
+ 	$$PWD/pepmanager.cpp \
+ 	$$PWD/pubsubsubscription.cpp \
+ 	$$PWD/rc.cpp \
++	$$PWD/passdialog.cpp \
+ 	$$PWD/httpauthmanager.cpp \
+ 	$$PWD/ahcommand.cpp \
+ 	$$PWD/ahcommandserver.cpp \

psi-plus-main-20141106.tar.xz/patches/0730-psi-add-bookmarks-to-join-conference-dlg.diff Added

@@ -0,0 +1,173 @@
+--- git.temp.orig/src/mucjoindlg.cpp
++++ git.temp/src/mucjoindlg.cpp
+@@ -29,6 +29,7 @@
+ #include "mucjoindlg.h"
+ #include "psicontactlist.h"
+ #include "groupchatdlg.h"
++#include "bookmarkmanager.h"
+ 
+ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
+ 	: QDialog(0)
+@@ -66,6 +67,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
+ 
+ 	setWindowTitle(CAP(windowTitle()));
+ 	connect(ui_.cb_recent, SIGNAL(activated(int)), SLOT(recent_activated(int)));
++	connect(ui_.cb_bookmarks, SIGNAL(activated(int)), SLOT(bookmarksActivated(int)));
+ 	if (!ui_.cb_recent->count()) {
+ 		ui_.cb_recent->setEnabled(false);
+ 		ui_.le_host->setFocus();
+@@ -73,6 +75,13 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
+ 	else {
+ 		recent_activated(0);
+ 	}
++	if (!ui_.cb_bookmarks->count()) {
++		ui_.cb_bookmarks->setEnabled(false);
++		ui_.le_host->setFocus();
++	}
++	else {
++		bookmarksActivated(0);
++	}
+ 
+ 	setWidgetsEnabled(true);
+ 	adjustSize();
+@@ -110,6 +119,8 @@ void MUCJoinDlg::updateIdentity(PsiAccou
+ 		return;
+ 	}
+ 
++	updateBookmarks(account_);
++
+ 	connect(account_, SIGNAL(disconnected()), this, SLOT(pa_disconnected()));
+ }
+ 
+@@ -138,6 +149,33 @@ void MUCJoinDlg::recent_activated(int x)
+ 	ui_.le_nick->setText(jid.resource());
+ }
+ 
++void MUCJoinDlg::bookmarksActivated(int x)
++{
++	Jid jid(ui_.cb_bookmarks->itemData(x).toString());
++	if (jid.full().isEmpty())
++		return;
++
++	ui_.le_host->setText(jid.domain());
++	ui_.le_room->setText(jid.node());
++	ui_.le_nick->setText(jid.resource());
++}
++
++void MUCJoinDlg::updateBookmarks(PsiAccount *pa)
++{
++	ui_.cb_bookmarks->clear();
++	if (pa && pa->bookmarkManager()->isAvailable()) {
++		ui_.cb_bookmarks->setEnabled(true);
++		foreach(ConferenceBookmark c, pa->bookmarkManager()->conferences()) {
++			Jid jid = c.jid().withResource(c.nick());
++			ui_.cb_bookmarks->addItem(JIDUtil::toString(jid, false));
++			ui_.cb_bookmarks->setItemData(ui_.cb_bookmarks->count()-1, QVariant(jid.full()));
++		}
++	}
++	else {
++		ui_.cb_bookmarks->setEnabled(false);
++	}
++}
++
+ void MUCJoinDlg::doJoin()
+ {
+ 	if (!account_ || !account_->checkConnected(this))
+@@ -191,6 +229,7 @@ void MUCJoinDlg::setWidgetsEnabled(bool
+ {
+ 	ui_.cb_ident->setEnabled(enabled);
+ 	ui_.cb_recent->setEnabled(enabled && ui_.cb_recent->count() > 0);
++	ui_.cb_bookmarks->setEnabled(enabled && ui_.cb_bookmarks->count() > 0);
+ 	ui_.gb_info->setEnabled(enabled);
+ 	joinButton_->setEnabled(enabled);
+ }
+--- git.temp.orig/src/mucjoindlg.h
++++ git.temp/src/mucjoindlg.h
+@@ -58,6 +58,8 @@ private slots:
+ 	void updateIdentityVisibility();
+ 	void pa_disconnected();
+ 	void recent_activated(int);
++	void bookmarksActivated(int);
++	void updateBookmarks(PsiAccount *pa);
+ 
+ private:
+ 	Ui::MUCJoin ui_;
+--- git.temp.orig/src/mucjoin.ui
++++ git.temp/src/mucjoin.ui
+@@ -27,7 +27,7 @@
+    <item row="0" column="1">
+     <widget class="AccountsComboBox" name="cb_ident"/>
+    </item>
+-   <item row="1" column="0">
++   <item row="2" column="0">
+     <widget class="QLabel" name="TextLabel1_2">
+      <property name="text">
+       <string>Recent:</string>
+@@ -37,7 +37,7 @@
+      </property>
+     </widget>
+    </item>
+-   <item row="1" column="1">
++   <item row="2" column="1">
+     <widget class="QComboBox" name="cb_recent">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+@@ -47,7 +47,7 @@
+      </property>
+     </widget>
+    </item>
+-   <item row="2" column="0" colspan="2">
++   <item row="4" column="0" colspan="2">
+     <widget class="QGroupBox" name="gb_info">
+      <property name="title">
+       <string>Room information</string>
+@@ -119,7 +119,7 @@
+      </layout>
+     </widget>
+    </item>
+-   <item row="3" column="0" colspan="2">
++   <item row="5" column="0" colspan="2">
+     <spacer>
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+@@ -135,7 +135,7 @@
+      </property>
+     </spacer>
+    </item>
+-   <item row="4" column="0" colspan="2">
++   <item row="6" column="0" colspan="2">
+     <widget class="Line" name="Line1">
+      <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+@@ -148,16 +148,29 @@
+      </property>
+     </widget>
+    </item>
+-   <item row="5" column="0">
++   <item row="7" column="0">
+     <widget class="BusyWidget" name="busy" native="true"/>
+    </item>
+-   <item row="5" column="1">
++   <item row="7" column="1">
+     <widget class="QDialogButtonBox" name="buttonBox">
+      <property name="standardButtons">
+       <set>QDialogButtonBox::Cancel</set>
+      </property>
+     </widget>
+    </item>
++   <item row="1" column="0">
++    <widget class="QLabel" name="label">
++     <property name="text">
++      <string>Bookmarks:</string>
++     </property>
++     <property name="alignment">
++      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
++     </property>
++    </widget>
++   </item>
++   <item row="1" column="1">
++    <widget class="QComboBox" name="cb_bookmarks"/>
++   </item>
+   </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11"/>

psi-plus-main-20141106.tar.xz/patches/0740-psi-add-contact-from-chat-dialog.diff Added

@@ -0,0 +1,215 @@
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -112,6 +112,7 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 	sendComposingEvents_ = false;
+ 	isComposing_ = false;
+ 	composingTimer_ = 0;
++	updateRealJid();
+ }
+ 
+ void ChatDlg::init()
+@@ -375,6 +376,7 @@ void ChatDlg::setJid(const Jid &j)
+ 	if (!j.compare(jid())) {
+ 		account()->dialogUnregister(this);
+ 		TabbableWidget::setJid(j);
++		updateRealJid();
+ 		account()->dialogRegister(this, jid());
+ 		updateContact(jid(), false);
+ 	}
+@@ -643,6 +645,16 @@ void ChatDlg::invalidateTab()
+ 	TabbableWidget::invalidateTab();
+ }
+ 
++void ChatDlg::updateRealJid()
++{
++	realJid_ = account()->realJid(jid());
++}
++
++Jid ChatDlg::realJid() const
++{
++	return realJid_;
++}
++
+ bool ChatDlg::isEncryptionEnabled() const
+ {
+ 	return false;
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -75,6 +75,7 @@ public:
+ public:
+ 	PsiAccount* account() const;
+ 	void setText(const QString& );
++	Jid realJid() const;
+ 
+ signals:
+ 	void aInfo(const Jid &);
+@@ -141,6 +142,7 @@ protected:
+ 	// reimplemented
+ 	virtual void invalidateTab();
+ 
++	void updateRealJid();
+ 	void resetComposing();
+ 	void doneSend();
+ 	virtual void setLooks();
+@@ -184,6 +186,7 @@ private:
+ 	int transid_;
+ 	Message m_;
+ 	bool lastWasEncrypted_;
++	Jid realJid_;
+ 
+ 	// Message Events & Chat States
+ 	QTimer* composingTimer_;
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3595,6 +3595,20 @@ void PsiAccount::itemPublished(const Jid
+ 	}*/
+ }
+ 
++Jid PsiAccount::realJid(const Jid &j) const
++{
++	GCContact *c = findGCContact(j);
++	if (c) {
++		if (c->status.hasMUCItem()) {
++			return c->status.mucItem().jid();
++		} else {
++			return Jid();
++		}
++	} else {
++		return j;
++	}
++}
++
+ QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
+ {
+ 	QList<UserListItem*> list;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -204,6 +204,7 @@ public:
+ 	void groupChatChangeNick(const QString &host, const QString &room, const QString& nick, const Status &);
+ 	void groupChatLeave(const QString &host, const QString &room);
+ 
++	Jid realJid(const Jid &j) const;
+ 	PsiContact* selfContact() const;
+ 	const QList<PsiContact*>& contactList() const;
+ 	int onlineContactsCount() const;
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -41,6 +41,7 @@
+ #include "capsmanager.h"
+ #include "psicontactlist.h"
+ #include "userlist.h"
++#include "psicontact.h"
+ #include "jidutil.h"
+ #include "xmpp_tasks.h"
+ #include "lastactivitytask.h"
+@@ -171,6 +172,9 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, P
+ 		: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_)
+ {
+ 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
++	connect(account(), SIGNAL(addedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
++	connect(account(), SIGNAL(removedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
++	connect(account(), SIGNAL(updateContact(const Jid &)), SLOT(updateContactAdding(const Jid &)));
+ 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
+ 	SendButtonTemplatesMenu* menu = getTemplateMenu();
+ 	if (menu) {
+@@ -309,6 +313,7 @@ void PsiChatDlg::setLooks()
+ 
+ 	updateIdentityVisibility();
+ 	updateCountVisibility();
++	updateContactAdding();
+ 
+ 	// toolbuttons
+ 	QIcon i;
+@@ -356,6 +361,26 @@ void PsiChatDlg::updateIdentityVisibilit
+ 	}
+ }
+ 
++void PsiChatDlg::updateContactAdding(PsiContact* c)
++{
++	if (!c || realJid().compare(c->jid(), false)) {
++		Jid rj = realJid();
++		UserListItem *uli;
++		if (rj.isNull() || ((uli = account()->findFirstRelevant(rj)) && (uli->inList() || uli->isSelf()))) {
++			act_add_contact->setVisible(false);
++		} else {
++			act_add_contact->setVisible(true);
++		}
++	}
++}
++
++void PsiChatDlg::updateContactAdding(const Jid &j)
++{
++	if (realJid().compare(j, false)) {
++		updateContactAdding();
++	}
++}
++
+ void PsiChatDlg::initToolButtons()
+ {
+ // typeahead find
+@@ -376,6 +401,9 @@ void PsiChatDlg::initToolButtons()
+ 	act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
+ 	connect(act_html_text, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
+ 
++	act_add_contact = new IconAction(tr("Add Contact To Roster"), "psi/addContact", tr("Add Contact"), 0, this);
++	connect(act_add_contact, SIGNAL(triggered()), SLOT(addContact()));
++
+ 	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
+ 	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
+ 	act_icon_->setMenu(account()->psi()->iconSelectPopup());
+@@ -433,6 +461,7 @@ void PsiChatDlg::initToolBar()
+ 	if (AvCallManager::isSupported()) {
+ 		ui_.toolbar->addAction(act_voice_);
+ 	}
++	ui_.toolbar->addAction(act_add_contact);
+ }
+ 
+ void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
+@@ -719,6 +748,14 @@ void PsiChatDlg::doMiniCmd()
+ 	mCmdManager_.open(new MCmdSimpleState(MCMDCHAT, tr("Command>")), QStringList() );
+ }
+ 
++void PsiChatDlg::addContact()
++{
++	Jid j(realJid());
++	UserListItem *uli = account()->findFirstRelevant(jid());
++	QString name = uli && !uli->name().isEmpty()? uli->name() : j.node();
++	account()->openAddUserDlg(j.withResource(""), name.isEmpty()?j.node():name, "");
++}
++
+ void PsiChatDlg::doMinimize()
+ {
+ 	window()->showMinimized();
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -12,6 +12,7 @@
+ #include "typeaheadfind.h"
+ 
+ class IconAction;
++class PsiContact;
+ 
+ class PsiChatDlg : public ChatDlg
+ {
+@@ -34,11 +35,14 @@ private slots:
+ 	void toggleSmallChat();
+ 	void doClearButton();
+ 	void doMiniCmd();
++	void addContact();
+ 	void doMinimize();
+ 	void buildMenu();
+ 	void updateCounter();
+ 	void updateIdentityVisibility();
+ 	void updateCountVisibility();
++	void updateContactAdding(PsiContact* c = 0);
++	void updateContactAdding(const Jid &j);
+ 
+ 	// reimplemented
+ 	void chatEditCreated();
+@@ -86,6 +90,7 @@ private:
+ 	IconAction* act_ps_;
+ 	IconAction* act_templates_;
+ 	IconAction* act_html_text;
++	IconAction* act_add_contact;
+ 	QAction *act_mini_cmd_, *act_minimize_;
+ 
+ 	MCmdManager mCmdManager_;

psi-plus-main-20141106.tar.xz/patches/0750-psi-tab-action-on-mouse-click.diff Added

@@ -0,0 +1,39 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -467,6 +467,8 @@ QLineEdit#le_status_text {
+ 				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
+ 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
+ 				<use-tabs type="bool">true</use-tabs>
++ 				<mouse-middle-button type="QString">close</mouse-middle-button>
++				<mouse-doubleclick-action type="QString">detach</mouse-doubleclick-action>
+ 				<size type="QString"></size> 
+ 				<grouping type="QString" comment="A ':' seperated list of groups of kinds of tabs to keep in the same tabset. 'C' for chat and 'M' for mucs. 'A' means using all in one window patch.">CM</grouping>
+ 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -449,12 +449,23 @@ void TabDlg::detachCurrentTab()
+ 
+ void TabDlg::mouseDoubleClickTab(QWidget* widget)
+ {
+-	if(userManagement_)
++	const QString act = PsiOptions::instance()->getOption("options.ui.tabs.mouse-doubleclick-action").toString();
++	if(act == "hide")
++		hideTab(static_cast<TabbableWidget*>(widget));
++	else if(act == "close")
++		closeTab(static_cast<TabbableWidget*>(widget));
++	else if(act == "detach" && userManagement_)
+ 		detachTab(static_cast<TabbableWidget*>(widget));
+ }
+ 
+ void TabDlg::mouseMiddleClickTab(QWidget* widget) {
+-	closeTab(static_cast<TabbableWidget*>(widget));
++	const QString act = PsiOptions::instance()->getOption("options.ui.tabs.mouse-middle-button").toString();
++	if(act == "hide")
++		hideTab(static_cast<TabbableWidget*>(widget));
++	else if(act == "close")
++		closeTab(static_cast<TabbableWidget*>(widget));
++	else if(act == "detach" && userManagement_)
++		detachTab(static_cast<TabbableWidget*>(widget));
+ }
+ 
+ void TabDlg::detachTab(TabbableWidget* tab)

psi-plus-main-20141106.tar.xz/patches/0760-psi-block-contact-from-menu.diff Added

@@ -0,0 +1,760 @@
+--- git.orig/src/contactlistmodel.cpp
++++ git/src/contactlistmodel.cpp
+@@ -561,6 +561,9 @@ QVariant ContactListModel::contactData(c
+ 	else if (role == MucMessagesRole) {
+ 		return QVariant(contact->userListItem().pending());
+ 	}
++	else if (role == BlockRole) {
++		return QVariant(contact->isBlocked());
++	}
+ #ifdef YAPSI
+ 	else if (role == Qt::ForegroundRole) {
+ 		return QVariant(Ya::statusColor(contact->status().type()));
+--- git.orig/src/contactlistmodel.h
++++ git/src/contactlistmodel.h
+@@ -86,6 +86,7 @@ public:
+ 		AvatarRole = Qt::UserRole + 28,
+ 		IsMucRole = Qt::UserRole + 29,
+ 		MucMessagesRole = Qt::UserRole + 30,
++		BlockRole = Qt::UserRole + 31,
+ 
+ 		// groups
+ 		ExpandedRole = Qt::UserRole + 12,
+--- git.orig/src/privacy/privacydlg.cpp
++++ git/src/privacy/privacydlg.cpp
+@@ -48,11 +48,11 @@ PrivacyDlg::PrivacyDlg(const QString& ac
+ 	connect(ui_.cb_default,SIGNAL(activated(int)),SLOT(default_selected(int)));
+ 	connect(ui_.cb_lists,SIGNAL(activated(int)),SLOT(list_selected(int)));
+ 	connect(ui_.cb_lists,SIGNAL(currentIndexChanged(int)),SLOT(list_changed(int)));
+-	connect(manager_,SIGNAL(changeActiveList_success()),SLOT(change_succeeded()));
++	connect(manager_,SIGNAL(changeActiveList_success(QString)),SLOT(changeActiveList_succeeded(QString)));
+ 	connect(manager_,SIGNAL(changeActiveList_error()),SLOT(change_failed()));
+-	connect(manager_,SIGNAL(changeDefaultList_success()),SLOT(change_succeeded()));
++	connect(manager_,SIGNAL(changeDefaultList_success(QString)),SLOT(changeDefaultList_succeeded(QString)));
+ 	connect(manager_,SIGNAL(changeDefaultList_error()),SLOT(change_failed()));
+-	connect(manager_,SIGNAL(changeList_success()),SLOT(changeList_succeeded()));
++	connect(manager_,SIGNAL(changeList_success(QString)),SLOT(changeList_succeeded(QString)));
+ 	connect(manager_,SIGNAL(changeList_error()),SLOT(changeList_failed()));
+ 
+ 	connect(ui_.pb_newList,SIGNAL(clicked()),SLOT(newList()));
+@@ -252,8 +252,29 @@ void PrivacyDlg::list_failed()
+ 	setWidgetsEnabled(true);
+ }
+ 
+-void PrivacyDlg::changeList_succeeded()
++void PrivacyDlg::changeActiveList_succeeded(QString name)
+ {
++	if(!name.isEmpty() && ui_.cb_active->findText(name) == -1) {
++		ui_.cb_active->addItem(name);
++		ui_.cb_active->setCurrentIndex(ui_.cb_active->findText(name));
++	}
++	change_succeeded();
++}
++
++void PrivacyDlg::changeDefaultList_succeeded(QString name)
++{
++	if(!name.isEmpty() && ui_.cb_default->findText(name) == -1) {
++		ui_.cb_default->addItem(name);
++		ui_.cb_default->setCurrentIndex(ui_.cb_default->findText(name));
++	}
++	change_succeeded();
++}
++
++void PrivacyDlg::changeList_succeeded(QString name)
++{
++	if(!name.isEmpty() && ui_.cb_lists->findText(name) == -1) {
++		ui_.cb_lists->addItem(name);
++	}
+ 	// If we just deleted a list, select the first list
+ 	if (model_.list().isEmpty()) {
+ 		ui_.cb_lists->setCurrentIndex(0);
+--- git.orig/src/privacy/privacydlg.h
++++ git/src/privacy/privacydlg.h
+@@ -55,9 +55,11 @@ protected slots:
+ 	void list_selected(int i);
+ 	void list_changed(int);
+ 	void list_failed();
+-	void changeList_succeeded();
++	void changeList_succeeded(QString);
+ 	void changeList_failed();
+ 	void change_succeeded();
++	void changeActiveList_succeeded(QString);
++	void changeDefaultList_succeeded(QString);
+ 	void change_failed();
+ 	void close();
+ 	void addRule();
+--- git.orig/src/privacy/privacylist.cpp
++++ git/src/privacy/privacylist.cpp
+@@ -51,6 +51,12 @@ void PrivacyList::insertItem(int index,
+ 	reNumber();
+ }
+ 
++void PrivacyList::appendItem(const PrivacyListItem& item)
++{
++	insertItem(items_.count(), item);
++}
++
++
+ void PrivacyList::reNumber()
+ {
+ 	unsigned int order = 100;
+--- git.orig/src/privacy/privacylist.h
++++ git/src/privacy/privacylist.h
+@@ -43,6 +43,7 @@ public:
+ 	const PrivacyListItem& item(int index) const { return items_.at(index); }
+ 	void removeItem(int index) { items_.removeAt(index); }
+ 	void insertItem(int index, const PrivacyListItem& item);
++	void appendItem(const PrivacyListItem& item);
+ 	bool moveItemUp(int index);
+ 	bool moveItemDown(int index);
+ 	bool onlyBlockItems() const;
+--- git.orig/src/privacy/privacymanager.h
++++ git/src/privacy/privacymanager.h
+@@ -40,11 +40,11 @@ public:
+ 	virtual void requestList(const QString& name) = 0;
+ 
+ signals:
+-	void changeDefaultList_success();
++	void changeDefaultList_success(QString);
+ 	void changeDefaultList_error();
+-	void changeActiveList_success();
++	void changeActiveList_success(QString);
+ 	void changeActiveList_error();
+-	void changeList_success();
++	void changeList_success(QString);
+ 	void changeList_error();
+ 	void defaultListAvailable(const PrivacyList&);
+ 	void defaultListError();
+--- git.orig/src/privacy/psiprivacymanager.cpp
++++ git/src/privacy/psiprivacymanager.cpp
+@@ -23,12 +23,30 @@
+ #include "xmpp_xmlcommon.h"
+ #include "xmpp_task.h"
+ #include "xmpp_jid.h"
++#include "xmpp_tasks.h"
++#include "userlist.h"
+ #include "psiprivacymanager.h"
+ #include "privacymanager.h"
+ #include "privacylist.h"
++#include "psicon.h"
++#include "contactupdatesmanager.h"
++#include "psiaccount.h"
+ 
+ #define PRIVACY_NS "jabber:iq:privacy"
+ 
++static const QString BLOCKED_LIST_NAME = "blocked";
++
++static XMPP::Jid processJid(const XMPP::Jid& jid)
++{
++	return jid.withResource("");
++}
++
++static bool privacyListItemForJid(const PrivacyListItem& item, const Jid& jid)
++{
++	return item.type() == PrivacyListItem::JidType &&
++	       processJid(item.value()) == processJid(jid);
++}
++
+ using namespace XMPP;
+ 
+ // -----------------------------------------------------------------------------
+@@ -46,8 +64,11 @@ public:
+ 			return false;
+ 
+ 		QString ns = queryNS(e);
+-		if(ns == "jabber:iq:privacy") {
+-			// TODO: Do something with update
++		if (ns == PRIVACY_NS) {
++			QDomElement listTag = queryTag(e).firstChildElement("list");
++			if (!listTag.isNull()) {
++				emit privacyListChanged(listTag.attribute("name"));
++			}
+ 
+ 			// Confirm receipt
+ 			QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
+@@ -57,6 +78,9 @@ public:
+ 
+ 		return false;
+ 	}
++
++signals:
++	void privacyListChanged(const QString& name);
+ };
+ 
+ // -----------------------------------------------------------------------------
+@@ -205,6 +229,9 @@ public:
+ 		}
+ 		return true;
+ 	}
++	QString name() {
++		return list_.name();
++	}
+ };
+ 
+ class GetPrivacyListTask : public Task
+@@ -261,14 +288,38 @@ public:
+ 
+ // -----------------------------------------------------------------------------
+ 
+-PsiPrivacyManager::PsiPrivacyManager(XMPP::Task* rootTask) : rootTask_(rootTask), getDefault_waiting_(false), block_waiting_(false)
+-{
+-   listener_ = new PrivacyListListener(rootTask_);
++PsiPrivacyManager::PsiPrivacyManager(PsiAccount* account, XMPP::Task* rootTask) : rootTask_(rootTask), getDefault_waiting_(false), block_waiting_(false)
++		, account_(account)
++		, accountAvailable_(false)
++		, isAvailable_(false)
++{
++	blockedListName_ = BLOCKED_LIST_NAME;
++	listener_ = new PrivacyListListener(rootTask_);
++	connect(listener_, SIGNAL(privacyListChanged(const QString&)), SLOT(privacyListChanged(const QString&)));
++
++	connect(account, SIGNAL(updatedActivity()), SLOT(accountStateChanged()));
++
++	connect(this, SIGNAL(listReceived(const PrivacyList&)), SLOT(newListReceived(const PrivacyList&)));
++	connect(this, SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)), SLOT(newListsReceived(const QString&, const QString&, const QStringList&)));
++	connect(this, SIGNAL(listsError()), SLOT(newListsError()));
++
++	connect(this, SIGNAL(changeDefaultList_success(QString)), SLOT(newChangeDefaultList_success()));
++	connect(this, SIGNAL(changeDefaultList_error()), SLOT(newChangeDefaultList_error()));
++	connect(this, SIGNAL(changeActiveList_success(QString)), SLOT(newChangeActiveList_success()));
++	connect(this, SIGNAL(changeActiveList_error()), SLOT(newChangeActiveList_error()));
+ }
+ 
+ PsiPrivacyManager::~PsiPrivacyManager()
+ {
+ 	delete listener_;
++
++	qDeleteAll(lists_);
++}
++
++void PsiPrivacyManager::privacyListChanged(const QString& name)
++{
++	if (!name.isEmpty())
++		requestList(name);
+ }
+ 
+ void PsiPrivacyManager::requestListNames()
+@@ -378,7 +429,7 @@ void PsiPrivacyManager::changeDefaultLis
+ 	}
+ 
+ 	if (t->success()) {
+-		emit changeDefaultList_success();
++		emit changeDefaultList_success(t->name());
+ 	}
+ 	else {
+ 		emit changeDefaultList_error();
+@@ -387,6 +438,7 @@ void PsiPrivacyManager::changeDefaultLis
+ 
+ void PsiPrivacyManager::changeActiveList(const QString& name)
+ {
++	tmpActiveListName_ = name;
+ 	SetPrivacyListsTask* t = new SetPrivacyListsTask(rootTask_);
+ 	t->setActive(name);
+ 	connect(t,SIGNAL(finished()),SLOT(changeActiveList_finished()));
+@@ -402,7 +454,8 @@ void PsiPrivacyManager::changeActiveList
+ 	}
+ 
+ 	if (t->success()) {
+-		emit changeActiveList_success();
++		blockedListName_ = tmpActiveListName_ .isEmpty() ? BLOCKED_LIST_NAME : tmpActiveListName_ ;
++		emit changeActiveList_success(t->name());
+ 	}
+ 	else {
+ 		emit changeActiveList_error();
+@@ -426,7 +479,7 @@ void PsiPrivacyManager::changeList_finis
+ 	}
+ 
+ 	if (t->success()) {
+-		emit changeList_success();
++		emit changeList_success(t->name());
+ 	}
+ 	else {
+ 		emit changeList_error();
+@@ -467,4 +520,229 @@ void PsiPrivacyManager::receiveList()
+ 	}
+ }
+ 
++
++bool PsiPrivacyManager::isAvailable() const
++{
++	return isAvailable_;
++}
++
++void PsiPrivacyManager::setIsAvailable(bool available)
++{
++	if (available != isAvailable_) {
++		isAvailable_ = available;
++		emit availabilityChanged();
++	}
++}
++
++void PsiPrivacyManager::accountStateChanged()
++{
++	if (!account_->isAvailable()) {
++		setIsAvailable(false);
++	}
++
++	if (account_->isAvailable() && !accountAvailable_) {
++		requestListNames();
++	}
++
++	accountAvailable_ = account_->isAvailable();
++}
++
++static QStringList findDifferences(QStringList previous, QStringList current)
++{
++	QStringList result;
++	foreach(QString i, previous) {
++		if (!current.contains(i))
++			result += i;
++	}
++	return result;
++}
++
++void PsiPrivacyManager::newListReceived(const PrivacyList& list)
++{
++	QStringList previouslyBlockedContacts = blockedContacts();
++
++	if (lists_.contains(list.name()))
++		*lists_[list.name()] = list;
++	else
++		lists_[list.name()] = new PrivacyList(list);
++
++	if (list.name() == blockedListName_)
++		invalidateBlockedListCache();
++
++	QStringList currentlyBlockedContacts = blockedContacts();
++	QStringList updatedContacts;
++	updatedContacts += findDifferences(previouslyBlockedContacts, currentlyBlockedContacts);
++	updatedContacts += findDifferences(currentlyBlockedContacts, previouslyBlockedContacts);
++
++	foreach(QString contact, updatedContacts) {
++		//emit simulateContactOffline(contact);
++
++		if (!isContactBlocked(contact)) {
++			if (isAuthorized(contact)) {
++				JT_Presence* p = new JT_Presence(account_->client()->rootTask());
++				p->pres(processJid(contact), account_->status());
++				p->go(true);
++			}
++
++			{
++				JT_Presence* p = new JT_Presence(account_->client()->rootTask());
++				p->probe(processJid(contact));
++				p->go(true);
++			}
++		}
++	}
++
++	emit listChanged(updatedContacts);
++}
++
++void PsiPrivacyManager::newListsReceived(const QString& defaultList, const QString& activeList, const QStringList& lists)
++{
++	if(!activeList.isEmpty())
++		blockedListName_ = activeList;
++
++	if (!lists.contains(blockedListName_))
++		createBlockedList();
++	else
++		requestList(blockedListName_);
++
++	if (defaultList.isEmpty())
++		changeDefaultList(blockedListName_);
++
++	if(activeList.isEmpty())
++		changeActiveList(blockedListName_);
++
++	setIsAvailable(true);
++}
++
++void PsiPrivacyManager::newListsError()
++{
++	setIsAvailable(false);
++}
++
++void PsiPrivacyManager::newChangeDefaultList_success()
++{
++}
++
++void PsiPrivacyManager::newChangeDefaultList_error()
++{
++	qWarning("YaPrivacyManager::changeDefaultList_error()");
++}
++
++void PsiPrivacyManager::newChangeActiveList_success()
++{
++}
++
++void PsiPrivacyManager::newChangeActiveList_error()
++{
++	qWarning("YaPrivacyManager::changeActiveList_error()");
++}
++
++void PsiPrivacyManager::createBlockedList()
++{
++	PrivacyList list(blockedListName_);
++	PrivacyListItem allowAll;
++	allowAll.setType(PrivacyListItem::FallthroughType);
++	allowAll.setAction(PrivacyListItem::Allow);
++	allowAll.setAll();
++
++	list.insertItem(0, allowAll);
++	changeList(list);
++}
++
++PrivacyList* PsiPrivacyManager::blockedList() const
++{
++	if(lists_.contains(blockedListName_))
++		return lists_[blockedListName_];
++
++	return 0;
++}
++
++QStringList PsiPrivacyManager::blockedContacts() const
++{
++	QStringList result;
++	if (blockedList()) {
++		foreach(PrivacyListItem item, blockedList()->items()) {
++			if (item.type() == PrivacyListItem::JidType &&
++			    item.action() == PrivacyListItem::Deny) {
++				result << processJid(item.value()).full();
++			}
++		}
++	}
++	return result;
++}
++
++void PsiPrivacyManager::invalidateBlockedListCache()
++{
++	isBlocked_.clear();
++
++	if (!blockedList())
++		return;
++
++	foreach(PrivacyListItem item, blockedList()->items()) {
++		if (item.type() == PrivacyListItem::JidType &&
++		    item.action() == PrivacyListItem::Deny) {
++			isBlocked_[processJid(item.value()).full()] = true;
++		}
++	}
++}
++
++bool PsiPrivacyManager::isContactBlocked(const XMPP::Jid& jid) const
++{
++	return isBlocked_.contains(processJid(jid).full());
++}
++
++PrivacyListItem PsiPrivacyManager::blockItemFor(const XMPP::Jid& jid) const
++{
++	PrivacyListItem item;
++	item.setType(PrivacyListItem::JidType);
++	item.setValue(processJid(jid).full());
++	item.setAction(PrivacyListItem::Deny);
++	item.setAll();
++	return item;
++}
++
++void PsiPrivacyManager::setContactBlocked(const XMPP::Jid& jid, bool blocked)
++{
++	if (blocked) {
++		account_->psi()->contactUpdatesManager()->contactBlocked(account_, jid);
++	}
++
++	if(!blockedList()) {
++		createBlockedList();
++		return;
++	}
++
++	if (isContactBlocked(jid) == blocked)
++		return;
++
++	if (blocked && isAuthorized(jid)) {
++		JT_Presence* p = new JT_Presence(account_->client()->rootTask());
++		p->pres(processJid(jid), account_->loggedOutStatus());
++		p->go(true);
++	}
++
++	PrivacyList newList(*blockedList());
++	newList.clear();
++
++	foreach(PrivacyListItem item, blockedList()->items()) {
++		if (privacyListItemForJid(item, jid))
++			continue;
++
++		newList.appendItem(item);
++	}
++
++	if (blocked)
++		newList.insertItem(0, blockItemFor(jid));
++
++	changeList(newList);
++}
++
++bool PsiPrivacyManager::isAuthorized(const XMPP::Jid& jid) const
++{
++	UserListItem* u = account_->findFirstRelevant(processJid(jid));
++	return u && (u->subscription().type() == Subscription::Both ||
++		     u->subscription().type() == Subscription::From);
++}
++
++
+ #include "psiprivacymanager.moc"
+--- git.orig/src/privacy/psiprivacymanager.h
++++ git/src/privacy/psiprivacymanager.h
+@@ -23,11 +23,16 @@
+ 
+ #include <QObject>
+ #include <QStringList>
++#include <QHash>
+ 
+ #include "privacymanager.h"
+ 
++#include "xmpp_jid.h"
++
+ class QString;
++class PsiAccount;
+ class PrivacyList;
++class PrivacyListItem;
+ class PrivacyListListener;
+ namespace XMPP {
+ 	class Task;
+@@ -39,7 +44,7 @@ class PsiPrivacyManager : public Privacy
+ 	Q_OBJECT
+ 
+ public:
+-	PsiPrivacyManager(XMPP::Task* rootTask);
++	PsiPrivacyManager(PsiAccount* account, XMPP::Task* rootTask);
+ 	virtual ~PsiPrivacyManager();
+ 
+ 	void requestListNames();
+@@ -80,6 +85,52 @@ private:
+ 
+ 	QStringList block_targets_;
+ 	bool block_waiting_;
++
++public:
++	bool isAvailable() const;
++
++	bool isContactBlocked(const XMPP::Jid& jid) const;
++	void setContactBlocked(const XMPP::Jid& jid, bool blocked);
++
++signals:
++	void availabilityChanged();
++	void listChanged(const QStringList& contacts);
++
++	//void simulateContactOffline(const XMPP::Jid& contact);
++
++private slots:
++	void newListReceived(const PrivacyList& p);
++	void newListsReceived(const QString& defaultList, const QString& activeList, const QStringList& lists);
++	void newListsError();
++
++	void accountStateChanged();
++
++	void newChangeDefaultList_success();
++	void newChangeDefaultList_error();
++	void newChangeActiveList_success();
++	void newChangeActiveList_error();
++
++private slots:
++	void privacyListChanged(const QString& name);
++
++private:
++	PsiAccount* account_;
++	bool accountAvailable_;
++	bool isAvailable_;
++	QHash<QString, PrivacyList*> lists_;
++	QHash<QString, bool> isBlocked_;
++
++	void invalidateBlockedListCache();
++	void setIsAvailable(bool available);
++
++	void createBlockedList();
++	PrivacyList* blockedList() const;
++	PrivacyListItem blockItemFor(const XMPP::Jid& jid) const;
++
++	QStringList blockedContacts() const;
++
++	QString blockedListName_, tmpActiveListName_;
++	bool isAuthorized(const XMPP::Jid& jid) const;
+ };
+ 
+ #endif
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -1107,7 +1107,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	connect(d->client, SIGNAL(xmlOutgoing(const QString &)), d, SLOT(client_xmlOutgoing(const QString &)));
+ 
+ 	// Privacy manager
+-	d->privacyManager = new PsiPrivacyManager(d->client->rootTask());
++	d->privacyManager = new PsiPrivacyManager(d->account, d->client->rootTask());
+ 
+ 	// Caps manager
+ 	d->capsManager = new CapsManager(d->client->jid(), capsRegistry, new IrisProtocol::DiscoInfoQuerier(d->client));
+--- git.orig/src/psicontact.cpp
++++ git/src/psicontact.cpp
+@@ -44,6 +44,8 @@
+ #include "yacommon.h"
+ #include "yaprofile.h"
+ #include "yatoastercentral.h"
++#else
++#include "psiprivacymanager.h"
+ #endif
+ #include "contactlistgroup.h"
+ #include "desktoputil.h"
+@@ -680,6 +682,10 @@ void PsiContact::toggleBlockedStateConfi
+ 
+ 	bool blocked = privacyManager->isContactBlocked(jid());
+ 	blockContactConfirmationHelper(!blocked);
++#else
++	PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
++	bool blocked = privacyManager->isContactBlocked(jid());
++	blockContactConfirmationHelper(!blocked);
+ #endif
+ }
+ 
+@@ -694,8 +700,8 @@ void PsiContact::blockContactConfirmatio
+ 
+ 	privacyManager->setContactBlocked(jid(), block);
+ #else
+-	// FIXME
+-	Q_UNUSED(block);
++	PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
++	privacyManager->setContactBlocked(jid(), block);
+ #endif
+ }
+ 
+@@ -837,6 +843,10 @@ void PsiContact::addRemoveAuthBlockAvail
+ 		YaPrivacyManager* privacyManager = dynamic_cast<YaPrivacyManager*>(account()->privacyManager());
+ 		Q_ASSERT(privacyManager);
+ 		*blockButton = *blockButton && privacyManager->isAvailable();
++#else
++		PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
++		if(privacyManager)
++			*blockButton = *blockButton && privacyManager->isAvailable();
+ #endif
+ 	}
+ }
+@@ -937,6 +947,10 @@ bool PsiContact::isBlocked() const
+ 	return account() && privacyManager(account()) &&
+ 	       privacyManager(account())->isContactBlocked(jid());
+ #else
++	if(account()) {
++		PsiPrivacyManager* privacyManager = dynamic_cast<PsiPrivacyManager*>(account()->privacyManager());
++		return privacyManager->isContactBlocked(jid());
++	}
+ 	return false;
+ #endif
+ }
+--- git.orig/src/psicontactlistviewdelegate.cpp
++++ git/src/psicontactlistviewdelegate.cpp
+@@ -282,6 +282,7 @@ void PsiContactListViewDelegate::drawCon
+ 
+ 	QStyleOptionViewItemV2 o = option;
+ 	o.font = *font_;
++	o.font.setItalic(index.data(ContactListModel::BlockRole).toBool());
+ 	o.fontMetrics = *fontMetrics_;
+ 	QPalette palette = o.palette;
+ 	palette.setColor(QPalette::Text, textColor);
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -45,6 +45,8 @@
+ 
+ #ifdef YAPSI
+ #include "yaprofile.h"
++#else
++#include "psiprivacymanager.h"
+ #endif
+ 
+ #include "groupchatdlg.h"
+@@ -256,6 +258,7 @@ public:
+ 	QAction* mucHideAction_;
+ 	QAction* mucShowAction_;
+ 	QAction* mucLeaveAction_;
++	QAction* blockAction_;
+ 
+ #endif
+ 
+@@ -424,6 +427,9 @@ public:
+ 		connect(mucLeaveAction_, SIGNAL(triggered()), SLOT(mucLeave()));
+ 		mucLeaveAction_->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
+ 
++		blockAction_ = new IconAction(tr("Block"), "psi/stop", tr("Block"), 0, this, 0, true);
++		connect(blockAction_, SIGNAL(triggered(bool)), SLOT(block(bool)));
++
+ 		if (!contact_->isConference()) {
+ 			menu_->addAction(addAuthAction_);
+ 			menu_->addAction(transportLogonAction_);
+@@ -450,6 +456,7 @@ public:
+ 			mngMenu_ = menu_->addMenu(IconsetFactory::icon("psi/manageContact").icon(), tr("Manage &Contact"));
+ 			mngMenu_->addAction(renameAction_);
+ 			mngMenu_->addMenu(groupMenu_);
++			mngMenu_->addAction(blockAction_);
+ 			authMenu_ = mngMenu_->addMenu(tr("&Authorization"));
+ 			authMenu_->addAction(authResendAction_);
+ 			authMenu_->addAction(authRerequestAction_);
+@@ -472,6 +479,7 @@ public:
+ 			menu_->addAction(mucLeaveAction_);
+ 			menu_->addSeparator();
+ 			menu_->addAction(customStatusAction_);
++			//menu_->addAction(blockAction_);
+ 		}
+ #endif
+ 	}
+@@ -490,9 +498,14 @@ private slots:
+ 
+ 	void updateActions()
+ 	{
+-		if (!contact_ or contact_->isConference())
++		if (!contact_)
+ 			return;
+ 
++		if(contact_->isConference()) {
++			updateBlockActionState();
++			return;
++		}
++
+ #ifdef YAPSI
+ 		YaProfile* profile = YaProfile::create(contact_->account(), contact_->jid());
+ 		openHistoryAction_->setEnabled(contact_->historyAvailable());
+@@ -555,6 +568,7 @@ private slots:
+ 			authMenu_->menuAction()->setVisible(false);
+ 		}
+ 		authMenu_->setEnabled(contact_->account()->isAvailable());
++		updateBlockActionState();
+ 		removeAction_->setVisible(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()  && !contact_->isSelf());
+ 		removeAction_->setEnabled(contact_->removeAvailable());
+ 		if (!PsiOptions::instance()->getOption("options.ui.menu.contact.custom-picture").toBool()) {
+@@ -635,6 +649,14 @@ private slots:
+ 		contact_->setGroups(QStringList() << group);
+ 	}
+ 
++	void block(bool )
++	{
++		if (!contact_)
++			return;
++
++		contact_->toggleBlockedStateConfirmation();
++	}
++
+ 	void addAuth()
+ 	{
+ 		if (!contact_)
+@@ -841,6 +863,16 @@ private slots:
+ 		contact_->account()->actionOpenChatSpecific(jid);
+ 	}
+ #endif
++private:
++	void updateBlockActionState()
++	{
++		if(!contact_)
++			return;
++		blockAction_->setVisible(!(contact_->isPrivate()/* || contact_->isAgent()*/ || contact_->isSelf()));
++		blockAction_->setEnabled(contact_->account()->isAvailable() && dynamic_cast<PsiPrivacyManager*>(contact_->account()->privacyManager())->isAvailable());
++		blockAction_->setChecked(contact_->isBlocked());
++		blockAction_->setText(blockAction_->isChecked() ? tr("Unblock") : tr("Block"));
++	}
+ };
+ 
+ PsiContactMenu::PsiContactMenu(PsiContact* contact, ContactListModel* model)

psi-plus-main-20141106.tar.xz/patches/0770-psi-workaround-adhoc-form-closes.diff Added

@@ -0,0 +1,32 @@
+--- git.orig/src/ahcexecutetask.cpp
++++ git/src/ahcexecutetask.cpp
+@@ -47,14 +47,10 @@ bool AHCExecuteTask::take(const QDomElem
+ 		QDomElement i = e.firstChildElement("command");
+ 		if (!i.isNull()) {
+ 			AHCommand c(i);
+-			if (c.status() == AHCommand::Executing) {
+-				AHCFormDlg *w = new AHCFormDlg(c,receiver_,client());
+-				w->show();
+-			}
+-			else if (c.status() == AHCommand::Completed && i.childNodes().count() > 0) {
+-				AHCFormDlg *w = new AHCFormDlg(c,receiver_,client(), true);
+-				w->show();
+-			}
++			if (c.status() == AHCommand::Executing)
++				new AHCFormDlg(c,receiver_,client());
++			else if (c.status() == AHCommand::Completed && i.childNodes().count() > 0)
++				new AHCFormDlg(c,receiver_,client(), true);
+ 			setSuccess();
+ 			return true;
+ 		}
+--- git.orig/src/ahcformdlg.cpp
++++ git/src/ahcformdlg.cpp
+@@ -138,6 +138,8 @@ AHCFormDlg::AHCFormDlg(const AHCommand&
+ 	}
+ 
+ 	adjustSize();
++	show();
++	setParent(0);
+ }
+ 
+ void AHCFormDlg::doPrev()

psi-plus-main-20141106.tar.xz/patches/0780-psiplus-decorate-windows.diff Added

@@ -0,0 +1,1118 @@
+--- a/options/default.xml
++++ b/options/default.xml
+@@ -455,6 +455,7 @@ QLineEdit#le_status_text {
+ 				</sounds>
+ 				<successful-subscription type="bool">true</successful-subscription>
+ 			</notifications>
++			<decorate-windows type="bool">true</decorate-windows>
+ 			<service-discovery>
+ 				<automatically-get-info type="bool">false</automatically-get-info>
+ 				<automatically-get-items type="bool">false</automatically-get-items>
+--- a/src/groupchatdlg.cpp
++++ b/src/groupchatdlg.cpp
+@@ -84,6 +84,7 @@
+ #include "mcmdmanager.h"
+ #include "lastactivitytask.h"
+ #include "psirichtext.h"
++#include "psiwindowheader.h"
+ 
+ #include "mcmdsimplesite.h"
+ 
+@@ -237,9 +238,13 @@ public:
+ 
+ 	int logSize;
+ 	int rosterSize;
++
+ public:
+ 	bool trackBar;
+ 
++	bool tabmode;
++	PsiWindowHeader *winHeader_;
++
+ public:
+ 	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
+ 	ChatView* te_log() const { return dlg->ui_.log; }
+@@ -629,6 +634,14 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	ui_.lb_ident->setAccount(account());
+ 	ui_.lb_ident->setShowJid(false);
+ 	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
++	d->tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
++	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
++	if (!d->tabmode && !isBorder()) {
++		d->winHeader_ = new PsiWindowHeader(this);
++		ui_.vboxLayout1->insertWidget(0, d->winHeader_);
++	}
++	setMargins();
++
+ #ifdef WEBKIT
+ 	ui_.log->setAccount(account());
+ #endif
+@@ -2103,6 +2116,25 @@ void GCMainDlg::resizeEvent(QResizeEvent *e)
+ 	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
+ }
+ 
++void GCMainDlg::setMargins()
++{
++	ui_.vboxLayout->setContentsMargins(0,0,0,0);
++	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
++	if (!d->tabmode) {
++		ui_.hboxLayout->setContentsMargins(4,0,4,0);
++		if (!isBorder()) {
++			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
++		}
++		else {
++			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
++		}
++	}
++	else {
++		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
++		ui_.hboxLayout->setContentsMargins(2,0,4,0);
++	}
++}
++
+ //----------------------------------------------------------------------------
+ // GCFindDlg
+ //----------------------------------------------------------------------------
+--- a/src/groupchatdlg.h
++++ b/src/groupchatdlg.h
+@@ -168,6 +168,8 @@ private:
+ 
+ 	void contextMenuEvent(QContextMenuEvent *);
+ 
++	void setMargins();
++
+ };
+ 
+ class GCFindDlg : public QDialog
+--- a/src/mainwin.cpp
++++ b/src/mainwin.cpp
+@@ -146,6 +146,8 @@ public:
+ 	QTimer *hideTimer;
+ 	int hideTimerInterval; //interval in sec
+ 	bool useAutohide;
++	bool isHide;
++
+ 
+ #ifdef Q_OS_WIN
+ 	DWORD deactivationTickCount;
+@@ -570,6 +572,8 @@ MainWin::MainWin(bool _onTop, bool _asTool, PsiCon* psi)
+ 	d->hideTimerInterval = PsiOptions::instance()->getOption("options.contactlist.autohide-interval").toInt();
+ 	d->hideTimer->setInterval(d->hideTimerInterval*1000);
+ 	optionChanged("options.contactlist.use-autohide");
++	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
++	setMouseTracking(!isBorder());
+ }
+ 
+ MainWin::~MainWin()
+@@ -624,6 +628,11 @@ void MainWin::optionChanged(const QString& option)
+ 		if(d->useAutohide)
+ 			d->hideTimer->start();
+ 	}
++	else if (option == "options.ui.decorate-windows") {
++		setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
++		setMouseTracking(!isBorder());
++		show();
++	}
+ }
+ 
+ void MainWin::hideTimerTimeout()
+@@ -793,13 +802,19 @@ void MainWin::setWindowOpts(bool _onTop, bool _asTool)
+ 	d->onTop = _onTop;
+ 	d->asTool = _asTool;
+ 
+-	Qt::WindowFlags flags = 0;
++	Qt::WindowFlags flags = windowFlags();
+ 	if(d->onTop) {
+ 		flags |= Qt::WindowStaysOnTopHint;
+ 	}
++	else {
++		flags &= ~Qt::WindowStaysOnTopHint;
++	}
+ 	if(d->asTool) {
+ 		flags |= Qt::Tool | TOOLW_FLAGS;
+ 	}
++	else {
++		flags &= ~Qt::Tool;
++	}
+ 
+ 	setWindowFlags(flags);
+ 	show();
+@@ -1729,6 +1744,7 @@ void MainWin::statusClicked(int x)
+ {
+ 	if(x == Qt::MidButton) {
+ 		recvNextEvent();
++		d->isHide = false;
+ 	}
+ }
+ 
+@@ -1982,4 +1998,32 @@ void MainWin::resizeEvent(QResizeEvent *e)
+ 	}
+ }
+ 
++void MainWin::mousePressEvent(QMouseEvent *e)
++{
++	if (e->button() == Qt::MidButton && !isBorder()) {
++		d->isHide = true;
++	}
++
++	AdvancedWidget<QMainWindow>::mousePressEvent(e);
++}
++
++void MainWin::mouseReleaseEvent(QMouseEvent *e)
++{
++	if (e->button() == Qt::MidButton && !isBorder() && d->isHide) {
++		d->isHide = false;
++		if (e->globalPos().x() >= geometry().left()
++			&& e->globalPos().x() <= geometry().right()
++			&& e->globalPos().y() >= geometry().top()
++			&& e->globalPos().y() <= geometry().bottom()){
++			if (d->asTool){
++				d->mainWin->trayHide();
++			} else {
++				setWindowState(windowState() | Qt::WindowMinimized);
++			}
++		}
++	}
++
++	AdvancedWidget<QMainWindow>::mouseReleaseEvent(e);
++}
++
+ //#endif
+--- a/src/mainwin.h
++++ b/src/mainwin.h
+@@ -26,6 +26,7 @@
+ #include <QList>
+ #include <QString>
+ #include <QStringList>
++#include <QMouseEvent>
+ 
+ #include "advwidget.h"
+ #include "xmpp_status.h"
+@@ -84,6 +85,8 @@ protected:
+ #ifdef Q_OS_WIN
+ 	bool winEvent(MSG *, long *);
+ #endif
++	void mousePressEvent(QMouseEvent *e);
++	void mouseReleaseEvent(QMouseEvent *e);
+ 
+ signals:
+ 	void statusChanged(XMPP::Status::Type);
+--- a/src/options/opt_application.cpp
++++ b/src/options/opt_application.cpp
+@@ -43,7 +43,9 @@ QWidget *OptionsTabApplication::widget()
+ 
+ 	w = new OptApplicationUI();
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+-
++	d->ck_winDecor->setWhatsThis(
++		tr("Set or remove window decorations for roster and chats."
++		" For chats there are special header with close, hide and maximize buttons"));
+ 	// docklet
+ 	d->ck_docklet->setWhatsThis(
+ 		tr("Makes Psi use a docklet icon, also known as system tray icon."));
+@@ -90,6 +92,7 @@ void OptionsTabApplication::applyOptions()
+ 	OptApplicationUI *d = (OptApplicationUI *)w;
+ 
+ 	PsiOptions::instance()->setOption("options.ui.contactlist.quit-on-close", d->ck_quitOnClose->isChecked());
++	PsiOptions::instance()->setOption("options.ui.decorate-windows", d->ck_winDecor->isChecked());
+ 
+ 	// Auto-update
+ 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
+@@ -134,6 +137,7 @@ void OptionsTabApplication::restoreOptions()
+ 
+ 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
+ 	d->ck_quitOnClose->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool());
++	d->ck_winDecor->setChecked(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
+ 
+ 	// docklet
+ 	d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
+--- a/src/options/opt_application.ui
++++ b/src/options/opt_application.ui
+@@ -24,6 +24,16 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_winDecor" >
++     <property name="text" >
++      <string>Decorate windows</string>
++     </property>
++     <property name="checked" >
++      <bool>true</bool>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QGroupBox" name="gb_docklet" >
+      <property name="title" >
+       <string>Docklet</string>
+@@ -223,6 +233,7 @@
+  <layoutdefault spacing="6" margin="11" />
+  <tabstops>
+   <tabstop>ck_docklet</tabstop>
++  <tabstop>ck_winDecor</tabstop>
+   <tabstop>ck_dockDCstyle</tabstop>
+   <tabstop>ck_dockHideMW</tabstop>
+   <tabstop>ck_dockToolMW</tabstop>
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
+@@ -176,6 +176,8 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
+ 	connect(account(), SIGNAL(removedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
+ 	connect(account(), SIGNAL(updateContact(const Jid &)), SLOT(updateContactAdding(const Jid &)));
+ 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
++	tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
++	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
+ 	SendButtonTemplatesMenu* menu = getTemplateMenu();
+ 	if (menu) {
+ 		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
+@@ -248,6 +250,11 @@ void PsiChatDlg::initUi()
+ 	act_mini_cmd_->setText(tr("Input command..."));
+ 	connect(act_mini_cmd_, SIGNAL(triggered()), SLOT(doMiniCmd()));
+ 	addAction(act_mini_cmd_);
++	if (!tabmode) {
++		winHeader_ = new PsiWindowHeader(this);
++		ui_.vboxLayout1->insertWidget(0, winHeader_);
++	}
++	setMargins();
+ 
+ 	ui_.mini_prompt->hide();
+ 
+@@ -486,6 +493,22 @@ void PsiChatDlg::activated()
+ 	ChatDlg::activated();
+ 
+ 	updateCountVisibility();
++
++	bool border = PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool();
++	if (!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()){
++		if (!winHeader_.isNull())
++			winHeader_->setVisible(!border);
++		setWindowBorder(border);
++		setMargins();
++#if defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
++		//
++#else
++		bringToFront(true);
++#endif
++	} else {
++		if (!winHeader_.isNull())
++			winHeader_->setVisible(false);
++	}
+ }
+ 
+ void PsiChatDlg::setContactToolTip(QString text)
+@@ -820,4 +843,23 @@ void PsiChatDlg::sendTemp(const QString &templText)
+ 	}
+ }
+ 
++void PsiChatDlg::setMargins()
++{
++	ui_.vboxLayout->setContentsMargins(0,0,0,0);
++	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
++	if (!tabmode) {
++		ui_.hboxLayout->setContentsMargins(4,0,4,0);
++		if (!isBorder()) {
++			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
++		}
++		else {
++			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
++		}
++	}
++	else {
++		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
++		ui_.hboxLayout->setContentsMargins(2,0,4,0);
++	}
++}
++
+ #include "psichatdlg.moc"
+--- a/src/psichatdlg.h
++++ b/src/psichatdlg.h
+@@ -10,6 +10,7 @@
+ 
+ #include "ui_chatdlg.h"
+ #include "typeaheadfind.h"
++#include "psiwindowheader.h"
+ 
+ class IconAction;
+ class PsiContact;
+@@ -71,6 +72,7 @@ private:
+ 	void appendSysMsg(const QString &);
+ 	ChatView* chatView() const;
+ 	ChatEdit* chatEdit() const;
++	void setMargins();
+ 
+ private:
+ 	Ui::ChatDlg ui_;
+@@ -106,6 +108,8 @@ private:
+ 	int unacked_messages;
+ 
+ 	static PsiIcon *throbber_icon;
++	bool tabmode;
++	QPointer <PsiWindowHeader> winHeader_;
+ };
+ 
+ #endif
+--- a/src/tabs/tabdlg.cpp
++++ b/src/tabs/tabdlg.cpp
+@@ -167,9 +167,19 @@ TabDlg::TabDlg(TabManager* tabManager, const QString& geometryOption, TabDlgDele
+ 		delegate_->tabWidgetCreated(this, tabWidget_);
+ 
+ 	QVBoxLayout *vert1 = new QVBoxLayout(this);
+-	vert1->setMargin(1);
++	//Add windowheader widget if window not decorated
++	if (!PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool()
++		&& !PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
++		winHeader_ = new PsiWindowHeader(this);
++		vert1->addWidget(winHeader_);
++		vert1->setSpacing(0);
++		vert1->setMargin(0);
++	} else {
++		vert1->setMargin(1);
++	}
+ 	vert1->addWidget(tabWidget_);
+ 
++
+ 	setAcceptDrops(true);
+ 
+ 	X11WM_CLASS("tabs");
+@@ -189,6 +199,7 @@ TabDlg::TabDlg(TabManager* tabManager, const QString& geometryOption, TabDlgDele
+ 
+ 	if(!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A'))
+ 		setGeometryOptionPath(geometryOption);
++	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
+ }
+ 
+ TabDlg::~TabDlg()
+--- a/src/tabs/tabdlg.h
++++ b/src/tabs/tabdlg.h
+@@ -29,6 +29,7 @@
+ #include "advwidget.h"
+ 
+ #include "tabbablewidget.h"
++#include "psiwindowheader.h"
+ 
+ class PsiCon;
+ class ChatTabs;
+@@ -170,6 +171,7 @@ private:
+ 	void extinguishFlashingTabs();
+ 	void updateCaption();
+ 	void updateTabBar();
++	PsiWindowHeader *winHeader_;
+ };
+ 
+ #endif
+--- a/src/tools/advwidget/advwidget.h
++++ b/src/tools/advwidget/advwidget.h
+@@ -21,6 +21,7 @@
+ #ifndef ADVWIDGET_H
+ #define ADVWIDGET_H
+ 
++#include <QMouseEvent>
+ #include <QWidget>
+ 
+ class GAdvancedWidget : public QObject
+@@ -65,6 +66,81 @@ class AdvancedWidget : public BaseClass
+ {
+ private:
+ 	GAdvancedWidget *gAdvWidget;
++#ifdef Q_OS_WIN
++	Qt::WindowFlags deltaflags;
++#endif
++	QPoint movepath;
++	bool isResize;
++	bool isDrag;
++	bool border;
++	QMap <QString, bool> regions;
++	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
++	{
++		const int top = geom.top();
++		const int bottom = geom.bottom();
++		const int left = geom.left();
++		const int right = geom.right();
++		const int delta = 10;
++		const int maxtop = top + delta;
++		const int minbottom = bottom -delta;
++		if(mouse_y <= bottom
++				&& mouse_y >= minbottom
++				&& qAbs(mouse_x - left) < delta) {
++			setMouseRegion("leftbottom");
++		}
++		else if (mouse_x > (left + delta)
++			 && mouse_x < (right - delta)
++			 && qAbs(mouse_y - bottom) < delta) {
++			setMouseRegion("bottom");
++		}
++		else if ((bottom - mouse_y) < delta
++			     && qAbs(mouse_x - right) < delta){
++			setMouseRegion("rightbottom");
++		}
++		else if ((right - mouse_x) < delta
++			 &&  mouse_y > maxtop
++			 && mouse_y < minbottom) {
++			setMouseRegion("right");
++		}
++		else if ((mouse_x - left) < delta
++			 &&  mouse_y > maxtop
++			 && mouse_y < minbottom) {
++			setMouseRegion("left");
++		}
++		else if ((mouse_y - top) < delta
++			 && mouse_x > (left + delta)
++			 && mouse_x < (right -delta)){
++			setMouseRegion("top");
++		}
++		else if ((top - mouse_y) < delta
++			 && qAbs(mouse_x - right) < delta){
++			setMouseRegion("righttop");
++		}
++		else if ((top - mouse_y) < delta
++			 && qAbs(mouse_x - left) < delta){
++			setMouseRegion("lefttop");
++		}
++		else {
++			setMouseRegion("");
++		}
++	}
++	void setMouseRegion(const QString &region)
++	{
++		foreach(const QString &item, regions.keys()) {
++			regions.insert(item, false);
++		}
++		if (!region.isEmpty()) {
++			regions.insert(region, true);
++		}
++	}
++	bool getMouseRegion()
++	{
++		foreach(bool value, regions) {
++			if (value)
++				return value;
++		}
++		return false;
++	}
+ 
+ public:
+ 	AdvancedWidget(QWidget *parent = 0, Qt::WindowFlags f = 0)
+@@ -73,6 +149,7 @@ public:
+ 	{
+ 		if (f != 0)
+ 			BaseClass::setWindowFlags(f);
++		border = true;
+ 		gAdvWidget = new GAdvancedWidget( this );
+ 	}
+ 
+@@ -151,6 +228,46 @@ public:
+ 		windowTitleChanged();
+ 	}
+ 
++	void setWindowBorder(bool isDecorated)
++	{
++		Qt::WindowFlags flags = BaseClass::windowFlags();
++#ifdef Q_OS_WIN
++		if (deltaflags == 0) {
++			deltaflags = flags;
++		}
++		if (isDecorated) {
++			if (flags != deltaflags) {
++				flags |= Qt::WindowTitleHint;
++				flags &= ~Qt::FramelessWindowHint;
++				deltaflags = 0;
++				if (flags != BaseClass::windowFlags()) {
++					setWindowFlags(flags);
++				}
++			}
++		} else {
++			flags &= ~Qt::WindowTitleHint;
++			flags |= Qt::FramelessWindowHint;
++			if (flags != BaseClass::windowFlags()) {
++				setWindowFlags(flags);
++			}
++
++		}
++#else
++		if (isDecorated) {
++			flags &= ~Qt::FramelessWindowHint;
++		} else {
++			flags |= Qt::FramelessWindowHint;
++		}
++		if (flags != BaseClass::windowFlags()) {
++			setWindowFlags(flags);
++		}
++#endif
++		border = isDecorated;
++	}
++	bool isBorder(){
++		return border;
++	}
++
+ protected:
+ 	virtual void windowTitleChanged()
+ 	{
+@@ -165,6 +282,122 @@ protected:
+ 		}
+ 		BaseClass::changeEvent(event);
+ 	}
++
++protected:
++	void setWindowFlags(Qt::WindowFlags flags){
++		BaseClass::setWindowFlags(flags);
++	}
++	void mousePressEvent(QMouseEvent *event)
++	{
++		QWidget *window = BaseClass::window();
++		if (!border && (event->button()==Qt::LeftButton)) {
++			mouseEnterEvent(event->globalPos().x(), event->globalPos().y(), window->geometry());
++			if (getMouseRegion()) {
++				isResize = true;
++			}
++			else{
++				movepath = event->globalPos() - window->pos();
++				isResize = false;
++			}
++			isDrag = true;
++			BaseClass::mousePressEvent(event);
++		}
++	}
++	void mouseMoveEvent(QMouseEvent *event)
++	{
++		bool isLeftButton = (event->buttons() & Qt::LeftButton);
++		const QPoint pg = event->globalPos();
++		QWidget *window = BaseClass::window();
++		int ypath = 0;
++		int xpath = 0;
++		const int right = window->geometry().right();
++		const int left =  window->geometry().left();
++		const int top =  window->geometry().top();
++		const int bottom = window->geometry().bottom();
++		if (isLeftButton && regions.value("leftbottom") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeBDiagCursor));
++			ypath =  pg.y() - bottom;
++			xpath = left - pg.x();
++			if ((window->width() + xpath) < window->minimumWidth()) {
++				xpath = window->minimumWidth() - window->width();
++			}
++			window->setGeometry(window->x() - xpath, window->y(), window->width() + xpath, window->height() + ypath);
++
++		}
++		else if (isLeftButton && regions.value("rightbottom") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeFDiagCursor));
++			ypath = pg.y() - bottom;
++			xpath = pg.x() - right;
++			window->resize(window->width() + xpath, window->height() + ypath);
++
++		}
++		else if (isLeftButton && regions.value("lefttop") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeFDiagCursor));
++			ypath =  top - pg.y();
++			xpath = left - pg.x();
++			if ((window->width() + xpath) < window->minimumWidth()) {
++				xpath = window->minimumWidth() - window->width();
++			}
++			if ((window->height() + ypath) < window->minimumHeight()) {
++				ypath = window->minimumHeight() - window->height();
++			}
++			window->setGeometry(window->x() - xpath, window->y() - ypath, window->width() + xpath, window->height() + ypath);
++		}
++		else if (isLeftButton && regions.value("righttop") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeBDiagCursor));
++			ypath =  top - pg.y();
++			xpath = pg.x() - right;
++			if ((window->width() + xpath) < window->minimumWidth()) {
++				xpath = window->minimumWidth() - window->width();
++			}
++			if ((window->height() + ypath) < window->minimumHeight()) {
++				ypath = window->minimumHeight() - window->height();
++			}
++			window->setGeometry(window->x(), window->y() - ypath, window->width() + xpath, window->height() + ypath);
++		}
++		else if (isLeftButton && regions.value("bottom") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeVerCursor));
++			ypath =  pg.y() - bottom;
++			window->resize(window->width(), window->height() + ypath);
++		}
++		else if (isLeftButton && regions.value("right") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeHorCursor));
++			xpath =  pg.x() - right;
++			window->resize(window->width() + xpath, window->height());
++		}
++		else if (isLeftButton && regions.value("left") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeHorCursor));
++			xpath =  left - pg.x();
++			if ((window->width() + xpath) < window->minimumWidth()) {
++				xpath = window->minimumWidth() - window->width();
++			}
++			window->setGeometry(window->x() - xpath, window->y(), window->width() + xpath, window->height());
++		}
++		else if (isLeftButton && regions.value("top") && isResize && !border) {
++			window->setCursor(QCursor(Qt::SizeVerCursor));
++			ypath =  top - pg.y();
++			if ((window->height() + ypath) < window->minimumHeight()) {
++				ypath = window->minimumHeight() - window->height();
++			}
++			window->setGeometry(window->x(), window->y() - ypath, window->width(), window->height() + ypath);
++		}
++		else if(isLeftButton && isDrag && !isResize && !border) {
++			window->setCursor(QCursor(Qt::ArrowCursor));
++			window->move( event->globalPos() - movepath );
++		}
++		BaseClass::mouseMoveEvent(event);
++	}
++	void mouseReleaseEvent(QMouseEvent *event)
++	{
++		QWidget *window = BaseClass::window();
++		if (!border && (event->button() == Qt::LeftButton) && isDrag) {
++			movepath = QPoint(0,0);
++			isDrag = false;
++			isResize = false;
++			window->setCursor(QCursor(Qt::ArrowCursor));
++			BaseClass::mouseReleaseEvent(event);
++		}
++	}
+ };
+ 
+ #endif
+new file mode 100644
+--- /dev/null
++++ b/src/widgets/psiwindowheader.cpp
+@@ -0,0 +1,226 @@
++/*
++ * psiwindowheader.cpp
++ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++
++#include <QIcon>
++#include <QDesktopWidget>
++
++#include "psiwindowheader.h"
++#include "psiiconset.h"
++
++PsiWindowHeader::PsiWindowHeader(QWidget *p)
++	: QWidget(p),
++	  maximized(false),
++	  defaultSize(QSize(320, 280))
++{
++	parent_ = p->window();
++	ui_.setupUi(this);
++#ifdef Q_OS_MAC
++	ui_.horiz->insertWidget(0, ui_.closeButton);
++	ui_.horiz->insertWidget(1, ui_.hideButton);
++	ui_.horiz->insertWidget(2, ui_.maximizeButton);
++#endif
++	ui_.hideButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMinButton));
++	ui_.maximizeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMaxButton));
++	ui_.closeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
++	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
++
++	connect(ui_.hideButton, SIGNAL(clicked()), SLOT(hidePressed()));
++	connect(ui_.closeButton, SIGNAL(clicked()), SLOT(closePressed()));
++	connect(ui_.maximizeButton, SIGNAL(clicked()), SLOT(maximizePressed()));
++	setMouseTracking(true);
++}
++
++PsiWindowHeader::~PsiWindowHeader()
++{
++}
++
++void PsiWindowHeader::hidePressed()
++{
++	parent_->setWindowState(parent_->windowState() | Qt::WindowMinimized);
++}
++
++void PsiWindowHeader::closePressed()
++{
++	parent_->close();
++}
++
++void PsiWindowHeader::maximizePressed()
++{
++	const QRect desktop = qApp->desktop()->availableGeometry(-1);
++	if (!maximized) {
++		if (parent_->window()->width() != qApp->desktop()->width()
++			&& parent_->window()->height() != qApp->desktop()->height()) {
++			oldSize = parent_->window()->geometry();
++			parent_->window()->setGeometry(desktop);
++			maximized = true;
++		}
++		else if (!oldSize.isNull() && !oldSize.isEmpty()) {
++			parent_->window()->setGeometry(oldSize);
++			maximized = false;
++		}
++		else {
++			parent_->window()->resize(defaultSize);
++			maximized = false;
++		}
++	} else {
++		if (oldSize.top() < desktop.top()) {
++			oldSize.setTop(desktop.top());
++		}
++		if (oldSize.left() < desktop.left() ) {
++			oldSize.setLeft(desktop.left());
++		}
++		if (oldSize.right() > desktop.right()) {
++			oldSize.setRight(desktop.right());
++		}
++		if (oldSize.bottom() > desktop.bottom()) {
++			oldSize.setBottom(desktop.bottom());
++		}
++		parent_->window()->setGeometry(oldSize);
++		maximized = false;
++	}
++}
++
++void PsiWindowHeader::mouseDoubleClickEvent(QMouseEvent *e)
++{
++	if (e->button() == Qt::LeftButton) {
++		maximizePressed();
++		e->accept();
++	}
++}
++
++void PsiWindowHeader::mousePressEvent(QMouseEvent *e)
++{
++	if (e->button() == Qt::LeftButton) {
++		mouseEnterEvent(e->pos().x(),e->pos().y(),geometry());
++		if (inVRect || inLDRect || inRDRect) {
++			isResize = true;
++		}
++		else{
++			movepath = e->pos();
++			isResize = false;
++		}
++		isDrag = true;
++		e->accept();
++	}
++}
++
++void PsiWindowHeader::mouseMoveEvent(QMouseEvent *e)
++{
++	bool isLeftButton = (e->buttons() & Qt::LeftButton);
++	const QPoint pg = e->globalPos();
++	int ypath = 0;
++	int xpath = 0;
++	if (isLeftButton && inLDRect && isResize && !maximized) {
++		setCursor(QCursor(Qt::SizeFDiagCursor));
++		ypath = parent_->window()->y() - pg.y() ;
++		xpath = parent_->window()->x() - pg.x();
++		if ((parent_->window()->width() + xpath) < parent_->window()->minimumWidth()) {
++			xpath = parent_->window()->minimumWidth() - parent_->window()->width();
++		}
++		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
++			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
++		}
++		parent_->window()->setGeometry(parent_->window()->x() - xpath,
++						parent_->window()->y() - ypath,
++						parent_->window()->width() + xpath,
++						parent_->window()->height() + ypath);
++
++	}
++	else if (isLeftButton && inVRect && isResize && !maximized) {
++		setCursor(QCursor(Qt::SizeVerCursor));
++		ypath = parent_->window()->y() - pg.y();
++		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
++			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
++		}
++		parent_->window()->setGeometry(parent_->window()->x(),
++						parent_->window()->y() - ypath,
++						parent_->window()->width(),
++						parent_->window()->height() + ypath);
++	}
++	else if (isLeftButton && inRDRect && isResize && !maximized) {
++		setCursor(QCursor(Qt::SizeBDiagCursor));
++		ypath = parent_->window()->y() - pg.y();
++		xpath = pg.x() - parent_->window()->geometry().right();
++		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
++			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
++		}
++		parent_->window()->setGeometry(parent_->window()->x(),
++						parent_->window()->y() - ypath,
++						parent_->window()->width() + xpath,
++						parent_->window()->height() + ypath);
++
++	}
++	else if(isLeftButton && isDrag &&!isResize && !maximized) {
++		setCursor(QCursor(Qt::ArrowCursor));
++		parent_->window()->move( e->globalPos() - movepath );
++	}
++	e->accept();
++}
++
++void PsiWindowHeader::mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
++{
++	if(mouse_y <= geom.top()+7
++		&& qAbs(mouse_x - geom.left()) <= 4) {
++		inLDRect = true;
++		inRDRect = false;
++		inVRect = false;
++	}
++	else if(mouse_y <= geom.top()+7
++		&& qAbs(mouse_x - geom.right()) <= 4) {
++		inRDRect = true;
++		inLDRect = false;
++		inVRect = false;
++	}
++	else if (mouse_x > (geom.left() + 4)
++		&& mouse_x < (geom.right() - 4)
++		&& qAbs(mouse_y - geom.top()) <= 4) {
++		inVRect = true;
++		inLDRect = false;
++		inRDRect = false;
++	}
++	else {
++		inVRect = false;
++		inLDRect = false;
++		inRDRect = false;
++	}
++}
++
++void PsiWindowHeader::mouseReleaseEvent(QMouseEvent *e)
++{
++	if (e->button() == Qt::LeftButton && isDrag) {
++		movepath.setX(0);
++		movepath.setY(0);
++		isDrag = false;
++		isResize = false;
++		setCursor(QCursor(Qt::ArrowCursor));
++	}
++	int min_x = qMin(ui_.hideButton->geometry().left(), qMin(ui_.maximizeButton->geometry().left(), ui_.closeButton->geometry().left()));
++	int max_x = qMax(ui_.hideButton->geometry().right(), qMax(ui_.maximizeButton->geometry().right(), ui_.closeButton->geometry().right()));
++	if (e->button() == Qt::MidButton) {
++		if (((e->x() > geometry().left() && e->x() < min_x)
++			|| (e->x() < geometry().right() && e->x() > max_x ))
++			&& e->y() > geometry().top()
++			&& e->y() < geometry().bottom()) {
++			hidePressed();
++		}
++	}
++	e->accept();
++}
+new file mode 100644
+--- /dev/null
++++ b/src/widgets/psiwindowheader.h
+@@ -0,0 +1,65 @@
++/*
++ * psiwindowheader.cpp
++ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++
++#ifndef PSIWINDOWHEADER_H
++#define PSIWINDOWHEADER_H
++
++#include "ui_psiwindowheader.h"
++
++#include <QToolButton>
++#include <QMouseEvent>
++#include <QRect>
++
++class PsiWindowHeader : public QWidget
++{
++	Q_OBJECT
++public:
++	PsiWindowHeader(QWidget* p);
++	~PsiWindowHeader();
++
++private:
++	Ui::PsiWindowHeader ui_;
++	QWidget *parent_;
++	QPoint movepath;
++	bool isDrag;
++	bool isResize;
++	bool inVRect;
++	bool inLDRect;
++	bool inRDRect;
++	bool maximized;
++	QRect oldSize;
++	QSize defaultSize;
++	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom);
++
++private slots:
++	void hidePressed();
++	void closePressed();
++	void maximizePressed();
++
++protected:
++	void mouseMoveEvent(QMouseEvent *e);
++	void mousePressEvent(QMouseEvent *e);
++	void mouseReleaseEvent(QMouseEvent *e);
++	void mouseDoubleClickEvent(QMouseEvent *e);
++
++};
++
++#endif // PSIWINDOWHEADER_H
+new file mode 100644
+--- /dev/null
++++ b/src/widgets/psiwindowheader.ui
+@@ -0,0 +1,120 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>PsiWindowHeader</class>
++ <widget class="QWidget" name="PsiWindowHeader">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>130</width>
++    <height>31</height>
++   </rect>
++  </property>
++  <property name="sizePolicy">
++   <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
++    <horstretch>0</horstretch>
++    <verstretch>0</verstretch>
++   </sizepolicy>
++  </property>
++  <property name="mouseTracking">
++   <bool>true</bool>
++  </property>
++  <property name="windowTitle">
++   <string>PsiWindowHeader</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout">
++   <property name="spacing">
++    <number>0</number>
++   </property>
++   <property name="margin">
++    <number>0</number>
++   </property>
++   <item>
++    <layout class="QHBoxLayout" name="horiz">
++     <property name="spacing">
++      <number>0</number>
++     </property>
++     <item>
++      <widget class="QFrame" name="headerFrame">
++       <property name="frameShape">
++        <enum>QFrame::NoFrame</enum>
++       </property>
++       <property name="frameShadow">
++        <enum>QFrame::Plain</enum>
++       </property>
++       <property name="lineWidth">
++        <number>1</number>
++       </property>
++       <layout class="QHBoxLayout" name="horizontalLayout_3">
++        <property name="spacing">
++         <number>0</number>
++        </property>
++        <property name="margin">
++         <number>0</number>
++        </property>
++        <item>
++         <layout class="QHBoxLayout" name="horiz1">
++          <property name="spacing">
++           <number>2</number>
++          </property>
++          <item>
++           <spacer name="spacer">
++            <property name="orientation">
++             <enum>Qt::Horizontal</enum>
++            </property>
++            <property name="sizeHint" stdset="0">
++             <size>
++              <width>40</width>
++              <height>20</height>
++             </size>
++            </property>
++           </spacer>
++          </item>
++          <item>
++           <widget class="QToolButton" name="hideButton">
++            <property name="text">
++             <string>...</string>
++            </property>
++            <property name="autoRaise">
++             <bool>true</bool>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QToolButton" name="maximizeButton">
++            <property name="text">
++             <string>...</string>
++            </property>
++            <property name="autoRaise">
++             <bool>true</bool>
++            </property>
++           </widget>
++          </item>
++          <item>
++           <widget class="QToolButton" name="closeButton">
++            <property name="sizePolicy">
++             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
++              <horstretch>0</horstretch>
++              <verstretch>0</verstretch>
++             </sizepolicy>
++            </property>
++            <property name="text">
++             <string>...</string>
++            </property>
++            <property name="autoRaise">
++             <bool>true</bool>
++            </property>
++           </widget>
++          </item>
++         </layout>
++        </item>
++       </layout>
++      </widget>
++     </item>
++    </layout>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- a/src/widgets/widgets.pri
++++ b/src/widgets/widgets.pri
+@@ -16,6 +16,7 @@ SOURCES += \
+ 	$$PWD/psitiplabel.cpp \
+ 	$$PWD/psitabwidget.cpp \
+ 	$$PWD/psitabbar.cpp \
++	$$PWD/psiwindowheader.cpp \
+ 	$$PWD/actionlineedit.cpp \
+ 	$$PWD/typeaheadfind.cpp
+ 
+@@ -43,10 +44,12 @@ HEADERS += \
+ 	$$PWD/psitiplabel.h \
+ 	$$PWD/psitabwidget.h \
+ 	$$PWD/psitabbar.h \
++	$$PWD/psiwindowheader.h \
+ 	$$PWD/actionlineedit.h \
+ 	$$PWD/typeaheadfind.h
+ 
+-FORMS += $$PWD/fancypopup.ui
++FORMS += $$PWD/fancypopup.ui \
++	$$PWD/psiwindowheader.ui
+ 
+ # to remove dependency on iconset and stuff
+ #DEFINES += WIDGET_PLUGIN

psi-plus-main-20141106.tar.xz/patches/0790-psi-colors-for-tabs.diff Added

@@ -0,0 +1,32 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -376,6 +376,8 @@ QLineEdit#le_status_text {
+ 					<chat>
+ 						<link-color type="QColor">#0000ff</link-color>
+ 						<mailto-color type="QColor">#0000ff</mailto-color>
++						<composing-color type="QColor">darkGreen</composing-color>
++						<unread-message-color type="QColor">red</unread-message-color>
+ 					</chat>
+ 					<passive-popup>
+ 						<border type="QColor">#5297f9</border>
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -653,15 +653,15 @@ void TabDlg::updateTab(TabbableWidget* c
+ 	//now set text colour based upon whether there are new messages/composing etc
+ 
+ 	if (chat->state() == TabbableWidget::StateComposing) {
+-		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
++		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
+ 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
+ 	}
+ 	else if (chat->unreadMessageCount()) {
+-		tabWidget_->setTabTextColor(chat, Qt::red);
++		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
+ 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
+ 	}
+ 	else {
+-		tabWidget_->setTabTextColor(chat, palette().windowText().color());
++		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
+ 		tabWidget_->setTabIcon(chat, chat->icon());
+ 	}
+ 	updateCaption();

psi-plus-main-20141106.tar.xz/patches/0800-psi-video-option.diff Added

@@ -0,0 +1,156 @@
+--- git.temp.orig/src/avcall/avcall.cpp
++++ git.temp/src/avcall/avcall.cpp
+@@ -29,6 +29,7 @@
+ #include "../psimedia/psimedia.h"
+ #include "applicationinfo.h"
+ #include "psiaccount.h"
++#include "psioptions.h"
+ 
+ #define USE_THREAD
+ 
+@@ -907,6 +908,9 @@ bool AvCallManager::isVideoSupported()
+ 	if(!isSupported())
+ 		return false;
+ 
++	if(PsiOptions::instance()->getOption("options.media.video-support").toBool())
++		return true;
++
+ 	if(!QString::fromLatin1(qgetenv("PSI_ENABLE_VIDEO")).isEmpty())
+ 		return true;
+ 	else
+--- git.temp.orig/src/options/opt_avcall.cpp
++++ git.temp/src/options/opt_avcall.cpp
+@@ -201,6 +201,7 @@ void OptionsTabAvCall::applyOptions()
+ 	PsiOptions::instance()->setOption("options.media.devices.audio-output", d->cb_audioOutDevice->itemData(d->cb_audioOutDevice->currentIndex()).toString());
+ 	PsiOptions::instance()->setOption("options.media.devices.audio-input", d->cb_audioInDevice->itemData(d->cb_audioInDevice->currentIndex()).toString());
+ 	PsiOptions::instance()->setOption("options.media.devices.video-input", d->cb_videoInDevice->itemData(d->cb_videoInDevice->currentIndex()).toString());
++	PsiOptions::instance()->setOption("options.media.video-support", d->cb_videoSupport->isChecked());
+ }
+ 
+ void OptionsTabAvCall::restoreOptions()
+@@ -246,4 +247,5 @@ void OptionsTabAvCall::restoreOptions()
+ 	d->cb_audioOutDevice->setCurrentIndex(d->cb_audioOutDevice->findData(config.audioOutDeviceId));
+ 	d->cb_audioInDevice->setCurrentIndex(d->cb_audioInDevice->findData(config.audioInDeviceId));
+ 	d->cb_videoInDevice->setCurrentIndex(d->cb_videoInDevice->findData(config.videoInDeviceId));
++	d->cb_videoSupport->setChecked(PsiOptions::instance()->getOption("options.media.video-support").toBool());
+ }
+--- git.temp.orig/src/options/opt_avcall.ui
++++ git.temp/src/options/opt_avcall.ui
+@@ -1,74 +1,90 @@
+-<ui version="4.0" >
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
+  <class>OptAvCall</class>
+- <widget class="QWidget" name="OptAvCall" >
+-  <property name="geometry" >
++ <widget class="QWidget" name="OptAvCall">
++  <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>400</width>
+-    <height>108</height>
++    <height>114</height>
+    </rect>
+   </property>
+-  <property name="windowTitle" >
++  <property name="windowTitle">
+    <string>Form</string>
+   </property>
+-  <layout class="QGridLayout" >
+-   <item row="0" column="0" >
+-    <widget class="QLabel" name="label" >
+-     <property name="text" >
++  <layout class="QGridLayout">
++   <item row="0" column="0">
++    <widget class="QLabel" name="label">
++     <property name="text">
+       <string>Audio output:</string>
+      </property>
+     </widget>
+    </item>
+-   <item row="0" column="1" >
+-    <widget class="QComboBox" name="cb_audioOutDevice" >
+-     <property name="sizePolicy" >
+-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
++   <item row="0" column="2">
++    <widget class="QComboBox" name="cb_audioOutDevice">
++     <property name="sizePolicy">
++      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+-   <item row="1" column="0" >
+-    <widget class="QLabel" name="lb_audioInDevice" >
+-     <property name="text" >
++   <item row="1" column="0">
++    <widget class="QLabel" name="lb_audioInDevice">
++     <property name="text">
+       <string>Audio input:</string>
+      </property>
+     </widget>
+    </item>
+-   <item row="1" column="1" >
+-    <widget class="QComboBox" name="cb_audioInDevice" >
+-     <property name="sizePolicy" >
+-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
++   <item row="1" column="2">
++    <widget class="QComboBox" name="cb_audioInDevice">
++     <property name="sizePolicy">
++      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+-   <item row="2" column="0" >
+-    <widget class="QLabel" name="lb_videoInDevice" >
+-     <property name="text" >
++   <item row="3" column="0">
++    <widget class="QLabel" name="lb_videoInDevice">
++     <property name="text">
+       <string>Video input:</string>
+      </property>
+     </widget>
+    </item>
+-   <item row="2" column="1" >
+-    <widget class="QComboBox" name="cb_videoInDevice" >
+-     <property name="sizePolicy" >
+-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
++   <item row="3" column="2">
++    <widget class="QComboBox" name="cb_videoInDevice">
++     <property name="sizePolicy">
++      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
++   <item row="2" column="0">
++    <widget class="QLabel" name="label_2">
++     <property name="text">
++      <string>Video support:</string>
++     </property>
++    </widget>
++   </item>
++   <item row="2" column="2">
++    <widget class="QCheckBox" name="cb_videoSupport">
++     <property name="text">
++      <string/>
++     </property>
++    </widget>
++   </item>
+   </layout>
+  </widget>
+  <tabstops>
+   <tabstop>cb_audioOutDevice</tabstop>
+   <tabstop>cb_audioInDevice</tabstop>
++  <tabstop>cb_videoSupport</tabstop>
+   <tabstop>cb_videoInDevice</tabstop>
+  </tabstops>
+  <resources/>

psi-plus-main-20141106.tar.xz/patches/0810-psi-chatview-quote-feature.diff Added

@@ -0,0 +1,429 @@
+diff --git a/src/chatview_te.cpp b/src/chatview_te.cpp
+index abeb859..1e3904c 100644
+--- a/src/chatview_te.cpp
++++ b/src/chatview_te.cpp
+@@ -35,6 +35,8 @@
+ #include <QTimer>
+ #include <QKeyEvent>
+ #include <QUrl>
++#include <QMenu>
++#include <QTextDocumentFragment>
+ 
+ static const char *informationalColorOpt = "options.ui.look.colors.messages.informational";
+ 
+@@ -58,6 +60,12 @@ ChatView::ChatView(QWidget *parent)
+ 	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
+ 	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
+ #endif
++	actQuote_ = new QAction(tr("Quote"), this);
++	actQuote_->setEnabled(false);
++	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
++	addAction(actQuote_);
++	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
++	connect(this, SIGNAL(selectionChanged()), SLOT(changeActQuoteState()));
+ 
+ 	useMessageIcons_ = PsiOptions::instance()->getOption("options.ui.chat.use-message-icons").toBool();
+ 	if (useMessageIcons_) {
+@@ -123,10 +131,20 @@ void ChatView::contextMenuEvent(QContextMenuEvent *e)
+ 		e->accept();
+ 	}
+ 	else {
+-		PsiTextView::contextMenuEvent(e);
++		QMenu *menu = createStandardContextMenu(e->pos());
++		menu->exec(e->globalPos());
++		delete menu;
++		e->accept();
+ 	}
+ }
+ 
++QMenu* ChatView::createStandardContextMenu(const QPoint &position)
++{
++	QMenu *menu = PsiTextView::createStandardContextMenu(position);
++	menu->addAction(actQuote_);
++	return menu;
++}
++
+ void ChatView::addLogIconsResources()
+ {
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
+@@ -188,6 +206,24 @@ void ChatView::autoCopy()
+ }
+ 
+ /**
++ * Make quote from any selected text and paste it in chat window
++ */
++
++void ChatView::quoteEvent()
++{
++	emit quote(getPlainText());
++}
++
++/**
++ * Enable or disable actQuote_ in relations from hasSelection()
++ */
++
++void ChatView::changeActQuoteState()
++{
++	actQuote_->setEnabled(textCursor().hasSelection());
++}
++
++/**
+  * Handle KeyPress events that happen in ChatEdit widget. This is used
+  * to 'fix' the copy shortcut.
+  * \param object object that should receive the event
+diff --git a/src/chatview_te.h b/src/chatview_te.h
+index b3a3f1e..cf643d2 100644
+--- a/src/chatview_te.h
++++ b/src/chatview_te.h
+@@ -47,6 +47,7 @@ public:
+ 	QSize sizeHint() const;
+ 	void clear();
+ 	void contextMenuEvent(QContextMenuEvent *e);
++	QMenu* createStandardContextMenu(const QPoint &position);
+ 
+ 	void init();
+ 	void setDialog(QWidget* dialog);
+@@ -82,12 +83,15 @@ protected:
+ 
+ protected slots:
+ 	void autoCopy();
++	void quoteEvent();
++	void changeActQuoteState();
+ 
+ private slots:
+ 	void slotScroll();
+ 
+ signals:
+ 	void showNM(const QString&);
++	void quote(const QString &text);
+ 
+ private:
+ 	bool isMuc_;
+@@ -102,6 +106,7 @@ private:
+ 	QPixmap logIconDelivered;
+ 	QPixmap logIconTime;
+ 	QPixmap logIconInfo;
++	QAction *actQuote_;
+ };
+ 
+ #endif
+diff --git a/src/groupchatdlg.cpp b/src/groupchatdlg.cpp
+index fcdc942..53e6f87 100644
+--- a/src/groupchatdlg.cpp
++++ b/src/groupchatdlg.cpp
+@@ -819,6 +819,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	setShortcuts();
+ 	invalidateTab();
+ 	setConnecting();
++	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
+ }
+ 
+ GCMainDlg::~GCMainDlg()
+diff --git a/src/msgmle.cpp b/src/msgmle.cpp
+index 773e45b..852ab9c 100644
+--- a/src/msgmle.cpp
++++ b/src/msgmle.cpp
+@@ -33,6 +33,7 @@
+ #include <QTextDocument>
+ #include <QTimer>
+ #include <QMimeData>
++#include <QClipboard>
+ 
+ #include "shortcutmanager.h"
+ #include "spellchecker/spellhighlighter.h"
+@@ -93,6 +94,13 @@ void ChatEdit::initActions()
+ 	act_showMessageLast= new QAction(this);
+ 	addAction(act_showMessageLast);
+ 	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
++
++	QClipboard *clipboard = QApplication::clipboard();
++	actPasteAsQuote_ = new QAction(tr("Paste as Quotation"), this);
++	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
++	addAction(actPasteAsQuote_);
++	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
++	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
+ }
+ 
+ void ChatEdit::setShortcuts()
+@@ -119,6 +127,13 @@ void ChatEdit::setFont(const QFont &f)
+ 	controller_->setFont(f);
+ }
+ 
++QMenu* ChatEdit::createStandardContextMenu(const QPoint &position)
++{
++	QMenu *menu = QTextEdit::createStandardContextMenu(position);
++	menu->addAction(actPasteAsQuote_);
++	return menu;
++}
++
+ bool ChatEdit::checkSpellingGloballyEnabled()
+ {
+ 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
+@@ -223,8 +238,10 @@ void ChatEdit::contextMenuEvent(QContextMenuEvent *e)
+ 		}
+ 	}
+ 
+-	// Do normal menu
+-	QTextEdit::contextMenuEvent(e);
++	// Do custom menu
++	QMenu *menu = createStandardContextMenu(e->pos());
++	menu->exec(e->globalPos());
++	delete menu;
+ 	e->accept();
+ }
+ 
+@@ -299,6 +316,18 @@ void ChatEdit::showHistoryMessageNext()
+ 	}
+ }
+ 
++void ChatEdit::changeActPasteAsQuoteState()
++{
++	QClipboard *clipboard = QApplication::clipboard();
++	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
++}
++
++void ChatEdit::pasteAsQuote()
++{
++	QString text = QApplication::clipboard()->mimeData()->text();
++	insertAsQuote(text);
++}
++
+ void ChatEdit::showHistoryMessagePrev()
+ {
+ 	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
+@@ -408,6 +437,24 @@ void ChatEdit::setCssString(const QString &css) {
+ 	controller_->setCssString(css);
+ }
+ 
++void ChatEdit::insertAsQuote(const QString &text)
++{
++	int pos =  textCursor().position();
++	QString prevLine = toPlainText().left(pos - 1);
++	prevLine = prevLine.mid(prevLine.lastIndexOf("\n") + 1);
++
++	QString quote = QString::fromUtf8("» ") + text;
++	quote.replace("\n", QString::fromUtf8("\n» "));
++
++	// Check for previous quote and merge if true
++	if(!prevLine.startsWith(QString::fromUtf8("»"))) {
++		quote.prepend("\n");
++	}
++	quote.append("\n");
++	insertPlainText(quote);
++}
++
++
+ //----------------------------------------------------------------------------
+ // LineEdit
+ //----------------------------------------------------------------------------
+diff --git a/src/msgmle.h b/src/msgmle.h
+index a18d69f..a32c064 100644
+--- a/src/msgmle.h
++++ b/src/msgmle.h
+@@ -49,6 +49,7 @@ public:
+ 	// reimplemented
+ 	QSize sizeHint() const;
+ 	void setFont(const QFont &);
++	QMenu* createStandardContextMenu(const QPoint &position);
+ 
+ 	static bool checkSpellingGloballyEnabled();
+ 	void setCheckSpelling(bool);
+@@ -59,6 +60,7 @@ public slots:
+ 	void clearMessageHistory();
+ 	void doHTMLTextMenu();
+ 	void setCssString(const QString& css);
++	void insertAsQuote(const QString& text);
+ 
+ protected slots:
+  	void applySuggestion();
+@@ -68,6 +70,8 @@ protected slots:
+ 	void showHistoryMessagePrev();
+ 	void showHistoryMessageFirst();
+ 	void showHistoryMessageLast();
++	void changeActPasteAsQuoteState();
++	void pasteAsQuote();
+ 
+ protected:
+ 	// override the tab/esc behavior
+@@ -92,6 +96,8 @@ private:
+ 	QAction* act_showMessageNext;
+ 	QAction* act_showMessageFirst;
+ 	QAction* act_showMessageLast;
++	QAction *actPasteAsQuote_;
++
+ 	QString currentText;
+ 	HTMLTextController *controller_;
+ };
+diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
+index c5e5087..f7f9c08 100644
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
+@@ -256,6 +256,8 @@ void PsiChatDlg::initUi()
+ 	}
+ 	setMargins();
+ 
++	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
++	
+ 	ui_.mini_prompt->hide();
+ 
+ 	if (throbber_icon == 0) {
+diff --git a/src/webview.cpp b/src/webview.cpp
+index 1648b4a..9069fc6 100644
+--- a/src/webview.cpp
++++ b/src/webview.cpp
+@@ -45,6 +45,11 @@ WebView::WebView(QWidget* parent) : QWebView(parent), possibleDragging(false), i
+ 	connect(page()->action(QWebPage::Cut), SIGNAL(triggered()), SLOT(textCopiedEvent()));
+ 	connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStartedEvent()));
+ 	connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinishedEvent(bool)));
++
++	actQuote_ = new QAction(tr("Quote"), this);
++	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
++	addAction(actQuote_);
++	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
+ }
+ 
+ void WebView::linkClickedEvent(const QUrl& url)
+@@ -68,6 +73,11 @@ void WebView::loadFinishedEvent(bool success)
+ 	isLoading_ = false;
+ }
+ 
++void WebView::quoteEvent()
++{
++	emit quote(selectedText());
++}
++
+ void WebView::contextMenuEvent(QContextMenuEvent* event)
+ {
+ 	if (isLoading_) return;
+@@ -85,6 +95,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* event)
+ 		menu = new QMenu(this);
+ 		if (!page()->selectedText().isEmpty()) {
+ 			menu->addAction(pageAction(QWebPage::Copy));
++			menu->addAction(actQuote_);
+ 		} else {
+ 			if (!menu->isEmpty()) {
+ 				menu->addSeparator();
+diff --git a/src/webview.h b/src/webview.h
+index 77489af..e8ff0ba 100644
+--- a/src/webview.h
++++ b/src/webview.h
+@@ -100,13 +100,17 @@ private:
+ 	bool isLoading_;
+ 	QStringList jsBuffer_;
+ 	QPoint dragStartPosition;
++	QAction *actQuote_;
+ 
++signals:
++	void quote(const QString &text);
+ 
+ protected slots:
+ 	void linkClickedEvent(const QUrl& url);
+ 	void textCopiedEvent();
+ 	void loadStartedEvent();
+ 	void loadFinishedEvent(bool);
++	void quoteEvent();
+ };
+ 
+ 
+diff --git a/src/widgets/psitextview.cpp b/src/widgets/psitextview.cpp
+index 804f640..47c694a 100644
+--- a/src/widgets/psitextview.cpp
++++ b/src/widgets/psitextview.cpp
+@@ -25,6 +25,7 @@
+ #include <QAbstractTextDocumentLayout>
+ #include <QTextDocumentFragment>
+ #include <QTextFragment>
++#include <QRegExp>
+ #include <QMimeData>
+ 
+ #include "urlobject.h"
+@@ -79,6 +80,54 @@ PsiTextView::PsiTextView(QWidget *parent)
+ 	viewport()->setMouseTracking(true); // we want to get all mouseMoveEvents
+ }
+ 
++ /**
++ * Reimplemented createStandardContextMenu(const QPoint &position)
++ * for creating of custom context menu
++ */
++
++QMenu* PsiTextView::createStandardContextMenu(const QPoint &position)
++{
++	QTextCursor textcursor = cursorForPosition(position);
++	QMenu *menu;
++	QString anc = anchorAt(position);
++	if (!anc.isEmpty()) {
++		menu = URLObject::getInstance()->createPopupMenu(anc);
++
++		int posInBlock = textcursor.position() - textcursor.block().position();
++		QString textblock = textcursor.block().text();
++		int begin = textcursor.block().position() + textblock.lastIndexOf(QRegExp("\\s|^"), posInBlock) + 1;
++		int end = textcursor.block().position() + textblock.indexOf(QRegExp("\\s|$"), posInBlock);
++		textcursor.setPosition(begin);
++		textcursor.setPosition(end, QTextCursor::KeepAnchor);
++		setTextCursor(textcursor);
++
++		menu = URLObject::getInstance()->createPopupMenu(anc);
++	}
++	else {
++		if (isSelectedBlock() || !textCursor().hasSelection()) { // only if no selection we select text block
++			int begin = textcursor.block().position();
++			int end = begin + textcursor.block().length() - 1;
++			textcursor.setPosition(begin);
++			textcursor.setPosition(end, QTextCursor::KeepAnchor);
++			setTextCursor(textcursor);
++		}
++		menu = QTextEdit::createStandardContextMenu();
++	}
++	return menu;
++}
++
++bool PsiTextView::isSelectedBlock()
++{
++	if (textCursor().hasSelection()) {
++		const QTextCursor &cursor = textCursor();
++		const QTextBlock  &block  = cursor.block();
++		int start = cursor.selectionStart();
++		if (block.position() == start && block.length() == cursor.selectionEnd() - start + 1)
++			return true;
++	}
++	return false;
++}
++
+ /**
+  * This function returns true if vertical scroll bar is
+  * at its maximum position.
+@@ -175,11 +224,7 @@ QString PsiTextView::getPlainText() const
+ 
+ void PsiTextView::contextMenuEvent(QContextMenuEvent *e)
+ {
+-	QMenu *menu;
+-	if (!anchorAt(e->pos()).isEmpty())
+-		menu = URLObject::getInstance()->createPopupMenu(anchorAt(e->pos()));
+-	else
+-		menu = createStandardContextMenu();
++	QMenu *menu = createStandardContextMenu(e->pos());
+ 	menu->exec(e->globalPos());
+ 	e->accept();
+ 	delete menu;
+diff --git a/src/widgets/psitextview.h b/src/widgets/psitextview.h
+index 5c1c3c1..377365f 100644
+--- a/src/widgets/psitextview.h
++++ b/src/widgets/psitextview.h
+@@ -32,6 +32,9 @@ class PsiTextView : public QTextEdit
+ public:
+ 	PsiTextView(QWidget *parent = 0);
+ 
++	// Reimplemented
++	QMenu* createStandardContextMenu(const QPoint &position);
++
+ 	bool atBottom();
+ 
+ 	virtual void appendText(const QString &text);
+@@ -68,6 +71,7 @@ protected:
+ 	class Private;
+ private:
+ 	Private *d;
++	bool isSelectedBlock();
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/0820-psi-resolve-nickname-by-N-for-adduserdlg.diff Added

@@ -0,0 +1,37 @@
+--- git.temp.orig/src/adduserdlg.cpp
++++ git.temp/src/adduserdlg.cpp
+@@ -329,10 +329,30 @@ void AddUserDlg::resolveNickFinished()
+ 	JT_VCard *jt = (JT_VCard *)sender();
+ 
+ 	if(jt->success()) {
+-		if ( !jt->vcard().nickName().isEmpty() )
+-			le_nick->setText( jt->vcard().nickName() );
+-		else if( !jt->vcard().fullName().isEmpty() )
+-			le_nick->setText( jt->vcard().fullName() );
++		QString nickname;
++		const XMPP::VCard vcard = jt->vcard();
++		if ( !vcard.nickName().isEmpty() ) {
++			nickname = vcard.nickName();
++		} else if ( !vcard.fullName().isEmpty() ) {
++			nickname = vcard.fullName();
++		} else {
++			nickname = vcard.givenName();
++			if ( nickname.isEmpty() ) {
++				nickname = vcard.middleName();
++			} else if ( !vcard.middleName().isEmpty() ) {
++				nickname += " " + vcard.middleName();
++			}
++			if ( nickname.isEmpty() ) {
++				nickname = vcard.familyName();
++			} else if ( !vcard.familyName().isEmpty() ) {
++				nickname += " " + vcard.familyName();
++			}
++		}
++
++		if ( nickname.isEmpty() ) {
++			nickname = jt->jid().bare();
++		}
++		le_nick->setText(nickname);
+ 	}
+ }
+

psi-plus-main-20141106.tar.xz/patches/0830-psi-xmlconsole-filter-group-always-enable.diff Added

psi-plus-main-20141106.tar.xz/patches/0840-psi-nix-systemwatch.diff Added

@@ -0,0 +1,62 @@
+--- git.temp.orig/src/libpsi/tools/systemwatch/systemwatch_unix.cpp
++++ git.temp/src/libpsi/tools/systemwatch/systemwatch_unix.cpp
+@@ -19,7 +19,42 @@
+  */
+ 
+ #include "systemwatch_unix.h"
++#ifdef USE_DBUS
++# include <QDBusConnection>
++#endif
+ 
+ UnixSystemWatch::UnixSystemWatch()
+ {
++#ifdef USE_DBUS
++	// TODO: check which service we should listen to
++	QDBusConnection conn = QDBusConnection::systemBus();
++	// listen to systemd's logind
++	// TODO: use delaying Inhibitor locks
++	conn.connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", this, SLOT(prepareForSleep(bool)));
++	// listen to UPower
++	conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Sleeping", this, SLOT(sleeping()));
++	conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Resuming", this, SLOT(resuming()));
++#endif
++}
++
++void UnixSystemWatch::prepareForSleep(bool beforeSleep)
++{
++	if (beforeSleep)
++	{
++		emit sleep();
++	}
++	else
++	{
++		emit wakeup();
++	}
++}
++
++void UnixSystemWatch::sleeping()
++{
++	emit sleep();
++}
++
++void UnixSystemWatch::resuming()
++{
++	emit wakeup();
+ }
+--- git.temp.orig/src/libpsi/tools/systemwatch/systemwatch_unix.h
++++ git.temp/src/libpsi/tools/systemwatch/systemwatch_unix.h
+@@ -25,8 +25,14 @@
+ 
+ class UnixSystemWatch : public SystemWatch
+ {
++	Q_OBJECT
+ public:
+ 	UnixSystemWatch();
++
++private slots:
++	void prepareForSleep(bool beforeSleep);
++	void sleeping();
++	void resuming();
+ };
+ 
+

psi-plus-main-20141106.tar.xz/patches/0850-psi-add-trackbar-to-chats.diff Added

@@ -0,0 +1,63 @@
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -103,6 +103,7 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 	transid_ = -1;
+ 	key_ = "";
+ 	lastWasEncrypted_ = false;
++	trackBar_ = false;
+ 
+ 	status_ = -1;
+ 
+@@ -164,6 +165,12 @@ void ChatDlg::initComposing()
+ 	chatEditCreated();
+ }
+ 
++void ChatDlg::doTrackBar()
++{
++	trackBar_ = false;
++	chatView()->doTrackBar();
++}
++
+ void ChatDlg::initActions()
+ {
+ 	act_send_ = new QAction(this);
+@@ -325,6 +332,8 @@ void ChatDlg::logSelectionChanged()
+ void ChatDlg::deactivated()
+ {
+ 	TabbableWidget::deactivated();
++
++	trackBar_ = true;
+ }
+ 
+ void ChatDlg::activated()
+@@ -339,6 +348,8 @@ void ChatDlg::activated()
+ 	doFlash(false);
+ 
+ 	chatEdit()->setFocus();
++
++	trackBar_ = false;
+ }
+ 
+ void ChatDlg::dropEvent(QDropEvent* event)
+@@ -839,6 +850,9 @@ QString ChatDlg::whoNick(bool local) con
+ 
+ void ChatDlg::appendMessage(const Message &m, bool local)
+ {
++	if(trackBar_)
++		doTrackBar();
++
+ 	// figure out the encryption state
+ 	bool encChanged = false;
+ 	bool encEnabled = false;
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -180,6 +180,9 @@ private:
+ 	bool keepOpen_;
+ 	bool warnSend_;
+ 
++	bool trackBar_;
++	void doTrackBar();
++
+ 	QTimer* selfDestruct_;
+ 
+ 	QString key_;

psi-plus-main-20141106.tar.xz/patches/0860-psi-vert-splitter-position.diff Added

@@ -0,0 +1,268 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -119,6 +119,8 @@
+ 				<only-paste-template type="bool">false</only-paste-template>
+ 				<hide-when-closing type="bool">false</hide-when-closing>
+ 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
++				<log-height type="int">325</log-height>
++				<chatedit-height type="int">10</chatedit-height>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+--- git.orig/src/chatsplitter.cpp
++++ git/src/chatsplitter.cpp
+@@ -75,6 +75,15 @@ void ChatSplitter::setSizes(const QList<
+ 		splitter_->setSizes(list);
+ }
+ 
++QList<int> ChatSplitter::sizes()
++{
++	QList<int> list;
++	if(splitter_)
++		list = splitter_->sizes();
++
++	return list;
++}
++
+ /**
+  * Moves \a child either to the real QSplitter, or adds it to the
+  * private layout.
+@@ -130,6 +139,8 @@ void ChatSplitter::updateLayout()
+ 
+ 	foreach(QWidget* child, children_)
+ 		updateChildLayout(child);
++
++	connect(splitter_, SIGNAL(splitterMoved(int,int)), SIGNAL(splitterMoved(int,int)));
+ }
+ 
+ /**
+--- git.orig/src/chatsplitter.h
++++ git/src/chatsplitter.h
+@@ -35,6 +35,7 @@ public:
+ 	void setOrientation(Qt::Orientation orientation);
+ 	void addWidget(QWidget* widget);
+ 	void setSizes(const QList<int>& list);
++	QList<int> sizes();
+ 
+ protected:
+ 	/**
+@@ -49,6 +50,9 @@ public slots:
+ private slots:
+ 	void childDestroyed(QObject* obj);
+ 
++signals:
++	void splitterMoved(int,int);
++
+ private:
+ 	void updateChildLayout(QWidget* child);
+ 	void updateLayout();
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -239,6 +239,9 @@ public:
+ 	int logSize;
+ 	int rosterSize;
+ 
++	int logHeight;
++	int chateditHeight;
++
+ public:
+ 	bool trackBar;
+ 
+@@ -782,6 +785,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
+ 
+ 	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
++	connect(ui_.vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
+ 
+ 	// resize the horizontal splitter
+ 	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
+@@ -799,10 +803,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
+ 
+ 	// resize the vertical splitter
+-	list.clear();
+-	list << 324;
+-	list << 10;
+-	ui_.vsplitter->setSizes(list);
++	d->logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
++	d->chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
++	setVSplitterPosition(d->logHeight, d->chateditHeight);
+ 
+ 	X11WM_CLASS("groupchat");
+ 
+@@ -855,6 +858,26 @@ void GCMainDlg::horizSplitterMoved()
+ 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
+ }
+ 
++void GCMainDlg::verticalSplitterMoved(int, int)
++{
++	QList<int> list = ui_.vsplitter->sizes();
++	d->logHeight = list.first();
++	d->chateditHeight = list.last();
++	PsiOptions::instance()->setOption("options.ui.chat.log-height", d->logHeight);
++	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", d->chateditHeight);
++
++	emit vSplitterMoved(d->logHeight, d->chateditHeight);
++}
++
++void GCMainDlg::setVSplitterPosition(int log,int chat)
++{
++	QList<int> list;
++	d->logHeight = log;
++	d->chateditHeight = chat;
++	list << log << chat;
++	ui_.vsplitter->setSizes(list);
++}
++
+ void GCMainDlg::doMinimize()
+ {
+ 	window()->showMinimized();
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -85,6 +85,7 @@ public:
+ 	virtual TabbableWidget::State state() const;
+ 	virtual int unreadMessageCount() const;
+ 	virtual QString desiredCaption() const;
++	virtual void setVSplitterPosition(int log,int chat);
+ 
+ protected:
+ 	void setShortcuts();
+@@ -145,6 +146,7 @@ private slots:
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
+ 	void horizSplitterMoved();
++	void verticalSplitterMoved(int, int);
+ 	void doMinimize();
+ 
+ 
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -236,10 +236,11 @@ void PsiChatDlg::initUi()
+ 
+ 	connect(account()->capsManager(), SIGNAL(capsChanged(const Jid&)), SLOT(capsChanged(const Jid&)));
+ 
+-	QList<int> list;
+-	list << 324;
+-	list << 96;
+-	ui_.splitter->setSizes(list);
++	logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
++	chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
++	setVSplitterPosition(logHeight, chateditHeight);
++
++	connect(ui_.splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
+ 
+ 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
+  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
+@@ -266,6 +267,26 @@ void PsiChatDlg::initUi()
+ 	unacked_messages = 0;
+ }
+ 
++void PsiChatDlg::verticalSplitterMoved(int, int)
++{
++	QList<int> list = ui_.splitter->sizes();
++	logHeight = list.first();
++	chateditHeight = list.last();
++	PsiOptions::instance()->setOption("options.ui.chat.log-height", logHeight);
++	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", chateditHeight);
++
++	emit vSplitterMoved(logHeight, chateditHeight);
++}
++
++void PsiChatDlg::setVSplitterPosition(int log,int chat)
++{
++	QList<int> list;
++	logHeight = log;
++	chateditHeight = chat;
++	list << log << chat;
++	ui_.splitter->setSizes(list);
++}
++
+ void PsiChatDlg::updateCountVisibility()
+ {
+ 	if (PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && !smallChat_) {
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -22,6 +22,8 @@ public:
+ 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
+ 	~PsiChatDlg();
+ 
++	virtual void setVSplitterPosition(int log,int chat);
++
+ protected:
+ 	// reimplemented
+ 	void contextMenuEvent(QContextMenuEvent *);
+@@ -52,6 +54,7 @@ private slots:
+ 	void doPasteAndSend();
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
++	void verticalSplitterMoved(int, int);
+ 
+ private:
+ 	void initToolBar();
+@@ -110,6 +113,9 @@ private:
+ 	static PsiIcon *throbber_icon;
+ 	bool tabmode;
+ 	QPointer <PsiWindowHeader> winHeader_;
++
++	int logHeight;
++	int chateditHeight;
+ };
+ 
+ #endif
+--- git.orig/src/tabs/tabbablewidget.h
++++ git/src/tabs/tabbablewidget.h
+@@ -68,6 +68,7 @@ public:
+ 	virtual State state() const = 0;
+ 	virtual int unreadMessageCount() const = 0;
+ 	virtual QString desiredCaption() const = 0;
++	virtual void setVSplitterPosition(int,int){}; // default implementation do nothing
+ 
+ 	// Templates
+ 	SendButtonTemplatesMenu* getTemplateMenu();
+@@ -78,6 +79,7 @@ signals:
+ 	void invalidateTabInfo();
+ 	void updateFlashState();
+ 	void eventsRead(const Jid &);
++	void vSplitterMoved(int,int);
+ 
+ public slots:
+ 	virtual void deactivated();
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -426,6 +426,7 @@ void TabDlg::addTab(TabbableWidget* tab)
+ 
+ 	connect(tab, SIGNAL(invalidateTabInfo()), SLOT(updateTab()));
+ 	connect(tab, SIGNAL(updateFlashState()), SLOT(updateFlashState()));
++	connect(tab, SIGNAL(vSplitterMoved(int,int)), SLOT(updateVSplitters(int,int)));
+ 
+ 	updateTab(tab);
+ 	setUpdatesEnabled(true);
+@@ -496,6 +497,7 @@ void TabDlg::removeTabWithNoChecks(Tabba
+ {
+ 	disconnect(tab, SIGNAL(invalidateTabInfo()), this, SLOT(updateTab()));
+ 	disconnect(tab, SIGNAL(updateFlashState()), this, SLOT(updateFlashState()));
++	disconnect(tab, SIGNAL(vSplitterMoved(int,int)), this, SLOT(updateVSplitters(int,int)));
+ 
+ 	tabs_.removeAll(tab);
+ 	tabWidget_->removePage(tab);
+@@ -906,3 +908,10 @@ void TabDlg::setTabIcon(QWidget *widget,
+ {
+ 	tabWidget_->setTabIcon(widget, icon);
+ }
++
++void TabDlg::updateVSplitters(int log, int chat)
++{
++	foreach(TabbableWidget *w, tabs_) {
++		w->setVSplitterPosition(log, chat);
++	}
++}
+--- git.orig/src/tabs/tabdlg.h
++++ git/src/tabs/tabdlg.h
+@@ -146,6 +146,7 @@ private slots:
+ 	void menu_sendTabTo(QAction *act);
+ 	void queuedSendTabTo(TabbableWidget* chat, TabDlg *dest);
+ 	void showTabMenu(int tab, QPoint pos, QContextMenuEvent * event);
++	void updateVSplitters(int log, int chat);
+ 
+ private:
+ 	TabDlgDelegate *delegate_;

psi-plus-main-20141106.tar.xz/patches/0870-psi-allow-accounts-reordering-in-manager.diff Added

@@ -0,0 +1,230 @@
+--- git.orig/src/accountmanagedlg.cpp
++++ git/src/accountmanagedlg.cpp
+@@ -257,6 +257,7 @@ public:
+ 	{
+ 		pa = _pa;
+ 		Q_ASSERT(!pa.isNull());
++		setFlags(flags() ^ Qt::ItemIsDropEnabled);
+ 		connect(pa, SIGNAL(updatedActivity()), SLOT(updateInfo()));
+ 		connect(pa, SIGNAL(updatedAccount()), SLOT(updateInfo()));
+ 		updateInfo();
+@@ -286,6 +287,36 @@ private slots:
+ 	}
+ };
+ 
++
++
++AccountManageTree::AccountManageTree(QWidget *parent)
++	: QTreeWidget(parent)
++{
++
++}
++
++void AccountManageTree::dropEvent(QDropEvent *event)
++{
++	QTreeWidget::dropEvent(event);
++	AccountManageTree *tree = qobject_cast<AccountManageTree *>(event->source());
++
++	if (tree) {
++		QList<PsiAccount*> accountsList;
++		foreach (QTreeWidgetItem *ami, tree->findItems("*", Qt::MatchWildcard)) {
++			accountsList.append(((AccountManageItem *)ami)->pa.data());
++		}
++		emit orderChanged(accountsList);
++	}
++}
++
++void AccountManageTree::dragMoveEvent(QDragMoveEvent *event)
++{
++	QTreeWidget::dragMoveEvent(event);
++	sortByColumn(-1);
++}
++
++
++
+ AccountManageDlg::AccountManageDlg(PsiCon *_psi)
+ :QDialog(0)
+ {
+@@ -308,6 +339,7 @@ AccountManageDlg::AccountManageDlg(PsiCo
+ 
+ 	connect(lv_accs, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(modify(QTreeWidgetItem *)));
+ 	connect(lv_accs, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(qlv_selectionChanged(QTreeWidgetItem *, QTreeWidgetItem *)));
++	connect(lv_accs, SIGNAL(orderChanged(QList<PsiAccount*>)), psi, SLOT(setAccountsOrder(QList<PsiAccount*>)));
+ 	connect(psi, SIGNAL(accountAdded(PsiAccount *)), SLOT(accountAdded(PsiAccount *)));
+ 	connect(psi, SIGNAL(accountRemoved(PsiAccount *)), SLOT(accountRemoved(PsiAccount *)));
+ #ifdef HAVE_QT5
+@@ -315,6 +347,11 @@ AccountManageDlg::AccountManageDlg(PsiCo
+ #else
+ 	lv_accs->header()->setResizeMode(QHeaderView::ResizeToContents);
+ #endif
++	lv_accs->setDragDropMode(QAbstractItemView::InternalMove);
++	lv_accs->setDragDropOverwriteMode(false);
++	lv_accs->setSortingEnabled(true);
++	lv_accs->sortByColumn(-1);
++
+ 	foreach(PsiAccount* pa, psi->contactList()->accounts())
+ 		new AccountManageItem(lv_accs, pa);
+ 
+--- git.orig/src/accountmanagedlg.h
++++ git/src/accountmanagedlg.h
+@@ -21,7 +21,7 @@
+ #ifndef ACCOUNTMANAGEDLG_H
+ #define ACCOUNTMANAGEDLG_H
+ 
+-#include "ui_accountmanage.h"
++#include <QTreeWidget>
+ 
+ namespace XMPP
+ {
+@@ -33,6 +33,23 @@ class PsiCon;
+ class PsiAccount;
+ class QTreeWidgetItem;
+ 
++class AccountManageTree : public QTreeWidget
++{
++	Q_OBJECT
++
++public:
++	AccountManageTree(QWidget *parent = 0);
++
++protected:
++	void dropEvent(QDropEvent *event);
++	void dragMoveEvent(QDragMoveEvent *event);
++
++signals:
++	void orderChanged(QList<PsiAccount *> accountsList);
++};
++
++#include "ui_accountmanage.h"
++
+ class AccountManageDlg : public QDialog, public Ui::AccountManage
+ {
+ 	Q_OBJECT
+--- git.orig/src/accountmanage.ui
++++ git/src/accountmanage.ui
+@@ -17,7 +17,7 @@
+    <item>
+     <layout class="QHBoxLayout">
+      <item>
+-      <widget class="QTreeWidget" name="lv_accs">
++      <widget class="AccountManageTree" name="lv_accs">
+        <property name="indentation">
+         <number>0</number>
+        </property>
+@@ -121,6 +121,11 @@
+    <extends>QWidget</extends>
+    <header>iconbutton.h</header>
+   </customwidget>
++  <customwidget>
++   <class>AccountManageTree</class>
++   <extends>QTreeWidget</extends>
++   <header>accountmanagedlg.h</header>
++  </customwidget>
+  </customwidgets>
+  <resources/>
+  <connections>
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -240,11 +240,13 @@ public:
+ 		accountTree.removeOption("accounts", true);
+ 		// save accounts with known base
+ 		QSet<QString> cbases;
++		QStringList order;
+ 		foreach(UserAccount ua, acc) {
+ 			if (!ua.optionsBase.isEmpty()) {
+ 				ua.toOptions(&accountTree);
+ 				cbases += ua.optionsBase;
+ 			}
++			order.append(ua.id);
+ 		}
+ 		// save new accounts
+ 		int idx = 0;
+@@ -258,6 +260,7 @@ public:
+ 				ua.toOptions(&accountTree, base);
+ 			}
+ 		}
++		accountTree.setOption("order", order);
+ 		QFile accountsFile(pathToProfile(activeProfile, ApplicationInfo::ConfigLocation) + "/accounts.xml");
+ 		accountTree.saveOptions(accountsFile.fileName(), "accounts", ApplicationInfo::optionsNS(), ApplicationInfo::version());;
+ 
+@@ -647,6 +650,17 @@ bool PsiCon::init()
+ 			ua.fromOptions(&d->accountTree, base);
+ 			accs += ua;
+ 		}
++		QStringList order = d->accountTree.getOption("order").toStringList();
++		int start = 0;
++		foreach (const QString &id, order) {
++			for (int i = start; i < accs.size(); ++i) {
++				if (accs[i].id == id) {
++					accs.move(i, start);
++					start++;
++					break;
++				}
++			}
++		}
+ 
+ 		// Disable accounts if necessary, and overwrite locked properties
+ 		bool single = options->getOption("options.ui.account.single").toBool();
+@@ -1019,6 +1033,11 @@ void PsiCon::removeAccount(PsiAccount *p
+ 	d->contactList->removeAccount(pa);
+ }
+ 
++void PsiCon::setAccountsOrder(QList<PsiAccount*> accounts)
++{
++	d->contactList->setAccountsOrder(accounts);
++}
++
+ void PsiCon::statusMenuChanged(XMPP::Status::Type x, bool forceDialog)
+ {
+ #ifndef YAPSI
+--- git.orig/src/psicon.h
++++ git/src/psicon.h
+@@ -148,6 +148,7 @@ public slots:
+ 	void doToolbars();
+ 	void doStatusPresets();
+ 	void checkAccountsEmpty();
++	void setAccountsOrder(QList<PsiAccount*>);
+ 
+ public slots:
+ 	void doSleep();
+--- git.orig/src/psicontactlist.cpp
++++ git/src/psicontactlist.cpp
+@@ -280,6 +280,28 @@ UserAccountList PsiContactList::getUserA
+ }
+ 
+ /**
++ * Moves accounts from list to top. affects default account
++ */
++void PsiContactList::setAccountsOrder(QList<PsiAccount*> accounts)
++{
++	int start = 0;
++	bool needSave = false;
++	foreach (PsiAccount *account, accounts) {
++		int index = accounts_.indexOf(account, start);
++		if (index != -1) {
++			accounts_.move(index, start);
++			if (index != start) {
++				needSave = true;
++			}
++			start++;
++		}
++	}
++	if (needSave) {
++		emit saveAccounts();
++	}
++}
++
++/**
+  * It's called by each and every PsiAccount on its creation.
+  */
+ void PsiContactList::link(PsiAccount* account)
+--- git.orig/src/psicontactlist.h
++++ git/src/psicontactlist.h
+@@ -62,6 +62,7 @@ public:
+ 	PsiAccount *defaultAccount() const;
+ 
+ 	UserAccountList getUserAccountList() const;
++	void setAccountsOrder(QList<PsiAccount*> accounts);
+ 
+ 	PsiAccount* createAccount(const QString& name, const Jid& j = "", const QString& pass = "", bool opt_host = false, const QString& host = "", int port = 5222, bool legacy_ssl_probe = true, UserAccount::SSLFlag ssl = UserAccount::SSL_Auto, QString proxyID = "", const QString &tlsOverrideDomain="", const QByteArray &tlsOverrideCert=QByteArray());
+ 	void createAccount(const UserAccount&);

psi-plus-main-20141106.tar.xz/patches/0880-psi-hide-muc-auto-join.diff Added

@@ -0,0 +1,210 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -291,6 +291,7 @@ QLineEdit#le_status_text {
+ 				</view>
+ 			</menu>
+ 			<muc comment="Multi-User Chat options">
++				<hide-on-autojoin type="bool">false</hide-on-autojoin>
+ 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
+ 				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
+ 				<log-width type="int">500</log-width>
+--- git.orig/src/mucjoindlg.cpp
++++ git/src/mucjoindlg.cpp
+@@ -48,6 +48,8 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
+ 	joinButton_ = ui_.buttonBox->addButton(tr("&Join"), QDialogButtonBox::AcceptRole);
+ 	joinButton_->setDefault(true);
+ 
++	reason_ = MucCustomJoin;
++
+ 	updateIdentity(pa);
+ 
+ 	ui_.cb_ident->setController(controller_);
+@@ -176,11 +178,13 @@ void MUCJoinDlg::updateBookmarks(PsiAcco
+ 	}
+ }
+ 
+-void MUCJoinDlg::doJoin()
++void MUCJoinDlg::doJoin(MucJoinReason r)
+ {
+ 	if (!account_ || !account_->checkConnected(this))
+ 		return;
+ 
++	reason_ = r;
++
+ 	QString host = ui_.le_host->text();
+ 	QString room = ui_.le_room->text();
+ 	QString nick = ui_.le_nick->text();
+@@ -246,6 +250,9 @@ void MUCJoinDlg::joined()
+ 
+ void MUCJoinDlg::error(int, const QString &str)
+ {
++	if(!isVisible())
++		show();
++
+ 	ui_.busy->stop();
+ 	setWidgetsEnabled(true);
+ 
+--- git.orig/src/mucjoindlg.h
++++ git/src/mucjoindlg.h
+@@ -36,6 +36,12 @@ class MUCJoinDlg : public QDialog
+ 	Q_OBJECT
+ 
+ public:
++
++	enum MucJoinReason {
++		MucAutoJoin,
++		MucCustomJoin
++	};
++
+ 	MUCJoinDlg(PsiCon *, PsiAccount *);
+ 	~MUCJoinDlg();
+ 
+@@ -48,11 +54,15 @@ public:
+ 
+ public slots:
+ 	void done(int);
+-	void doJoin();
++	void doJoin(MucJoinReason reason = MucCustomJoin);
+ 
+ 	// reimplemented
+ 	void accept();
+ 
++public:
++	MucJoinReason getReason() const { return reason_; };
++
++
+ private slots:
+ 	void updateIdentity(PsiAccount *);
+ 	void updateIdentityVisibility();
+@@ -67,6 +77,7 @@ private:
+ 	PsiAccount* account_;
+ 	QPushButton* joinButton_;
+ 	XMPP::Jid jid_;
++	MucJoinReason reason_;
+ 
+ 	void disableWidgets();
+ 	void enableWidgets();
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -130,7 +130,6 @@
+ #include "systeminfo.h"
+ #include "avatars.h"
+ #include "ahcommanddlg.h"
+-#include "mucjoindlg.h"
+ #include "ahcservermanager.h"
+ #include "rc.h"
+ #include "tabdlg.h"
+@@ -2341,7 +2340,7 @@ void PsiAccount::bookmarksAvailabilityCh
+ 	foreach(ConferenceBookmark c, d->bookmarkManager->conferences()) {
+ 		if (!findDialog<GCMainDlg*>(Jid(c.jid().bare())) && c.autoJoin()) {
+ 			if  (!joinSkip.contains(c.jid().full().toUpper()))
+-				actionJoin(c, true);
++				actionJoin(c, true, MUCJoinDlg::MucAutoJoin);
+ 		}
+ 	}
+ #endif
+@@ -3383,7 +3382,7 @@ void PsiAccount::actionJoin(const Jid& m
+ 			   false);
+ }
+ 
+-void PsiAccount::actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately)
++void PsiAccount::actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately, MUCJoinDlg::MucJoinReason reason)
+ {
+ #ifdef GROUPCHAT
+ 	MUCJoinDlg* w = new MUCJoinDlg(psi(), this);
+@@ -3392,9 +3391,11 @@ void PsiAccount::actionJoin(const Confer
+ 	w->setNick(bookmark.nick().isEmpty() ? JIDUtil::nickOrJid(this->nick(), d->jid.node()) : bookmark.nick());
+ 	w->setPassword(bookmark.password());
+ 
+-	w->show();
++	if(reason != MUCJoinDlg::MucAutoJoin
++	   || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool())
++		w->show();
+ 	if (connectImmediately) {
+-		w->doJoin();
++		w->doJoin(reason);
+ 	}
+ #else
+ 	Q_UNUSED(bookmark);
+@@ -5527,16 +5528,18 @@ void PsiAccount::edb_finished()
+ 	delete h;
+ }
+ 
+-void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType)
++void PsiAccount::openGroupChat(const Jid &j, ActivationType activationType, MUCJoinDlg::MucJoinReason reason)
+ {
+ #ifdef GROUPCHAT
+ 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
+ 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
+ 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
+ 	connect(d->psi, SIGNAL(emitOptionsUpdate()), w, SLOT(optionsUpdate()));
+-	w->ensureTabbedCorrectly();
+-	if (activationType == UserAction)
+-		w->bringToFront();
++	if(reason != MUCJoinDlg::MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
++		w->ensureTabbedCorrectly();
++		if (activationType == UserAction)
++			w->bringToFront();
++	}
+ #endif
+ }
+ 
+@@ -5617,10 +5620,17 @@ void PsiAccount::client_groupChatJoined(
+ 	MUCJoinDlg *w = findDialog<MUCJoinDlg*>(j);
+ 	if(!w)
+ 		return;
++	MUCJoinDlg::MucJoinReason r = w->getReason();
+ 	w->joined();
+ 
+-	// TODO: Correctly handle auto-join groupchats
+-	openGroupChat(j, UserAction);
++	openGroupChat(j, UserAction, r);
++//	if(r == MUCJoinDlg::MucAutoJoin && PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
++//		m = findDialog<GCMainDlg*>(Jid(j.bare()));
++//		if(m) {
++//			QTimer::singleShot(0, m, SLOT(hideTab()));
++//		}
++//	}
++
+ #endif
+ }
+ 
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -36,6 +36,7 @@
+ #include "mood.h"
+ #include "activity.h"
+ #include "geolocation.h"
++#include "mucjoindlg.h"
+ 
+ namespace XMPP
+ {
+@@ -198,7 +199,7 @@ public:
+ 	void showXmlConsole();
+ 	void openAddUserDlg();
+ 	void openAddUserDlg(const XMPP::Jid &jid, const QString &nick, const QString &group);
+-	void openGroupChat(const Jid &, ActivationType activationType);
++	void openGroupChat(const Jid &, ActivationType activationType, MUCJoinDlg::MucJoinReason reason = MUCJoinDlg::MucCustomJoin);
+ 	bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString& pass, bool nohistory = false);
+ 	void groupChatSetStatus(const QString &host, const QString &room, const Status &);
+ 	void groupChatChangeNick(const QString &host, const QString &room, const QString& nick, const Status &);
+@@ -361,7 +362,7 @@ public slots:
+ 	void actionSearch(const Jid &);
+ 	void actionManageBookmarks();
+ 	void actionJoin(const Jid& mucJid, const QString& password = QString());
+-	void actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately);
++	void actionJoin(const ConferenceBookmark& bookmark, bool connectImmediately, MUCJoinDlg::MucJoinReason reason = MUCJoinDlg::MucCustomJoin);
+ 	void actionDisco(const Jid &, const QString &);
+ 	void actionInvite(const Jid &, const QString &);
+ 	void actionVoice(const Jid&);
+--- git.orig/src/tabs/tabbablewidget.cpp
++++ git/src/tabs/tabbablewidget.cpp
+@@ -47,7 +47,7 @@ TabbableWidget::TabbableWidget(const Jid
+ 		TabbableWidget::templateMenu->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
+ 	}
+ 	++TabbableWidget::chatsCount;
+-	QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
++	//QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
+ }
+ 
+ void TabbableWidget::ensureTabbedCorrectly()

psi-plus-main-20141106.tar.xz/patches/0890-psi-auto-capitalizer.diff Added

@@ -0,0 +1,239 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -107,6 +107,7 @@
+ 				</avatars>
+ 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
+ 				<auto-popup type="bool">false</auto-popup>
++				<auto-capitalize type="bool">false</auto-capitalize>
+ 				<delete-contents-after type="QString">never</delete-contents-after>
+ 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
+ 				<use-chat-says-style type="bool">false</use-chat-says-style>
+@@ -559,6 +560,7 @@ QLineEdit#le_status_text {
+ 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
+ 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
+ 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
++				<change-case type="QKeySequence" comment="Change case of letters in the chat edit" >Ctrl+Alt+x</change-case>
+ 				<minimize type="QKeySequence" comment="Minimize active chat window"/>
+ 			</chat>
+ 			<contactlist comment="Shortcuts in the contactlist">
+--- git.orig/src/msgmle.cpp
++++ git/src/msgmle.cpp
+@@ -40,6 +40,126 @@
+ #include "psioptions.h"
+ #include "htmltextcontroller.h"
+ 
++#include "qdebug.h"
++
++//----------------------------------------------------------------------------
++// CapitalLettersController
++//----------------------------------------------------------------------------
++
++class CapitalLettersController : public QObject
++{
++	Q_OBJECT
++public:
++	CapitalLettersController(QTextEdit* parent)
++		: QObject()
++		, te_(parent)
++		, enabled_(true)
++	{
++		connect(te_->document(), SIGNAL(contentsChange(int,int,int)), SLOT(textChanged(int,int,int)));
++	}
++
++	virtual ~CapitalLettersController() {};
++
++	void setAutoCapitalizeEnabled(bool enabled)
++	{
++		enabled_ = enabled;
++	}
++
++private:
++	void capitalizeChar(int pos, QChar c)
++	{
++		changeChar(pos, c.toUpper());
++	}
++
++	void decapitalizeChar(int pos, QChar c)
++	{
++		changeChar(pos, c.toLower());
++	}
++
++	void changeChar(int pos, QChar c)
++	{
++		QTextCursor cur = te_->textCursor();
++		cur.setPosition(pos+1);
++		const QTextCharFormat cf = cur.charFormat();
++		cur.deletePreviousChar();
++		cur.setCharFormat(cf);
++		cur.insertText(c);
++	}
++
++public slots:
++	void textChanged(int pos, int /*charsRemoved*/, int charsAdded)
++	{
++		if(enabled_) {
++			if(charsAdded == 0) {
++				return;
++			}
++			if(!te_->textCursor().atEnd()) { //Editing the letter in the middle of the text
++				return;
++			}
++			bool capitalizeNext_ = false;
++
++			if(pos == 0 && charsAdded < 3) { //the first letter after the previous message was sent
++				capitalizeNext_ = true;
++			}
++			else if (charsAdded > 1) { //Insert a piece of text
++				return;
++			}
++			else {
++				QString txt = te_->toPlainText();
++				QRegExp capitalizeAfter("(?:^[^.][.]+\\s+)|(?:\\s*[^.]{2,}[.]+\\s+)|(?:[!?]\\s+)");
++				int index = txt.lastIndexOf(capitalizeAfter);
++				if(index != -1 && index == pos-capitalizeAfter.matchedLength()) {
++					capitalizeNext_ = true;
++				}
++			}
++
++			if(capitalizeNext_) {
++				QChar ch = te_->document()->characterAt(pos);
++				if(!ch.isLetter() || !ch.isLower()) {
++					return;
++				}
++				else {
++					capitalizeChar(pos, ch);
++				}
++			}
++		}
++	}
++
++	void changeCase()
++	{
++		bool tmpEnabled = enabled_;
++		enabled_ = false;
++		QTextCursor oldCur = te_->textCursor();
++		int pos = oldCur.position();
++		int begin = 0;
++		int end = te_->document()->characterCount();
++		if(oldCur.hasSelection()) {
++			begin = oldCur.selectionStart();
++			end = oldCur.selectionEnd();
++		}
++		for(; begin < end; begin++) {
++			QChar ch = te_->document()->characterAt(begin);
++			if(!ch.isLetter()) {
++				continue;
++			}
++
++			if(ch.isLower()) {
++				capitalizeChar(begin, ch);
++			}
++			else {
++				decapitalizeChar(begin, ch);
++			}
++		}
++		oldCur.setPosition(pos);
++		te_->setTextCursor(oldCur);
++		enabled_ = tmpEnabled;
++	}
++
++private:
++	QTextEdit* te_;
++	bool enabled_;
++};
++
+ 
+ //----------------------------------------------------------------------------
+ // ChatEdit
+@@ -51,6 +171,7 @@ ChatEdit::ChatEdit(QWidget *parent)
+ 	, spellhighlighter_(0)
+ {
+ 	controller_ = new HTMLTextController(this);
++	capitalizer_ = new CapitalLettersController(this);
+ 
+ 	setWordWrapMode(QTextOption::WordWrap);
+ 	setAcceptRichText(false);
+@@ -67,6 +188,7 @@ ChatEdit::ChatEdit(QWidget *parent)
+ 
+ 	initActions();
+ 	setShortcuts();
++	optionsChanged();
+ }
+ 
+ ChatEdit::~ChatEdit()
+@@ -74,6 +196,12 @@ ChatEdit::~ChatEdit()
+ 	clearMessageHistory();
+ 	delete spellhighlighter_;
+ 	delete controller_;
++	delete capitalizer_;
++}
++
++CapitalLettersController * ChatEdit::capitalizer()
++{
++	return capitalizer_;
+ }
+ 
+ void ChatEdit::initActions()
+@@ -100,6 +228,10 @@ void ChatEdit::initActions()
+ 	addAction(actPasteAsQuote_);
+ 	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
+ 	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
++
++	act_changeCase = new QAction(this);
++	addAction(act_changeCase);
++	connect(act_changeCase, SIGNAL(triggered()), capitalizer_, SLOT(changeCase()));
+ }
+ 
+ void ChatEdit::setShortcuts()
+@@ -108,6 +240,7 @@ void ChatEdit::setShortcuts()
+ 	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
+ 	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
+ 	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
++	act_changeCase->setShortcuts(ShortcutManager::instance()->shortcuts("chat.change-case"));
+ }
+ 
+ void ChatEdit::setDialog(QWidget* dialog)
+@@ -297,6 +430,7 @@ void ChatEdit::addToDictionary()
+ void ChatEdit::optionsChanged()
+ {
+ 	setCheckSpelling(checkSpellingGloballyEnabled());
++	capitalizer_->setAutoCapitalizeEnabled(PsiOptions::instance()->getOption("options.ui.chat.auto-capitalize").toBool());
+ }
+ 
+ void ChatEdit::showHistoryMessageNext()
+@@ -507,3 +641,5 @@ void LineEdit::updateScrollBar()
+ 	setVerticalScrollBarPolicy(sizeHint().height() > height() ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
+ 	ensureCursorVisible();
+ }
++
++#include "msgmle.moc"
+--- git.orig/src/msgmle.h
++++ git/src/msgmle.h
+@@ -34,6 +34,7 @@ class QResizeEvent;
+ class QTimer;
+ class SpellHighlighter;
+ class HTMLTextController;
++class CapitalLettersController;
+ 
+ 
+ class ChatEdit : public QTextEdit
+@@ -54,6 +55,7 @@ public:
+ 	static bool checkSpellingGloballyEnabled();
+ 	void setCheckSpelling(bool);
+ 	XMPP::HTMLElement toHTMLElement();
++	CapitalLettersController * capitalizer();
+ 
+ public slots:
+ 	void appendMessageHistory(const QString& text);
+@@ -97,9 +99,11 @@ private:
+ 	QAction* act_showMessageFirst;
+ 	QAction* act_showMessageLast;
+ 	QAction *actPasteAsQuote_;
++	QAction *act_changeCase;
+ 
+ 	QString currentText;
+ 	HTMLTextController *controller_;
++	CapitalLettersController *capitalizer_;
+ };
+ 
+

psi-plus-main-20141106.tar.xz/patches/0900-psi-disable-show-status-changes-in-chat.diff Added

@@ -0,0 +1,23 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -115,6 +115,7 @@
+ 				<use-small-chats type="bool">false</use-small-chats>
+ 				<use-message-icons type="bool">true</use-message-icons>
+ 				<scaled-message-icons type="bool">false</scaled-message-icons>
++				<show-status-changes type="bool">true</show-status-changes>
+ 				<warn-before-clear type="bool">true</warn-before-clear>
+ 				<css type="QString" />
+ 				<only-paste-template type="bool">false</only-paste-template>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -490,7 +490,9 @@ void ChatDlg::updateContact(const Jid &j
+ 			key_ = userStatus.publicKeyID;
+ 			updatePGP();
+ 
+-			if (fromPresence && statusChanged) {
++			if (PsiOptions::instance()->getOption("options.ui.chat.show-status-changes").toBool()
++				&& fromPresence && statusChanged)
++			{
+ 				chatView()->dispatchMessage(MessageView::statusMessage(
+ 												dispNick_, status_,
+ 												statusString_, priority_));

psi-plus-main-20141106.tar.xz/patches/0910-psi-autostart.diff Added

@@ -0,0 +1,139 @@
+--- git.temp.orig/src/applicationinfo.cpp
++++ git.temp/src/applicationinfo.cpp
+@@ -383,3 +383,28 @@ QString ApplicationInfo::currentProfileD
+ {
+ 	return pathToProfile(activeProfile, type);
+ }
++
++QString ApplicationInfo::desktopFile()
++{
++	QString dFile;
++	const QString execFileName = QFileInfo(qApp->applicationFilePath()).fileName();
++	const QString desktopFile = QString("/usr/share/applications/%1.desktop").arg(execFileName);
++	QFile f(desktopFile);
++	if(f.open(QIODevice::ReadOnly)) {
++		dFile = QString::fromUtf8(f.readAll());
++	}
++	else {
++		dFile = "[Desktop Entry]\n";
++		dFile += "Version=1.0\n";
++		dFile += "Type=Application\n";
++		dFile += QString("Name=%1\n").arg(name());
++		dFile += "GenericName=Jabber Client\n";
++		dFile += "Comment=Communicate over the Jabber network\n";
++		dFile += QString("Icon=%1\n").arg(execFileName);
++		dFile += QString("Exec=%1\n").arg(execFileName);
++		dFile += "Terminal=false\n";
++		dFile += "Categories=Network;InstantMessaging;Qt;";
++	}
++
++	return dFile;
++}
+--- git.temp.orig/src/applicationinfo.h
++++ git.temp/src/applicationinfo.h
+@@ -44,6 +44,9 @@ public:
+ 	static QString optionsNS();
+ 	static QString storageNS();
+ 	static QString fileCacheNS();
++
++	// Common
++	static QString desktopFile();
+ };
+ 
+ #endif
+--- git.temp.orig/src/options/opt_application.cpp
++++ git.temp/src/options/opt_application.cpp
+@@ -13,9 +13,17 @@
+ #include "qsettings.h"
+ #include <QList>
+ #include <QMessageBox>
++#include <QDir>
+ 
+ #include "ui_opt_application.h"
+ 
++#ifdef Q_OS_WIN
++	static const QString regString = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
++#endif
++#ifdef HAVE_X11
++	static const QString psiAutoStart = "/.config/autostart/psi-plus.desktop";
++#endif
++
+ class OptApplicationUI : public QWidget, public Ui::OptApplication
+ {
+ public:
+@@ -60,6 +68,7 @@ QWidget *OptionsTabApplication::widget()
+ 
+ #ifdef Q_OS_MAC
+ 	d->gb_docklet->hide();
++	d->ck_auto_load->hide();
+ #endif
+ 
+ 	if (!haveAutoUpdater_) {
+@@ -126,6 +135,29 @@ void OptionsTabApplication::applyOptions
+ 	}
+ 	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
+ 	s.setValue("last_lang", itemData);
++
++	//Auto-load
++#ifdef Q_OS_WIN
++	QSettings set(regString, QSettings::NativeFormat);
++	if(d->ck_auto_load->isChecked()) {
++		set.setValue(ApplicationInfo::name(), QDir::toNativeSeparators(qApp->applicationFilePath()));
++	}
++	else {
++		set.remove(ApplicationInfo::name());
++	}
++#endif
++#ifdef HAVE_X11
++	QDir home = QDir::home();
++	if (!home.exists(".config/autostart")) {
++		home.mkpath(".config/autostart");
++	}
++	QFile f(home.absolutePath() + psiAutoStart);
++	if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
++		const QString contents = ApplicationInfo::desktopFile().trimmed();
++		f.write(contents.toUtf8());
++		f.write(QString("\nHidden=%1").arg(d->ck_auto_load->isChecked() ? "false\n" : "true\n").toUtf8());
++	}
++#endif
+ }
+ 
+ void OptionsTabApplication::restoreOptions()
+@@ -164,6 +196,21 @@ void OptionsTabApplication::restoreOptio
+ 		d->cb_lang->setCurrentIndex( 0 );
+ 	else if(!curLang.isEmpty() && lang.contains(curLang) )
+ 		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
++
++	//Auto-load
++#ifdef Q_OS_WIN
++	QSettings set(regString, QSettings::NativeFormat);
++	const QString path = set.value(ApplicationInfo::name()).toString();
++	d->ck_auto_load->setChecked( (path == QDir::toNativeSeparators(qApp->applicationFilePath())) );
++#endif
++#ifdef HAVE_X11
++	QFile desktop(QDir::homePath() + psiAutoStart);
++	if (desktop.open(QIODevice::ReadOnly)
++		&& QString(desktop.readAll()).contains(QRegExp("\\bhidden\\s*=\\s*false", Qt::CaseInsensitive)))
++	{
++		d->ck_auto_load->setChecked(true);
++	}
++#endif
+ }
+ 
+ void OptionsTabApplication::doEnableQuitOnClose(int state)
+--- git.temp.orig/src/options/opt_application.ui
++++ git.temp/src/options/opt_application.ui
+@@ -14,6 +14,13 @@
+   </property>
+   <layout class="QVBoxLayout" >
+    <item>
++    <widget class="QCheckBox" name="ck_auto_load">
++     <property name="text">
++      <string>Automatically launch application when OS starts</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QCheckBox" name="ck_docklet" >
+      <property name="text" >
+       <string>Enable docklet</string>

psi-plus-main-20141106.tar.xz/patches/0920-psi-fix-tunes.diff Added

@@ -0,0 +1,1687 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -36,7 +36,7 @@
+ 				<publish comment="Publish user tune information" type="bool">true</publish>
+ 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
+ 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
+-				<controller-filter comment="List of disabled controllers" type="QString"></controller-filter>
++				<controller-filter comment="List of disabled controllers" type="QString">WinAmp</controller-filter>
+ 			</tune>
+ 		</extended-presence>
+ 		<muc comment="Multi-User Chat options">
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -27,7 +27,8 @@ HEADERS += \
+ 	$$PWD/opt_avcall.h \
+ 	$$PWD/opt_toolbars.h \
+ 	$$PWD/opt_advanced.h \
+-	$$PWD/opt_shortcuts.h
++	$$PWD/opt_shortcuts.h \
++	$$PWD/opt_statuspep.h
+ 
+ HEADERS += $$PWD/opt_tree.h
+ 
+@@ -48,7 +49,8 @@ SOURCES += \
+ 	$$PWD/opt_avcall.cpp \
+ 	$$PWD/opt_toolbars.cpp \
+ 	$$PWD/opt_advanced.cpp \
+-	$$PWD/opt_shortcuts.cpp
++	$$PWD/opt_shortcuts.cpp \
++	$$PWD/opt_statuspep.cpp
+ 
+ SOURCES += $$PWD/opt_tree.cpp
+ 
+@@ -75,7 +77,8 @@ FORMS += \
+ 	$$PWD/opt_iconset_system.ui \
+ 	$$PWD/opt_iconset_roster.ui \
+ 	$$PWD/opt_general_groupchat.ui \
+-	$$PWD/opt_shortcuts.ui
++	$$PWD/opt_shortcuts.ui \
++	$$PWD/opt_statuspep.ui
+ 
+ psi_plugins {
+ 	FORMS += $$PWD/opt_plugins.ui
+--- git.orig/src/options/opt_status.cpp
++++ git/src/options/opt_status.cpp
+@@ -1,6 +1,7 @@
+ #include "opt_status.h"
+ #include "opt_statusgeneral.h"
+ #include "opt_statusauto.h"
++#include "opt_statuspep.h"
+ 
+ OptionsTabStatus::OptionsTabStatus(QObject *parent)
+ : MetaOptionsTab(parent, "status", "", tr("Status"), tr("Status preferences"), "psi/status")
+@@ -10,4 +11,5 @@ OptionsTabStatus::OptionsTabStatus(QObje
+ 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), parent, SLOT(enableCommonWidgets(bool)));
+ 	connect(general, SIGNAL(enableDlgCommonWidgets(bool)), SLOT(enableOtherTabs(bool)));
+ 	addTab(new OptionsTabStatusAuto(this));
++	addTab(new OptionsTabStatusPep(this));
+ }
+--- git.orig/src/options/opt_statuspep.cpp
++++ git/src/options/opt_statuspep.cpp
+@@ -0,0 +1,108 @@
++#include "opt_statuspep.h"
++#include "psioptions.h"
++
++#include <QListWidget>
++#include <QCheckBox>
++
++#include "ui_opt_statuspep.h"
++
++static const char *tuneUrlFilterOptionPath = "options.extended-presence.tune.url-filter";
++static const char *tuneControllerFilterOptionPath = "options.extended-presence.tune.controller-filter";
++
++class OptStatusPepUI : public QWidget, public Ui::OptStatusPep
++{
++public:
++	OptStatusPepUI() : QWidget() { setupUi(this); }
++};
++
++OptionsTabStatusPep::OptionsTabStatusPep(QObject *parent)
++: OptionsTab(parent, "status_tunes", "", tr("PEP"), tr("Tunes no-video filter and controllers switcher"))
++, w_(0)
++, psi_(0)
++, controllersChanged_(false)
++{
++}
++
++OptionsTabStatusPep::~OptionsTabStatusPep()
++{
++}
++
++QWidget *OptionsTabStatusPep::widget()
++{
++	if (w_) {
++		return 0;
++	}
++
++	w_ = new OptStatusPepUI();
++	return w_;
++}
++
++void OptionsTabStatusPep::applyOptions()
++{
++	if (!w_) {
++		return;
++	}
++
++	OptStatusPepUI *d = (OptStatusPepUI *)w_;
++	PsiOptions* o = PsiOptions::instance();
++	QStringList newTuneFilters = d->tuneExtensions->text().split(QRegExp("\\W+"));
++	QString tuneExstensionsFilter;
++	if (!newTuneFilters.isEmpty()) {
++		newTuneFilters.removeDuplicates();
++		qSort(newTuneFilters);
++		tuneExstensionsFilter = newTuneFilters.join(" ").toLower();
++		d->tuneExtensions->setText(tuneExstensionsFilter);
++	}
++	QString controllerFilter = blackList_.join(",");
++	if (tuneExstensionsFilter != tuneFilters_) {
++		o->setOption(tuneUrlFilterOptionPath, tuneExstensionsFilter);
++	}
++	if (controllersChanged_) {
++		o->setOption(tuneControllerFilterOptionPath, controllerFilter);
++	}
++}
++
++void OptionsTabStatusPep::restoreOptions()
++{
++	if (!w_) {
++		return;
++	}
++
++	OptStatusPepUI *d = (OptStatusPepUI *)w_;
++	PsiOptions* o = PsiOptions::instance();
++	tuneFilters_ = o->getOption(tuneUrlFilterOptionPath).toString();
++	d->tuneExtensions->setText(tuneFilters_);
++	QStringList controllers = psi_->tuneManager()->controllerNames();
++	blackList_ = o->getOption(tuneControllerFilterOptionPath).toString().split(QRegExp("[,]\\s*"), QString::SkipEmptyParts);
++	foreach(const QString &name, controllers) {
++		QCheckBox* cb = new QCheckBox(name);
++		QString caption = name + " controller";
++		cb->setText(caption);
++		cb->setObjectName(name);
++		int i = controllers.indexOf(name);
++		d->gridLayout->addWidget(cb,i/3,i%3);
++		cb->setChecked(!blackList_.contains(name));
++		connect(cb, SIGNAL(toggled(bool)), SLOT(controllerSelected(bool)));
++	}
++}
++
++void OptionsTabStatusPep::controllerSelected(bool checked)
++{
++	QCheckBox *box = qobject_cast<QCheckBox*>(sender());
++	QString name_ = box->objectName();
++	if (!name_.isEmpty()) {
++		if (!checked && !blackList_.contains(name_, Qt::CaseInsensitive)) {
++			blackList_ << name_;
++			controllersChanged_ = true;
++		}
++		else if (checked) {
++			blackList_.removeAll(name_);
++			controllersChanged_ = true;
++		}
++	}
++}
++
++void OptionsTabStatusPep::setData(PsiCon *psi, QWidget *)
++{
++	psi_ = psi;
++}
+--- git.orig/src/options/opt_statuspep.h
++++ git/src/options/opt_statuspep.h
+@@ -0,0 +1,36 @@
++#ifndef OPT_STAUSPEP_H
++#define OPT_STAUSPEP_H
++
++#include "optionstab.h"
++#include "common.h"
++#include "psicon.h"
++
++class QWidget;
++
++class OptionsTabStatusPep : public OptionsTab
++{
++	Q_OBJECT
++
++public:
++
++	OptionsTabStatusPep(QObject *parent);
++	~OptionsTabStatusPep();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++	void setData(PsiCon *psi, QWidget *);
++
++protected slots:
++	void controllerSelected(bool);
++
++private:
++	QWidget *w_;
++	PsiCon *psi_;
++	QStringList blackList_;
++	QString tuneFilters_;
++	bool controllersChanged_;
++};
++
++
++#endif // OPT_STAUSPEP_H
+--- git.orig/src/options/opt_statuspep.ui
++++ git/src/options/opt_statuspep.ui
+@@ -0,0 +1,108 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>OptStatusPep</class>
++ <widget class="QWidget" name="OptStatusPep">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>588</width>
++    <height>350</height>
++   </rect>
++  </property>
++  <property name="sizePolicy">
++   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
++    <horstretch>0</horstretch>
++    <verstretch>0</verstretch>
++   </sizepolicy>
++  </property>
++  <property name="windowTitle">
++   <string>Form</string>
++  </property>
++  <property name="autoFillBackground">
++   <bool>false</bool>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout">
++   <item>
++    <widget class="QGroupBox" name="groupBox">
++     <property name="title">
++      <string>Tunes</string>
++     </property>
++     <property name="alignment">
++      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
++     </property>
++     <property name="flat">
++      <bool>false</bool>
++     </property>
++     <layout class="QVBoxLayout" name="verticalLayout_4">
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <item>
++       <widget class="QLabel" name="label">
++        <property name="text">
++         <string>Enter media file extensions to ignore them on tune sending</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QLineEdit" name="tuneExtensions">
++        <property name="toolTip">
++         <string>Add extensions</string>
++        </property>
++        <property name="whatsThis">
++         <string>Ignored media file extensions on psi tunes sending</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QGroupBox" name="rightGroupBox">
++        <property name="sizePolicy">
++         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
++          <horstretch>0</horstretch>
++          <verstretch>0</verstretch>
++         </sizepolicy>
++        </property>
++        <property name="title">
++         <string>Tune Controllers</string>
++        </property>
++        <property name="flat">
++         <bool>false</bool>
++        </property>
++        <layout class="QVBoxLayout" name="verticalLayout_2">
++         <property name="spacing">
++          <number>0</number>
++         </property>
++         <property name="sizeConstraint">
++          <enum>QLayout::SetDefaultConstraint</enum>
++         </property>
++         <property name="margin">
++          <number>6</number>
++         </property>
++         <item>
++          <layout class="QGridLayout" name="gridLayout"/>
++         </item>
++        </layout>
++       </widget>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <spacer name="verticalSpacer">
++     <property name="orientation">
++      <enum>Qt::Vertical</enum>
++     </property>
++     <property name="sizeHint" stdset="0">
++      <size>
++       <width>20</width>
++       <height>40</height>
++      </size>
++     </property>
++    </spacer>
++   </item>
++  </layout>
++ </widget>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -37,7 +37,7 @@ pep {
+ 	DEFINES += USE_PEP
+ 	CONFIG += tc_psifile
+ 	mac { CONFIG += tc_itunes }
+-	windows { CONFIG += tc_winamp }
++	windows { CONFIG += tc_aimp tc_winamp }
+ 	unix:dbus:!mac { CONFIG += tc_mpris }
+ }
+ include($$PWD/tools/tunecontroller/tunecontroller.pri)
+--- git.orig/src/tools/tunecontroller/aimptunecontroller.cpp
++++ git/src/tools/tunecontroller/aimptunecontroller.cpp
+@@ -0,0 +1,137 @@
++/*
++ * aimptunecontroller.cpp
++ * Copyright (C) 2012 Vitaly Tonkacheyev
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "aimptunecontroller.h"
++#include "plugins/aimp/third-party/apiRemote.h"
++
++/**
++ * \class AimpTuneController
++ * \brief A controller class for AIMP3 player.
++ */
++
++static const int PLAYING = 2;
++static const int STOPPED = 0;
++static const WCHAR* AIMP_REMOTE_CLASS = (WCHAR *)L"AIMP2_RemoteInfo";
++
++AimpTuneController::AimpTuneController()
++: PollingTuneController(),
++  _tuneSent(false)
++{
++	startPoll();
++}
++
++HWND AimpTuneController::findAimp() const
++{
++	return FindWindow(AIMP_REMOTE_CLASS, AIMP_REMOTE_CLASS);
++}
++
++int AimpTuneController::getAimpStatus(const HWND &aimp) const
++{
++	if (aimp) {
++		return (int)SendMessage(aimp, WM_AIMP_PROPERTY, AIMP_RA_PROPERTY_PLAYER_STATE | AIMP_RA_PROPVALUE_GET, 0);
++	}
++	return STOPPED;
++}
++
++void AimpTuneController::check()
++{
++	HWND aimp = findAimp();
++	if (getAimpStatus(aimp) == PLAYING) {
++		sendTune(getTune());
++	}
++	else {
++		clearTune();
++	}
++	PollingTuneController::check();
++}
++
++Tune AimpTuneController::currentTune() const
++{
++	return _currentTune;
++}
++
++Tune AimpTuneController::getTune() const
++{
++	HANDLE aFile=OpenFileMapping(FILE_MAP_READ, TRUE, AIMP_REMOTE_CLASS);
++	PAIMPRemoteFileInfo aInfo = (PAIMPRemoteFileInfo)MapViewOfFile(aFile, FILE_MAP_READ, 0, 0, AIMPRemoteAccessMapFileSize);
++	if (aInfo != NULL) {
++		wchar_t *str = (wchar_t *)((char*)aInfo + sizeof(*aInfo));
++		QString album = QString::fromWCharArray(str, aInfo->AlbumLength);
++		str += aInfo->AlbumLength;
++		QString artist = QString::fromWCharArray(str, aInfo->ArtistLength);
++		str += aInfo->ArtistLength + aInfo->DateLength;
++		QString url = QString::fromWCharArray(str, aInfo->FileNameLength);
++		str += aInfo->FileNameLength + aInfo->GenreLength;
++		QString title = QString::fromWCharArray(str, aInfo->TitleLength);
++		unsigned long trackNumber = aInfo->TrackNumber;
++		unsigned long time = aInfo->Duration;
++		Tune tune = Tune();
++		if (!url.isEmpty()) {
++			if (!title.isEmpty()) {
++				tune.setName(title);
++			}
++			else {
++				int index = url.replace("/", "\\").lastIndexOf("\\");
++				if (index > 0) {
++					QString filename = url.right(url.length()-index-1);
++					index = filename.lastIndexOf(".");
++					title = (index > 0) ? filename.left(index) : filename;
++				}
++				else {
++					title = url;
++				}
++				tune.setName(title);
++			}
++			if (trackNumber > 0) {
++				tune.setTrack(QString::number(trackNumber));
++			}
++			if (time > 0) {
++				tune.setTime((uint)time);
++			}
++			if (!artist.isEmpty()) {
++				tune.setArtist(artist);
++			}
++			if (!album.isEmpty()) {
++				tune.setAlbum(album);
++			}
++			tune.setURL(url);
++		}
++		return tune;
++	}
++	UnmapViewOfFile(aInfo);
++	CloseHandle(aFile);
++	return Tune();
++}
++
++void AimpTuneController::sendTune(const Tune &tune)
++{
++	if (tune != _currentTune && !tune.isNull()) {
++		_currentTune = tune;
++		_tuneSent = true;
++	}
++}
++
++void AimpTuneController::clearTune()
++{
++	if (_tuneSent) {
++		_currentTune = Tune();
++		_tuneSent = false;
++	}
++}
+--- git.orig/src/tools/tunecontroller/aimptunecontroller.h
++++ git/src/tools/tunecontroller/aimptunecontroller.h
+@@ -0,0 +1,51 @@
++/*
++ * aimptunecontroller.h
++ * Copyright (C) 2012 Vitaly Tonkacheyev
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef AIMPTUNECONTROLLER_H
++#define AIMPTUNECONTROLLER_H
++
++#include "pollingtunecontroller.h"
++#include "tune.h"
++#include "windows.h"
++
++class AimpTuneController : public PollingTuneController
++{
++	Q_OBJECT
++
++public:
++	AimpTuneController();
++	Tune currentTune() const;
++
++protected slots:
++	void check();
++
++private:
++	Tune getTune() const;
++	HWND findAimp() const;
++	int getAimpStatus(const HWND &aimp) const;
++	void sendTune(const Tune &tune);
++	void clearTune();
++
++private:
++	Tune _currentTune;
++	bool _tuneSent;
++};
++
++#endif
+--- git.orig/src/tools/tunecontroller/itunestunecontroller.cpp
++++ git/src/tools/tunecontroller/itunestunecontroller.cpp
+@@ -0,0 +1,113 @@
++/*
++ * itunescontroller.cpp
++ * Copyright (C) 2006  Remko Troncon
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include <QtGlobal>
++#include <QString>
++#include <QTime>
++#include <QDebug>
++
++#include <CoreFoundation/CoreFoundation.h>
++
++#include "itunestunecontroller.h"
++
++/**
++ * \class ITunesController
++ * \brief A controller for the Mac OS X version of iTunes.
++ */
++
++static QString CFStringToQString(CFStringRef s)
++{
++	QString result;
++
++	if (s != NULL) {
++		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
++		char* buffer = new char[length];
++		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
++			result = QString::fromUtf8(buffer);
++		}
++		else {
++			qWarning("itunesplayer.cpp: CFString conversion failed.");
++		}
++		delete[] buffer;
++	}
++    return result;
++}
++
++
++ITunesController::ITunesController()
++{
++	// TODO: Poll iTunes for current playing tune
++	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
++	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
++}
++
++ITunesController::~ITunesController()
++{
++	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
++	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
++}
++
++Tune ITunesController::currentTune() const
++{
++	return currentTune_;
++}
++
++void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
++{
++	Tune tune;
++	ITunesController* controller = (ITunesController*) observer;
++
++	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
++	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
++		//qDebug() << "itunesplayer.cpp: Paused";
++		emit controller->stopped();
++	}
++	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
++		//qDebug() << "itunesplayer.cpp: Stopped";
++		emit controller->stopped();
++	}
++	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
++		//qDebug() << "itunesplayer.cpp: Playing";
++		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
++		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
++		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
++
++		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
++		if (cf_track) {
++			int tracknr;
++			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
++				qWarning("itunesplayer.cpp: Number value conversion failed.");
++			}
++			tune.setTrack(QString::number(tracknr));
++		}
++
++		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
++		int time = 0;
++		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
++			qWarning("itunesplayer.cpp: Number value conversion failed.");
++		}
++		tune.setTime((unsigned int) (time / 1000));
++		controller->currentTune_ = tune;
++		emit controller->playing(tune);
++	}
++	else {
++		qWarning("itunesplayer.cpp: Unknown state.");
++	}
++}
+--- git.orig/src/tools/tunecontroller/itunestunecontroller.h
++++ git/src/tools/tunecontroller/itunestunecontroller.h
+@@ -0,0 +1,22 @@
++#ifndef ITUNESTUNECONTROLLER_H
++#define ITUNESTUNECONTROLLER_H
++
++#include <QString>
++#include <CoreFoundation/CoreFoundation.h>
++
++#include "tunecontrollerinterface.h"
++
++class ITunesController : public TuneController
++{
++public:
++	ITunesController();
++	~ITunesController();
++
++	virtual Tune currentTune() const;
++
++private:
++	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
++	Tune currentTune_;
++};
++
++#endif
+--- git.orig/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
++++ git/src/tools/tunecontroller/plugins/aimp/aimpplugin.cpp
+@@ -0,0 +1,61 @@
++/*
++ * aimpplugin.cpp
++ * Copyright (C) 2012 Vitaly Tonkacheyev
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef QT_STATICPLUGIN
++#define QT_STATICPLUGIN
++#endif
++
++#include <QtCore>
++#include <QObject>
++#include <QString>
++
++#include "aimptunecontroller.h"
++#include "tunecontrollerplugin.h"
++
++class AIMPPlugin : public QObject, public TuneControllerPlugin
++{
++
++	Q_OBJECT
++
++	Q_INTERFACES(TuneControllerPlugin)
++#ifdef HAVE_QT5
++	Q_PLUGIN_METADATA(IID "org.psi-im.Psi.TuneControllerPlugin")
++#endif
++
++public:
++	virtual QString name();
++	virtual TuneController* createController();
++};
++
++#ifndef HAVE_QT5
++Q_EXPORT_PLUGIN2(aimpplugin, AIMPPlugin);
++#endif
++
++QString AIMPPlugin::name()
++{
++	return "AIMP3";
++}
++
++TuneController* AIMPPlugin::createController()
++{
++    return new AimpTuneController();
++}
++
++#include "aimpplugin.moc"
+--- git.orig/src/tools/tunecontroller/plugins/aimp/third-party/apiRemote.h
++++ git/src/tools/tunecontroller/plugins/aimp/third-party/apiRemote.h
+@@ -0,0 +1,213 @@
++/************************************************/
++/*                                              */
++/*          AIMP Programming Interface          */
++/*               v3.60 build 1400               */
++/*                                              */
++/*                Artem Izmaylov                */
++/*                (C) 2006-2014                 */
++/*                 www.aimp.ru                  */
++/*              ICQ: 345-908-513                */
++/*            Mail: support@aimp.ru             */
++/*                                              */
++/************************************************/
++
++#ifndef apiRemoteH
++#define apiRemoteH
++
++#include <windows.h>
++
++const char AIMPRemoteAccessClass[] = "AIMP2_RemoteInfo";
++const int  AIMPRemoteAccessMapFileSize = 2048;
++
++#pragma pack(push, 1)
++struct TAIMPRemoteFileInfo
++{
++	DWORD Deprecated1;
++	BOOL Active;
++	DWORD BitRate;
++	DWORD Channels;
++	DWORD Duration;
++	INT64 FileSize;
++	DWORD FileMark;
++	DWORD SampleRate;
++	DWORD TrackNumber;
++	DWORD AlbumLength;
++	DWORD ArtistLength;
++	DWORD DateLength;
++	DWORD FileNameLength;
++	DWORD GenreLength;
++	DWORD TitleLength;
++	DWORD Deprecated2[6];
++};
++#pragma pack(pop)
++typedef TAIMPRemoteFileInfo *PAIMPRemoteFileInfo;
++
++// Messages, which you can send to window with "AIMPRemoteAccessClass" class
++// You can receive Window Handle via FindWindow function (see MSDN for details)
++const int WM_AIMP_COMMAND  = WM_USER + 0x75;
++const int WM_AIMP_NOTIFY   = WM_USER + 0x76;
++const int WM_AIMP_PROPERTY = WM_USER + 0x77;
++
++// See AIMP_RA_CMD_GET_ALBUMART command
++const int WM_AIMP_COPYDATA_ALBUMART_ID = 0x41495043;
++
++//==============================================================================
++// + How to:
++//     GET:  SendMessage(Handle, WM_AIMP_PROPERTY, PropertyID | AIMP_RA_PROPVALUE_GET, 0);
++//     SET:  SendMessage(Handle, WM_AIMP_PROPERTY, PropertyID | AIMP_RA_PROPVALUE_SET, NewValue);
++//
++//     Receive Change Notification:
++//       1) You should register notification hook using AIMP_RA_CMD_REGISTER_NOTIFY command
++//       2) When property will change you receive WM_AIMP_NOTIFY message with following params:
++//          WParam: AIMP_RA_NOTIFY_PROPERTY (Notification ID)
++//          LParam: Property ID
++//
++// Properties ID:
++//==============================================================================
++
++const int AIMP_RA_PROPVALUE_GET = 0;
++const int AIMP_RA_PROPVALUE_SET = 1;
++
++const int AIMP_RA_PROPERTY_MASK = 0xFFFFFFF0;
++
++// !! ReadOnly
++// Returns player version:
++// HiWord: Version ID (for example: 301 -> v3.01)
++// LoWord: Build Number
++const int AIMP_RA_PROPERTY_VERSION = 0x10;
++
++// GET: Returns current position of now playing track (in msec)
++// SET: LParam: position (in msec)
++const int AIMP_RA_PROPERTY_PLAYER_POSITION = 0x20;
++
++// !! ReadOnly
++// Returns duration of now playing track (in msec)
++const int AIMP_RA_PROPERTY_PLAYER_DURATION = 0x30;
++
++// !! ReadOnly
++// Returns current player state
++//  0 = Stopped
++//  1 = Paused
++//  2 = Playing
++const int AIMP_RA_PROPERTY_PLAYER_STATE = 0x40;
++
++// GET: Return current volume [0..100] (%)
++// SET: LParam: volume [0..100] (%)
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_VOLUME = 0x50;
++
++// GET: Return current mute state [0..1]
++// SET: LParam: Mute state [0..1]
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_MUTE = 0x60;
++
++// GET: Return track repeat state [0..1]
++// SET: LParam: Track Repeat state [0..1]
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_TRACK_REPEAT = 0x70;
++
++// GET: Return shuffle state [0..1]
++// SET: LParam: shuffle state [0..1]
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_TRACK_SHUFFLE = 0x80;
++
++// GET: Return radio capture state [0..1]
++// SET: LParam: radio capture state [0..1]
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_RADIOCAP = 0x90;
++
++// GET: Return full screen visualization mode [0..1]
++// SET: LParam: full screen visualization mode [0..1]
++//      Returns 0, if fails
++const int AIMP_RA_PROPERTY_VISUAL_FULLSCREEN = 0xA0;
++
++//==============================================================================
++// Commands ID for WM_AIMP_COMMAND message: (Command ID must be defined in WParam)
++//==============================================================================
++
++const int AIMP_RA_CMD_BASE = 10;
++
++// LParam: Window Handle, which will receive WM_AIMP_NOTIFY message from AIMP
++// See description for WM_AIMP_NOTIFY message for details
++const int AIMP_RA_CMD_REGISTER_NOTIFY = AIMP_RA_CMD_BASE + 1;
++
++// LParam: Window Handle
++const int AIMP_RA_CMD_UNREGISTER_NOTIFY = AIMP_RA_CMD_BASE + 2;
++
++// Start / Resume playback
++// See AIMP_RA_PROPERTY_PLAYER_STATE
++const int AIMP_RA_CMD_PLAY = AIMP_RA_CMD_BASE + 3;
++
++// Pause / Start playback
++// See AIMP_RA_PROPERTY_PLAYER_STATE
++const int AIMP_RA_CMD_PLAYPAUSE = AIMP_RA_CMD_BASE + 4;
++
++// Pause / Resume playback
++// See AIMP_RA_PROPERTY_PLAYER_STATE
++const int AIMP_RA_CMD_PAUSE = AIMP_RA_CMD_BASE + 5;
++
++// Stop playback
++// See AIMP_RA_PROPERTY_PLAYER_STATE
++const int AIMP_RA_CMD_STOP = AIMP_RA_CMD_BASE + 6;
++
++// Next Track
++const int AIMP_RA_CMD_NEXT = AIMP_RA_CMD_BASE + 7;
++
++// Previous Track
++const int AIMP_RA_CMD_PREV = AIMP_RA_CMD_BASE + 8;
++
++// Next Visualization
++const int AIMP_RA_CMD_VISUAL_NEXT = AIMP_RA_CMD_BASE + 9;
++
++// Previous Visualization
++const int AIMP_RA_CMD_VISUAL_PREV = AIMP_RA_CMD_BASE + 10;
++
++// Close the program
++const int AIMP_RA_CMD_QUIT = AIMP_RA_CMD_BASE + 11;
++
++// Execute "Add files" dialog
++const int AIMP_RA_CMD_ADD_FILES = AIMP_RA_CMD_BASE + 12;
++
++// Execute "Add folders" dialog
++const int AIMP_RA_CMD_ADD_FOLDERS = AIMP_RA_CMD_BASE + 13;
++
++// Execute "Add Playlists" dialog
++const int AIMP_RA_CMD_ADD_PLAYLISTS = AIMP_RA_CMD_BASE + 14;
++
++// Execute "Add URL" dialog
++const int AIMP_RA_CMD_ADD_URL = AIMP_RA_CMD_BASE + 15;
++
++// Execute "Open Files" dialog
++const int AIMP_RA_CMD_OPEN_FILES = AIMP_RA_CMD_BASE + 16;
++
++// Execute "Open Folders" dialog
++const int AIMP_RA_CMD_OPEN_FOLDERS = AIMP_RA_CMD_BASE + 17;
++
++// Execute "Open Playlist" dialog
++const int AIMP_RA_CMD_OPEN_PLAYLISTS = AIMP_RA_CMD_BASE + 18;
++
++// AlbumArt Request
++const int AIMP_RA_CMD_GET_ALBUMART = AIMP_RA_CMD_BASE + 19;
++
++// Start First Visualization
++const int AIMP_RA_CMD_VISUAL_START = AIMP_RA_CMD_BASE + 20;
++
++// Stop Visualization
++const int AIMP_RA_CMD_VISUAL_STOP = AIMP_RA_CMD_BASE + 21;
++
++//==============================================================================
++// Notifications ID for WM_AIMP_NOTIFY message: (Notification ID in WParam)
++//==============================================================================
++
++const int AIMP_RA_NOTIFY_BASE = 0;
++
++const int AIMP_RA_NOTIFY_TRACK_INFO = AIMP_RA_NOTIFY_BASE + 1;
++
++// Called, when audio stream starts playing or when an Internet radio station changes the track
++const int AIMP_RA_NOTIFY_TRACK_START = AIMP_RA_NOTIFY_BASE + 2;
++
++// Called, when property has been changed
++// LParam: Property ID
++const int AIMP_RA_NOTIFY_PROPERTY = AIMP_RA_NOTIFY_BASE + 3; 
++
++#endif // !apiRemoteH
+\ В конце файла нет новой строки
+--- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
++++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.cpp
+@@ -1,113 +0,0 @@
+-/*
+- * itunescontroller.cpp
+- * Copyright (C) 2006  Remko Troncon
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+- *
+- */
+-
+-#include <QtGlobal>
+-#include <QString>
+-#include <QTime>
+-#include <QDebug>
+-
+-#include <CoreFoundation/CoreFoundation.h>
+-
+-#include "itunescontroller.h"
+-
+-/**
+- * \class ITunesController
+- * \brief A controller for the Mac OS X version of iTunes.
+- */
+-
+-static QString CFStringToQString(CFStringRef s)
+-{
+-	QString result;
+-
+-	if (s != NULL) {
+-		CFIndex length = CFStringGetMaximumSizeForEncoding(CFStringGetLength(s), kCFStringEncodingUTF8) + 1;
+-		char* buffer = new char[length];
+-		if (CFStringGetCString(s, buffer, length, kCFStringEncodingUTF8)) {
+-			result = QString::fromUtf8(buffer);
+-		}
+-		else {
+-			qWarning("itunesplayer.cpp: CFString conversion failed.");
+-		}
+-		delete[] buffer;
+-	}
+-    return result;
+-}
+-
+-
+-ITunesController::ITunesController()
+-{
+-	// TODO: Poll iTunes for current playing tune
+-	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
+-	CFNotificationCenterAddObserver(center, this, ITunesController::iTunesCallback, CFSTR("com.apple.iTunes.playerInfo"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
+-}
+-
+-ITunesController::~ITunesController()
+-{
+-	CFNotificationCenterRef center = CFNotificationCenterGetDistributedCenter();
+-	CFNotificationCenterRemoveObserver(center, this, CFSTR("com.apple.iTunes.playerInfo"), NULL);
+-}
+-
+-Tune ITunesController::currentTune() const
+-{
+-	return currentTune_;
+-}
+-
+-void ITunesController::iTunesCallback(CFNotificationCenterRef,void* observer,CFStringRef,const void*, CFDictionaryRef info)
+-{
+-	Tune tune;
+-	ITunesController* controller = (ITunesController*) observer;
+-
+-	CFStringRef cf_state = (CFStringRef) CFDictionaryGetValue(info, CFSTR("Player State"));
+-	if (CFStringCompare(cf_state,CFSTR("Paused"),0) == kCFCompareEqualTo) {
+-		//qDebug() << "itunesplayer.cpp: Paused";
+-		emit controller->stopped();
+-	}
+-	else if (CFStringCompare(cf_state,CFSTR("Stopped"),0) == kCFCompareEqualTo) {
+-		//qDebug() << "itunesplayer.cpp: Stopped";
+-		emit controller->stopped();
+-	}
+-	else if (CFStringCompare(cf_state,CFSTR("Playing"),0) == kCFCompareEqualTo) {
+-		//qDebug() << "itunesplayer.cpp: Playing";
+-		tune.setArtist(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Artist"))));
+-		tune.setName(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Name"))));
+-		tune.setAlbum(CFStringToQString((CFStringRef) CFDictionaryGetValue(info, CFSTR("Album"))));
+-
+-		CFNumberRef cf_track = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Track Number"));
+-		if (cf_track) {
+-			int tracknr;
+-			if (!CFNumberGetValue(cf_track,kCFNumberIntType,&tracknr)) {
+-				qWarning("itunesplayer.cpp: Number value conversion failed.");
+-			}
+-			tune.setTrack(QString::number(tracknr));
+-		}
+-
+-		CFNumberRef cf_time = (CFNumberRef) CFDictionaryGetValue(info, CFSTR("Total Time"));
+-		int time = 0;
+-		if (cf_time && !CFNumberGetValue(cf_time,kCFNumberIntType,&time)) {
+-			qWarning("itunesplayer.cpp: Number value conversion failed.");
+-		}
+-		tune.setTime((unsigned int) (time / 1000));
+-		controller->currentTune_ = tune;
+-		emit controller->playing(tune);
+-	}
+-	else {
+-		qWarning("itunesplayer.cpp: Unknown state.");
+-	}
+-}
+--- git.orig/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
++++ git/src/tools/tunecontroller/plugins/itunes/itunescontroller.h
+@@ -1,22 +0,0 @@
+-#ifndef ITUNESCONTROLLER_H
+-#define ITUNESCONTROLLER_H
+-
+-#include <QString>
+-#include <CoreFoundation/CoreFoundation.h>
+-
+-#include "tunecontrollerinterface.h"
+-
+-class ITunesController : public TuneController
+-{
+-public:
+-	ITunesController();
+-	~ITunesController();
+-
+-	virtual Tune currentTune() const;
+-
+-private:
+-	static void iTunesCallback(CFNotificationCenterRef,void*,CFStringRef,const void*, CFDictionaryRef info);
+-	Tune currentTune_;
+-};
+-
+-#endif
+--- git.orig/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
++++ git/src/tools/tunecontroller/plugins/itunes/itunesplugin.cpp
+@@ -26,7 +26,7 @@
+ #include <QObject>
+ #include <QString>
+ 
+-#include "itunescontroller.h"
++#include "itunestunecontroller.h"
+ #include "tunecontrollerplugin.h"
+ 
+ class ITunesPlugin : public QObject, public TuneControllerPlugin
+--- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
++++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.cpp
+@@ -1,197 +0,0 @@
+-/*
+- * winampcontroller.cpp
+- * Copyright (C) 2006  Remko Troncon
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+- *
+- */
+-
+-#include <windows.h>
+-
+-#ifdef Q_CC_MSVC
+-#pragma warning(push)
+-#pragma warning(disable: 4100)
+-#endif
+-
+-// this file generates eight C4100 warnings, when compiled with MSVC2003
+-#include "third-party/wa_ipc.h"
+-
+-#ifdef Q_CC_MSVC
+-#pragma warning(pop)
+-#endif
+-
+-#include "winampcontroller.h"
+-
+-
+-/**
+- * \class WinAmpController
+- * \brief A controller for WinAmp.
+- */
+-
+-static const int NormInterval = 3000;
+-static const int AntiscrollInterval = 100;
+-
+-/**
+- * \brief Constructs the controller.
+- */
+-WinAmpController::WinAmpController()
+-: PollingTuneController(),
+-  antiscrollCounter_(0)
+-{
+-	startPoll();
+-	setInterval(NormInterval);
+-}
+-
+-template <typename char_type> const size_t length (const char_type * begin)
+-{
+-	const char_type * end = begin;
+-	for (; *end; ++end);
+-	return end - begin;
+-}
+-
+-// Returns a title of a track currently being played by WinAmp with given HWND (passed in waWnd)
+-QPair<bool, QString> WinAmpController::getTrackTitle(const HWND &waWnd) const
+-{
+-	TCHAR waTitle[2048];
+-	QString title;
+-
+-	// Get WinAmp window title. It always contains name of the track
+-	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
+-	// Now, waTitle contains WinAmp window title
+-	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
+-	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
+-		// request to be called again soon.
+-		return QPair<bool, QString>(false, QString());
+-	}
+-
+-	// Check whether there is a need to do the all stuff
+-	if (!title.length()) {
+-		return QPair<bool, QString>(true,title);
+-	}
+-
+-	QString winamp (" - Winamp ***");
+-	int winampLength = winamp.length();
+-
+-	// Is title scrolling on the taskbar enabled?
+-	title += title + title;
+-	int waLast = title.indexOf (winamp, -1);
+-	if (waLast != -1) {
+-		if (title.length()) {
+-			title.remove (waLast, title.length () - waLast);
+-		}
+-		int waFirst;
+-		while ((waFirst = title.indexOf (winamp)) != -1) {
+-			title.remove (0, waFirst + winampLength);
+-		}
+-	}
+-	else {
+-		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
+-	}
+-
+-	// Remove leading and trailing spaces
+-	title  = title.trimmed();
+-
+-	// Remove trailing " - Winamp" from title
+-	if (title.length ()) {
+-		winamp = " - Winamp";
+-		winampLength = winamp.length ();
+-		int waFirst = title.indexOf (winamp);
+-		if (waFirst != -1)
+-		{
+-			title.remove (waFirst, waFirst + winampLength);
+-		}
+-	}
+-
+-	// Remove track number from title
+-	if (title.length ()) {
+-		QString dot(". ");
+-		int dotFirst = title.indexOf (dot);
+-		if (dotFirst != -1) {
+-			// All symbols before the dot are digits?
+-			bool allDigits = true;
+-			for (int pos = dotFirst; pos > 0; --pos) {
+-				allDigits = allDigits && title[pos].isNumber();
+-			}
+-			if (allDigits) {
+-				title.remove(0, dotFirst + dot.length ());
+-			}
+-		}
+-	}
+-
+-	// Remove leading and trailing spaces
+-	if (title.length ()) {
+-		while (title.length () && title[0] == ' ') {
+-			title.remove (0, 1);
+-		}
+-		while (title.length () && title[title.length () - 1] == ' ') {
+-			title.remove (title.length () - 1, 1);
+-		}
+-	}
+-
+-	return QPair<bool, QString>(true,title);
+-}
+-
+-
+-/**
+- * Polls for new song info.
+- */
+-void WinAmpController::check()
+-{
+-
+-	Tune tune;
+-#ifdef UNICODE
+-	HWND h = FindWindow(L"Winamp v1.x", NULL);
+-#else
+-	HWND h = FindWindow("Winamp v1.x", NULL);
+-#endif
+-	if (h && SendMessage(h, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
+-		tune = getTune(h);
+-	}
+-	prevTune_ = tune;
+-	setInterval(NormInterval);
+-	PollingTuneController::check();
+-}
+-
+-Tune WinAmpController::getTune(const HWND &hWnd)
+-{
+-	Tune tune = Tune();
+-	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
+-	if (position != -1) {
+-		if (hWnd && SendMessage(hWnd,WM_WA_IPC,0,IPC_ISPLAYING) == 1) {
+-			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
+-			if (!trackpair.first) {
+-				// getTrackTitle wants us to retry in a few ms...
+-				int interval = AntiscrollInterval;
+-				if (++antiscrollCounter_ > 10) {
+-					antiscrollCounter_ = 0;
+-					interval = NormInterval;
+-				}
+-				setInterval(interval);
+-				return Tune();
+-			}
+-			antiscrollCounter_ = 0;
+-			tune.setName(trackpair.second);
+-			tune.setURL(trackpair.second);
+-			tune.setTrack(QString::number(position + 1));
+-			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
+-		}
+-	}
+-	return tune;
+-}
+-
+-Tune WinAmpController::currentTune() const
+-{
+-	return prevTune_;
+-}
+--- git.orig/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
++++ git/src/tools/tunecontroller/plugins/winamp/winampcontroller.h
+@@ -1,48 +0,0 @@
+-/*
+- * winampcontroller.h
+- * Copyright (C) 2006  Remko Troncon
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this library; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+- *
+- */
+-
+-#ifndef WINAMPCONTROLLER_H
+-#define WINAMPCONTROLLER_H
+-
+-#include "pollingtunecontroller.h"
+-
+-#include <windows.h>
+-#include <QPair>
+-
+-class WinAmpController : public PollingTuneController
+-{
+-	Q_OBJECT
+-public:
+-	WinAmpController();
+-	virtual Tune currentTune() const;
+-
+-private:
+-	Tune getTune(const HWND &hWnd);
+-	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
+-
+-protected slots:
+-	void check();
+-
+-private:
+-	Tune prevTune_;
+-	int antiscrollCounter_;
+-};
+-
+-#endif
+--- git.orig/src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
++++ git/src/tools/tunecontroller/plugins/winamp/winampplugin.cpp
+@@ -28,7 +28,7 @@ QString WinAmpPlugin::name()
+ 
+ TuneController* WinAmpPlugin::createController()
+ {
+-	return new WinAmpController();
++	return new WinAmpTuneController();
+ }
+ 
+ #ifndef HAVE_QT5
+--- git.orig/src/tools/tunecontroller/plugins/winamp/winampplugin.h
++++ git/src/tools/tunecontroller/plugins/winamp/winampplugin.h
+@@ -29,7 +29,7 @@
+ #include <QObject>
+ #include <QString>
+ 
+-#include "winampcontroller.h"
++#include "winamptunecontroller.h"
+ #include "tunecontrollerplugin.h"
+ 
+ class WinAmpPlugin : public QObject, public TuneControllerPlugin
+--- git.orig/src/tools/tunecontroller/tunecontrollermanager.cpp
++++ git/src/tools/tunecontroller/tunecontrollermanager.cpp
+@@ -172,6 +172,14 @@ Q_IMPORT_PLUGIN(winampplugin)
+ #endif
+ #endif
+ 
++#ifdef TC_AIMP
++#ifdef HAVE_QT5
++Q_IMPORT_PLUGIN(AIMPPlugin)
++#else
++Q_IMPORT_PLUGIN(aimpplugin)
++#endif
++#endif
++
+ #ifdef TC_PSIFILE
+ #ifdef HAVE_QT5
+ Q_IMPORT_PLUGIN(PsiFilePlugin)
+--- git.orig/src/tools/tunecontroller/tunecontroller.pri
++++ git/src/tools/tunecontroller/tunecontroller.pri
+@@ -25,10 +25,10 @@ tc_itunes {
+ 		INCLUDEPATH += $$ITUNES_PLUGIN_PATH
+ 
+ 		HEADERS += \
+-			$$ITUNES_PLUGIN_PATH/itunescontroller.h
++			$$PWD/itunestunecontroller.h
+ 
+ 		SOURCES += \
+-			$$ITUNES_PLUGIN_PATH/itunescontroller.cpp \
++			$$PWD/itunestunecontroller.cpp \
+ 			$$ITUNES_PLUGIN_PATH/itunesplugin.cpp
+ 
+ 		QMAKE_LFLAGS += -framework CoreFoundation
+@@ -42,11 +42,11 @@ tc_winamp {
+ 	INCLUDEPATH += $$WINAMP_PLUGIN_PATH
+ 
+ 	HEADERS += \
+-		$$WINAMP_PLUGIN_PATH/winampcontroller.h \
++		$$PWD/winamptunecontroller.h \
+ 		$$WINAMP_PLUGIN_PATH/winampplugin.h
+ 
+ 	SOURCES += \
+-		$$WINAMP_PLUGIN_PATH/winampcontroller.cpp \
++		$$PWD/winamptunecontroller.cpp \
+ 		$$WINAMP_PLUGIN_PATH/winampplugin.cpp
+ 
+ 	LIBS += -lUser32
+@@ -78,3 +78,17 @@ tc_mpris {
+ 		$$PWD/mpristunecontroller.cpp \
+ 		$$MPRIS_PLUGIN_PATH/mprisplugin.cpp
+ }
++
++#AIMP
++tc_aimp {
++	DEFINES += TC_AIMP
++	AIMP_PLUGIN_PATH = $$PWD/plugins/aimp
++	INCLUDEPATH += $$AIMP_PLUGIN_PATH
++
++	HEADERS += \
++		$$PWD/aimptunecontroller.h
++
++	SOURCES += \
++		$$PWD/aimptunecontroller.cpp \
++		$$AIMP_PLUGIN_PATH/aimpplugin.cpp
++}
+--- git.orig/src/tools/tunecontroller/winamptunecontroller.cpp
++++ git/src/tools/tunecontroller/winamptunecontroller.cpp
+@@ -0,0 +1,197 @@
++/*
++ * winamptunecontroller.cpp
++ * Copyright (C) 2006  Remko Troncon
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include <windows.h>
++
++#ifdef Q_CC_MSVC
++#pragma warning(push)
++#pragma warning(disable: 4100)
++#endif
++
++// this file generates eight C4100 warnings, when compiled with MSVC2003
++#include "plugins/winamp/third-party/wa_ipc.h"
++
++#ifdef Q_CC_MSVC
++#pragma warning(pop)
++#endif
++
++#include "winamptunecontroller.h"
++
++
++/**
++ * \class WinAmpTuneController
++ * \brief A controller for WinAmp.
++ */
++
++static const int NormInterval = 3000;
++static const int AntiscrollInterval = 100;
++
++/**
++ * \brief Constructs the controller.
++ */
++WinAmpTuneController::WinAmpTuneController()
++: PollingTuneController(),
++  antiscrollCounter_(0)
++{
++	startPoll();
++	setInterval(NormInterval);
++}
++
++template <typename char_type> const size_t length (const char_type * begin)
++{
++	const char_type * end = begin;
++	for (; *end; ++end);
++	return end - begin;
++}
++
++// Returns a title of a track currently being played by WinAmp with given HWND (passed in waWnd)
++QPair<bool, QString> WinAmpTuneController::getTrackTitle(const HWND &waWnd) const
++{
++	TCHAR waTitle[2048];
++	QString title;
++
++	// Get WinAmp window title. It always contains name of the track
++	SendMessage (waWnd, WM_GETTEXT, static_cast<WPARAM> (sizeof (waTitle) / sizeof (waTitle[0])), reinterpret_cast<LPARAM> (waTitle));
++	// Now, waTitle contains WinAmp window title
++	title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle));
++	if (title[0] == '*' || (title.length () && title[title.length() - 1] == '*')) {
++		// request to be called again soon.
++		return QPair<bool, QString>(false, QString());
++	}
++
++	// Check whether there is a need to do the all stuff
++	if (!title.length()) {
++		return QPair<bool, QString>(true,title);
++	}
++
++	QString winamp (" - Winamp ***");
++	int winampLength = winamp.length();
++
++	// Is title scrolling on the taskbar enabled?
++	title += title + title;
++	int waLast = title.indexOf (winamp, -1);
++	if (waLast != -1) {
++		if (title.length()) {
++			title.remove (waLast, title.length () - waLast);
++		}
++		int waFirst;
++		while ((waFirst = title.indexOf (winamp)) != -1) {
++			title.remove (0, waFirst + winampLength);
++		}
++	}
++	else {
++		title = QString ((const QChar *) waTitle, length<TCHAR> ((const TCHAR *) waTitle)); // Title is not scrolling
++	}
++
++	// Remove leading and trailing spaces
++	title  = title.trimmed();
++
++	// Remove trailing " - Winamp" from title
++	if (title.length ()) {
++		winamp = " - Winamp";
++		winampLength = winamp.length ();
++		int waFirst = title.indexOf (winamp);
++		if (waFirst != -1)
++		{
++			title.remove (waFirst, waFirst + winampLength);
++		}
++	}
++
++	// Remove track number from title
++	if (title.length ()) {
++		QString dot(". ");
++		int dotFirst = title.indexOf (dot);
++		if (dotFirst != -1) {
++			// All symbols before the dot are digits?
++			bool allDigits = true;
++			for (int pos = dotFirst; pos > 0; --pos) {
++				allDigits = allDigits && title[pos].isNumber();
++			}
++			if (allDigits) {
++				title.remove(0, dotFirst + dot.length ());
++			}
++		}
++	}
++
++	// Remove leading and trailing spaces
++	if (title.length ()) {
++		while (title.length () && title[0] == ' ') {
++			title.remove (0, 1);
++		}
++		while (title.length () && title[title.length () - 1] == ' ') {
++			title.remove (title.length () - 1, 1);
++		}
++	}
++
++	return QPair<bool, QString>(true,title);
++}
++
++
++/**
++ * Polls for new song info.
++ */
++void WinAmpTuneController::check()
++{
++
++	Tune tune;
++#ifdef UNICODE
++	HWND h = FindWindow(L"Winamp v1.x", NULL);
++#else
++	HWND h = FindWindow("Winamp v1.x", NULL);
++#endif
++	if (h && SendMessage(h, WM_WA_IPC, 0, IPC_ISPLAYING) == 1) {
++		tune = getTune(h);
++	}
++	prevTune_ = tune;
++	setInterval(NormInterval);
++	PollingTuneController::check();
++}
++
++Tune WinAmpTuneController::getTune(const HWND &hWnd)
++{
++	Tune tune = Tune();
++	int position = (int)SendMessage(hWnd, WM_WA_IPC, 0, IPC_GETLISTPOS);
++	if (position != -1) {
++		if (hWnd && SendMessage(hWnd,WM_WA_IPC,0,IPC_ISPLAYING) == 1) {
++			QPair<bool, QString> trackpair(getTrackTitle(hWnd));
++			if (!trackpair.first) {
++				// getTrackTitle wants us to retry in a few ms...
++				int interval = AntiscrollInterval;
++				if (++antiscrollCounter_ > 10) {
++					antiscrollCounter_ = 0;
++					interval = NormInterval;
++				}
++				setInterval(interval);
++				return Tune();
++			}
++			antiscrollCounter_ = 0;
++			tune.setName(trackpair.second);
++			tune.setURL(trackpair.second);
++			tune.setTrack(QString::number(position + 1));
++			tune.setTime(SendMessage(hWnd, WM_WA_IPC, 1, IPC_GETOUTPUTTIME));
++		}
++	}
++	return tune;
++}
++
++Tune WinAmpTuneController::currentTune() const
++{
++	return prevTune_;
++}
+--- git.orig/src/tools/tunecontroller/winamptunecontroller.h
++++ git/src/tools/tunecontroller/winamptunecontroller.h
+@@ -0,0 +1,48 @@
++/*
++ * winamptunecontroller.h
++ * Copyright (C) 2006  Remko Troncon
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef WINAMPTUNECONTROLLER_H
++#define WINAMPTUNECONTROLLER_H
++
++#include "pollingtunecontroller.h"
++
++#include <windows.h>
++#include <QPair>
++
++class WinAmpTuneController : public PollingTuneController
++{
++	Q_OBJECT
++public:
++	WinAmpTuneController();
++	virtual Tune currentTune() const;
++
++private:
++	Tune getTune(const HWND &hWnd);
++	QPair<bool, QString> getTrackTitle(const HWND &waWnd) const;
++
++protected slots:
++	void check();
++
++private:
++	Tune prevTune_;
++	int antiscrollCounter_;
++};
++
++#endif

psi-plus-main-20141106.tar.xz/patches/0930-psi-fix-psitooltiphandler.diff Added

@@ -0,0 +1,47 @@
+--- git.temp.orig/src/widgets/psitooltip.cpp
++++ git.temp/src/widgets/psitooltip.cpp
+@@ -40,7 +40,6 @@ class PsiToolTipHandler : public QObject
+ public:
+ 	static PsiToolTipHandler *getInstance()
+ 	{
+-		static PsiToolTipHandler *instance = 0;
+ 		if (!instance)
+ 			instance = new PsiToolTipHandler();
+ 
+@@ -49,8 +48,10 @@ public:
+ 
+ 	void install(QWidget *widget)
+ 	{
++		if(!watchedWidgets_.contains(widget)) {
++			connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
++		}
+ 		watchedWidgets_[widget] = true;
+-		connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
+ 	}
+ 
+ private slots:
+@@ -58,10 +59,15 @@ private slots:
+ 	{
+ 		QWidget* widget = static_cast<QWidget*>(obj);
+ 		watchedWidgets_.remove(widget);
++		if(watchedWidgets_.isEmpty()) {
++			instance->deleteLater();
++			instance = 0;
++		}
+ 	}
+ 
+ private:
+ 	QHash<QWidget*, bool> watchedWidgets_;
++	static PsiToolTipHandler *instance;
+ 
+ 	PsiToolTipHandler()
+ 		: QObject(qApp)
+@@ -87,6 +93,8 @@ private:
+ 	}
+ };
+ 
++PsiToolTipHandler* PsiToolTipHandler::instance = 0;
++
+ //----------------------------------------------------------------------------
+ // ToolTipPosition
+ //----------------------------------------------------------------------------

psi-plus-main-20141106.tar.xz/patches/0940-psi-options-reset-button.diff Added

@@ -0,0 +1,124 @@
+Entering 'iris'
+Entering 'src/libpsi'
+--- git.temp.orig/src/psioptions.cpp
++++ git.temp/src/psioptions.cpp
+@@ -334,6 +334,42 @@ void PsiOptions::getOptionsStorage_finis
+ 	}
+ }
+ 
++/**
++ * Reset node \a name to default value
++ * \return Nothing
++ */
++void PsiOptions::resetOption(const QString &name)
++{
++	defaults(); // to init defaults_
++	QStringList nodes = getChildOptionNames(name);
++
++	if (!isInternalNode(name)) {
++		const QVariant &dev = defaults_->getOption(name);
++		if (!dev.isValid()) { // don't touch non exist nodes
++			return;
++		}
++		const QVariant &prev = getOption(name);
++		if (prev == dev) { // do nothing if values is identical
++			return;
++		}
++		setOption(name, dev);
++	}
++	else { // internal node
++		foreach(QString node, nodes) {
++			const QVariant &dev = defaults_->getOption(node);
++			if (!dev.isValid()) {
++				continue;
++			}
++			const QVariant &prev = getOption(node);
++			if (prev == dev) {
++				continue;
++			}
++			setOption(node, dev);
++		}
++	}
++}
++
++
+ PsiOptions* PsiOptions::instance_ = NULL;
+ PsiOptions* PsiOptions::defaults_ = NULL;
+ 
+--- git.temp.orig/src/psioptions.h
++++ git.temp/src/psioptions.h
+@@ -47,6 +47,7 @@ public:
+ 	bool newProfile();
+ 	bool save(QString file);
+ 	void autoSave(bool autoSave, QString autoFile = "");
++	void resetOption(const QString &name);
+ 
+ // don't call this normally
+ 	PsiOptions();
+--- git.temp.orig/src/psioptionseditor.cpp
++++ git.temp/src/psioptionseditor.cpp
+@@ -160,11 +160,13 @@ PsiOptionsEditor::PsiOptionsEditor(QWidg
+ 
+ 	buttonLine->addStretch(1);
+ 
+-	if (1) { // FIXME
+-		pb_delete = new QPushButton(tr("Delete"), this);
+-		buttonLine->addWidget(pb_delete);
+-		connect(pb_delete, SIGNAL(clicked()), SLOT(deleteit()));
+-	}
++	pb_delete = new QPushButton(tr("Delete..."), this);
++	buttonLine->addWidget(pb_delete);
++	connect(pb_delete, SIGNAL(clicked()), SLOT(deleteit()));
++
++	pb_reset = new QPushButton(tr("Reset..."), this);
++	buttonLine->addWidget(pb_reset);
++	connect(pb_reset, SIGNAL(clicked()), SLOT(resetit()));
+ 
+ 	pb_edit = new QPushButton(tr("Edit..."), this);
+ 	buttonLine->addWidget(pb_edit);
+@@ -274,12 +276,26 @@ void PsiOptionsEditor::deleteit()
+ 		sub = true;
+ 		confirm = tr("Really delete all options starting with %1.?");
+ 	}
+-	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi: Option Editor"),
++	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi+: Option Editor"),
+ 				   confirm.arg(option), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel)) {
+ 		PsiOptions::instance()->removeOption( option, sub);
+ 	}
+ }
+ 
++void PsiOptionsEditor::resetit()
++{
++	QModelIndex idx = tv_->currentIndex();
++	QString option = tm_->indexToOptionName(idx);
++	QString confirm = tr("Really reset options %1 to default value?");
++	if (o_->isInternalNode(option)) {
++		confirm = tr("Really reset all options starting with %1. to default value?");
++	}
++	if (QMessageBox::Yes == QMessageBox::warning(this, tr("Psi+: Option Editor"),
++                   confirm.arg(option), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel)) {
++		PsiOptions::instance()->resetOption(option);
++	}
++}
++
+ void PsiOptionsEditor::detach()
+ {
+ 	new PsiOptionsEditor();
+--- git.temp.orig/src/psioptionseditor.h
++++ git.temp/src/psioptionseditor.h
+@@ -27,6 +27,7 @@ private slots:
+ 	void add();
+ 	void edit();
+ 	void deleteit();
++	void resetit();
+ 	void detach();
+ 
+ private:
+@@ -39,6 +40,7 @@ private:
+ 	QLabel* lb_path;
+ 	QLabel* lb_comment;
+ 	QPushButton *pb_delete;
++	QPushButton *pb_reset;
+ 	QPushButton *pb_edit;
+ 	QPushButton *pb_new;
+ 	QToolButton *pb_detach;

psi-plus-main-20141106.tar.xz/patches/0950-psi-fix-pep-retraction.diff Added

@@ -0,0 +1,354 @@
+Entering 'iris'
+Entering 'src/libpsi'
+--- git.temp.orig/src/activity.cpp
++++ git.temp/src/activity.cpp
+@@ -84,8 +84,8 @@ bool Activity::isNull() const
+ 
+ QDomElement Activity::toXml(QDomDocument& doc)
+ {
+-	QDomElement activity = doc.createElement("activity");
+-	activity.setAttribute("xmlns", "http://jabber.org/protocol/activity");
++	QDomElement activity = doc.createElement(PEP_ACTIVITY_TN);
++	activity.setAttribute("xmlns", PEP_ACTIVITY_NS);
+ 
+ 	if (!type() == Unknown) {
+ 		ActivityCatalog* ac = ActivityCatalog::instance();
+@@ -98,9 +98,6 @@ QDomElement Activity::toXml(QDomDocument
+ 
+ 		activity.appendChild(el);
+ 	}
+-	else {
+-		qWarning("activity.cpp: ERROR: Converting unknown activity");
+-	}
+ 
+ 	if (!text().isEmpty()) {
+ 		QDomElement el = doc.createElement("text");
+@@ -114,14 +111,17 @@ QDomElement Activity::toXml(QDomDocument
+ 
+ void Activity::fromXml(const QDomElement& element)
+ {
+-	if (element.tagName() != "activity")
+-		return;
+-
+ 	type_ = Activity::Unknown;
+ 	specificType_ = Activity::UnknownSpecific;
+ 
++	if (element.tagName() != PEP_ACTIVITY_TN)
++		return;
++
+ 	for (QDomNode node = element.firstChild(); !node.isNull(); node = node.nextSibling()) {
+ 		QDomElement child = node.toElement();
++		if(child.isNull()) {
++			continue;
++		}
+ 		if (child.tagName() == "text") {
+ 			text_ = child.text();
+ 		}
+--- git.temp.orig/src/activity.h
++++ git.temp/src/activity.h
+@@ -23,6 +23,9 @@
+ 
+ #include <QString>
+ 
++#define PEP_ACTIVITY_TN "activity"
++#define PEP_ACTIVITY_NS "http://jabber.org/protocol/activity"
++
+ class QDomElement;
+ class QDomDocument;
+ 
+--- git.temp.orig/src/activitycatalog.cpp
++++ git.temp/src/activitycatalog.cpp
+@@ -27,6 +27,8 @@
+ 
+ ActivityCatalog::Entry::Entry()
+ {
++	type_ = Activity::Unknown;
++	specificType_ = Activity::UnknownSpecific;
+ }
+ 
+ ActivityCatalog::Entry::Entry(Activity::Type type, const QString& value, const QString& text)
+--- git.temp.orig/src/activitydlg.cpp
++++ git.temp/src/activitydlg.cpp
+@@ -94,7 +94,7 @@ void ActivityDlg::setActivity()
+ 
+ 	foreach(PsiAccount *pa, pa_) {
+ 		if (generalActivityStr == tr("<unset>")) {
+-			pa->pepManager()->retract("http://jabber.org/protocol/activity", "current");
++			pa->pepManager()->disable(PEP_ACTIVITY_TN, PEP_ACTIVITY_NS, "current");
+ 		}
+ 		else {
+ 			ActivityCatalog* ac = ActivityCatalog::instance();
+@@ -104,7 +104,7 @@ void ActivityDlg::setActivity()
+ 			if (specificActivityStr != tr("<unset>")) {
+ 				specificType = ac->findEntryByText(specificActivityStr).specificType();
+ 			}
+-			pa->pepManager()->publish("http://jabber.org/protocol/activity", PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++			pa->pepManager()->publish(PEP_ACTIVITY_NS, PubSubItem("current",Activity(generalType,specificType,ui_.le_description->text()).toXml(*pa->client()->rootTask()->doc())));
+ 		}
+ 	}
+ 	close();
+--- git.temp.orig/src/avatars.cpp
++++ git.temp/src/avatars.cpp
+@@ -241,7 +241,7 @@ signals:
+ 
+ protected:
+ 	void requestAvatar() {
+-		factory()->account()->pepManager()->get(jid_,"urn:xmpp:avatar:data",hash());
++		factory()->account()->pepManager()->get(jid_,PEP_AVATAR_DATA_NS,hash());
+ 	}
+ 
+ 	void avatarUpdated()
+@@ -557,20 +557,16 @@ void AvatarFactory::setSelfAvatar(const
+ 			// Publish data
+ 			QDomDocument* doc = account()->client()->doc();
+ 			QString hash = Hash("sha1").hashToString(avatar_data);
+-			QDomElement el = doc->createElement("data");
+-			el.setAttribute("xmlns","urn:xmpp:avatar:data");
++			QDomElement el = doc->createElement(PEP_AVATAR_DATA_TN);
++			el.setAttribute("xmlns",PEP_AVATAR_DATA_NS);
+ 			el.appendChild(doc->createTextNode(Base64().arrayToString(avatar_data)));
+ 			selfAvatarData_ = avatar_data;
+ 			selfAvatarHash_ = hash;
+-			account()->pepManager()->publish("urn:xmpp:avatar:data",PubSubItem(hash,el));
++			account()->pepManager()->publish(PEP_AVATAR_DATA_NS,PubSubItem(hash,el));
+ 		}
+ 	}
+ 	else {
+-		QDomDocument* doc = account()->client()->doc();
+-		QDomElement meta_el =  doc->createElement("metadata");
+-		meta_el.setAttribute("xmlns","urn:xmpp:avatar:metadata");
+-		meta_el.appendChild(doc->createElement("stop"));
+-		account()->pepManager()->publish("urn:xmpp:avatar:metadata",PubSubItem("current",meta_el));
++		account()->pepManager()->disable(PEP_AVATAR_METADATA_TN, PEP_AVATAR_METADATA_NS, "current");
+ 	}
+ }
+ 
+@@ -640,8 +636,8 @@ int AvatarFactory::maxAvatarSize()
+ 
+ void AvatarFactory::itemPublished(const Jid& jid, const QString& n, const PubSubItem& item)
+ {
+-	if (n == "urn:xmpp:avatar:data") {
+-		if (item.payload().tagName() == "data") {
++	if (n == PEP_AVATAR_DATA_NS) {
++		if (item.payload().tagName() == PEP_AVATAR_DATA_TN) {
+ 			if (pep_avatars_.contains(jid.bare())) {
+ 				pep_avatars_[jid.bare()]->setData(item.id(),item.payload().text());
+ 			}
+@@ -650,12 +646,14 @@ void AvatarFactory::itemPublished(const
+ 			qWarning("avatars.cpp: Unexpected item payload");
+ 		}
+ 	}
+-	else if (n == "urn:xmpp:avatar:metadata") {
++	else if (n == PEP_AVATAR_METADATA_NS) {
+ 		if (!pep_avatars_.contains(jid.bare())) {
+ 			pep_avatars_[jid.bare()] = new PEPAvatar(this, jid.bare());
+ 			connect(pep_avatars_[jid.bare()],SIGNAL(avatarChanged(const Jid&)),this, SLOT(updateAvatar(const Jid&)));
+ 		}
++		// check for the deprecated <stop/> child element
+ 		QDomElement e = item.payload().firstChildElement("stop");
++		// if there's a <stop/> element or the <metadata/> element is empty, remove user's avatar
+ 		if (!e.isNull()) {
+ 			pep_avatars_[jid.bare()]->updateHash("");
+ 		}
+@@ -667,12 +665,12 @@ void AvatarFactory::itemPublished(const
+ 
+ void AvatarFactory::publish_success(const QString& n, const PubSubItem& item)
+ {
+-	if (n == "urn:xmpp:avatar:data" && item.id() == selfAvatarHash_) {
++	if (n == PEP_AVATAR_DATA_NS && item.id() == selfAvatarHash_) {
+ 		// Publish metadata
+ 		QDomDocument* doc = account()->client()->doc();
+ 		QImage avatar_image = QImage::fromData(selfAvatarData_);
+-		QDomElement meta_el = doc->createElement("metadata");
+-		meta_el.setAttribute("xmlns","urn:xmpp:avatar:metadata");
++		QDomElement meta_el = doc->createElement(PEP_AVATAR_METADATA_TN);
++		meta_el.setAttribute("xmlns",PEP_AVATAR_METADATA_NS);
+ 		QDomElement info_el = doc->createElement("info");
+ 		info_el.setAttribute("id",selfAvatarHash_);
+ 		info_el.setAttribute("bytes",avatar_image.byteCount());
+@@ -680,7 +678,7 @@ void AvatarFactory::publish_success(cons
+ 		info_el.setAttribute("width",avatar_image.width());
+ 		info_el.setAttribute("type",image2type(selfAvatarData_));
+ 		meta_el.appendChild(info_el);
+-		account()->pepManager()->publish("urn:xmpp:avatar:metadata",PubSubItem(selfAvatarHash_,meta_el));
++		account()->pepManager()->publish(PEP_AVATAR_METADATA_NS,PubSubItem(selfAvatarHash_,meta_el));
+ 	}
+ }
+ 
+--- git.temp.orig/src/avatars.h
++++ git.temp/src/avatars.h
+@@ -28,6 +28,12 @@
+ 
+ #include "iconset.h"
+ 
++#define PEP_AVATAR_DATA_TN     "data"
++#define PEP_AVATAR_DATA_NS     "urn:xmpp:avatar:data"
++
++#define PEP_AVATAR_METADATA_TN "metadata"
++#define PEP_AVATAR_METADATA_NS "urn:xmpp:avatar:metadata"
++
+ class PsiAccount;
+ class Avatar;
+ class VCardAvatar;
+--- git.temp.orig/src/geolocation.cpp
++++ git.temp/src/geolocation.cpp
+@@ -35,8 +35,8 @@ GeoLocation::GeoLocation(const QDomEleme
+ 
+ QDomElement GeoLocation::toXml(QDomDocument& doc)
+ {
+-	QDomElement geoloc = doc.createElement("geoloc");
+-	geoloc.setAttribute("xmlns", "http://jabber.org/protocol/geoloc");
++	QDomElement geoloc = doc.createElement(PEP_GEOLOC_TN);
++	geoloc.setAttribute("xmlns", PEP_GEOLOC_NS);
+ 
+ 	if (alt_.hasValue()) {
+ 		QDomElement e = doc.createElement("alt");
+@@ -129,11 +129,14 @@ QDomElement GeoLocation::toXml(QDomDocum
+ 
+ void GeoLocation::fromXml(const QDomElement& e)
+ {
+-	if (e.tagName() != "geoloc")
++	if (e.tagName() != PEP_GEOLOC_TN)
+ 		return;
+ 
+ 	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+ 		QDomElement m = n.toElement();
++		if (m.isNull()) {
++			continue;
++		}
+ 		if (m.tagName() == "alt")
+ 			alt_ = Maybe<float>(m.text().toFloat());
+ 		else if (m.tagName() == "bearing")
+--- git.temp.orig/src/geolocation.h
++++ git.temp/src/geolocation.h
+@@ -25,6 +25,9 @@
+ 
+ #include "maybe.h"
+ 
++#define PEP_GEOLOC_TN "geoloc"
++#define PEP_GEOLOC_NS "http://jabber.org/protocol/geoloc"
++
+ class QDomElement;
+ class QDomDocument;
+ 
+--- git.temp.orig/src/geolocationdlg.cpp
++++ git.temp/src/geolocationdlg.cpp
+@@ -160,10 +160,10 @@ void GeoLocationDlg::setGeoLocation()
+ 
+ 	foreach(PsiAccount *pa, pa_) {
+ 		if (geoloc.isNull()) {
+-			pa->pepManager()->retract("http://jabber.org/protocol/geoloc", "current");
++			pa->pepManager()->disable(PEP_GEOLOC_TN, PEP_GEOLOC_NS, "current");
+ 		}
+ 		else {
+-			pa->pepManager()->publish("http://jabber.org/protocol/geoloc", PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++			pa->pepManager()->publish(PEP_GEOLOC_NS, PubSubItem("current",geoloc.toXml(*pa->client()->rootTask()->doc())));
+ 		}
+ 	}
+ 	close();
+--- git.temp.orig/src/mood.cpp
++++ git.temp/src/mood.cpp
+@@ -65,16 +65,13 @@ bool Mood::isNull() const
+ 
+ QDomElement Mood::toXml(QDomDocument& doc)
+ {
+-	QDomElement mood = doc.createElement("mood");
+-	mood.setAttribute("xmlns", "http://jabber.org/protocol/mood");
++	QDomElement mood = doc.createElement(PEP_MOOD_TN);
++	mood.setAttribute("xmlns", PEP_MOOD_NS);
+ 
+ 	if (!type() == Unknown) {
+ 		QDomElement el = doc.createElement(MoodCatalog::instance()->findEntryByType(type()).value());
+ 		mood.appendChild(el);
+ 	}
+-	else {
+-		qWarning("mood.cpp: ERROR: Converting unknown mood");
+-	}
+ 
+ 	if (!text().isEmpty()) {
+ 		QDomElement el = doc.createElement("text");
+@@ -88,11 +85,16 @@ QDomElement Mood::toXml(QDomDocument& do
+ 
+ void Mood::fromXml(const QDomElement& e)
+ {
+-	if (e.tagName() != "mood")
++	type_ = Mood::Unknown;
++
++	if (e.tagName() != PEP_MOOD_TN)
+ 		return;
+ 
+ 	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
+ 		QDomElement m = n.toElement();
++		if(m.isNull()) {
++			continue;
++		}
+ 		if (m.tagName() == "text") {
+ 			text_ = m.text();
+ 		}
+--- git.temp.orig/src/mood.h
++++ git.temp/src/mood.h
+@@ -23,6 +23,9 @@
+ 
+ #include <QString>
+ 
++#define PEP_MOOD_TN "mood"
++#define PEP_MOOD_NS "http://jabber.org/protocol/mood"
++
+ class QDomElement;
+ class QDomDocument;
+ 
+--- git.temp.orig/src/moodcatalog.cpp
++++ git.temp/src/moodcatalog.cpp
+@@ -27,6 +27,7 @@
+ 
+ MoodCatalog::Entry::Entry()
+ {
++	type_ = Mood::Unknown;
+ }
+ 
+ MoodCatalog::Entry::Entry(Mood::Type type, const QString& value, const QString& text) : type_(type), value_(value), text_(text)
+--- git.temp.orig/src/mooddlg.cpp
++++ git.temp/src/mooddlg.cpp
+@@ -58,11 +58,11 @@ void MoodDlg::setMood()
+ 	QString moodstr = ui_.cb_type->currentText();
+ 	foreach(PsiAccount *pa, pa_) {
+ 		if (moodstr == tr("<unset>")) {
+-			pa->pepManager()->retract("http://jabber.org/protocol/mood", "current");
++			pa->pepManager()->disable(PEP_MOOD_TN, PEP_MOOD_NS, "current");
+ 		}
+ 		else {
+ 			Mood::Type type = MoodCatalog::instance()->findEntryByText(moodstr).type();
+-			pa->pepManager()->publish("http://jabber.org/protocol/mood", PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())), PEPManager::PresenceAccess);
++			pa->pepManager()->publish(PEP_MOOD_NS, PubSubItem("current",Mood(type,ui_.le_text->text()).toXml(*pa->client()->rootTask()->doc())));
+ 		}
+ 	}
+ 	close();
+--- git.temp.orig/src/pepmanager.cpp
++++ git.temp/src/pepmanager.cpp
+@@ -570,6 +570,16 @@ void PEPManager::retract(const QString&
+ }
+ 
+ 
++void PEPManager::disable(const QString& tagName, const QString& node, const QString& id)
++{
++	// disable by publishing an empty element
++	QDomElement element = client_->rootTask()->doc()->createElement(tagName);
++	element.setAttribute("xmlns", node);
++
++	publish(node, PubSubItem(id,element));
++}
++
++
+ void PEPManager::publishFinished()
+ {
+ 	PEPPublishTask* task = (PEPPublishTask*) sender();
+--- git.temp.orig/src/pepmanager.h
++++ git.temp/src/pepmanager.h
+@@ -59,6 +59,7 @@ public:
+ 
+ 	void publish(const QString& node, const PubSubItem&, Access = DefaultAccess);
+ 	void retract(const QString& node, const QString& id);
++	void disable(const QString& tagName, const QString& node, const QString& id);
+ 	void get(const Jid& jid, const QString& node, const QString& id);
+ 
+ 	//void getSubscriptions(const Jid& jid);

psi-plus-main-20141106.tar.xz/patches/0960-psi-remove-whiteboard-action-from-groupchat.diff Added

@@ -0,0 +1,56 @@
+--- git.temp.orig/src/groupchatdlg.cpp
++++ git.temp/src/groupchatdlg.cpp
+@@ -210,9 +210,9 @@ public:
+ 	bool nonAnonymous;		 // got status code 100 ?
+ 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
+ 	TypeAheadFindBar *typeahead;
+-#ifdef WHITEBOARDING
+-	IconAction *act_whiteboard;
+-#endif
++//#ifdef WHITEBOARDING
++//	IconAction *act_whiteboard;
++//#endif
+ 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
+ 
+ 	QAction *act_mini_cmd, *act_nick, *act_hide, *act_minimize;
+@@ -695,10 +695,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	d->act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
+ 	connect(d->act_html_text, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
+ 
+-#ifdef WHITEBOARDING
+-	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
+-	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
+-#endif
++//#ifdef WHITEBOARDING
++//	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
++//	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
++//#endif
+ 
+ 	connect(pa->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), d, SLOT(addEmoticon(QString)));
+ 	d->act_icon = new IconAction( tr( "Select Icon" ), "psi/smile", tr( "Select Icon" ), 0, this );
+@@ -742,9 +742,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.toolbar->addAction(d->act_find);
+ 	ui_.toolbar->addAction(d->act_configure);
+ 	ui_.toolbar->addAction(d->act_html_text);
+-#ifdef WHITEBOARDING
+-	ui_.toolbar->addAction(d->act_whiteboard);
+-#endif
++//#ifdef WHITEBOARDING
++//	ui_.toolbar->addAction(d->act_whiteboard);
++//#endif
+ 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+ 	ui_.toolbar->addAction(d->act_icon);
+ 	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
+@@ -1964,9 +1964,9 @@ void GCMainDlg::buildMenu()
+ 
+ 	d->act_clear->addTo( d->pm_settings );
+ 	d->act_configure->addTo( d->pm_settings );
+-#ifdef WHITEBOARDING
+-	d->act_whiteboard->addTo( d->pm_settings );
+-#endif
++//#ifdef WHITEBOARDING
++//	d->act_whiteboard->addTo( d->pm_settings );
++//#endif
+ 	d->pm_settings->addSeparator();
+ 
+ 	d->pm_settings->addAction(d->act_icon);

psi-plus-main-20141106.tar.xz/patches/0970-psi-disable-auto-scroll-to-bottom.diff Added

@@ -0,0 +1,30 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -108,6 +108,7 @@
+ 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
+ 				<auto-popup type="bool">false</auto-popup>
+ 				<auto-capitalize type="bool">false</auto-capitalize>
++				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
+ 				<delete-contents-after type="QString">never</delete-contents-after>
+ 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
+ 				<use-chat-says-style type="bool">false</use-chat-says-style>
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -346,7 +346,7 @@ void ChatView::renderMucMessage(const Me
+ 		}
+ 	}
+ 
+-	if(mv.isLocal()) {
++	if(mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
+ 		scrollToBottom();
+ 	}
+ }
+@@ -372,7 +372,7 @@ void ChatView::renderMessage(const Messa
+ 		}
+ 	}
+ 
+-	if (mv.isLocal()) {
++	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
+ 		deferredScroll();
+ 	}
+ }

psi-plus-main-20141106.tar.xz/patches/0980-psi-fix-pgp-icon-in-roster.diff Added

@@ -0,0 +1,90 @@
+--- git.temp.orig/src/contactlistmodel.cpp
++++ git.temp/src/contactlistmodel.cpp
+@@ -564,6 +564,9 @@ QVariant ContactListModel::contactData(c
+ 	else if (role == BlockRole) {
+ 		return QVariant(contact->isBlocked());
+ 	}
++	else if (role == IsSecureRole) {
++		return QVariant(contact->userListItem().isSecure());
++	}
+ #ifdef YAPSI
+ 	else if (role == Qt::ForegroundRole) {
+ 		return QVariant(Ya::statusColor(contact->status().type()));
+--- git.temp.orig/src/contactlistmodel.h
++++ git.temp/src/contactlistmodel.h
+@@ -87,6 +87,7 @@ public:
+ 		IsMucRole = Qt::UserRole + 29,
+ 		MucMessagesRole = Qt::UserRole + 30,
+ 		BlockRole = Qt::UserRole + 31,
++		IsSecureRole = Qt::UserRole + 32,
+ 
+ 		// groups
+ 		ExpandedRole = Qt::UserRole + 12,
+--- git.temp.orig/src/psicontactlistviewdelegate.cpp
++++ git.temp/src/psicontactlistviewdelegate.cpp
+@@ -365,6 +365,11 @@ void PsiContactListViewDelegate::drawCon
+ 		rightPixs.push_back(pix);
+ 		rightWidths.push_back(pix.width());
+ 	}
++	if (index.data(ContactListModel::IsSecureRole).toBool()) {
++		const QPixmap &pix = IconsetFactory::iconPixmap("psi/pgp");
++		rightPixs.push_back(pix);
++		rightWidths.push_back(pix.width());
++	}
+ 	}
+ 
+ 	if(rightPixs.isEmpty() && mucMessages.isEmpty())
+@@ -401,29 +406,6 @@ void PsiContactListViewDelegate::drawCon
+ 			painter->drawPixmap(iconRect.topRight(), pix);
+ 		}
+ 	}
+-
+-#if 0
+-	int x;
+-	if (d->status_single)
+-		x = widthUsed();
+-	else {
+-		QFontMetrics fm(p->font());
+-		const QPixmap *pix = pixmap(column);
+-		x = fm.width(text(column)) + (pix ? pix->width() : 0) + 8;
+-	}
+-
+-	if (d->u) {
+-		UserResourceList::ConstIterator it = d->u->priority();
+-		if (it != d->u->userResourceList().end()) {
+-			if (d->u->isSecure((*it).name())) {
+-				const QPixmap &pix = IconsetFactory::iconPixmap("psi/cryptoYes");
+-				int y = (height() - pix.height()) / 2;
+-				p->drawPixmap(x, y, pix);
+-				x += 24;
+-			}
+-		}
+-	}
+-#endif
+ }
+ 
+ void PsiContactListViewDelegate::drawGroup(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+--- git.temp.orig/src/userlist.cpp
++++ git.temp/src/userlist.cpp
+@@ -1120,6 +1120,11 @@ void UserListItem::setPrivate(bool b)
+ 	v_private = b;
+ }
+ 
++bool UserListItem::isSecure() const
++{
++	return !secList.isEmpty();
++}
++
+ bool UserListItem::isSecure(const QString &rname) const
+ {
+ 	for(QStringList::ConstIterator it = secList.begin(); it != secList.end(); ++it) {
+--- git.temp.orig/src/userlist.h
++++ git.temp/src/userlist.h
+@@ -152,6 +152,7 @@ public:
+ 	const UserResourceList & userResourceList() const;
+ 	UserResourceList::ConstIterator priority() const;
+ 
++	bool isSecure() const;
+ 	bool isSecure(const QString &rname) const;
+ 	void setSecure(const QString &rname, bool);
+

psi-plus-main-20141106.tar.xz/patches/0990-psi-remember-pgp-key.diff Added

@@ -0,0 +1,173 @@
+--- git.orig/src/passphrasedlg.cpp
++++ git/src/passphrasedlg.cpp
+@@ -42,3 +42,7 @@ QString PassphraseDlg::getPassphrase() c
+ 	return ui_.le_pass->text();
+ }
+ 
++bool PassphraseDlg::rememberPassPhrase() const
++{
++	return ui_.cb_savePass->isChecked();
++}
+--- git.orig/src/passphrasedlg.h
++++ git/src/passphrasedlg.h
+@@ -32,6 +32,7 @@ public:
+ 	void promptPassphrase(const QString& name);
+ 
+ 	QString getPassphrase() const;
++	bool rememberPassPhrase() const;
+ 
+ private:
+ 	Ui::Passphrase ui_;
+--- git.orig/src/passphrase.ui
++++ git/src/passphrase.ui
+@@ -74,6 +74,13 @@ Please enter your passphrase below:</str
+                   </property>
+                 </widget>
+               </item>
++              <item>
++                <widget class="QCheckBox" name="cb_savePass">
++                  <property name="text">
++                    <string>Remember passphrase</string>
++                  </property>
++               </widget>
++              </item>
+             </layout>
+           </item>
+         </layout>
+--- git.orig/src/pgputil.cpp
++++ git/src/pgputil.cpp
+@@ -92,6 +92,9 @@ void PGPUtil::passphraseDone(int result)
+ 		QString passphrase = passphraseDlg_->getPassphrase();
+ 		if (!currentEntryId_.isEmpty()) {
+ 			passphrases_[currentEntryId_] = passphrase;
++			if(passphraseDlg_->rememberPassPhrase()) {
++				emit newPassPhase(currentEntryId_, passphrase);
++			}
+ 		}
+ 		qcaEventHandler_->submitPassword(currentEventId_,passphrase.toUtf8());
+ 	}
+@@ -283,6 +286,11 @@ void PGPUtil::removePassphrase(const QSt
+ 	passphrases_.remove(id);
+ }
+ 
++void PGPUtil::addPassphrase(const QString &id, const QString &pass)
++{
++	passphrases_.insert(id, pass);
++}
++
+ void PGPUtil::keyStoreAvailable(const QString& k)
+ {
+ 	QCA::KeyStore* ks = new QCA::KeyStore(k, &qcaKeyStoreManager_);
+--- git.orig/src/pgputil.h
++++ git/src/pgputil.h
+@@ -40,9 +40,11 @@ public:
+ 	bool equals(QCA::PGPKey, QCA::PGPKey);
+ 
+ 	void removePassphrase(const QString& id);
++	void addPassphrase(const QString& id, const QString& pass);
+ 
+ signals:
+ 	void pgpKeysUpdated();
++	void newPassPhase(const QString&, const QString&);
+ 
+ protected:
+ 	PGPUtil();
+--- git.orig/src/profiles.h
++++ git/src/profiles.h
+@@ -80,6 +80,7 @@ public:
+ 	QMap<QString, GroupData> groupState;
+ 
+ 	QCA::PGPKey pgpSecretKey;
++	QString pgpPassPhrase;
+ 
+ 	VarList keybind;
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -1198,6 +1198,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	//connect(d->psi, SIGNAL(pgpToggled(bool)), SLOT(pgpToggled(bool)));
+ #ifdef HAVE_PGPUTIL
+ 	connect(&PGPUtil::instance(), SIGNAL(pgpKeysUpdated()), SLOT(pgpKeysUpdated()));
++	connect(&PGPUtil::instance(), SIGNAL(newPassPhase(QString,QString)), SLOT(newPgpPassPhase(QString,QString)));
+ #endif
+ 
+ 	d->setEnabled(enabled());
+@@ -5817,10 +5818,23 @@ void PsiAccount::pgpKeysUpdated()
+ #endif
+ }
+ 
++void PsiAccount::newPgpPassPhase(const QString &id, const QString &pass)
++{
++	const QString pgpSecretKeyID = (d->acc.pgpSecretKey.isNull() ? "" : d->acc.pgpSecretKey.keyId());
++	if(pgpSecretKeyID == id) {
++		d->acc.pgpPassPhrase = pass;
++	}
++}
++
+ void PsiAccount::trySignPresence()
+ {
+ 	QCA::SecureMessageKey skey;
+ 	skey.setPGPSecretKey(d->cur_pgpSecretKey);
++#ifdef HAVE_PGPUTIL
++	if(!d->cur_pgpSecretKey.isNull() && !d->acc.pgpPassPhrase.isEmpty()) {
++		PGPUtil::instance().addPassphrase(d->cur_pgpSecretKey.keyId(), d->acc.pgpPassPhrase);
++	}
++#endif
+ 	QByteArray plain = d->loginStatus.status().toUtf8();
+ 
+ 	PGPTransaction *t = new PGPTransaction(new QCA::OpenPGP());
+@@ -5844,6 +5858,7 @@ void PsiAccount::pgp_signFinished()
+ 	else {
+ 		// Clear passphrase from cache
+ 		if (t->errorCode() == QCA::SecureMessage::ErrorPassphrase) {
++			d->acc.pgpPassPhrase.clear();
+ 			QCA::KeyStoreEntry ke = PGPUtil::instance().getSecretKeyStoreEntry(d->cur_pgpSecretKey.keyId());
+ 			if (!ke.isNull())
+ 				PGPUtil::instance().removePassphrase(ke.id());
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -472,6 +472,7 @@ protected:
+ private slots:
+ 	void eventFromXml(const PsiEvent::Ptr &e);
+ 	void simulateContactOffline(const XMPP::Jid& contact);
++	void newPgpPassPhase(const QString& id, const QString& pass);
+ 
+ private:
+ 	void handleEvent(const PsiEvent::Ptr &e, ActivationType activationType);
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -259,6 +259,11 @@ void UserAccount::fromOptions(OptionsTre
+ 		QCA::KeyStoreEntry e = PGPUtil::instance().getSecretKeyStoreEntry(pgpSecretKeyID);
+ 		if (!e.isNull())
+ 			pgpSecretKey = e.pgpSecretKey();
++
++		pgpPassPhrase = o->getOption(base + ".pgp-pass-phrase").toString();
++		if(!pgpPassPhrase.isEmpty()) {
++			pgpPassPhrase = decodePassword(pgpPassPhrase, pgpSecretKeyID);
++		}
+ 	}
+ #endif
+ 
+@@ -389,8 +394,10 @@ void UserAccount::toOptions(OptionsTree
+ 	o->setOption(base + ".priority", priority);
+ 	if (!pgpSecretKey.isNull()) {
+ 		o->setOption(base + ".pgp-secret-key-id", pgpSecretKey.keyId());
++		o->setOption(base + ".pgp-pass-phrase", encodePassword(pgpPassPhrase, pgpSecretKey.keyId()));
+ 	} else {
+ 		o->setOption(base + ".pgp-secret-key-id", "");
++		o->setOption(base + ".pgp-pass-phrase", "");
+ 	}
+ 	switch (allow_plain) {
+ 		case XMPP::ClientStream::NoAllowPlain:
+@@ -559,6 +566,11 @@ void UserAccount::fromXml(const QDomElem
+ 		QCA::KeyStoreEntry e = PGPUtil::instance().getSecretKeyStoreEntry(pgpSecretKeyID);
+ 		if (!e.isNull())
+ 			pgpSecretKey = e.pgpSecretKey();
++
++		readEntry(a, "passphrase", &pgpPassPhrase);
++		if(!pgpPassPhrase.isEmpty()) {
++			pgpPassPhrase = decodePassword(pgpPassPhrase, pgpSecretKeyID);
++		}
+ 	}
+ #endif
+

psi-plus-main-20141106.tar.xz/patches/1000-psi-save-button-for-muc-kickban-reasons.diff Added

@@ -0,0 +1,78 @@
+--- git.temp.orig/src/mucreasonseditor.cpp
++++ git.temp/src/mucreasonseditor.cpp
+@@ -16,11 +16,7 @@ MUCReasonsEditor::~MUCReasonsEditor()
+ 
+ void MUCReasonsEditor::accept()
+ {
+-	QStringList reasons;
+-	int cnt=ui_.lstReasons->count();
+-	for (int i=0; i<cnt; ++i)
+-		reasons.append(ui_.lstReasons->item(i)->text());
+-	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
++	save();
+ 	reason_=ui_.txtReason->text();
+ 	QDialog::accept();
+ }
+@@ -42,3 +38,11 @@ void MUCReasonsEditor::on_btnRemove_clic
+ 	}
+ }
+ 
++void MUCReasonsEditor::save()
++{
++	QStringList reasons;
++	int cnt=ui_.lstReasons->count();
++	for (int i=0; i<cnt; ++i)
++		reasons.append(ui_.lstReasons->item(i)->text());
++	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
++}
+--- git.temp.orig/src/mucreasonseditor.h
++++ git.temp/src/mucreasonseditor.h
+@@ -18,6 +18,7 @@ private:
+ private slots:
+ 	void on_btnAdd_clicked();
+ 	void on_btnRemove_clicked();
++	void save();
+ protected slots:
+ 	void accept();
+ };
+--- git.temp.orig/src/mucreasonseditor.ui
++++ git.temp/src/mucreasonseditor.ui
+@@ -77,6 +77,13 @@
+       <number>6</number>
+      </property>
+      <item>
++      <widget class="QPushButton" name="btnSave">
++       <property name="text">
++        <string>Save</string>
++       </property>
++      </widget>
++     </item>
++     <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+@@ -147,5 +154,24 @@
+     </hint>
+    </hints>
+   </connection>
++  <connection>
++   <sender>btnSave</sender>
++   <signal>clicked()</signal>
++   <receiver>MUCReasonsEditor</receiver>
++   <slot>save()</slot>
++   <hints>
++    <hint type="sourcelabel" >
++     <x>35</x>
++     <y>282</y>
++    </hint>
++    <hint type="destinationlabel" >
++     <x>199</x>
++     <y>149</y>
++    </hint>
++   </hints>
++  </connection>
+  </connections>
++ <slots>
++  <slot>save()</slot>
++ </slots>
+ </ui>

psi-plus-main-20141106.tar.xz/patches/1010-psi-one-chat-for-many-resources.diff Added

@@ -0,0 +1,633 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -124,6 +124,8 @@
+ 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
+ 				<log-height type="int">325</log-height>
+ 				<chatedit-height type="int">10</chatedit-height>
++				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
++				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -107,6 +107,14 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 
+ 	status_ = -1;
+ 
++	autoSelectContact_ = false;
++	if (PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode").toString() == "auto") {
++		UserListItem *uli = account()->findFirstRelevant(jid);
++		if (!uli || (!uli->isPrivate() && (jid.resource().isEmpty() || uli->userResourceList().count() <= 1))) {
++			autoSelectContact_ = true;
++		}
++	}
++
+ 	// Message events
+ 	contactChatState_ = XMPP::StateNone;
+ 	lastChatState_ = XMPP::StateNone;
+@@ -398,18 +406,7 @@ const QString& ChatDlg::getDisplayName()
+ 	return dispNick_;
+ }
+ 
+-struct UserStatus {
+-	UserStatus()
+-			: userListItem(0)
+-			, statusType(XMPP::Status::Offline) {}
+-	UserListItem* userListItem;
+-	XMPP::Status::Type statusType;
+-	QString status;
+-	int priority;
+-	QString publicKeyID;
+-};
+-
+-UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource)
++UserStatus ChatDlg::userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource)
+ {
+ 	if (ul.isEmpty())
+ 		return UserStatus();
+@@ -468,12 +465,20 @@ void ChatDlg::updateContact(const Jid &j
+ 	if (jid().compare(j, false)) {
+ 		QList<UserListItem*> ul = account()->findRelevant(j);
+ 		UserStatus userStatus = userStatusFor(jid(), ul, false);
++
++		Jid oldJid = jid();
++		updateJidWidget(ul, userStatus.statusType, fromPresence);
++		bool jidSwitched = !oldJid.compare(jid(), true);
++		if (jidSwitched) {
++			userStatus = userStatusFor(jid(), ul, false);
++		}
++
+ 		if (userStatus.statusType == XMPP::Status::Offline)
+ 			contactChatState_ = XMPP::StateNone;
+ 
+ 		bool statusWithPriority = PsiOptions::instance()->getOption("options.ui.chat.status-with-priority").toBool();
+ 		bool statusChanged = false;
+-		if (status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
++		if (jidSwitched || status_ != userStatus.statusType || statusString_ != userStatus.status || (statusWithPriority && priority_ != userStatus.priority)) {
+ 			statusChanged = true;
+ 			status_ = userStatus.statusType;
+ 			statusString_ = userStatus.status;
+@@ -511,6 +516,13 @@ void ChatDlg::updateContact(const Jid &j
+ 	}
+ }
+ 
++void ChatDlg::updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence)
++{
++	Q_UNUSED(ul);
++	Q_UNUSED(status);
++	Q_UNUSED(fromPresence);
++}
++
+ void ChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
+ {
+ 	Q_UNUSED(u);
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -48,6 +48,17 @@ class QDragEnterEvent;
+ class ChatView;
+ class ChatEdit;
+ 
++struct UserStatus {
++	UserStatus()
++			: userListItem(0)
++			, statusType(XMPP::Status::Offline) {}
++	UserListItem* userListItem;
++	XMPP::Status::Type statusType;
++	QString status;
++	int priority;
++	QString publicKeyID;
++};
++
+ class ChatDlg : public TabbableWidget
+ {
+ 	Q_OBJECT
+@@ -76,6 +87,8 @@ public:
+ 	PsiAccount* account() const;
+ 	void setText(const QString& );
+ 	Jid realJid() const;
++	bool autoSelectContact() const {return autoSelectContact_;};
++	static UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource);
+ 
+ signals:
+ 	void aInfo(const Jid &);
+@@ -100,6 +113,7 @@ protected:
+ 	void dropEvent(QDropEvent* event);
+ 	void dragEnterEvent(QDragEnterEvent* event);
+ 	bool eventFilter(QObject *obj, QEvent *event);
++	bool autoSelectContact_;
+ 
+ public slots:
+ 	// reimplemented
+@@ -151,6 +165,7 @@ protected:
+ 
+ 	virtual void initUi() = 0;
+ 	virtual void capsChanged();
++	virtual void updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence);
+ 	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
+ 
+ 	void appendMessage(const Message &, bool local = false);
+--- git.orig/src/chatdlg.ui
++++ git/src/chatdlg.ui
+@@ -64,10 +64,22 @@
+           </widget>
+          </item>
+          <item>
+-          <widget class="QLineEdit" name="le_jid">
+-           <property name="readOnly">
++          <widget class="QComboBox" name="le_jid">
++           <property name="sizePolicy">
++            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
++             <horstretch>1</horstretch>
++             <verstretch>0</verstretch>
++            </sizepolicy>
++           </property>
++           <property name="editable">
+             <bool>true</bool>
+            </property>
++           <property name="sizeAdjustPolicy">
++            <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
++           </property>
++           <property name="minimumContentsLength">
++            <number>10</number>
++           </property>
+           </widget>
+          </item>
+          <item>
+@@ -366,6 +378,15 @@
+    <header>iconlabel.h</header>
+   </customwidget>
+  </customwidgets>
++ <tabstops>
++  <tabstop>le_jid</tabstop>
++  <tabstop>tb_voice</tabstop>
++  <tabstop>tb_pgp</tabstop>
++  <tabstop>tb_emoticons</tabstop>
++  <tabstop>tb_actions</tabstop>
++  <tabstop>mle</tabstop>
++  <tabstop>pb_send</tabstop>
++ </tabstops>
+  <resources/>
+  <connections/>
+ </ui>
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -2720,9 +2720,9 @@ void PsiAccount::processIncomingMessage(
+ 	else
+ 		j = ul.first()->jid();
+ 
+-	c = findChatDialog(j);
++	/*c = findChatDialog(j);
+ 	if(!c)
+-		c = findChatDialog(m.from().full());
++		c = findChatDialog(m.from().full());*/
+ 
+ 	if(m.type() == "error") {
+ 		Stanza::Error err = m.error();
+@@ -2754,6 +2754,13 @@ void PsiAccount::processIncomingMessage(
+ 			else if (type == "chat")
+ 				m.setType("chat");
+ 			else if (type == "current-open") {
++				c = NULL;
++				foreach (ChatDlg *cl, findChatDialogs(m.from(), false)) {
++					if (cl->autoSelectContact() || cl->jid().resource().isEmpty() || m.from().resource() == cl->jid().resource()) {
++						c = cl;
++						break;
++					}
++				}
+ 				if (c != NULL && !c->isHidden())
+ 					m.setType("chat");
+ 				else
+@@ -3208,9 +3215,33 @@ bool PsiAccount::validRosterExchangeItem
+ 	return false;
+ }
+ 
+-ChatDlg* PsiAccount::findChatDialog(const Jid& jid) const
++ChatDlg* PsiAccount::findChatDialog(const Jid& jid, bool compareResource) const
++{
++	return findDialog<ChatDlg*>(jid, compareResource);
++}
++
++ChatDlg* PsiAccount::findChatDialogEx(const Jid& jid) const
++{
++	ChatDlg* cm1 = NULL;
++	ChatDlg* cm2 = NULL;
++	foreach (ChatDlg *cl, findChatDialogs(jid, false)) {
++		if (cl->autoSelectContact())
++			return cl;
++		if (!cm1 && jid.resource() == cl->jid().resource()) {
++				cm1 = cl;
++				continue;
++		}
++		if (!cm2 && cl->jid().resource().isEmpty())
++			cm2 = cl;
++	}
++	if (cm1)
++		return cm1;
++	return cm2;
++}
++
++QList<ChatDlg*> PsiAccount::findChatDialogs(const Jid& jid, bool compareResource) const
+ {
+-	return findDialog<ChatDlg*>(jid, true);
++	return findDialogs<ChatDlg*>(jid, compareResource);
+ }
+ 
+ QWidget* PsiAccount::findDialog(const QMetaObject& mo, const Jid& jid, bool compareResource) const
+@@ -3725,7 +3756,8 @@ EventDlg *PsiAccount::ensureEventDlg(con
+ 
+ ChatDlg *PsiAccount::ensureChatDlg(const Jid &j)
+ {
+-	ChatDlg *c = findChatDialog(j);
++	/*ChatDlg *c = findChatDialog(j);*/
++	ChatDlg *c = findChatDialogEx(j);
+ 	if(!c) {
+ 		// create the chatbox
+ 		c = ChatDlg::create(j, this, d->tabManager);
+@@ -3743,6 +3775,7 @@ ChatDlg *PsiAccount::ensureChatDlg(const
+ #endif
+ 	}
+ 	else {
++		c->setJid(j);
+ 		// on X11, do a special reparent to open on the right desktop
+ #ifdef HAVE_X11
+ 		/* KIS added an exception for tabs here. We do *not* want chats flying
+@@ -4921,12 +4954,12 @@ void PsiAccount::handleEvent(const PsiEv
+ 		}
+ 		else if (m.messageReceipt() == ReceiptReceived) {
+ 			if (o->getOption("options.ui.notifications.request-receipts").toBool()) {
+-				ChatDlg *c = findChatDialog(e->from());
+-				if (!c) {
+-					c = findChatDialog(e->jid());
+-				}
+-				if (c) {
+-					c->incomingMessage(m);
++				foreach (ChatDlg *c, findChatDialogs(e->from(), false)) {
++					if (c->autoSelectContact()  || c->jid().resource().isEmpty() || e->from().resource() == c->jid().resource()) {
++						if (c->autoSelectContact())
++							c->setJid(e->from());
++						c->incomingMessage(m);
++					}
+ 				}
+ 			}
+ 			return;
+@@ -4935,11 +4968,9 @@ void PsiAccount::handleEvent(const PsiEv
+ 		// Pass message events to chat window
+ 		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
+ 			if (o->getOption("options.messages.send-composing-events").toBool()) {
+-				ChatDlg *c = findChatDialog(e->from());
+-				if (!c) {
+-					c = findChatDialog(e->jid());
+-				}
++				ChatDlg *c = findChatDialogEx(e->from());
+ 				if (c) {
++					c->setJid(e->from());
+ 					c->incomingMessage(m);
+ 				}
+ 			}
+@@ -4955,11 +4986,8 @@ void PsiAccount::handleEvent(const PsiEv
+ 
+ 		// pass chat messages directly to a chat window if possible (and deal with sound)
+ 		else if(m.type() == "chat") {
+-			ChatDlg *c = findChatDialog(e->from());
+-			if(!c)
+-				c = findChatDialog(e->jid());
+-
+-			if(c)
++			ChatDlg *c = findChatDialogEx(e->from());
++			if (c)
+ 				c->setJid(e->from());
+ 
+ 			//if the chat exists, and is either open in a tab,
+@@ -5430,12 +5458,12 @@ void PsiAccount::messageStanzasAcked(int
+ void PsiAccount::processChatsHelper(const Jid& j, bool removeEvents)
+ {
+ 	//printf("processing chats for [%s]\n", j.full().latin1());
+-	ChatDlg *c = findChatDialog(j);
++	ChatDlg *c = findChatDialogEx(j);
+ 	if(!c)
+ 		return;
+ 	// extract the chats
+ 	QList<PsiEvent::Ptr> chatList;
+-	bool compareResources = true;
++	bool compareResources = !c->autoSelectContact();
+ #ifdef YAPSI
+ 	compareResources = false;
+ #endif
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -162,7 +162,9 @@ public:
+ 	QHostAddress *localAddress() const;
+ 	void passwordReady(QString password);
+ 
+-	ChatDlg* findChatDialog(const Jid& jid) const;
++	ChatDlg* findChatDialog(const Jid& jid, bool compareResource = true) const;
++	ChatDlg* findChatDialogEx(const Jid& jid) const;
++	QList<ChatDlg*> findChatDialogs(const Jid& jid, bool compareResource = true) const;
+ 
+ 	template<typename T>
+ 	inline T findDialog(const Jid& jid = Jid(), bool compareResource = true) const {
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -199,6 +199,28 @@ PsiChatDlg::~PsiChatDlg()
+ void PsiChatDlg::initUi()
+ {
+ 	ui_.setupUi(this);
++
++	le_autojid = new ActionLineEdit(ui_.le_jid);
++	ui_.le_jid->setLineEdit(le_autojid);
++	ui_.le_jid->lineEdit()->setReadOnly(true);
++	if (autoSelectContact_) {
++		QStringList excl = PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode-ignorelist").toString().toLower().split(",", QString::SkipEmptyParts);
++		if (excl.indexOf(jid().bare()) == -1) {
++			ui_.le_jid->insertItem(0, "auto", jid().full());
++			ui_.le_jid->setCurrentIndex(0);
++		} else {
++			autoSelectContact_ = false;
++		}
++	}
++	connect(ui_.le_jid, SIGNAL(activated(int)), this, SLOT(contactChanged()));
++	UserListItem *ul = account()->findFirstRelevant(jid());
++	if (!ul || !ul->isPrivate()) {
++		act_autojid = new IconAction(this);
++		updateAutojidIcon();
++		connect(act_autojid, SIGNAL(triggered()), SLOT(doSwitchJidMode()));
++		le_autojid->addAction(act_autojid);
++	}
++
+ 	ui_.lb_ident->setAccount(account());
+ 	ui_.lb_ident->setShowJid(false);
+ 
+@@ -545,6 +567,110 @@ void PsiChatDlg::setContactToolTip(QStri
+ 	ui_.avatar->setToolTip(text);
+ }
+ 
++void PsiChatDlg::updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence)
++{
++	static bool internal_change = false;
++	if (!internal_change) {
++		// Filling jid's combobox
++		const UserListItem *u = ul.first();
++		if (!u)
++			return;
++		UserResourceList resList = u->userResourceList();
++		const QString name = u->name();
++		QComboBox *jidCombo = ui_.le_jid;
++		if (!u->isPrivate()) {
++			// If no conference private chat
++			const int combo_idx = jidCombo->currentIndex();
++			Jid old_jid = (combo_idx != -1) ? Jid(jidCombo->itemData(combo_idx).toString()) : Jid();
++			//if (fromPresence || jid() != old_jid) {
++				bool auto_mode = autoSelectContact_;
++				Jid new_auto_jid = jid();
++				if (auto_mode) {
++					if (fromPresence && !resList.isEmpty()) {
++						UserResourceList::ConstIterator it = resList.priority();
++						new_auto_jid = jid().withResource((*it).name());
++					}
++				}
++				// Filling address combobox
++				QString iconStr = "clients/unknown";
++				const int resCnt = resList.size();
++				if (resCnt == 1) {
++					UserResourceList::ConstIterator it = resList.begin();
++					if (it != resList.end() && (*it).name().isEmpty())
++						// Empty resource,  but online. Transport?
++						iconStr = "clients/" + u->findClient((*it).clientName().toLower());
++				} else if (resCnt == 0) {
++					iconStr = QString();
++				}
++				setJidComboItem(0, makeContactName(name, u->jid().bare()), u->jid().bare(), iconStr);
++				int new_index = -1;
++				int curr_index = 1;
++				for (UserResourceList::ConstIterator it = resList.begin(); it != resList.end(); it++) {
++					UserResource r = *it;
++					if (!r.name().isEmpty()) {
++						Jid tmp_jid(u->jid().withResource(r.name()));
++						QString iconStr2 = "clients/" + u->findClient(r.clientName().toLower());
++						setJidComboItem(curr_index, makeContactName(name, tmp_jid), tmp_jid, iconStr2);
++						if (new_index == -1 && tmp_jid == new_auto_jid) {
++							new_index = curr_index;
++						}
++						curr_index++;
++					}
++				}
++				if (new_index == -1) {
++					new_index = 0;
++					if (autoSelectContact_) {
++						new_auto_jid = jid().bare();
++					} else {
++						if (!jid().resource().isEmpty()) {
++							new_index = jidCombo->count();
++							setJidComboItem(curr_index, makeContactName(name, jid()), jid(), iconStr);
++							new_index = curr_index++;
++						}
++					}
++				}
++				// Сlean combobox's tail
++				while (curr_index < jidCombo->count())
++					jidCombo->removeItem(curr_index);
++
++				ui_.le_jid->setCurrentIndex(new_index);
++				if (new_auto_jid != jid()) {
++					internal_change = true;
++					setJid(new_auto_jid);
++					if (old_jid != new_auto_jid) {
++						if (autoSelectContact_ && (status != XMPP::Status::Offline || !new_auto_jid.resource().isEmpty())) {
++							appendSysMsg(tr("Contact has been switched: %1").arg(TextUtil::escape(JIDUtil::toString(new_auto_jid, true))));
++						}
++					}
++				}
++			//}
++		} else {
++			// Conference private chat
++			QString iconStr;
++			Jid tmp_jid = jid();
++			UserResourceList::ConstIterator it = resList.begin();
++			if (it != resList.end()) {
++				iconStr = "clients/" + u->findClient((*it).clientName().toLower());
++				tmp_jid = u->jid().withResource((*it).name());
++			} else if (jidCombo->count() > 0) {
++				tmp_jid = Jid(jidCombo->itemData(0).toString());
++			}
++			if (tmp_jid.isValid()) {
++				if (iconStr == "clients/unknown")
++					iconStr = QString(); // for disable the icon
++				setJidComboItem(0, makeContactName(name, tmp_jid), tmp_jid, iconStr);
++			}
++			// Clean combobox's tail
++			while (jidCombo->count() > 1)
++				jidCombo->removeItem(1);
++			//-
++			jidCombo->setCurrentIndex(0);
++		}
++		jidCombo->setToolTip(jidCombo->currentText());
++	}
++	internal_change = false;
++}
++
+ void PsiChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
+ {
+ 	Q_UNUSED(statusString);
+@@ -575,22 +701,6 @@ void PsiChatDlg::contactUpdated(UserList
+ 	}
+ 
+ 	if (u) {
+-		QString name;
+-		QString j;
+-		if (jid().resource().isEmpty())
+-			j = JIDUtil::toString(u->jid(), true);
+-		else
+-			j = JIDUtil::toString(u->jid().bare(), false) + '/' + jid().resource();
+-
+-		if (!u->name().isEmpty())
+-			name = u->name() + QString(" <%1>").arg(j);
+-		else
+-			name = j;
+-
+-		ui_.le_jid->setText(name);
+-		ui_.le_jid->setCursorPosition(0);
+-		ui_.le_jid->setToolTip(name);
+-
+ 		UserResourceList srl = u->userResourceList();
+ 		if(!srl.isEmpty()) {
+ 			UserResource r;
+@@ -885,4 +995,76 @@ void PsiChatDlg::setMargins()
+ 	}
+ }
+ 
++QString PsiChatDlg::makeContactName(const QString &name, const Jid &jid) const
++{
++	QString name_;
++	QString j = JIDUtil::toString(jid, true);
++	if (!name.isEmpty())
++		name_ = name + QString(" <%1>").arg(j);
++	else
++		name_ = j;
++	return name_;
++}
++
++void PsiChatDlg::contactChanged()
++{
++	int curr_index = ui_.le_jid->currentIndex();
++	Jid jid_(ui_.le_jid->itemData(curr_index).toString());
++	if (jid_ != jid()) {
++		autoSelectContact_ = false;
++		setJid(jid_);
++		updateAutojidIcon();
++	}
++}
++
++void PsiChatDlg::updateAutojidIcon()
++{
++	QIcon icon(IconsetFactory::iconPixmap("psi/autojid"));
++	QPixmap pix;
++	QString text;
++	if (autoSelectContact_) {
++		pix = icon.pixmap(QSize(16, 16), QIcon::Normal, QIcon::Off);
++		text = tr("turn off autojid");
++	} else {
++		pix = icon.pixmap(QSize(16, 16), QIcon::Disabled, QIcon::Off);
++		text = tr("turn on autojid");
++	}
++	act_autojid->setIcon(QIcon(pix));
++	act_autojid->setText(text);
++	act_autojid->setToolTip(text);
++	act_autojid->setStatusTip(text);
++}
++
++void PsiChatDlg::setJidComboItem(int pos, const QString &text, const Jid &jid, const QString &icon_str)
++{
++	// Warning! If pos >= items count, the element will be added in a list tail
++	//-
++	QIcon icon;
++	QComboBox *jid_combo = ui_.le_jid;
++	if (!icon_str.isEmpty()) {
++		const PsiIcon picon = IconsetFactory::icon(icon_str);
++		icon = picon.icon();
++	}
++	if (jid_combo->count() > pos) {
++		jid_combo->setItemText(pos, text);
++		jid_combo->setItemData(pos, JIDUtil::toString(jid, true));
++		jid_combo->setItemIcon(pos, icon);
++	} else {
++		jid_combo->addItem(icon, text, JIDUtil::toString(jid, true));
++	}
++}
++
++void PsiChatDlg::doSwitchJidMode()
++{
++	autoSelectContact_ = ! autoSelectContact_;
++	updateAutojidIcon();
++	if (autoSelectContact_) {
++		const QList<UserListItem*> ul = account()->findRelevant(jid().bare());
++		UserStatus userStatus = userStatusFor(jid(), ul, false);
++		updateJidWidget(ul, userStatus.statusType, true);
++		userStatus = userStatusFor(jid(), ul, false);
++		contactUpdated(userStatus.userListItem, userStatus.statusType, userStatus.status);
++	}
++}
++
+ #include "psichatdlg.moc"
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -11,6 +11,8 @@
+ #include "ui_chatdlg.h"
+ #include "typeaheadfind.h"
+ #include "psiwindowheader.h"
++#include "widgets/actionlineedit.h"
++
+ 
+ class IconAction;
+ class PsiContact;
+@@ -55,6 +57,9 @@ private slots:
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
+ 	void verticalSplitterMoved(int, int);
++	void contactChanged();
++	QString makeContactName(const QString &name, const Jid &jid) const;
++	void doSwitchJidMode();
+ 
+ private:
+ 	void initToolBar();
+@@ -64,6 +69,7 @@ private:
+ 	void initUi();
+ 	void capsChanged();
+ 	bool isEncryptionEnabled() const;
++	void updateJidWidget(const QList<UserListItem*> &ul, int status, bool fromPresence);
+ 	void contactUpdated(UserListItem* u, int status, const QString& statusString);
+ 	void updateAvatar();
+ 	void optionsUpdate();
+@@ -76,6 +82,8 @@ private:
+ 	ChatView* chatView() const;
+ 	ChatEdit* chatEdit() const;
+ 	void setMargins();
++	void updateAutojidIcon();
++	void setJidComboItem(int pos, const QString &text, const Jid &jid, const QString &icon_str);
+ 
+ private:
+ 	Ui::ChatDlg ui_;
+@@ -98,6 +106,9 @@ private:
+ 	IconAction* act_add_contact;
+ 	QAction *act_mini_cmd_, *act_minimize_;
+ 
++	ActionLineEdit *le_autojid;
++	IconAction *act_autojid;
++
+ 	MCmdManager mCmdManager_;
+ 	MCmdSimpleSite mCmdSite_;
+ 
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -1731,9 +1731,9 @@ void PsiCon::processEvent(const PsiEvent
+ 		if ( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() && sentToChatWindow ) {
+ 			// Message already displayed, need only to pop up chat dialog, so that
+ 			// it will be read (or marked as read)
+-			ChatDlg *c = account->findChatDialog(from);
++			ChatDlg *c = account->findChatDialogEx(from);
+ 			if(!c)
+-				c = account->findChatDialog(e->jid());
++				c = account->findChatDialogEx(e->jid());
+ 			if(!c)
+ 				return; // should never happen
+

psi-plus-main-20141106.tar.xz/patches/1020-psi-tab-highlight-color.diff Added

@@ -0,0 +1,79 @@
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -1131,9 +1131,15 @@ void ChatDlg::chatEditCreated()
+ 
+ TabbableWidget::State ChatDlg::state() const
+ {
+-	return contactChatState_ == XMPP::StateComposing ?
+-		   TabbableWidget::StateComposing :
+-		   TabbableWidget::StateNone;
++	TabbableWidget::State state = TabbableWidget::StateNone;
++	if(contactChatState_ == XMPP::StateComposing) {
++		state = TabbableWidget::StateComposing;
++	}
++	else if(unreadMessageCount()) {
++		state = TabbableWidget::StateHighlighted;
++	}
++
++	return state;
+ }
+ 
+ int ChatDlg::unreadMessageCount() const
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1991,7 +1991,7 @@ void GCMainDlg::chatEditCreated()
+ 
+ TabbableWidget::State GCMainDlg::state() const
+ {
+-	return TabbableWidget::StateNone;
++	return d->hPending ? TabbableWidget::StateHighlighted : TabbableWidget::StateNone;
+ }
+ 
+ int GCMainDlg::unreadMessageCount() const
+--- git.orig/src/tabs/tabbablewidget.h
++++ git/src/tabs/tabbablewidget.h
+@@ -63,7 +63,8 @@ public:
+ 
+ 	enum State {
+ 		StateNone = 0,
+-		StateComposing
++		StateComposing,
++		StateHighlighted
+ 	};
+ 	virtual State state() const = 0;
+ 	virtual int unreadMessageCount() const = 0;
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -654,17 +654,25 @@ void TabDlg::updateTab(TabbableWidget* c
+ 	tabWidget_->setTabText(chat, captionForTab(chat));
+ 	//now set text colour based upon whether there are new messages/composing etc
+ 
+-	if (chat->state() == TabbableWidget::StateComposing) {
++	TabbableWidget::State state = chat->state();
++	if (state == TabbableWidget::StateComposing) {
+ 		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
+ 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
+ 	}
+-	else if (chat->unreadMessageCount()) {
+-		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
+-		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
+-	}
+ 	else {
+-		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
+-		tabWidget_->setTabIcon(chat, chat->icon());
++		if (state == TabbableWidget::StateHighlighted) {
++			tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
++		}
++		else {
++			tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
++		}
++
++		if(chat->unreadMessageCount()) {
++			tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
++		}
++		else {
++			tabWidget_->setTabIcon(chat, chat->icon());
++		}
+ 	}
+ 	updateCaption();
+ }

psi-plus-main-20141106.tar.xz/patches/1030-psi-modern-muc-roster.diff Added

@@ -0,0 +1,1230 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -297,6 +297,21 @@ QLineEdit#le_status_text {
+ 			</menu>
+ 			<muc comment="Multi-User Chat options">
+ 				<hide-on-autojoin type="bool">false</hide-on-autojoin>
++				<userlist comment="Userlist options">
++					<show-groups type="bool">true</show-groups>
++					<use-slim-group-headings type="bool">false</use-slim-group-headings>
++					<nick-coloring type = "bool">true</nick-coloring>
++					<show-client-icons type = "bool">true</show-client-icons>
++					<show-affiliation-icons type = "bool">true</show-affiliation-icons>
++					<contact-sort-style type = "QString">alpha</contact-sort-style>
++					<show-status-icons type = "bool">true</show-status-icons>
++					<avatars>
++						<show type="bool">false</show>
++						<size type="int">24</size>
++						<avatars-at-left type="bool">true</avatars-at-left>
++						<radius type="int">3</radius>
++					</avatars>
++				</userlist>
+ 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
+ 				<show-initial-joins comment="Show joins on your MUC join (with status and priority, depends on options)" type="bool">false</show-initial-joins>
+ 				<log-width type="int">500</log-width>
+@@ -373,6 +388,10 @@ QLineEdit#le_status_text {
+ 							<item>Purple</item>
+ 							<item>Red</item>
+ 						</nick-colors>
++						<role-moderator type="QColor">#910000</role-moderator>
++						<role-participant type="QColor">#00008a</role-participant>
++						<role-visitor type="QColor">#336600</role-visitor>
++						<role-norole type="QColor">black</role-norole>
+ 					</muc>
+ 					<messages comment="Message coloring.">
+ 						<received type="QColor" comment="Color used to indicate received messages.">#0000ff</received>
+--- git.orig/src/avatars.cpp
++++ git/src/avatars.cpp
+@@ -42,6 +42,7 @@
+ #include "xmpp_client.h"
+ #include "xmpp_resource.h"
+ #include "xmpp_pubsubitem.h"
++#include "xmpp_tasks.h"
+ #include "avatars.h"
+ #include "applicationinfo.h"
+ #include "psiaccount.h"
+@@ -275,7 +276,7 @@ protected:
+ 	void avatarUpdated()
+ 		{ emit avatarChanged(jid_); }
+ 
+-private:
++protected:
+ 	Jid jid_;
+ };
+ 
+@@ -303,6 +304,48 @@ void VCardAvatar::receivedVCard()
+ //------------------------------------------------------------------------------
+ 
+ //------------------------------------------------------------------------------
++// VCardMucAvatar: Avatars coming from VCards of MUC contacts.
++//------------------------------------------------------------------------------
++
++class VCardMucAvatar : public VCardAvatar
++{
++	Q_OBJECT
++
++public:
++	VCardMucAvatar(AvatarFactory* factory, const Jid& jid);
++
++public slots:
++	virtual void receivedVCard();
++
++protected:
++	virtual void requestAvatar();
++};
++
++
++VCardMucAvatar::VCardMucAvatar(AvatarFactory* factory, const Jid& jid)
++	: VCardAvatar(factory, jid)
++{
++}
++
++void VCardMucAvatar::requestAvatar()
++{
++	VCardFactory::instance()->getVCard(jid_.full(), factory()->account()->client()->rootTask(), this, SLOT(receivedVCard()), false);
++}
++
++void VCardMucAvatar::receivedVCard()
++{
++	JT_VCard* task = static_cast<JT_VCard*>(sender());
++	const VCard vcard = task->vcard();
++	if (!vcard.isEmpty()) {
++		saveToCache(vcard.photo());
++		setImage(vcard.photo());
++		emit avatarChanged(jid_);
++	}
++}
++
++//------------------------------------------------------------------------------
++
++//------------------------------------------------------------------------------
+ // VCardStaticAvatar: VCard static photo avatar (not published through presence)
+ //------------------------------------------------------------------------------
+ 
+@@ -505,6 +548,25 @@ QPixmap AvatarFactory::getAvatar(const J
+ 	return pm;
+ }
+ 
++QPixmap AvatarFactory::getMucAvatar(const Jid& _jid)
++{
++	Jid jid = _jid;
++	Avatar* av = 0;
++	if (muc_vcard_avatars_.contains(jid.full()) && !muc_vcard_avatars_[jid.full()]->isEmpty()) {
++		av = muc_vcard_avatars_[jid.full()];
++	}
++
++	QPixmap pm = (av ? av->getPixmap() : QPixmap());
++	pm = ensureSquareAvatar(pm);
++
++	// Update iconset
++	PsiIcon icon;
++	icon.setImpix(pm);
++	iconset_.setIcon(QString("avatars/%1").arg(jid.full()),icon);
++
++	return pm;
++}
++
+ Avatar* AvatarFactory::retrieveAvatar(const Jid& jid)
+ {
+ 	//printf("Retrieving avatar of %s\n", jid.full().latin1());
+@@ -577,6 +639,12 @@ void AvatarFactory::updateAvatar(const J
+ 	emit avatarChanged(j);
+ }
+ 
++void AvatarFactory::updateMucAvatar(const Jid &j)
++{
++	getMucAvatar(j);
++	emit avatarChanged(j);
++}
++
+ void AvatarFactory::importManualAvatar(const Jid& j, const QString& fileName)
+ {
+ 	FileAvatar(this, j).import(fileName);
+@@ -609,6 +677,18 @@ void AvatarFactory::resourceAvailable(co
+ 	}
+ }
+ 
++void AvatarFactory::newMucItem(const Jid &fullJid, const Status &s)
++{
++	if (s.hasPhotoHash()) {
++		const QString hash = s.photoHash();
++		if (!muc_vcard_avatars_.contains(fullJid.full())) {
++			muc_vcard_avatars_[fullJid.full()] = new VCardMucAvatar(this, fullJid);
++			connect(muc_vcard_avatars_[fullJid.full()], SIGNAL(avatarChanged(const Jid&)), this, SLOT(updateMucAvatar(const Jid&)));
++		}
++		muc_vcard_avatars_[fullJid.full()]->updateHash(hash);
++	}
++}
++
+ QString AvatarFactory::getManualDir()
+ {
+ 	QDir avatars(pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/pictures");
+@@ -634,6 +714,37 @@ int AvatarFactory::maxAvatarSize()
+ 	return MAX_AVATAR_SIZE;
+ }
+ 
++QPixmap AvatarFactory::roundedAvatar(const QPixmap &pix, int rad, int avSize)
++{
++	QPixmap avatar_icon;
++	QPixmap av = pix;
++	if(!pix.isNull()) {
++		if (avSize != 0) {
++			if (rad != 0) {
++				avSize = qMax(avSize, rad*2);
++				av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++				int w = av.width(), h = av.height();
++				QPainterPath pp;
++				pp.addRoundedRect(0, 0, w, h, rad, rad);
++				avatar_icon = QPixmap(w, h);
++				avatar_icon.fill(QColor(0,0,0,0));
++				QPainter mp(&avatar_icon);
++				mp.setBackgroundMode(Qt::TransparentMode);
++				mp.setRenderHints(QPainter::Antialiasing, true);
++				mp.fillPath(pp, QBrush(av));
++			}
++			else {
++				avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
++			}
++		}
++		else {
++			avatar_icon = QPixmap();
++		}
++	}
++
++	return avatar_icon;
++}
++
+ void AvatarFactory::itemPublished(const Jid& jid, const QString& n, const PubSubItem& item)
+ {
+ 	if (n == PEP_AVATAR_DATA_NS) {
+--- git.orig/src/avatars.h
++++ git/src/avatars.h
+@@ -37,6 +37,7 @@
+ class PsiAccount;
+ class Avatar;
+ class VCardAvatar;
++class VCardMucAvatar;
+ class VCardStaticAvatar;
+ class FileAvatar;
+ class PEPAvatar;
+@@ -45,6 +46,7 @@ namespace XMPP {
+ 	class Jid;
+ 	class Resource;
+ 	class PubSubItem;
++	class Status;
+ }
+ 
+ using namespace XMPP;
+@@ -66,15 +68,20 @@ public:
+ 	void removeManualAvatar(const Jid& j);
+ 	bool hasManualAvatar(const Jid& j);
+ 
++	void newMucItem(const Jid& fullJid, const Status& s);
++	QPixmap getMucAvatar(const Jid& jid);
++
+ 	static QString getManualDir();
+ 	static QString getCacheDir();
+ 	static int maxAvatarSize();
++	static QPixmap roundedAvatar(const QPixmap& pix, int rad, int avatarSize);
+ 
+ signals:
+ 	void avatarChanged(const Jid&);
+ 
+ public slots:
+ 	void updateAvatar(const Jid&);
++	void updateMucAvatar(const Jid&);
+ 
+ protected slots:
+ 	void itemPublished(const Jid&, const QString&, const PubSubItem&);
+@@ -92,6 +99,7 @@ private:
+ 	QMap<QString,PEPAvatar*> pep_avatars_;
+ 	QMap<QString,FileAvatar*> file_avatars_;
+ 	QMap<QString,VCardAvatar*> vcard_avatars_;
++	QMap<QString,VCardMucAvatar*> muc_vcard_avatars_;
+ 	QMap<QString,VCardStaticAvatar*> vcard_static_avatars_;
+ 	PsiAccount* pa_;
+ 	Iconset iconset_;
+--- git.orig/src/contactlistmodel.cpp
++++ git/src/contactlistmodel.cpp
+@@ -552,7 +552,9 @@ QVariant ContactListModel::contactData(c
+ 		return QVariant(contact->userListItem().clients());
+ 	}
+ 	else if (role == AvatarRole) {
+-		QPixmap pix = contact->account()->avatarFactory()->getAvatar(contact->jid());
++		QPixmap pix = contact->isPrivate() ?
++			      contact->account()->avatarFactory()->getMucAvatar(contact->jid()) :
++			      contact->account()->avatarFactory()->getAvatar(contact->jid());
+ 		return QVariant(pix);
+ 	}
+ 	else if (role == IsMucRole) {
+--- git.orig/src/gcuserview.cpp
++++ git/src/gcuserview.cpp
+@@ -37,6 +37,8 @@
+ #include "psioptions.h"
+ #include "coloropt.h"
+ #include "avcall/avcall.h"
++#include "xmpp_muc.h"
++#include "avatars.h"
+ 
+ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
+ {
+@@ -54,6 +56,32 @@ public:
+ 	GCUserViewDelegate(QObject* p)
+ 		: QItemDelegate(p)
+ 	{
++		updateSettings();
++	}
++
++	void updateSettings()
++	{
++		PsiOptions *o = PsiOptions::instance();
++		colorForeground_  = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-foreground");
++		colorBackground_  = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-background");
++		colorModerator_   = o->getOption("options.ui.look.colors.muc.role-moderator").value<QColor>();
++		colorParticipant_ = o->getOption("options.ui.look.colors.muc.role-participant").value<QColor>();
++		colorVisitor_     = o->getOption("options.ui.look.colors.muc.role-visitor").value<QColor>();
++		colorNoRole_      = o->getOption("options.ui.look.colors.muc.role-norole").value<QColor>();
++		showGroups_       = o->getOption("options.ui.muc.userlist.show-groups").toBool();
++		slimGroups_       = o->getOption("options.ui.muc.userlist.use-slim-group-headings").toBool();
++		nickColoring_     = o->getOption("options.ui.muc.userlist.nick-coloring").toBool();
++		showClients_      = o->getOption("options.ui.muc.userlist.show-client-icons").toBool();
++		showAffiliations_ = o->getOption("options.ui.muc.userlist.show-affiliation-icons").toBool();
++		showStatusIcons_  = o->getOption("options.ui.muc.userlist.show-status-icons").toBool();
++		showAvatar_       = o->getOption("options.ui.muc.userlist.avatars.show").toBool();
++		avatarSize_       = o->getOption("options.ui.muc.userlist.avatars.size").toInt();
++		avatarAtLeft_     = o->getOption("options.ui.muc.userlist.avatars.avatars-at-left").toBool();
++		avatarRadius_     = o->getOption("options.ui.muc.userlist.avatars.radius").toInt();
++
++		QFont font;
++		font.fromString(o->getOption("options.ui.look.font.contactlist").toString());
++		fontHeight_ = QFontMetrics(font).height()+2;
+ 	}
+ 
+ 	void paint(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index) const
+@@ -66,52 +94,204 @@ public:
+ 				paintGroup(mp, option, gi);
+ 			}
+ 			else {
+-				paintContact(mp, option, index);
++				paintContact(mp, option, index, (GCUserViewItem*)i);
+ 			}
+ 		}
+ 	}
+ 
+ 	void paintGroup(QPainter* p, const QStyleOptionViewItem& o, GCUserViewGroupItem* gi) const
+ 	{
+-		bool slimGroups = PsiOptions::instance()->getOption("options.ui.look.contactlist.use-slim-group-headings").toBool();
++		if(!showGroups_)
++			return;
++
+ 		QRect rect = o.rect;
+ 		QFont f = o.font;
+-		f.setPointSize(common_smallFontSize);
+ 		p->setFont(f);
+-		QColor colorForeground = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-foreground");
+-		QColor colorBackground = ColorOpt::instance()->color("options.ui.look.colors.contactlist.grouping.header-background");
+-		if (!slimGroups || (o.state & QStyle::State_Selected) ) {
+-			p->fillRect(rect, colorBackground);
++		if (!slimGroups_ || (o.state & QStyle::State_Selected) ) {
++			p->fillRect(rect, colorBackground_);
+ 		}
+ 
+-		p->setPen(QPen(colorForeground));
++		p->setPen(QPen(colorForeground_));
+ 		rect.translate(2, (rect.height() - o.fontMetrics.height())/2);
+ 		p->drawText(rect, gi->text(0));
+-		if (slimGroups	&& !(o.state & QStyle::State_Selected))
++		if (slimGroups_	&& !(o.state & QStyle::State_Selected))
+ 		{
+ 			QFontMetrics fm(f);
+ 			int x = fm.width(gi->text(0)) + 8;
+ 			int width = rect.width();
+ 			if(x < width - 8) {
+ 				int h = rect.y() + (rect.height() / 2) - 1;
+-				p->setPen(QPen(colorBackground));
++				p->setPen(QPen(colorBackground_));
+ 				p->drawLine(x, h, width - 8, h);
+ 				h++;
+-				p->setPen(QPen(colorForeground));
++				p->setPen(QPen(colorForeground_));
+ 				p->drawLine(x, h, width - 8, h);
+ 			}
+ 		}
+ 	}
+ 
+-	void paintContact(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index) const
++	void paintContact(QPainter* mp, const QStyleOptionViewItem& option, const QModelIndex& index, GCUserViewItem* item) const
+ 	{
+-		QItemDelegate::paint(mp, option, index);
++		mp->save();
++		QStyleOptionViewItem o = option;
++		QPalette palette = o.palette;
++		MUCItem::Role r = item->s.mucItem().role();
++		QRect rect = o.rect;
++
++		if(nickColoring_) {
++			if(r == MUCItem::Moderator)
++				palette.setColor(QPalette::Text, colorModerator_);
++			else if(r == MUCItem::Participant)
++				palette.setColor(QPalette::Text, colorParticipant_);
++			else if(r == MUCItem::Visitor)
++				palette.setColor(QPalette::Text, colorVisitor_);
++			else
++				palette.setColor(QPalette::Text, colorNoRole_);
++		}
++
++		mp->fillRect(rect, (o.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base));
++
++		if(showAvatar_) {
++			QPixmap ava = item->avatar();
++			if(ava.isNull()) {
++				ava = IconsetFactory::iconPixmap("psi/default_avatar");
++			}
++			ava = AvatarFactory::roundedAvatar(ava, avatarRadius_, avatarSize_);
++			QRect avaRect(rect);
++			avaRect.setWidth(ava.width());
++			avaRect.setHeight(ava.height());
++			if(!avatarAtLeft_) {
++				avaRect.moveTopRight(rect.topRight());
++				avaRect.translate(-1, 1);
++				rect.setRight(avaRect.left() - 1);
++			}
++			else {
++				avaRect.translate(1, 1);
++				rect.setLeft(avaRect.right() + 1);
++			}
++			mp->drawPixmap(avaRect, ava);
++		}
++
++		QPixmap status = showStatusIcons_ ? item->icon() : QPixmap();
++		int h = rect.height();
++		int sh = status.isNull() ? 0 : status.height();
++		rect.setHeight(qMax(sh, fontHeight_));
++		rect.moveTop(rect.top() + (h - rect.height())/2);
++		if(!status.isNull()) {
++			QRect statusRect(rect);
++			statusRect.setWidth(status.width());
++			statusRect.setHeight(status.height());
++			statusRect.translate(1, 1);
++			mp->drawPixmap(statusRect, status);
++			rect.setLeft(statusRect.right() + 2);
++		}
++		else
++			rect.setLeft(rect.left() + 2);
++
++		mp->setPen(QPen((o.state & QStyle::State_Selected) ? palette.color(QPalette::HighlightedText) : palette.color(QPalette::Text)));
++		mp->setFont(o.font);
++		mp->setClipRect(rect);
++		QTextOption to;
++		to.setWrapMode(QTextOption::NoWrap);
++		mp->drawText(rect, index.data(Qt::DisplayRole).toString(), to);
++
++		QList<QPixmap> rightPixs;
++		if(showClients_) {
++			GCUserView *gcuv = (GCUserView*)item->treeWidget();
++			GCMainDlg* dlg = gcuv->mainDlg();
++			QPixmap clientPix;
++			if(dlg) {
++				UserListItem u;
++				const QString &nick = item->text(0);
++				Jid caps_jid(/*s.mucItem().jid().isEmpty() ? */ dlg->jid().withResource(nick) /* : s.mucItem().jid()*/);
++				QString client_name = dlg->account()->capsManager()->clientName(caps_jid);
++				QString client_version = (client_name.isEmpty() ? QString() : dlg->account()->capsManager()->clientVersion(caps_jid));
++				UserResource ur;
++				ur.setClient(client_name,client_version,"");
++				u.userResourceList().append(ur);
++				QStringList clients = u.clients();
++				if(!clients.isEmpty())
++					clientPix = IconsetFactory::iconPixmap("clients/" + clients.takeFirst());
++			}
++			if(!clientPix.isNull())
++				rightPixs.push_back(clientPix);
++		}
++
++		if(showAffiliations_) {
++			MUCItem::Affiliation a = item->s.mucItem().affiliation();
++			QPixmap pix;
++			if(a == MUCItem::Owner)
++				pix = IconsetFactory::iconPixmap("affiliation/owner");
++			else if(a == MUCItem::Admin)
++				pix = IconsetFactory::iconPixmap("affiliation/admin");
++			else if(a == MUCItem::Member)
++				pix = IconsetFactory::iconPixmap("affiliation/member");
++			else if(a == MUCItem::Outcast)
++				pix = IconsetFactory::iconPixmap("affiliation/outcast");
++			else
++				pix = IconsetFactory::iconPixmap("affiliation/noaffiliation");
++			if(!pix.isNull())
++				rightPixs.push_back(pix);
++		}
++
++		mp->restore();
++
++		if(rightPixs.isEmpty())
++			return;
++
++		int sumWidth = 0;
++		foreach (const QPixmap& pix, rightPixs) {
++				sumWidth += pix.width();
++		}
++		sumWidth += rightPixs.count();
++
++		QColor bgc = (option.state & QStyle::State_Selected) ? palette.color(QPalette::Highlight) : palette.color(QPalette::Base);
++		QColor tbgc = bgc;
++		tbgc.setAlpha(0);
++		QLinearGradient grad(rect.right() - sumWidth - 20, 0, rect.right() - sumWidth, 0);
++		grad.setColorAt(0, tbgc);
++		grad.setColorAt(1, bgc);
++		QBrush tbakBr(grad);
++		QRect gradRect(rect);
++		gradRect.setLeft(gradRect.right() - sumWidth - 20);
++		mp->fillRect(gradRect, tbakBr);
++
++		QRect iconRect(rect);
++		for (int i=0; i<rightPixs.size(); i++) {
++			const QPixmap pix = rightPixs[i];
++			iconRect.setRight(iconRect.right() - pix.width() -1);
++			mp->drawPixmap(iconRect.topRight(), pix);
++		}
++
+ 	}
+ 
+ 	QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+ 	{
+-		return QItemDelegate::sizeHint(option, index);
++		if(!index.isValid())
++			return QSize(0,0);
++
++		QSize size = QItemDelegate::sizeHint(option, index);
++		GCUserView *uv = static_cast<GCUserView*>(parent());
++		if(uv) {
++			QTreeWidgetItem *i = uv->findEntry(index);
++			GCUserViewItem *vi = dynamic_cast<GCUserViewItem*>(i);
++			if(vi) {
++				int rowH = qMax(fontHeight_, vi->icon().height() + 2);
++				int h = showAvatar_ ? qMax(avatarSize_ + 2, rowH) : rowH;
++				size.setHeight(h);
++			}
++			else {
++				size.setHeight(showGroups_ ? fontHeight_ : 0);
++			}
++		}
++
++		return size;
+ 	}
++
++private:
++	QColor colorForeground_, colorBackground_, colorModerator_, colorParticipant_, colorVisitor_, colorNoRole_;
++	bool showGroups_, slimGroups_, nickColoring_, showClients_, showAffiliations_, showStatusIcons_, showAvatar_, avatarAtLeft_;
++	int avatarSize_, fontHeight_, avatarRadius_;
+ };
+ 
+ 
+@@ -125,10 +305,21 @@ GCUserViewItem::GCUserViewItem(GCUserVie
+ {
+ }
+ 
++void GCUserViewItem::setAvatar(const QPixmap &pix)
++{
++	avatar_ = pix;
++	treeWidget()->viewport()->update();
++}
++
++void GCUserViewItem::setIcon(const QPixmap &icon)
++{
++	icon_ = icon;
++}
++
+ bool GCUserViewItem::operator<(const QTreeWidgetItem& it) const
+ {
+ 	GCUserViewItem *item = (GCUserViewItem*)(&it);
+-	if(PsiOptions::instance()->getOption("options.ui.contactlist.contact-sort-style").toString() == "status") {
++	if(PsiOptions::instance()->getOption("options.ui.muc.userlist.contact-sort-style").toString() == "status") {
+ 		int rank = rankStatus(s.type()) - rankStatus(item->s.type());
+ 		if (rank == 0)
+ 			rank = QString::localeAwareCompare(text(0).toLower(), it.text(0).toLower());
+@@ -224,7 +415,7 @@ void GCUserView::updateAll()
+ 		int count = j->childCount();
+ 		for(int num = 0; num < count; num++) {
+ 			GCUserViewItem *i = (GCUserViewItem*)j->child(num);
+-			i->setIcon(0, PsiIconset::instance()->status(i->s).icon());
++			i->setIcon(PsiIconset::instance()->status(i->s).pixmap());
+ 		}
+ 		j->sortChildren(0, Qt::AscendingOrder);
+ 	}
+@@ -304,7 +495,7 @@ void GCUserView::updateEntry(const QStri
+ 	}
+ 
+ 	lvi->s = s;
+-	lvi->setIcon(0, PsiIconset::instance()->status(lvi->s).icon());
++	lvi->setIcon(PsiIconset::instance()->status(lvi->s).pixmap());
+ 	gr->sortChildren(0, Qt::AscendingOrder);
+ }
+ 
+@@ -369,6 +560,8 @@ bool GCUserView::maybeTip(const QPoint &
+ 	ur.setClient(client_name,client_version,"");
+ 	//ur.setClient(QString(),QString(),"");
+ 	u.userResourceList().append(ur);
++	u.setPrivate(true);
++	u.setAvatarFactory(dlg->account()->avatarFactory());
+ 
+ 	PsiToolTip::showText(mapToGlobal(pos), u.makeTip(), this);
+ 	return true;
+@@ -573,4 +766,10 @@ void GCUserView::mousePressEvent(QMouseE
+ 		contextMenuRequested(event->pos());
+ }
+ 
++void GCUserView::setLooks()
++{
++	((GCUserViewDelegate*)itemDelegate())->updateSettings();
++	viewport()->update();
++}
++
+ #include "gcuserview.moc"
+--- git.orig/src/gcuserview.h
++++ git/src/gcuserview.h
+@@ -39,10 +39,18 @@ class GCUserViewItem : public QObject, p
+ {
+ public:
+ 	GCUserViewItem(GCUserViewGroupItem *);
++	void setAvatar(const QPixmap& pix);
++	QPixmap avatar() const { return avatar_; };
++	void setIcon(const QPixmap &icon);
++	QPixmap icon() const { return icon_; };
+ 
+ 	Status s;
+ 
+ 	virtual bool operator<  (const QTreeWidgetItem& it) const;
++
++private:
++	QPixmap avatar_;
++	QPixmap icon_;
+ };
+ 
+ class GCUserViewGroupItem : public QTreeWidgetItem
+@@ -66,6 +74,7 @@ public:
+ 	~GCUserView();
+ 
+ 	void setMainDlg(GCMainDlg* mainDlg);
++	GCMainDlg* mainDlg() const { return gcDlg_; };
+ 	virtual QMimeData* mimeData(const QList<QTreeWidgetItem*>items) const;
+ 	void clear();
+ 	void updateAll();
+@@ -76,6 +85,7 @@ public:
+ 	void removeEntry(const QString &);
+ 	QStringList nickList() const;
+ 	void doContextMenu(QTreeWidgetItem* it);
++	void setLooks();
+ 
+ protected:
+ 	enum Role { Moderator = 0, Participant = 1, Visitor = 2 };
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -85,6 +85,7 @@
+ #include "lastactivitytask.h"
+ #include "psirichtext.h"
+ #include "psiwindowheader.h"
++#include "avatars.h"
+ 
+ #include "mcmdsimplesite.h"
+ 
+@@ -813,12 +814,15 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ 	// Connect signals from MUC manager
+ 	connect(d->mucManager,SIGNAL(action_error(MUCManager::Action, int, const QString&)), SLOT(action_error(MUCManager::Action, int, const QString&)));
++	connect(d->mucManager, SIGNAL(action_success(MUCManager::Action)), ui_.lv_users, SLOT(update()));
+ 
+ 	setLooks();
+ 	setShortcuts();
+ 	invalidateTab();
+ 	setConnecting();
+ 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
++
++	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
+ }
+ 
+ GCMainDlg::~GCMainDlg()
+@@ -1477,6 +1481,8 @@ void GCMainDlg::presence(const QString &
+ 			}
+ 		}
+ 		ui_.lv_users->updateEntry(nick, s);
++		if(!nick.isEmpty())
++			avatarUpdated(jidForNick(nick));
+ 	}
+ 	else {
+ 		// Unavailable
+@@ -1571,6 +1577,22 @@ void GCMainDlg::presence(const QString &
+ 		account()->capsManager()->updateCaps(caps_jid,s.capsNode(),s.capsVersion(),s.capsExt());
+ 	}
+ 
++	if(!nick.isEmpty())
++		account()->avatarFactory()->newMucItem(jidForNick(nick), s);
++}
++
++XMPP::Jid GCMainDlg::jidForNick(const QString &nick) const
++{
++	return Jid(jid()).withResource(nick);
++}
++
++void GCMainDlg::avatarUpdated(const Jid &jid_)
++{
++	if(jid_.compare(jid(), false)) {
++		GCUserViewItem *it = dynamic_cast<GCUserViewItem*>(ui_.lv_users->findEntry(jid_.resource()));
++		if(it)
++			it->setAvatar(account()->avatarFactory()->getMucAvatar(jid_));
++	}
+ }
+ 
+ void GCMainDlg::message(const Message &_m)
+@@ -1836,6 +1858,8 @@ void GCMainDlg::setLooks()
+ #ifndef Q_OS_MAC
+ 	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
+ #endif
++
++	ui_.lv_users->setLooks();
+ }
+ 
+ void GCMainDlg::optionsUpdate()
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -148,6 +148,7 @@ private slots:
+ 	void horizSplitterMoved();
+ 	void verticalSplitterMoved(int, int);
+ 	void doMinimize();
++	void avatarUpdated(const Jid& jid);
+ 
+ 
+ 
+@@ -172,6 +173,8 @@ private:
+ 
+ 	void setMargins();
+ 
++	inline XMPP::Jid jidForNick(const QString &nick) const;
++
+ };
+ 
+ class GCFindDlg : public QDialog
+--- git.orig/src/options/opt_appearance.cpp
++++ git/src/options/opt_appearance.cpp
+@@ -99,6 +99,7 @@ OptionsTabIconset::OptionsTabIconset(QOb
+ 	addTab( new OptionsTabIconsetClients(this) );
+ 	addTab( new OptionsTabIconsetRoster(this) );
+ 	addTab( new OptionsTabIconsetSystem(this) );
++	addTab( new OptionsTabIconsetAffiliations(this) );
+ }
+ 
+ 
+--- git.orig/src/options/opt_iconset_affiliation.ui
++++ git/src/options/opt_iconset_affiliation.ui
+@@ -0,0 +1,88 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>IconsetAffiliation</class>
++ <widget class="QWidget" name="IconsetAffiliation">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>256</width>
++    <height>195</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>IconsetClientUI</string>
++  </property>
++  <layout class="QVBoxLayout">
++   <property name="spacing">
++    <number>6</number>
++   </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
++   <item>
++    <widget class="QGroupBox" name="groupBox10">
++     <property name="title">
++      <string>Affiliation iconsets</string>
++     </property>
++     <layout class="QGridLayout">
++      <property name="margin">
++       <number>8</number>
++      </property>
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <item row="1" column="2">
++       <spacer>
++        <property name="orientation">
++         <enum>Qt::Horizontal</enum>
++        </property>
++        <property name="sizeType">
++         <enum>QSizePolicy::Expanding</enum>
++        </property>
++        <property name="sizeHint" stdset="0">
++         <size>
++          <width>204</width>
++          <height>20</height>
++         </size>
++        </property>
++       </spacer>
++      </item>
++      <item row="1" column="3">
++       <widget class="IconButton" name="pb_affiliationDetails" native="true">
++        <property name="text" stdset="0">
++         <string>&amp;Show Details</string>
++        </property>
++       </widget>
++      </item>
++      <item row="0" column="0" colspan="4">
++       <widget class="IconsetSelect" name="iss_affiliation" native="true"/>
++      </item>
++     </layout>
++    </widget>
++   </item>
++   <item>
++    <widget class="QProgressBar" name="progress">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <layoutdefault spacing="6" margin="11"/>
++ <customwidgets>
++  <customwidget>
++   <class>IconButton</class>
++   <extends></extends>
++   <header>iconbutton.h</header>
++  </customwidget>
++  <customwidget>
++   <class>IconsetSelect</class>
++   <extends></extends>
++   <header>iconsetselect.h</header>
++  </customwidget>
++ </customwidgets>
++ <resources/>
++ <connections/>
++</ui>
+--- git.orig/src/options/opt_iconset.cpp
++++ git/src/options/opt_iconset.cpp
+@@ -28,6 +28,7 @@
+ #include "ui_opt_iconset_client.h"
+ #include "ui_opt_iconset_system.h"
+ #include "ui_opt_iconset_roster.h"
++#include "ui_opt_iconset_affiliation.h"
+ #include "ui_ui_isdetails.h"
+ 
+ class IconsetEmoUI : public QWidget, public Ui::IconsetEmo
+@@ -60,6 +61,12 @@ public:
+ 	IconsetSystemUI() : QWidget() { setupUi(this); }
+ };
+ 
++class IconsetAffiliationUI : public QWidget, public Ui::IconsetAffiliation
++{
++  public:
++    IconsetAffiliationUI() : QWidget() { setupUi(this); }
++};
++
+ class IconsetRosterUI : public QWidget, public Ui::IconsetRoster
+ {
+ public:
+@@ -957,6 +964,153 @@ void OptionsTabIconsetActivity::cancelTh
+ {
+ 	if ( thread ) {
+ 		threadCancelled.lock();
++		thread->cancelled = true;
++		threadCancelled.unlock();
++
++		thread = 0;
++	}
++}
++//----------------------------------------------------------------------------
++// OptionsTabIconsetAffiliations
++//----------------------------------------------------------------------------
++
++OptionsTabIconsetAffiliations::OptionsTabIconsetAffiliations(QObject *parent)
++	: OptionsTab(parent, "iconset_affiliations", "", tr("Affiliations"), tr("Select your affiliations iconset"))
++	, w(0)
++	, thread(0)
++{
++}
++
++OptionsTabIconsetAffiliations::~OptionsTabIconsetAffiliations()
++{
++	cancelThread();
++}
++
++QWidget *OptionsTabIconsetAffiliations::widget()
++{
++	if ( w )
++		return 0;
++
++	w = new IconsetAffiliationUI;
++	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
++
++	connect(d->pb_affiliationDetails, SIGNAL(clicked()), SLOT(previewIconset()));
++
++	return w;
++}
++
++void OptionsTabIconsetAffiliations::applyOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
++
++	const Iconset *is = d->iss_affiliation->iconset();
++	if ( is ) {
++		QFileInfo fi( is->fileName() );
++		PsiOptions::instance()->setOption("options.iconsets.affiliations", fi.fileName());
++	}
++}
++
++void OptionsTabIconsetAffiliations::restoreOptions()
++{
++	if ( !w || thread )
++		return;
++
++	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
++
++	d->iss_affiliation->clear();
++	QStringList loaded;
++
++	d->setCursor(Qt::WaitCursor);
++
++	QPalette customPal = d->palette();
++	customPal.setCurrentColorGroup(QPalette::Inactive);
++	d->iss_affiliation->setEnabled(false);
++	d->iss_affiliation->setPalette(customPal);
++
++	d->pb_affiliationDetails->setEnabled(false);
++	d->pb_affiliationDetails->setPalette(customPal);
++
++	d->progress->show();
++	d->progress->setValue( 0 );
++
++	numIconsets = countIconsets("/affiliations", loaded);
++	iconsetsLoaded = 0;
++
++	cancelThread();
++
++	thread = new IconsetLoadThread(this, "/affiliations");
++	thread->start();
++}
++
++bool OptionsTabIconsetAffiliations::event(QEvent *e)
++{
++	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
++	if ( e->type() == QEvent::User ) { // iconset load event
++		IconsetLoadEvent *le = (IconsetLoadEvent *)e;
++
++		if ( thread != le->thread() )
++			return false;
++
++		if ( !numIconsets )
++			numIconsets = 1;
++		d->progress->setValue( (int)((float)100 * ++iconsetsLoaded / numIconsets) );
++
++		Iconset *i = le->iconset();
++		if ( i ) {
++			PsiIconset::instance()->stripFirstAnimFrame(i);
++			d->iss_affiliation->insert(*i);
++
++			QFileInfo fi( i->fileName() );
++			if ( fi.fileName() == PsiOptions::instance()->getOption("options.iconsets.affiliations").toString() )
++				d->iss_affiliation->setItemSelected(d->iss_affiliation->lastItem(), true);
++
++			delete i;
++		}
++
++		return true;
++	}
++	else if ( e->type() == QEvent::User + 1 ) { // finish event
++		d->iss_affiliation->setEnabled(true);
++		d->iss_affiliation->setPalette(QPalette());
++
++		d->pb_affiliationDetails->setEnabled(true);
++		d->pb_affiliationDetails->setPalette(QPalette());
++
++		connect(d->iss_affiliation, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), SIGNAL(dataChanged()));
++
++		d->progress->hide();
++
++		d->unsetCursor();
++		thread = 0;
++
++		return true;
++	}
++
++	return false;
++}
++
++void OptionsTabIconsetAffiliations::previewIconset()
++{
++	IconsetAffiliationUI *d = (IconsetAffiliationUI *)w;
++	const Iconset *is = d->iss_affiliation->iconset();
++	if (is) {
++		isDetails(*is, parentWidget->parentWidget(), psi);
++	}
++}
++
++void OptionsTabIconsetAffiliations::setData(PsiCon *psicon, QWidget *p)
++{
++	psi = psicon;
++	parentWidget = p;
++}
++
++void OptionsTabIconsetAffiliations::cancelThread()
++{
++	if ( thread ) {
++		threadCancelled.lock();
+ 		thread->cancelled = true;
+ 		threadCancelled.unlock();
+ 
+--- git.orig/src/options/opt_iconset.h
++++ git/src/options/opt_iconset.h
+@@ -149,6 +149,34 @@ private:
+ 	IconsetLoadThread *thread;
+ };
+ 
++class OptionsTabIconsetAffiliations : public OptionsTab
++{
++	Q_OBJECT
++public:
++	OptionsTabIconsetAffiliations(QObject *parent);
++	~OptionsTabIconsetAffiliations();
++
++	QWidget *widget();
++	void applyOptions();
++	void restoreOptions();
++	bool stretchable() const { return true; }
++
++private slots:
++	void setData(PsiCon *, QWidget *);
++	void previewIconset();
++
++protected:
++	bool event(QEvent *);
++	void cancelThread();
++
++private:
++	QWidget *w, *parentWidget;
++	PsiCon *psi;
++
++	int numIconsets, iconsetsLoaded;
++	IconsetLoadThread *thread;
++};
++
+ class OptionsTabIconsetRoster : public OptionsTab
+ {
+ 	Q_OBJECT
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
+@@ -74,6 +74,7 @@ FORMS += \
+ 	$$PWD/opt_iconset_mood.ui \
+ 	$$PWD/opt_iconset_activity.ui \
+ 	$$PWD/opt_iconset_client.ui \
++	$$PWD/opt_iconset_affiliation.ui \
+ 	$$PWD/opt_iconset_system.ui \
+ 	$$PWD/opt_iconset_roster.ui \
+ 	$$PWD/opt_general_groupchat.ui \
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -6213,6 +6213,7 @@ void PsiAccount::invokeGCMessage(const J
+ 	u->setInList(false);
+ 	u->setName(j.resource());
+ 	u->setPrivate(true);
++	u->setAvatarFactory(avatarFactory());
+ 
+ 	// make a resource so the contact appears online
+ 	UserResource ur;
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -732,6 +732,7 @@ void PsiChatDlg::updateAvatar()
+ 	}
+ 
+ 	UserListItem *ul = account()->findFirstRelevant(jid());
++	bool private_ = false;
+ 	if (ul && !ul->userResourceList().isEmpty()) {
+ 		UserResourceList::Iterator it = ul->userResourceList().find(jid().resource());
+ 		if (it == ul->userResourceList().end())
+@@ -739,9 +740,12 @@ void PsiChatDlg::updateAvatar()
+ 
+ 		res = (*it).name();
+ 		client = (*it).clientName();
++		private_ = ul->isPrivate();
+ 	}
+ 	//QPixmap p = account()->avatarFactory()->getAvatar(jid().withResource(res),client);
+-	QPixmap p = account()->avatarFactory()->getAvatar(jid().withResource(res));
++	QPixmap p = private_ ?
++			account()->avatarFactory()->getMucAvatar(jid().withResource(res)) :
++			account()->avatarFactory()->getAvatar(jid().withResource(res));
+ 	if (p.isNull()) {
+ 		ui_.avatar->hide();
+ 	}
+--- git.orig/src/psicontactlistviewdelegate.cpp
++++ git/src/psicontactlistviewdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include "coloropt.h"
+ #include "contactlistview.h"
+ #include "common.h"
++#include "avatars.h"
+ 
+ static const QString contactListFontOptionPath = "options.ui.look.font.contactlist";
+ static const QString slimGroupsOptionPath = "options.ui.look.contactlist.use-slim-group-headings";
+@@ -162,33 +163,12 @@ QList<QPixmap> PsiContactListViewDelegat
+ 
+ QPixmap PsiContactListViewDelegate::avatarIcon(const QModelIndex& index) const
+ {
+-	QPixmap avatar_icon;
+ 	int avSize = showAvatars_ ? avatarSize_ : 0;
+-	QPixmap av = qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
++	QPixmap av = index.data(ContactListModel::IsMucRole).toBool() ? QPixmap() : index.data(ContactListModel::AvatarRole).value<QPixmap>();
+ 	if(av.isNull() && useDefaultAvatar_)
+ 		av = IconsetFactory::iconPixmap("psi/default_avatar");
+-	int radius;
+-	if (avSize && !av.isNull()) {
+-		if ( (radius = avatarRadius_) ) {
+-			avSize = qMax(avSize, radius*2);
+-			av = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+-			int w = av.width(), h = av.height();
+-			QPainterPath pp;
+-			pp.addRoundedRect(0, 0, w, h, radius, radius);
+-			avatar_icon = QPixmap(w, h);
+-			avatar_icon.fill(QColor(0,0,0,0));
+-			QPainter mp(&avatar_icon);
+-			mp.setBackgroundMode(Qt::TransparentMode);
+-			mp.setRenderHints(QPainter::Antialiasing, true);
+-			mp.fillPath(pp, QBrush(av));
+-		} else {
+-			avatar_icon = av.scaled(avSize, avSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+-		}
+-	} else {
+-		avatar_icon = QPixmap();
+-	}
+ 
+-	return avatar_icon;
++	return AvatarFactory::roundedAvatar(av, avatarRadius_, avSize);
+ }
+ 
+ QSize PsiContactListViewDelegate::sizeHint(const QStyleOptionViewItem& /*option*/, const QModelIndex& index) const
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -42,8 +42,8 @@ class PsiIconset::Private
+ private:
+ 	PsiIconset *psi;
+ public:
+-	Iconset system, moods, clients, activities;
+-	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity;
++	Iconset system, moods, clients, activities, affiliations;
++	QString cur_system, cur_status, cur_moods, cur_clients, cur_activity, cur_affiliations;
+ 	QStringList cur_emoticons;
+ 	QMap<QString, QString> cur_service_status;
+ 	QMap<QString, QString> cur_custom_status;
+@@ -290,6 +290,23 @@ public:
+ 		return def;
+ 	}
+ 
++	Iconset affiliationsIconset(bool *ok)
++	{
++		Iconset def;
++		*ok = def.load( iconsetPath("affiliations/default") );
++
++		if ( PsiOptions::instance()->getOption("options.iconsets.affiliations").toString() != "default" ) {
++			Iconset is;
++			is.load ( iconsetPath("affiliations/" + PsiOptions::instance()->getOption("options.iconsets.affiliations").toString()) );
++
++			loadIconset(&def, &is);
++		}
++
++		stripFirstAnimFrame( def );
++
++		return def;
++	}
++
+ 	QList<Iconset*> emoticons()
+ 	{
+ 		QList<Iconset*> emo;
+@@ -464,6 +481,21 @@ bool PsiIconset::loadClients()
+ 	return ok;
+ }
+ 
++bool PsiIconset::loadAffiliations()
++{
++	bool ok = true;
++	QString cur_affiliations = PsiOptions::instance()->getOption("options.iconsets.affiliations").toString();
++	if (d->cur_affiliations != cur_affiliations) {
++		Iconset affiliations = d->affiliationsIconset(&ok);
++		d->loadIconset(&d->affiliations, &affiliations);
++		d->affiliations.addToFactory();
++
++		d->cur_affiliations = cur_affiliations;
++	}
++
++	return ok;
++}
++
+ bool PsiIconset::loadAll()
+ {
+ 	if (!loadSystem() || !loadRoster())
+@@ -473,6 +505,7 @@ bool PsiIconset::loadAll()
+ 	loadMoods();
+ 	loadActivity();
+ 	loadClients();
++	loadAffiliations();
+ 	return true;
+ }
+ 
+@@ -493,6 +526,9 @@ void PsiIconset::optionChanged(const QSt
+ 	else if (option == "options.iconsets.clients") {
+ 		loadClients();
+ 	}
++	else if (option == "options.iconsets.affiliations") {
++		loadAffiliations();
++	}
+ 
+ 	// currently we rely on PsiCon calling reloadRoster() when
+ 	// all options are already applied. otherwise we risk the chance
+--- git.orig/src/psiiconset.h
++++ git/src/psiiconset.h
+@@ -47,6 +47,7 @@ public:
+ 	Iconset moods;
+ 	Iconset activities;
+ 	Iconset clients;
++	Iconset affiliations;
+ 	const Iconset &system() const;
+ 	void stripFirstAnimFrame(Iconset *);
+ 	static void removeAnimation(Iconset *);
+@@ -103,6 +104,8 @@ private:
+ 	bool loadMoods();
+ 	bool loadActivity();
+ 	bool loadClients();
++	bool loadAffiliations();
++
+ };
+ 
+ QString status2name(int s);
+--- git.orig/src/userlist.cpp
++++ git/src/userlist.cpp
+@@ -877,14 +877,18 @@ QString UserListItem::makeBareTip(bool t
+ 		mucItem = userResourceList()[0].status().hasMUCItem();
+ 	}
+ 
+-	if (v_avatarFactory && !v_avatarFactory->getAvatar(jid().bare()).isNull() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
++	if (v_avatarFactory
++		&& (isPrivate() ? !v_avatarFactory->getMucAvatar(jid().full()).isNull() : !v_avatarFactory->getAvatar(jid().bare()).isNull())
++		&& PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.avatar").toBool())
++	{
+ 		useAvatar = true;
++	}
+ 
+ 	str += "<table cellspacing=\"3\"><tr>";
+ 	str += "<td>";
+ 
+ 	if (useAvatar) {
+-		str += QString("<icon name=\"avatars/%1\">").arg(jid().bare());
++		str += QString("<icon name=\"avatars/%1\">").arg(isPrivate() ? TextUtil::escape(jid().full()) : jid().bare());
+ 		str += "</td><td width=\"10\"></td>";
+ 		str += "<td>";
+ 	}

psi-plus-main-20141106.tar.xz/patches/1040-psi-filecache-for-avatars.diff Added

@@ -0,0 +1,83 @@
+Entering 'iris'
+Entering 'src/libpsi'
+--- git.temp.orig/src/avatars.cpp
++++ git.temp/src/avatars.cpp
+@@ -50,6 +50,7 @@
+ #include "vcardfactory.h"
+ #include "pepmanager.h"
+ #include "pixmaputil.h"
++#include "filecache.h"
+ 
+ #define MAX_AVATAR_SIZE 96
+ #define MAX_AVATAR_DISPLAY_SIZE 64
+@@ -84,6 +85,34 @@ static QByteArray scaleAvatar(const QByt
+ //------------------------------------------------------------------------------
+ 
+ //------------------------------------------------------------------------------
++//  AvatarFileCache
++//------------------------------------------------------------------------------
++class AvatarFileCache : public FileCache
++{
++	Q_OBJECT
++public:
++	static AvatarFileCache *instance()
++	{
++		if (!_instance) {
++			_instance = new AvatarFileCache();
++		}
++		return _instance;
++	}
++
++private:
++	AvatarFileCache()
++		: FileCache(AvatarFactory::getCacheDir(), QApplication::instance())
++	{
++	}
++
++	static AvatarFileCache *_instance;
++};
++
++AvatarFileCache* AvatarFileCache::_instance = 0;
++
++//------------------------------------------------------------------------------
++
++//------------------------------------------------------------------------------
+ //  Avatar: Base class for avatars.
+ //------------------------------------------------------------------------------
+ 
+@@ -178,14 +207,15 @@ void CachedAvatar::updateHash(const QStr
+ 
+ bool CachedAvatar::isCached(const QString& h)
+ {
+-	return QDir(AvatarFactory::getCacheDir()).exists(h);
++	return AvatarFileCache::instance()->get(h);
+ }
+ 
+ void CachedAvatar::loadFromCache(const QString& h)
+ {
+ 	// printf("Loading avatar from cache\n");
+ 	hash_ = h;
+-	setImage(QImage(QDir(AvatarFactory::getCacheDir()).filePath(h)));
++	QByteArray ar = AvatarFileCache::instance()->getData(h);
++	setImage(QImage::fromData(ar));
+ 	if (pixmap().isNull()) {
+ 		qWarning("CachedAvatar::loadFromCache(): Null pixmap. Unsupported format ?");
+ 	}
+@@ -194,16 +224,7 @@ void CachedAvatar::loadFromCache(const Q
+ void CachedAvatar::saveToCache(const QByteArray& data)
+ {
+ 	QString hash = QCA::Hash("sha1").hashToString(data);
+-	// printf("Saving %s to cache.\n",hash.latin1());
+-	QString fn = QDir(AvatarFactory::getCacheDir()).filePath(hash);
+-	QFile f(fn);
+-	if (f.open(QIODevice::WriteOnly)) {
+-		f.write(data);
+-		f.close();
+-	}
+-	else
+-		printf("Error opening %s for writing.\n", qPrintable(f.fileName()));
+-
++	AvatarFileCache::instance()->append(hash, "img", data);
+ }
+ 
+ //------------------------------------------------------------------------------

psi-plus-main-20141106.tar.xz/patches/1050-psi-always-visible-contacts.diff Added

@@ -0,0 +1,227 @@
+--- git.orig/src/contactlistgroup.cpp
++++ git/src/contactlistgroup.cpp
+@@ -377,6 +377,9 @@ void ContactListGroup::updateOnlineConta
+ 			}
+ 			if (contact->alerting())
+ 				shouldBeVisible = true;
++			if (contact->isAlwaysVisible()) {
++				shouldBeVisible = true;
++			}
+ 		}
+ 		else if ((group = dynamic_cast<ContactListGroup*>(item->item()))) {
+ 			totalContactsCount += group->totalContactsCount();
+--- git.orig/src/contactlistproxymodel.cpp
++++ git/src/contactlistproxymodel.cpp
+@@ -96,6 +96,9 @@ bool ContactListProxyModel::filterAccept
+ 		else if (psiContact->isAgent()) {
+ 			return showTransports();
+ 		}
++		else if (psiContact->isAlwaysVisible()) {
++			return true;
++		}
+ 
+ 		bool show = true;
+ 		if (psiContact->isHidden()) {
+--- git.orig/src/profiles.h
++++ git/src/profiles.h
+@@ -87,6 +87,8 @@ public:
+ 	XMPP::Jid dtProxy;
+ 	bool ibbOnly;
+ 
++	QStringList alwaysVisibleContacts;
++
+ 	QString optionsBase;
+ 
+ 	QString stunHost;
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -898,6 +898,37 @@ public:
+ 		avCallManager->setStunRelayTcpService(acc.stunHost, acc.stunPort, convert_proxy(acc, jid), acc.stunUser, acc.stunPass);
+ 	}
+ 
++	bool isAlwaysVisibleContact(const Jid& jid) const
++	{
++		return acc.alwaysVisibleContacts.contains(jid.bare());
++	}
++
++	void setAlwaysVisibleContact(const Jid& jid, bool visible)
++	{
++		if(!visible) {
++			acc.alwaysVisibleContacts.removeAll(jid.bare());
++		}
++		else if(!acc.alwaysVisibleContacts.contains(jid.bare())) {
++			acc.alwaysVisibleContacts.append(jid.bare());
++		}
++	}
++
++	void updateContacts()
++	{
++		QStringList jids;
++		foreach(PsiContact *pc, contacts) {
++			const Jid jid = pc->jid();
++			jids.append(jid.bare());
++			bool vis = isAlwaysVisibleContact(jid);
++			if(vis != pc->isAlwaysVisible())
++				pc->setAlwaysVisible(vis);
++		}
++		foreach(const QString& j,  acc.alwaysVisibleContacts) {
++			if(!jids.contains(j))
++				acc.alwaysVisibleContacts.removeAll(j);
++		}
++	}
++
+ private:
+ 	Status lastManualStatus_;
+ 
+@@ -1272,6 +1303,8 @@ PsiAccount::PsiAccount(const UserAccount
+ 	QTimer::singleShot(0, d, SLOT(loadQueue()));
+ 
+ 	d->contactList->link(this);
++
++	d->updateContacts(); //update always visible contacts state
+ }
+ 
+ PsiAccount::~PsiAccount()
+@@ -1339,6 +1372,11 @@ void PsiAccount::cleanupStream()
+ 	d->localAddress = QHostAddress();
+ }
+ 
++void PsiAccount::updateAlwaysVisibleContact(PsiContact *pc)
++{
++	d->setAlwaysVisibleContact(pc->jid(), pc->isAlwaysVisible());
++}
++
+ bool PsiAccount::enabled() const
+ {
+ 	return d->acc.opt_enabled;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -191,6 +191,8 @@ public:
+ 
+ 	bool notifyOnline() const;
+ 
++	void updateAlwaysVisibleContact(PsiContact* pc);
++
+ 	void modify();
+ 	void reconfigureFTManager();
+ 	void changeVCard();
+--- git.orig/src/psicontact.cpp
++++ git/src/psicontact.cpp
+@@ -67,6 +67,7 @@ public:
+ 		, statusTimer_(0)
+ 		, isValid_(true)
+ 		, isAnimated_(false)
++		, isAlwaysVisible_(false)
+ 		, contact_(contact)
+ #ifdef YAPSI
+ 		, gender_(XMPP::VCard::UnknownGender)
+@@ -108,6 +109,7 @@ public:
+ 	Status oldStatus_;
+ 	bool isValid_;
+ 	bool isAnimated_;
++	bool isAlwaysVisible_;
+ #ifdef YAPSI
+ 	bool showOnlineTemporarily_;
+ 	bool reconnecting_;
+@@ -550,6 +552,18 @@ bool PsiContact::shouldBeVisible() const
+ 	// return ContactListItem::shouldBeVisible();
+ }
+ 
++bool PsiContact::isAlwaysVisible() const
++{
++	return d->isAlwaysVisible_;
++}
++
++void PsiContact::setAlwaysVisible(bool visible)
++{
++	d->isAlwaysVisible_ = visible;
++	account()->updateAlwaysVisibleContact(this);
++	emit updated();
++}
++
+ /**
+  * Standard desired parent.
+  */
+--- git.orig/src/psicontact.h
++++ git/src/psicontact.h
+@@ -70,6 +70,9 @@ public:
+ 
+ 	virtual void setEditing(bool editing);
+ 
++	bool isAlwaysVisible() const;
++	void setAlwaysVisible(bool visible);
++
+ 	bool addAvailable() const;
+ 	bool removeAvailable() const;
+ 	bool authAvailable() const;
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
+@@ -259,6 +259,7 @@ public:
+ 	QAction* mucShowAction_;
+ 	QAction* mucLeaveAction_;
+ 	QAction* blockAction_;
++	QAction* visibleAction_;
+ 
+ #endif
+ 
+@@ -430,6 +431,9 @@ public:
+ 		blockAction_ = new IconAction(tr("Block"), "psi/stop", tr("Block"), 0, this, 0, true);
+ 		connect(blockAction_, SIGNAL(triggered(bool)), SLOT(block(bool)));
+ 
++		visibleAction_ = new IconAction(tr("Always Visible"), "psi/eye", tr("Always Visible"), 0, this, 0, true);
++		connect(visibleAction_, SIGNAL(triggered(bool)), SLOT(setAlwaysVisible(bool)));
++
+ 		if (!contact_->isConference()) {
+ 			menu_->addAction(addAuthAction_);
+ 			menu_->addAction(transportLogonAction_);
+@@ -457,6 +461,7 @@ public:
+ 			mngMenu_->addAction(renameAction_);
+ 			mngMenu_->addMenu(groupMenu_);
+ 			mngMenu_->addAction(blockAction_);
++			mngMenu_->addAction(visibleAction_);
+ 			authMenu_ = mngMenu_->addMenu(tr("&Authorization"));
+ 			authMenu_->addAction(authResendAction_);
+ 			authMenu_->addAction(authRerequestAction_);
+@@ -569,6 +574,7 @@ private slots:
+ 		}
+ 		authMenu_->setEnabled(contact_->account()->isAvailable());
+ 		updateBlockActionState();
++		visibleAction_->setChecked(contact_->isAlwaysVisible());
+ 		removeAction_->setVisible(!PsiOptions::instance()->getOption("options.ui.contactlist.lockdown-roster").toBool()  && !contact_->isSelf());
+ 		removeAction_->setEnabled(contact_->removeAvailable());
+ 		if (!PsiOptions::instance()->getOption("options.ui.menu.contact.custom-picture").toBool()) {
+@@ -657,6 +663,14 @@ private slots:
+ 		contact_->toggleBlockedStateConfirmation();
+ 	}
+ 
++	void setAlwaysVisible(bool visible)
++	{
++		if (!contact_)
++			return;
++
++		contact_->setAlwaysVisible(visible);
++	}
++
+ 	void addAuth()
+ 	{
+ 		if (!contact_)
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -330,6 +330,8 @@ void UserAccount::fromOptions(OptionsTre
+ 		tlsOverrideCert = o->getOption(base + ".tls.override-certificate").toByteArray();
+ 		tlsOverrideDomain = o->getOption(base + ".tls.override-domain").toString();
+ 	}
++
++	alwaysVisibleContacts = o->getOption(base + ".always-visible-contacts").toStringList();
+ }
+ 
+ void UserAccount::toOptions(OptionsTree *o, QString base)
+@@ -470,6 +472,8 @@ void UserAccount::toOptions(OptionsTree
+ 	o->setOption(base + ".tls.override-certificate", tlsOverrideCert);
+ 	o->setOption(base + ".tls.override-domain", tlsOverrideDomain);
+ 	saveLastStatus(o, base);
++
++	o->setOption(base + ".always-visible-contacts", alwaysVisibleContacts);
+ }
+ 
+ void UserAccount::fromXml(const QDomElement &a)

psi-plus-main-20141106.tar.xz/patches/1060-psi-hide-any-group.diff Added

@@ -0,0 +1,181 @@
+--- git.temp.orig/src/contactlistgroup.cpp
++++ git.temp/src/contactlistgroup.cpp
+@@ -335,6 +335,17 @@ bool ContactListGroup::haveOnlineContact
+ 	return haveOnlineContacts_;
+ }
+ 
++bool ContactListGroup::isHidden() const
++{
++	return model()->groupState()->isHidden(this);
++}
++
++void ContactListGroup::setHidden(bool hidden)
++{
++	model_->groupState()->setHidden(this, hidden);
++	model_->updatedGroupVisibility(this);
++}
++
+ bool ContactListGroup::shouldBeVisible() const
+ {
+ 	return shouldBeVisible_;
+--- git.temp.orig/src/contactlistgroup.h
++++ git.temp/src/contactlistgroup.h
+@@ -56,6 +56,8 @@ public:
+ 	virtual int onlineContactsCount() const;
+ 	virtual int totalContactsCount() const;
+ 	int contactsCount() const;
++	bool isHidden() const;
++	void setHidden(bool hidden);
+ 
+ 	QList<PsiContact*> contacts() const;
+ 
+--- git.temp.orig/src/contactlistgroupmenu.cpp
++++ git.temp/src/contactlistgroupmenu.cpp
+@@ -57,6 +57,7 @@ class ContactListGroupMenu::Private : pu
+ 	QAction* actionMucHide_;
+ 	QAction* actionMucShow_;
+ 	QAction* actionMucLeave_;
++	QAction* actionHide_;
+ 
+ public:
+ 	Private(ContactListGroupMenu* menu, ContactListGroup* _group)
+@@ -108,6 +109,9 @@ public:
+ 		actionMucLeave_ = new IconAction(tr("Leave All"), this, "psi/action_muc_leave");
+ 		connect(actionMucLeave_, SIGNAL(triggered()), SLOT(mucLeave()));
+ 
++		actionHide_ = new IconAction(tr("Hidden"), "psi/show_hidden", tr("Hidden"), 0, this, 0, true);
++		connect(actionHide_, SIGNAL(triggered(bool)), SLOT(actHide(bool)));
++
+ 		authMenu_ = 0;
+ 
+ 		if (ContactListGroup::SpecialType_Conference != group->specialGroupType()) {
+@@ -120,6 +124,8 @@ public:
+ 			menu->addAction(sendMessageAction_);
+ 			menu->addAction(actionCustomStatus_);
+ 			menu->addSeparator();
++			menu->addAction(actionHide_);
++			menu_->addSeparator();
+ 			authMenu_ = menu->addMenu(tr("Authorization"));
+ 			authMenu_->addAction(actionAuth_);
+ 			authMenu_->addAction(actionAuthRequest_);
+@@ -152,6 +158,7 @@ private slots:
+ 		renameAction_->setEnabled(group->isEditable());
+ 		removeGroupAndContactsAction_->setEnabled(group->isRemovable());
+ 		removeGroupWithoutContactsAction_->setEnabled(group->isRemovable());
++		actionHide_->setChecked(group->isHidden());
+ #ifdef YAPSI
+ 		addGroupAction_->setEnabled(group->model()->contactList()->haveAvailableAccounts());
+ #endif
+@@ -302,6 +309,14 @@ private slots:
+ 		}
+ 	}
+ 
++	void actHide(bool hide)
++	{
++		if (!group)
++			return;
++
++		group->setHidden(hide);
++	}
++
+ #ifdef YAPSI
+ 	void addGroup()
+ 	{
+--- git.temp.orig/src/contactlistgroupstate.cpp
++++ git.temp/src/contactlistgroupstate.cpp
+@@ -95,6 +95,23 @@ void ContactListGroupState::setGroupOrde
+ 	order_[group->fullName()] = order;
+ }
+ 
++bool ContactListGroupState::isHidden(const ContactListGroup* group) const
++{
++	const QString groupName = group->fullName();
++	if(hidden_.contains(groupName)) {
++		return hidden_.value(groupName);
++	}
++
++	return false;
++}
++
++void ContactListGroupState::setHidden(const ContactListGroup* group, bool hidden)
++{
++	saveGroupStateTimer_->start();
++
++	hidden_[group->fullName()] = hidden;
++}
++
+ void ContactListGroupState::updateGroupList(const ContactListModel* model)
+ {
+ 	GroupExpandedState newExpanded;
+@@ -182,6 +199,20 @@ void ContactListGroupState::load(const Q
+ 			}
+ 		}
+ 	}
++	{
++		QDomElement hidden = root.firstChildElement("hidden");
++		if (!hidden.isNull()) {
++			for (QDomNode n = hidden.firstChild(); !n.isNull(); n = n.nextSibling()) {
++				QDomElement e = n.toElement();
++				if (e.isNull())
++					continue;
++
++				if (e.tagName() == "item") {
++					hidden_[e.attribute("fullName")] = e.text() == "true";
++				}
++			}
++		}
++	}
+ }
+ 
+ void ContactListGroupState::save()
+@@ -220,6 +251,19 @@ void ContactListGroupState::save()
+ 			}
+ 		}
+ 	}
++	{
++		QDomElement hidden = XMLHelper::emptyTag(&doc, "hidden");
++		root.appendChild(hidden);
++
++		QMap<QString, bool>::iterator i = hidden_.begin();
++		for (; i != hidden_.end(); ++i) {
++			if (i.value() == true) {
++				QDomElement item = textTag(&doc, "item", "true");
++				item.setAttribute("fullName", i.key());
++				hidden.appendChild(item);
++			}
++		}
++	}
+ 
+ 	PsiOptions::instance()->setOption(groupStateOptionPath.arg(id_), doc.toString());
+ }
+--- git.temp.orig/src/contactlistgroupstate.h
++++ git.temp/src/contactlistgroupstate.h
+@@ -50,6 +50,9 @@ public:
+ 	int groupOrder(const ContactListGroup* group) const;
+ 	void setGroupOrder(const ContactListGroup* group, int order);
+ 
++	bool isHidden(const ContactListGroup* group) const;
++	void setHidden(const ContactListGroup* group, bool hidden);
++
+ 	void updateGroupList(const ContactListModel* model);
+ 
+ 	void load(const QString& id);
+@@ -66,6 +69,7 @@ private:
+ 	QString id_;
+ 	GroupExpandedState expanded_;
+ 	QMap<QString, int> order_;
++	QMap<QString, bool> hidden_;
+ 
+ 	QStringList groupNames(const ContactListModel* model, const QModelIndex& parent, QStringList parentName) const;
+ };
+--- git.temp.orig/src/contactlistproxymodel.cpp
++++ git.temp/src/contactlistproxymodel.cpp
+@@ -126,7 +126,7 @@ bool ContactListProxyModel::filterAccept
+ 			}
+ 
+ 			bool show = true;
+-			if (index.data(Qt::DisplayRole) == PsiContact::hiddenGroupName()) {
++			if (index.data(Qt::DisplayRole) == PsiContact::hiddenGroupName() || group->isHidden()) {
+ 				show = showHidden();
+ 			}
+

psi-plus-main-20141106.tar.xz/patches/1070-psi-set-window-icons.diff Added

@@ -0,0 +1,285 @@
+--- psi.orig/src/aboutdlg.cpp
++++ psi/src/aboutdlg.cpp
+@@ -24,12 +24,14 @@
+ 
+ #include "applicationinfo.h"
+ #include "aboutdlg.h"
++#include "iconset.h"
+ 
+ AboutDlg::AboutDlg(QWidget* parent)
+ 	: QDialog(parent)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/psiplus_logo").icon());
+ 
+ 	setModal(false);
+ 
+--- psi.orig/src/accountmanagedlg.cpp
++++ psi/src/accountmanagedlg.cpp
+@@ -41,6 +41,7 @@
+ #include "psicontactlist.h"
+ #include "iconaction.h"
+ #include "shortcutmanager.h"
++#include "iconset.h"
+ 
+ using namespace XMPP;
+ 
+@@ -94,6 +95,7 @@ AccountRemoveDlg::AccountRemoveDlg(const
+ :QDialog(parent)
+ {
+ 	setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/account").icon());
+ 	setModal(false);
+ 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
+ 	d = new Private;
+--- psi.orig/src/activitydlg.cpp
++++ psi/src/activitydlg.cpp
+@@ -33,7 +33,9 @@ ActivityDlg::ActivityDlg(QList<PsiAccoun
+ 	if(pa_.isEmpty())
+ 		close();
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("activities/other").icon());
+ 	setModal(false);
++
+ 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
+ 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
+--- psi.orig/src/avcall/calldlg.cpp
++++ psi/src/avcall/calldlg.cpp
+@@ -28,6 +28,7 @@
+ #include "common.h"
+ #include "psiaccount.h"
+ #include "psioptions.h"
++#include "iconset.h"
+ 
+ // from opt_avcall.cpp
+ extern void options_avcall_update();
+@@ -68,6 +69,7 @@ public:
+ 	{
+ 		ui.setupUi(q);
+ 		q->setWindowTitle(tr("Voice Call"));
++		q->setWindowIcon(IconsetFactory::icon("psi/avcall").icon());
+ 
+ 		ui.lb_bandwidth->setEnabled(false);
+ 		ui.cb_bandwidth->setEnabled(false);
+--- psi.orig/src/bookmarkmanagedlg.cpp
++++ psi/src/bookmarkmanagedlg.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include "bookmarkmanager.h"
+ #include "psiaccount.h"
++#include "iconset.h"
+ 
+ BookmarkManageDlg::BookmarkManageDlg(PsiAccount* account)
+ 	: QDialog()
+@@ -35,6 +36,8 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
+ 	setAttribute(Qt::WA_DeleteOnClose, true);
+ 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/bookmarks").icon());
++
+ 	account_->dialogRegister(this);
+ 
+ 	QAction* removeBookmarkAction = new QAction(this);
+--- psi.orig/src/contactmanager/contactmanagerdlg.cpp
++++ psi/src/contactmanager/contactmanagerdlg.cpp
+@@ -44,6 +44,7 @@ ContactManagerDlg::ContactManagerDlg(Psi
+ 	ui_.setupUi(this);
+ 	pa_->dialogRegister(this);
+ 	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
++	setWindowIcon(IconsetFactory::icon("psi/action_contacts_manager").icon());
+ 
+ 	um = new ContactManagerModel(this, pa_);
+ 	um->reloadUsers();
+--- psi.orig/src/geolocationdlg.cpp
++++ psi/src/geolocationdlg.cpp
+@@ -27,6 +27,7 @@
+ #include "pepmanager.h"
+ #include "geolocation.h"
+ #include <QLineEdit>
++#include "iconset.h"
+ 
+ GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
+ {
+@@ -34,7 +35,9 @@ GeoLocationDlg::GeoLocationDlg(QList<Psi
+ 	if(pa_.isEmpty())
+ 		close();
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("system/geolocation").icon());
+ 	setModal(false);
++
+ 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
+  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
+ 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
+--- psi.orig/src/groupchatdlg.cpp
++++ psi/src/groupchatdlg.cpp
+@@ -631,7 +631,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	setAcceptDrops(true);
+ 
+ #ifndef Q_OS_MAC
+-	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
++	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
+ #endif
+ 
+ 	ui_.setupUi(this);
+@@ -1859,7 +1859,7 @@ void GCMainDlg::setLooks()
+ 
+ 	// update the widget icon
+ #ifndef Q_OS_MAC
+-	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
++	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
+ #endif
+ 
+ 	ui_.lv_users->setLooks();
+@@ -2097,6 +2097,7 @@ void GCMainDlg::doBookmark()
+ 	formLayout->addRow(tr("&Auto join:"), chkAJoin);
+ 	layout->addLayout(formLayout);
+ 	layout->addLayout(blayout);
++	dlg->setWindowIcon(IconsetFactory::icon("psi/bookmark_remove").icon());
+ 	dlg->setLayout(layout);
+ 	dlg->setMinimumWidth(300);
+ 	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));
+--- psi.orig/src/mooddlg.cpp
++++ psi/src/mooddlg.cpp
+@@ -34,7 +34,9 @@ MoodDlg::MoodDlg(QList<PsiAccount*> list
+ 	if(pa_.isEmpty())
+ 		close();
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("mood/").icon());
+ 	setModal(false);
++
+ 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
+ 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));
+ 
+--- psi.orig/src/mucjoindlg.cpp
++++ psi/src/mucjoindlg.cpp
+@@ -30,6 +30,7 @@
+ #include "psicontactlist.h"
+ #include "groupchatdlg.h"
+ #include "bookmarkmanager.h"
++#include "iconset.h"
+ 
+ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
+ 	: QDialog(0)
+@@ -38,6 +39,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
+ 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
+ 	setModal(false);
+ 	ui_.setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
+ 	controller_ = psi;
+ 	account_ = 0;
+ 	controller_->dialogRegister(this);
+--- psi.orig/src/options/optionsdlg.cpp
++++ psi/src/options/optionsdlg.cpp
+@@ -505,6 +505,7 @@ OptionsDlg::OptionsDlg(PsiCon *psi, QWid
+ 	: QDialog(parent)
+ {
+ 	setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/options").icon());
+ 	pb_apply = buttonBox->button(QDialogButtonBox::Apply);
+ 
+ 	setAttribute(Qt::WA_DeleteOnClose);
+--- psi.orig/src/privacy/privacydlg.cpp
++++ psi/src/privacy/privacydlg.cpp
+@@ -26,6 +26,7 @@
+ #include "privacylist.h"
+ #include "privacymanager.h"
+ #include "privacylistmodel.h"
++#include "iconset.h"
+ 
+ // fixme: subscribe on the destroyed() signal of the manager
+ 
+@@ -34,6 +35,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
+ 	ui_.setupUi(this);
+ 	setAttribute(Qt::WA_DeleteOnClose);
+ 	setWindowTitle(tr("%1: Privacy Lists").arg(account_name));
++	setWindowIcon(IconsetFactory::icon("psi/eye").icon());
+ 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
+ 
+ 	connect(manager_,SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)),SLOT(updateLists(const QString&, const QString&, const QStringList&)));
+--- psi.orig/src/profiledlg.cpp
++++ psi/src/profiledlg.cpp
+@@ -81,6 +81,7 @@ ProfileOpenDlg::ProfileOpenDlg(const QSt
+ 	setupUi(this);
+ 	setModal(true);
+ 	setWindowTitle(CAP(windowTitle()));
++	setWindowIcon(IconsetFactory::icon("psi/profile").icon());
+ 	pb_open->setDefault(true);
+ 
+ 	langs = _langs;
+--- psi.orig/src/psioptionseditor.cpp
++++ psi/src/psioptionseditor.cpp
+@@ -184,6 +184,9 @@ PsiOptionsEditor::PsiOptionsEditor(QWidg
+ 		pb_detach->setToolTip(tr("Open a detached option editor window."));
+ 		buttonLine->addWidget(pb_detach);
+ 		connect(pb_detach, SIGNAL(clicked()), SLOT(detach()));
++	} else {
++		setWindowIcon(IconsetFactory::icon("psi/advanced-plus").icon());
++		setWindowTitle(CAP(tr("Advanced")));
+ 	}
+ 
+ 
+--- psi.orig/src/statusdlg.cpp
++++ psi/src/statusdlg.cpp
+@@ -72,6 +72,7 @@ StatusShowDlg::StatusShowDlg(const UserL
+ 	te->setText(u.makeDesc());
+ 
+ 	setWindowTitle(tr("Status for %1").arg(JIDUtil::nickOrJid(u.name(), u.jid().full())));
++	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
+ 	resize(400,240);
+ 
+ 	pb->setFocus();
+@@ -113,6 +114,7 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi,
+ 	d->withPriority = withPriority;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: All accounts")));
++	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
+ 	d->setStatusMode = setStatusForAccount;
+ 	init();
+ }
+@@ -129,6 +131,7 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
+ 	d->withPriority = withPriority;
+ 
+ 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
++	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
+ 	d->setStatusMode = setStatusForAccount;
+ 	init();
+ }
+--- psi.orig/src/tipdlg.cpp
++++ psi/src/tipdlg.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include "psioptions.h"
+ #include "psicon.h"
++#include "iconset.h"
+ 
+ void TipDlg::show(PsiCon* psi)
+ {
+@@ -48,6 +49,7 @@ TipDlg::TipDlg(PsiCon* psi)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
+ 	setupUi(this);
++	setWindowIcon(IconsetFactory::icon("psi/tip").icon());
+ 	setModal(false);
+ 
+ 	psi_->dialogRegister(this);
+--- psi.orig/src/xmlconsole.cpp
++++ psi/src/xmlconsole.cpp
+@@ -33,6 +33,7 @@
+ #include "psicon.h"
+ #include "psicontactlist.h"
+ #include "textutil.h"
++#include "iconset.h"
+ 
+ //----------------------------------------------------------------------------
+ // XmlConsole
+@@ -41,7 +42,7 @@ XmlConsole::XmlConsole(PsiAccount *_pa)
+ :QWidget()
+ {
+ 	ui_.setupUi(this);
+-
++	setWindowIcon(IconsetFactory::icon("psi/xml").icon());
+ 	pa = _pa;
+ 	pa->dialogRegister(this);
+ 	connect(pa, SIGNAL(updatedAccount()), SLOT(updateCaption()));

psi-plus-main-20141106.tar.xz/patches/1080-psi-optionseditor-show-only-first-line.diff Added

psi-plus-main-20141106.tar.xz/patches/1090-psi-custom-chat-window-caption.diff Added

@@ -0,0 +1,52 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -109,6 +109,7 @@
+ 				<auto-popup type="bool">false</auto-popup>
+ 				<auto-capitalize type="bool">false</auto-capitalize>
+ 				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
++				<caption type="QString"></caption>
+ 				<delete-contents-after type="QString">never</delete-contents-after>
+ 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
+ 				<use-chat-says-style type="bool">false</use-chat-says-style>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -645,7 +645,10 @@ void ChatDlg::setSelfDestruct(int minute
+ 
+ QString ChatDlg::desiredCaption() const
+ {
+-	QString cap = "";
++	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
++	if(!cap.isEmpty()) {
++		return cap;
++	}
+ 
+ 	if (pending_ > 0) {
+ 		cap += "* ";
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1802,7 +1802,10 @@ void GCMainDlg::doAlert()
+ 
+ QString GCMainDlg::desiredCaption() const
+ {
+-	QString cap = "";
++	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
++	if(!cap.isEmpty()) {
++		return cap;
++	}
+ 
+ 	if (d->pending > 0) {
+ 		cap += "* ";
+--- git.orig/src/tabs/tabdlg.cpp
++++ git/src/tabs/tabdlg.cpp
+@@ -558,7 +558,10 @@ void TabDlg::activated()
+ 
+ QString TabDlg::desiredCaption() const
+ {
+-	QString cap = "";
++	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
++	if(!cap.isEmpty()) {
++		return cap;
++	}
+ 	uint pending = 0;
+ 	foreach(TabbableWidget* tab, tabs_) {
+ 		pending += tab->unreadMessageCount();

psi-plus-main-20141106.tar.xz/patches/1100-psi-muc-and-user-topic-context-menu.diff Added

@@ -0,0 +1,107 @@
+--- a/src/groupchatdlg.cpp
++++ b/src/groupchatdlg.cpp
+@@ -52,6 +52,7 @@
+ #include <QCheckBox>
+ #include <QDialogButtonBox>
+ #include <QFormLayout>
++#include <QClipboard>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"
+@@ -210,6 +211,7 @@ public:
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+ 	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
++	QAction *act_copy_muc_jid;
+ 	TypeAheadFindBar *typeahead;
+ //#ifdef WHITEBOARDING
+ //	IconAction *act_whiteboard;
+@@ -728,6 +730,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	d->act_bookmark = new IconAction(this);
+ 	connect(d->act_bookmark, SIGNAL(triggered()), SLOT(doBookmark()));
+ 	ui_.le_topic->addAction(d->act_bookmark);
++
++	d->act_copy_muc_jid = new QAction(tr("Copy Groupchat JID"), this);
++	connect(d->act_copy_muc_jid, SIGNAL(triggered()), SLOT(copyMucJid()));
++	ui_.le_topic->addAction(d->act_copy_muc_jid);
++
+ 	BookmarkManager *bm = account()->bookmarkManager();
+ 	d->act_bookmark->setVisible(bm->isAvailable());
+ 	if (bm->isAvailable()) {
+@@ -2117,6 +2124,11 @@ void GCMainDlg::doBookmark()
+ 	delete dlg;
+ }
+ 
++void GCMainDlg::copyMucJid()
++{
++	QApplication::clipboard()->setText(jid().bare());
++}
++
+ void GCMainDlg::doRemoveBookmark()
+ {
+ 	BookmarkManager *bm = account()->bookmarkManager();
+--- a/src/groupchatdlg.h
++++ b/src/groupchatdlg.h
+@@ -142,6 +142,7 @@ private slots:
+ 	void editTemplates();
+ 	void doPasteAndSend();
+ 	void doBookmark();
++	void copyMucJid();
+ 	void doRemoveBookmark();
+ 	void sendTemp(const QString &);
+ 	void psButtonEnabled();
+--- a/src/infodlg.cpp
++++ b/src/infodlg.cpp
+@@ -161,7 +161,8 @@ InfoDlg::InfoDlg(int type, const Jid &j, const VCard &vcard, PsiAccount *pa, QWi
+ 	d->namesDlg->setLayout(fl);
+ 	// end names editing dialog
+ 
+-	QAction *editnames = new QAction(IconsetFactory::icon(d->type == Self?"psi/options":"psi/info").icon(), "", this);
++	QAction *editnames = new QAction(IconsetFactory::icon(d->type == Self ? "psi/options" : "psi/info").icon(),
++									 d->type == Self ? tr("Edit names") : tr("View names") , this);
+ 	ui_.le_fullname->addAction(editnames);
+ 	ui_.le_fullname->widgetForAction(editnames)->setPopup(d->namesDlg);
+ 	d->homepageAction = new QAction(IconsetFactory::icon("psi/arrowRight").icon(), tr("Open web browser"), this);
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
+@@ -19,6 +19,7 @@
+ #include <QMessageBox>
+ #include <QDebug>
+ #include <QTimer>
++#include <QClipboard>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"
+@@ -219,6 +220,10 @@ void PsiChatDlg::initUi()
+ 		updateAutojidIcon();
+ 		connect(act_autojid, SIGNAL(triggered()), SLOT(doSwitchJidMode()));
+ 		le_autojid->addAction(act_autojid);
++
++		QAction *act_copy_user_jid = new QAction(tr("Copy user JID"), this);
++		le_autojid->addAction(act_copy_user_jid);
++		connect(act_copy_user_jid, SIGNAL(triggered()), SLOT(copyUserJid()));
+ 	}
+ 
+ 	ui_.lb_ident->setAccount(account());
+@@ -426,6 +431,11 @@ void PsiChatDlg::updateContactAdding(PsiContact* c)
+ 	}
+ }
+ 
++void PsiChatDlg::copyUserJid()
++{
++	QApplication::clipboard()->setText(jid().bare());
++}
++
+ void PsiChatDlg::updateContactAdding(const Jid &j)
+ {
+ 	if (realJid().compare(j, false)) {
+--- a/src/psichatdlg.h
++++ b/src/psichatdlg.h
+@@ -48,6 +48,7 @@ private slots:
+ 	void updateCountVisibility();
+ 	void updateContactAdding(PsiContact* c = 0);
+ 	void updateContactAdding(const Jid &j);
++	void copyUserJid();
+ 
+ 	// reimplemented
+ 	void chatEditCreated();

psi-plus-main-20141106.tar.xz/patches/1110-psi-reasons-for-roles-affiliations.diff Added

@@ -0,0 +1,268 @@
+--- git.temp.orig/src/groupchatdlg.cpp
++++ git.temp/src/groupchatdlg.cpp
+@@ -1462,6 +1462,7 @@ void GCMainDlg::presence(const QString &
+ 			// Status change
+ 			if ( !d->connecting && options_->getOption("options.muc.show-role-affiliation").toBool() ) {
+ 				QString message;
++				QString reason;
+ 				if (contact->s.mucItem().role() != s.mucItem().role() && s.mucItem().role() != MUCItem::NoRole) {
+ 					if (contact->s.mucItem().affiliation() != s.mucItem().affiliation()) {
+ 						message = tr("%1 is now %2 and %3").arg(nick).arg(MUCManager::roleToString(s.mucItem().role(),true)).arg(MUCManager::affiliationToString(s.mucItem().affiliation(),true));
+@@ -1469,9 +1470,15 @@ void GCMainDlg::presence(const QString &
+ 					else {
+ 						message = tr("%1 is now %2").arg(nick).arg(MUCManager::roleToString(s.mucItem().role(),true));
+ 					}
++					reason = s.mucItem().reason();
+ 				}
+ 				else if (contact->s.mucItem().affiliation() != s.mucItem().affiliation()) {
+ 					message += tr("%1 is now %2").arg(nick).arg(MUCManager::affiliationToString(s.mucItem().affiliation(),true));
++					reason = s.mucItem().reason();
++				}
++
++				if(!reason.isEmpty()) {
++					message += tr(" (Reason: %1)").arg(reason);
+ 				}
+ 
+ 				if (!message.isEmpty()) {
+@@ -1923,20 +1930,45 @@ void GCMainDlg::lv_action(const QString
+ 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+ 		d->mucManager->ban(contact->s.mucItem().jid());
+ 	}
+-	else if(x == 12) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().role() != MUCItem::Visitor)
+-			d->mucManager->setRole(nick, MUCItem::Visitor);
+-	}
+-	else if(x == 13) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().role() != MUCItem::Participant)
+-			d->mucManager->setRole(nick, MUCItem::Participant);
+-	}
+-	else if(x == 14) {
++	else if(x > 11 && x < 19) {
++		MUCReasonsEditor editor(this);
++		QString reason;
++		if (editor.exec())
++			reason = editor.reason();
++		else return;
+ 		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().role() != MUCItem::Moderator)
+-			d->mucManager->setRole(nick, MUCItem::Moderator);
++		if (!contact)
++			return;
++		switch(x) {
++		case 12:
++			if (contact->s.mucItem().role() != MUCItem::Visitor)
++				d->mucManager->setRole(nick, MUCItem::Visitor, reason);
++			break;
++		case 13:
++			if (contact->s.mucItem().role() != MUCItem::Participant)
++				d->mucManager->setRole(nick, MUCItem::Participant, reason);
++			break;
++		case 14:
++			if (contact->s.mucItem().role() != MUCItem::Moderator)
++				d->mucManager->setRole(nick, MUCItem::Moderator, reason);
++			break;
++		case 15:
++			if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
++				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation, reason);
++			break;
++		case 16:
++			if (contact->s.mucItem().affiliation() != MUCItem::Member)
++				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Member, reason);
++			break;
++		case 17:
++			if (contact->s.mucItem().affiliation() != MUCItem::Admin)
++				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Admin, reason);
++			break;
++		case 18:
++			if (contact->s.mucItem().affiliation() != MUCItem::Owner)
++				d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner, reason);
++			break;
++		}
+ 	}
+ 	else if(x >= 100 && x<300) {
+ 		// Kick || Ban with reason
+@@ -1964,26 +1996,6 @@ void GCMainDlg::lv_action(const QString
+ 		}
+ 
+ 	}
+-	else if(x == 15) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().affiliation() != MUCItem::NoAffiliation)
+-			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::NoAffiliation);
+-	}
+-	else if(x == 16) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().affiliation() != MUCItem::Member)
+-			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Member);
+-	}
+-	else if(x == 17) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().affiliation() != MUCItem::Admin)
+-			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Admin);
+-	}
+-	else if(x == 18) {
+-		GCUserViewItem *contact = (GCUserViewItem*) ui_.lv_users->findEntry(nick);
+-		if (contact->s.mucItem().affiliation() != MUCItem::Owner)
+-			d->mucManager->setAffiliation(contact->s.mucItem().jid(), MUCItem::Owner);
+-	}
+ }
+ 
+ void GCMainDlg::contextMenuEvent(QContextMenuEvent *)
+--- git.temp.orig/src/mucreasonseditor.cpp
++++ git.temp/src/mucreasonseditor.cpp
+@@ -1,48 +1,82 @@
++/*
++ * mucreasonseditor.cpp
++ * Copyright (C)
++ * 2011 Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
+ #include "mucreasonseditor.h"
+ #include "common.h"
+ #include "psioptions.h"
++#include "ui_mucreasonseditor.h"
+ 
+ 
+ MUCReasonsEditor::MUCReasonsEditor(QWidget* parent)
+ 	: QDialog(parent)
++	, ui_(new Ui::MUCReasonsEditor)
+ {
+-	ui_.setupUi(this);
+-	ui_.lstReasons->addItems(PsiOptions::instance()->getOption("options.muc.reasons").toStringList());
++	ui_->setupUi(this);
++	ui_->lstReasons->addItems(PsiOptions::instance()->getOption("options.muc.reasons").toStringList());
++
++	connect(ui_->btnAdd, SIGNAL(clicked()), SLOT(addButtonClicked()));
++	connect(ui_->btnRemove, SIGNAL(clicked()), SLOT(removeButtonClicked()));
++	connect(ui_->lstReasons, SIGNAL(currentTextChanged(QString)), SLOT(currentChanged(QString)));
+ }
+ 
+ MUCReasonsEditor::~MUCReasonsEditor()
+ {
++	delete ui_;
+ }
+ 
+ void MUCReasonsEditor::accept()
+ {
+ 	save();
+-	reason_=ui_.txtReason->text();
++	reason_ = ui_->txtReason->text();
+ 	QDialog::accept();
+ }
+ 
+-void MUCReasonsEditor::on_btnAdd_clicked()
++void MUCReasonsEditor::currentChanged(const QString &r)
++{
++	ui_->txtReason->setText(r);
++}
++
++void MUCReasonsEditor::addButtonClicked()
+ {
+-	reason_=ui_.txtReason->text().trimmed();
++	reason_ = ui_->txtReason->text().trimmed();
+ 	if (reason_.isEmpty())
+ 		return;
+-	ui_.lstReasons->addItem(reason_);
++	ui_->lstReasons->addItem(reason_);
+ }
+ 
+-void MUCReasonsEditor::on_btnRemove_clicked()
++void MUCReasonsEditor::removeButtonClicked()
+ {
+-	int idx=ui_.lstReasons->currentRow();
+-	if (idx>=0) {
+-		QListWidgetItem *item =ui_.lstReasons->takeItem(idx);
+-		if (item) delete item;
++	int idx = ui_->lstReasons->currentRow();
++	if (idx >= 0) {
++		QListWidgetItem *item =ui_->lstReasons->takeItem(idx);
++		if (item)
++			delete item;
+ 	}
+ }
+ 
+ void MUCReasonsEditor::save()
+ {
+ 	QStringList reasons;
+-	int cnt=ui_.lstReasons->count();
+-	for (int i=0; i<cnt; ++i)
+-		reasons.append(ui_.lstReasons->item(i)->text());
++	int cnt = ui_->lstReasons->count();
++	for (int i = 0; i < cnt; ++i)
++		reasons.append(ui_->lstReasons->item(i)->text());
+ 	PsiOptions::instance()->setOption("options.muc.reasons", reasons);
+ }
+--- git.temp.orig/src/mucreasonseditor.h
++++ git.temp/src/mucreasonseditor.h
+@@ -1,9 +1,32 @@
++/*
++ * mucreasonseditor.cpp
++ * Copyright (C)
++ * 2011 Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
+ #ifndef MUCREASONSEDITOR_H
+ #define MUCREASONSEDITOR_H
+ 
+ #include <QDialog>
+ 
+-#include "ui_mucreasonseditor.h"
++namespace Ui {
++	class MUCReasonsEditor;
++}
+ 
+ class MUCReasonsEditor: public QDialog
+ {
+@@ -12,13 +35,17 @@ public:
+ 	MUCReasonsEditor(QWidget* parent = 0);
+ 	~MUCReasonsEditor();
+ 	QString reason() const { return reason_; }
++
+ private:
+-	Ui::MUCReasonsEditor ui_;
++	Ui::MUCReasonsEditor *ui_;
+ 	QString reason_;
++
+ private slots:
+-	void on_btnAdd_clicked();
+-	void on_btnRemove_clicked();
++	void addButtonClicked();
++	void removeButtonClicked();
+ 	void save();
++	void currentChanged(const QString&);
++
+ protected slots:
+ 	void accept();
+ };

psi-plus-main-20141106.tar.xz/patches/1120-psi-filter-in-discodlg.diff Added

@@ -0,0 +1,101 @@
+--- git.temp.orig/src/discodlg.cpp
++++ git.temp/src/discodlg.cpp
+@@ -707,6 +707,9 @@ class DiscoListView : public QTreeWidget
+ public:
+ 	DiscoListView(QWidget *parent);
+ 
++public slots:
++	void updateItemsVisibility(const QString& filter);
++
+ protected:
+ 	bool maybeTip(const QPoint &);
+ 
+@@ -837,6 +840,37 @@ bool DiscoListView::eventFilter(QObject*
+ 	return QTreeWidget::eventFilter(o, e);
+ }
+ 
++// returns false if parent item should not be hidden (it has visible children)
++static bool updateItemsRecursively(QTreeWidgetItem* parent, const QString& filter)
++{
++	bool hidden = true;
++	for(int j = 0; j < parent->childCount(); j++) {
++		QTreeWidgetItem *i = parent->child(j);
++		if(filter.isEmpty()) {
++			i->setHidden(false);
++			updateItemsRecursively(i, filter);
++		}
++		else {
++			bool v = true;
++			if(i->isExpanded()) {
++				v = updateItemsRecursively(i, filter);
++			}
++			v &= !(i->text(0).contains(filter, Qt::CaseInsensitive) || i->text(1).contains(filter, Qt::CaseInsensitive));
++			i->setHidden(v);
++			hidden &= v;
++		}
++	}
++	return hidden;
++}
++
++void DiscoListView::updateItemsVisibility(const QString& filter)
++{
++	for(int n = 0; n < topLevelItemCount(); n++) {
++		QTreeWidgetItem *it = topLevelItem(n);
++		updateItemsRecursively(it, filter);
++	}
++}
++
+ //----------------------------------------------------------------------------
+ // DiscoDlg::Private
+ //----------------------------------------------------------------------------
+@@ -951,9 +985,11 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 	replaceWidget(lv_discoOld, dlg->lv_disco);
+ 
+ 	dlg->lv_disco->installEventFilter (this);
+-	connect(dlg->lv_disco, SIGNAL(currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(itemSelected (QTreeWidgetItem *)));;
++	dlg->le_filter->installEventFilter(this);
++	connect(dlg->lv_disco, SIGNAL(currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)), SLOT(itemSelected (QTreeWidgetItem *)));
+ 	connect(dlg->lv_disco, SIGNAL(itemExpanded (QTreeWidgetItem *)), SLOT(itemExpanded (QTreeWidgetItem *)));
+-	connect(dlg->lv_disco, SIGNAL(itemDoubleClicked (QTreeWidgetItem *, int)), SLOT(itemDoubleclicked (QTreeWidgetItem *)));;
++	connect(dlg->lv_disco, SIGNAL(itemDoubleClicked (QTreeWidgetItem *, int)), SLOT(itemDoubleclicked (QTreeWidgetItem *)));
++	connect(dlg->le_filter, SIGNAL(textChanged(QString)), dlg->lv_disco, SLOT(updateItemsVisibility(QString)));
+ 
+ 	// protocol actions
+ 	QSignalMapper *pm = new QSignalMapper(this);
+@@ -1360,6 +1396,13 @@ bool DiscoDlg::Private::eventFilter (QOb
+ 			return true;
+ 		}
+ 	}
++	else if(object == dlg->le_filter && event->type() == QEvent::KeyPress) {
++		QKeyEvent *ke = static_cast<QKeyEvent*>(event);
++		if(ke->key() == Qt::Key_Escape) {
++			dlg->le_filter->clear();
++			return true;
++		}
++	}
+ 
+ 	return false;
+ }
+--- git.temp.orig/src/disco.ui
++++ git.temp/src/disco.ui
+@@ -120,6 +120,20 @@
+       <widget class="QTreeWidget" name="lv_disco" />
+      </item>
+      <item>
++    <layout class="QHBoxLayout" name="horizontalLayout">
++     <item>
++      <widget class="QLabel" name="label">
++       <property name="text">
++        <string>Filter by JID:</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QLineEdit" name="le_filter"/>
++     </item>
++    </layout>
++   </item>
++     <item>
+       <widget class="QCheckBox" name="ck_autoItems" >
+        <property name="text" >
+         <string>Auto-browse into objects</string>

psi-plus-main-20141106.tar.xz/patches/1130-psi-bookmark-nick-auto-comlition.diff Added

@@ -0,0 +1,80 @@
+--- psi.orig/src/mucjoindlg.cpp
++++ psi/src/mucjoindlg.cpp
+@@ -32,8 +32,12 @@
+ #include "bookmarkmanager.h"
+ #include "iconset.h"
+ 
++static const int nickConflictCode = 409;
++static const QString additionalSymbol = "_";
++
+ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiAccount* pa)
+ 	: QDialog(0)
++	, nickAlreadyCompleted_(false)
+ {
+ 	setAttribute(Qt::WA_DeleteOnClose);
+ 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
+@@ -243,22 +247,32 @@ void MUCJoinDlg::joined()
+ 	controller_->recentGCAdd(jid_.full());
+ 	ui_.busy->stop();
+ 
++	nickAlreadyCompleted_ = false;
+ 	closeDialogs(this);
+ 	deleteLater();
+ 	account_->addMucItem(jid_.bare());
+ }
+ 
+-void MUCJoinDlg::error(int, const QString &str)
++void MUCJoinDlg::error(int error, const QString &str)
+ {
+-	if(!isVisible())
+-		show();
+-
+ 	ui_.busy->stop();
+ 	setWidgetsEnabled(true);
+ 
+ 	account_->dialogUnregister(this);
+ 	controller_->dialogRegister(this);
+ 
++	if(!nickAlreadyCompleted_ && reason_ == MucAutoJoin && error == nickConflictCode) {
++		nickAlreadyCompleted_ = true;
++		ui_.le_nick->setText(ui_.le_nick->text() + additionalSymbol);
++		doJoin(reason_);
++		return;
++	}
++
++	if(!isVisible())
++		show();
++
++	nickAlreadyCompleted_ = false;
++
+ 	QMessageBox* msg = new QMessageBox(QMessageBox::Information, tr("Error"), tr("Unable to join groupchat.\nReason: %1").arg(str), QMessageBox::Ok, this);
+ 	msg->setAttribute(Qt::WA_DeleteOnClose, true);
+ 	msg->setModal(false);
+@@ -271,7 +285,7 @@ void MUCJoinDlg::setJid(const Jid& mucJi
+ 	ui_.le_room->setText(mucJid.node());
+ }
+ 
+-void MUCJoinDlg::setNick(const QString nick)
++void MUCJoinDlg::setNick(const QString& nick)
+ {
+ 	ui_.le_nick->setText(nick);
+ }
+--- psi.orig/src/mucjoindlg.h
++++ psi/src/mucjoindlg.h
+@@ -46,7 +46,7 @@ public:
+ 	~MUCJoinDlg();
+ 
+ 	void setJid(const XMPP::Jid& jid);
+-	void setNick(const QString nick);
++	void setNick(const QString& nick);
+ 	void setPassword(const QString& password);
+ 
+ 	void joined();
+@@ -78,6 +78,7 @@ private:
+ 	QPushButton* joinButton_;
+ 	XMPP::Jid jid_;
+ 	MucJoinReason reason_;
++	bool nickAlreadyCompleted_;
+ 
+ 	void disableWidgets();
+ 	void enableWidgets();

psi-plus-main-20141106.tar.xz/patches/1140-psi-import-export-bookmarks.diff Added

@@ -0,0 +1,151 @@
+--- git.temp.orig/src/bookmarkmanagedlg.cpp
++++ git.temp/src/bookmarkmanagedlg.cpp
+@@ -23,10 +23,13 @@
+ #include <QStandardItemModel>
+ #include <QPushButton>
+ #include <QAction>
++#include <QFile>
++#include <QMessageBox>
+ 
+ #include "bookmarkmanager.h"
+ #include "psiaccount.h"
+ #include "iconset.h"
++#include "fileutil.h"
+ 
+ BookmarkManageDlg::BookmarkManageDlg(PsiAccount* account)
+ 	: QDialog()
+@@ -47,6 +50,11 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
+ 	removeBookmarkAction->setShortcuts(QKeySequence::Delete);
+ 	ui_.listView->addAction(removeBookmarkAction);
+ 
++	ui_.pb_import->setIcon(IconsetFactory::icon("psi/cm_import").icon());
++	ui_.pb_export->setIcon(IconsetFactory::icon("psi/cm_export").icon());
++	connect(ui_.pb_import, SIGNAL(clicked()), SLOT(importBookmarks()));
++	connect(ui_.pb_export, SIGNAL(clicked()), SLOT(exportBookmarks()));
++
+ 	addButton_    = ui_.bookmarkButtonBox->addButton(tr("&Add"),    QDialogButtonBox::ActionRole);
+ 	removeButton_ = ui_.bookmarkButtonBox->addButton(tr("&Remove"), QDialogButtonBox::DestructiveRole);
+ 	joinButton_   = ui_.bookmarkButtonBox->addButton(tr("&Join"),   QDialogButtonBox::ActionRole);
+@@ -221,3 +229,57 @@ void BookmarkManageDlg::appendItem(QStan
+ 	item->setDropEnabled(false);
+ 	model_->invisibleRootItem()->appendRow(item);
+ }
++
++void BookmarkManageDlg::importBookmarks()
++{
++	QString fileName = FileUtil::getOpenFileName(this, tr("Import bookmarks"));
++	if(fileName.isEmpty())
++		return;
++
++	QFile file(fileName);
++	if(file.open(QIODevice::ReadOnly | QIODevice::Text)) {
++		QDomDocument doc;
++		QString error;
++		if(doc.setContent(&file, &error)) {
++			QDomElement root = doc.firstChildElement("bookmarks");
++			if(root.isNull())
++				return;
++			QDomElement elem = root.firstChildElement("conference");
++			while(!elem.isNull()) {
++				ConferenceBookmark c(elem);
++
++				QStandardItem* item = new QStandardItem(c.name());
++				item->setData(QVariant(c.jid().full()), JidRole);
++				item->setData(QVariant(c.autoJoin()),   AutoJoinRole);
++				item->setData(QVariant(c.nick()),       NickRole);
++				item->setData(QVariant(c.password()),   PasswordRole);
++				appendItem(item);
++
++				elem = elem.nextSiblingElement("conference");
++			}
++		}
++		else {
++			QMessageBox::warning(this, tr("Error!"), error);
++		}
++	}
++}
++
++void BookmarkManageDlg::exportBookmarks()
++{
++	QString fileName = FileUtil::getSaveFileName(this, tr("Export bookmarks"), "bookmarks.txt");
++	if(fileName.isEmpty())
++		return;
++
++	QFile file(fileName);
++	if(file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
++		QDomDocument doc;
++		QDomElement root = doc.createElement("bookmarks");
++		doc.appendChild(root);
++		for (int row = 0; row < model_->rowCount(); ++row) {
++			QModelIndex index = model_->index(row, 0, QModelIndex());
++			ConferenceBookmark cb = bookmarkFor(index);
++			root.appendChild(cb.toXml(doc));
++		}
++		file.write(doc.toString().toLocal8Bit());
++	}
++}
+--- git.temp.orig/src/bookmarkmanagedlg.h
++++ git.temp/src/bookmarkmanagedlg.h
+@@ -68,6 +68,8 @@ private slots:
+ 	void joinCurrentRoom();
+ 	void closeEditor(QWidget* editor, QAbstractItemDelegate::EndEditHint hint);
+ 	void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
++	void importBookmarks();
++	void exportBookmarks();
+ 
+ private:
+ 	Ui::BookmarkManage ui_;
+--- git.temp.orig/src/bookmarkmanage.ui
++++ git.temp/src/bookmarkmanage.ui
+@@ -118,13 +118,50 @@
+      </property>
+     </widget>
+    </item>
+-   <item row="2" column="0" colspan="2" >
++   <item row="2" column="1">
+     <widget class="QDialogButtonBox" name="buttonBox" >
+      <property name="standardButtons" >
+       <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      </property>
+     </widget>
+    </item>
++   <item row="2" column="0">
++    <layout class="QHBoxLayout" name="importLayout">
++     <item>
++      <widget class="QPushButton" name="pb_import">
++       <property name="toolTip">
++        <string>Import bookmarks from file</string>
++       </property>
++       <property name="text">
++        <string>&amp;Import</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <widget class="QPushButton" name="pb_export">
++       <property name="toolTip">
++        <string>Export bookmarks to file</string>
++       </property>
++       <property name="text">
++        <string>&amp;Export</string>
++       </property>
++      </widget>
++     </item>
++     <item>
++      <spacer name="horizontalSpacer">
++       <property name="orientation">
++        <enum>Qt::Horizontal</enum>
++       </property>
++       <property name="sizeHint" stdset="0">
++        <size>
++         <width>40</width>
++         <height>20</height>
++        </size>
++       </property>
++      </spacer>
++     </item>
++    </layout>
++   </item>
+   </layout>
+  </widget>
+  <resources/>

psi-plus-main-20141106.tar.xz/patches/1150-psi-improve-mini-comands.diff Added

@@ -0,0 +1,93 @@
+--- git.temp.orig/src/groupchatdlg.cpp
++++ git.temp/src/groupchatdlg.cpp
+@@ -353,7 +353,10 @@ public slots:
+ 
+ 	void doMiniCmd()
+ 	{
+-		mCmdManager.open(new MCmdSimpleState(MCMDMUC, tr("Command") + '>'), QStringList() );
++		if(mCmdManager.isActive())
++			mCmdManager.processCommand(QString());
++		else
++			mCmdManager.open(new MCmdSimpleState(MCMDMUC, tr("Command") + '>'), QStringList() );
+ 	}
+ 
+ public:
+@@ -363,11 +366,7 @@ public:
+ 			if (command.count() > 0) cmd = command[0].toLower();
+ 	/*
+ TODO:
+-topic <topic>
+-invite <jid>
+ part [message]
+-kick <jid|nickname> [comment]
+-ban <jid|nickname>
+ 
+ Maybe?:
+ join <channel>{,<channel>}
+@@ -397,6 +396,32 @@ join <channel>{,<channel>} [pass{,<pass>
+ 			} else if(cmd == "sping") {
+ 				doSPing();
+ 				newstate = 0;
++			} else if(cmd == "kick" && command.count() > 1) {
++				command.removeFirst();
++				const QString nick = command.takeFirst().trimmed();
++				QString reason;
++				if(!command.isEmpty()) {
++					reason = command.join(" ");
++				}
++				mucManager->kick(nick, reason);
++			} else if(cmd == "ban" && command.count() > 1) {
++				command.removeFirst();
++				QString nick = command.takeFirst().trimmed();
++				GCUserViewItem *contact = dynamic_cast<GCUserViewItem*>( dlg->ui_.lv_users->findEntry(nick) );
++				if(contact && !contact->s.mucItem().jid().isEmpty()) {
++					nick = contact->s.mucItem().jid().bare();
++				}
++				QString reason;
++				if(!command.isEmpty()) {
++					reason = command.join(" ").trimmed();
++				}
++				mucManager->ban(Jid(nick), reason);
++			} else if(cmd == "invite" && command.count() > 1) {
++				dlg->account()->actionInvite(Jid(command[1].trimmed()), dlg->jid().bare());
++			} else if(cmd == "topic" && command.count() > 1) {
++				command.removeFirst();
++				const QString topic = command.join(" ").trimmed();
++				dlg->setTopic(topic);
+ 			} else if (cmd == "version" && command.count() > 1) {
+ 				QString nick = command[1].trimmed();
+ 				Jid target = dlg->jid().withResource(nick);
+@@ -417,6 +442,8 @@ join <channel>{,<channel>} [pass{,<pass>
+ 				preset = command;
+ 				newstate = oldstate;
+ 				return true;
++			} else if (cmd == "leave") {
++				dlg->close();
+ 			} else if (!cmd.isEmpty()) {
+ 				return false;
+ 			}
+@@ -433,10 +460,21 @@ join <channel>{,<channel>} [pass{,<pass>
+ 		if (state->getName() == MCMDMUC) {
+ 			QString spaceAtEnd = QString(QChar(0));
+ 			if (item == 0) {
+-				all << "clear" + spaceAtEnd << "nick" + spaceAtEnd << "sping" + spaceAtEnd << "version" + spaceAtEnd << "idle" + spaceAtEnd << "quote" + spaceAtEnd;
+-			} else if (item == 1 && (partcommand[0] == "version" || partcommand[0] == "idle")) {
+-				all = dlg->ui_.lv_users->nickList();
++				all << "clear" + spaceAtEnd << "nick" + spaceAtEnd << "kick" + spaceAtEnd << "leave" + spaceAtEnd
++				<< "ban" + spaceAtEnd << "sping" + spaceAtEnd << "version" + spaceAtEnd  << "invite" + spaceAtEnd
++				<< "idle" + spaceAtEnd << "quote" + spaceAtEnd  << "topic" + spaceAtEnd;
++			} else if (item == 1) {
++				if (partcommand[0] == "version" || partcommand[0] == "idle" || partcommand[0] == "kick" || partcommand[0] == "ban") {
++					all = dlg->ui_.lv_users->nickList();
++				} else if (partcommand[0] == "topic") {
++					all << dlg->topic();
++				}
++			} else if (item == 2) {
++				if (partcommand[0] == "kick" || partcommand[0] == "ban") {
++					all << PsiOptions::instance()->getOption("options.muc.reasons").toStringList();
++				}
+ 			}
++
+ 		}
+ 		QStringList res;
+ 		foreach(QString cmd, all) {

psi-plus-main-20141106.tar.xz/patches/1160-psi-action-unregister-in-discodlg.diff Added

@@ -0,0 +1,97 @@
+--- git.orig/src/discodlg.cpp
++++ git/src/discodlg.cpp
+@@ -919,7 +919,7 @@ public: // data
+ 	IconAction *actBrowse, *actBack, *actForward, *actRefresh, *actStop;
+ 
+ 	// custom actions, that will be added to toolbar and context menu
+-	IconAction *actRegister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
++	IconAction *actRegister, *actUnregister, *actSearch, *actJoin, *actAHCommand, *actVCard, *actAdd, *actQueryVersion;
+ 
+ 	typedef QList<History*> HistoryList;
+ 	HistoryList backHistory, forwardHistory;
+@@ -1024,6 +1024,9 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 	actRegister = new IconAction (tr("Register"), "psi/register", tr("&Register"), 0, dlg);
+ 	connect (actRegister, SIGNAL(triggered()), sm, SLOT(map()));
+ 	sm->setMapping(actRegister, Features::FID_Register);
++	actUnregister = new IconAction (tr("Unregister"), "psi/cancel", tr("&Unregister"), 0, dlg);
++	connect (actUnregister, SIGNAL(triggered()), sm, SLOT(map()));
++	sm->setMapping(actUnregister, Features::FID_Gateway);
+ 	actSearch = new IconAction (tr("Search"), "psi/search", tr("&Search"), 0, dlg);
+ 	connect (actSearch, SIGNAL(triggered()), sm, SLOT(map()));
+ 	sm->setMapping(actSearch, Features::FID_Search);
+@@ -1061,6 +1064,7 @@ DiscoDlg::Private::Private(DiscoDlg *par
+ 	// custom actions
+ 	toolBar->addSeparator();
+ 	toolBar->addAction(actRegister);
++	toolBar->addAction(actUnregister);
+ 	toolBar->addAction(actSearch);
+ 	toolBar->addAction(actJoin);
+ 
+@@ -1237,6 +1241,7 @@ void DiscoDlg::Private::enableButtons(co
+ 	// custom actions
+ 	Features f = it.features();
+ 	actRegister->setEnabled( f.canRegister() );
++	actUnregister->setEnabled( f.canRegister() );
+ 	actSearch->setEnabled( f.canSearch() );
+ 	actJoin->setEnabled( f.canGroupchat() );
+ 	actAdd->setEnabled( itemSelected );
+@@ -1364,6 +1369,7 @@ bool DiscoDlg::Private::eventFilter (QOb
+ 			// custom actions
+ 			p.addSeparator();
+ 			actRegister->addTo(&p);
++			actUnregister->addTo(&p);
+ 			actSearch->addTo(&p);
+ 			actJoin->addTo(&p);
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3422,8 +3422,12 @@ void PsiAccount::featureActivated(QStrin
+ 		actionExecuteCommand(jid, node);
+ 	else if ( f.canDisco() )
+ 		actionDisco(jid, node);
+-	else if ( f.isGateway() )
+-		; // TODO
++	else if ( f.isGateway() ) {
++		if(QMessageBox::question(0, tr("Unregister from %1").arg(jid.bare()),
++					 tr("Are you sure?"),
++					 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
++			actionUnregister(jid);
++	}
+ 	else if ( f.haveVCard() )
+ 		actionInfo(jid);
+ 	else if ( f.id() == Features::FID_Add ) {
+@@ -4457,6 +4461,13 @@ void PsiAccount::actionRegister(const Ji
+ 	}
+ }
+ 
++void PsiAccount::actionUnregister(const Jid &j)
++{
++	JT_UnRegister *ju = new JT_UnRegister(d->client->rootTask());
++	ju->unreg(j);
++	ju->go(true);
++}
++
+ void PsiAccount::actionSearch(const Jid &j)
+ {
+ 	if(!checkConnected())
+@@ -4835,9 +4846,7 @@ void PsiAccount::dj_remove(const Jid &j)
+ 
+ 		// if it looks like a transport, unregister (but not if it is the server!!)
+ 		if(u->isTransport() && !Jid(d->client->host()).compare(u->jid())) {
+-			JT_UnRegister *ju = new JT_UnRegister(d->client->rootTask());
+-			ju->unreg(j);
+-			ju->go(true);
++			actionUnregister(j);
+ 		}
+ 	}
+ }
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -363,6 +363,7 @@ public slots:
+ 	void actionGroupsSet(const Jid &, const QStringList &);
+ 	void actionHistoryBox(const PsiEvent::Ptr &e);
+ 	void actionRegister(const Jid &);
++	void actionUnregister(const Jid &);
+ 	void actionSearch(const Jid &);
+ 	void actionManageBookmarks();
+ 	void actionJoin(const Jid& mucJid, const QString& password = QString());

psi-plus-main-20141106.tar.xz/patches/1170-psi-idle-server.diff Added

@@ -0,0 +1,144 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -679,6 +679,7 @@ QLineEdit#le_status_text {
+ 		</p2p>
+ 		<service-discovery>
+ 			<enable-entity-capabilities type="bool">true</enable-entity-capabilities>
++			<last-activity type="bool">true</last-activity>
+ 		</service-discovery>
+ 		<status>
+ 			<ask-for-message-on-offline type="bool">false</ask-for-message-on-offline>
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -320,6 +320,48 @@ bool BlockTransportPopupList::find(const
+ 	return false;
+ }
+ 
++
++//----------------------------------------------------------------------------
++// IdleServer
++//----------------------------------------------------------------------------
++class IdleServer : public XMPP::Task
++{
++	Q_OBJECT
++public:
++	IdleServer(PsiAccount *pa, Task *parent)
++		: Task(parent)
++		, pa_(pa)
++	{
++	}
++
++	~IdleServer()
++	{
++	}
++
++	bool take(const QDomElement &e)
++	{
++		if (e.tagName() != "iq" || e.attribute("type") != "get")
++			return false;
++
++		const QString ns = queryNS(e);
++		if (ns == "jabber:iq:last") {
++			QDomElement iq = createIQ(doc(), "result", e.attribute("from"), e.attribute("id"));
++			QDomElement query = doc()->createElement("query");
++			query.setAttribute("xmlns", ns);
++			iq.appendChild(query);
++			query.setAttribute("seconds", pa_->psi()->idle());
++
++			send(iq);
++			return true;
++		}
++		return false;
++	}
++
++private:
++	PsiAccount *pa_;
++};
++
++
+ //----------------------------------------------------------------------------
+ // PsiAccount
+ //----------------------------------------------------------------------------
+@@ -1201,6 +1243,12 @@ PsiAccount::PsiAccount(const UserAccount
+ 	PluginManager::instance()->addAccount(this, d->client);
+ #endif
+ 
++	//Idle server
++	if(PsiOptions::instance()->getOption("options.service-discovery.last-activity").toBool()) {
++		new IdleServer(this, d->client->rootTask());
++		d->client->addExtension("last-act", QStringList("jabber:iq:last"));
++	}
++
+ 	// HTML
+ 	if(PsiOptions::instance()->getOption("options.html.chat.render").toBool())
+ 		d->client->addExtension("html",Features("http://jabber.org/protocol/xhtml-im"));
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -309,7 +309,7 @@ public:
+ 
+ 	struct IdleSettings
+ 	{
+-		IdleSettings()
++		IdleSettings() : secondsIdle(0)
+ 		{}
+ 
+ 		void update()
+@@ -322,10 +322,13 @@ public:
+ 			notAvailableAfter = o->getOption("options.status.auto-away.not-availible-after").toInt();
+ 			awayAfter = o->getOption("options.status.auto-away.away-after").toInt();
+ 			menuXA = o->getOption("options.ui.menu.status.xa").toBool();
++			useIdleServer = o->getOption("options.service-discovery.last-activity").toBool();
+ 		}
+ 
+ 		bool useOffline, useNotAvailable, useAway, menuXA;
+ 		int offlineAfter, notAvailableAfter, awayAfter;
++		int secondsIdle;
++		bool useIdleServer;
+ 	};
+ 
+ 	IdleSettings idleSettings_;
+@@ -1406,10 +1409,12 @@ void PsiCon::optionChanged(const QString
+ 
+ 	//Idle server
+ 	d->idleSettings_.update();
+-	if(d->idleSettings_.useAway || d->idleSettings_.useNotAvailable || d->idleSettings_.useOffline)
++	if(d->idleSettings_.useAway || d->idleSettings_.useNotAvailable || d->idleSettings_.useOffline || d->idleSettings_.useIdleServer)
+ 		d->idle.start();
+-	else
++	else {
+ 		d->idle.stop();
++		d->idleSettings_.secondsIdle = 0;
++	}
+ 
+ 	if (option == "options.ui.notifications.alert-style") {
+ 		alertIconUpdateAlertStyle();
+@@ -1911,6 +1916,7 @@ void PsiCon::aboutToQuit()
+ 
+ void PsiCon::secondsIdle(int sec)
+ {
++	d->idleSettings_.secondsIdle = sec;
+ 	int minutes = sec / 60;
+ 	PsiAccount::AutoAway aa;
+ 
+@@ -1928,6 +1934,11 @@ void PsiCon::secondsIdle(int sec)
+ 	}
+ }
+ 
++int PsiCon::idle() const
++{
++	return d->idleSettings_.secondsIdle;
++}
++
+ ContactUpdatesManager* PsiCon::contactUpdatesManager() const
+ {
+ 	return contactUpdatesManager_;
+--- git.orig/src/psicon.h
++++ git/src/psicon.h
+@@ -89,6 +89,7 @@ public:
+ 	QWidget *dialogFind(const char *className);
+ 	void dialogRegister(QWidget *w);
+ 	void dialogUnregister(QWidget *w);
++	int idle() const;
+ 
+ 	QMenuBar* defaultMenuBar() const;
+

psi-plus-main-20141106.tar.xz/patches/1180-psi-reasons-in-muc-config-dlg.diff Added

@@ -0,0 +1,74 @@
+--- git.temp.orig/src/mucaffiliationsmodel.cpp
++++ git.temp/src/mucaffiliationsmodel.cpp
+@@ -27,7 +27,7 @@
+ using namespace XMPP;
+ 
+ 
+-MUCAffiliationsModel::MUCAffiliationsModel() : QStandardItemModel(Unknown,1)
++MUCAffiliationsModel::MUCAffiliationsModel() : QStandardItemModel(Unknown,2)
+ {
+ 	QFont font;
+ 	font.setBold(true);
+@@ -37,8 +37,10 @@ MUCAffiliationsModel::MUCAffiliationsMod
+ 		setData(ind,QVariant(affiliationlistindexToString((AffiliationListIndex) i)));
+ 		setData(ind,font_variant,Qt::FontRole);
+ 		insertColumns(0,1,ind);
++		insertColumns(1,1,ind);
+ 		enabled_[(AffiliationListIndex) i] = false;
+ 	}
++	setHorizontalHeaderLabels(QStringList() << tr("JID") << tr("Reason"));
+ }
+ 
+ Qt::ItemFlags MUCAffiliationsModel::flags(const QModelIndex &index) const
+@@ -63,8 +65,12 @@ Qt::DropActions MUCAffiliationsModel::su
+ 
+ bool MUCAffiliationsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int, const QModelIndex &parent)
+ {
+-	if (!data || action != Qt::MoveAction || !(data->hasFormat("application/vnd.text.list") || data->hasFormat("text/plain")))
++	if ( (parent.isValid() && parent.column() != 0)
++		|| !data || action != Qt::MoveAction
++		|| !( data->hasFormat("application/vnd.text.list") || data->hasFormat("text/plain") ) )
++	{
+ 		return false;
++	}
+ 
+ 	// Decode the data
+ 	QStringList newItems;
+@@ -130,7 +136,7 @@ QMimeData* MUCAffiliationsModel::mimeDat
+ 	QByteArray encodedData;
+ 	QDataStream stream(&encodedData, QIODevice::WriteOnly);
+ 	foreach (QModelIndex index, indexes) {
+-		if (index.isValid()) {
++		if (index.isValid() && index.column() == 0) {
+ 			QString text = data(index, Qt::DisplayRole).toString();
+ 			stream << text;
+ 		}
+@@ -220,6 +226,7 @@ void MUCAffiliationsModel::addItems(cons
+ 			}
+ 			insertRows(row,1,list);
+ 			setData(index(row,0,list),QVariant(item.jid().full()));
++			setData(index(row,1,list),QVariant(item.reason()));
+ 			MUCItem i(MUCItem::UnknownRole,item.affiliation());
+ 			i.setJid(item.jid());
+ 			items_ += i;
+--- git.temp.orig/src/mucaffiliationsview.cpp
++++ git.temp/src/mucaffiliationsview.cpp
+@@ -26,11 +26,17 @@
+ MUCAffiliationsView::MUCAffiliationsView(QWidget* parent) : QTreeView(parent)
+ {
+ 	setRootIsDecorated(false);
+-	header()->hide();
++#ifdef HAVE_QT5
++	header()->setSectionResizeMode(QHeaderView::ResizeToContents);
++#else
++	header()->setResizeMode(QHeaderView::ResizeToContents);;
++#endif
++	setItemsExpandable(false);
+ 	setItemsExpandable(false);
+ 	setDragEnabled(true);
+ 	setAcceptDrops(true);
+ 	setDropIndicatorShown(true);
++	setSelectionBehavior(QAbstractItemView::SelectRows);
+ }
+ 
+ void MUCAffiliationsView::removeCurrent()

psi-plus-main-20141106.tar.xz/patches/1190-psi-chat-avatar.diff Added

@@ -0,0 +1,40 @@
+--- git.orig/src/chatdlg.ui
++++ git/src/chatdlg.ui
+@@ -339,6 +339,9 @@
+            <property name="text">
+             <string>Avatar</string>
+            </property>
++           <property name="alignment">
++            <set>Qt::AlignCenter</set>
++           </property>
+           </widget>
+          </item>
+         </layout>
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -757,13 +757,19 @@ void PsiChatDlg::updateAvatar()
+ 			account()->avatarFactory()->getMucAvatar(jid().withResource(res)) :
+ 			account()->avatarFactory()->getAvatar(jid().withResource(res));
+ 	if (p.isNull()) {
+-		ui_.avatar->hide();
+-	}
+-	else {
+-		int size = PsiOptions::instance()->getOption("options.ui.chat.avatars.size").toInt();
+-		ui_.avatar->setPixmap(p.scaled(QSize(size, size), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+-		ui_.avatar->show();
++		if (!PsiOptions::instance()->getOption("options.ui.contactlist.avatars.use-default-avatar").toBool()) {
++			ui_.avatar->hide();
++			return;
++		}
++		p = IconsetFactory::iconPixmap("psi/default_avatar");
+ 	}
++	int optSize = PsiOptions::instance()->getOption("options.ui.chat.avatars.size").toInt();
++	ui_.avatar->setFixedSize(optSize, optSize);
++	int avatarSize = p.width(); //qMax(p.width(), p.height());
++	if (avatarSize > optSize)
++		avatarSize = optSize;
++	ui_.avatar->setPixmap(p.scaled(QSize(avatarSize, avatarSize), Qt::KeepAspectRatio, Qt::SmoothTransformation));
++	ui_.avatar->show();
+ }
+ 
+ void PsiChatDlg::optionsUpdate()

psi-plus-main-20141106.tar.xz/patches/1200-psi-rename-privacy-list.diff Added

@@ -0,0 +1,60 @@
+--- git.temp.orig/src/privacy/privacydlg.cpp
++++ git.temp/src/privacy/privacydlg.cpp
+@@ -59,6 +59,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
+ 
+ 	connect(ui_.pb_newList,SIGNAL(clicked()),SLOT(newList()));
+ 	connect(ui_.pb_deleteList,SIGNAL(clicked()),SLOT(removeList()));
++	connect(ui_.pb_renameList,SIGNAL(clicked()),SLOT(renameList()));
+ 
+ 	connect(ui_.pb_add,SIGNAL(clicked()),SLOT(addRule()));
+ 	connect(ui_.pb_edit,SIGNAL(clicked()),SLOT(editCurrentRule()));
+@@ -357,3 +358,23 @@ void PrivacyDlg::removeList()
+ 	manager_->changeList(model_.list());
+ 	manager_->requestListNames();
+ }
++
++void PrivacyDlg::renameList()
++{
++	QString newName = QInputDialog::getText(this, tr("Rename List"), tr("Input new name"));
++	if(newName.isEmpty()) {
++		return;
++	}
++	PrivacyList tmp = model_.list();
++	model_.list().setName(newName);
++	tmp.clear();
++	manager_->changeList(model_.list());
++	if(ui_.cb_default->currentText() == tmp.name()) {
++		manager_->changeDefaultList(newName);
++	}
++	if(ui_.cb_active->currentText() == tmp.name()) {
++		manager_->changeActiveList(newName);
++	}
++	manager_->changeList(tmp);
++	manager_->requestListNames();
++}
+--- git.temp.orig/src/privacy/privacydlg.h
++++ git.temp/src/privacy/privacydlg.h
+@@ -70,6 +70,7 @@ protected slots:
+ 	void applyList();
+ 	void newList();
+ 	void removeList();
++	void renameList();
+ 
+ private:
+ 	Ui::Privacy ui_;
+--- git.temp.orig/src/privacy/privacy.ui
++++ git.temp/src/privacy/privacy.ui
+@@ -117,6 +117,13 @@
+          </widget>
+         </item>
+         <item>
++         <widget class="QPushButton" name="pb_renameList">
++          <property name="text">
++           <string>Rename List</string>
++          </property>
++         </widget>
++        </item>
++        <item>
+          <widget class="QPushButton" name="pb_deleteList">
+           <property name="text">
+            <string>Delete List</string>

psi-plus-main-20141106.tar.xz/patches/1210-psi-execute-command-in-muc-roster-menu.diff Added

psi-plus-main-20141106.tar.xz/patches/1220-psi-active-contacts-tool-button.diff Added

@@ -0,0 +1,325 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -534,6 +534,7 @@ QLineEdit#le_status_text {
+ 				<show_self type="QKeySequence" comment="Show Self"></show_self>
+ 				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
+ 				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
++				<active_contacts type="QKeySequence" comment="Active contacts"/>
+ 				<status_all type="QKeySequence" comment="Status All"></status_all>
+ 				<status_group type="QKeySequence" comment="Status Group"></status_group>
+ 				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
+--- git.orig/src/activecontactsmenu.cpp
++++ git/src/activecontactsmenu.cpp
+@@ -0,0 +1,70 @@
++/*
++ * activecontactsmenu.cpp
++ * Copyright (C) 2011  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "activecontactsmenu.h"
++#include "psiaccount.h"
++#include "psicontact.h"
++#include "psiiconset.h"
++#include "psicon.h"
++
++
++class ActiveContactAction : public QAction
++{
++	Q_OBJECT
++public:
++	ActiveContactAction(const QString& jid, const QString& nick, const QIcon& icon, PsiAccount* pa, QMenu* parent)
++		: QAction(icon, nick, parent)
++		, pa_(pa)
++		, jid_(jid)
++	{
++		parent->addAction(this);
++		connect(this, SIGNAL(triggered()), SLOT(actionActivated()));
++	}
++
++private slots:
++	void actionActivated()
++	{
++		pa_->actionDefault(Jid(jid_));
++	}
++
++private:
++	PsiAccount* pa_;
++	QString jid_;
++};
++
++
++
++ActiveContactsMenu::ActiveContactsMenu(PsiCon *psi, QWidget *parent)
++	: QMenu(parent)
++	, psi_(psi)
++{
++	foreach(PsiAccount *pa, psi_->contactList()->accounts()) {
++		if(!pa->enabled())
++			continue;
++
++		QList<PsiContact*> list = pa->activeContacts();
++		foreach(PsiContact* pc, list) {
++			new ActiveContactAction(pc->jid().full(), pc->name(), PsiIconset::instance()->statusPtr(pc->jid(), pc->status())->icon(), pa, this);
++		}
++	}
++}
++
++
++#include "activecontactsmenu.moc"
+--- git.orig/src/activecontactsmenu.h
++++ git/src/activecontactsmenu.h
+@@ -0,0 +1,38 @@
++/*
++ * activecontactsmenu.h
++ * Copyright (C) 2011  Khryukin Evgeny
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#ifndef ACTIVECONTACTSMENU_H
++#define ACTIVECONTACTSMENU_H
++
++#include <QMenu>
++
++class PsiCon;
++
++class ActiveContactsMenu : public QMenu
++{
++	Q_OBJECT
++public:
++	ActiveContactsMenu(PsiCon* psi, QWidget* parent);
++
++private:
++	PsiCon* psi_;
++};
++
++#endif
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -74,6 +74,7 @@
+ #include "mooddlg.h"
+ #include "activitydlg.h"
+ #include "geolocationdlg.h"
++#include "activecontactsmenu.h"
+ 
+ #include "mainwin_p.h"
+ 
+@@ -660,6 +661,8 @@ void MainWin::registerAction( IconAction
+ 	} actionlist[] = {
+ 		{ "choose_status", activated, this, SLOT( actChooseStatusActivated() ) },
+ 		{ "reconnect_all", activated, this, SLOT( actReconnectActivated() ) },
++
++		{ "active_contacts",activated, this, SLOT( actActiveContacts() ) },
+ #ifndef NEWCONTACTLIST
+ 		{ "show_offline", toggled, cvlist, SLOT( setShowOffline(bool) ) },
+ 		{ "show_away",    toggled, cvlist, SLOT( setShowAway(bool) ) },
+@@ -1247,6 +1250,14 @@ void MainWin::actSetGeolocActivated()
+ 	}
+ }
+ 
++void MainWin::actActiveContacts()
++{
++	ActiveContactsMenu* acm = new ActiveContactsMenu(d->psi, this);
++	if(!acm->actions().isEmpty())
++		acm->exec(QCursor::pos());
++	delete acm;
++}
++
+ void MainWin::activatedAccOption(PsiAccount* pa, int x)
+ {
+ 	if(x == 0) {
+--- git.orig/src/mainwin.h
++++ git/src/mainwin.h
+@@ -148,6 +148,7 @@ private slots:
+ 	void actSetMoodActivated();
+ 	void actSetActivityActivated();
+ 	void actSetGeolocActivated();
++	void actActiveContacts();
+ 
+ 	bool showDockMenu(const QPoint &);
+ 	void dockActivated();
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -3330,6 +3330,17 @@ QList<ChatDlg*> PsiAccount::findChatDial
+ 	return findDialogs<ChatDlg*>(jid, compareResource);
+ }
+ 
++QList<PsiContact*> PsiAccount::activeContacts() const
++{
++	QList<PsiContact*> ret;
++	foreach(PsiContact *pc, contactList()) {
++		if(pc->isActiveContact()) {
++			ret.append(pc);
++		}
++	}
++	return ret;
++}
++
+ QWidget* PsiAccount::findDialog(const QMetaObject& mo, const Jid& jid, bool compareResource) const
+ {
+ 	return d->findDialog(mo, jid, compareResource);
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -166,6 +166,8 @@ public:
+ 	ChatDlg* findChatDialogEx(const Jid& jid) const;
+ 	QList<ChatDlg*> findChatDialogs(const Jid& jid, bool compareResource = true) const;
+ 
++	QList<PsiContact*> activeContacts() const;
++
+ 	template<typename T>
+ 	inline T findDialog(const Jid& jid = Jid(), bool compareResource = true) const {
+ 		return static_cast<T>(findDialog(((T)0)->staticMetaObject, jid, compareResource));
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -190,9 +190,13 @@ void PsiActionList::Private::createMainW
+ 		IconAction *eventNotifier = new EventNotifierAction(this, "EventNotifierAction");
+ 		eventNotifier->setWhatsThis (tr("Special item that displays number of pending events"));
+ 
++		IconAction *actActiveContacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
++		actActiveContacts->setWhatsThis (tr("Simple way to find contacts with opened chats"));
++
+ 		ActionNames actions[] = {
+ 			{ "button_options", optionsButton },
+ 			{ "button_status",  statusButton  },
++			{ "active_contacts",actActiveContacts},
+ 			{ "event_notifier", eventNotifier },
+ 			{ "", 0 }
+ 		};
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -33,6 +33,7 @@
+ #include "messageview.h"
+ #include "iconselect.h"
+ #include "avatars.h"
++#include "activecontactsmenu.h"
+ #include "psitooltip.h"
+ #include "psioptions.h"
+ #include "coloropt.h"
+@@ -496,6 +497,9 @@ void PsiChatDlg::initToolButtons()
+ 
+ 	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
+ 	act_templates_->setMenu(getTemplateMenu());
++
++	act_active_contacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
++	connect(act_active_contacts, SIGNAL(triggered()), SLOT(actActiveContacts()));
+ }
+ 
+ void PsiChatDlg::initToolBar()
+@@ -524,6 +528,7 @@ void PsiChatDlg::initToolBar()
+ 		ui_.toolbar->addAction(act_voice_);
+ 	}
+ 	ui_.toolbar->addAction(act_add_contact);
++	ui_.toolbar->addAction(act_active_contacts);
+ }
+ 
+ void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
+@@ -681,6 +686,14 @@ void PsiChatDlg::updateJidWidget(const Q
+ 	internal_change = false;
+ }
+ 
++void PsiChatDlg::actActiveContacts()
++{
++	ActiveContactsMenu* acm = new ActiveContactsMenu(account()->psi(), this);
++	if(!acm->actions().isEmpty())
++		acm->exec(QCursor::pos());
++	delete acm;
++}
++
+ void PsiChatDlg::contactUpdated(UserListItem* u, int status, const QString& statusString)
+ {
+ 	Q_UNUSED(statusString);
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -61,6 +61,7 @@ private slots:
+ 	void contactChanged();
+ 	QString makeContactName(const QString &name, const Jid &jid) const;
+ 	void doSwitchJidMode();
++	void actActiveContacts();
+ 
+ private:
+ 	void initToolBar();
+@@ -109,6 +110,7 @@ private:
+ 
+ 	ActionLineEdit *le_autojid;
+ 	IconAction *act_autojid;
++	IconAction *act_active_contacts;
+ 
+ 	MCmdManager mCmdManager_;
+ 	MCmdSimpleSite mCmdSite_;
+--- git.orig/src/psicontact.cpp
++++ git/src/psicontact.cpp
+@@ -540,6 +540,17 @@ bool PsiContact::isAnimated() const
+ }
+ 
+ /**
++ * Returns true if there is opened chat with this contact
++ */
++bool PsiContact::isActiveContact() const
++{
++	if(isConference()) {
++		return false;
++	}
++	return account()->findChatDialog(jid(), isPrivate() ? true : false);
++}
++
++/**
+  * Contact should always be visible if it's alerting.
+  */
+ bool PsiContact::shouldBeVisible() const
+--- git.orig/src/psicontact.h
++++ git/src/psicontact.h
+@@ -66,6 +66,8 @@ public:
+ 
+ 	virtual bool isAnimated() const;
+ 
++	bool isActiveContact() const;
++
+ 	void activate();
+ 
+ 	virtual void setEditing(bool editing);
+--- git.orig/src/src.pri
++++ git/src/src.pri
+@@ -130,6 +130,7 @@ HEADERS += \
+ 	$$PWD/statusdlg.h \
+ 	$$PWD/statuscombobox.h \
+ 	$$PWD/eventdlg.h \
++	$$PWD/activecontactsmenu.h \
+ 	$$PWD/chatdlg.h \
+ 	$$PWD/psichatdlg.h \
+ 	$$PWD/chatsplitter.h \
+@@ -276,6 +277,7 @@ SOURCES += \
+ 	$$PWD/statusdlg.cpp \
+ 	$$PWD/statuscombobox.cpp \
+ 	$$PWD/eventdlg.cpp \
++	$$PWD/activecontactsmenu.cpp \
+ 	$$PWD/chatdlg.cpp \
+ 	$$PWD/psichatdlg.cpp \
+ 	$$PWD/chatsplitter.cpp \

psi-plus-main-20141106.tar.xz/patches/1230-psi-pgp-chat-icons.diff Added

@@ -0,0 +1,204 @@
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -46,6 +46,7 @@ static const char *informationalColorOpt
+ ChatView::ChatView(QWidget *parent)
+ 	: PsiTextView(parent)
+ 	, isMuc_(false)
++	, isEncryptionEnabled_(false)
+ 	, oldTrackBarPosition(0)
+ 	, dialog_(0)
+ {
+@@ -74,12 +75,18 @@ ChatView::ChatView(QWidget *parent)
+ 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
++			logIconReceivePgp = IconsetFactory::iconPixmap("psi/notification_chat_receive_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
++			logIconSendPgp = IconsetFactory::iconPixmap("psi/notification_chat_send_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
++			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 		} else {
+ 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive");
+ 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send");
+ 			logIconDelivered = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok");
++			logIconReceivePgp = IconsetFactory::iconPixmap("psi/notification_chat_receive_pgp");
++			logIconSendPgp = IconsetFactory::iconPixmap("psi/notification_chat_send_pgp");
++			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp");
+ 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time");
+ 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info");
+ 		}
+@@ -109,6 +116,11 @@ void ChatView::setDialog(QWidget* dialog
+ 	dialog_ = dialog;
+ }
+ 
++void ChatView::setEncryptionEnabled(bool enabled)
++{
++	isEncryptionEnabled_ = enabled;
++}
++
+ void ChatView::setSessionData(bool isMuc, const QString &jid, const QString name)
+ {
+ 	isMuc_ = isMuc;
+@@ -149,15 +161,18 @@ void ChatView::addLogIconsResources()
+ {
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_send"), logIconSend);
++	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive_pgp"), logIconReceivePgp);
++	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_send_pgp"), logIconSendPgp);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_time"), logIconTime);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_info"), logIconInfo);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered"), logIconDelivered);
++	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered_pgp"), logIconDeliveredPgp);
+ }
+ 
+ void ChatView::markReceived(QString id)
+ {
+ 	if (useMessageIcons_) {
+-		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + id), logIconDelivered);
++		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + id), isEncryptionEnabled_? logIconDeliveredPgp : logIconDelivered);
+ 		setLineWrapColumnOrWidth(lineWrapColumnOrWidth());
+ 	}
+ }
+@@ -356,11 +371,14 @@ void ChatView::renderMessage(const Messa
+ 	QString timestr = formatTimeStamp(mv.dateTime());
+ 	QString color = colorString(mv.isLocal(), mv.isSpooled());
+ 	if (useMessageIcons_ && mv.isAwaitingReceipt()) {
+-		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()), logIconSend);
++		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()),
++					isEncryptionEnabled_ ? logIconSendPgp : logIconSend);
+ 	}
+-	QString icon = useMessageIcons_?
++	QString icon = useMessageIcons_ ?
+ 		(QString("<img src=\"%1\" />").arg(mv.isLocal()?
+-		(mv.isAwaitingReceipt()?QString("icon:delivery") + mv.messageId():"icon:log_icon_send"):"icon:log_icon_receive")):"";
++		(mv.isAwaitingReceipt() ? QString("icon:delivery") + mv.messageId()
++			: isEncryptionEnabled_ ? "icon:log_icon_send_pgp" : "icon:log_icon_send")
++		: isEncryptionEnabled_ ? "icon:log_icon_receive_pgp" : "icon:log_icon_receive")) : "";
+ 	if (mv.isEmote()) {
+ 		appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
+ 	} else {
+--- git.orig/src/chatview_te.h
++++ git/src/chatview_te.h
+@@ -66,6 +66,8 @@ public slots:
+ 	void scrollUp();
+ 	void scrollDown();
+ 
++	void setEncryptionEnabled(bool enabled);
++
+ protected:
+ 	// override the tab/esc behavior
+ 	bool focusNextPrevChild(bool next);
+@@ -95,6 +97,7 @@ signals:
+ 
+ private:
+ 	bool isMuc_;
++	bool isEncryptionEnabled_;
+ 	QString jid_;
+ 	QString name_;
+ 	int  oldTrackBarPosition;
+@@ -104,6 +107,9 @@ private:
+ 	QPixmap logIconSend;
+ 	QPixmap logIconReceive;
+ 	QPixmap logIconDelivered;
++	QPixmap logIconSendPgp;
++	QPixmap logIconReceivePgp;
++	QPixmap logIconDeliveredPgp;
+ 	QPixmap logIconTime;
+ 	QPixmap logIconInfo;
+ 	QAction *actQuote_;
+--- git.orig/src/chatview_webkit.cpp
++++ git/src/chatview_webkit.cpp
+@@ -148,6 +148,7 @@ ChatView::ChatView(QWidget *parent)
+ 	, sessionReady_(false)
+ 	, dialog_(0)
+ 	, isMuc_(false)
++	, isEncryptionEnabled_(false)
+ {
+ 	jsObject = new ChatViewJSObject(this);
+ 	webView = new WebView(this);
+@@ -191,6 +192,11 @@ void ChatView::init()
+ 	);
+ }
+ 
++void ChatView::setEncryptionEnabled(bool enabled)
++{
++	isEncryptionEnabled_ = enabled;
++}
++
+ void ChatView::embedJsObject()
+ {
+ 	ChatViewTheme *theme = currentTheme();
+@@ -207,6 +213,7 @@ void ChatView::markReceived(QString id)
+ 	QVariantMap m;
+ 	m["type"] = "receipt";
+ 	m["id"] = id;
++	m["encrypted"] = isEncryptionEnabled_;
+ 	sendJsObject(m);
+ }
+ 
+@@ -325,6 +332,7 @@ void ChatView::dispatchMessage(const Mes
+ 	QVariantMap vm = mv.toVariantMap(isMuc_, true);
+ 	vm["mtype"] = vm["type"];
+ 	vm["type"] = "message";
++	vm["encrypted"] = isEncryptionEnabled_;
+ 	sendJsObject(vm);
+ }
+ 
+--- git.orig/src/chatview_webkit.h
++++ git/src/chatview_webkit.h
+@@ -69,6 +69,8 @@ public slots:
+ 	void scrollUp();
+ 	void scrollDown();
+ 
++	void setEncryptionEnabled(bool enabled);
++
+ protected:
+ 	// override the tab/esc behavior
+ 	bool focusNextPrevChild(bool next);
+@@ -100,6 +102,7 @@ private:
+ 	bool sessionReady_;
+ 	QPointer<QWidget> dialog_;
+ 	bool isMuc_;
++	bool isEncryptionEnabled_;
+ 	QString jid_;
+ 	QString name_;
+ 	PsiAccount *account_;
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -807,6 +807,7 @@ void PsiChatDlg::updatePGP()
+ 	ui_.tb_pgp->setVisible(account()->hasPGP() &&
+ 						   !smallChat_ &&
+ 						   !PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool());
++	ui_.log->setEncryptionEnabled(isEncryptionEnabled());
+ }
+ 
+ void PsiChatDlg::doClearButton()
+@@ -836,6 +837,7 @@ void PsiChatDlg::doClearButton()
+ void PsiChatDlg::setPGPEnabled(bool enabled)
+ {
+ 	act_pgp_->setChecked(enabled);
++	ui_.log->setEncryptionEnabled(enabled);
+ }
+ 
+ void PsiChatDlg::toggleSmallChat()
+--- git.orig/themes/chatview/psi/classic/index.html
++++ git/themes/chatview/psi/classic/index.html
+@@ -92,7 +92,7 @@ window[chatServer.jsNamespace()].theme =
+ 				var img = document.getElementById("receipt"+shared.cdata.id);
+ 				if (img) {
+ 					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
+-					img.src = "icon:psi/notification_chat_delivery_ok"+sizeUri;
++					img.src = (shared.cdata.encrypted?"icon:psi/notification_chat_delivery_ok_pgp":"icon:psi/notification_chat_delivery_ok")+sizeUri;
+ 				}
+ 			}
+ 			if (shared.cdata.mtype == "message") {
+@@ -132,6 +132,9 @@ window[chatServer.jsNamespace()].theme =
+ 							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
+ 								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
+ 								: "psi/notification_chat_receive";
++							if(shared.cdata.encrypted) {
++								icon += "_pgp"
++							}
+ 							break;
+ 						case "system":
+ 						case "subject":

psi-plus-main-20141106.tar.xz/patches/1240-psi-fix-groupchat-options.diff Added

@@ -0,0 +1,53 @@
+--- git.temp.orig/src/options/opt_groupchat.cpp
++++ git.temp/src/options/opt_groupchat.cpp
+@@ -54,6 +54,10 @@ QWidget *OptionsTabGroupchat::widget()
+ 	connect(d->pb_addNickColor,	   SIGNAL(clicked()), SLOT(addGCNickColor()));
+ 	connect(d->pb_removeNickColor,	   SIGNAL(clicked()), SLOT(removeGCNickColor()));
+ 
++	connect(d->ck_gcHashNickColoring, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
++	connect(d->ck_gcNickColoring, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
++	connect(d->ck_gcHighlights, SIGNAL(toggled(bool)), SLOT(updateWidgetsState()));
++
+ 	// TODO: add QWhatsThis for all controls on widget
+ 
+ 	return w;
+@@ -112,6 +116,29 @@ void OptionsTabGroupchat::restoreOptions
+ 	d->le_newNickColor->setText("#FFFFFF");
+ }
+ 
++void OptionsTabGroupchat::updateWidgetsState()
++{
++	GeneralGroupchatUI *d = (GeneralGroupchatUI *)w;
++
++	{
++		bool enableHighlights = d->ck_gcHighlights->isChecked();
++		d->lw_highlightWords->setEnabled(enableHighlights);
++		d->le_newHighlightWord->setEnabled(enableHighlights);
++		d->pb_addHighlightWord->setEnabled(enableHighlights);
++		d->pb_removeHighlightWord->setEnabled(enableHighlights);
++	}
++
++	{
++		bool enableNickColors = d->ck_gcNickColoring->isChecked() && !d->ck_gcHashNickColoring->isChecked();
++		d->ck_gcNickColoring->setEnabled(!d->ck_gcHashNickColoring->isChecked());
++		d->lw_nickColors->setEnabled(enableNickColors);
++		d->le_newNickColor->setEnabled(enableNickColors);
++		d->pb_addNickColor->setEnabled(enableNickColors);
++		d->pb_removeNickColor->setEnabled(enableNickColors);
++		d->pb_nickColor->setEnabled(enableNickColors);
++	}
++}
++
+ static QPixmap name2color(QString name)
+ {
+ 	QColor c(name);
+--- git.temp.orig/src/options/opt_groupchat.h
++++ git.temp/src/options/opt_groupchat.h
+@@ -28,6 +28,7 @@ private slots:
+ 	void chooseGCNickColor();
+ 	void displayGCNickColor();
+ 	void selectedGCNickColor(QListWidgetItem *item);
++	void updateWidgetsState();
+ 
+ private:
+ 	QWidget *w, *dlg;

psi-plus-main-20141106.tar.xz/patches/1250-psi-autostart-pgp.diff Added

@@ -0,0 +1,102 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -63,6 +63,7 @@
+ 		<pgp comment="PGP encryption options">
+ 			<enable comment="Enable PGP globally" type="bool">true</enable>
+ 			<auto-assign comment="Automatically assign known keys to contacts with signed presences and no assigned keys" type="bool">true</auto-assign>
++			<auto-start comment="Automatically enable PGP encryption" type="bool">false</auto-start>
+ 		</pgp>
+ 		<ui comment="User interface options">
+ 			<account comment="Account options">
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -171,7 +171,7 @@ private:
+ 
+ 
+ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
+-		: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_)
++	: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_), autoPGP_(true)
+ {
+ 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
+ 	connect(account(), SIGNAL(addedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
+@@ -482,6 +482,7 @@ void PsiChatDlg::initToolButtons()
+ 
+ 	act_pgp_ = new IconAction(tr("Toggle Encryption"), "", tr("Toggle Encryption"), 0, this, 0, true);
+ 	ui_.tb_pgp->setDefaultAction(act_pgp_);
++	connect(act_pgp_, SIGNAL(triggered(bool)), SLOT(actPgpToggled(bool)));
+ 
+ 	act_info_ = new IconAction(tr("User Info"), "psi/vCard", tr("User Info"), 0, this);
+ 	connect(act_info_, SIGNAL(triggered()), SLOT(doInfo()));
+@@ -800,16 +801,44 @@ void PsiChatDlg::updatePGP()
+ 		act_pgp_->setEnabled(true);
+ 	}
+ 	else {
+-		act_pgp_->setChecked(false);
++		setPGPEnabled(false);
+ 		act_pgp_->setEnabled(false);
+ 	}
+ 
++	checkPGPAutostart();
++
+ 	ui_.tb_pgp->setVisible(account()->hasPGP() &&
+ 						   !smallChat_ &&
+ 						   !PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool());
+ 	ui_.log->setEncryptionEnabled(isEncryptionEnabled());
+ }
+ 
++void PsiChatDlg::checkPGPAutostart()
++{
++	if(account()->hasPGP() && autoPGP_ && PsiOptions::instance()->getOption("options.pgp.auto-start").toBool()) {
++		UserListItem *item = account()->findFirstRelevant(jid());
++		if(item && !item->publicKeyID().isEmpty()) {
++			if(!jid().resource().isEmpty()) {
++				UserResourceList::Iterator rit = item->userResourceList().find(jid().resource());
++				if(rit !=item->userResourceList().end()) {
++					UserResource r = *rit;
++					if(r.pgpVerifyStatus() != 0) {
++						setPGPEnabled(false);
++						return;
++					}
++				}
++			}
++			setPGPEnabled(true);
++		}
++	}
++}
++
++void PsiChatDlg::actPgpToggled(bool b)
++{
++	autoPGP_ = false;
++	ui_.log->setEncryptionEnabled(b);
++}
++
+ void PsiChatDlg::doClearButton()
+ {
+ 	if (PsiOptions::instance()->getOption("options.ui.chat.warn-before-clear").toBool()) {
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -62,6 +62,7 @@ private slots:
+ 	QString makeContactName(const QString &name, const Jid &jid) const;
+ 	void doSwitchJidMode();
+ 	void actActiveContacts();
++	void actPgpToggled(bool);
+ 
+ private:
+ 	void initToolBar();
+@@ -76,6 +77,7 @@ private:
+ 	void updateAvatar();
+ 	void optionsUpdate();
+ 	void updatePGP();
++	void checkPGPAutostart();
+ 	void setPGPEnabled(bool enabled);
+ 	void activated();
+ 	void setLooks();
+@@ -130,6 +132,8 @@ private:
+ 
+ 	int logHeight;
+ 	int chateditHeight;
++
++	bool autoPGP_;
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/1260-psi-fix-trackbar.diff Added

@@ -0,0 +1,108 @@
+--- git.temp.orig/src/tabs/tabbablewidget.cpp
++++ git.temp/src/tabs/tabbablewidget.cpp
+@@ -37,10 +37,15 @@
+ 
+ TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabManager)
+ 	: AdvancedWidget<QWidget>(0)
++	, state_(Deactivated)
+ 	, jid_(jid)
+ 	, pa_(pa)
+ 	, tabManager_(tabManager)
+ {
++	stateCommitTimer_.setInterval(100);
++	stateCommitTimer_.setSingleShot(true);
++	connect(&stateCommitTimer_, SIGNAL(timeout()), SLOT(commitState()));
++
+ 	if (TabbableWidget::chatsCount == 0) {
+ 		TabbableWidget::templateMenu = new SendButtonTemplatesMenu(NULL);
+ 		TabbableWidget::templateMenu->setParams(false);
+@@ -247,11 +252,22 @@ void TabbableWidget::changeEvent(QEvent*
+ 	    event->type() == QEvent::WindowStateChange)
+ 	{
+ 		if (isActiveTab()) {
+-			activated();
++			state_ = Activated;
+ 		}
+ 		else {
+-			deactivated();
++			state_ = Deactivated;
+ 		}
++		stateCommitTimer_.start();
++	}
++}
++
++void TabbableWidget::commitState()
++{
++	if(state_ == Activated) {
++		activated();
++	}
++	else {
++		deactivated();
+ 	}
+ }
+ 
+--- git.temp.orig/src/tabs/tabbablewidget.h
++++ git.temp/src/tabs/tabbablewidget.h
+@@ -22,6 +22,7 @@
+ #define TABBABLE_H
+ 
+ #include <QIcon>
++#include <QTimer>
+ #include "advwidget.h"
+ #include "im.h" // ChatState
+ #include "sendbuttonmenu.h"
+@@ -83,19 +84,26 @@ signals:
+ 	void vSplitterMoved(int,int);
+ 
+ public slots:
+-	virtual void deactivated();
+-	virtual void activated();
+ 	void bringToFront(bool raiseWindow = true);
+ 	virtual void ensureTabbedCorrectly();
+ 	void hideTab();
+ 
+ protected:
+ 	virtual void setJid(const Jid&);
++	virtual void deactivated();
++	virtual void activated();
+ 
+ 	// reimplemented
+ 	void changeEvent(QEvent* e);
+ 
++private slots:
++	void commitState();
++
+ private:
++	enum ActivationState { Activated, Deactivated };
++	ActivationState state_;
++	QTimer stateCommitTimer_;
++
+ 	Jid jid_;
+ 	PsiAccount *pa_;
+ 	TabManager *tabManager_;
+--- git.temp.orig/src/tabs/tabdlg.cpp
++++ git.temp/src/tabs/tabdlg.cpp
+@@ -397,12 +397,12 @@ void TabDlg::tabSelected(QWidget* _selec
+ 	// _selected could be null when TabDlg is closing and deleting all its tabs
+ 	TabbableWidget* selected = _selected ? qobject_cast<TabbableWidget*>(_selected) : 0;
+ 	if (!selectedTab_.isNull()) {
+-		selectedTab_->deactivated();
++		QCoreApplication::postEvent(selectedTab_, new QEvent(QEvent::ActivationChange));
+ 	}
+ 
+ 	selectedTab_ = selected;
+ 	if (selected) {
+-		selected->activated();
++		QCoreApplication::postEvent(selected, new QEvent(QEvent::ActivationChange));
+ 	}
+ 
+ 	updateCaption();
+@@ -520,7 +520,7 @@ void TabDlg::closeTab(TabbableWidget* ch
+ 	chat->hide();
+ 	removeTabWithNoChecks(chat);
+ 	chat->setParent(0);
+-	chat->deactivated();
++	QCoreApplication::postEvent(chat, new QEvent(QEvent::ActivationChange));
+ 	if (tabWidget_->count() > 0) {
+ 		updateCaption();
+ 	}

psi-plus-main-20141106.tar.xz/patches/1270-psi-muc-avatars-at-popups.diff Added

@@ -0,0 +1,62 @@
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -1728,7 +1728,9 @@ void GCMainDlg::message(const Message &_
+ 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
+ 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
+ 				MessageEvent::Ptr e(new MessageEvent(m, account()));
+-				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), 0, e);
++				UserListItem i;
++				i.setPrivate(true);
++				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), &i, e);
+ 			}
+ 		}
+ 	}
+--- git.orig/src/psidbusnotifier.cpp
++++ git/src/psidbusnotifier.cpp
+@@ -206,7 +206,11 @@ void PsiDBusNotifier::popup(PsiAccount*
+ //	}
+ 	QImage im;
+ 	if(account) {
+-		im = account->avatarFactory()->getAvatar(jid.bare()).toImage();
++		if(uli && uli->isPrivate())
++			im = account->avatarFactory()->getMucAvatar(jid).toImage();
++		else
++			im = account->avatarFactory()->getAvatar(jid).toImage();
++
+ 		if(!im.isNull()) {
+ 			int size = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.avatar-size").toInt();
+ 			im = im.scaledToWidth(size, Qt::SmoothTransformation);
+--- git.orig/src/psigrowlnotifier.cpp
++++ git/src/psigrowlnotifier.cpp
+@@ -126,8 +126,12 @@ void PsiGrowlNotifier::popup(PsiAccount*
+ 		if (((int)statusMsg.length()) > len)
+ 			statusMsg = statusMsg.left(len) + "...";
+ 	QPixmap icon;
+-	if(account)
+-		icon = account->avatarFactory()->getAvatar(jid.bare());
++	if(account) {
++		if(uli && uli->isPrivate())
++			icon = account->avatarFactory()->getMucAvatar(jid);
++		else
++			icon = account->avatarFactory()->getAvatar(jid);
++	}
+ 
+ 	if (uli) {
+ 		contact = uli->name();
+--- git.orig/src/psipopup.cpp
++++ git/src/psipopup.cpp
+@@ -330,7 +330,13 @@ void PsiPopup::setData(const Jid &j, con
+ 			}
+ 		}
+ 	}
+-	QPixmap avatar = d->account->avatarFactory()->getAvatar(jid);
++	QPixmap avatar;
++	if(d->account) {
++		if(u && u->isPrivate())
++			avatar = d->account->avatarFactory()->getMucAvatar(j);
++		else
++			avatar = d->account->avatarFactory()->getAvatar(j);
++	}
+ 	// show popup
+ 	if ( d->popupType != PopupManager::AlertComposing && d->popupType != PopupManager::AlertHeadline &&
+ 	     (d->popupType != PopupManager::AlertFile || !PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool()) )

psi-plus-main-20141106.tar.xz/patches/1280-psi-ignoring-global-statuses.diff Added

@@ -0,0 +1,152 @@
+--- git.orig/src/accountstatusmenu.cpp
++++ git/src/accountstatusmenu.cpp
+@@ -30,4 +30,18 @@ void AccountStatusMenu::fill()
+ {
+ 	StatusMenu::fill();
+ 	statusChanged(account->status());
++	addIgnoreGlobalActions();
+ }
++
++void AccountStatusMenu::addIgnoreGlobalActions()
++{
++	QAction *blockAction = new IconAction(tr("Ignore global actions"), this, "psi/ignore_global_actions");
++	blockAction->setCheckable(true);
++	blockAction->setChecked(account->accountOptions().ignore_global_actions);
++	blockAction->setToolTip(tr("Ignore all global actions for this account. For example, autostatus, mood, activity etc."));
++	connect(blockAction, SIGNAL(triggered(bool)), account, SLOT(actionSetBlock(bool)));
++	addSeparator();
++	addAction(blockAction);
++
++}
++
+--- git.orig/src/accountstatusmenu.h
++++ git/src/accountstatusmenu.h
+@@ -20,6 +20,9 @@ protected:
+ 	void addChoose();
+ 	void addReconnect();
+ 
++private:
++	void addIgnoreGlobalActions();
++
+ private slots:
+ 	void chooseStatusActivated();
+ 
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -1200,7 +1200,7 @@ void MainWin::actSetMoodActivated()
+ {
+ 	QList<PsiAccount*> l;
+ 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
+-		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
+ 			l.append(pa);
+ 	}
+ 	if(l.isEmpty())
+@@ -1218,7 +1218,7 @@ void MainWin::actSetActivityActivated()
+ {
+ 	QList<PsiAccount*> l;
+ 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
+-		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
+ 			l.append(pa);
+ 	}
+ 	if(l.isEmpty())
+@@ -1236,7 +1236,7 @@ void MainWin::actSetGeolocActivated()
+ {
+ 	QList<PsiAccount*> l;
+ 	foreach(PsiAccount *pa, d->psi->contactList()->accounts()) {
+-		if(pa->isActive() && pa->serverInfoManager()->hasPEP())
++		if(pa->isActive() && pa->serverInfoManager()->hasPEP() && !pa->accountOptions().ignore_global_actions)
+ 			l.append(pa);
+ 	}
+ 	if(l.isEmpty())
+--- git.orig/src/profiles.h
++++ git/src/profiles.h
+@@ -63,7 +63,7 @@ public:
+ 	XMPP::ClientStream::AllowPlainType allow_plain;
+ 	bool req_mutual_auth;
+ 	bool legacy_ssl_probe;
+-	bool opt_automatic_resource, priority_dep_on_status;
++	bool opt_automatic_resource, priority_dep_on_status, ignore_global_actions;
+ 	int security_level;
+ 	enum SSLFlag { SSL_No = 0, SSL_Yes = 1, SSL_Auto = 2, SSL_Legacy = 3 } ssl;
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -4090,6 +4090,11 @@ void PsiAccount::actionExecuteCommandSpe
+ 	}
+ }
+ 
++void PsiAccount::actionSetBlock(bool blocked)
++{
++	d->acc.ignore_global_actions = blocked;
++}
++
+ void PsiAccount::actionSetMood()
+ {
+ 	QList<PsiAccount*> list;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -377,6 +377,7 @@ public slots:
+ 	void actionSendFiles(const Jid &, const QStringList&);
+ 	void actionExecuteCommand(const Jid& j, const QString& = QString());
+ 	void actionExecuteCommandSpecific(const Jid&, const QString& = QString());
++	void actionSetBlock(bool);
+ 	void actionSetMood();
+ 	void actionSetActivity();
+ 	void actionSetGeoLocation();
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -1179,7 +1179,7 @@ void PsiCon::setGlobalStatus(const Statu
+ 
+ 	// globally set each account which is logged in
+ 	foreach(PsiAccount* account, d->contactList->enabledAccounts())
+-		if (allOffline || account->isActive())
++		if ((allOffline || account->isActive()) && (!account->accountOptions().ignore_global_actions || s.type() == Status::Offline))
+ 			account->setStatus(s, withPriority, isManualStatus);
+ 
+ 	emit statusMessageChanged(s.status());
+@@ -1930,6 +1930,9 @@ void PsiCon::secondsIdle(int sec)
+ 		aa = PsiAccount::AutoAway_None;
+ 
+ 	foreach(PsiAccount* pa, d->contactList->enabledAccounts()) {
++		if(pa->accountOptions().ignore_global_actions)
++			continue;
++
+ 		pa->setAutoAwayStatus(aa);
+ 	}
+ }
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -133,6 +133,7 @@ void UserAccount::reset()
+ 	host = "";
+ 	opt_automatic_resource = false;
+ 	priority_dep_on_status = true;
++	ignore_global_actions = false;
+ 	resource = ApplicationInfo::name();
+ 	priority = 55;
+ 	ibbOnly = false;
+@@ -184,6 +185,7 @@ void UserAccount::fromOptions(OptionsTre
+ 	legacy_ssl_probe = o->getOption(base + ".legacy-ssl-probe").toBool();
+ 	opt_automatic_resource = o->getOption(base + ".automatic-resource").toBool();
+ 	priority_dep_on_status = o->getOption(base + ".priority-depends-on-status").toBool();
++	ignore_global_actions = o->getOption(base + ".ignore-global-actions").toBool();
+ 	opt_log = o->getOption(base + ".log").toBool();
+ 	opt_reconn = o->getOption(base + ".reconn").toBool();
+ 	opt_ignoreSSLWarnings = o->getOption(base + ".ignore-SSL-warnings").toBool();
+@@ -350,6 +352,7 @@ void UserAccount::toOptions(OptionsTree
+ 	o->setOption(base + ".legacy-ssl-probe", legacy_ssl_probe);
+ 	o->setOption(base + ".automatic-resource", opt_automatic_resource);
+ 	o->setOption(base + ".priority-depends-on-status", priority_dep_on_status);
++	o->setOption(base + ".ignore-global-actions", ignore_global_actions);
+ 	o->setOption(base + ".log", opt_log);
+ 	o->setOption(base + ".reconn", opt_reconn);
+ 	o->setOption(base + ".connect-after-sleep", opt_connectAfterSleep);
+@@ -499,6 +502,7 @@ void UserAccount::fromXml(const QDomElem
+ 	//readBoolAttribute(a, "gpg", &opt_gpg);
+ 	readBoolAttribute(a, "automatic-resource", &opt_automatic_resource);
+ 	readBoolAttribute(a, "priority-depends-on-status", &priority_dep_on_status);
++	readBoolAttribute(a, "ignore-global-actions", &ignore_global_actions);
+ 
+ 	// Will be overwritten if there is a new option
+ 	bool opt_plain = false;

psi-plus-main-20141106.tar.xz/patches/1290-psi-multilang-spelling-for-aspell.diff Added

@@ -0,0 +1,238 @@
+--- psi.orig/options/default.xml
++++ psi/options/default.xml
+@@ -334,6 +334,7 @@ QLineEdit#le_status_text {
+ 			</show-deprecated>
+ 			<spell-check comment="Options related to the spell checker">
+ 				<enabled comment="Whether the spell checker is enabled" type="bool">true</enabled>
++				<langs type="QString"></langs>
+ 			</spell-check>
+ 			<disable-send-button type="bool">true</disable-send-button>
+ 			<systemtray comment="Options related to the system tray">
+--- psi.orig/src/libpsi/tools/spellchecker/aspellchecker.cpp
++++ psi/src/libpsi/tools/spellchecker/aspellchecker.cpp
+@@ -33,23 +33,15 @@
+ #include "aspellchecker.h"
+ 
+ ASpellChecker::ASpellChecker()
++	: config_(new_aspell_config())
+ {
+-	config_ = NULL;
+-	speller_ = NULL;
+-	config_ = new_aspell_config();
+ 	aspell_config_replace(config_, "encoding", "utf-8");
+ #ifdef Q_OS_WIN
+ 	aspell_config_replace(config_, "conf-dir", QDir::homePath().toLocal8Bit().data());
+ 	aspell_config_replace(config_, "data-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
+ 	aspell_config_replace(config_, "dict-dir", QString("%1/aspell").arg(QCoreApplication::applicationDirPath()).toLocal8Bit().data());
+ #endif
+-	AspellCanHaveError* ret = new_aspell_speller(config_);
+-	if (aspell_error_number(ret) == 0) {
+-		speller_ = to_aspell_speller(ret);
+-	}
+-	else {
+-		qWarning() << QString("Aspell error: %1").arg(aspell_error_message(ret));
+-	}
++	setActiveLanguages(getAllLanguages());
+ }
+ 
+ ASpellChecker::~ASpellChecker()
+@@ -59,30 +51,33 @@ ASpellChecker::~ASpellChecker()
+ 		config_ = NULL;
+ 	}
+ 
+-	if(speller_) {
+-		delete_aspell_speller(speller_);
+-		speller_ = NULL;
+-	}
++	clearSpellers();
+ }
+ 
+ bool ASpellChecker::isCorrect(const QString& word)
+ {
+-	if(speller_) {
+-		int correct = aspell_speller_check(speller_, word.toUtf8().constData(), -1);
+-		return (correct != 0);
++	if(spellers_.isEmpty())
++		return true;
++
++	foreach(AspellSpeller* speller, spellers_) {
++		if (aspell_speller_check(speller, word.toUtf8().constData(), -1) != 0)
++			return true;
+ 	}
+-	return true;
++	return false;
+ }
+ 
+ QList<QString> ASpellChecker::suggestions(const QString& word)
+ {
+ 	QList<QString> words;
+-	if (speller_) {
+-		const AspellWordList* list = aspell_speller_suggest(speller_, word.toUtf8(), -1);
++
++	foreach(AspellSpeller* speller, spellers_) {
++		const AspellWordList* list = aspell_speller_suggest(speller, word.toUtf8(), -1);
+ 		AspellStringEnumeration* elements = aspell_word_list_elements(list);
+ 		const char *c_word;
+ 		while ((c_word = aspell_string_enumeration_next(elements)) != NULL) {
+-			words += QString::fromUtf8(c_word);
++			QString suggestion = QString::fromUtf8(c_word);
++			if(suggestion.size() > 2)
++				words.append(suggestion);
+ 		}
+ 		delete_aspell_string_enumeration(elements);
+ 	}
+@@ -92,11 +87,11 @@ QList<QString> ASpellChecker::suggestion
+ bool ASpellChecker::add(const QString& word)
+ {
+ 	bool result = false;
+-	if (config_ && speller_) {
++	if (config_ && !spellers_.empty()) {
+ 		QString trimmed_word = word.trimmed();
+ 		if(!word.isEmpty()) {
+-			aspell_speller_add_to_personal(speller_, trimmed_word.toUtf8(), trimmed_word.toUtf8().length());
+-			aspell_speller_save_all_word_lists(speller_);
++			aspell_speller_add_to_personal(spellers_.first(), trimmed_word.toUtf8(), trimmed_word.toUtf8().length());
++			aspell_speller_save_all_word_lists(spellers_.first());
+ 			result = true;
+ 		}
+ 	}
+@@ -105,10 +100,63 @@ bool ASpellChecker::add(const QString& w
+ 
+ bool ASpellChecker::available() const
+ {
+-	return (speller_ != NULL);
++	return !spellers_.isEmpty();
+ }
+ 
+ bool ASpellChecker::writable() const
+ {
+ 	return false;
+ }
++
++QList<QString> ASpellChecker::getAllLanguages() const
++{
++	QList<QString> langs;
++
++	AspellDictInfoList* dict_info_list = get_aspell_dict_info_list(config_);
++
++	if (!aspell_dict_info_list_empty(dict_info_list))
++	{
++		AspellDictInfoEnumeration* dict_info_enum = aspell_dict_info_list_elements(dict_info_list);
++
++		while (!aspell_dict_info_enumeration_at_end(dict_info_enum)) {
++			const AspellDictInfo* dict_info = aspell_dict_info_enumeration_next(dict_info_enum);
++			QString lang(dict_info -> code);
++			if (lang.contains('_'))
++				lang.truncate(lang.indexOf('_'));
++			if (!langs.contains(lang)) {
++				langs.append(lang);
++			}
++		}
++
++		delete_aspell_dict_info_enumeration(dict_info_enum);
++	}
++
++	return langs;
++}
++
++void ASpellChecker::setActiveLanguages(const QList<QString>& langs)
++{
++	clearSpellers();
++
++	foreach(const QString& lang, langs)
++	{
++		AspellConfig* conf = aspell_config_clone(config_);
++		aspell_config_replace(conf, "lang", lang.toUtf8().constData());
++		AspellCanHaveError* ret = new_aspell_speller(conf);
++		if (aspell_error_number(ret) == 0) {
++			spellers_.append(to_aspell_speller(ret));
++		}
++		else {
++			qDebug() << QString("Aspell error: %1").arg(aspell_error_message(ret));
++		}
++		delete_aspell_config(conf);
++	}
++}
++
++void ASpellChecker::clearSpellers()
++{
++	foreach(AspellSpeller* speller, spellers_)
++		delete_aspell_speller(speller);
++
++	spellers_.clear();
++}
+--- psi.orig/src/libpsi/tools/spellchecker/aspellchecker.h
++++ psi/src/libpsi/tools/spellchecker/aspellchecker.h
+@@ -46,9 +46,17 @@ public:
+ 	virtual bool available() const;
+ 	virtual bool writable() const;
+ 
++	virtual void setActiveLanguages(const QList<QString>& langs);
++	virtual QList<QString> getAllLanguages() const;
++
++private:
++	void clearSpellers();
++
+ private:
+ 	AspellConfig* config_;
+-	AspellSpeller* speller_;
++
++	typedef QList<AspellSpeller*> ASpellers;
++	ASpellers spellers_;
+ };
+ 
+ #endif
+--- psi.orig/src/libpsi/tools/spellchecker/spellchecker.h
++++ psi/src/libpsi/tools/spellchecker/spellchecker.h
+@@ -41,6 +41,9 @@ public:
+ 	virtual bool isCorrect(const QString&);
+ 	virtual bool add(const QString&);
+ 
++	virtual void setActiveLanguages(const QList<QString>& ) {}
++	virtual QList<QString> getAllLanguages() const { return QList<QString>(); }
++
+ protected:
+ 	SpellChecker();
+ 	virtual ~SpellChecker();
+--- psi.orig/src/psicon.cpp
++++ psi/src/psicon.cpp
+@@ -81,6 +81,7 @@
+ #include "accountscombobox.h"
+ #include "tabdlg.h"
+ #include "chatdlg.h"
++#include "spellchecker/aspellchecker.h"
+ #ifdef WEBKIT
+ #include "avatars.h"
+ #include "chatviewthemeprovider.h"
+@@ -735,6 +736,9 @@ bool PsiCon::init()
+ 	optionChanged(tuneUrlFilterOptionPath);
+ #endif
+ 
++	//init spellchecker
++	optionChanged("options.ui.spell-check.langs");
++
+ 	return result;
+ }
+ 
+@@ -1438,6 +1442,21 @@ void PsiCon::optionChanged(const QString
+ 		return;
+ 	}
+ 
++	if (option == "options.ui.spell-check.langs") {
++		QStringList langs = PsiOptions::instance()->getOption(option).toString().split(QRegExp("\\s+"), QString::SkipEmptyParts);
++		if(langs.isEmpty()) {
++			langs = SpellChecker::instance()->getAllLanguages();
++			QString lang_env = getenv("LANG");
++			if(!lang_env.isEmpty()) {
++				lang_env = lang_env.split("_").first();
++				if(langs.contains(lang_env, Qt::CaseInsensitive))
++					langs = QStringList(lang_env);
++			}
++		}
++		SpellChecker::instance()->setActiveLanguages(langs);
++		return;
++	}
++
+ #ifdef USE_PEP
+ 	if (option == tuneUrlFilterOptionPath || option == tuneTitleFilterOptionPath) {
+ 		d->tuneManager->setTuneFilters(PsiOptions::instance()->getOption(tuneUrlFilterOptionPath).toString().split(QRegExp("\\W+")),

psi-plus-main-20141106.tar.xz/patches/1300-psi-chat-not-in-list-fix.diff Added

@@ -0,0 +1,29 @@
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -4270,7 +4270,7 @@ void PsiAccount::actionHistoryBox(const
+ 
+ void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
+ {
+-	UserListItem *u = find(j);
++	UserListItem *u = (findGCContact(j)) ? find(j) : find(j.bare());
+ 	if(!u) {
+ 		qWarning("[%s] not in userlist\n", qPrintable(j.full()));
+ 		return;
+@@ -4278,7 +4278,7 @@ void PsiAccount::actionOpenChat(const Ji
+ 
+ 	// if 'j' is bare, we might want to switch to a specific resource
+ 	QString res;
+-	if(u && j.resource().isEmpty()) {
++	if(j.resource().isEmpty()) {
+ 		// first, are there any queued chats?
+ 		/*PsiEvent *e = d->eventQueue->peekFirstChat(j, false);
+ 		if(e) {
+@@ -4616,7 +4616,7 @@ void PsiAccount::openUri(const QUrl &uri
+ 		QString body = uri.queryItemValue("body");
+ 		QString type = uri.queryItemValue("type");
+ 		if (type == "chat" && subject.isEmpty()) {
+-			if (!find(entity)) {
++			if (!find(entity.bare())) {
+ 				addUserListItem(entity);
+ 			}
+ 			actionOpenChat(entity, body);

psi-plus-main-20141106.tar.xz/patches/1310-psi-dont-spellcheck-digits.diff Added

@@ -0,0 +1,29 @@
+--- git.temp.orig/src/libpsi/tools/spellchecker/spellhighlighter.cpp
++++ git.temp/src/libpsi/tools/spellchecker/spellhighlighter.cpp
+@@ -21,12 +21,14 @@ void SpellHighlighter::highlightBlock(co
+ 
+ 	// Match words (minimally)
+ 	QRegExp expression("\\b\\w+\\b");
++	QRegExp digit("\\d+");
+ 
+ 	// Iterate through all words
+ 	int index = text.indexOf(expression);
+ 	while (index >= 0) {
+ 		int length = expression.matchedLength();
+-		if (!SpellChecker::instance()->isCorrect(expression.cap()))
++		QString word = expression.cap();
++		if (!digit.exactMatch(word) && !SpellChecker::instance()->isCorrect(word))
+ 			setFormat(index, length, tcf);
+ 		index = text.indexOf(expression, index + length);
+ 	}
+--- git.temp.orig/src/msgmle.cpp
++++ git.temp/src/msgmle.cpp
+@@ -348,7 +348,7 @@ void ChatEdit::contextMenuEvent(QContext
+ 		tc.movePosition(QTextCursor::StartOfWord, QTextCursor::MoveAnchor);
+ 		tc.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+ 		QString selected_word = tc.selectedText();
+-		if (!selected_word.isEmpty() && !SpellChecker::instance()->isCorrect(selected_word)) {
++		if (!selected_word.isEmpty() && !QRegExp("\\d+").exactMatch(selected_word) && !SpellChecker::instance()->isCorrect(selected_word)) {
+ 			QList<QString> suggestions = SpellChecker::instance()->suggestions(selected_word);
+ 			if (!suggestions.isEmpty() || SpellChecker::instance()->writable()) {
+ 				QMenu spell_menu;

psi-plus-main-20141106.tar.xz/patches/1320-psi-fix-online-contacts-count-update.diff Added

@@ -0,0 +1,45 @@
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -450,6 +450,11 @@ public:
+ 		reconnectTimeoutTimer_ = new QTimer(this);
+ 		reconnectTimeoutTimer_->setSingleShot(true);
+ 		connect(reconnectTimeoutTimer_, SIGNAL(timeout()), SLOT(reconnectTimerTimeout()));
++
++		updateOnlineContactsCountTimer_ = new QTimer(this);
++		updateOnlineContactsCountTimer_->setInterval(500);
++		updateOnlineContactsCountTimer_->setSingleShot(true);
++		connect(updateOnlineContactsCountTimer_, SIGNAL(timeout()), SLOT(updateOnlineContactsCountTimeout()));
+ 	}
+ 
+ 	PsiContactList* contactList;
+@@ -477,6 +482,7 @@ public:
+ 	bool pepAvailable;
+ 	QString currentConnectionError;
+ 	int currentConnectionErrorCondition;
++	QTimer *updateOnlineContactsCountTimer_;
+ 
+ 	// Tune
+ 	Tune lastTune;
+@@ -646,7 +652,8 @@ public:
+ 		return pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/events-" + JIDUtil::encode(acc.id).toLower() + ".xml";
+ 	}
+ 
+-	void updateOnlineContactsCount()
++private slots:
++	void updateOnlineContactsCountTimeout()
+ 	{
+ 		int newOnlineContactsCount = 0;
+ 		foreach(const PsiContact* c, contacts) {
+@@ -662,6 +669,12 @@ public:
+ 		}
+ 	}
+ 
++public:
++	void updateOnlineContactsCount()
++	{
++		updateOnlineContactsCountTimer_->start();
++	}
++
+ 	// FIXME: Rename updateEntry -> updateContact
+ 	void updateEntry(const UserListItem& u)
+ 	{

psi-plus-main-20141106.tar.xz/patches/1330-psi-remove-nick-entry-from-muc-stanzas.diff Added

psi-plus-main-20141106.tar.xz/patches/1340-psi-use-absolutefilepath-in-psireachtext.diff Added

psi-plus-main-20141106.tar.xz/patches/1350-psi-whiteboard-invitation-event.diff Added

@@ -0,0 +1,374 @@
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -1217,6 +1217,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	d->sxeManager = new SxeManager(d->client, this);
+ 	 // Initialize Whiteboard manager
+ 	d->wbManager = new WbManager(d->client, this, d->sxeManager);
++	connect(d->wbManager, SIGNAL(wbRequest(Jid,int)),SLOT(wbRequest(Jid,int)));
+ #endif
+ 
+ 	// Avatars
+@@ -1557,7 +1558,12 @@ VoiceCaller* PsiAccount::voiceCaller() c
+ {
+ 	return d->voiceCaller;
+ }
+-
++#ifdef WHITEBOARDING
++WbManager* PsiAccount::wbManager() const
++{
++	return d->wbManager;
++}
++#endif
+ PrivacyManager* PsiAccount::privacyManager() const
+ {
+ 	return d->privacyManager;
+@@ -2754,6 +2760,19 @@ void PsiAccount::client_messageReceived(
+ 	}
+ }
+ 
++#ifdef WHITEBOARDING
++void PsiAccount::wbRequest(const Jid &j, int id)
++{
++	SxeEvent::Ptr se(new SxeEvent(id, this));
++	XMPP::Message m;
++	m.setSubject(tr("Whiteboard invitation"));
++	m.setFrom(j);
++	se->setFrom(j);
++	se->setMessage(m);
++	handleEvent(se, IncomingStanza);
++}
++#endif
++
+ /**
+  * Handles the passed Message \param m. Also message's type could be modified
+  * here, if certain options are set.
+@@ -5171,6 +5190,13 @@ void PsiAccount::handleEvent(const PsiEv
+ 	else if(e->type() == PsiEvent::HttpAuth) {
+ 		soundType = eSystem;
+ 	}
++#ifdef WHITEBOARDING
++	else if(e->type() == PsiEvent::Sxe) {
++		soundType = eHeadline;
++		doPopup = true;
++		popupType = PopupManager::AlertHeadline;
++	}
++#endif
+ 	else if(e->type() == PsiEvent::File) {
+ 		soundType = eIncomingFT;
+ 		doPopup = true;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -91,6 +91,9 @@ class GoogleFileTransfer;
+ #endif
+ class PsiIcon;
+ class QIcon;
++#ifdef WHITEBOARDING
++class WbManager;
++#endif
+ 
+ // sick sick remove this someday please!
+ struct GCContact;
+@@ -135,6 +138,9 @@ public:
+ 	PrivacyManager* privacyManager() const;
+ 	CapsManager* capsManager() const;
+ 	VoiceCaller* voiceCaller() const;
++#ifdef WHITEBOARDING
++	WbManager* wbManager() const;
++#endif
+ 	Status status() const;
+ 	static Status loggedOutStatus();
+ 	int defaultPriority(const XMPP::Status &);
+@@ -437,6 +443,10 @@ private slots:
+ 	void disconnect();
+ 	void enableNotifyOnline();
+ 
++#ifdef WHITEBOARDING
++	void wbRequest(const Jid& j, int id);
++#endif
++
+ 	void itemPublished(const Jid&, const QString&, const PubSubItem&);
+ 	void itemRetracted(const Jid&, const QString&, const PubSubRetraction&);
+ 
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -112,6 +112,9 @@
+ #include "alertmanager.h"
+ #include "bosskey.h"
+ #include "popupmanager.h"
++#ifdef WHITEBOARDING
++#include "whiteboarding/wbmanager.h"
++#endif
+ 
+ #include "AutoUpdater/AutoUpdater.h"
+ #ifdef HAVE_SPARKLE
+@@ -1767,6 +1770,15 @@ void PsiCon::processEvent(const PsiEvent
+ 		// as the event could be deleted just above, we're using cached account and from values
+ 		account->openChat(from, activationType);
+ 	}
++#ifdef WHITEBOARDING
++	else if (e->type() == PsiEvent::Sxe) {
++		e->account()->eventQueue()->dequeue(e);
++		e->account()->queueChanged();
++		e->account()->cpUpdate(*u);
++		e->account()->wbManager()->requestActivated((e.staticCast<SxeEvent>())->id());
++		return;
++	}
++#endif
+ 	else {
+ 		// search for an already opened eventdlg
+ 		EventDlg *w = e->account()->findDialog<EventDlg*>(u->jid());
+--- git.orig/src/psievent.h
++++ git/src/psievent.h
+@@ -54,6 +54,9 @@ public:
+ 	typedef QSharedPointer<PsiEvent> Ptr;
+ 	enum {
+ 		Message,
++#ifdef WHITEBOARDING
++		Sxe,
++#endif
+ 		Auth,
+ 		PGP,
+ 		File,
+@@ -177,6 +180,27 @@ private:
+ 	QString v_at;
+ };
+ 
++#ifdef WHITEBOARDING
++class SxeEvent : public MessageEvent
++{
++	Q_OBJECT
++public:
++	SxeEvent(int id, PsiAccount *acc)
++		: MessageEvent(acc), id_(id) {}
++	SxeEvent(const SxeEvent &from)
++		: MessageEvent(from), id_(from.id()) {}
++	~SxeEvent() {}
++	typedef QSharedPointer<SxeEvent> Ptr;
++	int type() const { return Sxe; }
++//	XMPP::Jid from() const { return jid(); }
++//	void setFrom(const XMPP::Jid &) {  }
++	int id() const { return id_; }
++
++private:
++	int id_;
++};
++#endif
++
+ // request pgp passphrase
+ class PGPEvent : public PsiEvent
+ {
+--- git.orig/src/sxe/sxemanager.cpp
++++ git/src/sxe/sxemanager.cpp
+@@ -50,9 +50,9 @@ SxeManager::SxeManager(Client* client, P
+ 	connect(&negotiationTimer_, SIGNAL(timeout()), SLOT(negotiationTimeout()));
+ }
+ 
+-void SxeManager::addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features)) {
+-	invitationCallbacks_ += callback;
+-}
++//void SxeManager::addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features)) {
++//	invitationCallbacks_ += callback;
++//}
+ 
+ void SxeManager::messageReceived(const Message &message) {
+ 	// only process messages that contain a <sxe/> with a nonempty
+@@ -269,8 +269,9 @@ bool SxeManager::processNegotiationAsJoi
+ 
+ 		// check if one of the invitation callbacks accepts the invitation.
+ 		const QString sessionId = negotiation->sessionId;
+-		foreach(bool (*callback)(const Jid &peer, const QList<QString> &features), invitationCallbacks_) {
+-			bool result = callback(negotiation->peer, negotiation->features);
++//		foreach(bool (*callback)(const Jid &peer, const QList<QString> &features), invitationCallbacks_) {
++			bool result = false; //callback(negotiation->peer, negotiation->features);
++			emit invitationCallback(negotiation->peer, negotiation->features, &result);
+ 			if (!negotiations_.contains(sessionId, negotiation)) { //FIXME that's wrong. negotiation can be replaced with new one with the same address
+ 				return false;
+ 			}
+@@ -279,7 +280,8 @@ bool SxeManager::processNegotiationAsJoi
+ 				negotiation->state = SxeNegotiation::InvitationAccepted;
+ 				return true;
+ 			}
+-		}
++			return false;
++//		}
+ 		// othewise abort negotiation
+ 		abortNegotiation(negotiation);
+ 		return false;
+--- git.orig/src/sxe/sxemanager.h
++++ git/src/sxe/sxemanager.h
+@@ -101,8 +101,8 @@ public:
+ 	 *  If such session doesn't exits, returns 0.
+ 	 */
+ 	QPointer<SxeSession> findSession(const QString &session);
+-	/*! \brief Add a callback for invitations.*/
+-	void addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features));
++//	/*! \brief Add a callback for invitations.*/
++//	void addInvitationCallback(bool (*callback)(const Jid &peer, const QList<QString> &features));
+ 	/*! \brief Starts a new session negotiation to the specified contact with given list of features.*/
+ 	void startNewSession(const Jid &target, const Jid &ownJid, bool groupChat, const QDomDocument &initialDoc, QList<QString> features = QList<QString>());
+ 	/*! \brief Join an existing session.*/
+@@ -118,6 +118,8 @@ signals:
+ 	/*! \brief Emitted when \a an invitation to \a jid was declined and joining an alternative session \a session was suggested.*/
+ 	void alternativeSession(const Jid &jid, const QString &session);
+ 
++	void invitationCallback(const Jid &peer, const QList<QString> &features, bool* result);
++
+ private:
+ 	/*! \brief Process a message that contains a negotiation element.
+ 	 *  Returns a pointer to the new session if negotiation finished.
+@@ -163,8 +165,8 @@ private:
+ 	QList<DetectedSession> DetectedSessions_;
+ 	/*! \brief A list of Jids corresponding to self.*/
+ 	QList<QString> ownJids_;
+-	/*! \brief A list of callbacks used to determine whether an invitation should be accepted.*/
+-	QList<bool (*)(const Jid &peer, const QList<QString> &features)> invitationCallbacks_;
++//	/*! \brief A list of callbacks used to determine whether an invitation should be accepted.*/
++//	QList<bool (*)(const Jid &peer, const QList<QString> &features)> invitationCallbacks_;
+ 	/*! \brief A counter used for including a unique id in each sent sxe element.*/
+ 	int sxeId_;
+ 	/*! \brief A list of messages waiting to be sent out.*/
+--- git.orig/src/whiteboarding/wbmanager.cpp
++++ git/src/whiteboarding/wbmanager.cpp
+@@ -32,8 +32,45 @@
+ 
+ using namespace XMPP;
+ 
+-// -----------------------------------------------------------------------------
+ 
++class WbRequest
++{
++public:
++	WbRequest() : loop_(new QEventLoop), id_(lastRequetsId++)
++	{}
++
++	~WbRequest()
++	{
++		if(loop_->isRunning())
++			loop_->exit();
++		delete loop_;
++	}
++
++	void startLoop()
++	{
++		loop_->exec();
++	}
++
++	void stopLoop()
++	{
++		loop_->exit();
++	}
++
++	int id() const
++	{
++		return id_;
++	}
++
++private:
++	QEventLoop *loop_;
++	int id_;
++
++	static int lastRequetsId;
++};
++
++int WbRequest::lastRequetsId = 0;
++
++// -----------------------------------------------------------------------------
+ WbManager::WbManager(XMPP::Client* client, PsiAccount* pa, SxeManager* sxemanager) {
+ 	pa_ = pa;
+ 	sxemanager_ = sxemanager;
+@@ -41,12 +78,14 @@ WbManager::WbManager(XMPP::Client* clien
+ 	client->addExtension("whiteboard", Features(WBNS));
+ 
+ 	connect(sxemanager_, SIGNAL(sessionNegotiated(SxeSession*)), SLOT(createWbDlg(SxeSession*)));
+-	sxemanager_->addInvitationCallback(WbManager::checkInvitation);
++	//sxemanager_->addInvitationCallback(WbManager::checkInvitation);
++	connect(sxemanager, SIGNAL(invitationCallback(Jid,QList<QString>,bool*)), this, SLOT(checkInvitation(Jid,QList<QString>,bool*)));
+ }
+ 
+ WbManager::~WbManager()
+ {
+ 	qDeleteAll(dialogs_);
++	qDeleteAll(requests_);
+ }
+ 
+ void WbManager::openWhiteboard(const Jid &target, const Jid &ownJid, bool groupChat, bool promptInitialDoc) {
+@@ -143,13 +182,33 @@ void WbManager::createWbDlg(SxeSession*
+ 	}
+ }
+ 
+-bool WbManager::checkInvitation(const Jid &peer, const QList<QString> &features) {
+-	if(!features.contains(WBNS))
+-		return false;
++void WbManager::checkInvitation(const Jid &peer, const QList<QString> &features, bool* result) {
++	if(*result)
++		return;
+ 
+-	return (QMessageBox::Yes == QMessageBox::question(NULL,
++	if(!features.contains(WBNS)) {
++		*result = false;
++		return;
++	}
++
++	WbRequest* wr = new WbRequest();
++	requests_.append(wr);
++	emit wbRequest(peer, wr->id());
++	wr->startLoop();
++	requests_.removeAll(wr);
++	delete wr;
++	*result = (QMessageBox::Yes == QMessageBox::question(NULL,
+ 									tr("Whiteboarding Invitation?"),
+ 									tr("%1 has invited you to a whiteboarding session. Would you like to join?").arg(peer.full()),
+ 									QMessageBox::Yes | QMessageBox::No,
+ 									QMessageBox::No));
+ }
++
++void WbManager::requestActivated(int id) {
++	foreach(WbRequest* wr, requests_) {
++		if(wr->id() == id) {
++			wr->stopLoop();
++			return;
++		}
++	}
++}
+--- git.orig/src/whiteboarding/wbmanager.h
++++ git/src/whiteboarding/wbmanager.h
+@@ -37,6 +37,7 @@ namespace XMPP {
+ }
+ 
+ using namespace XMPP;
++class WbRequest;
+ 
+ /*! \brief The manager for whiteboard dialogs.
+  *  The manager listen to SxeManager to pick up any new sessions negotiated by
+@@ -58,7 +59,8 @@ public:
+ 	WbManager(XMPP::Client* client, PsiAccount* pa, SxeManager* sxemanager);
+ 	~WbManager();
+ 	/*! \brief Returns true if features contains WBNS and the user wishes to accept the invitation. */
+-    static bool checkInvitation(const Jid &peer, const QList<QString> &features);
++	//static bool checkInvitation(const Jid &peer, const QList<QString> &features);
++	void requestActivated(int id);
+ 
+ public slots:
+ 	/*! \brief Opens the existing dialog to the specified contact or starts a new session negotiation if necessary.*/
+@@ -75,13 +77,20 @@ private:
+ 	/*! \brief A list of dialogs of established sessions.*/
+ 	QList<WbDlg*> dialogs_;
+ 	/*! \brief A pointer to the SxeManager used for negotiating sessions.*/
+-    SxeManager* sxemanager_;
++	SxeManager* sxemanager_;
++
++	QList<WbRequest*> requests_;
++
++signals:
++	void wbRequest(const Jid &peer, int id);
+ 
+ private slots:
+ 	/*! \brief Removes and deletes the dialog for the given session.*/
+ 	void removeDialog(WbDlg* dialog);
+ 	/*! \brief Returns a pointer to a new dialog to with given contact and session set.*/
+ 	void createWbDlg(SxeSession* session);
++
++	void  checkInvitation(const Jid &peer, const QList<QString> &features, bool* result);
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/1360-psi-fix-display-status-icon.diff Added

@@ -0,0 +1,60 @@
+--- git.temp.orig/src/userlist.cpp
++++ git.temp/src/userlist.cpp
+@@ -23,6 +23,8 @@
+ #include <QList>
+ #include <QtCrypto>
+ #include <QTextDocument> // for TextUtil::escape()
++#include <QBuffer>
++#include <QUrl>
+ 
+ #include "userlist.h"
+ #include "avatars.h"
+@@ -958,33 +960,27 @@ QString UserListItem::makeBareTip(bool t
+ 			else
+ 				name = QObject::tr("[blank]");
+ 
+-			int status = makeSTATUS(r.status());
+-			QString istr = "status/offline";
+-			if(status == STATUS_ONLINE)
+-				istr = "status/online";
+-			else if(status == STATUS_AWAY)
+-				istr = "status/away";
+-			else if(status == STATUS_XA)
+-				istr = "status/xa";
+-			else if(status == STATUS_DND)
+-				istr = "status/dnd";
+-			else if(status == STATUS_CHAT)
+-				istr = "status/chat";
+-			else if(status == STATUS_INVISIBLE)
+-				istr = "status/invisible"; //this shouldn't happen
+-
+ 			QString secstr;
+ 			if(isSecure(r.name()) && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool())
+ 				secstr += QString(" <%1=\"psi/cryptoYes\">").arg(imgTag);
+ 			QString hr;
+ 			if (!mucItem)
+ 				hr = "<hr/>";
+-			if(r.status().mucItem().jid().isEmpty())
+-				str += hr + QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
+-				+ QString("(%1)").arg(r.priority()) + secstr + "</div>";
+-			else
+-				str += hr +  QString("<div style='white-space:pre'><%1=\"%2\"> ").arg(imgTag).arg(istr) + QString("<b>%1</b> ").arg(TextUtil::escape(name)) \
+-				+ QString("(%1) &lt;%2&gt;").arg(r.priority()).arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true))) + secstr + "</div>";
++			str += hr + "<div style='white-space:pre'>";
++
++			PsiIcon *statusIcon = PsiIconset::instance()->statusPtr(jid(), makeSTATUS(r.status()));
++			if (statusIcon) {
++				QByteArray imageArray;
++				QBuffer buff(&imageArray);
++				statusIcon->image().save(&buff, "png");
++				QString imgBase64(QUrl::toPercentEncoding(imageArray.toBase64()));
++				str += QString("<img src=\"data:image/png;base64,%1\" alt=\"img\"/>").arg(imgBase64);
++			}
++
++			str += QString(" <b>%1</b> ").arg(TextUtil::escape(name)) + QString("(%1)").arg(r.priority());
++			if (!r.status().mucItem().jid().isEmpty())
++				str += QString(" &lt;%1&gt;").arg(TextUtil::escape(JIDUtil::toString(r.status().mucItem().jid(),true)));
++			str += secstr + "</div>";
+ 
+ 			if(!r.publicKeyID().isEmpty() && PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.pgp").toBool()) {
+ 				int v = r.pgpVerifyStatus();

psi-plus-main-20141106.tar.xz/patches/1370-psi-fix-transports-group.diff Added

@@ -0,0 +1,38 @@
+--- git.temp.orig/src/contactlistnestedgroup.cpp
++++ git.temp/src/contactlistnestedgroup.cpp
+@@ -55,7 +55,10 @@ void ContactListNestedGroup::addContact(
+ 	if (canContainSpecialGroups()) {
+ 		ContactListGroup* group = specialGroupFor(contact);
+ 		if (group) {
+-			group->addContact(contact, contactGroups);
++			if (!contact->isAgent())
++				group->addContact(contact, contactGroups);
++			else
++				group->addContact(contact, QStringList() << QString());
+ 			return;
+ 		}
+ 	}
+@@ -127,6 +130,23 @@ void ContactListNestedGroup::contactGrou
+ 
+ 		restrictContactAdd = specialGroup != 0;
+ 	}
++	else if (!isSpecial() && contact->isAgent() && model()->groupsEnabled())
++	{
++		ContactListNestedGroup *rootGroup = this;
++		while (rootGroup->parent())
++		{
++			rootGroup = static_cast<ContactListNestedGroup *>(rootGroup->parent());
++			if (rootGroup->canContainSpecialGroups())
++			{
++				ContactListGroup* specialGroup = rootGroup->specialGroupFor(contact);
++				if (specialGroup && specialGroup != this)
++				{
++					specialGroup->contactGroupsChanged(contact, QStringList() << QString());
++					return;
++				}
++			}
++		}
++	}
+ 
+ #ifdef CONTACTLISTNESTEDGROUP_OLD_CONTACTGROUPSCHANGED
+ 	bool addToSelf = false;

psi-plus-main-20141106.tar.xz/patches/1380-psi-stun-hosts-combobox.diff Added

@@ -0,0 +1,265 @@
+--- git.orig/src/accountmodifydlg.cpp
++++ git/src/accountmodifydlg.cpp
+@@ -33,6 +33,8 @@
+ #include "privacydlg.h"
+ #include "pgpkeydlg.h"
+ #include "psicontactlist.h"
++#include "iconaction.h"
++#include "actionlineedit.h"
+ 
+ AccountModifyDlg::AccountModifyDlg(PsiCon *_psi, QWidget *parent)
+ :QDialog(parent)
+@@ -152,8 +154,21 @@ void AccountModifyDlg::init()
+ 	ck_keepAlive->setChecked(acc.opt_keepAlive);
+ 	ck_ibbOnly->setChecked(acc.ibbOnly);
+ 	le_dtProxy->setText(acc.dtProxy.full());
+-	le_stunHost->setText(acc.stunHost);
+-	le_stunPort->setText(QString::number(acc.stunPort));
++
++	ActionLineEdit *ale_delStunHost = new ActionLineEdit(cb_stunHost);
++	cb_stunHost->setLineEdit(ale_delStunHost);
++	IconAction *ia_delStunHost = new IconAction(tr("Delete current host from the list"), this, "psi/remove");
++	connect(ia_delStunHost, SIGNAL(triggered()), SLOT(removeStunHost()));
++	ale_delStunHost->addAction(ia_delStunHost);
++
++	cb_stunHost->addItem(tr("<don't use>"));
++	cb_stunHost->addItems(acc.stunHosts);
++	if (acc.stunHost.isEmpty()) {
++		cb_stunHost->setCurrentIndex(0);
++	}
++	else {
++		cb_stunHost->setCurrentIndex(cb_stunHost->findText(acc.stunHost));
++	}
+ 	le_stunUser->setText(acc.stunUser);
+ 	le_stunPass->setText(acc.stunPass);
+ 	autoconnectCksChanged();
+@@ -474,6 +489,21 @@ void AccountModifyDlg::detailsChangePW()
+ 	}
+ }
+ 
++void AccountModifyDlg::removeStunHost()
++{
++	// Don't remove no host
++	if (!cb_stunHost->currentIndex()) {
++		return;
++	}
++
++	QString host = cb_stunHost->currentText();
++	int item = cb_stunHost->findText(host);
++	if (item > -1) {
++		cb_stunHost->removeItem(item);
++	}
++	cb_stunHost->setCurrentIndex(0);
++}
++
+ void AccountModifyDlg::save()
+ {
+ 	/*if(pa && le_name->text().isEmpty()) {
+@@ -541,8 +571,15 @@ void AccountModifyDlg::save()
+ 	acc.opt_keepAlive = ck_keepAlive->isChecked();
+ 	acc.ibbOnly = ck_ibbOnly->isChecked();
+ 	acc.dtProxy = le_dtProxy->text();
+-	acc.stunHost = le_stunHost->text();
+-	acc.stunPort = le_stunPort->text().toInt();
++	acc.stunHost = cb_stunHost->currentIndex() ? cb_stunHost->currentText().trimmed() : "";
++	acc.stunHosts.clear();
++	// first item is no host
++	for (int i = 1; i < cb_stunHost->count(); i++) {
++		acc.stunHosts << cb_stunHost->itemText(i);
++	}
++	if (acc.stunHosts.indexOf(acc.stunHost) == -1) {
++		acc.stunHosts << acc.stunHost;
++	}
+ 	acc.stunUser = le_stunUser->text();
+ 	acc.stunPass = le_stunPass->text();
+ 
+--- git.orig/src/accountmodifydlg.h
++++ git/src/accountmodifydlg.h
+@@ -56,6 +56,8 @@ private slots:
+ 	void detailsVCard();
+ 	void detailsChangePW();
+ 
++	void removeStunHost();
++
+ 	void save();
+ 
+ 	//void pgpToggled(bool);
+--- git.orig/src/accountmodify.ui
++++ git/src/accountmodify.ui
+@@ -6,8 +6,8 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>761</width>
+-    <height>455</height>
++    <width>765</width>
++    <height>475</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -915,28 +915,18 @@
+              </widget>
+             </item>
+             <item>
+-             <widget class="QLineEdit" name="le_stunHost"/>
+-            </item>
+-            <item>
+-             <widget class="QLabel" name="lb_stunPort">
+-              <property name="text">
+-               <string>Port:</string>
++             <widget class="QComboBox" name="cb_stunHost">
++              <property name="sizePolicy">
++               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
++                <horstretch>0</horstretch>
++                <verstretch>0</verstretch>
++               </sizepolicy>
+               </property>
+-             </widget>
+-            </item>
+-            <item>
+-             <widget class="QLineEdit" name="le_stunPort">
+-              <property name="minimumSize">
+-               <size>
+-                <width>56</width>
+-                <height>0</height>
+-               </size>
++              <property name="editable">
++               <bool>true</bool>
+               </property>
+-              <property name="maximumSize">
+-               <size>
+-                <width>56</width>
+-                <height>16777215</height>
+-               </size>
++              <property name="insertPolicy">
++               <enum>QComboBox::NoInsert</enum>
+               </property>
+              </widget>
+             </item>
+@@ -972,19 +962,6 @@
+               </property>
+              </widget>
+             </item>
+-            <item>
+-             <spacer name="horizontalSpacer">
+-              <property name="orientation">
+-               <enum>Qt::Horizontal</enum>
+-              </property>
+-              <property name="sizeHint" stdset="0">
+-               <size>
+-                <width>40</width>
+-                <height>20</height>
+-               </size>
+-              </property>
+-             </spacer>
+-            </item>
+            </layout>
+           </item>
+          </layout>
+@@ -1130,8 +1107,6 @@ When you enable this option you will not
+   <tabstop>ck_req_mutual</tabstop>
+   <tabstop>cb_security_level</tabstop>
+   <tabstop>le_dtProxy</tabstop>
+-  <tabstop>le_stunHost</tabstop>
+-  <tabstop>le_stunPort</tabstop>
+   <tabstop>le_stunUser</tabstop>
+   <tabstop>le_stunPass</tabstop>
+   <tabstop>ck_custom_auth</tabstop>
+--- git.orig/src/profiles.h
++++ git/src/profiles.h
+@@ -91,8 +91,8 @@ public:
+ 
+ 	QString optionsBase;
+ 
++	QStringList stunHosts;
+ 	QString stunHost;
+-	int stunPort;
+ 	QString stunUser;
+ 	QString stunPass;
+ 
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -948,9 +948,14 @@ public:
+ 
+ 	void updateAvCallSettings(const UserAccount &acc)
+ 	{
+-		avCallManager->setStunBindService(acc.stunHost, acc.stunPort);
+-		avCallManager->setStunRelayUdpService(acc.stunHost, acc.stunPort, acc.stunUser, acc.stunPass);
+-		avCallManager->setStunRelayTcpService(acc.stunHost, acc.stunPort, convert_proxy(acc, jid), acc.stunUser, acc.stunPass);
++		QString stunHost = acc.stunHost.section(":", 0, 0);
++		int stunPort = acc.stunHost.section(":", 1, 1).toInt();
++		if (!stunPort) {
++			stunPort = 3478; // STUN default port
++		}
++		avCallManager->setStunBindService(stunHost, stunPort);
++		avCallManager->setStunRelayUdpService(stunHost, stunPort, acc.stunUser, acc.stunPass);
++		avCallManager->setStunRelayTcpService(stunHost, stunPort, convert_proxy(acc, jid), acc.stunUser, acc.stunPass);
+ 	}
+ 
+ 	bool isAlwaysVisibleContact(const Jid& jid) const
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -154,7 +154,29 @@ void UserAccount::reset()
+ 	proxy_user = "";
+ 	proxy_pass = "";
+ 
+-	stunPort = 3478;
++	stunHosts.clear();
++	stunHosts << "stun.jabber.ru:5249"
++			  << "stun.habahaba.im"
++			  << "stun.ekiga.net"
++			  << "provserver.televolution.net"
++			  << "stun1.voiceeclipse.net"
++			  << "stun.callwithus.com"
++			  << "stun.counterpath.net"
++			  << "stun.endigovoip.com"
++			  << "stun.ideasip.com"
++			  << "stun.internetcalls.com"
++			  << "stun.noc.ams-ix.net"
++			  << "stun.phonepower.com"
++			  << "stun.phoneserve.com"
++			  << "stun.rnktel.com"
++			  << "stun.softjoys.com"
++			  << "stun.sipgate.net"
++			  << "stun.sipgate.net:10000"
++			  << "stun.stunprotocol.org"
++			  << "stun.voipbuster.com"
++			  << "stun.voxgratia.org";
++
++	stunHost = stunHosts[0];
+ 
+ 	keybind.clear();
+ 
+@@ -311,15 +333,14 @@ void UserAccount::fromOptions(OptionsTre
+ 	ibbOnly = o->getOption(base + ".ibb-only").toBool();
+ 
+ 
+-	if (allSetOptions.contains(base + ".stun-host")) {
+-		stunHost = o->getOption(base + ".stun-host").toString();
++	if (allSetOptions.contains(base + ".stun-hosts")) {
++		stunHosts = o->getOption(base + ".stun-hosts").toStringList();
++		if (allSetOptions.contains(base + ".stun-host")) {
++			stunHost = o->getOption(base + ".stun-host").toString();
++		}
+ 	}
+-	if (allSetOptions.contains(base + ".stun-port")) {
+-		int tmpPort = o->getOption(base + ".stun-port").toInt();
+-		// a few days in the 0.13-dev development cycle the code set
+-		// 0 as port when first adding this option. Ignore 0 for now
+-		// and use default
+-		if (tmpPort != 0) stunPort = tmpPort;
++	else if (!o->getOption(base + ".stun-host").toString().isEmpty()) {
++		stunHost = o->getOption(base + ".stun-host").toString();
+ 	}
+ 	if (allSetOptions.contains(base + ".stun-username")) {
+ 		stunUser = o->getOption(base + ".stun-username").toString();
+@@ -467,8 +488,8 @@ void UserAccount::toOptions(OptionsTree
+ 	o->setOption(base + ".bytestreams-proxy", dtProxy.full());
+ 	o->setOption(base + ".ibb-only", ibbOnly);
+ 
++	o->setOption(base + ".stun-hosts", stunHosts);
+ 	o->setOption(base + ".stun-host", stunHost);
+-	o->setOption(base + ".stun-port", QString::number(stunPort));
+ 	o->setOption(base + ".stun-username", stunUser);
+ 	o->setOption(base + ".stun-password", stunPass);
+

psi-plus-main-20141106.tar.xz/patches/1390-psi-fix-showing-xml-chars-in-group-popup.diff Added

@@ -0,0 +1,47 @@
+--- git.temp.orig/src/contactlistmodel.h
++++ git.temp/src/contactlistmodel.h
+@@ -97,6 +97,7 @@ public:
+ 		TotalContactsRole = Qt::UserRole + 16,
+ 		InternalGroupNameRole = Qt::UserRole + 17,
+ 		SpecialGroupTypeRole = Qt::UserRole + 18,
++		DisplayGroupRole = Qt::UserRole + 33,
+ 
+ 		// accounts
+ 		UsingSSLRole = Qt::UserRole + 19,
+--- git.temp.orig/src/psicontactlistmodel.cpp
++++ git.temp/src/psicontactlistmodel.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <QTimer>
++#include <QTextDocument> // for Qt::escape()
+ 
+ #include "psicontactlistmodel.h"
+ 
+@@ -57,8 +58,14 @@ QVariant PsiContactListModel::contactDat
+ 
+ QVariant PsiContactListModel::contactGroupData(const ContactListGroup* group, int role) const
+ {
+-	if (role == Qt::ToolTipRole) {
++	if (role == DisplayGroupRole || role == Qt::ToolTipRole) {
+ 		QString text = itemData(group, Qt::DisplayRole).toString();
++		if (role == Qt::ToolTipRole)
++#ifdef HAVE_QT5
++			text = text.toHtmlEscaped();
++#else
++			text = Qt::escape(text);
++#endif
+ 		text += QString(" (%1/%2)")
+ 		        .arg(itemData(group, ContactListModel::OnlineContactsRole).toInt())
+ 		        .arg(itemData(group, ContactListModel::TotalContactsRole).toInt());
+--- git.temp.orig/src/psicontactlistviewdelegate.cpp
++++ git.temp/src/psicontactlistviewdelegate.cpp
+@@ -422,7 +422,7 @@ void PsiContactListViewDelegate::drawGro
+ 
+ 	r.setLeft(pixmapRect.right() + 3);
+ 
+-	QString text = index.data(Qt::ToolTipRole).toString();
++	QString text = index.data(ContactListModel::DisplayGroupRole).toString();
+ 	drawText(painter, o, r, text, index);
+ 
+ 	if(slimGroup_ && !(option.state & QStyle::State_Selected)) {

psi-plus-main-20141106.tar.xz/patches/1400-psi-switch-tab-on-new-message.diff Added

@@ -0,0 +1,66 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -113,6 +113,7 @@
+ 				<caption type="QString"></caption>
+ 				<delete-contents-after type="QString">never</delete-contents-after>
+ 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
++				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
+ 				<use-chat-says-style type="bool">false</use-chat-says-style>
+ 				<use-expanding-line-edit type="bool">false</use-expanding-line-edit>
+ 				<use-small-chats type="bool">false</use-small-chats>
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -933,7 +933,8 @@ void ChatDlg::appendMessage(const Messag
+ 		if (PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool()) {
+ 			if (isTabbed()) {
+ 				TabDlg* tabSet = getManagingTabDlg();
+-				tabSet->selectTab(this);
++				if (PsiOptions::instance()->getOption("options.ui.chat.switch-tab-on-new-messages").toBool() || !tabSet->isActiveWindow())
++					tabSet->selectTab(this);
+ 				::bringToFront(tabSet, false);
+ 			}
+ 			else {
+--- git.orig/src/options/opt_chat.cpp
++++ git/src/options/opt_chat.cpp
+@@ -74,6 +74,9 @@ QWidget *OptionsTabChat::widget()
+ 	d->ck_raiseChatWindow->setWhatsThis(
+ 		tr("Makes Psi bring an open chat window to the front of your screen when you receive a new message."
+ 		" It does not take the keyboard focus, so it will not interfere with your work."));
++	d->ck_switchTabOnMessage->setWhatsThis(
++		tr("Makes Psi switch tab on active tabbed window when you receive a new message."
++		" It does not take the keyboard focus, so it will not interfere with your work."));
+ 	d->ck_smallChats->setWhatsThis(
+ 		tr("Makes Psi open chat windows in compact mode."));
+ 	d->ck_tabChats->setWhatsThis(
+@@ -102,6 +105,7 @@ void OptionsTabChat::applyOptions()
+ 	PsiOptions::instance()->setOption("options.messages.default-outgoing-message-type", bg_defAct->buttons().indexOf(bg_defAct->checkedButton()) == 0 ? "message" : "chat");
+ 	PsiOptions::instance()->setOption("options.ui.chat.alert-for-already-open-chats", d->ck_alertOpenChats->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked());
++	PsiOptions::instance()->setOption("options.ui.chat.switch-tab-on-new-messages", d->ck_switchTabOnMessage->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked());
+ 	PsiOptions::instance()->setOption("options.ui.tabs.show-tab-buttons", d->ck_showTabButtons->isChecked());
+ 
+@@ -179,6 +183,7 @@ void OptionsTabChat::restoreOptions()
+ 	bg_defAct->buttons()[PsiOptions::instance()->getOption("options.messages.default-outgoing-message-type").toString() == "message" ? 0 : 1]->setChecked(true);
+ 	d->ck_alertOpenChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.alert-for-already-open-chats").toBool() );
+ 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
++	d->ck_switchTabOnMessage->setChecked( PsiOptions::instance()->getOption("options.ui.chat.switch-tab-on-new-messages").toBool() );
+ 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
+ 	d->ck_showTabButtons->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool() );
+ 	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
+--- git.orig/src/options/opt_chat.ui
++++ git/src/options/opt_chat.ui
+@@ -41,6 +41,13 @@
+     </widget>
+    </item>
+    <item>
++    <widget class="QCheckBox" name="ck_switchTabOnMessage" >
++     <property name="text" >
++      <string>Switch tab on receiving new messages</string>
++     </property>
++    </widget>
++   </item>
++   <item>
+     <widget class="QCheckBox" name="ck_smallChats" >
+      <property name="text" >
+       <string>Open chats in compact mode</string>

psi-plus-main-20141106.tar.xz/patches/1410-psi-tunable-chattoolbar.diff Added

@@ -0,0 +1,1646 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -565,6 +565,27 @@ QLineEdit#le_status_text {
+ 				<help_about_qt type="QKeySequence" comment="About Qt"></help_about_qt>
+ 				<help_diag_qcaplugin type="QKeySequence" comment="QCA plugin diag"></help_diag_qcaplugin>
+ 				<help_diag_qcakeystore type="QKeySequence" comment="QCA key store diag"></help_diag_qcakeystore>
++				<chat_active_contacts type="QKeySequence"></chat_active_contacts>
++				<chat_add_contact type="QKeySequence"></chat_add_contact>
++				<chat_clear type="QKeySequence"></chat_clear>
++				<chat_compact type="QKeySequence"></chat_compact>
++				<chat_file type="QKeySequence"></chat_file>
++				<chat_find type="QKeySequence"></chat_find>
++				<chat_history type="QKeySequence"></chat_history>
++				<chat_html_text type="QKeySequence"></chat_html_text>
++				<chat_icon type="QKeySequence"></chat_icon>
++				<chat_info type="QKeySequence"></chat_info>
++				<chat_pgp type="QKeySequence"></chat_pgp>
++				<chat_ps type="QKeySequence"></chat_ps>
++				<chat_templates type="QKeySequence"></chat_templates>
++				<chat_voice type="QKeySequence"></chat_voice>
++				<gchat_clear type="QKeySequence"></gchat_clear>
++				<gchat_configure type="QKeySequence"></gchat_configure>
++				<gchat_find type="QKeySequence"></gchat_find>
++				<gchat_html_text type="QKeySequence"></gchat_html_text>
++				<gchat_icon type="QKeySequence"></gchat_icon>
++				<gchat_ps type="QKeySequence"></gchat_ps>
++				<gchat_templates type="QKeySequence"></gchat_templates>
+ 			</alist>
+ 			<chat comment="Shortcuts in the chat dialog">
+ 				<next-tab type="QVariantList" comment="Switch to the next tab">
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -54,6 +54,7 @@
+ #include <QFormLayout>
+ #include <QClipboard>
+ 
++#include "psiactionlist.h"
+ #include "psicon.h"
+ #include "psiaccount.h"
+ #include "capsmanager.h"
+@@ -201,8 +202,14 @@ public:
+ 
+ 		trackBar = false;
+ 		mCmdManager.registerProvider(this);
++		actions = new ActionList("", 0, false);
+ 	}
+ 
++	~Private() {
++		delete actions;
++	}
++
++
+ 	GCMainDlg *dlg;
+ 	int state;
+ 	MUCManager *mucManager;
+@@ -210,7 +217,8 @@ public:
+ 	QString password;
+ 	QString topic;
+ 	bool nonAnonymous;		 // got status code 100 ?
+-	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_ps, *act_templates, *act_bookmark, *act_html_text;
++	ActionList *actions;
++	IconAction *act_bookmark;
+ 	QAction *act_copy_muc_jid;
+ 	TypeAheadFindBar *typeahead;
+ //#ifdef WHITEBOARDING
+@@ -678,8 +686,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	ui_.lb_ident->setAccount(account());
+ 	ui_.lb_ident->setShowJid(false);
+ 	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
+-	d->tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
+-	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
++	PsiOptions *options = PsiOptions::instance();
++	d->tabmode = options->getOption("options.ui.tabs.use-tabs").toBool();
++	setWindowBorder(options->getOption("options.ui.decorate-windows").toBool());
+ 	if (!d->tabmode && !isBorder()) {
+ 		d->winHeader_ = new PsiWindowHeader(this);
+ 		ui_.vboxLayout1->insertWidget(0, d->winHeader_);
+@@ -716,7 +725,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ #ifndef HAVE_QT5
+ 	ui_.lv_users->model()->setSupportedDragActions(Qt::CopyAction);
+ #endif
+-	if ( PsiOptions::instance()->getOption("options.ui.contactlist.disable-scrollbar").toBool() ) {
++	if (options->getOption("options.ui.contactlist.disable-scrollbar").toBool() ) {
+ 		ui_.lv_users->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ 	}
+ 	connect(ui_.lv_users, SIGNAL(action(const QString &, const Status &, int)), SLOT(lv_action(const QString &, const Status &, int)));
+@@ -724,28 +733,54 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	hb3a->addWidget( d->typeahead );
+ 	ui_.vboxLayout1->addLayout(hb3a);
+ 
+-	d->act_clear = new IconAction (tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
+-	connect( d->act_clear, SIGNAL(triggered()), SLOT(doClearButton()));
++	ActionList* actList = account()->psi()->actionList()->actionLists(PsiActionList::Actions_Groupchat).at(0);
++	foreach (const QString &name, actList->actions()) {
++		IconAction *action = actList->action(name)->copy();
++		action->setParent(this);
++		d->actions->addAction(name, action);
+ 
+-	d->act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
+-	connect(d->act_find, SIGNAL(triggered()), d->typeahead, SLOT(toggleVisibility()));
+-
+-	d->act_configure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("&Configure Room"), 0, this);
+-	connect(d->act_configure, SIGNAL(triggered()), SLOT(configureRoom()));
++		if (name == "gchat_clear") {
++			connect(action, SIGNAL(triggered()), SLOT(doClearButton()));
++		}
++		else if (name == "gchat_find") {
++			// typeahead find
++			connect(action, SIGNAL(triggered()), d->typeahead, SLOT(toggleVisibility()));
++		// -- typeahead
++		}
++		else if (name == "gchat_configure") {
++			connect(action, SIGNAL(triggered()), SLOT(configureRoom()));
++		}
++		else if (name == "gchat_html_text") {
++			connect(action, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
++		}
++		else if (name == "gchat_icon") {
++			connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), d, SLOT(addEmoticon(QString)));
++			action->setMenu(pa->psi()->iconSelectPopup());
++			ui_.tb_emoticons->setMenu(pa->psi()->iconSelectPopup());
++		}
++		else if (name == "gchat_info") {
++			connect(action, SIGNAL(triggered()), SLOT(doInfo()));
++		}
++		else if (name == "gchat_ps") {
++			connect(action, SIGNAL(triggered()), SLOT(doPasteAndSend()));
++		}
++		else if (name == "gchat_templates") {
++			action->setMenu(getTemplateMenu());
++		}
++	}
+ 
+-	d->act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
+-	connect(d->act_html_text, SIGNAL(triggered()), d->mle(), SLOT(doHTMLTextMenu()));
++	actList = account()->psi()->actionList()->actionLists(PsiActionList::Actions_Common).at(0);
++	foreach (const QString &name, actList->actions()) {
++		IconAction *action = actList->action(name)->copy();
++		action->setParent(this);
++		d->actions->addAction(name, action);
++	}
+ 
+ //#ifdef WHITEBOARDING
+ //	d->act_whiteboard = new IconAction(tr("Open a Whiteboard"), "psi/whiteboard", tr("Open a &Whiteboard"), 0, this);
+ //	connect(d->act_whiteboard, SIGNAL(triggered()), SLOT(openWhiteboard()));
+ //#endif
+ 
+-	connect(pa->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), d, SLOT(addEmoticon(QString)));
+-	d->act_icon = new IconAction( tr( "Select Icon" ), "psi/smile", tr( "Select Icon" ), 0, this );
+-	d->act_icon->setMenu( pa->psi()->iconSelectPopup() );
+-	ui_.tb_emoticons->setMenu(pa->psi()->iconSelectPopup());
+-
+ 	d->act_nick = new QAction(this);
+ 	d->act_nick->setText(tr("Change Nickname..."));
+ 	connect(d->act_nick, SIGNAL(triggered()), d, SLOT(doNick()));
+@@ -759,12 +794,6 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(d->act_minimize, SIGNAL(triggered()), SLOT(doMinimize()));
+ 	addAction(d->act_minimize);
+ 
+-	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
+-	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
+-
+-	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
+-	d->act_templates->setMenu(getTemplateMenu());
+-
+ 	d->act_bookmark = new IconAction(this);
+ 	connect(d->act_bookmark, SIGNAL(triggered()), SLOT(doBookmark()));
+ 	ui_.le_topic->addAction(d->act_bookmark);
+@@ -784,19 +813,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 
+ 	int s = PsiIconset::instance()->system().iconSize();
+ 	ui_.toolbar->setIconSize(QSize(s,s));
+-	ui_.toolbar->addAction(d->act_clear);
+-	ui_.toolbar->addAction(d->act_find);
+-	ui_.toolbar->addAction(d->act_configure);
+-	ui_.toolbar->addAction(d->act_html_text);
++
+ //#ifdef WHITEBOARDING
+ //	ui_.toolbar->addAction(d->act_whiteboard);
+ //#endif
+-	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+-	ui_.toolbar->addAction(d->act_icon);
+-	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
+-	ui_.toolbar->addAction(d->act_templates);
+-	((QToolButton *)ui_.toolbar->widgetForAction(d->act_templates))->setPopupMode(QToolButton::InstantPopup);
+-	ui_.toolbar->addAction(d->act_ps);
+ 	ui_.toolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
+ 
+ 	// Common actions
+@@ -834,10 +854,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(ui_.vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
+ 
+ 	// resize the horizontal splitter
+-	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
+-	d->rosterSize = PsiOptions::instance()->getOption("options.ui.muc.roster-width").toInt();
++	d->logSize = options->getOption("options.ui.muc.log-width").toInt();
++	d->rosterSize = options->getOption("options.ui.muc.roster-width").toInt();
+ 	QList<int> list;
+-	bool leftRoster = PsiOptions::instance()->getOption("options.ui.muc.roster-at-left").toBool();
++	bool leftRoster = options->getOption("options.ui.muc.roster-at-left").toBool();
+ 	if(leftRoster)
+ 		list << d->rosterSize << d->logSize;
+ 	else
+@@ -849,8 +869,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
+ 
+ 	// resize the vertical splitter
+-	d->logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
+-	d->chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
++	d->logHeight = options->getOption("options.ui.chat.log-height").toInt();
++	d->chateditHeight = options->getOption("options.ui.chat.chatedit-height").toInt();
+ 	setVSplitterPosition(d->logHeight, d->chateditHeight);
+ 
+ 	X11WM_CLASS("groupchat");
+@@ -862,6 +882,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(d->mucManager, SIGNAL(action_success(MUCManager::Action)), ui_.lv_users, SLOT(update()));
+ 
+ 	setLooks();
++	setToolbuttons();
+ 	setShortcuts();
+ 	invalidateTab();
+ 	setConnecting();
+@@ -962,8 +983,9 @@ void GCMainDlg::ensureTabbedCorrectly()
+ 
+ void GCMainDlg::setShortcuts()
+ {
+-	d->act_clear->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
+-	d->act_find->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
++
++	d->actions->action("gchat_clear")->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
++	d->actions->action("gchat_find")->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
+ 	d->act_send->setShortcuts(ShortcutManager::instance()->shortcuts("chat.send"));
+ 	if (!isTabbed()) {
+ 		d->act_close->setShortcuts(ShortcutManager::instance()->shortcuts("common.close"));
+@@ -1445,7 +1467,7 @@ void GCMainDlg::presence(const QString &
+ 		if (d->configDlg) {
+ 			d->configDlg->setRoleAffiliation(s.mucItem().role(),s.mucItem().affiliation());
+ 		}
+-		d->act_configure->setEnabled(s.mucItem().affiliation() >= MUCItem::Member);
++		d->actions->action("gchat_configure")->setEnabled(s.mucItem().affiliation() >= MUCItem::Member);
+ 	}
+ 
+ 	PsiOptions *options_ = PsiOptions::instance();
+@@ -1890,7 +1912,7 @@ void GCMainDlg::setLooks()
+ 	f.fromString(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
+ 	ui_.lv_users->setFont(f);
+ 
+-	if (PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
++	if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m1.visible").toBool()) {
+ 		ui_.toolbar->show();
+ 		ui_.tb_actions->hide();
+ 		ui_.tb_emoticons->hide();
+@@ -1918,6 +1940,28 @@ void GCMainDlg::setLooks()
+ 	ui_.lv_users->setLooks();
+ }
+ 
++void GCMainDlg::setToolbuttons()
++{
++	ui_.toolbar->clear();
++	PsiOptions *options = PsiOptions::instance();
++	QStringList actionsNames = options->getOption("options.ui.contactlist.toolbars.m1.actions").toStringList();
++	foreach (const QString &actionName, actionsNames) {
++		// Hack. separator action can be added only once.
++		if (actionName == "separator") {
++			ui_.toolbar->addSeparator();
++			continue;
++		}
++
++		IconAction *action = d->actions->action(actionName);
++		if (action) {
++			action->addTo(ui_.toolbar);
++			if (actionName == "gchat_icon" || actionName == "gchat_templates") {
++				((QToolButton *)ui_.toolbar->widgetForAction(action))->setPopupMode(QToolButton::InstantPopup);
++			}
++		}
++	}
++}
++
+ void GCMainDlg::optionsUpdate()
+ {
+ 	/*QMimeSourceFactory *m = ui_.log->mimeSourceFactory();
+@@ -1925,6 +1969,7 @@ void GCMainDlg::optionsUpdate()
+ 	delete m;*/
+ 
+ 	setLooks();
++	setToolbuttons();
+ 	setShortcuts();
+ 	d->typeahead->optionsUpdate();
+ 	// update status icons
+@@ -2050,16 +2095,16 @@ void GCMainDlg::buildMenu()
+ 	// Dialog menu
+ 	d->pm_settings->clear();
+ 
+-	d->act_clear->addTo( d->pm_settings );
+-	d->act_configure->addTo( d->pm_settings );
++	d->actions->action("gchat_clear")->addTo( d->pm_settings );
++	d->actions->action("gchat_configure")->addTo( d->pm_settings );
+ //#ifdef WHITEBOARDING
+ //	d->act_whiteboard->addTo( d->pm_settings );
+ //#endif
+ 	d->pm_settings->addSeparator();
+ 
+-	d->pm_settings->addAction(d->act_icon);
+-	d->pm_settings->addAction(d->act_templates);
+-	d->pm_settings->addAction(d->act_ps);
++	d->pm_settings->addAction(d->actions->action("gchat_icon"));
++	d->pm_settings->addAction(d->actions->action("gchat_templates"));
++	d->pm_settings->addAction(d->actions->action("gchat_ps"));
+ 	d->pm_settings->addAction(d->act_nick);
+ 	d->pm_settings->addAction(d->act_bookmark);
+ }
+@@ -2115,7 +2160,7 @@ void GCMainDlg::doPasteAndSend()
+ 	if(TabbableWidget::isActiveTab()) {
+ 		d->mle()->paste();
+ 		mle_returnPressed();
+-		d->act_ps->setEnabled(false);
++		d->actions->action("gchat_ps")->setEnabled(false);
+ 		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
+ 	}
+ }
+@@ -2193,7 +2238,7 @@ void GCMainDlg::doRemoveBookmark()
+ 
+ void GCMainDlg::psButtonEnabled()
+ {
+-	d->act_ps->setEnabled(true);
++	d->actions->action("gchat_ps")->setEnabled(true);
+ }
+ 
+ void GCMainDlg::sendTemp(const QString &templText)
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -165,6 +165,7 @@ private:
+ 	void appendSysMsg(const MessageView &);
+ 	void appendMessage(const Message &, bool);
+ 	void setLooks();
++	void setToolbuttons();
+ 
+ 	void mucKickMsgHelper(const QString &nick, const Status &s, const QString &nickJid, const QString &title,
+ 			const QString &youSimple, const QString &youBy, const QString &someoneSimple,
+--- git.orig/src/mainwin.cpp
++++ git/src/mainwin.cpp
+@@ -397,8 +397,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	if (allInOne) {
+ 		QString toolOpt = "options.ui.contactlist.toolbars";
+ 		foreach(QString base, PsiOptions::instance()->getChildOptionNames(toolOpt, true, true)) {
+-			// toolbar "Show contacts" is second, so check m1
+-			if (base == toolOpt + ".m1") {
++			// toolbar "Show contacts" is fourth, so check m3
++			if (base == toolOpt + ".m3") {
+ 				d->viewToolBar = new PsiToolBar(base, rosterBar, d->psi->actionList());
+ 				d->viewToolBar->initialize();
+ 				connect(d->viewToolBar, SIGNAL(customize()), d->psi, SLOT(doToolbars()));
+@@ -899,8 +899,14 @@ void MainWin::buildToolbars()
+ 	qDeleteAll(toolbars_);
+ 	toolbars_.clear();
+ 
+-	bool allInOne = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A');
+-	foreach(QString base, PsiOptions::instance()->getChildOptionNames("options.ui.contactlist.toolbars", true, true)) {
++	PsiOptions *options = PsiOptions::instance();
++	bool allInOne = options->getOption("options.ui.tabs.grouping").toString().contains('A');
++	foreach(const QString &base, options->getChildOptionNames("options.ui.contactlist.toolbars", true, true)) {
++		QString toolbarName = options->getOption(base + ".name").toString();
++		if (toolbarName == "Chat" || toolbarName == "Groupchat") {
++			continue;
++		}
++
+ 		PsiToolBar* tb;
+ 		if (allInOne) {
+ 			if (d && d->viewToolBar && (d->viewToolBar->base() == base))
+--- git.orig/src/options/opt_lookfeel_toolbars.ui
++++ git/src/options/opt_lookfeel_toolbars.ui
+@@ -1,45 +1,44 @@
+-<ui version="4.0" >
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
+  <class>LookFeelToolbars</class>
+- <widget class="QWidget" name="LookFeelToolbars" >
+-  <property name="geometry" >
++ <widget class="QWidget" name="LookFeelToolbars">
++  <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>315</width>
++    <width>346</width>
+     <height>256</height>
+    </rect>
+   </property>
+-  <property name="windowTitle" >
++  <property name="windowTitle">
+    <string>LookFeelToolbarsUI</string>
+   </property>
+-  <layout class="QVBoxLayout" >
+-   <property name="margin" >
+-    <number>9</number>
+-   </property>
+-   <property name="spacing" >
++  <layout class="QVBoxLayout">
++   <property name="spacing">
+     <number>6</number>
+    </property>
++   <property name="margin">
++    <number>9</number>
++   </property>
+    <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="margin" >
+-      <number>0</number>
+-     </property>
+-     <property name="spacing" >
++    <layout class="QHBoxLayout">
++     <property name="spacing">
+       <number>6</number>
+      </property>
++     <property name="margin">
++      <number>0</number>
++     </property>
+      <item>
+-      <widget class="QLabel" name="textLabel1" >
+-       <property name="text" >
++      <widget class="QLabel" name="textLabel1">
++       <property name="text">
+         <string>Toolbar:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+-      <widget class="QComboBox" name="cb_toolbars" >
+-       <property name="sizePolicy" >
+-        <sizepolicy>
+-         <hsizetype>3</hsizetype>
+-         <vsizetype>0</vsizetype>
++      <widget class="QComboBox" name="cb_toolbars">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+@@ -48,13 +47,13 @@
+      </item>
+      <item>
+       <spacer>
+-       <property name="orientation" >
++       <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+-       <property name="sizeType" >
++       <property name="sizeType">
+         <enum>QSizePolicy::Maximum</enum>
+        </property>
+-       <property name="sizeHint" >
++       <property name="sizeHint" stdset="0">
+         <size>
+          <width>30</width>
+          <height>20</height>
+@@ -63,21 +62,21 @@
+       </spacer>
+      </item>
+      <item>
+-      <widget class="IconButton" name="pb_addToolbar" >
+-       <property name="text" >
++      <widget class="IconButton" name="pb_addToolbar">
++       <property name="text">
+         <string>&amp;Add</string>
+        </property>
+-       <property name="shortcut" >
++       <property name="shortcut">
+         <string>Alt+A</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+-      <widget class="IconButton" name="pb_deleteToolbar" >
+-       <property name="text" >
++      <widget class="IconButton" name="pb_deleteToolbar">
++       <property name="text">
+         <string>&amp;Delete</string>
+        </property>
+-       <property name="shortcut" >
++       <property name="shortcut">
+         <string>Alt+D</string>
+        </property>
+       </widget>
+@@ -85,75 +84,77 @@
+     </layout>
+    </item>
+    <item>
+-    <widget class="Line" name="line2" >
+-     <property name="frameShape" >
++    <widget class="Line" name="line2">
++     <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+      </property>
+-     <property name="frameShadow" >
++     <property name="frameShadow">
+       <enum>QFrame::Sunken</enum>
+      </property>
+-     <property name="orientation" >
++     <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="margin" >
+-      <number>0</number>
+-     </property>
+-     <property name="spacing" >
+-      <number>6</number>
+-     </property>
+-     <item>
+-      <widget class="QLabel" name="textLabel20" >
+-       <property name="text" >
+-        <string>Name:</string>
+-       </property>
+-      </widget>
+-     </item>
+-     <item>
+-      <widget class="QLineEdit" name="le_toolbarName" />
+-     </item>
+-    </layout>
++    <widget class="QWidget" name="w_toolbarName" native="true">
++     <layout class="QHBoxLayout">
++      <property name="spacing">
++       <number>6</number>
++      </property>
++      <property name="margin">
++       <number>1</number>
++      </property>
++      <item>
++       <widget class="QLabel" name="textLabel20">
++        <property name="text">
++         <string>Name:</string>
++        </property>
++       </widget>
++      </item>
++      <item>
++       <widget class="QLineEdit" name="le_toolbarName"/>
++      </item>
++     </layout>
++    </widget>
+    </item>
+    <item>
+-    <layout class="QHBoxLayout" >
+-     <property name="margin" >
+-      <number>0</number>
+-     </property>
+-     <property name="spacing" >
++    <layout class="QHBoxLayout">
++     <property name="spacing">
+       <number>6</number>
+      </property>
++     <property name="margin">
++      <number>0</number>
++     </property>
+      <item>
+-      <widget class="QCheckBox" name="ck_toolbarOn" >
+-       <property name="whatsThis" >
++      <widget class="QCheckBox" name="ck_toolbarOn">
++       <property name="whatsThis">
+         <string>Specifies, whether toolbar is enabled and visible.</string>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>Enabled</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+-      <widget class="QCheckBox" name="ck_toolbarLocked" >
+-       <property name="whatsThis" >
++      <widget class="QCheckBox" name="ck_toolbarLocked">
++       <property name="whatsThis">
+         <string/>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>Locked</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+-       <property name="orientation" >
++       <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+-       <property name="sizeType" >
++       <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+-       <property name="sizeHint" >
++       <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+@@ -164,35 +165,35 @@
+     </layout>
+    </item>
+    <item>
+-    <widget class="Line" name="line3" >
+-     <property name="frameShape" >
++    <widget class="Line" name="line3">
++     <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+      </property>
+-     <property name="frameShadow" >
++     <property name="frameShadow">
+       <enum>QFrame::Sunken</enum>
+      </property>
+-     <property name="orientation" >
++     <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+-    <layout class="QGridLayout" >
+-     <property name="margin" >
++    <layout class="QGridLayout">
++     <property name="margin">
+       <number>0</number>
+      </property>
+-     <property name="spacing" >
++     <property name="spacing">
+       <number>6</number>
+      </property>
+-     <item row="3" column="3" >
++     <item row="3" column="3">
+       <spacer>
+-       <property name="orientation" >
++       <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+-       <property name="sizeType" >
++       <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+-       <property name="sizeHint" >
++       <property name="sizeHint" stdset="0">
+         <size>
+          <width>25</width>
+          <height>101</height>
+@@ -200,79 +201,73 @@
+        </property>
+       </spacer>
+      </item>
+-     <item row="1" column="3" >
+-      <widget class="IconToolButton" name="tb_up" >
+-       <property name="sizePolicy" >
+-        <sizepolicy>
+-         <hsizetype>0</hsizetype>
+-         <vsizetype>0</vsizetype>
++     <item row="1" column="3">
++      <widget class="IconToolButton" name="tb_up">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>...</string>
+        </property>
+-       <property name="psiIconName" stdset="0" >
++       <property name="psiIconName" stdset="0">
+         <string>psi/arrowUp</string>
+        </property>
+       </widget>
+      </item>
+-     <item rowspan="3" row="1" column="2" >
+-      <widget class="QListWidget" name="lw_selectedActions" >
+-       <property name="editTriggers" >
++     <item row="1" column="2" rowspan="3">
++      <widget class="QListWidget" name="lw_selectedActions">
++       <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+-       <property name="sortingEnabled" >
++       <property name="sortingEnabled">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+-     <item row="2" column="3" >
+-      <widget class="IconToolButton" name="tb_down" >
+-       <property name="sizePolicy" >
+-        <sizepolicy>
+-         <hsizetype>0</hsizetype>
+-         <vsizetype>0</vsizetype>
++     <item row="2" column="3">
++      <widget class="IconToolButton" name="tb_down">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>...</string>
+        </property>
+-       <property name="psiIconName" stdset="0" >
++       <property name="psiIconName" stdset="0">
+         <string>psi/arrowDown</string>
+        </property>
+       </widget>
+      </item>
+-     <item row="1" column="1" >
+-      <widget class="IconToolButton" name="tb_right" >
+-       <property name="sizePolicy" >
+-        <sizepolicy>
+-         <hsizetype>0</hsizetype>
+-         <vsizetype>0</vsizetype>
++     <item row="1" column="1">
++      <widget class="IconToolButton" name="tb_right">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>...</string>
+        </property>
+-       <property name="psiIconName" stdset="0" >
++       <property name="psiIconName" stdset="0">
+         <string>psi/arrowRight</string>
+        </property>
+       </widget>
+      </item>
+-     <item row="3" column="1" >
++     <item row="3" column="1">
+       <spacer>
+-       <property name="orientation" >
++       <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+-       <property name="sizeType" >
++       <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+-       <property name="sizeHint" >
++       <property name="sizeHint" stdset="0">
+         <size>
+          <width>25</width>
+          <height>91</height>
+@@ -280,61 +275,59 @@
+        </property>
+       </spacer>
+      </item>
+-     <item row="0" column="0" >
+-      <widget class="QLabel" name="textLabel25" >
+-       <property name="text" >
++     <item row="0" column="0">
++      <widget class="QLabel" name="textLabel25">
++       <property name="text">
+         <string>A&amp;vailable actions:</string>
+        </property>
+-       <property name="buddy" >
++       <property name="buddy">
+         <cstring>tw_availActions</cstring>
+        </property>
+       </widget>
+      </item>
+-     <item row="2" column="1" >
+-      <widget class="IconToolButton" name="tb_left" >
+-       <property name="sizePolicy" >
+-        <sizepolicy>
+-         <hsizetype>0</hsizetype>
+-         <vsizetype>0</vsizetype>
++     <item row="2" column="1">
++      <widget class="IconToolButton" name="tb_left">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+-       <property name="text" >
++       <property name="text">
+         <string>...</string>
+        </property>
+-       <property name="psiIconName" stdset="0" >
++       <property name="psiIconName" stdset="0">
+         <string>psi/arrowLeft</string>
+        </property>
+       </widget>
+      </item>
+-     <item rowspan="3" row="1" column="0" >
+-      <widget class="QTreeWidget" name="tw_availActions" >
+-       <property name="editTriggers" >
++     <item row="1" column="0" rowspan="3">
++      <widget class="QTreeWidget" name="tw_availActions">
++       <property name="editTriggers">
+         <set>QAbstractItemView::NoEditTriggers</set>
+        </property>
+-       <property name="rootIsDecorated" >
++       <property name="rootIsDecorated">
+         <bool>false</bool>
+        </property>
+-       <property name="sortingEnabled" >
++       <property name="sortingEnabled">
+         <bool>false</bool>
+        </property>
+-       <property name="columnCount" >
++       <property name="columnCount">
+         <number>1</number>
+        </property>
+        <column>
+-        <property name="text" >
++        <property name="text">
+          <string/>
+         </property>
+        </column>
+       </widget>
+      </item>
+-     <item row="0" column="2" >
+-      <widget class="QLabel" name="textLabel24" >
+-       <property name="text" >
++     <item row="0" column="2">
++      <widget class="QLabel" name="textLabel24">
++       <property name="text">
+         <string>Curr&amp;ent actions:</string>
+        </property>
+-       <property name="buddy" >
++       <property name="buddy">
+         <cstring>lw_selectedActions</cstring>
+        </property>
+       </widget>
+@@ -343,7 +336,7 @@
+    </item>
+   </layout>
+  </widget>
+- <layoutdefault spacing="6" margin="11" />
++ <layoutdefault spacing="6" margin="11"/>
+  <customwidgets>
+   <customwidget>
+    <class>IconToolButton</class>
+--- git.orig/src/options/opt_toolbars.cpp
++++ git/src/options/opt_toolbars.cpp
+@@ -23,6 +23,10 @@
+ #include <QList>
+ #include <QVBoxLayout>
+ 
++#define CHAT_TOOLBAR       0
++#define GROUPCHAT_TOOLBAR  1
++#define ROSTER_TOOLBAR     2
++
+ class LookFeelToolbarsUI : public QWidget, public Ui::LookFeelToolbars
+ {
+ public:
+@@ -39,12 +43,41 @@ class OptionsTabToolbars::Private
+ {
+ public:
+ 	QList<ToolbarPrefs> toolbars;
++	class OptionsTabToolbars *q;
+ 
+ 	PsiActionList::ActionsType class2id() {
+ 		int ret = (int)PsiActionList::Actions_Common;
+ 		ret |= (int)PsiActionList::Actions_MainWin;
+ 		return (PsiActionList::ActionsType)ret;
+ 	}
++
++	PsiActionList::ActionsType class2idChat() {
++		int ret = (int)PsiActionList::Actions_Common;
++		ret |= (int)PsiActionList::Actions_Chat;
++		return (PsiActionList::ActionsType)ret;
++	}
++
++	PsiActionList::ActionsType class2idGroupchat() {
++		int ret = (int)PsiActionList::Actions_Common;
++		ret |= (int)PsiActionList::Actions_Groupchat;
++		return (PsiActionList::ActionsType)ret;
++	}
++
++	PsiActionList::ActionsType currentType() {
++		PsiActionList::ActionsType type;
++		LookFeelToolbarsUI *d = (LookFeelToolbarsUI*) q->w;
++
++		if (d->cb_toolbars->currentIndex() == CHAT_TOOLBAR) {
++			type = class2idChat();
++		}
++		else if (d->cb_toolbars->currentIndex() == GROUPCHAT_TOOLBAR) {
++			type = class2idGroupchat();
++		}
++		else {
++			type = class2id();
++		}
++		return type;
++	}
+ };
+ 
+ OptionsTabToolbars::OptionsTabToolbars(QObject *parent)
+@@ -52,6 +85,7 @@ OptionsTabToolbars::OptionsTabToolbars(Q
+ {
+ 	w = 0;
+ 	p = new Private();
++	p->q = this;
+ 
+ 	noDirty = false;
+ }
+@@ -185,7 +219,11 @@ void OptionsTabToolbars::restoreOptions(
+ 
+ 	PsiOptions *o = PsiOptions::instance();
+ 
+-	QStringList toolbarBases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true);
++	QStringList toolbarBases;
++	toolbarBases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true);
++
++	QString chatToolbarName = tr("Chat");
++	QString groupchatToolbarName = tr("Groupchat");
+ 
+ 	foreach(QString base, toolbarBases) {
+ 		ToolbarPrefs tb;
+@@ -201,15 +239,19 @@ void OptionsTabToolbars::restoreOptions(
+ 		tb.keys = o->getOption(base + ".actions").toStringList();
+ 
+ 		p->toolbars << tb;
+-		d->cb_toolbars->addItem(tb.name);
++		if (tb.name == "Chat") {
++			d->cb_toolbars->addItem(chatToolbarName);
++		}
++		else if (tb.name == "Groupchat") {
++			d->cb_toolbars->addItem(groupchatToolbarName);
++		}
++		else {
++			d->cb_toolbars->addItem(tb.name);
++		}
+ 	}
+ 
+-	if (d->cb_toolbars->count() > 0) {
+-		d->cb_toolbars->setCurrentIndex(0);
+-		toolbarSelectionChanged(0);
+-	}
+-	else
+-		toolbarSelectionChanged(-1);
++	d->cb_toolbars->setCurrentIndex(0);
++	toolbarSelectionChanged(0);
+ }
+ 
+ //----------------------------------------------------------------------------
+@@ -311,7 +353,8 @@ void OptionsTabToolbars::toolbarSelectio
+ 	d->le_toolbarName->setEnabled(enable);
+ 	// d->pb_toolbarPosition->setEnabled(enable && moveable);
+ 	d->ck_toolbarOn->setEnabled(enable);
+-	d->ck_toolbarLocked->setEnabled(enable && moveable);
++	d->ck_toolbarLocked->setEnabled(enable);
++	d->ck_toolbarLocked->setVisible(item >= ROSTER_TOOLBAR || item < CHAT_TOOLBAR);
+ 	// d->ck_toolbarStretch->setEnabled(enable && moveable);
+ 	d->lw_selectedActions->setEnabled(enable && customizeable);
+ 	d->tw_availActions->setEnabled(enable && customizeable);
+@@ -319,8 +362,9 @@ void OptionsTabToolbars::toolbarSelectio
+ 	d->tb_down->setEnabled(enable && customizeable);
+ 	d->tb_left->setEnabled(enable && customizeable);
+ 	d->tb_right->setEnabled(enable && customizeable);
+-	d->pb_deleteToolbar->setEnabled(enable);
++	d->pb_deleteToolbar->setEnabled((item >= CHAT_TOOLBAR && item < ROSTER_TOOLBAR) ? false : enable);
+ 	d->cb_toolbars->setEnabled(enable);
++	d->w_toolbarName->setVisible(item >= ROSTER_TOOLBAR || item < CHAT_TOOLBAR);
+ 
+ 	d->tw_availActions->clear();
+ 	d->lw_selectedActions->clear();
+@@ -335,9 +379,11 @@ void OptionsTabToolbars::toolbarSelectio
+ 	ToolbarPrefs tb;
+ 	tb = p->toolbars[n];
+ 
+-	d->le_toolbarName->setText(tb.name);
++	if (item > 1) {
++		d->le_toolbarName->setText(tb.name);
++		d->ck_toolbarLocked->setChecked(tb.locked || !moveable);
++	}
+ 	d->ck_toolbarOn->setChecked(tb.on);
+-	d->ck_toolbarLocked->setChecked(tb.locked || !moveable);
+ 	// d->ck_toolbarStretch->setChecked(tb.stretchable);
+ 
+ 	{
+@@ -345,7 +391,9 @@ void OptionsTabToolbars::toolbarSelectio
+ 		QTreeWidget *tw = d->tw_availActions;
+ 		QTreeWidgetItem *lastRoot = 0;
+ 
+-		foreach(ActionList* actionList, psi->actionList()->actionLists(p->class2id())) {
++		QList<ActionList*> lists = psi->actionList()->actionLists(p->currentType());
++
++		foreach(ActionList* actionList, lists) {
+ 			QTreeWidgetItem *root = new QTreeWidgetItem(tw, lastRoot);
+ 			lastRoot = root;
+ 			root->setText(0, actionList->name());
+@@ -376,7 +424,7 @@ void OptionsTabToolbars::toolbarSelectio
+ 
+ 	QStringList::Iterator it = tb.keys.begin();
+ 	for (; it != tb.keys.end(); ++it) {
+-		addToolbarAction(d->lw_selectedActions, *it, p->class2id());
++		addToolbarAction(d->lw_selectedActions, *it, p->currentType());
+ 	}
+ 	updateArrows();
+ 
+@@ -506,7 +554,7 @@ void OptionsTabToolbars::toolbarAddActio
+ 	if (!item || item->data(0, Qt::UserRole).toString().isEmpty())
+ 		return;
+ 
+-	addToolbarAction(d->lw_selectedActions, item->data(0, Qt::UserRole).toString(), p->class2id());
++	addToolbarAction(d->lw_selectedActions, item->data(0, Qt::UserRole).toString(), p->currentType());
+ 	rebuildToolbarKeys();
+ 	updateArrows();
+ }
+@@ -537,9 +585,11 @@ void OptionsTabToolbars::toolbarDataChan
+ 	ToolbarPrefs tb = p->toolbars[n];
+ 
+ 	tb.dirty = true;
+-	tb.name = d->le_toolbarName->text();
++	if (n > 1) {
++		tb.name = d->le_toolbarName->text();
++		tb.locked = d->ck_toolbarLocked->isChecked();
++	}
+ 	tb.on = d->ck_toolbarOn->isChecked();
+-	tb.locked = d->ck_toolbarLocked->isChecked();
+ 	// tb.stretchable = d->ck_toolbarStretch->isChecked();
+ 
+ 	p->toolbars[n] = tb;
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -59,6 +59,8 @@ private:
+ 	void createChat();
+ 	void createGroupchat();
+ 
++	void addPluginsActions(ActionsType type);
++
+ 	struct ActionNames {
+ 		const char *name;
+ 		IconAction *action;
+@@ -443,10 +445,76 @@ void PsiActionList::Private::createMessa
+ 
+ void PsiActionList::Private::createChat()
+ {
++	{
++		IconAction *actClear = new IconAction(tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
++		IconAction *actFind = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
++		IconAction *actHtmlText = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
++		IconAction *actAddContact = new IconAction(tr("Add Contact To Roster"), "psi/addContact", tr("Add Contact"), 0, this);
++		IconAction *actIcon = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
++		IconAction *actVoice = new IconAction(tr("Voice Call"), "psi/avcall", tr("Voice Call"), 0, this);
++		IconAction *actFile = new IconAction(tr("Send File"), "psi/upload", tr("Send File"), 0, this);
++		IconAction *actPgp = new IconAction(tr("Toggle Encryption"), "psi/cryptoYes", tr("Toggle Encryption"), 0, this, 0, true);
++		IconAction *actInfo = new IconAction(tr("User Info"), "psi/vCard", tr("User Info"), 0, this);
++		IconAction *actHistory = new IconAction(tr("Message History"), "psi/history", tr("Message History"), 0, this);
++		IconAction *actCompact = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
++		IconAction *actPs = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
++		IconAction *actTemplates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
++		IconAction *actActiveContacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
++
++		ActionNames actions[] = {
++			{ "chat_clear",  actClear  },
++			{ "chat_find", actFind   },
++			{ "chat_html_text", actHtmlText   },
++			{ "chat_add_contact", actAddContact   },
++			{ "chat_icon", actIcon   },
++			{ "chat_voice", actVoice   },
++			{ "chat_file", actFile   },
++			{ "chat_pgp", actPgp   },
++			{ "chat_info", actInfo   },
++			{ "chat_history", actHistory   },
++			{ "chat_compact", actCompact   },
++			{ "chat_ps", actPs   },
++			{ "chat_templates", actTemplates   },
++			{ "chat_active_contacts", actActiveContacts   },
++			{ "", 0 }
++		};
++
++		createActionList(tr("Chat basic buttons"), Actions_Chat, actions);
++	}
++
++	addPluginsActions(Actions_Chat);
+ }
+ 
+ void PsiActionList::Private::createGroupchat()
+ {
++	{
++		IconAction *actClear = new IconAction(tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
++		IconAction *actFind = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
++		IconAction *actHtmlText = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
++		IconAction *actConfigure = new IconAction(tr("Configure Room"), "psi/configure-room", tr("Configure Room"), 0, this);
++		IconAction *actIcon = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
++		IconAction *actPs = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
++		IconAction *actTemplates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
++
++		ActionNames actions[] = {
++			{ "gchat_clear",  actClear  },
++			{ "gchat_find", actFind   },
++			{ "gchat_html_text", actHtmlText   },
++			{ "gchat_configure", actConfigure   },
++			{ "gchat_icon", actIcon   },
++			{ "gchat_ps", actPs   },
++			{ "gchat_templates", actTemplates   },
++			{ "", 0 }
++		};
++
++		createActionList(tr("Groupchat basic buttons"), Actions_Groupchat, actions);
++	}
++
++	addPluginsActions(Actions_Groupchat);
++}
++
++void PsiActionList::Private::addPluginsActions(ActionsType type)
++{
+ }
+ 
+ void PsiActionList::Private::optionsChanged()
+--- git.orig/src/psiactionlist.h
++++ git/src/psiactionlist.h
+@@ -35,8 +35,8 @@ public:
+ 		Actions_Common    = (1 << 0),
+ 		Actions_MainWin   = (1 << 1),
+ 		// Actions_Message   = (1 << 2),
+-		// Actions_Chat      = (1 << 3),
+-		// Actions_Groupchat = (1 << 4)
++		Actions_Chat      = (1 << 3),
++		Actions_Groupchat = (1 << 4)
+ 	};
+ 
+ public:
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -48,7 +48,8 @@
+ #include "xmpp_tasks.h"
+ #include "lastactivitytask.h"
+ #include "avcall/avcall.h"
+-
++#include "actionlist.h"
++#include "psiactionlist.h"
+ 
+ #define MCMDCHAT		"http://psi-im.org/ids/mcmd#chatmain"
+ 
+@@ -171,7 +172,8 @@ private:
+ 
+ 
+ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
+-	: ChatDlg(jid, pa, tabManager), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_), autoPGP_(true)
++	: ChatDlg(jid, pa, tabManager), actions_(new ActionList("", 0, false)), mCmdManager_(&mCmdSite_), tabCompletion(&mCmdManager_)
++	, autoPGP_(true)
+ {
+ 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
+ 	connect(account(), SIGNAL(addedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
+@@ -196,6 +198,7 @@ PsiChatDlg::~PsiChatDlg()
+ 		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
+ 		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
+ 	}
++	delete actions_;
+ }
+ 
+ void PsiChatDlg::initUi()
+@@ -355,7 +358,7 @@ void PsiChatDlg::setLooks()
+ 		ui_.lb_client->show();
+ 		ui_.lb_status->show();
+ 		ui_.le_jid->show();
+-		if (PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
++		if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool()) {
+ 			ui_.toolbar->show();
+ 			ui_.tb_actions->hide();
+ 			ui_.tb_emoticons->hide();
+@@ -372,25 +375,26 @@ void PsiChatDlg::setLooks()
+ 	updateIdentityVisibility();
+ 	updateCountVisibility();
+ 	updateContactAdding();
++	updateToolbuttons();
+ 
+ 	// toolbuttons
+ 	QIcon i;
+ 	i.addPixmap(IconsetFactory::icon("psi/cryptoNo").impix(),  QIcon::Normal, QIcon::Off);
+ 	i.addPixmap(IconsetFactory::icon("psi/cryptoYes").impix(), QIcon::Normal, QIcon::On);
+-	act_pgp_->setPsiIcon(0);
+-	act_pgp_->setIcon(i);
++	actions_->action("chat_pgp")->setPsiIcon(0);
++	actions_->action("chat_pgp")->setIcon(i);
+ }
+ 
+ void PsiChatDlg::setShortcuts()
+ {
+ 	ChatDlg::setShortcuts();
+ 
+-	act_clear_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
++	actions_->action("chat_clear")->setShortcuts(ShortcutManager::instance()->shortcuts("chat.clear"));
+ // typeahead find bar
+-	act_find->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
++	actions_->action("chat_find")->setShortcuts(ShortcutManager::instance()->shortcuts("chat.find"));
+ // -- typeahead
+-	act_info_->setShortcuts(ShortcutManager::instance()->shortcuts("common.user-info"));
+-	act_history_->setShortcuts(ShortcutManager::instance()->shortcuts("common.history"));
++	actions_->action("chat_info")->setShortcuts(ShortcutManager::instance()->shortcuts("common.user-info"));
++	actions_->action("chat_history")->setShortcuts(ShortcutManager::instance()->shortcuts("common.history"));
+ 
+ 	act_mini_cmd_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
+ 
+@@ -425,11 +429,41 @@ void PsiChatDlg::updateContactAdding(Psi
+ 		Jid rj = realJid();
+ 		UserListItem *uli;
+ 		if (rj.isNull() || ((uli = account()->findFirstRelevant(rj)) && (uli->inList() || uli->isSelf()))) {
+-			act_add_contact->setVisible(false);
++			actions_->action("chat_add_contact")->setVisible(false);
+ 		} else {
+-			act_add_contact->setVisible(true);
++			actions_->action("chat_add_contact")->setVisible(true);
++		}
++	}
++}
++
++void PsiChatDlg::updateToolbuttons()
++{
++	ui_.toolbar->clear();
++	PsiOptions *options = PsiOptions::instance();
++	QStringList actionsNames = options->getOption("options.ui.contactlist.toolbars.m0.actions").toStringList();
++	foreach (const QString &actionName, actionsNames) {
++		if (actionName == "chat_voice" && !AvCallManager::isSupported()) {
++			continue;
++		}
++		if (actionName == "chat_pgp" && !options->getOption("options.pgp.enable").toBool()) {
++			continue;
++		}
++
++		// Hack. separator action can be added only once.
++		if (actionName == "separator") {
++			ui_.toolbar->addSeparator();
++			continue;
++		}
++
++		IconAction *action = actions_->action(actionName);
++		if (action) {
++			action->addTo(ui_.toolbar);
++			if (actionName == "chat_icon" || actionName == "chat_templates") {
++				((QToolButton *)ui_.toolbar->widgetForAction(action))->setPopupMode(QToolButton::InstantPopup);
++			}
+ 		}
+ 	}
++
+ }
+ 
+ void PsiChatDlg::copyUserJid()
+@@ -453,54 +487,69 @@ void PsiChatDlg::initToolButtons()
+ 	ui_.vboxLayout1->addLayout(hb3a);
+ // -- typeahead
+ 
+-	act_clear_ = new IconAction(tr("Clear Chat Window"), "psi/clearChat", tr("Clear Chat Window"), 0, this);
+-	connect(act_clear_, SIGNAL(triggered()), SLOT(doClearButton()));
+-
+-// typeahead find
+-	act_find = new IconAction(tr("Find"), "psi/search", tr("&Find"), 0, this, "", true);
+-	connect(act_find, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
+-// -- typeahead
+-
+-	act_html_text = new IconAction(tr("Set Text Format"), "psi/text", tr("Set Text Format"), 0, this);
+-	connect(act_html_text, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
+-
+-	act_add_contact = new IconAction(tr("Add Contact To Roster"), "psi/addContact", tr("Add Contact"), 0, this);
+-	connect(act_add_contact, SIGNAL(triggered()), SLOT(addContact()));
+-
+-	connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
+-	act_icon_ = new IconAction(tr("Select Icon"), "psi/smile", tr("Select Icon"), 0, this);
+-	act_icon_->setMenu(account()->psi()->iconSelectPopup());
+-	ui_.tb_emoticons->setMenu(account()->psi()->iconSelectPopup());
+-
+-	act_voice_ = new IconAction(tr("Voice Call"), "psi/avcall", tr("Voice Call"), 0, this);
+-	connect(act_voice_, SIGNAL(triggered()), SLOT(doVoice()));
+-	//act_voice_->setEnabled(false);
+-	ui_.tb_voice->setDefaultAction(act_voice_);
+-
+-	act_file_ = new IconAction(tr("Send File"), "psi/upload", tr("Send File"), 0, this);
+-	connect(act_file_, SIGNAL(triggered()), SLOT(doFile()));
+-
+-	act_pgp_ = new IconAction(tr("Toggle Encryption"), "", tr("Toggle Encryption"), 0, this, 0, true);
+-	ui_.tb_pgp->setDefaultAction(act_pgp_);
+-	connect(act_pgp_, SIGNAL(triggered(bool)), SLOT(actPgpToggled(bool)));
+-
+-	act_info_ = new IconAction(tr("User Info"), "psi/vCard", tr("User Info"), 0, this);
+-	connect(act_info_, SIGNAL(triggered()), SLOT(doInfo()));
+-
+-	act_history_ = new IconAction(tr("Message History"), "psi/history", tr("Message History"), 0, this);
+-	connect(act_history_, SIGNAL(triggered()), SLOT(doHistory()));
++	ActionList* list = account()->psi()->actionList()->actionLists(PsiActionList::Actions_Chat).at(0);
++	foreach (const QString &name, list->actions()) {
++		IconAction *action = list->action(name)->copy();
++		action->setParent(this);
++		actions_->addAction(name, action);
+ 
+-	act_compact_ = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
+-	connect(act_compact_, SIGNAL(triggered()), SLOT(toggleSmallChat()));
+-
+-	act_ps_ = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
+-	connect(act_ps_, SIGNAL(triggered()), SLOT(doPasteAndSend()));
+-
+-	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
+-	act_templates_->setMenu(getTemplateMenu());
++		if (name == "chat_clear") {
++			connect(action, SIGNAL(triggered()), SLOT(doClearButton()));
++		}
++		else if (name == "chat_find") {
++			// typeahead find
++			connect(action, SIGNAL(triggered()), typeahead, SLOT(toggleVisibility()));
++		// -- typeahead
++		}
++		else if (name == "chat_html_text") {
++			connect(action, SIGNAL(triggered()), chatEdit(), SLOT(doHTMLTextMenu()));
++		}
++		else if (name == "chat_add_contact") {
++			connect(action, SIGNAL(triggered()), SLOT(addContact()));
++		}
++		else if (name == "chat_icon") {
++			connect(account()->psi()->iconSelectPopup(), SIGNAL(textSelected(QString)), this, SLOT(addEmoticon(QString)));
++			action->setMenu(account()->psi()->iconSelectPopup());
++			ui_.tb_emoticons->setMenu(account()->psi()->iconSelectPopup());
++		}
++		else if (name == "chat_voice") {
++			connect(action, SIGNAL(triggered()), SLOT(doVoice()));
++			//act_voice_->setEnabled(false);
++			ui_.tb_voice->setDefaultAction(actions_->action("chat_voice"));
++		}
++		else if (name == "chat_file") {
++			connect(action, SIGNAL(triggered()), SLOT(doFile()));
++		}
++		else if (name == "chat_pgp") {
++			ui_.tb_pgp->setDefaultAction(actions_->action("chat_pgp"));
++			connect(action, SIGNAL(triggered(bool)), SLOT(actPgpToggled(bool)));
++		}
++		else if (name == "chat_info") {
++			connect(action, SIGNAL(triggered()), SLOT(doInfo()));
++		}
++		else if (name == "chat_history") {
++			connect(action, SIGNAL(triggered()), SLOT(doHistory()));
++		}
++		else if (name == "chat_compact") {
++			connect(action, SIGNAL(triggered()), SLOT(toggleSmallChat()));
++		}
++		else if (name == "chat_ps") {
++			connect(action, SIGNAL(triggered()), SLOT(doPasteAndSend()));
++		}
++		else if (name == "chat_templates") {
++			action->setMenu(getTemplateMenu());
++		}
++		else if (name == "chat_active_contacts") {
++			connect(action, SIGNAL(triggered()), SLOT(actActiveContacts()));
++		}
++	}
+ 
+-	act_active_contacts = new IconAction (tr("Active contacts"), "psi/jabber", tr("Active contacts"), 0, this);
+-	connect(act_active_contacts, SIGNAL(triggered()), SLOT(actActiveContacts()));
++	list = account()->psi()->actionList()->actionLists(PsiActionList::Actions_Common).at(0);
++	foreach (const QString &name, list->actions()) {
++		IconAction *action = list->action(name)->copy();
++		action->setParent(this);
++		actions_->addAction(name, action);
++	}
+ }
+ 
+ void PsiChatDlg::initToolBar()
+@@ -508,28 +557,7 @@ void PsiChatDlg::initToolBar()
+ 	ui_.toolbar->setWindowTitle(tr("Chat Toolbar"));
+ 	int s = PsiIconset::instance()->system().iconSize();
+ 	ui_.toolbar->setIconSize(QSize(s, s));
+-	ui_.toolbar->addAction(act_clear_);
+-// typeahead find bar
+-	ui_.toolbar->addAction(act_find);
+-// -- typeahead
+-	ui_.toolbar->addAction(act_html_text);
+-	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
+-	ui_.toolbar->addAction(act_icon_);
+-	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
+-	ui_.toolbar->addAction(act_templates_);
+-	((QToolButton *)ui_.toolbar->widgetForAction(act_templates_))->setPopupMode(QToolButton::InstantPopup);
+-	ui_.toolbar->addAction(act_ps_);
+-	ui_.toolbar->addAction(act_file_);
+-	if (PsiOptions::instance()->getOption("options.pgp.enable").toBool()) {
+-		ui_.toolbar->addAction(act_pgp_);
+-	}
+-	ui_.toolbar->addAction(act_info_);
+-	ui_.toolbar->addAction(act_history_);
+-	if (AvCallManager::isSupported()) {
+-		ui_.toolbar->addAction(act_voice_);
+-	}
+-	ui_.toolbar->addAction(act_add_contact);
+-	ui_.toolbar->addAction(act_active_contacts);
++	updateToolbuttons();
+ }
+ 
+ void PsiChatDlg::contextMenuEvent(QContextMenuEvent *)
+@@ -798,18 +826,18 @@ void PsiChatDlg::optionsUpdate()
+ void PsiChatDlg::updatePGP()
+ {
+ 	if (account()->hasPGP()) {
+-		act_pgp_->setEnabled(true);
++		actions_->action("chat_pgp")->setEnabled(true);
+ 	}
+ 	else {
+ 		setPGPEnabled(false);
+-		act_pgp_->setEnabled(false);
++		actions_->action("chat_pgp")->setEnabled(false);
+ 	}
+ 
+ 	checkPGPAutostart();
+ 
+ 	ui_.tb_pgp->setVisible(account()->hasPGP() &&
+ 						   !smallChat_ &&
+-						   !PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool());
++						   !PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool());
+ 	ui_.log->setEncryptionEnabled(isEncryptionEnabled());
+ }
+ 
+@@ -865,7 +893,7 @@ void PsiChatDlg::doClearButton()
+ 
+ void PsiChatDlg::setPGPEnabled(bool enabled)
+ {
+-	act_pgp_->setChecked(enabled);
++	actions_->action("chat_pgp")->setChecked(enabled);
+ 	ui_.log->setEncryptionEnabled(enabled);
+ }
+ 
+@@ -879,22 +907,22 @@ void PsiChatDlg::buildMenu()
+ {
+ 	// Dialog menu
+ 	pm_settings_->clear();
+-	pm_settings_->addAction(act_compact_);
+-	pm_settings_->addAction(act_clear_);
++	pm_settings_->addAction(actions_->action("chat_compact"));
++	pm_settings_->addAction(actions_->action("chat_clear"));
+ 	pm_settings_->addSeparator();
+ 
+-	pm_settings_->addAction(act_icon_);
+-	pm_settings_->addAction(act_templates_);
+-	pm_settings_->addAction(act_ps_);
+-	pm_settings_->addAction(act_file_);
++	pm_settings_->addAction(actions_->action("chat_icon_"));
++	pm_settings_->addAction(actions_->action("chat_templates"));
++	pm_settings_->addAction(actions_->action("chat_ps"));
++	pm_settings_->addAction(actions_->action("chat_file"));
+ 	if (AvCallManager::isSupported()) {
+-		pm_settings_->addAction(act_voice_);
++		pm_settings_->addAction(actions_->action("chat_voice"));
+ 	}
+-	pm_settings_->addAction(act_pgp_);
++	pm_settings_->addAction(actions_->action("chat_pgp"));
+ 	pm_settings_->addSeparator();
+ 
+-	pm_settings_->addAction(act_info_);
+-	pm_settings_->addAction(act_history_);
++	pm_settings_->addAction(actions_->action("chat_info"));
++	pm_settings_->addAction(actions_->action("chat_history"));
+ }
+ 
+ void PsiChatDlg::updateCounter()
+@@ -904,7 +932,7 @@ void PsiChatDlg::updateCounter()
+ 
+ bool PsiChatDlg::isEncryptionEnabled() const
+ {
+-	return act_pgp_->isChecked();
++	return actions_->action("chat_pgp")->isChecked();
+ }
+ 
+ void PsiChatDlg::appendSysMsg(const QString &str)
+@@ -1019,14 +1047,14 @@ void PsiChatDlg::doPasteAndSend()
+ 	if(ChatDlg::isActiveTab()) {
+ 		chatEdit()->paste();
+ 		doSend();
+-		act_ps_->setEnabled(false);
++		actions_->action("chat_ps")->setEnabled(false);
+ 		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
+ 	}
+ }
+ 
+ void PsiChatDlg::psButtonEnabled()
+ {
+-	act_ps_->setEnabled(true);
++	actions_->action("chat_ps")->setEnabled(true);
+ }
+ 
+ void PsiChatDlg::sendTemp(const QString &templText)
+--- git.orig/src/psichatdlg.h
++++ git/src/psichatdlg.h
+@@ -12,7 +12,7 @@
+ #include "typeaheadfind.h"
+ #include "psiwindowheader.h"
+ #include "widgets/actionlineedit.h"
+-
++#include "actionlist.h"
+ 
+ class IconAction;
+ class PsiContact;
+@@ -48,6 +48,7 @@ private slots:
+ 	void updateCountVisibility();
+ 	void updateContactAdding(PsiContact* c = 0);
+ 	void updateContactAdding(const Jid &j);
++	void updateToolbuttons();
+ 	void copyUserJid();
+ 
+ 	// reimplemented
+@@ -94,20 +95,8 @@ private:
+ 
+ 	QMenu* pm_settings_;
+ 
+-	IconAction* act_clear_;
+-	IconAction* act_history_;
+-	IconAction* act_info_;
+-	IconAction* act_pgp_;
+-	IconAction* act_icon_;
+-	IconAction* act_file_;
+-	IconAction* act_compact_;
+-	IconAction* act_voice_;
++	ActionList* actions_;
+ 	TypeAheadFindBar *typeahead;
+-	IconAction* act_find;
+-	IconAction* act_ps_;
+-	IconAction* act_templates_;
+-	IconAction* act_html_text;
+-	IconAction* act_add_contact;
+ 	QAction *act_mini_cmd_, *act_minimize_;
+ 
+ 	ActionLineEdit *le_autojid;
+--- git.orig/src/psioptions.cpp
++++ git/src/psioptions.cpp
+@@ -31,10 +31,8 @@
+ #include "statuspreset.h"
+ #include "psitoolbar.h"
+ #include "common.h"
+-
+ using namespace XMPP;
+ 
+-
+ // ----------------------------------------------------------------------------
+ 
+ class OptionsStorageTask : public Task
+@@ -183,6 +181,23 @@ bool PsiOptions::newProfile()
+ 	            ).toOptions(this);
+ 
+ 	{
++		QStringList pluginsKeys;
++		ToolbarPrefs chatToolbar;
++		chatToolbar.on = true;
++		chatToolbar.name = "Chat";
++		chatToolbar.keys << "chat_clear"  << "chat_find" << "chat_html_text" << "chat_add_contact";
++		chatToolbar.keys += pluginsKeys;
++		chatToolbar.keys << "spacer" << "chat_icon" << "chat_templates" << "chat_ps" << "chat_file"
++						 << "chat_pgp" << "chat_info" << "chat_history" << "chat_voice"
++						 << "chat_active_contacts";
++
++		ToolbarPrefs groupchatToolbar;
++		groupchatToolbar.on = true;
++		groupchatToolbar.name = "Groupchat";
++		groupchatToolbar.keys << "gchat_clear"  << "gchat_find" << "gchat_html_text" << "gchat_configure";
++		groupchatToolbar.keys += pluginsKeys;
++		groupchatToolbar.keys << "spacer" << "gchat_icon" << "gchat_templates" << "gchat_ps" ;
++
+ 		ToolbarPrefs buttons;
+ 		buttons.name = tr("Buttons");
+ #ifndef Q_OS_MAC
+@@ -203,7 +218,9 @@ bool PsiOptions::newProfile()
+ 		eventNotifier.dock = Qt3Dock_Bottom;
+ 
+ 		QList<ToolbarPrefs> toolbars;
+-		toolbars << buttons
++		toolbars << chatToolbar
++		         << groupchatToolbar
++				 << buttons
+ 		         << showContacts
+ 		         << eventNotifier;
+ 		foreach(ToolbarPrefs tb, toolbars) {
+@@ -372,4 +389,3 @@ void PsiOptions::resetOption(const QStri
+ 
+ PsiOptions* PsiOptions::instance_ = NULL;
+ PsiOptions* PsiOptions::defaults_ = NULL;
+-
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -1358,6 +1358,62 @@ bool OptionsMigration::fromFile(const QS
+ 
+ void OptionsMigration::lateMigration()
+ {
++	// Add default chat and groupchat toolbars
++	if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.name").toString() != "Chat") {
++		QStringList pluginsKeys;
++		ToolbarPrefs chatToolbar;
++		chatToolbar.on = PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool();
++		PsiOptions::instance()->removeOption("options.ui.chat.central-toolbar");
++		chatToolbar.name = "Chat";
++		chatToolbar.keys << "chat_clear"  << "chat_find" << "chat_html_text" << "chat_add_contact";
++		chatToolbar.keys += pluginsKeys;
++		chatToolbar.keys << "spacer" << "chat_icon" << "chat_templates" << "chat_ps" << "chat_file"
++						 << "chat_pgp" << "chat_info" << "chat_history" << "chat_voice"
++						 << "chat_active_contacts";
++
++		if (PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool()) {
++			chatToolbar.keys.removeAt(chatToolbar.keys.indexOf("chat_ps"));
++		}
++
++		ToolbarPrefs groupchatToolbar;
++		groupchatToolbar.on = chatToolbar.on;
++
++		groupchatToolbar.name = "Groupchat";
++		groupchatToolbar.keys << "gchat_clear"  << "gchat_find" << "gchat_html_text" << "gchat_configure";
++		groupchatToolbar.keys += pluginsKeys;
++		groupchatToolbar.keys << "spacer" << "gchat_icon" << "gchat_templates" << "gchat_ps" ;
++
++		if (PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool()) {
++			groupchatToolbar.keys.removeAt(groupchatToolbar.keys.indexOf("gchat_ps"));
++		}
++		PsiOptions::instance()->removeOption("options.ui.chat.disable-paste-send");
++
++		QList<ToolbarPrefs> toolbars;
++		toolbars << chatToolbar
++		         << groupchatToolbar;
++
++		QStringList toolbarBases = PsiOptions::instance()->getChildOptionNames("options.ui.contactlist.toolbars", true, true);
++		foreach(QString base, toolbarBases) {
++			ToolbarPrefs tb;
++			tb.id = PsiOptions::instance()->getOption(base + ".key").toString();
++			tb.name = PsiOptions::instance()->getOption(base + ".name").toString();
++			tb.on = PsiOptions::instance()->getOption(base + ".visible").toBool();
++			tb.locked = PsiOptions::instance()->getOption(base + ".locked").toBool();
++			tb.dock = (Qt3Dock)PsiOptions::instance()->getOption(base + ".dock.position").toInt(); //FIXME
++			tb.nl = PsiOptions::instance()->getOption(base + ".dock.nl").toBool();
++			tb.keys = PsiOptions::instance()->getOption(base + ".actions").toStringList();
++
++			toolbars << tb;
++		}
++
++		PsiOptions::instance()->removeOption("options.ui.contactlist.toolbars", true);
++
++		foreach(ToolbarPrefs tb, toolbars) {
++			tb.locked = true;
++			PsiToolBar::structToOptions(PsiOptions::instance(), tb);
++		}
++	}
++
+ 	foreach(QString opt, PsiOptions::instance()->allOptionNames()) {
+ 		if (opt.startsWith("options.status.presets.") ||
+ 			opt.startsWith("options.iconsets.service-status.") ||
+--- git.orig/src/widgets/iconaction.cpp
++++ git/src/widgets/iconaction.cpp
+@@ -57,7 +57,7 @@ public:
+ 		action = act;
+ 		Q_ASSERT(action);
+ 
+-		if (parent->isWidgetType())
++		if (parent && parent->isWidgetType())
+ 			((QWidget *)parent)->addAction(action);
+ 
+ #ifdef Q_OS_MAC

psi-plus-main-20141106.tar.xz/patches/1420-psi-unity-menubar.diff Added

@@ -0,0 +1,135 @@
+--- git.temp.orig/src/mainwin.cpp
++++ git.temp/src/mainwin.cpp
+@@ -118,6 +118,11 @@ public:
+ 	bool onTop, asTool;
+ 	QMenu* mainMenu, *optionsMenu, *toolsMenu;
+ 	GlobalStatusMenu *statusMenu;
++#ifdef Q_OS_LINUX
++	// Status menu for MenuBar.
++	// Workaround a Unity bug.
++	GlobalStatusMenu *statusMenuMB;
++#endif
+ 	int sbState;
+ 	QString nickname;
+ 	PsiTrayIcon* tray;
+@@ -456,6 +461,16 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	connect(d->statusMenu, SIGNAL(statusSelected(XMPP::Status::Type, bool)), d->psi, SLOT(statusMenuChanged(XMPP::Status::Type, bool)));
+ 	connect(d->statusMenu, SIGNAL(statusPresetSelected(XMPP::Status,bool,bool)), d->psi, SLOT(setGlobalStatus(XMPP::Status,bool,bool)));
+ 	connect(d->statusMenu, SIGNAL(statusPresetDialogForced(const QString &)), d->psi, SLOT(showStatusDialog(const QString &)));
++
++#ifdef Q_OS_LINUX
++	d->statusMenuMB = new GlobalStatusMenu((QWidget*)this, d->psi);
++	d->statusMenuMB->setTitle(tr("Status"));
++	d->statusMenuMB->setObjectName("statusMenu");
++	connect(d->statusMenuMB, SIGNAL(statusSelected(XMPP::Status::Type, bool)), d->psi, SLOT(statusMenuChanged(XMPP::Status::Type, bool)));
++	connect(d->statusMenuMB, SIGNAL(statusPresetSelected(XMPP::Status,bool,bool)), d->psi, SLOT(setGlobalStatus(XMPP::Status,bool,bool)));
++	connect(d->statusMenuMB, SIGNAL(statusPresetDialogForced(const QString &)), d->psi, SLOT(showStatusDialog(const QString &)));
++#endif
++
+ 	d->optionsMenu = new QMenu(tr("General"), this);
+ 	d->optionsMenu->setObjectName("optionsMenu");
+ #ifdef Q_OS_MAC
+@@ -469,7 +484,10 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ #endif
+ 
+ 
+-	buildStatusMenu();
++	buildStatusMenu(d->statusMenu);
++#ifdef Q_OS_LINUX
++	buildStatusMenu(d->statusMenuMB);
++#endif
+ 	buildOptionsMenu();
+ 	connect(d->optionsMenu, SIGNAL(aboutToShow()), SLOT(buildOptionsMenu()));
+ 
+@@ -506,7 +524,11 @@ MainWin::MainWin(bool _onTop, bool _asTo
+ 	mainMenuBar()->addMenu(d->optionsMenu);
+ #endif
+ 
++#ifdef Q_OS_LINUX
++	mainMenuBar()->addMenu(d->statusMenuMB);
++#else
+ 	mainMenuBar()->addMenu(d->statusMenu);
++#endif
+ 
+ 	mainMenuBar()->addMenu(viewMenu);
+ 	d->getAction("show_offline")->addTo(viewMenu);
+@@ -851,11 +873,20 @@ void MainWin::setUseDock(bool use)
+ 
+ void MainWin::buildStatusMenu()
+ {
+-	d->statusMenu->clear();
+-	d->statusMenu->fill();
++	GlobalStatusMenu *statusMenu = qobject_cast<GlobalStatusMenu*>(sender());
++	Q_ASSERT(statusMenu);
++	if (statusMenu) {
++		buildStatusMenu(statusMenu);
++	}
++}
++
++void MainWin::buildStatusMenu(GlobalStatusMenu *statusMenu)
++{
++	statusMenu->clear();
++	statusMenu->fill();
+ #ifdef USE_PEP
+-	d->statusMenu->addSeparator();
+-	d->getAction("publish_tune")->addTo(d->statusMenu);
++	statusMenu->addSeparator();
++	d->getAction("publish_tune")->addTo(statusMenu);
+ #endif
+ }
+ 
+@@ -1408,6 +1439,9 @@ void MainWin::decorateButton(int status)
+ 			d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(STATUS_OFFLINE)->icon());
+ 		}
+ 
++#ifdef Q_OS_LINUX
++		d->statusMenuMB->statusChanged(makeStatus(STATUS_OFFLINE, ""));
++#endif
+ 		d->statusMenu->statusChanged(makeStatus(STATUS_OFFLINE, ""));
+ 
+ 		setWindowIcon(PsiIconset::instance()->status(STATUS_OFFLINE).impix());
+@@ -1417,8 +1451,10 @@ void MainWin::decorateButton(int status)
+ 		d->statusButton->setIcon(PsiIconset::instance()->statusPtr(status));
+ 		d->statusSmallerAlt->setPsiIcon(PsiIconset::instance()->statusPtr(status));
+ 		d->rosterAvatar->setStatusIcon(PsiIconset::instance()->statusPtr(status)->icon());
++#ifdef Q_OS_LINUX
++		d->statusMenuMB->statusChanged(makeStatus(status, d->psi->currentStatusMessage()));
++#endif
+ 		d->statusMenu->statusChanged(makeStatus(status, d->psi->currentStatusMessage()));
+-
+ 		setWindowIcon(PsiIconset::instance()->status(status).impix());
+ 	}
+ 
+@@ -1603,8 +1639,10 @@ void MainWin::optionsUpdate()
+ 
+ 	setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.contactlist.opacity").toInt()))/100);
+ 
+-	buildStatusMenu();
+-
++	buildStatusMenu(d->statusMenu);
++#ifdef Q_OS_LINUX
++	buildStatusMenu(d->statusMenuMB);
++#endif
+ 	updateTray();
+ }
+ 
+--- git.temp.orig/src/mainwin.h
++++ git.temp/src/mainwin.h
+@@ -45,6 +45,8 @@ class IconAction;
+ class PsiIcon;
+ class ContactView;
+ class PsiTrayIcon;
++class GlobalStatusMenu;
++
+ namespace XMPP {
+ 	class Status;
+ }
+@@ -195,6 +197,8 @@ private:
+ 	void saveToolbarsState();
+ 	void loadToolbarsState();
+ 
++	void buildStatusMenu(GlobalStatusMenu *statusMenu);
++
+ private:
+ 	class Private;
+ 	Private *d;

psi-plus-main-20141106.tar.xz/patches/1430-psi-toolbars-sorted.diff Added

@@ -0,0 +1,45 @@
+From 9e7b9f2f4b03b376b185fb2c0dc3428ae2bf00bc Mon Sep 17 00:00:00 2001
+From: Ivan Romanov <drizt@land.ru>
+Date: Fri, 4 Oct 2013 13:12:24 +0600
+Subject: [PATCH] Fixed Toolbar Options again
+
+Options internally uses QHash so they has no order.
+Before putting toolbars in combobox they must be sorted.
+
+The patch wan't applyed by upstream. So I commit here.
+---
+ src/options/opt_toolbars.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- git.temp.orig/src/options/opt_toolbars.cpp
++++ git.temp/src/options/opt_toolbars.cpp
+@@ -22,6 +22,7 @@
+ #include <QHBoxLayout>
+ #include <QList>
+ #include <QVBoxLayout>
++#include <QRegExp>
+ 
+ #define CHAT_TOOLBAR       0
+ #define GROUPCHAT_TOOLBAR  1
+@@ -222,10 +223,20 @@ void OptionsTabToolbars::restoreOptions(
+ 	QStringList toolbarBases;
+ 	toolbarBases = o->getChildOptionNames("options.ui.contactlist.toolbars", true, true);
+ 
++
++	// toolbarBases is chaotic. Need to sort before do anything.
++	QStringList sortedToolbarBases;
++	for (int i = 0; !toolbarBases.isEmpty(); ++i) {
++		int index = toolbarBases.indexOf(QRegExp(QString(".*m%1$").arg(i)));
++		if (index >= 0) {
++			sortedToolbarBases << toolbarBases.takeAt(index);
++		}
++	}
++
+ 	QString chatToolbarName = tr("Chat");
+ 	QString groupchatToolbarName = tr("Groupchat");
+ 
+-	foreach(QString base, toolbarBases) {
++	foreach(QString base, sortedToolbarBases) {
+ 		ToolbarPrefs tb;
+ 		tb.id = o->getOption(base + ".key").toString();
+ 		tb.name = o->getOption(base + ".name").toString();

psi-plus-main-20141106.tar.xz/patches/1440-psi-fix-selection-behavior-chat-dlg.diff Added

@@ -0,0 +1,110 @@
+--- a/src/chatview_te.cpp
++++ b/src/chatview_te.cpp
+@@ -515,3 +515,11 @@ ChatView * ChatView::textWidget()
+ {
+ 	return this;
+ }
++
++QWidget *ChatView::realTextWidget()
++{
++	QWidget *child = childAt(frameRect().center());
++	if (child)
++		return child;
++	return this;
++}
+--- a/src/chatview_te.h
++++ b/src/chatview_te.h
+@@ -61,6 +61,7 @@ public:
+ 	void doTrackBar();
+ 	bool internalFind(QString str, bool startFromBeginning = false);
+ 	ChatView *textWidget();
++	QWidget *realTextWidget();
+ 
+ public slots:
+ 	void scrollUp();
+--- a/src/chatview_webkit.cpp
++++ b/src/chatview_webkit.cpp
+@@ -379,4 +379,9 @@ WebView* ChatView::textWidget()
+ 	return webView;
+ }
+ 
++QWidget* ChatView::realTextWidget()
++{
++	return webView;
++}
++
+ #include "chatview_webkit.moc"
+--- a/src/chatview_webkit.h
++++ b/src/chatview_webkit.h
+@@ -64,6 +64,7 @@ public:
+ 	void doTrackBar();
+ 	bool internalFind(QString str, bool startFromBeginning = false);
+ 	WebView * textWidget();
++	QWidget * realTextWidget();
+ 
+ public slots:
+ 	void scrollUp();
+--- a/src/groupchatdlg.cpp
++++ b/src/groupchatdlg.cpp
+@@ -544,6 +544,13 @@ public slots:
+ public:
+ 
+ 	bool eventFilter( QObject *obj, QEvent *ev ) {
++		if (obj == te_log()->realTextWidget())
++		{
++			if (ev->type() == QEvent::MouseButtonPress)
++				mle()->setFocus();
++			return QObject::eventFilter(obj, ev);
++		}
++
+ 		if (te_log()->handleCopyEvent(obj, ev, mle()))
+ 			return true;
+ 
+@@ -876,6 +883,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
+ 	X11WM_CLASS("groupchat");
+ 
+ 	ui_.mle->chatEdit()->setFocus();
++	ui_.log->realTextWidget()->installEventFilter(d);
+ 
+ 	// Connect signals from MUC manager
+ 	connect(d->mucManager,SIGNAL(action_error(MUCManager::Action, int, const QString&)), SLOT(action_error(MUCManager::Action, int, const QString&)));
+--- a/src/psichatdlg.cpp
++++ b/src/psichatdlg.cpp
+@@ -290,6 +290,8 @@ void PsiChatDlg::initUi()
+ 
+ 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
+ 	
++	ui_.log->realTextWidget()->installEventFilter(this);
++	
+ 	ui_.mini_prompt->hide();
+ 
+ 	if (throbber_icon == 0) {
+@@ -1010,15 +1012,22 @@ void PsiChatDlg::doMinimize()
+ }
+ 
+ bool PsiChatDlg::eventFilter( QObject *obj, QEvent *ev ) {
+-	if ( obj == chatEdit() && ev->type() == QEvent::KeyPress ) {
+-		QKeyEvent *e = (QKeyEvent *)ev;
++	if ( obj == chatEdit() ) {
++		if ( ev->type() == QEvent::KeyPress ) {
++			QKeyEvent *e = (QKeyEvent *)ev;
+ 
+-		if ( e->key() == Qt::Key_Tab ) {
+-			tabCompletion.tryComplete();
+-			return true;
++			if ( e->key() == Qt::Key_Tab ) {
++				tabCompletion.tryComplete();
++				return true;
++			}
++
++			tabCompletion.reset();
+ 		}
++	}
+ 
+-		tabCompletion.reset();
++	else if ( obj == ui_.log->realTextWidget() ) {
++		if ( ev->type() == QEvent::MouseButtonPress )
++			chatEdit()->setFocus();
+ 	}
+ 
+ 	return ChatDlg::eventFilter( obj, ev );

psi-plus-main-20141106.tar.xz/patches/1450-psi-enchant-multidicts.diff Added

@@ -0,0 +1,167 @@
+--- git.temp.orig/src/libpsi/tools/spellchecker/enchantchecker.cpp
++++ git.temp/src/libpsi/tools/spellchecker/enchantchecker.cpp
+@@ -31,42 +31,41 @@
+ #include "enchant++.h"
+ #include "enchantchecker.h"
+ 
+-EnchantChecker::EnchantChecker() : speller_(NULL)
++EnchantChecker::EnchantChecker()
++	: spellers_(EnchantDictList())
++	, allLanguages_(QStringList())
+ {
+ 	if (enchant::Broker *instance = enchant::Broker::instance())
+ 	{
+-		std::string lang("en_US");
+-		std::string probeLang = QLocale().name().toStdString();
+-		if (instance->dict_exists(probeLang))
+-			lang = probeLang;
+-		try {
+-			speller_ = enchant::Broker::instance()->request_dict(lang);
+-		} catch (enchant::Exception &e) {
+-			qWarning() << QString("Enchant error: %1").arg(e.what());
+-		}
++		instance->list_dicts(enchantDictDescribeFn, static_cast<void*>(this));
++		setActiveLanguages(getAllLanguages());
+ 	}
+ }
+ 
+ EnchantChecker::~EnchantChecker()
+ {
+-	delete speller_;
+-	speller_ = NULL;
++	clearSpellers();
+ }
+ 
+ bool EnchantChecker::isCorrect(const QString& word)
+ {
+-	if(speller_) {
+-		return speller_->check(word.toUtf8().constData());
++	if (spellers_.isEmpty())
++		return true;
++
++	foreach (enchant::Dict* speller, spellers_) {
++		if (speller->check(word.toUtf8().constData()))
++			return true;
+ 	}
+-	return true;
++	return false;
+ }
+ 
+ QList<QString> EnchantChecker::suggestions(const QString& word)
+ {
+ 	QList<QString> words;
+-	if (speller_) {
++
++	foreach(enchant::Dict* speller, spellers_) {
+ 		std::vector<std::string> out_suggestions;
+-		speller_->suggest(word.toUtf8().constData(), out_suggestions);
++		speller->suggest(word.toUtf8().constData(), out_suggestions);
+ 		std::vector<std::string>::iterator aE = out_suggestions.end();
+ 		for (std::vector<std::string>::iterator aI = out_suggestions.begin(); aI != aE; ++aI) {
+ 			words += QString::fromUtf8(aI->c_str());
+@@ -78,10 +77,10 @@ QList<QString> EnchantChecker::suggestio
+ bool EnchantChecker::add(const QString& word)
+ {
+ 	bool result = false;
+-	if (speller_) {
++	if (!spellers_.isEmpty()) {
+ 		QString trimmed_word = word.trimmed();
+ 		if(!word.isEmpty()) {
+-			speller_->add_to_pwl(word.toUtf8().constData());
++			spellers_.first()->add_to_pwl(word.toUtf8().constData());
+ 			result = true;
+ 		}
+ 	}
+@@ -90,10 +89,57 @@ bool EnchantChecker::add(const QString&
+ 
+ bool EnchantChecker::available() const
+ {
+-	return (speller_ != NULL);
++	return (spellers_.isEmpty() != true);
+ }
+ 
+ bool EnchantChecker::writable() const
+ {
+ 	return false;
+ }
++
++QList<QString> EnchantChecker::getAllLanguages() const
++{
++	return allLanguages_;
++}
++
++void EnchantChecker::setActiveLanguages(const QList<QString>& langs)
++{
++	clearSpellers();
++
++	foreach (const QString& lang, langs) {
++		if (!allLanguages_.contains(lang))
++			continue;
++
++		try {
++			spellers_ << enchant::Broker::instance()->request_dict(lang.toStdString());
++		} catch (enchant::Exception &e) {
++			qWarning() << QString("Enchant error: %1").arg(e.what());
++		}
++	}
++}
++
++void EnchantChecker::clearSpellers()
++{
++	qDeleteAll(spellers_);
++	spellers_.clear();
++}
++
++void EnchantChecker::enchantDictDescribeFn(const char *const lang_tag,
++										   const char *const provider_name,
++										   const char *const provider_desc,
++										   const char *const provider_file,
++										   void *user_data)
++{
++	Q_UNUSED(provider_name);
++	Q_UNUSED(provider_desc);
++	Q_UNUSED(provider_file);
++	EnchantChecker *enchantChecker = static_cast<EnchantChecker*>(user_data);
++
++	QString lang(lang_tag);
++
++	if (lang.contains('_'))
++		lang.truncate(lang.indexOf('_'));
++
++	if (!enchantChecker->allLanguages_.contains(lang))
++		enchantChecker->allLanguages_ << lang;
++}
+--- git.temp.orig/src/libpsi/tools/spellchecker/enchantchecker.h
++++ git.temp/src/libpsi/tools/spellchecker/enchantchecker.h
+@@ -27,8 +27,7 @@
+ #ifndef ENCHANTCHECKER_H
+ #define ENCHANTCHECKER_H
+ 
+-#include <QList>
+-#include <QString>
++#include <QStringList>
+ 
+ #include "spellchecker.h"
+ 
+@@ -48,8 +47,20 @@ public:
+ 	virtual bool available() const;
+ 	virtual bool writable() const;
+ 
++	virtual void setActiveLanguages(const QList<QString>& langs);
++	virtual QList<QString> getAllLanguages() const;
++
+ private:
+-	enchant::Dict* speller_;
++	static void enchantDictDescribeFn(const char *const lang_tag,
++									  const char *const provider_name,
++									  const char *const provider_desc,
++									  const char *const provider_file,
++									  void *user_data);
++	void clearSpellers();
++
++	typedef QList<enchant::Dict*> EnchantDictList;
++	EnchantDictList spellers_;
++	QStringList allLanguages_;
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/1460-psi-muc-highlight-events.diff Added

@@ -0,0 +1,383 @@
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -327,6 +327,7 @@ QLineEdit#le_status_text {
+ 					<height>420</height>
+ 				</size>
+ 				<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring><use-hash-nick-coloring type="bool">true</use-hash-nick-coloring><colored-history type="bool">true</colored-history>
++				<allow-highlight-events type="bool">false</allow-highlight-events>
+ 			</muc>
+ 			<show-deprecated comment="Deprecated functionality or protocols">
+ 				<service-discovery comment="Service discovery dialog">
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -448,6 +448,8 @@ void ChatDlg::ensureTabbedCorrectly()
+ 
+ void ChatDlg::updateContact(const Jid &j, bool fromPresence)
+ {
++	if (account()->groupchats().contains(j.full()))
++		return;
+ 	// if groupchat, only update if the resource matches
+ 	if (account()->findGCContact(j) && !jid().compare(j)) {
+ 		return;
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -199,6 +199,7 @@ public:
+ 		dlg = d;
+ 		nickSeparator = ":";
+ 		nonAnonymous = false;
++		alert = false;
+ 
+ 		trackBar = false;
+ 		mCmdManager.registerProvider(this);
+@@ -237,6 +238,7 @@ public:
+ 	int pending;
+ 	int hPending; // highlight pending
+ 	bool connecting;
++	bool alert;
+ 
+ 	QStringList hist;
+ 	int histAt;
+@@ -1047,6 +1049,7 @@ void GCMainDlg::activated()
+ 			u->setPending(d->pending, d->hPending);
+ 			account()->updateEntry(*u);
+ 		}
++		messagesRead(jid());
+ 		invalidateTab();
+ 	}
+ 	doFlash(false);
+@@ -1681,11 +1684,11 @@ void GCMainDlg::avatarUpdated(const Jid
+ 	}
+ }
+ 
+-void GCMainDlg::message(const Message &_m)
++void GCMainDlg::message(const Message &_m, const PsiEvent::Ptr &e)
+ {
+ 	Message m = _m;
+ 	QString from = m.from().resource();
+-	bool alert = false;
++	d->alert = false;
+ 
+ 	if (m.getMUCStatuses().contains(100)) {
+ 		d->nonAnonymous = true;
+@@ -1735,7 +1738,7 @@ void GCMainDlg::message(const Message &_
+ 
+ 	// code to determine if the speaker was addressing this client in chat
+ 	if(m.body().contains(d->self))
+-		alert = true;
++		d->alert = true;
+ 
+ 	if (m.body().left(d->self.length()) == d->self)
+ 		d->lastReferrer = m.from().resource();
+@@ -1744,7 +1747,7 @@ void GCMainDlg::message(const Message &_
+ 		QStringList highlightWords = options->getOption("options.ui.muc.highlight-words").toStringList();
+ 		foreach (QString word, highlightWords) {
+ 			if(m.body().contains((word), Qt::CaseInsensitive)) {
+-				alert = true;
++				d->alert = true;
+ 			}
+ 		}
+ 	}
+@@ -1755,13 +1758,12 @@ void GCMainDlg::message(const Message &_
+ 			account()->playSound(PsiAccount::eSend);
+ 	}
+ 	else {
+-		if(alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
++		if(d->alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
+ 			account()->playSound(PsiAccount::eGroupChat);
+ 
+-		if(alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
++		if(d->alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
+ 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
+ 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
+-				MessageEvent::Ptr e(new MessageEvent(m, account()));
+ 				UserListItem i;
+ 				i.setPrivate(true);
+ 				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), &i, e);
+@@ -1770,9 +1772,9 @@ void GCMainDlg::message(const Message &_
+ 	}
+ 
+ 	if(from.isEmpty())
+-		appendSysMsg(m.body(), alert, m.timeStamp());
++		appendSysMsg(m.body(), d->alert, m.timeStamp());
+ 	else
+-		appendMessage(m, alert);
++		appendMessage(m, d->alert);
+ }
+ 
+ void GCMainDlg::joined()
+@@ -1809,6 +1811,11 @@ const QDateTime & GCMainDlg::lastMsgTime
+ 	return d->te_log()->lastMsgTime();
+ }
+ 
++bool GCMainDlg::isLastMessageAlert() const
++{
++	return d->alert;
++}
++
+ void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
+ {
+ 	MessageView mv = MessageView::fromPlainText(str, MessageView::System);
+--- git.orig/src/groupchatdlg.h
++++ git/src/groupchatdlg.h
+@@ -31,6 +31,7 @@
+ #include "ui_groupchatdlg.h"
+ #include "mucmanager.h"
+ #include "advwidget.h"
++#include "psievent.h"
+ 
+ using namespace XMPP;
+ 
+@@ -70,12 +71,13 @@ public:
+ 
+ 	void error(int, const QString &);
+ 	void presence(const QString &, const Status &);
+-	void message(const Message &);
++	void message(const Message &, const PsiEvent::Ptr &e = PsiEvent::Ptr());
+ 	void joined();
+ 	void setPassword(const QString&);
+ 	const QString& nick() const;
+ 	const QString& topic() const;
+ 	const QDateTime& lastMsgTime() const;
++	bool isLastMessageAlert() const;
+ 
+ 	bool isInactive() const;
+ 	void reactivate();
+@@ -100,6 +102,7 @@ protected:
+ 
+ signals:
+ 	void aSend(const Message &);
++	void messagesRead(const Jid &);
+ 
+ public slots:
+ 	// reimplemented
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -2804,9 +2804,9 @@ void PsiAccount::processIncomingMessage(
+ 
+ #ifdef GROUPCHAT
+ 	if(_m.type() == "groupchat") {
+-		GCMainDlg *w = findDialog<GCMainDlg*>(Jid(_m.from().bare()));
+-		if(w)
+-			w->message(_m);
++		MessageEvent::Ptr me(new MessageEvent(_m, this));
++		me->setOriginLocal(false);
++		handleEvent(me, IncomingStanza);
+ 		return;
+ 	}
+ #endif
+@@ -5080,7 +5080,17 @@ void PsiAccount::handleEvent(const PsiEv
+ 				!(e->type() == PsiEvent::Message &&
+ 				 e.staticCast<MessageEvent>()->message().body().isEmpty()))
+ 			{
+-				logEvent(e->from(), e);
++				bool isMuc = false;
++#ifdef GROUPCHAT
++				if(e->type() == PsiEvent::Message) {
++					MessageEvent::Ptr me = e.staticCast<MessageEvent>();
++					if (me->message().type() == "groupchat")
++						isMuc = true;
++				}
++#endif
++				if (!isMuc) {
++					logEvent(e->from(), e);
++				}
+ 			}
+ 		}
+ 	}
+@@ -5120,7 +5130,7 @@ void PsiAccount::handleEvent(const PsiEv
+ 		}
+ 
+ 		// Pass message events to chat window
+-		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
++		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty() && m.type() != "groupchat") {
+ 			if (o->getOption("options.messages.send-composing-events").toBool()) {
+ 				ChatDlg *c = findChatDialogEx(e->from());
+ 				if (c) {
+@@ -5184,6 +5194,22 @@ void PsiAccount::handleEvent(const PsiEv
+ 			doPopup = true;
+ 			popupType = PopupManager::AlertHeadline;
+ 		} // /headline
++#ifdef GROUPCHAT
++		else if (m.type() == "groupchat") {
++			putToQueue = false;
++			bool allowMucEvents = o->getOption("options.ui.muc.allow-highlight-events").toBool();
++			if (activationType != FromXml) {
++				GCMainDlg *c = findDialog<GCMainDlg*>(e->from());
++				if (c) {
++					c->message(m, e);
++					if (!c->isActiveTab() && c->isLastMessageAlert() && !m.spooled() && allowMucEvents)
++						putToQueue = true;
++				}
++			}
++			else if (allowMucEvents)
++				putToQueue = true;
++		} // /groupchat
++#endif
+ 		else if (m.type().isEmpty()) {
+ 			soundType = eMessage;
+ 			doPopup = true;
+@@ -5581,11 +5607,18 @@ void PsiAccount::processReadNext(const U
+ 		return;
+ 
+ 	bool isChat = false;
++#ifdef GROUPCHAT
++	bool isMuc = false;
++#endif
+ 	if(e->type() == PsiEvent::Message) {
+ 		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
+ 		const Message &m = me->message();
+ 		if(m.type() == "chat" && m.getForm().fields().empty())
+ 			isChat = true;
++#ifdef GROUPCHAT
++		else if (m.type() == "groupchat")
++			isMuc = true;
++#endif
+ 	}
+ 
+ 	// if it's a chat message, just open the chat window.  there is no need to do
+@@ -5596,6 +5629,17 @@ void PsiAccount::processReadNext(const U
+ 		return;
+ 	}
+ 
++#ifdef GROUPCHAT
++	if (isMuc) {
++		GCMainDlg *c = findDialog<GCMainDlg*>(e->from());
++		if (c)
++		{
++			c->bringToFront(true);
++			return;
++		}
++	}
++#endif
++
+ 	// remove from queue
+ 	e = d->eventQueue->dequeue(u.jid());
+ 
+@@ -5702,6 +5746,19 @@ void PsiAccount::chatMessagesRead(const
+ //	}
+ }
+ 
++#ifdef GROUPCHAT
++void PsiAccount::groupChatMessagesRead(const Jid &j)
++{
++	d->eventQueue->clear(j);
++
++	QList<UserListItem*> ul = findRelevant(j);
++	if(!ul.isEmpty()) {
++		UserListItem *u = ul.first();
++		cpUpdate(*u);
++	}
++}
++#endif
++
+ void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e)
+ {
+ 	if (!d->acc.opt_log)
+@@ -5724,6 +5781,7 @@ void PsiAccount::openGroupChat(const Jid
+ 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
+ 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
+ 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
++	connect(w, SIGNAL(messagesRead(const Jid &)), SLOT(groupChatMessagesRead(const Jid &)));
+ 	connect(d->psi, SIGNAL(emitOptionsUpdate()), w, SLOT(optionsUpdate()));
+ 	if(reason != MUCJoinDlg::MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
+ 		w->ensureTabbedCorrectly();
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -451,6 +451,9 @@ private slots:
+ 	void itemRetracted(const Jid&, const QString&, const PubSubRetraction&);
+ 
+ 	void chatMessagesRead(const Jid &);
++#ifdef GROUPCHAT
++	void groupChatMessagesRead(const Jid &);
++#endif
+ 
+ 	void slotCheckVCard();
+ 	void edb_finished();
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -81,6 +81,9 @@
+ #include "accountscombobox.h"
+ #include "tabdlg.h"
+ #include "chatdlg.h"
++#ifdef GROUPCHAT
++#include "groupchatdlg.h"
++#endif
+ #include "spellchecker/aspellchecker.h"
+ #ifdef WEBKIT
+ #include "avatars.h"
+@@ -1739,16 +1742,28 @@ void PsiCon::processEvent(const PsiEvent
+ 	}
+ 
+ 	bool isChat = false;
++#ifdef GROUPCHAT
++	bool isMuc = false;
++#endif
+ 	bool sentToChatWindow = false;
+ 	if ( e->type() == PsiEvent::Message ) {
+ 		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
+ 		const Message &m = me->message();
+-		bool emptyForm = m.getForm().fields().empty();
+-		// FIXME: Refactor this, PsiAccount and PsiEvent out
+-		if (m.type() == "chat" && emptyForm) {
+-			isChat = true;
+-			sentToChatWindow = me->sentToChatWindow();
++#ifdef GROUPCHAT
++		if (m.type() == "groupchat") {
++			isMuc = true;
+ 		}
++		else {
++#endif
++			bool emptyForm = m.getForm().fields().empty();
++			// FIXME: Refactor this, PsiAccount and PsiEvent out
++			if (m.type() == "chat" && emptyForm) {
++				isChat = true;
++				sentToChatWindow = me->sentToChatWindow();
++			}
++#ifdef GROUPCHAT
++		}
++#endif
+ 	}
+ 
+ 	if ( isChat ) {
+@@ -1780,6 +1795,17 @@ void PsiCon::processEvent(const PsiEvent
+ 	}
+ #endif
+ 	else {
++#ifdef GROUPCHAT
++		if (isMuc) {
++			PsiAccount *account = e->account();
++			GCMainDlg *c = account->findDialog<GCMainDlg*>(e->from());
++			if (c) {
++				c->ensureTabbedCorrectly();
++				c->bringToFront(true);
++				return;
++			}
++		}
++#endif
+ 		// search for an already opened eventdlg
+ 		EventDlg *w = e->account()->findDialog<EventDlg*>(u->jid());
+ 
+--- git.orig/src/psievent.cpp
++++ git/src/psievent.cpp
+@@ -241,6 +241,10 @@ int MessageEvent::type() const
+ 
+ Jid MessageEvent::from() const
+ {
++#ifdef GROUPCHAT
++	if (v_m.type() == "groupchat")
++		return v_m.from().bare();
++#endif
+ 	return v_m.from();
+ }
+ 
+--- git.orig/src/psiiconset.cpp
++++ git/src/psiiconset.cpp
+@@ -650,7 +650,7 @@ PsiIcon *PsiIconset::event2icon(const Ps
+ 		const Message &m = me->message();
+ 		if(m.type() == "headline")
+ 			icon = "psi/headline";
+-		else if(m.type() == "chat")
++		else if(m.type() == "chat" || m.type() == "groupchat")
+ 			icon = "psi/chat";
+ 		else if(m.type() == "error")
+ 			icon = "psi/system";

psi-plus-main-20141106.tar.xz/patches/1470-iris-XEP-0083-nested-roster-groups.diff Added

@@ -0,0 +1,479 @@
+--- git.orig/iris/src/xmpp/xmpp-im/client.cpp
++++ git/iris/src/xmpp/xmpp-im/client.cpp
+@@ -102,6 +102,8 @@ using namespace Jabber;*/
+ #define vsnprintf _vsnprintf
+ #endif
+ 
++#define GROUPS_DELIMITER_TIMEOUT 10
++
+ namespace XMPP
+ {
+ 
+@@ -885,12 +887,38 @@ void Client::prRoster(const Roster &r)
+ 	importRoster(r);
+ }
+ 
+-void Client::rosterRequest()
++void Client::rosterRequest(bool withGroupsDelimiter)
+ {
+ 	if(!d->active)
+ 		return;
+ 
+ 	JT_Roster *r = new JT_Roster(rootTask());
++	int timeout = 0;
++	if (withGroupsDelimiter) {
++		connect(r, SIGNAL(finished()), SLOT(slotRosterDelimiterRequestFinished()));
++		r->getGroupsDelimiter();
++		// WORKAROUND: Some bad servers (Facebook for example) don't response
++		// on groups delimiter request. Wait timeout and go ahead.
++		r->setTimeout(GROUPS_DELIMITER_TIMEOUT);
++	}
++	else {
++		connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
++		r->get();
++		d->roster.flagAllForDelete(); // mod_groups patch
++	}
++
++	r->go(true);
++}
++
++void Client::slotRosterDelimiterRequestFinished()
++{
++	JT_Roster *r = qobject_cast<JT_Roster*>(sender());
++	if(r->success()) {
++		d->roster.setGroupsDelimiter(r->groupsDelimiter());
++		emit rosterGroupsDelimiterRequestFinished(r->groupsDelimiter());
++	}
++
++	r = new JT_Roster(rootTask());
+ 	connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
+ 	r->get();
+ 	d->roster.flagAllForDelete(); // mod_groups patch
+@@ -1254,13 +1282,35 @@ void LiveRosterItem::setFlagForDelete(bo
+ //---------------------------------------------------------------------------
+ // LiveRoster
+ //---------------------------------------------------------------------------
++class LiveRoster::Private
++{
++public:
++	QString groupsDelimiter;
++};
++
+ LiveRoster::LiveRoster()
+-:QList<LiveRosterItem>()
++	: QList<LiveRosterItem>()
++	, d(new LiveRoster::Private)
+ {
+ }
+ 
+ LiveRoster::~LiveRoster()
+ {
++	delete d;
++}
++
++LiveRoster::LiveRoster(const LiveRoster &other)
++	: QList<LiveRosterItem>(other)
++	, d(new LiveRoster::Private)
++{
++	d->groupsDelimiter = other.d->groupsDelimiter;
++}
++
++LiveRoster &LiveRoster::operator=(const LiveRoster &other)
++{
++	QList<LiveRosterItem>::operator=(other);
++	d->groupsDelimiter = other.d->groupsDelimiter;
++	return *this;
+ }
+ 
+ void LiveRoster::flagAllForDelete()
+@@ -1289,4 +1339,14 @@ LiveRoster::ConstIterator LiveRoster::fi
+ 	return it;
+ }
+ 
++void LiveRoster::setGroupsDelimiter(const QString &groupsDelimiter)
++{
++	d->groupsDelimiter = groupsDelimiter;
++}
++
++QString LiveRoster::groupsDelimiter() const
++{
++	return d->groupsDelimiter;
++}
++
+ }
+--- git.orig/iris/src/xmpp/xmpp-im/types.cpp
++++ git/iris/src/xmpp/xmpp-im/types.cpp
+@@ -2846,13 +2846,35 @@ bool RosterItem::fromXml(const QDomEleme
+ //---------------------------------------------------------------------------
+ // Roster
+ //---------------------------------------------------------------------------
++class Roster::Private
++{
++public:
++	QString groupsDelimiter;
++};
++
+ Roster::Roster()
+-:QList<RosterItem>()
++	: QList<RosterItem>()
++	, d(new Roster::Private)
+ {
+ }
+ 
+ Roster::~Roster()
+ {
++	delete d;
++}
++
++Roster::Roster(const Roster &other)
++	: QList<RosterItem>(other)
++	, d(new Roster::Private)
++{
++	d->groupsDelimiter = other.d->groupsDelimiter;
++}
++
++Roster &Roster::operator=(const Roster &other)
++{
++	QList<RosterItem>::operator=(other);
++	d->groupsDelimiter = other.d->groupsDelimiter;
++	return *this;
+ }
+ 
+ Roster::Iterator Roster::find(const Jid &j)
+@@ -2875,6 +2897,16 @@ Roster::ConstIterator Roster::find(const
+ 	return end();
+ }
+ 
++void Roster::setGroupsDelimiter(const QString &groupsDelimiter)
++{
++	d->groupsDelimiter = groupsDelimiter;
++}
++
++QString Roster::groupsDelimiter() const
++{
++	return d->groupsDelimiter;
++}
++
+ 
+ //---------------------------------------------------------------------------
+ // FormField
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_client.h
+@@ -79,7 +79,7 @@ namespace XMPP
+ 		QString resource() const;
+ 		Jid jid() const;
+ 
+-		void rosterRequest();
++		void rosterRequest(bool withGroupsDelimiter = true);
+ 		void sendMessage(const Message &, bool want_notify = false);
+ 		void sendSubscription(const Jid &, const QString &, const QString& nick = QString());
+ 		void setPresence(const Status &);
+@@ -138,6 +138,7 @@ namespace XMPP
+ 		void activated();
+ 		void disconnected();
+ 		//void authFinished(bool, int, const QString &);
++		void rosterGroupsDelimiterRequestFinished(const QString &);
+ 		void rosterRequestFinished(bool, int, const QString &);
+ 		void rosterItemAdded(const RosterItem &);
+ 		void rosterItemUpdated(const RosterItem &);
+@@ -171,6 +172,7 @@ namespace XMPP
+ 		void streamIncomingXml(const QString &);
+ 		void streamOutgoingXml(const QString &);
+ 
++		void slotRosterDelimiterRequestFinished();
+ 		void slotRosterRequestFinished();
+ 
+ 		// basic daemons
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
+@@ -34,9 +34,19 @@ namespace XMPP
+ 		LiveRoster();
+ 		~LiveRoster();
+ 
++		LiveRoster(const LiveRoster &other);
++		LiveRoster &operator=(const LiveRoster &other);
++
+ 		void flagAllForDelete();
+ 		LiveRoster::Iterator find(const Jid &, bool compareRes=true);
+ 		LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
++
++		void setGroupsDelimiter(const QString &groupsDelimiter);
++		QString groupsDelimiter() const;
++
++	private:
++		class Private;
++		Private *d;
+ 	};
+ }
+ 
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_roster.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_roster.h
+@@ -36,11 +36,18 @@ namespace XMPP
+ 		Roster();
+ 		~Roster();
+ 
++		Roster(const Roster &other);
++		Roster &operator=(const Roster &other);
++
+ 		Roster::Iterator find(const Jid &);
+ 		Roster::ConstIterator find(const Jid &) const;
+ 
++		void setGroupsDelimiter(const QString &groupsDelimiter);
++		QString groupsDelimiter() const;
++
+ 	private:
+-		class RosterPrivate *d;
++		class Private;
++		Private *d;
+ 	};
+ }
+ 
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_task.cpp
++++ git/iris/src/xmpp/xmpp-im/xmpp_task.cpp
+@@ -24,6 +24,8 @@
+ #include "xmpp_client.h"
+ #include "xmpp_xmlcommon.h"
+ 
++#define DEFAULT_TIMEOUT 300
++
+ using namespace XMPP;
+ 
+ class Task::TaskPrivate
+@@ -38,6 +40,7 @@ public:
+ 	Client *client;
+ 	bool insig, deleteme, autoDelete;
+ 	bool done;
++	int timeout;
+ };
+ 
+ Task::Task(Task *parent)
+@@ -72,6 +75,7 @@ void Task::init()
+ 	d->deleteme = false;
+ 	d->autoDelete = false;
+ 	d->done = false;
++	d->timeout = DEFAULT_TIMEOUT;
+ }
+ 
+ Task *Task::parent() const
+@@ -109,6 +113,16 @@ const QString & Task::statusString() con
+ 	return d->statusString;
+ }
+ 
++void Task::setTimeout(int seconds) const
++{
++	d->timeout = seconds;
++}
++
++int Task::timeout()
++{
++	return d->timeout;
++}
++
+ void Task::go(bool autoDelete)
+ {
+ 	d->autoDelete = autoDelete;
+@@ -121,6 +135,9 @@ void Task::go(bool autoDelete)
+ 	}
+ 	else {
+ 		onGo();
++		if (d->timeout) {
++			QTimer::singleShot(d->timeout * 1000, this, SLOT(timeoutFinished()));
++		}
+ 	}
+ }
+ 
+@@ -169,6 +186,16 @@ void Task::onDisconnect()
+ 	}
+ }
+ 
++void Task::onTimeout()
++{
++	if(!d->done) {
++		d->success = false;
++		// d->statusCode = ErrTimeout;
++		d->statusString = tr("Request timed out");
++		done();
++	}
++}
++
+ void Task::send(const QDomElement &x, bool want_notify)
+ {
+ 	client()->send(x, want_notify);
+@@ -225,6 +252,11 @@ void Task::clientDisconnected()
+ 	onDisconnect();
+ }
+ 
++void Task::timeoutFinished()
++{
++	onTimeout();
++}
++
+ void Task::debug(const char *fmt, ...)
+ {
+ 	va_list ap;
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_task.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_task.h
+@@ -49,6 +49,9 @@ namespace XMPP {
+ 		int statusCode() const;
+ 		const QString & statusString() const;
+ 
++		void setTimeout(int seconds) const;
++		int timeout();
++
+ 		void go(bool autoDelete=false);
+ 		virtual bool take(const QDomElement &);
+ 		void safeDelete();
+@@ -59,6 +62,7 @@ namespace XMPP {
+ 	protected:
+ 		virtual void onGo();
+ 		virtual void onDisconnect();
++		virtual void onTimeout();
+ 		void send(const QDomElement &, bool want_notify = false);
+ 		void setSuccess(int code=0, const QString &str="");
+ 		void setError(const QDomElement &);
+@@ -69,6 +73,7 @@ namespace XMPP {
+ 
+ 	private slots:
+ 		void clientDisconnected();
++		void timeoutFinished();
+ 		void done();
+ 
+ 	private:
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
++++ git/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
+@@ -367,9 +367,11 @@ public:
+ 	Private() {}
+ 
+ 	Roster roster;
++	QString groupsDelimiter;
+ 	QList<QDomElement> itemList;
+ };
+ 
++
+ JT_Roster::JT_Roster(Task *parent)
+ :Task(parent)
+ {
+@@ -407,7 +409,7 @@ void JT_Roster::set(const Jid &jid, cons
+ 
+ void JT_Roster::remove(const Jid &jid)
+ {
+-	type = 1;
++	type = 2;
+ 	//to = client()->host();
+ 	QDomElement item = doc()->createElement("item");
+ 	item.setAttribute("jid", jid.full());
+@@ -415,11 +417,47 @@ void JT_Roster::remove(const Jid &jid)
+ 	d->itemList += item;
+ }
+ 
++void JT_Roster::getGroupsDelimiter()
++{
++	type = 3;
++	//to = client()->host();
++	iq = createIQ(doc(), "get", to.full(), id());
++
++	QDomElement roster = doc()->createElement("roster");
++	roster.setAttribute("xmlns", "roster:delimiter");
++
++	QDomElement query = doc()->createElement("query");
++	query.setAttribute("xmlns", "jabber:iq:private");
++	query.appendChild(roster);
++
++	iq.appendChild(query);
++}
++
++void JT_Roster::setGroupsDelimiter(const QString &groupsDelimiter)
++{
++	type = 4;
++	//to = client()->host();
++	iq = createIQ(doc(), "set", to.full(), id());
++
++	QDomText text = doc()->createTextNode(groupsDelimiter);
++
++	QDomElement roster = doc()->createElement("roster");
++	roster.setAttribute("xmlns", "roster:delimiter");
++	roster.appendChild(text);
++
++	QDomElement query = doc()->createElement("query");
++	query.setAttribute("xmlns", "jabber:iq:private");
++	query.appendChild(roster);
++
++	iq.appendChild(query);
++}
++
+ void JT_Roster::onGo()
+ {
+-	if(type == 0)
++	if (type == 0) {
+ 		send(iq);
+-	else if(type == 1) {
++	}
++	else if(type == 1 || type == 2) {
+ 		//to = client()->host();
+ 		iq = createIQ(doc(), "set", to.full(), id());
+ 		QDomElement query = doc()->createElement("query");
+@@ -429,6 +467,12 @@ void JT_Roster::onGo()
+ 			query.appendChild(it);
+ 		send(iq);
+ 	}
++	else if (type == 3) {
++		send(iq);
++	}
++	else if (type == 4) {
++		send(iq);
++	}
+ }
+ 
+ const Roster & JT_Roster::roster() const
+@@ -436,6 +480,11 @@ const Roster & JT_Roster::roster() const
+ 	return d->roster;
+ }
+ 
++QString JT_Roster::groupsDelimiter() const
++{
++	return d->groupsDelimiter;
++}
++
+ QString JT_Roster::toString() const
+ {
+ 	if(type != 1)
+@@ -504,6 +553,24 @@ bool JT_Roster::take(const QDomElement &
+ 		setSuccess();
+ 		return true;
+ 	}
++	// getGroupsDelimiter
++	else if (type == 3) {
++		if(x.attribute("type") == "result") {
++			QDomElement q = queryTag(x);
++			QDomElement delimiter = q.firstChild().toElement();
++			d->groupsDelimiter = delimiter.firstChild().toText().data();
++			setSuccess();
++		}
++		else {
++			setError(x);
++		}
++		return true;
++	}
++	// setGroupsDelimiter
++	else if (type == 4) {
++		setSuccess();
++		return true;
++	}
+ 
+ 	return false;
+ }
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_tasks.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_tasks.h
+@@ -98,7 +98,12 @@ namespace XMPP
+ 		void set(const Jid &, const QString &name, const QStringList &groups);
+ 		void remove(const Jid &);
+ 
++		// XEP-0083
++		void getGroupsDelimiter();
++		void setGroupsDelimiter(const QString &groupsDelimiter);
++
+ 		const Roster & roster() const;
++		QString groupsDelimiter() const;
+ 
+ 		QString toString() const;
+ 		bool fromString(const QString &);

psi-plus-main-20141106.tar.xz/patches/1480-psi-fix-send-action.diff Added

psi-plus-main-20141106.tar.xz/patches/1490-psi-multirows-tab.diff Added

@@ -0,0 +1,931 @@
+diff --git a/options/default.xml b/options/default.xml
+index 4abb214..0472700 100644
+--- a/options/default.xml
++++ b/options/default.xml
+@@ -510,6 +510,7 @@ QLineEdit#le_status_text {
+ 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
+ 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
+ 				<show-tab-buttons type="bool">true</show-tab-buttons>
++				<multi-rows comment="Use multi rows mode for chat tab bar" type="bool">true</multi-rows>
+ 			</tabs>
+ 		</ui>
+ 		<shortcuts comment="Shortcuts">
+diff --git a/src/widgets/psitabbar.cpp b/src/widgets/psitabbar.cpp
+index b93bf77..b60dc77 100644
+--- a/src/widgets/psitabbar.cpp
++++ b/src/widgets/psitabbar.cpp
+@@ -32,7 +32,7 @@
+  * Constructor
+  */
+ PsiTabBar::PsiTabBar(PsiTabWidget *parent)
+-		: QTabBar(parent)
++		: TabBar(parent)
+ 		, dragsEnabled_(true) {
+ 	//setAcceptDrops(true);
+ 
+@@ -81,7 +81,7 @@ int PsiTabBar::findTabUnder(const QPoint &pos) {
+ }
+ 
+ void PsiTabBar::mousePressEvent(QMouseEvent *event) {
+-	QTabBar::mousePressEvent(event);
++	TabBar::mousePressEvent(event);
+ 	event->accept();
+ }
+ 
+@@ -185,7 +185,7 @@ void PsiTabBar::setDragsEnabled(bool enabled) {
+ 
+ void PsiTabBar::paintEvent(QPaintEvent *event)
+ {
+-	QTabBar::paintEvent(event);
++	TabBar::paintEvent(event);
+ #if QT_VERSION < 0x040500
+ 	QPainter painter(this);
+ 	QPen pen(Qt::cyan);
+diff --git a/src/widgets/psitabbar.h b/src/widgets/psitabbar.h
+index aa0d5b8..27b6328 100644
+--- a/src/widgets/psitabbar.h
++++ b/src/widgets/psitabbar.h
+@@ -21,12 +21,12 @@
+ #ifndef _PSITABBAR_H_
+ #define _PSITABBAR_H_
+ 
+-#include <QTabBar>
++#include "tabbar.h"
+ #include <QPoint>
+ 
+ class PsiTabWidget;
+ 
+-class PsiTabBar : public QTabBar
++class PsiTabBar : public TabBar
+ {
+ 	Q_OBJECT
+ 
+diff --git a/src/widgets/psitabwidget.cpp b/src/widgets/psitabwidget.cpp
+index 065fc41..67de434 100644
+--- a/src/widgets/psitabwidget.cpp
++++ b/src/widgets/psitabwidget.cpp
+@@ -38,7 +38,10 @@ PsiTabWidget::PsiTabWidget(QWidget *parent)
+ 		: QWidget(parent) {
+ 	tabsPosition_ = QTabWidget::East; // impossible => uninitialised state
+ 	tabBar_ = new PsiTabBar(this);
+-	tabBar_->setUsesScrollButtons(true);
++
++	bool multiRow = PsiOptions::instance()->getOption("options.ui.tabs.multi-rows", true).toBool();
++	tabBar_->setMultiRow(multiRow);
++	tabBar_->setUsesScrollButtons(!multiRow);
+ 	layout_ = new QVBoxLayout(this);
+ 	layout_->setMargin(0);
+ 	layout_->setSpacing(0);
+@@ -55,19 +58,21 @@ PsiTabWidget::PsiTabWidget(QWidget *parent)
+ 	downButton_ = new QToolButton(this);
+ 	downButton_->setMinimumSize(3,3);
+ 	downButton_->setFixedWidth(buttonwidth);
+-	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
++	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ 	menu_ = new QMenu(this);
+ 	downButton_->setMenu(menu_);
+ 	downButton_->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
+ 	connect(menu_, SIGNAL(aboutToShow()), SLOT(menu_aboutToShow()));
+ 	connect(menu_, SIGNAL(triggered(QAction*)), SLOT(menu_triggered(QAction*)));
+ 	barLayout_->addWidget(downButton_);
++	barLayout_->setAlignment(downButton_, Qt::AlignBottom);
+ 
+ 	closeButton_ = new QToolButton(this);
+ 	closeButton_->setMinimumSize(3,3);
+ 	closeButton_->setFixedWidth(buttonwidth);
+-	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
++	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ 	barLayout_->addWidget(closeButton_);
++	barLayout_->setAlignment(closeButton_, Qt::AlignBottom);
+ 	closeButton_->setText("x");
+ 	downButton_->setArrowType(Qt::DownArrow);
+ 	downButton_->setPopupMode(QToolButton::InstantPopup);
+@@ -182,6 +187,7 @@ void PsiTabWidget::addTab(QWidget *widget, QString name, const QIcon &icon)
+ 		tabBar_->addTab(name);
+ 	setLooks();
+ 	showPage(currentPage());
++	tabBar_->layoutTabs();
+ }
+ 
+ void PsiTabWidget::setLooks()
+@@ -192,6 +198,14 @@ void PsiTabWidget::setLooks()
+ 	}
+ }
+ 
++void PsiTabWidget::resizeEvent(QResizeEvent *event)
++{
++	QWidget::resizeEvent(event);
++	if (tabBar_->multiRow()) {
++		tabBar_->layoutTabs();
++	}
++}
++
+ /**
+  * Selects the page for the specified widget.
+  */
+diff --git a/src/widgets/psitabwidget.h b/src/widgets/psitabwidget.h
+index 4d4b49e..e1a00f3 100644
+--- a/src/widgets/psitabwidget.h
++++ b/src/widgets/psitabwidget.h
+@@ -22,7 +22,6 @@
+ #define PSITABWIDGET_H
+ 
+ #include <QTabWidget>
+-#include <QTabBar>
+ #include <QDragEnterEvent>
+ #include "psitabbar.h"
+ 
+@@ -80,6 +79,9 @@ signals:
+ 	// context menu on the blank space will have tab==-1
+ 	void tabContextMenu(int tab, QPoint pos, QContextMenuEvent *event);
+ 
++protected:
++	void resizeEvent(QResizeEvent *event);
++
+ private slots:
+ 	void mouseDoubleClickTab(int tab);
+ 	void mouseMiddleClickTab(int tab);
+@@ -91,7 +93,7 @@ private slots:
+ 
+ private:
+ 	QVector<QWidget*> widgets_;
+-	QTabBar *tabBar_;
++	PsiTabBar *tabBar_;
+ 	QVBoxLayout *layout_;
+ 	QHBoxLayout *barLayout_;
+ 	QStackedLayout *stacked_;
+diff --git a/src/widgets/tabbar.cpp b/src/widgets/tabbar.cpp
+new file mode 100644
+index 0000000..0452cb9
+--- /dev/null
++++ b/src/widgets/tabbar.cpp
+@@ -0,0 +1,676 @@
++/*
++ * tabbar.cpp
++ * Copyright (C) 2013-2014  Ivan Romanov <drizt@land.ru>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include "tabbar.h"
++
++#include <QAbstractButton>
++#include <QPixmap>
++#include <QStyleOptionTab>
++#include <QStylePainter>
++#include <QMouseEvent>
++
++class CloseButton : public QAbstractButton
++{
++	Q_OBJECT
++
++public:
++	CloseButton(QWidget *parent = 0);
++
++	QSize sizeHint() const;
++	inline QSize minimumSizeHint() const
++		{ return sizeHint(); }
++	void enterEvent(QEvent *event);
++	void leaveEvent(QEvent *event);
++	void paintEvent(QPaintEvent *event);
++};
++
++class TabBar::Private
++{
++public:
++	TabBar *q;
++	Private(TabBar *base)
++	{
++		q = base;
++		tabsClosable = false;
++		multiRow = false;
++		balanseCloseButtons();
++	}
++
++	void layoutTabs();
++	QSize tabSizeHint(QStyleOptionTabV3 tab) const;
++	void balanseCloseButtons();
++
++	QList<QStyleOptionTabV3> hackedTabs;
++	QList<CloseButton*> closeButtons;
++	bool tabsClosable;
++	bool multiRow;
++};
++
++void TabBar::Private::layoutTabs()
++{
++	hackedTabs.clear();
++
++	QTabBar::ButtonPosition closeSide = (QTabBar::ButtonPosition)q->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, q);
++	int barWidth = q->width();
++	for (int i = 0; i < q->count(); i++) {
++		QStyleOptionTabV3 tab;
++		q->initStyleOption(&tab, i);
++		if (i == 0) {
++			tab.rect.setLeft(0);
++		}
++
++		tab.position = QStyleOptionTab::Beginning;
++
++		if (tabsClosable) {
++			tab.rect.setWidth(tab.rect.width() + closeButtons.at(i)->size().width());
++			if (closeSide == QTabBar::LeftSide) {
++				tab.leftButtonSize = closeButtons.at(i)->size();
++			}
++			else {
++				tab.rightButtonSize = closeButtons.at(i)->size();
++			}
++		}
++
++		tab.rect.setSize(tabSizeHint(tab));
++
++		QStyleOptionTabV3 prevTab;
++		if (i > 0) {
++			prevTab = hackedTabs.last();
++		}
++
++		if (i > 0 && prevTab.rect.right() + tab.rect.width() >= barWidth) {
++			tab.rect.moveTo(0, prevTab.rect.bottom() - 1);
++			if (prevTab.position == QStyleOptionTab::Middle) {
++				prevTab.position = QStyleOptionTab::End;
++			}
++			else {
++				prevTab.position = QStyleOptionTab::OnlyOneTab;
++			}
++
++			if (i == q->count() - 1) {
++				tab.position = QStyleOptionTab::OnlyOneTab;
++			}
++
++			hackedTabs[i - 1] = prevTab;
++		}
++		else {
++			if (q->count() == 1) {
++				tab.position = QStyleOptionTab::OnlyOneTab;
++			}
++			else if (i == q->count() - 1) {
++				tab.position = QStyleOptionTab::End;
++				tab.rect.moveTo(prevTab.rect.right() + 1, prevTab.rect.top());
++			}
++			else if (i > 0) {
++				tab.position = QStyleOptionTab::Middle;
++				tab.rect.moveTo(prevTab.rect.right() + 1, prevTab.rect.top());
++			}
++		}
++
++		hackedTabs << tab;
++	}
++
++	int rowStart = 0;
++
++	// stretch filled or last row
++	for (int i = 0; i < hackedTabs.size(); i++) {
++		QStyleOptionTab::TabPosition position = hackedTabs.at(i).position;
++		if (position != QStyleOptionTab::End && position != QStyleOptionTab::OnlyOneTab) {
++			continue;
++		}
++
++		// stretch factor
++		double sf = static_cast<float>(barWidth) / hackedTabs.at(i).rect.right();
++
++		// don't strech the last row
++		bool lastRow = i == hackedTabs.size() - 1;
++		if (lastRow)
++			sf = qMin(1.5, sf);
++
++		for (int j = rowStart; j <= i; j++) {
++			QStyleOptionTabV3 tab = hackedTabs.at(j);
++			if (j > rowStart) {
++				tab.rect.moveLeft(hackedTabs.at(j - 1).rect.right() + 1);
++			}
++			if (j < i) {
++				tab.rect.setWidth(tab.rect.width() * sf);
++			}
++			else {
++				if (!lastRow) {
++					tab.rect.setRight(barWidth - 1);
++				}
++				else {
++					int width = qMin(static_cast<int>(tab.rect.width() * sf), barWidth - 1);
++					tab.rect.setWidth(width);
++				}
++			}
++			hackedTabs[j] = tab;
++		}
++
++#ifdef Q_OS_MAC
++		// Mac OS X puts tabs on center. We do too.
++		if (lastRow) {
++			int left = (barWidth - hackedTabs.at(i).rect.right() - 1) / 2;
++			if (left) {
++				for (int j = rowStart; j <= i; j++) {
++					hackedTabs[j].rect.moveLeft(hackedTabs.at(j).rect.left() + left);
++				}
++			}
++		}
++#endif
++
++		rowStart = i + 1;
++	}
++
++	q->setMinimumSize(0, q->sizeHint().height());
++	q->resize(q->sizeHint());
++}
++
++inline static bool verticalTabs(QTabBar::Shape shape)
++{
++	return shape == QTabBar::RoundedWest
++		   || shape == QTabBar::RoundedEast
++		   || shape == QTabBar::TriangularWest
++		   || shape == QTabBar::TriangularEast;
++}
++
++QSize TabBar::Private::tabSizeHint(QStyleOptionTabV3 opt) const
++{
++	QSize iconSize = opt.iconSize;
++	int hframe = q->style()->pixelMetric(QStyle::PM_TabBarTabHSpace, &opt, q);
++	int vframe = q->style()->pixelMetric(QStyle::PM_TabBarTabVSpace, &opt, q);
++	const QFontMetrics fm = q->fontMetrics();
++
++	int maxWidgetHeight = qMax(opt.leftButtonSize.height(), opt.rightButtonSize.height());
++	int maxWidgetWidth = qMax(opt.leftButtonSize.width(), opt.rightButtonSize.width());
++
++	int widgetWidth = 0;
++	int widgetHeight = 0;
++	int padding = 0;
++	if (!opt.leftButtonSize.isEmpty()) {
++		padding += 4;
++		widgetWidth += opt.leftButtonSize.width();
++		widgetHeight += opt.leftButtonSize.height();
++	}
++	if (!opt.rightButtonSize.isEmpty()) {
++		padding += 4;
++		widgetWidth += opt.rightButtonSize.width();
++		widgetHeight += opt.rightButtonSize.height();
++	}
++	if (!opt.icon.isNull())
++		padding += 4;
++
++	QSize csz;
++	if (verticalTabs(q->shape())) {
++		csz = QSize( qMax(maxWidgetWidth, qMax(fm.height(), iconSize.height())) + vframe,
++					 fm.size(Qt::TextShowMnemonic, opt.text).width() + iconSize.width() + hframe + widgetHeight + padding);
++	} else {
++		csz = QSize(fm.size(Qt::TextShowMnemonic, opt.text).width() + iconSize.width() + hframe
++					+ widgetWidth + padding,
++					qMax(maxWidgetHeight, qMax(fm.height(), iconSize.height())) + vframe);
++	}
++
++	QSize retSize = q->style()->sizeFromContents(QStyle::CT_TabBarTab, &opt, csz, q);
++	return retSize;
++
++}
++
++void TabBar::Private::balanseCloseButtons()
++{
++	if (tabsClosable && multiRow) {
++		while (closeButtons.isEmpty() || closeButtons.size() < q->count()) {
++			CloseButton *cb = new CloseButton(q);
++			closeButtons << cb;
++			cb->show();
++			connect(cb, SIGNAL(clicked()), q, SLOT(closeTab()));
++		}
++
++		while (closeButtons.size() > q->count()) {
++			closeButtons.takeLast()->deleteLater();
++		}
++	}
++	else {
++		qDeleteAll(closeButtons);
++		closeButtons.clear();
++	}
++}
++
++TabBar::TabBar(QWidget *parent)
++	: QTabBar(parent)
++{
++	d = new Private(this);
++}
++
++void TabBar::layoutTabs()
++{
++	if (d->multiRow) {
++		d->layoutTabs();
++	}
++	update();
++}
++
++void TabBar::setMultiRow(bool b)
++{
++	if (b == d->multiRow) {
++		return;
++	}
++
++	d->multiRow = b;
++
++	if (b) {
++		d->tabsClosable = QTabBar::tabsClosable();
++		setElideMode(Qt::ElideNone);
++		QTabBar::setTabsClosable(false);
++	}
++	else {
++		QTabBar::setTabsClosable(d->tabsClosable);
++		d->tabsClosable = false;
++	}
++
++	d->balanseCloseButtons();
++	if (b) {
++		// setUsesScrollButtons(false);
++		layoutTabs();
++	}
++	else {
++		d->hackedTabs.clear();
++		update();
++	}
++}
++
++void TabBar::setCurrentIndex(int index)
++{
++	if (!d->hackedTabs.isEmpty()) {
++		int prev = currentIndex();
++		if (prev > -1) {
++			d->hackedTabs[prev].state = QStyle::State_Enabled;
++
++			if (prev > 0)
++				d->hackedTabs[prev - 1].selectedPosition = QStyleOptionTab::NotAdjacent;
++			if (prev + 1 < d->hackedTabs.size())
++				d->hackedTabs[prev + 1].selectedPosition = QStyleOptionTab::NotAdjacent;
++		}
++		d->hackedTabs[index].state = QStyle::State_Enabled | QStyle::State_Selected;
++
++		if (index > 0)
++			d->hackedTabs[index - 1].selectedPosition = QStyleOptionTab::NextIsSelected;
++		if (index + 1 < d->hackedTabs.size())
++			d->hackedTabs[index + 1].selectedPosition = QStyleOptionTab::PreviousIsSelected;
++
++	}
++	QTabBar::setCurrentIndex(index);
++}
++
++void TabBar::setTabText(int index, const QString & text)
++{
++	QTabBar::setTabText(index, text);
++	layoutTabs();
++}
++
++void TabBar::setTabTextColor(int index, const QColor & color)
++{
++	QTabBar::setTabTextColor(index, color);
++	layoutTabs();
++}
++
++void TabBar::setTabIcon(int index, const QIcon &icon)
++{
++	QTabBar::setTabIcon(index, icon);
++	layoutTabs();
++}
++
++QRect TabBar::tabRect(int index) const
++{
++	if (d->multiRow) {
++		if (index < d->hackedTabs.size() && index >= 0)
++			return d->hackedTabs[index].rect;
++		else
++			return QRect();
++	}
++	else {
++		return QTabBar::tabRect(index);
++	}
++}
++
++QWidget *TabBar::tabButton(int index, ButtonPosition position) const
++{
++	ButtonPosition closeButtonPos = static_cast<ButtonPosition>(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this));
++	if (!d->multiRow || position != closeButtonPos)
++		return QTabBar::tabButton(index, position);
++
++	Q_ASSERT(index < d->closeButtons.size());
++	return index < d->closeButtons.size() ? d->closeButtons[index] : 0;
++}
++
++bool TabBar::multiRow() const
++{
++	return d->multiRow;
++}
++
++QSize TabBar::minimumSizeHint() const
++{
++	return QSize(0, sizeHint().height());
++}
++
++QSize TabBar::sizeHint() const
++{
++	// use own sizeHint only for single row mode
++	if (!d->multiRow) {
++		return QTabBar::sizeHint();
++	}
++
++	QList<QStyleOptionTabV3> tabs = d->hackedTabs;
++
++	QRect rect;
++	for (int i=0; i < tabs.size(); i++) {
++		rect = rect.united(tabs.at(i).rect);
++	}
++
++	QSize size = rect.size();
++	size.setWidth(width());
++	return size;
++}
++
++QSize TabBar::tabSizeHint(int index) const
++{
++	// use own sizeHint only for single row mode
++	if (!d->multiRow) {
++		return QTabBar::tabSizeHint(index);
++	}
++
++	if (index < 0 || d->hackedTabs.size() <= index) {
++		return QSize();
++	}
++
++	QStyleOptionTabV3 opt = d->hackedTabs.at(index);
++	return d->tabSizeHint(opt);
++}
++
++void TabBar::setTabsClosable(bool b)
++{
++	if (!d->multiRow) {
++		QTabBar::setTabsClosable(b);
++		return;
++	}
++
++	if (d->tabsClosable == b) {
++		return;
++	}
++
++	d->tabsClosable = b;
++	d->balanseCloseButtons();
++	d->layoutTabs();
++}
++
++bool TabBar::tabsClosable() const
++{
++	return d->tabsClosable;
++}
++
++// stealed from qtabbar_p.h
++static void initStyleBaseOption(QStyleOptionTabBarBaseV2 *optTabBase, QTabBar *tabbar, QSize size)
++{
++	QStyleOptionTab tabOverlap;
++	tabOverlap.shape = tabbar->shape();
++	int overlap = tabbar->style()->pixelMetric(QStyle::PM_TabBarBaseOverlap, &tabOverlap, tabbar);
++	QWidget *theParent = tabbar->parentWidget();
++	optTabBase->init(tabbar);
++	optTabBase->shape = tabbar->shape();
++	optTabBase->documentMode = tabbar->documentMode();
++	if (theParent && overlap > 0) {
++		QRect rect;
++		switch (tabOverlap.shape) {
++		case QTabBar::RoundedNorth:
++		case QTabBar::TriangularNorth:
++			rect.setRect(0, size.height()-overlap, size.width(), overlap);
++			break;
++		case QTabBar::RoundedSouth:
++		case QTabBar::TriangularSouth:
++			rect.setRect(0, 0, size.width(), overlap);
++			break;
++		case QTabBar::RoundedEast:
++		case QTabBar::TriangularEast:
++			rect.setRect(0, 0, overlap, size.height());
++			break;
++		case QTabBar::RoundedWest:
++		case QTabBar::TriangularWest:
++			rect.setRect(size.width() - overlap, 0, overlap, size.height());
++			break;
++		}
++		optTabBase->rect = rect;
++	}
++}
++
++void TabBar::paintEvent(QPaintEvent *event)
++{
++	// use own painting only for multi row mode
++	if (!d->multiRow) {
++		QTabBar::paintEvent(event);
++		return;
++	}
++
++	QStylePainter p(this);
++	QList<QStyleOptionTabV3> tabs = d->hackedTabs;
++
++	int selected = currentIndex();
++	if (drawBase()) {
++		QStyleOptionTabBarBaseV2 optTabBase;
++		initStyleBaseOption(&optTabBase, this, size());
++
++		optTabBase.selectedTabRect = tabs[selected].rect;
++
++		for (int i = 0; i < tabs.size(); ++i)
++			optTabBase.tabBarRect |= tabs[i].rect;
++
++		p.drawPrimitive(QStyle::PE_FrameTabBarBase, optTabBase);
++	}
++
++	int rowHeight = tabs[selected].rect.height();
++
++	// There is some problems when tabs are painted not in first row.
++	// Draw on a pixmap like a painting in the first row. Then move image
++	// to real TabBar widget.
++	QPixmap pixmap(width(), rowHeight);
++	pixmap.fill(Qt::transparent);
++	QStylePainter pp(&pixmap, this);
++	bool drawSelected = false;
++
++	if (shape() == QTabBar::RoundedNorth) {
++		for (int i = 0; i < tabs.size(); ++i) {
++			QStyleOptionTabV3 tab = tabs[i];
++			if (i != selected) {
++				tab.rect.moveBottom(rowHeight - 1);
++				pp.drawControl(QStyle::CE_TabBarTab, tab);
++			}
++			else {
++				drawSelected = true;
++			}
++
++			if (tab.position == QStyleOptionTab::End || tab.position == QStyleOptionTab::OnlyOneTab) {
++				if (drawSelected) {
++					// Draw current tab in the last order
++					tab = tabs[selected];
++					tab.rect.moveBottom(rowHeight - 1);
++					pp.drawControl(QStyle::CE_TabBarTab, tab);
++					drawSelected = false;
++				}
++
++				QRect rect(0, tabs[i].rect.top(), width(), rowHeight);
++				p.drawItemPixmap(rect, Qt::AlignCenter, pixmap);
++				pixmap.fill(Qt::transparent);
++			}
++		}
++	}
++	else {
++		for (int i = tabs.size() - 1; i >= 0; --i) {
++			QStyleOptionTabV3 tab = tabs[i];
++			if (i != selected) {
++				tab.rect.moveTop(0);
++				pp.drawControl(QStyle::CE_TabBarTab, tab);
++			}
++			else {
++				drawSelected = true;
++			}
++
++			if (tab.position == QStyleOptionTab::Beginning || tab.position == QStyleOptionTab::OnlyOneTab) {
++				if (drawSelected) {
++					// Draw current tab in the last order
++					tab = tabs[selected];
++					tab.rect.moveTop(0);
++					pp.drawControl(QStyle::CE_TabBarTab, tab);
++					drawSelected = false;
++				}
++
++				QRect rect(0, tabs[i].rect.top(), width(), rowHeight);
++				p.drawItemPixmap(rect, Qt::AlignCenter, pixmap);
++				pixmap.fill(Qt::transparent);
++			}
++		}
++	}
++
++	ButtonPosition closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this);
++	QStyle::SubElement se = (closeSide == LeftSide ? QStyle::SE_TabBarTabLeftButton : QStyle::SE_TabBarTabRightButton);
++	if (d->tabsClosable) {
++		for (int i = 0; i < tabs.size(); i++) {
++			QStyleOptionTabV3 opt;
++			opt = tabs.at(i);
++
++			QRect rect = style()->subElementRect(se, &opt, this);
++			rect.setTop(rect.top() + opt.rect.top());
++			QPoint p = rect.topLeft();
++			d->closeButtons.at(i)->move(p);
++		}
++	}
++}
++
++void TabBar::mousePressEvent(QMouseEvent *event)
++{
++	if (!d->multiRow) {
++		QTabBar::mousePressEvent(event);
++		return;
++	}
++
++	if (event->button() != Qt::LeftButton) {
++		event->ignore();
++		return;
++	}
++
++	for (int i = 0; i < count(); i++) {
++		if (d->hackedTabs.at(i).rect.contains(event->pos())) {
++			setCurrentIndex(i);
++			d->layoutTabs();
++
++			// QStyleOptionTabV3 tab = d->hackedTabs.at(currentIndex());
++			// tab.state = QStyle::State_Enabled;
++			// d->hackedTabs[currentIndex()] = tab;
++			// tab = d->hackedTabs.at(i);
++			// tab.state = QStyle::State_Selected | QStyle::State_Enabled;
++			// d->hackedTabs[i] = tab;
++			// update();
++		}
++	}
++}
++
++void TabBar::tabInserted(int index)
++{
++	QTabBar::tabInserted(index);
++
++	if (!d->multiRow) {
++		return;
++	}
++
++	d->balanseCloseButtons();
++	d->layoutTabs();
++}
++
++void TabBar::tabRemoved(int index)
++{
++	QTabBar::tabRemoved(index);
++
++	if (!d->multiRow) {
++		return;
++	}
++
++	d->balanseCloseButtons();
++	d->layoutTabs();
++}
++
++void TabBar::closeTab()
++{
++	CloseButton *cb = qobject_cast<CloseButton*>(sender());
++	int index = d->closeButtons.indexOf(cb);
++	emit tabCloseRequested(index);
++}
++
++CloseButton::CloseButton(QWidget *parent)
++	: QAbstractButton(parent)
++{
++	setFocusPolicy(Qt::NoFocus);
++	setCursor(Qt::ArrowCursor);
++	setToolTip(tr("Close Tab"));
++	resize(sizeHint());
++}
++
++QSize CloseButton::sizeHint() const
++{
++	ensurePolished();
++	int width = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, this);
++	int height = style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight, 0, this);
++	return QSize(width, height);
++}
++
++void CloseButton::enterEvent(QEvent *event)
++{
++	if (isEnabled())
++		update();
++	QAbstractButton::enterEvent(event);
++}
++
++void CloseButton::leaveEvent(QEvent *event)
++{
++	if (isEnabled())
++		update();
++	QAbstractButton::leaveEvent(event);
++}
++
++void CloseButton::paintEvent(QPaintEvent *)
++{
++	QPainter p(this);
++	QStyleOption opt;
++	opt.init(this);
++	opt.state |= QStyle::State_AutoRaise;
++	if (isEnabled() && underMouse() && !isChecked() && !isDown())
++		opt.state |= QStyle::State_Raised;
++	if (isChecked())
++		opt.state |= QStyle::State_On;
++	if (isDown())
++		opt.state |= QStyle::State_Sunken;
++
++	if (const TabBar *tb = qobject_cast<const TabBar*>(parent())) {
++		int index = tb->currentIndex();
++		QTabBar::ButtonPosition position = static_cast<QTabBar::ButtonPosition>(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tb));
++		if (tb->tabButton(index, position) == this)
++			opt.state |= QStyle::State_Selected;
++	}
++
++	style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &p, this);
++}
++
++#include "tabbar.moc"
+diff --git a/src/widgets/tabbar.h b/src/widgets/tabbar.h
+new file mode 100644
+index 0000000..84f4188
+--- /dev/null
++++ b/src/widgets/tabbar.h
+@@ -0,0 +1,62 @@
++/*
++ * tabbar.h
++ * Copyright (C) 2013-2014  Ivan Romanov <drizt@land.ru>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#pragma once
++
++#include <QTabBar>
++
++class TabBar : public QTabBar
++{
++	Q_OBJECT
++public:
++	explicit TabBar(QWidget *parent = 0);
++
++	void layoutTabs();
++
++	void setMultiRow(bool b);
++	bool multiRow() const;
++
++	// reimplemented
++	QSize minimumSizeHint() const;
++	QSize sizeHint() const;
++	QSize tabSizeHint(int index) const;
++	void setTabsClosable(bool b);
++	bool tabsClosable() const;
++	void setCurrentIndex(int index);
++	void setTabText(int index, const QString &text);
++	void setTabTextColor(int index, const QColor &color);
++	void setTabIcon(int index, const QIcon &icon);
++	QRect tabRect(int index) const;
++	QWidget *tabButton(int index, ButtonPosition position) const;
++
++protected:
++	// reimplemented
++	void paintEvent(QPaintEvent *event);
++	void mousePressEvent(QMouseEvent *event);
++	void tabInserted(int index);
++	void tabRemoved(int index);
++
++private slots:
++	void closeTab();
++
++private:
++	class Private;
++	Private *d;
++};
+diff --git a/src/widgets/widgets.pri b/src/widgets/widgets.pri
+index a2e1290..cbd770b 100644
+--- a/src/widgets/widgets.pri
++++ b/src/widgets/widgets.pri
+@@ -18,8 +18,8 @@ SOURCES += \
+ 	$$PWD/psitabbar.cpp \
+ 	$$PWD/psiwindowheader.cpp \
+ 	$$PWD/actionlineedit.cpp \
+-	$$PWD/typeaheadfind.cpp
+-
++	$$PWD/typeaheadfind.cpp \
++	$$PWD/tabbar.cpp
+ 
+ HEADERS += \
+ 	$$PWD/stretchwidget.h \
+@@ -46,7 +46,8 @@ HEADERS += \
+ 	$$PWD/psitabbar.h \
+ 	$$PWD/psiwindowheader.h \
+ 	$$PWD/actionlineedit.h \
+-	$$PWD/typeaheadfind.h
++	$$PWD/typeaheadfind.h \
++	$$PWD/tabbar.h
+ 
+ FORMS += $$PWD/fancypopup.ui \
+ 	$$PWD/psiwindowheader.ui

psi-plus-main-20130107.tar.xz/patches/8000-psi-extend-plugins-interface.diff -> psi-plus-main-20141106.tar.xz/patches/8000-psi-extend-plugins-interface.diff Changed

@@ -1,16 +1,16 @@
---- psi.orig/iris/src/xmpp/xmpp-im/client.cpp
-+++ psi/iris/src/xmpp/xmpp-im/client.cpp
-@@ -618,6 +618,7 @@ void Client::send(const QDomElement &x)
+--- git.orig/iris/src/xmpp/xmpp-im/client.cpp
++++ git/iris/src/xmpp/xmpp-im/client.cpp
+@@ -626,6 +626,7 @@ void Client::send(const QDomElement &x,
+ 		//printf("bad stanza??\n");
  		return;
  	}
- 
 +	emit stanzaElementOutgoing(e);
  	QString out = s.toString();
+ 	//qWarning() << "Out: " << out;
  	debug(QString("Client: outgoing: [\n%1]\n").arg(out));
- 	emit xmlOutgoing(out);
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -149,6 +149,7 @@ namespace XMPP
+--- git.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
++++ git/iris/src/xmpp/xmpp-im/xmpp_client.h
+@@ -151,6 +151,7 @@ namespace XMPP
  		void debugText(const QString &);
  		void xmlIncoming(const QString &);
  		void xmlOutgoing(const QString &);
@@ -18,9 +18,9 @@
  		void groupChatJoined(const Jid &);
  		void groupChatLeft(const Jid &);
  		void groupChatPresence(const Jid &, const Status &);
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -23,6 +23,7 @@
+--- git.orig/src/applicationinfo.cpp
++++ git/src/applicationinfo.cpp
+@@ -27,6 +27,7 @@
  
  #include "psiapplication.h"
  #include "applicationinfo.h"
@@ -28,7 +28,7 @@
  #include "profiles.h"
  #include "homedirmigration.h"
  #include "activeprofiles.h"
-@@ -81,6 +82,11 @@ QString ApplicationInfo::capsVersion()
+@@ -88,6 +89,11 @@ QString ApplicationInfo::capsVersion()
  	return PROG_CAPS_VERSION;
  }
  
@@ -40,9 +40,9 @@
  QString ApplicationInfo::IPCName()
  {
  	return PROG_IPC_NAME;
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -19,6 +19,7 @@ public:
+--- git.orig/src/applicationinfo.h
++++ git/src/applicationinfo.h
+@@ -20,6 +20,7 @@ public:
  	static QString version();
  	static QString capsNode();
  	static QString capsVersion();
@@ -50,9 +50,9 @@
  	static QString IPCName();
  
  	// URLs
---- psi.orig/src/chatdlg.h
-+++ psi/src/chatdlg.h
-@@ -171,7 +171,11 @@ protected:
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -170,7 +170,11 @@ protected:
  
  	void appendMessage(const Message &, bool local = false);
  	virtual bool isEncryptionEnabled() const;
@@ -64,8 +64,8 @@
  	virtual void nicksChanged();
  
  	QString whoNick(bool local) const;
---- psi.orig/src/contactlistaccountmenu.cpp
-+++ psi/src/contactlistaccountmenu.cpp
+--- git.orig/src/contactlistaccountmenu.cpp
++++ git/src/contactlistaccountmenu.cpp
 @@ -22,6 +22,8 @@
  
  #include <QPointer>
@@ -96,7 +96,7 @@
  		adminMenu_ = menu->addMenu(tr("&Admin"));
  		adminMenu_->addAction(adminOnlineUsersAction_);
  		adminMenu_->addAction(adminSendServerMessageAction_);
-@@ -234,6 +243,12 @@ private slots:
+@@ -235,6 +244,12 @@ private slots:
  		adminSetMotdAction_->setVisible(newMessageAction_->isVisible());
  		adminUpdateMotdAction_->setVisible(newMessageAction_->isVisible());
  		adminDeleteMotdAction_->setVisible(newMessageAction_->isVisible());
@@ -109,32 +109,50 @@
  	}
  
  	void statusChanged(XMPP::Status::Type statusType, bool forceDialog)
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -85,6 +85,7 @@
+--- git.orig/src/groupchatdlg.cpp
++++ git/src/groupchatdlg.cpp
+@@ -85,6 +85,9 @@
  #include "mucreasonseditor.h"
  #include "mcmdmanager.h"
  #include "lastactivitytask.h"
++#ifdef PSI_PLUGINS
 +#include "pluginmanager.h"
++#endif
  #include "psirichtext.h"
  #include "psiwindowheader.h"
  #include "avatars.h"
-@@ -794,6 +795,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- //#ifdef WHITEBOARDING
- //	ui_.toolbar->addAction(d->act_whiteboard);
- //#endif
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->addGCToolBarButton(this, ui_.toolbar, account(), jid().full());
-+#endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(d->act_icon);
- 	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
-@@ -2069,6 +2073,12 @@ void GCMainDlg::buildMenu()
- 		d->pm_settings->addAction(d->act_ps);
+@@ -899,6 +902,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
+ 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
+ 
+ 	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
++
++#ifdef PSI_PLUGINS
++	PluginManager::instance()->setupGCTab(this, account(), jid().full());
++#endif
+ }
+ 
+ GCMainDlg::~GCMainDlg()
+@@ -1962,6 +1969,14 @@ void GCMainDlg::setToolbuttons()
+ 	PsiOptions *options = PsiOptions::instance();
+ 	QStringList actionsNames = options->getOption("options.ui.contactlist.toolbars.m1.actions").toStringList();
+ 	foreach (const QString &actionName, actionsNames) {
++#ifdef PSI_PLUGINS
++		if (actionName.endsWith("-plugin")) {
++			QString name = PluginManager::instance()->nameByShortName(actionName.mid(0, actionName.length() - 7));
++			PluginManager::instance()->addGCToolBarButton(this, ui_.toolbar, account(), jid().full(), name);
++			continue;
++		}
++#endif
++
+ 		// Hack. separator action can be added only once.
+ 		if (actionName == "separator") {
+ 			ui_.toolbar->addSeparator();
+@@ -2123,6 +2138,12 @@ void GCMainDlg::buildMenu()
+ 	d->pm_settings->addAction(d->actions->action("gchat_ps"));
  	d->pm_settings->addAction(d->act_nick);
  	d->pm_settings->addAction(d->act_bookmark);
 +#ifdef PSI_PLUGINS
-+	if(!PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
++	if(!PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m1.visible").toBool()) {
 +		d->pm_settings->addSeparator();
 +		PluginManager::instance()->addGCToolBarButton(this, d->pm_settings, account(), jid().full());
 +	}
@@ -142,8 +160,8 @@
  }
  
  void GCMainDlg::chatEditCreated()
---- psi.orig/src/options/options.pri
-+++ psi/src/options/options.pri
+--- git.orig/src/options/options.pri
++++ git/src/options/options.pri
 @@ -79,7 +79,8 @@ FORMS += \
  	$$PWD/opt_iconset_roster.ui \
  	$$PWD/opt_general_groupchat.ui \
@@ -154,8 +172,8 @@
  
  psi_plugins {
  	FORMS += $$PWD/opt_plugins.ui
---- psi.orig/src/options/opt_plugins.cpp
-+++ psi/src/options/opt_plugins.cpp
+--- git.orig/src/options/opt_plugins.cpp
++++ git/src/options/opt_plugins.cpp
 @@ -3,6 +3,7 @@
  #include "iconwidget.h"
  #include "pluginmanager.h"
@@ -182,15 +200,16 @@
  }
  
  QWidget *OptionsTabPlugins::widget()
-@@ -40,39 +43,48 @@ QWidget *OptionsTabPlugins::widget()
+@@ -40,39 +43,49 @@ QWidget *OptionsTabPlugins::widget()
  	w = new OptPluginsUI();
  	OptPluginsUI *d = (OptPluginsUI *)w;
  
 -	listPlugins();
+-
 +	d->pb_info->setIcon(QIcon(IconsetFactory::iconPixmap("psi/info")));
++	d->cb_plugins->setMaxVisibleItems(50);
 +	d->cb_loadPlugin->setProperty("isOption", false);
  
--	
 -	/*d->ck_messageevents->setWhatsThis(
 -		tr("Enables the sending and requesting of message events such as "
 -		"'Contact is Typing', ..."));*/
@@ -200,7 +219,7 @@
 -	connect(d->cb_loadPlugin,SIGNAL(stateChanged(int)),SLOT(loadToggled(int)));
 +	connect(d->cb_loadPlugin,SIGNAL(clicked(bool)),SLOT(loadToggled(bool)));
 +	connect(d->pb_info, SIGNAL(clicked()), SLOT(showPluginInfo()));
- 	
+ 
  	return w;
  }
  
@@ -243,16 +262,22 @@
  void OptionsTabPlugins::listPlugins()
  {
    	if ( !w )
-@@ -84,16 +96,16 @@ void OptionsTabPlugins::listPlugins()
- 	
+@@ -84,26 +97,43 @@ void OptionsTabPlugins::listPlugins()
+ 
  	PluginManager *pm=PluginManager::instance();
- 	
+ 
 -	QStringList plugins=pm->availablePlugins();
 -		foreach (QString plugin, plugins){
+-		d->cb_plugins->addItem(plugin);
 +	QStringList plugins = pm->availablePlugins();
 +	plugins.sort();
 +	foreach (const QString& plugin, plugins){
- 		d->cb_plugins->addItem(plugin);
++		QIcon icon = pm->icon(plugin);
++
++		if (!pm->isEnabled(plugin)) {
++			icon = QIcon(icon.pixmap(icon.availableSizes().at(0), QIcon::Disabled));
++		}
++		d->cb_plugins->addItem(icon, plugin);
  	}
  	pluginSelected(0);
  }
@@ -263,22 +288,33 @@
 -	Q_UNUSED(state);
  	if ( !w )
  		return;
- 	
-@@ -101,9 +113,10 @@ void OptionsTabPlugins::loadToggled(int
- 	
+ 
+ 	OptPluginsUI *d = (OptPluginsUI *)w;
+ 
++	PluginManager *pm = PluginManager::instance();
++	QString name = d->cb_plugins->currentText();
++
  	QString option=QString("%1.%2")
  		.arg(PluginManager::loadOptionPrefix)
 -		.arg(PluginManager::instance()->shortName(d->cb_plugins->currentText()));
--	bool value=d->cb_loadPlugin->isChecked(); 
+-	bool value=d->cb_loadPlugin->isChecked();
 -	PsiOptions::instance()->setOption(option, value);
-+		.arg(PluginManager::instance()->shortName(d->cb_plugins->currentText())); 
++		.arg(pm->shortName(name));
 +	PsiOptions::instance()->setOption(option, state);
 +
 +	pluginSelected(0);
++
++	QIcon icon = pm->icon(name);
++	if (!pm->isEnabled(name)) {
++		icon = QIcon(icon.pixmap(icon.availableSizes().at(0), QIcon::Disabled));
++	}
++
++	d->cb_plugins->setItemIcon(d->cb_plugins->currentIndex(), icon);
++
  }
  
  void OptionsTabPlugins::pluginSelected(int index)
-@@ -115,43 +128,44 @@ void OptionsTabPlugins::pluginSelected(i
+@@ -115,43 +145,44 @@ void OptionsTabPlugins::pluginSelected(i
  	OptPluginsUI *d = (OptPluginsUI *)w;
  	d->le_location->setText(tr("No plugin selected."));
  	d->cb_loadPlugin->setEnabled(false);
@@ -295,7 +331,7 @@
  		d->cb_loadPlugin->setEnabled(true);
  		QWidget* pluginOptions = PluginManager::instance()->optionsWidget( pluginName );
  		d->cb_plugins->setEnabled(true);
--	
+-
 +		d->version->setText(tr("Version: ")+PluginManager::instance()->version( pluginName ));
  		QString option=QString("%1.%2")
  			.arg(PluginManager::loadOptionPrefix)
@@ -306,8 +342,8 @@
 -		else
 -			value=Qt::Unchecked;
 -		d->cb_loadPlugin->setChecked(value);
--	
--		d->vboxLayout1->remove(d->pluginOptions);
+-
+-		d->vboxLayout1->removeWidget(d->pluginOptions);
 -		delete d->pluginOptions;
 -		d->pluginOptions=NULL;
 -		if (pluginOptions)
@@ -321,7 +357,7 @@
 -			d->pluginOptions = new QLabel(tr("This plugin has no user configurable options"),d);
 -			qWarning("Plugin has no options");
 -		}
--		
+-
 -		d->vboxLayout1->addWidget(d->pluginOptions);
 +		d->cb_loadPlugin->setChecked(PsiOptions::instance()->getOption(option, false).toBool());
 +		pluginOptions->setParent(d);
@@ -350,8 +386,8 @@
 +		infoDialog->show();
  	}
  }
---- psi.orig/src/options/opt_plugins.h
-+++ psi/src/options/opt_plugins.h
+--- git.orig/src/options/opt_plugins.h
++++ git/src/options/opt_plugins.h
 @@ -2,6 +2,8 @@
  #define OPT_PLUGINS_H
  
@@ -386,8 +422,8 @@
  };
  
  #endif
---- psi.orig/src/options/opt_plugins.ui
-+++ psi/src/options/opt_plugins.ui
+--- git.orig/src/options/opt_plugins.ui
++++ git/src/options/opt_plugins.ui
 @@ -1,72 +1,91 @@
 -<ui version="4.0" >
 - <author></author>
@@ -612,8 +648,8 @@
        </size>
       </property>
      </spacer>
---- psi.orig/src/options/plugininfodialog.ui
-+++ psi/src/options/plugininfodialog.ui
+--- git.orig/src/options/plugininfodialog.ui
++++ git/src/options/plugininfodialog.ui
 @@ -0,0 +1,96 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<ui version="4.0">
@@ -711,9 +747,9 @@
 +  </connection>
 + </connections>
 +</ui>
---- psi.orig/src/pluginhost.cpp
-+++ psi/src/pluginhost.cpp
-@@ -6,17 +6,51 @@
+--- git.orig/src/pluginhost.cpp
++++ git/src/pluginhost.cpp
+@@ -6,17 +6,52 @@
  #include "pluginhost.h"
  
  #include <QPluginLoader>
@@ -763,10 +799,11 @@
 +#include "contactinfoaccessor.h"
 +#include "soundaccessor.h"
 +#include "textutil.h"
++#include "chattabaccessor.h"
  
  /**
   * \brief Constructs a host/wrapper for a plugin.
-@@ -32,12 +66,16 @@
+@@ -32,12 +67,16 @@
   */
  PluginHost::PluginHost(PluginManager* manager, const QString& pluginFile)
  	: manager_(manager)
@@ -785,7 +822,7 @@
  {
  	load();	// reads plugin name, etc
  	unload();
-@@ -107,6 +145,16 @@ const QString& PluginHost::version() con
+@@ -107,6 +146,26 @@ const QString& PluginHost::version() con
  }
  
  /**
@@ -799,10 +836,20 @@
 +}
 +
 +/**
++ * \brief Returns plugin icon.
++ *
++ * Data is available also when plugin is not loaded.
++ */
++const QIcon& PluginHost::icon() const
++{
++	return icon_;
++}
++
++/**
   * \brief Returns plugin options widget.
   *
   * Always returns null if plugin is not currently loaded.
-@@ -136,21 +184,29 @@ QWidget* PluginHost::optionsWidget() con
+@@ -136,21 +195,29 @@ QWidget* PluginHost::optionsWidget() con
   */
  bool PluginHost::load()
  {
@@ -821,8 +868,7 @@
  			loader_ = new QPluginLoader(file_);
 +			//loader_->setLoadHints(QLibrary::ResolveAllSymbolsHint);
  		}
--	
-+
+ 
  		QObject* plugin = loader_->instance();
  		if (!loader_->isLoaded()) {
  			delete loader_;
@@ -835,11 +881,14 @@
  			//Check it's the right sort of plugin
  			PsiPlugin* psiPlugin = qobject_cast<PsiPlugin*>(plugin);
  			if (psiPlugin) {
-@@ -161,6 +217,12 @@ bool PluginHost::load()
+@@ -161,6 +228,15 @@ bool PluginHost::load()
  				name_ = psiPlugin->name();
  				shortName_ = psiPlugin->shortName();
  				version_ = psiPlugin->version();
 +				priority_ = psiPlugin->priority();
++				icon_ = QIcon(psiPlugin->icon());
++				hasToolBarButton_ = qobject_cast<ToolbarIconAccessor*>(plugin_) ? true : false;
++				hasGCToolBarButton_ = qobject_cast<GCToolbarIconAccessor*>(plugin_) ? true : false;
 +				PluginInfoProvider *pip = qobject_cast<PluginInfoProvider*>(plugin_);
 +				if (pip) {
 +					hasInfo_ = true;
@@ -848,7 +897,7 @@
  			} else  {
  				qWarning("Attempted to load %s, but it is not a valid plugin.", qPrintable(file_));
  				if (loader_->isLoaded()) {
-@@ -168,6 +230,8 @@ bool PluginHost::load()
+@@ -168,6 +244,8 @@ bool PluginHost::load()
  					loader_->unload();
  				}
  				delete loader_;
@@ -857,7 +906,7 @@
  			}
  		}
  	}
-@@ -187,20 +251,24 @@ bool PluginHost::load()
+@@ -187,20 +265,24 @@ bool PluginHost::load()
   */
  bool PluginHost::unload()
  {
@@ -872,10 +921,9 @@
  			qWarning("Plugin %s's loader wasn't found when trying to unload", qPrintable(name_));
  			return false;
  		}
--		else if (loader_->unload()) {	
+ 		else if (loader_->unload()) {
 -	  		//if we're done with the plugin completely and it's unloaded
--	  		// we can delete the loader;	
-+		else if (loader_->unload()) {
+-	  		// we can delete the loader;
 +			//if we're done with the plugin completely and it's unloaded
 +			// we can delete the loader;
  			delete plugin_;
@@ -885,18 +933,17 @@
 +			delete iconset_;
 +			iconset_ = 0;
 +			connected_ = false;
- 		}	  	
+ 		}
  	}
  	return plugin_ == 0;
-@@ -231,26 +299,135 @@ bool PluginHost::enable()
+@@ -231,26 +313,135 @@ bool PluginHost::enable()
  {
  	if (!enabled_ && load()) {
  		if (!connected_) {
 +#ifndef PLUGINS_NO_DEBUG
  			qDebug() << "connecting plugin " << name_;
--	
 +#endif
-+
+ 
  			StanzaSender* s = qobject_cast<StanzaSender*>(plugin_);
  			if (s) {
 +#ifndef PLUGINS_NO_DEBUG
@@ -920,7 +967,7 @@
 +#endif
  				o->setOptionAccessingHost(this);
  			}
-+
+ 
 +			ShortcutAccessor* sa = qobject_cast<ShortcutAccessor*>(plugin_);
 +			if (sa) {
 +#ifndef PLUGINS_NO_DEBUG
@@ -935,7 +982,7 @@
 +#endif
 +				pa->setPopupAccessingHost(this);
 +			}
- 			
++
 +			IconFactoryAccessor* ia = qobject_cast<IconFactoryAccessor*>(plugin_);
 +			if (ia) {
 +#ifndef PLUGINS_NO_DEBUG
@@ -1025,7 +1072,7 @@
  			connected_ = true;
  		}
  
-@@ -271,7 +448,7 @@ bool PluginHost::enable()
+@@ -271,7 +462,7 @@ bool PluginHost::enable()
  bool PluginHost::disable()
  {
  	if (enabled_) {
@@ -1034,7 +1081,7 @@
  	}
  	return !enabled_;
  }
-@@ -356,6 +533,16 @@ bool PluginHost::incomingXml(int account
+@@ -356,6 +547,16 @@ bool PluginHost::incomingXml(int account
  }
  
  
@@ -1051,12 +1098,12 @@
  //-- for EventFilter ------------------------------------------------
  
  /**
-@@ -365,13 +552,12 @@ bool PluginHost::incomingXml(int account
+@@ -365,13 +566,12 @@ bool PluginHost::incomingXml(int account
   * this will call its processEvent() handler.
   * Handler may then modify the event and may cause the event to be
   * silently discarded.
 - * TODO: modification doesn't work
-  * 
+  *
   * \param account Identifier of the PsiAccount responsible
   * \param e Event XML
   * \return Continue processing the event; true if the stanza should be silently discarded.
@@ -1066,7 +1113,7 @@
  {
  	bool handled = false;
  	EventFilter *ef = qobject_cast<EventFilter*>(plugin_);
-@@ -406,6 +592,23 @@ bool PluginHost::processMessage(int acco
+@@ -406,6 +606,23 @@ bool PluginHost::processMessage(int acco
  	return handled;
  }
  
@@ -1090,7 +1137,7 @@
  
  //-- StanzaSender ---------------------------------------------------
  
-@@ -456,7 +659,8 @@ void PluginHost::sendMessage(int account
+@@ -456,7 +673,8 @@ void PluginHost::sendMessage(int account
  	//manager_->sendXml(account, m.toStanza(...).toString());
  
  	//TODO(mck): yeah, that's sick..
@@ -1100,7 +1147,7 @@
  
  }
  
-@@ -471,6 +675,10 @@ QString PluginHost::uniqueId(int account
+@@ -471,6 +689,10 @@ QString PluginHost::uniqueId(int account
  	return manager_->uniqueId(account);
  }
  
@@ -1111,7 +1158,7 @@
  
  //-- IqFilter -------------------------------------------------------
  
-@@ -494,7 +702,9 @@ QString PluginHost::uniqueId(int account
+@@ -494,7 +716,9 @@ QString PluginHost::uniqueId(int account
  void PluginHost::addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter)
  {
  	if (iqNsFilters_.values(ns).contains(filter)) {
@@ -1122,7 +1169,7 @@
  	} else {
  		iqNsFilters_.insert(ns, filter);
  	}
-@@ -519,9 +729,13 @@ void PluginHost::addIqNamespaceFilter(co
+@@ -519,9 +743,13 @@ void PluginHost::addIqNamespaceFilter(co
   */
  void PluginHost::addIqNamespaceFilter(const QRegExp &ns, IqNamespaceFilter *filter)
  {
@@ -1137,7 +1184,7 @@
  	} else {
  		iqNsxFilters_.insert(ns, filter);
  	}
-@@ -570,9 +784,8 @@ void PluginHost::setPluginOption( const
+@@ -570,9 +798,8 @@ void PluginHost::setPluginOption( const
  	//
  	//if (!plugin)
  	//	return;
@@ -1149,7 +1196,7 @@
  }
  
  /**
-@@ -585,9 +798,11 @@ void PluginHost::setPluginOption( const
+@@ -585,9 +812,11 @@ void PluginHost::setPluginOption( const
   * \param  option Option to set
   * \param value Return value
   */
@@ -1163,7 +1210,7 @@
  }
  
  /**
-@@ -616,6 +831,435 @@ QVariant PluginHost::getGlobalOption(con
+@@ -616,6 +845,468 @@ QVariant PluginHost::getGlobalOption(con
  	return PsiOptions::instance()->getOption(option);
  }
  
@@ -1401,6 +1448,11 @@
 +	return manager_->getName(account);
 +}
 +
++int PluginHost::findOnlineAccountForContact(const QString &jid) const
++{
++	return manager_->findOnlineAccountForContact(jid);
++}
++
 +bool PluginHost::setActivity(int account, const QString& Jid, QDomElement xml)
 +{
 +	return manager_->setActivity(account, Jid, xml);
@@ -1424,16 +1476,23 @@
 +				QVariantHash param = buttons_.at(i);
 +				QString th = param.value("tooltip").value<QString>();
 +				IconAction *button = new IconAction(th, param.value("icon").value<QString>(), th, 0, parent);
-+				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toAscii());
++				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
 +				toolbar->addAction(button);
 +			}
 +		}
 +		QAction *act = ta->getAction(parent, account, contact);
-+		if(act)
++		if(act) {
++			act->setObjectName(shortName_);
 +			toolbar->addAction(act);
++		}
 +	}
 +}
 +
++bool PluginHost::hasToolBarButton()
++{
++	return hasToolBarButton_;
++}
++
 +void PluginHost::addGCToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact)
 +{
 +	GCToolbarIconAccessor *ta = qobject_cast<GCToolbarIconAccessor*>(plugin_);
@@ -1443,7 +1502,7 @@
 +				QVariantHash param = gcbuttons_.at(i);
 +				QString th = param.value("tooltip").value<QString>();
 +				IconAction *button = new IconAction(th, param.value("icon").value<QString>(), th, 0, parent);
-+				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toAscii());
++				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
 +				toolbar->addAction(button);
 +			}
 +		}
@@ -1453,6 +1512,11 @@
 +	}
 +}
 +
++bool PluginHost::hasGCToolBarButton()
++{
++	return hasGCToolBarButton_;
++}
++
 +void PluginHost::initPopup(const QString& text, const QString& title, const QString& icon, int type)
 +{
 +	manager_->initPopup(text, title, icon, type);
@@ -1492,7 +1556,7 @@
 +				QVariantHash param = accMenu_.at(i);
 +				IconAction *act = new IconAction(param.value("name").value<QString>(), menu, param.value("icon").value<QString>());
 +				act->setProperty("account", QVariant(account));
-+				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toAscii());
++				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
 +				menu->addAction(act);
 +			}
 +		}
@@ -1512,7 +1576,7 @@
 +				IconAction *act = new IconAction(param.value("name").value<QString>(), menu, param.value("icon").value<QString>());
 +				act->setProperty("account", QVariant(account));
 +				act->setProperty("jid", QVariant(jid));
-+				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toAscii());
++				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
 +				menu->addAction(act);
 +			}
 +		}
@@ -1522,6 +1586,22 @@
 +	}
 +}
 +
++void PluginHost::setupChatTab(QWidget* tab, int account, const QString& contact)
++{
++	ChatTabAccessor *cta = qobject_cast<ChatTabAccessor*>(plugin_);
++	if(cta) {
++		cta->setupChatTab(tab, account, contact);
++	}
++}
++
++void PluginHost::setupGCTab(QWidget* tab, int account, const QString& contact)
++{
++	ChatTabAccessor *cta = qobject_cast<ChatTabAccessor*>(plugin_);
++	if(cta) {
++		cta->setupGCTab(tab, account, contact);
++	}
++}
++
 +bool PluginHost::isSelf(int account, const QString& jid)
 +{
 +	return manager_->isSelf(account, jid);
@@ -1599,8 +1679,8 @@
  
  //-- helpers --------------------------------------------------------
  
---- psi.orig/src/pluginhost.h
-+++ psi/src/pluginhost.h
+--- git.orig/src/pluginhost.h
++++ git/src/pluginhost.h
 @@ -10,10 +10,28 @@
  #include <QVariant>
  #include <QRegExp>
@@ -1647,15 +1727,16 @@
  
  public:
  	PluginHost(PluginManager* manager, const QString& pluginFile);
-@@ -38,6 +60,7 @@ public:
+@@ -38,6 +60,8 @@ public:
  	const QString& name() const;
  	const QString& shortName() const;
  	const QString& version() const;
 +	int priority() const;
++	const QIcon& icon() const;
  
  	// loading
  	bool load();
-@@ -51,16 +74,20 @@ public:
+@@ -51,16 +75,20 @@ public:
  
  	// for StanzaFilter and IqNamespaceFilter
  	bool incomingXml(int account, const QDomElement& e);
@@ -1677,7 +1758,7 @@
  
  	// IqFilteringHost
  	void addIqNamespaceFilter(const QString& ns, IqNamespaceFilter* filter);
-@@ -70,25 +97,121 @@ public:
+@@ -70,25 +98,134 @@ public:
  
  	// OptionAccessingHost
  	void setPluginOption(const QString& option, const QVariant& value);
@@ -1696,12 +1777,12 @@
 +	// IconFacrotyAccessingHost
 +	QIcon getIcon(const QString& name);
 +	void addIcon(const QString& name, const QByteArray& icon);
-+	
++
 +	//ActiveTabHost
 +	QTextEdit* getEditBox();
 +	QString getJid();
 +	QString getYourJid();
-+	
++
 +	//ApplicationInfoAccessingHost
 +	Proxy getProxyFor(const QString &obj);
 +	QString appName();
@@ -1728,6 +1809,7 @@
 +	QString getId(int account);
 +	QString getName(int account);
 +	QStringList getRoster(int account);
++	int findOnlineAccountForContact(const QString &jid) const;
 +
 +	//ContactInfoAccessingHost
 +	bool isSelf(int account, const QString& jid);
@@ -1754,11 +1836,20 @@
 +	void unregisterOption(const QString& name);
 +
 +	void addToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact);
++	bool hasToolBarButton();
++
 +	void addGCToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact);
++	bool hasGCToolBarButton();
 +
 +	void addAccountMenu(QMenu *menu, int account);
 +	void addContactMenu(QMenu *menu, int account, const QString& jid);
 +
++	//ChatTabAccessor
++	void setupChatTab(QWidget* tab, int account, const QString& contact);
++
++	// GCTabAccessor
++	void setupGCTab(QWidget* tab, int account, const QString& contact);
++
 +	void applyOptions();
 +	void restoreOptions();
 +
@@ -1782,8 +1873,11 @@
  	QString shortName_;
  	QString version_;
 +	int priority_;
++	QIcon icon_;
  	QPluginLoader* loader_;
 +	Iconset* iconset_;
++	bool hasToolBarButton_;
++	bool hasGCToolBarButton_;
  
  	bool valid_;
  	bool connected_;
@@ -1801,8 +1895,8 @@
  
  	bool loadPlugin(QObject* pluginObject);
  
---- psi.orig/src/pluginmanager.cpp
-+++ psi/src/pluginmanager.cpp
+--- git.orig/src/pluginmanager.cpp
++++ git/src/pluginmanager.cpp
 @@ -8,7 +8,7 @@
  #include <QtCore>
  #include <QtCrypto>
@@ -1838,9 +1932,9 @@
  
  
 @@ -80,10 +86,9 @@ PluginManager* PluginManager::instance()
-  * Default constructor. Locates all plugins, sets watchers on those directories to 
+  * Default constructor. Locates all plugins, sets watchers on those directories to
   * locate new ones and loads those enabled in the config.
-  */ 
+  */
 -PluginManager::PluginManager() : QObject(NULL)
 +PluginManager::PluginManager() : QObject(NULL), psi_(0)
  {
@@ -1922,7 +2016,7 @@
   * It causes the available plugin list to be refreshed.
 - *
 - * TODO: it should also load the plugins if they're on the autoload list
-  */ 
+  */
  void PluginManager::dirsChanged()
  {
 -	updatePluginsList();
@@ -2002,7 +2096,7 @@
  
  /**
 @@ -160,7 +229,9 @@ void PluginManager::optionChanged(const
-  */ 
+  */
  void PluginManager::loadAllPlugins()
  {
 +#ifndef PLUGINS_NO_DEBUG
@@ -2011,8 +2105,8 @@
    	//Any static (compiled in) plugins we happen to have
  	/*foreach( QObject* plugin, QPluginLoader::staticInstances() ) {
  		loadPlugin( plugin );
-@@ -180,12 +251,12 @@ void PluginManager::loadAllPlugins()
-  */ 
+@@ -180,25 +251,34 @@ void PluginManager::loadAllPlugins()
+  */
  bool PluginManager::unloadAllPlugins()
  {
 +#ifndef PLUGINS_NO_DEBUG
@@ -2027,28 +2121,54 @@
  			ok = false;
  		}
  	}
-@@ -198,7 +269,7 @@ bool PluginManager::unloadAllPlugins()
+ 	return ok;
+ }
+ 
++bool PluginManager::isEnabled(const QString& plugin) const
++{
++	bool enabled = false;
++	if (hosts_.contains(plugin)) {
++		enabled = hosts_[plugin]->isEnabled();
++	}
++	return enabled;
++}
++
+ /**
+  * Find the file which provides the named plugin. If the named plugin is not
+  * known, an empty string is provided.
   * \param plugin Name of the plugin.
   * \return Path to the plugin file.
-  */ 
+  */
 -QString PluginManager::pathToPlugin(const QString& plugin)
 +QString PluginManager::pathToPlugin(const QString& plugin) const
  {
  	QString path;
  	if (hosts_.contains(plugin)) {
-@@ -213,7 +284,7 @@ QString PluginManager::pathToPlugin(cons
+@@ -213,7 +293,7 @@ QString PluginManager::pathToPlugin(cons
   * \param plugin Name of the plugin.
   * \return Path to the plugin file.
-  */ 
+  */
 -QString PluginManager::shortName(const QString& plugin)
 +QString PluginManager::shortName(const QString& plugin) const
  {
  	QString name;
  	if (hosts_.contains(plugin)) {
-@@ -222,10 +293,19 @@ QString PluginManager::shortName(const Q
+@@ -222,10 +302,31 @@ QString PluginManager::shortName(const Q
  	return name;
  }
  
++QString PluginManager::nameByShortName(const QString& shortName) const
++{
++	QString name;
++	foreach (PluginHost* host, pluginsByPriority_) {
++		if (host->shortName() == shortName) {
++			name = host->name();
++			break;
++		}
++	}
++	return name;
++}
++
 +QString PluginManager::version(const QString& plugin) const
 +{
 +	QString name;
@@ -2066,7 +2186,7 @@
  {
  	return hosts_.keys();
  }
-@@ -238,13 +318,33 @@ QStringList PluginManager::availablePlug
+@@ -238,13 +339,33 @@ QStringList PluginManager::availablePlug
   */
  QWidget* PluginManager::optionsWidget(const QString& plugin)
  {
@@ -2104,7 +2224,7 @@
  }
  
  /**
-@@ -257,10 +357,10 @@ QWidget* PluginManager::optionsWidget(co
+@@ -257,10 +378,10 @@ QWidget* PluginManager::optionsWidget(co
   * \param event Incoming event
   * \return Continue processing the event; true if the event should be silently discarded.
   */
@@ -2117,7 +2237,7 @@
  		if (host->processMessage(accountIds_[account], jidFrom, body, subject)) {
  			handled = true;
  			break;
-@@ -279,10 +379,10 @@ bool PluginManager::processMessage(const
+@@ -279,10 +400,10 @@ bool PluginManager::processMessage(const
   * \param event Incoming event
   * \return Continue processing the event; true if the event should be silently discarded.
   */
@@ -2130,7 +2250,7 @@
  		if (host->processEvent(accountIds_[account], event)) {
  			handled = true;
  			break;
-@@ -292,6 +392,40 @@ bool PluginManager::processEvent(const P
+@@ -292,6 +413,40 @@ bool PluginManager::processEvent(const P
  }
  
  /**
@@ -2171,7 +2291,7 @@
   * \brief Give each plugin the opportunity to process the incoming xml
   *
   * Each plugin is passed the xml in turn using various filter interfaces
-@@ -306,7 +440,7 @@ bool PluginManager::processEvent(const P
+@@ -306,7 +461,7 @@ bool PluginManager::processEvent(const P
  bool PluginManager::incomingXml(int account, const QDomElement &xml)
  {
  	bool handled = false;
@@ -2180,7 +2300,7 @@
  		if (host->incomingXml(account, xml)) {
  			handled = true;
  			break;
-@@ -342,7 +476,7 @@ void PluginManager::sendXml(int account,
+@@ -342,7 +497,7 @@ void PluginManager::sendXml(int account,
   * \param account Identifier of the PsiAccount responsible
   * \return Unique ID to be used for when sending a stanza
   */
@@ -2189,7 +2309,7 @@
  {
  	QString id;
  	if (account < clients_.size()) {
-@@ -351,15 +485,284 @@ QString PluginManager::uniqueId(int acco
+@@ -351,15 +506,322 @@ QString PluginManager::uniqueId(int acco
  	return id;
  }
  
@@ -2323,6 +2443,18 @@
 +	return nm;
 +}
 +
++int PluginManager::findOnlineAccountForContact(const QString &jid) const
++{
++	Jid j(jid);
++	QHash<PsiAccount*, int>::const_iterator it = accountIds_.constBegin();
++	for ( ; it != accountIds_.end(); it++) {
++		if (it.key() && it.key()->isAvailable() && it.key()->findContact(j)) {
++			return it.value();
++		}
++	}
++	return -1;
++}
++
 +bool PluginManager::setActivity(int account, const QString& jid, QDomElement xml)
 +{
 +	if (account >= accountIds_.size())
@@ -2445,6 +2577,22 @@
 +	}
 +}
 +
++void PluginManager::setupChatTab(QWidget *tab, PsiAccount *account, const QString& contact)
++{
++	int i = accountIds_.value(account);
++	foreach (PluginHost* host, pluginsByPriority_) {
++		host->setupChatTab(tab, i, contact);
++	}
++}
++
++void PluginManager::setupGCTab(QWidget *tab, PsiAccount *account, const QString& contact)
++{
++	int i = accountIds_.value(account);
++	foreach (PluginHost* host, pluginsByPriority_) {
++		host->setupGCTab(tab, i, contact);
++	}
++}
++
 +bool PluginManager::hasInfoProvider(const QString& plugin) const
 +{
 +	if (hosts_.contains(plugin))
@@ -2461,6 +2609,16 @@
 +	return info;
 +}
 +
++QIcon PluginManager::icon(const QString& plugin) const
++{
++	QIcon icon;
++	if (hosts_.contains(plugin)) {
++		icon = hosts_[plugin]->icon();
++	}
++
++	return icon;
++}
++
  /**
   * Tells the plugin manager about an XMPP::Client and the owning PsiAccount
   */
@@ -2475,7 +2633,7 @@
  }
  
  /**
-@@ -372,6 +775,199 @@ bool PluginManager::verifyStanza(const Q
+@@ -372,6 +834,212 @@ bool PluginManager::verifyStanza(const Q
  	return true;
  }
  
@@ -2493,22 +2651,35 @@
 +	}
 +}
 +
-+void PluginManager::addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact)
++void PluginManager::addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin)
 +{
-+
 +	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->addToolBarButton(parent,toolbar, accountIds_[account], contact);
++		if (plugin.isEmpty() || (host->name() == plugin)) {
++			host->addToolBarButton(parent,toolbar, accountIds_[account], contact);
++		}
 +	}
 +}
 +
-+void PluginManager::addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact)
++bool PluginManager::hasToolBarButton(const QString& plugin) const
++{
++	return hosts_[plugin]->hasToolBarButton();
++}
++
++void PluginManager::addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin)
 +{
 +
 +	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->addGCToolBarButton(parent,toolbar, accountIds_[account], contact);
++		if (plugin.isEmpty() || (host->name() == plugin)) {
++			host->addGCToolBarButton(parent,toolbar, accountIds_[account], contact);
++		}
 +	}
 +}
 +
++bool PluginManager::hasGCToolBarButton(const QString& plugin) const
++{
++	return hosts_[plugin]->hasGCToolBarButton();
++}
++
 +void PluginManager::setStatus(int account, const QString& status, const QString& statusMessage)
 +{
 +	if(account < accountIds_.size()) {
@@ -2675,8 +2846,8 @@
  PluginManager* PluginManager::instance_ = NULL;
  const QString PluginManager::loadOptionPrefix = "plugins.auto-load";
  const QString PluginManager::pluginOptionPrefix = "plugins.options";
---- psi.orig/src/pluginmanager.h
-+++ psi/src/pluginmanager.h
+--- git.orig/src/pluginmanager.h
++++ git/src/pluginmanager.h
 @@ -11,12 +11,16 @@
  #include <QMap>
  #include <QHash>
@@ -2694,7 +2865,7 @@
  
  namespace XMPP {
  	class Client;
-@@ -33,29 +37,48 @@ class PluginManager : public QObject
+@@ -33,29 +37,56 @@ class PluginManager : public QObject
  
  public:
  	static PluginManager* instance();
@@ -2711,14 +2882,15 @@
  
 -	QString pathToPlugin(const QString& plugin);
 -	QString shortName(const QString& plugin);
++	bool isEnabled(const QString& plugin) const;
 +	QString pathToPlugin(const QString& plugin) const;
 +	QString shortName(const QString& plugin) const;
++	QString nameByShortName(const QString& shortName) const;
 +	QString version(const QString& plugin) const;
  	QWidget* optionsWidget(const QString& plugin);
  
 -	bool processEvent(const PsiAccount* account, QDomElement& eventXml);
 -	bool processMessage(const PsiAccount* account, const QString& jidFrom, const QString& body, const QString& subject);
--	
 +	void setShortcuts();
 +
 +	bool processEvent(PsiAccount* account, QDomElement& eventXml);
@@ -2729,17 +2901,23 @@
 +
 +	void applyOptions(const QString& plugin);
 +	void restoreOptions(const QString& plugin);
-+	void addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact);
-+	void addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact);
++	void addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin = "");
++	bool hasToolBarButton(const QString& plugin) const;
++	void addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin = "");
++	bool hasGCToolBarButton(const QString& plugin) const;
 +	void addAccountMenu(QMenu *menu, PsiAccount* account);
 +	void addContactMenu(QMenu *menu, PsiAccount* account, QString jid);
 +
++	void setupChatTab(QWidget *tab, PsiAccount* account, const QString& contact);
++	void setupGCTab(QWidget *tab, PsiAccount* account, const QString& contact);
++
 +	QString pluginInfo(const QString& plugin) const;
 +	bool hasInfoProvider(const QString& plugin) const;
-+
++	QIcon icon(const QString& plugin) const;
+ 
  	static const QString loadOptionPrefix;
  	static const QString pluginOptionPrefix;
- 	
+ 
  private:
  	PluginManager();
 +	PsiCon *psi_;
@@ -2751,7 +2929,7 @@
  
  	static PluginManager* instance_;
  
-@@ -63,26 +86,70 @@ private:
+@@ -63,26 +94,71 @@ private:
  	QVector<XMPP::Client*> clients_;
  
  	//account, account id
@@ -2767,7 +2945,7 @@
 +	//sorted by priority
 +	QList<PluginHost*> pluginsByPriority_;
  
- 	
+ 
  	QList<QCA::DirWatch*> dirWatchers_;
  
 +	// Options widget provides by plugin on opt_plugins
@@ -2789,6 +2967,7 @@
 +	QString getJid(int account) const;
 +	QString getId(int account) const;
 +	QString getName(int account) const;
++	int findOnlineAccountForContact(const QString &jid) const;
 +
 +	bool isSelf(int account, const QString& jid) const;
 +	bool isAgent(int account, const QString& jid) const;
@@ -2818,7 +2997,7 @@
 +	void createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot);
  
  	friend class PluginHost;
- 	
+ 
  private slots:
  	void dirsChanged();
  	void optionChanged(const QString& option);
@@ -2826,9 +3005,9 @@
  };
  
  #endif
---- psi.orig/src/plugins/include/accountinfoaccessinghost.h
-+++ psi/src/plugins/include/accountinfoaccessinghost.h
-@@ -0,0 +1,26 @@
+--- git.orig/src/plugins/include/accountinfoaccessinghost.h
++++ git/src/plugins/include/accountinfoaccessinghost.h
+@@ -0,0 +1,27 @@
 +#ifndef ACCOUNTINFOACCESSINGHOST_H
 +#define ACCOUNTINFOACCESSINGHOST_H
 +
@@ -2850,13 +3029,14 @@
 +	virtual QString getId(int account) = 0;  //if account out of range return "-1"
 +	virtual QString getName(int account) = 0;  //if account out of range return ""
 +	virtual QStringList getRoster(int account) = 0; //if account out of range return List with one element, value "-1"
++	virtual int findOnlineAccountForContact(const QString &jid) const = 0; //gets all accounts and searches for specified contact in them. return -1 if account is not found
 +};
 +
 +Q_DECLARE_INTERFACE(AccountInfoAccessingHost, "org.psi-im.AccountInfoAccessingHost/0.1");
 +
 +#endif // ACCOUNTINFOACCESSINGHOST_H
---- psi.orig/src/plugins/include/accountinfoaccessor.h
-+++ psi/src/plugins/include/accountinfoaccessor.h
+--- git.orig/src/plugins/include/accountinfoaccessor.h
++++ git/src/plugins/include/accountinfoaccessor.h
 @@ -0,0 +1,18 @@
 +#ifndef ACCOUNTINFOACCESSOR_H
 +#define ACCOUNTINFOACCESSOR_H
@@ -2876,8 +3056,8 @@
 +
 +
 +#endif // ACCOUNTINFOACCESSOR_H
---- psi.orig/src/plugins/include/activetabaccessinghost.h
-+++ psi/src/plugins/include/activetabaccessinghost.h
+--- git.orig/src/plugins/include/activetabaccessinghost.h
++++ git/src/plugins/include/activetabaccessinghost.h
 @@ -0,0 +1,18 @@
 +#ifndef ACTIVETABACCESSINGHOST_H
 +#define ACTIVETABACCESSINGHOST_H
@@ -2897,8 +3077,8 @@
 +
 +Q_DECLARE_INTERFACE(ActiveTabAccessingHost, "org.psi-im.ActiveTabAccessingHost/0.1");
 +#endif // ACTIVETABACCESSINGHOST_H
---- psi.orig/src/plugins/include/activetabaccessor.h
-+++ psi/src/plugins/include/activetabaccessor.h
+--- git.orig/src/plugins/include/activetabaccessor.h
++++ git/src/plugins/include/activetabaccessor.h
 @@ -0,0 +1,17 @@
 +#ifndef ACTIVETABACCESSOR_H
 +#define ACTIVETABACCESSOR_H
@@ -2917,8 +3097,8 @@
 +Q_DECLARE_INTERFACE(ActiveTabAccessor, "org.psi-im.ActiveTabAccessor/0.1");
 +
 +#endif // ACTIVETABACCESSOR_H
---- psi.orig/src/plugins/include/applicationinfoaccessinghost.h
-+++ psi/src/plugins/include/applicationinfoaccessinghost.h
+--- git.orig/src/plugins/include/applicationinfoaccessinghost.h
++++ git/src/plugins/include/applicationinfoaccessinghost.h
 @@ -0,0 +1,45 @@
 +#ifndef APPLICATIONINFOACCESSINGHOST_H
 +#define APPLICATIONINFOACCESSINGHOST_H
@@ -2965,8 +3145,8 @@
 +Q_DECLARE_INTERFACE(ApplicationInfoAccessingHost, "org.psi-im.ApplicationInfoAccessingHost/0.1");
 +
 +#endif // APPLICATIONINFOACCESSINGHOST_H
---- psi.orig/src/plugins/include/applicationinfoaccessor.h
-+++ psi/src/plugins/include/applicationinfoaccessor.h
+--- git.orig/src/plugins/include/applicationinfoaccessor.h
++++ git/src/plugins/include/applicationinfoaccessor.h
 @@ -0,0 +1,17 @@
 +#ifndef APPLICATIONINFOACCESSOR_H
 +#define APPLICATIONINFOACCESSOR_H
@@ -2985,8 +3165,29 @@
 +Q_DECLARE_INTERFACE(ApplicationInfoAccessor, "org.psi-im.ApplicationInfoAccessor/0.1");
 +
 +#endif // APPLICATIONINFOACCESSOR_H
---- psi.orig/src/plugins/include/contactinfoaccessinghost.h
-+++ psi/src/plugins/include/contactinfoaccessinghost.h
+--- git.orig/src/plugins/include/chattabaccessor.h
++++ git/src/plugins/include/chattabaccessor.h
+@@ -0,0 +1,18 @@
++#ifndef CHATTABACCESSOR_H
++#define CHATTABACCESSOR_H
++
++class QWidget;
++class QString;
++
++class ChatTabAccessor
++{
++public:
++	virtual ~ChatTabAccessor() {}
++
++	virtual void setupChatTab(QWidget* tab, int account, const QString& contact) = 0;
++	virtual void setupGCTab(QWidget* tab, int account, const QString& contact) = 0;
++};
++
++Q_DECLARE_INTERFACE(ChatTabAccessor, "org.psi-im.ChatTabAccessor/0.1");
++
++#endif // CHATTABACCESSOR_H
+--- git.orig/src/plugins/include/contactinfoaccessinghost.h
++++ git/src/plugins/include/contactinfoaccessinghost.h
 @@ -0,0 +1,27 @@
 +#ifndef CONTACTINFOACCESSINGHOST_H
 +#define CONTACTINFOACCESSINGHOST_H
@@ -3015,8 +3216,8 @@
 +Q_DECLARE_INTERFACE(ContactInfoAccessingHost, "org.psi-im.ContactInfoAccessingHost/0.1");
 +
 +#endif // CONTACTINFOACCESSINGHOST_H
---- psi.orig/src/plugins/include/contactinfoaccessor.h
-+++ psi/src/plugins/include/contactinfoaccessor.h
+--- git.orig/src/plugins/include/contactinfoaccessor.h
++++ git/src/plugins/include/contactinfoaccessor.h
 @@ -0,0 +1,18 @@
 +#ifndef CONTACTINFOACCESSOR_H
 +#define CONTACTINFOACCESSOR_H
@@ -3036,8 +3237,8 @@
 +
 +
 +#endif // CONTACTINFOACCESSOR_H
---- psi.orig/src/plugins/include/contactstateaccessinghost.h
-+++ psi/src/plugins/include/contactstateaccessinghost.h
+--- git.orig/src/plugins/include/contactstateaccessinghost.h
++++ git/src/plugins/include/contactstateaccessinghost.h
 @@ -0,0 +1,19 @@
 +#ifndef CONTACTSTATEACCESSINGHOST_H
 +#define CONTACTSTATEACCESSINGHOST_H
@@ -3058,8 +3259,8 @@
 +Q_DECLARE_INTERFACE(ContactStateAccessingHost, "org.psi-im.ContactStateAccessingHost/0.2");
 +
 +#endif // CONTACTSTATEACCESSINGHOST_H
---- psi.orig/src/plugins/include/contactstateaccessor.h
-+++ psi/src/plugins/include/contactstateaccessor.h
+--- git.orig/src/plugins/include/contactstateaccessor.h
++++ git/src/plugins/include/contactstateaccessor.h
 @@ -0,0 +1,18 @@
 +#ifndef CONTACTSTATEACCESSOR_H
 +#define CONTACTSTATEACCESSOR_H
@@ -3079,8 +3280,8 @@
 +
 +
 +#endif // CONTACTSTATEACCESSOR_H
---- psi.orig/src/plugins/include/eventcreatinghost.h
-+++ psi/src/plugins/include/eventcreatinghost.h
+--- git.orig/src/plugins/include/eventcreatinghost.h
++++ git/src/plugins/include/eventcreatinghost.h
 @@ -0,0 +1,16 @@
 +#ifndef EVENTCREATINGHOST_H
 +#define EVENTCREATINGHOST_H
@@ -3098,8 +3299,8 @@
 +
 +Q_DECLARE_INTERFACE(EventCreatingHost, "org.psi-im.EventCreatingHost/0.1");
 +#endif
---- psi.orig/src/plugins/include/eventcreator.h
-+++ psi/src/plugins/include/eventcreator.h
+--- git.orig/src/plugins/include/eventcreator.h
++++ git/src/plugins/include/eventcreator.h
 @@ -0,0 +1,17 @@
 +#ifndef EVENTCREATOR_H
 +#define EVENTCREATOR_H
@@ -3118,8 +3319,8 @@
 +Q_DECLARE_INTERFACE(EventCreator, "org.psi-im.EventCreator/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/eventfilter.h
-+++ psi/src/plugins/include/eventfilter.h
+--- git.orig/src/plugins/include/eventfilter.h
++++ git/src/plugins/include/eventfilter.h
 @@ -1,7 +1,8 @@
  #ifndef EVENTFILTER_H
  #define EVENTFILTER_H
@@ -3142,8 +3343,8 @@
  };
  
  Q_DECLARE_INTERFACE(EventFilter, "org.psi-im.EventFilter/0.1");
---- psi.orig/src/plugins/include/gctoolbariconaccessor.h
-+++ psi/src/plugins/include/gctoolbariconaccessor.h
+--- git.orig/src/plugins/include/gctoolbariconaccessor.h
++++ git/src/plugins/include/gctoolbariconaccessor.h
 @@ -0,0 +1,22 @@
 +#ifndef GCTOOLBARICONACCESSOR_H
 +#define GCTOOLBARICONACCESSOR_H
@@ -3167,8 +3368,8 @@
 +Q_DECLARE_INTERFACE(GCToolbarIconAccessor, "org.psi-im.GCToolbarIconAccessor/0.1");
 +
 +#endif // GCTOOLBARICONACCESSOR_H
---- psi.orig/src/plugins/include/iconfactoryaccessinghost.h
-+++ psi/src/plugins/include/iconfactoryaccessinghost.h
+--- git.orig/src/plugins/include/iconfactoryaccessinghost.h
++++ git/src/plugins/include/iconfactoryaccessinghost.h
 @@ -0,0 +1,17 @@
 +#ifndef ICONFACTORYACCESSINGHOST_H
 +#define ICONFACTORYACCESSINGHOST_H
@@ -3187,8 +3388,8 @@
 +
 +Q_DECLARE_INTERFACE(IconFactoryAccessingHost, "org.psi-im.IconFactoryAccessingHost/0.1");
 +#endif // ICONFACTORYACCESSINGHOST_H
---- psi.orig/src/plugins/include/iconfactoryaccessor.h
-+++ psi/src/plugins/include/iconfactoryaccessor.h
+--- git.orig/src/plugins/include/iconfactoryaccessor.h
++++ git/src/plugins/include/iconfactoryaccessor.h
 @@ -0,0 +1,17 @@
 +#ifndef ICONFACTORYACCESSOR_H
 +#define ICONFACTORYACCESSOR_H
@@ -3207,8 +3408,8 @@
 +Q_DECLARE_INTERFACE(IconFactoryAccessor, "org.psi-im.IconFactoryAccessor/0.1");
 +
 +#endif // ICONFACTORYACCESSOR_H
---- psi.orig/src/plugins/include/iqfilteringhost.h
-+++ psi/src/plugins/include/iqfilteringhost.h
+--- git.orig/src/plugins/include/iqfilteringhost.h
++++ git/src/plugins/include/iqfilteringhost.h
 @@ -1,8 +1,8 @@
  #ifndef IQFILTERINGHOST_H
  #define IQFILTERINGHOST_H
@@ -3220,8 +3421,8 @@
  
  class IqNamespaceFilter;
  
---- psi.orig/src/plugins/include/iqnamespacefilter.h
-+++ psi/src/plugins/include/iqnamespacefilter.h
+--- git.orig/src/plugins/include/iqnamespacefilter.h
++++ git/src/plugins/include/iqnamespacefilter.h
 @@ -1,7 +1,7 @@
  #ifndef IQNAMESPACEFILTER_H
  #define IQNAMESPACEFILTER_H
@@ -3231,8 +3432,8 @@
  
  class IqNamespaceFilter
  {
---- psi.orig/src/plugins/include/menuaccessor.h
-+++ psi/src/plugins/include/menuaccessor.h
+--- git.orig/src/plugins/include/menuaccessor.h
++++ git/src/plugins/include/menuaccessor.h
 @@ -0,0 +1,25 @@
 +#ifndef MENUACCESSOR_H
 +#define MENUACCESSOR_H
@@ -3259,8 +3460,8 @@
 +Q_DECLARE_INTERFACE(MenuAccessor, "org.psi-im.MenuAccessor/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/optionaccessinghost.h
-+++ psi/src/plugins/include/optionaccessinghost.h
+--- git.orig/src/plugins/include/optionaccessinghost.h
++++ git/src/plugins/include/optionaccessinghost.h
 @@ -1,8 +1,8 @@
  #ifndef OPTIONACCESSINGHOST_H
  #define OPTIONACCESSINGHOST_H
@@ -3281,8 +3482,8 @@
  
  	virtual void setGlobalOption(const QString& option, const QVariant& value) = 0;
  	virtual QVariant getGlobalOption(const QString& option) = 0;
---- psi.orig/src/plugins/include/optionaccessor.h
-+++ psi/src/plugins/include/optionaccessor.h
+--- git.orig/src/plugins/include/optionaccessor.h
++++ git/src/plugins/include/optionaccessor.h
 @@ -1,8 +1,7 @@
  #ifndef OPTIONACCESSOR_H
  #define OPTIONACCESSOR_H
@@ -3293,8 +3494,8 @@
  
  class OptionAccessingHost;
  
---- psi.orig/src/plugins/include/plugininfoprovider.h
-+++ psi/src/plugins/include/plugininfoprovider.h
+--- git.orig/src/plugins/include/plugininfoprovider.h
++++ git/src/plugins/include/plugininfoprovider.h
 @@ -0,0 +1,18 @@
 +#ifndef PLUGININFOPROVIDER_H
 +#define PLUGININFOPROVIDER_H
@@ -3314,8 +3515,8 @@
 +
 +
 +#endif // PLUGININFOPROVIDER_H
---- psi.orig/src/plugins/include/popupaccessinghost.h
-+++ psi/src/plugins/include/popupaccessinghost.h
+--- git.orig/src/plugins/include/popupaccessinghost.h
++++ git/src/plugins/include/popupaccessinghost.h
 @@ -0,0 +1,21 @@
 +#ifndef POPUPACCESSINGHOST_H
 +#define POPUPACCESSINGHOST_H
@@ -3338,8 +3539,8 @@
 +Q_DECLARE_INTERFACE(PopupAccessingHost, "org.psi-im.PopupAccessingHost/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/popupaccessor.h
-+++ psi/src/plugins/include/popupaccessor.h
+--- git.orig/src/plugins/include/popupaccessor.h
++++ git/src/plugins/include/popupaccessor.h
 @@ -0,0 +1,16 @@
 +#ifndef POPUPACCESSOR_H
 +#define POPUPACCESSOR_H
@@ -3357,8 +3558,8 @@
 +Q_DECLARE_INTERFACE(PopupAccessor, "org.psi-im.PopupAccessor/0.1");
 +
 +#endif // POPUPACCESSOR_H
---- psi.orig/src/plugins/include/psiaccountcontroller.h
-+++ psi/src/plugins/include/psiaccountcontroller.h
+--- git.orig/src/plugins/include/psiaccountcontroller.h
++++ git/src/plugins/include/psiaccountcontroller.h
 @@ -0,0 +1,18 @@
 +#ifndef PSIACCOUNTCONTROLLER_H
 +#define PSIACCOUNTCONTROLLER_H
@@ -3378,8 +3579,8 @@
 +
 +
 +#endif // PSIACCOUNTCONTROLLER_H
---- psi.orig/src/plugins/include/psiaccountcontrollinghost.h
-+++ psi/src/plugins/include/psiaccountcontrollinghost.h
+--- git.orig/src/plugins/include/psiaccountcontrollinghost.h
++++ git/src/plugins/include/psiaccountcontrollinghost.h
 @@ -0,0 +1,18 @@
 +#ifndef PSIACCOUNTCONTROLLINGHOST_H
 +#define PSIACCOUNTCONTROLLINGHOST_H
@@ -3399,8 +3600,8 @@
 +Q_DECLARE_INTERFACE(PsiAccountControllingHost, "org.psi-im.PsiAccountControllingHost/0.1");
 +
 +#endif // PSIACCOUNTCONTROLLINGHOST_H
---- psi.orig/src/plugins/include/psiplugin.h
-+++ psi/src/plugins/include/psiplugin.h
+--- git.orig/src/plugins/include/psiplugin.h
++++ git/src/plugins/include/psiplugin.h
 @@ -37,8 +37,29 @@ class QWidget;
  class PsiPlugin
  {
@@ -3440,17 +3641,22 @@
  
  	/**
  	 * \brief Enable plugin
-@@ -87,6 +108,8 @@ public:
+@@ -87,8 +108,12 @@ public:
  	 */
  	virtual bool disable() = 0;
  
 +	virtual void applyOptions() = 0;
 +	virtual void restoreOptions() = 0;
++
++	virtual QPixmap icon() const = 0;
  };
  
- Q_DECLARE_INTERFACE(PsiPlugin, "org.psi-im.PsiPlugin/0.3");
---- psi.orig/src/plugins/include/shortcutaccessinghost.h
-+++ psi/src/plugins/include/shortcutaccessinghost.h
+-Q_DECLARE_INTERFACE(PsiPlugin, "org.psi-im.PsiPlugin/0.3");
++Q_DECLARE_INTERFACE(PsiPlugin, "org.psi-im.PsiPlugin/0.4");
+ 
+ #endif
+--- git.orig/src/plugins/include/shortcutaccessinghost.h
++++ git/src/plugins/include/shortcutaccessinghost.h
 @@ -0,0 +1,20 @@
 +#ifndef SHORTCUTACCESSINGHOST_H
 +#define SHORTCUTACCESSINGHOST_H
@@ -3472,8 +3678,8 @@
 +Q_DECLARE_INTERFACE(ShortcutAccessingHost, "org.psi-im.ShortcutAccessingHost/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/shortcutaccessor.h
-+++ psi/src/plugins/include/shortcutaccessor.h
+--- git.orig/src/plugins/include/shortcutaccessor.h
++++ git/src/plugins/include/shortcutaccessor.h
 @@ -0,0 +1,18 @@
 +#ifndef SHORTCUTACCESSOR_H
 +#define SHORTCUTACCESSOR_H
@@ -3493,8 +3699,8 @@
 +Q_DECLARE_INTERFACE(ShortcutAccessor, "org.psi-im.ShortcutAccessor/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/soundaccessinghost.h
-+++ psi/src/plugins/include/soundaccessinghost.h
+--- git.orig/src/plugins/include/soundaccessinghost.h
++++ git/src/plugins/include/soundaccessinghost.h
 @@ -0,0 +1,16 @@
 +#ifndef SOUNDACCESSINGHOST_H
 +#define SOUNDACCESSINGHOST_H
@@ -3512,8 +3718,8 @@
 +Q_DECLARE_INTERFACE(SoundAccessingHost, "org.psi-im.SoundAccessingHost/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/soundaccessor.h
-+++ psi/src/plugins/include/soundaccessor.h
+--- git.orig/src/plugins/include/soundaccessor.h
++++ git/src/plugins/include/soundaccessor.h
 @@ -0,0 +1,16 @@
 +#ifndef SOUNDACCESSOR_H
 +#define SOUNDACCESSOR_H
@@ -3531,8 +3737,8 @@
 +Q_DECLARE_INTERFACE(SoundAccessor, "org.psi-im.SoundAccessor/0.1");
 +
 +#endif
---- psi.orig/src/plugins/include/stanzafilter.h
-+++ psi/src/plugins/include/stanzafilter.h
+--- git.orig/src/plugins/include/stanzafilter.h
++++ git/src/plugins/include/stanzafilter.h
 @@ -1,7 +1,7 @@
  #ifndef STANZAFILTER_H
  #define STANZAFILTER_H
@@ -3552,8 +3758,8 @@
  };
  
  Q_DECLARE_INTERFACE(StanzaFilter, "org.psi-im.StanzaFilter/0.1");
---- psi.orig/src/plugins/include/stanzasendinghost.h
-+++ psi/src/plugins/include/stanzasendinghost.h
+--- git.orig/src/plugins/include/stanzasendinghost.h
++++ git/src/plugins/include/stanzasendinghost.h
 @@ -1,8 +1,8 @@
  #ifndef STANZASENDINGHOST_H
  #define STANZASENDINGHOST_H
@@ -3573,8 +3779,8 @@
  };
  
  Q_DECLARE_INTERFACE(StanzaSendingHost, "org.psi-im.StanzaSendingHost/0.1");
---- psi.orig/src/plugins/include/toolbariconaccessor.h
-+++ psi/src/plugins/include/toolbariconaccessor.h
+--- git.orig/src/plugins/include/toolbariconaccessor.h
++++ git/src/plugins/include/toolbariconaccessor.h
 @@ -0,0 +1,22 @@
 +#ifndef TOOLBARICONACCESSOR_H
 +#define TOOLBARICONACCESSOR_H
@@ -3598,9 +3804,9 @@
 +Q_DECLARE_INTERFACE(ToolbarIconAccessor, "org.psi-im.ToolbarIconAccessor/0.1");
 +
 +#endif // TOOLBARICONACCESSOR_H
---- psi.orig/src/plugins/plugins.pri
-+++ psi/src/plugins/plugins.pri
-@@ -10,5 +10,30 @@ HEADERS += \
+--- git.orig/src/plugins/plugins.pri
++++ git/src/plugins/plugins.pri
+@@ -10,5 +10,31 @@ HEADERS += \
  	$$PWD/include/iqfilteringhost.h \
  	$$PWD/include/eventfilter.h \
  	$$PWD/include/optionaccessor.h \
@@ -3632,24 +3838,25 @@
 +	$$PWD/include/contactinfoaccessor.h \
 +	$$PWD/include/contactinfoaccessinghost.h \
 +	$$PWD/include/soundaccessor.h \
-+	$$PWD/include/soundaccessinghost.h
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -767,6 +767,13 @@ public slots:
- 		xmlRingbuf[xmlRingbufWrite].time = QDateTime::currentDateTime();
++	$$PWD/include/soundaccessinghost.h \
++	$$PWD/include/chattabaccessor.h
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -783,6 +783,13 @@ public slots:
  		xmlRingbufWrite = (xmlRingbufWrite + 1) % xmlRingbuf.count();
  	}
-+
+ 
 +	void client_stanzaElementOutgoing(QDomElement &s)
 +	{
 +#ifdef PSI_PLUGINS
 +		PluginManager::instance()->processOutgoingStanza(account, s);
 +#endif
 +	}
- 	
++
  	void pm_proxyRemoved(QString proxykey)
  	{
-@@ -1118,6 +1125,11 @@ PsiAccount::PsiAccount(const UserAccount
+ 		if (acc.proxyID == proxykey) acc.proxyID = "";
+@@ -1138,6 +1145,11 @@ PsiAccount::PsiAccount(const UserAccount
  
  	// create XMPP::Client
  	d->client = new Client;
@@ -3661,7 +3868,7 @@
  	d->client->setOSName(SystemInfo::instance()->os());
  	d->client->setClientName(ApplicationInfo::name());
  	d->client->setClientVersion(ApplicationInfo::version());
-@@ -1175,6 +1187,7 @@ PsiAccount::PsiAccount(const UserAccount
+@@ -1195,6 +1207,7 @@ PsiAccount::PsiAccount(const UserAccount
  	connect(d->client, SIGNAL(endImportRoster()), SIGNAL(endBulkContactUpdate()));
  	connect(d->client, SIGNAL(xmlIncoming(const QString &)), d, SLOT(client_xmlIncoming(const QString &)));
  	connect(d->client, SIGNAL(xmlOutgoing(const QString &)), d, SLOT(client_xmlOutgoing(const QString &)));
@@ -3669,7 +3876,7 @@
  
  	// Privacy manager
  	d->privacyManager = new PsiPrivacyManager(d->account, d->client->rootTask());
-@@ -1239,11 +1252,6 @@ PsiAccount::PsiAccount(const UserAccount
+@@ -1257,11 +1270,6 @@ PsiAccount::PsiAccount(const UserAccount
  	d->rcLeaveMucServer =0;
  	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
  
@@ -3681,21 +3888,21 @@
  	//Idle server
  	if(PsiOptions::instance()->getOption("options.service-discovery.last-activity").toBool()) {
  		new IdleServer(this, d->client->rootTask());
-@@ -1792,6 +1800,10 @@ void PsiAccount::logout(bool fast, const
+@@ -1831,6 +1839,9 @@ void PsiAccount::logout(bool fast, const
  	if(!isActive())
  		return;
  
 +#ifdef PSI_PLUGINS
 +	PluginManager::instance()->logout(this);
 +#endif
-+
  	clearCurrentConnectionError();
  
  	d->stopReconnect();
-@@ -4635,6 +4647,22 @@ void PsiAccount::dj_sendMessage(const Me
+@@ -4718,6 +4729,22 @@ void PsiAccount::dj_sendMessage(const Me
+ 			nm.setNick(nick());
  		}
  	}
- 
++	
 +#ifdef PSI_PLUGINS
 +	if (!nm.body().isEmpty()) {
 +		QString body = nm.body();
@@ -3711,27 +3918,26 @@
 +		}
 +	}
 +#endif
-+
- 	d->client->sendMessage(nm);
  
- 	// only toggle if not an invite or body is not empty
-@@ -4917,6 +4945,15 @@ static bool messageListContainsEvent(con
+ 	// GSOC: stream management
+ 	// check whether message came from a ChatDlg
+@@ -5010,6 +5037,15 @@ static bool messageListContainsEvent(con
  	return false;
  }
  
 +#ifdef PSI_PLUGINS
 +void PsiAccount::createNewPluginEvent(const QString &jid, const QString &descr, QObject *receiver, const char *slot)
 +{
-+	PluginEvent *pe = new PluginEvent(jid, descr, this);
-+	connect(pe, SIGNAL(activated(QString)), receiver, slot);
++	PluginEvent::Ptr pe(new PluginEvent(jid, descr, this));
++	connect(pe.data(), SIGNAL(activated(QString)), receiver, slot);
 +	handleEvent(pe, IncomingStanza);
 +}
 +#endif
 +
  // handle an incoming event
- void PsiAccount::handleEvent(PsiEvent* e, ActivationType activationType)
+ void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationType)
  {
-@@ -4961,12 +4998,14 @@ void PsiAccount::handleEvent(PsiEvent* e
+@@ -5055,12 +5091,13 @@ void PsiAccount::handleEvent(const PsiEv
  	e->setJid(j);
  
  #ifdef PSI_PLUGINS
@@ -3739,16 +3945,24 @@
 +	QDomDocument doc;
 +	QDomElement eXml = e->toXml(&doc);
  	if (PluginManager::instance()->processEvent(this, eXml)) {
- 		delete e;
+-		delete e;
  		return;
 +	} else {
 +		e->fromXml(psi(),this, &eXml);
  	}
--	//FIXME(KIS): must now cause the event to be recreated from this xml or such. Horrid. 	
+-	//FIXME(KIS): must now cause the event to be recreated from this xml or such. Horrid.
  #endif
  
  	if (d->psi->filterEvent(this, e)) {
-@@ -5183,6 +5222,13 @@ void PsiAccount::handleEvent(PsiEvent* e
+@@ -5105,7 +5142,6 @@ void PsiAccount::handleEvent(const PsiEv
+ 		//if ( !ul.isEmpty() )
+ 		//	ulItem=ul.first();
+ 		if (PluginManager::instance()->processMessage(this, e->from().full(), m.body(), m.subject())) {
+-			delete e;
+ 			return;
+ 		}
+ 		//PluginManager::instance()->message(this,e->from(),ulItem,((MessageEvent*)e)->message().body());
+@@ -5303,6 +5339,13 @@ void PsiAccount::handleEvent(const PsiEv
  		}
  #endif
  	}
@@ -3762,9 +3976,9 @@
  	else {
  		putToQueue = false;
  		doPopup = false;
-@@ -5202,7 +5248,16 @@ void PsiAccount::handleEvent(PsiEvent* e
- 		    (popupType == PopupManager::AlertAvCall    && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
- 		    (popupType == PopupManager::AlertComposing && PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.composing").toBool()))
+@@ -5322,7 +5365,16 @@ void PsiAccount::handleEvent(const PsiEv
+ 		    (popupType == PopupManager::AlertAvCall    && o->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
+ 		    (popupType == PopupManager::AlertComposing && o->getOption("options.ui.notifications.passive-popups.composing").toBool()))
  		{
 -			psi()->popupManager()->doPopup(this, popupType, j, r, u, e, false);
 +#ifdef PSI_PLUGINS
@@ -3778,12 +3992,12 @@
 +			}
 +#endif
  		}
- 
  		emit startBounce();
-@@ -5377,6 +5432,10 @@ void PsiAccount::queueEvent(PsiEvent* e,
+ 	}
+@@ -5489,6 +5541,10 @@ void PsiAccount::queueEvent(const PsiEve
+ 		else if (e->type() == PsiEvent::File) {
+ 			doPopup = PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool();
  		}
- 		else if (e->type() == PsiEvent::Auth && !EventDlg::messagingEnabled())
- 			doPopup = false;
 +#ifdef PSI_PLUGINS
 +		else if (e->type() == PsiEvent::Plugin)
 +			doPopup = false;
@@ -3791,13 +4005,13 @@
  		else {
  			doPopup = PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool();
  		}
-@@ -5399,6 +5458,18 @@ void PsiAccount::openNextEvent(const Use
- 	PsiEvent *e = d->eventQueue->peek(u.jid());
+@@ -5511,6 +5567,18 @@ void PsiAccount::openNextEvent(const Use
+ 	PsiEvent::Ptr e = d->eventQueue->peek(u.jid());
  	if(!e)
  		return;
 +#ifdef PSI_PLUGINS
 +	if(e->type() == PsiEvent::Plugin) {
-+		PluginEvent* pe = (PluginEvent*)e;
++		PluginEvent::Ptr pe = e.staticCast<PluginEvent>();
 +		pe->activate();
 +		eventQueue()->dequeue(e);
 +		queueChanged();
@@ -3810,9 +4024,9 @@
  
  	psi()->processEvent(e, activationType);
  }
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -246,6 +246,10 @@ public:
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -252,6 +252,10 @@ public:
  	};
  	void playSound(SoundType onevent);
  
@@ -3823,32 +4037,86 @@
  	QStringList hiddenChats(const Jid &) const;
  
  	int sendMessageEncrypted(const Message &);
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -46,6 +46,7 @@
- #include "xmpp_tasks.h"
- #include "lastactivitytask.h"
- #include "avcall/avcall.h"
+--- git.orig/src/psiactionlist.cpp
++++ git/src/psiactionlist.cpp
+@@ -28,6 +28,9 @@
+ 
+ #include "iconset.h"
+ #include "psioptions.h"
++#ifdef PSI_PLUGINS
 +#include "pluginmanager.h"
++#endif
+ 
+ #include "mainwin_p.h"
+ 
+@@ -515,6 +518,23 @@ void PsiActionList::Private::createGroup
+ 
+ void PsiActionList::Private::addPluginsActions(ActionsType type)
+ {
++#ifdef PSI_PLUGINS
++	PluginManager *pm = PluginManager::instance();
++	QStringList plugins = pm->availablePlugins();
++	ActionList *actions = new ActionList(tr("Plugins"), type, false);
++	foreach (const QString &plugin, plugins) {
++		if ((type == Actions_Chat      && !pm->hasToolBarButton(plugin)) ||
++			(type == Actions_Groupchat && !pm->hasGCToolBarButton(plugin))) {
++
++			continue;
++		}
++
++		IconAction *action = new IconAction(plugin, "", plugin, 0, this);
++		action->setIcon(pm->icon(plugin));
++		actions->addAction(pm->shortName(plugin) + "-plugin", action);
++	}
++	list->addList(actions);
++#endif
+ }
  
+ void PsiActionList::Private::optionsChanged()
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -50,6 +50,9 @@
+ #include "avcall/avcall.h"
+ #include "actionlist.h"
+ #include "psiactionlist.h"
++#ifdef PSI_PLUGINS
++#include "pluginmanager.h"
++#endif
  
  #define MCMDCHAT		"http://psi-im.org/ids/mcmd#chatmain"
-@@ -499,6 +500,9 @@ void PsiChatDlg::initToolBar()
- 	ui_.toolbar->addAction(act_find);
- // -- typeahead
- 	ui_.toolbar->addAction(act_html_text);
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->addToolBarButton(this, ui_.toolbar, account(), jid().full());
-+#endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(act_icon_);
- 	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
-@@ -848,6 +852,12 @@ void PsiChatDlg::buildMenu()
  
- 	pm_settings_->addAction(act_info_);
- 	pm_settings_->addAction(act_history_);
+@@ -291,6 +294,10 @@ void PsiChatDlg::initUi()
+ 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
+ 	
+ 	ui_.log->realTextWidget()->installEventFilter(this);
++
 +#ifdef PSI_PLUGINS
-+	if(!PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool()) {
++	PluginManager::instance()->setupChatTab(this, account(), jid().full());
++#endif
+ 	
+ 	ui_.mini_prompt->hide();
+ 
+@@ -451,6 +458,14 @@ void PsiChatDlg::updateToolbuttons()
+ 			continue;
+ 		}
+ 
++#ifdef PSI_PLUGINS
++		if (actionName.endsWith("-plugin")) {
++			QString name = PluginManager::instance()->nameByShortName(actionName.mid(0, actionName.length() - 7));
++			PluginManager::instance()->addToolBarButton(this, ui_.toolbar, account(), jid().full(), name);
++			continue;
++		}
++#endif
++
+ 		// Hack. separator action can be added only once.
+ 		if (actionName == "separator") {
+ 			ui_.toolbar->addSeparator();
+@@ -925,6 +940,12 @@ void PsiChatDlg::buildMenu()
+ 
+ 	pm_settings_->addAction(actions_->action("chat_info"));
+ 	pm_settings_->addAction(actions_->action("chat_history"));
++#ifdef PSI_PLUGINS
++	if(!PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool()) {
 +		pm_settings_->addSeparator();
 +		PluginManager::instance()->addToolBarButton(this, pm_settings_, account(), jid().full());
 +	}
@@ -3856,9 +4124,9 @@
  }
  
  void PsiChatDlg::updateCounter()
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -596,7 +596,7 @@ bool PsiCon::init()
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -598,7 +598,7 @@ bool PsiCon::init()
  
  #ifdef PSI_PLUGINS
  	// Plugin Manager
@@ -3867,7 +4135,7 @@
  #endif
  
  	// Global shortcuts
-@@ -797,7 +797,9 @@ void PsiCon::deinit()
+@@ -803,7 +803,9 @@ void PsiCon::deinit()
  	// save profile
  	if(d->contactList)
  		d->saveProfile(acc);
@@ -3878,7 +4146,7 @@
  	GlobalShortcutManager::clear();
  
  	DesktopUtil::unsetUrlHandler("xmpp");
-@@ -817,6 +819,9 @@ void PsiCon::setShortcuts()
+@@ -823,6 +825,9 @@ void PsiCon::setShortcuts()
  #ifdef YAPSI
  	ShortcutManager::connect("global.filter-contacts", d->mainwin, SLOT(filterContacts()));
  #endif
@@ -3888,8 +4156,8 @@
  }
  
  PsiContactList* PsiCon::contactList() const
---- psi.orig/src/psicontactmenu.cpp
-+++ psi/src/psicontactmenu.cpp
+--- git.orig/src/psicontactmenu.cpp
++++ git/src/psicontactmenu.cpp
 @@ -39,6 +39,7 @@
  #include "statusdlg.h"
  #include "xmpp_tasks.h"
@@ -3898,7 +4166,7 @@
  #ifdef HAVE_PGPUTIL
  #include "pgputil.h"
  #endif
-@@ -449,6 +450,11 @@ public:
+@@ -455,6 +456,11 @@ public:
  			}
  			menu_->addSeparator();
  			menu_->addAction(sendFileAction_);
@@ -3909,9 +4177,9 @@
 +
  			menu_->addMenu(inviteToGroupchatMenu_);
  			menu_->addSeparator();
- 			menu_->addAction(renameAction_);
---- psi.orig/src/psievent.cpp
-+++ psi/src/psievent.cpp
+ 			mngMenu_ = menu_->addMenu(IconsetFactory::icon("psi/manageContact").icon(), tr("Manage &Contact"));
+--- git.orig/src/psievent.cpp
++++ git/src/psievent.cpp
 @@ -208,6 +208,49 @@ void PsiEvent::setId(int id)
  }
  #endif
@@ -3962,9 +4230,9 @@
  //----------------------------------------------------------------------------
  // MessageEvent
  //----------------------------------------------------------------------------
---- psi.orig/src/psievent.h
-+++ psi/src/psievent.h
-@@ -60,6 +60,10 @@ public:
+--- git.orig/src/psievent.h
++++ git/src/psievent.h
+@@ -64,6 +64,10 @@ public:
  		//Status
  		HttpAuth,
  		AvCallType
@@ -3975,7 +4243,7 @@
  	};
  	virtual int type() const = 0;
  
-@@ -104,6 +108,31 @@ private:
+@@ -108,6 +112,32 @@ private:
  #endif
  };
  
@@ -3988,6 +4256,7 @@
 +	PluginEvent(const QString& jid, const QString& descr, PsiAccount *acc);
 +	~PluginEvent();
 +
++	typedef QSharedPointer<PluginEvent> Ptr;
 +	int type() const;
 +	XMPP::Jid from() const;
 +	virtual void setFrom(const XMPP::Jid &j);
@@ -4007,3 +4276,55 @@
  // normal, chat, error, headline, etc
  class MessageEvent : public PsiEvent
  {
+--- git.orig/src/psioptions.cpp
++++ git/src/psioptions.cpp
+@@ -31,6 +31,9 @@
+ #include "statuspreset.h"
+ #include "psitoolbar.h"
+ #include "common.h"
++#ifdef PSI_PLUGINS
++#include "pluginmanager.h"
++#endif
+ using namespace XMPP;
+ 
+ // ----------------------------------------------------------------------------
+@@ -182,6 +185,13 @@ bool PsiOptions::newProfile()
+ 
+ 	{
+ 		QStringList pluginsKeys;
++#ifdef PSI_PLUGINS
++		PluginManager *pm = PluginManager::instance();
++		QStringList plugins = pm->availablePlugins();
++		foreach (const QString &plugin, plugins) {
++			pluginsKeys << pm->shortName(plugin) + "-plugin";
++		}
++#endif
+ 		ToolbarPrefs chatToolbar;
+ 		chatToolbar.on = true;
+ 		chatToolbar.name = "Chat";
+--- git.orig/src/psi_profiles.cpp
++++ git/src/psi_profiles.cpp
+@@ -45,6 +45,9 @@
+ #ifdef HAVE_PGPUTIL
+ #include "pgputil.h"
+ #endif
++#ifdef PSI_PLUGINS
++#include "pluginmanager.h"
++#endif
+ 
+ using namespace XMPP;
+ using namespace XMLHelper;
+@@ -1361,6 +1364,13 @@ void OptionsMigration::lateMigration()
+ 	// Add default chat and groupchat toolbars
+ 	if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.name").toString() != "Chat") {
+ 		QStringList pluginsKeys;
++#ifdef PSI_PLUGINS
++		PluginManager *pm = PluginManager::instance();
++		QStringList plugins = pm->availablePlugins();
++		foreach (const QString &plugin, plugins) {
++			pluginsKeys << pm->shortName(plugin) + "-plugin";
++		}
++#endif
+ 		ToolbarPrefs chatToolbar;
+ 		chatToolbar.on = PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool();
+ 		PsiOptions::instance()->removeOption("options.ui.chat.central-toolbar");

psi-plus-main-20130107.tar.xz/patches/9970-psiplus-join-to-support-muc.diff -> psi-plus-main-20141106.tar.xz/patches/9970-psiplus-join-to-support-muc.diff Changed

@@ -1,15 +1,17 @@
---- git.orig/src/mainwin.cpp
-+++ git/src/mainwin.cpp
-@@ -1063,7 +1063,7 @@ void MainWin::actOnlineHomeActivated ()
+Entering 'iris'
+Entering 'src/libpsi'
+--- git.temp.orig/src/mainwin.cpp
++++ git.temp/src/mainwin.cpp
+@@ -1097,7 +1097,7 @@ void MainWin::actOnlineHomeActivated ()
  
  void MainWin::actOnlineForumActivated ()
  {
--    DesktopUtil::openUrl("http://forum.psi-im.org");
-+    DesktopUtil::openUrl("http://forum.psi-plus.com");
+-	DesktopUtil::openUrl("http://forum.psi-im.org");
++	DesktopUtil::openUrl("http://forum.psi-plus.com");
  }
  
  void MainWin::actJoinPsiMUCActivated()
-@@ -1073,12 +1073,12 @@ void MainWin::actJoinPsiMUCActivated()
+@@ -1107,12 +1107,12 @@ void MainWin::actJoinPsiMUCActivated()
  		return;
  	}
  
@@ -24,9 +26,9 @@
  }
  
  void MainWin::actAboutActivated ()
---- git.orig/src/psiactionlist.cpp
-+++ git/src/psiactionlist.cpp
-@@ -381,11 +381,11 @@ void PsiActionList::Private::createMainW
+--- git.temp.orig/src/psiactionlist.cpp
++++ git.temp/src/psiactionlist.cpp
+@@ -386,11 +386,11 @@ void PsiActionList::Private::createMainW
  		IconAction *actOnlineHome = new IconAction (tr("Home Page (Online)"), tr("&Home Page (Online)"), 0, this);
  		actOnlineHome->setWhatsThis (tr("Home Page (Online)"));

psi-plus-main-20130107.tar.xz/patches/9980-psi-search-for-psimedia-in-all-plugins-dirs.diff -> psi-plus-main-20141106.tar.xz/patches/9980-psi-search-for-psimedia-in-all-plugins-dirs.diff Changed

@@ -1,6 +1,6 @@
---- git.orig/src/applicationinfo.cpp
-+++ git/src/applicationinfo.cpp
-@@ -118,6 +118,17 @@ QStringList ApplicationInfo::dataDirs()
+--- git.temp.orig/src/applicationinfo.cpp
++++ git.temp/src/applicationinfo.cpp
+@@ -134,6 +134,17 @@ QStringList ApplicationInfo::dataDirs()
  	return  dirs;
  }
  
@@ -18,9 +18,9 @@
  QString ApplicationInfo::getCertificateStoreSaveDir()
  {
  	QDir certsave(homeDir(DataLocation) + "/certs");
---- git.orig/src/applicationinfo.h
-+++ git/src/applicationinfo.h
-@@ -38,6 +38,7 @@ public:
+--- git.temp.orig/src/applicationinfo.h
++++ git.temp/src/applicationinfo.h
+@@ -40,6 +40,7 @@ public:
  	static QStringList getCertificateStoreDirs();
  	static QString getCertificateStoreSaveDir();
  	static QStringList dataDirs();
@@ -28,8 +28,8 @@
  
  	// Namespaces
  	static QString optionsNS();
---- git.orig/src/avcall/avcall.cpp
-+++ git/src/avcall/avcall.cpp
+--- git.temp.orig/src/avcall/avcall.cpp
++++ git.temp/src/avcall/avcall.cpp
 @@ -117,7 +117,11 @@ static void ensureLoaded()
  			pluginFile = findPlugin("../Plugins", "gstprovider");
  			resourcePath = QCoreApplication::applicationDirPath() + "/../Frameworks/gstreamer-0.10";
@@ -43,10 +43,10 @@
  #endif
  		}
  
---- git.orig/src/pluginmanager.cpp
-+++ git/src/pluginmanager.cpp
-@@ -58,13 +58,7 @@ public:
-  */ 
+--- git.temp.orig/src/pluginmanager.cpp
++++ git.temp/src/pluginmanager.cpp
+@@ -60,13 +60,7 @@ public:
+  */
  static QStringList pluginDirs()
  {
 -	QStringList l;

psi-plus-main-20130107.tar.xz/patches/9990-psiplus-aboutdlg.diff -> psi-plus-main-20141106.tar.xz/patches/9990-psiplus-aboutdlg.diff Changed

@@ -1,6 +1,6 @@
---- psi.orig/src/aboutdlg.cpp
-+++ psi/src/aboutdlg.cpp
-@@ -71,6 +71,58 @@ AboutDlg::AboutDlg(QWidget* parent)
+--- git.temp.orig/src/aboutdlg.cpp
++++ git.temp/src/aboutdlg.cpp
+@@ -71,6 +71,52 @@ AboutDlg::AboutDlg(QWidget* parent)
  			   tr("Developer"));
  	ui_.te_authors->setText( authors );
  
@@ -16,20 +16,23 @@
 +			   "rion4ik@gmail.com", "", "",
 +			   tr("Founder and Lead Patcher"));
 +	psiplus += details(QString::fromUtf8("majik"),
-+			   "", "maj@jabber.ru", "",
++			   "maksim.maj@gmail.com", "", "",
 +			   tr("Founder, Designer and Patcher"));
 +	psiplus += details(QString::fromUtf8("Dealer_WeARE"),
 +			   "wadealer@gmail.com", "", "",
 +			   tr("Lead Patcher and Plugins Writer; Mac OS X Packager"));
-+	psiplus += details(QString::fromUtf8("tux-den"),
-+			   "", "", "",
-+			   tr("Designer and Patcher"));
-+	psiplus += details(QString::fromUtf8("taurus"),
++	psiplus += details(QString::fromUtf8("liuch"),
 +			   "", "", "",
-+			   tr("Patcher, Plugins Writer and Fedora Packager"));
++			   tr("Patcher and Plugins Writer"));
++	psiplus += details(QString::fromUtf8("tehnick"),
++			  "tehnick-8@mail.ru", "", "",
++			  tr("Language coordinator; Debian Packager"));
 +	psiplus += details(QString::fromUtf8("KukuRuzo"),
 +			   "", "", "",
 +			   tr("Patcher and Plugins Writer"));
++	psiplus += details(QString::fromUtf8("taurus"),
++			   "", "", "",
++			   tr("Patcher, Plugins Writer and Fedora Packager"));
 +	psiplus += details(QString::fromUtf8("ivan1986"),
 +			   "", "", "",
 +			   tr("Patcher and Ubuntu Packager"));
@@ -45,21 +48,12 @@
 +	psiplus += details(QString::fromUtf8("Z_God"),
 +			   "", "", "",
 +			   tr("Psimedia Patcher and Wiki English localization"));
-+	psiplus += details(QString::fromUtf8("liuch"),
-+			   "", "", "",
-+			   tr("Patcher and Plugins Writer"));
-+	psiplus += details(QString::fromUtf8("Nirdosh"),
-+			   "", "", "",
-+			   tr("OpenSUSE Packager"));
-+	psiplus += details(QString::fromUtf8("tehnick"),
-+			  "", "", "",
-+			  tr("Language coordinator"));
 +	ui_.te_psiplus->setText( psiplus );
 +
  	// fill in Thanks To tab...
  	QString thanks;
  	thanks += details(QString::fromUtf8("Frederik Schwarzer"),
-@@ -182,7 +234,7 @@ QString AboutDlg::details( QString name,
+@@ -182,7 +231,7 @@ QString AboutDlg::details( QString name,
  	if ( !email.isEmpty() )
  		ret += nbsp + "E-mail: " + "<a href=\"mailto:" + email + "\">" + email + "</a><br>\n";
  	if ( !jabber.isEmpty() )
@@ -68,8 +62,8 @@
  	if ( !www.isEmpty() )
  		ret += nbsp + "WWW: " + "<a href=\"" + www + "\">" + www + "</a><br>\n";
  	if ( !desc.isEmpty() )
---- psi.orig/src/about.ui
-+++ psi/src/about.ui
+--- git.temp.orig/src/about.ui
++++ git.temp/src/about.ui
 @@ -8,12 +8,12 @@
     <rect>
      <x>0</x>
@@ -94,7 +88,7 @@
         </property>
        </widget>
       </item>
-@@ -221,7 +221,23 @@ Copyright © 2001-2012 The Psi Team.&lt;
+@@ -221,7 +221,23 @@ Copyright © 2001-2014 The Psi Team.&lt;
         </item>
        </layout>
       </widget>

psi-plus-main-20130107.tar.xz/patches/9999-psiplus-application-info.diff -> psi-plus-main-20141106.tar.xz/patches/9999-psiplus-application-info.diff Changed

@@ -1,10 +1,19 @@
-Entering 'iris'
-Entering 'src/libpsi'
-Index: psi-plus-0.15.5342-269/psi.desktop
-===================================================================
---- psi-plus-0.15.5342-269.orig/psi.desktop	2012-08-10 09:16:26.000000000 +0400
-+++ psi-plus-0.15.5342-269/psi.desktop	2012-08-10 09:19:04.168232551 +0400
-@@ -5,8 +5,8 @@
+diff --git a/certs/README b/certs/README
+--- a/certs/README
++++ b/certs/README
+@@ -4,7 +4,7 @@ Please use PSIDATADIR/certs for local additions.
+ 
+ Default value of PSIDATADIR:
+   Linux, MacOS X and other Unices
+-     ~/.psi/ 
++     ~/.local/share/psi+/
+   Windows NT, 2000, XP and Server 2003
+      %UserProfile%\PsiData\ (usually C:\Documents and Settings\username\PsiData )
+   Windows 95, 98 and Me
+diff --git a/psi.desktop b/psi.desktop
+--- a/psi.desktop
++++ b/psi.desktop
+@@ -5,11 +5,11 @@ Type=Application
  Name=Psi+
  GenericName=XMPP Client
  Comment=Communicate over the XMPP network
@@ -14,12 +23,15 @@
 +Exec=psi-plus %U
  MimeType=x-scheme-handler/xmpp;
  Terminal=false
+-StartupWMClass=psi
++StartupWMClass=psi-plus
  Categories=Network;InstantMessaging;Qt;
-Index: psi-plus-0.15.5342-269/qcm/conf.qcm
-===================================================================
---- psi-plus-0.15.5342-269.orig/qcm/conf.qcm	2012-08-09 23:21:31.000000000 +0400
-+++ psi-plus-0.15.5342-269/qcm/conf.qcm	2012-08-10 09:19:04.168232551 +0400
-@@ -71,16 +71,16 @@
+ Keywords=XMPP;Jabber;Chat;InstantMessaging;
+ 
+diff --git a/qcm/conf.qcm b/qcm/conf.qcm
+--- a/qcm/conf.qcm
++++ b/qcm/conf.qcm
+@@ -70,8 +70,8 @@ public:
  		psiGenerateFile("mac/Info.plist.in", "mac/Info.plist", vars);
  
  #ifndef Q_OS_WIN
@@ -29,7 +41,8 @@
 +		conf->addExtra(QString("PSI_DATADIR=%1/psi-plus").arg(conf->getenv("DATADIR")));
  #endif
  
- 		QFile file("src/config.h");
+ 		QDir(".").mkdir("src");
+@@ -79,8 +79,8 @@ public:
  		if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
  			QTextStream stream( &file );
  #ifndef Q_OS_WIN
@@ -40,16 +53,17 @@
  #endif
  			stream << "#define PSI_VERSION \"" << version << "\"" << endl;
  		}
-Index: psi-plus-0.15.5342-269/src/applicationinfo.cpp
-===================================================================
---- psi-plus-0.15.5342-269.orig/src/applicationinfo.cpp	2012-08-10 09:16:29.000000000 +0400
-+++ psi-plus-0.15.5342-269/src/applicationinfo.cpp	2012-08-10 09:19:04.168232551 +0400
-@@ -35,12 +35,12 @@
- // place (like an external file loaded through the resources system)
- // Should also be overridable through an optional file.
+diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
+--- a/src/applicationinfo.cpp
++++ b/src/applicationinfo.cpp
+@@ -42,13 +42,13 @@
+ //
+ // PROG_SNAME - read as small name, system name, soname, short name, fs name
  
 -#define PROG_NAME "Psi"
+-#define PROG_SNAME "psi"
 +#define PROG_NAME "Psi+"
++#define PROG_SNAME "psi+"
  #define PROG_VERSION PSI_VERSION
  //#define PROG_VERSION "0.15-dev" " (" __DATE__ ")" //CVS Builds are dated
  //#define PROG_VERSION "0.15";
@@ -60,11 +74,10 @@
  #define PROG_IPC_NAME "org.psi-im.Psi"	// must not contain '\\' character on Windows
  #define PROG_OPTIONS_NS "http://psi-im.org/options"
  #define PROG_STORAGE_NS "http://psi-im.org/storage"
-Index: psi-plus-0.15.5342-269/src/homedirmigration.ui
-===================================================================
---- psi-plus-0.15.5342-269.orig/src/homedirmigration.ui	2012-08-09 23:21:31.000000000 +0400
-+++ psi-plus-0.15.5342-269/src/homedirmigration.ui	2012-08-10 09:19:04.168232551 +0400
-@@ -43,7 +43,7 @@
+diff --git a/src/homedirmigration.ui b/src/homedirmigration.ui
+--- a/src/homedirmigration.ui
++++ b/src/homedirmigration.ui
+@@ -43,7 +43,7 @@ p, li { white-space: pre-wrap; }
  &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
  p, li { white-space: pre-wrap; }
  &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -73,7 +86,7 @@
       </property>
       <property name="text">
        <string>Import Psi profile</string>
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,7 @@ p, li { white-space: pre-wrap; }
  &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
  p, li { white-space: pre-wrap; }
  &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -82,23 +95,21 @@
       </property>
       <property name="text">
        <string>Create new profile</string>
-Index: psi-plus-0.15.5342-269/src/plugins/psiplugin.pri
-===================================================================
---- psi-plus-0.15.5342-269.orig/src/plugins/psiplugin.pri	2012-08-09 23:21:31.000000000 +0400
-+++ psi-plus-0.15.5342-269/src/plugins/psiplugin.pri	2012-08-10 09:19:04.168232551 +0400
-@@ -2,7 +2,7 @@
- CONFIG += plugin
- QT += xml
+diff --git a/src/plugins/psiplugin.pri b/src/plugins/psiplugin.pri
+--- a/src/plugins/psiplugin.pri
++++ b/src/plugins/psiplugin.pri
+@@ -14,7 +14,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+   DEFINES += HAVE_QT5
+ }
  
 -target.path = $$(HOME)/.local/share/Psi/plugins
 +target.path = $$(HOME)/.local/share/psi+/plugins
  INSTALLS += target
  
  include(plugins.pri)
-Index: psi-plus-0.15.5342-269/src/src.pro
-===================================================================
---- psi-plus-0.15.5342-269.orig/src/src.pro	2012-08-10 09:16:26.000000000 +0400
-+++ psi-plus-0.15.5342-269/src/src.pro	2012-08-10 09:19:04.168232551 +0400
+diff --git a/src/src.pro b/src/src.pro
+--- a/src/src.pro
++++ b/src/src.pro
 @@ -4,7 +4,7 @@
  
  # Configuration
@@ -106,13 +117,13 @@
 -TARGET   = psi
 +TARGET   = psi-plus
  CONFIG  += qt thread x11
- DESTDIR  = $$PWD/..
+ DESTDIR  = $$top_builddir
  
-@@ -43,17 +43,17 @@
+@@ -43,17 +43,17 @@ unix {
  
  	# icons and desktop files
  	dt.path=$$PREFIX/share/applications/
--	dt.files = ../psi.desktop 
+-	dt.files = ../psi.desktop
 +	dt.extra = cp -f ../psi.desktop $(INSTALL_ROOT)$$dt.path/psi-plus.desktop
  	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
 -	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png

psi-plus-main-20130107.tar.xz/patches/dev/0030-webikit-with-fixes.diff -> psi-plus-main-20141106.tar.xz/patches/dev/0030-webikit-with-fixes.diff Changed

@@ -74,7 +74,7 @@
 +			return false;
 +		if(ret != 0)
 +			return false;
-+		
++
 +		conf->addExtra("CONFIG += webkit");
 +		return true;
 +	}
@@ -230,13 +230,13 @@
  #include "psirichtext.h"
 +#include "messageview.h"
 +#include "chatview.h"
- 
+
  #ifdef Q_WS_WIN
  #include <windows.h>
 @@ -117,12 +119,16 @@ void ChatDlg::init()
  	initActions();
  	setShortcuts();
- 
+
 -	// TODO: this have to be moved to chatEditCreated()
 +	chatEdit()->installEventFilter(this);
  	chatView()->setDialog(this);
@@ -246,28 +246,28 @@
 +	chatView()->setAccount(account());
 +#endif
 +	chatView()->init();
- 
+
 -	chatEdit()->installEventFilter(this);
 -	connect(chatView(), SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
 +	// seems its useless hack
 +	//connect(chatView(), SIGNAL(selectionChanged()), SLOT(logSelectionChanged())); //
- 
+
  	// SyntaxHighlighters modify the QTextEdit in a QTimer::singleShot(0, ...) call
  	// so we need to install our hooks after it fired for the first time
 @@ -200,12 +206,12 @@ void ChatDlg::setShortcuts()
- 
+
  void ChatDlg::scrollUp()
  {
 -	chatView()->verticalScrollBar()->setValue(chatView()->verticalScrollBar()->value() - chatView()->verticalScrollBar()->pageStep() / 2);
 +	chatView()->scrollUp();
  }
- 
+
  void ChatDlg::scrollDown()
  {
 -	chatView()->verticalScrollBar()->setValue(chatView()->verticalScrollBar()->value() + chatView()->verticalScrollBar()->pageStep() / 2);
 +	chatView()->scrollDown();
  }
- 
+
  void ChatDlg::closeEvent(QCloseEvent *e)
 @@ -303,12 +309,13 @@ void ChatDlg::logSelectionChanged()
  {
@@ -288,10 +288,10 @@
 +//	}
  #endif
  }
- 
+
 @@ -450,18 +457,7 @@ void ChatDlg::updateContact(const Jid &j
  			updatePGP();
- 
+
  			if (fromPresence && statusChanged) {
 -				QString msg = tr("%1 is %2").arg(Qt::escape(dispNick_)).arg(status2txt(status_));
 -				if (!statusString_.isEmpty()) {
@@ -308,7 +308,7 @@
 +				chatView()->dispatchMessage(MessageView::statusMessage(dispNick_, status_, statusString_));
  			}
  		}
- 
+
 @@ -670,6 +666,8 @@ void ChatDlg::doSend()
  	if (isEncryptionEnabled()) {
  		m.setWasEncrypted(true);
@@ -316,20 +316,20 @@
 +	QString id = account()->client()->genUniqueId();
 +	m.setId(id); // we need id early for message manipulations in chatview
  	m_ = m;
- 
+
  	// Request events
 @@ -777,7 +775,7 @@ QString ChatDlg::whoNick(bool local) con
  		result = dispNick_;
  	}
- 
+
 -	return Qt::escape(result);
 +	return result;
  }
- 
+
  void ChatDlg::appendMessage(const Message &m, bool local)
 @@ -792,17 +790,14 @@ void ChatDlg::appendMessage(const Messag
  	encEnabled = lastWasEncrypted_;
- 
+
  	if (encChanged) {
 -		if (encEnabled) {
 -			appendSysMsg(QString("<icon name=\"psi/cryptoYes\"> ") + tr("Encryption Enabled"));
@@ -356,7 +356,7 @@
 @@ -810,21 +805,31 @@ void ChatDlg::appendMessage(const Messag
  		}
  	}
- 
+
 -	QString txt = messageText(m);
 -	QString subject = messageSubject(m);
 -
@@ -372,7 +372,7 @@
 +	if (!m.subject().isEmpty()) {
 +		chatView()->dispatchMessage(MessageView::subjectMessage(m.subject()));
 +	}
- 
+
 -	if (local) {
 -		deferredScroll();
 +	MessageView mv(MessageView::Message);
@@ -397,12 +397,12 @@
 +		}
 +		chatView()->dispatchMessage(MessageView::urlsMessage(urlsMap));
  	}
- 
+
  	// if we're not active, notify the user by changing the title
 @@ -855,16 +860,6 @@ void ChatDlg::appendMessage(const Messag
  	}
  }
- 
+
 -void ChatDlg::deferredScroll()
 -{
 -	QTimer::singleShot(250, this, SLOT(slotScroll()));
@@ -419,7 +419,7 @@
 @@ -1029,67 +1024,8 @@ void ChatDlg::nicksChanged()
  	// this function is intended to be reimplemented in subclasses
  }
- 
+
 -static const QString me_cmd = "/me ";
 -
 -bool ChatDlg::isEmoteMessage(const XMPP::Message& m)
@@ -482,7 +482,7 @@
  {
 -	chatView()->setDialog(this);
  	chatEdit()->setDialog(this);
- 
+
  	if (highlightersInstalled_) {
 --- psi.orig/src/chatdlg.h
 +++ psi/src/chatdlg.h
@@ -503,7 +503,7 @@
 -	QString messageText(const XMPP::Message& m);
 -	QString messageSubject(const XMPP::Message& m);
  	virtual void chatEditCreated();
- 
+
 -	enum SpooledType {
 -		Spooled_None,
 -		Spooled_OfflineStorage
@@ -513,7 +513,7 @@
  	virtual void capsChanged();
  	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
 -	virtual QString colorString(bool local, SpooledType spooled) const = 0;
- 
+
  	void appendMessage(const Message &, bool local = false);
  	virtual bool isEncryptionEnabled() const;
  	virtual void appendSysMsg(const QString& txt) = 0;
@@ -521,7 +521,7 @@
 -	virtual void appendNormalMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject) = 0;
 -	virtual void appendMessageFields(const Message& m) = 0;
  	virtual void nicksChanged();
- 
+
  	QString whoNick(bool local) const;
 --- psi.orig/src/chatdlg.ui
 +++ psi/src/chatdlg.ui
@@ -2177,7 +2177,7 @@
  	QString lastWhois;
 @@ -849,8 +849,8 @@ void EventDlg::init()
  	}
- 
+
  	// text area
 -	d->mle = new ChatView(this);
 -	d->mle->setDialog(this);
@@ -2209,16 +2209,16 @@
 @@ -571,7 +571,7 @@ FileRequestDlg::FileRequestDlg(const Jid
  	connect(d->psi, SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
  	updateIdentityVisibility();
- 
+
 -	d->te = new ChatView(this);
 +	d->te = new PsiTextView(this);
  	d->te->setReadOnly(false);
  	d->te->setAcceptRichText(false);
  	replaceWidget(te_desc, d->te);
 @@ -662,7 +662,7 @@ FileRequestDlg::FileRequestDlg(const QDa
- 
+
  	replaceWidget(lb_accountlabel, hb);
- 
+
 -	d->te = new ChatView(this);
 +	d->te = new PsiTextView(this);
  	d->te->setAcceptRichText(false);
@@ -2236,12 +2236,12 @@
  #include "xmpp_tasks.h"
 @@ -189,7 +190,6 @@ public:
  		nonAnonymous = false;
- 		
+
  		trackBar = false;
 -		oldTrackBarPosition = 0;
  		mCmdManager.registerProvider(this);
  	}
- 
+
 @@ -198,6 +198,7 @@ public:
  	MUCManager *mucManager;
  	QString self, prev_self;
@@ -2251,18 +2251,18 @@
  	IconAction *act_find, *act_clear, *act_icon, *act_configure;
  #ifdef WHITEBOARDING
 @@ -226,8 +227,6 @@ public:
- 	
+
  public:
  	bool trackBar;
 -protected:
 -	int  oldTrackBarPosition;
- 
+
  public:
  	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
 @@ -245,11 +244,6 @@ public slots:
  		PsiRichText::addEmoticon(mle(), text);
  	}
- 
+
 -	void deferredScroll() {
 -		//QTimer::singleShot(250, this, SLOT(slotScroll()));
 -		te_log()->scrollToBottom();
@@ -2274,7 +2274,7 @@
 @@ -433,76 +427,11 @@ join <channel>{,<channel>} [pass{,<pass>
  	virtual void mCmdSiteDestroyed() {
  	}
- 
+
 -
 -
 -protected slots:
@@ -2291,18 +2291,18 @@
 -			cursor.clearSelection();
 -			te_log()->setTextCursor(cursor);
 -		}
--		
+-
 -		bool found = te_log()->find(str);
 -		if(!found) {
 -			if (!startFromBeginning)
 -				return internalFind(str, true);
--			
+-
 -			return false;
 -		}
 -
 -		return true;
 -	}
--	
+-
 -private:
 -	void removeTrackBar(QTextCursor &cursor)
 -	{
@@ -2314,7 +2314,7 @@
 -			cursor.setBlockFormat(blockFormat);
 -		}
 -	}
--		
+-
 -	void addTrackBar(QTextCursor &cursor)
 -	{
 -		cursor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
@@ -2325,7 +2325,7 @@
 -		cursor.setBlockFormat(blockFormat);
 -	}
 -
- public:		
+ public:
  	void doTrackBar()
  	{
  		trackBar = false;
@@ -2347,7 +2347,7 @@
 -		te_log()->verticalScrollBar()->setValue(scrollbarValue);
 +		te_log()->doTrackBar();
  	}
- 
+
  public:
 @@ -633,7 +562,6 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
  	: TabbableWidget(j.bare(), pa, tabManager)
@@ -2365,49 +2365,49 @@
 +#ifdef WEBKIT
 +	ui_.log->setAccount(account());
 +#endif
- 
+
  	connect(ui_.pb_topic, SIGNAL(clicked()), SLOT(doTopic()));
  	PsiToolTip::install(ui_.le_topic);
 @@ -674,7 +606,8 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
  	ui_.tb_emoticons->setIcon(IconsetFactory::icon("psi/smile").icon());
- 
+
  #ifdef Q_WS_MAC
 -	connect(ui_.log, SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
 +	// seems its useless hack
 +	//connect(ui_.log, SIGNAL(selectionChanged()), SLOT(logSelectionChanged()));
  #endif
- 
+
  	ui_.lv_users->setMainDlg(this);
 @@ -733,6 +666,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
  	ui_.mini_prompt->hide();
  	connect(ui_.mle, SIGNAL(textEditCreated(QTextEdit*)), SLOT(chatEditCreated()));
  	chatEditCreated();
 +	ui_.log->init(); //here is we ready to do that
- 
+
  	d->pm_settings = new QMenu(this);
  	connect(d->pm_settings, SIGNAL(aboutToShow()), SLOT(buildMenu()));
 @@ -810,12 +744,12 @@ void GCMainDlg::setShortcuts()
- 
+
  void GCMainDlg::scrollUp()
  {
 -	ui_.log->verticalScrollBar()->setValue(ui_.log->verticalScrollBar()->value() - ui_.log->verticalScrollBar()->pageStep()/2);
 +	ui_.log->scrollUp();
  }
- 
+
  void GCMainDlg::scrollDown()
  {
 -	ui_.log->verticalScrollBar()->setValue(ui_.log->verticalScrollBar()->value() + ui_.log->verticalScrollBar()->pageStep()/2);
 +	ui_.log->scrollDown();
  }
- 
+
  void GCMainDlg::closeEvent(QCloseEvent *e)
 @@ -866,10 +800,11 @@ void GCMainDlg::logSelectionChanged()
  {
  #ifdef Q_WS_MAC
  	// A hack to only give the message log focus when text is selected
--	if (ui_.log->textCursor().hasSelection()) 
+-	if (ui_.log->textCursor().hasSelection())
 -		ui_.log->setFocus();
--	else 
+-	else
 -		ui_.mle->chatEdit()->setFocus();
 +// seems its already useless. at least copy works w/o this hack
 +//	if (ui_.log->textCursor().hasSelection())
@@ -2416,15 +2416,15 @@
 +//		ui_.mle->chatEdit()->setFocus();
  #endif
  }
- 
+
 @@ -1011,7 +946,7 @@ void GCMainDlg::doTopic()
- 
+
  void GCMainDlg::doClear()
  {
 -	ui_.log->setText("");
 +	ui_.log->clear();
  }
- 
+
  void GCMainDlg::doClearButton()
 @@ -1026,7 +961,7 @@ void GCMainDlg::doClearButton()
  			)
@@ -2451,7 +2451,7 @@
 -	appendSysMsg(message, false, QDateTime::currentDateTime());
 +	appendSysMsg(message);
  }
- 
+
  void GCMainDlg::presence(const QString &nick, const Status &s)
 @@ -1208,7 +1143,7 @@ void GCMainDlg::presence(const QString &
  		else {
@@ -2461,7 +2461,7 @@
 +		appendSysMsg(message);
  		return;
  	}
- 
+
 @@ -1228,7 +1163,7 @@ void GCMainDlg::presence(const QString &
  	if(s.isAvailable()) {
  		// Available
@@ -2482,7 +2482,7 @@
  		else {
 @@ -1280,23 +1215,18 @@ void GCMainDlg::presence(const QString &
  				}
- 
+
  				if (!message.isEmpty()) {
 -					appendSysMsg(message, false, QDateTime::currentDateTime());
 +					appendSysMsg(message);
@@ -2514,7 +2514,7 @@
 +			appendSysMsg(log);
  			goForcedLeave();
  		}
- 
+
 @@ -1385,7 +1315,7 @@ void GCMainDlg::presence(const QString &
  					message += QString(" (%1)").arg(s.status());
  				}
@@ -2527,7 +2527,7 @@
 @@ -1416,18 +1346,33 @@ void GCMainDlg::message(const Message &_
  		d->nonAnonymous = false;
  	}
- 
+
 -
  	if(!m.subject().isNull()) {
 -		ui_.le_topic->setText(m.subject());
@@ -2565,11 +2565,11 @@
 +		//ui_.log->dispatchMessage(tv);
 +		return;
  	}
- 
+
  	if(m.body().isEmpty())
 @@ -1460,7 +1405,7 @@ void GCMainDlg::message(const Message &_
  	}
- 
+
  	if(from.isEmpty())
 -		appendSysMsg(m.body(), alert, m.timeStamp(), true);
 +		appendSysMsg(m.body(), alert, m.timeStamp());
@@ -2579,7 +2579,7 @@
 @@ -1487,144 +1432,57 @@ const QString& GCMainDlg::nick() const
  	return d->self;
  }
- 
+
 -void GCMainDlg::updateLastMsgTime(QDateTime t)
 +void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
  {
@@ -2598,7 +2598,7 @@
  	}
 +	appendSysMsg(mv);
  }
- 
+
 -void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts, bool prepareAsChatMessage)
 -{
 -	// FIXME:
@@ -2614,7 +2614,7 @@
 +{
  	if (d->trackBar)
  		d->doTrackBar();
- 
+
 -	if (!PsiOptions::instance()->getOption("options.ui.muc.use-highlighting").toBool())
 -		alert=false;
 -
@@ -2628,12 +2628,12 @@
 -	ui_.log->appendText(QString("<font color=\"%1\">[%2]").arg(color, timestr) +
 -		QString(" *** %1</font>").arg(prepareAsChatMessage ? TextUtil::prepareMessageText(str) : Qt::escape(str)));
 +	ui_.log->dispatchMessage(mv);
- 
+
 -	if(alert)
 +	if(mv.isAlert())
  		doAlert();
  }
- 
+
 -QString GCMainDlg::getNickColor(QString nick)
 -{
 -	int sender;
@@ -2647,9 +2647,9 @@
 -		}
 -		sender=nicks[nick];
 -	}
--	
+-
 -	QStringList nickColors = PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList();
--	
+-
 -	if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || nickColors.empty()) {
 -		return "#000000";
 -	}
@@ -2683,7 +2683,7 @@
 +	mv.setLocal(mv.nick() == d->self);
 +	mv.setSpooled(m.spooled());
 +	mv.setDateTime(m.timeStamp());
- 
+
 -	who = m.from().resource();
 -	if (d->trackBar&&m.from().resource() != d->self&&!m.spooled())
 +	if (d->trackBar && !mv.isLocal() && !mv.isSpooled()) {
@@ -2718,7 +2718,7 @@
 -		txt = TextUtil::plain2rich(m.body());
 -
 -	txt = TextUtil::linkify(txt);
- 
+
 -	if(PsiOptions::instance()->getOption("options.ui.emoticons.use-emoticons").toBool())
 -		txt = TextUtil::emoticonify(txt);
 -	if( PsiOptions::instance()->getOption("options.ui.chat.legacy-formatting").toBool() )
@@ -2744,7 +2744,7 @@
 -		d->deferredScroll();
 -	}
 +	ui_.log->dispatchMessage(mv);
- 
+
  	// if we're not active, notify the user by changing the title
 -	if(!isActiveTab() && (who != d->self)) {
 +	if(!isActiveTab() && !mv.isLocal()) {
@@ -2763,7 +2763,7 @@
  	class Message;
 @@ -136,9 +137,9 @@ private:
  	Ui::GroupChatDlg ui_;
- 
+
  	void doAlert();
 -	void appendSysMsg(const QString &, bool, const QDateTime &ts=QDateTime(), bool prepareAsChatMessage=false);
 +	void appendSysMsg(const QString &, bool alert=false, const QDateTime &ts=QDateTime());
@@ -2771,12 +2771,12 @@
  	void appendMessage(const Message &, bool);
 -	void updateLastMsgTime(QDateTime t);
  	void setLooks();
- 
+
  	void mucKickMsgHelper(const QString &nick, const Status &s, const QString &nickJid, const QString &title,
 @@ -147,9 +148,6 @@ private:
- 
+
  	void contextMenuEvent(QContextMenuEvent *);
- 
+
 -	QString getNickColor(QString);
 -	QMap<QString,int> nicks;
 -	int nicknumber;
@@ -3245,12 +3245,12 @@
  #include <QTextDocument>
  #include <QTimer>
 -#include <QDateTime>
- 
+
  #include "shortcutmanager.h"
  #include "spellchecker/spellhighlighter.h"
 @@ -41,135 +39,6 @@
  #include "psioptions.h"
- 
+
  //----------------------------------------------------------------------------
 -// ChatView
 -//----------------------------------------------------------------------------
@@ -3292,7 +3292,7 @@
 -void ChatView::keyPressEvent(QKeyEvent *e)
 -{
 -/*	if(e->key() == Qt::Key_Escape)
--		e->ignore(); 
+-		e->ignore();
 -#ifdef Q_WS_MAC
 -	else if(e->key() == Qt::Key_W && e->modifiers() & Qt::ControlModifier)
 -		e->ignore();
@@ -3304,7 +3304,7 @@
 -		e->ignore();
 -	else if(e->key() == Qt::Key_I && (e->modifiers() & Qt::ControlModifier))
 -		e->ignore(); */
--	/*else*/ if(e->key() == Qt::Key_M && (e->modifiers() & Qt::ControlModifier) && !isReadOnly()) // newline 
+-	/*else*/ if(e->key() == Qt::Key_M && (e->modifiers() & Qt::ControlModifier) && !isReadOnly()) // newline
 -		append("\n");
 -/*	else if(e->key() == Qt::Key_U && (e->modifiers() & Qt::ControlModifier) && !isReadOnly())
 -		setText(""); */
@@ -3342,27 +3342,27 @@
 -		    (e->key() == Qt::Key_Insert && (e->modifiers() & Qt::ControlModifier)))
 -		{
 -			if (!chatEdit->textCursor().hasSelection() &&
--			     this->textCursor().hasSelection()) 
+-			     this->textCursor().hasSelection())
 -			{
 -				this->copy();
 -				return true;
 -			}
 -		}
 -	}
--	
+-
 -	return false;
 -}
 -
 -void ChatView::appendText(const QString &text)
 -{
 -	bool doScrollToBottom = atBottom();
--	
--	// prevent scrolling back to selected text when 
+-
+-	// prevent scrolling back to selected text when
 -	// restoring selection
 -	int scrollbarValue = verticalScrollBar()->value();
--	
+-
 -	PsiTextView::appendText(text);
--	
+-
 -	if (doScrollToBottom)
 -		scrollToBottom();
 -	else
@@ -3387,9 +3387,9 @@
 --- psi.orig/src/msgmle.h
 +++ psi/src/msgmle.h
 @@ -23,8 +23,6 @@
- 
+
  #include <QTextEdit>
- 
+
 -#include "psitextview.h"
 -
  class ChatEdit;
@@ -3398,7 +3398,7 @@
 @@ -32,34 +30,6 @@ class QResizeEvent;
  class QTimer;
  class SpellHighlighter;
- 
+
 -class ChatView : public PsiTextView
 -{
 -	Q_OBJECT
@@ -3427,7 +3427,7 @@
 -private:
 -	QWidget* dialog_;
 -};
- 
+
  class ChatEdit : public QTextEdit
  {
 --- psi.orig/src/networkaccessmanager.cpp
@@ -3507,7 +3507,7 @@
 +
 +void NetworkAccessManager::callFinished() {
 +    QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
-+    
++
 +    if (reply) {
 +        emit finished(reply);
 +    }
@@ -3653,14 +3653,14 @@
 +#include "opt_theme.h"
  #include "common.h"
  #include "iconwidget.h"
- 
+
 @@ -21,6 +22,7 @@
  #include "ui_opt_appearance_misc.h"
  #include "psioptions.h"
  #include "coloropt.h"
 +#include "psithememanager.h"
- 
- 
+
+
  class OptAppearanceUI : public QWidget, public Ui::OptAppearance
 @@ -78,12 +80,25 @@ QSize FontLabel::sizeHint() const
  OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's appearance"), "psi/appearance")
@@ -3684,7 +3684,7 @@
  	addTab( new OptionsTabIconsetSystem(this) );
 -	addTab( new OptionsTabAppearanceMisc(this) );
  }
- 
+
 +
  //----------------------------------------------------------------------------
  // OptionsTabAppearanceMisc
@@ -3698,14 +3698,14 @@
 +		{d->ck_cUserText,        d->pb_cUserText,        "messages.usertext", ""}
 +
  	};
- 
+
  	bg_color = new QButtonGroup(this);
 --- psi.orig/src/options/opt_appearance.h
 +++ psi/src/options/opt_appearance.h
 @@ -36,6 +36,13 @@ public:
  	OptionsTabAppearance(QObject *parent);
  };
- 
+
 +class OptionsTabIconset : public MetaOptionsTab
 +{
 +	Q_OBJECT
@@ -4127,7 +4127,7 @@
 -#include "textutil.h"
  #include "xmpp_tasks.h"
  #include "lastactivitytask.h"
- 
+
 @@ -136,8 +136,8 @@ public slots:
  			dlg_->appendSysMsg("No version information available.");
  			return;
@@ -4137,7 +4137,7 @@
 +		dlg_->appendSysMsg(Qt::escape(QString("Version response: N: %2 V: %3 OS: %4")
 +			.arg(version->name(), version->version(), version->os())));
  	};
- 
+
  	void lastactivity_finished()
 @@ -154,7 +154,7 @@ public slots:
  				.arg(idle->time().toString()));
@@ -4147,11 +4147,11 @@
 +				.arg(idle->time().toString(), Qt::escape(idle->status())));
  		}
  	}
- 
+
 @@ -526,67 +526,6 @@ void PsiChatDlg::updateCounter()
  	ui_.lb_count->setNum(chatEdit()->toPlainText().length());
  }
- 
+
 -void PsiChatDlg::appendEmoteMessage(SpooledType spooled, const QDateTime& time, bool local, const QString& txt, const QString& subject)
 -{
 -	updateLastMsgTime(time);
@@ -4217,7 +4217,7 @@
  {
  	return act_pgp_->isChecked();
 @@ -594,25 +533,7 @@ bool PsiChatDlg::isEncryptionEnabled() c
- 
+
  void PsiChatDlg::appendSysMsg(const QString &str)
  {
 -	QDateTime t = QDateTime::currentDateTime();
@@ -4241,7 +4241,7 @@
 -	return ColorOpt::instance()->color("options.ui.look.colors.messages.received").name();
 +	chatView()->dispatchMessage(MessageView::fromHtml(str, MessageView::System));
  }
- 
+
  ChatView* PsiChatDlg::chatView() const
 @@ -643,23 +564,13 @@ void PsiChatDlg::doSend() {
  	if (mCmdSite_.isActive()) {
@@ -4254,7 +4254,7 @@
  		ChatDlg::doSend();
  	}
  }
- 
+
 -void PsiChatDlg::updateLastMsgTime(QDateTime t)
 -{
 -	bool doInsert = t.date() != lastMsgTime_.date();
@@ -4282,15 +4282,15 @@
 -	void updateLastMsgTime(QDateTime t);
  	ChatView* chatView() const;
  	ChatEdit* chatEdit() const;
- 
+
 @@ -86,7 +81,6 @@ private:
  	MCmdTabCompletion tabCompletion;
- 
+
  	bool smallChat_;
 -	QDateTime lastMsgTime_;
  	class ChatDlgMCmdProvider;
  };
- 
+
 --- psi.orig/src/psicon.cpp
 +++ psi/src/psicon.cpp
 @@ -40,6 +40,7 @@
@@ -4315,7 +4315,7 @@
 @@ -191,6 +196,7 @@ private:
  	}
  };
- 
+
 +
  //----------------------------------------------------------------------------
  // PsiCon::Private
@@ -4323,7 +4323,7 @@
 @@ -473,6 +479,18 @@ bool PsiCon::init()
  		//}
  	}
- 
+
 +#ifdef WEBKIT
 +	PsiThemeManager::instance()->registerProvider(
 +			new ChatViewThemeProvider(this), true);
@@ -4338,12 +4338,12 @@
 +
  	if ( !d->actionList )
  		d->actionList = new PsiActionList( this );
- 
+
 @@ -619,7 +637,6 @@ bool PsiCon::init()
- 	}	
- 	
+ 	}
+
  	checkAccountsEmpty();
--	
+-
  	// try autologin if needed
  	foreach(PsiAccount* account, d->contactList->accounts()) {
  		account->autoLogin();
@@ -5166,7 +5166,7 @@
 @@ -592,6 +607,31 @@ unix:!dbus {
  	SOURCES += $$PWD/activeprofiles_stub.cpp
  }
- 
+
 +webkit {
 +	HEADERS += 	$$PWD/chatview_webkit.h \
 +			$$PWD/networkaccessmanager.h \
@@ -5205,7 +5205,7 @@
 +		sharedfiles.files += ../themes
 +	}
  	INSTALLS += sharedfiles
- 
+
  	# Widgets
 --- psi.orig/src/statusdlg.cpp
 +++ psi/src/statusdlg.cpp
@@ -5230,7 +5230,7 @@
 @@ -161,8 +161,8 @@ void StatusSetDlg::init()
  	connect(d->cb_preset, SIGNAL(currentIndexChanged(int)), SLOT(chooseStatusPreset(int)));
  	hb1->addWidget(d->cb_preset,3);
- 
+
 -	d->te = new ChatView(this);
 -	d->te->setDialog(this);
 +	d->te = new PsiTextView(this);
@@ -5242,7 +5242,7 @@
 +++ psi/src/textutil.cpp
 @@ -150,7 +150,7 @@ QString TextUtil::rich2plain(const QStri
  				out += '\n';
- 			
+
  			// handle output of Qt::convertFromPlainText() correctly
 -			if((tagName == "p" || tagName == "/p") && out.length() > 0)
 +			if((tagName == "p" || tagName == "/p" || tagName == "div") && out.length() > 0)
@@ -5252,7 +5252,7 @@
 @@ -535,6 +535,15 @@ QString TextUtil::emoticonify(const QStr
  	return out;
  }
- 
+
 +QString TextUtil::img2title(const QString &in)
 +{
 +	QString ret = in;
@@ -5264,9 +5264,9 @@
 +
  QString TextUtil::legacyFormat(const QString& in)
  {
- 
+
 @@ -552,38 +561,3 @@ QString TextUtil::legacyFormat(const QSt
- 
+
  	return out;
  }
 -
@@ -5311,7 +5311,7 @@
  	QString legacyFormat(const QString &);
  	QString emoticonify(const QString &in);
 +	QString img2title(const QString &in);
- 
+
  	QString prepareMessageText(const QString& text, bool isEmote=false, bool isHtml=false);
  };
 --- psi.orig/src/theme.cpp
@@ -5577,9 +5577,9 @@
  #include <QCoreApplication>
  #include <QLocale>
 +#include <QBuffer>
- 
+
  #include <QTextCodec>
- 
+
 @@ -270,6 +271,7 @@ public:
  		text = from.text;
  		sound = from.sound;
@@ -5593,13 +5593,13 @@
  	Anim *anim;
  	QIcon *icon;
 +	mutable QByteArray rawData;
- 
+
  	int activatedCount;
  	friend class PsiIcon;
 @@ -447,6 +450,24 @@ const QIcon &PsiIcon::icon() const
  	return *d->icon;
  }
- 
+
 +#ifdef WEBKIT
 +/**
 + * Returns original image data
@@ -5637,7 +5637,7 @@
 @@ -961,6 +986,20 @@ const QStringList IconsetFactory::icons(
  	return IconsetFactoryPrivate::instance()->icons();
  }
- 
+
 +#ifdef WEBKIT
 +/**
 + * Returs image raw data aka original image
@@ -5664,18 +5664,18 @@
 +#ifdef WEBKIT
 +	virtual const QByteArray & raw() const;
 +#endif
- 
+
  	virtual const Impix &impix() const;
  	virtual const Impix &frameImpix() const;
 @@ -236,6 +239,9 @@ public:
- 
+
  	static const PsiIcon *iconPtr(const QString &name);
  	static const QStringList icons();
 +#ifdef WEBKIT
 +	static const QByteArray raw(const QString &name);
 +#endif
  };
- 
+
  #endif
 --- psi.orig/src/webview.cpp
 +++ psi/src/webview.cpp
@@ -5946,11 +5946,11 @@
 + * Extended QWebView.
 + *
 + * It's used in EventView and HTMLChatView.
-+ * Provides evaluateJavaScript escaping and secure NetworkManager with icon:// URL 
-+ * support and \<img\> whitelisting. 
++ * Provides evaluateJavaScript escaping and secure NetworkManager with icon:// URL
++ * support and \<img\> whitelisting.
 + *
-+ * Better name for it would be: PsiWebView, but it's used in HTMLChatView which is 
-+ * Psi-unaware.  
++ * Better name for it would be: PsiWebView, but it's used in HTMLChatView which is
++ * Psi-unaware.
 + */
 +class WebView : public QWebView {
 +
@@ -6002,7 +6002,7 @@
 @@ -104,10 +104,6 @@ signals:
  	void iconSelected(const PsiIcon *);
  	void textSelected(QString);
- 
+
 -public slots:
 -	void aboutToShow() { iconStart(); }
 -	void aboutToHide() { iconStop();  }
@@ -6013,23 +6013,23 @@
 @@ -147,8 +143,8 @@ private:
  		}
  	}
- 
+
 -	void enterEvent(QEvent *) { setFocus();   update(); } // focus follows mouse mode
 -	void leaveEvent(QEvent *) { clearFocus(); update(); }
 +	void enterEvent(QEvent *) { iconStart(); setFocus();  update(); } // focus follows mouse mode
 +	void leaveEvent(QEvent *) { iconStop(); clearFocus(); update(); }
- 
+
  private slots:
  	void iconUpdated()
 @@ -338,8 +334,8 @@ void IconSelect::setIconset(const Iconse
  		connect (b, SIGNAL(iconSelected(const PsiIcon *)), menu, SIGNAL(iconSelected(const PsiIcon *)));
  		connect (b, SIGNAL(textSelected(QString)), menu, SIGNAL(textSelected(QString)));
- 
+
 -		connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
 -		connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
 +		//connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
 +		//connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
- 
+
  		if (++column >= size) {
  			++row;
 --- psi.orig/themes/chatview/adium/adapter.js
@@ -6044,7 +6044,7 @@
 +		var resources = ["Template.html", "FileTransferRequest.html",
 +		"Footer.html", "Header.html", "Status.html", "Topic.html", "Content.html",
 +		"Incoming/Content.html", "Incoming/NextContent.html",
-+		"Incoming/Context.html", "Incoming/NextContext.html", 
++		"Incoming/Context.html", "Incoming/NextContext.html",
 +		"Outgoing/Content.html", "Outgoing/NextContent.html",
 +		"Outgoing/Context.html", "Outgoing/NextContext.html"];
 +		for (var i=0; i<resources.length; i++) {
@@ -6134,12 +6134,12 @@
 +	var dateFormat = "hh:mm";
 +	var cdata;
 +	var proxyEl = document.createElement("div");
-+	
++
 +	function TemplateVar(name, param) {
 +		this.name = name;
 +		this.param = param
 +	}
-+	
++
 +	TemplateVar.prototype = {
 +		toString : function() {
 +			//chat.console("DEBUG: TemplateVar.prototype.toString " + session);
@@ -6161,7 +6161,7 @@
 +			return d || "";
 +		}
 +	}
-+	
++
 +	function TemplateTimeVar(name, param) {
 +		this.name = name;
 +		if (param) {
@@ -6175,18 +6175,18 @@
 +			this.format = dateFormat
 +		}
 +	}
-+	
++
 +	TemplateTimeVar.prototype.toString = function() {
 +		//chat.console("DEBUG: TemplateTimeVar.prototype.toString");
 +		return cdata[this.name] instanceof Date?
-+			server.formatDate(cdata[this.name], this.format) : 
++			server.formatDate(cdata[this.name], this.format) :
 +			(cdata[this.name] ? cdata[this.name] : "");
 +	}
 +
 +	function Template(raw) {
 +		var splitted = raw.split(/(%[\w]+(?:\{[\w:%]+\})?%)/), i;
 +		this.parts = [];
-+		
++
 +		for (i = 0; i < splitted.length; i++) {
 +			var m = splitted[i].match(/%([\w]+)(?:\{([\w:%]+)\})?%/);
 +			if (m) {
@@ -6198,7 +6198,7 @@
 +			}
 +		}
 +	}
-+	
++
 +	Template.prototype.toString = function(data) {
 +		chat.console("prepare Template.prototype.toString1");
 +		cdata = data || cdata;
@@ -6208,21 +6208,21 @@
 +		chat.console("prepare Template.prototype.toString2");
 +		return proxyEl.innerHTML;
 +	}
-+	
++
 +	// Template variable constructors
 +	var tvConstructors = {
 +		time : TemplateTimeVar,
 +		timeOpened : TemplateTimeVar
 +	}
-+	
++
 +	function psiOption(name) {
 +		return eval("[" + server.psiOption(name) + "][0]")
 +	}
-+	
++
 +	return {
 +		getHtml : function() {
 +			session = window.chatSession; // global session because Template needs it
-+			
++
 +			//chat.console("prepare html");
 +			var html = server.cache("html");
 +			var ip = server.cache("Info.plist");
@@ -6256,7 +6256,7 @@
 +			}
 +			//chat.console("prepare html5");
 +			html = html.replace(/%@/g, function(){return replace.shift() || ""});
-+			
++
 +			var styles = [];
 +			if (ip.DefaultBackgroundColor) {
 +				styles.push("background-color:#"+ip.DefaultBackgroundColor);
@@ -6281,7 +6281,7 @@
 +			var ip = server.cache("Info.plist");
 +			var prevGrouppingData = null;
 +			var groupping = !(ip.DisableCombineConsecutive == true);
-+			
++
 +			chat.adapter.receiveObject = function(data) {
 +				cdata = data;
 +				try {
@@ -6299,7 +6299,7 @@
 +									(prevGrouppingData.userid == cdata.userid) &&
 +									(prevGrouppingData.emote == cdata.emote) &&
 +									(prevGrouppingData.local == cdata.local));
-+									
++
 +								if (data.nextOfGroup) {
 +									template = data.local?templates.outgoingNextContent:templates.incomingNextContent;
 +								} else {
@@ -6358,12 +6358,12 @@
 +					chat.util.showCriticalError("APPEND ERROR: " + e + " \nline: " + e.line)
 +				}
 +			};
-+			
++
 +			var t = {};
 +			var templates = {}
 +			var tcList = ["Status.html", "Content.html",
 +				"Incoming/Content.html", "Incoming/NextContent.html",
-+				"Incoming/Context.html", "Incoming/NextContext.html", 
++				"Incoming/Context.html", "Incoming/NextContext.html",
 +				"Outgoing/Content.html", "Outgoing/NextContent.html",
 +				"Outgoing/Context.html", "Outgoing/NextContext.html"];
 +			var i
@@ -6410,7 +6410,7 @@
 +		// NOTE:
 +		// Any percent signs in this file must be escaped!
 +		// Use two escape signs (%%) to display it, this is passed through a format call!
-+		
++
 +		function appendHTML(html) {
 +			var node = document.getElementById("Chat");
 +			var range = document.createRange();
@@ -6418,7 +6418,7 @@
 +			var documentFragment = range.createContextualFragment(html);
 +			node.appendChild(documentFragment);
 +		}
-+		
++
 +		// a coalesced HTML object buffers and outputs DOM objects en masse.
 +		// saves A LOT of CSS recalculation time when loading many messages.
 +		// (ex. a long twitter timeline)
@@ -6430,11 +6430,11 @@
 +			this.isCoalescing = false;
 +			this.isConsecutive = undefined;
 +			this.shouldScroll = undefined;
-+			
++
 +			var appendElement = function (elem) {
 +				document.getElementById("Chat").appendChild(elem);
 +			};
-+			
++
 +			function outputHTML() {
 +				var insert = document.getElementById("insert");
 +				if(!!insert && self.isConsecutive) {
@@ -6446,14 +6446,14 @@
 +					appendElement(self.fragment);
 +				}
 +				alignChat(self.shouldScroll);
-+				
++
 +				// reset state to empty/non-coalescing
 +				self.shouldScroll = undefined;
 +				self.isConsecutive = undefined;
 +				self.isCoalescing = false;
 +				self.coalesceRounds = 0;
 +			}
-+			
++
 +			// creates and returns a new documentFragment, containing all content nodes
 +			// which can be inserted as a single node.
 +			function createHTMLNode(html) {
@@ -6461,26 +6461,26 @@
 +				range.selectNode(document.getElementById("Chat"));
 +				return range.createContextualFragment(html);
 +			}
-+			
++
 +			// removes first insert node from the internal fragment.
 +			function rmInsertNode() {
 +				var insert = self.fragment.querySelector("#insert");
 +				if(insert)
 +					insert.parentNode.removeChild(insert);
 +			}
-+			
++
 +			function setShouldScroll(flag) {
 +				if(flag && undefined === self.shouldScroll)
 +					self.shouldScroll = flag;
 +			}
-+			
++
 +			// hook in a custom method to append new data
 +			// to the chat.
 +			this.setAppendElementMethod = function (func) {
 +				if(typeof func === 'function')
 +					appendElement = func;
 +			}
-+						
++
 +			// (re)start the coalescing timer.
 +			//   we wait 25ms for a new message to come in.
 +			//   If we get one, restart the timer and wait another 10ms.
@@ -6495,7 +6495,7 @@
 +				if(400 < self.coalesceRounds)
 +					self.cancel();
 +			}
-+			
++
 +			// if we need to append content into an insertion div,
 +			// we need to clear the buffer and cancel the timeout.
 +			this.cancel = function() {
@@ -6504,10 +6504,10 @@
 +					outputHTML();
 +				}
 +			}
-+			
-+			
++
++
 +			// coalased analogs to the global functions
-+			
++
 +			this.append = function(html, shouldScroll) {
 +				// if we started this fragment with a consecuative message,
 +				// cancel and output before we continue
@@ -6518,13 +6518,13 @@
 +				rmInsertNode();
 +				var node = createHTMLNode(html);
 +				self.fragment.appendChild(node);
-+				
++
 +				node = null;
 +
 +				setShouldScroll(shouldScroll);
 +				self.coalesce();
 +			}
-+			
++
 +			this.appendNext = function(html, shouldScroll) {
 +				if(undefined === self.isConsecutive)
 +					self.isConsecutive = true;
@@ -6539,7 +6539,7 @@
 +				setShouldScroll(shouldScroll);
 +				self.coalesce();
 +			}
-+			
++
 +			this.replaceLast = function (html, shouldScroll) {
 +				rmInsertNode();
 +				var node = createHTMLNode(html);
@@ -6554,7 +6554,7 @@
 +		//Appending new content to the message view
 +		function appendMessage(html) {
 +			var shouldScroll;
-+			
++
 +			// Only call nearBottom() if should scroll is undefined.
 +			if(undefined === coalescedHTML.shouldScroll) {
 +				shouldScroll = nearBottom();
@@ -6563,13 +6563,13 @@
 +			}
 +			appendMessageNoScroll(html, shouldScroll);
 +		}
-+		
-+		function appendMessageNoScroll(html, shouldScroll) {			
++
++		function appendMessageNoScroll(html, shouldScroll) {
 +			shouldScroll = shouldScroll || false;
 +			// always try to coalesce new, non-griuped, messages
 +			coalescedHTML.append(html, shouldScroll)
 +		}
-+		
++
 +		function appendNextMessage(html){
 +			var shouldScroll;
 +			if(undefined === coalescedHTML.shouldScroll) {
@@ -6579,7 +6579,7 @@
 +			}
 +			appendNextMessageNoScroll(html, shouldScroll);
 +		}
-+		
++
 +		function appendNextMessageNoScroll(html, shouldScroll){
 +			shouldScroll = shouldScroll || false;
 +			// only group next messages if we're already coalescing input
@@ -6626,7 +6626,7 @@
 +		//Dynamically exchange the active stylesheet
 +		function setStylesheet( id, url ) {
 +			var code = "<style id=\"" + id + "\" type=\"text/css\" media=\"screen,print\">";
-+			if( url.length ) 
++			if( url.length )
 +				code += "@import url( \"" + url + "\" );";
 +			code += "</style>";
 +			var range = document.createRange();
@@ -6642,25 +6642,25 @@
 +			var node = event.target;
 +			if (node.tagName.toLowerCase() != 'img')
 +				return;
-+				
++
 +			imageSwap(node, false);
 +		}
-+		
++
 +		/* Converts textual emoticons to images if textToImagesFlag is true, otherwise vice versa */
 +		function imageSwap(node, textToImagesFlag) {
 +			var shouldScroll = nearBottom();
-+			
++
 +			var images = [node];
 +			if (event.altKey) {
 +				while (node.id != "Chat" && node.parentNode.id != "Chat")
 +					node = node.parentNode;
 +				images = node.querySelectorAll(textToImagesFlag ? "a" : "img");
 +			}
-+			
++
 +			for (var i = 0; i < images.length; i++) {
 +				textToImagesFlag ? textToImage(images[i]) : imageToText(images[i]);
 +			}
-+			
++
 +			alignChat(shouldScroll);
 +		}
 +
@@ -6674,7 +6674,7 @@
 +			img.className = node.className;
 +			node.parentNode.replaceChild(img, node);
 +		}
-+		
++
 +		function imageToText(node)
 +		{
 +			if (client.zoomImage(node) || !node.alt)
@@ -6688,7 +6688,7 @@
 +			a.appendChild(text);
 +			node.parentNode.replaceChild(a, node);
 +		}
-+		
++
 +		//Align our chat to the bottom of the window.  If true is passed, view will also be scrolled down
 +		function alignChat(shouldScroll) {
 +			var windowHeight = window.innerHeight;
@@ -6710,7 +6710,7 @@
 +		window.onresize = function windowDidResize(){
 +			alignChat(true/*nearBottom()*/); //nearBottom buggy with inactive tabs
 +		}
-+		
++
 +		function initStyle() {
 +			alignChat(true);
 +			if(!coalescedHTML)
@@ -6748,7 +6748,7 @@
 +++ psi/themes/chatview/psi/adapter.js
 @@ -0,0 +1,260 @@
 +try {
-+	
++
 +window[chatServer.jsNamespace()].adapter = {
 +	loadTheme : function() {
 +        chatServer.setHtml(chatServer.getFileContents("index.html"));
@@ -6773,15 +6773,15 @@
 +			prevGrouppingData : null,
 +			groupping : false,
 +			chatElement : null,
-+		
++
 +			TemplateVar : function(name) {
 +				this.name = name;
 +			},
-+		
++
 +			Template : function(raw) {
 +				var splitted = raw.split('%'), i;
 +				this.parts = [];
-+				
++
 +				for (i = 0; i < splitted.length; i++) {
 +					if (/^[a-zA-Z]+$/.test(splitted[i])) {
 +						this.parts.push(new shared.TemplateVar(splitted[i]));
@@ -6792,15 +6792,15 @@
 +					}
 +				}
 +			},
-+			
++
 +			psiOption : function(name) {
 +				return eval("[" + shared.server.psiOption(name) + "][0]")
 +			},
-+			
++
 +			colorOption : function(name) {
 +				return eval("[" + shared.server.colorOption(name) + "][0]")
 +			},
-+			
++
 +			appendHtml : function(html, scroll, nextEl) { //scroll[true|false|auto/other]
 +				if (typeof(scroll) == 'boolean') {
 +					shared.scroller.atBottom = scroll;
@@ -6812,14 +6812,14 @@
 +				}
 +				shared.scroller.invalidate();
 +			},
-+			
++
 +			stopGroupping : function() {
 +				if (shared.prevGrouppingData) {
 +					shared.prevGrouppingData.nextEl.parentNode.removeChild(shared.prevGrouppingData.nextEl)
 +					shared.prevGrouppingData = null;
 +				}
 +			},
-+			
++
 +			initTheme : function(config) {
 +				if (inited) {
 +					chat.util.showCriticalError("Theme should not be inited twice. Something wrong with theme.")
@@ -6866,14 +6866,14 @@
 +				return shared.cdata.nextOfGroup;
 +			}
 +		};
-+        
++
 +        // internationalization
 +        function tr(text)
 +        {
 +            // TODO translate
 +            return text;
 +        }
-+        
++
 +        // accepts some templater object and object with 2 optional methods: "pre" and "post(text)"
 +        function proxyTemplate(template, handlers)
 +        {
@@ -6884,7 +6884,7 @@
 +                return result;
 +            }}
 +        }
-+		
++
 +		shared.TemplateVar.prototype = {
 +			toString : function() {
 +				if (shared.varHandlers[this.name]) {
@@ -6909,12 +6909,12 @@
 +				return d || "";
 +			}
 +		}
-+		
++
 +		shared.Template.prototype.toString = function() {
 +			return this.parts.join("");
 +		}
-+		
-+		
++
++
 +		chat.adapter.receiveObject = function(data) {
 +			shared.cdata = data;
 +			if (!inited) {
@@ -6992,13 +6992,13 @@
 +				chat.util.showCriticalError("APPEND ERROR: " + e + " \nline: " + e.line)
 +			}
 +		};
-+	
++
 +		chat.adapter.initSession = null;
 +		chat.adapter.loadTheme = null;
 +		window.chatServer = null;
 +		window.chatSession = null;
 +		return shared;
-+	
++
 +	}
 +}
 +
@@ -7038,14 +7038,14 @@
 +	var nicks = {};
 +	var nickNumber = 0;
 +	var chat = window[chatServer.jsNamespace()];
-+	
++
 +	var cssBody = chat.util.findStyleSheet(document.styleSheets[0], "body").style;
 +	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets[0], ".sent").style;
 +	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets[0], ".received").style;
 +	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
 +	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
 +	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
-+	
++
 +	var applyPsiSettings = function() {
 +		chat.util.updateObject(cssBody, eval("["+shared.session.getFont()+"][0]"));
 +		cssBody.color = shared.server.getPaletteTextcolor(); // global message color palette().color(QPalette::Text).name();
@@ -7054,7 +7054,7 @@
 +		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
 +		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
 +	}
-+	
++
 +	var shared = chat.adapter.initSession();
 +	shared.initTheme({
 +		chatElement : document.body,
@@ -7109,13 +7109,13 @@
 +			}
 +		}
 +	});
-+	
++
 +	applyPsiSettings();
-+	
++
 +	shared.session.signalInited();
-+	
++
 +	return {
-+		
++
 +	};
 +}()
 +
@@ -7149,12 +7149,12 @@
 +				er.style.cssText = "background-color:red;color:white;border:1px solid black;padding:1em;margin:1em;font-weight:bold";
 +				er.innerHTML = chat.util.escapeHtml(text).replace(/\n/, "<br/>");
 +			},
-+			
++
 +			// just for debug
 +			escapeHtml : function(html) {
 +				return html.split("&").join("&amp;").split( "<").join("&lt;").split(">").join("&gt;");
 +			},
-+			
++
 +			// just for debug
 +			props : function(e, rec) {
 +				var ret='';
@@ -7183,7 +7183,7 @@
 +				}
 +				return ret;
 +			},
-+			
++
 +			// replaces <icon name="icon_name" text="icon_text" />
 +			// with <img src="icon://psi/icon_name" title="icon_text" />
 +			icon2img : function (obj) {
@@ -7206,13 +7206,13 @@
 +					}
 +				}
 +			},
-+			
++
 +			updateObject : function(object, update) {
 +				for (var i in update) {
 +					object[i] = update[i]
 +				}
 +			},
-+			
++
 +			findStyleSheet : function (sheet, selector) {
 +				for (var i=0; i<sheet.cssRules.length; i++) {
 +					if (sheet.cssRules[i].selectorText == selector)
@@ -7220,19 +7220,19 @@
 +				}
 +				return false;
 +			},
-+			
++
 +			appendHtml : function(dest, html) {
 +				htmlSource.innerHTML = html;
 +				chat.util.replaceIcons(htmlSource);
 +				while (htmlSource.firstChild) dest.appendChild(htmlSource.firstChild);
 +			},
-+			
++
 +			siblingHtml : function(dest, html) {
 +				htmlSource.innerHTML = html;
 +				chat.util.replaceIcons(htmlSource);
 +				while (htmlSource.firstChild) dest.parentNode.insertBefore(htmlSource.firstChild, dest);
 +			},
-+			
++
 +			ensureDeleted : function(id) {
 +				if (id) {
 +					var el = document.getElementById(id);
@@ -7241,7 +7241,7 @@
 +					}
 +				}
 +			},
-+			
++
 +			loadXML : function(path, allowEmpty) {
 +				allowEmpty = allowEmpty || false;
 +				text = server.getFileContents(path);
@@ -7256,7 +7256,7 @@
 +				}
 +			}
 +		},
-+		
++
 +		WindowScroller : function(animate) {
 +			var o=this, state, timerId
 +			var ignoreNextScroll = false;
@@ -7290,14 +7290,14 @@
 +					timerId = null;
 +				}
 +			}
-+			
++
 +			//timeout to be sure content rerendered correctly
 +			window.addEventListener("resize", function() {setTimeout(function(){
 +				if (o.atBottom) { //immediatelly scroll to bottom if we wish it
 +					window.scrollTo(0, document.height - window.innerHeight);
 +				}
 +			}, 0);}, false);
-+			
++
 +			//let's consider scroll may happen only by user action
 +			window.addEventListener("scroll", function(){
 +				if (ignoreNextScroll) {
@@ -7307,7 +7307,7 @@
 +				stopAnimation();
 +				o.atBottom = document.height == (window.innerHeight+window.pageYOffset);
 +			}, false);
-+			
++
 +			//EXTERNAL API
 +			// checks current state of scroll and wish and activates necessary actions
 +			o.invalidate = function() {
@@ -7315,7 +7315,7 @@
 +					startAnimation();
 +				}
 +			}
-+			
++
 +			o.force = function() {
 +				o.atBottom = true;
 +				o.invalidate();

psi-plus-main-20141106.tar.xz/patches/dev/0460-psi-plugins-fixes.patch Added

@@ -0,0 +1,182 @@
+--- git.temp.orig/src/plugins/generic/antievil/antievil.cpp
++++ git.temp/src/plugins/generic/antievil/antievil.cpp
+@@ -42,7 +42,7 @@ public:
+ 		return "0.1";
+ 	}
+ 
+-	virtual QWidget* options() const
++	virtual QWidget* options()
+ 	{
+ 		return 0;
+ 	}
+@@ -92,6 +92,13 @@ public:
+ 		return blocked;
+ 	}
+ 
++	virtual bool incomingStanza(int account, QDomElement& stanza)
++	{
++		Q_UNUSED(account)
++		Q_UNUSED(stanza)
++		return false;
++	}
++
+ 
+ 	//-- StanzaSender ----------------------------------------
+ 
+@@ -100,6 +107,9 @@ public:
+ 		stanzaSender = host;
+ 	}
+ 
++	virtual void applyOptions() {};
++	virtual void restoreOptions() {};
++
+ 
+ private:
+ 	StanzaSendingHost* stanzaSender;
+--- git.temp.orig/src/plugins/generic/consoledump/consoledumpplugin.cpp
++++ git.temp/src/plugins/generic/consoledump/consoledumpplugin.cpp
+@@ -39,9 +39,11 @@ public:
+ 	virtual QString name() const;
+ 	virtual QString shortName() const;
+ 	virtual QString version() const;
+-	virtual QWidget* options() const;
++	virtual QWidget* options();
+ 	virtual bool enable();
+ 	virtual bool disable();
++	virtual void applyOptions() {};
++	virtual void restoreOptions() {};
+ 
+     virtual bool processEvent(int account, const QDomElement& e);
+ 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
+@@ -72,7 +74,7 @@ QString ConsoleDumpPlugin::version() con
+ 	return "0.1";
+ }
+ 
+-QWidget* ConsoleDumpPlugin::options() const
++QWidget* ConsoleDumpPlugin::options()
+ {
+ 	return 0;
+ }
+--- git.temp.orig/src/plugins/generic/echo/echoplugin.cpp
++++ git.temp/src/plugins/generic/echo/echoplugin.cpp
+@@ -44,12 +44,12 @@ public:
+ 	virtual QString name() const;
+ 	virtual QString shortName() const;
+ 	virtual QString version() const;
+-	virtual QWidget* options() const;
++	virtual QWidget* options();
+ 	virtual bool enable();
+ 	virtual bool disable();
+ 
+ 	// EventFilter
+-    virtual bool processEvent(int account, const QDomElement& e);
++	virtual bool processEvent(int account, const QDomElement& e);
+ 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
+ 
+ 	// StanzaSender
+@@ -59,7 +59,8 @@ public:
+ 	virtual void setOptionAccessingHost(OptionAccessingHost* host);
+ 	virtual void optionChanged(const QString& option);
+ 
+-
++	virtual void applyOptions();
++	virtual void restoreOptions();
+ 
+ private:
+ 	bool enabled;
+@@ -91,7 +92,7 @@ QString EchoPlugin::version() const
+ 	return "0.1";
+ }
+ 
+-QWidget* EchoPlugin::options() const
++QWidget* EchoPlugin::options()
+ {
+ 	return 0;
+ }
+@@ -160,6 +161,4 @@ void EchoPlugin::optionChanged(const QSt
+ {
+ 	Q_UNUSED(option);
+ }
+-
+-
+ #include "echoplugin.moc"
+--- git.temp.orig/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
++++ git.temp/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
+@@ -44,7 +44,7 @@ public:
+ 	virtual QString name() const;
+ 	virtual QString shortName() const;
+ 	virtual QString version() const;
+-	virtual QWidget* options() const;
++	virtual QWidget* options();
+ 	virtual bool enable();
+ 	virtual bool disable();
+ 
+@@ -52,6 +52,8 @@ public:
+ 
+     virtual bool processEvent(int account, const QDomElement& e);
+ 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
++	virtual void applyOptions() {};
++	virtual void restoreOptions() {};
+ 
+ private slots:
+ 	void stopGame();
+@@ -95,7 +97,7 @@ QString NoughtsAndCrossesPlugin::version
+ 	return "0.1";
+ }
+ 
+-QWidget* NoughtsAndCrossesPlugin::options() const
++QWidget* NoughtsAndCrossesPlugin::options()
+ {
+ 	return 0;
+ }
+--- git.temp.orig/src/plugins/generic/null/nullplugin.cpp
++++ git.temp/src/plugins/generic/null/nullplugin.cpp
+@@ -34,9 +34,11 @@ public:
+ 	virtual QString name() const;
+ 	virtual QString shortName() const;
+ 	virtual QString version() const;
+-	virtual QWidget* options() const;
++	virtual QWidget* options();
+ 	virtual bool enable();
+ 	virtual bool disable();
++	virtual void applyOptions() {};
++	virtual void restoreOptions() {};
+ };
+ 
+ Q_EXPORT_PLUGIN(NullPlugin);
+@@ -56,7 +58,7 @@ QString NullPlugin::version() const
+ 	return "0.1";
+ }
+ 
+-QWidget* NullPlugin::options() const
++QWidget* NullPlugin::options()
+ {
+ 	return 0;
+ }
+--- git.temp.orig/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
++++ git.temp/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
+@@ -44,12 +44,14 @@ public:
+ 	virtual QString name() const;
+ 	virtual QString shortName() const;
+ 	virtual QString version() const;
+-	virtual QWidget* options() const;
++	virtual QWidget* options();
+ 	virtual bool enable();
+ 	virtual bool disable();
+ 
+     virtual bool processEvent(int account, const QDomElement& e);
+ 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
++	virtual void applyOptions() {};
++	virtual void restoreOptions() {};
+ 
+ private:
+ 	bool enabled_;
+@@ -107,7 +109,7 @@ QString URLWatcherPlugin::version() cons
+ 	return "0.2";
+ }
+ 
+-QWidget* URLWatcherPlugin::options() const
++QWidget* URLWatcherPlugin::options()
+ {
+ 	return 0;
+ }

psi-plus-main-20141106.tar.xz/patches/dev/psi-fix-muc-contacts-bank.diff Added

@@ -0,0 +1,635 @@
+--- git.temp.orig/iris/src/xmpp/xmpp-im/client.cpp
++++ git.temp/iris/src/xmpp/xmpp-im/client.cpp
+@@ -407,6 +407,26 @@ QString Client::groupChatNick(const QStr
+ 	return QString();
+ }
+ 
++bool Client::groupchatExist(const Jid &j) const
++{
++	if (j.resource().isEmpty()) {
++		foreach (const GroupChat &gc, d->groupChatList) {
++			if (gc.j.compare(j, false))
++				return true;
++		}
++	}
++	return false;
++}
++
++QStringList Client::groupchats() const
++{
++	QStringList lst;
++	foreach (const GroupChat &gc, d->groupChatList)
++		//if (gc.status == GroupChat::Connected)
++			lst.append(gc.j.bare());
++	return lst;
++}
++
+ /*void Client::start()
+ {
+ 	if(d->stream->old()) {
+--- git.temp.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
++++ git.temp/iris/src/xmpp/xmpp-im/xmpp_client.h
+@@ -132,6 +132,8 @@ namespace XMPP
+ 		void groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
+ 		void groupChatLeaveAll(const QString &statusStr = QString());
+ 		QString groupChatNick(const QString &host, const QString &room) const;
++		bool groupchatExist(const Jid &j) const;
++		QStringList groupchats() const;
+ 
+ 	signals:
+ 		void activated();
+--- git.temp.orig/src/chatdlg.cpp
++++ git.temp/src/chatdlg.cpp
+@@ -115,6 +115,9 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 		}
+ 	}
+ 
++	if (account()->isGCContact(jid))
++		account()->gcContactIncRef(jid);
++
+ 	// Message events
+ 	contactChatState_ = XMPP::StateNone;
+ 	lastChatState_ = XMPP::StateNone;
+@@ -164,6 +167,8 @@ void ChatDlg::init()
+ 
+ ChatDlg::~ChatDlg()
+ {
++	if (account()->isGCContact(jid()))
++		account()->gcContactDecRef(jid());
+ 	account()->dialogUnregister(this);
+ }
+ 
+@@ -442,12 +447,11 @@ void ChatDlg::ensureTabbedCorrectly()
+ 
+ void ChatDlg::updateContact(const Jid &j, bool fromPresence)
+ {
+-	if (account()->groupchats().contains(j.full()))
++	if (account()->client()->groupchatExist(j))
+ 		return;
+ 	// if groupchat, only update if the resource matches
+-	if (account()->findGCContact(j) && !jid().compare(j)) {
++	if (account()->isGCContact(j) && !jid().compare(j))
+ 		return;
+-	}
+ 
+ 	if (jid().compare(j, false)) {
+ 		QList<UserListItem*> ul = account()->findRelevant(j);
+--- git.temp.orig/src/infodlg.cpp
++++ git.temp/src/infodlg.cpp
+@@ -223,8 +223,7 @@ InfoDlg::InfoDlg(int type, const Jid &j,
+ 	}
+ 
+ 	// fake UserListItem used when displaying groupchat contact
+-	GCContact *gcc = pa->findGCContact(j);
+-	if (gcc) {
++	if (pa->isGCContact(j)) {
+ 		d->userListItem = new UserListItem(false);
+ 		d->userListItem->setJid(j);
+ 		d->userListItem->setName(j.resource());
+--- git.temp.orig/src/mucmanager.cpp
++++ git.temp/src/mucmanager.cpp
+@@ -614,3 +614,98 @@ void MUCManager::destroy_finished()
+ 		emit destroy_error(t->statusCode(), t->statusString());
+ 	}
+ }
++
++// -----------------------------------------------------------------------------
++
++MUCContactList::MUCContactList()
++{
++}
++
++MUCContactList::~MUCContactList()
++{
++	qDeleteAll(mclist);
++}
++
++bool MUCContactList::contains(const Jid &j) const
++{
++	if (j.resource().isEmpty())
++		return false;
++	return mclist.contains(j.full());
++}
++
++void MUCContactList::mucLeave(const Jid &j)
++{
++	QStringList keys_ = mclist.keys();
++	foreach (const QString &s, keys_) {
++		const Jid cj = Jid(s);
++		if (j.isEmpty() || j.compare(cj, false)) {
++			Status s = status(cj);
++			s.setType(Status::Offline);
++			setStatus(cj, s);
++		}
++	}
++}
++
++void MUCContactList::incRef(const Jid &j)
++{
++	if (j.resource().isEmpty())
++		return;
++
++	MUCContact *mc = mclist.value(j.full());
++	if (!mc) {
++		mc = new MUCContact;
++		mc->refcount = 1;
++		mc->status = Status();
++		mclist[j.full()] = mc;
++	}
++	else
++		++mc->refcount;
++}
++
++void MUCContactList::decRef(const Jid &j)
++{
++	if (j.resource().isEmpty())
++		return;
++
++	MUCContact *mc = mclist.value(j.full());
++	if (mc && --mc->refcount == 0) {
++			mclist.remove(j.full());
++			delete mc;
++	}
++}
++
++Status MUCContactList::status(const Jid &j) const
++{
++	MUCContact *mc = mclist.value(j.full());
++	if (mc)
++		return mc->status;
++	return Status();
++}
++
++void MUCContactList::setStatus(const Jid &j, Status s)
++{
++	MUCContact *mc = mclist.value(j.full());
++	if (mc) {
++		bool turn = (s.isAvailable() != mc->status.isAvailable());
++		mc->status = s;
++		if (turn) {
++			if (s.isAvailable())
++				incRef(j);
++			else
++				decRef(j);
++		}
++	}
++	else if (s.isAvailable()) {
++		incRef(j);
++		mclist.value(j.full())->status = s;
++	}
++}
++
++QList<Jid> MUCContactList::jids() const
++{
++	QList<Jid> jl;
++	foreach (const QString &s, mclist.keys()) {
++		jl.append(Jid(s));
++	}
++	return jl;
++}
+--- git.temp.orig/src/mucmanager.h
++++ git.temp/src/mucmanager.h
+@@ -25,6 +25,7 @@
+ 
+ #include "xmpp_muc.h"
+ #include "xmpp_jid.h"
++#include "xmpp_status.h"
+ 
+ class QString;
+ namespace XMPP {
+@@ -124,4 +125,26 @@ private:
+ 	Jid room_;
+ };
+ 
++class MUCContactList
++{
++public:
++	MUCContactList();
++	~MUCContactList();
++	bool contains(const Jid &j) const;
++	void mucLeave(const Jid &j);
++	void incRef(const Jid &j);
++	void decRef(const Jid &j);
++	Status status(const Jid &j) const;
++	void setStatus(const Jid &j, Status s);
++	QList<Jid> jids() const;
++
++private:
++	struct MUCContact
++	{
++		Status status;
++		int refcount;
++	};
++	QHash<QString, MUCContact*> mclist;
++};
++
+ #endif
+--- git.temp.orig/src/psiaccount.cpp
++++ git.temp/src/psiaccount.cpp
+@@ -86,6 +86,7 @@
+ #ifdef GROUPCHAT
+ #include "groupchatdlg.h"
+ #endif
++#include "mucmanager.h"
+ #include "statusdlg.h"
+ #include "infodlg.h"
+ #include "adduserdlg.h"
+@@ -222,12 +223,6 @@ static AdvancedConnector::Proxy convert_
+ 	return p;
+ }
+ 
+-struct GCContact
+-{
+-	Jid jid;
+-	Status status;
+-};
+-
+ //----------------------------------------------------------------------------
+ // BlockTransportPopup -- blocks popups on transport status changes
+ //----------------------------------------------------------------------------
+@@ -431,6 +426,7 @@ public:
+ 		, pepManager(0)
+ 		, bookmarkManager(0)
+ 		, httpAuthManager(0)
++		, gcbank(0)
+ 		, conn(0)
+ 		, stream(0)
+ 		, tls(0)
+@@ -523,8 +519,7 @@ public:
+ 	// HttpAuth
+ 	HttpAuthManager* httpAuthManager;
+ 
+-	QList<GCContact*> gcbank;
+-	QStringList groupchats;
++	MUCContactList *gcbank;
+ 
+ 	QPointer<AdvancedConnector> conn;
+ 	QPointer<ClientStream> stream;
+@@ -1239,6 +1234,9 @@ PsiAccount::PsiAccount(const UserAccount
+ 	d->httpAuthManager = new HttpAuthManager(d->client->rootTask());
+ 	connect(d->httpAuthManager, SIGNAL(confirmationRequest(const PsiHttpAuthRequest &)), SLOT(incomingHttpAuthRequest(const PsiHttpAuthRequest &)));
+ 
++	// MUC contacts list
++	d->gcbank = new MUCContactList();
++
+ 	// Time server
+ 	new TimeServer(d->client->rootTask());
+ 	d->client->addExtension("e-time", QStringList("urn:xmpp:time"));
+@@ -1412,6 +1410,14 @@ PsiAccount::~PsiAccount()
+ 
+ 	qDeleteAll(d->userList);
+ 	d->userList.clear();
++
++	delete d->selfContact;
++	foreach (PsiContact *pc, d->contacts) {
++		pc->disconnect();
++		delete pc;
++	}
++	d->contacts.clear();
++	delete d->gcbank;
+ 
+ 	d->contactList->unlink(this);
+ 	delete d;
+@@ -2897,7 +2903,7 @@ void PsiAccount::processIncomingMessage(
+ 	if( m.messageReceipt() == ReceiptRequest && !m.id().isEmpty() &&
+ 		PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool()) {
+ 		UserListItem *u;
+-		if(j.compare(d->self.jid(), false) || groupchats().contains(j.bare()) || (!d->loginStatus.isInvisible() && (u = d->userList.find(j)) && (u->subscription().type() == Subscription::To || u->subscription().type() == Subscription::Both))) {
++		if(j.compare(d->self.jid(), false) || client()->groupchatExist(j.bare()) || (!d->loginStatus.isInvisible() && (u = d->userList.find(j)) && (u->subscription().type() == Subscription::To || u->subscription().type() == Subscription::Both))) {
+ 			Message tm(m.from());
+ 			tm.setMessageReceiptId(m.id());
+ 			tm.setMessageReceipt(ReceiptReceived);
+@@ -3677,8 +3683,7 @@ void PsiAccount::simulateRosterOffline()
+ 		}
+ 	}
+ 
+-	while (!d->gcbank.isEmpty())
+-		delete d->gcbank.takeFirst();
++	d->gcbank->mucLeave(Jid());
+ 
+ 	emit endBulkContactUpdate();
+ }
+@@ -3807,16 +3812,13 @@ void PsiAccount::itemPublished(const Jid
+ 
+ Jid PsiAccount::realJid(const Jid &j) const
+ {
+-	GCContact *c = findGCContact(j);
+-	if (c) {
+-		if (c->status.hasMUCItem()) {
+-			return c->status.mucItem().jid();
+-		} else {
+-			return Jid();
+-		}
+-	} else {
+-		return j;
++	if (isGCContact(j)) {
++		Status s = d->gcbank->status(j);
++		if (s.hasMUCItem())
++			return s.mucItem().jid();
++		return Jid();
+ 	}
++	return j;
+ }
+ 
+ QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
+@@ -3837,7 +3839,7 @@ QList<UserListItem*> PsiAccount::findRel
+ 			} else {
+ 				// skip status changes from muc participants
+ 				// if the MUC somehow got into userList.
+-				if (!j.resource().isEmpty() && d->groupchats.contains(j.bare())) continue;
++				if (!j.resource().isEmpty() && isGCContact(j)) continue;
+ 			}
+ 			list.append(u);
+ 		}
+@@ -4216,7 +4218,7 @@ void PsiAccount::actionDefault(const Jid
+ 
+ 	if(d->eventQueue->count(u->jid()) > 0)
+ 		openNextEvent(*u, UserAction);
+-	else if (groupchats().contains(j.full()))
++	else if (client()->groupchatExist(j))
+ 	{
+ 		TabbableWidget *tab = findDialog<TabbableWidget*>(Jid(j.full()));
+ 		if(tab) {
+@@ -4346,7 +4348,7 @@ void PsiAccount::actionHistoryBox(PsiEve
+ 
+ void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
+ {
+-	UserListItem *u = (findGCContact(j)) ? find(j) : find(j.bare());
++	UserListItem *u = (isGCContact(j)) ? find(j) : find(j.bare());
+ 	if(!u) {
+ 		qWarning("[%s] not in userlist\n", qPrintable(j.full()));
+ 		return;
+@@ -4395,8 +4397,7 @@ void PsiAccount::actionOpenChat2(const J
+ 	else {
+ 		// this can happen if the contact is not in the roster at all
+ 
+-		GCContact *c = findGCContact(j);
+-		if(c) {
++		if (isGCContact(j)) {
+ 			// if the contact is from a groupchat, use invokeGCChat
+ 			invokeGCChat(j);
+ 			return;
+@@ -4485,7 +4486,7 @@ void PsiAccount::actionInfo(const Jid &_
+ {
+ 	bool useCache = true;
+ 	Jid j;
+-	if(findGCContact(_j)) {
++	if (isGCContact(_j)) {
+ 		useCache = false;
+ 		j = _j;
+ 	}
+@@ -4760,7 +4761,7 @@ void PsiAccount::dj_sendMessage(const Me
+ 
+ 	// don't log groupchat, private messages, or encrypted messages
+ 	if(log) {
+-		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !findGCContact(m.to())) {
++		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !isGCContact(m.to())) {
+ 			MessageEvent *me = new MessageEvent(m, this);
+ 			me->setOriginLocal(true);
+ 			me->setTimeStamp(QDateTime::currentDateTime());
+@@ -5052,7 +5053,7 @@ void PsiAccount::handleEvent(PsiEvent* e
+ 	QList<UserListItem*> ul = findRelevant(e->from());
+ 	if(ul.isEmpty()) {
+ 		// if groupchat, then we want the full JID
+-		if(findGCContact(e->from())) {
++		if(isGCContact(e->from())) {
+ 			j = e->from();
+ 		}
+ 		else {
+@@ -5101,7 +5102,7 @@ void PsiAccount::handleEvent(PsiEvent* e
+ 
+ 			// don't log private messages
+ 			if (!found &&
+-				!findGCContact(e->from()) &&
++				!isGCContact(e->from()) &&
+ 				!(e->type() == PsiEvent::Message &&
+ 				  ((MessageEvent *)e)->message().body().isEmpty()))
+ 			{
+@@ -5412,19 +5413,18 @@ UserListItem* PsiAccount::addUserListIte
+ 	u->setInList(false);
+ 	u->setAvatarFactory(avatarFactory());
+ 	u->setName(nick);
+-	u->setConference(groupchats().contains(jid.full()));
++	u->setConference(client()->groupchatExist(jid));
+ 
+ 	// is it a private groupchat?
+ 	Jid j = u->jid();
+-	GCContact *c = findGCContact(j);
+-	if(c) {
++	if (isGCContact(j)) {
+ 		u->setName(j.resource());
+ 		u->setPrivate(true);
+ 
+ 		// make a resource so the contact appears online
+ 		UserResource ur;
+ 		ur.setName(j.resource());
+-		ur.setStatus(c->status);
++		ur.setStatus(d->gcbank->status(j));
+ 		u->userResourceList().append(ur);
+ 	}
+ 
+@@ -5466,8 +5466,6 @@ void PsiAccount::addMucItem(const Jid& j
+ 		d->removeEntry(jid);
+ 		d->userList.removeAll(u);
+ 	}
+-	if (!d->groupchats.contains(jid.bare()))
+-		d->groupchats += jid.bare();
+ 	addUserListItem(jid.bare(), "");
+ }
+ 
+@@ -5855,7 +5853,6 @@ void PsiAccount::groupChatSetStatus(cons
+ void PsiAccount::groupChatLeave(const QString &host, const QString &room)
+ {
+ 	Jid j(room + '@' + host);
+-	d->groupchats.removeAll(j.bare());
+ 	d->client->groupChatLeave(host, room, PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
+ 	UserListItem *u = find(j);
+ 	if (u) {
+@@ -5864,28 +5861,29 @@ void PsiAccount::groupChatLeave(const QS
+ 	}
+ }
+ 
+-GCContact *PsiAccount::findGCContact(const Jid &j) const
++bool PsiAccount::isGCContact(const Jid &j) const
+ {
+-	foreach(GCContact *c, d->gcbank) {
+-		if(c->jid.compare(j))
+-			return c;
+-	}
+-	return 0;
++	return d->gcbank->contains(j);
+ }
+ 
+ Status PsiAccount::gcContactStatus(const Jid &j)
+ {
+-	GCContact *c = findGCContact(j);
+-	if (c) {
+-		return c->status;
+-	} else {
+-		return Status();
+-	}
++	return d->gcbank->status(j);
++}
++
++void PsiAccount::gcContactIncRef(const Jid &j)
++{
++	d->gcbank->incRef(j);
++}
++
++void PsiAccount::gcContactDecRef(const Jid &j)
++{
++	d->gcbank->decRef(j);
+ }
+ 
+ QStringList PsiAccount::groupchats() const
+ {
+-	return d->groupchats;
++	return client()->groupchats();
+ }
+ 
+ void PsiAccount::client_groupChatJoined(const Jid &j)
+@@ -5919,24 +5917,17 @@ void PsiAccount::client_groupChatJoined(
+ void PsiAccount::client_groupChatLeft(const Jid &j)
+ {
+ 	// remove all associated groupchat contacts from the bank
+-	for(QList<GCContact*>::Iterator it = d->gcbank.begin(); it != d->gcbank.end(); ) {
+-		GCContact *c = *it;
+-
++	foreach (const Jid &cj, d->gcbank->jids()) {
+ 		// contact from this room?
+-		if(!c->jid.compare(j, false)) {
+-			++it;
+-			continue;
+-		}
+-		UserListItem *u = find(c->jid);
+-		if(!u) {
+-			++it;
+-			continue;
++		if (cj.compare(j, false)) {
++			UserListItem *u = find(cj);
++			if (u) {
++				simulateContactOffline(u);
++			}
+ 		}
+ 
+-		simulateContactOffline(u);
+-		it = d->gcbank.erase(it);
+-		delete c;
+ 	}
++	d->gcbank->mucLeave(j.bare());
+ }
+ 
+ void PsiAccount::client_groupChatPresence(const Jid &j, const Status &s)
+@@ -5946,13 +5937,9 @@ void PsiAccount::client_groupChatPresenc
+ 	if(!w)
+ 		return;
+ 
+-	GCContact *c = findGCContact(j);
+-	if(!c) {
+-		c = new GCContact;
+-		c->jid = j;
+-		c->status = s;
+-		d->gcbank.append(c);
+-	}
++	if (!s.isAvailable())
++		d->gcbank->incRef(j);
++	d->gcbank->setStatus(j, s);
+ 
+ 	w->presence(j.resource(), s);
+ 
+@@ -5965,6 +5952,9 @@ void PsiAccount::client_groupChatPresenc
+ 		client_resourceAvailable(j, r);
+ 	else
+ 		client_resourceUnavailable(j, j.resource());
++
++	if (!s.isAvailable())
++		d->gcbank->decRef(j);
+ #endif
+ }
+ 
+@@ -6449,8 +6439,7 @@ void PsiAccount::setReceipts(bool b)
+ 
+ void PsiAccount::invokeGCMessage(const Jid &j)
+ {
+-	GCContact *c = findGCContact(j);
+-	if(!c)
++	if (!isGCContact(j))
+ 		return;
+ 
+ 	// create dummy item, open chat, then destroy item.  HORRIBLE HACK!
+@@ -6464,7 +6448,7 @@ void PsiAccount::invokeGCMessage(const J
+ 	// make a resource so the contact appears online
+ 	UserResource ur;
+ 	ur.setName(j.resource());
+-	ur.setStatus(c->status);
++	ur.setStatus(d->gcbank->status(j));
+ 	u->userResourceList().append(ur);
+ 
+ 	d->userList.append(u);
+@@ -6475,8 +6464,7 @@ void PsiAccount::invokeGCMessage(const J
+ 
+ void PsiAccount::invokeGCChat(const Jid &j)
+ {
+-	GCContact *c = findGCContact(j);
+-	if(!c)
++	if (!isGCContact(j))
+ 		return;
+ 
+ 	// create dummy item, open chat, then destroy item.  HORRIBLE HACK!
+@@ -6491,7 +6479,7 @@ void PsiAccount::invokeGCChat(const Jid
+ 	// make a resource so the contact appears online
+ 	UserResource ur;
+ 	ur.setName(j.resource());
+-	ur.setStatus(c->status);
++	ur.setStatus(d->gcbank->status(j));
+ 	u->userResourceList().append(ur);
+ 
+ 	d->userList.append(u);
+--- git.temp.orig/src/psiaccount.h
++++ git.temp/src/psiaccount.h
+@@ -95,9 +95,6 @@ class QIcon;
+ class WbManager;
+ #endif
+ 
+-// sick sick remove this someday please!
+-struct GCContact;
+-
+ class AvCallManager;
+ 
+ class PsiAccount : public QObject
+@@ -258,9 +255,10 @@ public:
+ 
+ 	int sendMessageEncrypted(const Message &);
+ 
+-	// sucks sucks sucks sucks sucks sucks sucks
+-	GCContact *findGCContact(const Jid &j) const;
++	bool isGCContact(const Jid &j) const;
+ 	XMPP::Status gcContactStatus(const Jid &j);
++	void gcContactIncRef(const Jid &j);
++	void gcContactDecRef(const Jid &j);
+ 	QStringList groupchats() const;
+ 
+ 	void toggleSecurity(const Jid &, bool);
+--- git.temp.orig/src/psicontact.cpp
++++ git.temp/src/psicontact.cpp
+@@ -167,6 +167,8 @@ PsiContact::PsiContact(const UserListIte
+ 	d->account_ = account;
+ 	if (d->account_) {
+ 		connect(d->account_->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
++		if (d->account_->isGCContact(u.jid()))
++			d->account_->gcContactIncRef(u.jid());
+ 	}
+ 	connect(VCardFactory::instance(), SIGNAL(vcardChanged(const Jid&)), SLOT(vcardChanged(const Jid&)));
+ 	update(u);
+@@ -185,6 +187,11 @@ PsiContact::PsiContact()
+  */
+ PsiContact::~PsiContact()
+ {
++	if (account()) {
++		const Jid &j = userListItem().jid();
++		if (account()->isGCContact(j))
++			account()->gcContactDecRef(j);
++	}
+ 	d->isValid_ = false;
+ 	emit destroyed(this);
+ 	delete d;

psi-plus-main-20141106.tar.xz/patches/dev/psi-fix-win32-Qt5.3.1-build.patch Added

psi-plus-main-20141106.tar.xz/patches/dev/psi-nested-groups.diff Added

@@ -0,0 +1,1767 @@
+--- git.temp.orig/options/default.xml
++++ git.temp/options/default.xml
+@@ -275,6 +275,7 @@ QLineEdit#le_status_text {
+ 						<margin type="int">0</margin>
+ 					</avatar>
+ 				</roster-avatar-frame>
++				<default-groups-delimiter comment="Default nested groups delimiter will be used if no delimiter on the server" type="QString">::</default-groups-delimiter>
+ 			</contactlist>
+ 			<menu comment="Options for the menu">
+ 				<account comment="Options for the account-specific menu">
+--- git.temp.orig/src/accountmodify.ui
++++ git.temp/src/accountmodify.ui
+@@ -7,7 +7,7 @@
+     <x>0</x>
+     <y>0</y>
+     <width>765</width>
+-    <height>475</height>
++    <height>522</height>
+    </rect>
+   </property>
+   <property name="windowTitle">
+@@ -1043,6 +1043,63 @@ When you enable this option you will not
+         </widget>
+        </item>
+        <item>
++        <layout class="QHBoxLayout" name="horizontalLayout_2">
++         <item>
++          <widget class="QLabel" name="label_3">
++           <property name="text">
++            <string>Nested groups delimiter: </string>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QLineEdit" name="le_groupsdelimiter">
++           <property name="sizePolicy">
++            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
++             <horstretch>0</horstretch>
++             <verstretch>0</verstretch>
++            </sizepolicy>
++           </property>
++           <property name="maximumSize">
++            <size>
++             <width>64</width>
++             <height>16777215</height>
++            </size>
++           </property>
++           <property name="readOnly">
++            <bool>true</bool>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <spacer name="horizontalSpacer">
++           <property name="orientation">
++            <enum>Qt::Horizontal</enum>
++           </property>
++           <property name="sizeHint" stdset="0">
++            <size>
++             <width>40</width>
++             <height>20</height>
++            </size>
++           </property>
++          </spacer>
++         </item>
++         <item>
++          <widget class="QPushButton" name="pb_groupsdelimiter">
++           <property name="text">
++            <string>Change...</string>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QPushButton" name="pb_disablegroupsdelimiter">
++           <property name="text">
++            <string>Disable</string>
++           </property>
++          </widget>
++         </item>
++        </layout>
++       </item>
++       <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+@@ -1123,8 +1180,8 @@ When you enable this option you will not
+    <slot>reject()</slot>
+    <hints>
+     <hint type="sourcelabel">
+-     <x>346</x>
+-     <y>439</y>
++     <x>355</x>
++     <y>512</y>
+     </hint>
+     <hint type="destinationlabel">
+      <x>523</x>
+--- git.temp.orig/src/accountmodifydlg.cpp
++++ git.temp/src/accountmodifydlg.cpp
+@@ -35,6 +35,7 @@
+ #include "psicontactlist.h"
+ #include "iconaction.h"
+ #include "actionlineedit.h"
++#include "userlist.h"
+ 
+ AccountModifyDlg::AccountModifyDlg(PsiCon *_psi, QWidget *parent)
+ :QDialog(parent)
+@@ -223,6 +224,12 @@ void AccountModifyDlg::init()
+ 	pb_removeBlock->hide();
+ 	pb_addBlock->hide();
+ 
++	// Misc
++	connect(pb_groupsdelimiter, SIGNAL(clicked()), SLOT(miscChangeGroupsDelimiter()));
++	connect(pb_disablegroupsdelimiter, SIGNAL(clicked()), SLOT(miscDisableGroupsDelimiter()));
++	if (pa && pa->userList())
++		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
++
+ 	// QWhatsThis helpers
+ 	cb_plain->setWhatsThis(
+ 		tr("Normally, Psi logs in using the <i>digest</i> authentication "
+@@ -504,6 +511,22 @@ void AccountModifyDlg::removeStunHost()
+ 	cb_stunHost->setCurrentIndex(0);
+ }
+ 
++void AccountModifyDlg::miscChangeGroupsDelimiter()
++{
++	if (pa) {
++		pa->changeGroupsDelimiter();
++		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
++	}
++}
++
++void AccountModifyDlg::miscDisableGroupsDelimiter()
++{
++	if (pa) {
++		pa->disableGroupsDelimiter();
++		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
++	}
++}
++
+ void AccountModifyDlg::save()
+ {
+ 	/*if(pa && le_name->text().isEmpty()) {
+--- git.temp.orig/src/accountmodifydlg.h
++++ git.temp/src/accountmodifydlg.h
+@@ -57,6 +57,8 @@ private slots:
+ 	void detailsChangePW();
+ 
+ 	void removeStunHost();
++	void miscChangeGroupsDelimiter();
++	void miscDisableGroupsDelimiter();
+ 
+ 	void save();
+ 
+--- git.temp.orig/src/contactlistaccountgroup.cpp
++++ git.temp/src/contactlistaccountgroup.cpp
+@@ -30,14 +30,13 @@
+ #include "contactlistgroupcache.h"
+ 
+ ContactListAccountGroup::ContactListAccountGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount* account)
+-	: ContactListNestedGroup(model, parent, QString())
++	: ContactListNestedGroup(model, parent, account, QString())
+ 	, isRoot_(!account)
+-	, account_(account)
+ {
+-	if (account_) {
++	if (account) {
+ 		model->groupCache()->addGroup(this);
+-		connect(account_, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
+-		connect(account_, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
++		connect(account, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
++		connect(account, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
+ 	}
+ }
+ 
+@@ -57,11 +56,6 @@ void ContactListAccountGroup::clearGroup
+ 	ContactListNestedGroup::clearGroup();
+ }
+ 
+-PsiAccount* ContactListAccountGroup::account() const
+-{
+-	return account_;
+-}
+-
+ ContactListModel::Type ContactListAccountGroup::type() const
+ {
+ 	return ContactListModel::AccountType;
+@@ -140,7 +134,7 @@ void ContactListAccountGroup::accountUpd
+ 
+ 	model()->updatedItem(root->findGroup(this));
+ 
+-	if (account_.isNull() || !account_->enabled()) {
++	if (!account() || !account()->enabled()) {
+ 		clearGroup();
+ 		root->removeAccount(this);
+ 	}
+@@ -148,8 +142,8 @@ void ContactListAccountGroup::accountUpd
+ 
+ const QString& ContactListAccountGroup::displayName() const
+ {
+-	if (account_) {
+-		return account_->name();
++	if (account()) {
++		return account()->name();
+ 	}
+ 
+ 	static QString emptyName;
+@@ -163,8 +157,8 @@ QString ContactListAccountGroup::compari
+ 
+ QString ContactListAccountGroup::internalGroupName() const
+ {
+-	if (account_) {
+-		return account_->id();
++	if (account()) {
++		return account()->id();
+ 	}
+ 
+ 	return QString();
+--- git.temp.orig/src/contactlistaccountgroup.h
++++ git.temp/src/contactlistaccountgroup.h
+@@ -34,7 +34,6 @@ public:
+ 	ContactListAccountGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount* account);
+ 	~ContactListAccountGroup();
+ 
+-	PsiAccount* account() const;
+ 	ContactListAccountGroup* findAccount(PsiAccount* account) const;
+ 
+ 	// reimplemented
+@@ -63,7 +62,6 @@ private slots:
+ 
+ private:
+ 	bool isRoot_;
+-	QPointer<PsiAccount> account_;
+ 	QList<ContactListAccountGroup*> accounts_;
+ };
+ 
+--- git.temp.orig/src/contactlistdragmodel.cpp
++++ git.temp/src/contactlistdragmodel.cpp
+@@ -23,6 +23,7 @@
+ #include <QtAlgorithms>
+ #include <QTimer>
+ 
++#include "userlist.h"
+ #include "psioptions.h"
+ #include "psiaccount.h"
+ #include "contactlistgroup.h"
+@@ -296,7 +297,7 @@ bool ContactListDragModel::supportsMimeD
+ 		if (group) {
+ 			ContactListItemProxy* item2 = itemProxy(parent);
+ 			ContactListGroup* group2 = item2 ? item2->parent() : 0;
+-			if (group2 && group2->fullName().startsWith(group->fullName() + ContactListGroup::groupDelimiter())) {
++			if (group2 && group2->fullName().startsWith(group->fullName() + group2->groupsDelimiter())) {
+ 				return false;
+ 			}
+ 		}
+@@ -340,22 +341,18 @@ void ContactListDragModel::addOperations
+ 		for (int i = 0; i < group->itemsCount(); ++i) {
+ 			ContactListItemProxy* itemProxy = group->item(i);
+ 			PsiContact* contact = 0;
+-#ifdef CONTACTLIST_NESTED_GROUPS
+ 			ContactListGroup* childGroup = 0;
+-#endif
+ 			if ((contact = dynamic_cast<PsiContact*>(itemProxy->item()))) {
+ 				operations->addOperation(contact,
+ 										 sourceOperationsForContactGroup(currentGroupName, contact),
+ 										 destinationOperationsForContactGroup(newGroupName, contact));
+ 			}
+-#ifdef CONTACTLIST_NESTED_GROUPS
+-#error needs testing
++			// #error needs testing
+ 			else if ((childGroup = dynamic_cast<ContactListGroup*>(itemProxy->item()))) {
+-				QString theName = childGroup->fullName().split(ContactListGroup::groupDelimiter()).last();
+-				QString newName = (newGroupName.isEmpty() ? "" : newGroupName + ContactListGroup::groupDelimiter()) + theName;
++				QString theName = childGroup->toNestedGroups(childGroup->fullName()).last();
++				QString newName = (newGroupName.isEmpty() ? "" : newGroupName + childGroup->groupsDelimiter()) + theName;
+ 				addOperationsForGroupRename(childGroup->fullName(), newName, operations);
+ 			}
+-#endif
+ 		}
+ 	}
+ }
+@@ -382,7 +379,9 @@ bool ContactListDragModel::dropMimeData(
+ 
+ 	foreach(ContactListModelSelection::Group group, selection.groups()) {
+ 		QString parentGroupName = getDropGroupName(parent);
+-		if (parentGroupName.startsWith(group.fullName + ContactListGroup::groupDelimiter())) {
++		bool hasDelimiter = account(parent)->userList()->hasGroupsDelimiter();
++		QString delimiter = account(parent)->userList()->groupsDelimiter();
++		if (parentGroupName.startsWith(group.fullName + delimiter)) {
+ 			qWarning("Dropping group to its descendant is not supported ('%s' -> '%s')", qPrintable(group.fullName), qPrintable(parentGroupName));
+ 			continue;
+ 		}
+@@ -391,8 +390,8 @@ bool ContactListDragModel::dropMimeData(
+ 			continue;
+ 
+ 		// TODO: unify these two lines with the ones in operationsForGroupRename
+-		QString theName = group.fullName.split(ContactListGroup::groupDelimiter()).last();
+-		QString newName = (parentGroupName.isEmpty() ? "" : parentGroupName + ContactListGroup::groupDelimiter()) + theName;
++		QString theName = group.fullName.split(hasDelimiter ? delimiter : "").last();
++		QString newName = (parentGroupName.isEmpty() ? "" : parentGroupName + delimiter) + theName;
+ 		if (newName == group.fullName)
+ 			continue;
+ 
+@@ -422,37 +421,17 @@ void ContactListDragModel::renameGroup(C
+ 	Q_ASSERT(group);
+ 	ContactListModelOperationList operations(ContactListModelOperationList::Move);
+ 
+-	QStringList name = group->fullName().split(ContactListGroup::groupDelimiter());
++	QStringList name = group->toNestedGroups(group->fullName());
+ 	if (name.isEmpty())
+ 		return;
+ 	name.takeLast();
+ 	if (!newName.isEmpty())
+ 		name << newName;
+-	addOperationsForGroupRename(group->fullName(), name.join(ContactListGroup::groupDelimiter()), &operations);
++	addOperationsForGroupRename(group->fullName(), group->fromNestedGroups(name), &operations);
+ 
+ 	performContactOperations(operations, Operation_GroupRename);
+ }
+ 
+-QString ContactListDragModel::processContactSetGroupName(const QString& groupName) const
+-{
+-	if (accountsEnabled()) {
+-		QStringList split = groupName.split(ContactListGroup::groupDelimiter());
+-		split.takeFirst();
+-		return split.join(ContactListGroup::groupDelimiter());
+-	}
+-
+-	return groupName;
+-}
+-
+-QStringList ContactListDragModel::processContactSetGroupNames(const QStringList& groups) const
+-{
+-	QStringList result;
+-	foreach(const QString& g, groups) {
+-		result << processContactSetGroupName(g);
+-	}
+-	return result;
+-}
+-
+ QStringList ContactListDragModel::processContactGetGroupNames(PsiContact* contact) const
+ {
+ 	QStringList groups;
+@@ -504,7 +483,7 @@ void ContactListDragModel::performContac
+ 			}
+ 		}
+ 
+-		psiContact->setGroups(processContactSetGroupNames(groups));
++		psiContact->setGroups(groups);
+ 	}
+ 
+ 	contactOperationsPerformed(operations, operationType, groupContactCount);
+@@ -532,7 +511,7 @@ QList<PsiContact*> ContactListDragModel:
+ 		QStringList groups = psiContact->groups();
+ 
+ 		foreach(ContactListModelOperationList::Operation op, contactOperation.operations) {
+-			groups.removeAll(processContactSetGroupName(op.groupFrom));
++			groups.removeAll(op.groupFrom);
+ 		}
+ 
+ 		if (!groupsEnabled()) {
+@@ -562,8 +541,9 @@ QList<PsiContact*> ContactListDragModel:
+ 				continue;
+ 
+ 			QStringList groups = it.value();
++
+ 			if (!groups.isEmpty())
+-				psiContact->setGroups(processContactSetGroupNames(groups));
++				psiContact->setGroups(groups);
+ 			else
+ 				psiContact->remove();
+ 		}
+--- git.temp.orig/src/contactlistdragmodel.h
++++ git.temp/src/contactlistdragmodel.h
+@@ -113,8 +113,6 @@ protected:
+ 	virtual QString getDropGroupName(const QModelIndex& parent) const;
+ 	virtual void contactOperationsPerformed(const ContactListModelOperationList& operations, OperationType operationType, const QHash<ContactListGroup*, int>& groupContactCount);
+ 
+-	QString processContactSetGroupName(const QString& groupName) const;
+-	QStringList processContactSetGroupNames(const QStringList& groups) const;
+ 	QStringList processContactGetGroupNames(PsiContact* contact) const;
+ 	QString sourceOperationsForContactGroup(const QString& groupName, PsiContact* contact) const;
+ 	QString destinationOperationsForContactGroup(const QString& groupName, PsiContact* contact) const;
+--- git.temp.orig/src/contactlistgroup.cpp
++++ git.temp/src/contactlistgroup.cpp
+@@ -28,17 +28,17 @@
+ #include "psicontact.h"
+ #include "contactlistgroupstate.h"
+ #include "contactlistgroupcache.h"
++#include "psiaccount.h"
++#include "userlist.h"
+ #ifdef YAPSI
+ #include "fakegroupcontact.h"
+ #endif
+ 
+-static QString GROUP_DELIMITER = "::";
+-
+ /**
+  * Flat group class.
+  */
+-ContactListGroup::ContactListGroup(ContactListModel* model, ContactListGroup* parent)
+-	: ContactListItem()
++ContactListGroup::ContactListGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account)
++	: ContactListItem(account)
+ 	, model_(model)
+ 	, parent_(parent)
+ 	, updateOnlineContactsTimer_(0)
+@@ -76,35 +76,61 @@ QString ContactListGroup::internalGroupN
+ 
+ QString ContactListGroup::fullName() const
+ {
+-	QStringList name;
++	QStringList nestedGroups;
+ 	const ContactListGroup* group = this;
+ 	while (group) {
+-		if (!group->internalGroupName().isEmpty())
+-			name.prepend(group->internalGroupName());
++		if (!group->internalGroupName().isEmpty() && group->type() != ContactListModel::AccountType)
++			nestedGroups.prepend(group->internalGroupName());
+ 		group = group->parent();
+ 	}
+-	return name.join(groupDelimiter());
++	return fromNestedGroups(nestedGroups);
++}
++
++bool ContactListGroup::hasGroupsDelimiter() const
++{
++	return account() ? account()->userList()->hasGroupsDelimiter() : false;
++}
++
++QString ContactListGroup::groupsDelimiter() const
++{
++	return account() ? account()->userList()->groupsDelimiter() : "";
+ }
+ 
+-const QString& ContactListGroup::groupDelimiter()
++QStringList ContactListGroup::toNestedGroups(const QString &group) const
+ {
+-	return GROUP_DELIMITER;
++	QStringList nestedGroups;
++	if (hasGroupsDelimiter())
++		nestedGroups = group.split(groupsDelimiter());
++	else
++		nestedGroups << group;
++	return nestedGroups;
+ }
+ 
+-void ContactListGroup::setGroupDelimiter(const QString& str)
++QString ContactListGroup::fromNestedGroups(const QStringList &nestedGroups) const
+ {
+-	GROUP_DELIMITER = str;
++	QString group;
++	if (hasGroupsDelimiter()) {
++		group = nestedGroups.join(groupsDelimiter());
++	}
++	else {
++		group = nestedGroups.join("");
++	}
++	return group;
+ }
+ 
+-QString ContactListGroup::sanitizeGroupName(const QString& name) const
++QString ContactListGroup::sanitizeGroupName(const QString &name) const
+ {
+-	return name.split(groupDelimiter(), QString::SkipEmptyParts).join(groupDelimiter());
++	if (!hasGroupsDelimiter()) {
++		return name;
++	}
++
++	return name.split(groupsDelimiter(), QString::SkipEmptyParts).join(groupsDelimiter());
+ }
+ 
+ QStringList ContactListGroup::sanitizeGroupNames(const QStringList& names) const
+ {
+ 	QStringList sanitized;
+-	foreach(QString name, names) {
++	foreach(const QString &name, names) {
+ 		sanitized.append(sanitizeGroupName(name));
+ 	}
+ 	return sanitized;
+@@ -420,6 +446,7 @@ void ContactListGroup::updateOnlineConta
+ 		onlineContactsCount_ = onlineContactsCount;
+ 		totalContactsCount_ = totalContactsCount;
+ 		if (parent()) {
++			parent()->updateOnlineContactsFlag();
+ 			model()->updatedItem(parent()->findGroup(this));
+ 		}
+ 	}
+@@ -477,7 +504,7 @@ void ContactListGroup::contactsHelper(QL
+ 	foreach(ContactListItemProxy* item, items_) {
+ 		ContactListGroup* group = dynamic_cast<ContactListGroup*>(item->item());
+ 		if (group)
+-			contactsHelper(contacts);
++			group->contactsHelper(contacts);
+ 	}
+ }
+ 
+--- git.temp.orig/src/contactlistgroup.h
++++ git.temp/src/contactlistgroup.h
+@@ -38,7 +38,7 @@ class ContactListGroup : public ContactL
+ {
+ 	Q_OBJECT
+ public:
+-	ContactListGroup(ContactListModel* model, ContactListGroup* parent);
++	ContactListGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account);
+ 	~ContactListGroup();
+ 
+ 	ContactListItemProxy* item(int index) const;
+@@ -80,8 +80,13 @@ public:
+ 	virtual ContactListItemMenu* contextMenu(ContactListModel* model);
+ 	virtual bool compare(const ContactListItem* other) const;
+ 
+-	static const QString& groupDelimiter();
+-	static void setGroupDelimiter(const QString&);
++	bool hasGroupsDelimiter() const;
++	QString groupsDelimiter() const;
++
++	QStringList toNestedGroups(const QString &group) const;
++	QString fromNestedGroups(const QStringList &nestedGroups) const;
++
++	// static void setGroupsDelimiter(const QString&);
+ 	QString sanitizeGroupName(const QString&) const;
+ 	QStringList sanitizeGroupNames(const QStringList& names) const;
+ 
+--- git.temp.orig/src/contactlistgroupstate.cpp
++++ git.temp/src/contactlistgroupstate.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "contactlistgroupstate.h"
++#include "contactlistgroup.h"
+ 
+ #include <QTimer>
+ #include <QStringList>
+@@ -28,6 +29,8 @@
+ #include "contactlistgroup.h"
+ #include "psioptions.h"
+ #include "xmpp_xmlcommon.h"
++#include "psiaccount.h"
++#include "userlist.h"
+ 
+ static const QString groupStateOptionPath = "options.main-window.contact-list.group-state.%1";
+ 
+@@ -147,8 +150,17 @@ QStringList ContactListGroupState::group
+ 	}
+ 
+ 	if (result.isEmpty()) {
+-		for (int len = 1; len < parentName.count() + 1; ++len)
+-			result += QStringList(parentName.mid(0, len)).join(ContactListGroup::groupDelimiter());
++		ContactListItemProxy *itemProxy = model->modelIndexToItemProxy(parent);
++		if (itemProxy) {
++			ContactListGroup *groupItem = qobject_cast<ContactListGroup*>(itemProxy->item());
++			QString groupsDelimiter;
++			if (groupItem && groupItem->hasGroupsDelimiter()) {
++				groupsDelimiter = groupItem->groupsDelimiter();
++			}
++
++			for (int len = 1; len < parentName.count() + 1; ++len)
++				result += QStringList(parentName.mid(0, len)).join(groupsDelimiter);
++		}
+ 	}
+ 
+ 	return result;
+--- git.temp.orig/src/contactlistitem.cpp
++++ git.temp/src/contactlistitem.cpp
+@@ -21,15 +21,32 @@
+ #include "contactlistitem.h"
+ 
+ #include "psicontact.h"
++#include "psiaccount.h"
+ 
+-ContactListItem::ContactListItem(QObject* parent)
++class ContactListItem::Private
++{
++public:
++	Private();
++	bool editing;
++	PsiAccount *account;
++};
++
++ContactListItem::Private::Private()
++	: editing(false)
++	, account(0)
++{
++}
++
++ContactListItem::ContactListItem(PsiAccount *account, QObject* parent)
+ 	: QObject(parent)
+-	, editing_(false)
++	, d(new ContactListItem::Private)
+ {
++	d->account = account;
+ }
+ 
+ ContactListItem::~ContactListItem()
+ {
++	delete d;
+ }
+ 
+ bool ContactListItem::isEditable() const
+@@ -90,15 +107,20 @@ QString ContactListItem::comparisonName(
+ 
+ bool ContactListItem::editing() const
+ {
+-	return editing_;
++	return d->editing;
+ }
+ 
+ void ContactListItem::setEditing(bool editing)
+ {
+-	editing_ = editing;
++	d->editing = editing;
+ }
+ 
+ const QString& ContactListItem::displayName() const
+ {
+ 	return name();
+ }
++
++PsiAccount *ContactListItem::account() const
++{
++	return d->account;
++}
+--- git.temp.orig/src/contactlistitem.h
++++ git.temp/src/contactlistitem.h
+@@ -27,11 +27,12 @@
+ #include "contactlistmodel.h"
+ 
+ class ContactListItemMenu;
++class PsiAccount;
+ 
+ class ContactListItem : public QObject
+ {
+ public:
+-	ContactListItem(QObject* parent = 0);
++	ContactListItem(PsiAccount *account, QObject* parent = 0);
+ 	virtual ~ContactListItem();
+ 
+ 	virtual ContactListModel::Type type() const = 0;
+@@ -58,8 +59,11 @@ public:
+ 	virtual bool editing() const;
+ 	virtual void setEditing(bool editing);
+ 
++	PsiAccount *account() const;
++
+ private:
+-	bool editing_;
++	class Private;
++	Private *d;
+ };
+ 
+ #endif
+--- git.temp.orig/src/contactlistitemproxy.cpp
++++ git.temp/src/contactlistitemproxy.cpp
+@@ -19,19 +19,41 @@
+  */
+ 
+ #include "contactlistitemproxy.h"
+-
+ #include "contactlistgroup.h"
+ #include "contactlistmodel.h"
+ 
++#include <QPointer>
++
++class ContactListItemProxy::Private
++{
++public:
++	QPointer<ContactListItem> item;
++	QPointer<ContactListGroup> parent;
++};
++
+ ContactListItemProxy::ContactListItemProxy(ContactListGroup* parent, ContactListItem* item)
+-	: item_(item)
+-	, parent_(parent)
++	: d(new ContactListItemProxy::Private)
+ {
+ 	Q_ASSERT(item);
+ 	Q_ASSERT(parent);
++
++	d->item = item;
++	d->parent = parent;
++
+ 	parent->model()->contactListItemProxyCreated(this);
+ }
+ 
+ ContactListItemProxy::~ContactListItemProxy()
+ {
++	delete d;
++}
++
++ContactListItem *ContactListItemProxy::item() const
++{
++	return d->item;
++}
++
++ContactListGroup *ContactListItemProxy::parent() const
++{
++	return d->parent;
+ }
+--- git.temp.orig/src/contactlistitemproxy.h
++++ git.temp/src/contactlistitemproxy.h
+@@ -22,7 +22,6 @@
+ #define CONTACTLISTITEMPROXY_H
+ 
+ #include <QObject>
+-#include <QPointer>
+ 
+ class ContactListItem;
+ class ContactListGroup;
+@@ -33,12 +32,12 @@ public:
+ 	ContactListItemProxy(ContactListGroup* parent, ContactListItem* item);
+ 	~ContactListItemProxy();
+ 
+-	ContactListItem* item() const { return item_; }
+-	ContactListGroup* parent() const { return parent_; }
++	ContactListItem *item() const;
++	ContactListGroup *parent() const;
+ 
+ private:
+-	QPointer<ContactListItem> item_;
+-	QPointer<ContactListGroup> parent_;
++	class Private;
++	Private *d;
+ };
+ 
+ #endif
+--- git.temp.orig/src/contactlistmodel.cpp
++++ git.temp/src/contactlistmodel.cpp
+@@ -68,6 +68,7 @@ ContactListModel::ContactListModel(PsiCo
+ 	connect(updater_, SIGNAL(contactGroupsChanged(PsiContact*)), SLOT(contactGroupsChanged(PsiContact*)));
+ 	connect(updater_, SIGNAL(beginBulkContactUpdate()), SLOT(beginBulkUpdate()));
+ 	connect(updater_, SIGNAL(endBulkContactUpdate()), SLOT(endBulkUpdate()));
++	connect(updater_, SIGNAL(groupsDelimiterChanged()), SLOT(invalidateLayout()));
+ 	connect(contactList_, SIGNAL(destroying()), SLOT(destroyingContactList()));
+ 	connect(contactList_, SIGNAL(showOfflineChanged(bool)), SIGNAL(showOfflineChanged()));
+ 	connect(contactList_, SIGNAL(showHiddenChanged(bool)), SIGNAL(showHiddenChanged()));
+@@ -118,9 +119,9 @@ ContactListGroup* ContactListModel::crea
+ 		return new ContactListAccountGroup(this, 0, 0);
+ 
+ 	if (!groupsEnabled_)
+-		return new ContactListGroup(this, 0);
++		return new ContactListGroup(this, 0, 0);
+ 
+-	return new ContactListNestedGroup(this, 0, QString());
++	return new ContactListNestedGroup(this, 0, 0, QString());
+ }
+ 
+ bool ContactListModel::groupsEnabled() const
+@@ -645,10 +646,24 @@ bool ContactListModel::setData(const QMo
+ 			//}
+ 		}
+ 		else if ((group = dynamic_cast<ContactListGroup*>(item->item()))) {
++			bool hasGroupsDelimiter = group->hasGroupsDelimiter();
++			QString groupsDelimiter = group->groupsDelimiter();
+ 			if (name.isEmpty()) {
+ 				QMessageBox::information(0, tr("Error"), tr("You can't set a blank group name."));
+ 				return false;
+ 			}
++			else if (hasGroupsDelimiter && name.startsWith(groupsDelimiter)) {
++				QMessageBox::information(0, tr("Error"), tr("You can't use delimiter in the begin of group name."));
++				return false;
++			}
++			else if (hasGroupsDelimiter && name.endsWith(groupsDelimiter)) {
++				QMessageBox::information(0, tr("Error"), tr("You can't use delimiter in the end of group name."));
++				return false;
++			}
++			else if (hasGroupsDelimiter && name.split(groupsDelimiter).contains("")) {
++				QMessageBox::information(0, tr("Error"), tr("You can't use repeating delimiter in the group name."));
++				return false;
++			}
+ 			// else {
+ 				// // make sure we don't have it already
+ 				// if (group->account()->groupList().contains(name)) {
+@@ -850,7 +865,7 @@ PsiAccount* ContactListModel::account(co
+ {
+ 	ContactListItemProxy* item = itemProxy(index);
+ 	if (item) {
+-		PsiContact* contact = dynamic_cast<PsiContact*>(item->item());
++		ContactListItem *contact = item->item();
+ 		if (contact)
+ 			return contact->account();
+ 	}
+--- git.temp.orig/src/contactlistmodel.h
++++ git.temp/src/contactlistmodel.h
+@@ -27,13 +27,14 @@
+ #include <QHash>
+ #include <QPointer>
+ 
++#include "contactlistitemproxy.h"
++
+ class PsiAccount;
+ class PsiContact;
+ class PsiContactList;
+ class ContactListItem;
+ class ContactListGroup;
+ class ContactListAccountGroup;
+-class ContactListItemProxy;
+ class ContactListGroupState;
+ class ContactListGroupCache;
+ class ContactListModelUpdater;
+@@ -116,7 +117,6 @@ public:
+ 
+ 	virtual PsiContactList* contactList() const;
+ 
+-	void invalidateLayout();
+ 	ContactListItemProxy* modelIndexToItemProxy(const QModelIndex& index) const;
+ 	QModelIndex itemProxyToModelIndex(ContactListItemProxy* item) const;
+ 	QModelIndex itemProxyToModelIndex(ContactListItemProxy* item, int index) const;
+@@ -195,6 +195,7 @@ signals:
+ public slots:
+ 	void expanded(const QModelIndex&);
+ 	void collapsed(const QModelIndex&);
++	void invalidateLayout();
+ 
+ protected slots:
+ 	void addContact(PsiContact*);
+--- git.temp.orig/src/contactlistmodelupdater.cpp
++++ git.temp/src/contactlistmodelupdater.cpp
+@@ -42,6 +42,7 @@ ContactListModelUpdater::ContactListMode
+ 	connect(contactList_, SIGNAL(removedContact(PsiContact*)), SLOT(removeContact(PsiContact*)));
+ 	connect(contactList_, SIGNAL(beginBulkContactUpdate()), SLOT(beginBulkUpdate()));
+ 	connect(contactList_, SIGNAL(endBulkContactUpdate()), SLOT(endBulkUpdate()));
++	connect(contactList_, SIGNAL(groupsDelimiterChanged()), SIGNAL(groupsDelimiterChanged()));
+ }
+ 
+ ContactListModelUpdater::~ContactListModelUpdater()
+--- git.temp.orig/src/contactlistmodelupdater.h
++++ git.temp/src/contactlistmodelupdater.h
+@@ -51,6 +51,7 @@ signals:
+ 	void contactAnim(PsiContact*);
+ 	void contactUpdated(PsiContact*);
+ 	void contactGroupsChanged(PsiContact*);
++	void groupsDelimiterChanged();
+ 
+ 	void beginBulkContactUpdate();
+ 	void endBulkContactUpdate();
+--- git.temp.orig/src/contactlistnestedgroup.cpp
++++ git.temp/src/contactlistnestedgroup.cpp
+@@ -26,8 +26,8 @@
+ #include "contactlistitemproxy.h"
+ #include "contactlistspecialgroup.h"
+ 
+-ContactListNestedGroup::ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, QString name)
+-	: ContactListGroup(model, parent)
++ContactListNestedGroup::ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account, QString name)
++	: ContactListGroup(model, parent, account)
+ {
+ 	quietSetName(name);
+ }
+@@ -82,12 +82,8 @@ void ContactListNestedGroup::addContact(
+ 			ContactListGroup::addContact(contact, contactGroups);
+ 		}
+ 		else {
+-			QStringList nestedGroups;
+-#ifdef CONTACTLIST_NESTED_GROUPS
+-			nestedGroups = groupName.split(groupDelimiter());
+-#else
+-			nestedGroups += groupName;
+-#endif
++			QStringList nestedGroups = toNestedGroups(sanitizeGroupName(groupName));
++
+ 			if (!name().isEmpty()) {
+ 				QString firstPart = nestedGroups.takeFirst();
+ 				Q_ASSERT(firstPart == name());
+@@ -97,13 +93,13 @@ void ContactListNestedGroup::addContact(
+ 
+ 			ContactListGroup* group = findGroup(nestedGroups.first());
+ 			if (!group) {
+-				group = new ContactListNestedGroup(model(), this, nestedGroups.first());
++				group = new ContactListNestedGroup(model(), this, contact->account(), nestedGroups.first());
+ 				addGroup(group);
+ CL_DEBUG("ContactListNextedGroup(%x)::addContact: %s", this, qPrintable(group->fullName()));
+ 			}
+ 
+ 			QStringList moreGroups;
+-			moreGroups << nestedGroups.join(groupDelimiter());
++			moreGroups << fromNestedGroups(nestedGroups);
+ 			group->addContact(contact, moreGroups);
+ 		}
+ 	}
+@@ -172,11 +168,8 @@ void ContactListNestedGroup::contactGrou
+ 		}
+ 
+ 		QStringList split;
+-#ifdef CONTACTLIST_NESTED_GROUPS
+-		split = group.split(groupDelimiter());
+-#else
+-		split += group;
+-#endif
++		split = toNestedGroups(group);
++
+ 		if (!name().isEmpty()) {
+ 			QString firstPart = split.takeFirst();
+ 			// hmm, probably should continue as the data should be invalid
+@@ -202,14 +195,10 @@ void ContactListNestedGroup::contactGrou
+ 		QStringList mergedGroupNames;
+ 		foreach(QStringList i, splitGroupNames)
+ 			if (!i.isEmpty() && i.first() == split.first())
+-				mergedGroupNames += i.join(groupDelimiter());
++				mergedGroupNames += fromNestedGroups(i);
+ 
+ 		foreach(QString i, mergedGroupNames) {
+-#ifdef CONTACTLIST_NESTED_GROUPS
+-			splitGroupNames.removeAll(i.split(groupDelimiter()));
+-#else
+-			splitGroupNames.removeAll(QStringList() << i);
+-#endif
++			splitGroupNames.removeAll(toNestedGroups(i));
+ 		}
+ 
+ 		group->contactGroupsChanged(contact, mergedGroupNames);
+@@ -249,7 +238,7 @@ CL_DEBUG("ContactListNextedGroup(%x)::co
+ 			fullGroupName << name();
+ 		fullGroupName += split;
+ 		QStringList tmp;
+-		tmp << fullGroupName.join(groupDelimiter());
++		tmp << fromNestedGroups(fullGroupName);
+ 		addContact(contact, tmp);
+ 	}
+ 
+@@ -269,14 +258,14 @@ CL_DEBUG("ContactListNextedGroup(%x)::co
+ #else
+ 	QStringList newNestedGroups = fullName().isEmpty()
+ 	                              ? contactGroups
+-	                              : contactGroups.filter(QRegExp(QString("^%1($|%2)").arg(fullName(), groupDelimiter())));
++	                              : contactGroups.filter(QRegExp(QString("^%1($|%2)").arg(fullName(), groupsDelimiter())));
+ 
+ 	QStringList directChildren;
+ 	foreach(QString nnGroup, newNestedGroups) {
+-		QString unqualifiedName = nnGroup.mid(QString(fullName().isEmpty() ? "" : fullName() + groupDelimiter()).length());
++		QString unqualifiedName = nnGroup.mid(QString(fullName().isEmpty() ? "" : fullName() + groupsDelimiter()).length());
+ 		if (!unqualifiedName.isEmpty()) {
+ 			// direct children!
+-			directChildren << QString(name().isEmpty() ? "" : name() + groupDelimiter()) + unqualifiedName;
++			directChildren << QString(name().isEmpty() ? "" : name() + groupsDelimiter()) + unqualifiedName;
+ 		}
+ 	}
+ 
+--- git.temp.orig/src/contactlistnestedgroup.h
++++ git.temp/src/contactlistnestedgroup.h
+@@ -27,7 +27,7 @@ class ContactListNestedGroup : public Co
+ {
+ 	Q_OBJECT
+ public:
+-	ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, QString name);
++	ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account, QString name);
+ 	~ContactListNestedGroup();
+ 
+ 	virtual bool canContainSpecialGroups() const;
+--- git.temp.orig/src/contactlistspecialgroup.cpp
++++ git.temp/src/contactlistspecialgroup.cpp
+@@ -24,7 +24,7 @@
+ #include <QStringList>
+ 
+ ContactListSpecialGroup::ContactListSpecialGroup(ContactListModel* model, ContactListGroup* parent, ContactListGroup::SpecialType type)
+-	: ContactListNestedGroup(model, parent, QString())
++	: ContactListNestedGroup(model, parent, 0, QString())
+ 	, specialType_(type)
+ {
+ 	name_ = QString::fromUtf8("☣special_group_");
+--- /dev/null
++++ git.temp/src/creategroup.ui
+@@ -0,0 +1,159 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ui version="4.0">
++ <class>CreateGroupDlg</class>
++ <widget class="QDialog" name="CreateGroupDlg">
++  <property name="geometry">
++   <rect>
++    <x>0</x>
++    <y>0</y>
++    <width>360</width>
++    <height>250</height>
++   </rect>
++  </property>
++  <property name="windowTitle">
++   <string>Create New Group</string>
++  </property>
++  <layout class="QVBoxLayout" name="verticalLayout">
++   <item>
++    <widget class="QLabel" name="label">
++     <property name="text">
++      <string>Choose parent group: </string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <widget class="QTreeWidget" name="twGroups">
++     <attribute name="headerVisible">
++      <bool>false</bool>
++     </attribute>
++     <column>
++      <property name="text">
++       <string notr="true">1</string>
++      </property>
++     </column>
++    </widget>
++   </item>
++   <item>
++    <widget class="QLabel" name="label_2">
++     <property name="text">
++      <string>Enter the new group name:</string>
++     </property>
++    </widget>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout">
++     <item>
++      <widget class="QLineEdit" name="lneGroupName"/>
++     </item>
++     <item>
++      <widget class="QPushButton" name="btnAddGroup">
++       <property name="text">
++        <string>Add</string>
++       </property>
++      </widget>
++     </item>
++    </layout>
++   </item>
++   <item>
++    <widget class="QDialogButtonBox" name="buttonBox">
++     <property name="orientation">
++      <enum>Qt::Horizontal</enum>
++     </property>
++     <property name="standardButtons">
++      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
++     </property>
++    </widget>
++   </item>
++  </layout>
++ </widget>
++ <tabstops>
++  <tabstop>buttonBox</tabstop>
++ </tabstops>
++ <resources/>
++ <connections>
++  <connection>
++   <sender>buttonBox</sender>
++   <signal>accepted()</signal>
++   <receiver>CreateGroupDlg</receiver>
++   <slot>accept()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>227</x>
++     <y>222</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>157</x>
++     <y>249</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>buttonBox</sender>
++   <signal>rejected()</signal>
++   <receiver>CreateGroupDlg</receiver>
++   <slot>reject()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>295</x>
++     <y>228</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>286</x>
++     <y>249</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>btnAddGroup</sender>
++   <signal>clicked()</signal>
++   <receiver>CreateGroupDlg</receiver>
++   <slot>addGroup()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>313</x>
++     <y>180</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>361</x>
++     <y>166</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>lneGroupName</sender>
++   <signal>textChanged(QString)</signal>
++   <receiver>CreateGroupDlg</receiver>
++   <slot>checkGroupName()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>149</x>
++     <y>188</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>356</x>
++     <y>126</y>
++    </hint>
++   </hints>
++  </connection>
++  <connection>
++   <sender>twGroups</sender>
++   <signal>currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)</signal>
++   <receiver>CreateGroupDlg</receiver>
++   <slot>checkGroupName()</slot>
++   <hints>
++    <hint type="sourcelabel">
++     <x>94</x>
++     <y>78</y>
++    </hint>
++    <hint type="destinationlabel">
++     <x>360</x>
++     <y>72</y>
++    </hint>
++   </hints>
++  </connection>
++ </connections>
++ <slots>
++  <slot>checkGroupName()</slot>
++  <slot>addGroup()</slot>
++ </slots>
++</ui>
+--- /dev/null
++++ git.temp/src/creategroupdlg.cpp
+@@ -0,0 +1,207 @@
++/*
++ * creategroupdlg.cpp
++ * Copyright (C) 2014  Ivan Romanov <drizt@land.ru>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include "ui_creategroup.h"
++#include "creategroupdlg.h"
++#include "psicontact.h"
++#include "userlist.h"
++#include "psiaccount.h"
++
++#include <QPushButton>
++#include <QTreeWidgetItem>
++#include <QList>
++#include <QRegExp>
++
++class CreateGroupDlg::Private
++{
++public:
++	CreateGroupDlg *q;
++	Ui::CreateGroupDlg *ui;
++	PsiContact *contact;
++
++	QString fullGroupName()
++	{
++		QStringList groupNameList;
++		groupNameList << ui->lneGroupName->text();
++
++		QTreeWidgetItem *item = ui->twGroups->currentItem();
++		if (item != ui->twGroups->topLevelItem(0)) {
++			while (item != 0) {
++				groupNameList.prepend(item->text(0));
++				item = item->parent();
++			}
++		}
++
++		QString groupsDelimiter = contact->account()->userList()->groupsDelimiter();
++
++		return groupNameList.join(groupsDelimiter);
++	}
++};
++
++CreateGroupDlg::CreateGroupDlg(PsiContact *contact, QWidget *parent)
++	: QDialog(parent)
++	, d(new CreateGroupDlg::Private)
++{
++	d->q = this;
++	d->ui = new Ui::CreateGroupDlg;
++	d->ui->setupUi(this);
++	d->ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
++	d->ui->btnAddGroup->setEnabled(false);
++	d->contact = contact;
++
++	// Fill groups tree
++	bool hasGroupsDelimiter = d->contact->account()->userList()->hasGroupsDelimiter();
++
++	QList<QTreeWidgetItem *> items;
++	items << new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("<None>")));
++
++	// Show only <None> if no delimiter
++	if (hasGroupsDelimiter) {
++		QString groupsDelimiter = d->contact->account()->userList()->groupsDelimiter();
++		QStringList groupList = d->contact->account()->groupList();
++		groupList.removeAll("");
++		groupList.removeAll(PsiContact::hiddenGroupName());
++		foreach (const QString &groupName, groupList) {
++			QStringList subGroupList = groupName.split(groupsDelimiter);
++
++			QTreeWidgetItem *parentItem = 0;
++			foreach (const QString &subGroupName, subGroupList) {
++				QList<QTreeWidgetItem*> children;
++				if (parentItem) {
++					for (int i = 0; i < parentItem->childCount(); i++)
++						children << parentItem->child(i);
++				}
++				else {
++					children = items;
++				}
++
++				bool needCreateItem = true;
++
++				for (int i = 0; i < children.length(); i++) {
++					if (children.at(i)->text(0) == subGroupName) {
++						parentItem = children.at(i);
++						needCreateItem = false;
++						break;
++					}
++				}
++
++				if (needCreateItem) {
++					parentItem = new QTreeWidgetItem(parentItem, QStringList(subGroupName));
++					items << parentItem;
++				}
++			}
++		}
++	}
++	d->ui->twGroups->insertTopLevelItems(0, items);
++	d->ui->twGroups->setCurrentItem(items.at(0));
++	d->ui->lneGroupName->setFocus();
++}
++
++CreateGroupDlg::~CreateGroupDlg()
++{
++	delete d->ui;
++	delete d;
++}
++
++void CreateGroupDlg::accept()
++{
++	QDialog::accept();
++	d->contact->setGroups(QStringList() << d->fullGroupName());
++}
++
++void CreateGroupDlg::checkGroupName()
++{
++	bool ok;
++	QString groupName = d->fullGroupName();
++
++	// Subgroup name can't be empty
++	ok = !d->ui->lneGroupName->text().isEmpty();
++
++	QString groupsDelimiter = d->contact->account()->userList()->groupsDelimiter();
++	bool hasGroupsDelimiter = d->contact->account()->userList()->hasGroupsDelimiter();
++	QString subGroupName = d->ui->lneGroupName->text();
++
++	// Subgroup name can't start or end with delimiter
++	// or has repeated delimiters
++	if (hasGroupsDelimiter &&
++		(subGroupName.split(groupsDelimiter)).contains("")) {
++
++		ok = false;
++	}
++
++	// Contact is not added to this group
++	if (ok) {
++		ok = !d->contact->userListItem().groups().contains(groupName);
++	}
++
++	d->ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
++
++	// Can't create subgroup if no delimiter
++	if (ok) {
++		ok = hasGroupsDelimiter;
++	}
++
++	// Can't create subgroup with delimiter
++	if (ok) {
++		ok = !subGroupName.contains(groupsDelimiter);
++	}
++
++	// No such subgroup
++	if (ok) {
++		QTreeWidgetItem *item = d->ui->twGroups->currentItem();
++		QList<QTreeWidgetItem*> children;
++
++		if (item == d->ui->twGroups->topLevelItem(0)) {
++			for (int i = 1; i < d->ui->twGroups->topLevelItemCount(); i++)
++				children << d->ui->twGroups->topLevelItem(i);
++		}
++		else {
++			for (int i = 0; i < item->childCount(); i++)
++				children << item->child(i);
++		}
++
++		for (int i = 0; i < children.length(); i++) {
++			if (children.at(i)->text(0) == subGroupName) {
++				ok = false;
++				break;
++			}
++		}
++	}
++	d->ui->btnAddGroup->setEnabled(ok);
++}
++
++void CreateGroupDlg::addGroup()
++{
++	QTreeWidgetItem *item = d->ui->twGroups->currentItem();
++	QString subGroupName = d->ui->lneGroupName->text();
++
++	if (item == d->ui->twGroups->topLevelItem(0)) {
++		item = 0;
++		item = new QTreeWidgetItem(item, QStringList(subGroupName));
++		d->ui->twGroups->addTopLevelItem(item);
++	}
++	else {
++		item = new QTreeWidgetItem(item, QStringList(subGroupName));
++	}
++	d->ui->twGroups->setCurrentItem(item);
++
++	d->ui->lneGroupName->setText("");
++	d->ui->lneGroupName->setFocus();
++}
+--- /dev/null
++++ git.temp/src/creategroupdlg.h
+@@ -0,0 +1,46 @@
++/*
++ * creategroupdlg.h
++ * Copyright (C) 2014  Ivan Romanov <drizt@land.ru>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef CREATEGROUPDLG_H
++#define CREATEGROUPDLG_H
++
++#include <QDialog>
++
++class PsiContact;
++
++class CreateGroupDlg : public QDialog
++{
++	Q_OBJECT
++
++public:
++	CreateGroupDlg(PsiContact *contact, QWidget *parent = 0);
++	~CreateGroupDlg();
++
++public slots:
++	void accept();
++	void checkGroupName();
++	void addGroup();
++
++private:
++	class Private;
++	Private *d;
++};
++
++#endif // CREATEGROUPDLG_H
+--- git.temp.orig/src/psi_profiles.cpp
++++ git.temp/src/psi_profiles.cpp
+@@ -302,6 +302,8 @@ void UserAccount::fromOptions(OptionsTre
+ 		allow_plain = XMPP::ClientStream::NoAllowPlain;
+ 	}
+ 
++	roster.setGroupsDelimiter(o->getOption(base + ".roster-cache-groups-delimiter").toString());
++
+ 	QStringList rosterCache = o->getChildOptionNames(base + ".roster-cache", true, true);
+ 	foreach(QString rbase, rosterCache) {
+ 		RosterItem ri;
+@@ -439,6 +441,8 @@ void UserAccount::toOptions(OptionsTree
+ 			qFatal("unknown allow_plain enum value in UserAccount::toOptions");
+ 	}
+ 
++	o->setOption(base + ".roster-cache-groups-delimiter", roster.groupsDelimiter());
++
+ 	int idx = 0;
+ 	foreach(RosterItem ri, roster) {
+ 		QString rbase = base + ".roster-cache.a" + QString::number(idx++);
+--- git.temp.orig/src/psiaccount.cpp
++++ git.temp/src/psiaccount.cpp
+@@ -23,7 +23,6 @@
+  *
+  */
+ 
+-
+ #include <QFileDialog>
+ #include <QSet>
+ #include <QInputDialog>
+@@ -1100,6 +1099,8 @@ PsiAccount::PsiAccount(const UserAccount
+ 	d->voiceCaller = 0;
+ 	d->blockTransportPopupList = new BlockTransportPopupList();
+ 
++	d->userList.setGroupsDelimiter(acc.roster.groupsDelimiter());
++
+ 	v_isActive = false;
+ 	isDisconnecting = false;
+ 	notifyOnlineOk = false;
+@@ -1168,6 +1169,7 @@ PsiAccount::PsiAccount(const UserAccount
+ 	//connect(d->client, SIGNAL(sslCertReady(const QSSLCert &)), SLOT(client_sslCertReady(const QSSLCert &)));
+ 	//connect(d->client, SIGNAL(closeFinished()), SLOT(client_closeFinished()));
+ 	//connect(d->client, SIGNAL(authFinished(bool, int, const QString &)), SLOT(client_authFinished(bool, int, const QString &)));
++	connect(d->client, SIGNAL(rosterGroupsDelimiterRequestFinished(const QString &)), SLOT(client_rosterRequestGroupsDelimiterFinished(const QString &)));
+ 	connect(d->client, SIGNAL(rosterRequestFinished(bool, int, const QString &)), SLOT(client_rosterRequestFinished(bool, int, const QString &)));
+ 	connect(d->client, SIGNAL(rosterItemAdded(const RosterItem &)), SLOT(client_rosterItemAdded(const RosterItem &)));
+ 	connect(d->client, SIGNAL(rosterItemAdded(const RosterItem &)), SLOT(client_rosterItemUpdated(const RosterItem &)));
+@@ -1508,6 +1510,7 @@ const UserAccount & PsiAccount::userAcco
+ 	// save the roster and pgp key bindings
+ 	d->acc.roster.clear();
+ 	d->acc.keybind.clear();
++	d->acc.roster.setGroupsDelimiter(d->userList.groupsDelimiter());
+ 	foreach(UserListItem* u, d->userList) {
+ 		if(u->inList())
+ 			d->acc.roster += *u;
+@@ -2321,6 +2324,24 @@ int PsiAccount::currentConnectionErrorCo
+ 	return d->currentConnectionErrorCondition;
+ }
+ 
++void PsiAccount::client_rosterRequestGroupsDelimiterFinished(const QString &groupsDelimiter)
++{
++	if (!groupsDelimiter.isEmpty()) {
++		d->userList.setGroupsDelimiter(groupsDelimiter);
++	}
++	else {
++		QString defaultGroupsDelimiter = PsiOptions::instance()->getOption("options.ui.contactlist.default-groups-delimiter").toString();
++
++		// Not empty delimiter can be set in options before login. Need to reset it in any case.
++		d->userList.setGroupsDelimiter(defaultGroupsDelimiter);
++
++		// Prevent excessed iq
++		if (!defaultGroupsDelimiter.isEmpty()) {
++			actionSetGroupsDelimiter(defaultGroupsDelimiter);
++		}
++	}
++}
++
+ void PsiAccount::client_rosterRequestFinished(bool success, int, const QString &)
+ {
+ 	if(success) {
+@@ -3474,6 +3495,35 @@ void PsiAccount::doDisco()
+ 	actionDisco(d->jid.domain(), "");
+ }
+ 
++void PsiAccount::changeGroupsDelimiter()
++{
++	if (!checkConnected()) {
++		return;
++	}
++
++	bool ok = false;
++	QString delimiter = d->account->userList()->groupsDelimiter();
++	delimiter = QInputDialog::getText(0,
++									  tr("Nested Groups Delimiter"),
++									  tr("Set a new delimiter of nested groups"),
++									  QLineEdit::Normal,
++									  delimiter,
++									  &ok);
++	if (!ok)
++		return;
++
++	actionSetGroupsDelimiter(delimiter);
++}
++
++void PsiAccount::disableGroupsDelimiter()
++{
++	if (!checkConnected()) {
++		return;
++	}
++
++	actionSetGroupsDelimiter("e");
++}
++
+ void PsiAccount::actionDisco(const Jid &j, const QString &node)
+ {
+ 	DiscoDlg *w = new DiscoDlg(this, j, node);
+@@ -3512,6 +3562,18 @@ void PsiAccount::featureActivated(QStrin
+ 	}
+ }
+ 
++void PsiAccount::actionSetGroupsDelimiter(const QString &groupsDelimiter)
++{
++	if (d->userList.groupsDelimiter() != groupsDelimiter) {
++		d->userList.setGroupsDelimiter(groupsDelimiter);
++		emit groupsDelimiterChanged();
++	}
++
++	JT_Roster *r = new JT_Roster(d->client->rootTask());
++	r->setGroupsDelimiter(groupsDelimiter);
++	r->go(true);
++}
++
+ void PsiAccount::actionManageBookmarks()
+ {
+ 	BookmarkManageDlg *dlg = findDialog<BookmarkManageDlg*>();
+--- git.temp.orig/src/psiaccount.h
++++ git.temp/src/psiaccount.h
+@@ -207,6 +207,8 @@ public:
+ 	void changePW();
+ 	void changeStatus(int, bool forceDialog = false);
+ 	void doDisco();
++	void changeGroupsDelimiter();
++	void disableGroupsDelimiter();
+ 
+ 	void showXmlConsole();
+ 	void openAddUserDlg();
+@@ -302,6 +304,7 @@ signals:
+ 	void encryptedMessageSent(int, bool, int, const QString &);
+ 	void enabledChanged();
+ 	void startBounce();
++	void groupsDelimiterChanged();
+ 
+ public slots:
+ 	void setStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
+@@ -391,6 +394,7 @@ public slots:
+ 	void actionUnsetAvatar();
+ 	void actionQueryVersion(const Jid& j);
+ 	void featureActivated(QString feature, Jid jid, QString node);
++	void actionSetGroupsDelimiter(const QString &groupsDelimiter);
+ 
+ 	void actionAssignKey(const Jid &);
+ 	void actionUnassignKey(const Jid &);
+@@ -410,6 +414,7 @@ private slots:
+ 	void cs_delayedCloseFinished();
+ 	void cs_warning(int);
+ 	void cs_error(int);
++	void client_rosterRequestGroupsDelimiterFinished(const QString &groupsDelimiter);
+ 	void client_rosterRequestFinished(bool, int, const QString &);
+ 	void resolveContactName();
+ 	void client_rosterItemAdded(const RosterItem &);
+--- git.temp.orig/src/psicontact.cpp
++++ git.temp/src/psicontact.cpp
+@@ -63,8 +63,7 @@ class PsiContact::Private : public Alert
+ 	Q_OBJECT
+ public:
+ 	Private(PsiContact* contact)
+-		: account_(0)
+-		, statusTimer_(0)
++		: statusTimer_(0)
+ 		, isValid_(true)
+ 		, isAnimated_(false)
+ 		, isAlwaysVisible_(false)
+@@ -100,7 +99,6 @@ public:
+ 	{
+ 	}
+ 
+-	PsiAccount* account_;
+ 	QTimer* statusTimer_;
+ 	QTimer* animTimer_;
+ 	UserListItem u_;
+@@ -140,7 +138,7 @@ public:
+ #ifdef YAPSI
+ 		reconnecting_ = false;
+ #endif
+-		if (account_ && !account_->notifyOnline())
++		if (contact_->account() && !contact_->account()->notifyOnline())
+ 			oldStatus_ = status_;
+ 		else
+ 			statusTimer_->start();
+@@ -164,12 +162,11 @@ private:
+  * Creates new PsiContact.
+  */
+ PsiContact::PsiContact(const UserListItem& u, PsiAccount* account)
+-	: ContactListItem(account)
++	: ContactListItem(account, account)
+ {
+ 	d = new Private(this);
+-	d->account_ = account;
+-	if (d->account_) {
+-		connect(d->account_->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
++	if (account) {
++		connect(account->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
+ 	}
+ 	connect(VCardFactory::instance(), SIGNAL(vcardChanged(const Jid&)), SLOT(vcardChanged(const Jid&)));
+ 	update(u);
+@@ -178,10 +175,9 @@ PsiContact::PsiContact(const UserListIte
+ }
+ 
+ PsiContact::PsiContact()
+-	: ContactListItem(0)
++	: ContactListItem(0, 0)
+ {
+ 	d = new Private(this);
+-	d->account_ = 0;
+ }
+ 
+ /**
+@@ -195,14 +191,6 @@ PsiContact::~PsiContact()
+ }
+ 
+ /**
+- * Returns account to which a contact belongs.
+- */
+-PsiAccount* PsiContact::account() const
+-{
+-	return d->account_;
+-}
+-
+-/**
+  * TODO: Think of ways to remove this function.
+  */
+ const UserListItem& PsiContact::userListItem() const
+--- git.temp.orig/src/psicontact.h
++++ git.temp/src/psicontact.h
+@@ -45,7 +45,6 @@ public:
+ 	PsiContact(const UserListItem& u, PsiAccount* account);
+ 	~PsiContact();
+ 
+-	PsiAccount* account() const;
+ 	const UserListItem& userListItem() const;
+ 	const UserResourceList& userResourceList() const;
+ 	virtual void update(const UserListItem& u);
+--- git.temp.orig/src/psicontactlist.cpp
++++ git.temp/src/psicontactlist.cpp
+@@ -315,6 +315,7 @@ void PsiContactList::link(PsiAccount* ac
+ 	connect(account, SIGNAL(beginBulkContactUpdate()), this, SIGNAL(beginBulkContactUpdate()));
+ 	connect(account, SIGNAL(endBulkContactUpdate()), this, SIGNAL(endBulkContactUpdate()));
+ 	connect(account, SIGNAL(rosterRequestFinished()), this, SIGNAL(rosterRequestFinished()));
++	connect(account, SIGNAL(groupsDelimiterChanged()), this, SIGNAL(groupsDelimiterChanged()));
+ 	accounts_.append(account);
+ 	if (account->enabled())
+ 		addEnabledAccount(account);
+--- git.temp.orig/src/psicontactlist.h
++++ git.temp/src/psicontactlist.h
+@@ -99,6 +99,7 @@ signals:
+ 	void beginBulkContactUpdate();
+ 	void endBulkContactUpdate();
+ 	void rosterRequestFinished();
++	void groupsDelimiterChanged();
+ 
+ 	/**
+ 	 * This signal is emitted when account is loaded from disk or created
+--- git.temp.orig/src/psicontactmenu.cpp
++++ git.temp/src/psicontactmenu.cpp
+@@ -50,6 +50,7 @@
+ #endif
+ 
+ #include "groupchatdlg.h"
++#include "creategroupdlg.h"
+ 
+ //----------------------------------------------------------------------------
+ // GroupMenu
+@@ -130,23 +131,8 @@ private slots:
+ 
+ 	void createNewGroup()
+ 	{
+-		while (contact_) {
+-			bool ok = false;
+-			QString newgroup = QInputDialog::getText(0, tr("Create New Group"),
+-			                   tr("Enter the new group name:"),
+-			                   QLineEdit::Normal,
+-			                   QString::null,
+-			                   &ok, 0);
+-			if (!ok)
+-				break;
+-			if (newgroup.isEmpty())
+-				continue;
+-
+-			if (!contact_->userListItem().groups().contains(newgroup)) {
+-				emit groupActivated(newgroup);
+-				break;
+-			}
+-		}
++		CreateGroupDlg dlg(contact_);
++		dlg.exec();
+ 	}
+ };
+ 
+--- git.temp.orig/src/src.pri
++++ git.temp/src/src.pri
+@@ -214,7 +214,8 @@ HEADERS += \
+ 	$$PWD/coloropt.h \
+ 	$$PWD/geolocationdlg.h \
+ 	$$PWD/rosteravatarframe.h \
+-	$$PWD/sendbuttonmenu.h
++	$$PWD/sendbuttonmenu.h \
++	$$PWD/creategroupdlg.h
+ 
+ 
+ 
+@@ -357,7 +358,8 @@ SOURCES += \
+ 	$$PWD/coloropt.cpp \
+ 	$$PWD/geolocationdlg.cpp \
+ 	$$PWD/rosteravatarframe.cpp \
+-	$$PWD/sendbuttonmenu.cpp
++	$$PWD/sendbuttonmenu.cpp \
++	$$PWD/creategroupdlg.cpp
+ 
+ unix:!macx:!haiku {
+ 	HEADERS += $$PWD/x11windowsystem.h
+@@ -452,7 +454,6 @@ mac {
+ CONFIG += newcontactlist
+ newcontactlist {
+ 	DEFINES += NEWCONTACTLIST
+-	# DEFINES += CONTACTLIST_NESTED_GROUPS
+ 	HEADERS += \
+ 		$$PWD/contactlistview.h \
+ 		$$PWD/contactlistdragview.h \
+@@ -600,7 +601,8 @@ FORMS += \
+ 	$$PWD/ahcformdlg.ui \
+ 	$$PWD/geolocation.ui \
+ 	$$PWD/rosteravatarframe.ui \
+-	$$PWD/sendbuttontemplateseditor.ui
++	$$PWD/sendbuttontemplateseditor.ui \
++	$$PWD/creategroup.ui
+ 
+ # options dialog
+ include($$PWD/options/options.pri)
+--- git.temp.orig/src/userlist.cpp
++++ git.temp/src/userlist.cpp
+@@ -1178,3 +1178,17 @@ UserListItem *UserList::find(const XMPP:
+ 	return 0;
+ }
+ 
++void UserList::setGroupsDelimiter(const QString &groupsDelimiter)
++{
++	_groupsDelimiter = groupsDelimiter;
++}
++
++QString UserList::groupsDelimiter() const
++{
++	return _groupsDelimiter;
++}
++
++bool UserList::hasGroupsDelimiter() const
++{
++	return groupsDelimiter().indexOf(QRegExp("^[0-9A-Za-z]?$")) == -1;
++}
+--- git.temp.orig/src/userlist.h
++++ git.temp/src/userlist.h
+@@ -187,6 +187,16 @@ public:
+ 	~UserList();
+ 
+ 	UserListItem *find(const XMPP::Jid &);
++
++	void setGroupsDelimiter(const QString &groupsDelimiter);
++	QString groupsDelimiter() const;
++
++	// If the delimiter is a single alphanumeric character (a-z, A-Z, 0-9) or empty
++	// the situation treats as if nesting were disabled
++	bool hasGroupsDelimiter() const;
++
++private:
++	QString _groupsDelimiter;
+ };
+ 
+ #endif

psi-plus-main-20141106.tar.xz/patches/dev/psi-new-caps.patch Added

@@ -0,0 +1,852 @@
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_discoext.cpp
++++ psi/iris/src/xmpp/xmpp-im/xmpp_discoext.cpp
+@@ -0,0 +1,90 @@
++/*
++ * xmpp_discoext.cpp
++ * Copyright (C) 2013  Aleksey Andreev
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#include "xmpp_discoext.h"
++
++using namespace XMPP;
++
++DiscoExtension::DiscoExtension()
++	: XData()
++	, valid_(false)
++{
++}
++
++DiscoExtension::DiscoExtension(const QDomElement &e)
++	: XData()
++	, valid_(false)
++{
++	fromXml(e);
++}
++
++DiscoExtension::~DiscoExtension()
++{
++}
++
++void DiscoExtension::fromXml(const QDomElement &e)
++{
++	XData::fromXml(e);
++	valid_ = (XData::isValid() && type() == XData::Data_Result && !registrarType().isEmpty());
++}
++
++bool DiscoExtension::isValid() const
++{
++	return valid_;
++}
++
++const QString DiscoExtension::extensionType() const
++{
++	return registrarType();
++}
++
++DiscoExtList::DiscoExtList()
++{
++}
++
++DiscoExtList::~DiscoExtList()
++{
++}
++
++void DiscoExtList::addExtension(DiscoExtension *ext)
++{
++	list_[ext->extensionType()] = DiscoExtPointer(ext);
++}
++
++QStringList DiscoExtList::extensionValues(const QString &etype, const QString vname) const
++{
++	if (list_.contains(etype))
++	{
++		const DiscoExtPointer ext = list_.value(etype);
++		if (!ext.isNull() && ext->isValid())
++		{
++			const XData::Field f = ext->getField(vname);
++			if (f.isValid())
++				return f.value();
++		}
++	}
++	return QStringList();
++}
++
++QString DiscoExtList::extensionValue(const QString &etype, const QString vname) const
++{
++	QStringList vl = extensionValues(etype, vname);
++	return vl.value(0);
++}
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_discoext.h
++++ psi/iris/src/xmpp/xmpp-im/xmpp_discoext.h
+@@ -0,0 +1,63 @@
++/*
++ * xmpp_discoext.h
++ * Copyright (C) 2013  Aleksey Andreev
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ */
++
++#ifndef XMPP_DISCOEXT
++#define XMPP_DISCOEXT
++
++#include <QString>
++#include <QSharedPointer>
++
++#include "xmpp_xdata.h"
++
++namespace XMPP {
++
++	class DiscoExtension : public XData
++	{
++	public:
++		DiscoExtension();
++		DiscoExtension(const QDomElement &e);
++		~DiscoExtension();
++
++		void fromXml(const QDomElement &);
++		bool isValid() const;
++		const QString extensionType() const;
++
++	private:
++		bool valid_;
++	};
++
++	class DiscoExtList
++	{
++	public:
++		DiscoExtList();
++		~DiscoExtList();
++
++		void addExtension(DiscoExtension *ext);
++		QStringList extensionValues(const QString &etype, const QString vname) const;
++		QString extensionValue(const QString &etype, const QString vname) const;
++
++	private:
++		typedef QSharedPointer<DiscoExtension> DiscoExtPointer;
++		QMap<QString, DiscoExtPointer> list_;
++	};
++
++}
++
++#endif
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
++++ psi/iris/src/xmpp/xmpp-im/xmpp_discoinfotask.cpp
+@@ -23,6 +23,7 @@
+ #include "xmpp_task.h"
+ #include "xmpp/jid/jid.h"
+ #include "xmpp_discoitem.h"
++#include "xmpp_discoext.h"
+ #include "xmpp_discoinfotask.h"
+ #include "xmpp_xmlcommon.h"
+ 
+@@ -134,6 +135,7 @@ bool DiscoInfoTask::take(const QDomEleme
+ 
+ 		QStringList features;
+ 		DiscoItem::Identities identities;
++		DiscoExtList extList;
+ 
+ 		for(QDomNode n = q.firstChild(); !n.isNull(); n = n.nextSibling()) {
+ 			QDomElement e = n.toElement();
+@@ -152,10 +154,18 @@ bool DiscoInfoTask::take(const QDomEleme
+ 
+ 				identities.append( id );
+ 			}
++			else {
++				DiscoExtension *ext = new DiscoExtension(e);
++				if (ext->isValid())
++					extList.addExtension(ext);
++				else
++					delete ext;
++			}
+ 		}
+ 
+ 		item.setFeatures( features );
+ 		item.setIdentities( identities );
++		item.setExtensions( extList );
+ 
+ 		d->item = item;
+ 
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_discoitem.cpp
++++ psi/iris/src/xmpp/xmpp-im/xmpp_discoitem.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "xmpp_discoitem.h"
++#include "xmpp_discoext.h"
+ 
+ using namespace XMPP;
+ 
+@@ -37,6 +38,7 @@ public:
+ 
+ 	Features features;
+ 	Identities identities;
++	DiscoExtList exts;
+ };
+ 
+ DiscoItem::DiscoItem()
+@@ -58,6 +60,7 @@ DiscoItem & DiscoItem::operator= (const
+ 	d->action = from.d->action;
+ 	d->features = from.d->features;
+ 	d->identities = from.d->identities;
++	d->exts = from.d->exts;
+ 
+ 	return *this;
+ }
+@@ -167,6 +170,15 @@ void DiscoItem::setIdentities(const Iden
+ 		setName( i.first().name );
+ }
+ 
++const DiscoExtList &DiscoItem::extensions() const
++{
++	return d->exts;
++}
++
++void DiscoItem::setExtensions(const DiscoExtList &extlist)
++{
++	d->exts = extlist;
++}
+ 
+ DiscoItem::Action DiscoItem::string2action(QString s)
+ {
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_discoitem.h
++++ psi/iris/src/xmpp/xmpp-im/xmpp_discoitem.h
+@@ -25,6 +25,7 @@
+ 
+ #include "xmpp/jid/jid.h"
+ #include "xmpp_features.h"
++#include "xmpp_discoext.h"
+ #include "xmpp_agentitem.h"
+ 
+ namespace XMPP {
+@@ -66,6 +67,9 @@ namespace XMPP {
+ 		const Identities &identities() const;
+ 		void setIdentities(const Identities &);
+ 
++		const DiscoExtList &extensions() const;
++		void setExtensions(const DiscoExtList &extlist);
++
+ 		// some useful helper functions
+ 		static Action string2action(QString s);
+ 		static QString action2string(Action a);
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
++++ psi/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
+@@ -760,6 +760,7 @@ bool JT_PushPresence::take(const QDomEle
+  			p.setCapsNode(i.attribute("node"));
+  			p.setCapsVersion(i.attribute("ver"));
+  			p.setCapsExt(i.attribute("ext"));
++			p.setCapsHashAlgorithm(i.attribute("hash"));
+   		}
+ 		else if(i.tagName() == "x" && i.attribute("xmlns") == "vcard-temp:x:update") {
+ 			QDomElement t;
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_xdata.cpp
++++ psi/iris/src/xmpp/xmpp-im/xmpp_xdata.cpp
+@@ -431,6 +431,19 @@ XData::FieldList XData::fields() const
+ 	return d->fields;
+ }
+ 
++XData::Field XData::getField(const QString &var) const
++{
++	if ( !d->fields.isEmpty() ) {
++		FieldList::ConstIterator it = d->fields.begin();
++		for ( ; it != d->fields.end(); ++it) {
++			Field f = *it;
++			if (f.isValid() && f.var() == var)
++				return f;
++		}
++	}
++	return Field();
++}
++
+ void XData::setFields(const FieldList &f)
+ {
+ 	d->fields = f;
+--- psi.orig/iris/src/xmpp/xmpp-im/xmpp_xdata.h
++++ psi/iris/src/xmpp/xmpp-im/xmpp_xdata.h
+@@ -161,6 +161,7 @@ namespace XMPP {
+ 		typedef QList<Field> FieldList;
+ 
+ 		FieldList fields() const;
++		Field getField(const QString &var) const;
+ 		void setFields(const FieldList &);
+ 
+ 	private:
+--- psi.orig/iris/src/xmpp/xmpp.pri
++++ psi/iris/src/xmpp/xmpp.pri
+@@ -68,6 +68,7 @@ HEADERS += \
+ 	$$PWD/xmpp-im/xmpp_features.h \
+ 	$$PWD/xmpp-im/xmpp_agentitem.h \
+ 	$$PWD/xmpp-im/xmpp_discoitem.h \
++	$$PWD/xmpp-im/xmpp_discoext.h \
+ 	$$PWD/xmpp-im/xmpp_bitsofbinary.h \
+ 	$$PWD/xmpp-im/im.h
+ 
+@@ -86,6 +87,7 @@ SOURCES += \
+ 	$$PWD/xmpp-im/client.cpp \
+ 	$$PWD/xmpp-im/xmpp_features.cpp \
+ 	$$PWD/xmpp-im/xmpp_discoitem.cpp \
++	$$PWD/xmpp-im/xmpp_discoext.cpp \
+ 	$$PWD/xmpp-im/xmpp_discoinfotask.cpp \
+ 	$$PWD/xmpp-im/xmpp_xdata.cpp \
+ 	$$PWD/xmpp-im/xmpp_task.cpp \
+--- psi.orig/src/capabilities/capsmanager.cpp
++++ psi/src/capabilities/capsmanager.cpp
+@@ -87,20 +87,20 @@ void CapsManager::setEnabled(bool b)
+  * @param ver The entity's caps version
+  * @param ext The entity's caps extensions
+  */
+-void CapsManager::updateCaps(const Jid& jid, const QString& node, const QString& ver, const QString& ext)
++void CapsManager::updateCaps(const Jid& jid, const QString& node, const QString& ver, const QString& ext, const QString& hashAlgo)
+ {
+ 	if (jid.compare(jid_,false))
+ 		return;
+ 
+-	CapsSpec c(node,ver,ext);
+-	CapsSpecs caps = c.flatten();
++	CapsSpec c(node,ver,ext,hashAlgo);
++	QStringList nodes = c.flatten();
+ 	if (capsSpecs_[jid.full()] != c) {
+ 		//qDebug() << QString("caps.cpp: Updating caps for %1 (node=%2,ver=%3,ext=%4)").arg(QString(jid.full()).replace('%',"%%")).arg(node).arg(ver).arg(ext);
+ 
+ 		// Unregister from all old caps nodes
+-		CapsSpecs old_caps = capsSpecs_[jid.full()].flatten();
+-		foreach(CapsSpec s, old_caps) {
+-			if (s != CapsSpec()) {
++		QStringList old_nodes = capsSpecs_[jid.full()].flatten();
++		foreach(const QString &s, old_nodes) {
++			if (!s.isEmpty()) {
+ 				capsJids_[s].removeAll(jid.full());
+ 			}
+ 		}
+@@ -108,7 +108,7 @@ void CapsManager::updateCaps(const Jid&
+ 		if (!node.isEmpty() && !ver.isEmpty()) {
+ 			// Register with all new caps nodes
+ 			capsSpecs_[jid.full()] = c;
+-			foreach(CapsSpec s, caps) {
++			foreach(const QString &s, nodes) {
+ 				if (!capsJids_[s].contains(jid.full())) {
+ 					capsJids_[s].push_back(jid.full());
+ 				}
+@@ -118,10 +118,10 @@ void CapsManager::updateCaps(const Jid&
+ 
+ 			// Register new caps and check if we need to discover features
+ 			if (isEnabled()) {
+-				foreach(CapsSpec s, caps) {
++				foreach(const QString &s, nodes) {
+ 					if (!registry_->isRegistered(s) && capsJids_[s].count() == 1) {
+ 						//qDebug() << QString("caps.cpp: Sending disco request to %1, node=%2").arg(QString(jid.full()).replace('%',"%%")).arg(node + "#" + s.extensions());
+-						discoInfoQuerier_->getDiscoInfo(jid,node + '#' + s.extensions());
++						discoInfoQuerier_->getDiscoInfo(jid,s);
+ 					}
+ 				}
+ 			}
+@@ -134,7 +134,7 @@ void CapsManager::updateCaps(const Jid&
+ 	}
+ 	else {
+ 		// Add to the list of jids
+-		foreach(CapsSpec s, caps) {
++		foreach(const QString &s, nodes) {
+ 			capsJids_[s].push_back(jid.full());
+ 		}
+ 	}
+@@ -149,9 +149,9 @@ void CapsManager::disableCaps(const Jid&
+ {
+ 	//qDebug() << QString("caps.cpp: Disabling caps for %1.").arg(QString(jid.full()).replace('%',"%%"));
+ 	if (capsEnabled(jid)) {
+-		CapsSpecs cs = capsSpecs_[jid.full()].flatten();
+-		foreach(CapsSpec s, cs) {
+-			if (s != CapsSpec()) {
++		QStringList nodes = capsSpecs_[jid.full()].flatten();
++		foreach(const QString &s, nodes) {
++			if (!s.isEmpty()) {
+ 				capsJids_[s].removeAll(jid.full());
+ 			}
+ 		}
+@@ -175,7 +175,7 @@ void CapsManager::getDiscoInfo_success(c
+ 	if (!ok) {
+ 		return;
+ 	}
+-	registry_->registerCaps(cs,item.identities(),item.features().list());
++	registry_->registerCaps(cs,item.identities(),item.features().list(),item.extensions());
+ }
+ 
+ void CapsManager::getDiscoInfo_error(const XMPP::Jid& jid, const QString& node, int, const QString&)
+@@ -193,11 +193,11 @@ CapsSpec CapsManager::getCapsSpecForNode
+ 		return CapsSpec();
+     }
+ 	QString node = disco_node.left(hash_index);
+-	QString ext = disco_node.right(disco_node.length() - hash_index - 1);
++	QString ver = disco_node.right(disco_node.length() - hash_index - 1);
+ 	CapsSpec jid_cs = capsSpecs_[jid.full()];
+ 	if (jid_cs.node() == node) {
+ 		ok = true;
+-		return CapsSpec(node,jid_cs.version(),ext);
++		return CapsSpec(node,ver,QString(),QString());
+ 	}
+ 	else {
+ 		ok = false;
+@@ -212,7 +212,7 @@ CapsSpec CapsManager::getCapsSpecForNode
+ void CapsManager::capsRegistered(const CapsSpec& cs)
+ {
+ 	// Notify affected jids.
+-	foreach(QString s, capsJids_[cs]) {
++	foreach(const QString &s, capsJids_[cs.flatten(false).first()]) {
+ 		//qDebug() << QString("caps.cpp: Notifying %1.").arg(s.replace('%',"%%"));
+ 		emit capsChanged(s);
+ 	}
+@@ -235,8 +235,8 @@ XMPP::Features CapsManager::features(con
+ 	//qDebug() << "caps.cpp: Retrieving features of " << jid.full();
+ 	QStringList f;
+ 	if (capsEnabled(jid)) {
+-		CapsSpecs cs = capsSpecs_[jid.full()].flatten();
+-		foreach(CapsSpec s, cs) {
++		QStringList nodes = capsSpecs_[jid.full()].flatten();
++		foreach(const QString &s, nodes) {
+ 			//qDebug() << QString("    %1").arg(registry_->features(s).list().join("\n"));
+ 			f += registry_->features(s).list();
+ 		}
+@@ -251,11 +251,19 @@ XMPP::Features CapsManager::features(con
+ QString CapsManager::clientName(const Jid& jid) const
+ {
+ 	if (capsEnabled(jid)) {
+-		QString name;
+ 		CapsSpec cs = capsSpecs_[jid.full()];
+-		const DiscoItem::Identities& i = registry_->identities(CapsSpec(cs.node(),cs.version(),cs.version()));
+-		if (i.count() > 0) {
+-			name = i.first().name;
++		QString name;
++
++		QString cs_str = cs.flatten(false).first();
++		if (registry_->isRegistered(cs_str)) {
++			name = registry_->extensions(cs_str).extensionValue("urn:xmpp:dataforms:softwareinfo", "software");
++
++			if (name.isEmpty()) {
++				const DiscoItem::Identities& i = registry_->identities(cs_str);
++				if (i.count() > 0) {
++					name = i.first().name;
++				}
++			}
+ 		}
+ 
+ 		// Try to be intelligent about the name
+@@ -284,5 +292,38 @@ QString CapsManager::clientName(const Ji
+  */
+ QString CapsManager::clientVersion(const Jid& jid) const
+ {
+-	return (capsEnabled(jid) ? capsSpecs_[jid.full()].version() : QString());
++	if (!capsEnabled(jid))
++		return QString();
++
++	QString version;
++	const CapsSpec &cs = capsSpecs_[jid.full()];
++	QString cs_str = cs.flatten(false).first();
++	if (registry_->isRegistered(cs_str))
++		version = registry_->extensions(cs_str).extensionValue("urn:xmpp:dataforms:softwareinfo", "software_version");
++
++	if (version.isEmpty())
++		version = cs.version();
++
++	return version;
++}
++
++/**
++ * \brief Returns the OS version of a given jid.
++ */
++QString CapsManager::osVersion(const Jid &jid) const
++{
++	QString os_str;
++	if (capsEnabled(jid)) {
++		QString cs_str = capsSpecs_[jid.full()].flatten(false).first();
++		if (registry_->isRegistered(cs_str)) {
++			XMPP::DiscoExtList el = registry_->extensions(cs_str);
++			os_str = el.extensionValue("urn:xmpp:dataforms:softwareinfo", "os").trimmed();
++			if (!os_str.isEmpty()) {
++				QString os_ver = el.extensionValue("urn:xmpp:dataforms:softwareinfo", "os_version").trimmed();
++				if (!os_ver.isEmpty())
++					os_str.append(" " + os_ver);
++			}
++		}
++	}
++	return os_str;
+ }
+--- psi.orig/src/capabilities/capsmanager.h
++++ psi/src/capabilities/capsmanager.h
+@@ -48,12 +48,13 @@ public:
+ 	bool isEnabled();
+ 	void setEnabled(bool);
+ 
+-	void updateCaps(const Jid& jid, const QString& node, const QString& ver, const QString& ext);
++	void updateCaps(const Jid& jid, const QString& node, const QString& ver, const QString& ext, const QString& hashAlgo);
+ 	void disableCaps(const Jid& jid);
+ 	bool capsEnabled(const Jid& jid) const;
+ 	XMPP::Features features(const Jid& jid) const;
+ 	QString clientName(const Jid& jid) const;
+ 	QString clientVersion(const Jid& jid) const;
++	QString osVersion(const Jid& jid) const;
+ 
+ signals:
+ 	/**
+@@ -76,7 +77,7 @@ private:
+ 	QPointer<Protocol::DiscoInfoQuerier> discoInfoQuerier_;
+ 	bool isEnabled_;
+ 	QMap<QString,CapsSpec> capsSpecs_;
+-	QMap<CapsSpec,QList<QString> > capsJids_;
++	QMap<QString,QList<QString> > capsJids_;
+ };
+ 
+ 
+--- psi.orig/src/capabilities/capsregistry.cpp
++++ psi/src/capabilities/capsregistry.cpp
+@@ -47,6 +47,11 @@ const DiscoItem::Identities& CapsRegistr
+ 	return identities_;
+ }
+ 
++const XMPP::DiscoExtList& CapsRegistry::CapsInfo::extensions() const
++{
++	return extensions_;
++}
++
+ void CapsRegistry::CapsInfo::setIdentities(const DiscoItem::Identities& i)
+ {
+ 	identities_ = i;
+@@ -57,6 +62,11 @@ void CapsRegistry::CapsInfo::setFeatures
+ 	features_ = f;
+ }
+ 
++void CapsRegistry::CapsInfo::setExtensions(const XMPP::DiscoExtList& exts)
++{
++	extensions_ = exts;
++}
++
+ void CapsRegistry::CapsInfo::updateLastSeen()
+ {
+ 	lastSeen_ = QDateTime::currentDateTime();
+@@ -146,12 +156,10 @@ void CapsRegistry::save(QIODevice& out)
+ 	QDomDocument doc;
+ 	QDomElement capabilities = doc.createElement("capabilities");
+ 	doc.appendChild(capabilities);
+-	QMap<CapsSpec,CapsInfo>::ConstIterator i = capsInfo_.begin();
++	QMap<QString,CapsInfo>::ConstIterator i = capsInfo_.begin();
+ 	for( ; i != capsInfo_.end(); i++) {
+ 		QDomElement info = i.value().toXml(&doc);
+-		info.setAttribute("node",i.key().node());
+-		info.setAttribute("ver",i.key().version());
+-		info.setAttribute("ext",i.key().extensions());
++		info.setAttribute("node",i.key());
+ 		capabilities.appendChild(info);
+ 	}
+ 
+@@ -199,9 +207,15 @@ void CapsRegistry::load(QIODevice& in)
+ 		if(i.tagName() == "info") {
+ 			CapsInfo info;
+ 			info.fromXml(i);
+-			CapsSpec spec(i.attribute("node"),i.attribute("ver"),i.attribute("ext"));
+-			capsInfo_[spec] = info;
+-			//qDebug() << QString("Read %1 %2 %3").arg(spec.node()).arg(spec.version()).arg(spec.extensions());
++			QString node = i.attribute("node");
++			int sep = node.indexOf('#');
++			if (sep > 0 && sep + 1 < node.length()) {
++				capsInfo_[node] = info;
++				//qDebug() << QString("Read %1 %2").arg(node).arg(ver);
++			}
++			else {
++				qWarning() << "capsregistry.cpp: Node" << node << "invalid";
++			}
+ 		}
+ 		else {
+ 			qWarning("capsregistry.cpp: Unknown element");
+@@ -212,13 +226,15 @@ void CapsRegistry::load(QIODevice& in)
+ /**
+  * \brief Registers capabilities of a client.
+  */
+-void CapsRegistry::registerCaps(const CapsSpec& spec,const XMPP::DiscoItem::Identities& identities,const XMPP::Features& features)
++void CapsRegistry::registerCaps(const CapsSpec& spec,const XMPP::DiscoItem::Identities& identities,const XMPP::Features& features,const XMPP::DiscoExtList& exts)
+ {
+-	if (!isRegistered(spec)) {
++	QString dnode = spec.flatten(false).first();
++	if (!isRegistered(dnode)) {
+ 		CapsInfo info;
+ 		info.setIdentities(identities);
+ 		info.setFeatures(features);
+-		capsInfo_[spec] = info;
++		info.setExtensions(exts);
++		capsInfo_[dnode] = info;
+ 		emit registered(spec);
+ 	}
+ }
+@@ -226,7 +242,7 @@ void CapsRegistry::registerCaps(const Ca
+ /**
+  * \brief Checks if capabilities have been registered.
+  */
+-bool CapsRegistry::isRegistered(const CapsSpec& spec) const
++bool CapsRegistry::isRegistered(const QString& spec) const
+ {
+ 	return capsInfo_.contains(spec);
+ }
+@@ -235,7 +251,7 @@ bool CapsRegistry::isRegistered(const Ca
+ /**
+  * \brief Retrieves the features of a given caps spec.
+  */
+-XMPP::Features CapsRegistry::features(const CapsSpec& spec) const
++XMPP::Features CapsRegistry::features(const QString& spec) const
+ {
+ 	return capsInfo_[spec].features();
+ }
+@@ -243,7 +259,13 @@ XMPP::Features CapsRegistry::features(co
+ /**
+  * \brief Retrieves the identities of a given caps spec.
+  */
+-XMPP::DiscoItem::Identities CapsRegistry::identities(const CapsSpec& spec) const
++XMPP::DiscoItem::Identities CapsRegistry::identities(const QString& spec) const
+ {
+ 	return capsInfo_[spec].identities();
+ }
++
++const XMPP::DiscoExtList &CapsRegistry::extensions(const QString &spec) const
++{
++	return capsInfo_.constFind(spec).value().extensions();
++	//return capsInfo_[spec].extensions();
++}
+--- psi.orig/src/capabilities/capsregistry.h
++++ psi/src/capabilities/capsregistry.h
+@@ -43,10 +43,11 @@ class CapsRegistry : public QObject
+ public:
+ 	CapsRegistry();
+ 
+-	void registerCaps(const CapsSpec&, const XMPP::DiscoItem::Identities&, const XMPP::Features& features);
+-	bool isRegistered(const CapsSpec&) const;
+-	XMPP::Features features(const CapsSpec&) const;
+-	XMPP::DiscoItem::Identities identities(const CapsSpec&) const;
++	void registerCaps(const CapsSpec&, const XMPP::DiscoItem::Identities&, const XMPP::Features& features,const XMPP::DiscoExtList& exts);
++	bool isRegistered(const QString &) const;
++	XMPP::Features features(const QString&) const;
++	XMPP::DiscoItem::Identities identities(const QString&) const;
++	const XMPP::DiscoExtList &extensions(const QString& spec) const;
+ 
+ signals:
+ 	void registered(const CapsSpec&);
+@@ -62,9 +63,11 @@ private:
+ 			CapsInfo();
+ 			const XMPP::Features& features() const;
+ 			const XMPP::DiscoItem::Identities& identities() const;
++			const XMPP::DiscoExtList& extensions() const;
+ 
+ 			void setIdentities(const XMPP::DiscoItem::Identities&);
+ 			void setFeatures(const XMPP::Features&);
++			void setExtensions(const XMPP::DiscoExtList&);
+ 
+ 			QDomElement toXml(QDomDocument *) const;
+ 			void fromXml(const QDomElement&);
+@@ -75,9 +78,10 @@ private:
+ 		private:
+ 			XMPP::Features features_;
+ 			XMPP::DiscoItem::Identities identities_;
++			XMPP::DiscoExtList extensions_;
+ 			QDateTime lastSeen_;
+ 	};
+-	QMap<CapsSpec,CapsInfo> capsInfo_;
++	QMap<QString,CapsInfo> capsInfo_;
+ };
+ 
+ 
+--- psi.orig/src/capabilities/capsspec.cpp
++++ psi/src/capabilities/capsspec.cpp
+@@ -44,8 +44,17 @@ CapsSpec::CapsSpec()
+  * @param ven the version
+  * @param ext the list of extensions (separated by spaces)
+  */
+-CapsSpec::CapsSpec(const QString& node, const QString& ver, const QString& ext) : node_(node), ver_(ver), ext_(ext)
++CapsSpec::CapsSpec(const QString& node, const QString& ver, const QString& ext, const QString& hashAlgo)
++	: node_(node)
++	, ver_(ver)
++	, ext_(ext)
++	, hashAlgo_(hashAlgo)
+ {
++	if (!hashAlgo.isEmpty()) { // XEP-0115
++		hashVal_ = ver;
++		ver_ = QString();
++		ext_ = QString(); // this attribute is deprecated in XEP-0115
++	}
+ }
+ 
+ 
+@@ -75,6 +84,17 @@ const QString& CapsSpec::extensions() co
+ 	return ext_;
+ }
+ 
++const QString& CapsSpec::hashAlgorithm() const
++{
++	return hashAlgo_;
++}
++
++
++const QString& CapsSpec::hash() const
++{
++	return hashVal_;
++}
++
+ 
+ /**
+  * \brief Flattens the caps specification into the set of 'simple'
+@@ -88,13 +108,20 @@ const QString& CapsSpec::extensions() co
+  *	node=http://psi-im.org, ver=0.10, ext=achat
+  *	node=http://psi-im.org, ver=0.10, ext=vchat
+  */
+-CapsSpecs CapsSpec::flatten() const
++QStringList CapsSpec::flatten(bool withExt) const
+ {
+-	CapsSpecs l;
+-	l.append(CapsSpec(node(),version(),version()));
+-	QStringList exts(extensions().split(' ',QString::SkipEmptyParts));
+-	for (QStringList::ConstIterator i = exts.begin(); i != exts.end(); ++i) {
+-		l.append(CapsSpec(node(),version(),*i));
++	QStringList l;
++	if (!hashAlgo_.isEmpty()) {
++		l.append(node_ + "#" + hashVal_);
++	}
++	else {
++		l.append(node_ + "#" + ver_);
++	}
++	if (withExt) {
++		QStringList exts(extensions().split(' ',QString::SkipEmptyParts));
++		for (QStringList::ConstIterator i = exts.begin(); i != exts.end(); ++i) {
++			l.append(node_ + "#" + *i);
++		}
+ 	}
+ 	return l;
+ }
+--- psi.orig/src/capabilities/capsspec.h
++++ psi/src/capabilities/capsspec.h
+@@ -25,24 +25,26 @@
+ #include <QString>
+ 
+ class CapsSpec;
+-typedef QList<CapsSpec> CapsSpecs;
++typedef QList<CapsSpec> CapsSpecs; // TODO REMOVE
+ 
+ class CapsSpec
+ {
+ 	public:
+ 		CapsSpec();
+-		CapsSpec(const QString&, const QString&, const QString&);
++		CapsSpec(const QString&, const QString&, const QString&, const QString&);
+ 		const QString& node() const;
+ 		const QString& version() const;
+ 		const QString& extensions() const;
+-		CapsSpecs flatten() const;
++		const QString& hashAlgorithm() const;
++		const QString& hash() const;
++		QStringList flatten(bool withExt = true) const;
+ 
+ 		bool operator==(const CapsSpec&) const;
+ 		bool operator!=(const CapsSpec&) const;
+ 		bool operator<(const CapsSpec&) const;
+ 
+ 	private:
+-		QString node_, ver_, ext_;
++		QString node_, ver_, ext_, hashAlgo_, hashVal_;
+ };
+ 
+ 
+--- psi.orig/src/groupchatdlg.cpp
++++ psi/src/groupchatdlg.cpp
+@@ -1659,7 +1659,7 @@ void GCMainDlg::presence(const QString &
+ 
+ 	if (!s.capsNode().isEmpty()) {
+ 		Jid caps_jid(s.mucItem().jid().isEmpty() || !d->nonAnonymous ? Jid(jid()).withResource(nick) : s.mucItem().jid());
+-		account()->capsManager()->updateCaps(caps_jid,s.capsNode(),s.capsVersion(),s.capsExt());
++		account()->capsManager()->updateCaps(caps_jid,s.capsNode(),s.capsVersion(),s.capsExt(),s.capsHashAlgorithm());
+ 	}
+ 
+ 	if(!nick.isEmpty())
+--- psi.orig/src/psiaccount.cpp
++++ psi/src/psiaccount.cpp
+@@ -2557,7 +2557,7 @@ void PsiAccount::client_resourceAvailabl
+ 			if(local)
+ 				ur.setClient(ApplicationInfo::name(),ApplicationInfo::version(),SystemInfo::instance()->os());
+ 			else
+-				ur.setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
++				ur.setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),capsManager()->osVersion(j));
+ 
+ 			u->userResourceList().append(ur);
+ 			rp = &u->userResourceList().last();
+@@ -2621,13 +2621,13 @@ void PsiAccount::client_resourceAvailabl
+ 	// Update entity capabilities.
+ 	// This has to happen after the userlist item has been created.
+ 	if (!r.status().capsNode().isEmpty()) {
+-		capsManager()->updateCaps(j,r.status().capsNode(),r.status().capsVersion(),r.status().capsExt());
++		capsManager()->updateCaps(j,r.status().capsNode(),r.status().capsVersion(),r.status().capsExt(),r.status().capsHashAlgorithm());
+ 
+ 		// Update the client version
+ 		foreach(UserListItem* u, findRelevant(j)) {
+ 			UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
+ 			if (rit != u->userResourceList().end()) {
+-				(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),"");
++				(*rit).setClient(capsManager()->clientName(j),capsManager()->clientVersion(j),capsManager()->osVersion(j));
+ 				//(*rit).setClient(QString(),QString(),"");
+ 				cpUpdate(*u,(*rit).name());
+ 			}
+@@ -3182,14 +3182,19 @@ void PsiAccount::capsChanged(const Jid&
+ 		return;
+ 
+ 	QString name = capsManager()->clientName(j);
+-	QString version = (name.isEmpty() ? QString() : capsManager()->clientVersion(j));
++	QString version;
++	QString os;
++	if (!name.isEmpty()) {
++		version = capsManager()->clientVersion(j);
++		os = capsManager()->osVersion(j);
++	}
+ 
+ 	foreach(UserListItem *u, findRelevant(j)) {
+ 		UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
+ 		bool found = (rit == u->userResourceList().end()) ? false: true;
+ 		if(!found)
+ 			continue;
+-		(*rit).setClient(name,version,"");
++		(*rit).setClient(name,version,os);
+ 		//(*rit).setClient(QString(),QString(),"");
+ 		cpUpdate(*u);
+ 	}
+--- psi.orig/src/psicon.cpp
++++ psi/src/psicon.cpp
+@@ -772,9 +772,10 @@ void PsiCon::registerCaps(const QString&
+ 	identities += identity;
+ 
+ 	d->capsRegistry->registerCaps(CapsSpec(ApplicationInfo::capsNode(),
+-										   ApplicationInfo::capsVersion(), ext),
++										   ApplicationInfo::capsVersion(), ext, QString()),
+ 								  identities,
+-								  Features(features));
++								  Features(features),
++								  XMPP::DiscoExtList());
+ }
+ 
+ void PsiCon::deinit()

psi-plus-main-20130107.tar.xz/patches/dev/psi-new-history.patch -> psi-plus-main-20141106.tar.xz/patches/dev/psi-new-history.patch Changed

@@ -1,41 +1,1318 @@
---- psi.orig/src/eventdb.cpp
-+++ psi/src/eventdb.cpp
-@@ -28,6 +28,9 @@
+--- git.orig/admin/build/build_package.sh
++++ git/admin/build/build_package.sh
+@@ -82,10 +82,13 @@ build_package_psi() {
+ 		cp $mqtdir/bin/QtNetwork4.dll $arch_prefix
+ 		cp $mqtdir/bin/QtXml4.dll $arch_prefix
+ 		cp $mqtdir/bin/QtGui4.dll $arch_prefix
++		cp $mqtdir/bin/QtSql4.dll $arch_prefix
+ 		mkdir -p $arch_prefix/imageformats
+ 		cp $mqtdir/plugins/imageformats/qgif4.dll $arch_prefix/imageformats
+ 		cp $mqtdir/plugins/imageformats/qjpeg4.dll $arch_prefix/imageformats
+ 		cp $mqtdir/plugins/imageformats/qmng4.dll $arch_prefix/imageformats
++		mkdir -p $arch_prefix/sqldrivers
++		cp $mqtdir/plugins/sqldrivers/qsqlite4.dll
+ 		cp $deps_base/$qca_win_dir/$target_arch/bin/qca2.dll $arch_prefix
+ 		mkdir -p $arch_prefix/crypto
+ 		cp $deps_base/$qca_win_dir/$target_arch/plugins/crypto/qca-gnupg2.dll $arch_prefix/crypto
+@@ -126,8 +129,8 @@ build_package_psi() {
+ 			QT_LIB_PATH=$QTDIR/lib
+ 		fi
+ 		cd $psi_base
+-		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
+-		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
++		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
++		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
+ 		make
+ 	fi
+ }
+--- git.orig/admin/build/devconfig.sh
++++ git/admin/build/devconfig.sh
+@@ -60,7 +60,7 @@ if [ "$platform" == "win" ]; then
+ 	fi
+ 	mqtdir=`get_msys_path $qtdir`
+ 
+-	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib
++	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib --with-qjson-inc=$deps_base/$qjson_win_dir/$target_arch/include --with-qjson-lib=$deps_base/$qjson_win_dir/$target_arch/lib
+ 
+ 	rm -f $build_base/devenv
+ 	touch $build_base/devenv
+@@ -79,8 +79,8 @@ else
+ 	if [ "$QT_PLUGIN_PATH" == "" ]; then
+ 		QT_PLUGIN_PATH=$QTDIR/plugins
+ 	fi
+-	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
+-	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
++	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
++	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
+ 
+ 	# remove some gstbundle problem files
+ 	rm -f $deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10/libgstximagesink.so
+@@ -91,7 +91,7 @@ else
+ 	rm -f $build_base/devenv
+ 	touch $build_base/devenv
+ 	echo "export DYLD_LIBRARY_PATH=$deps_base/$gstbundle_mac_dir/uni/lib:\$DYLD_LIBRARY_PATH" >> $build_base/devenv
+-	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
++	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
+ 	echo "export GST_PLUGIN_PATH=$deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10" >> $build_base/devenv
+ 	echo "export GST_REGISTRY_FORK=no" >> $build_base/devenv
+ 	echo "export QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$deps_base/$qca_mac_dir/plugins" >> $build_base/devenv
+--- git.orig/admin/build/package_info
++++ git/admin/build/package_info
+@@ -39,3 +39,11 @@ psimedia_win_dir=psimedia-20120725-win
+ psimedia_mac_file=psimedia-20120725-mac.tar.bz2
+ psimedia_mac_url=http://psi-im.org/files/deps/psimedia-20120725-mac.tar.bz2
+ psimedia_mac_dir=psimedia-20120725-mac
++
++qjson_win_file=qjson-0.8.1-win.zip
++qjson_win_url=http://psi-im.org/files/deps/qjson-0.8.1-win.zip
++qjson_win_dir=qjson-0.8.1-win
++
++qjson_mac_file=qjson-0.8.1-mac.tar.bz2
++qjson_mac_url=http://psi-im.org/files/deps/qjson-0.8.1-mac.tar.bz2
++qjson_mac_dir=qjson-0.8.1-mac
+--- git.orig/admin/build/prep_dist.sh
++++ git/admin/build/prep_dist.sh
+@@ -45,8 +45,8 @@ if [ "$platform" == "mac" ]; then
+ 
+ 	mkdir -p $target_dist_base
+ 
+-	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui"
+-	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib"
++	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui QtSql"
++	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib sqldrivers/libqsqlite.dylib"
+ 	QCA_PLUGINS="crypto/libqca-ossl.dylib crypto/libqca-gnupg.dylib"
+ 
+ 	cp -a $psi_base/psi.app $target_dist_base/Psi.app
+@@ -57,6 +57,7 @@ if [ "$platform" == "mac" ]; then
+ 	done
+ 
+ 	install_name_tool -change qca.framework/Versions/2/qca @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/MacOS/psi
++	install_name_tool -change qjson.framework/Versions/0.8.1/qjson @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/MacOS/psi
+ 
+ 	mkdir -p $contentsdir/Frameworks
+ 	for f in $QT_FRAMEWORKS; do
+@@ -80,8 +81,14 @@ if [ "$platform" == "mac" ]; then
+ 	cp -a $deps_base/$qca_mac_dir/lib/qca.framework $contentsdir/Frameworks
+ 	cleanup_framework $contentsdir/Frameworks/qca.framework qca 2
+ 	install_name_tool -id @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/Frameworks/qca.framework/qca
++
++	cp -a $deps_base/$qjson_mac_dir/lib/qjson.framework $contentsdir/Frameworks
++	cleanup_framework $contentsdir/Frameworks/qjson.framework qjson 0.8.1
++	install_name_tool -id @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/Frameworks/qjson.framework/qjson
++
+ 	for g in $QT_FRAMEWORKS; do
+ 		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qca.framework/qca
++		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qjson.framework/qjson
+ 	done
+ 
+ 	mkdir -p $contentsdir/Plugins/crypto
+--- git.orig/options/default.xml
++++ git/options/default.xml
+@@ -129,6 +129,9 @@
+ 				<chatedit-height type="int">10</chatedit-height>
+ 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
+ 				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
++				<history comment="Message history options">
++					<preload-history-size comment="The number of preloaded messages" type="int">5</preload-history-size>
++				</history>
+ 			</chat>
+ 			<save>
+ 				<toolbars-state type="QByteArray"/>
+@@ -763,6 +766,9 @@ QLineEdit#le_status_text {
+ 				<video-input type="QString"/>
+ 			</devices>
+ 		</media>
++		<history comment="General history options">
++			<store-muc-private comment="Keep a history of correspondence for MUC private" type="bool">false</store-muc-private>
++		</history>
+ 	</options>
+ 	<accounts comment="Account definitions and options"/>
+ 	<plugins comment="Plugin options"/>
+--- git.orig/psi.qc
++++ git/psi.qc
+@@ -17,6 +17,9 @@
+   <dep type='qca'>
+     <required/>
+   </dep>
++  <dep type='qjson'>
++    <required/>
++  </dep>
+   <dep type='zlib'>
+     <required/>
+   </dep>
+--- git.orig/qcm/qjson.qcm
++++ git/qcm/qjson.qcm
+@@ -0,0 +1,162 @@
++/*
++-----BEGIN QCMOD-----
++name: QJson
++arg: with-qjson-inc=[path],Path to QJson include files
++arg: with-qjson-lib=[path],Path to QJson library or framework files
++-----END QCMOD-----
++*/
++
++// adapted from json.prf
++static QString internal_json_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
++{
++	QString out = QString(
++"QJSON_INCDIR = %1\n"
++"QJSON_LIBDIR = %2\n"
++"QJSON_FRAMEWORKDIR = %3\n"
++"\n"
++"CONFIG *= qt\n"
++"\n"
++"LINKAGE =\n"
++"\n"
++"!isEmpty(QJSON_FRAMEWORKDIR): {\n"
++"	framework_dir = $$QJSON_FRAMEWORKDIR\n"
++"	exists($$framework_dir/qjson.framework) {\n"
++"		QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
++"		LIBS *= -F$$framework_dir\n"
++"		INCLUDEPATH += $$framework_dir/qjson.framework\n"
++"		LINKAGE = -framework qjson\n"
++"	}\n"
++"}\n"
++"\n"
++"# else, link normally\n"
++"isEmpty(LINKAGE) {\n"
++"	!isEmpty(QJSON_INCDIR):INCLUDEPATH += $$QJSON_INCDIR\n"
++"	!isEmpty(QJSON_LIBDIR):LIBS += -L$$QJSON_LIBDIR\n"
++"	LINKAGE = -lqjson\n"
++"	CONFIG(debug, debug|release) {\n"
++"		windows:LINKAGE = -lqjsond\n"
++"		mac:LINKAGE = -lqjson_debug\n"
++"	}\n"
++"}\n"
++"\n"
++"LIBS += $$LINKAGE\n"
++	).arg(incdir, libdir, frameworkdir);
++	return out;
++}
++
++// set either libdir or frameworkdir, but not both
++static bool qjson_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
++{
++	QString proextra;
++	QString prf = internal_json_prf(incdir, libdir, frameworkdir);
++	proextra =
++	"CONFIG += qt\n"
++	"CONFIG -= debug_and_release debug release\n"
++	"QT -= gui\n";
++	proextra += prf;
++
++	QString str =
++	"#include <qjson/parser.h>\n"
++	"\n"
++	"int main()\n"
++	"{\n"
++	"	return 0;\n"
++	"}\n";
++
++	// test desired versions, potentially both release and debug
++
++	if(release)
++	{
++		int ret;
++		if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0)
++			return false;
++	}
++
++	if(debug)
++	{
++		int ret;
++		if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0)
++			return false;
++	}
++
++	*_prf = prf;
++	return true;
++}
++
++static bool qjson_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, QString *prf)
++{
++	return qjson_try(conf, incdir, libdir, QString(), release, debug, prf);
++}
++
++static bool qjson_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
++{
++	return qjson_try(conf, QString(), QString(), frameworkdir, release, debug, prf);
++}
++
++//----------------------------------------------------------------------------
++// qc_qjson
++//----------------------------------------------------------------------------
++class qc_qjson : public ConfObj
++{
++public:
++	qc_qjson(Conf *c) : ConfObj(c) {}
++	QString name() const { return "QJson"; }
++	QString shortname() const { return "qjson"; }
++	bool exec()
++	{
++		// get the build mode
++#ifdef QC_BUILDMODE
++		bool release = qc_buildmode_release;
++		bool debug = qc_buildmode_debug;
++#else
++		// else, default to just release mode
++		bool release = true;
++		bool debug = false;
++#endif
++
++		QString qjson_incdir, qjson_libdir, qjson_json_prf;
++		qjson_incdir = conf->getenv("QC_WITH_QJSON_INC");
++		qjson_libdir = conf->getenv("QC_WITH_QJSON_LIB");
++
++#if defined(Q_OS_MAC)
++		if(!qjson_libdir.isEmpty() && qjson_try_framework(conf, qjson_libdir, release, debug, &qjson_json_prf))
++		{
++			conf->addExtra(qjson_json_prf);
++			return true;
++		}
++#endif
++
++		if(!qjson_incdir.isEmpty() && !qjson_libdir.isEmpty() && qjson_try_lib(conf, qjson_incdir, qjson_libdir, release, debug, &qjson_json_prf))
++		{
++			conf->addExtra(qjson_json_prf);
++			return true;
++		}
++
++		QStringList incs;
++		QString version, libs, other;
++		if(conf->findPkgConfig("QJson", VersionAny, QString(), &version, &incs, &libs, &other))
++		{
++			for(int n = 0; n < incs.count(); ++n)
++				conf->addIncludePath(incs[n]);
++			if(!libs.isEmpty())
++				conf->addLib(libs);
++			return true;
++		}
++
++		QStringList prefixes;
++		prefixes += "/usr";
++		prefixes += "/usr/local";
++
++		for(int n = 0; n < prefixes.count(); ++n)
++		{
++			const QString &prefix = prefixes[n];
++			if(qjson_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qjson_json_prf))
++			{
++				conf->addExtra(qjson_json_prf);
++				return true;
++			}
++		}
++
++		return false;
++	}
++};
+--- git.orig/src/chatdlg.cpp
++++ git/src/chatdlg.cpp
+@@ -74,8 +74,8 @@
+ #include "psicontactlist.h"
+ #include "accountlabel.h"
+ #include "psirichtext.h"
+-#include "messageview.h"
+ #include "chatview.h"
++#include "eventdb.h"
+ 
+ #ifdef Q_OS_WIN
+ #include <windows.h>
+@@ -95,6 +95,7 @@ ChatDlg* ChatDlg::create(const Jid& jid,
+ ChatDlg::ChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
+ 	: TabbableWidget(jid, pa, tabManager)
+ 	, highlightersInstalled_(false)
++	, delayedMessages(0)
+ {
+ 	pending_ = 0;
+ 	keepOpen_ = false;
+@@ -107,6 +108,9 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 
+ 	status_ = -1;
+ 
++	historyState = false;
++	preloadHistory();
++
+ 	autoSelectContact_ = false;
+ 	if (PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode").toString() == "auto") {
+ 		UserListItem *uli = account()->findFirstRelevant(jid);
+@@ -164,6 +168,8 @@ void ChatDlg::init()
+ 
+ ChatDlg::~ChatDlg()
+ {
++	if (delayedMessages)
++		delete delayedMessages;
+ 	account()->dialogUnregister(this);
+ }
+ 
+@@ -434,6 +440,43 @@ UserStatus ChatDlg::userStatusFor(const
+ 	return u;
+ }
+ 
++void ChatDlg::preloadHistory()
++{
++	int cnt =PsiOptions::instance()->getOption("options.ui.chat.history.preload-history-size").toInt();
++	if (cnt > 0) {
++		holdMessages(true);
++		if (cnt > 100)
++			cnt = 100;
++		EDBHandle *h = new EDBHandle(account()->edb());
++		connect(h, SIGNAL(finished()), this, SLOT(getHistory()));
++		Jid j = jid();
++		if (!account()->findGCContact(j))
++			j = jid().bare();
++		int start = account()->eventQueue()->count(jid(), false);
++		h->get(account()->id(), j, QDateTime(), EDB::Backward, start, cnt);
++	}
++}
++
++void ChatDlg::getHistory()
++{
++	EDBHandle *h = qobject_cast<EDBHandle *>(sender());
++	if (!h)
++		return;
++
++	historyState = true;
++	const EDBResult &r = h->result();
++	for (int i = r.count() - 1; i >= 0; --i) {
++		const EDBItemPtr &item = r.at(i);
++		PsiEvent::Ptr e = item->event();
++		if (e->type() == PsiEvent::Message) {
++			MessageEvent::Ptr me = e.staticCast<MessageEvent>();
++			appendMessage(me->message(), me->originLocal());
++		}
++	}
++	delete h;
++	holdMessages(false);
++}
++
+ void ChatDlg::ensureTabbedCorrectly()
+ {
+ 	TabbableWidget::ensureTabbedCorrectly();
+@@ -491,7 +534,7 @@ void ChatDlg::updateContact(const Jid &j
+ 			if (PsiOptions::instance()->getOption("options.ui.chat.show-status-changes").toBool()
+ 				&& fromPresence && statusChanged)
+ 			{
+-				chatView()->dispatchMessage(MessageView::statusMessage(
++				dispatchMessage(MessageView::statusMessage(
+ 												dispNick_, status_,
+ 												statusString_, priority_));
+ 			}
+@@ -778,6 +821,7 @@ void ChatDlg::doSend()
+ 
+ void ChatDlg::doneSend()
+ {
++	historyState = false;
+ 	appendMessage(m_, true);
+ 	disconnect(chatEdit(), SIGNAL(textChanged()), this, SLOT(setComposing()));
+ 	chatEdit()->clear();
+@@ -806,6 +850,7 @@ void ChatDlg::encryptedMessageSent(int x
+ 
+ void ChatDlg::incomingMessage(const Message &m)
+ {
++	historyState = false;
+ 	if (m.body().isEmpty() && m.subject().isEmpty() && m.urlList().isEmpty()) {
+ 		// Event message
+ 		if (m.containsEvent(CancelEvent)) {
+@@ -866,14 +911,16 @@ void ChatDlg::appendMessage(const Messag
+ 	// figure out the encryption state
+ 	bool encChanged = false;
+ 	bool encEnabled = false;
+-	if (lastWasEncrypted_ != m.wasEncrypted()) {
+-		encChanged = true;
++	if (!historyState) {
++		if (lastWasEncrypted_ != m.wasEncrypted()) {
++			encChanged = true;
++		}
++		lastWasEncrypted_ = m.wasEncrypted();
++		encEnabled = lastWasEncrypted_;
+ 	}
+-	lastWasEncrypted_ = m.wasEncrypted();
+-	encEnabled = lastWasEncrypted_;
+ 
+ 	if (encChanged) {
+-		chatView()->dispatchMessage(MessageView::fromHtml(
++		dispatchMessage(MessageView::fromHtml(
+ 				encEnabled? QString("<icon name=\"psi/cryptoYes\"> ") + tr("Encryption Enabled"):
+ 							QString("<icon name=\"psi/cryptoNo\"> ") + tr("Encryption Disabled"),
+ 				MessageView::System
+@@ -889,7 +936,9 @@ void ChatDlg::appendMessage(const Messag
+ 	}
+ 
+ 	if (!m.subject().isEmpty()) {
+-		chatView()->dispatchMessage(MessageView::subjectMessage(m.subject()));
++		MessageView smv = MessageView::subjectMessage(m.subject());
++		smv.setSpooled(historyState);
++		dispatchMessage(smv);
+ 	}
+ 
+ 	MessageView mv(MessageView::Message);
+@@ -903,9 +952,9 @@ void ChatDlg::appendMessage(const Messag
+ 	mv.setNick(whoNick(local));
+ 	mv.setUserId(local?account()->jid().bare():jid().bare());
+ 	mv.setDateTime(m.timeStamp());
+-	mv.setSpooled(m.spooled());
++	mv.setSpooled(historyState);
+ 	mv.setAwaitingReceipt(local && m.messageReceipt() == ReceiptRequest);
+-	chatView()->dispatchMessage(mv);
++	dispatchMessage(mv);
+ 
+ 	if (!m.urlList().isEmpty()) {
+ 		UrlList urls = m.urlList();
+@@ -913,11 +962,49 @@ void ChatDlg::appendMessage(const Messag
+ 		foreach (const Url &u, urls) {
+ 			urlsMap.insert(u.url(), u.desc());
+ 		}
+-		chatView()->dispatchMessage(MessageView::urlsMessage(urlsMap));
++		MessageView umv = MessageView::urlsMessage(urlsMap);
++		umv.setSpooled(historyState);
++		dispatchMessage(umv);
+ 	}
++}
++
++void ChatDlg::holdMessages(bool hold)
++{
++	if (hold) {
++		if (!delayedMessages)
++			delayedMessages = new QList<MessageView>();
++	}
++	else if (delayedMessages) {
++		foreach (const MessageView &mv, *delayedMessages)
++		{
++			if (mv.isSpooled())
++				displayMessage(mv);
++		}
++		foreach (const MessageView &mv, *delayedMessages)
++		{
++			if (!mv.isSpooled())
++				displayMessage(mv);
++		}
++		delete delayedMessages;
++		delayedMessages = 0;
++	}
++}
++
++void ChatDlg::dispatchMessage(const MessageView &mv)
++{
++	if (delayedMessages)
++		delayedMessages->append(mv);
++	else
++		displayMessage(mv);
++}
++
++void ChatDlg::displayMessage(const MessageView &mv)
++{
++	chatView()->dispatchMessage(mv);
+ 
+ 	// if we're not active, notify the user by changing the title
+-	if (!isActiveTab()) {
++	MessageView::Type type = mv.type();
++	if (type != MessageView::System && type != MessageView::Status && !mv.isSpooled() && !isActiveTab()) {
+ 		++pending_;
+ 		invalidateTab();
+ 		if (PsiOptions::instance()->getOption("options.ui.flash-windows").toBool()) {
+@@ -939,7 +1026,7 @@ void ChatDlg::appendMessage(const Messag
+ 	//	messagesRead(jid());
+ 	//}
+ 
+-	if (!local) {
++	if (!mv.isLocal()) {
+ 		keepOpen_ = true;
+ 		QTimer::singleShot(1000, this, SLOT(setKeepOpenFalse()));
+ 	}
+--- git.orig/src/chatdlg.h
++++ git/src/chatdlg.h
+@@ -32,6 +32,7 @@
+ #include "advwidget.h"
+ 
+ #include "tabbablewidget.h"
++#include "messageview.h"
+ 
+ 
+ namespace XMPP
+@@ -89,6 +90,7 @@ public:
+ 	Jid realJid() const;
+ 	bool autoSelectContact() const {return autoSelectContact_;};
+ 	static UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource);
++	void preloadHistory();
+ 
+ signals:
+ 	void aInfo(const Jid &);
+@@ -148,6 +150,7 @@ private slots:
+ 	void addEmoticon(QString text);
+ 	void initComposing();
+ 	void setComposing();
++	void getHistory();
+ 
+ protected slots:
+ 	void checkComposing();
+@@ -169,6 +172,9 @@ protected:
+ 	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
+ 
+ 	void appendMessage(const Message &, bool local = false);
++	void holdMessages(bool hold);
++	void dispatchMessage(const MessageView &mv);
++	void displayMessage(const MessageView &mv);
+ 	virtual bool isEncryptionEnabled() const;
+ 
+ public:
+@@ -214,9 +220,11 @@ private:
+ 	QTimer* composingTimer_;
+ 	bool isComposing_;
+ 	bool sendComposingEvents_;
++	bool historyState;
+ 	QString eventId_;
+ 	ChatState contactChatState_;
+ 	ChatState lastChatState_;
++	QList<MessageView> *delayedMessages;
+ };
+ 
+ #endif
+--- git.orig/src/chatview_te.cpp
++++ git/src/chatview_te.cpp
+@@ -80,6 +80,7 @@ ChatView::ChatView(QWidget *parent)
+ 			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
++			logIconHistory = IconsetFactory::iconPixmap("psi/history").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
+ 		} else {
+ 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive");
+ 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send");
+@@ -89,6 +90,7 @@ ChatView::ChatView(QWidget *parent)
+ 			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp");
+ 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time");
+ 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info");
++			logIconHistory = IconsetFactory::iconPixmap("psi/history");
+ 		}
+ 		addLogIconsResources();
+ 	}
+@@ -167,6 +169,7 @@ void ChatView::addLogIconsResources()
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_info"), logIconInfo);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered"), logIconDelivered);
+ 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered_pgp"), logIconDeliveredPgp);
++	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_history"), logIconHistory);
+ }
+ 
+ void ChatView::markReceived(QString id)
+@@ -369,26 +372,47 @@ void ChatView::renderMucMessage(const Me
+ void ChatView::renderMessage(const MessageView &mv)
+ {
+ 	QString timestr = formatTimeStamp(mv.dateTime());
+-	QString color = colorString(mv.isLocal(), mv.isSpooled());
++	QString color = colorString(mv.isLocal(), false);
+ 	if (useMessageIcons_ && mv.isAwaitingReceipt()) {
+ 		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()),
+ 					isEncryptionEnabled_ ? logIconSendPgp : logIconSend);
+ 	}
+-	QString icon = useMessageIcons_ ?
+-		(QString("<img src=\"%1\" />").arg(mv.isLocal()?
+-		(mv.isAwaitingReceipt() ? QString("icon:delivery") + mv.messageId()
+-			: isEncryptionEnabled_ ? "icon:log_icon_send_pgp" : "icon:log_icon_send")
+-		: isEncryptionEnabled_ ? "icon:log_icon_receive_pgp" : "icon:log_icon_receive")) : "";
++	QString icon;
++	if (useMessageIcons_) {
++		QString sRes;
++		if (mv.isSpooled())
++			sRes = "icon:log_icon_history";
++		else if (mv.isLocal()) {
++			if (mv.isAwaitingReceipt())
++				sRes = QString("icon:delivery") + mv.messageId();
++			else if (isEncryptionEnabled_)
++				sRes = "icon:log_icon_receive_pgp";
++			else
++				sRes = "icon:log_icon_send";
++		} else {
++			if (isEncryptionEnabled_)
++				sRes = "icon:log_icon_receive_pgp";
++			else
++				sRes = "icon:log_icon_receive";
++		}
++		icon = QString("<img src=\"%1\" />").arg(sRes);
++	}
++	QString str;
+ 	if (mv.isEmote()) {
+-		appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
++		str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>";
+ 	} else {
+ 		if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
+-			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</span><br>" + mv.formattedText());
++			str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</span><br>";
+ 		}
+ 		else {
+-			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ") + mv.formattedText());
++			str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ");
+ 		}
++		if (mv.isSpooled())
++			str.append(QString("<span style=\"color: %1\">%2</span>").arg(ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name()).arg(mv.formattedText()));
++		else
++			str.append(mv.formattedText());
+ 	}
++	appendText(str);
+ 
+ 	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
+ 		deferredScroll();
+--- git.orig/src/chatview_te.h
++++ git/src/chatview_te.h
+@@ -113,6 +113,7 @@ private:
+ 	QPixmap logIconDeliveredPgp;
+ 	QPixmap logIconTime;
+ 	QPixmap logIconInfo;
++	QPixmap logIconHistory;
+ 	QAction *actQuote_;
+ };
+ 
+--- git.orig/src/eventdb.cpp
++++ git/src/eventdb.cpp
+@@ -28,23 +28,27 @@
  #include <QTimer>
  #include <QTextStream>
  #include <QDateTime>
 +#include <QSqlError>
-+#include <QSqlQuery>
 +#include <QSqlDriver>
++#include <qjson/parser.h>
++#include "qjson/serializer.h"
  
  #include "common.h"
  #include "applicationinfo.h"
-@@ -72,6 +75,15 @@ const QString & EDBItem::prevId() const
- 	return v_prevId;
+ #include "psievent.h"
++#include "psicontactlist.h"
+ #include "jidutil.h"
++#include "historyimp.h"
+ 
+ using namespace XMPP;
+ 
+ //----------------------------------------------------------------------------
+ // EDBItem
+ //----------------------------------------------------------------------------
+-EDBItem::EDBItem(const PsiEvent::Ptr &event, const QString &id, const QString &prevId, const QString &nextId)
++EDBItem::EDBItem(const PsiEvent::Ptr &event, const QString &id)
+ {
+ 	e = event;
+ 	v_id = id;
+-	v_prevId = prevId;
+-	v_nextId = nextId;
+ }
+ 
+ EDBItem::~EDBItem()
+@@ -61,17 +65,6 @@ const QString & EDBItem::id() const
+ 	return v_id;
+ }
+ 
+-const QString & EDBItem::nextId() const
+-{
+-	return v_nextId;
+-}
+-
+-const QString & EDBItem::prevId() const
+-{
+-	return v_prevId;
+-}
+-
+-
+ //----------------------------------------------------------------------------
+ // EDBHandle
+ //----------------------------------------------------------------------------
+@@ -81,6 +74,7 @@ public:
+ 	Private() {}
+ 
+ 	EDB *edb;
++	int beginRow_;
+ 	EDBResult r;
+ 	bool busy;
+ 	bool writeSuccess;
+@@ -93,6 +87,7 @@ EDBHandle::EDBHandle(EDB *edb)
+ {
+ 	d = new Private;
+ 	d->edb = edb;
++	d->beginRow_ = 0;
+ 	d->busy = false;
+ 	d->writeSuccess = false;
+ 	d->listeningFor = -1;
+@@ -108,53 +103,32 @@ EDBHandle::~EDBHandle()
+ 	delete d;
+ }
+ 
+-void EDBHandle::getLatest(const Jid &j, int len)
+-{
+-	d->busy = true;
+-	d->lastRequestType = Read;
+-	d->listeningFor = d->edb->op_getLatest(j, len);
+-}
+-
+-void EDBHandle::getOldest(const Jid &j, int len)
++void EDBHandle::get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int begin, int len)
+ {
+ 	d->busy = true;
+ 	d->lastRequestType = Read;
+-	d->listeningFor = d->edb->op_getOldest(j, len);
++	d->listeningFor = d->edb->op_get(accId, jid, date, direction, begin, len);
+ }
+ 
+-void EDBHandle::get(const Jid &j, const QString &id, int direction, int len)
++void EDBHandle::find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction)
+ {
+ 	d->busy = true;
+ 	d->lastRequestType = Read;
+-	d->listeningFor = d->edb->op_get(j, id, direction, len);
++	d->listeningFor = d->edb->op_find(accId, str, jid, date, direction);
+ }
+ 
+-void EDBHandle::getByDate(const Jid &j, QDateTime first, QDateTime last)
+-{
+-	d->busy = true;
+-	d->lastRequestType = Read;
+-	d->listeningFor = d->edb->op_getByDate(j, first, last);
+-}
+-
+-void EDBHandle::find(const QString &str, const Jid &j, const QString &id, int direction)
+-{
+-	d->busy = true;
+-	d->lastRequestType = Read;
+-	d->listeningFor = d->edb->op_find(str, j, id, direction);
+-}
+-
+-void EDBHandle::append(const Jid &j, const PsiEvent::Ptr &e)
++void EDBHandle::append(const QString &accId, const Jid &j, const PsiEvent::Ptr &e, int type)
+ {
+ 	d->busy = true;
+ 	d->lastRequestType = Write;
+-	d->listeningFor = d->edb->op_append(j, e);
++	d->listeningFor = d->edb->op_append(accId, j, e, type);
+ }
+ 
+-void EDBHandle::erase(const Jid &j)
++void EDBHandle::erase(const QString &accId, const Jid &j)
+ {
+ 	d->busy = true;
+ 	d->lastRequestType = Erase;
+-	d->listeningFor = d->edb->op_erase(j);
++	d->listeningFor = d->edb->op_erase(accId, j);
  }
  
-+void EDBItem::setNextId(const QString &id)
+ bool EDBHandle::busy() const
+@@ -198,6 +172,11 @@ int EDBHandle::lastRequestType() const
+ 	return d->lastRequestType;
+ }
+ 
++int EDBHandle::beginRow() const
 +{
-+	v_nextId = id;
++	return d->beginRow_;
 +}
 +
-+void EDBItem::setPrevId(const QString &id)
+ 
+ //----------------------------------------------------------------------------
+ // EDB
+@@ -209,12 +188,14 @@ public:
+ 
+ 	QList<EDBHandle*> list;
+ 	int reqid_base;
++	PsiCon *psi;
+ };
+ 
+-EDB::EDB()
++EDB::EDB(PsiCon *psi)
+ {
+ 	d = new Private;
+ 	d->reqid_base = 0;
++	d->psi = psi;
+ }
+ 
+ EDB::~EDB()
+@@ -239,46 +220,32 @@ void EDB::unreg(EDBHandle *h)
+ 	d->list.removeAll(h);
+ }
+ 
+-int EDB::op_getLatest(const Jid &j, int len)
+-{
+-	return getLatest(j, len);
+-}
+-
+-int EDB::op_getOldest(const Jid &j, int len)
+-{
+-	return getOldest(j, len);
+-}
+-
+-int EDB::op_get(const Jid &jid, const QString &id, int direction, int len)
+-{
+-	return get(jid, id, direction, len);
+-}
+-
+-int EDB::op_getByDate(const Jid &j, QDateTime first, QDateTime last)
++int EDB::op_get(const QString &accId, const Jid &jid, const QDateTime date, int direction, int start, int len)
+ {
+-	return getByDate(j, first, last);
++	return get(accId, jid, date, direction, start, len);
+ }
+ 
+-int EDB::op_find(const QString &str, const Jid &j, const QString &id, int direction)
++int EDB::op_find(const QString &accId, const QString &str, const Jid &j, const QDateTime date, int direction)
+ {
+-	return find(str, j, id, direction);
++	return find(accId, str, j, date, direction);
+ }
+ 
+-int EDB::op_append(const Jid &j, const PsiEvent::Ptr &e)
++int EDB::op_append(const QString &accId, const Jid &j, const PsiEvent::Ptr &e, int type)
+ {
+-	return append(j, e);
++	return append(accId, j, e, type);
+ }
+ 
+-int EDB::op_erase(const Jid &j)
++int EDB::op_erase(const QString &accId, const Jid &j)
+ {
+-	return erase(j);
++	return erase(accId, j);
+ }
+ 
+-void EDB::resultReady(int req, EDBResult r)
++void EDB::resultReady(int req, EDBResult r, int begin_row)
+ {
+ 	// deliver
+ 	foreach(EDBHandle* h, d->list) {
+ 		if(h->listeningFor() == req) {
++			h->d->beginRow_ = begin_row;
+ 			h->edb_resultReady(r);
+ 			return;
+ 		}
+@@ -296,6 +263,11 @@ void EDB::writeFinished(int req, bool b)
+ 	}
+ }
+ 
++inline PsiCon *EDB::psi()
 +{
-+	v_prevId = id;
++	return d->psi;
 +}
++
  
  //----------------------------------------------------------------------------
- // EDBHandle
-@@ -436,6 +448,7 @@ int EDBFlatFile::append(const Jid &j, Ps
+ // EDBFlatFile
+@@ -304,21 +276,18 @@ struct item_file_req
+ {
+ 	Jid j;
+ 	int type; // 0 = latest, 1 = oldest, 2 = random, 3 = write
++	int start;
+ 	int len;
+ 	int dir;
+ 	int id;
+-	int eventId;
++	QDateTime date;
+ 	QString findStr;
+ 	PsiEvent::Ptr event;
+ 
+-	QDateTime first, last;
+ 	enum Type {
+-		Type_getLatest = 0,
+-		Type_getOldest,
+ 		Type_get,
+ 		Type_append,
+ 		Type_find,
+-		Type_getByDate,
+ 		Type_erase
+ 	};
+ };
+@@ -332,8 +301,8 @@ public:
+ 	QList<item_file_req*> rlist;
+ };
+ 
+-EDBFlatFile::EDBFlatFile()
+-:EDB()
++EDBFlatFile::EDBFlatFile(PsiCon *psi)
++:EDB(psi)
+ {
+ 	d = new Private;
+ }
+@@ -347,64 +316,23 @@ EDBFlatFile::~EDBFlatFile()
+ 	delete d;
+ }
+ 
+-int EDBFlatFile::getLatest(const Jid &j, int len)
+-{
+-	item_file_req *r = new item_file_req;
+-	r->j = j;
+-	r->type = item_file_req::Type_getLatest;
+-	r->len = len < 1 ? 1: len;
+-	r->id = genUniqueId();
+-	d->rlist.append(r);
+-
+-	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
+-	return r->id;
+-}
+-
+-int EDBFlatFile::getOldest(const Jid &j, int len)
+-{
+-	item_file_req *r = new item_file_req;
+-	r->j = j;
+-	r->type = item_file_req::Type_getOldest;
+-	r->len = len < 1 ? 1: len;
+-	r->id = genUniqueId();
+-	d->rlist.append(r);
+-
+-	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
+-	return r->id;
+-}
+-
+-int EDBFlatFile::get(const Jid &j, const QString &id, int direction, int len)
++int EDBFlatFile::get(const QString &/*accId*/, const Jid &j, const QDateTime date, int direction, int start, int len)
+ {
+ 	item_file_req *r = new item_file_req;
+ 	r->j = j;
+ 	r->type = item_file_req::Type_get;
++	r->start = start;
+ 	r->len = len < 1 ? 1: len;
+ 	r->dir = direction;
+-	r->eventId = id.toInt();
+-	r->id = genUniqueId();
+-	d->rlist.append(r);
+-
+-	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
+-	return r->id;
+-}
+-
+-
+-int EDBFlatFile::getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last)
+-{
+-	item_file_req *r = new item_file_req;
+-	r->j = jid;
+-	r->type = item_file_req::Type_getByDate;
+-	r->len = 1;
++	r->date = date;
+ 	r->id = genUniqueId();
  	d->rlist.append(r);
+-	r->first = first;
+-	r->last = last;
  
  	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+
  	return r->id;
  }
  
-@@ -968,3 +981,689 @@ QString EDBFlatFile::File::eventToLine(P
- 	
+-int EDBFlatFile::find(const QString &str, const Jid &j, const QString &id, int direction)
++int EDBFlatFile::find(const QString &/*accId*/, const QString &str, const Jid &j, const QDateTime date, int direction)
+ {
+ 	item_file_req *r = new item_file_req;
+ 	r->j = j;
+@@ -412,7 +340,7 @@ int EDBFlatFile::find(const QString &str
+ 	r->len = 1;
+ 	r->dir = direction;
+ 	r->findStr = str;
+-	r->eventId = id.toInt();
++	r->date = date;
+ 	r->id = genUniqueId();
+ 	d->rlist.append(r);
+ 
+@@ -420,8 +348,10 @@ int EDBFlatFile::find(const QString &str
+ 	return r->id;
+ }
+ 
+-int EDBFlatFile::append(const Jid &j, const PsiEvent::Ptr &e)
++int EDBFlatFile::append(const QString &/*accId*/, const Jid &j, const PsiEvent::Ptr &e, int type)
+ {
++	if (type != EDB::Contact)
++		return 0;
+ 	item_file_req *r = new item_file_req;
+ 	r->j = j;
+ 	r->type = item_file_req::Type_append;
+@@ -438,7 +368,7 @@ int EDBFlatFile::append(const Jid &j, co
+ 	return r->id;
+ }
+ 
+-int EDBFlatFile::erase(const Jid &j)
++int EDBFlatFile::erase(const QString &/*accId*/, const Jid &j)
+ {
+ 	item_file_req *r = new item_file_req;
+ 	r->j = j;
+@@ -450,6 +380,22 @@ int EDBFlatFile::erase(const Jid &j)
+ 	return r->id;
+ }
+ 
++QList<EDB::ContactItem> EDBFlatFile::contacts(const QString &/*accId*/, int type)
++{
++	return File::contacts(type);
++}
++
++quint64 EDBFlatFile::eventsCount(const QString &accId, const XMPP::Jid &jid)
++{
++	quint64 res = 0;
++	if (!jid.isEmpty())
++		res = ensureFile(jid)->total();
++	else
++		foreach (const ContactItem &ci, contacts(accId, Contact))
++			res += ensureFile(ci.jid)->total();
++	return res;
++}
++
+ EDBFlatFile::File *EDBFlatFile::findFile(const Jid &j) const
+ {
+ 	foreach(File* i, d->flist) {
+@@ -503,25 +449,10 @@ void EDBFlatFile::performRequests()
+ 
+ 	File *f = ensureFile(r->j);
+ 	int type = r->type;
+-	if(type >= item_file_req::Type_getLatest && type <= item_file_req::Type_get) {
+-		int id, direction;
++	if(type == item_file_req::Type_get) {
+ 
+-		if(type == item_file_req::Type_getLatest) {
+-			direction = Backward;
+-			id = f->total()-1;
+-		}
+-		else if(type == item_file_req::Type_getOldest) {
+-			direction = Forward;
+-			id = 0;
+-		}
+-		else if(type == item_file_req::Type_get) {
+-			direction = r->dir;
+-			id = r->eventId;
+-		}
+-		else {
+-			qWarning("EDBFlatFile::performRequests(): Invalid type.");
+-			return;
+-		}
++		int direction = r->dir;
++		int id = f->getId(r->date, direction, r->start);
+ 
+ 		int len;
+ 		if(direction == Forward) {
+@@ -538,15 +469,11 @@ void EDBFlatFile::performRequests()
+ 		}
+ 
+ 		EDBResult result;
++		int startId = id;
+ 		for(int n = 0; n < len; ++n) {
+ 			PsiEvent::Ptr e(f->get(id));
+ 			if(e) {
+-				QString prevId, nextId;
+-				if(id > 0)
+-					prevId = QString::number(id-1);
+-				if(id < f->total()-1)
+-					nextId = QString::number(id+1);
+-				EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
++				EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id)));
+ 				result.append(ei);
+ 			}
+ 
+@@ -555,30 +482,26 @@ void EDBFlatFile::performRequests()
+ 			else
+ 				--id;
+ 		}
+-		resultReady(r->id, result);
++		if (direction == Backward)
++			startId = id + 1;
++		resultReady(r->id, result, startId);
+ 	}
+ 	else if(type == item_file_req::Type_append) {
+ 		writeFinished(r->id, f->append(r->event));
+ 	}
+ 	else if(type == item_file_req::Type_find) {
+-		int id = r->eventId;
++		int id = f->getId(r->date, r->dir, r->start);
+ 		EDBResult result;
+ 		while(1) {
+ 			PsiEvent::Ptr e(f->get(id));
+ 			if(!e)
+ 				break;
+ 
+-			QString prevId, nextId;
+-			if(id > 0)
+-				prevId = QString::number(id-1);
+-			if(id < f->total()-1)
+-				nextId = QString::number(id+1);
+-
+ 			if(e->type() == PsiEvent::Message) {
+ 				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
+ 				const Message &m = me->message();
+ 				if(m.body().indexOf(r->findStr, 0, Qt::CaseInsensitive) != -1) {
+-					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
++					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id)));
+ 					result.append(ei);
+ 					//commented line below to return ALL(instead of just first) messages that contain findStr
+ 					//break;
+@@ -590,40 +513,17 @@ void EDBFlatFile::performRequests()
+ 			else
+ 				--id;
+ 		}
+-		resultReady(r->id, result);
+-	}
+-	else if(type == item_file_req::Type_getByDate ) {
+-		int id = 0;
+-		EDBResult result;
+-		for (int i=0; i < f->total(); ++i) {
+-			PsiEvent::Ptr e(f->get(id));
+-			if(!e)
+-				continue;
+-
+-			QString prevId, nextId;
+-			if(id > 0)
+-				prevId = QString::number(id-1);
+-			if(id < f->total()-1)
+-				nextId = QString::number(id+1);
+-
+-			if(e->type() == PsiEvent::Message) {
+-				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
+-				const Message &m = me->message();
+-				if(m.timeStamp() > r->first && m.timeStamp() < r->last ) {
+-					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
+-					result.append(ei);
+-				}
+-			}
+-
+-			++id;
+-		}
+-		resultReady(r->id, result);
++		resultReady(r->id, result, 0);
+ 	}
+ 
+ 	else if(type == item_file_req::Type_erase) {
+ 		writeFinished(r->id, deleteFile(f->j));
+ 	}
+ 
++	else {
++		qWarning("EDBFlatFile::performRequests(): Invalid type.");
++	}
++
+ 	delete r;
+ }
+ 
+@@ -676,7 +576,28 @@ EDBFlatFile::File::~File()
+ 
+ QString EDBFlatFile::File::jidToFileName(const XMPP::Jid &j)
+ {
+-	return ApplicationInfo::historyDir() + "/" + JIDUtil::encode(j.bare()).toLower() + ".history";
++	return ApplicationInfo::historyDir() + "/" + strToFileName(JIDUtil::encode(j.bare()).toLower());
++}
++
++QString EDBFlatFile::File::strToFileName(const QString &s)
++{
++	QFileInfo fi(s);
++	return fi.fileName() + ".history";
++}
++
++QList<EDB::ContactItem> EDBFlatFile::File::contacts(int type)
++{
++	QList<ContactItem> res;
++	if (type == EDB::Contact) {
++		QDir dir(ApplicationInfo::historyDir() + "/");
++		QFileInfoList flist = dir.entryInfoList(QStringList(strToFileName("*")), QDir::Files);
++		foreach (const QFileInfo &fi, flist) {
++			XMPP::Jid jid(JIDUtil::decode(fi.completeBaseName()));
++			if (jid.isValid())
++				res.append(ContactItem("", jid));
++		}
++	}
++	return res;
+ }
+ 
+ void EDBFlatFile::File::ensureIndex()
+@@ -728,6 +649,59 @@ int EDBFlatFile::File::total() const
+ 	return d->index.size();
+ }
+ 
++int EDBFlatFile::File::getId(QDateTime &date, int dir, int offset)
++{
++	if (date.isNull()) {
++		if (dir == EDBFlatFile::Forward)
++			return offset;
++		if (offset >= total())
++			return 0;
++		return total() - offset - 1;
++	}
++	ensureIndex();
++	int id = findIdByNearDate(date, 0, total()-1);
++	if (id != -1) {
++		QDateTime fDate = getLineDate(getLine(id));
++		if (dir == EDBFlatFile::Forward) {
++			if (fDate < date)
++				++id;
++			id += offset;
++		} else {
++			if (fDate > date)
++				--id;
++			id -= offset;
++		}
++		if (id >= total())
++			id = total() - 1;
++		else if (id < 0)
++			id = 0;
++	}
++	return id;
++}
++
++int EDBFlatFile::File::findIdByNearDate(QDateTime &date, int start, int end)
++{
++	if (start == end)
++		return start;
++
++	int middle = (end - start) / 2;
++	const QDateTime mDate = getLineDate(getLine(start + middle));
++	if (!mDate.isValid())
++		return -1;
++
++	if (mDate == date)
++		return start + middle;
++	if (middle == 0) {
++		const QDateTime mDate2 = getLineDate(getLine(end));
++		if (!mDate2.isValid())
++			return -1;
++		return (abs(date.secsTo(mDate)) < abs(date.secsTo(mDate2))) ? start : end;
++	}
++	if (mDate > date)
++		return findIdByNearDate(date, start, start + middle);
++	return findIdByNearDate(date, start + middle, end);
++}
++
+ void EDBFlatFile::File::touch()
+ {
+ 	t->start(30000);
+@@ -738,24 +712,30 @@ void EDBFlatFile::File::timer_timeout()
+ 	timeout();
+ }
+ 
+-PsiEvent::Ptr EDBFlatFile::File::get(int id)
++QString EDBFlatFile::File::getLine(int id)
+ {
+ 	touch();
+ 
+ 	if(!valid)
+-		return PsiEvent::Ptr();
++		return QString();
+ 
+ 	ensureIndex();
+ 	if(id < 0 || id >= (int)d->index.size())
+-		return PsiEvent::Ptr();
++		return QString();
+ 
+ 	f.seek(d->index[id]);
+ 
+ 	QTextStream t;
+ 	t.setDevice(&f);
+ 	t.setCodec("UTF-8");
+-	QString line = t.readLine();
++	return t.readLine();
++}
+ 
++PsiEvent::Ptr EDBFlatFile::File::get(int id)
++{
++	QString line = getLine(id);
++	if (line.isEmpty())
++		return PsiEvent::Ptr();
+ 	return lineToEvent(line);
+ }
+ 
+@@ -788,6 +768,13 @@ bool EDBFlatFile::File::append(const Psi
+ 	return true;
+ }
+ 
++QDateTime EDBFlatFile::File::getLineDate(const QString &line) const
++{
++	int x1 = line.indexOf('|') + 1;
++	int x2 = line.indexOf('|', x1);
++	return QDateTime::fromString(line.mid(x1, x2 - x1), Qt::ISODate);
++}
++
+ PsiEvent::Ptr EDBFlatFile::File::lineToEvent(const QString &line)
+ {
+ 	// -- read the line --
+@@ -966,3 +953,811 @@ QString EDBFlatFile::File::eventToLine(c
+ 
  	return "";
  }
 +
@@ -43,7 +1320,7 @@
 +// EDBSqLite
 +//----------------------------------------------------------------------------
 +
-+EDBSqLite::EDBSqLite() : EDB(),
++EDBSqLite::EDBSqLite(PsiCon *psi) : EDB(psi),
 +	transactionsCounter(0),
 +	lastCommitTime(QDateTime::currentDateTime()),
 +	commitTimer(NULL),
@@ -54,28 +1331,55 @@
 +	QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "history");
 +	db.setDatabaseName(path);
 +	if (!db.open()) {
-+		qWarning("EDBSqLite::EDBSqLite(): Can't open base.\n" + db.lastError().text().toAscii());
++		qWarning("EDBSqLite::EDBSqLite(): Can't open base.\n" + db.lastError().text().toLatin1());
 +		return;
 +	}
++	QSqlQuery query(db);
++	query.exec("PRAGMA foreign_keys = ON;");
 +	setInsertingMode(Normal);
 +	if (db.tables(QSql::Tables).size() == 0) {
 +		// no tables found.
 +		if (db.transaction()) {
-+			QSqlQuery query(db);
-+			query.exec("CREATE TABLE `jids` (`id` INTEGER PRIMARY KEY ASC, `type` INTEGER, `jid` TEXT);");
-+			query.exec("CREATE TABLE `events` (`id` INTEGER PRIMARY KEY ASC AUTOINCREMENT, `jid_id` INTEGER, `date` TEXT, `type` INTEGER, `direction` INTEGER,  `flags` INTEGER, `subject` TEXT, `m_text` TEXT, `lang` TEXT);");
-+			query.exec("CREATE TABLE `urls` (`event_id` INTEGER, `url` TEXT, `desc` TEXT);");
-+			query.exec("CREATE INDEX `jid` ON `jids` (`jid`);");
-+			query.exec("CREATE INDEX `jid_id` ON `events` (`jid_id`);");
++			query.exec("CREATE TABLE `system` ("
++				"`key` TEXT, "
++				"`value` TEXT"
++				");");
++			query.exec("CREATE TABLE `accounts` ("
++				"`id` TEXT, "
++				"`lifetime` INTEGER"
++				");");
++			query.exec("CREATE TABLE `contacts` ("
++				"`id` INTEGER NOT NULL PRIMARY KEY ASC, "
++				"`acc_id` TEXT, "
++				"`type` INTEGER, "
++				"`jid` TEXT, "
++				"`lifetime` INTEGER"
++				");");
++			query.exec("CREATE TABLE `events` ("
++				"`id` INTEGER NOT NULL PRIMARY KEY ASC, "
++				"`contact_id` INTEGER NOT NULL REFERENCES `contacts`(`id`) ON DELETE CASCADE, "
++				"`resource` TEXT, "
++				"`date` TEXT, "
++				"`type` INTEGER, "
++				"`direction` INTEGER, "
++				"`subject` TEXT, "
++				"`m_text` TEXT, "
++				"`lang` TEXT, "
++				"`extra_data` TEXT"
++				");");
++			query.exec("CREATE INDEX `key` ON `system` (`key`);");
++			query.exec("CREATE INDEX `jid` ON `contacts` (`jid`);");
++			query.exec("CREATE INDEX `contact_id` ON `events` (`contact_id`);");
 +			query.exec("CREATE INDEX `date` ON `events` (`date`);");
-+			query.exec("CREATE INDEX `event_id` ON `urls` (`event_id`);");
 +			if (db.commit()) {
 +				status = Commited;
++				setStorageParam("version", "0.1");
++				setStorageParam("import_start", "yes");
 +			}
 +		}
-+	} else {
-+		status = Commited;
 +	}
++	else
++		status = Commited;
 +}
 +
 +EDBSqLite::~EDBSqLite()
@@ -89,112 +1393,166 @@
 +	QSqlDatabase::removeDatabase("history");
 +}
 +
-+int EDBSqLite::getLatest(const XMPP::Jid & jid, int len)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_getLatest;
-+	r->len = len < 1 ? 1 : len;
-+	r->id = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
-+}
-+
-+int EDBSqLite::getOldest(const XMPP::Jid &jid, int len)
++bool EDBSqLite::init()
 +{
-+	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_getOldest;
-+	r->len = len < 1 ? 1 : len;
-+	r->id = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
-+}
++	if (status == NotActive)
++		return false;
 +
-+int EDBSqLite::get(const XMPP::Jid &jid, const QString &id, int direction, int len)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_get;
-+	r->len = len < 1 ? 1 : len;
-+	r->dir = direction;
-+	r->eventId = id;
-+	r->id = genUniqueId();
-+	rlist.append(r);
++	if (!getStorageParam("import_start").isEmpty()) {
++		if (!importExecute()) {
++			status = NotActive;
++			return false;
++		}
++	}
 +
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
++	setMirror(new EDBFlatFile(psi()));
++	return true;
 +}
 +
-+int EDBSqLite::getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last)
++int EDBSqLite::get(const QString &accId, const XMPP::Jid &jid, QDateTime date, int direction, int start, int len)
 +{
 +	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_getByDate;
-+	r->len = 1;
-+	r->id = genUniqueId();
-+	r->first = first;
-+	r->last = last;
++	r->accId = accId;
++	r->j     = jid;
++	r->type  = item_query_req::Type_get;
++	r->start = start;
++	r->len   = len < 1 ? 1 : len;
++	r->dir   = direction;
++	r->date  = date;
++	r->id    = genUniqueId();
 +	rlist.append(r);
 +
 +	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
 +	return r->id;
 +}
 +
-+int EDBSqLite::find(const QString &str, const XMPP::Jid &jid, const QString &id, int direction)
++int EDBSqLite::find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction)
 +{
 +	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_find;
-+	r->len = 1;
-+	r->dir = direction;
++	r->accId   = accId;
++	r->j       = jid;
++	r->type    = item_query_req::Type_find;
++	r->len     = 1;
++	r->dir     = direction;
 +	r->findStr = str;
-+	r->eventId = id;
-+	r->id = genUniqueId();
++	r->date    = date;
++	r->id      = genUniqueId();
 +	rlist.append(r);
 +
 +	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
 +	return r->id;
 +}
 +
-+int EDBSqLite::append(const XMPP::Jid &jid, PsiEvent *e)
++int EDBSqLite::append(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int type)
 +{
 +	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_file_req::Type_append;
-+	r->event = e->copy();
++	r->accId   = accId;
++	r->j       = jid;
++	r->jidType = type;
++	r->type    = item_file_req::Type_append;
++	r->event   = e;
 +	if ( !r->event ) {
 +		qWarning("EDBSqLite::append(): Attempted to append incompatible type.");
 +		delete r;
 +		return 0;
 +	}
-+	r->id = genUniqueId();
++	r->id      = genUniqueId();
 +	rlist.append(r);
 +
 +	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
 +
 +	if (mirror_)
-+		mirror_->append(jid, e);
++		mirror_->append(accId, jid, e, type);
 +
 +	return r->id;
 +}
 +
-+int EDBSqLite::erase(const XMPP::Jid &jid)
++int EDBSqLite::erase(const QString &accId, const XMPP::Jid &jid)
 +{
 +	item_query_req *r = new item_query_req;
-+	r->j = jid;
-+	r->type = item_query_req::Type_erase;
-+	r->id = genUniqueId();
++	r->accId = accId;
++	r->j     = jid;
++	r->type  = item_query_req::Type_erase;
++	r->id    = genUniqueId();
 +	rlist.append(r);
 +
 +	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
 +	return r->id;
 +}
 +
++QList<EDB::ContactItem> EDBSqLite::contacts(const QString &accId, int type)
++{
++	QList<ContactItem> res;
++	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryContactsList, accId.isEmpty(), true);
++	query->bindValue(":type", type);
++	if (!accId.isEmpty())
++		query->bindValue(":acc_id", accId);
++	if (query->exec()) {
++		while (query->next()) {
++			const QSqlRecord &rec = query->record();
++			res.append(ContactItem(rec.value("acc_id").toString(), XMPP::Jid(rec.value("jid").toString())));
++		}
++		query->freeResult();
++	}
++	return res;
++}
++
++quint64 EDBSqLite::eventsCount(const QString &accId, const XMPP::Jid &jid)
++{
++	quint64 res = 0;
++	bool fAccAll  = accId.isEmpty();
++	bool fContAll = jid.isEmpty();
++	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryRowCount, fAccAll, fContAll);
++	if (!fAccAll)
++		query->bindValue(":acc_id", accId);
++	if (!fContAll)
++		query->bindValue(":jid", jid.full());
++	if (query->exec()) {
++		if (query->next())
++			res = query->record().value("count").toULongLong();
++		query->freeResult();
++	}
++	return res;
++}
++
++QString EDBSqLite::getStorageParam(const QString &key)
++{
++	QSqlQuery query(QSqlDatabase::database("history"));
++	query.prepare("SELECT `value` FROM `system` WHERE `key` = :key;");
++	query.bindValue(":key", key);
++	if (query.exec() && query.next())
++		return query.record().value("value").toString();
++	return QString();
++}
++
++void EDBSqLite::setStorageParam(const QString &key, const QString &val)
++{
++	transaction(true);
++	QSqlQuery query(QSqlDatabase::database("history"));
++	if (val.isEmpty()) {
++		query.prepare("DELETE FROM `system` WHERE `key` = :key;");
++		query.bindValue(":key", key);
++		query.exec();
++	}
++	else {
++		query.prepare("SELECT COUNT(*) AS `count` FROM `system` WHERE `key` = :key;");
++		query.bindValue(":key", key);
++		if (query.exec() && query.next() && query.record().value("count").toULongLong() != 0) {
++			query.prepare("UPDATE `system` SET `value` = :val WHERE `key` = :key;");
++			query.bindValue(":key", key);
++			query.bindValue(":val", val);
++			query.exec();
++		}
++		else {
++			query.prepare("INSERT INTO `system` (`key`, `value`) VALUES (:key, :val);");
++			query.bindValue(":key", key);
++			query.bindValue(":val", val);
++			query.exec();
++		}
++	}
++	commit();
++}
++
 +void EDBSqLite::setInsertingMode(InsertMode mode)
 +{
 +	// in the case of a flow of new records
@@ -231,187 +1589,123 @@
 +{
 +	if (rlist.isEmpty())
 +		return;
++
 +	item_query_req *r = rlist.takeFirst();
 +	const int type = r->type;
++
 +	if (type == item_query_req::Type_append) {
-+		bool b = appendEvent(r->j, r->event);
++		bool b = appendEvent(r->accId, r->j, r->event, r->jidType);
 +		writeFinished(r->id, b);
-+		delete r->event;
 +	}
-+	else if (type >= item_query_req::Type_getLatest && type <= item_query_req::Type_get) {
++
++	else if (type == item_query_req::Type_get) {
 +		commit();
-+		PreparedQueryes::QueryType queryType;
-+		if (type == item_query_req::Type_getLatest) {
-+			queryType = PreparedQueryes::QueryLatest;
-+		} else if (type == item_query_req::Type_getOldest) {
-+			queryType = PreparedQueryes::QueryOldest;
-+		} else if (type == item_query_req::Type_get) {
++		bool fContAll = r->j.isEmpty();
++		bool fAccAll  = r->accId.isEmpty();
++		QueryType queryType;
++		if (r->date.isNull()) {
++			if (r->dir == Forward)
++				queryType = QueryOldest;
++			else
++				queryType = QueryLatest;
++		} else {
 +			if (r->dir == Backward)
-+				queryType = PreparedQueryes::QueryIdBackward;
++				queryType = QueryDateBackward;
 +			else
-+				queryType = PreparedQueryes::QueryIdForward;
++				queryType = QueryDateForward;
 +		}
-+		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(queryType);
-+		QString sJid = r->j.bare();
-+		const int len = r->len + 1;
-+		query->bindValue(":jid", sJid);
-+		if (type == item_query_req::Type_get)
-+			query->bindValue(":id", r->eventId);
-+		query->bindValue(":cnt", len);
++		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(queryType, fAccAll, fContAll);
++		if (!fContAll)
++			query->bindValue(":jid", r->j.full());
++		if (!fAccAll)
++			query->bindValue(":acc_id", r->accId);
++		if (!r->date.isNull())
++			query->bindValue(":date", r->date);
++		query->bindValue(":start", r->start);
++		query->bindValue(":cnt", r->len);
 +		EDBResult result;
 +		if (query->exec()) {
-+			EDBItem *ei = NULL;
-+			int i = 0;
-+			const bool fForward = (queryType == PreparedQueryes::QueryOldest
-+					       || queryType == PreparedQueryes::QueryIdForward);
 +			while (query->next()) {
-+				++i;
-+				QString id = query->value(0).toString();
-+				if (i == len) {
-+					if (ei) {
-+						if (fForward)
-+							ei->setNextId(id);
-+						else
-+							ei->setPrevId(id);
-+					}
-+					break;
-+
-+				}
-+				PsiEvent *e = getEvent(query);
++				PsiEvent::Ptr e(getEvent(query->record()));
 +				if (e) {
-+					QString prevId, nextId;
-+					if (ei) {
-+						if (fForward) {
-+							ei->setNextId(id);
-+							prevId = ei->id();
-+						} else {
-+							ei->setPrevId(id);
-+							nextId = ei->id();
-+						}
-+					}
-+					ei = new EDBItem(e, id, prevId, nextId);
-+					result.append(EDBItemPtr(ei));
++					QString id = query->record().value("id").toString();
++					result.append(EDBItemPtr(new EDBItem(e, id)));
 +				}
 +			}
 +			query->freeResult();
-+			if (type == item_query_req::Type_get && !result.isEmpty()) {
-+				query = queryes.getPreparedQuery(fForward ? PreparedQueryes::QueryId2Forward : PreparedQueryes::QueryId2Backward);
-+				query->bindValue(":jid", sJid);
-+				query->bindValue(":id", r->eventId);
-+				if (query->exec() && query->next()) {
-+					if (fForward)
-+						result.first()->setPrevId(query->value(0).toString());
-+					else
-+						result.first()->setNextId(query->value(0).toString());
-+					query->freeResult();
-+				}
-+			}
 +		}
-+		resultReady(r->id, result);
-+	} else if(type == item_file_req::Type_getByDate ) {
-+		commit();
-+		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(PreparedQueryes::QueryDate1);
-+		QString jidStr = r->j.bare();
-+		query->bindValue(":jid", jidStr);
-+		query->bindValue(":date1", r->first);
-+		query->bindValue(":date2", r->last);
-+		EDBResult result;
-+		if (query->exec()) {
-+			EDBItem *ei = NULL;
-+			while (query->next()) {
-+				QString id = query->value(0).toString();
-+				PsiEvent *e = getEvent(query);
-+				if (e) {
-+					QString prevId;
-+					if (ei) {
-+						prevId = ei->id();
-+						ei->setNextId(id);
-+					}
-+					ei = new EDBItem(e, id, prevId, QString());
-+					EDBItemPtr eip = EDBItemPtr(ei);
-+					result.append(eip);
-+				}
-+			}
-+			query->freeResult();
-+			if (!result.isEmpty()) {
-+				query = queryes.getPreparedQuery(PreparedQueryes::QueryDate2);
-+				query->bindValue(":jid", jidStr);
-+				query->bindValue(":date", r->first);
-+				if (query->exec()) {
-+					if (query->next()) {
-+						result.first()->setPrevId(query->value(0).toString());
-+					}
-+				}
-+				query->freeResult();
-+				query = queryes.getPreparedQuery(PreparedQueryes::QueryDate3);
-+				query->bindValue(":jid", jidStr);
-+				query->bindValue(":date", r->last);
-+				if (query->exec() && query->next()) {
-+					result.last()->setNextId(query->value(0).toString());
-+				}
-+				query->freeResult();
++		int beginRow;
++		if (r->dir == Forward && r->date.isNull()) {
++			beginRow = r->start;
++		} else {
++			int cnt = rowCount(r->accId, r->j, r->date);
++			if (r->dir == Backward) {
++				beginRow = cnt - r->len + 1;
++				if (beginRow < 0)
++					beginRow = 0;
++			} else {
++				beginRow = cnt + 1;
 +			}
 +		}
-+		resultReady(r->id, result);
++		resultReady(r->id, result, beginRow);
++
 +	} else if(type == item_file_req::Type_find) {
 +		commit();
-+		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(PreparedQueryes::QueryFindText);
-+		query->bindValue(":jid", r->j.bare());
++		bool fContAll = r->j.isEmpty();
++		bool fAccAll  = r->accId.isEmpty();
++		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryFindText, fAccAll, fContAll);
++		if (!fContAll)
++			query->bindValue(":jid", r->j.bare());
++		if (!fAccAll)
++			query->bindValue(":acc_id", r->accId);
 +		EDBResult result;
 +		if (query->exec()) {
-+			EDBItem *ei = NULL;
 +			QString str = r->findStr.toLower();
 +			while (query->next()) {
-+				QString id = query->value(0).toString();
-+				if (!query->value(7).toString().toLower().contains(str, Qt::CaseSensitive))
++				const QSqlRecord rec = query->record();
++				if (!rec.value("m_text").toString().toLower().contains(str, Qt::CaseSensitive))
 +					continue;
-+				PsiEvent *e = getEvent(query);
++				PsiEvent::Ptr e(getEvent(rec));
 +				if (e) {
-+					QString prevId;
-+					if (ei) {
-+						prevId = ei->id();
-+						ei->setNextId(id);
-+					}
-+					ei = new EDBItem(e, id, prevId, QString());
-+					EDBItemPtr eip = EDBItemPtr(ei);
++					QString id = rec.value("id").toString();
++					EDBItemPtr eip = EDBItemPtr(new EDBItem(e, id));
 +					result.append(eip);
 +				}
 +			}
 +			query->freeResult();
 +		}
-+		resultReady(r->id, result);
++		resultReady(r->id, result, 0);
 +
 +	} else if(type == item_file_req::Type_erase) {
-+		writeFinished(r->id, eraseHistory(r->j));
++		writeFinished(r->id, eraseHistory(r->accId, r->j));
 +	}
++
 +	delete r;
 +}
 +
-+bool EDBSqLite::appendEvent(const XMPP::Jid &jid, PsiEvent *e)
++bool EDBSqLite::appendEvent(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int jidType)
 +{
 +	QSqlDatabase db = QSqlDatabase::database("history");
-+	const qint64 jidId = ensureJidRowId(jid);
-+	if (jidId == 0)
++	const qint64 contactId = ensureJidRowId(accId, jid, jidType);
++	if (contactId == 0)
 +		return false;
++
 +	QDateTime dTime;
 +	int nType = 0;
-+	int nFlags = 0;
++
 +	if (e->type() == PsiEvent::Message) {
-+		MessageEvent *me = (MessageEvent *)e;
++		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
 +		const Message &m = me->message();
 +		dTime = m.timeStamp();
-+		if (!m.subject().isEmpty() || !m.body().isEmpty())
-+			nFlags |= 1;
-+		if (!m.urlList().isEmpty())
-+			nFlags |= 2;
 +		if (m.type() == "chat")
 +			nType = 1;
 +		else if(m.type() == "error")
 +			nType = 4;
 +		else if(m.type() == "headline")
 +			nType = 5;
++
 +	} else if (e->type() == PsiEvent::Auth) {
-+		AuthEvent *ae = (AuthEvent *)e;
++		AuthEvent::Ptr ae = e.staticCast<AuthEvent>();
 +		dTime = ae->timeStamp();
 +		QString subType = ae->authType();
 +		if(subType == "subscribe")
@@ -422,67 +1716,64 @@
 +			nType = 7;
 +		else if(subType == "unsubscribed")
 +			nType = 8;
-+	} else {
++	} else
 +		return false;
-+	}
++
 +	int nDirection = e->originLocal() ? 1 : 2;
 +	if (!transaction(false))
 +		return false;
-+	QSqlQuery query(db);
-+	query.prepare("INSERT INTO `events` (`jid_id`, `date`, `type`, `direction`, `flags`, `subject`, `m_text`, `lang`) VALUES (?, ?, ?, ?, ?, ?, ?, ?);");
-+	query.bindValue(0, jidId);
-+	query.bindValue(1, dTime);
-+	query.bindValue(2, nType);
-+	query.bindValue(3, nDirection);
-+	query.bindValue(4, nFlags);
-+	if (nFlags == 0) {
-+		query.bindValue(5, QVariant(QVariant::String));
-+		query.bindValue(6, QVariant(QVariant::String));
-+		query.bindValue(7, QVariant(QVariant::String));
-+	} else {
-+		MessageEvent *me = (MessageEvent *)e;
++
++	PreparedQuery *query = queryes.getPreparedQuery(QueryInsertEvent, false, false);
++	query->bindValue(":contact_id", contactId);
++	query->bindValue(":resource", (jidType != GroupChatContact) ? jid.resource() : "");
++	query->bindValue(":date", dTime);
++	query->bindValue(":type", nType);
++	query->bindValue(":direction", nDirection);
++	if (nType == 0 || nType == 1 || nType == 4 || nType == 5) {
++		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
 +		const Message &m = me->message();
-+		if (nFlags & 1) {
-+			QString lang = m.lang();
-+			query.bindValue(5, m.subject(lang));
-+			query.bindValue(6, m.body(lang));
-+			query.bindValue(7, lang);
-+		}
-+		if (!query.exec())
-+			return false;
-+		if (nFlags & 2) {
-+			// Getting last record id
-+			qint64 eventId = query.lastInsertId().toLongLong();
-+			// insert into urls table
-+			const UrlList &urls = m.urlList();
-+			foreach (const Url &url, urls) {
-+				query.prepare("INSERT INTO `urls` (`event_id`, `url`, `desc`) VALUES (?, ?, ?);");
-+				query.addBindValue(eventId);
-+				query.addBindValue(url.url());
-+				query.addBindValue(url.desc());
-+				if (!query.exec())
-+					return false;
-+			}
++		QString lang = m.lang();
++		query->bindValue(":subject", m.subject(lang));
++		query->bindValue(":m_text", m.body(lang));
++		query->bindValue(":lang", lang);
++		QString extraData;
++		const UrlList &urls = m.urlList();
++		if (!urls.isEmpty()) {
++			QVariantMap xepList;
++			QVariantList urlList;
++			foreach (const Url &url, urls)
++				if (!url.url().isEmpty()) {
++					QVariantList urlItem;
++					urlItem.append(QVariant(url.url()));
++					if (!url.desc().isEmpty())
++						urlItem.append(QVariant(url.desc()));
++					urlList.append(QVariant(urlItem));
++				}
++			xepList["jabber:x:oob"] = QVariant(urlList);
++			QJson::Serializer serializer;
++			extraData = QString::fromUtf8(serializer.serialize(xepList));
 +		}
++		query->bindValue(":extra_data", extraData);
 +	}
-+	return true;
++	else {
++		query->bindValue(":subject", QVariant(QVariant::String));
++		query->bindValue(":m_text", QVariant(QVariant::String));
++		query->bindValue(":lang", QVariant(QVariant::String));
++		query->bindValue(":extra_data", QVariant(QVariant::String));
++	}
++	bool res = query->exec();
++	return res;
 +}
 +
-+PsiEvent *EDBSqLite::getEvent(PreparedQuery *q)
++PsiEvent::Ptr EDBSqLite::getEvent(const QSqlRecord &record)
 +{
-+	// `events`.`id`       - 0
-+	// `jid`               - 1
-+	// `data`              - 2
-+	// `type`              - 3
-+	// `direction`         - 4
-+	// `flags`             - 5
-+	// `subject`           - 6
-+	// `m_text`            - 7
-+	// `lang`              - 8
-+	int type = q->value(3).toInt();
++	PsiAccount *pa = psi()->contactList()->getAccount(record.value("acc_id").toString());
++
++	int type = record.value("type").toInt();
++
 +	if(type == 0 || type == 1 || type == 4 || type == 5) {
 +		Message m;
-+		m.setTimeStamp(q->value(2).toDateTime());
++		m.setTimeStamp(record.value("date").toDateTime());
 +		if(type == 1)
 +			m.setType("chat");
 +		else if(type == 4)
@@ -491,28 +1782,37 @@
 +			m.setType("headline");
 +		else
 +			m.setType("");
-+		m.setFrom(Jid(q->value(1).toString()));
-+		QVariant text = q->value(7);
++		m.setFrom(Jid(record.value("jid").toString()));
++		QVariant text = record.value("m_text");
 +		if (!text.isNull()) {
 +			m.setBody(text.toString());
-+			m.setLang(q->value(8).toString());
-+			m.setSubject(q->value(6).toString());
++			m.setLang(record.value("lang").toString());
++			m.setSubject(record.value("subject").toString());
 +		}
 +		m.setSpooled(true);
-+		if (q->value(5).toInt() & 2) {
-+			EDBSqLite::PreparedQuery *urlQuery = queryes.getPreparedQuery(PreparedQueryes::QueryUrls);
-+			urlQuery->bindValue(":id", q->value(0));
-+			if (urlQuery->exec()) {
-+				while (urlQuery->next()) {
-+					m.urlAdd(Url(urlQuery->value(0).toString(), urlQuery->value(1).toString()));
++		QString extraStr = record.value("extra_data").toString();
++		if (!extraStr.isEmpty()) {
++			QJson::Parser parser;
++			bool fOk;
++			QVariantMap extraData = parser.parse(extraStr.toUtf8(), &fOk).toMap();
++			if (fOk) {
++				foreach (const QVariant &urlItem, extraData["jabber:x:oob"].toList()) {
++					QVariantList itemList = urlItem.toList();
++					if (!itemList.isEmpty()) {
++						QString url = itemList.at(0).toString();
++						QString desc;
++						if (itemList.size() > 1)
++							desc = itemList.at(1).toString();
++						m.urlAdd(Url(url, desc));
++					}
 +				}
-+				urlQuery->freeResult();
 +			}
 +		}
-+		MessageEvent *me = new MessageEvent(m, 0);
-+		me->setOriginLocal((q->value(4).toInt() == 1));
-+		return me;
++		MessageEvent::Ptr me(new MessageEvent(m, pa));
++		me->setOriginLocal((record.value("direction").toInt() == 1));
++		return me.staticCast<PsiEvent>();
 +	}
++
 +	if(type == 2 || type == 3 || type == 6 || type == 7 || type == 8) {
 +		QString subType = "subscribe";
 +		// if(type == 2) { // Not used (stupid "system message" from Psi <= 0.8.6)
@@ -525,60 +1825,107 @@
 +		else if(type == 8)
 +			subType = "unsubscribed";
 +
-+		AuthEvent *ae = new AuthEvent(Jid(q->value(1).toString()), subType, 0);
-+		ae->setTimeStamp(q->value(2).toDateTime());
-+		return ae;
++		AuthEvent::Ptr ae(new AuthEvent(Jid(record.value("jid").toString()), subType, pa));
++		ae->setTimeStamp(record.value("date").toDateTime());
++		return ae.staticCast<PsiEvent>();
 +	}
-+	return NULL;
++	return PsiEvent::Ptr();
 +}
 +
-+qint64 EDBSqLite::ensureJidRowId(const XMPP::Jid &jid)
++qint64 EDBSqLite::ensureJidRowId(const QString &accId, const XMPP::Jid &jid, int type)
 +{
-+	QString sJid = jid.bare();
-+	if (sJid.isEmpty())
++	if (jid.isEmpty())
 +		return 0;
-+	qint64 id = jidsHash.value(sJid, 0);
++	QString sJid = (type == GroupChatContact) ? jid.full() : jid.bare();
++	QString sKey = accId + "|" + sJid;
++	qint64 id = jidsCache.value(sKey, 0);
 +	if (id != 0)
 +		return id;
 +
-+	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(PreparedQueryes::QueryJidRowId);
++	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryJidRowId, false, false);
 +	query->bindValue(":jid", sJid);
++	query->bindValue(":acc_id", accId);
 +	if (query->exec()) {
 +		if (query->first()) {
-+			id = query->value(0).toLongLong();
++			id = query->record().value("id").toLongLong();
 +		} else {
++			//
 +			QSqlQuery queryIns(QSqlDatabase::database("history"));
-+			queryIns.prepare("INSERT INTO `jids` (`type`, `jid`) VALUES (:type, :jid);");
-+			queryIns.bindValue(":type", 1);  // contact jid
++			queryIns.prepare("INSERT INTO `contacts` (`acc_id`, `type`, `jid`, `lifetime`)"
++				" VALUES (:acc_id, :type, :jid, -1);");
++			queryIns.bindValue(":acc_id", accId);
++			queryIns.bindValue(":type", type);
 +			queryIns.bindValue(":jid", sJid);
 +			if (queryIns.exec()) {
 +				id  = queryIns.lastInsertId().toLongLong();
 +			}
 +		}
 +		query->freeResult();
++		if (id != 0)
++			jidsCache[sKey] = id;
 +	}
 +	return id;
 +}
 +
-+bool EDBSqLite::eraseHistory(const XMPP::Jid &jid)
++int EDBSqLite::rowCount(const QString &accId, const XMPP::Jid &jid, QDateTime before)
++{
++	bool fAccAll  = accId.isEmpty();
++	bool fContAll = jid.isEmpty();
++	QueryType type;
++	if (before.isNull())
++		type = QueryRowCount;
++	else
++		type = QueryRowCountBefore;
++	PreparedQuery *query = queryes.getPreparedQuery(type, fAccAll, fContAll);
++	if (!fContAll)
++		query->bindValue(":jid", jid.full());
++	if (!fAccAll)
++		query->bindValue(":acc_id", accId);
++	if (!before.isNull())
++		query->bindValue(":date", before);
++	int res = 0;
++	if (query->exec()) {
++		if (query->next()) {
++			res = query->record().value("count").toInt();
++		}
++		query->freeResult();
++	}
++	return res;
++}
++
++bool EDBSqLite::eraseHistory(const QString &accId, const XMPP::Jid &jid)
 +{
 +	bool res = false;
 +	if (!transaction(true))
 +		return false;
-+	QSqlQuery query(QSqlDatabase::database("history"));
-+	query.prepare("SELECT `id` FROM `jids` WHERE `jid` = :jid;");
-+	query.bindValue(":jid", jid.bare());
-+	if (query.exec() && query.first()) {
-+		const qint64 id = query.value(0).toLongLong();
-+		QString queryStr = QString("DELETE FROM `urls` WHERE `event_id` IN (SELECT `id` FROM `events` WHERE `jid_id` = :id);");
-+		query.prepare(queryStr);
-+		query.bindValue(":id", id);
-+		if (query.exec()) {
-+			query.prepare("DELETE FROM `events` WHERE `jid_id` = :id;");
-+			query.bindValue(":id", id);
-+			if (query.exec()) {
++
++	if (accId.isEmpty() && jid.isEmpty()) {
++		QSqlQuery query(QSqlDatabase::database("history"));
++		//if (query.exec("DELETE FROM `events`;"))
++			if (query.exec("DELETE FROM `contacts`;")) {
++				jidsCache.clear();
 +				res = true;
 +			}
++	}
++	else {
++		PreparedQuery *query = queryes.getPreparedQuery(QueryJidRowId, false, false);
++		query->bindValue(":jid", jid.full());
++		query->bindValue(":acc_id", accId);
++		if (query->exec() && query->next()) {
++			const qint64 id = query->record().value("id").toLongLong();
++			QSqlQuery query2(QSqlDatabase::database("history"));
++			query2.prepare("DELETE FROM `events` WHERE `contact_id` = :id;");
++			query2.bindValue(":id", id);
++			if (query2.exec()) {
++				res = true;
++				query2.prepare("DELETE FROM `contacts` WHERE `id` = :id AND `lifetime` = -1;");
++				query2.bindValue(":id", id);
++				if (query2.exec()) {
++					if (query2.numRowsAffected() > 0)
++							jidsCache.clear();
++				} else
++					res = false;
++			}
 +		}
 +	}
 +	if (res)
@@ -592,10 +1939,10 @@
 +{
 +	if (status == NotActive)
 +		return false;
-+	if (now || transactionsCounter >= maxUncommitedRecs || lastCommitTime.secsTo(QDateTime::currentDateTime()) >= maxUncommitedSecs) {
++	if (now || transactionsCounter >= maxUncommitedRecs
++			|| lastCommitTime.secsTo(QDateTime::currentDateTime()) >= maxUncommitedSecs)
 +		if (!commit())
 +			return false;
-+	}
 +
 +	if (status == Commited) {
 +		if (!QSqlDatabase::database("history").transaction())
@@ -652,13 +1999,26 @@
 +		commitTimer->stop();
 +}
 +
++bool EDBSqLite::importExecute()
++{
++	bool res = true;
++	HistoryImport *imp = new HistoryImport(psi());
++	if (imp->isNeeded()) {
++		if (imp->exec() != HistoryImport::ResultNormal) {
++			res = false;
++		}
++	}
++	delete imp;
++	return res;
++}
++
 +// ****************** class PreparedQueryes ********************
 +
-+EDBSqLite::PreparedQueryes::PreparedQueryes()
++EDBSqLite::QueryStorage::QueryStorage()
 +{
 +}
 +
-+EDBSqLite::PreparedQueryes::~PreparedQueryes()
++EDBSqLite::QueryStorage::~QueryStorage()
 +{
 +	foreach (EDBSqLite::PreparedQuery *q, queryList.values()) {
 +		if (q)
@@ -666,152 +2026,347 @@
 +	}
 +}
 +
-+EDBSqLite::PreparedQuery *EDBSqLite::PreparedQueryes::getPreparedQuery(QueryType type)
++EDBSqLite::PreparedQuery *EDBSqLite::QueryStorage::getPreparedQuery(QueryType type, bool allAccounts, bool allContacts)
 +{
-+	EDBSqLite::PreparedQuery *q = queryList.value(type, NULL);
++	QueryProperty queryProp(type, allAccounts, allContacts);
++	EDBSqLite::PreparedQuery *q = queryList.value(queryProp, NULL);
 +	if (q != NULL)
 +		return q;
 +
 +	q = new EDBSqLite::PreparedQuery(QSqlDatabase::database("history"));
 +	q->setForwardOnly(true);
-+	QString queryStr;
-+	if (type == QueryDate1) {
-+		queryStr = "SELECT `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `flags`, `subject`, `m_text`, `lang`"
-+			   " FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid  AND `jids`.`id` = `jid_id` AND `date` >= :date1 AND `date` <= :date2 ORDER BY `date` ASC;";
-+	} else if (type == QueryDate2) {
-+		queryStr = "SELECT `events`.`id` FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid AND `jids`.`id` = `jid_id` AND `date` < :date ORDER BY `date` DESC LIMIT 1;";
-+	} else if (type == QueryDate3) {
-+		queryStr = "SELECT `events`.`id` FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid AND `jids`.`id` = `jid_id`  AND `date` > :date ORDER BY `date` ASC LIMIT 1;";
-+	} else if (type == QueryFindText) {
-+		queryStr = "SELECT `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `flags`, `subject`, `m_text`, `lang`"
-+			   " FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid  AND `jids`.`id` = `jid_id` AND `m_text` IS NOT NULL ORDER BY `date`;";
-+	} else if (type == QueryLatest || type == QueryOldest || type == QueryIdBackward || type == QueryIdForward) {
-+		queryStr = "SELECT `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `flags`, `subject`, `m_text`, `lang`"
-+			   " FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid AND `jids`.`id` = `jid_id`";
-+		if (type == QueryIdBackward) {
-+			queryStr.append(" AND `events`.`id` <= :id");
-+		} else if (type == QueryIdForward) {
-+			queryStr.append(" AND `events`.`id` >= :id");
-+		}
-+		if (type == QueryLatest || type == QueryIdBackward) {
-+			queryStr.append(" ORDER BY `events`.`id` DESC");
-+		} else {
-+			queryStr.append(" ORDER BY `events`.`id` ASC");
-+		}
-+		queryStr.append(" LIMIT :cnt;");
-+	} else if (type == QueryId2Backward || type == QueryId2Forward) {
-+		queryStr = "SELECT `events`.`id` FROM `events`, `jids`"
-+			   " WHERE `jid` = :jid AND `jids`.`id` = `jid_id`";
-+		queryStr.append(QString(" AND `events`.`id` %1 :id").arg((type == QueryId2Forward) ? "<" : ">"));
-+		queryStr.append(QString(" ORDER BY `events`.`id` %1").arg((type == QueryId2Forward) ? "DESC" : "ASC"));
-+		queryStr.append(" LIMIT 1;");
-+	} else if (type == QueryUrls) {
-+		queryStr = "SELECT `url`, `desc` FROM `urls` WHERE `event_id` = :id;";
-+	} else if (type == QueryJidRowId) {
-+		queryStr = "SELECT `id` FROM `jids` WHERE `jid` = :jid;";
-+	}
-+	q->prepare(queryStr);
-+
-+	queryList[type] = q;
++	q->prepare(getQueryString(type, allAccounts, allContacts));
++	queryList[queryProp] = q;
 +	return q;
 +}
 +
 +EDBSqLite::PreparedQuery::PreparedQuery(QSqlDatabase db) : QSqlQuery(db)
 +{
 +}
---- psi.orig/src/eventdb.h
-+++ psi/src/eventdb.h
-@@ -26,6 +26,10 @@
++
++QString EDBSqLite::QueryStorage::getQueryString(QueryType type, bool allAccounts, bool allContacts)
++{
++	QString queryStr;
++	switch (type)
++	{
++		case QueryContactsList:
++			queryStr = "SELECT `acc_id`, `jid` FROM `contacts` WHERE `type` = :type";
++			if (!allAccounts)
++				queryStr.append(" AND `acc_id` = :acc_id");
++			queryStr.append(" ORDER BY `jid`;");
++			break;
++		case QueryLatest:
++		case QueryOldest:
++		case QueryDateBackward:
++		case QueryDateForward:
++			queryStr = "SELECT `acc_id`, `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
++				" FROM `events`, `contacts`"
++				" WHERE `contacts`.`id` = `contact_id`";
++			if (!allContacts)
++				queryStr.append(" AND `jid` = :jid");
++			if (!allAccounts)
++				queryStr.append(" AND `acc_id` = :acc_id");
++			if (type == QueryDateBackward)
++				queryStr.append(" AND `date` < :date");
++			else if (type == QueryDateForward)
++				queryStr.append(" AND `date` >= :date");
++			if (type == QueryLatest || type == QueryDateBackward)
++				queryStr.append(" ORDER BY `date` DESC");
++			else
++				queryStr.append(" ORDER BY `date` ASC");
++			queryStr.append(" LIMIT :start, :cnt;");
++			break;
++		case QueryRowCount:
++		case QueryRowCountBefore:
++			queryStr = "SELECT count(*) AS `count`"
++				" FROM `events`, `contacts`"
++				" WHERE `contacts`.`id` = `contact_id`";
++			if (!allContacts)
++				queryStr.append(" AND `jid` = :jid");
++			if (!allAccounts)
++				queryStr.append(" AND `acc_id` = :acc_id");
++			if (type == QueryRowCountBefore)
++				queryStr.append(" AND `date` < :date");
++			queryStr.append(";");
++			break;
++		case QueryJidRowId:
++			queryStr = "SELECT `id` FROM `contacts` WHERE `jid` = :jid AND acc_id = :acc_id;";
++			break;
++		case QueryFindText:
++			queryStr = "SELECT `acc_id`, `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
++				" FROM `events`, `contacts`"
++				" WHERE `contacts`.`id` = `contact_id`";
++			if (!allContacts)
++				queryStr.append(" AND `jid` = :jid");
++			if (!allAccounts)
++				queryStr.append(" AND `acc_id` = :acc_id");
++			queryStr.append(" AND `m_text` IS NOT NULL");
++			queryStr.append(" ORDER BY `date`;");
++			break;
++		case QueryInsertEvent:
++			queryStr = "INSERT INTO `events` ("
++				"`contact_id`, `resource`, `date`, `type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
++				") VALUES ("
++				":contact_id, :resource, :date, :type, :direction, :subject, :m_text, :lang, :extra_data"
++				");";
++			break;
++	}
++	return queryStr;
++}
++
++uint qHash(const QueryProperty &struc)
++{
++	uint res = struc.type;
++	res <<= 8;
++	res |=  struc.allAccounts;
++	res <<= 8;
++	res |=  struc.allContacts;
++	return res;
++}
+--- git.orig/src/eventdb.h
++++ git/src/eventdb.h
+@@ -26,23 +26,27 @@
  #include <QFile>
  #include <QSharedPointer>
  #include <QDateTime>
 +#include <QSqlDatabase>
 +#include <QSqlQuery>
++#include <QSqlRecord>
 +#include <QHash>
 +#include <QVariant>
  
  #include "xmpp_jid.h"
++#include "psicon.h"
+ #include "psievent.h"
  
-@@ -34,13 +38,15 @@ class PsiEvent;
  class EDBItem
  {
  public:
--	EDBItem(PsiEvent *, const QString &id, const QString &nextId, const QString &prevId);
-+	EDBItem(PsiEvent *, const QString &id, const QString &prevId, const QString &nextId);
+-	EDBItem(const PsiEvent::Ptr &, const QString &id, const QString &nextId, const QString &prevId);
++	EDBItem(const PsiEvent::Ptr &, const QString &id);
  	~EDBItem();
  
- 	PsiEvent *event() const;
+ 	PsiEvent::Ptr event() const;
  	const QString & id() const;
- 	const QString & nextId() const;
- 	const QString & prevId() const;
-+	void setNextId(const QString &id);
-+	void setPrevId(const QString &id);
+-	const QString & nextId() const;
+-	const QString & prevId() const;
  
  private:
- 	QString v_id, v_prevId, v_nextId;
-@@ -189,4 +195,114 @@ private:
- 	void ensureIndex();
+-	QString v_id, v_prevId, v_nextId;
++	QString v_id;
+ 	PsiEvent::Ptr e;
+ };
+ 
+@@ -59,18 +63,16 @@ public:
+ 	~EDBHandle();
+ 
+ 	// operations
+-	void getLatest(const XMPP::Jid &, int len);
+-	void getOldest(const XMPP::Jid &, int len);
+-	void get(const XMPP::Jid &jid, const QString &id, int direction, int len);
+-	void getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
+-	void find(const QString &, const XMPP::Jid &, const QString &id, int direction);
+-	void append(const XMPP::Jid &, const PsiEvent::Ptr &);
+-	void erase(const XMPP::Jid &);
++	void get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int begin, int len);
++	void find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
++	void append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
++	void erase(const QString &accId, const XMPP::Jid &);
+ 
+ 	bool busy() const;
+ 	const EDBResult result() const;
+ 	bool writeSuccess() const;
+ 	int lastRequestType() const;
++	int beginRow() const;
+ 
+ signals:
+ 	void finished();
+@@ -90,20 +92,30 @@ class EDB : public QObject
+ 	Q_OBJECT
+ public:
+ 	enum { Forward, Backward };
+-	EDB();
++	enum { Contact = 1, GroupChatContact = 2 };
++	struct ContactItem
++	{
++		QString   accId;
++		XMPP::Jid jid;
++		ContactItem(const QString &aId, XMPP::Jid j) { accId = aId; jid = j; }
++	};
++
++	EDB(PsiCon *psi);
+ 	virtual ~EDB()=0;
++	virtual QList<ContactItem> contacts(const QString &accId, int type) = 0;
++	virtual quint64 eventsCount(const QString &accId, const XMPP::Jid &jid) = 0;
++	virtual QString getStorageParam(const QString &key) = 0;
++	virtual void setStorageParam(const QString &key, const QString &val) = 0;
+ 
+ protected:
+ 	int genUniqueId() const;
+-	virtual int getLatest(const XMPP::Jid &, int len)=0;
+-	virtual int getOldest(const XMPP::Jid &, int len)=0;
+-	virtual int get(const XMPP::Jid &jid, const QString &id, int direction, int len)=0;
+-	virtual int getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last) = 0;
+-	virtual int append(const XMPP::Jid &, const PsiEvent::Ptr &)=0;
+-	virtual int find(const QString &, const XMPP::Jid &, const QString &id, int direction)=0;
+-	virtual int erase(const XMPP::Jid &)=0;
+-	void resultReady(int, EDBResult);
++	virtual int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len)=0;
++	virtual int append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int)=0;
++	virtual int find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction)=0;
++	virtual int erase(const QString &accId, const XMPP::Jid &)=0;
++	void resultReady(int, EDBResult, int);
+ 	void writeFinished(int, bool);
++	inline PsiCon *psi();
+ 
+ private:
+ 	class Private;
+@@ -113,29 +125,27 @@ private:
+ 	void reg(EDBHandle *);
+ 	void unreg(EDBHandle *);
+ 
+-	int op_getLatest(const XMPP::Jid &, int len);
+-	int op_getOldest(const XMPP::Jid &, int len);
+-	int op_get(const XMPP::Jid &, const QString &id, int direction, int len);
+-	int op_getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
+-	int op_find(const QString &, const XMPP::Jid &, const QString &id, int direction);
+-	int op_append(const XMPP::Jid &, const PsiEvent::Ptr&);
+-	int op_erase(const XMPP::Jid &);
++	int op_get(const QString &accId, const XMPP::Jid &, const QDateTime date, int direction, int start, int len);
++	int op_find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
++	int op_append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
++	int op_erase(const QString &accId, const XMPP::Jid &);
  };
  
+ class EDBFlatFile : public EDB
+ {
+ 	Q_OBJECT
+ public:
+-	EDBFlatFile();
++	EDBFlatFile(PsiCon *psi);
+ 	~EDBFlatFile();
+ 
+-	int getLatest(const XMPP::Jid &, int len);
+-	int getOldest(const XMPP::Jid &, int len);
+-	int get(const XMPP::Jid &jid, const QString &id, int direction, int len);
+-	int getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
+-	int find(const QString &, const XMPP::Jid &, const QString &id, int direction);
+-	int append(const XMPP::Jid &, const PsiEvent::Ptr&);
+-	int erase(const XMPP::Jid &);
++	int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len);
++	int find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
++	int append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
++	int erase(const QString &accId, const XMPP::Jid &);
++	QList<ContactItem> contacts(const QString &accId, int type);
++	quint64 eventsCount(const QString &accId, const XMPP::Jid &jid);
++	QString getStorageParam(const QString &) {return QString();}
++	void setStorageParam(const QString &, const QString &) {}
+ 
+ 	class File;
+ 
+@@ -160,11 +170,14 @@ public:
+ 	~File();
+ 
+ 	int total() const;
++	int getId(QDateTime &date, int dir, int offset);
+ 	void touch();
+ 	PsiEvent::Ptr get(int);
+ 	bool append(const PsiEvent::Ptr &);
+ 
+ 	static QString jidToFileName(const XMPP::Jid &);
++	static QString strToFileName(const QString &);
++	static QList<EDB::ContactItem> contacts(int type);
+ 
+ signals:
+ 	void timeout();
+@@ -186,6 +199,145 @@ private:
+ 	PsiEvent::Ptr lineToEvent(const QString &);
+ 	QString eventToLine(const PsiEvent::Ptr&);
+ 	void ensureIndex();
++	int findIdByNearDate(QDateTime &date, int start, int end);
++	QString getLine(int);
++	QDateTime getLineDate(const QString &line) const;
++};
++
++enum QueryType {
++	QueryContactsList,
++	QueryLatest, QueryOldest,
++	QueryDateForward, QueryDateBackward,
++	QueryFindText,
++	QueryRowCount, QueryRowCountBefore,
++	QueryJidRowId,
++	QueryInsertEvent
++};
++
++struct QueryProperty
++{
++	QueryType type;
++	bool      allAccounts;
++	bool      allContacts;
++	QueryProperty(QueryType tp, bool allAcc, bool allCont) {
++		type        = tp;
++		allAccounts = allAcc;
++		allContacts = allCont;
++	}
++	bool operator==(const QueryProperty &other) const {
++		return (type        == other.type &&
++				allAccounts == other.allAccounts &&
++				allContacts == other.allContacts);
++	}
++};
++uint qHash(const QueryProperty &struc);
++
 +class EDBSqLite : public EDB
 +{
 +	Q_OBJECT
 +
-+	class PreparedQueryes;
++	class QueryStorage;
 +	//--------
 +	class PreparedQuery : private QSqlQuery
 +	{
 +	public:
-+		void bindValue(const QString &placeholder, const QVariant &val) {QSqlQuery::bindValue(placeholder, val);};
-+		bool exec() {return QSqlQuery::exec();};
-+		bool first() {return QSqlQuery::first();};
-+		bool next() {return QSqlQuery::next();};
-+		QVariant value(int i) const {return QSqlQuery::value(i);};
-+		void freeResult() {QSqlQuery::finish();};
++		void bindValue(const QString &placeholder, const QVariant &val) {QSqlQuery::bindValue(placeholder, val);}
++		bool exec() {return QSqlQuery::exec();}
++		bool first() {return QSqlQuery::first();}
++		bool next() {return QSqlQuery::next();}
++		QSqlRecord record() const {return QSqlQuery::record();}
++		void freeResult() {QSqlQuery::finish();}
 +	private:
-+		friend class PreparedQueryes;
++		friend class QueryStorage;
 +		PreparedQuery(QSqlDatabase db);
-+		~PreparedQuery() {};
++		~PreparedQuery() {}
 +
 +	};
 +	//--------
-+	class PreparedQueryes
++	class QueryStorage
 +	{
 +	public:
-+		enum QueryType {
-+			QueryLatest, QueryOldest, QueryIdForward, QueryIdBackward,
-+			QueryId2Forward, QueryId2Backward,
-+			QueryDate1, QueryDate2, QueryDate3,
-+			QueryFindText,
-+			QueryUrls,
-+			QueryJidRowId
-+		};
-+		PreparedQueryes();
-+		~PreparedQueryes();
-+		PreparedQuery *getPreparedQuery(QueryType);
++		QueryStorage();
++		~QueryStorage();
++		PreparedQuery *getPreparedQuery(QueryType type, bool allAccounts, bool allContacts);
++	private:
++		QString getQueryString(QueryType type, bool allAccounts, bool allContacts);
 +	private:
-+		QHash<QueryType, PreparedQuery *> queryList;
++		QHash<QueryProperty, PreparedQuery *> queryList;
 +	};
 +	//--------
 +
 +public:
 +	enum InsertMode {Normal, Import};
 +
-+	EDBSqLite();
++	EDBSqLite(PsiCon *psi);
 +	~EDBSqLite();
++	bool init();
++
++	int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len);
++	int find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction);
++	int append(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int type);
++	int erase(const QString &accId, const XMPP::Jid &jid);
++	QList<ContactItem> contacts(const QString &accId, int type);
++	quint64 eventsCount(const QString &accId, const XMPP::Jid &jid);
++	QString getStorageParam(const QString &key);
++	void setStorageParam(const QString &key, const QString &val);
 +
-+	int getLatest(const XMPP::Jid &, int len);
-+	int getOldest(const XMPP::Jid &, int len);
-+	int get(const XMPP::Jid &jid, const QString &id, int direction, int len);
-+	int getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
-+	int find(const QString &str, const XMPP::Jid &jid, const QString &id, int direction);
-+	int append(const XMPP::Jid &jid, PsiEvent *e);
-+	int erase(const XMPP::Jid &jid);
 +	void setInsertingMode(InsertMode mode);
 +	void setMirror(EDBFlatFile *mirr);
 +	EDBFlatFile *mirror() const;
@@ -820,23 +2375,22 @@
 +	enum {NotActive, NotCommited, Commited};
 +	struct item_query_req
 +	{
++		QString accId;
 +		XMPP::Jid j;
++		int jidType;
 +		int type; // 0 = latest, 1 = oldest, 2 = random, 3 = write
++		int start;
 +		int len;
 +		int dir;
 +		int id;
-+		QString eventId;
++		QDateTime date;
 +		QString findStr;
-+		PsiEvent *event;
++		PsiEvent::Ptr event;
 +
-+		QDateTime first, last;
 +		enum Type {
-+			Type_getLatest = 0,
-+			Type_getOldest,
 +			Type_get,
 +			Type_append,
 +			Type_find,
-+			Type_getByDate,
 +			Type_erase
 +		};
 +	};
@@ -849,88 +2403,840 @@
 +	QTimer *commitTimer;
 +	EDBFlatFile *mirror_;
 +	QList<item_query_req*> rlist;
-+	QHash<QString, qint64>jidsHash;
-+	PreparedQueryes queryes;
++	QHash<QString, qint64>jidsCache;
++	QueryStorage queryes;
 +
 +private:
-+	bool appendEvent(const XMPP::Jid &, PsiEvent *);
-+	PsiEvent *getEvent(PreparedQuery *q);
-+	qint64 ensureJidRowId(const XMPP::Jid &);
-+	bool eraseHistory(const XMPP::Jid &);
++	bool appendEvent(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
++	PsiEvent::Ptr getEvent(const QSqlRecord &record);
++	qint64 ensureJidRowId(const QString &accId, const XMPP::Jid &jid, int type);
++	int  rowCount(const QString &accId, const XMPP::Jid &jid, const QDateTime before);
++	bool eraseHistory(const QString &accId, const XMPP::Jid &);
 +	bool transaction(bool now);
 +	bool rollback();
 +	void startAutocommitTimer();
 +	void stopAutocommitTimer();
++	bool importExecute();
 +
 +private slots:
 +	void performRequests();
 +	bool commit();
 +
-+};
-+
+ };
+ 
  #endif
---- psi.orig/src/historydlg.cpp
-+++ psi/src/historydlg.cpp
-@@ -36,6 +36,7 @@
- #include "fileutil.h"
- #include "userlist.h"
- #include "common.h"
-+#include "historyimp.h"
+--- git.orig/src/historydlg.cpp
++++ git/src/historydlg.cpp
+@@ -101,7 +101,8 @@ public:
+ 	Jid jid;
+ 	PsiAccount *pa;
+ 	PsiCon *psi;
+-	QString id_prev, id_begin, id_end, id_next;
++	int begin_row, end_row;
++	bool can_backward, can_forward;
+ 	HistoryDlg::RequestType reqType;
+ 	QString findStr;
+ 	QDate date;
+@@ -122,10 +123,12 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
+ 	setModal(false);
+ 	d = new Private;
+ 	d->reqType = TypeNone;
+-	d->pa = pa;
++	d->begin_row = 0;
++	d->end_row = -1;
+ 	d->psi = pa->psi();
+ 	d->jid = jid;
+-	d->pa->dialogRegister(this, d->jid);
++	d->pa = pa;
++	pa->dialogRegister(this, d->jid);
+ 
+ #ifndef Q_OS_MAC
+ 	setWindowIcon(IconsetFactory::icon("psi/history").icon());
+@@ -133,7 +136,11 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
+ 	ui_.tb_find->setIcon(IconsetFactory::icon("psi/search").icon());
+ 
+ 	ui_.msgLog->setFont(fontForOption("options.ui.look.font.chat"));
+-	ui_.jidList->setFont(fontForOption("options.ui.look.font.contactlist"));
++	QFont f = fontForOption("options.ui.look.font.contactlist");
++	ui_.jidList->setFont(f);
++	ui_.jidList2->setFont(f);
++	ui_.privList->setFont(f);
++	ui_.advList->setFont(f);
+ 
+ 	ui_.calendar->setFirstDayOfWeek(firstDayOfWeekFromLocale());
+ 
+@@ -142,7 +149,10 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
+ 	connect(ui_.buttonPrevious, SIGNAL(released()), SLOT(getPrevious()));
+ 	connect(ui_.buttonNext, SIGNAL(released()), SLOT(getNext()));
+ 	connect(ui_.buttonRefresh, SIGNAL(released()), SLOT(refresh()));
+-	connect(ui_.jidList, SIGNAL(itemSelectionChanged()), SLOT(openSelectedContact()));
++	connect(ui_.jidList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
++	connect(ui_.jidList2, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
++	connect(ui_.privList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
++	connect(ui_.advList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
+ 	connect(ui_.tb_find, SIGNAL(clicked()), SLOT(findMessages()));
+ 	connect(ui_.buttonLastest, SIGNAL(released()), SLOT(getLatest()));
+ 	connect(ui_.buttonEarliest, SIGNAL(released()), SLOT(getEarliest()));
+@@ -159,16 +169,19 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
+ 	optionUpdated("options.ui.chat.legacy-formatting");
+ 	connect(PsiOptions::instance(), SIGNAL(optionChanged(QString)), SLOT(optionUpdated(QString)));
+ 
+-	connect(d->pa, SIGNAL(removedContact(PsiContact*)), SLOT(removedContact(PsiContact*)));
++	connect(pa, SIGNAL(removedContact(PsiContact*)), SLOT(removedContact(PsiContact*)));
+ 
+ 	ui_.jidList->installEventFilter(this);
++	ui_.jidList2->installEventFilter(this);
++	ui_.privList->installEventFilter(this);
++	ui_.advList->installEventFilter(this);
+ 
+ 	listAccounts();
+ 	loadContacts();
+ 
+ 	setGeometryOptionPath(geometryOption);
+ 
+-	ui_.jidList->setFocus();
++	openSelectedContact();
+ }
+ 
+ HistoryDlg::~HistoryDlg()
+@@ -178,7 +191,7 @@ HistoryDlg::~HistoryDlg()
+ 
+ bool HistoryDlg::eventFilter(QObject *obj, QEvent *e)
+ {
+-	if(obj == ui_.jidList && e->type() == QEvent::ContextMenu) {
++	if((obj == ui_.jidList || obj == ui_.jidList2 || obj == ui_.privList || obj == ui_.advList) && e->type() == QEvent::ContextMenu) {
+ 		e->accept();
+ 		QTimer::singleShot(0, this, SLOT(doMenu()));
+ 		return true;
+@@ -199,72 +212,189 @@ void HistoryDlg::changeAccount(const QSt
+ 	ui_.msgLog->clear();
+ 	setButtons(false);
+ 	d->jid = QString();
+-	d->pa = d->psi->contactList()->getAccountByJid(ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString());
+ 	loadContacts();
+-	ui_.jidList->setCurrentRow(0);
++	setCurrentUserListItem();
+ 	openSelectedContact();
+ }
  
- static const QString geometryOption = "options.ui.history.size";
++void HistoryDlg::setCurrentUserListItem()
++{
++	switch (ui_.contactToolBox->currentIndex()) {
++	case 0:
++		ui_.jidList->setCurrentRow(0);
++		break;
++	case 1:
++		ui_.jidList2->setCurrentRow(0);
++		break;
++	case 2:
++		ui_.privList->setCurrentRow(0);
++		break;
++	case 3:
++		ui_.advList->setCurrentRow(0);
++		break;
++	}
++}
++
+ void HistoryDlg::listAccounts()
+ {
++	ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), tr("All accounts"), QVariant());
+ 	if (d->psi)
+ 	{
+ 		foreach (PsiAccount* account, d->psi->contactList()->enabledAccounts())
+-			ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), account->nameWithJid(), QVariant(account->jid().full()));
++			ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), account->nameWithJid(), QVariant(account->id()));
+ 	}
+ 	//select active account
+-	ui_.accountsBox->setCurrentIndex(ui_.accountsBox->findData(d->pa->jid().full()));
++	ui_.accountsBox->setCurrentIndex(ui_.accountsBox->findData(getCurrentAccountId()));
+ 	//connect signal after the list is populated to prevent execution in the middle of the loop
+ 	connect(ui_.accountsBox, SIGNAL(currentIndexChanged(const QString)), SLOT(changeAccount(const QString)));
+ }
  
-@@ -400,6 +401,8 @@ void HistoryDlg::doMenu()
- 	m->addAction(IconsetFactory::icon("psi/chat").icon(), tr("&Open chat"), this, SLOT(openChat()));
+ void HistoryDlg::loadContacts()
+ {
+-	jids_.clear();
++	QStringList jids;
+ 	ui_.jidList->clear();
++	ui_.jidList2->clear();
++	ui_.privList->clear();
++	ui_.advList->clear();
+ 	ui_.msgLog->clear();
+-	foreach (PsiContact* contact, d->pa->contactList())
+-	{
++	QList<PsiContact*> contactList;
++	QString pa_id = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
++	if (pa_id.isEmpty())
++		contactList = d->psi->contactList()->contacts();
++	else
++		contactList = d->psi->contactList()->getAccount(pa_id)->contactList();
++	// Roster contacts
++	foreach (PsiContact* contact, contactList) {
+ 		if(contact->isConference()
+-		|| contact->isPrivate()
+-		|| jids_.contains(contact->jid().bare()))
++		|| contact->isPrivate())
++			continue;
++		QString contactId = contact->account()->id() + "|" + contact->jid().bare();
++		if (jids.contains(contactId))
+ 			continue;
+ 
+ 		QListWidgetItem *item = new QListWidgetItem(contact->name(), ui_.jidList);
+-		item->setToolTip(contact->jid().bare());
++		item->setToolTip(makeContactToolTip(contact, true));
+ 		item->setIcon(PsiIconset::instance()->statusPtr(contact->jid(),Status(Status::Online))->icon());
+ 		//item->setIcon(PsiIconset::instance()->status(contact->status()).icon());
++		item->setStatusTip(contactId);
+ 		ui_.jidList->addItem(item);
+-		jids_.append(item->toolTip());
++		jids.append(contactId);
++		if (contact->jid().bare() == d->jid.bare()) {
++			ui_.contactToolBox->setCurrentIndex(0);
++			ui_.jidList->setCurrentItem(item);
++		}
+ 	}
+-	PsiContact* self = d->pa->selfContact();
+-	if(!jids_.contains(self->jid().bare())) {
+-		QListWidgetItem *item = new QListWidgetItem(self->name(), ui_.jidList);
+-		item->setToolTip(self->jid().bare());
+-		//item->setIcon(PsiIconset::instance()->status(self->status()).icon());
+-		item->setIcon(PsiIconset::instance()->statusPtr(self->jid(),Status(Status::Online))->icon());
+-		ui_.jidList->addItem(item);
+-		jids_.append(item->toolTip());
++	// Self contact
++	QString currentAccountId = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
++	foreach (PsiAccount *pa, d->psi->contactList()->accounts()) {
++		if (currentAccountId.isEmpty() || pa->id() == currentAccountId)
++		{
++			PsiContact* self = pa->selfContact();
++			QString contactId = pa->id() + "|" + self->jid().bare();
++			if(!jids.contains(contactId)) {
++				QListWidgetItem *item = new QListWidgetItem(self->name(), ui_.jidList);
++				item->setToolTip(makeContactToolTip(self, true));
++				item->setIcon(PsiIconset::instance()->statusPtr(self->jid(),Status(Status::Online))->icon());
++				item->setStatusTip(contactId);
++				ui_.jidList->addItem(item);
++				jids.append(contactId);
++				if (self->jid().bare() == d->jid.bare()) {
++					ui_.contactToolBox->setCurrentIndex(0);
++					ui_.jidList->setCurrentItem(item);
++				}
++			}
++			if (!currentAccountId.isEmpty())
++				break;
++		}
+ 	}
+-
+-	ui_.jidList->sortItems();
+-	//set contact in jidList to selected jid
+-	for (int i = 0; i < ui_.jidList->count(); i++)
++	// Not in roster list
++	foreach (const EDB::ContactItem &ci, d->psi->edb()->contacts(pa_id, EDB::Contact)) {
++		QString contactId = ci.accId + "|" + ci.jid.bare();
++		if (!jids.contains(contactId)) {
++			QListWidgetItem *item = new QListWidgetItem(ci.jid.bare(), ui_.jidList2);
++			item->setToolTip(makeContactToolTip(ci.accId, ci.jid, true));
++			item->setIcon(PsiIconset::instance()->statusPtr(ci.jid, Status(Status::Offline))->icon());
++			item->setStatusTip(contactId);
++			ui_.jidList2->addItem(item);
++			if (ci.jid.bare() == d->jid.bare()) {
++				ui_.contactToolBox->setCurrentIndex(1);
++				ui_.jidList2->setCurrentItem(item);
++			}
++		}
++	}
++	// Private
++	foreach (const EDB::ContactItem &ci, d->psi->edb()->contacts(pa_id, EDB::GroupChatContact)) {
++		QString contactId = ci.accId + "|" + ci.jid.full();
++		QListWidgetItem *item = new QListWidgetItem(ci.jid.resource(), ui_.privList);
++		item->setToolTip(makeContactToolTip(ci.accId, ci.jid, false));
++		item->setIcon(PsiIconset::instance()->statusPtr(ci.jid, Status(Status::Offline))->icon());
++		item->setStatusTip(contactId);
++		ui_.privList->addItem(item);
++		if (ci.jid == d->jid) {
++			ui_.contactToolBox->setCurrentIndex(2);
++			ui_.privList->setCurrentItem(item);
++		}
++	}
++	// Advanced
+ 	{
+-		if (ui_.jidList->item(i)->toolTip() == d->jid.bare().toLower())
+-			ui_.jidList->setCurrentRow(i);  //triggers openSelectedContact()
++		QListWidgetItem *item = new QListWidgetItem(tr("All contacts"), ui_.advList);
++		item->setToolTip(tr("All contacts"));
++		item->setStatusTip(QString());
++		ui_.advList->addItem(item);
+ 	}
++
++	ui_.jidList->sortItems();
++	ui_.jidList2->sortItems();
++	ui_.privList->sortItems();
+ }
+ 
+ void HistoryDlg::openSelectedContact()
+ {
+ 	ui_.msgLog->clear();
+-	UserListItem *u = currentUserListItem();
+-	if (!u)
+-		return;
+ 
+-	setWindowTitle(u->name() + " (" + u->jid().full() + ")");
+-	d->jid = u->jid();
++	QListWidget *contactList = NULL;
++	switch (ui_.contactToolBox->currentIndex()) {
++		case 0:
++			contactList = ui_.jidList;
++			break;
++		case 1:
++			contactList = ui_.jidList2;
++			break;
++		case 2:
++			contactList = ui_.privList;
++			break;
++	}
++	d->pa = 0;
++	d->jid = XMPP::Jid();
++	if (contactList) {
++		QListWidgetItem *item = contactList->currentItem();
++		if (item) {
++			QString sId = item->statusTip();
++			if (!sId.isEmpty())
++			{
++				d->pa = d->psi->contactList()->getAccount(sId.section('|', 0, 0));
++				d->jid = XMPP::Jid(sId.section('|', 1, -1));
++			}
++		}
++	}
++
++	QString sTitle;
++	if (!d->jid.isEmpty()) {
++		UserListItem *u = currentUserListItem();
++		if (u) {
++			sTitle = u->name() + " (" + u->jid().full() + ")";
++		}
++		else {
++			sTitle = d->jid.full();
++		}
++	}
++	else {
++		QString paId = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
++		if (!paId.isEmpty())
++			d->pa = d->psi->contactList()->getAccount(paId);
++		sTitle = tr("All contacts");
++	}
++	setWindowTitle(sTitle);
+ 	getLatest();
+ }
+ 
+@@ -301,35 +431,38 @@ void HistoryDlg::findMessages()
+ 	//get the oldest event as a starting point
+ 	startRequest();
+ 	d->reqType = TypeFindOldest;
+-	getEDBHandle()->getOldest(d->jid, 1);
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, 0, 1);
+ }
+ 
+ void HistoryDlg::removeHistory()
+ {
+ 	int res = QMessageBox::question(this, tr("Remove history"),
+-					tr("Are you sure you want to completely remove history for a contact %1?").arg(d->jid.bare())
++					tr("Are you sure you want to completely remove history for a contact %1?").arg(d->jid.full())
+ 					,QMessageBox::Ok | QMessageBox::Cancel);
+ 	if(res == QMessageBox::Ok) {
+-		getEDBHandle()->erase(d->jid);
++		getEDBHandle()->erase(getCurrentAccountId(), d->jid);
+ 		openSelectedContact();
+ 	}
+ }
+ 
+ void HistoryDlg::openChat()
+ {
+-	UserListItem *u = currentUserListItem();
+-	if(u) {
+-		d->pa->actionOpenChat2(u->jid().bare());
+-	}
++	if (d->pa && !d->jid.isEmpty())
++		d->pa->actionOpenChat2(d->jid);
+ }
+ 
+ void HistoryDlg::exportHistory()
+ {
+ 	UserListItem *u = currentUserListItem();
+-	if(!u)
+-		return;
+-	QString them = JIDUtil::nickOrJid(u->name(), u->jid().full());
+-	QString s = JIDUtil::encode(them).toLower();
++	QString them;
++	if(u) {
++		them = JIDUtil::nickOrJid(u->name(), u->jid().full());
++	} else {
++		//if (d->jid.isEmpty())
++		//	return;
++		them = d->jid.full();
++	}
++	QString s = (!them.isEmpty()) ? JIDUtil::encode(them).toLower() : "all_contacts";
+ 	QString fname = FileUtil::getSaveFileName(this,
+ 						  tr("Export message history"),
+ 						  s + ".txt",
+@@ -344,19 +477,22 @@ void HistoryDlg::exportHistory()
+ 	}
+ 	QTextStream stream(&f);
+ 
+-	QString us = d->pa->nick();
+-
+-	EDBHandle* h;
+-	QString id;
++	int start = 0;
+ 	startRequest();
+-	while(1) {
+-		h = new EDBHandle(d->pa->edb());
+-		if(id.isEmpty()) {
+-			h->getOldest(d->jid, 1000);
+-		}
+-		else {
+-			h->get(d->jid, id, EDB::Forward, 1000);
++	QString paId = getCurrentAccountId();
++	int max = 0;
++	{
++		quint64 edbCnt = d->psi->edb()->eventsCount(paId, d->jid);
++		if (edbCnt > 1000) {
++			max = edbCnt / 1000;
++			if ((edbCnt % 1000) != 0)
++				++max;
++			showProgress(max);
+ 		}
++	}
++	while(1) {
++		EDBHandle *h = new EDBHandle(d->psi->edb());
++		h->get(paId, d->jid, QDateTime(), EDB::Forward, start, 1000);
+ 		while(h->busy()) {
+ 			qApp->processEvents();
+ 		}
+@@ -367,7 +503,6 @@ void HistoryDlg::exportHistory()
+ 		// events are in forward order
+ 		for(int i = 0; i < cnt; ++i) {
+ 			EDBItemPtr item = r.value(i);
+-			id = item->nextId();
+ 			PsiEvent::Ptr e(item->event());
+ 			QString txt;
+ 
+@@ -375,10 +510,16 @@ void HistoryDlg::exportHistory()
+ 
+ 			QString nick;
+ 			if(e->originLocal()) {
+-				nick = us;
++				if (e->account())
++					nick = e->account()->nick();
++				else
++					nick = tr("deleted");
+ 			}
+ 			else {
+-				nick = them;
++				if (!them.isEmpty())
++					nick = them;
++				else
++					nick = e->from().full();
+ 			}
+ 
+ 			if(e->type() == PsiEvent::Message) {
+@@ -401,10 +542,14 @@ void HistoryDlg::exportHistory()
+ 		}
+ 		delete h;
+ 
++		if (max > 0)
++			incrementProgress();
++
+ 		// done!
+-		if(cnt == 0 || id.isEmpty()) {
++		if(cnt == 0)
+ 			break;
+-		}
++
++		start += 1000;
+ 	}
+ 	f.close();
+ 	stopRequest();
+@@ -412,11 +557,16 @@ void HistoryDlg::exportHistory()
+ 
+ void HistoryDlg::doMenu()
+ {
+-	QMenu *m = new QMenu(ui_.jidList);
+-	m->addAction(IconsetFactory::icon("psi/chat").icon(), tr("&Open chat"), this, SLOT(openChat()));
++	openSelectedContact();
++	bool fAll = (!d->pa || d->jid.isEmpty());
++	QMenu *m = new QMenu();
++	if (!fAll)
++		m->addAction(IconsetFactory::icon("psi/chat").icon(), tr("&Open chat"), this, SLOT(openChat()));
  	m->addAction(IconsetFactory::icon("psi/save").icon(), tr("&Export history"), this, SLOT(exportHistory()));
- 	m->addAction(IconsetFactory::icon("psi/clearChat").icon(), tr("&Delete history"), this, SLOT(removeHistory()));
-+	m->addSeparator();
-+	m->addAction(tr("&Import all history"), this, SLOT(importHistory()));
+-	m->addAction(IconsetFactory::icon("psi/clearChat").icon(), tr("&Delete history"), this, SLOT(removeHistory()));
++	if (!fAll)
++		m->addAction(IconsetFactory::icon("psi/clearChat").icon(), tr("&Delete history"), this, SLOT(removeHistory()));
  	m->exec(QCursor::pos());
++	delete m;
  }
  
-@@ -626,3 +629,25 @@ EDBHandle* HistoryDlg::getEDBHandle()
- 	connect(h, SIGNAL(finished()), SLOT(edb_finished()));
+ void HistoryDlg::edbFinished()
+@@ -437,28 +587,22 @@ void HistoryDlg::edbFinished()
+ 			if (d->reqType == TypeLatest || d->reqType == TypePrevious)
+ 			{
+ 				// events are in backward order
+-				// first entry is the end event
+-				EDBItemPtr it = r.first();
+-				d->id_end = it->id();
+-				d->id_next = it->nextId();
+-				// last entry is the begin event
+-				it = r.last();
+-				d->id_begin = it->id();
+-				d->id_prev = it->prevId();
+-				displayResult(r, EDB::Forward);
++				d->begin_row = h->beginRow();
++				d->end_row = d->begin_row + r.count() - 1;
++
++				d->can_backward = (d->begin_row > 0);
++				d->can_forward = (d->reqType != TypeLatest);
++				displayResult(r, (d->reqType == TypeLatest) ? EDB::Forward : EDB::Backward);
+ 				setButtons();
+ 			}
+ 			else if (d->reqType == TypeEarliest || d->reqType == TypeNext || d->reqType == TypeDate)
+ 			{
+ 				// events are in forward order
+-				// last entry is the end event
+-				EDBItemPtr it = r.last();
+-				d->id_end = it->id();
+-				d->id_next = it->nextId();
+-				// first entry is the begin event
+-				it = r.first();
+-				d->id_begin = it->id();
+-				d->id_prev = it->prevId();
++				d->begin_row = h->beginRow();
++				d->end_row = d->begin_row + r.count() - 1;
++
++				d->can_backward = (d->begin_row > 0);
++				d->can_forward = true;
+ 				displayResult(r, EDB::Backward);
+ 				setButtons();
+ 			}
+@@ -473,14 +617,15 @@ void HistoryDlg::edbFinished()
+ 				{
+ 					d->reqType = TypeFind;
+ 					d->findStr = str;
+-					EDBItemPtr ei = r.first();
+ 					startRequest();
+-					getEDBHandle()->find(str, d->jid, ei->id(), EDB::Forward);
++					getEDBHandle()->find(getCurrentAccountId(), str, d->jid, QDateTime(), EDB::Forward);
+ 					setButtons();
+ 				}
+ 			}
+ 			else if (d->reqType == TypeFind)
+ 			{
++				d->begin_row = 0;
++				d->end_row = r.count() - 1;
+ 				displayResult(r, EDB::Forward);
+ 				highlightBlocks(ui_.searchField->text());
+ 			}
+@@ -488,7 +633,29 @@ void HistoryDlg::edbFinished()
+ 		}
+ 		else
+ 		{
+-			ui_.msgLog->clear();
++			// no more data. TODO: visualization is needed.
++			bool buttons_updated = false;
++			if (d->reqType == TypePrevious)
++			{
++				d->can_backward = false;
++				buttons_updated = true;
++			}
++			else if (d->reqType == TypeLatest || d->reqType == TypeEarliest)
++			{
++				d->can_backward = false;
++				d->can_forward = false;
++				buttons_updated = true;
++			}
++			else if (d->reqType == TypeNext || d->reqType == TypeDate)
++			{
++				d->can_forward = false;
++				buttons_updated = true;
++			}
++			if (d->reqType == TypeFind)
++				ui_.msgLog->clear();
++
++			if (buttons_updated)
++				setButtons();
+ 		}
+ 	}
+ 	delete h;
+@@ -496,10 +663,10 @@ void HistoryDlg::edbFinished()
+ 
+ void HistoryDlg::setButtons()
+ {
+-	ui_.buttonPrevious->setEnabled(!d->id_prev.isEmpty());
+-	ui_.buttonNext->setEnabled(!d->id_next.isEmpty());
+-	ui_.buttonEarliest->setEnabled(!d->id_prev.isEmpty());
+-	ui_.buttonLastest->setEnabled(!d->id_next.isEmpty());
++	ui_.buttonPrevious->setEnabled(d->can_backward);
++	ui_.buttonNext->setEnabled(d->can_forward);
++	ui_.buttonEarliest->setEnabled(d->can_backward);
++	ui_.buttonLastest->setEnabled(d->can_forward);
+ }
+ 
+ void HistoryDlg::setButtons(bool act)
+@@ -521,28 +688,29 @@ void HistoryDlg::getLatest()
+ {
+ 	d->reqType = TypeLatest;
+ 	startRequest();
+-	getEDBHandle()->getLatest(d->jid, 50);
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Backward, 0, 50);
+ }
+ 
+ void HistoryDlg::getEarliest()
+ {
+ 	d->reqType = TypeEarliest;
+ 	startRequest();
+-	getEDBHandle()->getOldest(d->jid, 50);
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, 0, 50);
+ }
+ 
+ void HistoryDlg::getPrevious()
+ {
+ 	d->reqType = TypePrevious;
+ 	ui_.buttonPrevious->setEnabled(false);
+-	getEDBHandle()->get(d->jid, d->id_prev, EDB::Backward, 50);
++	int begin = (d->begin_row < 50) ? 0 : d->begin_row - 50;
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, begin, 50);
+ }
+ 
+ void HistoryDlg::getNext()
+ {
+ 	d->reqType = TypeNext;
+ 	ui_.buttonNext->setEnabled(false);
+-	getEDBHandle()->get(d->jid, d->id_next, EDB::Forward, 50);
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, d->end_row + 1, 50);
+ }
+ 
+ void HistoryDlg::getDate()
+@@ -550,23 +718,33 @@ void HistoryDlg::getDate()
+ 	const QDate date = ui_.calendar->selectedDate();
+ 	d->reqType = TypeDate;
+ 	d->date = date;
+-	QDateTime first (d->date);
+-	QDateTime last = first.addDays(1);
++	QDateTime first(d->date);
+ 	startRequest();
+-	getEDBHandle()->getByDate(d->jid, first, last);
++	getEDBHandle()->get(getCurrentAccountId(), d->jid, first, EDB::Forward, 0, 50);
+ }
+ 
+ void HistoryDlg::removedContact(PsiContact *pc)
+ {
+-	QString jid = pc->jid().bare().toLower();
+-	QString curJid  = ui_.jidList->currentItem()->toolTip();
++	QString contactId = pc->account()->id() + "|" + pc->jid().bare().toLower();
++	QString curId;
++	QListWidgetItem *lwi = ui_.jidList->currentItem();
++	if (lwi)
++		curId = lwi->statusTip();
+ 	for(int i = 0; i < ui_.jidList->count(); i++) {
+ 		QListWidgetItem *it = ui_.jidList->item(i);
+-		if(it && it->toolTip() == jid) {
++		if(it && it->statusTip() == contactId) {
+ 			ui_.jidList->removeItemWidget(it);
+-			if(jid == curJid) {
++			it = new QListWidgetItem(pc->jid().bare(), ui_.jidList2);
++			it->setToolTip(makeContactToolTip(pc, true));
++			it->setIcon(PsiIconset::instance()->statusPtr(pc->jid().bare(), Status(Status::Offline))->icon());
++			it->setStatusTip(contactId);
++			ui_.jidList2->addItem(it);
++			if(contactId == curId) {
+ 				ui_.jidList->setCurrentRow(0);
+-				openSelectedContact();
++				if (ui_.contactToolBox->currentIndex() == 0) {
++					ui_.jidList2->setCurrentItem(it);
++					ui_.contactToolBox->setCurrentIndex(1);
++				}
+ 			}
+ 			break;
+ 		}
+@@ -597,38 +775,53 @@ void HistoryDlg::autoCopy()
+ 	}
+ }
+ #endif
+-void HistoryDlg::displayResult(const EDBResult r, int direction, int max)
++void HistoryDlg::displayResult(const EDBResult &r, int direction, int max)
+ {
+ 	int i  = (direction == EDB::Forward) ? r.count() - 1 : 0;
+ 	int at = 0;
+ 	ui_.msgLog->clear();
+-	QString nick = TextUtil::plain2rich(d->pa->nick());
++	bool fAll = d->jid.isEmpty();
+ 	while (i >= 0 && i <= r.count() - 1 && (max == -1 ? true : at < max))
+ 	{
+ 		EDBItemPtr item = r.value(i);
+ 		PsiEvent::Ptr e(item->event());
+-		UserListItem *u = d->pa->findFirstRelevant(e->from().full());
+-		if(u) {
+-			QString from = JIDUtil::nickOrJid(u->name(), u->jid().full());
+-			if (e->type() == PsiEvent::Message)
++		if (e->type() == PsiEvent::Message) {
++			PsiAccount *pa = e->account();
++			QString from;
++			if (pa)
+ 			{
+-				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
+-				QString msg = me->message().body();
+-				msg = TextUtil::linkify(TextUtil::plain2rich(msg));
+-
+-				if (d->emoticons)
+-					msg = TextUtil::emoticonify(msg);
+-				if (d->formatting)
+-					msg = TextUtil::legacyFormat(msg);
+-
+-				if (me->originLocal())
+-					msg = "<span style='color:"+d->sentColor+"'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]")+" &lt;"+ nick +"&gt; " + msg + "</span>";
+-				else
+-					msg = "<span style='color:"+d->receivedColor+"'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]") + " &lt;" +  TextUtil::plain2rich(from) + "&gt; " + msg + "</span>";
+-
+-				ui_.msgLog->appendText(msg);
++				UserListItem *u = pa->findFirstRelevant(e->from().full());
++				if(u) {
++					if (!u->name().trimmed().isEmpty())
++						from = u->name().trimmed();
++				}
++			}
++			if (from.isEmpty())
++			{
++				from = e->from().resource().trimmed(); // for offline conferences
++				if (from.isEmpty())
++						from = e->from().node();
++			}
++			MessageEvent::Ptr me = e.staticCast<MessageEvent>();
++			QString msg = me->message().body();
++			msg = TextUtil::linkify(TextUtil::plain2rich(msg));
++
++			if (d->emoticons)
++				msg = TextUtil::emoticonify(msg);
++			if (d->formatting)
++				msg = TextUtil::legacyFormat(msg);
+ 
++			if (me->originLocal())
++			{
++				QString nick = (pa) ? TextUtil::plain2rich(pa->nick()) : tr("deleted");
++				msg = "<span style='color:" + d->sentColor + "'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]") + " &lt;" + nick
++					+ ((fAll) ? QString(" -> %1").arg(TextUtil::plain2rich(from)) : QString())
++					+ "&gt; " + msg + "</span>";
+ 			}
++			else
++				msg = "<span style='color:" + d->receivedColor + "'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]") + " &lt;" +  TextUtil::plain2rich(from) + "&gt; " + msg + "</span>";
++
++			ui_.msgLog->appendText(msg);
+ 		}
+ 
+ 		++at;
+@@ -641,11 +834,9 @@ void HistoryDlg::displayResult(const EDB
+ UserListItem* HistoryDlg::currentUserListItem() const
+ {
+ 	UserListItem* u = 0;
+-	QListWidgetItem *i = ui_.jidList->currentItem();
+-	if(!i)
+-		return u;
+-
+-	u = d->pa->findFirstRelevant(i->toolTip());
++	if (d->pa && !d->jid.isEmpty()) {
++		u = d->pa->findFirstRelevant(d->jid);
++	}
+ 	return u;
+ }
+ 
+@@ -662,6 +853,7 @@ void HistoryDlg::stopRequest()
+ 	if(ui_.busy->isActive()) {
+ 		ui_.busy->stop();
+ 	}
++	ui_.progressBar->setVisible(false);
+ 	setEnabled(true);
+ #ifdef Q_OS_MAC
+ 	// To workaround a Qt bug
+@@ -670,9 +862,46 @@ void HistoryDlg::stopRequest()
+ #endif
+ }
+ 
++void HistoryDlg::showProgress(int max)
++{
++	ui_.progressBar->setValue(0);
++	ui_.progressBar->setMaximum(max);
++	ui_.progressBar->setVisible(true);
++}
++
++void HistoryDlg::incrementProgress()
++{
++	ui_.progressBar->setValue(ui_.progressBar->value() + 1);
++}
++
+ EDBHandle* HistoryDlg::getEDBHandle()
+ {
+-	EDBHandle* h = new EDBHandle(d->pa->edb());
++	EDBHandle* h = new EDBHandle(d->psi->edb());
+ 	connect(h, SIGNAL(finished()), SLOT(edbFinished()));
  	return h;
  }
 +
-+void HistoryDlg::importHistory()
++QString HistoryDlg::makeContactToolTip(const PsiContact *contact, bool bare) const
 +{
-+	startRequest();
-+	HistoryImp *imp = new HistoryImp(d->psi);
-+	connect(imp, SIGNAL(finished(int)), this, SLOT(importFinished(int)));
-+	imp->start();
++	QString jidStr = JIDUtil::toString(contact->jid(), !bare);
++	if (ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).isNull())
++		jidStr.append(QString(" [%1]").arg(contact->account()->name()));
++	return jidStr;
 +}
 +
-+void HistoryDlg::importFinished(int result)
++QString HistoryDlg::makeContactToolTip(const QString &accId, const XMPP::Jid &jid, bool bare) const
 +{
-+	stopRequest();
-+	HistoryImp *imp = (HistoryImp *)sender();
-+	if (result == HistoryImp::Normal) {
-+		int sec = imp->importDuration();
-+		int min = sec / 60;
-+		sec = sec % 60;
-+		QMessageBox::information(this, tr("Import"), tr("Imports is finished.\nDuration is %1 min. %2 sec.").arg(min).arg(sec));
-+	} else if (result == HistoryImp::Error)
-+		QMessageBox::critical(this, tr("Import"), tr("Import error."));
-+	imp->deleteLater();
-+}
---- psi.orig/src/historydlg.h
-+++ psi/src/historydlg.h
-@@ -69,6 +69,8 @@ private slots:
- 	void openChat();
- 	void doMenu();
- 	void removedContact(PsiContact*);
-+	void importHistory();
-+	void importFinished(int);
++	QString jidStr = JIDUtil::toString(jid, !bare);
++	if (ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).isNull()) {
++		PsiAccount *pa = d->psi->contactList()->getAccount(accId);
++		jidStr.append(QString(" [%1]").arg((pa) ? pa->name() : tr("deleted")));
++	}
++	return jidStr;
++}
++
++QString HistoryDlg::getCurrentAccountId() const
++{
++	if (d->pa)
++		return d->pa->id();
++	return QString();
++}
+--- git.orig/src/historydlg.h
++++ git/src/historydlg.h
+@@ -81,19 +81,23 @@ private:
+ 	void setButtons();
+ 	void setButtons(bool act);
+ 	void loadContacts();
+-	void displayResult(const EDBResult , int, int max=-1);
++	void displayResult(const EDBResult &, int, int max=-1);
+ 	QFont fontForOption(const QString& option);
+ 	void listAccounts();
+ 	UserListItem* currentUserListItem() const;
+ 	void startRequest();
+ 	void stopRequest();
+-
++	void showProgress(int max);
++	void incrementProgress();
++	void setCurrentUserListItem();
++	QString makeContactToolTip(const PsiContact *contact, bool bare) const;
++	QString makeContactToolTip(const QString &accId, const Jid &jid, bool bare) const;
+ 	EDBHandle* getEDBHandle();
++	QString getCurrentAccountId() const;
  
- protected:
- 	bool eventFilter(QObject *, QEvent *);
---- psi.orig/src/historyimp.cpp
-+++ psi/src/historyimp.cpp
-@@ -0,0 +1,163 @@
+ 	class Private;
+ 	Private *d;
+ 	Ui::HistoryDlg ui_;
+-	QStringList jids_;
+ };
+ 
+ #endif
+--- git.orig/src/historyimp.cpp
++++ git/src/historyimp.cpp
+@@ -0,0 +1,302 @@
 +/*
 + * historyimp.cpp
-+ * Copyright (C) 20011   Aleksey Andreev
++ * Copyright (C) 2011   Aleksey Andreev
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -944,159 +3250,298 @@
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + *
 + */
 +
 +#include <QDir>
 +#include <QTimer>
 +#include <QMessageBox>
++#include <QLayout>
 +
 +#include "historyimp.h"
 +#include "applicationinfo.h"
++#include "psicontactlist.h"
++#include "psiaccount.h"
++#include "psicontact.h"
 +
-+HistoryImp::HistoryImp(PsiCon *psi) : QObject(),
++HistoryImport::HistoryImport(PsiCon *psi) : QObject(),
 +	psi_(psi),
-+	prompt(true),
++	srcEdb(NULL),
++	dstEdb(NULL),
++	hErase(NULL),
 +	hRead(NULL),
 +	hWrite(NULL),
-+	active(false)
++	active(false),
++	result_(ResultNone),
++	recordsCount(0),
++	dlg(NULL)
 +{
 +}
 +
-+HistoryImp::~HistoryImp()
++HistoryImport::~HistoryImport()
 +{
 +	clear();
 +}
 +
-+void HistoryImp::clear()
++bool HistoryImport::isNeeded()
 +{
-+	if (desEdb) {
-+		((EDBSqLite *)desEdb)->setInsertingMode(EDBSqLite::Normal);
-+		((EDBSqLite *)desEdb)->setMirror((EDBFlatFile *)souEdb);
++	bool res = false;
++	EDBSqLite *stor = static_cast<EDBSqLite *>(psi_->edb());
++	if (!stor->getStorageParam("import_start").isEmpty()) {
++		EDB *src = stor->mirror();
++		if (!src)
++			src = new EDBFlatFile(psi_);
++		//if (sou && sou->eventsCount(QString(), XMPP::Jid()) != 0)
++		if (!src->contacts(QString(), EDB::Contact).isEmpty())
++			res = true;
++		else
++			stor->setStorageParam("import_start", QString());
++		if (src != stor->mirror())
++			delete src;
++	}
++	return res;
++}
++
++void HistoryImport::clear()
++{
++	if (dstEdb) {
++		((EDBSqLite *)dstEdb)->setInsertingMode(EDBSqLite::Normal);
++		((EDBSqLite *)dstEdb)->setMirror(new EDBFlatFile(psi_));
++	}
++	if (hErase) {
++		delete hErase;
++		hErase = NULL;
 +	}
 +	if (hRead) {
 +		delete hRead;
 +		hRead = NULL;
 +	}
++	if (srcEdb) {
++		delete srcEdb;
++		srcEdb = NULL;
++	}
 +	if (hWrite) {
 +		delete hWrite;
 +		hWrite = NULL;
 +	}
++	if (dlg) {
++		delete dlg;
++		dlg = NULL;
++	}
 +}
 +
-+void HistoryImp::start()
++int HistoryImport::exec()
 +{
 +	active = true;
-+	startTime = QDateTime::currentDateTime();
-+	QString impDirStr = ApplicationInfo::historyDir() + "/";
-+	QDir impDir(impDirStr);
-+	QFileInfoList fl = impDir.entryInfoList(QStringList("*.history"), QDir::Files);
-+	impSize = 0;
-+	foreach (const QFileInfo &fi, fl) {
-+		XMPP::Jid jid(JIDUtil::decode(fi.completeBaseName()));
-+		if (jid.isValid()) {
-+			importList.append(QPair<XMPP::Jid, QString>(jid, QString()));
-+			impSize += fi.size();
++
++	dstEdb = psi_->edb();
++	((EDBSqLite *)dstEdb)->setMirror(NULL);
++	((EDBSqLite *)dstEdb)->setInsertingMode(EDBSqLite::Import);
++
++	dstEdb->setStorageParam("import_start", "yes");
++
++	if (!srcEdb)
++		srcEdb = new EDBFlatFile(psi_);
++
++	foreach (const EDB::ContactItem &ci, srcEdb->contacts(QString(), EDB::Contact)) {
++		const XMPP::Jid &jid = ci.jid;
++		QStringList accIds;
++		foreach (PsiAccount *acc, psi_->contactList()->accounts()) {
++			foreach (PsiContact *contact, acc->contactList()) {
++				if (contact->jid() == jid)
++					accIds.append(acc->id());
++			}
 +		}
++		if (accIds.isEmpty()) {
++			PsiAccount *pa = psi_->contactList()->defaultAccount();
++			if (pa)
++				accIds.append(pa->id());
++			else
++				accIds.append(psi_->contactList()->accounts().first()->id());
++		}
++		importList.append(ImportItem(accIds, jid));
 +	}
-+	if (importList.isEmpty()) {
-+		stop(Normal);
-+		return;
-+	}
-+	desEdb = psi_->edb();
-+	((EDBSqLite *)desEdb)->setMirror(NULL);
-+	((EDBSqLite *)desEdb)->setInsertingMode(EDBSqLite::Import);
 +
-+	souEdb = new EDBFlatFile;
++	if (importList.isEmpty())
++		stop(ResultNormal);
++	else
++		showDialog();
 +
-+	QTimer::singleShot(0, this, SLOT(readFromFiles()));
++	return result_;
 +}
 +
-+void HistoryImp::stop(int reason)
++void HistoryImport::stop(int reason)
 +{
-+	active = false;
 +	stopTime = QDateTime::currentDateTime();
-+	clear();
++	result_ = reason;
++	if (reason == ResultNormal) {
++		dstEdb->setStorageParam("import_start", QString());
++		int sec = importDuration();
++		int min = sec / 60;
++		sec = sec % 60;
++		qWarning(QString("Import is finished. Duration is %1 min. %2 sec.").arg(min).arg(sec).toLatin1());
++	}
++	else if (reason == ResultCancel)
++		qWarning("Import canceled");
++	else
++		qWarning("Import error");
++
++	active = false;
 +	emit finished(reason);
 +}
 +
-+int HistoryImp::importDuration()
++int HistoryImport::importDuration()
 +{
-+	int duration = 0;
-+	if (startTime.isValid() && stopTime.isValid()) {
-+		duration = startTime.secsTo(stopTime);
-+		if (duration < 0)
-+			duration = 0;
-+	}
-+	return duration;
++	return startTime.secsTo(stopTime);
 +}
 +
-+void HistoryImp::readFromFiles()
++void HistoryImport::readFromFiles()
 +{
 +	if (!active)
 +		return;
-+	if (prompt) {
-+		prompt = false;
-+		QString text = tr("Found %1 files. Common size is %2 bytes.\nContinue?").arg(importList.size()).arg(impSize);
-+		if (QMessageBox::question(NULL, tr("Import history"), text, QMessageBox::Yes, QMessageBox::No) != QMessageBox::Yes) {
-+			stop(Cancel);
++	if (hWrite != NULL) {
++		if (!hWrite->writeSuccess()) {
++			stop(ResultError); // Write error
 +			return;
 +		}
 +	}
-+	if (importList.isEmpty()) {
-+		stop(Normal);
++	else if (hErase != NULL && !hErase->writeSuccess()) {
++		stop(ResultError);
 +		return;
 +	}
-+	if (hWrite != NULL && !hWrite->writeSuccess()) {
-+		stop(Error); // Write error
++	if (importList.isEmpty()) {
++		stop(ResultNormal);
 +		return;
 +	}
 +	if (hRead == NULL) {
-+		hRead = new EDBHandle(souEdb);
++		hRead = new EDBHandle(srcEdb);
 +		connect(hRead, SIGNAL(finished()), this, SLOT(writeToSqlite()));
 +	}
-+	QPair<XMPP::Jid, QString> &rec = importList.first();
-+	QString nextId = rec.second;
-+	if (nextId.isEmpty()) {
-+		qWarning(QString("Importing %1").arg(JIDUtil::toString(rec.first, true)).toAscii());
-+		hRead->getOldest(rec.first, 1);
-+	} else {
-+		hRead->get(rec.first, nextId, EDB::Forward, 1);
-+	}
++
++	const ImportItem &item = importList.first();
++	int start = item.startNum;
++	if (start == 0)
++		qWarning(QString("Importing %1").arg(JIDUtil::toString(item.jid, true)).toLatin1());
++	--recordsCount;
++	if (dlg && (recordsCount % 100) == 0)
++		progressBar->setValue(progressBar->value() + 1);
++	hRead->get(item.accIds.first(), item.jid, QDateTime(), EDB::Forward, start, 1);
 +}
 +
-+void HistoryImp::writeToSqlite()
++void HistoryImport::writeToSqlite()
 +{
 +	if (!active)
 +		return;
 +	const EDBResult r = hRead->result();
 +	if (hRead->lastRequestType() != EDBHandle::Read || r.size() > 1) {
-+		stop(Error);
++		stop(ResultError);
 +		return;
 +	}
 +	if (r.isEmpty()) {
-+		importList.removeFirst();
++		importList.first().accIds.removeFirst();
++		if (importList.first().accIds.isEmpty())
++			importList.removeFirst();
 +		QTimer::singleShot(0, this, SLOT(readFromFiles()));
 +		return;
 +	}
 +	if (hWrite == NULL) {
-+		hWrite = new EDBHandle(desEdb);
++		hWrite = new EDBHandle(dstEdb);
 +		connect(hWrite, SIGNAL(finished()), this, SLOT(readFromFiles()));
 +	}
 +	EDBItemPtr it = r.first();
-+	hWrite->append(importList.first().first, it->event());
-+	if (!it->nextId().isEmpty())
-+		importList.first().second = it->nextId();
++	ImportItem &item = importList.first();
++	hWrite->append(item.accIds.first(), item.jid, it->event(), EDB::Contact);
++	item.startNum += 1;
++}
++
++void HistoryImport::showDialog()
++{
++	dlg = new QDialog();
++	dlg->setModal(true);
++	dlg->setWindowTitle(tr("Psi+ Import history"));
++	QVBoxLayout *mainLayout = new QVBoxLayout(dlg);
++	stackedWidget = new QStackedWidget(dlg);
++
++	QWidget *page1 = new QWidget();
++	QGridLayout *page1Layout = new QGridLayout(page1);
++	QLabel *lbMessage = new QLabel(page1);
++	lbMessage->setWordWrap(true);
++	lbMessage->setText(tr("Found %1 files for import.\nContinue?").arg(importList.size()));
++	page1Layout->addWidget(lbMessage, 0, 0, 1, 1);
++	stackedWidget->addWidget(page1);
++
++	QWidget *page2 = new QWidget();
++	QHBoxLayout *page2Layout = new QHBoxLayout(page2);
++	QGridLayout *page2GridLayout = new QGridLayout();
++	page2GridLayout->addWidget(new QLabel(tr("Status:"), page2), 0, 0, 1, 1);
++	lbStatus = new QLabel(page2);
++	page2GridLayout->addWidget(lbStatus, 0, 1, 1, 1);
++	page2GridLayout->addWidget(new QLabel(tr("Progress:"), page2), 1, 0, 1, 1);
++	progressBar = new QProgressBar(page2);
++	progressBar->setMaximum(1);
++	progressBar->setValue(0);
++	page2GridLayout->addWidget(progressBar, 1, 1, 1, 1);
++	page2Layout->addLayout(page2GridLayout);
++	stackedWidget->addWidget(page2);
++
++	mainLayout->addWidget(stackedWidget);
++	QHBoxLayout *buttonsLayout = new QHBoxLayout();
++	QSpacerItem *buttonsSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
++	buttonsLayout->addItem(buttonsSpacer);
++	btnOk = new QPushButton(dlg);
++	connect(btnOk, SIGNAL(clicked()), this, SLOT(start()));
++	btnOk->setText(tr("Ok"));
++	buttonsLayout->addWidget(btnOk);
++	QPushButton *btnCancel = new QPushButton(dlg);
++	connect(btnCancel, SIGNAL(clicked()), this, SLOT(cancel()));
++	btnCancel->setText(tr("Exit"));
++	buttonsLayout->addWidget(btnCancel);
++	mainLayout->addLayout(buttonsLayout);
++
++	dlg->adjustSize();
++	dlg->exec();
++}
++
++void HistoryImport::start()
++{
++	qWarning("Import start");
++	startTime = QDateTime::currentDateTime();
++	btnOk->setEnabled(false);
++	stackedWidget->setCurrentIndex(1);
++
++	lbStatus->setText(tr("Counting records"));
++	qApp->processEvents();
++	recordsCount = srcEdb->eventsCount(QString(), XMPP::Jid());
++	int max = recordsCount / 100;
++	if ((recordsCount % 100) != 0)
++		++max;
++	progressBar->setMaximum(max);
++	progressBar->setValue(0);
++
++	lbStatus->setText(tr("Import"));
++	hErase = new EDBHandle(dstEdb);
++	connect(hErase, SIGNAL(finished()), this, SLOT(readFromFiles()));
++	hErase->erase(QString(), QString());
++	while (active)
++		qApp->processEvents();
++	if (result_ == ResultNormal)
++		dlg->accept();
 +	else
-+		importList.removeFirst();
++		lbStatus->setText(tr("Error"));
 +}
---- psi.orig/src/historyimp.h
-+++ psi/src/historyimp.h
-@@ -0,0 +1,69 @@
++
++void HistoryImport::cancel()
++{
++	stop();
++	dlg->reject();
++}
+--- git.orig/src/historyimp.h
++++ git/src/historyimp.h
+@@ -0,0 +1,91 @@
 +/*
 + * historyimp.h
-+ * Copyright (C) 20011   Aleksey Andreev
++ * Copyright (C) 2011   Aleksey Andreev
 + *
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -1110,7 +3555,7 @@
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + *
 + */
 +
@@ -1118,44 +3563,66 @@
 +#define HISTORYIMP_H
 +
 +#include <QObject>
-+#include <QPair>
++#include <QDialog>
++#include <QLabel>
++#include <QProgressBar>
++#include <QStackedWidget>
++#include <QPushButton>
 +
 +#include "xmpp/jid/jid.h"
 +#include "jidutil.h"
 +#include "psicon.h"
 +#include "eventdb.h"
 +
-+class HistoryImp : public QObject
++struct ImportItem
++{
++	QStringList   accIds;
++	XMPP::Jid     jid;
++	int           startNum;
++	ImportItem(const QStringList &ids, const XMPP::Jid &j) { accIds = ids; jid = j; startNum = 0; }
++};
++
++class HistoryImport : public QObject
 +{
 +	Q_OBJECT
 +
 +public:
-+	enum {Normal, Cancel, Error};
-+	HistoryImp(PsiCon *psi);
-+	~HistoryImp();
-+	void start();
-+	void stop(int reason = Cancel);
++	enum {ResultNone, ResultNormal, ResultCancel, ResultError};
++	HistoryImport(PsiCon *psi);
++	~HistoryImport();
++	bool isNeeded();
++	int exec();
 +	int importDuration();
 +
 +private:
 +	PsiCon *psi_;
-+	bool prompt;
-+	qint64 impSize;
-+	QList< QPair<XMPP::Jid, QString> > importList;
-+	EDB *souEdb;
-+	EDB *desEdb;
++	QList<ImportItem> importList;
++	EDB *srcEdb;
++	EDB *dstEdb;
++	EDBHandle *hErase;
 +	EDBHandle *hRead;
 +	EDBHandle *hWrite;
 +	QDateTime startTime;
 +	QDateTime stopTime;
 +	bool active;
++	int result_;
++	quint64 recordsCount;
++	QDialog *dlg;
++	QLabel *lbStatus;
++	QProgressBar *progressBar;
++	QStackedWidget *stackedWidget;
++	QPushButton *btnOk;
 +
 +private:
 +	void clear();
++	void showDialog();
 +
 +private slots:
 +	void readFromFiles();
 +	void writeToSqlite();
++	void start();
++	void stop(int reason = ResultCancel);
++	void cancel();
 +
 +signals:
 +	void finished(int);
@@ -1163,29 +3630,719 @@
 +};
 +
 +#endif
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -324,7 +324,10 @@ PsiCon::PsiCon()
+--- git.orig/src/history.ui
++++ git/src/history.ui
+@@ -9,7 +9,7 @@
+    <rect>
+     <x>0</x>
+     <y>0</y>
+-    <width>672</width>
++    <width>670</width>
+     <height>680</height>
+    </rect>
+   </property>
+@@ -34,207 +34,377 @@
+   <property name="modal">
+    <bool>true</bool>
+   </property>
+-  <layout class="QGridLayout" name="gridLayout">
+-   <item row="0" column="0">
+-    <widget class="QComboBox" name="accountsBox">
+-     <property name="maximumSize">
+-      <size>
+-       <width>220</width>
+-       <height>16777215</height>
+-      </size>
+-     </property>
+-    </widget>
+-   </item>
+-   <item row="0" column="1">
+-    <layout class="QHBoxLayout" name="horizontalLayout_2">
++  <layout class="QVBoxLayout" name="verticalLayout_2">
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0,1">
+      <item>
+-      <widget class="QLineEdit" name="searchField">
+-       <property name="sizePolicy">
+-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+-         <horstretch>0</horstretch>
+-         <verstretch>0</verstretch>
+-        </sizepolicy>
+-       </property>
+-      </widget>
++      <layout class="QVBoxLayout" name="verticalLayout">
++       <item>
++        <widget class="QComboBox" name="accountsBox">
++         <property name="maximumSize">
++          <size>
++           <width>220</width>
++           <height>16777215</height>
++          </size>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <widget class="QToolBox" name="contactToolBox">
++         <property name="maximumSize">
++          <size>
++           <width>220</width>
++           <height>16777215</height>
++          </size>
++         </property>
++         <property name="currentIndex">
++          <number>0</number>
++         </property>
++         <widget class="QWidget" name="page_1">
++          <property name="geometry">
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>220</width>
++            <height>233</height>
++           </rect>
++          </property>
++          <attribute name="label">
++           <string>Roster contacts</string>
++          </attribute>
++          <layout class="QGridLayout" name="gridLayout">
++           <property name="margin">
++            <number>0</number>
++           </property>
++           <item row="1" column="0">
++            <widget class="QListWidget" name="jidList">
++             <property name="sizePolicy">
++              <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
++               <horstretch>0</horstretch>
++               <verstretch>0</verstretch>
++              </sizepolicy>
++             </property>
++             <property name="maximumSize">
++              <size>
++               <width>220</width>
++               <height>16777215</height>
++              </size>
++             </property>
++            </widget>
++           </item>
++          </layout>
++         </widget>
++         <widget class="QWidget" name="page_3">
++          <property name="geometry">
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>220</width>
++            <height>233</height>
++           </rect>
++          </property>
++          <attribute name="label">
++           <string>Not in roster</string>
++          </attribute>
++          <layout class="QGridLayout" name="gridLayout_2">
++           <property name="margin">
++            <number>0</number>
++           </property>
++           <item row="0" column="0">
++            <widget class="QListWidget" name="jidList2">
++             <property name="maximumSize">
++              <size>
++               <width>220</width>
++               <height>16777215</height>
++              </size>
++             </property>
++            </widget>
++           </item>
++          </layout>
++         </widget>
++         <widget class="QWidget" name="page_4">
++          <property name="geometry">
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>220</width>
++            <height>233</height>
++           </rect>
++          </property>
++          <attribute name="label">
++           <string>Private</string>
++          </attribute>
++          <layout class="QGridLayout" name="gridLayout_3">
++           <property name="margin">
++            <number>0</number>
++           </property>
++           <item row="0" column="0">
++            <widget class="QListWidget" name="privList">
++             <property name="maximumSize">
++              <size>
++               <width>220</width>
++               <height>16777215</height>
++              </size>
++             </property>
++            </widget>
++           </item>
++          </layout>
++         </widget>
++         <widget class="QWidget" name="page_5">
++          <property name="geometry">
++           <rect>
++            <x>0</x>
++            <y>0</y>
++            <width>220</width>
++            <height>233</height>
++           </rect>
++          </property>
++          <attribute name="label">
++           <string>Advanced</string>
++          </attribute>
++          <layout class="QGridLayout" name="gridLayout_4">
++           <property name="margin">
++            <number>0</number>
++           </property>
++           <item row="0" column="0">
++            <widget class="QListWidget" name="advList">
++             <property name="maximumSize">
++              <size>
++               <width>220</width>
++               <height>16777215</height>
++              </size>
++             </property>
++            </widget>
++           </item>
++          </layout>
++         </widget>
++        </widget>
++       </item>
++       <item>
++        <widget class="QCalendarWidget" name="calendar">
++         <property name="minimumSize">
++          <size>
++           <width>220</width>
++           <height>0</height>
++          </size>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>220</width>
++           <height>220</height>
++          </size>
++         </property>
++         <property name="firstDayOfWeek">
++          <enum>Qt::Sunday</enum>
++         </property>
++         <property name="gridVisible">
++          <bool>true</bool>
++         </property>
++         <property name="horizontalHeaderFormat">
++          <enum>QCalendarWidget::ShortDayNames</enum>
++         </property>
++         <property name="verticalHeaderFormat">
++          <enum>QCalendarWidget::NoVerticalHeader</enum>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <widget class="QPushButton" name="buttonRefresh">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>220</width>
++           <height>16777215</height>
++          </size>
++         </property>
++         <property name="focusPolicy">
++          <enum>Qt::NoFocus</enum>
++         </property>
++         <property name="toolTip">
++          <string>Refresh history</string>
++         </property>
++         <property name="text">
++          <string>&amp;Refresh</string>
++         </property>
++         <property name="autoDefault">
++          <bool>false</bool>
++         </property>
++        </widget>
++       </item>
++      </layout>
+      </item>
+      <item>
+-      <widget class="QToolButton" name="tb_find">
+-       <property name="sizePolicy">
+-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+-         <horstretch>0</horstretch>
+-         <verstretch>0</verstretch>
+-        </sizepolicy>
+-       </property>
+-       <property name="maximumSize">
+-        <size>
+-         <width>27</width>
+-         <height>27</height>
+-        </size>
+-       </property>
+-       <property name="text">
+-        <string/>
++      <widget class="Line" name="line">
++       <property name="orientation">
++        <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+-    </layout>
+-   </item>
+-   <item row="1" column="0">
+-    <widget class="QListWidget" name="jidList">
+-     <property name="maximumSize">
+-      <size>
+-       <width>220</width>
+-       <height>16777215</height>
+-      </size>
+-     </property>
+-     <property name="sortingEnabled">
+-      <bool>true</bool>
+-     </property>
+-    </widget>
+-   </item>
+-   <item row="1" column="1" rowspan="2">
+-    <widget class="PsiTextView" name="msgLog">
+-     <property name="sizePolicy">
+-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+-       <horstretch>0</horstretch>
+-       <verstretch>0</verstretch>
+-      </sizepolicy>
+-     </property>
+-     <property name="maximumSize">
+-      <size>
+-       <width>16777215</width>
+-       <height>16777215</height>
+-      </size>
+-     </property>
+-     <property name="focusPolicy">
+-      <enum>Qt::ClickFocus</enum>
+-     </property>
+-     <property name="readOnly">
+-      <bool>true</bool>
+-     </property>
+-    </widget>
+-   </item>
+-   <item row="2" column="0">
+-    <widget class="QCalendarWidget" name="calendar">
+-     <property name="maximumSize">
+-      <size>
+-       <width>220</width>
+-       <height>220</height>
+-      </size>
+-     </property>
+-     <property name="firstDayOfWeek">
+-      <enum>Qt::Sunday</enum>
+-     </property>
+-     <property name="gridVisible">
+-      <bool>true</bool>
+-     </property>
+-     <property name="horizontalHeaderFormat">
+-      <enum>QCalendarWidget::ShortDayNames</enum>
+-     </property>
+-     <property name="verticalHeaderFormat">
+-      <enum>QCalendarWidget::NoVerticalHeader</enum>
+-     </property>
+-    </widget>
+-   </item>
+-   <item row="3" column="0">
+-    <widget class="QPushButton" name="buttonRefresh">
+-     <property name="sizePolicy">
+-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+-       <horstretch>0</horstretch>
+-       <verstretch>0</verstretch>
+-      </sizepolicy>
+-     </property>
+-     <property name="maximumSize">
+-      <size>
+-       <width>220</width>
+-       <height>16777215</height>
+-      </size>
+-     </property>
+-     <property name="focusPolicy">
+-      <enum>Qt::NoFocus</enum>
+-     </property>
+-     <property name="toolTip">
+-      <string>Refresh history</string>
+-     </property>
+-     <property name="text">
+-      <string>&amp;Refresh</string>
+-     </property>
+-     <property name="autoDefault">
+-      <bool>false</bool>
+-     </property>
+-    </widget>
+-   </item>
+-   <item row="3" column="1">
+-    <layout class="QHBoxLayout" name="horizontalLayout">
+-     <property name="sizeConstraint">
+-      <enum>QLayout::SetDefaultConstraint</enum>
+-     </property>
+      <item>
+-      <widget class="QPushButton" name="buttonEarliest">
+-       <property name="focusPolicy">
+-        <enum>Qt::NoFocus</enum>
+-       </property>
+-       <property name="text">
+-        <string>&amp;Earliest</string>
+-       </property>
+-      </widget>
++      <layout class="QVBoxLayout" name="verticalLayout_3">
++       <item>
++        <layout class="QHBoxLayout" name="horizontalLayout_2">
++         <item>
++          <widget class="QLineEdit" name="searchField">
++           <property name="sizePolicy">
++            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
++             <horstretch>0</horstretch>
++             <verstretch>0</verstretch>
++            </sizepolicy>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QToolButton" name="tb_find">
++           <property name="sizePolicy">
++            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
++             <horstretch>0</horstretch>
++             <verstretch>0</verstretch>
++            </sizepolicy>
++           </property>
++           <property name="maximumSize">
++            <size>
++             <width>27</width>
++             <height>27</height>
++            </size>
++           </property>
++           <property name="text">
++            <string/>
++           </property>
++          </widget>
++         </item>
++        </layout>
++       </item>
++       <item>
++        <widget class="PsiTextView" name="msgLog">
++         <property name="sizePolicy">
++          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
++           <horstretch>0</horstretch>
++           <verstretch>0</verstretch>
++          </sizepolicy>
++         </property>
++         <property name="maximumSize">
++          <size>
++           <width>16777215</width>
++           <height>16777215</height>
++          </size>
++         </property>
++         <property name="focusPolicy">
++          <enum>Qt::ClickFocus</enum>
++         </property>
++         <property name="readOnly">
++          <bool>true</bool>
++         </property>
++        </widget>
++       </item>
++       <item>
++        <layout class="QHBoxLayout" name="horizontalLayout">
++         <property name="sizeConstraint">
++          <enum>QLayout::SetDefaultConstraint</enum>
++         </property>
++         <item>
++          <widget class="QPushButton" name="buttonEarliest">
++           <property name="focusPolicy">
++            <enum>Qt::NoFocus</enum>
++           </property>
++           <property name="text">
++            <string>&amp;Earliest</string>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QPushButton" name="buttonPrevious">
++           <property name="focusPolicy">
++            <enum>Qt::NoFocus</enum>
++           </property>
++           <property name="text">
++            <string>&amp;Previous</string>
++           </property>
++           <property name="autoDefault">
++            <bool>false</bool>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <spacer name="horizontalSpacer_2">
++           <property name="orientation">
++            <enum>Qt::Horizontal</enum>
++           </property>
++           <property name="sizeType">
++            <enum>QSizePolicy::Expanding</enum>
++           </property>
++           <property name="sizeHint" stdset="0">
++            <size>
++             <width>13</width>
++             <height>13</height>
++            </size>
++           </property>
++          </spacer>
++         </item>
++         <item>
++          <widget class="QPushButton" name="buttonNext">
++           <property name="focusPolicy">
++            <enum>Qt::NoFocus</enum>
++           </property>
++           <property name="text">
++            <string>&amp;Next</string>
++           </property>
++           <property name="autoDefault">
++            <bool>false</bool>
++           </property>
++          </widget>
++         </item>
++         <item>
++          <widget class="QPushButton" name="buttonLastest">
++           <property name="focusPolicy">
++            <enum>Qt::NoFocus</enum>
++           </property>
++           <property name="text">
++            <string>&amp;Lastest</string>
++           </property>
++          </widget>
++         </item>
++        </layout>
++       </item>
++      </layout>
+      </item>
++    </layout>
++   </item>
++   <item>
++    <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+-      <widget class="QPushButton" name="buttonPrevious">
+-       <property name="focusPolicy">
+-        <enum>Qt::NoFocus</enum>
+-       </property>
+-       <property name="text">
+-        <string>&amp;Previous</string>
+-       </property>
+-       <property name="autoDefault">
+-        <bool>false</bool>
+-       </property>
+-      </widget>
++      <widget class="BusyWidget" name="busy" native="true"/>
+      </item>
+      <item>
+-      <spacer name="horizontalSpacer_2">
++      <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+-       <property name="sizeType">
+-        <enum>QSizePolicy::Expanding</enum>
+-       </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+-         <width>13</width>
+-         <height>13</height>
++         <width>20</width>
++         <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+-      <widget class="QPushButton" name="buttonNext">
+-       <property name="focusPolicy">
+-        <enum>Qt::NoFocus</enum>
+-       </property>
+-       <property name="text">
+-        <string>&amp;Next</string>
+-       </property>
+-       <property name="autoDefault">
+-        <bool>false</bool>
+-       </property>
+-      </widget>
+-     </item>
+-     <item>
+-      <widget class="QPushButton" name="buttonLastest">
+-       <property name="focusPolicy">
+-        <enum>Qt::NoFocus</enum>
+-       </property>
+-       <property name="text">
+-        <string>&amp;Lastest</string>
++      <widget class="QProgressBar" name="progressBar">
++       <property name="sizePolicy">
++        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
++         <horstretch>1</horstretch>
++         <verstretch>0</verstretch>
++        </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+-   <item row="4" column="0">
+-    <widget class="BusyWidget" name="busy" native="true"/>
+-   </item>
+   </layout>
+  </widget>
+  <customwidgets>
+@@ -251,14 +421,13 @@
+   </customwidget>
+  </customwidgets>
+  <tabstops>
++  <tabstop>accountsBox</tabstop>
+   <tabstop>jidList</tabstop>
++  <tabstop>jidList2</tabstop>
++  <tabstop>privList</tabstop>
++  <tabstop>advList</tabstop>
+   <tabstop>calendar</tabstop>
+   <tabstop>searchField</tabstop>
+-  <tabstop>buttonEarliest</tabstop>
+-  <tabstop>buttonPrevious</tabstop>
+-  <tabstop>buttonNext</tabstop>
+-  <tabstop>buttonLastest</tabstop>
+-  <tabstop>accountsBox</tabstop>
+   <tabstop>tb_find</tabstop>
+   <tabstop>msgLog</tabstop>
+  </tabstops>
+--- git.orig/src/psiaccount.cpp
++++ git/src/psiaccount.cpp
+@@ -4764,11 +4764,12 @@ void PsiAccount::dj_sendMessage(const Me
+ 
+ 	// don't log groupchat, private messages, or encrypted messages
+ 	if(log) {
+-		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !findGCContact(m.to())) {
++		if(m.type() != "groupchat" && m.xencrypted().isEmpty()/* && !findGCContact(m.to())*/) {
++			int type = findGCContact(m.to()) ? EDB::GroupChatContact : EDB::Contact;
+ 			MessageEvent::Ptr me(new MessageEvent(m, this));
+ 			me->setOriginLocal(true);
+ 			me->setTimeStamp(QDateTime::currentDateTime());
+-			logEvent(m.to(), me);
++			logEvent(m.to(), me, type);
+ 		}
+ 	}
+ 
+@@ -5113,7 +5114,7 @@ void PsiAccount::handleEvent(const PsiEv
+ 
+ 			// don't log private messages
+ 			if (!found &&
+-				!findGCContact(e->from()) &&
++				//!findGCContact(e->from()) &&
+ 				!(e->type() == PsiEvent::Message &&
+ 				 e.staticCast<MessageEvent>()->message().body().isEmpty()))
+ 			{
+@@ -5126,7 +5127,8 @@ void PsiAccount::handleEvent(const PsiEv
+ 				}
+ #endif
+ 				if (!isMuc) {
+-					logEvent(e->from(), e);
++					int type = findGCContact(e->from()) ? EDB::GroupChatContact : EDB::Contact;
++					logEvent(e->from(), e, type);
+ 				}
+ 			}
+ 		}
+@@ -5827,14 +5829,16 @@ void PsiAccount::groupChatMessagesRead(c
+ }
+ #endif
+ 
+-void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e)
++void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e, int type)
+ {
+ 	if (!d->acc.opt_log)
+ 		return;
++	if (type == EDB::GroupChatContact && !PsiOptions::instance()->getOption("options.history.store-muc-private").toBool())
++		return;
+ 
+ 	EDBHandle *h = new EDBHandle(d->psi->edb());
+ 	connect(h, SIGNAL(finished()), SLOT(edb_finished()));
+-	h->append(j, e);
++	h->append(id(), j, e, type);
+ }
+ 
+ void PsiAccount::edb_finished()
+@@ -6289,7 +6293,7 @@ void PsiAccount::pgp_encryptFinished()
+ 			MessageEvent::Ptr me(new MessageEvent(m, this));
+ 			me->setOriginLocal(true);
+ 			me->setTimeStamp(QDateTime::currentDateTime());
+-			logEvent(m.to(), me);
++			logEvent(m.to(), me, EDB::Contact);
+ 		}
+ 
+ 		Message mwrap;
+--- git.orig/src/psiaccount.h
++++ git/src/psiaccount.h
+@@ -529,7 +529,7 @@ private:
+ 	void simulateRosterOffline();
+ 	void cpUpdate(const UserListItem &, const QString &rname="", bool fromPresence=false);
+ 	UserListItem* addUserListItem(const Jid& jid, const QString& nick="");
+-	void logEvent(const Jid &, const PsiEvent::Ptr &);
++	void logEvent(const Jid &, const PsiEvent::Ptr &, int);
+ 	void queueEvent(const PsiEvent::Ptr &e, ActivationType activationType);
+ 	void openNextEvent(const UserListItem &, ActivationType activationType);
+ 	void updateReadNext(const Jid &);
+--- git.orig/src/psichatdlg.cpp
++++ git/src/psichatdlg.cpp
+@@ -960,7 +960,7 @@ bool PsiChatDlg::isEncryptionEnabled() c
+ 
+ void PsiChatDlg::appendSysMsg(const QString &str)
+ {
+-	chatView()->dispatchMessage(MessageView::fromHtml(str, MessageView::System));
++	dispatchMessage(MessageView::fromHtml(str, MessageView::System));
+ }
+ 
+ ChatView* PsiChatDlg::chatView() const
+--- git.orig/src/psicon.cpp
++++ git/src/psicon.cpp
+@@ -359,8 +359,7 @@ PsiCon::PsiCon()
  	d->ftwin = 0;
  #endif
  
 -	d->edb = new EDBFlatFile;
-+	//d->edb = new EDBFlatFile;
-+	EDBSqLite *esl = new EDBSqLite;
-+	esl->setMirror(new EDBFlatFile);
-+	d->edb = esl;
- 
+-
++	d->edb = 0;
  	d->s5bServer = 0;
  	d->tuneManager = 0;
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
+ 	d->autoUpdater = 0;
+@@ -381,7 +380,8 @@ PsiCon::~PsiCon()
+ 
+ 	delete d->autoUpdater;
+ 	delete d->actionList;
+-	delete d->edb;
++	if (d->edb)
++		delete d->edb;
+ 	delete d->defaultMenuBar;
+ 	delete d->tabManager;
+ 	delete d->popupManager;
+@@ -703,6 +703,12 @@ bool PsiCon::init()
+ 
+ 	checkAccountsEmpty();
+ 
++	// Import for SQLite history
++	EDBSqLite *edb = new EDBSqLite(this);
++	d->edb = edb;
++	if (!edb->init())
++		return false;
++
+ 	// try autologin if needed
+ 	foreach(PsiAccount* account, d->contactList->accounts()) {
+ 		account->autoLogin();
+--- git.orig/src/src.pri
++++ git/src/src.pri
 @@ -1,4 +1,4 @@
 -QT += xml network
 +QT += xml network sql
  
- # modules
- include($$PWD/protocol/protocol.pri)
-@@ -155,6 +155,7 @@ HEADERS += \
+ greaterThan(QT_MAJOR_VERSION, 4) {
+   QT += widgets multimedia concurrent
+@@ -142,6 +142,7 @@ HEADERS += \
  	$$PWD/translationmanager.h \
  	$$PWD/eventdb.h \
  	$$PWD/historydlg.h \
@@ -1193,7 +4350,7 @@
  	$$PWD/tipdlg.h \
  	$$PWD/searchdlg.h \
  	$$PWD/registrationdlg.h \
-@@ -303,6 +304,7 @@ SOURCES += \
+@@ -290,6 +291,7 @@ SOURCES += \
  	$$PWD/translationmanager.cpp \
  	$$PWD/eventdb.cpp \
  	$$PWD/historydlg.cpp \
@@ -1201,3 +4358,85 @@
  	$$PWD/searchdlg.cpp \
  	$$PWD/registrationdlg.cpp \
  	$$PWD/psitoolbar.cpp \
+--- git.orig/themes/chatview/psi/adapter.js
++++ git/themes/chatview/psi/adapter.js
+@@ -189,7 +189,11 @@ window[chatServer.jsNamespace()].adapter
+ 							}
+ 							if (!template) {
+ 								data.nextOfGroup = false; //can't group w/o template
+-								template = data.local?shared.templates.sentMessage:shared.templates.receivedMessage;
++								if (data.spooled) {
++									template = shared.templates.spooledMessage;
++								} else {
++									template = data.local?shared.templates.sentMessage:shared.templates.receivedMessage;
++								}
+ 							}
+ 							break;
+                         case "status":
+--- git.orig/themes/chatview/psi/classic/index.html
++++ git/themes/chatview/psi/classic/index.html
+@@ -13,6 +13,7 @@ body > div img { vertical-align:bottom;
+ body > div > img:first-child { vertical-align:text-bottom; }
+ .sent {}
+ .received {}
++.spooledmsg {}
+ .infmsg {}
+ .usertext {}
+ .alert {font-weight:bold;}
+@@ -32,6 +33,7 @@ window[chatServer.jsNamespace()].theme =
+ 	var cssBody = chat.util.findStyleSheet(document.styleSheets[0], "body").style;
+ 	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets[0], ".sent").style;
+ 	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets[0], ".received").style;
++	var cssSpooledMsg = chat.util.findStyleSheet(document.styleSheets[0], ".spooledmsg").style;
+ 	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
+ 	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
+ 	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
+@@ -46,6 +48,7 @@ window[chatServer.jsNamespace()].theme =
+ 		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
+ 		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
+ 		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
++		cssSpooledMsg.color = cssUserText.color;
+ 		cssAlertMsg.color = shared.psiOption("options.ui.look.colors.messages.highlighting");
+ 		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
+ 		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
+@@ -73,7 +76,9 @@ window[chatServer.jsNamespace()].theme =
+ 			receivedMessage: shared.isMuc?
+ 				"<div class='msg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %alertedmessage%</div>"
+ 				: null,
+-			spooledMessage: "<div class='infmsg'>%icon%[%time%] %sender% %message%</div>",
++			spooledMessage: shared.isMuc?
++				"<div class='spooledmsg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %message%</div>"
++				: "<div class='spooledmsg'>%icon%<span class='%sentrec%'>[%time%] %sender%</span> %message%</div>",
+ 			sys: "<div class='infmsg'>%icon%%message%</div>",
+ 			sysMessage: "<div class='infmsg'>%icon%[%time%] *** %message%</div>",
+ 			sysMessageUT: "<div class='infmsg'>%icon%[%time%] *** %message%: <span class='usertext'>%usertext%</span></div>",
+@@ -97,7 +102,7 @@ window[chatServer.jsNamespace()].theme =
+ 			}
+ 			if (shared.cdata.mtype == "message") {
+ 				var template = shared.cdata.emote && shared.templates.messageNC ||
+-					(shared.cdata.spooled && shared.templates.message || null);
++					(shared.cdata.spooled && shared.templates.spooledMessage || null);
+ 				if (template) {
+ 					shared.appendHtml(template.toString(), shared.cdata.local?true:null);
+ 					return false;
+@@ -119,8 +124,7 @@ window[chatServer.jsNamespace()].theme =
+ 				return shared.cdata.alert?"<span class='alert'>"+
+ 					shared.cdata.message+"</span>":shared.cdata.message;
+ 			},
+-			sentrec : function() {return shared.cdata.spooled?"infmsg":
+-				(shared.cdata.local?"sent":"received");},
++			sentrec : function() {return shared.cdata.local?"sent":"received";},
+ 			nickcolor : function() {
+ 				return shared.session.mucNickColor(shared.cdata.sender, shared.cdata.local);
+ 			},
+@@ -129,6 +133,10 @@ window[chatServer.jsNamespace()].theme =
+ 				if (useMessageIcons) {
+ 					switch (shared.cdata.mtype) {
+ 						case "message":
++							if (shared.cdata.spooled) {
++								icon = "psi/history";
++								break;
++							}
+ 							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
+ 								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
+ 								: "psi/notification_chat_receive";

psi-plus-main-20141106.tar.xz/patches/dev/psi-plus-psimedia.patch Added

@@ -0,0 +1,81 @@
+diff --git a/psi.qc b/psi.qc
+index 1f74092..70c99a6 100644
+--- a/psi.qc
++++ b/psi.qc
+@@ -42,6 +42,7 @@
+   <dep type='conf'>
+     <required/>
+   </dep>
++  <dep type='psimedia'/>
+   <dep type='recursiveprl'>
+     <required/>
+   </dep>
+diff --git a/qcm/psimedia.qcm b/qcm/psimedia.qcm
+new file mode 100644
+index 0000000..cae88b6
+--- /dev/null
++++ b/qcm/psimedia.qcm
+@@ -0,0 +1,34 @@
++/*
++-----BEGIN QCMOD-----
++name: psimedia
++arg: with-psimedia-path=[path],Extra search path to libgstprovider.so
++-----END QCMOD-----
++*/
++
++//----------------------------------------------------------------------------
++// qc_psimedia
++//----------------------------------------------------------------------------
++class qc_psimedia : public ConfObj
++{
++public:
++	qc_psimedia(Conf *c) : ConfObj(c) {}
++	QString name() const { return "psimedia"; }
++	QString shortname() const { return "psimedia"; }
++
++	bool exec()
++	{
++		QString path = conf->getenv("QC_WITH_PSIMEDIA_PATH");
++		if (path.isEmpty()) {
++			return false;
++		}
++
++		conf->addDefine("HAVE_GSTPROVIDER_PATH");
++		QFile file("src/config.h");
++		if ( file.open(QIODevice::Append | QIODevice::Text) ) {
++			QTextStream stream( &file );
++			stream << "#define GSTPROVIDER_PATH \"" << path << "\"" << endl;
++		}
++
++		return true;
++	}
++};
+diff --git a/src/avcall/avcall.cpp b/src/avcall/avcall.cpp
+index 38fff17..320a4b3 100644
+--- a/src/avcall/avcall.cpp
++++ b/src/avcall/avcall.cpp
+@@ -30,6 +30,7 @@
+ #include "applicationinfo.h"
+ #include "psiaccount.h"
+ #include "psioptions.h"
++#include "../config.h"
+ 
+ #define USE_THREAD
+ 
+@@ -108,6 +109,16 @@ static void ensureLoaded()
+ 		QString resourcePath;
+ 
+ 		pluginFile = qgetenv("PSI_MEDIA_PLUGIN");
++
++#ifdef HAVE_GSTPROVIDER_PATH
++		if(pluginFile.isEmpty())
++		{
++			QFileInfo fi(GSTPROVIDER_PATH);
++			if(fi.exists())
++				pluginFile = GSTPROVIDER_PATH;
++		}
++#endif
++
+ 		if(pluginFile.isEmpty())
+ 		{
+ #if defined(Q_OS_WIN)

psi-plus-main-20130107.tar.xz/patches/dev/psi-win32-crash-dialog.patch -> psi-plus-main-20141106.tar.xz/patches/dev/psi-win32-crash-dialog.patch Changed

psi-plus-main-20141106.tar.xz/patches/haiku Added

psi-plus-main-20141106.tar.xz/patches/haiku/4000-fix-psiplus-build-in-haiku.patch Added

@@ -0,0 +1,498 @@
+--- a/iris/src/jdns/jdns_p.h
++++ b/iris/src/jdns/jdns_p.h
+@@ -44,6 +44,8 @@
+ # define JDNS_OS_SOLARIS
+ #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
+ # define JDNS_OS_MAC
++#elif defined(__HAIKU__)
++# define JDNS_OS_HAIKU
+ #endif
+ 
+ #ifdef JDNS_OS_WIN
+--- a/iris/src/jdns/jdns_sys.c
++++ b/iris/src/jdns/jdns_sys.c
+@@ -726,8 +726,8 @@ static int my_res_init()
+ //   a define, so the #ifdef doesn't work.  as a workaround, we'll explicitly
+ //   specify the platforms that have __res_state_ext
+ //#ifdef __res_state_ext
+-#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \
+-    defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS)
++#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || defined(JDNS_OS_NETBSD) \
++	|| defined (JDNS_OS_SOLARIS) || defined (JDNS_OS_HAIKU)
+ # define USE_EXTEXT
+ #endif
+ 
+--- a/iris/src/jdns/qjdns_sock.cpp
++++ b/iris/src/jdns/qjdns_sock.cpp
+@@ -46,6 +46,7 @@
+ 
+ #ifndef QT_NO_IPV6
+ # define HAVE_IPV6
++#ifndef Q_OS_HAIKU
+ # ifndef s6_addr
+ #  define IPPROTO_IPV6 41
+    struct in6_addr
+@@ -59,6 +60,7 @@
+    };
+ #  define s6_addr _S6_un._S6_u8
+ # endif
++#endif
+ # ifndef IPV6_JOIN_GROUP
+ #  define IPV6_JOIN_GROUP 12
+ #  define IPV6_MULTICAST_HOPS 10
+--- a/src/applicationinfo.cpp
++++ b/src/applicationinfo.cpp
+@@ -160,7 +160,7 @@ QString ApplicationInfo::resourcesDir()
+ {
+ #if defined(HAVE_X11)
+ 	return PSI_DATADIR;
+-#elif defined(Q_OS_WIN)
++#elif defined(Q_OS_WIN) || defined(Q_WS_HAIKU)
+ 	return qApp->applicationDirPath();
+ #elif defined(Q_OS_MAC)
+ 	// FIXME: Clean this up (remko)
+@@ -297,6 +297,10 @@ QString ApplicationInfo::homeDir(ApplicationInfo::HomedirType type)
+ 				QMessageBox::information(0, QObject::tr("Conversion Error"), QObject::tr("Configuration data for a previous version of Psi was found, but it was not possible to convert it to work with the current version. Ensure you have appropriate permission and that another copy of Psi is not running, and try again."));
+ 				exit(0);
+ 			}
++#elif defined Q_OS_HAIKU
++			QDir configDir(QDir::homePath() + "/.config/" + sname());
++			QDir cacheDir(QDir::homePath() + "/.cache/" + sname());
++			QDir dataDir(configDir);
+ #endif
+ 			configDir_ = configDir.path();
+ 			cacheDir_ = cacheDir.path();
+--- a/src/libpsi/tools/globalshortcut/globalshortcut.pri
++++ b/src/libpsi/tools/globalshortcut/globalshortcut.pri
+@@ -2,7 +2,7 @@ HEADERS += $$PWD/globalshortcutmanager.h $$PWD/globalshortcuttrigger.h
+ SOURCES += $$PWD/globalshortcutmanager.cpp
+ DEPENDPATH  += $$PWD
+ 
+-unix:!mac {
++unix:!mac:!haiku {
+ 	SOURCES += $$PWD/globalshortcutmanager_x11.cpp
+ }
+ win32: {
+@@ -16,3 +16,6 @@ mac: {
+ 	HEADERS += \
+ 		$$PWD/NDKeyboardLayout.h
+ }
++haiku: {
++	SOURCES += $$PWD/globalshortcutmanager_haiku.cpp
++}
+--- a/src/libpsi/tools/tools.pri
++++ b/src/libpsi/tools/tools.pri
+@@ -25,7 +25,7 @@ SOURCES += \
+ 	$$PWD/priorityvalidator.cpp \
+ 	$$PWD/iodeviceopener.cpp
+ 
+-unix:!mac {
++unix:!mac:!haiku {
+ 	HEADERS += $$PWD/x11info.h
+ 	SOURCES += $$PWD/x11info.cpp
+ }
+--- a/src/src.pri
++++ b/src/src.pri
+@@ -6,7 +6,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
+ 
+   unix:!mac:LIBS += -lxcb
+ }
+-unix:!mac:DEFINES += HAVE_X11
++unix:!mac:!haiku:DEFINES += HAVE_X11
+ 
+ # modules
+ include($$PWD/protocol/protocol.pri)
+--- a/src/systeminfo.cpp
++++ b/src/systeminfo.cpp
+@@ -26,6 +26,14 @@
+ #include <windows.h>
+ #endif
+ 
++#if defined(Q_WS_HAIKU)
++#include <sys/utsname.h>
++#include <Path.h>
++#include <FindDirectory.h>
++#include <AppFileInfo.h>
++extern "C" const char* __get_haiku_revision();
++#endif
++
+ #include "systeminfo.h"
+ 
+ #if defined(HAVE_X11)
+@@ -172,7 +180,7 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
+ 	os_str_ = "Unknown";
+ 
+ 	// Detect
+-#if defined(HAVE_X11) || defined(Q_OS_MAC)
++#if defined(HAVE_X11) || defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
+ 	time_t x;
+ 	time(&x);
+ 	char str[256];
+@@ -225,6 +233,31 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
+ 		default:
+ 			os_str_ = "Mac OS X";
+ 	}
++#elif defined(Q_WS_HAIKU)
++	QString strVersion("Haiku");
++	BPath path;
++	if (find_directory(B_BEOS_LIB_DIRECTORY, &path) == B_OK) {
++		path.Append("libbe.so");
++
++		BAppFileInfo appFileInfo;
++		version_info versionInfo;
++		BFile file;
++		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
++			&& appFileInfo.SetTo(&file) == B_OK
++			&& appFileInfo.GetVersionInfo(&versionInfo, 
++				B_APP_VERSION_KIND) == B_OK
++			&& versionInfo.short_info[0] != '\0')
++				strVersion = versionInfo.short_info;
++	}
++
++	 const char* haikuRevision = __get_haiku_revision();
++       if (haikuRevision != NULL) {
++               os_str_ = "Haiku";
++               os_str_ += " ( " + strVersion + " Rev. ";
++               os_str_ += haikuRevision;
++               os_str_ += ")";
++       }
++
+ #endif
+ 
+ #if defined(Q_OS_WIN)
+--- /dev/null
++++ b/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp
+@@ -0,0 +1,333 @@
++/*
++ * globalshortcutmanager_haiku.cpp - Haiku implementation of global shortcuts by Vitaly (Diger)
++ * Based on X11 implementation of global shortcuts
++ * Copyright (C) 2003-2006  Justin Karneges, Maciej Niedzielski
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ */
++
++#include "globalshortcutmanager.h"
++#include "globalshortcuttrigger.h"
++
++#include <InterfaceDefs.h>
++
++#include <QWidget>
++#include <QCoreApplication>
++
++
++class HKeyTrigger
++{
++public:
++	virtual ~HKeyTrigger() {}
++	virtual void activate() = 0;
++	virtual bool isAccepted(int qkey) const = 0;
++};
++
++class HKeyTriggerManager : public QObject
++{
++public:
++	static HKeyTriggerManager* instance()
++	{
++		if(!instance_)
++			instance_ = new HKeyTriggerManager();
++		return instance_;
++	}
++
++	void addTrigger(HKeyTrigger* trigger)
++	{
++		triggers_ << trigger;
++	}
++
++	void removeTrigger(HKeyTrigger* trigger)
++	{
++		triggers_.removeAll(trigger);
++	}
++
++	struct Qt_HK_Keygroup
++	{
++		char num;
++		int sym[3];
++	};
++
++protected:
++	// reimplemented
++	bool eventFilter(QObject* o, QEvent* e)
++	{
++		if(e->type() == QEvent::KeyPress) {
++			QKeyEvent* k = static_cast<QKeyEvent*>(e);
++			int qkey = k->key();
++			if (k->modifiers() & Qt::ShiftModifier)
++				qkey |= Qt::SHIFT;
++			if (k->modifiers() & Qt::ControlModifier)
++				qkey |= Qt::CTRL;
++			if (k->modifiers() & Qt::AltModifier)
++				qkey |= Qt::ALT;
++			if (k->modifiers() & Qt::MetaModifier)
++				qkey |= Qt::META;
++
++			foreach(HKeyTrigger* trigger, triggers_) {
++				if (trigger->isAccepted(qkey)) {
++					trigger->activate();
++					return true;
++				}
++			}
++		}
++
++		return QObject::eventFilter(o, e);
++	}
++
++private:
++	HKeyTriggerManager()
++		: QObject(QCoreApplication::instance())
++	{
++		QCoreApplication::instance()->installEventFilter(this);
++	}
++
++	static HKeyTriggerManager* instance_;
++	QList<HKeyTrigger*> triggers_;
++
++private:
++	struct Qt_HK_Keymap
++	{
++		int key;
++		Qt_HK_Keygroup hk;
++	};
++
++	static Qt_HK_Keymap qt_hk_table[];
++	static long alt_mask;
++	static long meta_mask;
++	static long super_mask;
++	static long hyper_mask;
++	static long numlock_mask;
++	static bool haveMods;
++
++	// adapted from qapplication_x11.cpp
++	static void ensureModifiers()
++	{
++		if (haveMods)
++			return;
++	}
++
++public:
++	static bool convertKeySequence(const QKeySequence& ks, unsigned int* _mod, Qt_HK_Keygroup* _kg)
++	{
++		int code = ks;
++		ensureModifiers();
++
++		unsigned int mod = 0;
++		/*
++		if (code & Qt::META)
++			mod |= meta_mask;
++		if (code & Qt::SHIFT)
++			mod |= ShiftMask;
++		if (code & Qt::CTRL)
++			mod |= ControlMask;
++		if (code & Qt::ALT)
++			mod |= alt_mask;
++		*/
++		Qt_HK_Keygroup kg;
++		kg.num = 0;
++		kg.sym[0] = 0;
++		code &= ~Qt::KeyboardModifierMask;
++
++		bool found = false;
++		for (int n = 0; qt_hk_table[n].key != Qt::Key_unknown; ++n) {
++			if (qt_hk_table[n].key == code) {
++				kg = qt_hk_table[n].hk;
++				found = true;
++				break;
++			}
++		}
++
++		if (!found) {
++			// try latin1
++			if (code >= 0x20 && code <= 0x7f) {
++				kg.num = 1;
++				kg.sym[0] = code;
++			}
++		}
++
++		if (!kg.num)
++			return false;
++
++		if (_mod)
++			*_mod = mod;
++		if (_kg)
++			*_kg = kg;
++
++		return true;
++	}
++
++	static QList<long> ignModifiersList()
++	{
++		QList<long> ret;
++		/*
++		if (numlock_mask) {
++			ret << 0 << LockMask << numlock_mask << (LockMask | numlock_mask);
++		}
++		else {
++			ret << 0 << LockMask;
++		}
++		*/
++		return ret;
++	}
++};
++
++
++HKeyTriggerManager* HKeyTriggerManager::instance_ = NULL;
++class GlobalShortcutManager::KeyTrigger::Impl : public HKeyTrigger
++{
++private:
++	KeyTrigger* trigger_;
++	int qkey_;
++
++	struct GrabbedKey {
++		int code;
++		uint mod;
++	};
++	QList<GrabbedKey> grabbedKeys_;
++
++	static bool failed;
++
++public:
++	/**
++	 * Constructor registers the hotkey.
++	 */
++	Impl(GlobalShortcutManager::KeyTrigger* t, const QKeySequence& ks)
++		: trigger_(t)
++		, qkey_(ks)
++	{
++		HKeyTriggerManager::instance()->addTrigger(this);
++
++		HKeyTriggerManager::Qt_HK_Keygroup kg;
++		unsigned int mod;
++	}
++
++	/**
++	 * Destructor unregisters the hotkey.
++	 */
++	~Impl()
++	{
++		HKeyTriggerManager::instance()->removeTrigger(this);
++
++	}
++
++	void activate()
++	{
++		emit trigger_->triggered();
++	}
++
++	bool isAccepted(int qkey) const
++	{
++		return qkey_ == qkey;
++	}
++};
++
++bool GlobalShortcutManager::KeyTrigger::Impl::failed;
++long HKeyTriggerManager::alt_mask  = 0;
++long HKeyTriggerManager::meta_mask = 0;
++long HKeyTriggerManager::super_mask  = 0;
++long HKeyTriggerManager::hyper_mask  = 0;
++long HKeyTriggerManager::numlock_mask  = 0;
++bool HKeyTriggerManager::haveMods  = false;
++
++
++HKeyTriggerManager::Qt_HK_Keymap
++HKeyTriggerManager::qt_hk_table[] = {
++	{ Qt::Key_Escape,      B_ESCAPE },
++	{ Qt::Key_Tab,         B_TAB},
++	{ Qt::Key_Backtab,     0 },
++	{ Qt::Key_Backspace,   B_BACKSPACE},
++	{ Qt::Key_Return,      B_RETURN},
++	{ Qt::Key_Enter,       B_ENTER},
++	{ Qt::Key_Insert,      B_INSERT},
++	{ Qt::Key_Delete,      B_DELETE},
++	{ Qt::Key_Pause,       B_PAUSE_KEY},
++	{ Qt::Key_Print,       B_PRINT_KEY},
++	{ Qt::Key_SysReq,      0 },
++	//{ Qt::Key_Clear,       B_CLEAR_KEY},
++	{ Qt::Key_Home,        B_HOME},
++	{ Qt::Key_End,         B_END},
++	{ Qt::Key_Left,        B_LEFT_ARROW},
++	{ Qt::Key_Up,          B_UP_ARROW},
++	{ Qt::Key_Right,       B_RIGHT_ARROW},
++	{ Qt::Key_Down,        B_DOWN_ARROW},
++	{ Qt::Key_PageUp,      B_PAGE_UP},
++	{ Qt::Key_PageDown,    B_PAGE_DOWN},
++	{ Qt::Key_Shift,       B_SHIFT_KEY},
++	{ Qt::Key_Control,     B_CONTROL_KEY},
++	{ Qt::Key_Meta,        B_LEFT_OPTION_KEY},
++	{ Qt::Key_Alt,         B_MENU_KEY},
++	{ Qt::Key_CapsLock,    B_CAPS_LOCK},
++	{ Qt::Key_NumLock,     B_NUM_LOCK},
++	{ Qt::Key_ScrollLock,  B_SCROLL_KEY},
++	{ Qt::Key_F1,          B_F1_KEY},
++	{ Qt::Key_F2,          B_F2_KEY},
++	{ Qt::Key_F3,          B_F3_KEY},
++	{ Qt::Key_F4,          B_F4_KEY},
++	{ Qt::Key_F5,          B_F5_KEY},
++	{ Qt::Key_F6,          B_F6_KEY},
++	{ Qt::Key_F7,          B_F7_KEY},
++	{ Qt::Key_F8,          B_F8_KEY},
++	{ Qt::Key_F9,          B_F9_KEY},
++	{ Qt::Key_F10,         B_F10_KEY},
++	{ Qt::Key_F11,         B_F11_KEY},
++	{ Qt::Key_F12,         B_F12_KEY},
++	{ Qt::Key_F13,         0 },
++	{ Qt::Key_F14,         0 },
++	{ Qt::Key_F15,         0 },
++	{ Qt::Key_F16,         0 },
++	{ Qt::Key_F17,         0 },
++	{ Qt::Key_F18,         0 },
++	{ Qt::Key_F19,         0 },
++	{ Qt::Key_F20,         0 },
++	{ Qt::Key_F21,         0 },
++	{ Qt::Key_F22,         0 },
++	{ Qt::Key_F23,         0 },
++	{ Qt::Key_F24,         0 },
++	{ Qt::Key_F25,         0 },
++	{ Qt::Key_F26,         0 },
++	{ Qt::Key_F27,         0 },
++	{ Qt::Key_F28,         0 },
++	{ Qt::Key_F29,         0 },
++	{ Qt::Key_F30,         0 },
++	{ Qt::Key_F31,         0 },
++	{ Qt::Key_F32,         0 },
++	{ Qt::Key_F33,         0 },
++	{ Qt::Key_F34,         0 },
++	{ Qt::Key_F35,         0 },
++	{ Qt::Key_Super_L,     0 },
++	{ Qt::Key_Super_R,     0 },
++	{ Qt::Key_Menu,        0 },
++	{ Qt::Key_Hyper_L,     0 },
++	{ Qt::Key_Hyper_R,     0 },
++	{ Qt::Key_Help,        0 },
++	{ Qt::Key_Direction_L, 0 },
++	{ Qt::Key_Direction_R, 0 },
++
++	{ Qt::Key_unknown,     0 },
++};
++
++GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
++{
++	d = new Impl(this, key);
++}
++
++GlobalShortcutManager::KeyTrigger::~KeyTrigger()
++{
++	delete d;
++	d = 0;
++}

psi-plus-main-20141106.tar.xz/patches/haiku/4010-fix-iconselect-buttons-in-haiku.patch Added

@@ -0,0 +1,35 @@
+--- a/src/widgets/iconselect.cpp
++++ b/src/widgets/iconselect.cpp
+@@ -102,6 +102,10 @@ public:
+ signals:
+ 	void iconSelected(const PsiIcon *);
+ 	void textSelected(QString);
++	
++public slots:
++	void aboutToShow() { iconStart(); }
++	void aboutToHide() { iconStop();  }
+ 
+ private:
+ 	void iconStart()
+@@ -142,8 +146,8 @@ private:
+ 		}
+ 	}
+ 
+-	void enterEvent(QEvent *) { iconStart(); setFocus();  update(); } // focus follows mouse mode
+-	void leaveEvent(QEvent *) { iconStop(); clearFocus(); update(); }
++	void enterEvent(QEvent *) { setFocus();   update(); } // focus follows mouse mode
++	void leaveEvent(QEvent *) { clearFocus(); update(); }
+ 
+ private slots:
+ 	void iconUpdated()
+@@ -333,8 +337,8 @@ void IconSelect::setIconset(const Iconset &iconset)
+ 		connect (b, SIGNAL(iconSelected(const PsiIcon *)), menu, SIGNAL(iconSelected(const PsiIcon *)));
+ 		connect (b, SIGNAL(textSelected(QString)), menu, SIGNAL(textSelected(QString)));
+ 
+-		//connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
+-		//connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
++		connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
++		connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
+ 
+ 		if (++column >= size) {
+ 			++row;

psi-plus-main-20141106.tar.xz/patches/haiku/4020-fix-screenshotplugin-build-in-haiku.patch Added

psi-plus-main-20130107.tar.xz/patches/mac/3000-brushed-metal.diff -> psi-plus-main-20141106.tar.xz/patches/mac/3000-brushed-metal.diff Changed

@@ -1,43 +1,40 @@
-diff -urpN -X psidiff.ignore sources//src/eventdlg.cpp work//src/eventdlg.cpp
---- sources//src/eventdlg.cpp	2010-03-11 21:03:58.000000000 +0500
-+++ work//src/eventdlg.cpp	2010-03-11 22:34:50.000000000 +0500
-@@ -465,6 +465,8 @@
+--- psi.orig/src/chatdlg.cpp
++++ psi/src/chatdlg.cpp
+@@ -97,6 +97,11 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
+ 	: TabbableWidget(jid, pa, tabManager)
+ 	, highlightersInstalled_(false)
+ {
++	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
++			setAttribute(Qt::WA_MacMetalStyle);
++
++	}
++
+ 	pending_ = 0;
+ 	keepOpen_ = false;
+ 	warnSend_ = false;
+--- psi.orig/src/eventdlg.cpp
++++ psi/src/eventdlg.cpp
+@@ -458,6 +458,8 @@ void AttachView::addUrlList(const UrlLis
  AddUrlDlg::AddUrlDlg(QWidget *parent)
  :QDialog(parent)
  {
 +	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
 +			setAttribute(Qt::WA_MacMetalStyle);
  	setupUi(this);
- #ifndef Q_WS_MAC
+ #ifndef Q_OS_MAC
  	setWindowIcon(IconsetFactory::icon("psi/www").icon());
-@@ -586,6 +588,8 @@
+@@ -580,6 +582,8 @@ EventDlg::EventDlg(const QString &to, Ps
  	: AdvancedWidget<QWidget>(0)
  {
  	setAttribute(Qt::WA_DeleteOnClose);
 + 	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);	
++			setAttribute(Qt::WA_MacMetalStyle);
  	d = new Private(this);
  	d->composing = true;
  	d->psi = psi;
-diff -urpN -X psidiff.ignore sources//src/chatdlg.cpp work//src/chatdlg.cpp
---- sources//src/chatdlg.cpp	2010-03-11 21:04:00.000000000 +0500
-+++ work//src/chatdlg.cpp	2010-03-11 22:26:19.000000000 +0500
-@@ -93,6 +93,11 @@
- 	: TabbableWidget(jid, pa, tabManager)
- 	, highlightersInstalled_(false)
- {
-+	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
-+			setAttribute(Qt::WA_MacMetalStyle);
-+
-+	}
-+	
- 	pending_ = 0;
- 	keepOpen_ = false;
- 	warnSend_ = false;
-diff -urpN -X psidiff.ignore sources//src/infodlg.cpp work//src/infodlg.cpp
---- sources//src/infodlg.cpp	2010-03-11 21:04:03.000000000 +0500
-+++ work//src/infodlg.cpp	2010-03-11 22:45:17.000000000 +0500
-@@ -120,6 +120,8 @@
+--- psi.orig/src/infodlg.cpp
++++ psi/src/infodlg.cpp
+@@ -127,6 +127,8 @@ InfoDlg::InfoDlg(int type, const Jid &j,
  	: QDialog(parent)
  {
  	setAttribute(Qt::WA_DeleteOnClose);
@@ -46,10 +43,9 @@
  #if QT_VERSION >= 0x040500
  	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
  #endif
-diff -urpN -X psidiff.ignore sources//src/psi_profiles.cpp work//src/psi_profiles.cpp
---- sources//src/psi_profiles.cpp	2010-03-11 21:04:03.000000000 +0500
-+++ work//src/psi_profiles.cpp	2010-03-11 22:46:21.000000000 +0500
-@@ -884,6 +884,7 @@
+--- psi.orig/src/psi_profiles.cpp
++++ psi/src/psi_profiles.cpp
+@@ -896,6 +896,7 @@ bool OptionsMigration::fromFile(const QS
  				migrateBoolEntry(tag, "jidComplete", "options.ui.message.use-jid-auto-completion");
  				migrateBoolEntry(tag, "grabUrls", "options.ui.message.auto-grab-urls-from-clipboard");
  				migrateBoolEntry(tag, "smallChats", "options.ui.chat.use-small-chats");
@@ -57,31 +53,29 @@
  				migrateBoolEntry(tag, "chatLineEdit", "options.ui.chat.use-expanding-line-edit");
  				migrateBoolEntry(tag, "useTabs", "options.ui.tabs.use-tabs");
  				migrateBoolEntry(tag, "putTabsAtBottom", "options.ui.tabs.put-tabs-at-bottom");
-diff -urpN -X psidiff.ignore sources//src/tabs/tabdlg.cpp work//src/tabs/tabdlg.cpp
---- sources//src/tabs/tabdlg.cpp	2010-03-11 21:04:03.000000000 +0500
-+++ work//src/tabs/tabdlg.cpp	2010-03-11 22:48:28.000000000 +0500
-@@ -131,6 +131,11 @@
+--- psi.orig/src/tabs/tabdlg.cpp
++++ psi/src/tabs/tabdlg.cpp
+@@ -149,6 +149,11 @@ TabDlg::TabDlg(TabManager* tabManager, c
  		delegate_->create(this);
  	}
- 
+
 +	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
 +			setAttribute(Qt::WA_MacMetalStyle);
-+		
++
 +	}
-+	
++
  	// FIXME
  	qRegisterMetaType<TabDlg*>("TabDlg*");
  	qRegisterMetaType<TabbableWidget*>("TabbableWidget*");
-diff -urpN -X psidiff.ignore sources//src/whiteboarding/wbdlg.cpp work//src/whiteboarding/wbdlg.cpp
---- sources//src/whiteboarding/wbdlg.cpp	2010-03-11 21:03:55.000000000 +0500
-+++ work//src/whiteboarding/wbdlg.cpp	2010-03-11 22:50:08.000000000 +0500
-@@ -38,6 +38,9 @@
+--- psi.orig/src/whiteboarding/wbdlg.cpp
++++ psi/src/whiteboarding/wbdlg.cpp
+@@ -41,6 +41,9 @@ static const QString geometryOption = "o
  //----------------------------------------------------------------------------
- 
+
  WbDlg::WbDlg(SxeSession* session, PsiAccount* pa) {
 +	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
 +		setAttribute(Qt::WA_MacMetalStyle);
-+	
++
  	groupChat_ = session->groupChat();
  	pending_ = 0;
  	keepOpen_ = false;

psi-plus-main-20130107.tar.xz/patches/mac/3020-psi-mac-Makefile.diff -> psi-plus-main-20141106.tar.xz/patches/mac/3020-psi-mac-Makefile.diff Changed

@@ -4,7 +4,7 @@
 @@ -23,25 +23,25 @@
  SPARKLEDIR=/Library/Frameworks
  PSI_DIR=..
- 
+
 -EXECUTABLE_NAME=psi
 -NAME=Psi
 +EXECUTABLE_NAME=psi-plus
@@ -13,7 +13,7 @@
 -VERSION=0.15-devel_$(shell date +"%Y%m%d")
 -#VERSION=0.15
 +VERSION=0.15.xxx-macosx
- 
+
 -APPFILE_NAME=Psi.app
 +APPFILE_NAME=Psi+.app
  FILES=$(APPFILE_NAME)
@@ -23,15 +23,15 @@
  endif
 -MASTER_DMG=$(NAME)-$(VERSION).dmg
 +MASTER_DMG=$(EXECUTABLE_NAME)-$(VERSION).dmg
- 
- 
+
+
  # Other variables
  QT_FRAMEWORK_VERSION=4
 -QT_FRAMEWORKS=QtCore QtXml QtNetwork QtGui QtSql QtSvg
 +QT_FRAMEWORKS=QtCore QtXml QtXmlPatterns QtNetwork QtGui QtSql QtSvg QtDBus phonon
  QT_PLUGINS=imageformats/libqjpeg.dylib imageformats/libqgif.dylib
 +PSIPLUS_PLUGINS=`ls ../src/$(EXECUTABLE_NAME).app/Contents/Resources/plugins`
- 
+
  # The rules
  .PHONY: buildall
 @@ -68,7 +68,7 @@
@@ -81,11 +81,11 @@
 +		done; \
 +		install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/MacOS/$(EXECUTABLE_NAME)"; \
 +	done; \
- 
+
  # The rest
  $(DISK_DIR)/%: $(PSI_DIR)/%
 @@ -150,9 +151,9 @@
- $(TEMPLATE_DMG).bz2: 
+ $(TEMPLATE_DMG).bz2:
  	@echo
  	@echo --------------------- Generating empty template --------------------
 -	mkdir template
@@ -96,4 +96,4 @@
 +#	rmdir template
  	bzip2 "$(TEMPLATE_DMG)"
  	@echo
- 
+

psi-plus-main-20130107.tar.xz/patches/mac/3030-psi-mac-sparkle.diff -> psi-plus-main-20141106.tar.xz/patches/mac/3030-psi-mac-sparkle.diff Changed

@@ -35,7 +35,7 @@
 @@ -36,7 +36,7 @@
  #define PROG_STORAGE_NS "http://psi-im.org/storage"
  #define PROG_FILECACHE_NS "http://psi-im.org/filecache"
- #ifdef Q_WS_MAC
+ #ifdef Q_OS_MAC
 -#define PROG_APPCAST_URL "http://psi-im.org/appcast/psi-mac.xml"
 +#define PROG_APPCAST_URL "http://psi-dev.googlecode.com/files/psi-plus-mac.xml"
  #else
@@ -46,14 +46,14 @@
 @@ -89,6 +89,11 @@
  #include <x11windowsystem.h>
  #endif
- 
+
 +#include "AutoUpdater/AutoUpdater.h"
 +#ifdef HAVE_SPARKLE
 +#include "AutoUpdater/SparkleAutoUpdater.h"
 +#endif
 +
  using namespace XMPP;
- 
+
  static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
 @@ -536,6 +541,9 @@ MainWin::MainWin(bool _onTop, bool _asTo
  	d->getAction("help_online_home")->addTo (helpMenu);
@@ -76,19 +76,19 @@
  		{ "help_about",       activated, this, SLOT( actAboutActivated() ) },
  		{ "help_about_qt",    activated, this, SLOT( actAboutQtActivated() ) },
 @@ -972,6 +979,9 @@ void MainWin::buildOptionsMenu()
- 	        << "help_report_bug"
- 	        << "diagnostics"
- 	        << "separator"
+ 			<< "help_report_bug"
+ 			<< "diagnostics"
+ 			<< "separator"
 +#ifdef HAVE_SPARKLE
-+	        << "help_update"
++			<< "help_update"
 +#endif
- 	        << "help_about"
- 	        << "help_about_qt";
- 
+ 			<< "help_about"
+ 			<< "help_about_qt";
+
 @@ -1097,6 +1105,16 @@ void MainWin::actAboutQtActivated ()
  	QMessageBox::aboutQt(this);
  }
- 
+
 +void MainWin::actCheckUpdateActivated()
 +{
 +#ifdef HAVE_SPARKLE
@@ -117,13 +117,13 @@
 @@ -387,6 +387,9 @@ void PsiActionList::Private::createMainW
  		IconAction *actPsiMUC = new IconAction (tr("Join Psi Discussion Room (Online)"), tr("&Join Psi Discussion Room (Online)"), 0, this);
  		actOnlineHome->setWhatsThis (tr("Join Psi Discussion Room (Online)"));
- 
+
 +		IconAction *actCheckUpdate = new IconAction (tr("Check for Updates..."), tr("&Check for Updates..."), 0, this);
 +		actCheckUpdate->setWhatsThis (tr("Check for Updates..."));
 +
  		IconAction *actBugReport = new IconAction (tr("Report a Bug (Online)"), tr("Report a &Bug (Online)"), 0, this);
  		actBugReport->setWhatsThis (tr("Report a Bug (Online)"));
- 
+
 @@ -415,6 +418,7 @@ void PsiActionList::Private::createMainW
  			{ "help_report_bug",       actBugReport       },
  			{ "help_about",            actAbout           },

psi-plus-main-20130107.tar.xz/patches/mac/3040-psi-chat-theme-mac_native.diff -> psi-plus-main-20141106.tar.xz/patches/mac/3040-psi-chat-theme-mac_native.diff Changed

@@ -40,21 +40,21 @@
 --- /dev/null
 +++ psi/themes/chatview/adium/native_mac/Contents/Resources/Main.css
 @@ -0,0 +1,53 @@
-+body { 
-+  background-color: #fff; 
-+  margin: 0; 
-+  padding: 0; 
-+  font-family: 'helvetica neue', helvetica, arial, sans-serif; 
-+  font-size: 14px; 
-+  text-align: left; 
++body {
++  background-color: #fff;
++  margin: 0;
++  padding: 0;
++  font-family: 'helvetica neue', helvetica, arial, sans-serif;
++  font-size: 14px;
++  text-align: left;
 +}
 +
 +/* Heading */
-+div.heading { 
-+  position: fixed; 
-+  top: 0; 
-+  right: 0; 
-+  padding: 1.25em 0; 
++div.heading {
++  position: fixed;
++  top: 0;
++  right: 0;
++  padding: 1.25em 0;
 +  width: 100%;
 +  z-index: 999;
 +  color: #fff;
@@ -64,10 +64,10 @@
 +}
 +div.heading .icon { position: absolute; top: 1px; left: 1px; border: 1px solid #333; background: #fff; }
 +div.heading img.icon { height: 66px; width: 66px; }
-+div.heading .with, div.heading .timestamp { 
-+  font-weight: bold; 
++div.heading .with, div.heading .timestamp {
++  font-weight: bold;
 +  font-family: 'myriadd pro', 'myriad', 'lucida grande', 'trebuchet ms', arial, sans-serif;
-+  position: relative; 
++  position: relative;
 +  left: 4.5em;
 +}
 +div.heading .with { font-size: 20px; }

psi-plus-main-20130107.tar.xz/patches/psimedia/0010-psimedia-varrate-asterisk.diff -> psi-plus-main-20141106.tar.xz/patches/psimedia/0010-psimedia-varrate-asterisk.diff Changed

@@ -23,7 +23,7 @@
 --- psimedia-1.0.3/gstprovider/rtpworker.cpp	2009-05-17 20:32:59.000000000 +0200
 +++ psimedia-1.0.3-hacked/gstprovider/rtpworker.cpp	2010-03-05 00:50:59.000000000 +0100
 @@ -969,6 +969,11 @@
- 
+
  bool RtpWorker::startSend()
  {
 +  return startSend(16000);
@@ -35,7 +35,7 @@
  	if(!infile.isEmpty() || !indata.isEmpty())
  	{
 @@ -1055,7 +1060,7 @@
- 
+
  	if(audiosrc)
  	{
 -		if(!addAudioChain())
@@ -44,7 +44,7 @@
  			delete pd_audiosrc;
  			pd_audiosrc = 0;
 @@ -1192,15 +1197,22 @@
- 
+
  	// TODO: support more than speex
  	int speex_at = -1;
 +	int samplerate = -1;
@@ -66,11 +66,11 @@
 +	  cleanup();
 +	  startSend(samplerate);
 +	}
- 
+
  	// TODO: support more than theora
  	int theora_at = -1;
 @@ -1460,9 +1472,13 @@
- 
+
  bool RtpWorker::addAudioChain()
  {
 +  return addAudioChain(16000);
@@ -94,9 +94,9 @@
  			pt = ri.id;
  			break;
 @@ -1683,7 +1699,20 @@
- 
+
  		gst_caps_unref(caps);
- 
+
 -		localAudioPayloadInfo = QList<PPayloadInfo>() << pi;
 +		PPayloadInfo speexnb;
 +		speexnb.id = 97;
@@ -105,21 +105,21 @@
 +		speexnb.channels = 1;
 +		speexnb.ptime = pi.ptime;
 +		speexnb.maxptime = pi.maxptime;
-+		
++
 +		QList<PPayloadInfo> ppil;
 +		ppil << pi;
 +		ppil << speexnb;
-+		
-+		
++
++
 +		localAudioPayloadInfo = ppil;
  		canTransmitAudio = true;
  	}
- 
+
 diff -ru psimedia-1.0.3/gstprovider/rtpworker.h psimedia-1.0.3-hacked/gstprovider/rtpworker.h
 --- psimedia-1.0.3/gstprovider/rtpworker.h	2009-03-13 20:46:42.000000000 +0100
 +++ psimedia-1.0.3-hacked/gstprovider/rtpworker.h	2010-03-05 00:50:37.000000000 +0100
 @@ -177,8 +177,10 @@
- 
+
  	bool setupSendRecv();
  	bool startSend();
 +	bool startSend(int rate);

psi-plus-main-20130107.tar.xz/patches/psimedia/0020-psimedia-win32-compilation-paths.diff -> psi-plus-main-20141106.tar.xz/patches/psimedia/0020-psimedia-win32-compilation-paths.diff Changed

psi-plus-main-20130107.tar.xz/patches/psimedia/0030-psimedia-uvcvideo-fix.diff -> psi-plus-main-20141106.tar.xz/patches/psimedia/0030-psimedia-uvcvideo-fix.diff Changed

@@ -5,7 +5,7 @@
 @@ -156,20 +156,23 @@
  	GstElement *capsfilter = gst_element_factory_make("capsfilter", NULL);
  	GstCaps *caps = gst_caps_new_empty();
- 
+
 -	for(int n = 0; n < widths.count(); ++n)
 -	{
 -		GstStructure *cs;
@@ -20,7 +20,7 @@
 +// 			"width", GST_TYPE_INT_RANGE, 1, widths[n],
 +// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
 +// 		gst_caps_append_structure(caps, cs);
-+// 
++//
 +// 		cs = gst_structure_new("video/x-raw-rgb",
 +// 			"width", GST_TYPE_INT_RANGE, 1, widths[n],
 +// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
@@ -29,7 +29,7 @@
 +        caps = gst_caps_from_string("video/x-raw-yuv , width=[320] , "
 +			"height=[240] , framerate=[30/1]");
 +        g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL);
- 
+
 -		cs = gst_structure_new("video/x-raw-rgb",
 -			"width", GST_TYPE_INT_RANGE, 1, widths[n],
 -			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
@@ -38,4 +38,4 @@
 -
  	GstStructure *cs = gst_structure_new("image/jpeg", NULL);
  	gst_caps_append_structure(caps, cs);
- 
+

psi-plus-main-20130107.tar.xz/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff -> psi-plus-main-20141106.tar.xz/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff Changed

psi-plus-main-20130107.tar.xz/patches/psimedia/0050-psimedia-drop-v4lsrc-gst-plugin.diff -> psi-plus-main-20141106.tar.xz/patches/psimedia/0050-psimedia-drop-v4lsrc-gst-plugin.diff Changed

@@ -2,7 +2,7 @@
 
 --- psimedia/gstprovider/devices.cpp	2009-06-09 10:12:11.000000000 +0200
 +++ psimedia/gstprovider/devices.cpp	2011-04-02 11:47:21.898041830 +0200
-@@ -90,7 +90,6 @@ 
+@@ -90,7 +90,6 @@
  		element_name == "alsasink" ||
  		element_name == "osssrc" ||
  		element_name == "osssink" ||
@@ -10,7 +10,7 @@
  		element_name == "v4l2src" ||
  		element_name == "osxaudiosrc" ||
  		element_name == "osxaudiosink" ||
-@@ -224,11 +223,6 @@ 
+@@ -224,11 +223,6 @@
  		if(type == PDevice::VideoIn)
  			element_name = "osxvideosrc";
  	}
@@ -22,7 +22,7 @@
  	else if(driver == "v4l2")
  	{
  		if(type == PDevice::VideoIn)
-@@ -380,7 +374,7 @@ 
+@@ -380,7 +374,7 @@
  			bool first = true;
  			foreach(const DeviceEnum::Item &i, list)
  			{
@@ -31,7 +31,7 @@
  				{
  					if(!test_video(element_name, i.id))
  						continue;
-@@ -444,7 +438,6 @@ 
+@@ -444,7 +438,6 @@
  	else // PDevice::VideoIn
  	{
  		drivers
@@ -41,7 +41,7 @@
  		<< "winks";
 --- psimedia/gstprovider/gstthread.cpp	2009-05-17 19:55:27.000000000 +0200
 +++ psimedia/gstprovider/gstthread.cpp	2011-04-02 11:48:28.581514484 +0200
-@@ -235,7 +235,6 @@ 
+@@ -235,7 +235,6 @@
  #elif defined(Q_OS_LINUX)
  			reqelem
  			<< "alsasrc" << "alsasink"