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

[Gaim-commits] CVS: gaim ChangeLog,1.472,1.473

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

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

Modified Files:
	ChangeLog 
Log Message:
<LSchiere> a changelog entry is a good thing


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- ChangeLog	6 May 2002 17:13:24 -0000	1.472
+++ ChangeLog	9 May 2002 14:49:24 -0000	1.473
@@ -17,6 +17,25 @@
 	  (Thanks, Mark Doliner)
 	* ICQ status messages in OSCAR (Thanks, Mark Doliner)
 	* Play sound when your name is said in a chat
+	* Approval dialog for Jabber when somebody wants to
+	  subscribe to user's presence. Also gives user the
+	  opportunity to add that buddy if not already on the
+	  user's buddy list.
+	* Jabber "Change buddy group" roster synchronization now
+	  works again.  (This was unknowingly broken when the
+	  "out-sourced" Jabber libs were upgraded in 0.56)
+	* Invalid Jabber I.D.'s no longer crash Gaim.  User now
+	  notified with pop-up's.
+	* Jabber Buddy sign-on time support, added in 0.57,
+	  removed until and unless and inconsistency can be
+	  resolved. (Thanks, Nathan Walp)
+	* Bug-fix for potential buffer overflow in Jabber
+	  plugin. (Thanks, rwscott)
+	* Tempfiles used for secure MSN/HotMail login (added in
+	  0.57) are now themselves created securely.
+	* 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!

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

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

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

Modified Files:
	jabber.c 
Log Message:
Added code to detect invalid JIDs and prevent Gaim from crashing on them.
Removed "safety check" call in jabber_handlebuddy() to apparently broken
xmlnode_get_datasz() function.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- jabber.c	8 May 2002 00:50:22 -0000	1.48
+++ jabber.c	9 May 2002 13:53:12 -0000	1.49
@@ -210,7 +210,10 @@
 	}
 	gjc->p = p;
 
-	gjc->user = jid_new(p, user);
+	if((gjc->user = jid_new(p, user)) == NULL) {
+		pool_free(p);	/* no need for this anymore! */
+		return (NULL);
+	}
 	gjc->pass = pstrdup(p, pass);
 
 	gjc->state = JCONN_STATE_OFF;
@@ -684,6 +687,23 @@
 }
 
 /*
+ * Remove a buddy from the (gaim) buddylist (if he's on it)
+ */
+static void jabber_remove_gaim_buddy(struct gaim_connection *gc, char *buddyname)
+{
+	struct buddy *b;
+
+	if ((b = find_buddy(gc, buddyname)) != NULL) {
+		struct group *group;
+
+		group = find_group_by_buddy(gc, buddyname);
+		debug_printf("removing buddy [1]: %s, from group: %s\n", buddyname, group->name);
+		remove_buddy(gc, group, b);
+		do_export(gc);
+	}
+}
+
+/*
  * keep track of away msg same as yahoo plugin
  */
 static void jabber_track_away(gjconn gjc, jpacket p, char *name, char *type)
@@ -1224,7 +1244,7 @@
 
 	buddyname = g_strdup_printf("%s@%s", who->user, who->server);
 
-	if((g = xmlnode_get_tag(x, "group")) != NULL && xmlnode_get_datasz(g) > 0) {
+	if((g = xmlnode_get_tag(x, "group")) != NULL) {
 		groupname = xmlnode_get_data(g);
 	}
 
@@ -1266,15 +1286,7 @@
 			}
 		}
 	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
-		if ((b = find_buddy(GJ_GC(gjc), buddyname)) != NULL) {
-			struct group *group;
-
-			group = find_group_by_buddy(GJ_GC(gjc), buddyname);
-			debug_printf("removing buddy [1]: %s, from group: %s\n",
-				buddyname, group->name);
-			remove_buddy(GJ_GC(gjc), group, b);
-			do_export(GJ_GC(gjc));
-		}
+		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);
 	}
 	g_free(buddyname);
 
@@ -1623,9 +1635,11 @@
 {
 	struct jabber_data *jd = data;
 
-	gjab_delete(jd->gjc);
-	g_free(jd->gjc->sid);
-	jd->gjc = NULL;
+	if(jd->gjc != NULL) {
+		gjab_delete(jd->gjc);
+		g_free(jd->gjc->sid);
+		jd->gjc = NULL;
+	}
 	g_free(jd);
 
 	return FALSE;
@@ -1653,7 +1667,7 @@
 		}
 
 		/* Free-up the pending queries memories and the list */
-		if(jd->gjc->queries != NULL) {
+		if(jd->gjc != NULL && jd->gjc->queries != NULL) {
 			g_hash_table_foreach_remove(jd->gjc->queries, jabber_destroy_hash, NULL);
 			g_hash_table_destroy(jd->gjc->queries);
 			jd->gjc->queries = NULL;
@@ -1664,7 +1678,8 @@
 
 	if(jd) {
 		g_timeout_add(50, jabber_free, jd);
-		xmlnode_free(jd->gjc->current);
+		if(jd->gjc != NULL)
+			xmlnode_free(jd->gjc->current);
 	}
 	gc->proto_data = NULL;
 }
@@ -1787,7 +1802,15 @@
 	if (!strchr(name, '@'))
 		realwho = g_strdup_printf("%s@%s", name, gjc->user->server);
 	else {
-		jid who = jid_new(gjc->p, name);
+		jid who;
+		
+		if((who = jid_new(gjc->p, name)) == NULL) {
+			char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), name);
+			do_error_dialog(msg, _("Jabber Error"));
+			g_free(msg);
+			jabber_remove_gaim_buddy(gc, name);
+			return;
+		}
 		if (who->user == NULL) {
 			/* FIXME: transport */
 			return;
@@ -1927,7 +1950,12 @@
 			data->next->next->data);
 	debug_printf("%s\n", realwho);
 
-	Jid = jid_new(gjc->p, realwho);
+	if((Jid = jid_new(gjc->p, realwho)) == NULL) {
+		char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), realwho);
+		do_error_dialog(msg, _("Jabber Error"));
+		g_free(msg);
+		return;
+	}
 
 	if((jc = find_any_chat(gc, Jid)) != NULL) {
 		free(Jid);	/* don't need it, after all */

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.75,1.76

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

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

Modified Files:
	irc.c 
Log Message:
with life
also comes the end
and with hope
also comes regret
the demise of your heart
and your courage
withering away in the sun
much like a rose
once trampled on
no longer living inside
your soul steps aside



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- irc.c	17 Mar 2002 20:23:33 -0000	1.75
+++ irc.c	8 May 2002 04:12:41 -0000	1.76
@@ -954,7 +954,7 @@
 
 	if (!g_strncasecmp(msg, "VERSION", 7)) {
 		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION Gaim " VERSION ": The Pimpin "
-					     "Penguin AIM Clone: " WEBSITE "\001\r\n", nick);
+					     "Linux Messaging Client: " WEBSITE "\001\r\n", nick);
 		irc_write(id->fd, buf, strlen(buf));
 	}
 	if (!g_strncasecmp(msg, "ACTION", 6)) {

[Gaim-commits] CVS: gaim gaim.desktop,1.2,1.3

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

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

Modified Files:
	gaim.desktop 
Log Message:
with life
also comes the end
and with hope
also comes regret
the demise of your heart
and your courage
withering away in the sun
much like a rose
once trampled on
no longer living inside
your soul steps aside



Index: gaim.desktop
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gaim.desktop	2 Jun 2000 22:09:16 -0000	1.2
+++ gaim.desktop	8 May 2002 04:12:41 -0000	1.3
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Gaim
-Comment=Client for AOL IM
+Comment=Linux Instant Messaging Client 
 Exec=gaim 
 Icon=gaim.xpm
 Info=Gaim

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

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

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

Modified Files:
	jabber.c 
Log Message:
Whacked buffer overflow bug in gjab_recv().  Thanks to rwscott.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- jabber.c	7 May 2002 00:51:15 -0000	1.47
+++ jabber.c	8 May 2002 00:50:22 -0000	1.48
@@ -401,7 +401,7 @@
 	if (!gjc || gjc->state == JCONN_STATE_OFF)
 		return;
 
-	if ((len = read(gjc->fd, buf, sizeof(buf))) > 0) {
+	if ((len = read(gjc->fd, buf, sizeof(buf) - 1)) > 0) {
 		struct jabber_data *jd = GJ_GC(gjc)->proto_data;
 		buf[len] = '\0';
 		debug_printf("input (len %d): %s\n", len, buf);

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

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

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

Modified Files:
	util.c 
Log Message:
Changed gaim_mkstemp() to use GLib's g_get_tmp_dir() at Sean's suggestion.


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- util.c	7 May 2002 23:41:30 -0000	1.119
+++ util.c	8 May 2002 00:21:26 -0000	1.120
@@ -1281,20 +1281,11 @@
 
 FILE *gaim_mkstemp(gchar **fpath)
 {
-	static char *tmpdir = NULL;
+	gchar *tmpdir;
 	int fd;
 	FILE *fp = NULL;
 
-	if(!tmpdir) {
-		if((tmpdir = tempnam(NULL, NULL)) == NULL) {
-			debug_printf("Error: tempnam() failed, error: %d\n", errno);
-		} else {
-			char *t = strrchr(tmpdir, '/');
-			*t = '\0';
-		}
-	}
-
-	if(tmpdir) {
+	if((tmpdir = g_get_tmp_dir()) != NULL) {
 		if((*fpath = g_strdup_printf("%s/%s", tmpdir, gaim_mkstemp_templ)) != NULL) {
 			if((fd = mkstemp(*fpath)) == -1) {
 				debug_printf("Error: Couldn't make \"%s\", error: %d\n", *fpath, errno);
@@ -1309,6 +1300,8 @@
 				*fpath = NULL;
 			}
 		}
+	} else {
+		debug_printf("Error: g_get_tmp_dir() failed in gaim_mkstemp()!\n");
 	}
 
 	return fp;

[Gaim-commits] CVS: gaim/src util.c,1.118,1.119

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

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

Modified Files:
	util.c 
Log Message:
Changed fprintf(stderr, ...)'s to debug_printf()'s.  Sorry 'bout that.


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- util.c	7 May 2002 23:12:14 -0000	1.118
+++ util.c	7 May 2002 23:41:30 -0000	1.119
@@ -1287,7 +1287,7 @@
 
 	if(!tmpdir) {
 		if((tmpdir = tempnam(NULL, NULL)) == NULL) {
-			fprintf(stderr, "tempnam() failed, error: %d\n", errno);
+			debug_printf("Error: tempnam() failed, error: %d\n", errno);
 		} else {
 			char *t = strrchr(tmpdir, '/');
 			*t = '\0';
@@ -1297,11 +1297,11 @@
 	if(tmpdir) {
 		if((*fpath = g_strdup_printf("%s/%s", tmpdir, gaim_mkstemp_templ)) != NULL) {
 			if((fd = mkstemp(*fpath)) == -1) {
-				fprintf(stderr, "Couldn't make \"%s\", error: %d\n", *fpath, errno);
+				debug_printf("Error: Couldn't make \"%s\", error: %d\n", *fpath, errno);
 			} else {
 				if((fp = fdopen(fd, "r+")) == NULL) {
 					close(fd);
-					fprintf(stderr, "Couldn't fdopen(), error: %d\n", errno);
+					debug_printf("Error: Couldn't fdopen(), error: %d\n", errno);
 				}
 			}
 			if(!fp) {

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.75,1.76

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

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

Modified Files:
	msn.c 
Log Message:
Changed tempfile creation to use new gaim_mkstemp() for secure tempfile
creation.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- msn.c	3 May 2002 23:19:53 -0000	1.75
+++ msn.c	7 May 2002 23:13:20 -0000	1.76
@@ -1264,11 +1264,10 @@
 
 		if (md->passport) {
 			unlink(md->passport);
-			free(md->passport);
+			g_free(md->passport);
 		}
-		md->passport = tempnam(NULL, NULL);
 
-		fd = fopen(md->passport, "w");
+		fd = gaim_mkstemp(&(md->passport));
 		fprintf(fd, "<html>\n");
 		fprintf(fd, "<head>\n");
 		fprintf(fd, "<noscript>\n");
@@ -1780,7 +1779,7 @@
 		g_free(md->msguser);
 	if (md->passport) {
 		unlink(md->passport);
-      		free(md->passport);
+      		g_free(md->passport);
 	}
 	while (md->switches)
 		msn_kill_switch(md->switches->data);

[Gaim-commits] CVS: gaim/src util.c,1.117,1.118 gaim.h,1.323,1.324

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

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

Modified Files:
	util.c gaim.h 
Log Message:
Added gaim_mkstemp() for secure tempfile creation.


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- util.c	16 Apr 2002 15:04:28 -0000	1.117
+++ util.c	7 May 2002 23:12:14 -0000	1.118
@@ -1266,3 +1266,50 @@
 	tm.tm_sec = sec >= 0 ? sec : time(NULL) % 60;
 	return mktime(&tm);
 }
+
+/*
+ * Like mkstemp() but returns a file pointer, uses a pre-set template,
+ * uses the semantics of tempnam() for the directory to use and allocates
+ * the space for the filepath.
+ *
+ * Caller is responsible for closing the file and removing it when done,
+ * as well as freeing the space pointed-to by "path" with g_free().
+ *
+ * Returns NULL on failure and cleans up after itself if so.
+ */
+static const char *gaim_mkstemp_templ = {"gaimXXXXXX"};
+
+FILE *gaim_mkstemp(gchar **fpath)
+{
+	static char *tmpdir = NULL;
+	int fd;
+	FILE *fp = NULL;
+
+	if(!tmpdir) {
+		if((tmpdir = tempnam(NULL, NULL)) == NULL) {
+			fprintf(stderr, "tempnam() failed, error: %d\n", errno);
+		} else {
+			char *t = strrchr(tmpdir, '/');
+			*t = '\0';
+		}
+	}
+
+	if(tmpdir) {
+		if((*fpath = g_strdup_printf("%s/%s", tmpdir, gaim_mkstemp_templ)) != NULL) {
+			if((fd = mkstemp(*fpath)) == -1) {
+				fprintf(stderr, "Couldn't make \"%s\", error: %d\n", *fpath, errno);
+			} else {
+				if((fp = fdopen(fd, "r+")) == NULL) {
+					close(fd);
+					fprintf(stderr, "Couldn't fdopen(), error: %d\n", errno);
+				}
+			}
+			if(!fp) {
+				g_free(*fpath);
+				*fpath = NULL;
+			}
+		}
+	}
+
+	return fp;
+}

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- gaim.h	6 May 2002 18:25:14 -0000	1.323
+++ gaim.h	7 May 2002 23:12:14 -0000	1.324
@@ -432,6 +432,7 @@
 extern char *add_cr(char *);
 extern void strip_linefeed(char *);
 extern time_t get_time(int, int, int, int, int, int);
+extern FILE *gaim_mkstemp(gchar **);
 
 /*------------------------------------------------------------------------*/
 /*  Multi-Entry dialog and vCard dialog support                           */

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

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

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

Modified Files:
	jabber.c 
Log Message:
Approval dialog when somebody wants to subscribe to user's presence. Also
gives user the opportunity to add that buddy if not already on the user's
buddy list.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- jabber.c	4 May 2002 03:34:46 -0000	1.46
+++ jabber.c	7 May 2002 00:51:15 -0000	1.47
@@ -733,26 +733,27 @@
 
 static time_t iso8601_to_time(char *timestamp)
 {
-   struct tm t;
-   time_t retval = 0;
+	struct tm t;
+	time_t retval = 0;
 
-   if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d",
-	 &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
-   {
-      t.tm_year -= 1900;
-      t.tm_mon -= 1;
-      t.tm_isdst = 0;
-      retval = mktime(&t);
-#ifdef HAVE_TM_GMTOFF
-      retval += t.tm_gmtoff;
-#else
-#     ifdef HAVE_TIMEZONE
-	 tzset();	/* making sure */
-         retval -= timezone;
-#     endif
-#endif
-   }
-   return retval;
+	if(sscanf(timestamp,"%04d%02d%02dT%02d:%02d:%02d",
+		&t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec))
+	{
+		t.tm_year -= 1900;
+		t.tm_mon -= 1;
+		t.tm_isdst = 0;
+		retval = mktime(&t);
+#		ifdef HAVE_TM_GMTOFF
+			retval += t.tm_gmtoff;
+#		else
+#		        ifdef HAVE_TIMEZONE
+				tzset();	/* making sure */
+				retval -= timezone;
+#		        endif
+#		endif
+	}
+
+	return retval;
 }
 
 static void jabber_handlemessage(gjconn gjc, jpacket p)
@@ -1058,6 +1059,60 @@
 	return;
 }
 
+/*
+ * Used only by Jabber accept/deny add stuff just below
+ */
+struct jabber_add_permit {
+	gjconn gjc;
+	gchar *user;
+};
+
+/*
+ * Common part for Jabber accept/deny adds
+ *
+ * "type" says whether we'll permit/deny the subscribe request
+ */
+static void jabber_accept_deny_add(struct jabber_add_permit *jap, const char *type)
+{
+	xmlnode g = xmlnode_new_tag("presence");
+
+	xmlnode_put_attrib(g, "to", jap->user);
+	xmlnode_put_attrib(g, "type", type);
+	gjab_send(jap->gjc, g);
+
+	xmlnode_free(g);
+}
+
+/*
+ * Callback from "accept" in do_ask_dialog() invoked by jabber_handles10n()
+ */
+static void jabber_accept_add(gpointer w, struct jabber_add_permit *jap)
+{
+	jabber_accept_deny_add(jap, "subscribed");
+	/*
+	 * If we don't already have the buddy on *our* buddylist,
+	 * ask if we want him or her added.
+	 */
+	if(find_buddy(GJ_GC(jap->gjc), jap->user) == NULL) {
+		show_got_added(GJ_GC(jap->gjc), NULL, jap->user, NULL, NULL);
+	}
+	g_free(jap->user);
+	g_free(jap);
+}
+
+/*
+ * Callback from "deny/cancel" in do_ask_dialog() invoked by jabber_handles10n()
+ */
+static void jabber_deny_add(gpointer w, struct jabber_add_permit *jap)
+{
+	jabber_accept_deny_add(jap, "unsubscribed");
+	g_free(jap->user);
+	g_free(jap);
+}
+
+/*
+ * Handle subscription requests
+ */
 static void jabber_handles10n(gjconn gjc, jpacket p)
 {
 	xmlnode g;
@@ -1066,11 +1121,32 @@
 
 	g = xmlnode_new_tag("presence");
 	xmlnode_put_attrib(g, "to", Jid);
-	if (!strcmp(type, "subscribe"))
-		xmlnode_put_attrib(g, "type", "subscribed");
-	else if (!strcmp(type, "unsubscribe"))
+
+	if (!strcmp(type, "subscribe")) {
+		/*
+		 * A "subscribe to us" request was received - put up the approval dialog
+		 */
+		struct jabber_add_permit *jap = g_new0(struct jabber_add_permit, 1);
+		gchar *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."),
+				Jid);
+
+		jap->gjc = gjc;
+		jap->user = g_strdup(Jid);
+		do_ask_dialog(msg, jap, jabber_accept_add, jabber_deny_add);
+
+		g_free(msg);
+		xmlnode_free(g);	/* Never needed it here anyway */
+		return;
+
+	} else if (!strcmp(type, "unsubscribe")) {
+		/*
+		 * An "unsubscribe to us" was received - simply "approve" it
+		 */
 		xmlnode_put_attrib(g, "type", "unsubscribed");
-	else {
+	} else {
+		/*
+		 * Did we attempt to subscribe to somebody and they do not exist?
+		 */
 		if (!strcmp(type, "unsubscribed")) {
 			xmlnode y;
 			char *status;

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.150,1.151

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

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

Modified Files:
	buddy_chat.c 
Log Message:
Yup, all the guys in #gaim are having a real laugh over this.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- buddy_chat.c	6 May 2002 19:30:04 -0000	1.150
+++ buddy_chat.c	6 May 2002 19:32:59 -0000	1.151
@@ -715,7 +715,7 @@
 			flag |= WFLAG_SEND;
 		} else {
 		       	flag |= WFLAG_RECV;
-			if (find_nick(g->gc, message))
+			if (find_nick(b->gc, message))
 				flag |= WFLAG_NICK;
 		}
 		g_free(str);

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.149,1.150

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

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

Modified Files:
	buddy_chat.c 
Log Message:
Would you believe this was all just a big prank?


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- buddy_chat.c	6 May 2002 19:17:14 -0000	1.149
+++ buddy_chat.c	6 May 2002 19:30:04 -0000	1.150
@@ -722,7 +722,7 @@
 	}
 
 	if (flag & WFLAG_RECV && b->makesound) {
-		if (flags & WFLAG_NICK && (sound_options & OPT_SOUND_CHAT_NICK)) {
+		if (flag & WFLAG_NICK && (sound_options & OPT_SOUND_CHAT_NICK)) {
 			play_sound(SND_CHAT_NICK);
 		} else {
 			play_sound(SND_CHAT_SAY);

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

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

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

Modified Files:
	buddy_chat.c 
Log Message:
Attempt #11.  This got embarrassing at attempt 3 -- now it's just ludicrous.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- buddy_chat.c	6 May 2002 19:07:00 -0000	1.148
+++ buddy_chat.c	6 May 2002 19:17:14 -0000	1.149
@@ -715,20 +715,20 @@
 			flag |= WFLAG_SEND;
 		} else {
 		       	flag |= WFLAG_RECV;
+			if (find_nick(g->gc, message))
+				flag |= WFLAG_NICK;
 		}
 		g_free(str);
 	}
 
-	if (flag & WFLAG_RECV && b->makesound) 
-	{
-		if (sound_options & OPT_SOUND_CHAT_NICK && find_nick(b->gc, message))
+	if (flag & WFLAG_RECV && b->makesound) {
+		if (flags & WFLAG_NICK && (sound_options & OPT_SOUND_CHAT_NICK)) {
 			play_sound(SND_CHAT_NICK);
-		else
+		} else {
 			play_sound(SND_CHAT_SAY);
-		if(find_nick(b->gc, message))
-			flag |= WFLAG_NICK;
+		}
 	}
-	write_to_conv(b, message, flag, who, mtime, -1);
+		write_to_conv(b, message, flag, who, mtime, -1);
 }
 
 

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.147,1.148

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

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

Modified Files:
	buddy_chat.c 
Log Message:
What... is... wrong... with... me...?


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- buddy_chat.c	6 May 2002 18:25:14 -0000	1.147
+++ buddy_chat.c	6 May 2002 19:07:00 -0000	1.148
@@ -719,12 +719,14 @@
 		g_free(str);
 	}
 
-	if (flag & WFLAG_RECV && b->makesound) {
-	     	if (sound_options & OPT_SOUND_CHAT_NICK)
+	if (flag & WFLAG_RECV && b->makesound) 
+	{
+		if (sound_options & OPT_SOUND_CHAT_NICK && find_nick(b->gc, message))
 			play_sound(SND_CHAT_NICK);
 		else
 			play_sound(SND_CHAT_SAY);
-		flag |= WFLAG_NICK;
+		if(find_nick(b->gc, message))
+			flag |= WFLAG_NICK;
 	}
 	write_to_conv(b, message, flag, who, mtime, -1);
 }

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.146,1.147 gaim.h,1.322,1.323

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

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

Modified Files:
	buddy_chat.c gaim.h 
Log Message:



Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- buddy_chat.c	6 May 2002 17:40:02 -0000	1.146
+++ buddy_chat.c	6 May 2002 18:25:14 -0000	1.147
@@ -661,8 +661,6 @@
 	n = strlen(who);
 	g_strdown(who);
 
-	debug_printf("\n%s\n%s\n%s\n\n", gc->username, gc->displayname, message);
-
 	if ((p = strstr(msg, who)) != NULL) {
 		if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
 			g_free(who);
@@ -716,16 +714,16 @@
 				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else {
-			if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
-				play_sound(SND_CHAT_SAY);
-			flag |= WFLAG_RECV;
+		       	flag |= WFLAG_RECV;
 		}
 		g_free(str);
 	}
 
-	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		if (b->makesound)
+	if (flag & WFLAG_RECV && b->makesound) {
+	     	if (sound_options & OPT_SOUND_CHAT_NICK)
 			play_sound(SND_CHAT_NICK);
+		else
+			play_sound(SND_CHAT_SAY);
 		flag |= WFLAG_NICK;
 	}
 	write_to_conv(b, message, flag, who, mtime, -1);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- gaim.h	6 May 2002 17:05:14 -0000	1.322
+++ gaim.h	6 May 2002 18:25:14 -0000	1.323
@@ -283,7 +283,7 @@
 #define OPT_SOUND_ARTSC			0x00008000
 #define OPT_SOUND_ESD			0x00010000
 #define OPT_SOUND_CMD			0x00020000
-#define OPT_SOUND_CHAT_NICK                  0x00040000
+#define OPT_SOUND_CHAT_NICK             0x00040000
 /* remember to also change the struct in sound.c */
 #define SND_BUDDY_ARRIVE 0
 #define SND_BUDDY_LEAVE 1

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.145,1.146

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

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

Modified Files:
	buddy_chat.c 
Log Message:
This is the last one--I promise.
This time it wasn't even broken--just doing something differently.

I should take a nap.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- buddy_chat.c	6 May 2002 17:05:14 -0000	1.145
+++ buddy_chat.c	6 May 2002 17:40:02 -0000	1.146
@@ -661,6 +661,8 @@
 	n = strlen(who);
 	g_strdown(who);
 
+	debug_printf("\n%s\n%s\n%s\n\n", gc->username, gc->displayname, message);
+
 	if ((p = strstr(msg, who)) != NULL) {
 		if (((p == msg) || !isalnum(*(p - 1))) && !isalnum(*(p + n))) {
 			g_free(who);
@@ -714,7 +716,7 @@
 				play_sound(SND_CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
 		} else {
-			if (b->makesound)
+			if (b->makesound && !(sound_options & OPT_SOUND_CHAT_NICK))
 				play_sound(SND_CHAT_SAY);
 			flag |= WFLAG_RECV;
 		}
@@ -722,7 +724,7 @@
 	}
 
 	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
+		if (b->makesound)
 			play_sound(SND_CHAT_NICK);
 		flag |= WFLAG_NICK;
 	}

[Gaim-commits] CVS: gaim ChangeLog,1.471,1.472

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

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

Modified Files:
	ChangeLog 
Log Message:
Today is going to be a long day... but not long enough


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -d -r1.471 -r1.472
--- ChangeLog	5 May 2002 19:02:04 -0000	1.471
+++ ChangeLog	6 May 2002 17:13:24 -0000	1.472
@@ -16,7 +16,8 @@
 	* A warning when your OSCAR buddy list is too long
 	  (Thanks, Mark Doliner)
 	* ICQ status messages in OSCAR (Thanks, Mark Doliner)
-	
+	* Play sound when your name is said in a chat
+
 version 0.57 (04/25/2002):
 	* New authorization method for Yahoo!
 	* Polish translation updated (Thanks Przemyslaw Sulek)

[Gaim-commits] CVS: gaim/src sound.c,1.56,1.57

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

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

Modified Files:
	sound.c 
Log Message:
Wow... I am screwed up.


Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sound.c	6 May 2002 17:18:58 -0000	1.56
+++ sound.c	6 May 2002 17:21:18 -0000	1.57
@@ -65,8 +65,8 @@
 	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),
-	NULL, 0, RedAlert, sizeof(RedAlert)
-	N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive),
+	NULL, 0, RedAlert, sizeof(RedAlert),
+	N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive)
 };
 
 static int check_dev(char *dev)

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

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

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

Modified Files:
	sound.c 
Log Message:
Can I do anything right?

The answer is no.  No, I cannot.


Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- sound.c	6 May 2002 16:47:27 -0000	1.55
+++ sound.c	6 May 2002 17:18:58 -0000	1.56
@@ -65,8 +65,8 @@
 	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),
-	N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive),
 	NULL, 0, RedAlert, sizeof(RedAlert)
+	N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive),
 };
 
 static int check_dev(char *dev)

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.144,1.145 gaim.h,1.321,1.322

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

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

Modified Files:
	buddy_chat.c gaim.h 
Log Message:
They convinced me to make it compile before committing.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- buddy_chat.c	6 May 2002 16:47:50 -0000	1.144
+++ buddy_chat.c	6 May 2002 17:05:14 -0000	1.145
@@ -722,7 +722,8 @@
 	}
 
 	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
-		play_sound(SND_CHAT_NICK);
+		if (b->makesound && !(sound_options & OPT_SOUND_CHAT_SAY))
+			play_sound(SND_CHAT_NICK);
 		flag |= WFLAG_NICK;
 	}
 	write_to_conv(b, message, flag, who, mtime, -1);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- gaim.h	6 May 2002 16:50:06 -0000	1.321
+++ gaim.h	6 May 2002 17:05:14 -0000	1.322
@@ -283,7 +283,7 @@
 #define OPT_SOUND_ARTSC			0x00008000
 #define OPT_SOUND_ESD			0x00010000
 #define OPT_SOUND_CMD			0x00020000
-#define OPT_SOUND_NICK                  0x00040000
+#define OPT_SOUND_CHAT_NICK                  0x00040000
 /* remember to also change the struct in sound.c */
 #define SND_BUDDY_ARRIVE 0
 #define SND_BUDDY_LEAVE 1
@@ -295,7 +295,8 @@
 #define SND_CHAT_YOU_SAY 7
 #define SND_CHAT_SAY 8
 #define SND_POUNCE_DEFAULT 9
-#define NUM_SOUNDS 10
+#define SND_CHAT_NICK 10
+#define NUM_SOUNDS 11
 extern char *sound_file[NUM_SOUNDS];
 
 /* global sound struct */

[Gaim-commits] CVS: gaim/src gaim.h,1.320,1.321

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

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

Modified Files:
	gaim.h 
Log Message:
Forgot to commit this file


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- gaim.h	29 Apr 2002 18:07:27 -0000	1.320
+++ gaim.h	6 May 2002 16:50:06 -0000	1.321
@@ -283,7 +283,7 @@
 #define OPT_SOUND_ARTSC			0x00008000
 #define OPT_SOUND_ESD			0x00010000
 #define OPT_SOUND_CMD			0x00020000
-
+#define OPT_SOUND_NICK                  0x00040000
 /* remember to also change the struct in sound.c */
 #define SND_BUDDY_ARRIVE 0
 #define SND_BUDDY_LEAVE 1

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.143,1.144

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

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

Modified Files:
	buddy_chat.c 
Log Message:
I mean this.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- buddy_chat.c	6 May 2002 16:47:27 -0000	1.143
+++ buddy_chat.c	6 May 2002 16:47:50 -0000	1.144
@@ -724,7 +724,7 @@
 	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
 		play_sound(SND_CHAT_NICK);
 		flag |= WFLAG_NICK;
-
+	}
 	write_to_conv(b, message, flag, who, mtime, -1);
 }
 

[Gaim-commits] CVS: gaim/src buddy_chat.c,1.142,1.143 sound.c,1.54,1.55

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

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

Modified Files:
	buddy_chat.c sound.c 
Log Message:
Play sound when your name is said


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- buddy_chat.c	16 Mar 2002 00:32:53 -0000	1.142
+++ buddy_chat.c	6 May 2002 16:47:27 -0000	1.143
@@ -721,7 +721,8 @@
 		g_free(str);
 	}
 
-	if ((flag & WFLAG_RECV) && find_nick(b->gc, message))
+	if ((flag & WFLAG_RECV) && find_nick(b->gc, message)) {
+		play_sound(SND_CHAT_NICK);
 		flag |= WFLAG_NICK;
 
 	write_to_conv(b, message, flag, who, mtime, -1);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- sound.c	6 Apr 2002 02:32:16 -0000	1.54
+++ sound.c	6 May 2002 16:47:27 -0000	1.55
@@ -65,6 +65,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),
+	N_("Someone says your name in chat"), OPT_SOUND_CHAT_NICK, Receive, sizeof(Receive),
 	NULL, 0, RedAlert, sizeof(RedAlert)
 };
 

[Gaim-commits] CVS: gaim/src dialogs.c,1.319,1.320

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

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

Modified Files:
	dialogs.c 
Log Message:
For Luke


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- dialogs.c	3 May 2002 19:46:07 -0000	1.319
+++ dialogs.c	5 May 2002 20:19:40 -0000	1.320
@@ -3946,7 +3946,7 @@
 	if (new_name && (strlen(new_name) != 0) && strcmp(new_name, g->name)) {
 		char *prevname;
 		gc = g->gc;
-		if ((orig = find_group(g->gc, new_name)) != NULL) {
+		if ((orig = find_group(g->gc, new_name)) != NULL && g_strcasecmp(new_name, g->name)) {
 			orig->members = g_slist_concat(orig->members, g->members);
 			handle_group_rename(orig, g->name);
 			g->gc->groups = g_slist_remove(g->gc->groups, g);

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.136,1.137

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

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

Modified Files:
	oscar.c 
Log Message:
I really should make sure these things compile before committing them


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- oscar.c	5 May 2002 19:02:08 -0000	1.136
+++ oscar.c	5 May 2002 19:20:18 -0000	1.137
@@ -3172,8 +3172,9 @@
 
 		/* Check for maximum number of buddies */
 		for (cur=gc->groups, tmp=0; cur; cur=g_slist_next(cur)) {
-			tmp = tmp + g_slist_length(cur->data->members);
-			
+			struct group* gr = (struct group*)cur->data;
+			tmp = tmp + g_slist_length(gr->members);
+		}
 		if (tmp > odata->rights.maxbuddies) {
 			char *dialog_msg = g_strdup_printf(_("The maximum number of buddies allowed in your buddy list is %d, and you have %d."
 							     "  Until you are below the limit, some buddies will not show up as online."), 
@@ -3181,7 +3182,7 @@
 			do_error_dialog(dialog_msg, _("Gaim - Warning"));
 			g_free(dialog_msg);
 		}
-
+		
 	} /* end if (gc) */
 
 	return 1;