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

[Gaim-commits] CVS: gaim/doc gaim.1,1.49,1.50

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

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

Modified Files:
	gaim.1 
Log Message:
0.56



Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gaim.1	15 Mar 2002 04:47:58 -0000	1.49
+++ gaim.1	30 Mar 2002 05:22:15 -0000	1.50
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.55 \- Instant Messaging client
+Gaim v0.56 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim gaim.spec.in,1.40,1.41 ChangeLog,1.434,1.435 NEWS,1.121,1.122

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

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

Modified Files:
	gaim.spec.in ChangeLog NEWS 
Log Message:
here



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gaim.spec.in	15 Mar 2002 02:59:54 -0000	1.40
+++ gaim.spec.in	29 Mar 2002 20:15:05 -0000	1.41
@@ -99,6 +99,24 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 29 2002 Rob Flynn <ro...@ma...> (0.55 release)
+- Jabber improvements (Thanks Jim Seymour)
+- Various sound cleanups (Thanks Robert McQueen)
+- Login process shown in single window (Thanks Michael Golden)
+- Can reorder your accounts in the account editor (Thanks Luke Schierer)
+- Updated Dutch translation
+- Shows "mobile" icon for Oscar buddies using mobile devices (Thanks Mark Doliner)
+- Fixed bug in MSN smilies that crashed PPC (and other?) platforms
+- Updated Polish Translation (Thanks Przemyslaw Sulek)
+- Updated Spanish Translation (Thanks Amaya)
+- Updated French translation
+- Updated Finnish translation (Thanks Tero Kuusela)
+- HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)
+- Speling corections (Thanks Tero Kuusela)
+- Oscar list icon fixes (Thanks Mark Doliner)
+- Oscar idle times work again (Thanks Mark Doliner)
+- Protocol icons on Edit Buddies tab (Thanks Christian Hammond)
+
 * Thu Mar 14 2002 Rob Flynn <ro...@ma...> (0.54 release)
 - Compiles without GdkPixbuf again
 - GtkIMHtml will refresh when you set a new GTK+ theme

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -d -r1.434 -r1.435
--- ChangeLog	29 Mar 2002 13:31:02 -0000	1.434
+++ ChangeLog	29 Mar 2002 20:15:05 -0000	1.435
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.55:
+version 0.55 (03/29/2002):
 	* Jabber improvements (Thanks Jim Seymour)
 	* Various sound cleanups (Thanks Robert McQueen)
 	* Login process shown in single window (Thanks Michael 

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- NEWS	29 Mar 2002 04:13:57 -0000	1.121
+++ NEWS	29 Mar 2002 20:15:05 -0000	1.122
@@ -1,6 +1,11 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.55:
+0.55 (03/29/2002):
+	Rob: 0.55 is here. I've been away for a few days on business. Sean
+	has been on Spring Break. Therefore, this release is mostly a patch
+	release. It does fix some bugs and makes a few thing slightly cooler,
+	so it's better in that aspect, I suppose.  Enjoy.
+
 	Sean: This is mostly a bugfix release.  I'm on Spring Break, not
 	doing any coding at all.  But lots of people sent in great patches
 	anyway.  Thanks guys!

[Gaim-commits] CVS: gaim ChangeLog,1.433,1.434

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

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

Modified Files:
	ChangeLog 
Log Message:
Thanks again, ChipX86


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -d -r1.433 -r1.434
--- ChangeLog	29 Mar 2002 04:08:41 -0000	1.433
+++ ChangeLog	29 Mar 2002 13:31:02 -0000	1.434
@@ -19,6 +19,7 @@
 	* Speling corections (Thanks Tero Kuusela)
 	* Oscar list icon fixes (Thanks Mark Doliner)
 	* Oscar idle times work again (Thanks Mark Doliner)
+	* Protocol icons on Edit Buddies tab (Thanks Christian Hammond)	
 
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim/src buddy.c,1.296,1.297 gaim.h,1.315,1.316 multi.c,1.114,1.115

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

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

Modified Files:
	buddy.c gaim.h multi.c 
Log Message:
Now you can tell of which protocol you're editing buddies on.  Thanks Christian Hammond.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- buddy.c	28 Mar 2002 19:58:58 -0000	1.296
+++ buddy.c	29 Mar 2002 13:28:55 -0000	1.297
@@ -1161,7 +1161,36 @@
 	update_num_groups();
 }
 
+void
+create_prpl_icon(GtkWidget *widget, struct gaim_connection *gc,
+				 GdkPixmap **pixmap, GdkBitmap **mask)
+{
+    /* This whole thing is a hack--but it looks nice.
+     * Probably should have a prpl->icon(struct gaim_connection *) to
+     * do this. */
+	GtkStyle *style;
+	char **xpm = NULL; 
 
+	if (widget == NULL || gc == NULL || pixmap == NULL || mask == NULL)
+		return;
+	
+	style = gtk_widget_get_style( widget );
+	
+	if (gc->prpl->list_icon)
+		if (gc->prpl->protocol ==  PROTO_OSCAR) { 
+			if (isdigit(*gc->username)) {
+				xpm = gc->prpl->list_icon(0);
+			} else {
+				xpm = gc->prpl->list_icon(0x10);
+			}
+		} else { 
+			xpm = gc->prpl->list_icon (0);
+		}
+	if (xpm == NULL)
+		xpm = (char **)no_icon_xpm;
+	
+	*pixmap = gdk_pixmap_create_from_xpm_d(widget->window, mask, &style->bg[GTK_STATE_NORMAL], xpm);
+}
 
 void build_edit_tree()
 {
@@ -1185,10 +1214,18 @@
 		z = (struct gaim_connection *)con->data;
 
 		if (g_slist_length(connections) > 1) {
+			GdkPixmap *pixmap;
+			GdkBitmap *mask;
+
 			text[0] = z->username;
 
+			create_prpl_icon(blist, z, &pixmap, &mask);
+
 			c = gtk_ctree_insert_node(GTK_CTREE(edittree), NULL,
-						  NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1);
+						  NULL, text, 3, pixmap, mask, pixmap, mask, 0, 1);
+
+			gdk_pixmap_unref (pixmap);
+			gdk_bitmap_unref (mask);
 
 			gtk_ctree_node_set_row_data(GTK_CTREE(edittree), c, z);
 		} else
@@ -1197,6 +1234,7 @@
 		grp = z->groups;
 
 		while (grp) {
+			
 			g = (struct group *)grp->data;
 
 			text[0] = g->name;

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- gaim.h	17 Mar 2002 22:23:18 -0000	1.315
+++ gaim.h	29 Mar 2002 13:28:55 -0000	1.316
@@ -326,6 +326,8 @@
 extern void do_quit();
 extern void signoff(struct gaim_connection *);
 extern void do_pounce(struct gaim_connection *, char *, int);
+void create_prpl_icon(GtkWidget *widget, struct gaim_connection *gc,
+					  GdkPixmap **pixmap, GdkBitmap **mask);
 
 /* Functions in buddy_chat.c */
 extern void show_new_buddy_chat(struct conversation *);

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- multi.c	17 Mar 2002 21:49:56 -0000	1.114
+++ multi.c	29 Mar 2002 13:28:55 -0000	1.115
@@ -1074,27 +1074,8 @@
 	GdkPixmap *gdkpixmap;
 	GdkBitmap *mask;
 	GtkWidget *pixmap;
-	GtkStyle *style;
-	char **xpm = NULL; 
-	
-	style = gtk_widget_get_style( widget );
-	
-	if (gc->prpl->list_icon)
-		if (gc->prpl->protocol ==  PROTO_OSCAR) { 
-			/* This is such a bad hack to get the right icon
-			 * for OSCAR.  But it's pretty */
-			if (isdigit(*gc->username)) {
-				xpm = gc->prpl->list_icon(0);
-			} else {
-				xpm = gc->prpl->list_icon(0x10);
-			}
-		} else { 
-			xpm = gc->prpl->list_icon (0);
-		}
-	if (xpm == NULL)
-		xpm = (char **)no_icon_xpm;
-	
-	gdkpixmap = gdk_pixmap_create_from_xpm_d(widget->window, &mask, &style->bg[GTK_STATE_NORMAL], xpm);
+
+	create_prpl_icon (widget, gc, &gdkpixmap, &mask);
 			
 	pixmap = gtk_pixmap_new (gdkpixmap, mask);
 	gdk_pixmap_unref (gdkpixmap);

[Gaim-commits] CVS: gaim NEWS,1.120,1.121

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

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

Modified Files:
	NEWS 
Log Message:
SWEN


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- NEWS	15 Mar 2002 04:47:58 -0000	1.120
+++ NEWS	29 Mar 2002 04:13:57 -0000	1.121
@@ -1,6 +1,9 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
 0.55:
+	Sean: This is mostly a bugfix release.  I'm on Spring Break, not
+	doing any coding at all.  But lots of people sent in great patches
+	anyway.  Thanks guys!
 
 0.54 (03/14/2002):
 	Rob: Well, here we are. 0.54. We got a lot of fun things in this

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.36,1.37 oscar.c,1.127,1.128 ssi.c,1.6,1.7

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

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

Modified Files:
	aim.h oscar.c ssi.c 
Log Message:
Mark Doliner fixed idle times.  Thanks, Mark.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- aim.h	19 Mar 2002 06:26:05 -0000	1.36
+++ aim.h	29 Mar 2002 04:08:41 -0000	1.37
@@ -1016,6 +1016,7 @@
 	struct aim_ssi_item *next;
 };
 
+/* These build the actual SNACs and queue them to be sent */
 faim_export int aim_ssi_reqrights(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_reqdata(aim_session_t *sess, aim_conn_t *conn, time_t localstamp, fu16_t localrev);
 faim_export int aim_ssi_enable(aim_session_t *sess, aim_conn_t *conn);
@@ -1023,9 +1024,11 @@
 faim_export int aim_ssi_modbegin(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_modend(aim_session_t *sess, aim_conn_t *conn);
 
+/* These handle the local variables */
 faim_export int aim_ssi_inlist(aim_session_t *sess, aim_conn_t *conn, char *name, fu16_t type);
 faim_export char *aim_ssi_getparentgroup(aim_session_t *sess, aim_conn_t *conn, char *name);
-/* faim_export int aim_ssi_getpermdeny(aim_tlvlist_t *tlvlist); */
+faim_export int aim_ssi_getpermdeny(aim_session_t *sess, aim_conn_t *conn);
+faim_export fu32_t aim_ssi_getpresence(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_cleanlist(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_addbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num);
 faim_export int aim_ssi_addmastergroup(aim_session_t *sess, aim_conn_t *conn);
@@ -1037,6 +1040,7 @@
 faim_export int aim_ssi_deletelist(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_delpord(aim_session_t *sess, aim_conn_t *conn, char **sn, unsigned int num, fu16_t type);
 faim_export int aim_ssi_setpermdeny(aim_session_t *sess, aim_conn_t *conn, int permdeny);
+faim_export int aim_ssi_setpresence(aim_session_t *sess, aim_conn_t *conn, fu32_t presence);
 
 struct aim_icq_offlinemsg {
 	fu32_t sender;

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- oscar.c	28 Mar 2002 21:02:37 -0000	1.127
+++ oscar.c	29 Mar 2002 04:08:41 -0000	1.128
@@ -2251,8 +2251,11 @@
 
 	aim_reqservice(sess, fr->conn, AIM_CONN_TYPE_CHATNAV);
 
-	if (!odata->icq)
+	if (!odata->icq) {
+		debug_printf("ssi: requesting ssi list\n");
 		aim_ssi_reqrights(sess, fr->conn);
+		aim_ssi_reqdata(sess, fr->conn, sess->ssi.timestamp, sess->ssi.revision);
+	}
 
 	return 1;
 }
@@ -2781,9 +2784,6 @@
 
 	debug_printf("ssi rights: Max buddies = %d / Max groups = %d / Max permits = %d / Max denies = %d\n", maxbuddies, maxgroups, maxpermits, maxdenies);
 */
-	debug_printf("ssi: requesting ssi list\n");
-
-	aim_ssi_reqdata(sess, fr->conn, sess->ssi.timestamp, sess->ssi.revision);
 
 	return 1;
 }
@@ -2797,12 +2797,8 @@
 
 	debug_printf("ssi: syncing local list and server list\n");
 
-	if (odata->icq) {
-		/* Delete the buddy list */
-		debug_printf("ssi: using ICQ, removing ssi data\n");
-		aim_ssi_deletelist(sess, fr->conn);
+	if (odata->icq)
 		return 1;
-	}
 
 	/* Activate SSI */
 	debug_printf("ssi: activating server-stored buddy list\n");
@@ -2862,13 +2858,17 @@
 			case 0x0004: /* Permit/deny setting */
 				if (curitem->data) {
 					fu8_t permdeny;
-					if ((permdeny = aim_ssi_getpermdeny(curitem->data)) && (permdeny != gc->permdeny)) {
+					if ((permdeny = aim_ssi_getpermdeny(sess, fr->conn)) && (permdeny != gc->permdeny)) {
 						debug_printf("ssi: changing permdeny from %d to %d\n", gc->permdeny, permdeny);
 						gc->permdeny = permdeny;
 						tmp++;
 					}
 				}
 				break;
+
+			case 0x0005: /* Presence setting */
+				/* We don't want to change Gaim's setting because it applies to all accounts */
+				break;
 		} /* End of switch on curitem->type */
 	} /* End of for loop */
 	if (tmp)
@@ -2940,6 +2940,11 @@
 				free(sns);
 			}
 		}
+
+		/* Presence settings (idle time visibility) */
+		if ((tmp = aim_ssi_getpresence(sess, fr->conn)) != 0xFFFFFFFF)
+			if (report_idle && !(tmp & 0x400))
+				aim_ssi_setpresence(sess, fr->conn, tmp | 0x400);
 	}
 
 	return 1;

Index: ssi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ssi.c	20 Mar 2002 17:17:09 -0000	1.6
+++ ssi.c	29 Mar 2002 04:08:41 -0000	1.7
@@ -51,19 +51,6 @@
 }
 
 /*
- * Returns the permit/deny byte
- * This should be removed and the byte should be passed directly to
- * the handler for x0006, along with all the buddies and other info.
- */
-faim_export int aim_ssi_getpermdeny(aim_tlvlist_t *tlvlist)
-{
-	aim_tlv_t *tlv;
-	if ((tlv = aim_gettlv(tlvlist, 0x00ca, 1)) && tlv->value)
-		return tlv->value[0];
-	return 0;
-}
-
-/*
  * Returns a pointer to an item with the given name and type, or NULL if one does not exist.
  */
 static struct aim_ssi_item *get_ssi_item(struct aim_ssi_item *items, char *name, fu16_t type)
@@ -73,7 +60,7 @@
 		for (cur=items; cur; cur=cur->next)
 			if ((cur->type == type) && (cur->name) && !(aim_sncmp(cur->name, name)))
 				return cur;
-	 } else { /* return the master group */
+	 } else { /* return the given type with gid 0 */
 		for (cur=items; cur; cur=cur->next)
 			if ((cur->type == type) && (cur->gid == 0x0000))
 				return cur;
@@ -82,6 +69,44 @@
 }
 
 /*
+ * Returns the permit/deny byte
+ */
+faim_export int aim_ssi_getpermdeny(aim_session_t *sess, aim_conn_t *conn)
+{
+	struct aim_ssi_item *cur = get_ssi_item(sess->ssi.items, NULL, AIM_SSI_TYPE_PDINFO);
+	if (cur) {
+		aim_tlvlist_t *tlvlist = cur->data;
+		if (tlvlist) {
+			aim_tlv_t *tlv = aim_gettlv(tlvlist, 0x00ca, 1);
+			if (tlv && tlv->value)
+				return aimutil_get8(tlv->value);
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * Returns the presence flag
+ * I'm pretty sure this is a bitmask, but really have no evidence for that.
+ * 0x00000400 - Show up as visible to others
+ */
+faim_export fu32_t aim_ssi_getpresence(aim_session_t *sess, aim_conn_t *conn)
+{
+	struct aim_ssi_item *cur = get_ssi_item(sess->ssi.items, NULL, AIM_SSI_TYPE_PRESENCEPREFS);
+	if (cur) {
+		aim_tlvlist_t *tlvlist = cur->data;
+		if (tlvlist) {
+			aim_tlv_t *tlv = aim_gettlv(tlvlist, 0x00c9, 1);
+			if (tlv && tlv->length)
+				return aimutil_get32(tlv->value);
+		}
+	}
+
+	return 0xFFFFFFFF;
+}
+
+/*
  * Add the given packet to the holding queue.
  */
 static int aim_ssi_enqueue(aim_session_t *sess, aim_conn_t *conn, aim_frame_t *fr)
@@ -809,7 +834,7 @@
 		return -EINVAL;
 
 	/* Look up the permit/deny settings item */
-	for (cur=sess->ssi.items; (cur && (cur->type!=AIM_SSI_TYPE_PDINFO)); cur=cur->next);
+	cur = get_ssi_item(sess->ssi.items, NULL, AIM_SSI_TYPE_PDINFO);
 
 	if (cur) {
 		/* The permit/deny item exists */
@@ -845,6 +870,70 @@
 		cur->data = NULL;
 		aim_addtlvtochain8((aim_tlvlist_t**)&cur->data, 0x00ca, permdeny);
 		aim_addtlvtochain32((aim_tlvlist_t**)&cur->data, 0x00cb, 0xffffffff);
+
+		/* Add the item to our list */
+		cur->next = sess->ssi.items;
+		sess->ssi.items = cur;
+
+		/* Send the add item SNAC */
+		aim_ssi_addmoddel(sess, conn, &cur, 1, AIM_CB_SSI_ADD);
+	}
+
+	/* Begin sending SSI SNACs */
+	aim_ssi_dispatch(sess, conn);
+
+	return 0;
+}
+
+/*
+ * Stores your setting for whether you should show up as idle or not.
+ * presence is a bitmask (at least, I think so...)
+ * 0x00000400 if you want others to see your idle time
+ */
+faim_export int aim_ssi_setpresence(aim_session_t *sess, aim_conn_t *conn, fu32_t presence) {
+	struct aim_ssi_item *cur, *tmp;
+	fu16_t j;
+	aim_tlv_t *tlv;
+
+	if (!sess || !conn)
+		return -EINVAL;
+
+	/* Look up the item */
+	cur = get_ssi_item(sess->ssi.items, NULL, AIM_SSI_TYPE_PRESENCEPREFS);
+
+	if (cur) {
+		/* The item exists */
+		if (cur->data && (tlv = aim_gettlv(cur->data, 0x00c9, 1))) {
+			/* Just change the value of the x00c9 TLV */
+			if (tlv->length != 4) {
+				tlv->length = 4;
+				free(tlv->value);
+				tlv->value = (fu8_t *)malloc(4*sizeof(fu8_t));
+			}
+			aimutil_put32(tlv->value, presence);
+		} else {
+			/* Need to add the x00c9 TLV to the TLV chain */
+			aim_addtlvtochain32((aim_tlvlist_t**)&cur->data, 0x00c9, presence);
+		}
+
+		/* Send the mod item SNAC */
+		aim_ssi_addmoddel(sess, conn, &cur, 1, AIM_CB_SSI_MOD);
+	} else {
+		/* Need to add the item */
+		if (!(cur = (struct aim_ssi_item *)malloc(sizeof(struct aim_ssi_item))))
+			return -ENOMEM;
+		cur->name = NULL;
+		cur->gid = 0x0000;
+		cur->bid = 0x007a; /* XXX - Is this number significant? */
+		do {
+			cur->bid += 0x0001;
+			for (tmp=sess->ssi.items, j=0; ((tmp) && (!j)); tmp=tmp->next)
+				if (tmp->bid == cur->bid)
+					j=1;
+		} while (j);
+		cur->type = AIM_SSI_TYPE_PRESENCEPREFS;
+		cur->data = NULL;
+		aim_addtlvtochain32((aim_tlvlist_t**)&cur->data, 0x00c9, presence);
 
 		/* Add the item to our list */
 		cur->next = sess->ssi.items;

[Gaim-commits] CVS: gaim ChangeLog,1.432,1.433

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

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

Modified Files:
	ChangeLog 
Log Message:
Mark Doliner fixed idle times.  Thanks, Mark.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -d -r1.432 -r1.433
--- ChangeLog	29 Mar 2002 04:05:03 -0000	1.432
+++ ChangeLog	29 Mar 2002 04:08:41 -0000	1.433
@@ -18,6 +18,7 @@
 	* HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)	
 	* Speling corections (Thanks Tero Kuusela)
 	* Oscar list icon fixes (Thanks Mark Doliner)
+	* Oscar idle times work again (Thanks Mark Doliner)
 
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim ChangeLog,1.431,1.432

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

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

Modified Files:
	ChangeLog 
Log Message:
It's a joke ;)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -d -r1.431 -r1.432
--- ChangeLog	29 Mar 2002 03:48:51 -0000	1.431
+++ ChangeLog	29 Mar 2002 04:05:03 -0000	1.432
@@ -16,7 +16,7 @@
 	* Updated French translation
 	* Updated Finnish translation (Thanks Tero Kuusela)
 	* HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)	
-	* Spelling corections (Thanks Tero Kuusela)
+	* Speling corections (Thanks Tero Kuusela)
 	* Oscar list icon fixes (Thanks Mark Doliner)
 
 version 0.54 (03/14/2002):

[Gaim-commits] CVS: gaim ChangeLog,1.430,1.431

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

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

Modified Files:
	ChangeLog 
Log Message:
b


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -d -r1.430 -r1.431
--- ChangeLog	28 Mar 2002 20:07:45 -0000	1.430
+++ ChangeLog	29 Mar 2002 03:48:51 -0000	1.431
@@ -16,7 +16,7 @@
 	* Updated French translation
 	* Updated Finnish translation (Thanks Tero Kuusela)
 	* HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)	
-	* Speling corections (Thanks Tero Kuusela)
+	* Spelling corections (Thanks Tero Kuusela)
 	* Oscar list icon fixes (Thanks Mark Doliner)
 
 version 0.54 (03/14/2002):

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.126,1.127

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

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

Modified Files:
	oscar.c 
Log Message:
Whoops.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- oscar.c	28 Mar 2002 19:10:34 -0000	1.126
+++ oscar.c	28 Mar 2002 21:02:37 -0000	1.127
@@ -1725,6 +1725,8 @@
 				"<IMG SRC=\"admin_icon.gif\"> : Administrator <br>"
 				"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br>"
 				"<IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"));
+	} else {
+		legend[0] = 0;
 	}
 		
 	if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE) {

[Gaim-commits] CVS: gaim/src aim.c,1.177,1.178 gtkspell.c,1.15,1.16 gtkspell.h,1.3,1.4 util.c,1.114,1.115

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

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

Modified Files:
	aim.c gtkspell.c gtkspell.h util.c 
Log Message:
Jabber improvements (Jim Seymour) and good handling of sigchld (Jim Seymour and Luke Schierer)


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- aim.c	17 Mar 2002 22:23:17 -0000	1.177
+++ aim.c	28 Mar 2002 20:07:45 -0000	1.178
@@ -84,6 +84,28 @@
 
 void BuddyTickerCreateWindow(void);
 
+#if HAVE_SIGNAL_H
+/*
+ * Lists of signals we wish to catch and those we wish to ignore.
+ * Each list terminated with -1
+ */
+static int catch_sig_list[] = {
+	SIGSEGV,
+	SIGHUP,
+	SIGINT,
+	SIGTERM,
+	SIGQUIT,
+	SIGCHLD,
+	-1
+};
+
+static int ignore_sig_list[] = {
+	SIGPIPE,
+	-1
+};
+#endif
+
+
 void cancel_logon(void)
 {
 #ifdef USE_APPLET
@@ -408,6 +430,9 @@
 		break;
 	case SIGCHLD:
 		clean_pid();
+#if HAVE_SIGNAL_H
+		signal(SIGCHLD, sighandler);	/* restore signal catching on this one! */
+#endif
 		break;
 	default:
 		debug_printf("caught signal %d\n", sig);
@@ -527,6 +552,10 @@
 {
 	int opt_acct = 0, opt_help = 0, opt_version = 0, opt_login = 0, do_login_ret = -1;
 	char *opt_user_arg = NULL, *opt_login_arg = NULL;
+#if HAVE_SIGNAL_H
+	int sig_indx;	/* for setting up signal catching */
+	void (*prev_sig_disp)();
+#endif
 #ifndef USE_APPLET
 	int opt, opt_user = 0;
 	int i;
@@ -573,13 +602,23 @@
 
 #if HAVE_SIGNAL_H
 	/* Let's not violate any PLA's!!!! */
-	signal(SIGSEGV, sighandler);
-	signal(SIGHUP, sighandler);
-	signal(SIGINT, sighandler);
-	signal(SIGTERM, sighandler);
-	signal(SIGQUIT, sighandler);
-	signal(SIGPIPE, SIG_IGN);
-	signal(SIGCHLD, sighandler);
+	/* jseymour: whatever the fsck that means */
+	for(sig_indx = 0; catch_sig_list[sig_indx] != -1; ++sig_indx) {
+		if((prev_sig_disp = signal(catch_sig_list[sig_indx], sighandler)) == SIG_ERR) {
+			char errmsg[BUFSIZ];
+			sprintf(errmsg, "Warning: couldn't set signal %d for catching",
+				catch_sig_list[sig_indx]);
+			perror(errmsg);
+		}
+	}
+	for(sig_indx = 0; ignore_sig_list[sig_indx] != -1; ++sig_indx) {
+		if((prev_sig_disp = signal(ignore_sig_list[sig_indx], SIG_IGN)) == SIG_ERR) {
+			char errmsg[BUFSIZ];
+			sprintf(errmsg, "Warning: couldn't set signal %d to ignore",
+				ignore_sig_list[sig_indx]);
+			perror(errmsg);
+		}
+	}
 #endif
 
 

Index: gtkspell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gtkspell.c	15 Nov 2001 23:32:54 -0000	1.15
+++ gtkspell.c	28 Mar 2002 20:07:45 -0000	1.16
@@ -55,7 +55,18 @@
 static void set_up_signal();
 
 int gtkspell_running() {
-	return (spell_pid > 0);
+	return (spell_pid > 0? spell_pid : 0);
+}
+
+/*
+ * Set to "gtkspell not running" status
+ *
+ * May seem a bit silly, but it allows us to keep the file-global
+ * variable from going program-global.  And if we need to do
+ * something else additional later, well...
+ */
+void gtkspell_notrunning() {
+    spell_pid = 0;
 }
 
 /*
@@ -170,11 +181,6 @@
 		gtkspell_stop();
 	}
 
-	if (!signal_set_up) {
-		set_up_signal();
-		signal_set_up = 1;
-	}
-
 	pipe(fd_write);
 	pipe(fd_read);
 	pipe(fd_error);
@@ -689,21 +695,3 @@
 	gtkspell_uncheck_all(gtktext);
 }
 
-static void sigchld(int param) {
-	if (gtkspell_running() &&
-		(waitpid(spell_pid, NULL, WNOHANG) == spell_pid)) {
-		spell_pid = 0;
-	} else {
-		/* a default SIGCHLD handler.
-		 * what else to do here? */
-		waitpid(-1, NULL, WNOHANG);
-	}
-}
-
-static void set_up_signal() {
-	struct sigaction sigact;
-	memset(&sigact, 0, sizeof(struct sigaction));
-
-	sigact.sa_handler = sigchld;
-	sigaction(SIGCHLD, &sigact, NULL);
-}

Index: gtkspell.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkspell.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkspell.h	19 Jan 2001 09:11:16 -0000	1.3
+++ gtkspell.h	28 Mar 2002 20:07:45 -0000	1.4
@@ -55,12 +55,23 @@
 /* Is gtkspell running?
  *
  * Return:
- * 	nonzero if it running
+ * 	nonzero, positive pid if it's running
  * 	zero if is not running
  *
  * Example:
  *  if (gtkspell_running())
  *  	printf("gtkspell is running.\n");
+ */
+
+extern void gtkspell_notrunning(void);
+/*
+ * Set gtkspell status to "not running"
+ * Intended to be used only by signal-catcher
+ * when the SIGCHLD signal it catches matches
+ * the gtkspell process i.d.
+ *
+ * Example:
+ *	gtkspell_notrunning();
  */
 
 extern void gtkspell_attach(GtkText *text);

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- util.c	17 Mar 2002 22:23:18 -0000	1.114
+++ util.c	28 Mar 2002 20:07:45 -0000	1.115
@@ -35,6 +35,7 @@
 #include <math.h>
 #include "gaim.h"
 #include "prpl.h"
+#include "gtkspell.h"
 
 char *full_date()
 {
@@ -616,10 +617,18 @@
 void clean_pid(void)
 {
 	int status;
-	pid_t pid;
+	pid_t pid, spell_pid;
 
-	printf ("clean_pid\n");
-	pid = waitpid(-1, &status, WNOHANG);
+	while((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+		if((spell_pid = gtkspell_running()) != 0 && pid == spell_pid) {
+			gtkspell_notrunning();
+		}
+	}
+	if(pid < 0 && errno != ECHILD) {
+		char errmsg[BUFSIZ];
+		sprintf(errmsg, "Warning: waitpid() returned %d", pid);
+		perror(errmsg);
+	}
 }
 
 struct aim_user *find_user(const char *name, int protocol)

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.38,1.39

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

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

Modified Files:
	jabber.c 
Log Message:
Jabber improvements (Jim Seymour) and good handling of sigchld (Jim Seymour and Luke Schierer)


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- jabber.c	17 Mar 2002 20:23:33 -0000	1.38
+++ jabber.c	28 Mar 2002 20:07:45 -0000	1.39
@@ -401,14 +401,14 @@
 	if (!gjc || gjc->state == JCONN_STATE_OFF)
 		return;
 
-	if ((len = read(gjc->fd, buf, sizeof(buf) - 1))) {
+	if ((len = read(gjc->fd, buf, sizeof(buf))) > 0) {
 		struct jabber_data *jd = GJ_GC(gjc)->proto_data;
 		buf[len] = '\0';
 		debug_printf("input (len %d): %s\n", len, buf);
 		XML_Parse(gjc->parser, buf, len, 0);
 		if (jd->die)
 			signoff(GJ_GC(gjc));
-	} else if (len <= 0) {
+	} else if (len < 0 || errno != EAGAIN) {
 		STATE_EVT(JCONN_STATE_OFF)
 	}
 }
@@ -686,7 +686,7 @@
 /*
  * keep track of away msg same as yahoo plugin
  */
-static void jabber_track_away(gjconn gjc, jpacket p, char *name)
+static void jabber_track_away(gjconn gjc, jpacket p, char *name, char *type)
 {
 	struct jabber_data *jd = GJ_GC(gjc)->proto_data;
 	gpointer val = g_hash_table_lookup(jd->hash, name);
@@ -695,15 +695,19 @@
 	char *status = NULL;
 	char *msg = NULL;
 
-	if((show = xmlnode_get_tag_data(p->x, "show")) != NULL) {
-		if (!strcasecmp(show, "away")) {
-			vshow = _("Away");
-		} else if (!strcasecmp(show, "chat")) {
-			vshow = _("Online");
-		} else if (!strcasecmp(show, "xa")) {
-			vshow = _("Extended Away");
-		} else if (!strcasecmp(show, "dnd")) {
-			vshow = _("Do Not Disturb");
+	if (type && (strcasecmp(type, "unavailable") == 0)) {
+		vshow = _("Unavailable");
+	} else {
+		if((show = xmlnode_get_tag_data(p->x, "show")) != NULL) {
+			if (!strcasecmp(show, "away")) {
+				vshow = _("Away");
+			} else if (!strcasecmp(show, "chat")) {
+				vshow = _("Online");
+			} else if (!strcasecmp(show, "xa")) {
+				vshow = _("Extended Away");
+			} else if (!strcasecmp(show, "dnd")) {
+				vshow = _("Do Not Disturb");
+			}
 		}
 	}
 
@@ -715,6 +719,8 @@
 			(vshow == NULL? "" : vshow),
 			(vshow == NULL || status == NULL? "" : ": "),
 			(status == NULL? "" : status));
+	} else {
+		msg = g_strdup(_("Online"));
 	}
 
 	if (val) {
@@ -845,11 +851,12 @@
 				if (!find_chat_buddy(jc->b, p->from->resource)) {
 					add_chat_buddy(jc->b, p->from->resource);
 				} else if ((y = xmlnode_get_tag(p->x, "status"))) {
-					char buf[8192];
+					char *buf;
 
-					g_snprintf(buf, sizeof(buf), "%s@%s/%s",
+					buf = g_strdup_printf("%s@%s/%s",
 						p->from->user, p->from->server, p->from->resource);
-					jabber_track_away(gjc, p, buf);
+					jabber_track_away(gjc, p, buf, NULL);
+					g_free(buf);
 
 				}
 			} else if (jc->b && msg) {
@@ -949,6 +956,9 @@
 				resources = resources->next;
 			}
 
+		/* keep track of away msg same as yahoo plugin */
+		jabber_track_away(gjc, p, normalize(b->name), type);
+
 		if (type && (strcasecmp(type, "unavailable") == 0)) {
 			if (resources) {
 				g_free(resources->data);
@@ -958,9 +968,6 @@
 				serv_got_update(GJ_GC(gjc), buddy, 0, 0, 0, 0, 0, 0);
 			}
 		} else {
-			/* keep track of away msg same as yahoo plugin */
-			jabber_track_away(gjc, p, normalize(b->name));
-
 			if (!resources) {
 				b->proto_data = g_slist_append(b->proto_data, g_strdup(res));
 			}
@@ -970,6 +977,12 @@
 		}
 	} else {
 		if (who->resource) {
+			char *buf;
+
+			buf = g_strdup_printf("%s@%s/%s", who->user, who->server, who->resource);
+			jabber_track_away(gjc, p, buf, type);
+			g_free(buf);
+
 			if (type && !strcasecmp(type, "unavailable")) {
 				struct jabber_data *jd;
 				if (!jc && !(jc = find_existing_chat(GJ_GC(gjc), who))) {
@@ -998,11 +1011,6 @@
 				}
 				if (!find_chat_buddy(jc->b, who->resource)) {
 					add_chat_buddy(jc->b, who->resource);
-				} else {
-					char buf[8192];
-					g_snprintf(buf, sizeof(buf), "%s@%s/%s",
-						who->user, who->server, who->resource);
-					jabber_track_away(gjc, p, buf);
 				}
 			}
 		}
@@ -1544,6 +1552,63 @@
 	return 1;
 }
 
+/*
+ * Add/update buddy's roster entry on server
+ */
+static void jabber_roster_update(struct gaim_connection *gc, char *name)
+{
+	xmlnode x, y;
+	char *realwho;
+	gjconn gjc;
+	struct buddy *buddy = NULL;
+	struct group *buddy_group = NULL;
+	
+	if(gc && gc->proto_data && ((struct jabber_data *)gc->proto_data)->gjc && name) {
+		gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+
+		if (!strchr(name, '@'))
+			realwho = g_strdup_printf("%s@%s", name, gjc->user->server);
+		else {
+			jid who = jid_new(gjc->p, name);
+			if (who->user == NULL) {
+				/* FIXME: transport */
+				return;
+			}
+			realwho = g_strdup_printf("%s@%s", who->user, who->server);
+		}
+
+
+		x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
+		y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
+		xmlnode_put_attrib(y, "jid", realwho);
+
+
+		/* If we can find the buddy, there's an alias for him, it's not 0-length
+		 * and it doesn't match his JID, add the "name" attribute.
+		 */
+		if((buddy = find_buddy(gc, realwho)) != NULL &&
+			buddy->show != NULL && strcmp(realwho, buddy->show)) {
+
+			xmlnode_put_attrib(y, "name", buddy->show);
+		}
+
+		/*
+		 * Find out what group the buddy's in and send that along
+		 * with the roster item.
+		 */
+		if((buddy_group = find_group_by_buddy(gc, realwho)) != NULL) {
+			xmlnode z;
+			z = xmlnode_insert_tag(y, "group");
+			xmlnode_insert_cdata(z, buddy_group->name, -1);
+		}
+
+		gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
+
+		xmlnode_free(x);
+		g_free(realwho);
+	}
+}
+
 static void jabber_add_buddy(struct gaim_connection *gc, char *name)
 {
 	xmlnode x, y;
@@ -1572,39 +1637,14 @@
 		realwho = g_strdup_printf("%s@%s", who->user, who->server);
 	}
 
-
-	x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
-	y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
-	xmlnode_put_attrib(y, "jid", realwho);
-
-	/* If we can find the buddy, there's an alias for him and
-	 * it's not 0-length, add the "name" attribute.
-	 */
-	if((buddy = find_buddy(gc, realwho)) != NULL &&
-		buddy->show != NULL && (buddy->show)[0] != '\0') {
-
-		xmlnode_put_attrib(y, "name", buddy->show);
-	}
-
-	/*
-	 * Find out what group the buddy's in and send that along
-	 * with the roster item.
-	 */
-	if((buddy_group = find_group_by_buddy(gc, realwho)) != NULL) {
-		xmlnode z;
-		z = xmlnode_insert_tag(y, "group");
-		xmlnode_insert_cdata(z, buddy_group->name, -1);
-	}
-
-	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
-	xmlnode_free(x);
-
 	x = xmlnode_new_tag("presence");
 	xmlnode_put_attrib(x, "to", realwho);
 	xmlnode_put_attrib(x, "type", "subscribe");
 	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
 	xmlnode_free(x);
 
+	jabber_roster_update(gc, realwho);
+
 	g_free(realwho);
 }
 
@@ -1976,7 +2016,7 @@
 	*ap++ = g_strdup_printf("<B>Jabber ID:</B> %s<BR>\n", realwho);
 
 	if((status = g_hash_table_lookup(jd->hash, realwho)) == NULL) {
-		status = _("Online");
+		status = _("Unknown");
 	}
 	*ap++ = g_strdup_printf("<B>Status:</B> %s<BR>\n", status);
 
@@ -2315,7 +2355,7 @@
 	}
 
 	if((status = g_hash_table_lookup(jd->hash, buddy)) == NULL) {
-		status = _("Online");
+		status = _("Unknown");
 	}
 	*ap++ = g_strdup_printf("<B>Status:</B> %s<BR>\n", status);
 

[Gaim-commits] CVS: gaim ChangeLog,1.429,1.430

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

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

Modified Files:
	ChangeLog 
Log Message:
Jabber improvements (Jim Seymour) and good handling of sigchld (Jim Seymour and Luke Schierer)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- ChangeLog	28 Mar 2002 19:10:34 -0000	1.429
+++ ChangeLog	28 Mar 2002 20:07:45 -0000	1.430
@@ -1,8 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.55:
-	* Better Jabber list management when using multiple
-	  resources (Thanks Jim Seymour)
+	* Jabber improvements (Thanks Jim Seymour)
 	* Various sound cleanups (Thanks Robert McQueen)
 	* Login process shown in single window (Thanks Michael 
 	  Golden)

[Gaim-commits] CVS: gaim/src buddy.c,1.295,1.296

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

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

Modified Files:
	buddy.c 
Log Message:
Aliased Logged in / Logged out messages. Thanks Andrew Echols!


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- buddy.c	28 Mar 2002 19:45:06 -0000	1.295
+++ buddy.c	28 Mar 2002 19:58:58 -0000	1.296
@@ -2174,12 +2174,12 @@
 				struct conversation *c = find_conversation(b->name);
 				if (c) {
 					char tmp[1024];
-					g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name);
+					g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->show);
 					write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 				} else if (clistqueue && find_queue_total_by_name(b->name)) {
 					struct queued_message *qm = g_new0(struct queued_message, 1);
 					g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-					qm->message = g_strdup_printf(_("%s logged in."), b->name);
+					qm->message = g_strdup_printf(_("%s logged in."), b->show);
 					qm->gc = gc;
 					qm->tm = time(NULL);
 					qm->flags = WFLAG_SYSTEM;
@@ -2238,12 +2238,12 @@
 			struct conversation *c = find_conversation(b->name);
 			if (c) {
 				char tmp[1024];
-				g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name);
+				g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->show);
 				write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 			} else if (clistqueue && find_queue_total_by_name(b->name)) {
 				struct queued_message *qm = g_new0(struct queued_message, 1);
 				g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-				qm->message = g_strdup_printf(_("%s logged out."), b->name);
+				qm->message = g_strdup_printf(_("%s logged out."), b->show);
 				qm->gc = gc;
 				qm->tm = time(NULL);
 				qm->flags = WFLAG_SYSTEM;

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

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

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

Modified Files:
	buddy.c 
Log Message:
Thanks Daniel Walls


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- buddy.c	17 Mar 2002 22:23:18 -0000	1.294
+++ buddy.c	28 Mar 2002 19:45:06 -0000	1.295
@@ -859,7 +859,6 @@
 		if (bs) {
 			if (g_slist_find(bs->connlist, gc)) {
 				bs->connlist = g_slist_remove(bs->connlist, gc);
-				update_num_group(gs);
 				if (!g_slist_length(bs->connlist)) {
 					gs->members = g_slist_remove(gs->members, bs);
 					if (bs->log_timer > 0)
@@ -879,6 +878,8 @@
 				}
 			}
 		}
+		if (gs)
+			update_num_group(gs);
 	}
 
 	c = find_conversation(rem_b->name);

[Gaim-commits] CVS: gaim/src dialogs.c,1.314,1.315

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

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

Modified Files:
	dialogs.c 
Log Message:
whoops


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- dialogs.c	28 Mar 2002 19:10:34 -0000	1.314
+++ dialogs.c	28 Mar 2002 19:25:00 -0000	1.315
@@ -1856,7 +1856,7 @@
 	if (!g_strcasecmp(url, "wireless_icon.gif"))
 		return wireless_icon_xpm;
 	if (!g_strcasecmp(url, "icq_icon.gif"))
-		return icon_online_xpm
+		return icon_online_xpm;
 	return NULL;
 }
 

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.125,1.126

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

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

Modified Files:
	oscar.c 
Log Message:
Correctly show list icons from icq and wireless oscar users.  Also correctly set icq user class for away.  Thanks, Mark Doliner.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- oscar.c	20 Mar 2002 20:10:37 -0000	1.125
+++ oscar.c	28 Mar 2002 19:10:34 -0000	1.126
@@ -1612,16 +1612,18 @@
 
 static char *images(int flags) {
 	static char buf[1024];
-	g_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s",
+	g_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s",
 			(flags & AIM_FLAG_ACTIVEBUDDY) ? "<IMG SRC=\"ab_icon.gif\">" : "",
 			(flags & AIM_FLAG_UNCONFIRMED) ? "<IMG SRC=\"dt_icon.gif\">" : "",
 			(flags & AIM_FLAG_AOL) ? "<IMG SRC=\"aol_icon.gif\">" : "",
+			(flags & AIM_FLAG_ICQ) ? "<IMG SRC=\"icq_icon.gif\">" : "",
 			(flags & AIM_FLAG_ADMINISTRATOR) ? "<IMG SRC=\"admin_icon.gif\">" : "",
 			(flags & AIM_FLAG_FREE) ? "<IMG SRC=\"free_icon.gif\">" : "",
 			(flags & AIM_FLAG_WIRELESS) ? "<IMG SRC=\"wireless_icon.gif\">" : "");
 	return buf;
 }
 
+
 /* XXX This is horribly copied from ../../buddy.c. */
 static char *caps_string(guint caps)
 {
@@ -1714,15 +1716,17 @@
 	prof = va_arg(ap, char *);
 	va_end(ap);
 
-	g_snprintf(legend, sizeof legend,
-			_("<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br>"
-			"<IMG SRC=\"free_icon.gif\"> : Normal AIM User<br>"
-			"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
-			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
-			"<IMG SRC=\"admin_icon.gif\"> : Administrator <br>"
-			"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br>"
-			"<IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"));
-
+	if (!od->icq) {
+		g_snprintf(legend, sizeof legend,
+				_("<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br>"
+				"<IMG SRC=\"free_icon.gif\"> : Normal AIM User<br>"
+				"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
+				"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
+				"<IMG SRC=\"admin_icon.gif\"> : Administrator <br>"
+				"<IMG SRC=\"ab_icon.gif\"> : ActiveBuddy Interactive Agent<br>"
+				"<IMG SRC=\"wireless_icon.gif\"> : Wireless Device User<br>"));
+	}
+		
 	if (info->present & AIM_USERINFO_PRESENT_ONLINESINCE) {
 		onlinesince = g_strdup_printf("Online Since : <B>%s</B><BR>\n",
 					asctime(localtime(&info->onlinesince)));
@@ -2618,7 +2622,7 @@
 		aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_DND);
 		gc->away = "";
 	} else if (!strcmp(state, "Not Available")) {
-		aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT);
+		aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY);
 		gc->away = "";
 	} else if (!strcmp(state, "Occupied")) {
 		aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_BUSY);
@@ -2631,7 +2635,7 @@
 		gc->away = "";
 	} else if (!strcmp(state, GAIM_AWAY_CUSTOM)) {
 	 	if (message) {
-			aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT);
+			aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY);
 			gc->away = "";
 		} else {
 		  
@@ -3094,24 +3098,24 @@
 		return (char **)icon_online_xpm;
 	if (uc & 0xff80) {
 		uc >>= 7;
-		if (uc & AIM_ICQ_STATE_AWAY)
-			return icon_away_xpm;
-		if (uc & AIM_ICQ_STATE_DND)
-			return icon_dnd_xpm;
-		if (uc & AIM_ICQ_STATE_OUT)
-			return icon_na_xpm;
-		if (uc & AIM_ICQ_STATE_BUSY)
-			return icon_occ_xpm;
-		if (uc & AIM_ICQ_STATE_CHAT)
-			return icon_ffc_xpm;
 		if (uc & AIM_ICQ_STATE_INVISIBLE)
 			return icon_offline_xpm;
+		if (uc & AIM_ICQ_STATE_CHAT)
+			return icon_ffc_xpm;
+		if (uc & AIM_ICQ_STATE_BUSY)
+		 	return icon_occ_xpm;
+		if (uc & AIM_ICQ_STATE_OUT)
+			return icon_na_xpm;
+		if (uc & AIM_ICQ_STATE_DND)
+		 	return icon_dnd_xpm;
+		if (uc & AIM_ICQ_STATE_AWAY)
+			return icon_away_xpm;
 		return icon_online_xpm;
 	}
-	if (uc & UC_WIRELESS)
-		return (char **)wireless_icon_xpm;
 	if (uc & UC_UNAVAILABLE)
 		return (char **)away_icon_xpm;
+	if (uc & UC_WIRELESS)
+		return (char **)wireless_icon_xpm;
 	if (uc & UC_AB)
 		return (char **)ab_xpm;
 	if (uc & UC_AOL)

[Gaim-commits] CVS: gaim/src dialogs.c,1.313,1.314

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

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

Modified Files:
	dialogs.c 
Log Message:
Correctly show list icons from icq and wireless oscar users.  Also correctly set icq user class for away.  Thanks, Mark Doliner.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- dialogs.c	19 Mar 2002 07:15:43 -0000	1.313
+++ dialogs.c	28 Mar 2002 19:10:34 -0000	1.314
@@ -80,6 +80,7 @@
 #include "pixmaps/admin_icon.xpm"
 #include "pixmaps/ab.xpm"
 #include "pixmaps/wireless_icon.xpm"
+#include "pixmaps/gnomeicu-online.xpm"
 
 #define PATHSIZE 1024
 
@@ -1854,6 +1855,8 @@
 		return ab_xpm;
 	if (!g_strcasecmp(url, "wireless_icon.gif"))
 		return wireless_icon_xpm;
+	if (!g_strcasecmp(url, "icq_icon.gif"))
+		return icon_online_xpm
 	return NULL;
 }
 

[Gaim-commits] CVS: gaim ChangeLog,1.428,1.429

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

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

Modified Files:
	ChangeLog 
Log Message:
Correctly show list icons from icq and wireless oscar users.  Also correctly set icq user class for away.  Thanks, Mark Doliner.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- ChangeLog	28 Mar 2002 18:22:48 -0000	1.428
+++ ChangeLog	28 Mar 2002 19:10:34 -0000	1.429
@@ -18,6 +18,7 @@
 	* Updated Finnish translation (Thanks Tero Kuusela)
 	* HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)	
 	* Speling corections (Thanks Tero Kuusela)
+	* Oscar list icon fixes (Thanks Mark Doliner)
 
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.45,1.46

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

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

Modified Files:
	toc.c 
Log Message:
Some spelling corrections by Tero Kuusela.  Thanks.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- toc.c	19 Mar 2002 16:09:41 -0000	1.45
+++ toc.c	28 Mar 2002 18:22:49 -0000	1.46
@@ -471,7 +471,7 @@
                 g_snprintf(buf, sizeof(buf), _("An unknown signon error has occurred: %s."), w);
                 break;
         default:
-                g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occured.  Info: %s"), no, w);
+                g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occurred.  Info: %s"), no, w);
 	}
 
         return buf;
@@ -779,7 +779,7 @@
 	} else if (!strcasecmp(c, "DIR_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_NICK_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_PASSWD_STATUS")) {
-		do_error_dialog(_("Password Change Successeful"), _("Gaim - Password Change"));
+		do_error_dialog(_("Password Change Successful"), _("Gaim - Password Change"));
 	} else if (!strcasecmp(c, "PAUSE")) {
 		tdt->state = STATE_PAUSE;
 		do_error_dialog(_("TOC has sent a PAUSE command. When this happens, TOC ignores"

[Gaim-commits] CVS: gaim/src/protocols/gg gg.c,1.18,1.19

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

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

Modified Files:
	gg.c 
Log Message:
Some spelling corrections by Tero Kuusela.  Thanks.


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gg.c	12 Mar 2002 17:21:43 -0000	1.18
+++ gg.c	28 Mar 2002 18:22:49 -0000	1.19
@@ -191,10 +191,10 @@
 		g_snprintf(msg, sizeof(msg), _("Error while reading from socket."));
 		break;
 	case GG_FAILURE_WRITING:
-		g_snprintf(msg, sizeof(msg), _("Error while writting to socket."));
+		g_snprintf(msg, sizeof(msg), _("Error while writing to socket."));
 		break;
 	case GG_FAILURE_PASSWORD:
-		g_snprintf(msg, sizeof(msg), _("Authentification failed."));
+		g_snprintf(msg, sizeof(msg), _("Authentication failed."));
 		break;
 	default:
 		g_snprintf(msg, sizeof(msg), _("Unknown Error Code."));
@@ -591,7 +591,7 @@
 	gchar *imsg;
 
 	if (invalid_uin(who)) {
-		do_error_dialog(_("You are trying to send message to invalid Gadu-Gadu UIN!"),
+		do_error_dialog(_("You are trying to send a message to an invalid Gadu-Gadu UIN."),
 				_("Gadu-Gadu Error"));
 		return -1;
 	}
@@ -812,31 +812,31 @@
 static void export_buddies_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "put_success:")) {
-		do_error_dialog(_("Buddies List sucessfully transfered into Server"),
+		do_error_dialog(_("Buddy List successfully transferred to server"),
 				_("Gadu-Gadu Information"));
 		return;
 	}
 
 	debug_printf("export_buddies_server_results: webdata [%s]\n", webdata);
-	do_error_dialog(_("Couldn't transfer Buddies List into Server"), _("Gadu-Gadu Error"));
+	do_error_dialog(_("Couldn't transfer Buddy List to server"), _("Gadu-Gadu Error"));
 }
 
 static void delete_buddies_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "put_success:")) {
-		do_error_dialog(_("Buddies List sucessfully deleted from Server"),
+		do_error_dialog(_("Buddy List sucessfully deleted from server"),
 				_("Gadu-Gadu Information"));
 		return;
 	}
 
 	debug_printf("delete_buddies_server_results: webdata [%s]\n", webdata);
-	do_error_dialog(_("Couldn't delete Buddies List from Server"), _("Gadu-Gadu Error"));
+	do_error_dialog(_("Couldn't delete Buddy List from server"), _("Gadu-Gadu Error"));
 }
 
 static void password_change_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "reg_success:")) {
-		do_error_dialog(_("Password changed sucessfully"),
+		do_error_dialog(_("Password changed successfully"),
 				_("Gadu-Gadu Information"));
 		return;
 	}

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

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

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

Modified Files:
	html.c 
Log Message:
Some spelling corrections by Tero Kuusela.  Thanks.


Index: html.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/html.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- html.c	2 Nov 2001 01:41:37 -0000	1.24
+++ html.c	28 Mar 2002 18:22:48 -0000	1.25
@@ -180,7 +180,7 @@
 		gunk->webdata = g_realloc(gunk->webdata, gunk->len + 1);
 		gunk->webdata[gunk->len] = 0;
 
-		debug_printf(_("Receieved: '%s'\n"), gunk->webdata);
+		debug_printf(_("Received: '%s'\n"), gunk->webdata);
 
 		gaim_input_remove(gunk->inpa);
 		close(sock);

[Gaim-commits] CVS: gaim ChangeLog,1.427,1.428

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

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

Modified Files:
	ChangeLog 
Log Message:
Some spelling corrections by Tero Kuusela.  Thanks.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -d -r1.427 -r1.428
--- ChangeLog	28 Mar 2002 18:03:12 -0000	1.427
+++ ChangeLog	28 Mar 2002 18:22:48 -0000	1.428
@@ -17,6 +17,7 @@
 	* Updated French translation
 	* Updated Finnish translation (Thanks Tero Kuusela)
 	* HTTP Proxy settings now HTTP compliant (Thanks Robert McQueen)	
+	* Speling corections (Thanks Tero Kuusela)
 
 version 0.54 (03/14/2002):
 	* Compiles without GdkPixbuf again

[Gaim-commits] CVS: gaim/src gaimrc.c,1.93,1.94

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

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

Modified Files:
	gaimrc.c 
Log Message:
A fix by Robert McQueen to his sound code cleanups.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- gaimrc.c	26 Feb 2002 23:06:53 -0000	1.93
+++ gaimrc.c	28 Mar 2002 18:05:48 -0000	1.94
@@ -773,7 +773,7 @@
 	}
 
 	/* this is where we do bugs and compatibility stuff */
-	if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_ESD | OPT_SOUND_NORMAL | OPT_SOUND_NAS | OPT_SOUND_ARTSC)))
+	if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_ESD | OPT_SOUND_NORMAL | OPT_SOUND_NAS | OPT_SOUND_ARTSC | OPT_SOUND_CMD)))
 		sound_options |= OPT_SOUND_ESD | OPT_SOUND_NORMAL | OPT_SOUND_NAS | OPT_SOUND_ARTSC;
 
 	if (conv_size.width == 0 &&

[Gaim-commits] CVS: gaim/src proxy.c,1.40,1.41

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

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

Modified Files:
	proxy.c 
Log Message:
HTTP Proxy now HTTP compliant.


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- proxy.c	30 Jan 2002 02:40:59 -0000	1.40
+++ proxy.c	28 Mar 2002 18:03:14 -0000	1.41
@@ -276,7 +276,7 @@
 	}
 	fcntl(source, F_SETFL, 0);
 
-	g_snprintf(cmd, sizeof(cmd), "CONNECT %s:%d HTTP/1.1\r\nHost = %s:%d\r\n", phb->host, phb->port,
+	g_snprintf(cmd, sizeof(cmd), "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\n", phb->host, phb->port,
 		   phb->host, phb->port);
 	if (send(source, cmd, strlen(cmd), 0) < 0) {
 		close(source);