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

[Gaim-commits] CVS: gaim/src gaim.h,1.325,1.326 prefs.c,1.226,1.227 sound.c,1.60,1.61

[Jim S. <jse...@us...>]

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

Modified Files:
	gaim.h prefs.c sound.c 
Log Message:
Easier ordering of sounds.  See patch "[ 560514 ] changable ordering of
sounds in prefs" for a more complete explanation.  (Thanks, Robert McQueen)


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- gaim.h	29 May 2002 01:23:38 -0000	1.325
+++ gaim.h	18 Jun 2002 00:49:55 -0000	1.326
@@ -297,6 +297,9 @@
 #define SND_POUNCE_DEFAULT 9
 #define SND_CHAT_NICK 10
 #define NUM_SOUNDS 11
+/* these two for the sound_order list in prefs.c */
+#define SND_SEPARATOR -1
+#define SND_END -2
 extern char *sound_file[NUM_SOUNDS];
 
 /* global sound struct */

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- prefs.c	17 Jun 2002 00:10:34 -0000	1.226
+++ prefs.c	18 Jun 2002 00:49:55 -0000	1.227
@@ -1603,6 +1603,17 @@
 	GtkWidget *menu;
 	GtkWidget *opt;
 	int i=1, driver=0, j;
+	/* order that sound options are presented in, SND_SEPARATOR for  *
+         * a seperator. better to do it this way than try and re-order   *
+         * the sound defines 'cause that would mux up the sound prefs in *
+         * gaimrc. this list is terminated with SND_END.       -Robot101 */
+	int sound_order[] = {
+		SND_BUDDY_ARRIVE, SND_BUDDY_LEAVE, SND_SEPARATOR,
+		SND_FIRST_RECEIVE, SND_RECEIVE, SND_SEND, SND_SEPARATOR,
+		SND_CHAT_JOIN, SND_CHAT_LEAVE,
+		SND_CHAT_YOU_SAY, SND_CHAT_SAY, SND_CHAT_NICK,
+		SND_END
+	};
 
 	parent = prefdialog->parent;
 	gtk_widget_destroy(prefdialog);
@@ -1745,19 +1756,17 @@
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_widget_show(vbox);
 
-	for (j=0; j < NUM_SOUNDS; j++) {
-		/* no entry for sounds without an option */
-		if (sounds[j].opt == 0)
-			continue;
-
-		/* seperators before SND_RECEIVE and SND_CHAT_JOIN */
-		if ((j == SND_RECEIVE) || (j == SND_CHAT_JOIN)) {
+	for (j=0; sound_order[j] != SND_END; j++) {
+		if (sound_order[j] == SND_SEPARATOR) {
 			sep = gtk_hseparator_new();
 			gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 5);
 			gtk_widget_show(sep);
+		} else {
+			/* no entry for sounds without an option */
+			if (sounds[sound_order[j]].opt == 0)
+				continue;
+			sound_entry(vbox, sound_order[j]);
 		}
-
-		sound_entry(vbox, j);
 	}
 
 	gtk_widget_show(prefdialog);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sound.c	16 Jun 2002 20:03:31 -0000	1.60
+++ sound.c	18 Jun 2002 00:49:55 -0000	1.61
@@ -52,12 +52,13 @@
 #include "sounds/Receive.h"
 #include "sounds/RedAlert.h"
 
-
 gboolean mute_sounds = 0;
 
-/* label and opt are null for the buddy pounce because it's configured *
- * per pounce. NULL option means it doesn't get displayed in the sound *
- * preferences box */
+/* description, option bit, default sound array, and it's size.   *
+ * if you want it to get displayed in the prefs dialog, it needs  *
+ * to be added to the sound_order array in prefs.c, if not, and   *
+ * it has no option bit, set it to 0. the order here has to match *
+ * the defines in gaim.h.                               -Robot101 */
 struct sound_struct sounds[NUM_SOUNDS] = {
 	{N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive)},
 	{N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave)},
@@ -68,6 +69,7 @@
 	{N_("Person leaves chat"), OPT_SOUND_CHAT_PART, BuddyLeave, sizeof(BuddyLeave)},
 	{N_("You talk in chat"), OPT_SOUND_CHAT_YOU_SAY, Send, sizeof(Send)},
 	{N_("Others talk in chat"), OPT_SOUND_CHAT_SAY, Receive, sizeof(Receive)},
+	/* this isn't a terminator, it's the buddy pounce default sound event ;-) */
 	{NULL, 0, RedAlert, sizeof(RedAlert)},
 	{N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive)}
 };

[Gaim-commits] CVS: gaim/src dialogs.c,1.322,1.323

[Jim S. <jse...@us...>]

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

Modified Files:
	dialogs.c 
Log Message:
Tie pixmaps and text labels together so when windows are expanded
vertically they stay together--the labels and pixmaps, that is.  (Thanks,
Daniel Walls)


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- dialogs.c	17 Jun 2002 00:10:34 -0000	1.322
+++ dialogs.c	18 Jun 2002 00:35:23 -0000	1.323
@@ -4288,23 +4288,60 @@
 	button_box_2 = gtk_vbox_new(FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
-	if (dispstyle == 2 || dispstyle == 0) {
-		pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
-		pixmap = gtk_pixmap_new(pm, mask);
-		gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+	
+	switch(dispstyle) {
+		case 0:
+			/* Display just pixmap */
+			pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+			pixmap = gtk_pixmap_new(pm, mask);
+			gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+			
+			gtk_widget_show(pixmap);
+			
+			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(mask);
+			break;
 
-		gtk_widget_show(pixmap);
+		case 1:
+			/* Display just label */
+			label = gtk_label_new(text);
+			gtk_widget_show(label);
+			gtk_box_pack_start(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
+			break;
 
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(mask);
-	}
+		case 2:
+			/* Display pixmap and label */
+			{
+				GtkWidget *button_box_top = gtk_vbox_new(FALSE, 0);
+				GtkWidget *button_box_bottom = gtk_vbox_new(FALSE, 0); 
+				
+				pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+				pixmap = gtk_pixmap_new(pm, mask);
+				gtk_box_pack_end(GTK_BOX(button_box_top), pixmap, FALSE, FALSE, 0);
 
-	if (dispstyle == 2 || dispstyle == 1) {
-		label = gtk_label_new(text);
-		gtk_widget_show(label);
-		gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
+				gtk_widget_show(pixmap);
+
+				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(mask);
+
+				label = gtk_label_new(text);
+				gtk_widget_show(label);
+				gtk_box_pack_start(GTK_BOX(button_box_bottom), label, FALSE, FALSE, 0);
+						
+				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_top, TRUE,
+							TRUE, 0);
+				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_bottom, TRUE,
+							TRUE, 0);
+				gtk_widget_show(button_box_top);
+				gtk_widget_show(button_box_bottom);
+			}
+			break;
+
+		default:
+			break;
 	}
 
 	gtk_tooltips_set_tip(button_tips, button, text, "Gaim");

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.86,1.87

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

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

Modified Files:
	msn.c 
Log Message:


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- msn.c	17 Jun 2002 02:39:38 -0000	1.86
+++ msn.c	17 Jun 2002 02:47:49 -0000	1.87
@@ -619,7 +619,7 @@
 	}
 	
 	cur = url_decode(ret->str);
-	g_string_free(ret, FALSE);
+	g_string_free(ret, TRUE);
 	return cur;
 }
 			
@@ -682,7 +682,6 @@
 
 		g_free(message);
 		if (format) {
-			g_free(format);
 			g_free(utf);
 		}
 	}

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.85,1.86

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

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

Modified Files:
	msn.c 
Log Message:
Patches by Felipe Contreras for MSN.

Thanks, Felipe!


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- msn.c	17 Jun 2002 01:04:10 -0000	1.85
+++ msn.c	17 Jun 2002 02:39:38 -0000	1.86
@@ -389,7 +389,9 @@
 			x = strstr(from, "\r\n"); *x = 0;
 			subject += strlen("Subject: ");
 			x = strstr(subject, "\r\n"); *x = 0;
+			from = utf8_to_str(from);
 			connection_has_mail(gc, -1, from, subject, login_url);
+			g_free(from);
 		}
 	}
 }
@@ -581,28 +583,6 @@
 	return 1;
 }
 
-static void msn_unescape(char *text) {
-	char *cpy = g_strdup(text);
-	char *cur = cpy;
-	int c = 0;
-
-
-	while (*cur) {
-		if (*cur == '%') {
-			if (sscanf (cur, "%%%x;", &c) == 1 && c != 0) {
-				*text = c;
-				cur = cur + 3;
-			} 
-		} else {
-			*text = *cur;
-			cur++;
-		}
-		text++;
-	}
-	*text = 0;
-	g_free(cpy);
-}
-
 static char *msn_parse_format(char *mime)
 {
 	char *cur;
@@ -638,8 +618,7 @@
 		}
 	}
 	
-	msn_unescape(ret->str);
-	cur = ret->str;
+	cur = url_decode(ret->str);
 	g_string_free(ret, FALSE);
 	return cur;
 }
@@ -669,7 +648,7 @@
 		return;
 	if (!g_strncasecmp(content, "Content-Type: text/x-msmsgscontrol\r\n",
 			   strlen(  "Content-Type: text/x-msmsgscontrol\r\n"))) {
-		if (strstr(content,"TypingUser: ")) {
+		if (strstr(content,"TypingUser: ") && !ms->chat) {
 			serv_got_typing(ms->gc, ms->msguser, MSN_TYPING_RECV_TIMEOUT);
 			return;
 		} 
@@ -860,8 +839,12 @@
 {
 	struct msn_data *md = map->gc->proto_data;
 	char buf[MSN_BUF_LEN];
-
-	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend));
+	char *srvfriend;
+	
+	srvfriend = str_to_utf8(url_encode(map->friend));
+	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, srvfriend);
+	g_free(srvfriend);
+	
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(map->gc, "Write error");
 		signoff(map->gc);
@@ -877,9 +860,10 @@
 {
 	struct msn_data *md = map->gc->proto_data;
 	char buf[MSN_BUF_LEN];
+	char *srvfriend = str_to_utf8(url_encode(map->friend));
 
 	if (*(map->user)) {
-		g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend));
+		g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, map->user, srvfriend);
 		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 			hide_login_progress(map->gc, "Write error");
 			signoff(map->gc);
@@ -889,6 +873,7 @@
 		build_block_list();
 	}
 	
+	g_free(srvfriend);
 	g_free(map->user);
 	g_free(map->friend);
 	g_free(map);
@@ -914,7 +899,7 @@
 		user = tmp;
 
 		GET_NEXT(tmp);
-		friend = tmp;
+		friend = url_decode(tmp);
 
 		if (g_strcasecmp(list, "RL"))
 			return 1;
@@ -927,11 +912,11 @@
 
 		ap = g_new0(struct msn_add_permit, 1);
 		ap->user = g_strdup(user);
-		ap->friend = g_strdup(url_decode(friend));
+		ap->friend = utf8_to_str(friend);
 		ap->gc = gc;
 
 		g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add %s to his or her buddy list."),
-				ap->user, url_decode(ap->friend), ap->gc->username);
+				ap->user, ap->friend, ap->gc->username);
 
 		do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add);
 	} else if (!g_strncasecmp(buf, "BLP", 3)) {
@@ -1011,7 +996,7 @@
 		if ((b = find_buddy(gc, user)) != NULL) {
 			if (b->proto_data)
 				g_free(b->proto_data);
-			b->proto_data = g_strdup(friend);
+			b->proto_data = utf8_to_str(friend);
 		}
 
 		if (!g_strcasecmp(state, "BSY")) {
@@ -1056,7 +1041,7 @@
 		if (!g_strcasecmp(which, "FL") && pos) {
 			struct msn_buddy *b = g_new0(struct msn_buddy, 1);
 			b->user = g_strdup(who);
-			b->friend = g_strdup(friend);
+			b->friend = utf8_to_str(friend);
 			md->fl = g_slist_append(md->fl, b);
 		} else if (!g_strcasecmp(which, "AL") && pos) {
 			char *dupl;
@@ -1084,10 +1069,10 @@
 				debug_printf("Unresolved MSN RL entry\n");
 				ap = g_new0(struct msn_add_permit, 1);
 				ap->user = g_strdup(who);
-				ap->friend = g_strdup(friend);
+				ap->friend = utf8_to_str(friend);
 				ap->gc = gc;
                          
-		                g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add you to their buddy list"),ap->user, url_decode(ap->friend));
+		                g_snprintf(msg, sizeof(msg), _("The user %s (%s) wants to add you to their buddy list"),ap->user, ap->friend);
 				do_ask_dialog(msg, ap, msn_accept_add, msn_cancel_add);
 			}
 		    }
@@ -1165,7 +1150,7 @@
 		if ((b = find_buddy(gc, user)) != NULL) {
 			if (b->proto_data)
 				g_free(b->proto_data);
-			b->proto_data = g_strdup(friend);
+			b->proto_data = utf8_to_str(friend);
 		}
 
 		if (!g_strcasecmp(state, "BSY")) {
@@ -1203,9 +1188,10 @@
 		GET_NEXT(tmp);
 		GET_NEXT(tmp);
 		GET_NEXT(tmp);
-		friend = url_decode(tmp);
+		friend = utf8_to_str(tmp);
 
 		g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend);
+		g_free(friend);
 	} else if (!g_strncasecmp(buf, "REM", 3)) {
 	} else if (!g_strncasecmp(buf, "RNG", 3)) {
 		struct msn_switchboard *ms;
@@ -1589,13 +1575,14 @@
 		resp = tmp;
 		GET_NEXT(tmp);
 		GET_NEXT(tmp);
-		friend = tmp;
+		friend = url_decode(tmp);
 		GET_NEXT(tmp);
-		friend = url_decode(friend);
 
 		/* so here, we're either getting the challenge or the OK */
 		if (!g_strcasecmp(resp, "OK")) {
+			friend = utf8_to_str(friend);
 			g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", friend);
+			g_free(friend);
 
 			g_snprintf(sendbuf, sizeof(sendbuf), "SYN %d 0\r\n", ++md->trId);
 			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
@@ -1613,7 +1600,9 @@
 			md5_byte_t di[16];
 			int i;
 
+			friend = utf8_to_str(friend);
 			g_snprintf(buf2, sizeof(buf2), "%s%s", friend, gc->password);
+			g_free(friend);
 
 			md5_init(&st);
 			md5_append(&st, (const md5_byte_t *)buf2, strlen(buf2));
@@ -2118,13 +2107,17 @@
 	struct gaim_connection *gc = data;
 	struct msn_data *md = gc->proto_data;
 	char buf[MSN_BUF_LEN];
+	char *alias;
 
-	if (strlen(url_encode(entry)) >= BUDDY_ALIAS_MAXLEN) {
+	alias = str_to_utf8(url_encode(entry));
+	
+	if (strlen(alias) >= BUDDY_ALIAS_MAXLEN) {
 		do_error_dialog(_("Friendly name too long."), _("MSN Error"));
 		return;
 	}
 	
-	g_snprintf(buf, sizeof(buf), "REA %d %s %s\r\n", ++md->trId, gc->username, url_encode(entry));
+	g_snprintf(buf, sizeof(buf), "REA %d %s %s\r\n", ++md->trId, gc->username, alias);
+	g_free(alias);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
 		signoff(gc);

[Gaim-commits] CVS: gaim ChangeLog,1.506,1.507

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

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

Modified Files:
	ChangeLog 
Log Message:
Patches by Felipe Contreras for MSN.

Thanks, Felipe!


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -d -r1.506 -r1.507
--- ChangeLog	17 Jun 2002 01:04:10 -0000	1.506
+++ ChangeLog	17 Jun 2002 02:39:38 -0000	1.507
@@ -45,6 +45,8 @@
 	* Added Mozilla to browser options and changed KFM to 
 	  Konqueror.
 	* Can now set the server and port for MSN and Napster
+	* MSN Internationalization (Thanks Felipe Contreras and
+	  countless, countless others)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/src/protocols/napster napster.c,1.17,1.18

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

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

Modified Files:
	napster.c 
Log Message:
Comment By: Charles (kkrizka)
Date: 2002-05-05 11:29

Message:
Logged In: YES 
user_id=535488

i need port for msn




Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- napster.c	12 Mar 2002 17:21:44 -0000	1.17
+++ napster.c	17 Jun 2002 01:04:10 -0000	1.18
@@ -1,7 +1,7 @@
 /*
  * gaim - Napster Protocol Plugin
  *
- * Copyright (C) 2000-2001, Rob Flynn <ro...@tg...>
+ * Copyright (C) 2000-2001, Rob Flynn <ro...@ma...>
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,6 +41,11 @@
 
 #define NAP_BUF_LEN 4096
 
+#define USEROPT_NAPSERVER 3
+#define NAP_SERVER "64.124.41.187"
+#define USEROPT_NAPPORT 4
+#define NAP_PORT 8888
+
 GSList *nap_connections = NULL;
 
 static unsigned int chat_id = 0;
@@ -434,7 +439,9 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct nap_data *ndata = gc->proto_data = g_new0(struct nap_data, 1);
 
-	ndata->fd = proxy_connect("64.124.41.187", 8888, nap_login_connect, gc);
+	ndata->fd = proxy_connect(user->proto_opt[USEROPT_NAPSERVER][0] ? user->proto_opt[USEROPT_NAPSERVER] : NAP_SERVER, 
+			       user->proto_opt[USEROPT_NAPPORT][0] ? atoi(user->proto_opt[USEROPT_NAPPORT]) : NAP_PORT,
+			       nap_login_connect, gc);
 	if (ndata->fd < 0) {
 		hide_login_progress(gc, "Unable to connect");
 		signoff(gc);
@@ -543,6 +550,27 @@
 	}
 }
 
+
+static GList *nap_user_opts()
+{
+	GList *m = NULL;
+	struct proto_user_opt *puo;
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = "Server:";
+	puo->def = NAP_SERVER;
+	puo->pos = USEROPT_NAPSERVER;
+	m = g_list_append(m, puo);
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = "Port:";
+	puo->def = "8888";
+	puo->pos = USEROPT_NAPPORT;
+	m = g_list_append(m, puo);
+
+	return m;
+}
+
 static char** nap_list_icon(int uc)
 {
 	return napster_xpm;
@@ -555,7 +583,7 @@
 	ret->protocol = PROTO_NAPSTER;
 	ret->name = nap_name;
 	ret->list_icon = nap_list_icon;
-	ret->user_opts = NULL;
+	ret->user_opts = nap_user_opts;
 	ret->login = nap_login;
 	ret->close = nap_close;
 	ret->send_im = nap_send_im;

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.84,1.85

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

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

Modified Files:
	msn.c 
Log Message:
Comment By: Charles (kkrizka)
Date: 2002-05-05 11:29

Message:
Logged In: YES 
user_id=535488

i need port for msn




Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- msn.c	17 Jun 2002 00:14:51 -0000	1.84
+++ msn.c	17 Jun 2002 01:04:10 -0000	1.85
@@ -85,6 +85,11 @@
 
 #define USEROPT_HOTMAIL 0
 
+#define USEROPT_MSNSERVER 3
+#define MSN_SERVER "messenger.hotmail.com"
+#define USEROPT_MSNPORT 4
+#define MSN_PORT 1863
+
 #define MSN_TYPING_RECV_TIMEOUT 6
 #define MSN_TYPING_SEND_TIMEOUT	4
 
@@ -1769,8 +1774,10 @@
 	set_login_progress(gc, 1, _("Connecting"));
 
 	g_snprintf(gc->username, sizeof(gc->username), "%s", msn_normalize(gc->username));
-
-	md->fd = proxy_connect("messenger.hotmail.com", 1863, msn_login_connect, gc);
+	
+	md->fd = proxy_connect(user->proto_opt[USEROPT_MSNSERVER][0] ? user->proto_opt[USEROPT_MSNSERVER] : MSN_SERVER, 
+			       user->proto_opt[USEROPT_MSNPORT][0] ? atoi(user->proto_opt[USEROPT_MSNPORT]) : MSN_PORT,
+			       msn_login_connect, gc);
 	if (md->fd < 0) {
 		hide_login_progress(gc, _("Unable to connect"));
 		signoff(gc);
@@ -2388,6 +2395,26 @@
 		g_free(b->proto_data);
 }
 
+static GList *msn_user_opts()
+{
+	GList *m = NULL;
+	struct proto_user_opt *puo;
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = "Server:";
+	puo->def = MSN_SERVER;
+	puo->pos = USEROPT_MSNSERVER;
+	m = g_list_append(m, puo);
+
+	puo = g_new0(struct proto_user_opt, 1);
+	puo->label = "Port:";
+	puo->def = "1863";
+	puo->pos = USEROPT_MSNPORT;
+	m = g_list_append(m, puo);
+
+	return m;
+}
+
 GSList *msn_smiley_list() 
 { 
 	GSList *smilies = NULL;
@@ -2523,6 +2550,7 @@
 	ret->rem_deny = msn_rem_deny;
 	ret->buddy_free = msn_buddy_free;
 	ret->smiley_list = msn_smiley_list;
+	ret->user_opts = msn_user_opts;
 
 	my_protocol = ret;
 }

[Gaim-commits] CVS: gaim ChangeLog,1.505,1.506

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

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

Modified Files:
	ChangeLog 
Log Message:
Comment By: Charles (kkrizka)
Date: 2002-05-05 11:29

Message:
Logged In: YES 
user_id=535488

i need port for msn




Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -d -r1.505 -r1.506
--- ChangeLog	16 Jun 2002 17:14:28 -0000	1.505
+++ ChangeLog	17 Jun 2002 01:04:10 -0000	1.506
@@ -42,6 +42,9 @@
 	  entirely
 	* Gaim can now handle messages from Mac ICQ and Miranda ICQ
 	  (Thanks, Mark Doliner)
+	* Added Mozilla to browser options and changed KFM to 
+	  Konqueror.
+	* Can now set the server and port for MSN and Napster
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.83,1.84

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

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

Modified Files:
	msn.c 
Log Message:
Ask Slashdot: Software Product Liability?


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- msn.c	3 Jun 2002 05:07:55 -0000	1.83
+++ msn.c	17 Jun 2002 00:14:51 -0000	1.84
@@ -1619,7 +1619,7 @@
 				g_snprintf(buf2, sizeof(buf2), "%02x", di[i]);
 				strcat(sendbuf, buf2);
 			}
-			strcat(sendbuf, "\n");
+			strcat(sendbuf, "\r\n");
 
 			if (msn_write(md->fd, sendbuf, strlen(sendbuf)) < 0) {
 				hide_login_progress(gc, _("Unable to send password"));

[Gaim-commits] CVS: gaim/src browser.c,1.22,1.23 dialogs.c,1.321,1.322 prefs.c,1.225,1.226 ui.h,1.41,1.42

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

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

Modified Files:
	browser.c dialogs.c prefs.c ui.h 
Log Message:
Added Mozilla as a browser, and changed KFM to Konqueror.


Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- browser.c	17 Mar 2002 22:23:17 -0000	1.22
+++ browser.c	17 Jun 2002 00:10:34 -0000	1.23
@@ -586,22 +586,31 @@
 			char command[1024];
 
 			if (web_browser == BROWSER_OPERA) {
-				args[0] = g_strdup("opera");
-				args[1] = g_strdup("-newwindow");
+				args[0] = "opera";
+				args[1] = "-newwindow";
 				args[2] = url;
 				args[3] = NULL;
-			} else if (web_browser == BROWSER_KFM) {
-				args[0] = g_strdup("kfmclient");
-				args[1] = g_strdup("openURL");
+			} else if (web_browser == BROWSER_KONQ) {
+				args[0] = "kfmclient";
+				args[1] = "openURL";
 				args[2] = url;
 				args[3] = NULL;
 			} else if (web_browser == BROWSER_GALEON) {
-				args[0] = g_strdup("galeon");
+				args[0] = "galeon";
+				if (misc_options & OPT_MISC_BROWSER_POPUP) {
+					args[1] = "-w";
+					args[2] = url;
+					args[3] = NULL;
+				} else {
+					args[1] = url;
+					args[2] = NULL;
+				}
+			} else if (web_browser == BROWSER_MOZILLA) {
+				args[0] = "mozilla";
 				args[1] = url;
 				args[2] = NULL;
 			} else if (web_browser == BROWSER_MANUAL) {
 				g_snprintf(command, sizeof(command), web_command, url);
-
 				args[0] = "sh";
 				args[1] = "-c";
 				args[2] = command;

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- dialogs.c	16 Jun 2002 20:03:31 -0000	1.321
+++ dialogs.c	17 Jun 2002 00:10:34 -0000	1.322
@@ -4285,9 +4285,9 @@
 	button_box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
 
-	button_box_2 = gtk_vbox_new(TRUE, 0);
+	button_box_2 = gtk_vbox_new(FALSE, 0);
 
-	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
 	if (dispstyle == 2 || dispstyle == 0) {

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- prefs.c	9 Jun 2002 12:08:16 -0000	1.225
+++ prefs.c	17 Jun 2002 00:10:34 -0000	1.226
@@ -288,9 +288,10 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
-	opt = browser_radio(_("KFM"), BROWSER_KFM, vbox, NULL);
+	opt = browser_radio(_("Konqueror"), BROWSER_KONQ, vbox, NULL);
 	opt = browser_radio(_("Opera"), BROWSER_OPERA, vbox, opt);
 	opt = browser_radio(_("Netscape"), BROWSER_NETSCAPE, vbox, opt);
+	opt = browser_radio(_("Mozilla"), BROWSER_MOZILLA, vbox, opt);
 
 	new_window =
 	    gaim_button(_("Pop up new window by default"), &misc_options, OPT_MISC_BROWSER_POPUP, vbox);

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ui.h	16 Jun 2002 20:03:31 -0000	1.41
+++ ui.h	17 Jun 2002 00:10:34 -0000	1.42
@@ -55,12 +55,13 @@
 #define DEFAULT_FONT_FACE "helvetica"
 
 #define BROWSER_NETSCAPE              0
-#define BROWSER_KFM                   1
+#define BROWSER_KONQ                  1
 #define BROWSER_MANUAL                2
 /*#define BROWSER_INTERNAL              3*/
 #define BROWSER_GNOME                 4
 #define BROWSER_OPERA                 5	
 #define BROWSER_GALEON                6
+#define BROWSER_MOZILLA               7
 
 #define FACE_ANGEL 0
 #define FACE_BIGSMILE 1

[Gaim-commits] CVS: gaim/src dialogs.c,1.320,1.321 sound.c,1.59,1.60 ui.h,1.40,1.41

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

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

Modified Files:
	dialogs.c sound.c ui.h 
Log Message:
No UI for this (yet)... but plugins can use it.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- dialogs.c	5 May 2002 20:19:40 -0000	1.320
+++ dialogs.c	16 Jun 2002 20:03:31 -0000	1.321
@@ -4285,9 +4285,9 @@
 	button_box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
 
-	button_box_2 = gtk_vbox_new(FALSE, 0);
+	button_box_2 = gtk_vbox_new(TRUE, 0);
 
-	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, FALSE, FALSE, 0);
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
 	if (dispstyle == 2 || dispstyle == 0) {

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sound.c	31 May 2002 02:26:53 -0000	1.59
+++ sound.c	16 Jun 2002 20:03:31 -0000	1.60
@@ -52,6 +52,9 @@
 #include "sounds/Receive.h"
 #include "sounds/RedAlert.h"
 
+
+gboolean mute_sounds = 0;
+
 /* label and opt are null for the buddy pounce because it's configured *
  * per pounce. NULL option means it doesn't get displayed in the sound *
  * preferences box */
@@ -551,6 +554,10 @@
 
 void play_sound(int sound)
 {
+
+	if (mute_sounds)
+		return;
+	
 	if (awaymessage && !(sound_options & OPT_SOUND_WHEN_AWAY))
 		return;
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ui.h	3 Jun 2002 05:52:52 -0000	1.40
+++ ui.h	16 Jun 2002 20:03:31 -0000	1.41
@@ -309,6 +309,9 @@
 /* Globals in prpl.c */
 extern GtkWidget *protomenu;
 
+/* Globals in sound.c */
+extern gboolean mute_sounds;
+
 /* Functions in about.c */
 extern void show_about(GtkWidget *, void *);
 extern void gaim_help(GtkWidget *, void *);

[Gaim-commits] CVS: gaim ChangeLog,1.504,1.505

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
KingAnt's Mac ICQ and Miranda ICQ patch


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -d -r1.504 -r1.505
--- ChangeLog	15 Jun 2002 20:24:01 -0000	1.504
+++ ChangeLog	16 Jun 2002 17:14:28 -0000	1.505
@@ -40,6 +40,8 @@
 	* Added capability for protocol-specific edit buddy menu entries
 	* Can now remove a Jabber buddy roster item from the server
 	  entirely
+	* Gaim can now handle messages from Mac ICQ and Miranda ICQ
+	  (Thanks, Mark Doliner)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/po pl.po,1.15,1.16

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

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

Modified Files:
	pl.po 
Log Message:
yaya



Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pl.po	3 Jun 2002 04:30:19 -0000	1.15
+++ pl.po	16 Jun 2002 17:09:55 -0000	1.16
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.59\n"
-"POT-Creation-Date: 2002-05-30 08:05-0400\n"
+"POT-Creation-Date: 2002-06-15 17:14-0400\n"
 "PO-Revision-Date: 2002-06-02 20:01+0100\n"
 "Last-Translator: Przemys³aw Su³ek <pb...@li...>\n"
 "Language-Team: POLISH <pl...@li...>\n"
@@ -22,11 +22,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim Czat"
[...1275 lines suppressed...]
 msgstr "Informacje rejestracji"
 
-#: src/prpl.c:684
+#: src/prpl.c:690
 msgid "Register"
 msgstr "Rejestruj"
 
@@ -3561,6 +3575,12 @@
 #: src/sound.c:69
 msgid "Someone says your name in chat"
 msgstr "Kto¶ wymawia Twoje imiê na czacie"
+
+#~ msgid "Enable sounds"
+#~ msgstr "Za³±cz d¼wiêki"
+
+#~ msgid "Manual"
+#~ msgstr "Rêcznie"
 
 #~ msgid "Events"
 #~ msgstr "Zdarzenia"

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.140,1.141

[Jim S. <jse...@us...>]

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

Modified Files:
	oscar.c 
Log Message:
Ability to receive messages from Mac ICQ and Miranda ICQ. (Thanks, Mark
Doliner)


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- oscar.c	29 May 2002 01:23:38 -0000	1.140
+++ oscar.c	16 Jun 2002 16:14:22 -0000	1.141
@@ -1485,6 +1485,16 @@
 	struct gaim_connection *gc = sess->aux_data;
 
 	switch (args->type) {
+		case 0x0001: { /* An almost-normal instant message.  Mac ICQ sends this.  It's peculiar. */
+			char *uin, *message;
+			uin = g_strdup_printf("%lu", args->uin);
+			message = g_strdup(args->msg);
+			strip_linefeed(message);
+			serv_got_im(gc, uin, message, 0, time(NULL), -1);
+			g_free(uin);
+			g_free(message);
+		} break;
+
 		case 0x0006: { /* Someone requested authorization */
 			gaim_icq_authask(gc, args->uin, args->msg);
 		} break;

[Gaim-commits] CVS: gaim ChangeLog,1.503,1.504

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Protocol-specific "edit buddy menu" capability and Jabber "Remove From
Roster" option.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -d -r1.503 -r1.504
--- ChangeLog	15 Jun 2002 17:26:58 -0000	1.503
+++ ChangeLog	15 Jun 2002 20:24:01 -0000	1.504
@@ -37,6 +37,9 @@
 	* Fixed problem with Jabber away status not being propagated to
 	  conference rooms for jabberd (server) v1.4.2 and above
 	* Chat room buddy lists are now sorted independent of case
+	* Added capability for protocol-specific edit buddy menu entries
+	* Can now remove a Jabber buddy roster item from the server
+	  entirely
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

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

[Jim S. <jse...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Added "Remove From Roster" (proto-specific edit buddy menu) option.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- jabber.c	15 Jun 2002 17:24:07 -0000	1.54
+++ jabber.c	15 Jun 2002 20:22:28 -0000	1.55
@@ -2373,6 +2373,27 @@
 	xmlnode_free(x);
 }
 
+/*
+ * Remove a buddy item from the roster entirely
+ */
+static void jabber_remove_buddy_roster_item(struct gaim_connection *gc, char *name)
+{
+	xmlnode x, y;
+	char *realwho;
+	gjconn gjc = ((struct jabber_data *)gc->proto_data)->gjc;
+
+	if(!name || (realwho = get_realwho(gjc, name, FALSE, NULL)) == NULL)
+		return;
+
+	x = jutil_iqnew(JPACKET__SET, NS_ROSTER);
+	y = xmlnode_insert_tag(xmlnode_get_tag(x, "query"), "item");
+	xmlnode_put_attrib(y, "jid", realwho);
+	xmlnode_put_attrib(y, "subscription", "remove");
+	gjab_send(((struct jabber_data *)gc->proto_data)->gjc, x);
+	g_free(realwho);
+	xmlnode_free(x);
+}
+
 static char **jabber_list_icon(int uc)
 {
 	switch (uc) {
@@ -2843,6 +2864,22 @@
 	return m;
 }
 
+/*
+ * Jabber protocol-specific "edit buddy menu" item(s)
+ */
+static GList *jabber_edit_buddy_menu(struct gaim_connection *gc, char *who) {
+	GList *m = NULL;
+	struct proto_buddy_menu *pbm;
+
+	pbm = g_new0(struct proto_buddy_menu, 1);
+	pbm->label = _("Remove From Roster");
+	pbm->callback = jabber_remove_buddy_roster_item;
+	pbm->gc = gc;
+	m = g_list_append(m, pbm);
+
+	return m;
+}
+
 static GList *jabber_away_states(struct gaim_connection *gc) {
 	GList *m = NULL;
 
@@ -3732,6 +3769,7 @@
 	ret->actions = jabber_actions;
 	ret->do_action = jabber_do_action;
 	ret->buddy_menu = jabber_buddy_menu;
+	ret->edit_buddy_menu = jabber_edit_buddy_menu;
 	ret->user_opts = jabber_user_opts;
 	ret->login = jabber_login;
 	ret->close = jabber_close;

[Gaim-commits] CVS: gaim/src buddy.c,1.316,1.317 prpl.h,1.65,1.66

[Jim S. <jse...@us...>]

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

Modified Files:
	buddy.c prpl.h 
Log Message:
Added capability for protocol-specific "edit buddy menu" items.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- buddy.c	29 May 2002 01:23:37 -0000	1.316
+++ buddy.c	15 Jun 2002 20:21:01 -0000	1.317
@@ -789,6 +789,7 @@
 	int row, column;
 	static GtkWidget *menu = NULL;
 	GtkWidget *button;
+	static GList *mo_top = NULL;
 
 	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
 		return FALSE;
@@ -806,6 +807,11 @@
 	if(menu) {
 		gtk_widget_destroy(menu);
 		menu = NULL;	/* safety measure */
+		if(mo_top) {
+			g_list_foreach(mo_top, (GFunc)g_free, NULL);
+			g_list_free(mo_top);
+			mo_top = NULL;
+		}
 	}
 
 	if (*type == EDIT_GROUP) {
@@ -860,6 +866,27 @@
 				   GTK_SIGNAL_FUNC(pressed_log), b->name);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
+
+		/*
+		 * Add protocol-specific edit buddy menu items if they exist
+		 */
+		if (b->gc->prpl->edit_buddy_menu) {
+			GList *mo = mo_top = b->gc->prpl->edit_buddy_menu(b->gc, b->name);
+
+			while (mo) {
+				struct proto_buddy_menu *pbm = mo->data;
+				GtkWidget *button;
+
+				button = gtk_menu_item_new_with_label(pbm->label);
+				gtk_signal_connect(GTK_OBJECT(button), "activate",
+						   GTK_SIGNAL_FUNC(menu_click), b->name);
+				gtk_object_set_user_data(GTK_OBJECT(button), mo);
+				gtk_menu_append(GTK_MENU(menu), button);
+				gtk_widget_show(button);
+
+				mo = mo->next;
+			}
+		}
 
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
 

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- prpl.h	12 Apr 2002 02:15:24 -0000	1.65
+++ prpl.h	15 Jun 2002 20:21:01 -0000	1.66
@@ -99,6 +99,7 @@
 	/* user_opts returns a GList* of g_malloc'd struct proto_user_opts */
 	GList *(* user_opts)();
 	GList *(* buddy_menu)(struct gaim_connection *, char *);
+	GList *(* edit_buddy_menu)(struct gaim_connection *, char *);
 	GList *(* chat_info)(struct gaim_connection *);
 
 	GSList *(* smiley_list)();

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.152,1.153

[Jim S. <jse...@us...>]

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

Modified Files:
	buddy_chat.c 
Log Message:
Chat room buddy lists are now sorted independent of case


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- buddy_chat.c	15 May 2002 02:21:21 -0000	1.152
+++ buddy_chat.c	15 Jun 2002 17:26:58 -0000	1.153
@@ -776,17 +776,17 @@
 	if (*a == '@') {
 		if (*b != '@')
 			return -1;
-		return (strcmp(a + 1, b + 1));
+		return (strcasecmp(a + 1, b + 1));
 	} else if (*a == '+') {
 		if (*b == '@')
 			return 1;
 		if (*b != '+')
 			return -1;
-		return (strcmp(a + 1, b + 1));
+		return (strcasecmp(a + 1, b + 1));
 	} else {
 		if (*b == '@' || *b == '+')
 			return 1;
-		return strcmp(a, b);
+		return strcasecmp(a, b);
 	}
 }
 

[Gaim-commits] CVS: gaim ChangeLog,1.502,1.503

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Chat room buddy lists are now sorted independent of case


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -d -r1.502 -r1.503
--- ChangeLog	15 Jun 2002 17:24:07 -0000	1.502
+++ ChangeLog	15 Jun 2002 17:26:58 -0000	1.503
@@ -36,6 +36,7 @@
 	* Plugged memory leaks in Jabber plug-in
 	* Fixed problem with Jabber away status not being propagated to
 	  conference rooms for jabberd (server) v1.4.2 and above
+	* Chat room buddy lists are now sorted independent of case
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

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

[Jim S. <jse...@us...>]

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

Modified Files:
	jabber.c 
Log Message:
Added typing notification and improved support for Jabber resources.
(Thanks, Nathan Walp)
Fixed problem with Gaim crashing on non-ASCII buddy alias (Jabber "name"
attribute) chars.  (Thanks, Ho-seok Lee)
Plugged memory leaks and fixed problem with away status not being
propagated to conference rooms for jabberd 1.4.2 and above.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- jabber.c	18 May 2002 23:31:33 -0000	1.53
+++ jabber.c	15 Jun 2002 17:24:07 -0000	1.54
@@ -78,6 +78,8 @@
 
 #define USEROPT_PORT 0
 
+#define JABBER_TYPING_NOTIFY_INT 15	/* Delay (in seconds) between sending typing notifications */
+
 /*
  * Note: "was_connected" may seem redundant, but it was needed and I
  * didn't want to touch the Jabber state stuff not specific to Gaim.
@@ -135,17 +137,61 @@
 	gjconn gjc;
 	gboolean did_import;
[...1564 lines suppressed...]
 	ret->group_buddy = jabber_group_change;
+	ret->send_typing = jabber_send_typing;
+	ret->convo_closed = jabber_convo_closed;
 
 	my_protocol = ret;
 }
@@ -3279,3 +3798,13 @@
 }
 
 #endif
+
+/*
+ * Local variables:
+ * c-indentation-style: k&r
+ * c-basic-offset: 8
+ * indent-tabs-mode: notnil
+ * End:
+ *
+ * vim: shiftwidth=8:
+ */

[Gaim-commits] CVS: gaim/src conversation.c,1.357,1.358

[Jim S. <jse...@us...>]

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

Modified Files:
	conversation.c 
Log Message:
Added typing notification and improved support for Jabber resources.
(Thanks, Nathan Walp)
Fixed problem with Gaim crashing on non-ASCII buddy alias (Jabber "name"
attribute) chars.  (Thanks, Ho-seok Lee)
Plugged memory leaks and fixed problem with away status not being
propagated to conference rooms for jabberd 1.4.2 and above.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- conversation.c	7 Jun 2002 02:57:31 -0000	1.357
+++ conversation.c	15 Jun 2002 17:24:07 -0000	1.358
@@ -530,6 +530,7 @@
 
 	if (!c->is_chat) {
 		GSList *cn = connections;
+		serv_send_typing(c->gc, c->name, FALSE);
 		while (cn) {
 			struct gaim_connection *gc = cn->data;
 			cn = cn->next;

[Gaim-commits] CVS: gaim ChangeLog,1.501,1.502

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Added typing notification and improved support for Jabber resources.
(Thanks, Nathan Walp)
Fixed problem with Gaim crashing on non-ASCII buddy alias (Jabber "name"
attribute) chars.  (Thanks, Ho-seok Lee)
Plugged memory leaks and fixed problem with away status not being
propagated to conference rooms for jabberd 1.4.2 and above.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -d -r1.501 -r1.502
--- ChangeLog	15 Jun 2002 16:19:02 -0000	1.501
+++ ChangeLog	15 Jun 2002 17:24:07 -0000	1.502
@@ -28,7 +28,14 @@
 	* Fixed MSN "Unkown Error Code", "Already there", and 
 	  "Already in opposite list" errors
 	* Changed "Play sound" button to "Mute" button
-	* You can now have "reserved" chars in IM and proxy passwords.
+	* You can now have "reserved" chars in IM and proxy passwords
+	* Jabber now has typing notification  (Thanks, Nathan Walp)
+	* Improved support for Jabber resources  (Thanks, Nathan Walp)
+	* Fixed problem with Gaim crashing on non-ASCII Jabber buddy
+	  aliases (Jabber "name" attribute) chars  (Thanks, Ho-seok Lee)
+	* Plugged memory leaks in Jabber plug-in
+	* Fixed problem with Jabber away status not being propagated to
+	  conference rooms for jabberd (server) v1.4.2 and above
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim ChangeLog,1.500,1.501

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
You can now have "reserved" chars in IM and proxy passwords.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -d -r1.500 -r1.501
--- ChangeLog	15 Jun 2002 03:30:33 -0000	1.500
+++ ChangeLog	15 Jun 2002 16:19:02 -0000	1.501
@@ -28,6 +28,7 @@
 	* Fixed MSN "Unkown Error Code", "Already there", and 
 	  "Already in opposite list" errors
 	* Changed "Play sound" button to "Mute" button
+	* You can now have "reserved" chars in IM and proxy passwords.
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/src gaimrc.c,1.95,1.96

[Jim S. <jse...@us...>]

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

Modified Files:
	gaimrc.c 
Log Message:
Can now have reserved chars in IM and proxy passwords.  (Ref: bug I.D.
[ 555752 ] Proxy pass socks and } character)


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- gaimrc.c	4 May 2002 08:21:31 -0000	1.95
+++ gaimrc.c	15 Jun 2002 15:43:03 -0000	1.96
@@ -555,10 +555,13 @@
 {
 	char *c;
 	int nl = 1, i;
-	if (u->options & OPT_USR_REM_PASS)
-		fprintf(f, "\t\tident { %s } { %s }\n", u->username, u->password);
-	else
+
+	if (u->options & OPT_USR_REM_PASS) {
+		fprintf(f, "\t\tident { %s } { %s }\n", u->username, (c = escape_text2(u->password)));
+		free(c);
+	} else {
 		fprintf(f, "\t\tident { %s } {  }\n", u->username);
+	}
 	fprintf(f, "\t\tuser_info {");
 	c = u->user_info;
 	while (*c) {
@@ -972,12 +975,15 @@
 
 static void gaimrc_write_proxy(FILE *f)
 {
+	char *str;
+
 	fprintf(f, "proxy {\n");
 	fprintf(f, "\thost { %s }\n", proxyhost);
 	fprintf(f, "\tport { %d }\n", proxyport);
 	fprintf(f, "\ttype { %d }\n", proxytype);
 	fprintf(f, "\tuser { %s }\n", proxyuser);
-	fprintf(f, "\tpass { %s }\n", proxypass);
+	fprintf(f, "\tpass { %s }\n", (str = escape_text2(proxypass)));
+	free(str);
 	fprintf(f, "}\n");
 }
 

[Gaim-commits] CVS: gaim ChangeLog,1.499,1.500

[Jim S. <jse...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
By popular request: extraneous <tab> following 0.58 entries removed.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -d -r1.499 -r1.500
--- ChangeLog	7 Jun 2002 18:29:43 -0000	1.499
+++ ChangeLog	15 Jun 2002 03:30:33 -0000	1.500
@@ -65,7 +65,7 @@
 	* Secure MSN logins (added in 0.57) no longer blow up
 	  on Solaris.
 	* Timezone support improved.
-	 
+
 version 0.57 (04/25/2002):
 	* New authorization method for Yahoo!
 	* Polish translation updated (Thanks Przemyslaw Sulek)