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

[Gaim-commits] CVS: gaim/pixmaps logout_menu.xpm,NONE,1.1 Makefile.am,1.59,1.60

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

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

Modified Files:
	Makefile.am 
Added Files:
	logout_menu.xpm 
Log Message:
Andrew Molly thinks I don't know the difference between 12x12 and
18x18. =-O



--- NEW FILE: logout_menu.xpm ---
/* XPM */
static char * logout_menu_xpm[] = {
/* width height num_colors chars_per_pixel */
"18 18 15 1",
/* colors */
" 	c #cccccc",
".	c #999999",
"X	c None",
"o	c black",
"O	c #000066",
"+	c #996666",
"@	c white",
"#	c #000099",
"$	c #666699",
"%	c #ffff99",
"&	c #6666cc",
"*	c #336699",
"=	c #333366",
"-	c #333399",
";	c #333333",
/* pixels */
"XXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXX",
"XXX .XoooooooooXXX",
"XXXXXXo       OXXX",
"XXXo.Xo ++@++@#XXX",
"XXXXX$o.+%@+%@OXXX",
"XXXXX&o +%@+%@#XXX",
"XXX .*o @@@@@@OXXX",
"XXX=X-ooo+@++@#XXX",
"XXXXX=o +.@+%@#XXX",
"XXXX.;o +%@+%@OXXX",
"XXXoXXo +%@+%@#XXX",
"XXXXXXo @@@@@@OXXX",
"XXX .*#O#O#O#O#XXX",
"XXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXX"};

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Makefile.am	2001/10/14 11:36:36	1.59
+++ Makefile.am	2001/11/20 07:20:05	1.60
@@ -61,6 +61,7 @@
 		login_icon.xpm			\
 		logo.xpm			\
 		logout_icon.xpm			\
+		logout_menu.xpm			\
 		luke03.xpm			\
 		moneymouth.xpm			\
 		mrt.xpm				\

[Gaim-commits] CVS: gaim/src buddy.c,1.276,1.277

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

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

Modified Files:
	buddy.c 
Log Message:
Andrew Molly thinks I don't know the difference between 12x12 and
18x18. =-O



Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- buddy.c	2001/11/20 06:53:45	1.276
+++ buddy.c	2001/11/20 07:20:05	1.277
@@ -72,6 +72,7 @@
 #include "pixmaps/gnome_add.xpm"
 #include "pixmaps/gnome_remove.xpm"
 #include "pixmaps/group.xpm"
+#include "pixmaps/logout_menu.xpm"
 
 static GtkTooltips *tips;
 static GtkAccelGroup *accel;
@@ -2415,7 +2416,7 @@
 	/*gaim_new_item_with_pixmap(menu, _("Export Buddy List"), export_small_xpm,
 	   GTK_SIGNAL_FUNC(show_export_dialog), 0, 0, 0); */
 	gaim_separator(menu);
-	gaim_new_item_with_pixmap(menu, _("Signoff"), logout_icon_xpm,
+	gaim_new_item_with_pixmap(menu, _("Signoff"), logout_menu_xpm,
 				  GTK_SIGNAL_FUNC(signoff_all), 'd', GDK_CONTROL_MASK, "Ctl+D");
 
 #ifndef USE_APPLET

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.79,1.80

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

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

Modified Files:
	gtkimhtml.c 
Log Message:
love makes me treat you the way that i do, gee baby, ain't i good to you ;-*


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- gtkimhtml.c	2001/11/20 01:29:42	1.79
+++ gtkimhtml.c	2001/11/20 07:05:36	1.80
@@ -1961,15 +1961,8 @@
 		for (i = 0; fontsize && names [i]; i++) {
 			newvals [FMLY] = names [i];
 
-			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize) / 10);
-			newvals [PXLSZ] = fs;
-			newvals [PTSZ] = "*";
-
-			TRY_FONT;
-
 			newvals [PXLSZ] = xflds [PXLSZ];
 			newvals [PTSZ] = xflds [PTSZ];
-
 			TRY_FONT;
 		}
 

[Gaim-commits] CVS: gaim/src buddy.c,1.275,1.276

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

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

Modified Files:
	buddy.c 
Log Message:
This will cure all that ails you.

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- buddy.c	2001/11/17 14:26:17	1.275
+++ buddy.c	2001/11/20 06:53:45	1.276
@@ -283,6 +283,7 @@
 			g_free(bs->name);
 			g_free(bs);
 		}
+		update_num_group(gs);
 	} else {
 		gtk_label_set_text(GTK_LABEL(bs->label), b->show);
 		update_idle_time(bs);
@@ -819,6 +820,7 @@
 		if (bs) {
 			if (g_slist_find(bs->connlist, gc)) {
 				bs->connlist = g_slist_remove(bs->connlist, gc);
+				update_num_group(gs);
 				if (!g_slist_length(bs->connlist)) {
 					gs->members = g_slist_remove(gs->members, bs);
 					if (bs->log_timer > 0)
@@ -834,14 +836,10 @@
 						gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
 						g_free(gs->name);
 						g_free(gs);
-					} else
-						update_num_group(gs);
-				} else
-					update_num_group(gs);
-			} else
-				update_num_group(gs);
-		} else
-			update_num_group(gs);
+					}
+				}
+			}
+		}
 	}
 
 	c = find_conversation(rem_b->name);
@@ -963,6 +961,7 @@
 							bs = new_buddy_show(gs, b, (char **)no_icon_xpm);
 					}
 					bs->connlist = g_slist_append(bs->connlist, gc);
+					update_num_group(gs);
 				}
 			}
 		}
@@ -2076,8 +2075,10 @@
 			gs = new_group_show(g->name);
 		if ((bs = find_buddy_show(gs, b->name)) == NULL)
 			bs = new_buddy_show(gs, b, (char **)login_icon_xpm);
-		if (!g_slist_find(bs->connlist, gc))
+		if (!g_slist_find(bs->connlist, gc)) {
 			bs->connlist = g_slist_append(bs->connlist, gc);
+			update_num_group(gs);
+		}
 		if (b->present == 1) {
 			if (bs->sound != 2)
 				play_sound(BUDDY_ARRIVE);
@@ -2096,7 +2097,6 @@
 			if (bs->log_timer > 0)
 				gtk_timeout_remove(bs->log_timer);
 			bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
-			update_num_group(gs);
 			if ((bs->sound != 2) && (im_options & OPT_IM_LOGON)) {
 				struct conversation *c = find_conversation(b->name);
 				if (c) {
@@ -2138,10 +2138,10 @@
 			play_sound(BUDDY_LEAVE);
 
 		bs->connlist = g_slist_remove(bs->connlist, gc);
+		update_num_group(gs);
 		if (bs->log_timer > 0)
 			gtk_timeout_remove(bs->log_timer);
 		bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
-		update_num_group(gs);
 		pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, logout_icon_xpm);
 		gtk_widget_hide(bs->pix);
 		gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);

[Gaim-commits] CVS: gaim/src browser.c,1.17,1.18 gaimrc.c,1.89,1.90 sound.c,1.43,1.44

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

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

Modified Files:
	browser.c gaimrc.c sound.c 
Log Message:
that's just rather pathetic


Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- browser.c	2001/10/26 01:48:25	1.17
+++ browser.c	2001/11/20 06:16:15	1.18
@@ -622,14 +622,7 @@
 
 			char *ms;
 
-			if (strstr(web_command, "\"%s\""))
-				g_snprintf(command, sizeof(command), web_command, url);
-			else if ((ms = strstr(web_command, "%s")) != NULL) {
-				*ms = 0;
-				g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url,
-					   ms + 2);
-			} else
-				g_snprintf(command, sizeof(command), web_command);
+			g_snprintf(command, sizeof(command), web_command, url);
 
 			args[0] = "sh";
 			args[1] = "-c";

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- gaimrc.c	2001/11/19 12:03:38	1.89
+++ gaimrc.c	2001/11/20 06:16:15	1.90
@@ -1026,7 +1026,7 @@
 
 	report_idle = IDLE_SCREENSAVER;
 	web_browser = BROWSER_NETSCAPE;
-	g_snprintf(web_command, sizeof(web_command), "xterm -e lynx %%s");
+	g_snprintf(web_command, sizeof(web_command), "xterm -e lynx \"%%s\"");
 
 	auto_away = 10;
 	a = g_new0(struct away_message, 1);

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- sound.c	2001/11/06 21:30:31	1.43
+++ sound.c	2001/11/20 06:16:15	1.44
@@ -406,14 +406,9 @@
 			char *args[4];
 			char command[4096];
 			char *ms;
-			if (strstr(sound_cmd, "\"%s\""))
-				g_snprintf(command, sizeof(command), sound_cmd, filename);
-			else if ((ms = strstr(sound_cmd, "%s")) != NULL) {
-				*ms = 0;
-				g_snprintf(command, sizeof(command), "%s\"%s\"%s", sound_cmd,
-					   filename, ms + 2);
-			} else
-				g_snprintf(command, sizeof(command), sound_cmd);
+
+			g_snprintf(command, sizeof(command), sound_cmd, filename);
+
 			args[0] = "sh";
 			args[1] = "-c";
 			args[2] = command;

[Gaim-commits] CVS: gaim README,1.22,1.23

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

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

Modified Files:
	README 
Log Message:
that's just rather pathetic


Index: README
===================================================================
RCS file: /cvsroot/gaim/gaim/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- README	2001/10/25 10:28:08	1.22
+++ README	2001/11/20 06:16:14	1.23
@@ -73,6 +73,10 @@
 The panel (if you made an applet) requires certain things to be in certain
 places, but the Makefile/configure script should figure things out for you.
 
+If you set a command for your browser or your sound player, make sure to put
+quotes around the %s where appropriate; otherwise, bad things could happen.
+Remember, you did it to yourself.
+
 Send me bug reports.  The web page is http://gaim.sourceforge.net/and the ftp
 site is ftp://ftp.sourceforge.net/pub/sourceforge/gaim. We also have a
 sourceforge page at http://sourceforge.net/projects/gaim/

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.78,1.79

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

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

Modified Files:
	gtkimhtml.c 
Log Message:
i don't know why this is so difficult


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- gtkimhtml.c	2001/11/20 01:23:37	1.78
+++ gtkimhtml.c	2001/11/20 01:29:42	1.79
@@ -62,7 +62,7 @@
 #define MAX_FONT_SIZE 7
 #define DEFAULT_FONT_SIZE 3
 
-#define POINT_SIZE(x) (_point_sizes [(x) - 1])
+#define POINT_SIZE(x) (_point_sizes [MIN ((x), MAX_FONT_SIZE) - 1])
 static gint _point_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
 
 #define DEFAULT_PRE_FACE "courier"
@@ -1931,7 +1931,7 @@
 		if (italics)
 			newvals [SLANT] = "i";
 		if (fontsize) {
-			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)));
+			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize));
 			newvals [PXLSZ] = "*";
 			newvals [PTSZ] = fs;
 		}
@@ -1961,8 +1961,7 @@
 		for (i = 0; fontsize && names [i]; i++) {
 			newvals [FMLY] = names [i];
 
-			g_snprintf (fs, sizeof (fs), "%d",
-				    POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)) / 10);
+			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize) / 10);
 			newvals [PXLSZ] = fs;
 			newvals [PTSZ] = "*";
 

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

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

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

Modified Files:
	gtkimhtml.c 
Log Message:
i really need to sleep


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- gtkimhtml.c	2001/11/20 01:22:16	1.77
+++ gtkimhtml.c	2001/11/20 01:23:37	1.78
@@ -1962,7 +1962,7 @@
 			newvals [FMLY] = names [i];
 
 			g_snprintf (fs, sizeof (fs), "%d",
-				    POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE) - 1) / 10);
+				    POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)) / 10);
 			newvals [PXLSZ] = fs;
 			newvals [PTSZ] = "*";
 

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.76,1.77

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

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

Modified Files:
	gtkimhtml.c 
Log Message:
>>Comment By: Decklin
> I'm also curious as to why you didn't want the POINT_SIZE
> macro...

i just didn't see it before :)


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- gtkimhtml.c	2001/11/19 11:14:54	1.76
+++ gtkimhtml.c	2001/11/20 01:22:16	1.77
@@ -62,7 +62,8 @@
 #define MAX_FONT_SIZE 7
 #define DEFAULT_FONT_SIZE 3
 
-gint _point_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
+#define POINT_SIZE(x) (_point_sizes [(x) - 1])
+static gint _point_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
 
 #define DEFAULT_PRE_FACE "courier"
 
@@ -1930,7 +1931,7 @@
 		if (italics)
 			newvals [SLANT] = "i";
 		if (fontsize) {
-			g_snprintf (fs, sizeof (fs), "%d", _point_sizes [MIN (fontsize, MAX_FONT_SIZE) - 1]);
+			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)));
 			newvals [PXLSZ] = "*";
 			newvals [PTSZ] = fs;
 		}
@@ -1961,7 +1962,7 @@
 			newvals [FMLY] = names [i];
 
 			g_snprintf (fs, sizeof (fs), "%d",
-				    _point_sizes [MIN (fontsize, MAX_FONT_SIZE) - 1] / 10);
+				    POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE) - 1) / 10);
 			newvals [PXLSZ] = fs;
 			newvals [PTSZ] = "*";
 

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.33,1.34

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

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

Modified Files:
	toc.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- toc.c	2001/11/15 08:19:46	1.33
+++ toc.c	2001/11/20 01:01:22	1.34
@@ -382,7 +382,7 @@
 	if (!url_text)
 		return;
 
-	g_show_info_text(url_text, NULL);
+	g_show_info_text(NULL, NULL, FALSE, url_text, NULL);
 }
 
 static char *show_error_message()

[Gaim-commits] CVS: gaim/src/protocols/zephyr zephyr.c,1.15,1.16

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

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

Modified Files:
	zephyr.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- zephyr.c	2001/11/06 23:58:24	1.15
+++ zephyr.c	2001/11/20 01:01:22	1.16
@@ -349,7 +349,7 @@
 					g_string_sprintfa(str, "<br>At %s since %s", locs.host,
 									locs.time);
 				}
-				g_show_info_text(str->str, NULL);
+				g_show_info_text(NULL, NULL, FALSE, str->str, NULL);
 				g_string_free(str, TRUE);
 			} else
 				serv_got_update(zgc, b->name, nlocs, 0, 0, 0, 0, 0);

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

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

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

Modified Files:
	irc.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- irc.c	2001/11/15 22:47:04	1.56
+++ irc.c	2001/11/20 01:01:21	1.57
@@ -639,7 +639,7 @@
 	case 318:
 		if (id->in_whois && id->whois_str) {
 			GString *str = decode_html(id->whois_str->str);
-			g_show_info_text(str->str, NULL);
+			g_show_info_text(gc, NULL, FALSE, str->str, NULL);
 			g_string_free(str, TRUE);
 			g_string_free(id->whois_str, TRUE);
 			id->whois_str = NULL;

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.70,1.71

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

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

Modified Files:
	oscar.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- oscar.c	2001/11/19 16:37:32	1.70
+++ oscar.c	2001/11/20 01:01:22	1.71
@@ -1558,6 +1558,7 @@
 	char buf[BUF_LONG];
 	char legend[BUF_LONG];
 	struct gaim_connection *gc = sess->aux_data;
+	gboolean away;
 	va_list ap;
 	char *asc;
 
@@ -1568,12 +1569,24 @@
 	infotype = (fu16_t)va_arg(ap, unsigned int);
 	va_end(ap);
 
+	g_snprintf(legend, sizeof legend,
+			_("<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br>"
+			"<IMG SRC=\"free_icon.gif\"> : Normal AIM User<br>"
+			"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
+			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
+			"<IMG SRC=\"admin_icon.gif\"> : Administrator"));
+
+	away = infotype != AIM_GETINFO_GENERALINFO;
+	if (away && (!prof || !*prof)) {
+		g_show_info_text(gc, info->sn, away, legend, NULL);
+		return 1;
+	}
+
 	if (info->membersince)
 		asc = g_strdup_printf("Member Since : <B>%s</B><BR>\n",
 				asctime(localtime(&info->membersince)));
 	else
 		asc = g_strdup("");
-
 	g_snprintf(buf, sizeof buf,
 			_("Username : <B>%s</B>  %s <BR>\n"
 			"%s"
@@ -1585,24 +1598,18 @@
 			info->warnlevel/10,
 			asctime(localtime(&info->onlinesince)),
 			info->idletime);
-	g_snprintf(legend, sizeof legend,
-			_("<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br>"
-			"<IMG SRC=\"free_icon.gif\"> : Normal AIM User<br>"
-			"<IMG SRC=\"aol_icon.gif\"> : AOL User <br>"
-			"<IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br>"
-			"<IMG SRC=\"admin_icon.gif\"> : Administrator"));
-	g_show_info_text(buf,
+	g_free(asc);
+
+	g_show_info_text(gc, info->sn, away, away ? "<br><hr>" : buf,
 			 (prof && strlen(prof)) ?
 				away_subs(prof, gc->username)
 				:
-				(infotype == AIM_GETINFO_GENERALINFO ?
-					_("<i>No Information Provided</i>") :
-					_("<i>User has no away message</i>")),
-			 legend,
+			 away ?
+				_("<i>User has no away message</i>") :
+				_("<i>No Information Provided</i>"),
+			 away ? legend : NULL,
 			 NULL);
 
-	g_free(asc);
-
 	return 1;
 }
 
@@ -2047,14 +2054,17 @@
 
 static int gaim_simpleinfo(aim_session_t *sess, aim_frame_t *fr, ...)
 {
+	struct gaim_connection *gc = sess->aux_data;
 	va_list ap;
 	struct aim_icq_simpleinfo *info;
 	char buf[16 * 1024];
+	char who[16];
 
 	va_start(ap, fr);
 	info = va_arg(ap, struct aim_icq_simpleinfo *);
 	va_end(ap);
 
+	g_snprintf(who, sizeof who, "%lu", info->uin);
 	g_snprintf(buf, sizeof buf,
 		   "<B>UIN:</B> %lu<BR>"
 		   "<B>Nick:</B> %s<BR>"
@@ -2065,7 +2075,7 @@
 		   info->first, info->last,
 		   info->email);
 
-	g_show_info_text(buf, NULL);
+	g_show_info_text(gc, who, FALSE, buf, NULL);
 
 	return 1;
 }
@@ -2107,7 +2117,7 @@
 	at += g_snprintf(buf + at, len - at, "<B>%s has the following screen names:</B><BR>", address);
 	for (i = 0; i < num; i++)
 		at += g_snprintf(buf + at, len - at, "%s<BR>", &SNs[i * (MAXSNLEN + 1)]);
-	g_show_info_text(buf, NULL);
+	g_show_info_text(NULL, NULL, FALSE, buf, NULL);
 	g_free(buf);
 
 	return 1;
@@ -2261,7 +2271,8 @@
 
 static void oscar_get_away_msg(struct gaim_connection *g, char *name) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_AWAYMESSAGE);
+	if (!odata->icq)
+		aim_getinfo(odata->sess, odata->conn, name, AIM_GETINFO_AWAYMESSAGE);
 }
 
 static void oscar_set_dir(struct gaim_connection *g, char *first, char *middle, char *last,
@@ -2690,12 +2701,6 @@
 	pbm->gc = gc;
 	m = g_list_append(m, pbm);
 
-	pbm = g_new0(struct proto_buddy_menu, 1);
-	pbm->label = _("Get Away Msg");
-	pbm->callback = oscar_get_away_msg;
-	pbm->gc = gc;
-	m = g_list_append(m, pbm);
-
 	if (strcmp(n, normalize(who))) {
 		pbm = g_new0(struct proto_buddy_menu, 1);
 		pbm->label = _("Direct IM");
@@ -2908,6 +2913,7 @@
 	ret->set_info = oscar_set_info;
 	ret->get_info = oscar_get_info;
 	ret->set_away = oscar_set_away;
+	ret->get_away = oscar_get_away_msg;
 	ret->set_dir = oscar_set_dir;
 	ret->get_dir = NULL; /* Oscar really doesn't have this */
 	ret->dir_search = oscar_dir_search;

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.40,1.41

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

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

Modified Files:
	msn.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- msn.c	2001/11/19 09:45:22	1.40
+++ msn.c	2001/11/20 01:01:22	1.41
@@ -669,12 +669,9 @@
 static void msn_accept_add(gpointer w, struct msn_add_permit *map)
 {
 	struct msn_data *md = map->gc->proto_data;
-	char *user;
 	char buf[MSN_BUF_LEN];
 
-	user = g_strdup(url_encode(map->user));
-	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, user, url_encode(map->friend));
-	g_free(user);
+	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, map->user, url_encode(map->friend));
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(map->gc, "Write error");
 		signoff(map->gc);
@@ -1712,7 +1709,6 @@
 	if (l)
 		return;
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "ADD %d FL %s %s\r\n", ++md->trId, who, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -1726,7 +1722,6 @@
 	struct msn_data *md = gc->proto_data;
 	char buf[MSN_BUF_LEN];
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "REM %d FL %s\r\n", ++md->trId, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -1838,7 +1833,6 @@
 			t = g_slist_append(t, who);
 			continue;
 		}
-		who = url_encode(who);
 		g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
 		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 			hide_login_progress(gc, "Write error");
@@ -1866,7 +1860,6 @@
 			t = g_slist_append(t, who);
 			continue;
 		}
-		who = url_encode(who);
 		g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
 		if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 			hide_login_progress(gc, "Write error");
@@ -1898,7 +1891,6 @@
 		return;
 	}
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "ADD %d AL %s %s\r\n", ++md->trId, who, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -1912,7 +1904,6 @@
 	struct msn_data *md = gc->proto_data;
 	char buf[MSN_BUF_LEN];
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "REM %d AL %s\r\n", ++md->trId, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -1933,7 +1924,6 @@
 		return;
 	}
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "ADD %d BL %s %s\r\n", ++md->trId, who, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -1947,7 +1937,6 @@
 	struct msn_data *md = gc->proto_data;
 	char buf[MSN_BUF_LEN];
 
-	who = url_encode(who);
 	g_snprintf(buf, sizeof(buf), "REM %d BL %s\r\n", ++md->trId, who);
 	if (msn_write(md->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.26,1.27

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

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

Modified Files:
	jabber.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- jabber.c	2001/11/17 02:50:06	1.26
+++ jabber.c	2001/11/20 01:01:22	1.27
@@ -926,6 +926,7 @@
 }
 
 static void jabber_handlevcard(gjconn j, xmlnode querynode, char *from) {
+	struct gaim_connection *gc = GJ_GC(j);
 	char buf[1024];
 	char *fn, *url, *email, *nickname, *status, *desc;
 	jid who;
@@ -960,7 +961,7 @@
 	if (desc)
 		at += g_snprintf(buf + at, sizeof(buf) - at, "<HR>%s<br>\n", desc);
 
-	g_show_info_text(buf, NULL);
+	g_show_info_text(gc, buddy, FALSE, buf, NULL);
 	g_free(buddy);
 }
 

[Gaim-commits] CVS: gaim/src conversation.c,1.302,1.303 dialogs.c,1.289,1.290 gaim.h,1.295,1.296 prpl.h,1.56,1.57 server.c,1.210,1.211

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

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

Modified Files:
	conversation.c dialogs.c gaim.h prpl.h server.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- conversation.c	2001/11/19 15:25:36	1.302
+++ conversation.c	2001/11/20 01:01:14	1.303
@@ -604,7 +604,7 @@
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 			return TRUE;
-		} else if (!(event->state & GDK_SHIFT_MASK) && (convo_options & OPT_CONVO_ENTER_SENDS)) {
+		} else if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) && (convo_options & OPT_CONVO_ENTER_SENDS)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 			return TRUE;

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- dialogs.c	2001/11/19 12:03:37	1.289
+++ dialogs.c	2001/11/20 01:01:14	1.290
@@ -172,11 +172,30 @@
 };
 
 struct info_dlg {
+	struct gaim_connection *gc;
+	char *who;
 	GtkWidget *window;
 	GtkWidget *text;
-	GtkWidget *close;
 };
+static GSList *info_dlgs = NULL;
 
+static struct info_dlg *find_info_dlg(struct gaim_connection *gc, char *who)
+{
+	GSList *i = info_dlgs;
+	while (i) {
+		struct info_dlg *d = i->data;
+		i = i->next;
+		if (d->gc != gc)
+			continue;
+		if (d->who == NULL)
+			continue;
+		if (!who)
+			continue;
+		if (!g_strcasecmp(normalize(who), d->who))
+			return d;
+	}
+	return NULL;
+}
 
 struct set_info_dlg {
 	GtkWidget *window;
@@ -1732,6 +1751,9 @@
 
 static void info_dlg_free(GtkWidget *b, struct info_dlg *d)
 {
+	if (g_slist_find(info_dlgs, d))
+		info_dlgs = g_slist_remove(info_dlgs, d);
+	g_free(d->who);
 	g_free(d);
 }
 
@@ -1750,7 +1772,7 @@
 	return NULL;
 }
 
-void g_show_info_text(char *info, ...)
+void g_show_info_text(struct gaim_connection *gc, char *who, gboolean away, char *info, ...)
 {
 	GtkWidget *ok;
 	GtkWidget *label;
@@ -1761,41 +1783,48 @@
 	char *more_info;
 	va_list ap;
 
-	struct info_dlg *b = g_new0(struct info_dlg, 1);
+	struct info_dlg *b = find_info_dlg(gc, who);
+	if (!b && away)
+		return;
+	if (!b) {
+		b = g_new0(struct info_dlg, 1);
+		b->gc = gc;
+		b->who = who ? g_strdup(normalize(who)) : NULL;
+		info_dlgs = g_slist_append(info_dlgs, b);
 
-	va_start(ap, info);
+		GAIM_DIALOG(b->window);
+		gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
+		gtk_container_border_width(GTK_CONTAINER(b->window), 5);
+		gtk_widget_realize(GTK_WIDGET(b->window));
+		gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(info_dlg_free), b);
+		aol_icon(b->window->window);
 
-	GAIM_DIALOG(b->window);
-	gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
-	gtk_container_border_width(GTK_CONTAINER(b->window), 5);
-	bbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(b->window), bbox);
-	gtk_widget_realize(GTK_WIDGET(b->window));
-	ok = picture_button(b->window, _("OK"), ok_xpm);
-	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
-	gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(info_dlg_free), b);
-	gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window);
+		bbox = gtk_vbox_new(FALSE, 5);
+		gtk_container_add(GTK_CONTAINER(b->window), bbox);
 
-	label = gtk_label_new(_("Below are the results of your search: "));
+		label = gtk_label_new(_("Below are the results of your search: "));
+		gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 
-	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-	text = gtk_imhtml_new(NULL, NULL);
-	b->text = text;
-	gtk_container_add(GTK_CONTAINER(sw), text);
+		sw = gtk_scrolled_window_new(NULL, NULL);
+		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+		gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 0);
 
-	GTK_LAYOUT(text)->hadjustment->step_increment = 10.0;
-	GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
-	gtk_widget_set_usize(sw, 300, 250);
-	gtk_imhtml_set_img_handler(GTK_IMHTML(text), info_img_handler);
-	gaim_setup_imhtml(text);
+		text = gtk_imhtml_new(NULL, NULL);
+		b->text = text;
+		gtk_container_add(GTK_CONTAINER(sw), text);
+		GTK_LAYOUT(text)->hadjustment->step_increment = 10.0;
+		GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
+		gtk_widget_set_usize(sw, 300, 250);
+		gtk_imhtml_set_img_handler(GTK_IMHTML(text), info_img_handler);
+		gaim_setup_imhtml(text);
 
-	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0);
+		ok = picture_button(b->window, _("OK"), ok_xpm);
+		gtk_signal_connect_object(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy),
+					  GTK_OBJECT(b->window));
+		gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0);
 
-	aol_icon(b->window->window);
-	gtk_widget_show_all(b->window);
+		gtk_widget_show_all(b->window);
+	}
 
 	if (convo_options & OPT_CONVO_IGNORE_COLOUR)
 		options ^= GTK_IMHTML_NO_COLOURS;
@@ -1807,13 +1836,20 @@
 	options ^= GTK_IMHTML_NO_TITLE;
 	options ^= GTK_IMHTML_NO_NEWLINE;
 	options ^= GTK_IMHTML_NO_SCROLL;
+
 	gtk_imhtml_append_text(GTK_IMHTML(b->text), info, options);
+
+	va_start(ap, info);
 	while ((more_info = va_arg(ap, char *)) != NULL)
 		 gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, options);
 	va_end(ap);
+
 	gtk_imhtml_append_text(GTK_IMHTML(b->text), "<BR>", 0);
 
-	gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0);
+	if (away)
+		info_dlgs = g_slist_remove(info_dlgs, b);
+	else
+		serv_get_away(gc, who);
 }
 
 /*------------------------------------------------------------------------*/

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- gaim.h	2001/11/19 16:37:32	1.295
+++ gaim.h	2001/11/20 01:01:16	1.296
@@ -331,7 +331,7 @@
 extern struct conversation *find_conversation(char *);
 
 /* Functions in dialogs.c */
-extern void g_show_info_text(char *, ...);
+extern void g_show_info_text(struct gaim_connection *, char *, gboolean, char *, ...);
 extern GtkWidget *do_error_dialog(char *, char *);
 extern void show_change_passwd(struct gaim_connection *);
 extern void show_set_dir(struct gaim_connection *);
@@ -384,6 +384,7 @@
 extern void serv_chat_whisper(struct gaim_connection *, int, char *, char *);
 extern int  serv_chat_send(struct gaim_connection *, int, char *);
 extern void serv_got_popup(char *, char *, int, int);
+extern void serv_get_away(struct gaim_connection *, char *);
 
 /* Functions in util.c */
 extern char *normalize(const char *);

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- prpl.h	2001/11/10 08:02:39	1.56
+++ prpl.h	2001/11/20 01:01:20	1.57
@@ -106,6 +106,7 @@
 	void (* set_info)	(struct gaim_connection *, char *info);
 	void (* get_info)	(struct gaim_connection *, char *who);
 	void (* set_away)	(struct gaim_connection *, char *state, char *message);
+	void (* get_away)       (struct gaim_connection *, char *who);
 	void (* set_dir)	(struct gaim_connection *, char *first,
 							   char *middle,
 							   char *last,

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- server.c	2001/11/19 16:37:32	1.210
+++ server.c	2001/11/20 01:01:21	1.211
@@ -162,6 +162,12 @@
 		g->prpl->get_info(g, name);
 }
 
+void serv_get_away(struct gaim_connection *g, char *name)
+{
+	if (g && g->prpl && g->prpl->get_away)
+		g->prpl->get_away(g, name);
+}
+
 void serv_get_dir(struct gaim_connection *g, char *name)
 {
 	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->get_dir)

[Gaim-commits] CVS: gaim/src/protocols/gg gg.c,1.9,1.10

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

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

Modified Files:
	gg.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gg.c	2001/11/10 08:02:39	1.9
+++ gg.c	2001/11/20 01:01:21	1.10
@@ -790,7 +790,7 @@
 
 	g_strfreev(webdata_tbl);
 
-	g_show_info_text(buf, NULL);
+	g_show_info_text(gc, NULL, FALSE, buf, NULL);
 
 	g_free(buf);
 }

[Gaim-commits] CVS: gaim/src/protocols/icq gaim_icq.c,1.20,1.21

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

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

Modified Files:
	gaim_icq.c 
Log Message:
SPAM!!!

All recipients of the email generated by this commit each owe me $125 per email sent, plus a $75 handling fee for all messages combined.

Or was that supposed to be the other way around.


Index: gaim_icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/gaim_icq.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gaim_icq.c	2001/11/10 08:02:39	1.20
+++ gaim_icq.c	2001/11/20 01:01:21	1.21
@@ -187,8 +187,11 @@
 
 static void icq_info_reply(icq_Link *link, unsigned long uin, const char *nick,
 			const char *first, const char *last, const char *email, char auth) {
+	struct gaim_connection *gc = link->icq_UserData;
 	char buf[16 * 1024];
+	char who[16];
 
+	g_snprintf(who, sizeof who, "%lu", uin);
 	g_snprintf(buf, sizeof buf,
 		   "<B>UIN:</B> %lu<BR>"
 		   "<B>Nick:</B> %s<BR>"
@@ -198,7 +201,7 @@
 		   nick,
 		   first, last,
 		   email);
-	g_show_info_text(buf, NULL);
+	g_show_info_text(gc, who, FALSE, buf, NULL);
 }
 
 static void icq_web_pager(icq_Link *link, unsigned char hour, unsigned char minute,

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.15,1.16

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

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

Modified Files:
	yahoo.c 
Log Message:
isback?


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- yahoo.c	2001/11/19 22:25:40	1.15
+++ yahoo.c	2001/11/19 23:32:04	1.16
@@ -967,6 +967,7 @@
 {
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	struct yahoo_packet *pkt;
+	int service;
 	char s[4];
 
 	gc->away = NULL;
@@ -1013,7 +1014,11 @@
 		yd->current_status = YAHOO_STATUS_AVAILABLE;
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_ISAWAY, yd->current_status, 0);
+	if (yd->current_status == YAHOO_STATUS_AVAILABLE)
+		service = YAHOO_SERVICE_ISBACK;
+	else
+		service = YAHOO_SERVICE_ISAWAY;
+	pkt = yahoo_packet_new(service, yd->current_status, 0);
 	g_snprintf(s, sizeof(s), "%d", yd->current_status);
 	yahoo_packet_hash(pkt, 10, s);
 	if (yd->current_status == YAHOO_STATUS_CUSTOM)

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.14,1.15

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

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

Modified Files:
	yahoo.c 
Log Message:
maybe this is better?


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- yahoo.c	2001/11/17 22:50:08	1.14
+++ yahoo.c	2001/11/19 22:25:40	1.15
@@ -398,6 +398,34 @@
 			buddy->msg = msg ? g_strdup(msg) : NULL;
 			yd->login = g_slist_append(yd->login, buddy);
 			break;
+		case 60: /* uh */
+			while (yd->login) {
+				buddy = yd->login->data;
+				state = buddy->state;
+				yd->login = g_slist_remove(yd->login, buddy);
+				if (state == YAHOO_STATUS_AVAILABLE)
+					serv_got_update(gc, buddy->name, 1, 0, 0, 0, 0, 0);
+				else if (state == YAHOO_STATUS_IDLE)
+					serv_got_update(gc, buddy->name, 1, 0, 0, time(NULL) - 600,
+							(state << 1), 0);
+				else
+					serv_got_update(gc, buddy->name, 1, 0, 0, 0,
+							(state << 1) | UC_UNAVAILABLE, 0);
+				if (state == YAHOO_STATUS_CUSTOM) {
+					gpointer val = g_hash_table_lookup(yd->hash, buddy->name);
+					if (val) {
+						g_free(val);
+						g_hash_table_insert(yd->hash, buddy->name,
+								    g_strdup(buddy->msg));
+					} else
+						g_hash_table_insert(yd->hash, g_strdup(buddy->name),
+								    g_strdup(buddy->msg));
+				}
+				g_free(buddy->msg);
+				g_free(buddy->name);
+				g_free(buddy);
+			}
+			break;
 		default:
 			debug_printf("unknown login key %d\n", pair->key);
 			break;
@@ -641,6 +669,7 @@
 	case YAHOO_SERVICE_LOGON:
 		yahoo_process_logon(gc, pkt);
 		break;
+	case YAHOO_SERVICE_LOGOFF:
 	case YAHOO_SERVICE_ISAWAY:
 	case YAHOO_SERVICE_ISBACK:
 		yahoo_process_status(gc, pkt);

[Gaim-commits] CVS: gaim autogen.sh,1.12,1.13

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

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

Modified Files:
	autogen.sh 
Log Message:
hm.


Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- autogen.sh	2001/11/19 04:35:39	1.12
+++ autogen.sh	2001/11/19 19:43:07	1.13
@@ -45,7 +45,7 @@
 
 aclocal -I m4 $ACLOCAL_FLAGS || exit;
 autoheader || exit;
-automake --add-missing --copy || exit;
+automake --add-missing --copy;
 autoconf || exit;
 automake || exit;
 ./configure $@

[Gaim-commits] CVS: gaim ChangeLog,1.356,1.357

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

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

Modified Files:
	ChangeLog 
Log Message:
hi


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -d -r1.356 -r1.357
--- ChangeLog	2001/11/18 04:20:05	1.356
+++ ChangeLog	2001/11/19 16:56:57	1.357
@@ -3,6 +3,7 @@
 version 0.49:
 	* Can compile against GTK+ 2.0 (version 1.3.10)
 	* Confirm before removing buddies
+	* Updated Russian translation (thanks Grigory Bakunov)
 
 version 0.48 (11/18/2001):
 	* Right-click on links to open/copy URL

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.69,1.70

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

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

Modified Files:
	oscar.c 
Log Message:
you can change your registered email address


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- oscar.c	2001/11/19 11:19:52	1.69
+++ oscar.c	2001/11/19 16:37:32	1.70
@@ -87,6 +87,8 @@
 
 	gboolean conf;
 	gboolean reqemail;
+	gboolean setemail;
+	char *email;
 	gboolean chpass;
 	char *oldp;
 	char *newp;
@@ -243,6 +245,7 @@
 static int gaim_offlinemsg       (aim_session_t *, aim_frame_t *, ...);
 static int gaim_offlinemsgdone   (aim_session_t *, aim_frame_t *, ...);
 static int gaim_simpleinfo       (aim_session_t *, aim_frame_t *, ...);
+static int gaim_popup            (aim_session_t *, aim_frame_t *, ...);
 
 static int gaim_directim_initiate(aim_session_t *, aim_frame_t *, ...);
 static int gaim_directim_incoming(aim_session_t *, aim_frame_t *, ...);
@@ -519,6 +522,8 @@
 	}
 	if (odata->create_name)
 		g_free(odata->create_name);
+	if (odata->email)
+		g_free(odata->email);
 	if (odata->newp)
 		g_free(odata->newp);
 	if (odata->oldp)
@@ -658,6 +663,7 @@
 	aim_conn_addhandler(sess, bosconn, 0x0001, 0x000f, gaim_selfinfo, 0);
 	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSG, gaim_offlinemsg, 0);
 	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_OFFLINEMSGCOMPLETE, gaim_offlinemsgdone, 0);
+	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_POP, 0x0002, gaim_popup, 0);
 	aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_ICQ, AIM_CB_ICQ_SIMPLEINFO, gaim_simpleinfo, 0);
 
 	((struct oscar_data *)gc->proto_data)->conn = bosconn;
@@ -1927,7 +1933,9 @@
 		debug_printf("changing password\n");
 		aim_admin_changepasswd(sess, fr->conn, od->newp, od->oldp);
 		g_free(od->oldp);
+		od->oldp = NULL;
 		g_free(od->newp);
+		od->newp = NULL;
 		od->chpass = FALSE;
 	}
 	if (od->conf) {
@@ -1940,6 +1948,12 @@
 		aim_admin_getinfo(sess, fr->conn, 0x0011);
 		od->reqemail = FALSE;
 	}
+	if (od->setemail) {
+		debug_printf("setting email\n");
+		aim_admin_setemail(sess, fr->conn, od->email);
+		g_free(od->email);
+		od->setemail = FALSE;
+	}
 
 	return 1;
 }
@@ -2056,6 +2070,25 @@
 	return 1;
 }
 
+static int gaim_popup(aim_session_t *sess, aim_frame_t *fr, ...)
+{
+	char *msg, *url;
+	fu16_t wid, hei, delay;
+	va_list ap;
+
+	va_start(ap, fr);
+	msg = va_arg(ap, char *);
+	url = va_arg(ap, char *);
+	wid = (fu16_t)va_arg(ap, int);
+	hei = (fu16_t)va_arg(ap, int);
+	delay = (fu16_t)va_arg(ap, int);
+	va_end(ap);
+
+	serv_got_popup(msg, url, wid, hei);
+
+	return 1;
+}
+
 static int gaim_parse_searchreply(aim_session_t *sess, aim_frame_t *fr, ...) {
 	va_list ap;
 	char *address, *SNs;
@@ -2771,6 +2804,20 @@
 	return m;
 }
 
+static void oscar_change_email(struct gaim_connection *gc, char *email)
+{
+	struct oscar_data *od = gc->proto_data;
+	aim_conn_t *conn = aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH);
+
+	if (conn) {
+		aim_admin_setemail(od->sess, conn, email);
+	} else {
+		od->setemail = TRUE;
+		od->email = g_strdup(email);
+		aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_AUTH);
+	}
+}
+
 static void oscar_do_action(struct gaim_connection *gc, char *act)
 {
 	struct oscar_data *od = gc->proto_data;
@@ -2786,13 +2833,14 @@
 			aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_AUTH);
 		} else
 			aim_admin_reqconfirm(od->sess, conn);
-	} else if (!strcmp(act, "Change Email")) {
 	} else if (!strcmp(act, "Display Current Registered Address")) {
 		if (!conn) {
 			od->reqemail = TRUE;
 			aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_AUTH);
 		} else
 			aim_admin_getinfo(od->sess, conn, 0x11);
+	} else if (!strcmp(act, "Change Current Registered Address")) {
+		do_prompt_dialog("Change Address To: ", NULL, gc, oscar_change_email, NULL);
 	} else if (!strcmp(act, "Search for Buddy by Email")) {
 		show_find_email(gc);
 	}
@@ -2806,10 +2854,8 @@
 	m = g_list_append(m, NULL);
 	m = g_list_append(m, "Change Password");
 	m = g_list_append(m, "Confirm Account");
-	/*
-	m = g_list_append(m, "Change Email");
-	*/
 	m = g_list_append(m, "Display Current Registered Address");
+	m = g_list_append(m, "Change Current Registered Address");
 	m = g_list_append(m, NULL);
 	m = g_list_append(m, "Search for Buddy by Email");
 

[Gaim-commits] CVS: gaim/src gaim.h,1.294,1.295 server.c,1.209,1.210

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

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

Modified Files:
	gaim.h server.c 
Log Message:
you can change your registered email address


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- gaim.h	2001/11/18 05:37:35	1.294
+++ gaim.h	2001/11/19 16:37:32	1.295
@@ -383,6 +383,7 @@
 extern void serv_chat_leave(struct gaim_connection *, int);
 extern void serv_chat_whisper(struct gaim_connection *, int, char *, char *);
 extern int  serv_chat_send(struct gaim_connection *, int, char *);
+extern void serv_got_popup(char *, char *, int, int);
 
 /* Functions in util.c */
 extern char *normalize(const char *);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- server.c	2001/11/19 11:19:52	1.209
+++ server.c	2001/11/19 16:37:32	1.210
@@ -31,6 +31,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <errno.h>
+#include "gtkimhtml.h"
 #include "prpl.h"
 #include "multi.h"
 #include "gaim.h"
@@ -40,6 +41,7 @@
 
 #include "pixmaps/ok.xpm"
 #include "pixmaps/cancel.xpm"
+#include "pixmaps/tb_search.xpm"
 
 void serv_login(struct aim_user *user)
 {
@@ -949,4 +951,61 @@
 
 	chat_write(b, who, w, buf, mtime);
 	g_free(buf);
+}
+
+static void des_popup(GtkWidget *w, GtkWidget *window)
+{
+	if (w == window) {
+		char *u = gtk_object_get_user_data(GTK_OBJECT(window));
+		g_free(u);
+	}
+	gtk_widget_destroy(window);
+}
+
+void serv_got_popup(char *msg, char *u, int wid, int hei)
+{
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *sw;
+	GtkWidget *text;
+	GtkWidget *hbox;
+	GtkWidget *button;
+	char *url = g_strdup(u);
+
+	GAIM_DIALOG(window);
+	gtk_window_set_wmclass(GTK_WINDOW(window), "popup", "Gaim");
+	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, TRUE);
+	gtk_window_set_title(GTK_WINDOW(window), "Gaim - Popup");
+	gtk_container_set_border_width(GTK_CONTAINER(window), 5);
+	gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_popup), window);
+	gtk_object_set_user_data(GTK_OBJECT(window), url);
+	gtk_widget_realize(window);
+	aol_icon(window->window);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(window), vbox);
+
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_widget_set_usize(sw, wid, hei);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
+
+	text = gtk_imhtml_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(sw), text);
+	gaim_setup_imhtml(text);
+
+	hbox = gtk_hbox_new(FALSE, 5);
+	gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+
+	button = picture_button(window, _("Close"), cancel_xpm);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(des_popup), window);
+
+	button = picture_button(window, _("More Info"), tb_search_xpm);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(open_url_nw), url);
+
+	gtk_widget_show_all(window);
+
+	gtk_imhtml_append_text(GTK_IMHTML(text), msg, GTK_IMHTML_NO_NEWLINE);
 }

[Gaim-commits] CVS: gaim/src conversation.c,1.301,1.302

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

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

Modified Files:
	conversation.c 
Log Message:
hi.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- conversation.c	2001/11/19 12:03:37	1.301
+++ conversation.c	2001/11/19 15:25:36	1.302
@@ -2775,7 +2775,7 @@
 		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(stop_anim), c);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
-	} else if (c->anim) {
+	} else if (c->anim && (gdk_pixbuf_animation_get_num_frames(c->anim) > 1)) {
 		button = gtk_menu_item_new_with_label(_("Enable Animation"));
 		gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(start_anim), c);
 		gtk_menu_append(GTK_MENU(menu), button);