changeset 2003:ffae8228d63a

[gaim-migrate @ 2013] small fixes committer: Tailor Script <[e-mail]>

--- a/ChangeLog	Tue Jun 12 17:18:21 2001 +0000
+++ b/ChangeLog	Tue Jun 12 22:59:05 2001 +0000
@@ -5,6 +5,7 @@
 	  (Thanks, Adam)
 	* Updated the German translation (Thanks, Dominik)
 	* Some MSN changes
+	* Some HTML widget changes
 
 version 0.11.0-pre13 (06/06/2001):
 	* Can view/set chat topic in Jabber (thanks faceprint)

--- a/TODO	Tue Jun 12 17:18:21 2001 +0000
+++ b/TODO	Tue Jun 12 22:59:05 2001 +0000
@@ -2,7 +2,6 @@
 
 THE CORE:
 	Status labels in buddy list (mostly just for yahoo/msn)
-	Border for GtkIMHtml
 	Transparency for GtkIMHtml
 	GPG Encryption of messages
 	Better way of showing away state - and possibly in main window
@@ -14,7 +13,6 @@
 			offline/normal message. uh... maybe this isn't the best
 			idea, but we need something that gives us this functionality....
 			prpl->send_im_offline?
-		OPT_PROTO_CHAT_TOPIC (for IRC/Jabber chatroom topics)
 		OPT_PROTO_MAILCHECK (mainly for Yahoo/MSN) - with appropriate toggle
 			on account editor modify thing for whether or not to display
 			it (and also move Yahoo/MSN dialog to prpl.c and have both of
@@ -57,14 +55,12 @@
 Yahoo:
 	Chat
 	File Transfer
-	Offline Messaging
 
 ICQ:
 	Authorization (is requesting Auth necessary?)
 	Chat
 	File Transfer
 	New User Registration
-	Offline Messaging
 
 MSN:
 	Chat (?)

--- a/plugins/irc.c	Tue Jun 12 17:18:21 2001 +0000
+++ b/plugins/irc.c	Tue Jun 12 22:59:05 2001 +0000
@@ -1877,16 +1877,23 @@
 static void irc_login_callback(gpointer data, gint source, GdkInputCondition condition)
 {
 	struct gaim_connection *gc = data;
-	struct irc_data *idata = gc->proto_data;
+	struct irc_data *idata;
 	char buf[4096];
 
+	if (!g_slist_find(connections, gc)) {
+		close(source);
+		return;
+	}
+
+	idata = gc->proto_data;
+
 	if (source == -1) {
 		hide_login_progress(gc, "Write error");
 		signoff(gc);
 		return;
 	}
 
-	if (idata->fd == 0)
+	if (idata->fd != source)
 		idata->fd = source;
 
  	g_snprintf(buf, 4096, "NICK %s\n USER %s localhost %s :GAIM (%s)\n",

--- a/src/oscar.c	Tue Jun 12 17:18:21 2001 +0000
+++ b/src/oscar.c	Tue Jun 12 22:59:05 2001 +0000
@@ -461,8 +461,10 @@
 	struct aim_session_t *sess;
 	struct aim_conn_t *conn;
 
-	if (!g_slist_find(connections, gc))
+	if (!g_slist_find(connections, gc)) {
+		close(source);
 		return;
+	}
 
 	odata = gc->proto_data;
 	sess = odata->sess;
@@ -590,8 +592,10 @@
 	struct aim_session_t *sess;
 	struct aim_conn_t *bosconn;
 
-	if (!g_slist_find(connections, gc))
+	if (!g_slist_find(connections, gc)) {
+		close(source);
 		return;
+	}
 
 	odata = gc->proto_data;
 	sess = odata->sess;
@@ -1003,8 +1007,10 @@
 	struct aim_session_t *sess;
 	struct aim_conn_t *tstconn;
 
-	if (!g_slist_find(connections, gc))
+	if (!g_slist_find(connections, gc)) {
+		close(source);
 		return;
+	}
 
 	odata = gc->proto_data;
 	sess = odata->sess;
@@ -1037,8 +1043,10 @@
 	struct aim_session_t *sess;
 	struct aim_conn_t *tstconn;
 
-	if (!g_slist_find(connections, gc))
+	if (!g_slist_find(connections, gc)) {
+		close(source);
 		return;
+	}
 
 	odata = gc->proto_data;
 	sess = odata->sess;
@@ -1073,6 +1081,7 @@
 	struct aim_conn_t *tstconn;
 
 	if (!g_slist_find(connections, gc)) {
+		close(source);
 		g_free(ccon->priv);
 		g_free(ccon->show);
 		g_free(ccon->name);
@@ -2678,22 +2687,13 @@
 
 static void oscar_chat_invite(struct gaim_connection *g, int id, char *message, char *name) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	GSList *bcs = g->buddy_chats;
-	struct conversation *b = NULL;
-
-	while (bcs) {
-		b = (struct conversation *)bcs->data;
-		if (id == b->id)
-			break;
-		bcs = bcs->next;
-		b = NULL;
-	}
-
-	if (!b)
+	struct chat_connection *ccon = find_oscar_chat(g, id);
+	
+	if (!ccon)
 		return;
-
-	aim_chat_invite(odata->sess, odata->conn, name,
-			message ? message : "", 0x4, b->name, 0x0);
+	
+	aim_chat_invite(odata->sess, odata->conn, name, message ? message : "",
+			ccon->exchange, ccon->name, 0x0);
 }
 
 static void oscar_chat_leave(struct gaim_connection *g, int id) {