removed some debug prints. uncommented code block for unix.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2272 ee746299-78ed-0310-b773-934348b2243d

6 files changed, 11 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index a2a42883..eb1f5795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-10-05
 
+	* libsylph/utils.c
+	  libsylph/pop.c
+	  libsylph/socket.c
+	  src/logwindow.c: removed some debug prints.
+	* libsylph/session.c: uncommented code block for unix.
+
+2009-10-05
+
 	* libsylph/imap.c: imap_session_destroy(): free thread pool.
 
 2009-10-05
diff --git a/libsylph/pop.c b/libsylph/pop.c
index e384e66c..aab918ee 100644
--- a/libsylph/pop.c
+++ b/libsylph/pop.c
@@ -335,7 +335,6 @@ gint pop3_retr_send(Pop3Session *session)
 {
 	session->state = POP3_RETR;
 	pop3_gen_send(session, "RETR %d", session->cur_msg);
-	g_print("sent RETR\n");
 	return PS_SUCCESS;
 }
 
@@ -344,8 +343,6 @@ gint pop3_retr_recv(Pop3Session *session, FILE *fp, guint len)
 	gchar *file;
 	gint drop_ok;
 
-	g_print("pop3_retr_recv (%d)\n", session->cur_msg);
-
 	file = get_tmp_file();
 	if (pop3_write_msg_to_file(file, fp, len) < 0) {
 		g_free(file);
@@ -371,7 +368,6 @@ gint pop3_retr_recv(Pop3Session *session, FILE *fp, guint len)
 			: drop_ok == DROP_DELETE ? RECV_TIME_DELETE
 			: session->current_time;
 
-	g_print("pop3_retr_recv done (%d)\n", session->cur_msg);
 	return PS_SUCCESS;
 }
 
@@ -634,7 +630,6 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
 	gint size;
 	gboolean size_limit_over;
 
-	g_print("pop3_lookup_next (%d -)\n", session->cur_msg);
 	for (;;) {
 		msg = &session->msg[session->cur_msg];
 		size = msg->size;
@@ -675,7 +670,7 @@ static Pop3State pop3_lookup_next(Pop3Session *session)
 	}
 
 	pop3_retr_send(session);
-	g_print("pop3_lookup_next (%d) done\n", session->cur_msg);
+
 	return POP3_RETR;
 }
 
@@ -858,7 +853,6 @@ static gint pop3_session_recv_data_finished(Session *session, guchar *data,
 	Pop3Session *pop3_session = POP3_SESSION(session);
 	Pop3ErrorValue val = PS_SUCCESS;
 
-	g_print("pop3_session_recv_data_finished\n");
 	switch (pop3_session->state) {
 	case POP3_GETRANGE_UIDL_RECV:
 		val = pop3_getrange_uidl_recv(pop3_session, (gchar *)data, len);
@@ -883,7 +877,6 @@ static gint pop3_session_recv_data_finished(Session *session, guchar *data,
 		return -1;
 	}
 
-	g_print("pop3_session_recv_data_finished done\n");
 	return 0;
 }
 
@@ -894,7 +887,6 @@ static gint pop3_session_recv_data_as_file_finished(Session *session, FILE *fp,
 
 	g_return_val_if_fail(pop3_session->state == POP3_RETR_RECV, -1);
 
-	g_print("pop3_session_recv_data_as_file_finished (%d)\n", pop3_session->cur_msg);
 	if (pop3_retr_recv(pop3_session, fp, len) < 0)
 		return -1;
 
@@ -912,7 +904,6 @@ static gint pop3_session_recv_data_as_file_finished(Session *session, FILE *fp,
 		if (pop3_lookup_next(pop3_session) == POP3_ERROR)
 			return -1;
 	}
-	g_print("pop3_session_recv_data_as_file_finished done (next %d)\n", pop3_session->cur_msg);
 
 	return 0;
 }
diff --git a/libsylph/session.c b/libsylph/session.c
index 4ebbfeef..7bb29347 100644
--- a/libsylph/session.c
+++ b/libsylph/session.c
@@ -356,8 +356,7 @@ static gint session_close(Session *session)
 {
 	g_return_val_if_fail(session != NULL, -1);
 
-//#ifdef G_OS_UNIX
-#if 0
+#ifdef G_OS_UNIX
 	if (session->conn_id > 0) {
 		sock_connect_async_cancel(session->conn_id);
 		session->conn_id = 0;
diff --git a/libsylph/socket.c b/libsylph/socket.c
index d81236cb..47aa7ec1 100644
--- a/libsylph/socket.c
+++ b/libsylph/socket.c
@@ -1385,7 +1385,6 @@ gint sock_connect_async_thread_wait(gint id, SockInfo **sock)
 	while (conn_data->flag == 0)
 		event_loop_iterate();
 
-	debug_print("sock_connect_async_thread_wait: flagged\n");
 	g_thread_join(conn_data->thread);
 	debug_print("sock_connect_async_thread_wait: thread exited\n");
 
diff --git a/libsylph/utils.c b/libsylph/utils.c
index 31f55a77..ace360a7 100644
--- a/libsylph/utils.c
+++ b/libsylph/utils.c
@@ -3912,7 +3912,6 @@ gint execute_command_line_async_wait(const gchar *cmdline)
 	while (data.flag == 0)
 		event_loop_iterate();
 
-	debug_print("execute_command_line_async_wait: flagged\n");
 	g_thread_join(thread);
 	debug_print("execute_command_line_async_wait: thread exited\n");
 
diff --git a/src/logwindow.c b/src/logwindow.c
index b8df6d93..759b5fd8 100644
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -186,6 +186,7 @@ static void log_window_append_real(const gchar *str, LogType type)
 
 #if USE_THREADS
 	if (g_thread_self() != main_thread) {
+		g_fprintf(stderr, "log_window_append_real called from non-main thread (%p)\n", g_thread_self());
 		return;
 	}
 #endif
@@ -261,7 +262,6 @@ void log_window_append(const gchar *str, LogType type)
 {
 #if USE_THREADS
 	if (g_thread_self() != main_thread) {
-		//g_fprintf(stderr, "log_window_append called from non-main thread (%p)\n", g_thread_self());
 		log_window_append_queue(str, type);
 		return;
 	}
@@ -286,7 +286,6 @@ void log_window_append_queue(const gchar *str, LogType type)
 	logdata->str = g_strdup(str);
 	logdata->type = type;
 
-	//g_print("append_queue: (%d) %s", type, str);
 	g_async_queue_push(logwindow->aqueue, logdata);
 #endif
 }
@@ -302,7 +301,6 @@ void log_window_flush(void)
 	}
 
 	while ((logdata = g_async_queue_try_pop(logwindow->aqueue))) {
-		//g_print("flush_queue: (%d) %s", logdata->type, logdata->str);
 		log_window_append_real(logdata->str, logdata->type);
 		g_free(logdata->str);
 		g_free(logdata);