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

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.108,1.109

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- oscar.c	5 Mar 2002 17:31:06 -0000	1.108
+++ oscar.c	6 Mar 2002 05:26:58 -0000	1.109
@@ -1156,11 +1156,12 @@
 		if (info->flags & AIM_FLAG_AWAY)
 			type |= UC_UNAVAILABLE;
 	}
-
 	if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) {
 		type = (info->icqinfo.status << 6);
-		if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT))
+		if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT) &&
+		      (info->icqinfo.status != AIM_ICQ_STATE_NORMAL)) {
 			type |= UC_UNAVAILABLE;
+		}
 	}
 
 	if (caps & AIM_CAPS_ICQ)
@@ -2618,6 +2619,7 @@
 			aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT);
 			gc->away = "";
 		} else {
+		  
 			aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
 		}
 	}

[Gaim-commits] CVS: gaim/src prefs.c,1.214,1.215 conversation.c,1.333,1.334

[Sean E. <sea...@us...>]

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

Modified Files:
	prefs.c conversation.c 
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- prefs.c	6 Mar 2002 00:18:02 -0000	1.214
+++ prefs.c	6 Mar 2002 05:26:58 -0000	1.215
@@ -1009,12 +1009,13 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
-	hbox = gtk_hbox_new(FALSE, 5);	
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
-	gtk_widget_show(hbox);
-	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, hbox);
+	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, vbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
 	
-	gaim_button(_("Disable Buddy Icon Animation"), &im_options, OPT_IM_NO_ANIMATION, hbox);
+	gaim_button(_("Disable Buddy Icon Animation"), &im_options, OPT_IM_NO_ANIMATION, vbox);
 #endif
 
 	gtk_widget_show(prefdialog);
@@ -2724,6 +2725,9 @@
 
 	if (option == OPT_IM_ALIAS_TAB)
 		set_convo_titles();
+
+	if (option == OPT_IM_NO_ANIMATION)
+		set_anim();
 
 	save_prefs();
 }

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- conversation.c	6 Mar 2002 00:18:02 -0000	1.333
+++ conversation.c	6 Mar 2002 05:26:58 -0000	1.334
@@ -3288,7 +3288,7 @@
 	gtk_container_add(GTK_CONTAINER(event), c->icon);
 	gtk_widget_show(c->icon);
 	if(im_options & OPT_IM_NO_ANIMATION)
-		stop_anim(c->icon, c);		
+		stop_anim(NULL, c);		
 	gdk_pixmap_unref(pm);
 	if (bm)
 		gdk_bitmap_unref(bm);
@@ -3307,6 +3307,18 @@
 	GList *c = conversations;
 	while (c) {
 		update_icon(c->data);
+		c = c->next;
+	}
+}
+
+void set_anim()
+{
+	GList *c = conversations;
+	while (c) {
+		if(im_options & OPT_IM_NO_ANIMATION)
+			stop_anim(NULL, c->data);
+		else 
+			start_anim(NULL, c->data);
 		c = c->next;
 	}
 }

[Gaim-commits] CVS: gaim ChangeLog,1.404,1.405

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -d -r1.404 -r1.405
--- ChangeLog	6 Mar 2002 00:18:02 -0000	1.404
+++ ChangeLog	6 Mar 2002 05:26:58 -0000	1.405
@@ -8,6 +8,7 @@
 	  were offline (Thanks Jason Willis)
 	* Option to globally disable Buddy Icon animation (Thanks
 	  Luke Schierer)
+	* Numerous bugfixes
 	
 version 0.53 (02/28/2002):
 	* Updated Polish Translation (thanks Przemyslaw Sulek)

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.55,1.56

[Sean E. <sea...@us...>]

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

Modified Files:
	msn.c 
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- msn.c	6 Mar 2002 00:18:02 -0000	1.55
+++ msn.c	6 Mar 2002 05:26:58 -0000	1.56
@@ -884,7 +884,7 @@
 			}
 
 			if(new) {
-				debug_printf("Unresolved MSN RL entry");
+				debug_printf("Unresolved MSN RL entry\n");
 				ap = g_new0(struct msn_add_permit, 1);
 				ap->user = g_strdup(who);
 				ap->friend = g_strdup(friend);

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.54,1.55

[Sean E. <sea...@us...>]

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

Modified Files:
	msn.c 
Log Message:
Lots of people have a problem with people who were added to their MSN reverse list while they were offline, not being prompted to add them to their allow list.  Jason Willis fixed that.  Also added a global buddy icon animation preference by Luke Schierer.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- msn.c	4 Mar 2002 04:18:02 -0000	1.54
+++ msn.c	6 Mar 2002 00:18:02 -0000	1.55
@@ -699,7 +699,6 @@
 		return;
 	}
 	build_allow_list(); /* er. right. we'll need to have a thing for this in CUI too */
-
 	show_got_added(map->gc, NULL, map->user, map->friend, NULL);
 }
 
@@ -847,6 +846,10 @@
 		serv_got_update(gc, user, 1, 0, 0, 0, status, 0);
 	} else if (!g_strncasecmp(buf, "LST", 3)) {
 		char *which, *who, *friend, *tmp = buf;
+		struct msn_add_permit *ap; /* for any as yet undealt with buddies who've added you to their buddy list when you were off-line.  How dare they! */
+		GSList *perm = gc->permit; /* current permit list */
+		char msg[MSN_BUF_LEN];
+		int new = 1;
 		int pos, tot;
 
 		GET_NEXT(tmp);
@@ -874,8 +877,25 @@
 		} else if (!g_strcasecmp(which, "BL") && pos) {
 			gc->deny = g_slist_append(gc->deny, g_strdup(who));
 		} else if (!g_strcasecmp(which, "RL")) {
-			if (pos != tot)
-				return 1;
+			while(perm) {
+				if(!g_strcasecmp(perm->data, who))
+					new = 0;
+				perm = perm->next;
+			}
+
+			if(new) {
+				debug_printf("Unresolved MSN RL entry");
+				ap = g_new0(struct msn_add_permit, 1);
+				ap->user = g_strdup(who);
+				ap->friend = g_strdup(friend);
+				ap->gc = gc;
+                         
+		                g_snprintf(msg, sizeof(msg), "The user %s (%s) wants to add you to their buddy list",ap->user, url_decode(ap->friend));
+				do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add);
+			}
+			
+			if (pos != tot) 
+				return 1; /* this isn't the last one in the RL, so return. */
 
 			g_snprintf(sendbuf, sizeof(sendbuf), "CHG %d NLN\r\n", ++md->trId);
 			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {

[Gaim-commits] CVS: gaim/src/protocols/oscar ft.c,1.14,1.15

[Sean E. <sea...@us...>]

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

Modified Files:
	ft.c 
Log Message:
Lots of people have a problem with people who were added to their MSN reverse list while they were offline, not being prompted to add them to their allow list.  Jason Willis fixed that.  Also added a global buddy icon animation preference by Luke Schierer.


Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ft.c	2 Mar 2002 04:52:21 -0000	1.14
+++ ft.c	6 Mar 2002 00:18:02 -0000	1.15
@@ -1115,7 +1115,7 @@
 				i = aim_recv(conn->fd, msg2, 1024);
 			else 
 				i = aim_recv(conn->fd, msg2, payloadlength - recvd);
-			if (i == 0) {
+			if (i <= 0) {
 				free(msg);
 				return -1;
 			}

[Gaim-commits] CVS: gaim ChangeLog,1.403,1.404

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Lots of people have a problem with people who were added to their MSN reverse list while they were offline, not being prompted to add them to their allow list.  Jason Willis fixed that.  Also added a global buddy icon animation preference by Luke Schierer.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -d -r1.403 -r1.404
--- ChangeLog	4 Mar 2002 04:18:02 -0000	1.403
+++ ChangeLog	6 Mar 2002 00:18:02 -0000	1.404
@@ -4,6 +4,10 @@
 	* Compiles without GdkPixbuf again
 	* GtkIMHtml will refresh when you set a new GTK+ theme
 	* Improved Yahoo! typing notification (thanks Brian Macke)
+	* Prompt to authorize MSN buddies who added you while you
+	  were offline (Thanks Jason Willis)
+	* Option to globally disable Buddy Icon animation (Thanks
+	  Luke Schierer)
 	
 version 0.53 (02/28/2002):
 	* Updated Polish Translation (thanks Przemyslaw Sulek)

[Gaim-commits] CVS: gaim/src conversation.c,1.332,1.333 gaim.h,1.309,1.310 prefs.c,1.213,1.214

[Sean E. <sea...@us...>]

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

Modified Files:
	conversation.c gaim.h prefs.c 
Log Message:
Lots of people have a problem with people who were added to their MSN reverse list while they were offline, not being prompted to add them to their allow list.  Jason Willis fixed that.  Also added a global buddy icon animation preference by Luke Schierer.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- conversation.c	4 Mar 2002 17:22:57 -0000	1.332
+++ conversation.c	6 Mar 2002 00:18:02 -0000	1.333
@@ -3287,6 +3287,8 @@
 	gtk_widget_set_usize(c->icon, sf, sf);
 	gtk_container_add(GTK_CONTAINER(event), c->icon);
 	gtk_widget_show(c->icon);
+	if(im_options & OPT_IM_NO_ANIMATION)
+		stop_anim(c->icon, c);		
 	gdk_pixmap_unref(pm);
 	if (bm)
 		gdk_bitmap_unref(bm);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- gaim.h	4 Mar 2002 04:18:02 -0000	1.309
+++ gaim.h	6 Mar 2002 00:18:02 -0000	1.310
@@ -233,6 +233,7 @@
 #define OPT_IM_SIDE_TAB			0x00000020
 #define OPT_IM_BR_TAB			0x00000040
 #define OPT_IM_HIDE_ICONS		0x00000080
+#define OPT_IM_NO_ANIMATION		0x00000100
 #define OPT_IM_ALIAS_TAB		0x00002000
 #define OPT_IM_POPDOWN			0x00004000
 

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- prefs.c	2 Mar 2002 04:52:21 -0000	1.213
+++ prefs.c	6 Mar 2002 00:18:02 -0000	1.214
@@ -1009,7 +1009,12 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
-	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, vbox);
+	hbox = gtk_hbox_new(FALSE, 5);	
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+	gtk_widget_show(hbox);
+	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, hbox);
+	
+	gaim_button(_("Disable Buddy Icon Animation"), &im_options, OPT_IM_NO_ANIMATION, hbox);
 #endif
 
 	gtk_widget_show(prefdialog);

[Gaim-commits] CVS: gaim/pixmaps Makefile.am,1.61,1.62

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Should have done this before.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Makefile.am	11 Dec 2001 10:35:46 -0000	1.61
+++ Makefile.am	5 Mar 2002 23:20:51 -0000	1.62
@@ -20,6 +20,7 @@
 		bigsmile.xpm			\
 		block.xpm			\
 		bold.xpm			\
+		broken.xpm			\
 		burp.xpm			\
 		cancel.xpm			\
 		close.xpm			\

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.101,1.102

[Sean E. <sea...@us...>]

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

Modified Files:
	gtkimhtml.c 
Log Message:
Fixed a parsing bug regarding IM images.  This was most notable when trying to view images in the log viewer (you aren't able to... does anyone want an option to?)


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- gtkimhtml.c	4 Mar 2002 23:55:14 -0000	1.101
+++ gtkimhtml.c	5 Mar 2002 18:19:18 -0000	1.102
@@ -3379,6 +3379,8 @@
 						alltext++;
 					alltext = alltext + strlen("<DATA ID=\"\" SIZE=\"\">") + strlen(id) + strlen(datasize);
 					g_free(tmp);
+					if (atoi(datasize) > len - pos)
+						break;
 					imagedata = g_malloc(atoi(datasize));
 					memcpy(imagedata, alltext, atoi(datasize));
 					

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.107,1.108

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
I gotta stop making mistakes like this.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- oscar.c	5 Mar 2002 17:16:51 -0000	1.107
+++ oscar.c	5 Mar 2002 17:31:06 -0000	1.108
@@ -2428,8 +2428,12 @@
 	struct direct_im *dim = find_direct_im(odata, name);
 	int ret = 0;
 	if (dim) {
-		if (dim->connected)   /* If we're not connected yet, send through server */
-			return  aim_send_im_direct(odata->sess, dim->conn, message);
+		if (dim->connected) {  /* If we're not connected yet, send through server */
+			ret =  aim_send_im_direct(odata->sess, dim->conn, message);
+			if (ret == 0)
+				return 1;
+			else return ret;
+		}
 		debug_printf("Direct IM pending, but not connected; sending through server\n");
 		}
 	if (imflags & IM_FLAG_AWAY) {

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.106,1.107

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
(12:08:49) Direct IM with seanegn2 established
(12:08:59) Direct IM with seanegn2 closed

This won't make Direct IMs work any better, but it will make your life easier when they fail.  No more "Unable to send message" or "Direct IM already pending" errors.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- oscar.c	4 Mar 2002 04:18:02 -0000	1.106
+++ oscar.c	5 Mar 2002 17:16:51 -0000	1.107
@@ -137,6 +137,7 @@
 	char name[80];
 	int watcher;
 	aim_conn_t *conn;
+	gboolean connected;
 };
 
 struct ask_direct {
@@ -317,7 +318,11 @@
 	od->direct_ims = g_slist_remove(od->direct_ims, dim);
 	gaim_input_remove(dim->watcher);
 
-	g_snprintf(buf, sizeof buf, _("Direct IM with %s closed"), sn);
+	if (dim->connected)
+		g_snprintf(buf, sizeof buf, _("Direct IM with %s closed"), sn);
+	else 
+		g_snprintf(buf, sizeof buf, _("Direct IM with %s failed"), sn);
+		
 	if ((cnv = find_conversation(sn)))
 		write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
 	update_progress(cnv, 100);
@@ -1207,7 +1212,9 @@
 	struct oscar_data *od = gc->proto_data;
 	struct conversation *cnv;
 	char buf[256];
-
+	struct sockaddr name;
+	socklen_t name_len = 1;
+	
 	if (!g_slist_find(connections, gc)) {
 		g_free(dim);
 		return;
@@ -1220,17 +1227,20 @@
 
 	if (dim->conn->fd != source)
 		dim->conn->fd = source;
-
 	aim_conn_completeconnect(od->sess, dim->conn);
 	if (!(cnv = find_conversation(dim->name))) 
 		cnv = new_conversation(dim->name);
-	g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), dim->name);
-	write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
 
+	/* This is the best way to see if we're connected or not */
+	if (getpeername(source, &name, &name_len) == 0) {
+		g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), dim->name);
+		dim->connected = TRUE;
+		write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
+	}
 	od->direct_ims = g_slist_append(od->direct_ims, dim);
-
+	
 	dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,
-					oscar_callback, dim->conn);
+				      oscar_callback, dim->conn);
 }
 
 static int accept_direct_im(gpointer w, struct ask_direct *d) {
@@ -2418,60 +2428,62 @@
 	struct direct_im *dim = find_direct_im(odata, name);
 	int ret = 0;
 	if (dim) {
-		ret = aim_send_im_direct(odata->sess, dim->conn, message);
+		if (dim->connected)   /* If we're not connected yet, send through server */
+			return  aim_send_im_direct(odata->sess, dim->conn, message);
+		debug_printf("Direct IM pending, but not connected; sending through server\n");
+		}
+	if (imflags & IM_FLAG_AWAY) {
+		ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
 	} else {
-		if (imflags & IM_FLAG_AWAY) {
-			ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
-		} else {
-			struct aim_sendimext_args args;
-			GSList *h = odata->hasicons;
-			struct icon_req *ir = NULL;
-			char *who = normalize(name);
-			struct stat st;
-
-			args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
-			if (odata->icq)
-				args.flags |= AIM_IMFLAGS_OFFLINE;
-
-			args.features = gaim_features;
-			args.featureslen = sizeof(gaim_features);
-
-			while (h) {
-				ir = h->data;
-				if (ir->request && !strcmp(who, ir->user))
-					break;
-				h = h->next;
-			}
-			if (h) {
-				ir->request = FALSE;
-				args.flags |= AIM_IMFLAGS_BUDDYREQ;
-				debug_printf("sending buddy icon request with message\n");
+		struct aim_sendimext_args args;
+		GSList *h = odata->hasicons;
+		struct icon_req *ir = NULL;
+		char *who = normalize(name);
+		struct stat st;
+		
+		args.flags = AIM_IMFLAGS_ACK | AIM_IMFLAGS_CUSTOMFEATURES;
+		if (odata->icq)
+			args.flags |= AIM_IMFLAGS_OFFLINE;
+		
+		args.features = gaim_features;
+		args.featureslen = sizeof(gaim_features);
+		
+		while (h) {
+			ir = h->data;
+			if (ir->request && !strcmp(who, ir->user))
+				break;
+			h = h->next;
 			}
+		if (h) {
+			ir->request = FALSE;
+			args.flags |= AIM_IMFLAGS_BUDDYREQ;
+			debug_printf("sending buddy icon request with message\n");
+		}
+		
+		if (gc->user->iconfile[0] && !stat(gc->user->iconfile, &st)) {
+			FILE *file = fopen(gc->user->iconfile, "r");
+			if (file) {
+				char *buf = g_malloc(st.st_size);
+				fread(buf, 1, st.st_size, file);
+				
+				args.iconlen   = st.st_size;
+				args.iconsum   = aim_iconsum(buf, st.st_size);
+				args.iconstamp = st.st_mtime;
 
-			if (gc->user->iconfile[0] && !stat(gc->user->iconfile, &st)) {
-				FILE *file = fopen(gc->user->iconfile, "r");
-				if (file) {
-					char *buf = g_malloc(st.st_size);
-					fread(buf, 1, st.st_size, file);
-
-					args.iconlen   = st.st_size;
-					args.iconsum   = aim_iconsum(buf, st.st_size);
-					args.iconstamp = st.st_mtime;
-
-					args.flags |= AIM_IMFLAGS_HASICON;
-					debug_printf("Claiming to have an icon.\n");
+				args.flags |= AIM_IMFLAGS_HASICON;
+				debug_printf("Claiming to have an icon.\n");
 
-					fclose(file);
-					g_free(buf);
-				}
+				fclose(file);
+				g_free(buf);
 			}
-
-			args.destsn = name;
-			args.msg    = message;
-			args.msglen = strlen(message);
-
-			ret = aim_send_im_ext(odata->sess, &args);
 		}
+		
+		args.destsn = name;
+		args.msg    = message;
+		args.msglen = strlen(message);
+		
+		ret = aim_send_im_ext(odata->sess, &args);
+		
 	}
 	if (ret >= 0)
 		return 1;
@@ -3118,6 +3130,7 @@
 	dim->conn = newconn;
 	dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,
 					oscar_callback, dim->conn);
+	dim->connected = TRUE;
 	g_snprintf(buf, sizeof buf, _("Direct IM with %s established"), sn);
 	g_free(sn);
 	write_to_conv(cnv, buf, WFLAG_SYSTEM, NULL, time(NULL), -1);
@@ -3126,7 +3139,7 @@
 				gaim_directim_incoming, 0);
 	aim_conn_addhandler(sess, newconn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMTYPING,
 				gaim_directim_typing, 0);
-	aim_conn_addhandler(od->sess, dim->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DOWNLOADIMAGE,
+	aim_conn_addhandler(sess, newconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_DOWNLOADIMAGE,
 			    gaim_update_ui, 0);
 	return 1;
 }
@@ -3211,8 +3224,15 @@
 
 	dim = find_direct_im(od, data->who);
 	if (dim) {
-		do_error_dialog("Direct IM request already pending.", "Unable");
-		return;
+		if (!(dim->connected)) {  /* We'll free the old, unconnected dim, and start over */
+			od->direct_ims = g_slist_remove(od->direct_ims, dim);
+			gaim_input_remove(dim->watcher);
+			g_free(dim);
+			debug_printf("Gave up on old direct IM, trying again\n");
+		} else {
+			do_error_dialog("DirectIM already open.", "Gaim");
+			return;
+		}
 	}
 	dim = g_new0(struct direct_im, 1);
 	dim->gc = gc;

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.100,1.101

[Sean E. <sea...@us...>]

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

Modified Files:
	gtkimhtml.c 
Log Message:
Another change to gtkimhtml's font loader.  Thanks, Ben Miller.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- gtkimhtml.c	4 Mar 2002 18:43:27 -0000	1.100
+++ gtkimhtml.c	4 Mar 2002 23:55:14 -0000	1.101
@@ -2127,10 +2127,11 @@
 			if (usesize && fontsize) {
 				g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize));
 				newvals [PTSZ] = fs;
-			} else if (!usesize)
+				newvals [PXLSZ] = "*";
+			} else if (!usesize) {
 				newvals [PTSZ] = "*";
-			newvals [PXLSZ] = "*";
-			
+				newvals [PXLSZ] = "*";
+			}
 			
 			if (name) {
 				/* we got passed a name. it might be a list of names. */
@@ -2193,7 +2194,7 @@
 				italicsind = 0;
 				usebold = TRUE;
 				usesize = FALSE;
-				} else if (names && names[nameind++]) {
+			} else if (names && names[nameind++]) {
 				useregenc = TRUE;        
 				italicsind = 0;
 				usebold = TRUE;

[Gaim-commits] CVS: gaim/src sound.c,1.48,1.49

[Sean E. <sea...@us...>]

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

Modified Files:
	sound.c 
Log Message:
This is what I meant to commit.


Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sound.c	4 Mar 2002 19:08:34 -0000	1.48
+++ sound.c	4 Mar 2002 19:15:12 -0000	1.49
@@ -480,7 +480,7 @@
 
 #ifdef ARTSC_SOUND
 		/* ArtsC is the new second choice. */
-		else if (sound_options & OPT_SOUND_ARTSC) {
+		if (sound_options & OPT_SOUND_ARTSC) {
 			if (can_play_artsc()) {
 				if (play_artsc(data, size))
 					_exit(0);
@@ -490,7 +490,7 @@
 
 #ifdef NAS_SOUND
 		/* NAS is our second choice setup. */
-		else if (sound_options & OPT_SOUND_NAS) {
+		if (sound_options & OPT_SOUND_NAS) {
 			if (can_play_nas()) {
 				if (play_nas(data, size))
 					_exit(0);

[Gaim-commits] CVS: gaim/src sound.c,1.47,1.48

[Sean E. <sea...@us...>]

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

Modified Files:
	sound.c 
Log Message:
It would probably be better if it compiled.


Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sound.c	4 Mar 2002 18:43:27 -0000	1.47
+++ sound.c	4 Mar 2002 19:08:34 -0000	1.48
@@ -499,7 +499,7 @@
 #endif
 
 		/* Lastly, we can try just plain old /dev/audio */
-		else if (sound_options & OPT_SOUND_NORMAL) {
+		if (sound_options & OPT_SOUND_NORMAL) {
 			if (can_play_audio()) {
 				play_audio(data, size);
 				_exit(0);

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.99,1.100 sound.c,1.46,1.47

[Sean E. <sea...@us...>]

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

Modified Files:
	gtkimhtml.c sound.c 
Log Message:
Don't fork for console beeps anymore.
Fixed a bug reported by Mike Owens.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- gtkimhtml.c	4 Mar 2002 03:04:48 -0000	1.99
+++ gtkimhtml.c	4 Mar 2002 18:43:27 -0000	1.100
@@ -2898,7 +2898,7 @@
 		*length = 5;
 	} else if (*(string + 1) == '#') {
 		guint pound = 0;
-		if (sscanf (string, "&#%u;", &pound) == 1) {
+		if ((sscanf (string, "&#%u;", &pound) == 1) && pound != 0) {
 			if (*(string + 3 + (gint)log10 (pound)) != ';')
 				return FALSE;
 			*replace = (gchar)pound;

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.c	3 Mar 2002 02:53:46 -0000	1.46
+++ sound.c	4 Mar 2002 18:43:27 -0000	1.47
@@ -391,17 +391,18 @@
 	return;
 #endif
 
+	if (sound_options & OPT_SOUND_BEEP) {
+		gdk_beep();
+		return;
+	}
+
 	pid = fork();
 
 	if (pid < 0)
 		return;
 	else if (pid == 0) {
 		alarm(30);
-		if (sound_options & OPT_SOUND_BEEP) {
-			gdk_beep();
-			_exit(0);
-		}
-
+		
 		if (sound_cmd[0]) {
 			char *args[4];
 			char command[4096];
@@ -455,20 +456,21 @@
 	return;
 #endif
 
+	if (sound_options & OPT_SOUND_BEEP) {
+		gdk_beep();
+		return;
+	}
 	pid = fork();
-
+	
 	if (pid < 0)
 		return;
 	else if (pid == 0) {
 		alarm(30);
-		if (sound_options & OPT_SOUND_BEEP) {
-			gdk_beep();
-			_exit(0);
-		}
+		
 #ifdef ESD_SOUND
 		/* ESD is our player of choice.  Are we OK to
 		 * go there? */
-		else if (sound_options & OPT_SOUND_ESD) {
+		if (sound_options & OPT_SOUND_ESD) {
 			if (can_play_esd()) {
 				if (play_esd(data, size))
 					_exit(0);

[Gaim-commits] CVS: gaim/src conversation.c,1.331,1.332

[Sean E. <sea...@us...>]

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

Modified Files:
	conversation.c 
Log Message:
Wow.  That was stupid.



Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -d -r1.331 -r1.332
--- conversation.c	4 Mar 2002 04:18:02 -0000	1.331
+++ conversation.c	4 Mar 2002 17:22:57 -0000	1.332
@@ -2299,19 +2299,18 @@
 
 void show_typing(struct conversation *c) {
 	
-	GtkStyle *style;
-	GtkNotebook *notebook = GTK_NOTEBOOK(c->is_chat ? chat_notebook : convo_notebook);
-	int offs = ((convo_options & OPT_CONVO_COMBINE) &&
-		    (im_options & OPT_IM_ONE_WINDOW) && c->is_chat) ?
-		g_list_length(conversations) : 0;
-	GList *ws = (c->is_chat ? chats : conversations);
-	GtkWidget *label = gtk_notebook_get_tab_label(notebook,
-						      gtk_notebook_get_nth_page(notebook,
-										offs + g_list_index(ws, c)));
 	if (c->is_chat) /* We shouldn't be getting typing notifications from chats. */
 		return;
 	if (im_options & OPT_IM_ONE_WINDOW) { /* We'll make the tab green */
-		
+		GtkStyle *style;
+		GtkNotebook *notebook = GTK_NOTEBOOK(c->is_chat ? chat_notebook : convo_notebook);
+		int offs = ((convo_options & OPT_CONVO_COMBINE) &&
+			    (im_options & OPT_IM_ONE_WINDOW) && c->is_chat) ?
+			g_list_length(conversations) : 0;
+		GList *ws = (c->is_chat ? chats : conversations);
+		GtkWidget *label = gtk_notebook_get_tab_label(notebook,
+							      gtk_notebook_get_nth_page(notebook,
+											offs + g_list_index(ws, c)));
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);

[Gaim-commits] CVS: gaim/src server.c,1.220,1.221

[Sean E. <sea...@us...>]

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

Modified Files:
	server.c 
Log Message:
Whoops.


Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- server.c	4 Mar 2002 04:18:02 -0000	1.220
+++ server.c	4 Mar 2002 07:01:57 -0000	1.221
@@ -775,7 +775,7 @@
 
 void serv_got_typing_stopped(struct gaim_connection *gc, char *name) {
 	struct conversation *c = find_conversation(name);
-	if (c->typing_timeout) {
+	if (c && c->typing_timeout) {
 		gtk_timeout_remove (c->typing_timeout);
 	}
 	reset_typing(g_strdup(name));

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.53,1.54

[Sean E. <sea...@us...>]

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

Modified Files:
	msn.c 
Log Message:
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.

Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- msn.c	2 Mar 2002 04:52:21 -0000	1.53
+++ msn.c	4 Mar 2002 04:18:02 -0000	1.54
@@ -1484,15 +1484,15 @@
 	g_free(md);
 }
 
-static int msn_send_typing(struct gaim_connection *gc, char *who) {
+static int msn_send_typing(struct gaim_connection *gc, char *who, int typing) {
 	struct msn_switchboard *ms = msn_find_switch(gc, who);
 	char header[MSN_BUF_LEN] =   "MIME-Version: 1.0\r\n"
 				     "Content-Type: text/x-msmsgscontrol\r\n" 
 				     "User-Agent: Gaim/" VERSION "\r\n" 
 				     "TypingUser: ";
 	char buf [MSN_BUF_LEN];
-	if (!ms)
-		return;
+	if (!ms || !typing)
+		return 0;
 	g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s\r\n\r\n\r\n",
 		   ++ms->trId,
 		   strlen(header) + strlen("\r\n\r\n\r\n") + strlen(gc->username),

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.33,1.34

[Sean E. <sea...@us...>]

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

Modified Files:
	yahoo.c 
Log Message:
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.

Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- yahoo.c	2 Mar 2002 04:52:21 -0000	1.33
+++ yahoo.c	4 Mar 2002 04:18:02 -0000	1.34
@@ -57,11 +57,6 @@
 #define USEROPT_PAGERPORT 4
 #define YAHOO_PAGER_PORT 5050
 
-/* I just made these values up.  Anyone know what they should be?
- * -SeanEgan */
-#define YAHOO_TYPING_RECV_TIMEOUT 10
-#define YAHOO_TYPING_SEND_TIMEOUT 8
-
 enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_LOGON = 1,
 	YAHOO_SERVICE_LOGOFF,
@@ -470,7 +465,7 @@
 {
 	char *msg = NULL;
 	char *from = NULL;
-	time_t tm = time(0);
+	char *typing = NULL;
 	GSList *l = pkt->hash;
 
 	while (l) {
@@ -479,9 +474,14 @@
 			from = pair->value;
 		if (pair->key == 49)
 			msg = pair->value;
+		if (pair->key == 13)
+			typing = pair->value;
 		l = l->next;
 	}
-	serv_got_typing(gc, from, YAHOO_TYPING_RECV_TIMEOUT);
+	if (*typing == '1')
+		serv_got_typing(gc, from, 0);
+	else
+		serv_got_typing_stopped(gc, from);
 }
 
 static void yahoo_process_message(struct gaim_connection *gc, struct yahoo_packet *pkt)
@@ -914,7 +914,7 @@
 	return 1;
 }
 
-int yahoo_send_typing(struct gaim_connection *gc, char *who)
+int yahoo_send_typing(struct gaim_connection *gc, char *who, int typ)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_TYPING, YAHOO_STATUS_TYPING, 0);//x6431de4f);
@@ -922,7 +922,7 @@
 	yahoo_packet_hash(pkt, 49, "TYPING");
 	yahoo_packet_hash(pkt, 1, gc->displayname);
 	yahoo_packet_hash(pkt, 14, " ");
-	yahoo_packet_hash(pkt, 13, "1");
+	yahoo_packet_hash(pkt, 13, typ ? "1" : "0");
 	yahoo_packet_hash(pkt, 5, who);
 	yahoo_packet_hash(pkt, 1002, "1");
 
@@ -930,7 +930,7 @@
 
 	yahoo_packet_free(pkt);
 
-	return YAHOO_TYPING_SEND_TIMEOUT;
+	return 0;
 }
 
 static void yahoo_set_away(struct gaim_connection *gc, char *state, char *msg)

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.105,1.106

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.

Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- oscar.c	4 Mar 2002 03:04:49 -0000	1.105
+++ oscar.c	4 Mar 2002 04:18:02 -0000	1.106
@@ -2404,20 +2404,12 @@
 	return "Oscar";
 }
 
-static void oscar_send_typing_stopped(struct gaim_connection *gc, char *name) {
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
-	struct direct_im *dim = find_direct_im(odata, name);
-	if (!dim)
-		return;
-	aim_send_typing(odata->sess, dim->conn, FALSE);
-}
-
-static int oscar_send_typing(struct gaim_connection *gc, char *name) {
+static int oscar_send_typing(struct gaim_connection *gc, char *name, int typing) {
 	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
 	struct direct_im *dim = find_direct_im(odata, name);
 	if (!dim)
 		return 0;
-	aim_send_typing(odata->sess, dim->conn, TRUE);
+	aim_send_typing(odata->sess, dim->conn, typing);
 	return 0;
 }
 
@@ -3545,7 +3537,6 @@
 	ret->close = oscar_close;
 	ret->send_im = oscar_send_im;
 	ret->send_typing = oscar_send_typing;
-	ret->send_typing_stopped = oscar_send_typing_stopped;
 	ret->set_info = oscar_set_info;
 	ret->get_info = oscar_get_info;
 	ret->set_away = oscar_set_away;

[Gaim-commits] CVS: gaim/src conversation.c,1.330,1.331 gaim.h,1.308,1.309 prpl.h,1.60,1.61 server.c,1.219,1.220

[Sean E. <sea...@us...>]

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

Modified Files:
	conversation.c gaim.h prpl.h server.c 
Log Message:
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.

Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- conversation.c	3 Mar 2002 23:53:28 -0000	1.330
+++ conversation.c	4 Mar 2002 04:18:02 -0000	1.331
@@ -903,7 +903,7 @@
 		char *txt = gtk_editable_get_chars(GTK_EDITABLE(c->entry), 0, -1);
 		if ((strlen(txt) == 0  && event->keyval < 256 && isprint(event->keyval)) ||
 		    (c->type_again != 0 && time(NULL) > c->type_again)) {
-			int timeout = serv_send_typing(c->gc, c->name);
+			int timeout = serv_send_typing(c->gc, c->name, TRUE);
 			if (timeout)
 				c->type_again = time(NULL) + timeout;
 			else
@@ -912,11 +912,11 @@
 		else if (strlen(txt) == 1) {
 			if ((GTK_OLD_EDITABLE(c->entry)->current_pos == 1 && event->keyval == GDK_BackSpace) ||
 			    (GTK_OLD_EDITABLE(c->entry)->current_pos == 0 && event->keyval == GDK_Delete))
-				serv_send_typing_stopped(c->gc, c->name);
+				serv_send_typing(c->gc, c->name, FALSE);
 		} else if (GTK_OLD_EDITABLE(c->entry)->selection_start_pos == 0) {
 			if (GTK_OLD_EDITABLE(c->entry)->selection_end_pos == strlen(txt) &&
 			    (event->keyval == GDK_BackSpace || event->keyval == GDK_Delete))
-				serv_send_typing_stopped(c->gc, c->name);
+				serv_send_typing(c->gc, c->name, FALSE);
 		}
 		g_free(txt);
 	}
@@ -2347,7 +2347,6 @@
 		return FALSE;
 	}
 		/* Reset the title (if necessary) */
-	debug_printf("resetting style\n");
 	if (c->is_chat) {
 		g_free(name);
 		c->typing_timeout = 0;

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- gaim.h	2 Mar 2002 04:52:21 -0000	1.308
+++ gaim.h	4 Mar 2002 04:18:02 -0000	1.309
@@ -360,8 +360,7 @@
 extern void serv_set_info(struct gaim_connection *, char *);
 extern void serv_set_away(struct gaim_connection *, char *, char *);
 extern void serv_set_away_all(char *);
-extern int  serv_send_typing(struct gaim_connection *, char *);
-extern void serv_send_typing_stopped(struct gaim_connection *, char *);
+extern int  serv_send_typing(struct gaim_connection *, char *, int);
 extern void serv_change_passwd(struct gaim_connection *, char *, char *);
 extern void serv_add_buddy(struct gaim_connection *, char *);
 extern void serv_add_buddies(struct gaim_connection *, GList *);

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- prpl.h	2 Mar 2002 04:52:21 -0000	1.60
+++ prpl.h	4 Mar 2002 04:18:02 -0000	1.61
@@ -104,8 +104,7 @@
 	void (* close)		(struct gaim_connection *);
 	int  (* send_im)	(struct gaim_connection *, char *who, char *message, int away);
 	void (* set_info)	(struct gaim_connection *, char *info);
-	int (* send_typing)    (struct gaim_connection *, char *name);
-	void (* send_typing_stopped)    (struct gaim_connection *, char *name);  
+	int  (* send_typing)    (struct gaim_connection *, char *name, int typing);
 	void (* get_info)	(struct gaim_connection *, char *who);
 	void (* set_away)	(struct gaim_connection *, char *state, char *message);
 	void (* get_away)       (struct gaim_connection *, char *who);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- server.c	2 Mar 2002 04:52:21 -0000	1.219
+++ server.c	4 Mar 2002 04:18:02 -0000	1.220
@@ -144,18 +144,14 @@
 
 /* This should return the elapsed time in seconds in which Gaim will not send
  * typing notifications.
- * if it returns zero, it will not send any more typing notifications */
-int serv_send_typing(struct gaim_connection *g, char *name) {
+ * if it returns zero, it will not send any more typing notifications 
+ * typing is a flag - TRUE for typing, FALSE for stopped typing */
+int serv_send_typing(struct gaim_connection *g, char *name, int typing) {
 	if (g && g->prpl && g->prpl->send_typing)
-		return g->prpl->send_typing(g, name);
+		return g->prpl->send_typing(g, name, typing);
 	else return 0;
 }
 
-void serv_send_typing_stopped(struct gaim_connection *g, char *name) {
-	if (g && g->prpl && g->prpl->send_typing_stopped)
-		g->prpl->send_typing_stopped(g, name);
-}
-
 int serv_send_im(struct gaim_connection *gc, char *name, char *message, int flags)
 {
 	int val = -EINVAL;
@@ -165,7 +161,7 @@
 	if (!(flags & IM_FLAG_AWAY))
 		serv_touch_idle(gc);
 
-	serv_send_typing_stopped(gc, name);
+	serv_send_typing(gc, name, FALSE);
 	return val;
 }
 

[Gaim-commits] CVS: gaim ChangeLog,1.402,1.403

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Improved typing notification for Yahoo so that it sends and recieves notification that the user has stopped typing.

Also, combined serv_send_typing and serv_send_typing_stopped... expect the same with serv_got_typing_stopped.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- ChangeLog	2 Mar 2002 19:39:57 -0000	1.402
+++ ChangeLog	4 Mar 2002 04:18:02 -0000	1.403
@@ -3,6 +3,7 @@
 version 0.54
 	* Compiles without GdkPixbuf again
 	* GtkIMHtml will refresh when you set a new GTK+ theme
+	* Improved Yahoo! typing notification (thanks Brian Macke)
 	
 version 0.53 (02/28/2002):
 	* Updated Polish Translation (thanks Przemyslaw Sulek)

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

[Sean E. <sea...@us...>]

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

Modified Files:
	oscar.c ssi.c 
Log Message:
Played with the font loader some more in gtkimhtml.c

This one is the closest I've done to Eric's, I think.  It should cause the least problems.

Also fixed the chatlist plugin again.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- oscar.c	3 Mar 2002 20:19:30 -0000	1.104
+++ oscar.c	4 Mar 2002 03:04:49 -0000	1.105
@@ -2768,7 +2768,7 @@
 	/* Delete the buddy list */
 	if (odata->icq) {
 		aim_ssi_deletelist(sess, fr->conn);
-		return;
+		return 1;
 	}
 
 	/* Activate SSI */

Index: ssi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssi.c	3 Mar 2002 02:53:46 -0000	1.3
+++ ssi.c	4 Mar 2002 03:04:49 -0000	1.4
@@ -212,7 +212,7 @@
  */
 faim_export int aim_ssi_deletelist(aim_session_t *sess, aim_conn_t *conn)
 {
-	int i, num;
+	int num;
 	struct aim_ssi_item *cur, **items;
 
 	for (cur=sess->ssi.items, num=0; cur; cur=cur->next)
@@ -853,7 +853,7 @@
  */
 faim_export int aim_ssi_setpermdeny(aim_session_t *sess, aim_conn_t *conn, int permdeny) {
 	struct aim_ssi_item *cur, *tmp;
-	fu16_t i, j;
+	fu16_t j;
 	aim_tlv_t *tlv;
 
 	if (!sess || !conn)

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.98,1.99

[Sean E. <sea...@us...>]

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

Modified Files:
	gtkimhtml.c 
Log Message:
Played with the font loader some more in gtkimhtml.c

This one is the closest I've done to Eric's, I think.  It should cause the least problems.

Also fixed the chatlist plugin again.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- gtkimhtml.c	3 Mar 2002 20:19:30 -0000	1.98
+++ gtkimhtml.c	4 Mar 2002 03:04:48 -0000	1.99
@@ -638,10 +638,7 @@
 	gc = gdk_gc_new (window);
 	cmap = gtk_widget_get_colormap (GTK_WIDGET (imhtml));
 	
-	if (line->selected) {
-		gdk_color_alloc (cmap, imhtml->default_hl_color);
-		gdk_gc_set_foreground(gc, imhtml->default_hl_color);
-	} else if (bit->bg != NULL) {
+	if (bit->bg != NULL) {
 		gdk_color_alloc (cmap, bit->bg);
 		gdk_gc_set_foreground (gc, bit->bg);
 	} else {
@@ -651,11 +648,14 @@
 
 	gdk_draw_rectangle (window, gc, TRUE, line->x - xoff, line->y - yoff, line->width, line->height);
 
-	if (bit->back != NULL) {
-		gdk_color_alloc (cmap, bit->back);
-		gdk_gc_set_foreground (gc, bit->back);
+	if (line->selected) {
+		gdk_color_alloc (cmap, imhtml->default_hl_color);
+		gdk_gc_set_foreground(gc, imhtml->default_hl_color);
 		gdk_draw_rectangle (window, gc, TRUE, line->x - xoff, line->y - yoff,
 				    width, line->height);
+	} else if (bit->back != NULL) {
+		gdk_color_alloc (cmap, bit->back);
+		gdk_gc_set_foreground (gc, bit->back);
 	}
 
 	if (bit->bm) {
@@ -2179,29 +2179,27 @@
 		/* If the font didn't load, we change some of the xlfds one by one
 		 * to get the closest we can.  */
 		if (!ret_font) {
-			if (!useregenc &&
-			    (!italics || italicsind == 2) && 
-			    !usebold && !usesize) {
-				useregenc = TRUE;
-				usebold = TRUE;
-				italicsind = 0;
-				usesize = TRUE;
-				if (names && !names[nameind++]) {
-					ret_font = gdk_font_ref(default_font);
-					break;
-				}
-			}	
-			if (useregenc)
+			if (useregenc) {
 				useregenc = FALSE;
-			else if (usesize) {
-				useregenc = TRUE;        
-				usesize = FALSE;
 			} else if (italics && italicsind != 2) {
 				useregenc = TRUE;
 				italicsind++;
-			} else if (usebold) {
+			} else if (bold && usebold) {
 				useregenc = TRUE;
+				italicsind=0;
 				usebold = FALSE;
+			} else if (usesize) {
+				useregenc = TRUE;        
+				italicsind = 0;
+				usebold = TRUE;
+				usesize = FALSE;
+				} else if (names && names[nameind++]) {
+				useregenc = TRUE;        
+				italicsind = 0;
+				usebold = TRUE;
+				usesize = TRUE;
+			} else {
+				ret_font = gdk_font_ref(default_font);
 			}
 		}
 		g_strfreev (names);