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

[Gaim-commits] CVS: gaim gaim.spec.in,1.47,1.48 ChangeLog,1.494,1.495 NEWS,1.135,1.136

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

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

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



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gaim.spec.in	14 May 2002 02:12:10 -0000	1.47
+++ gaim.spec.in	31 May 2002 05:10:00 -0000	1.48
@@ -93,6 +93,24 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+- Fri May 31 2002 Rob Flynn <ro...@ma...> (0.59 release)
+- Hungarian translation added (Thanks, Sutto Zoltan)
+- Swedish translation updated (Thanks, Christian Rose)
+- Spanish translation updated (Thanks, Alex)
+- Traditional Chinese translation updated (Thanks, Paladin Liu)
+- Czech translation added (Thanks, Honza)
+- Polish translation updated (Thanks Przemyslaw Sulek)
+- Squashed a bug in buddy right-click menu handling that crashed Gaim.  In the process: found and eliminated some memory leaks.
+- Fixed a significant applet leak
+- Can now change Jabber password on server (Thanks, Nathan Walp)
+- Certain types of Jabber presence errors no longer falsely show a buddy on-line.  Instead now a "broken light-bulb" icon is shown and the error status is available via "Get Away Msg"  (Thanks and a tip o' the hat to Christian Hammond for the graphic)
+- Conversation struct has pointer to toolbar (thanks Brent Priddy and Paul Miller)
+- Zephyr fixes (thanks, Arun A. Tharuvai)
+- Aliases in buddy ticker
+- Perl scripts can play Gaim sounds (thanks Andrew Rodland)
+- Internal sounds can be played by commands (thanks Lex Spoon)
+- Auto-login item in applet menu (thanks Chris Boyle)
+
 * Mon May 13 2002 Rob Flynn <ro...@ma...> (0.58 release)
 - Bulgarian translation added (Thanks, Igel Itzo)
 - Taiwanese translation added (Thanks, Paladin Liu)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -d -r1.494 -r1.495
--- ChangeLog	31 May 2002 03:00:47 -0000	1.494
+++ ChangeLog	31 May 2002 05:10:00 -0000	1.495
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.59
+version 0.59 (05/31/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)
 	* Swedish translation updated (Thanks, Christian Rose)
 	* Spanish translation updated (Thanks, Alex)
@@ -25,7 +25,7 @@
 	* Perl scripts can play Gaim sounds (thanks Andrew Rodland)
 	* Internal sounds can be played by commands (thanks Lex Spoon)
 	* Auto-login item in applet menu (thanks Chris Boyle)
-	
+
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)
 	* Traditional Chinese  translation added (Thanks, Paladin Liu)

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- NEWS	14 May 2002 14:53:56 -0000	1.135
+++ NEWS	31 May 2002 05:10:00 -0000	1.136
@@ -1,6 +1,8 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
-0.59
+0.59 (05/31/2002):
+	Rob: I guess Sean is busy at home or something and Jim is asleep.
+	I'm very tired but it's time for a release.  Enjoy.  :)
 
 0.58 (05/13/2002):
 	Rob: Yeah, so, my computer has been bad which is why the release

[Gaim-commits] CVS: gaim configure.in,1.116,1.117

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

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

Modified Files:
	configure.in 
Log Message:
(23:32:12) faceprint: sean is STILL a sloppy typer
(23:32:38) faceprint: but now i know that he uses vi ;-)


Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- configure.in	31 May 2002 03:15:15 -0000	1.116
+++ configure.in	31 May 2002 03:52:58 -0000	1.117
@@ -240,7 +240,7 @@
 	XSS_LIBS="no"
 	XSS_HEADERS="no"
 	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm])
-	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-Li$x_libraries -lXss"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries -lXss"],[],[-lX11 -lXext -lm])
 	if test \! "$XSS_LIBS" = "no"; then
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>

[Gaim-commits] CVS: gaim configure.in,1.115,1.116

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

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

Modified Files:
	configure.in 
Log Message:
(23:11:29) faceprint: sean is a sloppy typer
(23:11:52) KingAnt: But he's got a cool first name!


Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- configure.in	31 May 2002 02:58:06 -0000	1.115
+++ configure.in	31 May 2002 03:15:15 -0000	1.116
@@ -240,7 +240,7 @@
 	XSS_LIBS="no"
 	XSS_HEADERS="no"
 	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm])
-	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L%x_libraries -lXss"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-Li$x_libraries -lXss"],[],[-lX11 -lXext -lm])
 	if test \! "$XSS_LIBS" = "no"; then
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>

[Gaim-commits] CVS: gaim/src applet.c,1.31,1.32

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

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

Modified Files:
	applet.c 
Log Message:
A hack by Chris Blizzard to fix applet not showing up right when 
you start it up.


Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- applet.c	16 May 2002 22:46:42 -0000	1.31
+++ applet.c	31 May 2002 03:00:47 -0000	1.32
@@ -153,11 +153,23 @@
 }
 
 #ifdef HAVE_PANEL_PIXEL_SIZE
+
+static gint applet_update_pixel_size(gpointer data)
+{
+        update_applet();
+	return FALSE;
+}
+
 static void applet_change_pixel_size(GtkWidget *w, int size, gpointer data)
 {
 	sizehint = size;
 	gtk_widget_set_usize(icon, sizehint, sizehint);
-	update_applet();
+	/* we need to wait for the mainloop to finish updating the
+	   background pixel size, otherwise we'll end up getting the
+	   wrong background size when loading and drawing the new
+	   icon */
+	gtk_timeout_add(100, applet_update_pixel_size,
+			NULL);
 }
 #endif
 

[Gaim-commits] CVS: gaim ChangeLog,1.493,1.494

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

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

Modified Files:
	ChangeLog 
Log Message:
A hack by Chris Blizzard to fix applet not showing up right when 
you start it up.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -d -r1.493 -r1.494
--- ChangeLog	31 May 2002 02:26:53 -0000	1.493
+++ ChangeLog	31 May 2002 03:00:47 -0000	1.494
@@ -24,6 +24,7 @@
 	* Aliases in buddy ticker
 	* Perl scripts can play Gaim sounds (thanks Andrew Rodland)
 	* Internal sounds can be played by commands (thanks Lex Spoon)
+	* Auto-login item in applet menu (thanks Chris Boyle)
 	
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)
@@ -61,7 +62,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)

[Gaim-commits] CVS: gaim configure.in,1.114,1.115

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

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

Modified Files:
	configure.in 
Log Message:
typo-fix and Chris Boyle's patch to add an "auto-login" item to the applet
menu.  Thanks, Chris.


Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- configure.in	30 May 2002 18:33:40 -0000	1.114
+++ configure.in	31 May 2002 02:58:06 -0000	1.115
@@ -234,6 +234,7 @@
 
 dnl Check for XScreenSaver
 if test "x$enable_xss" = "xyes" ; then
+	AC_PATH_X
 	old_LIBS="$LIBS"
 	LIBS="$LIBS $UI_LIBS -L$x_libraries"
 	XSS_LIBS="no"

[Gaim-commits] CVS: gaim/src aim.c,1.180,1.181 multi.c,1.116,1.117

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

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

Modified Files:
	aim.c multi.c 
Log Message:
typo-fix and Chris Boyle's patch to add an "auto-login" item to the applet
menu.  Thanks, Chris.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- aim.c	5 May 2002 01:16:45 -0000	1.180
+++ aim.c	31 May 2002 02:58:07 -0000	1.181
@@ -148,6 +148,7 @@
 	}
 #ifdef USE_APPLET
 	set_user_state(online);
+	applet_widget_unregister_callback(APPLET_WIDGET(applet), "autologin");
 	applet_widget_register_callback(APPLET_WIDGET(applet),
 					"signoff", _("Signoff"), (AppletCallbackFunc)signoff_all, NULL);
 #endif /* USE_APPLET */
@@ -833,6 +834,9 @@
 					"plugins", _("Plugins"), GTK_SIGNAL_FUNC(show_plugins), NULL);
 #endif /* GAIM_PLUGINS */
 
+	applet_widget_register_callback(APPLET_WIDGET(applet),
+					"autologin", _("Auto-login"), (AppletCallbackFunc)auto_login, NULL);
+ 
 	if (!opt_acct)
 		auto_login();
 

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- multi.c	4 May 2002 08:21:31 -0000	1.116
+++ multi.c	31 May 2002 02:58:07 -0000	1.117
@@ -1468,6 +1468,8 @@
 	if (applet) {
 		/* These don't have any purpose if the applet is gone :-P */
 		applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff");
+		applet_widget_register_callback(APPLET_WIDGET(applet),
+						"autologin", _("Auto-login"), (AppletCallbackFunc)auto_login, NULL);
 		remove_applet_away();
 	}
 #else

[Gaim-commits] CVS: gaim/src sound.c,1.58,1.59

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

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

Modified Files:
	sound.c 
Log Message:
Lex Spoon--perhaps the coolest name I've ever seen submit a patch (it's 
between him and Chris Blizzard) made it so commands can play sounds!

Brilliant!


Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sound.c	29 May 2002 01:23:38 -0000	1.58
+++ sound.c	31 May 2002 02:26:53 -0000	1.59
@@ -481,7 +481,19 @@
 	}
 
 	else if ((sound_options & OPT_SOUND_CMD) && sound_cmd[0]) {
-		debug_printf("can't play internal sound with external command -- skipping\n");
+		char command[4096];
+		FILE *child;
+
+		g_snprintf(command, sizeof(command), sound_cmd, "-");
+		
+		child=popen(command, "w");
+		if(child == NULL) {
+			perror("popen");
+			return;
+ 	     }
+ 
+		fwrite(data, size, 1, child);
+		pclose(child);
 		return;
 	}
 

[Gaim-commits] CVS: gaim ChangeLog,1.492,1.493

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

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

Modified Files:
	ChangeLog 
Log Message:
Lex Spoon--perhaps the coolest name I've ever seen submit a patch (it's 
between him and Chris Blizzard) made it so commands can play sounds!

Brilliant!


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -d -r1.492 -r1.493
--- ChangeLog	29 May 2002 01:44:39 -0000	1.492
+++ ChangeLog	31 May 2002 02:26:53 -0000	1.493
@@ -23,6 +23,7 @@
 	* Zephyr fixes (thanks, Arun A. Tharuvai)
 	* Aliases in buddy ticker
 	* Perl scripts can play Gaim sounds (thanks Andrew Rodland)
+	* Internal sounds can be played by commands (thanks Lex Spoon)
 	
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

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

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

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

Modified Files:
	proxy.c 
Log Message:
Sean Davis has a cool first name--and he decided gethostbyname should 
report its errors.


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- proxy.c	28 Mar 2002 18:03:14 -0000	1.41
+++ proxy.c	31 May 2002 02:00:41 -0000	1.42
@@ -126,6 +126,8 @@
 	if (!inet_aton(host, &sin.sin_addr)) {
 		struct hostent *hp;
 		if (!(hp = gethostbyname(host))) {
+			debug_printf("gaim_gethostbyname(\"%s\", %d) failed: %s",
+				     host, port, hstrerror(h_errno));
 			return NULL;
 		}
 		memset(&sin, 0, sizeof(struct sockaddr_in));

[Gaim-commits] CVS: gaim configure.ac,1.69,1.70 configure.in,1.113,1.114

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

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

Modified Files:
	configure.ac configure.in 
Log Message:
Nathan Walp says this is better.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- configure.ac	19 May 2002 19:09:15 -0000	1.69
+++ configure.ac	30 May 2002 18:33:40 -0000	1.70
@@ -236,12 +236,13 @@
 
 dnl Check for XScreenSaver
 if test "x$enable_xss" = "xyes" ; then
+	AC_PATH_X
 	old_LIBS="$LIBS"
-	LIBS="$LIBS $UI_LIBS"
+	LIBS="$LIBS $UI_LIBS -L$x_libraries"
 	XSS_LIBS="no"
 	XSS_HEADERS="no"
-	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm])
-	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries -lXss"],[],[-lX11 -lXext -lm])
 	if test \! "$XSS_LIBS" = "no"; then
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- configure.in	19 May 2002 19:09:15 -0000	1.113
+++ configure.in	30 May 2002 18:33:40 -0000	1.114
@@ -235,11 +235,11 @@
 dnl Check for XScreenSaver
 if test "x$enable_xss" = "xyes" ; then
 	old_LIBS="$LIBS"
-	LIBS="$LIBS $UI_LIBS"
+	LIBS="$LIBS $UI_LIBS -L$x_libraries"
 	XSS_LIBS="no"
 	XSS_HEADERS="no"
-	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS=""],[],[-lX11 -lXext -lm])
-	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-lXss"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm])
+	AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L%x_libraries -lXss"],[],[-lX11 -lXext -lm])
 	if test \! "$XSS_LIBS" = "no"; then
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>

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

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

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

Modified Files:
	prpl.c 
Log Message:
compliant.  Thanks Tim Mooney


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- prpl.c	15 Apr 2002 03:23:09 -0000	1.53
+++ prpl.c	30 May 2002 17:49:03 -0000	1.54
@@ -470,9 +470,15 @@
 
 void set_icon_data(struct gaim_connection *gc, char *who, void *data, int len)
 {
-	struct icon_data tmp = { gc, normalize(who), NULL, 0 };
-	GList *l = g_list_find_custom(icons, &tmp, find_icon_data);
-	struct icon_data *id = l ? l->data : NULL;
+	struct icon_data tmp;
+	GList *l;
+	struct icon_data *id;
+	tmp.gc = gc;
+	tmp.who = normalize(who);
+	tmp.data=NULL;
+        tmp.len = 0;
+	l = g_list_find_custom(icons, &tmp, find_icon_data);
+	id = l ? l->data : NULL;
 
 	if (id) {
 		g_free(id->data);

[Gaim-commits] CVS: gaim/src conversation.c,1.354,1.355 perl.c,1.71,1.72

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

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

Modified Files:
	conversation.c perl.c 
Log Message:
Perl can play sounds!


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- conversation.c	28 May 2002 08:00:27 -0000	1.354
+++ conversation.c	29 May 2002 01:44:39 -0000	1.355
@@ -2822,7 +2822,12 @@
 	gtk_object_set_user_data(GTK_OBJECT(entry), c);
 	gtk_text_set_editable(GTK_TEXT(entry), TRUE);
 	gtk_text_set_word_wrap(GTK_TEXT(entry), TRUE);
-	gtk_widget_set_usize(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25));
+	/* I hate hackish workarounds.  According to Ari Pollak, a gtk bug causes Gaim to loop
+	 * infinitely if the entry is smaller than the text height.  This is a hackish workaround */ 
+	gtk_widget_set_usize(entry, conv_size.width - 20, 
+		MAX(conv_size.entry_height, 
+			gdk_char_height(gtk_widget_get_default_style()->font, '0') +
+			gtk_widget_get_default_style()->font->ascent + 1));
 
 	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c);
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);

Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- perl.c	25 Apr 2002 05:48:20 -0000	1.71
+++ perl.c	29 May 2002 01:44:40 -0000	1.72
@@ -105,6 +105,9 @@
 XS(XS_GAIM_add_event_handler); /* when servers talk */
 XS(XS_GAIM_add_timeout_handler); /* figure it out */
 
+/* play sound */
+XS(XS_GAIM_play_sound); /*play a sound*/
+
 void xs_init()
 {
 	char *file = __FILE__;
@@ -238,6 +241,8 @@
 
 	newXS ("GAIM::add_event_handler", XS_GAIM_add_event_handler, "GAIM");
 	newXS ("GAIM::add_timeout_handler", XS_GAIM_add_timeout_handler, "GAIM");
+
+	newXS ("GAIM::play_sound", XS_GAIM_play_sound, "GAIM");
 }
 
 void perl_end()
@@ -617,6 +622,8 @@
 	XSRETURN(0);
 }
 
+
+	
 XS (XS_GAIM_print_to_chat)
 {
 	struct gaim_connection *gc;
@@ -830,6 +837,18 @@
 	handler->handler_args = g_strdup(SvPV(ST(2), junk));
 	perl_timeout_handlers = g_list_append(perl_timeout_handlers, handler);
 	handler->iotag = g_timeout_add(timeout, perl_timeout, handler);
+	XSRETURN_EMPTY;
+}
+
+XS (XS_GAIM_play_sound)
+{
+	int id;
+	dXSARGS;
+
+	id = SvIV(ST(0));
+
+	play_sound(id);
+
 	XSRETURN_EMPTY;
 }
 

[Gaim-commits] CVS: gaim/plugins PERL-HOWTO,1.13,1.14

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

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

Modified Files:
	PERL-HOWTO 
Log Message:
Perl can play sounds!


Index: PERL-HOWTO
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/PERL-HOWTO,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PERL-HOWTO	18 Oct 2001 12:12:36 -0000	1.13
+++ PERL-HOWTO	29 May 2002 01:44:39 -0000	1.14
@@ -141,3 +141,19 @@
 	once, so if you want to keep calling function, keep readding the handler.
 	Args is a string that you'd like to have passed to your timeout handler; it's
 	optional.
+
+GAIM::play_sound(int sound)
+	Plays a sound using whatever method the user has selected. The argument is
+	one of the following numbers:
+
+	0	Buddy logs in
+	1	Buddy logs out
+	2	Message received
+	3	Message received begins conversation
+	4	Message sent
+	5	Person enters chat
+	6	Person leaves chat
+	7	You talk in chat
+	8	Others talk in chat
+	9	Default buddy pounce sound
+	10	Someone says your name in chat

[Gaim-commits] CVS: gaim ChangeLog,1.491,1.492

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

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

Modified Files:
	ChangeLog 
Log Message:
Perl can play sounds!


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -d -r1.491 -r1.492
--- ChangeLog	29 May 2002 00:24:41 -0000	1.491
+++ ChangeLog	29 May 2002 01:44:39 -0000	1.492
@@ -22,7 +22,8 @@
 	  Priddy and Paul Miller)
 	* Zephyr fixes (thanks, Arun A. Tharuvai)
 	* Aliases in buddy ticker
-
+	* Perl scripts can play Gaim sounds (thanks Andrew Rodland)
+	
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)
 	* Traditional Chinese  translation added (Thanks, Paladin Liu)

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

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

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

Modified Files:
	oscar.c 
Log Message:
Fewer compile warnings!  Thanks, Ari Pollak (I even spelled your name correctly)

Also, I think one of these warnings may have fixed a sporadic Hotmail auth failure;
let me know if you still get those.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- oscar.c	23 May 2002 00:06:01 -0000	1.139
+++ oscar.c	29 May 2002 01:23:38 -0000	1.140
@@ -2503,7 +2503,7 @@
 	 * parse-icq-status-message function knows if it is putting it's message in 
 	 * an info window because the name will _not_ be in od->evilhack.  For getting 
 	 * only the away message the contact's UIN is put in od->evilhack. */
-	if (budlight = find_buddy(gc, who)) {
+	if ((budlight = find_buddy(gc, who))) {
 		if ((budlight->uc >> 7) & (AIM_ICQ_STATE_AWAY || AIM_ICQ_STATE_DND || AIM_ICQ_STATE_OUT || AIM_ICQ_STATE_BUSY || AIM_ICQ_STATE_CHAT)) {
 			if (budlight->caps & AIM_CAPS_ICQSERVERRELAY)
 				g_show_info_text(gc, who, 0, buf, NULL);

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.77,1.78

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

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

Modified Files:
	msn.c 
Log Message:
Fewer compile warnings!  Thanks, Ari Pollak (I even spelled your name correctly)

Also, I think one of these warnings may have fixed a sporadic Hotmail auth failure;
let me know if you still get those.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- msn.c	19 May 2002 03:11:09 -0000	1.77
+++ msn.c	29 May 2002 01:23:38 -0000	1.78
@@ -1242,7 +1242,6 @@
 		char hippy[2048];
 		char *rru;
 		char *passport;
-		char *filename;
 
 		GET_NEXT(tmp);
 		GET_NEXT(tmp);
@@ -1250,7 +1249,7 @@
 		GET_NEXT(tmp);
 		passport = tmp;
 		
-		snprintf(hippy, sizeof(hippy), "%s%d%s", md->mspauth, time(NULL) - md->sl, gc->password);
+		snprintf(hippy, sizeof(hippy), "%s%lu%s", md->mspauth, time(NULL) - md->sl, gc->password);
 
 		md5_init(&st);
 		md5_append(&st, (const md5_byte_t *)hippy, strlen(hippy));

[Gaim-commits] CVS: gaim/src/protocols/gg iconv_string.c,1.1,1.2

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

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

Modified Files:
	iconv_string.c 
Log Message:
Fewer compile warnings!  Thanks, Ari Pollak (I even spelled your name correctly)

Also, I think one of these warnings may have fixed a sporadic Hotmail auth failure;
let me know if you still get those.


Index: iconv_string.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/iconv_string.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- iconv_string.c	18 Oct 2001 20:56:59 -0000	1.1
+++ iconv_string.c	29 May 2002 01:23:38 -0000	1.2
@@ -74,7 +74,7 @@
   {
     size_t count = 0;
     char tmpbuf[tmpbufsize];
-    const char* inptr = start;
+    char* inptr = (char *)start;
     size_t insize = end-start;
     while (insize > 0) {
       char* outptr = tmpbuf;
@@ -126,7 +126,7 @@
   iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */
   /* Do the conversion for real. */
   {
-    const char* inptr = start;
+    char* inptr = (char *)start;
     size_t insize = end-start;
     char* outptr = result;
     size_t outsize = length;

[Gaim-commits] CVS: gaim/src buddy.c,1.315,1.316 gaim.h,1.324,1.325 sound.c,1.57,1.58 util.c,1.120,1.121

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

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

Modified Files:
	buddy.c gaim.h sound.c util.c 
Log Message:
Fewer compile warnings!  Thanks, Ari Pollak (I even spelled your name correctly)

Also, I think one of these warnings may have fixed a sporadic Hotmail auth failure;
let me know if you still get those.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- buddy.c	29 May 2002 00:24:41 -0000	1.315
+++ buddy.c	29 May 2002 01:23:37 -0000	1.316
@@ -37,6 +37,7 @@
 #include <math.h>
 #include <time.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- gaim.h	7 May 2002 23:12:14 -0000	1.324
+++ gaim.h	29 May 2002 01:23:38 -0000	1.325
@@ -345,6 +345,8 @@
 /* Functions in conversation.c */
 extern void write_to_conv(struct conversation *, char *, int, char *, time_t, int);
 extern struct conversation *find_conversation(char *);
+extern void set_anim();
+extern void set_blist_tab();
 
 /* Functions in dialogs.c */
 extern void g_show_info_text(struct gaim_connection *, char *, int, char *, ...);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sound.c	6 May 2002 17:21:18 -0000	1.57
+++ sound.c	29 May 2002 01:23:38 -0000	1.58
@@ -56,17 +56,17 @@
  * per pounce. NULL option means it doesn't get displayed in the sound *
  * preferences box */
 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),
-	N_("Message received"), OPT_SOUND_RECV, Receive, sizeof(Receive),
-	N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive),
-	N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send),
-	N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive),
-	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)
+	{N_("Buddy logs in"), OPT_SOUND_LOGIN, BuddyArrive, sizeof(BuddyArrive)},
+	{N_("Buddy logs out"), OPT_SOUND_LOGOUT, BuddyLeave, sizeof(BuddyLeave)},
+	{N_("Message received"), OPT_SOUND_RECV, Receive, sizeof(Receive)},
+	{N_("Message received begins conversation"), OPT_SOUND_FIRST_RCV, Receive, sizeof(Receive)},
+	{N_("Message sent"), OPT_SOUND_SEND, Send, sizeof(Send)},
+	{N_("Person enters chat"), OPT_SOUND_CHAT_JOIN, BuddyArrive, sizeof(BuddyArrive)},
+	{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)}
 };
 
 static int check_dev(char *dev)

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- util.c	8 May 2002 00:21:26 -0000	1.120
+++ util.c	29 May 2002 01:23:38 -0000	1.121
@@ -928,7 +928,7 @@
 
 gchar *strdup_withhtml(const gchar *src)
 {
-	char *sp, *dest;
+	gchar *sp, *dest;
 	gulong destsize;
 
 	/*
@@ -936,7 +936,7 @@
 	 * additional length of "<BR>" over "\n"), account for the
 	 * terminator, malloc the space and call strncpy_withhtml.
 	 */
-	for(destsize = 0, sp = src; (sp = strchr(sp, '\n')) != NULL; ++sp, ++destsize)
+	for(destsize = 0, sp = (gchar *)src; (sp = strchr(sp, '\n')) != NULL; ++sp, ++destsize)
 		;
 	destsize *= 3;
 	destsize += strlen(src) + 1;

[Gaim-commits] CVS: gaim/src buddy.c,1.314,1.315 prefs.c,1.223,1.224 ticker.c,1.18,1.19 ui.h,1.38,1.39

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

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

Modified Files:
	buddy.c prefs.c ticker.c ui.h 
Log Message:
Aliases in buddy ticker, inspired by Jeff Stuart.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- buddy.c	25 May 2002 18:58:24 -0000	1.314
+++ buddy.c	29 May 2002 00:24:41 -0000	1.315
@@ -300,6 +300,8 @@
 		}
 		update_num_group(gs);
 	} else {
+		if (misc_options & OPT_MISC_BUDDY_TICKER)
+			BuddyTickerSetAlias(b->name, b->show);
 		gtk_label_set_text(GTK_LABEL(bs->label), b->show);
 		update_idle_time(bs);
 	}
@@ -2313,7 +2315,7 @@
 			gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
 			gtk_widget_show(bs->pix);
 			if (misc_options & OPT_MISC_BUDDY_TICKER) {
-				BuddyTickerAddUser(b->name, pm, bm);
+				BuddyTickerAddUser(b->name, b->show, pm, bm);
 				gtk_timeout_add(10000, (GtkFunction)BuddyTickerLogonTimeout, b->name);
 			}
 			gdk_pixmap_unref(pm);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- prefs.c	4 May 2002 04:20:42 -0000	1.223
+++ prefs.c	29 May 2002 00:24:41 -0000	1.224
@@ -965,7 +965,7 @@
 		gtk_widget_set_sensitive(opt, FALSE);
 	gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2);
 	gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2);
-	gaim_button(_("Show aliases in tabs/titles"), &im_options, OPT_IM_ALIAS_TAB, vbox2);
+	gaim_button(_("Show aliases in tabs/titles/ticker"), &im_options, OPT_IM_ALIAS_TAB, vbox2);
 	gaim_button(_("Hide window on send"), &im_options, OPT_IM_POPDOWN, vbox2);
 
 	frame = gtk_frame_new(_("Window Sizes"));
@@ -2750,8 +2750,10 @@
 	if (option == OPT_IM_HIDE_ICONS)
 		set_hide_icons();
 
-	if (option == OPT_IM_ALIAS_TAB)
+	if (option == OPT_IM_ALIAS_TAB) {
 		set_convo_titles();
+		BuddyTickerSetNames();
+	}
 
 	if (option == OPT_IM_NO_ANIMATION)
 		set_anim();

Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ticker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ticker.c	2 Nov 2001 01:41:37 -0000	1.18
+++ ticker.c	29 May 2002 00:24:41 -0000	1.19
@@ -34,6 +34,7 @@
 
 typedef struct {
 	char buddy[ 128 ];
+	char alias[ 388 ];
 	GtkWidget *hbox;
 	GtkWidget *ebox;
 	GtkWidget *label;
@@ -46,7 +47,7 @@
 
 void BuddyTickerDestroyWindow( GtkWidget *window );
 void BuddyTickerCreateWindow( void );
-void BuddyTickerAddUser( char *name, GdkPixmap *pm, GdkBitmap *bm );
+void BuddyTickerAddUser( char *name, char *alias, GdkPixmap *pm, GdkBitmap *bm );
 void BuddyTickerRemoveUser( char *name );
 void BuddyTickerSetPixmap( char *name, GdkPixmap *pm, GdkBitmap *bm );
 void BuddyTickerClearList( void );
@@ -66,7 +67,7 @@
 	userclose = TRUE;
 }
 
-static char *msg = "Welcome to Gaim " VERSION ", brought to you by Rob Flynn (maintainer), Eric Warmenhoven, Mark Spencer, Jeramey Crawford, Jim Duchek, and Syd Logan"; 
+static char *msg = "Welcome to Gaim " VERSION ", brought to you by Rob Flynn (maintainer), Eric Warmenhoven, Mark Spencer, Jeramey Crawford, Jim Duchek, Syd Logan, and Sean Egan"; 
 
 void
 BuddyTickerCreateWindow()
@@ -109,7 +110,7 @@
 }
 
 void
-BuddyTickerAddUser( char *name, GdkPixmap *pm, GdkBitmap *bm )
+BuddyTickerAddUser( char *name, char *alias, GdkPixmap *pm, GdkBitmap *bm )
 {
 	TickerData *p;
 	GList *q;
@@ -128,6 +129,7 @@
 	p->label = (GtkWidget *) NULL;
 	p->pix = (GtkWidget *) NULL;
 	strcpy( p->buddy, name );
+	strcpy( p->alias, alias);
 	tickerbuds = g_list_append( tickerbuds, p );
 
 	p->hbox = gtk_hbox_new( FALSE, 0 );
@@ -147,7 +149,10 @@
 	gtk_box_pack_start_defaults( GTK_BOX( p->hbox ), p->ebox );
 	gtk_widget_show( p->ebox );
 
-	p->label = gtk_label_new( name );
+	if (im_options & OPT_IM_ALIAS_TAB)
+		p->label = gtk_label_new( alias );
+	else
+		p->label = gtk_label_new( name );
 	gtk_container_add( GTK_CONTAINER(p->ebox), p->label ); 
 
 	gtk_widget_show( p->label );
@@ -198,6 +203,26 @@
 	gtk_widget_show( data->pix );
 }
 
+void
+BuddyTickerSetAlias( char *name, char *alias) {
+	GList *p;
+	TickerData *data;
+
+	if ( userclose == TRUE )
+		return;
+	p = (GList *) BuddyTickerFindUser( name );
+	if ( p )
+		data = (TickerData *) p->data;
+	else
+		return;
+	if (alias) {
+		g_snprintf(data->alias, sizeof(data->alias), alias);
+		
+		if (im_options & OPT_IM_ALIAS_TAB) 
+			gtk_label_set_text(GTK_LABEL(data->label), alias);
+	}
+}
+
 GList *
 BuddyTickerFindUser( char *name )
 {
@@ -212,6 +237,20 @@
 	return (GList *) NULL;
 }
 
+void
+BuddyTickerSetNames()
+{
+	GList *p = tickerbuds;
+	while ( p ) {
+		TickerData *q = (TickerData *) p->data;
+		if (im_options & OPT_IM_ALIAS_TAB)
+			gtk_label_set_text(GTK_LABEL(q->label), q->alias);
+		else
+			gtk_label_set_text(GTK_LABEL(q->label), q->buddy);
+	p = p->next;
+	}
+}
+
 int
 BuddyTickerMessageRemove( gpointer data )
 {
@@ -297,7 +336,7 @@
 					if (xpm == NULL)
 						xpm = (char **)no_icon_xpm;
 					pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
-					BuddyTickerAddUser( b->name, pm, bm );
+					BuddyTickerAddUser( b->name, b->show, pm, bm );
 				}
 			}
 		}

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ui.h	28 May 2002 08:00:27 -0000	1.38
+++ ui.h	29 May 2002 00:24:41 -0000	1.39
@@ -492,8 +492,10 @@
 /* Fucntions in ticker.c */
 void SetTickerPrefs();
 void BuddyTickerSignOff();
-void BuddyTickerAddUser(char *, GdkPixmap *, GdkBitmap *);
+void BuddyTickerAddUser(char *, char *, GdkPixmap *, GdkBitmap *);
 void BuddyTickerSetPixmap(char *, GdkPixmap *, GdkBitmap *);
+void BuddyTickerSetAlias(char *, char *);
+void BuddyTickerSetNames();
 void BuddyTickerSignoff();
 
 #endif /* _UI_H_ */

[Gaim-commits] CVS: gaim ChangeLog,1.490,1.491

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

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

Modified Files:
	ChangeLog 
Log Message:
Aliases in buddy ticker, inspired by Jeff Stuart.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -d -r1.490 -r1.491
--- ChangeLog	28 May 2002 08:40:48 -0000	1.490
+++ ChangeLog	29 May 2002 00:24:41 -0000	1.491
@@ -20,7 +20,8 @@
 	  the hat to Christian Hammond for the graphic)
 	* Conversation struct has pointer to toolbar (thanks Brent
 	  Priddy and Paul Miller)
-	* Zephyr fixes (thanks, (Arun A. Tharuvai)
+	* Zephyr fixes (thanks, Arun A. Tharuvai)
+	* Aliases in buddy ticker
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim ChangeLog,1.489,1.490

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

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

Modified Files:
	ChangeLog 
Log Message:
Arun says to do this.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -d -r1.489 -r1.490
--- ChangeLog	28 May 2002 08:05:59 -0000	1.489
+++ ChangeLog	28 May 2002 08:40:48 -0000	1.490
@@ -20,6 +20,7 @@
 	  the hat to Christian Hammond for the graphic)
 	* Conversation struct has pointer to toolbar (thanks Brent
 	  Priddy and Paul Miller)
+	* Zephyr fixes (thanks, (Arun A. Tharuvai)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim/src/protocols/zephyr ZSubs.c,1.2,1.3 zephyr.c,1.21,1.22

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

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

Modified Files:
	ZSubs.c zephyr.c 
Log Message:
Arun says to do this.


Index: ZSubs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/ZSubs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ZSubs.c	3 Oct 2001 19:38:28 -0000	1.2
+++ ZSubs.c	28 May 2002 08:40:48 -0000	1.3
@@ -76,6 +76,7 @@
     ZNotice_t notice;
     char header[Z_MAXHEADERLEN];
     char **list;
+    char *recip;
     int hdrlen;
     int size_avail = Z_MAXPKTLEN-Z_FRAGFUDGE; /* space avail for data,
 						 adjusted below */
@@ -117,11 +118,12 @@
     for (i=0;i<nitems;i++) {
 	list[i*3] = sublist[i].zsub_class;
 	list[i*3+1] = sublist[i].zsub_classinst;
-	if (sublist[i].zsub_recipient && *sublist[i].zsub_recipient &&
-	    *sublist[i].zsub_recipient != '*')
-	    list[i*3+2] = ZGetSender();
-	else
-	    list[i*3+2] = "";
+	recip = sublist[i].zsub_recipient;
+	if (recip && *recip == '*')
+	  recip++;
+	if (!recip || (*recip != 0 && *recip != '@'))
+	  recip = ZGetSender();
+	list[i*3+2] = recip;
     }
 
     start = -1;

Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- zephyr.c	20 Apr 2002 07:07:06 -0000	1.21
+++ zephyr.c	28 May 2002 08:40:48 -0000	1.22
@@ -316,7 +316,7 @@
 static void handle_message(ZNotice_t notice, struct sockaddr_in from)
 {
 	if (!g_strcasecmp(notice.z_class, LOGIN_CLASS)) {
-		/* well, we'll be updating in 2 seconds anyway, might as well ignore this. */
+		/* well, we'll be updating in 20 seconds anyway, might as well ignore this. */
 	} else if (!g_strcasecmp(notice.z_class, LOCATE_CLASS)) {
 		if (!g_strcasecmp(notice.z_opcode, LOCATE_LOCATE)) {
 			int nlocs;
@@ -359,6 +359,8 @@
 	} else {
 		char *buf, *buf2;
 		char *send_inst;
+		char *realmptr;
+		char *sendertmp;
 		char *ptr = notice.z_message + strlen(notice.z_message) + 1;
 		int len = notice.z_message_len - (ptr - notice.z_message);
 		int away;
@@ -387,10 +389,24 @@
 						zt2->open = TRUE;
 						serv_got_joined_chat(zgc, zt2->id, zt2->name);
 					}
-					send_inst = g_strdup_printf("%s %s", notice.z_sender,
-								    notice.z_class_inst);
+					/* If the person is in the default Realm, then strip the 
+					   Realm from the sender field */
+					sendertmp = g_strdup_printf("%s",notice.z_sender);
+					realmptr = strchr(sendertmp,'@');
+					realmptr++;
+					if (!g_strcasecmp(realmptr,ZGetRealm())) {
+						realmptr--;
+						sprintf(realmptr,"%c",'\0');
+						send_inst = g_strdup_printf("%s %s",sendertmp,
+									    notice.z_class_inst);
+								     
+					} else {
+						send_inst = g_strdup_printf("%s %s",notice.z_sender,
+									    notice.z_class_inst);
+					}
 					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE,
 								buf2, time(NULL));
+					g_free(sendertmp);
 					g_free(send_inst);
 				}
 				free_triple(zt1);
@@ -498,13 +514,15 @@
 			strip_comments(buff);
 			if (buff[0]) {
 				triple = g_strsplit(buff, ",", 3);
-				if (triple[0] && triple[1] && triple[2]) {
+				if (triple[0] && triple[1] ) {
 					char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"),
 								    ZGetRealm());
 					char *atptr;
 					sub.zsub_class = triple[0];
 					sub.zsub_classinst = triple[1];
-					if (!g_strcasecmp(triple[2], "%me%")) {
+					if(triple[2] == NULL) {
+						recip = g_malloc0(1);
+					} else if (!g_strcasecmp(triple[2], "%me%")) {
 						recip = g_strdup_printf("%s@%s", g_getenv("USER"),
 										ZGetRealm());
 					} else if (!g_strcasecmp(triple[2], "*")) {
@@ -608,6 +626,7 @@
 	FILE *fd;
 	char *fname;
 
+	char** triple;
 	fname = g_strdup_printf("%s/.zephyr.subs", g_get_home_dir());
 	fd = fopen(fname, "w");
 	
@@ -618,7 +637,19 @@
 	
 	while (s) {
 		zt = s->data;
-		fprintf(fd, "%s\n", zt->name);
+		triple = g_strsplit(zt->name,",",3);
+		if (triple[2] != NULL) {
+			if (!g_strcasecmp(triple[2], "")) {
+				fprintf(fd, "%s,%s,*\n", triple[0], triple[1]);
+			} else if (!g_strcasecmp(triple[2], ZGetSender())) {
+				fprintf(fd, "%s,%s,%%me%%\n",triple[0],triple[1]);
+			} else {
+				fprintf(fd, "%s\n", zt->name);
+			}
+		} else {
+			fprintf(fd, "%s,%s,*\n",triple[0], triple[1]);
+		}
+		g_free(triple);
 		s = s->next;
 	}
 	g_free(fname);
@@ -630,7 +661,7 @@
 	GSList *gr, *m;
 	struct group *g;
 	struct buddy *b;
-	char *ptr, *fname;
+	char *ptr, *fname, *ptr2;
 	FILE *fd;
 
 	fname = g_strdup_printf("%s/.anyone", g_get_home_dir());
@@ -646,8 +677,15 @@
 		m = g->members;
 		while (m) {
 			b = m->data;
-			if ((ptr = strchr(b->name, '@')) != NULL)
-				*ptr = '\0';
+			if ((ptr = strchr(b->name, '@')) != NULL) {
+				ptr2 = ptr + 1;
+				/* We should only strip the realm name if the principal
+				   is in the user's realm
+				*/
+				if (!g_strcasecmp(ptr2,ZGetRealm())) {
+					*ptr = '\0';
+				}
+			}
 			fprintf(fd, "%s\n", b->name);
 			if (ptr)
 				*ptr = '@';

[Gaim-commits] CVS: gaim ChangeLog,1.487,1.488

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

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

Modified Files:
	ChangeLog 
Log Message:
For plugins.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -d -r1.487 -r1.488
--- ChangeLog	22 May 2002 12:25:44 -0000	1.487
+++ ChangeLog	28 May 2002 08:00:25 -0000	1.488
@@ -18,6 +18,8 @@
 	  light-bulb" icon is shown and the error status is
 	  available via "Get Away Msg"  (Thanks and a tip o'
 	  the hat to Christian Hammond for the graphic)
+	* Conversation struct has pointer to toolbar (thanks Brent
+	  Priddy)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)

[Gaim-commits] CVS: gaim ChangeLog,1.488,1.489

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

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

Modified Files:
	ChangeLog 
Log Message:
Paul Miller had his own patch to do this, too.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -d -r1.488 -r1.489
--- ChangeLog	28 May 2002 08:00:25 -0000	1.488
+++ ChangeLog	28 May 2002 08:05:59 -0000	1.489
@@ -19,7 +19,7 @@
 	  available via "Get Away Msg"  (Thanks and a tip o'
 	  the hat to Christian Hammond for the graphic)
 	* Conversation struct has pointer to toolbar (thanks Brent
-	  Priddy)
+	  Priddy and Paul Miller)
 
 version 0.58 (05/13/2002):
 	* Bulgarian translation added (Thanks, Igel Itzo)