libtransport.git Changeset - 4cd528271c09

Changeset - 4cd528271c09

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 13 years ago 2012-03-14 09:00:19
hanzz.k@gmail.com

send info about missed calls + probably fixed Incorrect Password notification

1 file changed with 40 insertions and 9 deletions:

backends/skype/main.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -482,21 +482,26 @@ void Skype::login() { @@
 bool Skype::loadSkypeBuddies() {
 //	std::string re = "CONNSTATUS OFFLINE";
 //	while (re == "CONNSTATUS OFFLINE" || re.empty()) {
 //		sleep(1);
 // 	gchar buffer[1024];
 // 	int bytes_read = read(fd_output, buffer, 1023);
 // 	if (bytes_read > 0) {
 // 		buffer[bytes_read] = 0;
 // 		np->handleDisconnected(m_user, 0, buffer);
 // 		close(fd_output);
 // 		logout();
 // 		return FALSE;
 // 	}
 	gchar buffer[1024];
 	int bytes_read = read(fd_output, buffer, 1023);
 	if (bytes_read > 0) {
 		buffer[bytes_read] = 0;
 		std::string b(buffer);
 		LOG4CXX_WARN(logger, "Skype wrote this on stdout '" << b << "'");
 		if (b.find("Incorrect Password") != std::string::npos) {
 			LOG4CXX_INFO(logger, "Incorrect password, logging out")
 			np->handleDisconnected(m_user, 0, "Incorrect password");
 			close(fd_output);
 			logout();
 			return FALSE;
+		}
+	}
 	std::string re = send_command("NAME Spectrum");
 	if (m_counter++ > 15) {
 		LOG4CXX_ERROR(logger, "Logging out, because we tried to connect the Skype over DBUS 15 times without success");
 		np->handleDisconnected(m_user, 0, "");
 		close(fd_output);
 			if (from_handle == sk->getUsername())
 				return;
 			np->handleMessage(sk->getUser(), from, body);
+		}
+	}
 	else if (cmd[0] == "CALL") {
 		// CALL 884 STATUS RINGING
 		if (cmd[2] == "STATUS") {
 			if (cmd[3] == "RINGING" || cmd[3] == "MISSED") {
 				// handle only incoming calls
 				std::string type = sk->send_command("GET CALL " + cmd[1] + " TYPE");
 				type = type.substr(type.find("TYPE") + 5);
 				if (type.find("INCOMING") != 0) {
 					return;
+				}
 				std::string from = sk->send_command("GET CALL " + cmd[1] + " PARTNER_HANDLE");
 				from = from.substr(from.find("PARTNER_HANDLE") + 15);
 				std::string dispname = sk->send_command("GET CALL " + cmd[1] + " PARTNER_DISPNAME");
 				dispname = dispname.substr(dispname.find("PARTNER_DISPNAME") + 17);
 				if (cmd[3] == "RINGING") {
 					np->handleMessage(sk->getUser(), from, "User " + dispname + " is calling you.");
+				}
 				else {
 					np->handleMessage(sk->getUser(), from, "You have missed call from user " + dispname + ".");
+				}
+			}
+		}
+	}
+}
 DBusHandlerResult skype_notify_handler(DBusConnection *connection, DBusMessage *message, gpointer user_data) {
 	DBusMessageIter iterator;
 	gchar *message_temp;
 	DBusMessage *temp_message;

0 comments (0 inline, 0 general)