Created by Przemysław 'Troll' Maciąg <pmaciag (at) gmail (dot) com>

This patch is port of Machekku's patch:
'Emoticons Advanced Toggle - add for richroster'
for roster-nr

diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/common.h psi-0.10-test3/src/common.h
--- psi-0.10-test3-orig/src/common.h	2005-11-08 23:07:46.000000000 +0000
+++ psi-0.10-test3/src/common.h	2005-11-08 23:21:06.000000000 +0000
@@ -132,7 +132,7 @@
 	QString customBrowser, customMailer;
 
 	bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats, useStatusLinebreak, spaceEmoticons;
-	bool emoticonsInChatDlg, emoticonsInEventDlg, emoticonsInGroupChatDlg, emoticonsInPopup, emoticonsInToolTip;
+	bool emoticonsInChatDlg, emoticonsInEventDlg, emoticonsInGroupChatDlg, emoticonsInPopup, emoticonsInToolTip, emoticonsInRoster;
 	bool raiseChatWindow, showSubjects, showCounter, chatSays, chatSoftReturn, showGroupCounts;
 
 	QSize sizeEventDlg, sizeChatDlg, sizeTabDlg;
diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/contactview.cpp psi-0.10-test3/src/contactview.cpp
--- psi-0.10-test3-orig/src/contactview.cpp	2005-11-08 22:19:44.000000000 +0000
+++ psi-0.10-test3/src/contactview.cpp	2005-11-08 23:22:43.000000000 +0000
@@ -3245,7 +3245,7 @@
 
 	statusMsg = linkify (statusMsg);
 
-	if (option.useEmoticons)
+	if (option.useEmoticons && option.emoticonsInRoster)
 		statusMsg = emoticonify(statusMsg);
 
 	return statusMsg;
diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/options/opt_iconset.cpp psi-0.10-test3/src/options/opt_iconset.cpp
--- psi-0.10-test3-orig/src/options/opt_iconset.cpp	2005-11-08 22:16:13.000000000 +0000
+++ psi-0.10-test3/src/options/opt_iconset.cpp	2005-11-08 23:22:43.000000000 +0000
@@ -464,6 +464,7 @@
 	opt->emoticonsInGroupChatDlg = d->ck_emotGroupChat->isChecked();
 	opt->emoticonsInPopup = d->ck_emotPopup->isChecked();
 	opt->emoticonsInToolTip = d->ck_emotTooltip->isChecked();
+	opt->emoticonsInRoster = d->ck_emotRoster->isChecked();
 
 	opt->emoticons.clear();
 	IconWidgetItem *item = (IconWidgetItem *)d->iss_emoticons->firstItem();
@@ -494,6 +495,7 @@
 	d->ck_emotGroupChat->setChecked( opt->emoticonsInGroupChatDlg );
 	d->ck_emotPopup->setChecked( opt->emoticonsInPopup );
 	d->ck_emotTooltip->setChecked( opt->emoticonsInToolTip );
+	d->ck_emotRoster->setChecked( opt->emoticonsInRoster );
 
 	// fill in the iconset view
 	d->iss_emoticons->clear();
diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/options/opt_iconset_emo.ui psi-0.10-test3/src/options/opt_iconset_emo.ui
--- psi-0.10-test3-orig/src/options/opt_iconset_emo.ui	2005-11-08 22:16:13.000000000 +0000
+++ psi-0.10-test3/src/options/opt_iconset_emo.ui	2005-11-08 23:22:43.000000000 +0000
@@ -103,6 +103,14 @@
                         <string>In Tooltip</string>
                     </property>
                 </widget>
+                <widget class="QCheckBox" row="2" column="1">
+                    <property name="name">
+                        <cstring>ck_emotRoster</cstring>
+                    </property>
+                    <property name="text">
+                        <string>In Roster</string>
+                    </property>
+                </widget>
             </grid>
         </widget>       
         <widget class="QGroupBox">
diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/psi_profiles.cpp psi-0.10-test3/src/psi_profiles.cpp
--- psi-0.10-test3-orig/src/psi_profiles.cpp	2005-11-08 23:18:40.000000000 +0000
+++ psi-0.10-test3/src/psi_profiles.cpp	2005-11-08 23:22:02.000000000 +0000
@@ -391,6 +391,7 @@
 	prefs.emoticonsInGroupChatDlg = true;
 	prefs.emoticonsInPopup = true;
 	prefs.emoticonsInToolTip = true;
+	prefs.emoticonsInRoster = true;
 	prefs.alertOpenChats = false;
 	prefs.raiseChatWindow = false;
 	prefs.showSubjects = true;
@@ -876,6 +877,7 @@
 			p_misc.appendChild(textTag(doc, "emoticonsInGroupChatDlg", prefs.emoticonsInGroupChatDlg));
 			p_misc.appendChild(textTag(doc, "emoticonsInPopup", prefs.emoticonsInPopup));
 			p_misc.appendChild(textTag(doc, "emoticonsInToolTip", prefs.emoticonsInToolTip));
+			p_misc.appendChild(textTag(doc, "emoticonsInRoster", prefs.emoticonsInRoster));
 			p_misc.appendChild(textTag(doc, "alertOpenChats", prefs.alertOpenChats));
 			p_misc.appendChild(textTag(doc, "raiseChatWindow", prefs.raiseChatWindow));
 			p_misc.appendChild(textTag(doc, "showSubjects", prefs.showSubjects));
@@ -1644,6 +1646,7 @@
 				readBoolEntry(tag, "emoticonsInGroupChatDlg", &prefs.emoticonsInGroupChatDlg);
 				readBoolEntry(tag, "emoticonsInPopup", &prefs.emoticonsInPopup);
 				readBoolEntry(tag, "emoticonsInToolTip", &prefs.emoticonsInToolTip);
+				readBoolEntry(tag, "emoticonsInRoster", &prefs.emoticonsInRoster);
 				readBoolEntry(tag, "alertOpenChats", &prefs.alertOpenChats);
 				readBoolEntry(tag, "raiseChatWindow", &prefs.raiseChatWindow);
 				readBoolEntry(tag, "showSubjects", &prefs.showSubjects);