libtransport.git Changeset - dfb482b9a2f2

Changeset - dfb482b9a2f2

Parent rev.

Child rev.

[Not reviewed]

0 1 0

ValdikSS - 7 years ago 2018-05-16 22:44:01
iam@valdikss.org.ru

Case-insensitive comparison of VCard parameters. Fixes #289.

1 file changed with 5 insertions and 5 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -1491,107 +1491,107 @@ static gboolean pingTimeout(void *data) { @@
+}
 static void connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason, const char *text){
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	np->handleDisconnected(np->m_accounts[account], (int) reason, text ? text : "");
 // 	Dis *d = new Dis;
 // 	d->name = purple_account_get_username_wrapped(account);
 // 	d->protocol = purple_account_get_protocol_id_wrapped(account);
 // 	purple_timeout_add_seconds_wrapped(10, disconnectMe, d);
+}
 static PurpleConnectionUiOps conn_ui_ops =
+{
 	NULL,
 	NULL,
 	NULL,//connection_disconnected,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	connection_report_disconnect,
 	NULL,
 	NULL,
 	NULL
 };
 static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info) {
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	std::string name(purple_normalize_wrapped(account, who));
 	size_t pos = name.find("/");
 	if (pos != std::string::npos)
 		name.erase((int) pos, name.length() - (int) pos);
 	GList *vcardEntries = purple_notify_user_info_get_entries_wrapped(user_info);
 	PurpleNotifyUserInfoEntry *vcardEntry;
 	std::string firstName;
 	std::string lastName;
 	std::string fullName;
 	std::string nickname;
 	std::string header;
 	std::string label;
 	std::string photo;
 	while (vcardEntries) {
 		vcardEntry = (PurpleNotifyUserInfoEntry *)(vcardEntries->data);
 		if (purple_notify_user_info_entry_get_label_wrapped(vcardEntry) && purple_notify_user_info_entry_get_value_wrapped(vcardEntry)){
 			label = purple_notify_user_info_entry_get_label_wrapped(vcardEntry);
 			if (label == "Given Name" || label == "First Name") {
 			label = boost::locale::to_lower(purple_notify_user_info_entry_get_label_wrapped(vcardEntry));
 			if (label == "given name" || label == "first name") {
 				firstName = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
-			else if (label == "Family Name" || label == "Last Name") {
+			else if (label == "family name" || label == "last name") {
 				lastName = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
-			else if (label=="Nickname" || label == "Nick") {
+			else if (label=="nickname" || label == "nick") {
 				nickname = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
-			else if (label=="Full Name" || label == "Display name") {
+			else if (label=="full name" || label == "display name") {
 				fullName = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
 			else {
 				LOG4CXX_WARN(logger, "Unhandled VCard Label '" << purple_notify_user_info_entry_get_label_wrapped(vcardEntry) << "' " << purple_notify_user_info_entry_get_value_wrapped(vcardEntry));
+			}
+		}
 		vcardEntries = vcardEntries->next;
+	}
 	if ((!firstName.empty() || !lastName.empty()) && fullName.empty())
 		fullName = firstName + " " + lastName;
 	if (nickname.empty() && !fullName.empty()) {
 		nickname = fullName;
+	}
 	bool ownInfo = name == purple_account_get_username_wrapped(account);
 	if (ownInfo) {
 		const gchar *displayname = purple_connection_get_display_name_wrapped(gc);
 #if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 7
 		if (!displayname) {
 			displayname = purple_account_get_name_for_display_wrapped(account);
+		}
 #endif
 		if (displayname && nickname.empty()) {
 			nickname = displayname;
+		}
 		// avatar
 		PurpleStoredImage *avatar = purple_buddy_icons_find_account_icon_wrapped(account);
 		if (avatar) {
 			const gchar * data = (const gchar *) purple_imgstore_get_data_wrapped(avatar);
 			size_t len = purple_imgstore_get_size_wrapped(avatar);
 			if (len < 300000 && data) {
 				photo = std::string(data, len);
+			}
 			purple_imgstore_unref_wrapped(avatar);
+		}
+	}
 	PurpleBuddy *buddy = purple_find_buddy_wrapped(purple_connection_get_account_wrapped(gc), who);
 	if (buddy && photo.size() == 0) {
 		gsize len;
 		PurpleBuddyIcon *icon = NULL;
 		icon = purple_buddy_icons_find_wrapped(purple_connection_get_account_wrapped(gc), name.c_str());
 		if (icon) {

0 comments (0 inline, 0 general)