some cleanup in 1100

psi-plus · Feb 21, 2012 · 2415984 · 2415984
1 parent 127ef90
commit 2415984
Showing 1 changed file with 11 additions and 26 deletions.
diff --git a/patches/1100-psiplus-new-popups.diff b/patches/1100-psiplus-new-popups.diff
@@ -1782,14 +1782,6 @@
  TabManager *PsiCon::tabManager() const
  {
  	return d->tabManager;
-@@ -1615,7 +1627,6 @@ void PsiCon::processEvent(PsiEvent *e, A
- 		return;
- 	}
- #endif
--
- 	if(e->type() == PsiEvent::AvCallType) {
- 		AvCallEvent *ae = (AvCallEvent *)e;
- 		AvCall *sess = ae->takeAvCall();
 --- psi.orig/src/psicon.h
 +++ psi/src/psicon.h
 @@ -56,6 +56,7 @@ class TuneController;
@@ -2552,14 +2544,7 @@
 
  	popup = new FancyPopup(titleText, titleIcon, lastPopup, false);
  	connect(popup, SIGNAL(clicked(int)), SLOT(popupClicked(int)));
-@@ -179,41 +163,23 @@ void PsiPopup::Private::popupClicked(int
- 			// FIXME: it should work in most cases, but
- 			// maybe it's better to fix UserList::find()?
- 			Jid j( jid.bare() );
-+			qDebug() << j.full();
- 			account->actionDefault( j );
- 		}
- 	}
+@@ -185,35 +169,16 @@ void PsiPopup::Private::popupClicked(int
  	else if ( event && event->account() && button == (int)Qt::RightButton ) {
  		event->account()->psi()->removeEvent(event);
  	}
@@ -2598,7 +2583,7 @@
  {
  	QHBoxLayout *dataBox = new QHBoxLayout();
 
-@@ -242,7 +208,7 @@ QBoxLayout *PsiPopup::Private::createCon
+@@ -242,7 +207,7 @@ QBoxLayout *PsiPopup::Private::createCon
  	textLabel->setFont(font);
 
  	textLabel->setWordWrap(false);
@@ -2607,7 +2592,7 @@
  	textLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
  	dataBox->addWidget(textLabel);
 
-@@ -253,10 +219,11 @@ QBoxLayout *PsiPopup::Private::createCon
+@@ -253,10 +218,11 @@ QBoxLayout *PsiPopup::Private::createCon
  // PsiPopup
  //----------------------------------------------------------------------------
 
@@ -2621,7 +2606,7 @@
  }
 
  PsiPopup::~PsiPopup()
-@@ -264,61 +231,89 @@ PsiPopup::~PsiPopup()
+@@ -264,61 +230,89 @@ PsiPopup::~PsiPopup()
  	delete d;
  }
 
@@ -2752,7 +2737,7 @@
  {
  	if ( !d->popup ) {
  		deleteLater();
-@@ -344,24 +339,26 @@ void PsiPopup::setData(const Jid &j, con
+@@ -344,24 +338,26 @@ void PsiPopup::setData(const Jid &j, con
 
  	d->jid    = j;
  	d->status = r.status();
@@ -2788,7 +2773,7 @@
 
  	QString name;
  	if ( u && !u->name().isEmpty() ) {
-@@ -375,7 +372,7 @@ void PsiPopup::setData(const Jid &j, con
+@@ -375,7 +371,7 @@ void PsiPopup::setData(const Jid &j, con
  	}
 
  	if (!name.isEmpty()) {
@@ -2797,7 +2782,7 @@
  			name = "<nobr>" + Qt::escape(name) + "</nobr>";
  		else
  			name = "<nobr>" + Qt::escape(name) + " &lt;" + Qt::escape(jid) + "&gt;" + "</nobr>";
-@@ -397,7 +394,7 @@ void PsiPopup::setData(const Jid &j, con
+@@ -397,7 +393,7 @@ 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() ) {
@@ -2806,7 +2791,7 @@
  				d->display = false;
  				deleteLater();
  				break;
-@@ -406,8 +403,9 @@ void PsiPopup::setData(const Jid &j, con
+@@ -406,8 +402,9 @@ void PsiPopup::setData(const Jid &j, con
  	}
  	QPixmap avatar = d->account->avatarFactory()->getAvatar(jid);
  	// show popup
@@ -2818,7 +2803,7 @@
  		if ((event && event->type() == PsiEvent::Message) && (PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.showMessage").toBool())) {
  			const Message *jmessage = &((MessageEvent *)event)->message();
  			QString message;
-@@ -420,11 +418,13 @@ void PsiPopup::setData(const Jid &j, con
+@@ -420,11 +417,13 @@ void PsiPopup::setData(const Jid &j, con
  				contactText += "<br/><font size=\"+1\">" + message + "</font>";
  			}
  		}
@@ -2835,7 +2820,7 @@
  		QVBoxLayout *vbox = new QVBoxLayout;
  		vbox->addLayout( d->createContactInfo(&avatar, icon, contactText) );
 
-@@ -443,7 +443,7 @@ void PsiPopup::setData(const Jid &j, con
+@@ -443,7 +442,7 @@ void PsiPopup::setData(const Jid &j, con
 
  		messageLabel->setWordWrap(true);
  		messageLabel->setTextFormat(Qt::RichText);
@@ -2844,7 +2829,7 @@
  		messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
  		vbox->addWidget(messageLabel);
 
-@@ -456,6 +456,9 @@ void PsiPopup::setData(const Jid &j, con
+@@ -456,6 +455,9 @@ void PsiPopup::setData(const Jid &j, con
  		d->popup->addLayout( vbox );
  		show();
  	}