libtransport.git Changeset - deeafae6f037

Changeset - deeafae6f037

Parent rev.

Child rev.

[Not reviewed]

skypeweb_ts

0 7 0

Vitaly Takmazov - 7 years ago 2018-11-06 17:39:41
vitalyster@gmail.com

libpurple: store last_message_timestamp from skypeweb account into database

7 files changed with 126 insertions and 14 deletions:

CMakeLists.txt

backends/libpurple/main.cpp

backends/libpurple/purple_defs.cpp

backends/libpurple/purple_defs.h

packaging/debian/debian/changelog

tests/CMakeLists.txt

tests/libtransport/util.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
 project(libtransport)
 if(${CMAKE_MAJOR_VERSION} GREATER 2)
 cmake_policy(SET CMP0037 OLD)
 endif()
 cmake_policy(SET CMP0042 NEW)
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 include(CPack)
 message(STATUS "Variables to override default places where to find libraries:")
 message(STATUS "|- cppunit : -DCPPUNIT_INCLUDE_DIR,  -DCPPUNIT_LIBRARY")
 message(STATUS "|- swiften : -DSWIFTEN_INCLUDE_DIR,  -DSWIFTEN_LIBRARY")
 message(STATUS "  |- zlib  :                         -DZLIB_LIBRARY")
 message(STATUS "  |- expat :                         -DEXPAT_LIBRARY")
 message(STATUS "  |-libidn :                         -DLIBIDN_LIBRARY")
 message(STATUS "  |-libxml :                         -DLIBXML_LIBRARY")
 message(STATUS "|- boost   : -DBOOST_INCLUDEDIR,     -DBOOST_LIBRARYDIR")
 message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY")
 message(STATUS "           : -DPROTOBUF_PROTOC_EXECUTABLE")
 message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 option(ENABLE_SQLITE3 "Build with SQLite3 support" ON)
 option(ENABLE_MYSQL "Build with MySQL support" ON)
 option(ENABLE_PQXX "Build with Postgres supoort" ON)
 option(ENABLE_FROTZ "Build Frotz plugin" ON)
 option(ENABLE_IRC "Build IRC plugin" ON)
 option(ENABLE_PURPLE "Build Libpurple plugin" ON)
 option(ENABLE_SMSTOOLS3 "Build SMSTools3 plugin" ON)
 option(ENABLE_XMPP "Build XMPP plugin" ON)
 option(ENABLE_TWITTER "Build Twitter plugin" ON)
 option(ENABLE_DOCS "Build Docs" ON)
 # option(ENABLE_LOG "Build with logging using Log4cxx" ON)
 option(ENABLE_TESTS "Build Tests using CppUnit" OFF)
 MACRO(LIST_CONTAINS var value)
 	SET(${var})
 	FOREACH (value2 ${ARGN})
 		IF (${value} STREQUAL ${value2})
 		SET(${var} TRUE)
 		ENDIF (${value} STREQUAL ${value2})
 	ENDFOREACH (value2)
 ENDMACRO(LIST_CONTAINS)
 if(NOT LIB_INSTALL_DIR)
 	set(LIB_INSTALL_DIR "lib")
 endif()
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules")
 ###### Prerequisites ######

backends/libpurple/main.cpp

➞

Show inline comments

 			LOG4CXX_INFO(logger,  "accepting SSL certificate");
+		}
 		va_arg(actions, char *);
 		((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+	}
 	else if (t == "Plaintext Authentication") {
 		LOG4CXX_INFO(logger,  "Rejecting plaintext authentification");
 		va_arg(actions, char *);
 		va_arg(actions, GCallback);
 		va_arg(actions, char *);
 		((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+	}
 	else {
 		if (title) {
 			std::string headerString(title);
 			LOG4CXX_INFO(logger,  "header string: " << headerString);
 			if (headerString == "SSL Certificate Verification") {
 				if (CONFIG_BOOL_DEFAULTED(config, "service.verify_certs", false)) {
 					va_arg(actions, char *);
 					va_arg(actions, GCallback);
+				}
 				va_arg(actions, char *);
 				((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+			}
+		}
+	}
 	return NULL;
+}
 static std::string getAlias(PurpleBuddy *m_buddy) {
 	std::string alias;
 	PurpleContact *contact = PURPLE_CONTACT(PURPLE_BLIST_NODE(m_buddy)->parent);
 	if (contact && contact->alias) {
 		alias = contact->alias;
+	}
 	else if (purple_buddy_get_alias_wrapped(m_buddy)) {
 		alias = (std::string) purple_buddy_get_alias_wrapped(m_buddy);
+	}
 	else {
 		alias = (std::string) purple_buddy_get_server_alias_wrapped(m_buddy);
+	}
 	return alias;
+}
 static boost::mutex dblock;
 static std::string OAUTH_TOKEN = "hangouts_oauth_token";
 static std::string STEAM_ACCESS_TOKEN = "steammobile_access_token";
 static std::string DISCORD_ACCESS_TOKEN = "discord_access_token";
 static std::string LAST_MESSAGE_TIMESTAMP = "skypeweb_last_message_timestamp";
 static bool getUserToken(const std::string user, const std::string token_name, std::string &token_value)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!");
 		return false;
+	}
 	token_value = "";
 	int type = TYPE_STRING;
 	storagebackend->getUserSetting((long)info.id, token_name, type, token_value);
 	return true;
+}
 static bool storeUserToken(const std::string user, const std::string token_name, const std::string token_value)
+{
 	boost::mutex::scoped_lock lock(dblock);
 	UserInfo info;
 	if(storagebackend->getUser(user, info) == false) {
 		LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!");
 		return false;
+	}
 	storagebackend->updateUserSetting((long)info.id, token_name, token_value);
 	return true;
+}
 class SpectrumNetworkPlugin : public NetworkPlugin {
 	public:
 		SpectrumNetworkPlugin() : NetworkPlugin() {
 			LOG4CXX_INFO(logger, "Starting libpurple backend " << SPECTRUM_VERSION);
+		}
 		void handleExitRequest() {
 			LOG4CXX_INFO(logger, "Exiting...");
 			exit(0);
+		}
 		void getProtocolAndName(const std::string &legacyName, std::string &name, std::string &protocol) {
 			name = legacyName;
 			protocol = CONFIG_STRING(config, "service.protocol");
 			if (protocol == "any") {
 				protocol = name.substr(0, name.find("."));
 				name = name.substr(name.find(".") + 1);
+			}
+		}
 		void setDefaultAvatar(PurpleAccount *account, const std::string &legacyName) {
@@ @@ -389,141 +390,144 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				LOG4CXX_INFO(logger,  name.c_str() << ": Invalid protocol '" << protocol << "'");
 				np->handleDisconnected(user, 1, "Invalid protocol " + protocol);
 				return;
+			}
 			if (purple_accounts_find_wrapped(name.c_str(), protocol.c_str()) != NULL) {
 				account = purple_accounts_find_wrapped(name.c_str(), protocol.c_str());
 				if (m_accounts.find(account) != m_accounts.end() && m_accounts[account] != user) {
 					LOG4CXX_INFO(logger, "Account '" << name << "' is already used by '" << m_accounts[account] << "'");
 					np->handleDisconnected(user, 1, "Account '" + name + "' is already used by '" + m_accounts[account] + "'");
 					return;
+				}
 				LOG4CXX_INFO(logger, "Using previously created account with name '" << name.c_str() << "' and protocol '" << protocol << "'");
+			}
 			else {
 				LOG4CXX_INFO(logger, "Creating account with name '" << name.c_str() << "' and protocol '" << protocol << "'");
 				account = purple_account_new_wrapped(name.c_str(), protocol.c_str());
 				purple_accounts_add_wrapped(account);
+			}
 			m_sessions[user] = account;
 			m_accounts[account] = user;
 			// Default avatar
 			setDefaultAvatar(account, legacyName);
 			purple_account_set_password_wrapped(account, password.c_str());
 			purple_account_set_bool_wrapped(account, "custom_smileys", FALSE);
 			purple_account_set_bool_wrapped(account, "direct_connect", FALSE);
 			purple_account_set_bool_wrapped(account, "compat-verification", TRUE);
 			if (protocol == "prpl-hangouts") {
 				std::string token;
 				if (getUserToken(user, OAUTH_TOKEN, token)) {
 					purple_account_set_password_wrapped(account, token.c_str());
+				}
+			}
 			else if (protocol == "prpl-steam-mobile") {
 				std::string token;
 				if (getUserToken(user, STEAM_ACCESS_TOKEN, token)) {
 					purple_account_set_string_wrapped(account, "access_token", token.c_str());
+				}
+			}
             else if (protocol == "prpl-eionrobb-discord") {
                 std::string token;
                 if (getUserToken(user, DISCORD_ACCESS_TOKEN, token)) {
                     purple_account_set_string_wrapped(account, "token", token.c_str());
+                }
+            }
             if (protocol == "prpl-skypeweb") {
                 int ts = 0;
                 if (getLastMessageTimestamp(user, ts)) {
                     purple_account_set_int_wrapped(account, "last_message_timestamp", ts);
+                }
+            }
 			setDefaultAccountOptions(account);
 			// 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);
 			if (status_type != NULL) {
 				purple_account_set_status_wrapped(account, purple_status_type_get_id_wrapped(status_type), TRUE, NULL);
+			}
 			// OAuth helper
 			if (protocol == "prpl-hangouts" || protocol == "prpl-steam-mobile" || protocol == "prpl-eionrobb-discord") {
 				LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias);
 				handleBuddyChanged(user, adminLegacyName, adminAlias, std::vector<std::string>(), pbnetwork::STATUS_ONLINE);
+			}
+		}
 		void handleLogoutRequest(const std::string &user, const std::string &legacyName) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				if (account->ui_data) {
 					NodeCache *cache = (NodeCache *) account->ui_data;
 					purple_timeout_remove_wrapped(cache->timer);
 					delete cache;
 					account->ui_data = NULL;
+				}
 				if (purple_account_get_int_wrapped(account, "version", 0) != 0) {
 					std::string data = stringOf(purple_account_get_int_wrapped(account, "version", 0));
 					g_file_set_contents ("gfire.cfg", data.c_str(), data.size(), NULL);
+				}
 // 				VALGRIND_DO_LEAK_CHECK;
 				m_sessions.erase(user);
 				purple_account_disconnect_wrapped(account);
 				purple_account_set_enabled_wrapped(account, "spectrum", FALSE);
 				m_accounts.erase(account);
 				purple_accounts_delete_wrapped(account);
 #ifndef WIN32
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 				malloc_trim(0);
 #endif
 #endif
 // 				VALGRIND_DO_LEAK_CHECK;
+			}
+		}
 		void handleStatusChangeRequest(const std::string &user, int status, const std::string &statusMessage) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				int st;
 				switch(status) {
 					case pbnetwork::STATUS_AWAY: {
 						st = PURPLE_STATUS_AWAY;
 						if (!purple_account_get_status_type_with_primitive_wrapped(account, PURPLE_STATUS_AWAY))
 							st = PURPLE_STATUS_EXTENDED_AWAY;
 						else
 							st = PURPLE_STATUS_AWAY;
 						break;
+					}
 					case pbnetwork::STATUS_DND: {
 						st = PURPLE_STATUS_UNAVAILABLE;
 						break;
+					}
 					case pbnetwork::STATUS_XA: {
 						if (!purple_account_get_status_type_with_primitive_wrapped(account, PURPLE_STATUS_EXTENDED_AWAY))
 							st = PURPLE_STATUS_AWAY;
 						else
 							st = PURPLE_STATUS_EXTENDED_AWAY;
 						break;
+					}
 					case pbnetwork::STATUS_NONE: {
 						st = PURPLE_STATUS_OFFLINE;
 						break;
+					}
 					case pbnetwork::STATUS_INVISIBLE:
 						st = PURPLE_STATUS_INVISIBLE;
 						break;
 					default:
 						st = PURPLE_STATUS_AVAILABLE;
 						break;
+				}
 				gchar *_markup = purple_markup_escape_text_wrapped(statusMessage.c_str(), -1);
 				std::string markup(_markup);
 				g_free(_markup);
@@ @@ -1472,101 +1476,107 @@ static PurpleConversationUiOps conversation_ui_ops = @@
 	NULL,//conv_chat_rename_user,     /* chat_rename_user     */
 	conv_chat_remove_users,    /* chat_remove_users    */
 	NULL,//pidgin_conv_chat_update_user,     /* chat_update_user     */
 	conv_present,//pidgin_conv_present_conversation, /* present              */
 	conv_has_focus,//pidgin_conv_has_focus,            /* has_focus            */
 	NULL,//pidgin_conv_custom_smiley_add,    /* custom_smiley_add    */
 	NULL,//pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
 	NULL,//pidgin_conv_custom_smiley_close,  /* custom_smiley_close  */
 	NULL,//pidgin_conv_send_confirm,         /* send_confirm         */
 	NULL,
 	NULL,
 	NULL,
 	NULL
 };
 struct Dis {
 	std::string name;
 	std::string protocol;
 };
 // currently unused
 #if 0
 static gboolean disconnectMe(void *data) {
 	Dis *d = (Dis *) data;
 	PurpleAccount *account = purple_accounts_find_wrapped(d->name.c_str(), d->protocol.c_str());
 	delete d;
 	if (account) {
 		np->handleLogoutRequest(np->m_accounts[account], purple_account_get_username_wrapped(account));
+	}
 	return FALSE;
+}
 #endif
 static gboolean pingTimeout(void *data) {
 	np->checkPing();
 	return TRUE;
+}
 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 void connection_disconnected(PurpleConnection *gc) {
 	PurpleAccount *account = purple_connection_get_account_wrapped(gc);
 	purple_accounts_delete_wrapped(account);
 	np->m_accounts.erase(account);
+}
 static PurpleConnectionUiOps conn_ui_ops =
+{
 	NULL,
 	NULL,
-	NULL,//connection_disconnected,
 	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 = 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") {
 				lastName = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
 			else if (label=="nickname" || label == "nick") {
 				nickname = purple_notify_user_info_entry_get_value_wrapped(vcardEntry);
+			}
 			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));
+			}
 					m_topics.push_back(topic);
+				}
 				else {
 					if (usersId) {
 						char *users = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), usersId);
 						if (users) {
 							m_topics.push_back(users);
+						}
 						else {
 							LOG4CXX_WARN(logger, "RoomList topic and users is NULL");
 							m_topics.push_back(room->name);
+						}
+					}
 					else {
 						LOG4CXX_WARN(logger, "RoomList topic is NULL");
 						m_topics.push_back(room->name);
+					}
+				}
+			}
+		}
 		std::string user = "";
 		if (list->account) {
 			user = np->m_accounts[list->account];
+		}
 		LOG4CXX_INFO(logger, "RoomList is fetched for user " << user);
 		np->handleRoomList(user, np->m_rooms[user], m_topics);
+	}
 	else {
 		LOG4CXX_INFO(logger, "RoomList is still in progress");
+	}
+}
 static PurpleRoomlistUiOps roomlist_ui_ops =
+{
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	RoomlistProgress,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL
 };
 #if PURPLE_MAJOR_VERSION >=2 && PURPLE_MINOR_VERSION >=11
 static void preferencesIntChanged(PurpleAccount *account, const char *name, int value) {
 	boost::mutex::scoped_lock lock(dblock);
         UserInfo info;
 	std::string user = np->m_accounts[account];
 	LOG4CXX_INFO(logger, "asking for " << user << " settings");
         if(storagebackend->getUser(user, info) == false) {
                 LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!");
                 return;
+        }
         LOG4CXX_INFO(logger, "storing " << value << "as " << name << " for " << user);
         std::string defaultValue = "0";
         int type = TYPE_INT;
         storagebackend->getUserSetting((long)info.id, std::string(name), type, defaultValue);
         storagebackend->updateUserSetting((long)info.id, std::string(name), stringOf(value));
 };
 static void preferencesStringChanged(PurpleAccount *account, const char *name, const char *value) {
 	boost::mutex::scoped_lock lock(dblock);
         UserInfo info;
 	std::string user = np->m_accounts[account];
 	LOG4CXX_INFO(logger, "asking for " << user << " settings");
         if(storagebackend->getUser(user, info) == false) {
                 LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!");
                 return;
+        }
 	LOG4CXX_INFO(logger, "storing " << value << "as " << name << " for " << user);
 	std::string defaultValue = "";
 	int type = TYPE_STRING;
 	storagebackend->getUserSetting((long)info.id, std::string(name), type, defaultValue);
         storagebackend->updateUserSetting((long)info.id, std::string(name), std::string(value));
 };
 static void preferencesBoolChanged(PurpleAccount *account, const char *name, gboolean value) {
 	boost::mutex::scoped_lock lock(dblock);
         UserInfo info;
 	std::string user = np->m_accounts[account];
 	LOG4CXX_INFO(logger, "asking for " << user << " settings");
         if(storagebackend->getUser(user, info) == false) {
                 LOG4CXX_ERROR(logger, "Didn't find entry for " << user << " in the database!");
                 return;
+        }
         LOG4CXX_INFO(logger, "storing " << value << "as " << name << " for " << user);
         std::string defaultValue = "false";
         int type = TYPE_BOOLEAN;
         storagebackend->getUserSetting((long)info.id, std::string(name), type, defaultValue);
         storagebackend->updateUserSetting((long)info.id, std::string(name), stringOf(value));
 };
 static PurpleAccountPrefsUiOps account_prefs_ui_ops =
+{
 	preferencesIntChanged,
 	preferencesStringChanged,
 	preferencesBoolChanged,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	NULL
 };
 #endif
 static void transport_core_ui_init(void)
+{
 	purple_blist_set_ui_ops_wrapped(&blistUiOps);
 	purple_accounts_set_ui_ops_wrapped(&accountUiOps);
 	purple_notify_set_ui_ops_wrapped(&notifyUiOps);
 	purple_request_set_ui_ops_wrapped(&requestUiOps);
 	purple_xfers_set_ui_ops_wrapped(&xferUiOps);
 	purple_connections_set_ui_ops_wrapped(&conn_ui_ops);
 	purple_conversations_set_ui_ops_wrapped(&conversation_ui_ops);
 	purple_roomlist_set_ui_ops_wrapped(&roomlist_ui_ops);
 #if PURPLE_MAJOR_VERSION >=2 && PURPLE_MINOR_VERSION >= 11
 	purple_account_prefs_set_ui_ops_wrapped(&account_prefs_ui_ops);
 #endif
 // #ifndef WIN32
 // 	purple_dnsquery_set_ui_ops_wrapped(getDNSUiOps());
 // #endif
+}
 /***** Core Ui Ops *****/
 static void
 spectrum_glib_log_handler(const gchar *domain,
 						  GLogLevelFlags flags,
 						  const gchar *message,
 						  gpointer user_data)
+{
 	const char *level;
 	char *new_msg = NULL;
 	char *new_domain = NULL;
 	if ((flags & G_LOG_LEVEL_ERROR) == G_LOG_LEVEL_ERROR)
 		level = "ERROR";
 	else if ((flags & G_LOG_LEVEL_CRITICAL) == G_LOG_LEVEL_CRITICAL)
 		level = "CRITICAL";
 	else if ((flags & G_LOG_LEVEL_WARNING) == G_LOG_LEVEL_WARNING)
 		level = "WARNING";
 	else if ((flags & G_LOG_LEVEL_MESSAGE) == G_LOG_LEVEL_MESSAGE)
 		level = "MESSAGE";
 	else if ((flags & G_LOG_LEVEL_INFO) == G_LOG_LEVEL_INFO)
 		level = "INFO";
 	else if ((flags & G_LOG_LEVEL_DEBUG) == G_LOG_LEVEL_DEBUG)
 		level = "DEBUG";
 	else {
 		LOG4CXX_ERROR(logger, "Unknown glib logging level in " << (guint)flags);
 		level = "UNKNOWN"; /* This will never happen. */
+	}
 	if (message != NULL)
 		new_msg = purple_utf8_try_convert_wrapped(message);
 	if (domain != NULL)
 		new_domain = purple_utf8_try_convert_wrapped(domain);
 	if (new_msg != NULL) {
 		std::string area("glib");
 		area.push_back('/');
 		area.append(level);
 		std::string message(new_domain ? new_domain : "g_log");
 		message.push_back(' ');
 		message.append(new_msg);
+			}
 			if (CONFIG_BOOL(config, "service.server_mode") || CONFIG_STRING(config, "service.protocol") == "prpl-irc") {
 				cfg.setNeedRegistration(false);
+			}
 			else {
 				cfg.setNeedRegistration(true);
+			}
 			np->sendConfig(cfg);
+		}
 		np->handleDataRead(d);
+	}
 	else {
 		if (writeInput != 0) {
 			purple_input_remove_wrapped(writeInput);
 			writeInput = 0;
+		}
 		np->readyForData();
+	}
+}
 int main(int argc, char **argv) {
 	boost::locale::generator gen;
 	std::locale::global(gen(""));
 #ifndef WIN32
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 		mallopt(M_CHECK_ACTION, 2);
 		mallopt(M_PERTURB, 0xb);
 #endif
 		signal(SIGPIPE, SIG_IGN);
 		if (signal(SIGCHLD, spectrum_sigchld_handler) == SIG_ERR) {
 			std::cout << "SIGCHLD handler can't be set\n";
 			return -1;
+		}
 #endif
 	std::string error;
 	Config *cfg = Config::createFromArgs(argc, argv, error, host, port);
 	if (cfg == NULL) {
 		std::cerr << error;
 		return 1;
+	}
 	config = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Config>(cfg);
 	Logging::initBackendLogging(config.get());
 	if (CONFIG_STRING(config, "service.protocol") == "prpl-hangouts" || CONFIG_STRING(config, "service.protocol") == "prpl-steam-mobile") {
+	if (CONFIG_STRING(config, "service.protocol") == "prpl-hangouts" || CONFIG_STRING(config, "service.protocol") == "prpl-steam-mobile" || CONFIG_STRING(config, "service.protocol") == "prpl-skypeweb" || CONFIG_STRING(config, "service.protocol") == "prpl-eionrobb-discord") {
 		storagebackend = StorageBackend::createBackend(config.get(), error);
 		if (storagebackend == NULL) {
 			LOG4CXX_ERROR(logger, "Error creating StorageBackend! " << error);
-			LOG4CXX_ERROR(logger, "Hangouts and Steam backends need storage backend configured to work! " << error);
+			LOG4CXX_ERROR(logger, "Selected libpurple protocol need storage backend configured to work! " << error);
 			return NetworkPlugin::StorageBackendNeeded;
+		}
 		else if (!storagebackend->connect()) {
 			LOG4CXX_ERROR(logger, "Can't connect to database!");
 			return -1;
+		}
+	}
 	initPurple();
 	main_socket = create_socket(host.c_str(), port);
 	purple_input_add_wrapped(main_socket, PURPLE_INPUT_READ, &transportDataReceived, NULL);
 	purple_timeout_add_seconds_wrapped(30, pingTimeout, NULL);
 	np = new SpectrumNetworkPlugin();
 	GMainLoop *m_loop;
 #ifdef WITH_LIBEVENT
 	bool libev = CONFIG_STRING_DEFAULTED(config, "service.eventloop", "") == "libev";
 	if (!libev) {
 		m_loop = g_main_loop_new(NULL, FALSE);
+	}
 	else {
 		event_init();
+	}
 #endif
 	m_loop = g_main_loop_new(NULL, FALSE);
 	if (m_loop) {
 		g_main_loop_run(m_loop);
+	}
 #ifdef WITH_LIBEVENT
 	else {
 		event_loop(0);
+	}
 #endif
 	return 0;
+}

backends/libpurple/purple_defs.cpp

➞

Show inline comments

 #include "purple_defs.h"
 #if PURPLE_RUNTIME
 static HMODULE f_hPurple = NULL;
 purple_account_set_bool_wrapped_fnc purple_account_set_bool_wrapped = NULL;
 purple_account_get_protocol_id_wrapped_fnc purple_account_get_protocol_id_wrapped = NULL;
 purple_account_set_int_wrapped_fnc purple_account_set_int_wrapped = NULL;
 purple_account_set_string_wrapped_fnc purple_account_set_string_wrapped = NULL;
 purple_account_get_username_wrapped_fnc purple_account_get_username_wrapped = NULL;
 purple_account_set_username_wrapped_fnc purple_account_set_username_wrapped = NULL;
 purple_account_set_proxy_info_wrapped_fnc purple_account_set_proxy_info_wrapped = NULL;
 purple_accounts_find_wrapped_fnc purple_accounts_find_wrapped = NULL;
 purple_account_new_wrapped_fnc purple_account_new_wrapped = NULL;
 purple_accounts_add_wrapped_fnc purple_accounts_add_wrapped = NULL;
 purple_account_get_password_wrapped_fnc purple_account_get_password_wrapped = NULL;
 purple_account_set_password_wrapped_fnc purple_account_set_password_wrapped = NULL;
 purple_account_set_enabled_wrapped_fnc purple_account_set_enabled_wrapped = NULL;
 purple_account_set_privacy_type_wrapped_fnc purple_account_set_privacy_type_wrapped = NULL;
 purple_account_get_status_type_with_primitive_wrapped_fnc purple_account_get_status_type_with_primitive_wrapped = NULL;
 purple_account_set_status_wrapped_fnc purple_account_set_status_wrapped = NULL;
 purple_account_get_int_wrapped_fnc purple_account_get_int_wrapped = NULL;
 purple_account_disconnect_wrapped_fnc purple_account_disconnect_wrapped = NULL;
 purple_accounts_delete_wrapped_fnc purple_accounts_delete_wrapped = NULL;
 purple_account_get_connection_wrapped_fnc purple_account_get_connection_wrapped = NULL;
 purple_account_set_alias_wrapped_fnc purple_account_set_alias_wrapped = NULL;
 purple_account_set_public_alias_wrapped_fnc purple_account_set_public_alias_wrapped = NULL;
 purple_account_remove_buddy_wrapped_fnc purple_account_remove_buddy_wrapped = NULL;
 purple_account_add_buddy_wrapped_fnc purple_account_add_buddy_wrapped = NULL;
 purple_account_get_name_for_display_wrapped_fnc purple_account_get_name_for_display_wrapped = NULL;
 purple_accounts_set_ui_ops_wrapped_fnc purple_accounts_set_ui_ops_wrapped = NULL;
 purple_account_prefs_set_ui_ops_wrapped_fnc purple_account_prefs_set_ui_ops_wrapped = NULL;
 purple_account_option_get_type_wrapped_fnc purple_account_option_get_type_wrapped = NULL;
 purple_account_option_get_setting_wrapped_fnc purple_account_option_get_setting_wrapped = NULL;
 purple_blist_node_get_type_wrapped_fnc purple_blist_node_get_type_wrapped = NULL;
 purple_buddy_get_alias_wrapped_fnc purple_buddy_get_alias_wrapped = NULL;
 purple_buddy_get_server_alias_wrapped_fnc purple_buddy_get_server_alias_wrapped = NULL;
 purple_find_buddy_wrapped_fnc purple_find_buddy_wrapped = NULL;
 purple_buddy_get_group_wrapped_fnc purple_buddy_get_group_wrapped = NULL;
 purple_blist_remove_buddy_wrapped_fnc purple_blist_remove_buddy_wrapped = NULL;
 purple_blist_alias_buddy_wrapped_fnc purple_blist_alias_buddy_wrapped = NULL;
 purple_blist_server_alias_buddy_wrapped_fnc purple_blist_server_alias_buddy_wrapped = NULL;
 purple_find_group_wrapped_fnc purple_find_group_wrapped = NULL;
 purple_group_new_wrapped_fnc purple_group_new_wrapped = NULL;
 purple_blist_add_contact_wrapped_fnc purple_blist_add_contact_wrapped = NULL;
 purple_buddy_get_contact_wrapped_fnc purple_buddy_get_contact_wrapped = NULL;
 purple_buddy_new_wrapped_fnc purple_buddy_new_wrapped = NULL;
 purple_blist_add_buddy_wrapped_fnc purple_blist_add_buddy_wrapped = NULL;
 purple_blist_find_chat_wrapped_fnc purple_blist_find_chat_wrapped = NULL;
 purple_chat_get_components_wrapped_fnc purple_chat_get_components_wrapped = NULL;
 purple_buddy_get_presence_wrapped_fnc purple_buddy_get_presence_wrapped = NULL;
 purple_buddy_get_account_wrapped_fnc purple_buddy_get_account_wrapped = NULL;
 purple_buddy_get_name_wrapped_fnc purple_buddy_get_name_wrapped = NULL;
 purple_find_buddies_wrapped_fnc purple_find_buddies_wrapped = NULL;
 purple_group_get_name_wrapped_fnc purple_group_get_name_wrapped = NULL;
 purple_blist_set_ui_ops_wrapped_fnc purple_blist_set_ui_ops_wrapped = NULL;
 purple_set_blist_wrapped_fnc purple_set_blist_wrapped = NULL;
 purple_blist_new_wrapped_fnc purple_blist_new_wrapped = NULL;
 purple_blist_load_wrapped_fnc purple_blist_load_wrapped = NULL;
 purple_blist_get_handle_wrapped_fnc purple_blist_get_handle_wrapped = NULL;
 purple_buddy_icons_set_account_icon_wrapped_fnc purple_buddy_icons_set_account_icon_wrapped = NULL;
 purple_buddy_icons_find_wrapped_fnc purple_buddy_icons_find_wrapped = NULL;
 purple_buddy_icon_get_full_path_wrapped_fnc purple_buddy_icon_get_full_path_wrapped = NULL;
 purple_buddy_icon_unref_wrapped_fnc purple_buddy_icon_unref_wrapped = NULL;
 purple_buddy_icons_find_account_icon_wrapped_fnc purple_buddy_icons_find_account_icon_wrapped = NULL;
 purple_buddy_icon_get_data_wrapped_fnc purple_buddy_icon_get_data_wrapped = NULL;
 purple_certificate_add_ca_search_path_wrapped_fnc purple_certificate_add_ca_search_path_wrapped = NULL;
 purple_connection_get_state_wrapped_fnc purple_connection_get_state_wrapped = NULL;
 purple_connection_get_account_wrapped_fnc purple_connection_get_account_wrapped = NULL;
 purple_connection_get_display_name_wrapped_fnc purple_connection_get_display_name_wrapped = NULL;
 purple_connections_set_ui_ops_wrapped_fnc purple_connections_set_ui_ops_wrapped = NULL;
 purple_connections_get_handle_wrapped_fnc purple_connections_get_handle_wrapped = NULL;
 purple_conversation_get_im_data_wrapped_fnc purple_conversation_get_im_data_wrapped = NULL;
 purple_conversation_get_chat_data_wrapped_fnc purple_conversation_get_chat_data_wrapped = NULL;
 purple_find_conversation_with_account_wrapped_fnc purple_find_conversation_with_account_wrapped = NULL;
 purple_conversation_new_wrapped_fnc purple_conversation_new_wrapped = NULL;
 purple_conversation_get_type_wrapped_fnc purple_conversation_get_type_wrapped = NULL;
 purple_conv_im_send_wrapped_fnc purple_conv_im_send_wrapped = NULL;
 purple_conv_im_send_with_flags_wrapped_fnc purple_conv_im_send_with_flags_wrapped = NULL;
 purple_conv_chat_send_wrapped_fnc purple_conv_chat_send_wrapped = NULL;
@@ @@ -214,96 +215,99 @@ bool resolvePurpleFunctions() { @@
 	purple_account_get_status_type_with_primitive_wrapped = (purple_account_get_status_type_with_primitive_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_get_status_type_with_primitive");
 	if (!purple_account_get_status_type_with_primitive_wrapped)
 		return false;
 	purple_account_set_status_wrapped = (purple_account_set_status_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_set_status");
 	if (!purple_account_set_status_wrapped)
 		return false;
 	purple_account_get_int_wrapped = (purple_account_get_int_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_get_int");
 	if (!purple_account_get_int_wrapped)
 		return false;
 	purple_account_disconnect_wrapped = (purple_account_disconnect_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_disconnect");
 	if (!purple_account_disconnect_wrapped)
 		return false;
 	purple_accounts_delete_wrapped = (purple_accounts_delete_wrapped_fnc)GetProcAddress(f_hPurple, "purple_accounts_delete");
 	if (!purple_accounts_delete_wrapped)
 		return false;
 	purple_account_get_connection_wrapped = (purple_account_get_connection_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_get_connection");
 	if (!purple_account_get_connection_wrapped)
 		return false;
 	purple_account_set_alias_wrapped = (purple_account_set_alias_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_set_alias");
 	if (!purple_account_set_alias_wrapped)
 		return false;
 	purple_account_set_public_alias_wrapped = (purple_account_set_public_alias_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_set_public_alias");
 	if (!purple_account_set_public_alias_wrapped)
 		return false;
 	purple_account_remove_buddy_wrapped = (purple_account_remove_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_remove_buddy");
 	if (!purple_account_remove_buddy_wrapped)
 		return false;
 	purple_account_add_buddy_wrapped = (purple_account_add_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_add_buddy");
 	if (!purple_account_add_buddy_wrapped)
 		return false;
 	purple_account_get_name_for_display_wrapped = (purple_account_get_name_for_display_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_get_name_for_display");
 	if (!purple_account_get_name_for_display_wrapped)
 		return false;
 	purple_accounts_set_ui_ops_wrapped = (purple_accounts_set_ui_ops_wrapped_fnc)GetProcAddress(f_hPurple, "purple_accounts_set_ui_ops");
 	if (!purple_accounts_set_ui_ops_wrapped)
 		return false;
 	purple_account_prefs_set_ui_ops_wrapped = (purple_account_prefs_set_ui_ops_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_prefs_set_ui_ops");
 	if (!purple_account_prefs_set_ui_ops_wrapped)
 		return false;
 	purple_account_option_get_type_wrapped = (purple_account_option_get_type_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_option_get_type");
 	if (!purple_account_option_get_type_wrapped)
 		return false;
 	purple_account_option_get_setting_wrapped = (purple_account_option_get_setting_wrapped_fnc)GetProcAddress(f_hPurple, "purple_account_option_get_setting");
 	if (!purple_account_option_get_setting_wrapped)
 		return false;
 	purple_blist_node_get_type_wrapped = (purple_blist_node_get_type_wrapped_fnc)GetProcAddress(f_hPurple, "purple_blist_node_get_type");
 	if (!purple_blist_node_get_type_wrapped)
 		return false;
 	purple_buddy_get_alias_wrapped = (purple_buddy_get_alias_wrapped_fnc)GetProcAddress(f_hPurple, "purple_buddy_get_alias");
 	if (!purple_buddy_get_alias_wrapped)
 		return false;
 	purple_buddy_get_server_alias_wrapped = (purple_buddy_get_server_alias_wrapped_fnc)GetProcAddress(f_hPurple, "purple_buddy_get_server_alias");
 	if (!purple_buddy_get_server_alias_wrapped)
 		return false;
 	purple_find_buddy_wrapped = (purple_find_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_find_buddy");
 	if (!purple_find_buddy_wrapped)
 		return false;
 	purple_buddy_get_group_wrapped = (purple_buddy_get_group_wrapped_fnc)GetProcAddress(f_hPurple, "purple_buddy_get_group");
 	if (!purple_buddy_get_group_wrapped)
 		return false;
 	purple_blist_remove_buddy_wrapped = (purple_blist_remove_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_blist_remove_buddy");
 	if (!purple_blist_remove_buddy_wrapped)
 		return false;
 	purple_blist_alias_buddy_wrapped = (purple_blist_alias_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_blist_alias_buddy");
 	if (!purple_blist_alias_buddy_wrapped)
 		return false;
 	purple_blist_server_alias_buddy_wrapped = (purple_blist_server_alias_buddy_wrapped_fnc)GetProcAddress(f_hPurple, "purple_blist_server_alias_buddy");
 	if (!purple_blist_server_alias_buddy_wrapped)
 		return false;
 	purple_find_group_wrapped = (purple_find_group_wrapped_fnc)GetProcAddress(f_hPurple, "purple_find_group");
 	if (!purple_find_group_wrapped)
 		return false;
 	purple_group_new_wrapped = (purple_group_new_wrapped_fnc)GetProcAddress(f_hPurple, "purple_group_new");
 	if (!purple_group_new_wrapped)
 		return false;

backends/libpurple/purple_defs.h

➞

Show inline comments

 typedef const char *  (_cdecl * purple_account_get_password_wrapped_fnc)(const PurpleAccount *account);
 extern purple_account_get_password_wrapped_fnc purple_account_get_password_wrapped;
 typedef void  (_cdecl * purple_account_set_password_wrapped_fnc)(PurpleAccount *account, const char *password);
 extern purple_account_set_password_wrapped_fnc purple_account_set_password_wrapped;
 typedef void  (_cdecl * purple_account_set_enabled_wrapped_fnc)(PurpleAccount *account, const char *ui, gboolean value);
 extern purple_account_set_enabled_wrapped_fnc purple_account_set_enabled_wrapped;
 typedef void  (_cdecl * purple_account_set_privacy_type_wrapped_fnc)(PurpleAccount *account, PurplePrivacyType privacy_type);
 extern purple_account_set_privacy_type_wrapped_fnc purple_account_set_privacy_type_wrapped;
 typedef PurpleStatusType * (_cdecl * purple_account_get_status_type_with_primitive_wrapped_fnc)( const PurpleAccount *account, PurpleStatusPrimitive primitive);
 extern purple_account_get_status_type_with_primitive_wrapped_fnc purple_account_get_status_type_with_primitive_wrapped;
 typedef void  (_cdecl * purple_account_set_status_wrapped_fnc)(PurpleAccount *account, const char *status_id, gboolean active, ...);
 extern purple_account_set_status_wrapped_fnc purple_account_set_status_wrapped;
 typedef int  (_cdecl * purple_account_get_int_wrapped_fnc)(const PurpleAccount *account, const char *name, int default_value);
 extern purple_account_get_int_wrapped_fnc purple_account_get_int_wrapped;
 typedef void  (_cdecl * purple_account_disconnect_wrapped_fnc)(PurpleAccount *account);
 extern purple_account_disconnect_wrapped_fnc purple_account_disconnect_wrapped;
 typedef void  (_cdecl * purple_accounts_delete_wrapped_fnc)(PurpleAccount *account);
 extern purple_accounts_delete_wrapped_fnc purple_accounts_delete_wrapped;
 typedef PurpleConnection * (_cdecl * purple_account_get_connection_wrapped_fnc)(const PurpleAccount *account);
 extern purple_account_get_connection_wrapped_fnc purple_account_get_connection_wrapped;
 typedef void  (_cdecl * purple_account_set_alias_wrapped_fnc)(PurpleAccount *account, const char *alias);
 extern purple_account_set_alias_wrapped_fnc purple_account_set_alias_wrapped;
 typedef void  (_cdecl * purple_account_set_public_alias_wrapped_fnc)(PurpleAccount *account, const char *alias, PurpleSetPublicAliasSuccessCallback success_cb, PurpleSetPublicAliasFailureCallback failure_cb);
 extern purple_account_set_public_alias_wrapped_fnc purple_account_set_public_alias_wrapped;
 typedef void  (_cdecl * purple_account_remove_buddy_wrapped_fnc)(PurpleAccount *account, PurpleBuddy *buddy, PurpleGroup *group);
 extern purple_account_remove_buddy_wrapped_fnc purple_account_remove_buddy_wrapped;
 typedef void  (_cdecl * purple_account_add_buddy_wrapped_fnc)(PurpleAccount *account, PurpleBuddy *buddy);
 extern purple_account_add_buddy_wrapped_fnc purple_account_add_buddy_wrapped;
 typedef const gchar * (_cdecl * purple_account_get_name_for_display_wrapped_fnc)(const PurpleAccount *account);
 extern purple_account_get_name_for_display_wrapped_fnc purple_account_get_name_for_display_wrapped;
 typedef void  (_cdecl * purple_accounts_set_ui_ops_wrapped_fnc)(PurpleAccountUiOps *ops);
 extern purple_accounts_set_ui_ops_wrapped_fnc purple_accounts_set_ui_ops_wrapped;
 typedef void (_cdecl * purple_account_prefs_set_ui_ops_wrapped_fnc)(PurpleAccountPrefUiOps *ops);
 extern purple_account_prefs_set_ui_ops_wrapped_fnc purple_account_pref_set_ui_ops_wrapped;
 typedef PurplePrefType  (_cdecl * purple_account_option_get_type_wrapped_fnc)(const PurpleAccountOption *option);
 extern purple_account_option_get_type_wrapped_fnc purple_account_option_get_type_wrapped;
 typedef const char * (_cdecl * purple_account_option_get_setting_wrapped_fnc)(const PurpleAccountOption *option);
 extern purple_account_option_get_setting_wrapped_fnc purple_account_option_get_setting_wrapped;
 typedef PurpleBlistNodeType  (_cdecl * purple_blist_node_get_type_wrapped_fnc)(PurpleBlistNode *node);
 extern purple_blist_node_get_type_wrapped_fnc purple_blist_node_get_type_wrapped;
 typedef const char * (_cdecl * purple_buddy_get_alias_wrapped_fnc)(PurpleBuddy *buddy);
 extern purple_buddy_get_alias_wrapped_fnc purple_buddy_get_alias_wrapped;
 typedef const char * (_cdecl * purple_buddy_get_server_alias_wrapped_fnc)(PurpleBuddy *buddy);
 extern purple_buddy_get_server_alias_wrapped_fnc purple_buddy_get_server_alias_wrapped;
 typedef PurpleBuddy * (_cdecl * purple_find_buddy_wrapped_fnc)(PurpleAccount *account, const char *name);
 extern purple_find_buddy_wrapped_fnc purple_find_buddy_wrapped;
 typedef PurpleGroup * (_cdecl * purple_buddy_get_group_wrapped_fnc)(PurpleBuddy *buddy);
 extern purple_buddy_get_group_wrapped_fnc purple_buddy_get_group_wrapped;
 typedef void  (_cdecl * purple_blist_remove_buddy_wrapped_fnc)(PurpleBuddy *buddy);
 extern purple_blist_remove_buddy_wrapped_fnc purple_blist_remove_buddy_wrapped;
 typedef void  (_cdecl * purple_blist_alias_buddy_wrapped_fnc)(PurpleBuddy *buddy, const char *alias);
 extern purple_blist_alias_buddy_wrapped_fnc purple_blist_alias_buddy_wrapped;
 typedef void  (_cdecl * purple_blist_server_alias_buddy_wrapped_fnc)(PurpleBuddy *buddy, const char *alias);
 extern purple_blist_server_alias_buddy_wrapped_fnc purple_blist_server_alias_buddy_wrapped;
 typedef PurpleGroup * (_cdecl * purple_find_group_wrapped_fnc)(const char *name);
 extern purple_find_group_wrapped_fnc purple_find_group_wrapped;
 typedef PurpleGroup * (_cdecl * purple_group_new_wrapped_fnc)(const char *name);
 extern purple_group_new_wrapped_fnc purple_group_new_wrapped;
 typedef void  (_cdecl * purple_blist_add_contact_wrapped_fnc)(PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 extern purple_blist_add_contact_wrapped_fnc purple_blist_add_contact_wrapped;
 typedef PurpleContact * (_cdecl * purple_buddy_get_contact_wrapped_fnc)(PurpleBuddy *buddy);
 extern purple_buddy_get_contact_wrapped_fnc purple_buddy_get_contact_wrapped;
 typedef PurpleBuddy * (_cdecl * purple_buddy_new_wrapped_fnc)(PurpleAccount *account, const char *name, const char *alias);
 extern purple_buddy_new_wrapped_fnc purple_buddy_new_wrapped;
 typedef void  (_cdecl * purple_blist_add_buddy_wrapped_fnc)(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 extern purple_blist_add_buddy_wrapped_fnc purple_blist_add_buddy_wrapped;
 typedef void  (_cdecl * purple_util_set_user_dir_wrapped_fnc)(const char *dir);
 extern purple_util_set_user_dir_wrapped_fnc purple_util_set_user_dir_wrapped;
 typedef GIOChannel * (_cdecl * wpurple_g_io_channel_win32_new_socket_wrapped_fnc)(int socket);
 extern wpurple_g_io_channel_win32_new_socket_wrapped_fnc wpurple_g_io_channel_win32_new_socket_wrapped;
 #else
 #define PURPLE_BLIST_NODE_IS_CHAT_WRAPPED PURPLE_BLIST_NODE_IS_CHAT
 #define PURPLE_BLIST_NODE_IS_BUDDY_WRAPPED PURPLE_BLIST_NODE_IS_BUDDY
 #define PURPLE_BLIST_NODE_IS_CONTACT_WRAPPED PURPLE_BLIST_NODE_IS_CONTACT
 #define PURPLE_BLIST_NODE_IS_GROUP_WRAPPED PURPLE_BLIST_NODE_IS_GROUP
 #define PURPLE_CONV_IM_WRAPPED PURPLE_CONV_IM
 #define PURPLE_CONV_CHAT_WRAPPED PURPLE_CONV_CHAT
 #define PURPLE_CONNECTION_IS_CONNECTED_WRAPPED PURPLE_CONNECTION_IS_CONNECTED
 #define purple_account_set_bool_wrapped purple_account_set_bool
 #define purple_account_get_protocol_id_wrapped purple_account_get_protocol_id
 #define purple_account_set_int_wrapped purple_account_set_int
 #define purple_account_get_string_wrapped purple_account_get_string
 #define purple_account_set_string_wrapped purple_account_set_string
 #define purple_account_get_username_wrapped purple_account_get_username
 #define purple_account_set_username_wrapped purple_account_set_username
 #define purple_account_set_proxy_info_wrapped purple_account_set_proxy_info
 #define purple_accounts_find_wrapped purple_accounts_find
 #define purple_account_new_wrapped purple_account_new
 #define purple_accounts_add_wrapped purple_accounts_add
 #define purple_account_get_password_wrapped purple_account_get_password
 #define purple_account_set_password_wrapped purple_account_set_password
 #define purple_account_set_enabled_wrapped purple_account_set_enabled
 #define purple_account_set_privacy_type_wrapped purple_account_set_privacy_type
 #define purple_account_get_status_type_with_primitive_wrapped purple_account_get_status_type_with_primitive
 #define purple_account_set_status_wrapped purple_account_set_status
 #define purple_account_get_int_wrapped purple_account_get_int
 #define purple_account_disconnect_wrapped purple_account_disconnect
 #define purple_accounts_delete_wrapped purple_accounts_delete
 #define purple_account_get_connection_wrapped purple_account_get_connection
 #define purple_account_set_alias_wrapped purple_account_set_alias
 #define purple_account_set_public_alias_wrapped purple_account_set_public_alias
 #define purple_account_remove_buddy_wrapped purple_account_remove_buddy
 #define purple_account_add_buddy_wrapped purple_account_add_buddy
 #define purple_account_get_name_for_display_wrapped purple_account_get_name_for_display
 #define purple_accounts_set_ui_ops_wrapped purple_accounts_set_ui_ops
 #define purple_account_prefs_set_ui_ops_wrapped purple_account_prefs_set_ui_ops
 #define purple_account_option_get_type_wrapped purple_account_option_get_type
 #define purple_account_option_get_setting_wrapped purple_account_option_get_setting
 #define purple_blist_node_get_type_wrapped purple_blist_node_get_type
 #define purple_buddy_get_alias_wrapped purple_buddy_get_alias
 #define purple_buddy_get_server_alias_wrapped purple_buddy_get_server_alias
 #define purple_find_buddy_wrapped purple_find_buddy
 #define purple_buddy_get_group_wrapped purple_buddy_get_group
 #define purple_blist_remove_buddy_wrapped purple_blist_remove_buddy
 #define purple_blist_alias_buddy_wrapped purple_blist_alias_buddy
 #define purple_blist_server_alias_buddy_wrapped purple_blist_server_alias_buddy
 #define purple_find_group_wrapped purple_find_group
 #define purple_group_new_wrapped purple_group_new
 #define purple_blist_add_contact_wrapped purple_blist_add_contact
 #define purple_buddy_get_contact_wrapped purple_buddy_get_contact
 #define purple_buddy_new_wrapped purple_buddy_new
 #define purple_blist_add_buddy_wrapped purple_blist_add_buddy
 #define purple_blist_find_chat_wrapped purple_blist_find_chat
 #define purple_chat_get_components_wrapped purple_chat_get_components
 #define purple_buddy_get_presence_wrapped purple_buddy_get_presence
 #define purple_buddy_get_account_wrapped purple_buddy_get_account
 #define purple_buddy_get_name_wrapped purple_buddy_get_name
 #define purple_find_buddies_wrapped purple_find_buddies
 #define purple_group_get_name_wrapped purple_group_get_name
 #define purple_blist_set_ui_ops_wrapped purple_blist_set_ui_ops
 #define purple_set_blist_wrapped purple_set_blist
 #define purple_blist_new_wrapped purple_blist_new
 #define purple_blist_load_wrapped purple_blist_load
 #define purple_blist_get_handle_wrapped purple_blist_get_handle
 #define purple_buddy_icons_set_account_icon_wrapped purple_buddy_icons_set_account_icon
 #define purple_buddy_icons_find_wrapped purple_buddy_icons_find
 #define purple_buddy_icon_get_full_path_wrapped purple_buddy_icon_get_full_path
 #define purple_buddy_icon_unref_wrapped purple_buddy_icon_unref
 #define purple_buddy_icons_find_account_icon_wrapped purple_buddy_icons_find_account_icon
 #define purple_buddy_icon_get_data_wrapped purple_buddy_icon_get_data
 #define purple_certificate_add_ca_search_path_wrapped purple_certificate_add_ca_search_path
 #define purple_connection_get_state_wrapped purple_connection_get_state
 #define purple_connection_get_account_wrapped purple_connection_get_account
 #define purple_connection_get_display_name_wrapped purple_connection_get_display_name
 #define purple_connections_set_ui_ops_wrapped purple_connections_set_ui_ops
 #define purple_connections_get_handle_wrapped purple_connections_get_handle
 #define purple_conversation_get_im_data_wrapped purple_conversation_get_im_data
 #define purple_conversation_get_chat_data_wrapped purple_conversation_get_chat_data
 #define purple_find_conversation_with_account_wrapped purple_find_conversation_with_account
 #define purple_conversation_new_wrapped purple_conversation_new
 #define purple_conversation_get_type_wrapped purple_conversation_get_type
 #define purple_conversation_set_data_wrapped purple_conversation_set_data
 #define purple_conversation_update_wrapped purple_conversation_update
 #define purple_conv_im_send_wrapped purple_conv_im_send

packaging/debian/debian/changelog

➞

Show inline comments

-spectrum2 (1:1760-89e377b-1) unstable; urgency=low
+spectrum2 (1:2267-b80ba70a-1) unstable; urgency=low
   * Move package to git-buildpackage format
   * remove the -git suffix from package names
   * Change dependency from libswiften2-dev to libswiften-dev
   * remove some old cruft (debian/source/options, lintian-overrides, ...)
   * Add libevent-dev as build-dependency
  -- Mathias Ertl <apt-repository@fsinf.at>  Thu, 28 Jun 2012 21:39:27 +0200
 spectrum2-git (2.0.0~beta+47-gdd8627b-1) unstable; urgency=low
   * Upstream development snapshot
  -- Mathias Ertl <apt-repository@fsinf.at>  Tue, 20 Sep 2011 11:06:50 +0200

tests/CMakeLists.txt

➞

Show inline comments

 ADD_SUBDIRECTORY(libtransport)
 add_custom_target(test ${CMAKE_CURRENT_BINARY_DIR}/libtransport/libtransport_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output)
 add_custom_target(extended_test ${CMAKE_CURRENT_BINARY_DIR}/libtransport/libtransport_test COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/start.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output)
 add_custom_target(test $<TARGET_FILE:libtransport_test> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output)
 add_custom_target(extended_test $<TARGET_FILE:libtransport_test> COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/start.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests_output)

tests/libtransport/util.cpp

➞

Show inline comments

 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Server/ServerFromClientSession.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "basictest.h"
 #include "transport/utf8.h"
 #include <boost/lexical_cast.hpp>
 using namespace Transport;
 using boost::lexical_cast;
 class UtilTest : public CPPUNIT_NS :: TestFixture{
 	CPPUNIT_TEST_SUITE(UtilTest);
 	CPPUNIT_TEST(encryptDecryptPassword);
 	CPPUNIT_TEST(serializeGroups);
 	CPPUNIT_TEST(replaceInvalid);
     CPPUNIT_TEST(storeUserSettings);
 	CPPUNIT_TEST_SUITE_END();
 	public:
 		void setUp (void) {
+		}
 		void tearDown (void) {
+		}
 	void encryptDecryptPassword() {
 		std::string encrypted = StorageBackend::encryptPassword("password", "key");
 		CPPUNIT_ASSERT_EQUAL(std::string("password"), StorageBackend::decryptPassword(encrypted, "key"));
+	}
 	void serializeGroups() {
 		std::vector<std::string> groups;
 		std::string g = "";
 		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));
 		CPPUNIT_ASSERT_EQUAL(0, (int) StorageBackend::deserializeGroups(g).size());
 		groups.push_back("Buddies");
 		g = "Buddies";
 		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));
 		CPPUNIT_ASSERT_EQUAL(1, (int) StorageBackend::deserializeGroups(g).size());
 		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::deserializeGroups(g)[0]);
 		groups.push_back("Buddies2");
 		g = "Buddies\nBuddies2";
 		CPPUNIT_ASSERT_EQUAL(g, StorageBackend::serializeGroups(groups));
 		CPPUNIT_ASSERT_EQUAL(2, (int) StorageBackend::deserializeGroups(g).size());
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddies"), StorageBackend::deserializeGroups(g)[0]);
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddies2"), StorageBackend::deserializeGroups(g)[1]);
+	}
 	void replaceInvalid() {
 		std::string x("test\x80\xe0\xa0\xc0\xaf\xed\xa0\x80test");
 		std::string a;
 		CPPUNIT_ASSERT(x.end() != utf8::find_invalid(x.begin(), x.end()));
 		utf8::replace_invalid(x.begin(), x.end(), std::back_inserter(a), '_');
 		CPPUNIT_ASSERT_EQUAL(std::string("test____test"), a);
 		a = "";
 		utf8::remove_invalid(x.begin(), x.end(), std::back_inserter(a));
 		CPPUNIT_ASSERT_EQUAL(std::string("testtest"), a);
+	}
     void storeUserSettings() {
         std::istringstream ifs("service.server_mode = 1\nservice.jid=localhost\nservice.more_resources=1\nservice.admin_jid=me@localhost\ndatabase.type=sqlite3\ndatabase.database=demo.s3db");
         Config *cfg = new Config();
         cfg->load(ifs);
         std::string err = "";
         StorageBackend *storage = StorageBackend::createBackend(cfg, err);
         UserInfo res;
         res.uin = "123456";
         res.jid = "test@localhost";
         res.password = "secret";
         storage->connect();
         storage->setUser(res);
         storage->getUser("test@localhost", res);
         int ts = time(NULL);
         std::string key = boost::lexical_cast<std::string>(ts);
         int type = TYPE_INT;
         storage->getUserSetting(res.id, "test_variable", type, key);
         std::string value = "";
         storage->getUserSetting(res.id, "test_variable", type, value);
         unlink("demo.s3db");
         CPPUNIT_ASSERT_EQUAL(ts, boost::lexical_cast<int>(value));
+    }
 };
 CPPUNIT_TEST_SUITE_REGISTRATION (UtilTest);

0 comments (0 inline, 0 general)