libtransport.git Changeset - c43a4b4fc1f3

Changeset - c43a4b4fc1f3

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 13 years ago 2012-03-12 10:48:24
hanzz.k@gmail.com

sleep for 2 seconds before trying to connect skype using dbus and try it repeatedly when skype refuses to authenticate spectrum

1 file changed with 2 insertions and 1 deletions:

backends/skype/main.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -464,24 +464,25 @@ void Skype::login() { @@
+	{
 		LOG4CXX_INFO(logger, "Creating DBus connection.");
 		GError *error = NULL;
 		m_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 		if (m_connection == NULL && error != NULL)
+		{
 			LOG4CXX_INFO(logger,  m_username << ": DBUS Error: " << error->message);
 			g_error_free(error);
 			return;
+		}
+	}
 	sleep(2);
 	m_timer = g_timeout_add_seconds(1, create_dbus_proxy, this);
+}
 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;
@@ @@ -490,25 +491,25 @@ bool Skype::loadSkypeBuddies() { @@
 		logout();
 		return FALSE;
+	}
 	std::string re = send_command("NAME Spectrum");
 	if (m_counter++ > 15) {
 		np->handleDisconnected(m_user, 0, "");
 		close(fd_output);
 		logout();
 		return FALSE;
+	}
 	if (re.empty() || re == "CONNSTATUS OFFLINE") {
+	if (re.empty() || re == "CONNSTATUS OFFLINE" || re == "ERROR 68") {
 		return TRUE;
+	}
 	close(fd_output);
 	if (send_command("PROTOCOL 7") != "PROTOCOL 7") {
 		np->handleDisconnected(m_user, 0, "Skype is not ready");
 		logout();
 		return FALSE;
+	}
 	np->handleConnected(m_user);

0 comments (0 inline, 0 general)