pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim/src conversation.c,1.296,1.297 dialogs.c,1.284,1.285 gaim.h,1.293,1.294 prefs.c,1.198,1.199

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv1702

Modified Files:
	conversation.c dialogs.c gaim.h prefs.c 
Log Message:
I like beer.



Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- conversation.c	2001/11/18 04:19:49	1.296
+++ conversation.c	2001/11/18 05:37:35	1.297
@@ -540,10 +540,7 @@
 {
 	struct buddy *b = find_buddy(c->gc, c->name);
 	if (b) {
-		if (im_options & OPT_IM_DONT_CONFIRM_DEL)
-			show_confirm_del(c->gc, c->name);
-		else
-			do_remove_buddy(NULL, b);
+		show_confirm_del(c->gc, c->name);
 	} else if (c->gc)
 		show_add_buddy(c->gc, c->name, NULL, NULL);
 

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- dialogs.c	2001/11/18 04:19:49	1.284
+++ dialogs.c	2001/11/18 05:37:35	1.285
@@ -101,7 +101,6 @@
 	GtkWidget *label;
 	GtkWidget *ok;
 	GtkWidget *cancel;
-	GtkWidget *checkbox;	
 	char name[1024];
 	struct gaim_connection *gc;
 };
@@ -502,12 +501,6 @@
 	gtk_label_set_justify(GTK_LABEL(b->label), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start(GTK_BOX(fbox), b->label, FALSE, FALSE, 0);
 	gtk_widget_show(b->label);
-
-	b->checkbox = gtk_check_button_new_with_label(_("Do not ask me this question again"));
-	gtk_signal_connect(GTK_OBJECT(b->checkbox), "clicked",
-			   GTK_SIGNAL_FUNC(toggle_confirm_del_cb), (int *)OPT_IM_DONT_CONFIRM_DEL);
-	gtk_box_pack_start(GTK_BOX(fbox), b->checkbox, FALSE, FALSE, 0);
-	gtk_widget_show(b->checkbox);
 
 	hbox = gtk_hbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- gaim.h	2001/11/18 04:19:49	1.293
+++ gaim.h	2001/11/18 05:37:35	1.294
@@ -242,7 +242,6 @@
 #define OPT_IM_SIDE_TAB			0x00000020
 #define OPT_IM_BR_TAB			0x00000040
 #define OPT_IM_HIDE_ICONS		0x00000080
-#define OPT_IM_DONT_CONFIRM_DEL		0x00000100
 
 extern guint chat_options;
 #define OPT_CHAT_ONE_WINDOW		0x00000001

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- prefs.c	2001/11/18 04:19:49	1.198
+++ prefs.c	2001/11/18 05:37:35	1.199
@@ -906,8 +906,6 @@
 			vbox2);
 	gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
 	gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
-	gaim_button(_("Do not confirm removing of buddies"), &im_options, OPT_IM_DONT_CONFIRM_DEL, vbox2);
-
 	frame = gtk_frame_new(_("Window Sizes"));
 	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
 	gtk_widget_show(frame);

[Gaim-commits] CVS: gaim/src dialogs.c,1.285,1.286 prefs.c,1.199,1.200

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2248

Modified Files:
	dialogs.c prefs.c 
Log Message:
eh.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- dialogs.c	2001/11/18 05:37:35	1.285
+++ dialogs.c	2001/11/18 05:42:08	1.286
@@ -454,11 +454,6 @@
 
 }
 
-void toggle_confirm_del_cb(GtkWidget *w, int opt)
-{
-	im_options = im_options ^ opt;
-}
-
 void show_confirm_del(struct gaim_connection *gc, gchar *name)
 {
 	struct confirm_del *b = g_new0(struct confirm_del, 1);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- prefs.c	2001/11/18 05:37:35	1.199
+++ prefs.c	2001/11/18 05:42:08	1.200
@@ -906,6 +906,7 @@
 			vbox2);
 	gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
 	gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
+
 	frame = gtk_frame_new(_("Window Sizes"));
 	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
 	gtk_widget_show(frame);

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.20,1.21 aim_cbtypes.h,1.3,1.4 icq.c,1.5,1.6 oscar.c,1.66,1.67

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv18778/src/protocols/oscar

Modified Files:
	aim.h aim_cbtypes.h icq.c oscar.c 
Log Message:
i'll commit it later.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- aim.h	2001/11/17 13:57:30	1.20
+++ aim.h	2001/11/18 00:21:49	1.21
@@ -978,8 +978,17 @@
 	char *msg;
 };
 
+struct aim_icq_simpleinfo {
+	fu32_t uin;
+	char *nick;
+	char *first;
+	char *last;
+	char *email;
+};
+
 faim_export int aim_icq_reqofflinemsgs(aim_session_t *sess);
 faim_export int aim_icq_ackofflinemsgs(aim_session_t *sess);
+faim_export int aim_icq_getsimpleinfo(aim_session_t *sess, const char *uin);
 
 /* aim_util.c */
 /*

Index: aim_cbtypes.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim_cbtypes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- aim_cbtypes.h	2001/11/10 08:02:39	1.3
+++ aim_cbtypes.h	2001/11/18 00:21:49	1.4
@@ -180,6 +180,7 @@
 #define AIM_CB_ICQ_ERROR 0x0001
 #define AIM_CB_ICQ_OFFLINEMSG 0x00f0
 #define AIM_CB_ICQ_OFFLINEMSGCOMPLETE 0x00f1
+#define AIM_CB_ICQ_SIMPLEINFO 0x00f2
 #define AIM_CB_ICQ_DEFAULT 0xffff
 
 /*

Index: icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/icq.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- icq.c	2001/11/17 03:18:40	1.5
+++ icq.c	2001/11/18 00:21:49	1.6
@@ -108,6 +108,43 @@
 	return 0;
 }
 
+faim_export int aim_icq_getsimpleinfo(aim_session_t *sess, const char *uin)
+{
+	aim_conn_t *conn;
+	aim_frame_t *fr;
+	aim_snacid_t snacid;
+	int bslen;
+
+	if (!uin || uin[0] < '0' || uin[0] > '9')
+		return -EINVAL;
+
+	if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0015)))
+		return -EINVAL;
+
+	bslen = 2 + 4 + 2 + 2 + 2 + 4;
+
+	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + bslen)))
+		return -ENOMEM;
+
+	snacid = aim_cachesnac(sess, 0x0015, 0x0002, 0x0000, NULL, 0);
+	aim_putsnac(&fr->data, 0x0015, 0x0002, 0x0000, snacid);
+
+	/* For simplicity, don't bother using a tlvlist */
+	aimbs_put16(&fr->data, 0x0001);
+	aimbs_put16(&fr->data, bslen);
+
+	aimbs_putle16(&fr->data, bslen - 2);
+	aimbs_putle32(&fr->data, atoi(sess->sn));
+	aimbs_putle16(&fr->data, 0x07d0); /* I command thee. */
+	aimbs_putle16(&fr->data, snacid); /* eh. */
+	aimbs_putle16(&fr->data, 0x051f); /* shrug. */
+	aimbs_putle32(&fr->data, atoi(uin));
+
+	aim_tx_enqueue(sess, fr);
+
+	return 0;
+}
+
 /*
  * Response to 15/2, contains an ICQ packet.
  */
@@ -162,6 +199,40 @@
 
 		if ((userfunc = aim_callhandler(sess, rx->conn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSGCOMPLETE)))
 			ret = userfunc(sess, rx);
+	} else if (cmd == 0x07da) {
+		fu16_t subtype;
+
+		subtype = aimbs_getle16(&qbs);
+
+		if (subtype == 0x019a) {
+			fu16_t tlen;
+			struct aim_icq_simpleinfo info;
+			aim_rxcallback_t userfunc;
+
+			memset(&info, 0, sizeof(info));
+
+			aimbs_getle8(&qbs); /* no clue */
+			aimbs_getle16(&qbs); /* no clue */
+			info.uin = aimbs_getle32(&qbs);
+			tlen = aimbs_getle16(&qbs);
+			info.nick = aimbs_getstr(&qbs, tlen);
+			tlen = aimbs_getle16(&qbs);
+			info.first = aimbs_getstr(&qbs, tlen);
+			tlen = aimbs_getle16(&qbs);
+			info.last = aimbs_getstr(&qbs, tlen);
+			tlen = aimbs_getle16(&qbs);
+			info.email = aimbs_getstr(&qbs, tlen);
+			/* no clue what the rest of it is */
+
+			if ((userfunc = aim_callhandler(sess, rx->conn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_SIMPLEINFO)))
+				ret = userfunc(sess, rx, &info);
+
+			free(info.nick);
+			free(info.first);
+			free(info.last);
+			free(info.email);
+		}
+
 	}
 
 	aim_freetlvchain(&tl);

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- oscar.c	2001/11/17 13:57:30	1.66
+++ oscar.c	2001/11/18 00:21:49	1.67
@@ -229,23 +229,24 @@
 static int gaim_parse_searcherror(aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_searchreply(aim_session_t *, aim_frame_t *, ...);
 static int gaim_bosrights        (aim_session_t *, aim_frame_t *, ...);
-static int conninitdone_bos      (aim_session_t *sess, aim_frame_t *fr, ...);
-static int conninitdone_admin    (aim_session_t *sess, aim_frame_t *fr, ...);
-static int conninitdone_chat     (aim_session_t *sess, aim_frame_t *fr, ...);
-static int conninitdone_chatnav  (aim_session_t *sess, aim_frame_t *fr, ...);
+static int conninitdone_bos      (aim_session_t *, aim_frame_t *, ...);
+static int conninitdone_admin    (aim_session_t *, aim_frame_t *, ...);
+static int conninitdone_chat     (aim_session_t *, aim_frame_t *, ...);
+static int conninitdone_chatnav  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_msgerr     (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_buddyrights(aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_locerr     (aim_session_t *, aim_frame_t *, ...);
 static int gaim_icbm_param_info  (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parse_genericerr (aim_session_t *, aim_frame_t *, ...);
-static int gaim_memrequest       (aim_session_t *,  aim_frame_t*, ...);
-static int gaim_selfinfo         (aim_session_t *,  aim_frame_t*, ...);
-static int gaim_offlinemsg       (aim_session_t *,  aim_frame_t*, ...);
-static int gaim_offlinemsgdone   (aim_session_t *,  aim_frame_t*, ...);
+static int gaim_memrequest       (aim_session_t *, aim_frame_t *, ...);
+static int gaim_selfinfo         (aim_session_t *, aim_frame_t *, ...);
+static int gaim_offlinemsg       (aim_session_t *, aim_frame_t *, ...);
+static int gaim_offlinemsgdone   (aim_session_t *, aim_frame_t *, ...);
+static int gaim_simpleinfo       (aim_session_t *, aim_frame_t *, ...);
 
-static int gaim_directim_initiate  (aim_session_t *, aim_frame_t *, ...);
-static int gaim_directim_incoming  (aim_session_t *, aim_frame_t *, ...);
-static int gaim_directim_typing    (aim_session_t *, aim_frame_t *, ...);
+static int gaim_directim_initiate(aim_session_t *, aim_frame_t *, ...);
+static int gaim_directim_incoming(aim_session_t *, aim_frame_t *, ...);
+static int gaim_directim_typing  (aim_session_t *, aim_frame_t *, ...);
 
 static char *msgerrreason[] = {
 	"Invalid error",
@@ -652,6 +653,7 @@
 	aim_conn_addhandler(sess, bosconn, 0x0001, 0x000f, gaim_selfinfo, 0);
 	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSG, gaim_offlinemsg, 0);
 	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSGCOMPLETE, gaim_offlinemsgdone, 0);
+	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_SIMPLEINFO, gaim_simpleinfo, 0);
 
 	((struct oscar_data *)gc->proto_data)->conn = bosconn;
 	for (i = 0; i < (int)strlen(info->bosip); i++) {
@@ -2025,6 +2027,31 @@
 	return 1;
 }
 
+static int gaim_simpleinfo(aim_session_t *sess, aim_frame_t *fr, ...)
+{
+	va_list ap;
+	struct aim_icq_simpleinfo *info;
+	char buf[16 * 1024];
+
+	va_start(ap, fr);
+	info = va_arg(ap, struct aim_icq_simpleinfo *);
+	va_end(ap);
+
+	g_snprintf(buf, sizeof buf,
+		   "<B>UIN:</B> %lu<BR>"
+		   "<B>Nick:</B> %s<BR>"
+		   "<B>Name:</B> %s %s<BR>"
+		   "<B>Email:</B> %s\n",
+		   info->uin,
+		   info->nick,
+		   info->first, info->last,
+		   info->email);
+
+	g_show_info_text(buf, NULL);
+
+	return 1;
+}
+
 static int gaim_parse_searchreply(aim_session_t *sess, aim_frame_t *fr, ...) {
 	va_list ap;
 	char *address, *SNs;
@@ -2189,7 +2216,10 @@
 
 static void oscar_get_info(struct gaim_connection *g, char *name) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_GENERALINFO);
+	if (odata->icq)
+		aim_icq_getsimpleinfo(odata->sess, name);
+	else
+		aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_GENERALINFO);
 }
 
 static void oscar_get_away_msg(struct gaim_connection *g, char *name) {

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.13,1.14

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv753/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
it's easier for me to see services in hex


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- yahoo.c	2001/11/17 19:27:39	1.13
+++ yahoo.c	2001/11/17 22:50:08	1.14
@@ -658,7 +658,7 @@
 		yahoo_process_list(gc, pkt);
 		break;
 	default:
-		debug_printf("unhandled service %d\n", pkt->service);
+		debug_printf("unhandled service 0x%02x\n", pkt->service);
 		break;
 	}
 }
@@ -705,7 +705,7 @@
 		pkt = yahoo_packet_new(0, 0, 0);
 
 		pkt->service = yahoo_get16(yd->rxqueue + pos); pos += 2;
-		debug_printf("Yahoo Service: %d Status: %d\n", pkt->service, pkt->status);
+		debug_printf("Yahoo Service: 0x%02x Status: %d\n", pkt->service, pkt->status);
 		pkt->status = yahoo_get32(yd->rxqueue + pos); pos += 4;
 		pkt->id = yahoo_get32(yd->rxqueue + pos); pos += 4;
 

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.37,1.38

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv24157

Modified Files:
	msn.c 
Log Message:
one more


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- msn.c	2001/11/17 21:58:38	1.37
+++ msn.c	2001/11/17 21:59:59	1.38
@@ -1052,6 +1052,7 @@
 			if (md->fd < 0) {
 				hide_login_progress(gc, "Error transfering");
 				signoff(gc);
+				return 0;
 			}
 		}
 	} else if (isdigit(*buf)) {

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.36,1.37

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv23897

Modified Files:
	msn.c 
Log Message:
found it


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- msn.c	2001/11/17 21:55:49	1.36
+++ msn.c	2001/11/17 21:58:38	1.37
@@ -1255,6 +1255,7 @@
 
 			gaim_input_remove(md->inpa);
 			md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_callback, gc);
+			return 0;
 		} else if (!g_strcasecmp(resp, "MD5")) {
 			char buf2[MSN_BUF_LEN];
 			md5_state_t st;

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.35,1.36

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv23310

Modified Files:
	msn.c 
Log Message:
this is so ugly


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- msn.c	2001/11/07 12:17:31	1.35
+++ msn.c	2001/11/17 21:55:49	1.36
@@ -38,6 +38,13 @@
 	int fd;
 	int trId;
 	int inpa;
+
+	char *rxqueue;
+	int rxlen;
+	gboolean msg;
+	char *msguser;
+	int msglen;
+
 	GSList *switches;
 	GSList *fl;
 	GSList *permit;
@@ -49,6 +56,13 @@
 	struct conversation *chat;
 	int fd;
 	int inpa;
+
+	char *rxqueue;
+	int rxlen;
+	gboolean msg;
+	char *msguser;
+	int msglen;
+
 	char *sessid;
 	char *auth;
 	int trId;
@@ -342,6 +356,9 @@
 	if (ms->inpa)
 		gaim_input_remove(ms->inpa);
 	close(ms->fd);
+	g_free(ms->rxqueue);
+	if (ms->msg)
+		g_free(ms->msguser);
 	if (ms->sessid)
 		g_free(ms->sessid);
 	g_free(ms->auth);
@@ -359,26 +376,12 @@
 	g_free(ms);
 }
 
-static void msn_switchboard_callback(gpointer data, gint source, GaimInputCondition cond)
+static int msn_process_switch(struct msn_switchboard *ms, char *buf)
 {
-	struct msn_switchboard *ms = data;
 	struct gaim_connection *gc = ms->gc;
-	char buf[MSN_BUF_LEN];
+	char sendbuf[MSN_BUF_LEN];
 	static int id = 0;
-	int i = 0;
 
-	bzero(buf, sizeof(buf));
-	while ((read(ms->fd, buf + i, 1) > 0) && (buf[i++] != '\n'))
-		if (i == sizeof(buf))
-			i--; /* yes i know this loses data but we shouldn't get messages this long
-				and it's better than possibly writing past our buffer */
-	if (i == 0 || buf[i - 1] != '\n') {
-		msn_kill_switch(ms);
-		return;
-	}
-	debug_printf("MSN S: %s", buf);
-	g_strchomp(buf);
-
 	if (!g_strncasecmp(buf, "ACK", 3)) {
 	} else if (!g_strncasecmp(buf, "ANS", 3)) {
 		if (ms->chat)
@@ -389,8 +392,10 @@
 			GET_NEXT(tmp);
 			user = tmp;
 			remove_chat_buddy(ms->chat, user);
-		} else
+		} else {
 			msn_kill_switch(ms);
+			return 0;
+		}
 	} else if (!g_strncasecmp(buf, "CAL", 3)) {
 	} else if (!g_strncasecmp(buf, "IRO", 3)) {
 		char *tot, *user, *tmp = buf;
@@ -429,23 +434,21 @@
 			char *send = add_cr(ms->txqueue->data);
 			char *utf8 = str_to_utf8(send);
 			g_free(send);
-			g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
+			g_snprintf(sendbuf, sizeof(sendbuf), "MSG %d N %d\r\n%s%s", ++ms->trId,
 					strlen(MIME_HEADER) + strlen(utf8),
 					MIME_HEADER, utf8);
 			g_free(utf8);
 			g_free(ms->txqueue->data);
 			ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data);
-			if (msn_write(ms->fd, buf, strlen(buf)) < 0) {
+			if (msn_write(ms->fd, sendbuf, strlen(sendbuf)) < 0) {
 				msn_kill_switch(ms);
-				return;
+				return 0;
 			}
 			debug_printf("\n");
 		}
 	} else if (!g_strncasecmp(buf, "MSG", 3)) {
 		char *user, *tmp = buf;
-		int length, len, r;
-		char *msg, *content, *agent, *utf;
-		int flags = 0;
+		int length;
 
 		GET_NEXT(tmp);
 		user = tmp;
@@ -455,47 +458,9 @@
 		GET_NEXT(tmp);
 		length = atoi(tmp);
 
-		msg = g_malloc0(length + 1);
-
-		for (len = 0; len < length; len += r) {
-			if ((r = read(ms->fd, msg+len, length-len)) <= 0) {
-				g_free(msg);
-				hide_login_progress(gc, "Unable to read message");
-				signoff(gc);
-				return;
-			}
-		}
-
-		agent = strstr(msg, "User-Agent: ");
-		if (agent) {
-			if (!g_strncasecmp(agent, "User-Agent: Gaim", strlen("User-Agent: Gaim")))
-				flags |= IM_FLAG_GAIMUSER;
-		}
-		content = strstr(msg, "Content-Type: ");
-		if (!content) {
-			g_free(msg);
-			return;
-		}
-		if (!g_strncasecmp(content, "Content-Type: text/plain",
-				     strlen("Content-Type: text/plain"))) {
-			char *skiphead;
-			skiphead = strstr(msg, "\r\n\r\n");
-			if (!skiphead || !skiphead[4]) {
-				g_free(msg);
-				return;
-			}
-			skiphead += 4;
-			utf = utf8_to_str(skiphead);
-			strip_linefeed(utf);
-
-			if (ms->chat)
-				serv_got_chat_in(gc, ms->chat->id, user, flags, utf, time(NULL));
-			else
-				serv_got_im(gc, user, utf, flags, time(NULL));
-
-			g_free(utf);
-		}
-		g_free(msg);
+		ms->msg = TRUE;
+		ms->msguser = g_strdup(user);
+		ms->msglen = length;
 	} else if (!g_strncasecmp(buf, "NAK", 3)) {
 		do_error_dialog("A message may not have been received.", "MSN Error");
 	} else if (!g_strncasecmp(buf, "NLN", 3)) {
@@ -503,23 +468,137 @@
 		if (ms->chat)
 			serv_got_chat_left(gc, ms->chat->id);
 		msn_kill_switch(ms);
+		return 0;
 	} else if (!g_strncasecmp(buf, "USR", 3)) {
 		/* good, we got USR, now we need to find out who we want to talk to */
 		struct msn_switchboard *ms = msn_find_writable_switch(gc);
 
 		if (!ms)
-			return;
+			return 0;
 
-		g_snprintf(buf, sizeof(buf), "CAL %d %s\r\n", ++ms->trId, ms->user);
-		if (msn_write(ms->fd, buf, strlen(buf)) < 0)
+		g_snprintf(sendbuf, sizeof(sendbuf), "CAL %d %s\r\n", ++ms->trId, ms->user);
+		if (msn_write(ms->fd, sendbuf, strlen(sendbuf)) < 0) {
 			msn_kill_switch(ms);
+			return 0;
+		}
 	} else if (isdigit(*buf)) {
 		handle_errcode(buf, TRUE);
 	} else {
 		debug_printf("Unhandled message!\n");
 	}
+
+	return 1;
+}
+
+static void msn_process_switch_msg(struct msn_switchboard *ms, char *msg)
+{
+	char *content, *agent, *utf;
+	int flags = 0;
+
+	agent = strstr(msg, "User-Agent: ");
+	if (agent) {
+		if (!g_strncasecmp(agent, "User-Agent: Gaim", strlen("User-Agent: Gaim")))
+			flags |= IM_FLAG_GAIMUSER;
+	}
+	content = strstr(msg, "Content-Type: ");
+	if (!content)
+		return;
+	if (!g_strncasecmp(content, "Content-Type: text/plain",
+			     strlen("Content-Type: text/plain"))) {
+		char *skiphead;
+		skiphead = strstr(msg, "\r\n\r\n");
+		if (!skiphead || !skiphead[4]) {
+			return;
+		}
+		skiphead += 4;
+		utf = utf8_to_str(skiphead);
+		strip_linefeed(utf);
+
+		if (ms->chat)
+			serv_got_chat_in(ms->gc, ms->chat->id, ms->msguser, flags, utf, time(NULL));
+		else
+			serv_got_im(ms->gc, ms->msguser, utf, flags, time(NULL));
+
+		g_free(utf);
+	}
 }
 
+static void msn_switchboard_callback(gpointer data, gint source, GaimInputCondition cond)
+{
+	struct msn_switchboard *ms = data;
+	char buf[MSN_BUF_LEN];
+	int cont = 1;
+	int len;
+
+	len = read(ms->fd, buf, sizeof(buf));
+
+	if (len <= 0) {
+		msn_kill_switch(ms);
+		return;
+	}
+
+	ms->rxqueue = g_realloc(ms->rxqueue, len + ms->rxlen);
+	memcpy(ms->rxqueue + ms->rxlen, buf, len);
+	ms->rxlen += len;
+
+	while (cont) {
+		if (!ms->rxlen)
+			return;
+
+		if (ms->msg) {
+			char *msg;
+			if (ms->msglen > ms->rxlen)
+				return;
+			msg = ms->rxqueue;
+			ms->rxlen -= ms->msglen;
+			if (ms->rxlen) {
+				ms->rxqueue = g_memdup(msg + ms->msglen, ms->rxlen);
+			} else {
+				ms->rxqueue = NULL;
+				msg = g_realloc(msg, ms->msglen + 1);
+			}
+			msg[ms->msglen] = 0;
+			ms->msglen = 0;
+			ms->msg = FALSE;
+
+			msn_process_switch_msg(ms, msg);
+
+			g_free(ms->msguser);
+			g_free(msg);
+		} else {
+			char *end = ms->rxqueue;
+			int cmdlen;
+			char *cmd;
+			int i = 0;
+
+			while (i + 1 < ms->rxlen) {
+				if (*end == '\r' && end[1] == '\n')
+					break;
+				end++; i++;
+			}
+			if (i + 1 == ms->rxlen)
+				return;
+
+			cmdlen = end - ms->rxqueue + 2;
+			cmd = ms->rxqueue;
+			ms->rxlen -= cmdlen;
+			if (ms->rxlen) {
+				ms->rxqueue = g_memdup(cmd + cmdlen, ms->rxlen);
+			} else {
+				ms->rxqueue = NULL;
+				cmd = g_realloc(cmd, cmdlen + 1);
+			}
+			cmd[cmdlen] = 0;
+
+			debug_printf("MSN S: %s", cmd);
+			g_strchomp(cmd);
+			cont = msn_process_switch(ms, cmd);
+
+			g_free(cmd);
+		}
+	}
+}
+
 static void msn_rng_connect(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct msn_switchboard *ms = data;
@@ -610,25 +689,10 @@
 	g_free(map);
 }
 
-static void msn_callback(gpointer data, gint source, GaimInputCondition cond)
+static int msn_process_main(struct gaim_connection *gc, char *buf)
 {
-	struct gaim_connection *gc = data;
 	struct msn_data *md = gc->proto_data;
-	char buf[MSN_BUF_LEN];
-	int i = 0;
-
-	bzero(buf, sizeof(buf));
-	while ((read(md->fd, buf + i, 1) > 0) && (buf[i++] != '\n'))
-		if (i == sizeof(buf))
-			i--; /* yes i know this loses data but we shouldn't get messages this long
-				and it's better than possibly writing past our buffer */
-	if (i == 0 || buf[i - 1] != '\n') {
-		hide_login_progress(gc, "Error reading from server");
-		signoff(gc);
-		return;
-	}
-	debug_printf("MSN S: %s", buf);
-	g_strchomp(buf);
+	char sendbuf[MSN_BUF_LEN];
 
 	if (!g_strncasecmp(buf, "ADD", 3)) {
 		char *list, *user, *friend, *tmp = buf;
@@ -648,11 +712,11 @@
 		friend = tmp;
 
 		if (g_strcasecmp(list, "RL"))
-			return;
+			return 1;
 
 		while (perm) {
 			if (!g_strcasecmp(perm->data, user))
-				return;
+				return 1;
 			perm = perm->next;
 		}
 
@@ -704,13 +768,13 @@
 		md5_append(&st, (const md5_byte_t *)"Q1P7W2E4J9R8U3S5", strlen("Q1P7W2E4J9R8U3S5"));
 		md5_finish(&st, di);
 
-		g_snprintf(buf, sizeof(buf), "QRY %d ms...@ms... 32\r\n", ++md->trId);
+		g_snprintf(sendbuf, sizeof(sendbuf), "QRY %d ms...@ms... 32\r\n", ++md->trId);
 		for (i = 0; i < 16; i++) {
 			g_snprintf(buf2, sizeof(buf2), "%02x", di[i]);
-			strcat(buf, buf2);
+			strcat(sendbuf, buf2);
 		}
 
-		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+		if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 			hide_login_progress(gc, "Unable to write to server");
 			signoff(gc);
 		}
@@ -790,13 +854,13 @@
 			gc->deny = g_slist_append(gc->deny, g_strdup(who));
 		} else if (!g_strcasecmp(which, "RL")) {
 			if (pos != tot)
-				return;
+				return 1;
 
-			g_snprintf(buf, sizeof(buf), "CHG %d NLN\r\n", ++md->trId);
-			if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+			g_snprintf(sendbuf, sizeof(sendbuf), "CHG %d NLN\r\n", ++md->trId);
+			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 				hide_login_progress(gc, "Unable to write");
 				signoff(gc);
-				return;
+				return 0;
 			}
 
 			account_online(gc);
@@ -808,11 +872,11 @@
 			if (bud_list_cache_exists(gc))
 				do_import(gc, NULL);
 			else {
-				g_snprintf(buf, sizeof(buf), "BLP %d AL\r\n", ++md->trId);
-				if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+				g_snprintf(sendbuf, sizeof(sendbuf), "BLP %d AL\r\n", ++md->trId);
+				if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 					hide_login_progress(gc, "Unable to write");
 					signoff(gc);
-					return;
+					return 0;
 				}
 			}
 			while (md->fl) {
@@ -833,8 +897,6 @@
 	} else if (!g_strncasecmp(buf, "MSG", 3)) {
 		char *user, *tmp = buf;
 		int length;
-		char *msg, *skiphead, *utf;
-		int len, r;
 
 		GET_NEXT(tmp);
 		user = tmp;
@@ -844,36 +906,9 @@
 		GET_NEXT(tmp);
 		length = atoi(tmp);
 
-		msg = g_new0(char, MAX(length + 1, MSN_BUF_LEN));
-
-		for (len = 0; len < length; len += r) {
-			if ((r = read(md->fd, msg+len, length-len)) <= 0) {
-				g_free(msg);
-				hide_login_progress(gc, "Unable to read message");
-				signoff(gc);
-				return;
-			}
-		}
-
-		if (!g_strcasecmp(user, "hotmail")) {
-			handle_hotmail(gc, msg);
-			g_free(msg);
-			return;
-		}
-
-		skiphead = strstr(msg, "\r\n\r\n");
-		if (!skiphead || !skiphead[4]) {
-			g_free(msg);
-			return;
-		}
-		skiphead += 4;
-		utf = utf8_to_str(skiphead);
-		strip_linefeed(utf);
-
-		serv_got_im(gc, user, utf, 0, time(NULL));
-
-		g_free(utf);
-		g_free(msg);
+		md->msg = TRUE;
+		md->msguser = g_strdup(user);
+		md->msglen = length;
 	} else if (!g_strncasecmp(buf, "NLN", 3)) {
 		char *state, *user, *friend, *tmp = buf;
 		struct buddy *b;
@@ -957,7 +992,7 @@
 		ms->fd = proxy_connect(ssaddr, port, msn_rng_connect, ms);
 		if (ms->fd < 0) {
 			g_free(ms);
-			return;
+			return 1;
 		}
 		ms->user = g_strdup(user);
 		ms->sessid = g_strdup(sessid);
@@ -977,7 +1012,7 @@
 			if (!host) {
 				hide_login_progress(gc, "Got invalid XFR\n");
 				signoff(gc);
-				return;
+				return 0;
 			}
 			switchboard = FALSE;
 		}
@@ -999,14 +1034,14 @@
 		if (switchboard) {
 			struct msn_switchboard *ms = msn_find_writable_switch(gc);
 			if (!ms)
-				return;
+				return 1;
 
 			GET_NEXT(tmp);
 
 			ms->fd = proxy_connect(host, port, msn_ss_xfr_connect, ms);
 			if (ms->fd < 0) {
 				msn_kill_switch(ms);
-				return;
+				return 1;
 			}
 			ms->auth = g_strdup(tmp);
 		} else {
@@ -1024,6 +1059,108 @@
 	} else {
 		debug_printf("Unhandled message!\n");
 	}
+
+	return 1;
+}
+
+static void msn_process_main_msg(struct gaim_connection *gc, char *msg)
+{
+	struct msn_data *md = gc->proto_data;
+	char *skiphead, *utf;
+
+	if (!g_strcasecmp(md->msguser, "hotmail")) {
+		handle_hotmail(gc, msg);
+		return;
+	}
+
+	skiphead = strstr(msg, "\r\n\r\n");
+	if (!skiphead || !skiphead[4])
+		return;
+	skiphead += 4;
+	utf = utf8_to_str(skiphead);
+	strip_linefeed(utf);
+
+	serv_got_im(gc, md->msguser, utf, 0, time(NULL));
+
+	g_free(utf);
+}
+
+static void msn_callback(gpointer data, gint source, GaimInputCondition cond)
+{
+	struct gaim_connection *gc = data;
+	struct msn_data *md = gc->proto_data;
+	char buf[MSN_BUF_LEN];
+	int cont = 1;
+	int len;
+
+	len = read(md->fd, buf, sizeof(buf));
+
+	if (len <= 0) {
+		hide_login_progress(gc, "Error reading from server");
+		signoff(gc);
+		return;
+	}
+
+	md->rxqueue = g_realloc(md->rxqueue, len + md->rxlen);
+	memcpy(md->rxqueue + md->rxlen, buf, len);
+	md->rxlen += len;
+
+	while (cont) {
+		if (!md->rxlen)
+			return;
+
+		if (md->msg) {
+			char *msg;
+			if (md->msglen > md->rxlen)
+				return;
+			msg = md->rxqueue;
+			md->rxlen -= md->msglen;
+			if (md->rxlen) {
+				md->rxqueue = g_memdup(msg + md->msglen, md->rxlen);
+			} else {
+				md->rxqueue = NULL;
+				msg = g_realloc(msg, md->msglen + 1);
+			}
+			msg[md->msglen] = 0;
+			md->msglen = 0;
+			md->msg = FALSE;
+
+			msn_process_main_msg(gc, msg);
+
+			g_free(md->msguser);
+			g_free(msg);
+		} else {
+			char *end = md->rxqueue;
+			int cmdlen;
+			char *cmd;
+			int i = 0;
+
+			while (i + 1 < md->rxlen) {
+				if (*end == '\r' && end[1] == '\n')
+					break;
+				end++; i++;
+			}
+			if (i + 1 == md->rxlen)
+				return;
+
+			cmdlen = end - md->rxqueue + 2;
+			cmd = md->rxqueue;
+			md->rxlen -= cmdlen;
+			if (md->rxlen) {
+				md->rxqueue = g_memdup(cmd + cmdlen, md->rxlen);
+			} else {
+				md->rxqueue = NULL;
+				cmd = g_realloc(cmd, cmdlen + 1);
+			}
+			cmd[cmdlen] = 0;
+
+			debug_printf("MSN S: %s", cmd);
+			g_strchomp(cmd);
+			cont = msn_process_main(gc, cmd);
+
+			g_free(cmd);
+		}
+	}
 }
 
 static void msn_login_xfr_connect(gpointer data, gint source, GaimInputCondition cond)
@@ -1058,53 +1195,38 @@
 	md->inpa = gaim_input_add(md->fd, GAIM_INPUT_READ, msn_login_callback, gc);
 }
 
-static void msn_login_callback(gpointer data, gint source, GaimInputCondition cond)
+static int msn_process_login(struct gaim_connection *gc, char *buf)
 {
-	struct gaim_connection *gc = data;
 	struct msn_data *md = gc->proto_data;
-	char buf[MSN_BUF_LEN];
-	int i = 0;
-
-	bzero(buf, sizeof(buf));
-	while ((read(md->fd, buf + i, 1) > 0) && (buf[i++] != '\n'))
-		if (i == sizeof(buf))
-			i--; /* yes i know this loses data but we shouldn't get messages this long
-				and it's better than possibly writing past our buffer */
-	if (i == 0 || buf[i - 1] != '\n') {
-		hide_login_progress(gc, "Error reading from server");
-		signoff(gc);
-		return;
-	}
-	debug_printf("MSN S: %s", buf);
-	g_strchomp(buf);
+	char sendbuf[MSN_BUF_LEN];
 
 	if (!g_strncasecmp(buf, "VER", 3)) {
 		/* we got VER, check to see that MSNP5 is in the list, then send INF */
 		if (!strstr(buf, "MSNP5")) {
 			hide_login_progress(gc, "Protocol not supported");
 			signoff(gc);
-			return;
+			return 0;
 		}
 
-		g_snprintf(buf, sizeof(buf), "INF %d\r\n", ++md->trId);
-		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+		g_snprintf(sendbuf, sizeof(sendbuf), "INF %d\r\n", ++md->trId);
+		if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 			hide_login_progress(gc, "Unable to request INF\n");
 			signoff(gc);
-			return;
+			return 0;
 		}
 	} else if (!g_strncasecmp(buf, "INF", 3)) {
 		/* check to make sure we can use md5 */
 		if (!strstr(buf, "MD5")) {
 			hide_login_progress(gc, "Unable to login using MD5");
 			signoff(gc);
-			return;
+			return 0;
 		}
 
-		g_snprintf(buf, sizeof(buf), "USR %d MD5 I %s\r\n", ++md->trId, gc->username);
-		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+		g_snprintf(sendbuf, sizeof(sendbuf), "USR %d MD5 I %s\r\n", ++md->trId, gc->username);
+		if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 			hide_login_progress(gc, "Unable to send USR\n");
 			signoff(gc);
-			return;
+			return 0;
 		}
 
 		set_login_progress(gc, 3, "Requesting to send password");
@@ -1124,11 +1246,11 @@
 		if (!g_strcasecmp(resp, "OK")) {
 			g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend);
 
-			g_snprintf(buf, sizeof(buf), "SYN %d 0\r\n", ++md->trId);
-			if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+			g_snprintf(sendbuf, sizeof(sendbuf), "SYN %d 0\r\n", ++md->trId);
+			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 				hide_login_progress(gc, "Unable to write");
 				signoff(gc);
-				return;
+				return 0;
 			}
 
 			gaim_input_remove(md->inpa);
@@ -1145,17 +1267,17 @@
 			md5_append(&st, (const md5_byte_t *)buf2, strlen(buf2));
 			md5_finish(&st, di);
 
-			g_snprintf(buf, sizeof(buf), "USR %d MD5 S ", ++md->trId);
+			g_snprintf(sendbuf, sizeof(sendbuf), "USR %d MD5 S ", ++md->trId);
 			for (i = 0; i < 16; i++) {
 				g_snprintf(buf2, sizeof(buf2), "%02x", di[i]);
-				strcat(buf, buf2);
+				strcat(sendbuf, buf2);
 			}
-			strcat(buf, "\n");
+			strcat(sendbuf, "\n");
 
-			if (msn_write(md->fd, buf, strlen(buf)) < 0) {
+			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 				hide_login_progress(gc, "Unable to send password");
 				signoff(gc);
-				return;
+				return 0;
 			}
 
 			set_login_progress(gc, 4, "Password sent");
@@ -1168,7 +1290,7 @@
 		if (!host) {
 			hide_login_progress(gc, "Got invalid XFR\n");
 			signoff(gc);
-			return;
+			return 0;
 		}
 
 		GET_NEXT(host);
@@ -1189,14 +1311,73 @@
 			hide_login_progress(gc, "Unable to transfer");
 			signoff(gc);
 		}
+		return 0;
 	} else {
 		if (isdigit(*buf))
 			hide_login_progress(gc, handle_errcode(buf, FALSE));
 		else
 			hide_login_progress(gc, "Unable to parse message");
 		signoff(gc);
+		return 0;
+	}
+
+	return 1;
+}
+
+static void msn_login_callback(gpointer data, gint source, GaimInputCondition cond)
+{
+	struct gaim_connection *gc = data;
+	struct msn_data *md = gc->proto_data;
+	char buf[MSN_BUF_LEN];
+	int cont = 1;
+	int len;
+
+	len = read(md->fd, buf, sizeof(buf));
+
+	if (len <= 0) {
+		hide_login_progress(gc, "Error reading from server");
+		signoff(gc);
 		return;
 	}
+
+	md->rxqueue = g_realloc(md->rxqueue, len + md->rxlen);
+	memcpy(md->rxqueue + md->rxlen, buf, len);
+	md->rxlen += len;
+
+	while (cont) {
+		char *end = md->rxqueue;
+		int cmdlen;
+		char *cmd;
+		int i = 0;
+
+		if (!md->rxlen)
+			return;
+
+		while (i + 1 < md->rxlen) {
+			if (*end == '\r' && end[1] == '\n')
+				break;
+			end++; i++;
+		}
+		if (i + 1 == md->rxlen)
+			return;
+
+		cmdlen = end - md->rxqueue + 2;
+		cmd = md->rxqueue;
+		md->rxlen -= cmdlen;
+		if (md->rxlen) {
+			md->rxqueue = g_memdup(cmd + cmdlen, md->rxlen);
+		} else {
+			md->rxqueue = NULL;
+			cmd = g_realloc(cmd, cmdlen + 1);
+		}
+		cmd[cmdlen] = 0;
+
+		debug_printf("MSN S: %s", cmd);
+		g_strchomp(cmd);
+		cont = msn_process_login(gc, cmd);
+
+		g_free(cmd);
+	}
 }
 
 static void msn_login_connect(gpointer data, gint source, GaimInputCondition cond)
@@ -1254,6 +1435,9 @@
 	close(md->fd);
 	if (md->inpa)
 		gaim_input_remove(md->inpa);
+	g_free(md->rxqueue);
+	if (md->msg)
+		g_free(md->msguser);
 	while (md->switches)
 		msn_kill_switch(md->switches->data);
 	while (md->fl) {

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.12,1.13

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv28218/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
hm


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- yahoo.c	2001/11/15 22:34:47	1.12
+++ yahoo.c	2001/11/17 19:27:39	1.13
@@ -642,6 +642,7 @@
 		yahoo_process_logon(gc, pkt);
 		break;
 	case YAHOO_SERVICE_ISAWAY:
+	case YAHOO_SERVICE_ISBACK:
 		yahoo_process_status(gc, pkt);
 		break;
 	case YAHOO_SERVICE_MESSAGE:

[Gaim-commits] CVS: gaim/src buddy.c,1.274,1.275

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv5299

Modified Files:
	buddy.c 
Log Message:
hehehe


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- buddy.c	2001/11/17 13:57:30	1.274
+++ buddy.c	2001/11/17 14:26:17	1.275
@@ -1982,7 +1982,7 @@
 	gdk_font_unref(gtk_style_get_font(style));
 	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style)));
 	for (i = 0; i < 5; i++)
-		style->fg[i] = bs->label->style->fg[i];
+		style->fg[i] = bs->idle->style->fg[i];
 	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) {
 		style->fg[GTK_STATE_NORMAL].red =
 		  (style->fg[GTK_STATE_NORMAL].red / 2) + (style->base[GTK_STATE_NORMAL].red / 2);

[Gaim-commits] CVS: gaim/src conversation.c,1.294,1.295

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3143

Modified Files:
	conversation.c 
Log Message:
gtk2


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- conversation.c	2001/11/15 22:47:03	1.294
+++ conversation.c	2001/11/17 14:14:51	1.295
@@ -774,6 +774,7 @@
 					}
 				}
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+				return TRUE;
 			}
 		}
 	} else if ((event->keyval == GDK_Tab) && c->is_chat && (chat_options & OPT_CHAT_TAB_COMPLETE)) {

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.19,1.20 aim_internal.h,1.9,1.10 conn.c,1.7,1.8 info.c,1.7,1.8 oscar.c,1.65,1.66 service.c,1.1,1.2

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv32519/protocols/oscar

Modified Files:
	aim.h aim_internal.h conn.c info.c oscar.c service.c 
Log Message:
it's 6am


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- aim.h	2001/11/14 19:21:20	1.19
+++ aim.h	2001/11/17 13:57:30	1.20
@@ -416,12 +416,13 @@
 #define AIM_FLAG_OSCAR_PAY	0x0008
 #define AIM_FLAG_FREE 		0x0010
 #define AIM_FLAG_AWAY		0x0020
-#define AIM_FLAG_UNKNOWN40	0x0040
+#define AIM_FLAG_ICQ		0x0040
 #define AIM_FLAG_UNKNOWN80	0x0080
 #define AIM_FLAG_UNKNOWN100	0x0100
 #define AIM_FLAG_UNKNOWN200	0x0200
 #define AIM_FLAG_ACTIVEBUDDY    0x0400
 #define AIM_FLAG_UNKNOWN800	0x0800
+#define AIM_FLAG_ABINTERNAL     0x1000
 
 #define AIM_FLAG_ALLUSERS	0x001f
 
@@ -822,7 +823,8 @@
 #define AIM_CAPS_SAVESTOCKS     0x0080
 #define AIM_CAPS_SENDBUDDYLIST  0x0100
 #define AIM_CAPS_GAMES2         0x0200
-#define AIM_CAPS_EVERYBUDDY     0x0400
+#define AIM_CAPS_ICQ            0x0400
+#define AIM_CAPS_ABINTERNAL     0x0800
 #define AIM_CAPS_LAST           0x8000
 
 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
@@ -880,7 +882,7 @@
 	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
 	512, /* !! Note how small this is. */ \
 	(99.9)*10, (99.9)*10, \
-	1000 \
+	1000 /* !! And how large this is. */ \
 }
 
 /* This is what most AIM versions use. */

Index: aim_internal.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim_internal.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- aim_internal.h	2001/11/14 19:21:20	1.9
+++ aim_internal.h	2001/11/17 13:57:30	1.10
@@ -151,6 +151,7 @@
 	struct snacgroup *next;
 };
 
+#ifdef FAIM_NEED_CONN_INTERNAL
 struct snacpair {
 	fu16_t group;
 	fu16_t subtype;
@@ -170,6 +171,7 @@
 	struct snacpair *members;
 	struct rateclass *next;
 };
+#endif /* FAIM_NEED_CONN_INTERNAL */
 
 /*
  * This is inside every connection.  But it is a void * to anything

Index: conn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/conn.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- conn.c	2001/11/10 01:48:17	1.7
+++ conn.c	2001/11/17 13:57:30	1.8
@@ -7,6 +7,7 @@
  */
 
 #define FAIM_INTERNAL
+#define FAIM_NEED_CONN_INTERNAL
 #include <aim.h> 
 
 #ifndef _WIN32
@@ -127,9 +128,19 @@
 
 	for (rc = *head; rc; ) {
 		struct rateclass *tmp;
+		struct snacpair *sp;
 
 		tmp = rc->next;
+
+		for (sp = rc->members; sp; ) {
+			struct snacpair *tmpsp;
+
+			tmpsp = sp->next;
+			free(sp);
+			sp = tmpsp;
+		}
 		free(rc);
+
 		rc = tmp;
 	}
 

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- info.c	2001/11/05 02:05:06	1.7
+++ info.c	2001/11/17 13:57:30	1.8
@@ -145,7 +145,7 @@
 	/*
 	 * Advertised by the EveryBuddy client.
 	 */
-	{AIM_CAPS_EVERYBUDDY,
+	{AIM_CAPS_ICQ,
 	 {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
@@ -180,6 +180,10 @@
 
 	{AIM_CAPS_SENDBUDDYLIST,
 	 {0x09, 0x46, 0x13, 0x4b, 0x4c, 0x7f, 0x11, 0xd1,
+	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
+
+	{AIM_CAPS_ABINTERNAL,
+	 {0x09, 0x46, 0x13, 0x4f, 0x4c, 0x7f, 0x11, 0xd1,
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
 	{AIM_CAPS_LAST}

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- oscar.c	2001/11/14 19:21:20	1.65
+++ oscar.c	2001/11/17 13:57:30	1.66
@@ -1115,8 +1115,8 @@
 			if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT))
 				type |= UC_UNAVAILABLE;
 		}
-		if (caps & AIM_CAPS_EVERYBUDDY)
-			caps ^= AIM_CAPS_EVERYBUDDY;
+		if (caps & AIM_CAPS_ICQ)
+			caps ^= AIM_CAPS_ICQ;
 		debug_printf("icq status: %d\n", info->icqinfo.status);
 	}
 

Index: service.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- service.c	2001/11/10 01:48:17	1.1
+++ service.c	2001/11/17 13:57:30	1.2
@@ -4,6 +4,7 @@
  */
 
 #define FAIM_INTERNAL
+#define FAIM_NEED_CONN_INTERNAL
 #include <aim.h>
 
 #include "md5.h"
@@ -288,6 +289,8 @@
 		 */
 		if (mod->version >= 3)
 			aimbs_getrawbuf(bs, rc.unknown, sizeof(rc.unknown));
+
+		faimdprintf(sess, 1, "--- Adding rate class %d to connection type %d: window size = %ld, clear = %ld, alert = %ld, limit = %ld, disconnect = %ld, current = %ld, max = %ld\n", rx->conn->type, rc.classid, rc.windowsize, rc.clear, rc.alert, rc.limit, rc.disconnect, rc.current, rc.max);
 
 		rc_addclass(&ins->rates, &rc);
 	}

[Gaim-commits] CVS: gaim/src buddy.c,1.273,1.274 gtkimhtml.c,1.74,1.75

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv32519

Modified Files:
	buddy.c gtkimhtml.c 
Log Message:
it's 6am


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- buddy.c	2001/11/17 02:50:06	1.273
+++ buddy.c	2001/11/17 13:57:30	1.274
@@ -1890,7 +1890,7 @@
 	static char buf[256], *tmp;
 	int count = 0, i = 0;
 	gushort bit = 1;
-	while (bit <= 0x400) {
+	while (bit <= 0x800) {
 		if (bit & caps) {
 			switch (bit) {
 			case 0x1:
@@ -1920,6 +1920,9 @@
 				break;
 			case 0x400:
 				tmp = _("EveryBuddy Bug");
+				break;
+			case 0x800:
+				tmp = _("AP User");
 				break;
 			default:
 				tmp = NULL;

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- gtkimhtml.c	2001/11/15 23:43:44	1.74
+++ gtkimhtml.c	2001/11/17 13:57:30	1.75
@@ -1902,75 +1902,80 @@
 
 		xflds = g_strsplit (xname, "-", -1);
 
-#define NAME 2
-#define BOLD 3
-#define ITALICS 4
-#define SIZE 6
-#define PTSZ 7
+#define FNDRY 1
+#define FMLY 2
+#define WGHT 3
+#define SLANT 4
+#define SWDTH 5
+#define ADSTYL 6
+#define PXLSZ 7
+#define PTSZ 8
+#define RESX 9
+#define RESY 10
+#define SPC 11
+#define AVGWDTH 12
+#define RGSTRY 13
+#define ENCDNG 14
 
 		for (i = 0; xflds [i]; i++);
 		newvals = g_memdup (xflds, (i + 1) * sizeof (xflds));
+		if (!xflds [ADSTYL][0])
+			newvals [ADSTYL] = "*";
 
 		if (bold)
-			newvals [BOLD] = "bold";
+			newvals [WGHT] = "bold";
 		if (italics)
-			newvals [ITALICS] = "i";
+			newvals [SLANT] = "i";
 		if (fontsize) {
 			g_snprintf (fs, sizeof (fs), "%d", font_sizes [MIN (fontsize, MAX_SIZE) - 1]);
-			newvals [SIZE] = fs;
-			newvals [PTSZ] = "";
+			newvals [PXLSZ] = "*";
+			newvals [PTSZ] = fs;
 		}
 
 		if (name)
 			names = g_strsplit (name, ",", -1);
 		else {
 			names = g_new0 (gchar *, 2);
-			names [0] = g_strdup (xflds [NAME]);
+			names [0] = g_strdup (xflds [FMLY]);
 		}
 
 		for (i = 0; names [i]; i++) {
-			newvals [NAME] = names [i];
+			newvals [FMLY] = names [i];
 			TRY_FONT;
 		}
 
 		for (i = 0; italics && names [i]; i++) {
-			newvals [NAME] = names [i];
+			newvals [FMLY] = names [i];
 
-			newvals [ITALICS] = "o";
+			newvals [SLANT] = "o";
 			TRY_FONT;
 
-			newvals [ITALICS] = xflds [ITALICS];
+			newvals [SLANT] = xflds [SLANT];
 			TRY_FONT;
 		}
 
 		for (i = 0; fontsize && names [i]; i++) {
-			newvals [NAME] = names [i];
+			newvals [FMLY] = names [i];
 
-			if (xflds [PTSZ][0]) {
-				g_snprintf (fs, sizeof (fs), "%d",
-					    font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10);
-				newvals [PTSZ] = fs;
-				newvals [SIZE] = "";
-				TRY_FONT;
+			g_snprintf (fs, sizeof (fs), "%d",
+				    font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10);
+			newvals [PXLSZ] = fs;
+			newvals [PTSZ] = "*";
 
-				newvals [PTSZ] = xflds [PTSZ];
-			} else
-				newvals [SIZE] = xflds [SIZE];
 			TRY_FONT;
+
+			newvals [PXLSZ] = xflds [PXLSZ];
+			newvals [PTSZ] = xflds [PTSZ];
+
+			TRY_FONT;
 		}
 
 		for (i = 0; bold && names [i]; i++) {
-			newvals [NAME] = names [i];
+			newvals [FMLY] = names [i];
 
-			newvals [BOLD] = xflds [BOLD];
+			newvals [WGHT] = xflds [WGHT];
 			TRY_FONT;
 		}
-
-#undef NAME
-#undef BOLD
-#undef ITALICS
-#undef SIZE
-#undef PTSZ
 
 		g_free (newvals);
 		g_strfreev (xflds);

[Gaim-commits] CVS: gaim/src/protocols/oscar icq.c,1.4,1.5

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv21515/protocols/oscar

Modified Files:
	icq.c 
Log Message:
hi


Index: icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/icq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- icq.c	2001/11/17 02:53:55	1.4
+++ icq.c	2001/11/17 03:18:40	1.5
@@ -121,8 +121,7 @@
 	fu16_t cmdlen, cmd, reqid;
 
 	if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
-		if (tl)
-			aim_freetlvchain(&tl);
+		aim_freetlvchain(&tl);
 		faimdprintf(sess, 0, "corrupt ICQ response\n");
 		return 0;
 	}

[Gaim-commits] CVS: gaim/src/protocols/oscar icq.c,1.3,1.4

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv15710

Modified Files:
	icq.c 
Log Message:
fine


Index: icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/icq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- icq.c	2001/11/17 02:50:06	1.3
+++ icq.c	2001/11/17 02:53:55	1.4
@@ -122,7 +122,7 @@
 
 	if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
 		if (tl)
-			aim_freetlvchain(tl);
+			aim_freetlvchain(&tl);
 		faimdprintf(sess, 0, "corrupt ICQ response\n");
 		return 0;
 	}
@@ -165,7 +165,7 @@
 			ret = userfunc(sess, rx);
 	}
 
-	aim_freetlvchain(tl);
+	aim_freetlvchain(&tl);
 
 	return ret;
 }

[Gaim-commits] CVS: gaim/src/protocols/oscar icq.c,1.2,1.3

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv14731/src/protocols/oscar

Modified Files:
	icq.c 
Log Message:
eh


Index: icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/icq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- icq.c	2001/11/10 08:02:39	1.2
+++ icq.c	2001/11/17 02:50:06	1.3
@@ -121,6 +121,8 @@
 	fu16_t cmdlen, cmd, reqid;
 
 	if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
+		if (tl)
+			aim_freetlvchain(tl);
 		faimdprintf(sess, 0, "corrupt ICQ response\n");
 		return 0;
 	}
@@ -162,6 +164,8 @@
 		if ((userfunc = aim_callhandler(sess, rx->conn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSGCOMPLETE)))
 			ret = userfunc(sess, rx);
 	}
+
+	aim_freetlvchain(tl);
 
 	return ret;
 }

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.25,1.26

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv14731/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
eh


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- jabber.c	2001/11/06 23:58:23	1.25
+++ jabber.c	2001/11/17 02:50:06	1.26
@@ -773,10 +773,14 @@
 		} else {
 			/* keep track of away msg same as yahoo plugin */
 			struct jabber_data *jd = GJ_GC(j)->proto_data;
-			gpointer val = g_hash_table_lookup(jd->hash, b->name);
-			if (val)
+			gpointer val = g_hash_table_lookup(jd->hash, normalize(b->name));
+			if (val) {
 			   	g_free(val);
-			g_hash_table_insert(jd->hash, g_strdup(b->name), g_strdup(xmlnode_get_tag_data(p->x, "status")));
+				g_hash_table_insert(jd->hash, normalize(b->name),
+						g_strdup(xmlnode_get_tag_data(p->x, "status")));
+			} else
+				g_hash_table_insert(jd->hash, g_strdup(normalize(b->name)),
+						g_strdup(xmlnode_get_tag_data(p->x, "status")));
 
 
 			if (!resources) {

[Gaim-commits] CVS: gaim/src applet.c,1.25,1.26 buddy.c,1.272,1.273

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14731/src

Modified Files:
	applet.c buddy.c 
Log Message:
eh


Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- applet.c	2001/11/16 23:56:55	1.25
+++ applet.c	2001/11/17 02:50:05	1.26
@@ -306,7 +306,7 @@
 						awayname,
 						a->name, (AppletCallbackFunc)do_away_message, a);
 
-		awy = g_slist_next(awy);
+		awy = awy->next;
 		g_free(awayname);
 	}
 }

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- buddy.c	2001/11/17 00:37:07	1.272
+++ buddy.c	2001/11/17 02:50:06	1.273
@@ -1951,6 +1951,8 @@
 	char caps[256];
 	char *sotime = NULL, *itime;
 
+	int i;
+
 	time(&t);
 	if (!bs->connlist)
 		return;
@@ -1976,6 +1978,8 @@
 	style = gtk_style_new();
 	gdk_font_unref(gtk_style_get_font(style));
 	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style)));
+	for (i = 0; i < 5; i++)
+		style->fg[i] = bs->label->style->fg[i];
 	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) {
 		style->fg[GTK_STATE_NORMAL].red =
 		  (style->fg[GTK_STATE_NORMAL].red / 2) + (style->base[GTK_STATE_NORMAL].red / 2);

[Gaim-commits] CVS: gaim/src buddy.c,1.271,1.272

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22708/src

Modified Files:
	buddy.c 
Log Message:
i don't know.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- buddy.c	2001/11/15 22:47:03	1.271
+++ buddy.c	2001/11/17 00:37:07	1.272
@@ -1973,7 +1973,9 @@
 	if (blist_options & OPT_BLIST_SHOW_IDLETIME)
 		gtk_widget_show(bs->idle);
 
-	style = gtk_style_copy(bs->idle->style);
+	style = gtk_style_new();
+	gdk_font_unref(gtk_style_get_font(style));
+	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style)));
 	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) {
 		style->fg[GTK_STATE_NORMAL].red =
 		  (style->fg[GTK_STATE_NORMAL].red / 2) + (style->base[GTK_STATE_NORMAL].red / 2);

[Gaim-commits] CVS: gaim configure.ac,1.32,1.33

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv22708

Modified Files:
	configure.ac 
Log Message:
i don't know.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure.ac	2001/11/15 23:21:04	1.32
+++ configure.ac	2001/11/17 00:37:07	1.33
@@ -174,7 +174,7 @@
 	AM_PATH_GTK(1.2.3,,AC_MSG_ERROR([
 *** GTK+ is required to build Gaim; please make sure you have the GTK+
 *** development headers installed. The latest version of GTK+ is
-*** always available at http://www.gtk.org/.]),gthread)
+*** always available at http://www.gtk.org/.]))
 	UI_LIBS="$UI_LIBS $GTK_LIBS"
 	AC_PATH_PROG(gaimpath, gaim)
 fi

[Gaim-commits] CVS: gaim/src applet.c,1.24,1.25

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv14121

Modified Files:
	applet.c 
Log Message:
oo


Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- applet.c	2001/11/14 10:48:08	1.24
+++ applet.c	2001/11/16 23:56:55	1.25
@@ -161,6 +161,7 @@
 	if (!scale)
 		return NULL;
 	pb = gdk_pixbuf_scale_simple(scale, sizehint, sizehint, GDK_INTERP_HYPER);
+	gdk_pixbuf_unref(scale);
 
 	dst = g_new0(guchar, sizehint*sizehint*3);
 	make_background(dst);

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.73,1.74 gtkimhtml.h,1.8,1.9

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12155

Modified Files:
	gtkimhtml.c gtkimhtml.h 
Log Message:
eh.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- gtkimhtml.c	2001/11/14 00:28:07	1.73
+++ gtkimhtml.c	2001/11/15 23:43:44	1.74
@@ -143,11 +143,6 @@
 	while (*x) {
 		gchar *pos;
 
-		if (t->image) {
-			t->image = NULL;
-			return;
-		}
-
 		if (!t->values)
 			return;
 
@@ -238,6 +233,16 @@
 		}
 		g_free (t);
 	}
+}
+
+void
+gtk_imhtml_remove_smileys (GtkIMHtml *imhtml)
+{
+	g_return_if_fail (imhtml != NULL);
+	g_return_if_fail (GTK_IS_IMHTML (imhtml));
+
+	gtk_smiley_tree_destroy (imhtml->smiley_data);
+	imhtml->smiley_data = gtk_smiley_tree_new ();
 }
 
 struct _GtkIMHtmlBit {

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtkimhtml.h	2001/09/26 19:48:50	1.8
+++ gtkimhtml.h	2001/11/15 23:43:44	1.9
@@ -117,6 +117,8 @@
 					gchar            *text,
 					gchar           **xpm);
 
+void       gtk_imhtml_remove_smileys   (GtkIMHtml        *imhtml);
+
 void       gtk_imhtml_show_smileys     (GtkIMHtml        *imhtml,
 					gboolean          show);
 

[Gaim-commits] CVS: gaim/src gtkspell.c,1.14,1.15

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv9905

Modified Files:
	gtkspell.c 
Log Message:
ok


Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gtkspell.c	2001/11/15 22:47:03	1.14
+++ gtkspell.c	2001/11/15 23:32:54	1.15
@@ -85,7 +85,7 @@
 	while (!buf || (end = strchr(buf, '\n')) == NULL) {
 		char space[1024];
 		int ret = read(fd_read[0], space, 1023);
-		if (ret < 0) {
+		if (ret <= 0) {
 			error_print("read: %s\n", strerror(errno));
 			return NULL;
 		}

[Gaim-commits] CVS: gaim NEWS,1.99,1.100 configure.ac,1.31,1.32

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv7016

Modified Files:
	NEWS configure.ac 
Log Message:
(15:18:05) click81: the version in the about dialog is still 0.48
(15:18:40) SeanEgan: CHANGELOG
(15:18:51) SeanEgan: * Version now reads 0.49 (Thanks click81)


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- NEWS	2001/11/15 10:19:01	1.99
+++ NEWS	2001/11/15 23:21:03	1.100
@@ -1,5 +1,7 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
+0.49:
+
 0.48 (11/18/2001):
 	Rob: Hi! It's 4:12am! I'm watching The Simpsons. :). 
 	Oh boy, sleep! That's where I'm a viking! :) There's not

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.ac	2001/11/15 22:47:02	1.31
+++ configure.ac	2001/11/15 23:21:04	1.32
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.48])
+AM_INIT_AUTOMAKE([gaim], [0.49])
 
 AC_PATH_PROG(sedpath, sed)
 

[Gaim-commits] CVS: gaim/doc gaim.1,1.39,1.40

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/doc
In directory usw-pr-cvs1:/tmp/cvs-serv7016/doc

Modified Files:
	gaim.1 
Log Message:
(15:18:05) click81: the version in the about dialog is still 0.48
(15:18:40) SeanEgan: CHANGELOG
(15:18:51) SeanEgan: * Version now reads 0.49 (Thanks click81)


Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gaim.1	2001/11/01 18:50:39	1.39
+++ gaim.1	2001/11/15 23:21:04	1.40
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.48 \- Instant Messaging client
+Gaim v0.49 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim/src about.c,1.55,1.56 away.c,1.66,1.67 buddy.c,1.270,1.271 buddy_chat.c,1.131,1.132 conversation.c,1.293,1.294 dialogs.c,1.282,1.283 gaim.h,1.291,1.292 gtkspell.c,1.13,1.14 gtkticker.c,1.2,1.3 multi.c,1.105,1.106 plugins.c,1.85,1.86 prefs.c,1.196,1.197 prpl.c,1.47,1.48 ui.h,1.17,1.18

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28517/src

Modified Files:
	about.c away.c buddy.c buddy_chat.c conversation.c dialogs.c 
	gaim.h gtkspell.c gtkticker.c multi.c plugins.c prefs.c prpl.c 
	ui.h 
Log Message:
this actually doesn't change anything, unless you want to use gtk2.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- about.c	2001/10/20 18:41:47	1.55
+++ about.c	2001/11/15 22:47:03	1.56
@@ -89,7 +89,7 @@
 
 	if (!about) {
 
-		about = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(about);
 		gtk_widget_set_usize(GTK_WIDGET(about), 450, -1);
 		g_snprintf(abouttitle, sizeof(abouttitle), _("About Gaim v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);

Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- away.c	2001/11/02 01:41:36	1.66
+++ away.c	2001/11/15 22:47:03	1.67
@@ -195,7 +195,7 @@
 		return;
 
 	if (!imaway) {
-		imaway = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(imaway);
 		gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");
 		if (strlen(a->name))
 			 gtk_window_set_title(GTK_WINDOW(imaway), a->name);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- buddy.c	2001/11/06 23:58:21	1.270
+++ buddy.c	2001/11/15 22:47:03	1.271
@@ -500,15 +500,17 @@
 
 #endif
 
-void handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
+static int handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
 {
 	if (event->type == GDK_2BUTTON_PRESS) {
 		if (GTK_TREE_ITEM(widget)->expanded)
 			gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
 		else
 			gtk_tree_item_expand(GTK_TREE_ITEM(widget));
-	} else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3)) {
+		return TRUE;
 	}
+
+	return FALSE;
 }
 
 void pressed_im_bud(GtkWidget *widget, struct buddy *b)
@@ -585,10 +587,10 @@
 	g_list_free(first);
 }
 
-void handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b)
+static int handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b)
 {
 	if (!b->connlist)
-		return;
+		return FALSE;
 	if (event->type == GDK_2BUTTON_PRESS && event->button == 1) {
 		struct conversation *c;
 
@@ -708,6 +710,8 @@
 
 		/* Anything for other buttons? :) */
 	}
+
+	return FALSE;
 }
 
 static void un_alias(GtkWidget *a, struct buddy *b)
@@ -734,10 +738,10 @@
 	GtkWidget *button;
 
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return TRUE;
+		return FALSE;
 
 	if (!gtk_clist_get_selection_info(GTK_CLIST(edittree), event->x, event->y, &row, &column))
-		return TRUE;
+		return FALSE;
 
 	node = gtk_ctree_node_nth(GTK_CTREE(edittree), row);
 	type = gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
@@ -752,6 +756,8 @@
 		gtk_widget_show(button);
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
+
+		return TRUE;
 	} else if (*type == EDIT_BUDDY) {
 		struct buddy *b = (struct buddy *)type;
 		menu = gtk_menu_new();
@@ -793,9 +799,11 @@
 		gtk_widget_show(button);
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
+
+		return TRUE;
 	}
 
-	return TRUE;
+	return FALSE;
 }
 
 
@@ -2357,7 +2365,7 @@
 	}
 
 #ifdef USE_APPLET
-	blist = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(blist);
 #else
 	blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 #endif

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- buddy_chat.c	2001/11/09 03:11:56	1.131
+++ buddy_chat.c	2001/11/15 22:47:03	1.132
@@ -256,7 +256,7 @@
 	}
 
 	if (!joinchat) {
-		joinchat = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(joinchat);
 		gtk_window_set_wmclass(GTK_WINDOW(joinchat), "joinchat", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
 		gtk_widget_realize(joinchat);
@@ -386,7 +386,7 @@
 	GtkWidget *frame;
 
 	if (!invite) {
-		invite = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(invite);
 		gtk_widget_realize(invite);
 
 		cancel = picture_button(invite, _("Cancel"), cancel_xpm);
@@ -463,7 +463,7 @@
 
 void tab_complete(struct conversation *c)
 {
-	int pos = GTK_EDITABLE(c->entry)->current_pos;
+	int pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 	int start = pos;
 	int most_matched = -1;
 	char *entered, *partial = NULL;
@@ -1093,8 +1093,8 @@
 	if (!GTK_WIDGET_REALIZED(label))
 		return;
 	style = gtk_style_new();
-	gdk_font_unref(style->font);
-	style->font = gdk_font_ref(label->style->font);
+	gdk_font_unref(gtk_style_get_font(style));
+	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
 	b->unseen = 0;

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- conversation.c	2001/11/15 20:18:07	1.293
+++ conversation.c	2001/11/15 22:47:03	1.294
@@ -711,12 +711,12 @@
 				break;
 			}
 			if (buf[0]) {
-				if (GTK_EDITABLE(c->entry)->has_selection) {
-					int finish = GTK_EDITABLE(c->entry)->selection_end_pos;
+				if (GTK_OLD_EDITABLE(c->entry)->has_selection) {
+					int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;
 					gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 								 buf, strlen(buf), &finish);
 				} else {
-					pos = GTK_EDITABLE(c->entry)->current_pos;
+					pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 					gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 								 buf, strlen(buf), &pos);
 				}
@@ -779,6 +779,7 @@
 	} else if ((event->keyval == GDK_Tab) && c->is_chat && (chat_options & OPT_CHAT_TAB_COMPLETE)) {
 	        tab_complete(c);
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
+		return TRUE;
 	} else if (((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW)) ||
 		    (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) &&
 		   (event->state & GDK_MOD1_MASK) && (event->keyval > '0') && (event->keyval <= '9')) {
@@ -787,7 +788,7 @@
 		gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 	}
 
-	return TRUE;
+	return FALSE;
 }
 
 
@@ -941,7 +942,7 @@
 int entry_key_pressed(GtkWidget *w, GtkWidget *entry)
 {
 	check_everything(w);
-	return TRUE;
+	return FALSE;
 }
 
 /*------------------------------------------------------------------------*/
@@ -954,8 +955,8 @@
 	int res = 0;
 	char *tmp, *tmpo, h;
 	tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	h = tmpo[GTK_EDITABLE(entry)->current_pos];
-	tmpo[GTK_EDITABLE(entry)->current_pos] = '\0';
+	h = tmpo[GTK_OLD_EDITABLE(entry)->current_pos];
+	tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = '\0';
 	tmp = tmpo;
 	do {
 		p1 = strstr(tmp, s1);
@@ -978,7 +979,7 @@
 			}
 		}
 	} while (p1 || p2);
-	tmpo[GTK_EDITABLE(entry)->current_pos] = h;
+	tmpo[GTK_OLD_EDITABLE(entry)->current_pos] = h;
 	g_free(tmpo);
 	return res;
 }
@@ -986,8 +987,8 @@
 
 int invert_tags(GtkWidget *entry, char *s1, char *s2, int really)
 {
-	int start = GTK_EDITABLE(entry)->selection_start_pos;
-	int finish = GTK_EDITABLE(entry)->selection_end_pos;
+	int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+	int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 	char *s;
 
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
@@ -1009,8 +1010,8 @@
 void remove_tags(GtkWidget *entry, char *tag)
 {
 	char *s, *t;
-	int start = GTK_EDITABLE(entry)->selection_start_pos;
-	int finish = GTK_EDITABLE(entry)->selection_end_pos;
+	int start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+	int finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 	int temp;
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	t = s;
@@ -1090,7 +1091,7 @@
 
 void surround(GtkWidget *entry, char *pre, char *post)
 {
-	int temp, pos = GTK_EDITABLE(entry)->current_pos;
+	int temp, pos = GTK_OLD_EDITABLE(entry)->current_pos;
 	int dummy;
 	int start, finish;
 
@@ -1098,11 +1099,11 @@
 		gtkspell_detach(GTK_TEXT(entry));
 	}
 
-	if (GTK_EDITABLE(entry)->has_selection) {
+	if (GTK_OLD_EDITABLE(entry)->has_selection) {
 		remove_tags(entry, pre);
 		remove_tags(entry, post);
-		start = GTK_EDITABLE(entry)->selection_start_pos;
-		finish = GTK_EDITABLE(entry)->selection_end_pos;
+		start = GTK_OLD_EDITABLE(entry)->selection_start_pos;
+		finish = GTK_OLD_EDITABLE(entry)->selection_end_pos;
 		if (start > finish) {
 			dummy = finish;
 			finish = start;
@@ -1142,7 +1143,7 @@
 	if (invert_tags(entry, pre, post, 1))
 		return;
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-	pos = GTK_EDITABLE(entry)->current_pos;
+	pos = GTK_OLD_EDITABLE(entry)->current_pos;
 	debug_printf(_("Currently at %d, "), pos);
 	s2 = strstr(&s[pos], post);
 	if (s2) {
@@ -1606,8 +1607,8 @@
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
-		gdk_font_unref(style->font);
-		style->font = gdk_font_ref(label->style->font);
+		gdk_font_unref(gtk_style_get_font(style));
+		gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 		if (flags & WFLAG_NICK) {
 			style->fg[0].red = 0x0000;
 			style->fg[0].green = 0x0000;
@@ -2111,8 +2112,8 @@
 	if (!GTK_WIDGET_REALIZED(label))
 		return;
 	style = gtk_style_new();
-	gdk_font_unref(style->font);
-	style->font = gdk_font_ref(label->style->font);
+	gdk_font_unref(gtk_style_get_font(style));
+	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
 	c->unseen = 0;

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- dialogs.c	2001/11/06 23:58:21	1.282
+++ dialogs.c	2001/11/15 22:47:03	1.283
@@ -372,7 +372,7 @@
 	w->who = who;
 	w->gc = gc;
 
-	w->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(w->window);
 	dialogwindows = g_list_prepend(dialogwindows, w->window);
 	gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE);
@@ -511,7 +511,7 @@
 	GtkWidget *box;
 	GtkWidget *eedialog;
 
-	eedialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(eedialog);
 	gtk_widget_realize(eedialog);
 	ok = picture_button(eedialog, _("OK"), ok_xpm);
 	box = gtk_vbox_new(FALSE, 10);
@@ -556,7 +556,7 @@
 	GtkWidget *label;
 
 	if (!imdialog) {
-		imdialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(imdialog);
 		gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user"));
@@ -612,7 +612,7 @@
 
 	if (!infodialog) {
 
-		infodialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(infodialog);
 		gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(infodialog), FALSE, TRUE, TRUE);
 		gtk_widget_realize(infodialog);
@@ -749,7 +749,7 @@
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc;
 
-	a->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(a->window);
 	gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_group", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
 	gtk_widget_realize(a->window);
@@ -876,7 +876,7 @@
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc ? gc : connections->data;
 
-	a->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(a->window);
 	gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
@@ -1076,7 +1076,7 @@
 	struct addbp *b = g_new0(struct addbp, 1);
 	b->user = gc ? gc->user : aim_users->data;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim");
@@ -1299,7 +1299,7 @@
 	struct set_dir_dlg *b = g_new0(struct set_dir_dlg, 1);
 	b->gc = gc;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
@@ -1485,7 +1485,7 @@
 	struct passwddlg *b = g_new0(struct passwddlg, 1);
 	b->gc = gc;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim");
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
@@ -1584,7 +1584,7 @@
 	tmp = gc->user;
 	b->user = tmp;
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim");
 	dialogwindows = g_list_prepend(dialogwindows, b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
@@ -1671,7 +1671,7 @@
 
 	va_start(ap, info);
 
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
 	gtk_container_border_width(GTK_CONTAINER(b->window), 5);
 	bbox = gtk_vbox_new(FALSE, 5);
@@ -1794,7 +1794,7 @@
 	p->gc = gc;
 	p->permit = permit;
 
-	p->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(p->window);
 	gtk_container_set_border_width(GTK_CONTAINER(p->window), 5);
 	gtk_window_set_policy(GTK_WINDOW(p->window), FALSE, FALSE, TRUE);
 	gtk_widget_realize(p->window);
@@ -1986,7 +1986,7 @@
 
 	struct findbyinfo *b = g_new0(struct findbyinfo, 1);
 	b->gc = gc;
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim");
 	gtk_widget_show(b->window);
@@ -2143,7 +2143,7 @@
 	struct findbyemail *b = g_new0(struct findbyemail, 1);
 	if (g_slist_find(connections, gc))
 		b->gc = gc;
-	b->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(b->window);
 	gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim");
 	gtk_widget_realize(b->window);
@@ -2229,7 +2229,7 @@
 
 	if (!c->link_dialog) {
 		struct linkdlg *b = g_new0(struct linkdlg, 1);
-		c->link_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(c->link_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog), "add_link", "Gaim");
 		dialogwindows = g_list_prepend(dialogwindows, c->link_dialog);
 
@@ -2875,7 +2875,7 @@
 	struct create_away *ca = g_new0(struct create_away, 1);
 
 	/* Set up window */
-	ca->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(ca->window);
 	gtk_widget_set_usize(ca->window, -1, 250);
 	gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
 	gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim");
@@ -3047,12 +3047,12 @@
 
 	/* surround(c->entry, smiley_text, ""); */
 
-	if (GTK_EDITABLE(c->entry)->has_selection) {
-		int finish = GTK_EDITABLE(c->entry)->selection_end_pos;
+	if (GTK_OLD_EDITABLE(c->entry)->has_selection) {
+		int finish = GTK_OLD_EDITABLE(c->entry)->selection_end_pos;
 		gtk_editable_insert_text(GTK_EDITABLE(c->entry),
 					 smiley_text, strlen(smiley_text), &finish);
 	} else {
-		int pos = GTK_EDITABLE(c->entry)->current_pos;
+		int pos = GTK_OLD_EDITABLE(c->entry)->current_pos;
 		gtk_editable_insert_text(GTK_EDITABLE(c->entry), smiley_text, strlen(smiley_text), &pos);
 	}
 
@@ -3097,7 +3097,7 @@
 
 	win = c->window;
 
-	dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(dialog);
 	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim");
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
@@ -3178,7 +3178,7 @@
 	if (aliasdlg)
 		gtk_widget_destroy(aliasdlg);
 
-	aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(aliasdlg);
 	gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE);
 	gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim");
 	gtk_widget_realize(aliasdlg);
@@ -3354,7 +3354,7 @@
 	GtkWidget *label;
 	GtkWidget *hsep;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim");
 	gtk_container_set_border_width(GTK_CONTAINER(window), 10);
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
@@ -3624,7 +3624,7 @@
 	gtk_container_add(GTK_CONTAINER(frame), sw);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
 
-	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", open_url_nw, NULL);
+	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
 	gtk_container_add(GTK_CONTAINER(sw), layout);
 	gaim_setup_imhtml(layout);
 
@@ -3710,7 +3710,7 @@
 	GtkWidget *label;
 
 	if (!rename_dialog) {
-		rename_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(rename_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group"));
@@ -3815,7 +3815,7 @@
 	GtkWidget *label;
 
 	if (!rename_bud_dialog) {
-		rename_bud_dialog = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(rename_bud_dialog);
 		gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);
 		gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy"));

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- gaim.h	2001/11/10 08:02:39	1.291
+++ gaim.h	2001/11/15 22:47:03	1.292
@@ -82,6 +82,11 @@
 #define CUI_CHAT_RECV		6
 
 
+#define BROWSER_NETSCAPE              0
+#define BROWSER_KFM                   1
+#define BROWSER_MANUAL                2
+/*#define BROWSER_INTERNAL              3*/
+#define BROWSER_GNOME                 4
 
 #define IM_FLAG_AWAY     0x01
 #define IM_FLAG_CHECKBOX 0x02

Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gtkspell.c	2001/11/04 10:46:39	1.13
+++ gtkspell.c	2001/11/15 22:47:03	1.14
@@ -431,7 +431,7 @@
 		if (highlight.pixel == 0) {
 			/* add an entry for the highlight in the color map. */
 			GdkColormap *gc = gtk_widget_get_colormap(GTK_WIDGET(gtktext));
-			gdk_colormap_alloc_color(gc, &highlight, FALSE, TRUE);;
+			gdk_colormap_alloc_color(gc, &highlight, FALSE, TRUE);
 		}
 		change_color(gtktext, start, end, &highlight);
 		if (buf)

Index: gtkticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkticker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkticker.c	2000/11/21 01:00:45	1.2
+++ gtkticker.c	2001/11/15 22:47:03	1.3
@@ -22,6 +22,7 @@
  */
 
 #include "gtkticker.h"
+#include <gtk/gtk.h>
 
 static void gtk_ticker_compute_offsets (GtkTicker    *ticker);
 static void gtk_ticker_class_init    (GtkTickerClass    *klass);
@@ -94,7 +95,9 @@
   widget_class->realize = gtk_ticker_realize;
   widget_class->size_request = gtk_ticker_size_request;
   widget_class->size_allocate = gtk_ticker_size_allocate;
+#if ! GTK_CHECK_VERSION(1,3,0)
   widget_class->draw = gtk_ticker_draw;
+#endif
   widget_class->expose_event = gtk_ticker_expose;
 
   container_class->add = gtk_ticker_add_real;

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- multi.c	2001/11/13 06:07:32	1.105
+++ multi.c	2001/11/15 22:47:03	1.106
@@ -812,7 +812,7 @@
 	p->u = u;
 	passes = g_slist_append(passes, p);
 
-	p->win = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(p->win);
 	gtk_window_set_wmclass(GTK_WINDOW(p->win), "password", "Gaim");
 	gtk_container_border_width(GTK_CONTAINER(p->win), 5);
 	gtk_signal_connect(GTK_OBJECT(p->win), "destroy", GTK_SIGNAL_FUNC(pass_des), p);
@@ -1152,7 +1152,7 @@
 		meter->gc = gc;
 		meters = g_slist_append(meters, meter);
 
-		meter->window = gtk_window_new(GTK_WINDOW_DIALOG);
+		GAIM_DIALOG(meter->window);
 		gtk_window_set_policy(GTK_WINDOW(meter->window), 0, 0, 1);
 		gtk_window_set_wmclass(GTK_WINDOW(meter->window), "signon", "Gaim");
 		gtk_container_set_border_width(GTK_CONTAINER(meter->window), 5);

Index: plugins.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugins.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- plugins.c	2001/10/12 22:31:12	1.85
+++ plugins.c	2001/11/15 22:47:03	1.86
@@ -171,7 +171,7 @@
 	if (plugwindow)
 		return;
 
-	plugwindow = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(plugwindow);
 	gtk_window_set_wmclass(GTK_WINDOW(plugwindow), "plugins", "Gaim");
 	gtk_widget_realize(plugwindow);
 	aol_icon(plugwindow->window);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- prefs.c	2001/11/05 15:29:34	1.196
+++ prefs.c	2001/11/15 22:47:04	1.197
@@ -2441,7 +2441,7 @@
 	if (!dw)
 		dw = g_new0(struct debug_window, 1);
 
-	dw->window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(dw->window);
 	gtk_window_set_title(GTK_WINDOW(dw->window), _("Gaim debug output window"));
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- prpl.c	2001/11/14 23:42:14	1.47
+++ prpl.c	2001/11/15 22:47:04	1.48
@@ -127,7 +127,7 @@
 	GtkWidget *hbox;
 	GtkWidget *button;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	gtk_window_set_wmclass(GTK_WINDOW(window), "accept", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(window), _("Accept?"));
@@ -192,7 +192,7 @@
 	p->doit = doit;
 	p->dont = dont;
 
-	window = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(window);
 	p->window = window;
 	gtk_window_set_wmclass(GTK_WINDOW(window), "prompt", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
@@ -413,7 +413,7 @@
 	}
 
 
-	mn->email_win = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(mn->email_win);
 	gtk_window_set_wmclass(GTK_WINDOW(mn->email_win), "mail", "Gaim");
 	gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE);
 	gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ui.h	2001/11/09 03:11:56	1.17
+++ ui.h	2001/11/15 22:47:04	1.18
@@ -37,6 +37,18 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
 
+#if GTK_CHECK_VERSION(1,3,0)
+#define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
+			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
+#define GdkWindowPrivate GdkWindowObject
+#define gtk_toolbar_new(x,y) gtk_toolbar_new()
+#else
+#define GAIM_DIALOG(x)	x = gtk_window_new(GTK_WINDOW_DIALOG)
+#define GTK_OLD_EDITABLE(x) GTK_EDITABLE(x)
+#define gtk_style_get_font(style) (style)->font
+#define gtk_style_set_font(s, f) (s)->font = f
+#endif
+
 #define BROWSER_NETSCAPE              0
 #define BROWSER_KFM                   1
 #define BROWSER_MANUAL                2