[patch] psi-richroster-status_gui_on_off-fix.patch

psi-richroster-status_gui_on_off-fix.patch (text/plain), 2.51 KB, created by Przemyslaw Maciag (RETIRED) on 2005-05-08 14:58:40 UTC

diff -Naur psi-0.9.3-orig/src/contactview.cpp psi-0.9.3/src/contactview.cpp
--- psi-0.9.3-orig/src/contactview.cpp	2005-04-17 22:16:19.000000000 +0000
+++ psi-0.9.3/src/contactview.cpp	2005-05-08 22:33:10.000000000 +0000
@@ -562,7 +562,6 @@
 		QPtrListIterator<ContactViewItem> cvi_it(e->cvi);
 		for(ContactViewItem *i; (i = cvi_it.current()); ++cvi_it) {
 			i->setup();
-			i->resetName();
 		}
 	}
 }
@@ -1683,7 +1682,7 @@
 
 	if((i->type() == ContactViewItem::Contact && i->u()->inList()) ||
 		(i->type() == ContactViewItem::Group && i->groupType() == ContactViewItem::gUser && i->groupName() != ContactView::tr("Hidden"))) {
-		i->resetName();
+		i->setup();
 		i->setRenameEnabled(0, true);
 		i->startRename(0);
 		i->setRenameEnabled(0, false);
@@ -1773,7 +1772,7 @@
 		//e->u.setName(text);
 		//i->setContact(&e->u);
 		actionRename(e->u.jid(), text);
-		i->resetName(); // to put the status message in if needed
+		i->setup();
 	}
 	else {
 		// no change?
@@ -2868,8 +2867,8 @@
 		repl.setPattern("<!subscription>"); txt.replace(repl, QString("<br>") + ins);
 	}
 	// show status?
-	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg())
-		return txt;
+//	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg())
+//		return txt;
 	// resource dependent
 	UserResourceList srl = d->u->userResourceList();
 	if(!srl.isEmpty()){
diff -Naur psi-0.9.3-orig/src/richlistview.cpp psi-0.9.3/src/richlistview.cpp
--- psi-0.9.3-orig/src/richlistview.cpp	2005-04-17 22:16:18.000000000 +0000
+++ psi-0.9.3/src/richlistview.cpp	2005-05-08 22:33:42.000000000 +0000
@@ -31,22 +31,18 @@
 	QListViewItem::setup();
 	int h = height();
 	
-	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg()) {
-		if(v_rt)
-			delete v_rt;
-		v_rt = 0;
+	if (v_rt)
+		delete v_rt;
+	v_rt = 0;
+
+	const QListView* lv = listView();
+	if (! (((ContactView*)lv)->isShowStatusMsg ()))
 		return;
-	}
 
 	QString txt = expandTemplate(0); // single column !!!
-	if( txt.isEmpty() ){
-		if(v_rt)
-			delete v_rt;
-		v_rt = 0;
+	if (txt.isEmpty())
 		return;
-	}
     
-	const QListView* lv = listView();
 	const QPixmap* px = pixmap(0);
 	int left =  lv->itemMargin() + ((px)?(px->width() + lv->itemMargin()):0);
 
@@ -57,8 +53,6 @@
 		txt = QString("<font color=\"%1\">").arg(listView()->colorGroup().color( QColorGroup::HighlightedText ).name()) + txt + "</font>";
 	}
 	
-	if(v_rt)
-		delete v_rt;
 	v_rt = new QSimpleRichText(txt, lv->font());
 	
 	v_rt->setWidth(lv->columnWidth(0) - left - depth() * lv->treeStepSize());