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

[Gaim-commits] CVS: gaim NEWS,1.95,1.96

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

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

Modified Files:
	NEWS 
Log Message:
Het nieuwe wachtwoord is niet gelijk


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- NEWS	2001/11/01 16:55:08	1.95
+++ NEWS	2001/11/01 17:34:41	1.96
@@ -5,6 +5,13 @@
 	know. I hope all of you had a nice little halloween. There are
 	quite a number of changes in this release. There are a few too
 	many to list here, so I will redirect you to ye olde ChangeLog.
+
+	Eric: Remember back in the day when TOC was the only protocol
+	Gaim could use? Remember the login window from back then? Back
+	before Gaim had perl or plugins or multiple connections or
+	10 different protocols. Things have changed so much since then.
+	Many more changes in this release as well. All good things.
+	Don't forget to talk to SmarterChild.
 	
 0.46 (10/18/2001):
 	Rob: Hey guys! The smores were great! I really enjoyed meeting

[Gaim-commits] CVS: gaim ChangeLog,1.349,1.350 NEWS,1.94,1.95 gaim.spec.in,1.28,1.29

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

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

Modified Files:
	ChangeLog NEWS gaim.spec.in 
Log Message:
Here we go one more time..



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- ChangeLog	2001/10/30 16:49:59	1.349
+++ ChangeLog	2001/11/01 16:55:08	1.350
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.47:
+version 0.47 (11/01/2001):
 	* Better font loading (pays attention to charset now)
 	  (thanks Arkadiusz Miskiewicz)
 	* Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- NEWS	2001/10/18 19:55:19	1.94
+++ NEWS	2001/11/01 16:55:08	1.95
@@ -1,7 +1,11 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.47:
-
+0.47 (11/01/2001):
+	Rob: Hi. Gaim v0.47 has been released, as you should already
+	know. I hope all of you had a nice little halloween. There are
+	quite a number of changes in this release. There are a few too
+	many to list here, so I will redirect you to ye olde ChangeLog.
+	
 0.46 (10/18/2001):
 	Rob: Hey guys! The smores were great! I really enjoyed meeting
 	up with all of you guys and singing campfire songs. It was 

Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gaim.spec.in	2001/10/24 21:02:55	1.28
+++ gaim.spec.in	2001/11/01 16:55:08	1.29
@@ -99,6 +99,26 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Nov 01 2001 Rob Flynn <ro...@ma...> (0.47 release)
+- Better font loading (pays attention to charset now) (thanks Arkadiusz Miskiewicz)
+- Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)
+- Open Mail button for when you get new mail (Yahoo and MSN)
+- New buddy pounce option: Popup Notification
+- When adding a buddy, the groups list now updates when you switch accounts.
+- When creating a new buddy pounce, gaim now automagically selects "on away" or "on idle", if the user is away or idle.
+- Add Opera to the available browsers (thanks Brian Enigma)
+- Improved log viewer (thanks to Ben Miller)
+- When you are queueing away messages, double clicking on a buddy's name will cause the messages for that name to be dequeued.
+- You can choose which sound player you use at run-time (thanks Ben Miller)
+- When someone adds you to their buddy list, it asks if you want to add them as well (Yahoo, ICQ, and MSN) (thanks Nathan Walp)
+- Option to grey idle buddies (thanks Nathan Walp)
+- MSN Privacy Options
+- In MSN you can set a person's alias to their "friendly name" by right-click on their name while they're online.
+- IRC can do /WHOIS
+- The usual bug fixes and memory leak plugs
+- Added Dutch translation
+- Updated Korean translation
+
 * Thu Oct 18 2001 Rob Flynn <ro...@ma...> (0.46 release)
 - New applet icons (courtesy David Raeman)
 - ICQ works on big-endian platforms, e.g. sparc and ppc (thanks to Nathan Walp and Ben Miller)

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.52,1.53

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

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

Modified Files:
	irc.c 
Log Message:
eh


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- irc.c	2001/11/01 07:54:48	1.52
+++ irc.c	2001/11/01 08:05:38	1.53
@@ -634,20 +634,14 @@
 		handle_whois(gc, word, word_eol, n);
 		break;
 	case 318:
-		/*
-		id->whois_str = g_string_append(id->whois_str, "<BR><BR>");
-		id->whois_str = g_string_append(id->whois_str, word_eol[4]);
-		*/
-
-		{
+		if (id->in_whois && id->whois_str) {
 			GString *str = decode_html(id->whois_str->str);
 			g_show_info_text(str->str, NULL);
 			g_string_free(str, TRUE);
+			g_string_free(id->whois_str, TRUE);
+			id->whois_str = NULL;
+			id->in_whois = FALSE;
 		}
-
-		g_string_free(id->whois_str, TRUE);
-		id->whois_str = NULL;
-		id->in_whois = FALSE;
 		break;
 	case 324:
 		handle_mode(gc, word, word_eol, TRUE);
@@ -662,16 +656,12 @@
 		irc_request_buddy_update(gc);
 		break;
 	case 401:
+		do_error_dialog(_("No such nick/channel"), _("IRC Error"));
+		break;
 	case 402:
+		do_error_dialog(_("No such server"), _("IRC Error"));
 	case 431:
-		if (!id->in_whois) {
-			id->in_whois = TRUE;
-			id->whois_str = g_string_new("");
-		} else {
-			id->whois_str = g_string_append(id->whois_str, "<BR><BR>");
-			id->in_whois = TRUE;
-		}
-		id->whois_str = g_string_append(id->whois_str, word_eol[4]);
+		do_error_dialog(_("No nickname given"), _("IRC Error"));
 		break;
 	}
 }

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.51,1.52

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

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

Modified Files:
	irc.c 
Log Message:
you can't rely on == returning 0 or 1. it will vary depending on compiler and architecture and a number of other things.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- irc.c	2001/11/01 06:46:31	1.51
+++ irc.c	2001/11/01 07:54:48	1.52
@@ -584,7 +584,10 @@
 			break;
 	}
 	
-	id->whois_str = g_string_append(id->whois_str, word_eol[5] + (word_eol[5][0]==':'));
+	if (word_eol[5][0] == ':')
+		id->whois_str = g_string_append(id->whois_str, word_eol[5] + 1);
+	else
+		id->whois_str = g_string_append(id->whois_str, word_eol[5]);
 
 }
 
@@ -612,7 +615,11 @@
 	case 301:
 		if (id->in_whois) {
 			id->whois_str = g_string_append(id->whois_str, "<BR><b>Away: </b>");
-			id->whois_str = g_string_append(id->whois_str, word_eol[5] + (word_eol[5][0]==':'));
+
+			if (word_eol[5][0] == ':')
+				id->whois_str = g_string_append(id->whois_str, word_eol[5] + 1);
+			else
+				id->whois_str = g_string_append(id->whois_str, word_eol[5]);
 		} else
 			irc_got_im(gc, word[4], word_eol[5], IM_FLAG_AWAY, time(NULL));
 		break;

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.50,1.51

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

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

Modified Files:
	irc.c 
Log Message:
This is shorter...



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- irc.c	2001/11/01 06:42:51	1.50
+++ irc.c	2001/11/01 06:46:31	1.51
@@ -584,10 +584,7 @@
 			break;
 	}
 	
-	if (word_eol[5][0] == ':')
-		id->whois_str = g_string_append(id->whois_str, word_eol[5] + 1);
-	else
-		id->whois_str = g_string_append(id->whois_str, word_eol[5]);
+	id->whois_str = g_string_append(id->whois_str, word_eol[5] + (word_eol[5][0]==':'));
 
 }
 
@@ -615,11 +612,7 @@
 	case 301:
 		if (id->in_whois) {
 			id->whois_str = g_string_append(id->whois_str, "<BR><b>Away: </b>");
-
-			if (word_eol[5][0] == ':')
-				id->whois_str = g_string_append(id->whois_str, word_eol[5]+1);
-			else
-				id->whois_str = g_string_append(id->whois_str, word_eol[5]);
+			id->whois_str = g_string_append(id->whois_str, word_eol[5] + (word_eol[5][0]==':'));
 		} else
 			irc_got_im(gc, word[4], word_eol[5], IM_FLAG_AWAY, time(NULL));
 		break;

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.49,1.50

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

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

Modified Files:
	irc.c 
Log Message:
I missed this one...



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- irc.c	2001/11/01 06:39:59	1.49
+++ irc.c	2001/11/01 06:42:51	1.50
@@ -614,8 +614,12 @@
 		break;
 	case 301:
 		if (id->in_whois) {
-			id->whois_str = g_string_append(id->whois_str, "<BR><BR>");
-			id->whois_str = g_string_append(id->whois_str, word_eol[4]);
+			id->whois_str = g_string_append(id->whois_str, "<BR><b>Away: </b>");
+
+			if (word_eol[5][0] == ':')
+				id->whois_str = g_string_append(id->whois_str, word_eol[5]+1);
+			else
+				id->whois_str = g_string_append(id->whois_str, word_eol[5]);
 		} else
 			irc_got_im(gc, word[4], word_eol[5], IM_FLAG_AWAY, time(NULL));
 		break;

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

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

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

Modified Files:
	irc.c 
Log Message:
This is a little prettier...



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- irc.c	2001/10/28 09:11:51	1.48
+++ irc.c	2001/11/01 06:39:59	1.49
@@ -544,6 +544,53 @@
 	}
 }
 
+/* Handle our whois stuff here.  You know what, I have a sore throat.  You know
+ * what I think about that? I'm not too pleased with it.  Perhaps I should take
+ * some medicine, or perhaps I should go to bed? Blah!! */
+
+static void handle_whois(struct gaim_connection *gc, char *word[], char *word_eol[], int num)
+{
+	struct irc_data *id = gc->proto_data;
+	char tmp[1024];
+
+	if (!id->in_whois) {
+		id->in_whois = TRUE;
+		id->whois_str = g_string_new("");
+	} else {
+		/* I can't decide if we should have one break or two */
+		id->whois_str = g_string_append(id->whois_str, "<BR>");
+		id->in_whois = TRUE;
+	}
+
+	switch (num) {
+		case 311:
+			id->whois_str = g_string_append(id->whois_str, "<b>User: </b>");
+			break;
+		case 312:
+			id->whois_str = g_string_append(id->whois_str, "<b>Server: </b>");
+			break;
+		case 313:
+			g_snprintf(tmp, sizeof(tmp), "<b>IRC Operator:</b> %s ", word[4]);
+			id->whois_str = g_string_append(id->whois_str, tmp);
+			break;
+
+		case 317:
+			id->whois_str = g_string_append(id->whois_str, "<b>Idle Time: </b>");
+			break;
+		case 319:
+			id->whois_str = g_string_append(id->whois_str, "<b>Channels: </b>");
+			break;
+		default:
+			break;
+	}
+	
+	if (word_eol[5][0] == ':')
+		id->whois_str = g_string_append(id->whois_str, word_eol[5] + 1);
+	else
+		id->whois_str = g_string_append(id->whois_str, word_eol[5]);
+
+}
+
 static void process_numeric(struct gaim_connection *gc, char *word[], char *word_eol[])
 {
 	struct irc_data *id = gc->proto_data;
@@ -580,23 +627,20 @@
 	case 313:
 	case 317:
 	case 319:
-		if (!id->in_whois) {
-			id->in_whois = TRUE;
-			id->whois_str = g_string_new("");
-		} else {
-			id->whois_str = g_string_append(id->whois_str, "<BR><BR>");
-			id->in_whois = TRUE;
-		}
-		id->whois_str = g_string_append(id->whois_str, word_eol[4]);
+		handle_whois(gc, word, word_eol, n);
 		break;
 	case 318:
+		/*
 		id->whois_str = g_string_append(id->whois_str, "<BR><BR>");
 		id->whois_str = g_string_append(id->whois_str, word_eol[4]);
+		*/
+
 		{
 			GString *str = decode_html(id->whois_str->str);
 			g_show_info_text(str->str, NULL);
 			g_string_free(str, TRUE);
 		}
+
 		g_string_free(id->whois_str, TRUE);
 		id->whois_str = NULL;
 		id->in_whois = FALSE;

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.51,1.52

[Adam F. <mi...@us...>]

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

Modified Files:
	oscar.c 
Log Message:

Please buy the Swordfish DVD, and talk to GabrielShear on AIM.

(But SmarterChild is better.)



Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- oscar.c	2001/10/25 05:05:05	1.51
+++ oscar.c	2001/11/01 02:25:13	1.52
@@ -858,29 +858,10 @@
 }
 
 static int server_ready_auth(aim_session_t *sess, aim_frame_t *fr, ...) {
-	struct gaim_connection *gc = sess->aux_data;
-	struct oscar_data *od = gc->proto_data;
 
 	aim_auth_setversions(sess, fr->conn);
 	aim_bos_reqrate(sess, fr->conn);
 	debug_printf("done with AUTH ServerReady\n");
-	if (od->chpass) {
-		debug_printf("changing password\n");
-		aim_auth_changepasswd(sess, fr->conn, od->newp, od->oldp);
-		g_free(od->oldp);
-		g_free(od->newp);
-		od->chpass = FALSE;
-	}
-	if (od->conf) {
-		debug_printf("confirming account\n");
-		aim_auth_reqconfirm(sess, fr->conn);
-		od->conf = FALSE;
-	}
-	if (od->reqemail) {
-		debug_printf("requesting email\n");
-		aim_auth_getinfo(sess, fr->conn, 0x0011);
-		od->reqemail = FALSE;
-	}
 
 	return 1;
 }
@@ -893,33 +874,47 @@
 	return 1;
 }
 
+static int rateresp_chat(aim_session_t *sess, aim_frame_t *fr, ...) {
+	struct gaim_connection *gc = sess->aux_data;
+	struct chat_connection *chatcon;
+	static int id = 1;
+
+	aim_bos_ackrateresp(sess, fr->conn);
+	aim_chat_clientready(sess, fr->conn);
+	chatcon = find_oscar_chat_by_conn(gc, fr->conn);
+	chatcon->id = id;
+	chatcon->cnv = serv_got_joined_chat(gc, id++, chatcon->show);
+
+	return 1;
+}
+
+static int rateresp_chatnav(aim_session_t *sess, aim_frame_t *fr, ...) {
+
+	aim_bos_ackrateresp(sess, fr->conn);
+	aim_chatnav_clientready(sess, fr->conn);
+	aim_chatnav_reqrights(sess, fr->conn);
+
+	return 1;
+}
+
 static int server_ready_chatnav(aim_session_t *sess, aim_frame_t *fr, ...) {
 	debug_printf("chatnav: got server ready\n");
+	aim_conn_addhandler(sess, fr->conn, 0x0001, 0x0007, rateresp_chatnav, 0);
 	aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CTN, AIM_CB_CTN_INFO, gaim_chatnav_info, 0);
 	aim_bos_reqrate(sess, fr->conn);
-	aim_bos_ackrateresp(sess, fr->conn);
-	aim_chatnav_clientready(sess, fr->conn);
-	aim_chatnav_reqrights(sess, fr->conn);
 
 	return 1;
 }
 
 static int server_ready_chat(aim_session_t *sess, aim_frame_t *fr, ...) {
-	struct gaim_connection *gc = sess->aux_data;
-	struct chat_connection *chatcon;
-	static int id = 1;
 
 	debug_printf("chat: got server ready\n");
+	aim_conn_addhandler(sess, fr->conn, 0x0001, 0x0007, rateresp_chat, 0);
 	aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERJOIN, gaim_chat_join, 0);
 	aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_USERLEAVE, gaim_chat_leave, 0);
 	aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_ROOMINFOUPDATE, gaim_chat_info_update, 0);
 	aim_conn_addhandler(sess, fr->conn, AIM_CB_FAM_CHT, AIM_CB_CHT_INCOMINGMSG, gaim_chat_incoming_msg, 0);
 	aim_bos_reqrate(sess, fr->conn);
-	aim_bos_ackrateresp(sess, fr->conn);
-	aim_chat_clientready(sess, fr->conn);
-	chatcon = find_oscar_chat_by_conn(gc, fr->conn);
-	chatcon->id = id;
-	chatcon->cnv = serv_got_joined_chat(gc, id++, chatcon->show);
 
 	return 1;
 }
@@ -1965,9 +1960,30 @@
 }
 
 static int rateresp_auth(aim_session_t *sess, aim_frame_t *fr, ...) {
+	struct gaim_connection *gc = sess->aux_data;
+	struct oscar_data *od = gc->proto_data;
+
 	aim_bos_ackrateresp(sess, fr->conn);
 	aim_auth_clientready(sess, fr->conn);
 	debug_printf("connected to auth (admin)\n");
+
+	if (od->chpass) {
+		debug_printf("changing password\n");
+		aim_auth_changepasswd(sess, fr->conn, od->newp, od->oldp);
+		g_free(od->oldp);
+		g_free(od->newp);
+		od->chpass = FALSE;
+	}
+	if (od->conf) {
+		debug_printf("confirming account\n");
+		aim_auth_reqconfirm(sess, fr->conn);
+		od->conf = FALSE;
+	}
+	if (od->reqemail) {
+		debug_printf("requesting email\n");
+		aim_auth_getinfo(sess, fr->conn, 0x0011);
+		od->reqemail = FALSE;
+	}
 
 	return 1;
 }

[Gaim-commits] CVS: gaim/src server.c,1.204,1.205

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

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

Modified Files:
	server.c 
Log Message:
don't worry sean, i'm not insane.


Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- server.c	2001/10/25 09:19:25	1.204
+++ server.c	2001/11/01 00:26:19	1.205
@@ -743,7 +743,7 @@
 
 	plugin_event(event_warned, gc, name, (void *)lev, 0);
 
-	if (gc->evil > lev) {
+	if (gc->evil >= lev) {
 		gc->evil = lev;
 		return;
 	}

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

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

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

Modified Files:
	prefs.c 
Log Message:
i'm completely not thinking today. it doesn't matter because option will never equal two different things. but it still looks prettier.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- prefs.c	2001/10/31 23:40:53	1.193
+++ prefs.c	2001/10/31 23:46:54	1.194
@@ -2569,10 +2569,8 @@
 	if (!blist)
 		return;
 
-	if (option == OPT_BLIST_NO_BUTTONS) {
+	if (option == OPT_BLIST_NO_BUTTONS)
 		build_imchat_box(!(blist_options & OPT_BLIST_NO_BUTTONS));
-		update_button_pix();
-	}
 
 	if (option == OPT_BLIST_SHOW_GRPNUM)
 		update_num_groups();
@@ -2580,7 +2578,7 @@
 	if (option == OPT_BLIST_NO_MT_GRP)
 		toggle_show_empty_groups();
 
-	if (option == OPT_BLIST_SHOW_BUTTON_XPM)
+	if ((option == OPT_BLIST_SHOW_BUTTON_XPM) || (option == OPT_BLIST_NO_BUTTONS))
 		update_button_pix();
 
 	if (option == OPT_BLIST_SHOW_PIXMAPS)

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

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

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

Modified Files:
	prefs.c 
Log Message:
better to only do this once.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- prefs.c	2001/10/24 04:56:37	1.192
+++ prefs.c	2001/10/31 23:40:53	1.193
@@ -2586,10 +2586,7 @@
 	if (option == OPT_BLIST_SHOW_PIXMAPS)
 		toggle_buddy_pixmaps();
 
-	if (option == OPT_BLIST_GREY_IDLERS)
-		update_idle_times();
-
-	if (option == OPT_BLIST_SHOW_IDLETIME)
+	if ((option == OPT_BLIST_GREY_IDLERS) || (option == OPT_BLIST_SHOW_IDLETIME))
 		update_idle_times();
 }
 

[Gaim-commits] CVS: gaim/po .cvsignore,1.10,1.11

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

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

Modified Files:
	.cvsignore 
Log Message:
hi


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/po/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- .cvsignore	2001/10/01 15:05:26	1.10
+++ .cvsignore	2001/10/31 20:39:12	1.11
@@ -13,3 +13,4 @@
 ko.gmo
 ru.gmo
 pl.gmo
+nl.gmo

[Gaim-commits] CVS: gaim/src dialogs.c,1.277,1.278

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

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

Modified Files:
	dialogs.c 
Log Message:
"Don't Panic!"


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- dialogs.c	2001/10/26 23:20:20	1.277
+++ dialogs.c	2001/10/31 18:52:40	1.278
@@ -3434,6 +3434,9 @@
 			/* take off the \n */
 			buf[strlen(buf) - 1] = '\0';
 
+		/* don't lose the thirtieth line of conversation. thanks FeRD */
+		g_string_append(string, buf);
+
 		if (i == 30) {
 			gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, view->options);
 			g_string_free(string, TRUE);
@@ -3444,8 +3447,6 @@
 				gtk_main_iteration();
 			*/
 			i = 0;
-		} else {
-			g_string_append(string, buf);
 		}
 
 	}

[Gaim-commits] CVS: gaim/src buddy.c,1.266,1.267

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

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

Modified Files:
	buddy.c 
Log Message:
/* live si siht */


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- buddy.c	2001/10/26 23:49:50	1.266
+++ buddy.c	2001/10/31 10:35:16	1.267
@@ -991,6 +991,7 @@
 				connections = g_slist_prepend(connections, gc);
 		} else
 			connections = g_slist_append(connections, gc);
+		redo_convo_menus(); /* this is evil */
 	} else if (*ctype == EDIT_BUDDY) {
 		/* we moved a buddy. hopefully we just changed groups or positions or something.
 		 * if we changed connections, we copy the buddy to the new connection. if the new

[Gaim-commits] CVS: gaim/src away.c,1.64,1.65

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

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

Modified Files:
	away.c 
Log Message:
blah!


Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- away.c	2001/10/25 05:29:54	1.64
+++ away.c	2001/10/31 10:27:07	1.65
@@ -169,6 +169,8 @@
 
 	serv_set_away_all(NULL);
 	awaymessage = NULL;
+	clistqueue = NULL;
+	clistqueuesw = NULL;
 #ifdef USE_APPLET
 	applet_widget_unregister_callback(APPLET_WIDGET(applet), "away");
 	set_user_state(online);

[Gaim-commits] CVS: gaim/src/protocols/oscar im.c,1.11,1.12

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

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

Modified Files:
	im.c 
Log Message:
hi.


Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- im.c	2001/10/27 01:58:12	1.11
+++ im.c	2001/10/31 09:18:11	1.12
@@ -89,8 +89,10 @@
 	fu32_t sum;
 	int i;
 
-	for (i = 0, sum = 0; i < buflen; i += 2)
+	for (i = 0, sum = 0; i + 1 < buflen; i += 2)
 		sum += (buf[i+1] << 8) + buf[i];
+	if (i < buflen)
+		sum += buf[i];
 
 	sum = ((sum & 0xffff0000) >> 16) + (sum & 0x0000ffff);
 

[Gaim-commits] CVS: gaim/po nl.po,1.1,1.2

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

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

Modified Files:
	nl.po 
Log Message:
A few more nl.po fixen.



Index: nl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/nl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl.po	2001/10/30 16:48:23	1.1
+++ nl.po	2001/10/30 20:09:13	1.2
@@ -338,7 +338,7 @@
 
 #: src/buddy.c:2595
 msgid "Import Buddy List"
-msgstr "Buddy-Lijst importeren"
+msgstr "Buddy Lijst importeren"
 
 #: src/buddy.c:2613
 msgid "Tools"
@@ -350,7 +350,7 @@
 
 #: src/buddy.c:2632 src/dialogs.c:2074 src/dialogs.c:2241
 msgid "Search for Buddy"
-msgstr "Buddies zoeken"
+msgstr "Buddy's zoeken"
 
 #: src/buddy.c:2636
 msgid "by Email"
@@ -410,7 +410,7 @@
 
 #: src/buddy.c:2727 src/prefs.c:2671
 msgid "Buddy List"
-msgstr "Buddy-Lijst"
+msgstr "Buddy Lijst"
 
 #: src/buddy.c:2781
 msgid "Add a new Buddy"
@@ -434,7 +434,7 @@
 
 #: src/buddy.c:2847
 msgid "Gaim - Buddy List"
-msgstr "Gaim - Buddy-Lijst"
+msgstr "Gaim - Buddy Lijst"
 
 #: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
 msgid "Join what group:"
@@ -489,7 +489,7 @@
 #: src/buddy_chat.c:565 src/buddy_chat.c:671
 #, c-format
 msgid "%d %s in room"
-msgstr "%d %s in ruimte"
+msgstr "%d personen in ruimte"
 
 #: src/buddy_chat.c:572
 #, c-format
@@ -516,7 +516,7 @@
 
 #: src/buddy_chat.c:908
 msgid "0 people in room"
-msgstr "0 Mensen im ruimte"
+msgstr "0 Personen im ruimte"
 
 #: src/buddy_chat.c:982 src/buddy_chat.c:1123
 msgid "Whisper"
@@ -1201,7 +1201,7 @@
 
 #: src/multi.c:361 src/prefs.c:189
 msgid "General Options"
-msgstr "Algemene Opties"
+msgstr "Algemene Instellingen"
 
 #: src/multi.c:366
 msgid "Screenname:"
@@ -1626,7 +1626,7 @@
 
 #: src/prefs.c:354
 msgid "Proxy Options"
-msgstr "Proxy Opties"
+msgstr "Proxy Instellingen"
 
 #: src/prefs.c:366
 msgid ""
@@ -1634,11 +1634,11 @@
 "for details."
 msgstr ""
 "Niet alle protocollen kunnen de proxy instellingen gebruiken. "
-"Lees het README bestand voor meer details."
+"Zie het README bestand voor info."
 
 #: src/prefs.c:495
 msgid "Buddy List Options"
-msgstr "Buddy lijst opties"
+msgstr "Buddy Lijst Instellingen"
 
 #: src/prefs.c:507
 msgid "Buddy List Window"
@@ -1694,11 +1694,11 @@
 
 #: src/prefs.c:594
 msgid "Conversation Options"
-msgstr "Gesprek opties"
+msgstr "Gespreks Opties"
 
 #: src/prefs.c:606
 msgid "Keyboard Options"
-msgstr "Toestenbord opties"
+msgstr "Instellingen Toetsenbord"
 
 #: src/prefs.c:618
 msgid "Enter sends message"
@@ -1726,7 +1726,7 @@
 
 #: src/prefs.c:630
 msgid "Display and General Options"
-msgstr "Weergave en algemene opties"
+msgstr "Weergave en algemene Instellingen"
 
 #: src/prefs.c:642
 msgid "Show graphical smileys"
@@ -1774,7 +1774,7 @@
 
 #: src/prefs.c:827
 msgid "IM Options"
-msgstr "Bericht opties"
+msgstr "Instellingen Berichten"
 
 #: src/prefs.c:839
 msgid "IM Window"
@@ -1790,7 +1790,7 @@
 
 #: src/prefs.c:860 src/prefs.c:904
 msgid "Pictures"
-msgstr "Alleen plaatjes"
+msgstr "Alleen Plaatjes"
 
 #: src/prefs.c:861 src/prefs.c:905
 msgid "Text"
@@ -1882,7 +1882,7 @@
 
 #: src/prefs.c:1358 src/prefs.c:2692
 msgid "Font Options"
-msgstr "Lettertype opties"
+msgstr "Instellingen Lettertype"
 
 #: src/prefs.c:1375
 msgid "Underlined Text"
@@ -1898,7 +1898,7 @@
 
 #: src/prefs.c:1444
 msgid "Font Face for Text"
-msgstr "Lettertype voor text"
+msgstr "Lettertype voor Text"
 
 #: src/prefs.c:1459
 msgid "Font Size for Text"
@@ -1906,7 +1906,7 @@
 
 #: src/prefs.c:1541
 msgid "Gaim - Sound Configuration"
-msgstr "Gaim - Geluidsopties"
+msgstr "Gaim - Geluids Configuratie"
 
 #: src/prefs.c:1576
 msgid "Reset"
@@ -1918,7 +1918,7 @@
 
 #: src/prefs.c:1620
 msgid "Sound Options"
-msgstr "Geluidsopties"
+msgstr "Geluids Instellingen"
 
 #: src/prefs.c:1648
 msgid "No sounds when you log in"
@@ -2019,7 +2019,7 @@
 
 #: src/prefs.c:2212
 msgid "Privacy Options"
-msgstr "Privacy opties"
+msgstr "Privacy Instellingen"
 
 #: src/prefs.c:2228
 msgid "Set privacy for:"

[Gaim-commits] CVS: gaim ChangeLog,1.348,1.349

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

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

Modified Files:
	ChangeLog 
Log Message:
la la la la la la la la la



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- ChangeLog	2001/10/30 16:48:23	1.348
+++ ChangeLog	2001/10/30 16:49:59	1.349
@@ -27,6 +27,7 @@
 	* IRC can do /WHOIS
 	* The usual bug fixes and memory leak plugs
 	* Added Dutch translation
+	* Updated Korean translation
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

[Gaim-commits] CVS: gaim/po ko.po,1.19,1.20

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

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

Modified Files:
	ko.po 
Log Message:
la la la la la la la la la



Index: ko.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ko.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ko.po	2001/10/18 12:12:37	1.19
+++ ko.po	2001/10/30 16:49:59	1.20
@@ -4,58 +4,288 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 0.44\n"
-"POT-Creation-Date: 2001-09-20 11:07-0700\n"
-"PO-Revision-Date: 2001-10-10 18:15+0900\n"
-"Last-Translator: ÀÌÈ£¼® <al...@de...>\n"
+"Project-Id-Version: gaim 0.46\n"
+"POT-Creation-Date: 2001-10-18 09:08-0700\n"
+"PO-Revision-Date: 2001-10-29 17:24+0900\n"
+"Last-Translator: ½É»óÇö <art...@kl...>\n"
[...4252 lines suppressed...]
+# src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
+# src/dialogs.c:405
+#: src/server.c:758
+msgid "Warned"
+msgstr "°æ°í¹Þ¾Ò½À´Ï´Ù"
+
 # src/server.c:781
-#: src/server.c:802
+#: src/server.c:829
 msgid "Yes"
-msgstr "¿¬°áµÊ"
+msgstr "³×"
 
 # src/server.c:782
-#: src/server.c:803
+#: src/server.c:830
 msgid "No"
-msgstr "²÷±è"
+msgstr "¾Æ´Ï¿ä"
 

[Gaim-commits] CVS: gaim ChangeLog,1.347,1.348 configure.ac,1.22,1.23

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

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Added dutch translation.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- ChangeLog	2001/10/29 11:23:22	1.347
+++ ChangeLog	2001/10/30 16:48:23	1.348
@@ -26,6 +26,7 @@
 	  right-click on their name while they're online.
 	* IRC can do /WHOIS
 	* The usual bug fixes and memory leak plugs
+	* Added Dutch translation
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ac	2001/10/18 20:56:59	1.22
+++ configure.ac	2001/10/30 16:48:23	1.23
@@ -13,7 +13,7 @@
 AC_PROG_INSTALL
 
 
-ALL_LINGUAS="de es fr ko ru zh_CN pl"
+ALL_LINGUAS="de es fr ko ru zh_CN pl nl"
 AM_GNU_GETTEXT
 
 AC_CYGWIN

[Gaim-commits] CVS: gaim/po nl.po,NONE,1.1

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

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

Added Files:
	nl.po 
Log Message:
Added dutch translation.



--- NEW FILE: nl.po ---
# Dutch translation for "Gaim"
# Copyright (C) 2001 Free Software Foundation, Inc.
# First AUTHOR <f.e...@hc...> 2001
#
msgid ""
msgstr ""
"Project-Id-Version: Gaim 0.9.19\n"
"POT-Creation-Date: 2001-10-29 14:32-0700\n"
"PO-Revision-Date: 2001-10-29 19:17GMT\n"
"Last-Translator: Floris Eshuis <f.e...@hc...>\n"
"Language-Team: nl <nl...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Anjuta 0.1.7\n"

#: plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
msgid "Get Info"
msgstr "Haal Info op"
[...2209 lines suppressed...]
msgstr "Kan niet verbinden voor transfer!"

#: src/toc.c:1705
msgid "Could not write file header!"
msgstr "Kan bestandskop niet schrijven!"

#: src/toc.c:1794
msgid "Gaim - Save As..."
msgstr "Gaim - Opslaan als..."

#: src/toc.c:1833
#, c-format
msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
msgstr "%s vraagt %s, om bestand %d te accepteren: %s (%.2f %s)%s%s "

#: src/toc.c:1838
#, c-format
msgid "%s requests you to send them a file"
msgstr "%s vraagt u om een bestand te verzenden"

[Gaim-commits] CVS: gaim/src/protocols/yahoo yay.c,1.21,1.22

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

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

Modified Files:
	yay.c 
Log Message:
no.


Index: yay.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yay.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- yay.c	2001/10/23 04:54:45	1.21
+++ yay.c	2001/10/29 11:23:22	1.22
@@ -158,6 +158,7 @@
 
 	g_free(tmp);
 
+	strip_linefeed(buf);
 	serv_got_im(gc, nick, buf, 0, tm ? tm : time((time_t)NULL));
 
 	return 1;
@@ -276,6 +277,8 @@
 
 	account_online(gc);
 	serv_finish_login(gc);
+	if (yd->active_id)
+		g_free(yd->active_id);
 	yd->active_id = g_strdup(gc->username);
 	yd->logged_in = TRUE;
 
@@ -397,6 +400,7 @@
 	g_hash_table_destroy(yd->hash);
 	yahoo_disconnect(yd->sess);
 	yahoo_delete(yd->sess);
+	g_free(yd->active_id);
 	g_free(yd);
 }
 

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.23,1.24

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

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

Modified Files:
	jabber.c 
Log Message:
no.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- jabber.c	2001/10/25 09:19:25	1.23
+++ jabber.c	2001/10/29 11:23:22	1.24
@@ -359,6 +359,7 @@
 			/* id attrib of stream is stored for digest auth */
 			j->sid = xmlnode_get_attrib(x, "id");
 			/* STATE_EVT(JCONN_STATE_AUTH) */
+			xmlnode_free(x);
 		} else {
 			j->current = x;
 		}
@@ -1222,6 +1223,7 @@
 		gaim_input_remove(gc->inpa);
 	close(jd->jc->fd);
 	g_timeout_add(50, jabber_free, jd->jc);
+	xmlnode_free(jd->jc->current);
 	jd->jc = NULL;
 	g_free(jd);
 	gc->proto_data = NULL;

[Gaim-commits] CVS: gaim ChangeLog,1.346,1.347

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

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

Modified Files:
	ChangeLog 
Log Message:
no.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -d -r1.346 -r1.347
--- ChangeLog	2001/10/26 10:11:32	1.346
+++ ChangeLog	2001/10/29 11:23:22	1.347
@@ -25,6 +25,7 @@
 	* In MSN you can set a person's alias to their "friendly name" by
 	  right-click on their name while they're online.
 	* IRC can do /WHOIS
+	* The usual bug fixes and memory leak plugs
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

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

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

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

Modified Files:
	conn.c 
Log Message:
no.


Index: conn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/conn.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conn.c	2001/09/12 00:39:51	1.3
+++ conn.c	2001/10/29 11:23:22	1.4
@@ -884,6 +884,7 @@
  */
 faim_export void aim_session_kill(aim_session_t *sess)
 {
+	aim_cleansnacs(sess, -1);
 
 	aim_logoff(sess);