stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Receive VCard from PurpleAccount and fixed crash on disconnect

Browse source
This commit is contained in:
HanzZ 2011-06-19 20:40:27 +02:00
parent ca3ebd5c3c
commit 2836f390b9
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backends/libpurple/main.cpp
View file

@ -695,13 +695,23 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif
if (displayname) {
nickname = displayname;
}
// avatar
PurpleStoredImage *avatar = purple_buddy_icons_find_account_icon(account);
if (avatar) {
const gchar * data = (const gchar *) purple_imgstore_get_data(avatar);
size_t len = purple_imgstore_get_size(avatar);
if (len < 300000 && data) {
photo = Swift::createByteArray(data, len);
}
}
}
if ((!firstName.empty() || !lastName.empty()) && fullName.empty())
fullName = firstName + " " + lastName;
PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(gc), who);
if (buddy) {
if (buddy && photo.size() == 0) {
gsize len;
PurpleBuddyIcon *icon = NULL;
icon = purple_buddy_icons_find(purple_connection_get_account(gc), name.c_str());

4
include/Swiften/Server/Server.cpp
View file

@ -57,7 +57,9 @@ Server::~Server() {
}
void Server::start() {
assert(!serverFromClientConnectionServer);
if (serverFromClientConnectionServer) {
return;
}
serverFromClientConnectionServer = networkFactories_->getConnectionServerFactory()->createConnectionServer(port_);
serverFromClientConnectionServerSignalConnections.push_back(
serverFromClientConnectionServer->onNewConnection.connect(