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

merge

Browse source
This commit is contained in:
Jan Kaluza 2013-01-17 08:59:59 +01:00
commit 9f0f649c96
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -390,16 +390,17 @@ if (PROTOBUF_FOUND)
message("Skype plugin : no (does not run on Win32)")
endif()
if(YAHOO2_FOUND)
message("Libyahoo2 plugin : yes")
include_directories(${YAHOO2_INCLUDE_DIR})
else()
# if(YAHOO2_FOUND)
# message("Libyahoo2 plugin : yes")
# include_directories(${YAHOO2_INCLUDE_DIR})
# else()
if(ENABLE_YAHOO2)
message("Libyahoo2 plugin : no (install libyahoo2-devel)")
set(YAHOO2_FOUND 1)
message("Libyahoo2 plugin : yes")
else(ENABLE_YAHOO2)
message("Libyahoo2 plugin : no (user disabled)")
endif()
endif()
# endif()
if(ENABLE_SWIFTEN)
message("Swiften plugin : yes")

7
backends/libpurple/main.cpp
View file

@ -339,9 +339,12 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
// Enable account + privacy lists
purple_account_set_enabled_wrapped(account, "spectrum", TRUE);
#if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 7
if (CONFIG_BOOL(config, "service.enable_privacy_lists")) {
purple_account_set_privacy_type_wrapped(account, PURPLE_PRIVACY_DENY_USERS);
}
#endif
// Set the status
const PurpleStatusType *status_type = purple_account_get_status_type_with_primitive_wrapped(account, PURPLE_STATUS_AVAILABLE);
@ -483,7 +486,9 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
PurpleAccount *account = m_sessions[user];
if (account) {
purple_account_set_alias_wrapped(account, nickname.c_str());
#if PURPLE_MAJOR_VERSION >= 2 && PURPLE_MINOR_VERSION >= 7
purple_account_set_public_alias_wrapped(account, nickname.c_str(), NULL, NULL);
#endif
gssize size = image.size();
// this will be freed by libpurple
guchar *photo = (guchar *) g_malloc(size * sizeof(guchar));
@ -1115,9 +1120,11 @@ static void *notify_user_info(PurpleConnection *gc, const char *who, PurpleNotif
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;