libtransport.git Changeset - f6b023a12a56

Changeset - f6b023a12a56

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

HanzZ - 12 years ago 2013-01-29 17:30:23
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

2 files changed with 2 insertions and 2 deletions:

backends/libpurple/main.cpp

backends/twitter/TwitterPlugin.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 			else if (label=="Nickname" || label == "Nick") {
 				nickname = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
 			else if (label=="Full Name") {
+			else if (label=="Full Name" || label == "Display name") {
 				fullName = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
 			else {

backends/twitter/TwitterPlugin.cpp

➞

Show inline comments

+	}
 	else {
 		std::string buddy;
+		std::string buddy = legacyName;
 		if(userdb[user].twitterMode == CHATROOM) buddy = legacyName.substr(legacyName.find("/") + 1);
 		if(legacyName != "twitter") {
 			tp->runAsThread(new DirectMessageRequest(userdb[user].sessions, user, buddy, message,

0 comments (0 inline, 0 general)