# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1152173468 0
# Node ID 7d513e44201b93c2ae61df541db4f9a796cbc618
# Parent  5750bdb4f778c55cc198c374a349377db5d7ac81
[gaim-migrate @ 16439]
Minor odds and ends

committer: Tailor Script <tailor@pidgin.im>

diff -r 5750bdb4f778 -r 7d513e44201b plugins/ssl/ssl-gnutls.c
--- a/plugins/ssl/ssl-gnutls.c	Thu Jul 06 08:01:36 2006 +0000
+++ b/plugins/ssl/ssl-gnutls.c	Thu Jul 06 08:11:08 2006 +0000
@@ -106,6 +106,11 @@
 	GaimSslGnutlsData *gnutls_data;
 	static const int cert_type_priority[2] = { GNUTLS_CRT_X509, 0 };
 
+	/*
+	 * TODO: Uh, this needs to somehow check to make sure that gsc is
+	 *       still valid before actually doing anything.
+	 */
+
 	if(source < 0) {
 		if(gsc->error_cb != NULL)
 			gsc->error_cb(gsc, GAIM_SSL_CONNECT_FAILED, gsc->connect_cb_data);
diff -r 5750bdb4f778 -r 7d513e44201b src/conversation.c
--- a/src/conversation.c	Thu Jul 06 08:01:36 2006 +0000
+++ b/src/conversation.c	Thu Jul 06 08:11:08 2006 +0000
@@ -57,9 +57,6 @@
 	gaim_conv_im_update_typing(im);
 	gaim_conv_im_stop_typing_timeout(im);
 
-	gaim_signal_emit(gaim_conversations_get_handle(),
-					 "buddy-typing-stopped", c->account, c->name);
-
 	return FALSE;
 }
 
diff -r 5750bdb4f778 -r 7d513e44201b src/server.c
--- a/src/server.c	Thu Jul 06 08:01:36 2006 +0000
+++ b/src/server.c	Thu Jul 06 08:11:08 2006 +0000
@@ -621,9 +621,6 @@
 		gaim_signal_emit(gaim_conversations_get_handle(),
 						 "buddy-typing-stopped", gc->account, name);
 	}
-
-	gaim_signal_emit(gaim_conversations_get_handle(),
-					 "buddy-typing-stopped", gc->account, name);
 }
 
 struct chat_invite_data {
diff -r 5750bdb4f778 -r 7d513e44201b src/util.c
--- a/src/util.c	Thu Jul 06 08:01:36 2006 +0000
+++ b/src/util.c	Thu Jul 06 08:11:08 2006 +0000
@@ -2521,7 +2521,7 @@
 		}
 	} else {
 		gaim_debug(GAIM_DEBUG_ERROR, "gaim_mkstemp",
-				   "g_get_tmp_dir() failed!");
+				   "g_get_tmp_dir() failed!\n");
 	}
 
 	return fp;