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

[Gaim-commits] CVS: gaim ChangeLog,1.542,1.543

[Christian H. <ch...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Fixy v2.0.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- ChangeLog	14 Sep 2002 05:25:12 -0000	1.542
+++ ChangeLog	14 Sep 2002 05:25:43 -0000	1.543
@@ -69,9 +69,9 @@
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
 	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
 	  Arun Tharuvai)
-	* /topic when not an op now displays the current topic(thanks Mark 
+	* /topic when not an op now displays the current topic (Thanks Mark 
 	  Doliner)
-	* i18n fixes (thanks Matt Wilson)
+	* i18n fixes (Thanks Matt Wilson)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim ChangeLog,1.541,1.542

[Christian H. <ch...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Fixy.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -d -r1.541 -r1.542
--- ChangeLog	14 Sep 2002 03:17:03 -0000	1.541
+++ ChangeLog	14 Sep 2002 05:25:12 -0000	1.542
@@ -69,9 +69,9 @@
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
 	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
 	  Arun Tharuvai)
-	*/topic when not an op now displays the current topic(thanks Mark 
-	 Doliner)
-	*i18n fixes (thanks Matt Wilson)
+	* /topic when not an op now displays the current topic(thanks Mark 
+	  Doliner)
+	* i18n fixes (thanks Matt Wilson)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.108.2.3,1.108.2.4

[Luke S. <lsc...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	gtkimhtml.c 
Log Message:
and the i18n fixes from msw and paco-paco again.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.108.2.3
retrieving revision 1.108.2.4
diff -u -d -r1.108.2.3 -r1.108.2.4
--- gtkimhtml.c	30 Aug 2002 11:54:54 -0000	1.108.2.3
+++ gtkimhtml.c	14 Sep 2002 03:19:22 -0000	1.108.2.4
@@ -2216,8 +2216,6 @@
 			ret_font = gdk_font_load (tmp); 
 		else {
 			/* For some reason, fontsets must end with a single * as an xlfd */
-			gchar *garbage = tmp;
-			tmp = g_strconcat(garbage, ",*", NULL);
 			ret_font = gdk_fontset_load (tmp); 
 		}
 		/* If the font didn't load, we change some of the xlfds one by one

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.81,1.82

[Luke S. <lsc...@us...>]

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

Modified Files:
	irc.c 
Log Message:
i18n fixes from paco-paco and msw, /topic fix from kingant. get the i18n fixes
into gtk1-stable and i'm done for the night. 


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- irc.c	29 Aug 2002 01:47:14 -0000	1.81
+++ irc.c	14 Sep 2002 03:17:05 -0000	1.82
@@ -1592,11 +1592,14 @@
 		irc_write(id->fd, buf, strlen(buf));
 	} else if (!g_strcasecmp(pdibuf, "TOPIC")) {
 		if (!*word_eol[2]) {
-			g_free(what);
-			return -EINVAL;
+			struct conversation *c;
+			c = irc_find_chat(gc, who);
+			g_snprintf(buf, sizeof(buf), _("Topic for %s is %s"), who, c->topic ? c->topic : "(no topic set)");
+			write_to_conv(c, buf, WFLAG_SYSTEM | WFLAG_NOLOG, NULL, time(NULL), -1);
+		} else {
+			g_snprintf(buf, sizeof(buf), "TOPIC %s :%s\r\n", who, word_eol[2]);
+			irc_write(id->fd, buf, strlen(buf));
 		}
-		g_snprintf(buf, sizeof(buf), "TOPIC %s :%s\r\n", who, word_eol[2]);
-		irc_write(id->fd, buf, strlen(buf));
 	} else if (!g_strcasecmp(pdibuf, "NICK")) {
 		if (!*word_eol[2]) {
 			g_free(what);

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.119,1.120

[Luke S. <lsc...@us...>]

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

Modified Files:
	gtkimhtml.c 
Log Message:
i18n fixes from paco-paco and msw, /topic fix from kingant. get the i18n fixes
into gtk1-stable and i'm done for the night. 


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- gtkimhtml.c	29 Aug 2002 21:40:07 -0000	1.119
+++ gtkimhtml.c	14 Sep 2002 03:17:04 -0000	1.120
@@ -2119,8 +2119,6 @@
 			ret_font = gdk_font_load (tmp); 
 		else {
 			/* For some reason, fontsets must end with a single * as an xlfd */
-			gchar *garbage = tmp;
-			tmp = g_strconcat(garbage, ",*", NULL);
 			ret_font = gdk_fontset_load (tmp); 
 		}
 		/* If the font didn't load, we change some of the xlfds one by one

[Gaim-commits] CVS: gaim ChangeLog,1.540,1.541

[Luke S. <lsc...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
i18n fixes from paco-paco and msw, /topic fix from kingant. get the i18n fixes
into gtk1-stable and i'm done for the night. 


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -d -r1.540 -r1.541
--- ChangeLog	10 Sep 2002 15:31:33 -0000	1.540
+++ ChangeLog	14 Sep 2002 03:17:03 -0000	1.541
@@ -69,6 +69,9 @@
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
 	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
 	  Arun Tharuvai)
+	*/topic when not an op now displays the current topic(thanks Mark 
+	 Doliner)
+	*i18n fixes (thanks Matt Wilson)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim/src prefs.c,1.247,1.248

[Luke S. <lsc...@us...>]

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

Modified Files:
	prefs.c 
Log Message:
a couple prefs fixes. prefs should now save things when you change them (thanks faceprint)


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- prefs.c	31 Aug 2002 02:49:25 -0000	1.247
+++ prefs.c	14 Sep 2002 03:08:39 -0000	1.248
@@ -87,6 +87,7 @@
 static GtkWidget *show_color_pref(GtkWidget *, gboolean);
 static void delete_prefs(GtkWidget *, void *);
 void set_default_away(GtkWidget *, gpointer);
+static void apply_prefs();
 
 struct debug_window *dw = NULL;
 static GtkWidget *prefs = NULL;
@@ -94,7 +95,7 @@
 
 void delete_prefs(GtkWidget *asdf, void *gdsa) {
 	int v;
[...967 lines suppressed...]
-	
+}
+
 static GtkWidget *show_color_pref(GtkWidget *box, gboolean fgc)
 {
 	/* more stuff stolen from X-Chat */
@@ -1923,7 +1935,7 @@
 	fontname = g_strdup(gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(f)));
 	destroy_fontsel(0, 0);
 
-	while(fontname[i] && !isdigit(fontname[i]) && i < sizeof(fontface_new)) { 
+	while(fontname[i] && !isdigit(fontname[i]) && i < sizeof(fontface_new)) {
 		fontface_new[i] = fontname[i];
 		i++;
 	}
@@ -1931,3 +1943,4 @@
 	debug_printf("fontface_new: %s\n", fontface_new);
 	g_free(fontname);
 }
+

[Gaim-commits] CVS: gaim/src socket.c,1.1,1.2

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

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

Modified Files:
	socket.c 
Log Message:
Happy BSD!


Index: socket.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/socket.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- socket.c	30 Aug 2002 16:09:22 -0000	1.1
+++ socket.c	14 Sep 2002 02:34:38 -0000	1.2
@@ -28,6 +28,7 @@
 /* This provides code for connecting to a Gaim socket and communicating with
  * it.  It will eventually be made a library once the core and ui are split. */
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "gaim.h"

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.148,1.149

[Mark D. <the...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
Only you can prevent forest fires.

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- oscar.c	7 Sep 2002 18:41:08 -0000	1.148
+++ oscar.c	13 Sep 2002 06:41:21 -0000	1.149
@@ -649,6 +649,10 @@
 			/* Suspended account */
 			hide_login_progress(gc, _("Your account is currently suspended."));
 			break;
+		case 0x14:
+			/* service temporarily unavailable */
+			hide_login_progress(gc, _("The AOL Instant Messenger service is temporarily unavailable."));
+			break;
 		case 0x18:
 			/* connecting too frequently */
 			hide_login_progress(gc, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));

[Gaim-commits] CVS: gaim configure.ac,1.70.2.5,1.70.2.6 configure.in,1.118.2.5,1.118.2.6 ChangeLog,1.509.2.23,1.509.2.24 NEWS,1.138.2.2,1.138.2.3

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

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

Modified Files:
      Tag: gtk1-stable
	configure.ac configure.in ChangeLog NEWS 
Log Message:
wowee.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.70.2.5
retrieving revision 1.70.2.6
diff -u -d -r1.70.2.5 -r1.70.2.6
--- configure.ac	9 Sep 2002 05:51:22 -0000	1.70.2.5
+++ configure.ac	13 Sep 2002 02:39:28 -0000	1.70.2.6
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.2])
+AM_INIT_AUTOMAKE([gaim], [0.59.3])
 
 AC_PREREQ([2.50])
 

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.118.2.5
retrieving revision 1.118.2.6
diff -u -d -r1.118.2.5 -r1.118.2.6
--- configure.in	9 Sep 2002 05:51:22 -0000	1.118.2.5
+++ configure.in	13 Sep 2002 02:39:28 -0000	1.118.2.6
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.2])
+AM_INIT_AUTOMAKE([gaim], [0.59.3])
 
 
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.23
retrieving revision 1.509.2.24
diff -u -d -r1.509.2.23 -r1.509.2.24
--- ChangeLog	9 Sep 2002 05:51:22 -0000	1.509.2.23
+++ ChangeLog	13 Sep 2002 02:39:28 -0000	1.509.2.24
@@ -1,5 +1,8 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.59.3:
+	* Yahoo can connect again. Oops!
+
 version 0.59.2 (09/09/2002):
         * Japanese translation updated (Thanks, Junichi Uekawa)
 	* Won't crash when you set your MSN Friendly name to an

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138.2.2
retrieving revision 1.138.2.3
diff -u -d -r1.138.2.2 -r1.138.2.3
--- NEWS	9 Sep 2002 05:51:22 -0000	1.138.2.2
+++ NEWS	13 Sep 2002 02:39:29 -0000	1.138.2.3
@@ -1,6 +1,8 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
-0.69.2 (09/09/2002):
+0.59.3:
+
+0.59.2 (09/09/2002):
 	Rob: This time Sean couldn't be with us.  I finally got my linux box
 	some what back in order.  Life has been extremely hectic for both Sean
 	and myself lately, I think.  Sean will have his cable connection soon

[Gaim-commits] CVS: gaim/doc gaim.1,1.54.2.2,1.54.2.3

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

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

Modified Files:
      Tag: gtk1-stable
	gaim.1 
Log Message:
wowee.


Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.54.2.2
retrieving revision 1.54.2.3
diff -u -d -r1.54.2.2 -r1.54.2.3
--- gaim.1	29 Aug 2002 00:32:21 -0000	1.54.2.2
+++ gaim.1	13 Sep 2002 02:39:29 -0000	1.54.2.3
@@ -21,7 +21,7 @@
 .\" USA.
 .TH gaim 1
 .SH NAME
-Gaim v0.59.2 \- Instant Messaging client
+Gaim v0.59.3 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR

[Gaim-commits] CVS: gaim/src aim.c,1.193,1.194

[Luke S. <lsc...@us...>]

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

Modified Files:
	aim.c 
Log Message:
a second fix for people who --disable-plugins.  renaming variables w/out checking
your ifdefs isn't a good thing sean ;-)


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- aim.c	11 Sep 2002 05:24:44 -0000	1.193
+++ aim.c	12 Sep 2002 15:56:05 -0000	1.194
@@ -360,9 +360,7 @@
 #endif
 
 	gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0);
-#ifdef GAIM_PLUGINS
 	gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);
-#endif
 
 	gtk_widget_show(reg);
 	gtk_widget_show(options);

[Gaim-commits] CVS: gaim/src buddy.c,1.317.2.1,1.317.2.2

[Luke S. <lsc...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	buddy.c 
Log Message:
and the corresponding merge to gtk1-stable since this is something specific to 
the buddy list as it currently exists.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.317.2.1
retrieving revision 1.317.2.2
diff -u -d -r1.317.2.1 -r1.317.2.2
--- buddy.c	29 Aug 2002 00:32:22 -0000	1.317.2.1
+++ buddy.c	12 Sep 2002 14:39:41 -0000	1.317.2.2
@@ -768,18 +768,14 @@
 
 static void un_alias(GtkWidget *a, struct buddy *b)
 {
-	struct group *g = find_group_by_buddy(b->gc, b->name);
-	struct group_show *gs = find_group_show(g->name);
-	struct buddy_show *bs = NULL;
-	GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, b);
 	g_snprintf(b->show, sizeof(b->show), "%s", b->name);
-	gtk_ctree_node_set_text(GTK_CTREE(edittree), node, 0, b->name);
+	/* passing b->show as the previous name seems to be the (current)
+	 * way to get the bs->lable changed for that buddy. However, this
+	 * function should do everything that needs to be done
+	 */
+	handle_buddy_rename(b, b->show); /* make me a sammich! */
 	serv_alias_buddy(b);
-	if (gs)
-		bs = find_buddy_show(gs, b->name);
-	if (bs)
-		gtk_label_set(GTK_LABEL(bs->label), b->name);
-	do_export(b->gc);
+
 }
 
 static gboolean click_edit_tree(GtkWidget *widget, GdkEventButton *event, gpointer data)

[Gaim-commits] CVS: gaim/src buddy.c,1.326,1.327

[Luke S. <lsc...@us...>]

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

Modified Files:
	buddy.c 
Log Message:
Jason Willis submitted a patch to make unaliasing someone in the edit tab unalias
the person in the online tab also. bug fixes are always good things.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- buddy.c	30 Aug 2002 03:13:59 -0000	1.326
+++ buddy.c	12 Sep 2002 14:33:33 -0000	1.327
@@ -735,18 +735,14 @@
 
 static void un_alias(GtkWidget *a, struct buddy *b)
 {
-	struct group *g = find_group_by_buddy(b->gc, b->name);
-	struct group_show *gs = find_group_show(g->name);
-	struct buddy_show *bs = NULL;
-	GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, b);
 	g_snprintf(b->show, sizeof(b->show), "%s", b->name);
-	gtk_ctree_node_set_text(GTK_CTREE(edittree), node, 0, b->name);
+	/* passing b->show as the previous name seems to be the (current)
+	 * way to get the bs->lable changed for that buddy. However, this
+	 * function should do everything that needs to be done
+	 */
+	handle_buddy_rename(b, b->show); /* make me a sammich! */
 	serv_alias_buddy(b);
-	if (gs)
-		bs = find_buddy_show(gs, b->name);
-	if (bs)
-		gtk_label_set(GTK_LABEL(bs->label), b->name);
-	do_export(b->gc);
+
 }
 
 static gboolean click_edit_tree(GtkWidget *widget, GdkEventButton *event, gpointer data)

[Gaim-commits] CVS: gaim/src aim.c,1.192,1.193

[Luke S. <lsc...@us...>]

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

Modified Files:
	aim.c 
Log Message:
plugs should be inside #ifdef plugins 
Modified Files:
src/aim.c 
----------------------------------------------------------------------


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- aim.c	6 Sep 2002 23:03:20 -0000	1.192
+++ aim.c	11 Sep 2002 05:24:44 -0000	1.193
@@ -356,9 +356,9 @@
 	gtk_signal_connect(GTK_OBJECT(options), "clicked", GTK_SIGNAL_FUNC(show_prefs), NULL);
 #ifdef GAIM_PLUGINS
 	gtk_signal_connect(GTK_OBJECT(plugs), "clicked", GTK_SIGNAL_FUNC(show_plugins), NULL);
+	gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
 #endif
 
-	gtk_box_pack_start(GTK_BOX(hbox), plugs, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), options, TRUE, TRUE, 0);
 #ifdef GAIM_PLUGINS
 	gtk_box_pack_start(GTK_BOX(hbox), reg, TRUE, TRUE, 0);

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.43.2.2,1.43.2.3

[Luke S. <lsc...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	yahoo.c 
Log Message:
this fixes a bug in yahoo signons with SOME linux systems.
Modified Files:
Tag: gtk1-stable
src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -d -r1.43.2.2 -r1.43.2.3
--- yahoo.c	9 Sep 2002 05:46:08 -0000	1.43.2.2
+++ yahoo.c	11 Sep 2002 01:37:24 -0000	1.43.2.3
@@ -968,7 +968,7 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	g_snprintf(gc->username, sizeof(gc->username), "%s", g_strstrip(gc->username));
+	g_strstrip(gc->username);
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

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

[Luke S. <lsc...@us...>]

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

Modified Files:
	yahoo.c 
Log Message:
eric ding says this will work better. i didn't have any problems with the old 
code, but apparently some people get null spaces at the front of thier sn's
Modified Files:
src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- yahoo.c	10 Sep 2002 15:31:34 -0000	1.47
+++ yahoo.c	11 Sep 2002 01:18:18 -0000	1.48
@@ -970,7 +970,7 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	g_snprintf(gc->username, sizeof(gc->username), "%s", g_strstrip(gc->username));
+	g_strstrip(gc->username);
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

[Gaim-commits] CVS: gaim/src gaim.h,1.335,1.336 gaimrc.c,1.105,1.106 prpl.c,1.59,1.60

[Luke S. <lsc...@us...>]

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

Modified Files:
	gaim.h gaimrc.c prpl.c 
Log Message:
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this 
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c 
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- gaim.h	30 Aug 2002 16:09:22 -0000	1.335
+++ gaim.h	10 Sep 2002 15:31:33 -0000	1.336
@@ -455,11 +455,11 @@
 extern const char *handle_uri(char *);
 
 #ifdef HAVE_LANGINFO_CODESET
-#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8");
-#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET));
+#define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8")
+#define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET))
 #else
-#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8");
-#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1");
+#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8")
+#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1")
 #endif
 
 /*------------------------------------------------------------------------*/

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- gaimrc.c	30 Aug 2002 03:04:11 -0000	1.105
+++ gaimrc.c	10 Sep 2002 15:31:34 -0000	1.106
@@ -63,16 +63,15 @@
 	char value[MAX_VALUES][4096];
 };
 
-static struct parse *parse_line(char *line)
+static struct parse *parse_line(char *line, struct parse *p)
 {
 	char *c = line;
 	int inopt = 1, inval = 0, curval = -1;
 	int optlen = 0, vallen = 0;
-	static struct parse p;
 	int x;
 
 	for (x = 0; x < MAX_VALUES; x++) {
-		p.value[x][0] = 0;
+		p->value[x][0] = 0;
 	}
 
 
@@ -85,36 +84,36 @@
 			/*   if ((*c < 'a' || *c > 'z') && *c != '_') { */
 			if ((*c < 'a' || *c > 'z') && *c != '_' && (*c < 'A' || *c > 'Z')) {
 				inopt = 0;
-				p.option[optlen] = 0;
+				p->option[optlen] = 0;
 				c++;
 				continue;
 			}
 
-			p.option[optlen] = *c;
+			p->option[optlen] = *c;
 			optlen++;
 			c++;
 			continue;
 		} else if (inval) {
 			if ((*c == '}')) {
 				if (*(c - 1) == '\\') {
-					p.value[curval][vallen - 1] = *c;
+					p->value[curval][vallen - 1] = *c;
 					c++;
 					continue;
 				} else {
-					p.value[curval][vallen - 1] = 0;
+					p->value[curval][vallen - 1] = 0;
 					inval = 0;
 					c++;
 					continue;
 				}
 			} else {
-				p.value[curval][vallen] = *c;
+				p->value[curval][vallen] = *c;
 				vallen++;
 				c++;
 				continue;
 			}
 		} else if (*c == '{') {
 			if (*(c - 1) == '\\') {
-				p.value[curval][vallen - 1] = *c;
+				p->value[curval][vallen - 1] = *c;
 				c++;
 				continue;
 			} else {
@@ -129,7 +128,7 @@
 		c++;
 	}
 
-	return &p;
+	return p;
 }
 
 
@@ -228,6 +227,7 @@
 
 static void gaimrc_read_away(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	struct away_message *a;
@@ -241,7 +241,7 @@
 		if (buf[0] == '}')
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "message")) {
 			a = g_new0(struct away_message, 1);
 
@@ -301,6 +301,7 @@
 
 static void gaimrc_read_pounce(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	struct buddy_pounce *b;
@@ -314,7 +315,7 @@
 		if (buf[0] == '}')
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "entry")) {
 			b = g_new0(struct buddy_pounce, 1);
 
@@ -413,6 +414,7 @@
 
 static void gaimrc_read_plugins(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	GSList *load = NULL;
@@ -426,7 +428,7 @@
 		if (buf[0] == '}')
 			break;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "plugin")) {
 			filter_break(p->value[0]);
 			load = g_slist_append(load, g_strdup(p->value[0]));
@@ -446,6 +448,7 @@
 
 static struct aim_user *gaimrc_read_user(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	struct aim_user *u;
 	int i;
@@ -454,7 +457,7 @@
 	if (!fgets(buf, sizeof(buf), f))
 		return NULL;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "ident"))
 		return NULL;
@@ -499,7 +502,7 @@
 		return u;
 	}
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "user_opts"))
 		return u;
@@ -513,7 +516,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "proto_opts"))
 		return u;
@@ -527,7 +530,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "iconfile"))
 		return u;
@@ -540,7 +543,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "alias"))
 		return u;
@@ -593,6 +596,7 @@
 {
 	char buf[2048];
 	struct aim_user *u;
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -606,7 +610,7 @@
 
 
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "current_user")) {
 		} else if (strcmp(p->option, "user")) {
@@ -706,6 +710,7 @@
 static void gaimrc_read_options(FILE *f)
 {
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 	gboolean read_logging = FALSE, read_general = FALSE, read_display = FALSE;
 	int general_options = 0, display_options = 0;
@@ -720,7 +725,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "general_options")) {
 			general_options = atoi(p->value[0]);
@@ -872,6 +877,7 @@
 {
 	int i;
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -887,7 +893,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "sound_cmd")) {
 			g_snprintf(sound_cmd, sizeof(sound_cmd), "%s", p->value[0]);
@@ -1006,6 +1012,7 @@
 static void gaimrc_read_proxy(FILE *f)
 {
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -1018,7 +1025,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "host")) {
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", p->value[0]);
@@ -1135,7 +1142,7 @@
 	away_options =
 		OPT_AWAY_BACK_ON_IM;
 
-	for (i = 0; i < 7; i++)
+	for (i = 0; i < NUM_SOUNDS; i++)
 		sound_file[i] = NULL;
 	font_options = 0;
 	/* Enable all of the sound players that might be available.  The first

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- prpl.c	30 Aug 2002 03:14:04 -0000	1.59
+++ prpl.c	10 Sep 2002 15:31:34 -0000	1.60
@@ -437,7 +437,8 @@
 
 	mn->email_label = gtk_label_new(buf);
 	gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
-	gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, 0, 0, 5);
+	gtk_label_set_line_wrap(GTK_LABEL(mn->email_label), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, FALSE, TRUE, 5);
 	gtk_widget_show(mn->email_label);
 
 	hbox = gtk_hbox_new(FALSE, 5);

[Gaim-commits] CVS: gaim ChangeLog,1.539,1.540

[Luke S. <lsc...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this 
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c 
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -d -r1.539 -r1.540
--- ChangeLog	31 Aug 2002 02:40:51 -0000	1.539
+++ ChangeLog	10 Sep 2002 15:31:33 -0000	1.540
@@ -64,6 +64,11 @@
 	* Login all auto-login accounts from login window (Thanks
 	  Etan Reisner)
 	* View log button in conversation toolbar (Thanks Etan Reisner)
+	* Fixed a possible segfault when signing off Jabber (Thanks
+	  Craig Boston)
+	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
+	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
+	  Arun Tharuvai)
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.46,1.47

[Luke S. <lsc...@us...>]

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

Modified Files:
	yahoo.c 
Log Message:
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this 
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c 
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- yahoo.c	29 Aug 2002 03:22:21 -0000	1.46
+++ yahoo.c	10 Sep 2002 15:31:34 -0000	1.47
@@ -591,7 +591,7 @@
 			msg[j++] = m[i];
 		}
 		msg[j] = 0;
-		serv_got_im(gc, from, msg, 0, tm, -1);
+		serv_got_im(gc, from, utf8_to_str(msg), 0, tm, -1);
 	} else if (pkt->status == 2) {
 		do_error_dialog(_("Your Yahoo! message did not get sent."), NULL, GAIM_ERROR);
 	}
@@ -970,6 +970,7 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
+	g_snprintf(gc->username, sizeof(gc->username), "%s", g_strstrip(gc->username));
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;
@@ -1178,15 +1179,16 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, 0);
+	char *msg = str_to_utf8(what);
 
 	yahoo_packet_hash(pkt, 1, gc->displayname);
 	yahoo_packet_hash(pkt, 5, who);
-	yahoo_packet_hash(pkt, 14, what);
+	yahoo_packet_hash(pkt, 14, msg);
 
 	yahoo_send_packet(yd, pkt);
 
 	yahoo_packet_free(pkt);
-
+	
 	return 1;
 }
 

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.94,1.95

[Luke S. <lsc...@us...>]

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

Modified Files:
	msn.c 
Log Message:
Rob committed some bug fixes to gtk1-stable, but not to HEAD. now his computer
is acting up again, so i'm making the corresponding commits to HEAD. this 
should help with yahoo i18n, segfaults on jabber, a problem in gaimrc, and
word wrapping on new mail notification.
Modified Files:
ChangeLog src/gaim.h src/gaimrc.c src/prpl.c 
src/protocols/msn/msn.c src/protocols/yahoo/yahoo.c 
----------------------------------------------------------------------


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- msn.c	29 Aug 2002 01:47:14 -0000	1.94
+++ msn.c	10 Sep 2002 15:31:34 -0000	1.95
@@ -162,9 +162,10 @@
 {
 	static char buf[BUF_LEN];
 
+	gchar * ss = g_strstrip(s);
 	g_return_val_if_fail(s != NULL, NULL);
 
-	g_snprintf(buf, sizeof(buf), "%s%s", s, strchr(s, '@') ? "" : "@hotmail.com");
+	g_snprintf(buf, sizeof(buf), "%s%s", ss, strchr(ss, '@') ? "" : "@hotmail.com");
 
 	return buf;
 }

[Gaim-commits] CVS: gaim gaim.spec.in,1.52.2.1,1.52.2.2 ChangeLog,1.509.2.22,1.509.2.23 NEWS,1.138.2.1,1.138.2.2 configure.ac,1.70.2.4,1.70.2.5 configure.in,1.118.2.4,1.118.2.5

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

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

Modified Files:
      Tag: gtk1-stable
	gaim.spec.in ChangeLog NEWS configure.ac configure.in 
Log Message:
we likes to party



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.52.2.1
retrieving revision 1.52.2.2
diff -u -d -r1.52.2.1 -r1.52.2.2
--- gaim.spec.in	26 Aug 2002 02:41:27 -0000	1.52.2.1
+++ gaim.spec.in	9 Sep 2002 05:51:22 -0000	1.52.2.2
@@ -95,6 +95,32 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 09 2002 Rob Flynn <ro...@ma...> (0.59.2 release)
+- Japanese translation updated (Thanks, Junichi Uekawa)
+- Won't crash when you set your MSN Friendly name to an empty string.
+- Default manual browser command changed to reflect the fix in 0.59.1
+- Fixed the non-manual browser settings which were broke in 0.59.1 (Thanks, Chris Blizzard)
+- Improved MSN internationalization (Thanks A Lee)
+- Smiley lookup will search for longest match for smilies like :-(( (Thanks Eric Melski)
+- When an IM image is clicked, don't open the browser (Thanks Ari Pollak)
+- Prevent a possible crash in unhide_buddy_list() (Thanks Ari Pollak)
+- Fixed a compilation problem on systems without iconv.
+- GtkIMHtml can be set to render font sizes as point size or AIMish relative sizes -- no more huge Yahoo fonts. (Thanks Ka-Hing Cheung)
+- Fixed a bug with regard to Jabber resources (Thanks Nathan Walp)
+- Fixed a possible segfault when signing off Jabber (Thanks Craig Boston)
+- Word-wrapping on mail notification text (Thanks, Andrew Molloy)
+- Strip trailing and leading spaces from MSN/Yahoo names (Thanks, Arun Tharuvai)
+
+* Sat Aug 25 2002 Rob Flynn <ro...@ma...> (0.59.1 release)
+- Created a gtk1-stable branch for GTK+ 1.2 bugfix releases. Development will continue in our main branch in GTK+ 2 only.
+- Fixed a security bug in the manual browser setting (Thanks Robert McQueen)
+- Now using libiconv for better i18n support (Thanks Junichi Uekawa)
+- Will work with Perl 5.8 (thanks, Timothy Lee and Dan  Colascione)
+- Fix for HTTP proxies (thanks, Ethan Blanton)	
+- Read proxy environment variables. (thanks, Christian Hammond)
+- Use the pretty gaim.png for our menu entry.
+- Added support for gettext 0.11.x.
+
 * Mon Jun 24 2002 Rob Flynn <ro...@ma...> (0.59 release)
 - Hungarian translation added (Thanks, Sutto Zoltan)
 - Swedish translation updated (Thanks, Christian Rose)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.22
retrieving revision 1.509.2.23
diff -u -d -r1.509.2.22 -r1.509.2.23
--- ChangeLog	9 Sep 2002 05:46:07 -0000	1.509.2.22
+++ ChangeLog	9 Sep 2002 05:51:22 -0000	1.509.2.23
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.59.2
+version 0.59.2 (09/09/2002):
         * Japanese translation updated (Thanks, Junichi Uekawa)
 	* Won't crash when you set your MSN Friendly name to an
 	  empty string.
@@ -27,7 +27,7 @@
 	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
 	  Arun Tharuvai)
 
-version 0.59.1 (08/25/2002)
+version 0.59.1 (08/25/2002):
 	* Created a gtk1-stable branch for GTK+ 1.2 bugfix releases.
 	  Development will continue in our main branch in GTK+ 2 only.
 	* Fixed a security bug in the manual browser setting (Thanks

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138.2.1
retrieving revision 1.138.2.2
diff -u -d -r1.138.2.1 -r1.138.2.2
--- NEWS	26 Aug 2002 01:52:46 -0000	1.138.2.1
+++ NEWS	9 Sep 2002 05:51:22 -0000	1.138.2.2
@@ -1,6 +1,14 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
-0.59.1 (08/25/3002)
+0.69.2 (09/09/2002):
+	Rob: This time Sean couldn't be with us.  I finally got my linux box
+	some what back in order.  Life has been extremely hectic for both Sean
+	and myself lately, I think.  Sean will have his cable connection soon
+	and my linux box should be completely happy again soon.  Thanks to
+	everyone that kept the patches coming in and organized while we 
+	were busy (chip, luke, robot, etc.)
+
+0.59.1 (08/25/2002):
 	Sean: We've decided to create a stable branch for GTK+ 1.2 bugfixes
 	and start developing CVS HEAD in GTK+ 2 only.  GTK+ 1.2 releases
 	will be in the 0.59.x branch and GTK+ 2 releases will follow our

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.70.2.4
retrieving revision 1.70.2.5
diff -u -d -r1.70.2.4 -r1.70.2.5
--- configure.ac	29 Aug 2002 00:32:21 -0000	1.70.2.4
+++ configure.ac	9 Sep 2002 05:51:22 -0000	1.70.2.5
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.2cvs])
+AM_INIT_AUTOMAKE([gaim], [0.59.2])
 
 AC_PREREQ([2.50])
 

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.118.2.4
retrieving revision 1.118.2.5
diff -u -d -r1.118.2.4 -r1.118.2.5
--- configure.in	29 Aug 2002 00:32:21 -0000	1.118.2.4
+++ configure.in	9 Sep 2002 05:51:22 -0000	1.118.2.5
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.59.2cvs])
+AM_INIT_AUTOMAKE([gaim], [0.59.2])
 
 
 

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.43.2.1,1.43.2.2

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

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

Modified Files:
      Tag: gtk1-stable
	yahoo.c 
Log Message:
Changen.



Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -u -d -r1.43.2.1 -r1.43.2.2
--- yahoo.c	30 Aug 2002 11:54:54 -0000	1.43.2.1
+++ yahoo.c	9 Sep 2002 05:46:08 -0000	1.43.2.2
@@ -968,6 +968,7 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
+	g_snprintf(gc->username, sizeof(gc->username), "%s", g_strstrip(gc->username));
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;
@@ -1184,7 +1185,7 @@
 	yahoo_send_packet(yd, pkt);
 
 	yahoo_packet_free(pkt);
-
+	
 	return 1;
 }
 

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.87.2.2,1.87.2.3

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

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

Modified Files:
      Tag: gtk1-stable
	msn.c 
Log Message:
Changen.



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.87.2.2
retrieving revision 1.87.2.3
diff -u -d -r1.87.2.2 -r1.87.2.3
--- msn.c	28 Aug 2002 02:38:42 -0000	1.87.2.2
+++ msn.c	9 Sep 2002 05:46:08 -0000	1.87.2.3
@@ -162,9 +162,10 @@
 {
 	static char buf[BUF_LEN];
 
+	gchar * ss = g_strstrip(s);
 	g_return_val_if_fail(s != NULL, NULL);
 
-	g_snprintf(buf, sizeof(buf), "%s%s", s, strchr(s, '@') ? "" : "@hotmail.com");
+	g_snprintf(buf, sizeof(buf), "%s%s", ss, strchr(ss, '@') ? "" : "@hotmail.com");
 
 	return buf;
 }

[Gaim-commits] CVS: gaim/src gaimrc.c,1.96.2.2,1.96.2.3 prpl.c,1.54,1.54.2.1

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

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

Modified Files:
      Tag: gtk1-stable
	gaimrc.c prpl.c 
Log Message:
Changen.



Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -u -d -r1.96.2.2 -r1.96.2.3
--- gaimrc.c	26 Aug 2002 21:58:16 -0000	1.96.2.2
+++ gaimrc.c	9 Sep 2002 05:46:07 -0000	1.96.2.3
@@ -63,16 +63,15 @@
 	char value[MAX_VALUES][4096];
 };
 
-static struct parse *parse_line(char *line)
+static struct parse *parse_line(char *line, struct parse *p)
 {
 	char *c = line;
 	int inopt = 1, inval = 0, curval = -1;
 	int optlen = 0, vallen = 0;
-	static struct parse p;
 	int x;
 
 	for (x = 0; x < MAX_VALUES; x++) {
-		p.value[x][0] = 0;
+		p->value[x][0] = 0;
 	}
 
 
@@ -85,36 +84,36 @@
 			/*   if ((*c < 'a' || *c > 'z') && *c != '_') { */
 			if ((*c < 'a' || *c > 'z') && *c != '_' && (*c < 'A' || *c > 'Z')) {
 				inopt = 0;
-				p.option[optlen] = 0;
+				p->option[optlen] = 0;
 				c++;
 				continue;
 			}
 
-			p.option[optlen] = *c;
+			p->option[optlen] = *c;
 			optlen++;
 			c++;
 			continue;
 		} else if (inval) {
 			if ((*c == '}')) {
 				if (*(c - 1) == '\\') {
-					p.value[curval][vallen - 1] = *c;
+					p->value[curval][vallen - 1] = *c;
 					c++;
 					continue;
 				} else {
-					p.value[curval][vallen - 1] = 0;
+					p->value[curval][vallen - 1] = 0;
 					inval = 0;
 					c++;
 					continue;
 				}
 			} else {
-				p.value[curval][vallen] = *c;
+				p->value[curval][vallen] = *c;
 				vallen++;
 				c++;
 				continue;
 			}
 		} else if (*c == '{') {
 			if (*(c - 1) == '\\') {
-				p.value[curval][vallen - 1] = *c;
+				p->value[curval][vallen - 1] = *c;
 				c++;
 				continue;
 			} else {
@@ -129,7 +128,7 @@
 		c++;
 	}
 
-	return &p;
+	return p;
 }
 
 
@@ -228,6 +227,7 @@
 
 static void gaimrc_read_away(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	struct away_message *a;
@@ -241,7 +241,7 @@
 		if (buf[0] == '}')
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "message")) {
 			a = g_new0(struct away_message, 1);
 
@@ -301,6 +301,7 @@
 
 static void gaimrc_read_pounce(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	struct buddy_pounce *b;
@@ -314,7 +315,7 @@
 		if (buf[0] == '}')
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "entry")) {
 			b = g_new0(struct buddy_pounce, 1);
 
@@ -413,6 +414,7 @@
 
 static void gaimrc_read_plugins(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	char buf[4096];
 	GSList *load = NULL;
@@ -426,7 +428,7 @@
 		if (buf[0] == '}')
 			break;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 		if (!strcmp(p->option, "plugin")) {
 			filter_break(p->value[0]);
 			load = g_slist_append(load, g_strdup(p->value[0]));
@@ -446,6 +448,7 @@
 
 static struct aim_user *gaimrc_read_user(FILE *f)
 {
+	struct parse parse_buffer;
 	struct parse *p;
 	struct aim_user *u;
 	int i;
@@ -454,7 +457,7 @@
 	if (!fgets(buf, sizeof(buf), f))
 		return NULL;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "ident"))
 		return NULL;
@@ -499,7 +502,7 @@
 		return u;
 	}
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "user_opts"))
 		return u;
@@ -513,7 +516,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "proto_opts"))
 		return u;
@@ -527,7 +530,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "iconfile"))
 		return u;
@@ -540,7 +543,7 @@
 	if (!strcmp(buf, "\t}"))
 		return u;
 
-	p = parse_line(buf);
+	p = parse_line(buf, &parse_buffer);
 
 	if (strcmp(p->option, "alias"))
 		return u;
@@ -593,6 +596,7 @@
 {
 	char buf[2048];
 	struct aim_user *u;
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -606,7 +610,7 @@
 
 
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "current_user")) {
 		} else if (strcmp(p->option, "user")) {
@@ -707,6 +711,7 @@
 static void gaimrc_read_options(FILE *f)
 {
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 	gboolean read_logging = FALSE, read_general = FALSE, read_display = FALSE;
 	int general_options = 0, display_options = 0;
@@ -721,7 +726,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "general_options")) {
 			general_options = atoi(p->value[0]);
@@ -869,6 +874,7 @@
 {
 	int i;
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -884,7 +890,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "sound_cmd")) {
 			g_snprintf(sound_cmd, sizeof(sound_cmd), "%s", p->value[0]);
@@ -1003,6 +1009,7 @@
 static void gaimrc_read_proxy(FILE *f)
 {
 	char buf[2048];
+	struct parse parse_buffer;
 	struct parse *p;
 
 	buf[0] = 0;
@@ -1015,7 +1022,7 @@
 		if (!fgets(buf, sizeof(buf), f))
 			return;
 
-		p = parse_line(buf);
+		p = parse_line(buf, &parse_buffer);
 
 		if (!strcmp(p->option, "host")) {
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", p->value[0]);
@@ -1131,7 +1138,7 @@
 	away_options =
 		OPT_AWAY_BACK_ON_IM;
 
-	for (i = 0; i < 7; i++)
+	for (i = 0; i < NUM_SOUNDS; i++)
 		sound_file[i] = NULL;
 	font_options = 0;
 	/* Enable all of the sound players that might be available.  The first

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- prpl.c	30 May 2002 17:49:03 -0000	1.54
+++ prpl.c	9 Sep 2002 05:46:08 -0000	1.54.2.1
@@ -428,7 +428,8 @@
 
 	mn->email_label = gtk_label_new(buf);
 	gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
-	gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, 0, 0, 5);
+	gtk_label_set_line_wrap(GTK_LABEL(mn->email_label), TRUE);
+	gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, FALSE, TRUE, 5);
 	gtk_widget_show(mn->email_label);
 
 	hbox = gtk_hbox_new(FALSE, 5);