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

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

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

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

Modified Files:
	yay.c 
Log Message:
fun stuff.


Index: yay.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yay.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- yay.c	2001/10/15 15:48:25	1.19
+++ yay.c	2001/10/18 20:56:59	1.20
@@ -199,7 +199,7 @@
 	count = va_arg(ap, int);
 	va_end(ap);
 
-	connection_has_mail(gc, count, NULL, NULL);
+	connection_has_mail(gc, count, NULL, NULL, "http://mail.yahoo.com/");
 
 	return 1;
 }
@@ -644,7 +644,7 @@
 
 static void yahoo_do_action(struct gaim_connection *gc, char *act) {
 	if (!strcmp(act, "Activate ID")) {
-		do_prompt_dialog("Activate which ID:", gc, yahoo_act_id, NULL);
+		do_prompt_dialog("Activate which ID:", gc->displayname, gc, yahoo_act_id, NULL);
 	}
 }
 

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

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

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

Modified Files:
	msn.c 
Log Message:
fun stuff.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- msn.c	2001/10/14 11:36:36	1.23
+++ msn.c	2001/10/18 20:56:59	1.24
@@ -20,6 +20,8 @@
 			"User-Agent: Gaim/" VERSION "\r\n" \
 			"X-MMS-IM-Format: FN=MS%20Sans%20Serif; EF=; CO=0; PF=0\r\n\r\n"
 
+#define HOTMAIL_URL "http://www.hotmail.com/cgi-bin/folders"
+
 #define MSN_ONLINE  1
 #define MSN_BUSY    2
 #define MSN_IDLE    3
@@ -269,20 +271,20 @@
 		char *x = strstr(data, "Inbox-Unread:");
 		if (!x) return;
 		x += strlen("Inbox-Unread: ");
-		connection_has_mail(gc, atoi(x), NULL, NULL);
+		connection_has_mail(gc, atoi(x), NULL, NULL, HOTMAIL_URL);
 	} else if (strstr(data, "Content-Type: text/x-msmsgsemailnotification;")) {
 		char *from = strstr(data, "From:");
 		char *subject = strstr(data, "Subject:");
 		char *x;
 		if (!from || !subject) {
-			connection_has_mail(gc, 1, NULL, NULL);
+			connection_has_mail(gc, 1, NULL, NULL, HOTMAIL_URL);
 			return;
 		}
 		from += strlen("From: ");
 		x = strstr(from, "\r\n"); *x = 0;
 		subject += strlen("Subject: ");
 		x = strstr(subject, "\r\n"); *x = 0;
-		connection_has_mail(gc, -1, from, subject);
+		connection_has_mail(gc, -1, from, subject, HOTMAIL_URL);
 	}
 }
 
@@ -831,6 +833,7 @@
 		serv_got_update(gc, user, 1, 0, 0, 0, status, 0);
 	} else if (!g_strncasecmp(buf, "OUT", 3)) {
 	} else if (!g_strncasecmp(buf, "PRP", 3)) {
+	} else if (!g_strncasecmp(buf, "QNG", 3)) {
 	} else if (!g_strncasecmp(buf, "QRY", 3)) {
 	} else if (!g_strncasecmp(buf, "REA", 3)) {
 		char *friend, *tmp = buf;
@@ -1438,7 +1441,7 @@
 static void msn_do_action(struct gaim_connection *gc, char *act)
 {
 	if (!strcmp(act, "Set Friendly Name")) {
-		do_prompt_dialog("Set Friendly Name:", gc, msn_act_id, NULL);
+		do_prompt_dialog("Set Friendly Name:", gc->displayname, gc, msn_act_id, NULL);
 	}
 }
 

[Gaim-commits] CVS: gaim/src about.c,1.52,1.53 conversation.c,1.282,1.283 core.c,1.14,1.15 gtkimhtml.c,1.54,1.55 html.c,1.21,1.22 prpl.c,1.38,1.39 prpl.h,1.51,1.52

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

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

Modified Files:
	about.c conversation.c core.c gtkimhtml.c html.c prpl.c prpl.h 
Log Message:
fun stuff.


Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- about.c	2001/10/18 07:29:13	1.52
+++ about.c	2001/10/18 20:56:59	1.53
@@ -134,8 +134,8 @@
 
 		text = gtk_text_new(NULL, NULL);
 		gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
-				_("Rob Flynn (maintainer)               ro...@ma...\nEric Warmenhoven (lead coder)  war...@ya...\n\nBenjamin Miller\nDecklin Foster\nJim Duchek\nMark Spencer (original author)   mar...@ma..."),
-				198);
+				_("Rob Flynn (maintainer)               ro...@ma...\nEric Warmenhoven (lead coder)  war...@ya...\n\nBenjamin Miller\nDecklin Foster\nSean Egan\nJim Duchek\nMark Spencer (original author)   mar...@ma..."),
+				208);
 		gtk_box_pack_start(GTK_BOX(fbox), text, TRUE, TRUE, 0);
 		gtk_widget_show(text);
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- conversation.c	2001/10/17 01:33:00	1.282
+++ conversation.c	2001/10/18 20:56:59	1.283
@@ -2118,7 +2118,6 @@
 	GtkWidget *toolbar;
 	GtkWidget *hbox;
 	GtkWidget *label;
-	GtkStyle *style;
 	int dispstyle = set_dispstyle(0);
 
 	c->font_dialog = NULL;
@@ -2322,10 +2321,6 @@
 	gtk_widget_show(send);
 
 	update_buttons_by_protocol(c);
-
-	style = gtk_widget_get_style(GTK_WIDGET(entry));
-	gtk_imhtml_set_defaults(GTK_IMHTML(text), 0, &style->fg[GTK_STATE_NORMAL],
-				&style->base[GTK_STATE_NORMAL]);
 
 	gtk_widget_show(win);
 }

Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- core.c	2001/10/14 19:43:25	1.14
+++ core.c	2001/10/18 20:56:59	1.15
@@ -277,7 +277,7 @@
 	}
 }
 
-static gint gaim_recv(GIOChannel *source, void *buf, gint len)
+static gint gaim_recv(GIOChannel *source, guchar *buf, gint len)
 {
 	gint total = 0;
 	gint cur;
@@ -322,7 +322,7 @@
 		return FALSE;
 	}
 
-	if (gaim_recv(source, &len, sizeof(len)) != sizeof(len)) {
+	if (gaim_recv(source, (guchar *)&len, sizeof(len)) != sizeof(len)) {
 		debug_printf("UI has abandoned us!\n");
 		uis = g_slist_remove(uis, ui);
 		g_io_channel_close(ui->channel);

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gtkimhtml.c	2001/09/26 22:23:59	1.54
+++ gtkimhtml.c	2001/10/18 20:56:59	1.55
@@ -19,6 +19,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "gtkimhtml.h"
 #include <X11/Xlib.h>
 #include <gdk/gdkx.h>
@@ -27,6 +30,10 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <math.h>
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#include <locale.h>
+#endif
 
 #include "pixmaps/angel.xpm"
 #include "pixmaps/bigsmile.xpm"
@@ -79,6 +86,21 @@
 	gchar **image;
 };
 
+static gchar* getcharset()
+{
+	static gchar charset[64];
+#ifdef HAVE_LANGINFO_CODESET
+	gchar *ch = nl_langinfo(CODESET);
+	if (strncasecmp(ch, "iso-", 4) == 0)
+		g_snprintf(charset, sizeof(charset), "iso%s", ch + 4);
+	else
+		g_snprintf(charset, sizeof(charset), ch);
+#else
+	g_snprintf(charset, sizeof(charset), "iso8859-*");
+#endif
+	return charset;
+}
+
 static GtkSmileyTree*
 gtk_smiley_tree_new ()
 {
@@ -348,9 +370,12 @@
 	}
 	imhtml->tip_bit = NULL;
 
-	gdk_font_unref (imhtml->default_font);
-	gdk_color_free (imhtml->default_fg_color);
-	gdk_color_free (imhtml->default_bg_color);
+	if (imhtml->default_font)
+		gdk_font_unref (imhtml->default_font);
+	if (imhtml->default_fg_color)
+		gdk_color_free (imhtml->default_fg_color);
+	if (imhtml->default_bg_color)
+		gdk_color_free (imhtml->default_bg_color);
 
 	gdk_cursor_destroy (imhtml->hand_cursor);
 	gdk_cursor_destroy (imhtml->arrow_cursor);
@@ -406,10 +431,15 @@
 
 	gdk_window_set_cursor (widget->window, imhtml->arrow_cursor);
 
+	imhtml->default_font = gdk_font_ref (GTK_WIDGET (imhtml)->style->font);
+
 	gdk_window_set_background (widget->window, &widget->style->base [GTK_STATE_NORMAL]);
 	gdk_window_set_background (GTK_LAYOUT (imhtml)->bin_window,
 				   &widget->style->base [GTK_STATE_NORMAL]);
 
+	imhtml->default_fg_color = gdk_color_copy (&GTK_WIDGET (imhtml)->style->fg [GTK_STATE_NORMAL]);
+	imhtml->default_bg_color = gdk_color_copy (&GTK_WIDGET (imhtml)->style->base [GTK_STATE_NORMAL]);
+
 	gdk_window_show (GTK_LAYOUT (imhtml)->bin_window);
 }
 
@@ -1781,53 +1811,60 @@
 		return gdk_fontset_load ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*,*");
 	}
 
-	g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-%d-*-*-*-*-iso8859-*",
+	g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-%d-*-*-*-*-%s",
 		    choice,
 		    bold ? "bold" : "medium",
 		    italics ? 'i' : 'r',
-		    size);
+		    size,
+		    getcharset());
 	font = gdk_font_load (buf);
 
 	if (!font && italics) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-%d-*-*-*-*-iso8859-*",
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-%d-*-*-*-*-%s",
 			    choice,
 			    bold ? "bold" : "medium",
-			    size);
+			    size,
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
 	if (!font) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-*-*-*-*-*-iso8859-*",
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-*-*-*-*-*-%s",
 			    choice,
 			    bold ? "bold" : "medium",
-			    italics ? 'i' : 'r');
+			    italics ? 'i' : 'r',
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
 	if (!font && italics) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-*-*-*-*-*-iso8859-*",
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-*-*-*-*-*-%s",
 			    choice,
-			    bold ? "bold" : "medium");
+			    bold ? "bold" : "medium",
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
 	if (!font) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-iso8859-*",
+		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-%s",
 			    choice,
-			    italics ? 'i' : 'r');
+			    italics ? 'i' : 'r',
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
 	if (!font) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-iso8859-*",
+		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-%s",
 			    choice,
-			    italics ? 'o' : '*');
+			    italics ? 'o' : '*',
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
 	if (!font && italics) {
-		g_snprintf (buf, sizeof (buf), "-*-%s-*-*-*-*-*-*-*-*-*-*-iso8859-*",
-			    choice);
+		g_snprintf (buf, sizeof (buf), "-*-%s-*-*-*-*-*-*-*-*-*-*-%s",
+			    choice,
+			    getcharset());
 		font = gdk_font_load (buf);
 	}
 
@@ -1914,9 +1951,7 @@
 		{ "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }
 	};
 
-	imhtml->default_font = gdk_font_ref (GTK_WIDGET (imhtml)->style->font);
-	imhtml->default_fg_color = gdk_color_copy (&GTK_WIDGET (imhtml)->style->fg [GTK_STATE_NORMAL]);
-	imhtml->default_bg_color = gdk_color_copy (&GTK_WIDGET (imhtml)->style->base [GTK_STATE_NORMAL]);
+	imhtml->default_font = gtk_imhtml_font_load (imhtml, DEFAULT_FONT_NAME, FALSE, FALSE, 0);
 	imhtml->hand_cursor = gdk_cursor_new (GDK_HAND2);
 	imhtml->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
 

Index: html.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/html.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- html.c	2001/10/03 09:48:33	1.21
+++ html.c	2001/10/18 20:56:59	1.22
@@ -74,9 +74,9 @@
 	return text2;
 }
 
-static struct g_url parse_url(char *url)
+static struct g_url *parse_url(char *url)
 {
-	struct g_url test;
+	struct g_url *test = g_new0(struct g_url, 1);
 	char scan_info[255];
 	char port[5];
 	int f;
@@ -87,7 +87,7 @@
 	else
 		g_snprintf(scan_info, sizeof(scan_info),
 			   "%%[A-Za-z0-9.]:%%[0-9]/%%[A-Za-z0-9.~_-/&%%?=+^]");
-	f = sscanf(url, scan_info, test.address, port, test.page);
+	f = sscanf(url, scan_info, test->address, port, test->page);
 	if (f == 1) {
 		if (strstr(url, "http://"))
 			g_snprintf(scan_info, sizeof(scan_info),
@@ -95,8 +95,8 @@
 		else
 			g_snprintf(scan_info, sizeof(scan_info),
 				   "%%[A-Za-z0-9.]/%%[A-Za-z0-9.~_-/&%%?=+^]");
-		f = sscanf(url, scan_info, test.address, test.page);
-		g_snprintf(port, sizeof(test.port), "80");
+		f = sscanf(url, scan_info, test->address, test->page);
+		g_snprintf(port, sizeof(test->port), "80");
 		port[2] = 0;
 	}
 	if (f == 1) {
@@ -104,18 +104,18 @@
 			g_snprintf(scan_info, sizeof(scan_info), "http://%%[A-Za-z0-9.]");
 		else
 			g_snprintf(scan_info, sizeof(scan_info), "%%[A-Za-z0-9.]");
-		f = sscanf(url, scan_info, test.address);
-		g_snprintf(test.page, sizeof(test.page), "%c", '\0');
+		f = sscanf(url, scan_info, test->address);
+		g_snprintf(test->page, sizeof(test->page), "%c", '\0');
 	}
 
-	sscanf(port, "%d", &test.port);
+	sscanf(port, "%d", &test->port);
 	return test;
 }
 
 struct grab_url_data {
 	void (*callback)(gpointer, char *);
 	gpointer data;
-	struct g_url website;
+	struct g_url *website;
 	char *url;
 
 	int inpa;
@@ -133,6 +133,7 @@
 
 	if (sock == -1) {
 		gunk->callback(gunk->data, NULL);
+		g_free(gunk->website);
 		g_free(gunk->url);
 		g_free(gunk);
 		return;
@@ -140,7 +141,7 @@
 
 	if (!gunk->sentreq) {
 		char buf[256];
-		g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\r\n\r\n", gunk->website.page);
+		g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\r\n\r\n", gunk->website->page);
 		debug_printf("Request: %s\n", buf);
 		write(sock, buf, strlen(buf));
 		fcntl(sock, F_SETFL, O_NONBLOCK);
@@ -178,6 +179,7 @@
 		gunk->callback(gunk->data, gunk->webdata);
 		if (gunk->webdata)
 			g_free(gunk->webdata);
+		g_free(gunk->website);
 		g_free(gunk->url);
 		g_free(gunk);
 	} else {
@@ -186,6 +188,7 @@
 		gunk->callback(gunk->data, NULL);
 		if (gunk->webdata)
 			g_free(gunk->webdata);
+		g_free(gunk->website);
 		g_free(gunk->url);
 		g_free(gunk);
 	}
@@ -201,8 +204,9 @@
 	gunk->url = g_strdup(url);
 	gunk->website = parse_url(url);
 
-	if ((sock = proxy_connect(gunk->website.address, gunk->website.port,
+	if ((sock = proxy_connect(gunk->website->address, gunk->website->port,
 				  grab_url_callback, gunk)) < 0) {
+		g_free(gunk->website);
 		g_free(gunk->url);
 		g_free(gunk);
 		callback(data, g_strdup(_("g003: Error opening connection.\n")));

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- prpl.c	2001/10/04 23:10:51	1.38
+++ prpl.c	2001/10/18 20:56:59	1.39
@@ -27,6 +27,7 @@
 
 #include "pixmaps/ok.xpm"
 #include "pixmaps/cancel.xpm"
+#include "pixmaps/tb_forward.xpm"
 
 GSList *protocols = NULL;
 
@@ -176,7 +177,7 @@
 	gtk_widget_destroy(p->window);
 }
 
-void do_prompt_dialog(const char *text, void *data, void *doit, void *dont)
+void do_prompt_dialog(const char *text, const char *def, void *data, void *doit, void *dont)
 {
 	GtkWidget *window;
 	GtkWidget *vbox;
@@ -212,6 +213,8 @@
 
 	entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
+	if (def)
+		gtk_entry_set_text(GTK_ENTRY(entry), text);
 	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(act_prompt), p);
 	p->entry = entry;
 
@@ -346,6 +349,7 @@
 	struct gaim_connection *gc;
 	GtkWidget *email_win;
 	GtkWidget *email_label;
+	char *url;
 };
 GSList *mailnots = NULL;
 
@@ -368,11 +372,18 @@
 	}
 	debug_printf("removing mail notification\n");
 	mailnots = g_slist_remove(mailnots, mn);
+	if (mn->url)
+		g_free(mn->url);
 	g_free(mn);
 }
 
-void connection_has_mail(struct gaim_connection *gc, int count, const char *from, const char *subject)
+void connection_has_mail(struct gaim_connection *gc, int count, const char *from, const char *subject, const char *url)
 {
+	GtkWidget *hbox;
+	GtkWidget *vbox;
+	GtkWidget *urlbut;
+	GtkWidget *close;
+
 	struct mail_notify *mn;
 	char buf[2048];
 
@@ -387,65 +398,55 @@
 
 	if (count < 0 && from && subject) {
 		g_snprintf(buf, sizeof buf, "%s has mail from %s: %s", gc->username, from, subject);
-		if (!mn->email_win) {
-			GtkWidget *close;
+	} else if (count) {
+		g_snprintf(buf, sizeof buf, "%s has %d new message%s.",
+			   gc->username, count, count == 1 ? "" : "s");
+	} else if (mn->email_win) {
+		gtk_widget_destroy(mn->email_win);
+		return;
+	}
 
-			mn->email_win = gtk_dialog_new();
-			gtk_window_set_policy(GTK_WINDOW(mn->email_win), 0, 0, 1);
-			gtk_container_set_border_width(GTK_CONTAINER(mn->email_win), 5);
-			gtk_window_set_title(GTK_WINDOW(mn->email_win), "New Mail");
-			gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy",
-					   GTK_SIGNAL_FUNC(des_email_win), mn);
-			gtk_widget_realize(mn->email_win);
-			aol_icon(mn->email_win->window);
+	if (mn->email_win) {
+		gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
+		return;
+	}
 
-			mn->email_label = gtk_label_new(buf);
-			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mn->email_win)->vbox),
-					   mn->email_label, 0, 0, 5);
-			gtk_widget_show(mn->email_label);
 
-			close = picture_button(mn->email_win, _("Close"), cancel_xpm);
-			gtk_window_set_focus(GTK_WINDOW(mn->email_win), close);
-			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mn->email_win)->action_area),
-					   close, 0, 0, 5);
-			gtk_signal_connect(GTK_OBJECT(close), "clicked",                      
-					   GTK_SIGNAL_FUNC(des_email_win), mn);
+	mn->email_win = gtk_window_new(GTK_WINDOW_DIALOG);
+	gtk_window_set_wmclass(GTK_WINDOW(mn->email_win), "mail", "Gaim");
+	gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE);
+	gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail"));
+	gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy", GTK_SIGNAL_FUNC(des_email_win), mn);
+	gtk_widget_realize(mn->email_win);
+	aol_icon(mn->email_win->window);
 
-			gtk_widget_show(mn->email_win);
-		}
-		gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
-	} else if (count) {
-		g_snprintf(buf, sizeof buf, "%s has %d new message%s.",
-			   gc->username, count, count == 1 ? "" : "s");
-		if (!mn->email_win) {
-			GtkWidget *close;
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
+	gtk_container_add(GTK_CONTAINER(mn->email_win), vbox);
+	gtk_widget_show(vbox);
 
-			mn->email_win = gtk_dialog_new();
-			gtk_window_set_policy(GTK_WINDOW(mn->email_win), 0, 0, 1);
-			gtk_container_set_border_width(GTK_CONTAINER(mn->email_win), 5);
-			gtk_window_set_title(GTK_WINDOW(mn->email_win), "New Mail");
-			gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy",
-					   GTK_SIGNAL_FUNC(des_email_win), mn);
-			gtk_widget_realize(mn->email_win);
-			aol_icon(mn->email_win->window);
+	mn->email_label = gtk_label_new(buf);
+	gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
+	gtk_box_pack_start(GTK_BOX(vbox), mn->email_label, 0, 0, 5);
+	gtk_widget_show(mn->email_label);
 
-			mn->email_label = gtk_label_new(buf);
-			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mn->email_win)->vbox),
-					   mn->email_label, 0, 0, 5);
-			gtk_widget_show(mn->email_label);
+	hbox = gtk_hbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	gtk_widget_show(hbox);
 
-			close = picture_button(mn->email_win, _("Close"), cancel_xpm);
-			gtk_window_set_focus(GTK_WINDOW(mn->email_win), close);
-			gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mn->email_win)->action_area),
-					   close, 0, 0, 5);
-			gtk_signal_connect(GTK_OBJECT(close), "clicked",                      
-					   GTK_SIGNAL_FUNC(des_email_win), mn);
+	close = picture_button(mn->email_win, _("Close"), cancel_xpm);
+	gtk_window_set_focus(GTK_WINDOW(mn->email_win), close);
+	gtk_box_pack_end(GTK_BOX(hbox), close, 0, 0, 5);
+	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn);
 
-			gtk_widget_show(mn->email_win);
-		}
-		gtk_label_set_text(GTK_LABEL(mn->email_label), buf);
-	} else if (mn->email_win)
-		gtk_widget_destroy(mn->email_win);
+	if (url) {
+		mn->url = g_strdup(url);
+		urlbut = picture_button(mn->email_win, _("Open Mail"), tb_forward_xpm);
+		gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5);
+		gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(open_url_nw), mn->url);
+	}
+
+	gtk_widget_show(mn->email_win);
 }
 
 struct icon_data {

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- prpl.h	2001/10/14 11:36:36	1.51
+++ prpl.h	2001/10/18 20:56:59	1.52
@@ -161,9 +161,9 @@
 extern void do_proto_menu();
 
 extern void do_ask_dialog(const char *, void *, void *, void *);
-extern void do_prompt_dialog(const char *, void *, void *, void *);
+extern void do_prompt_dialog(const char *, const char *, void *, void *, void *);
 
-extern void connection_has_mail(struct gaim_connection *, int, const char *, const char *);
+extern void connection_has_mail(struct gaim_connection *, int, const char *, const char *, const char *);
 
 extern void set_icon_data(struct gaim_connection *, char *, void *, int);
 extern void *get_icon_data(struct gaim_connection *, char *, int *);

[Gaim-commits] CVS: gaim/src/protocols/gg iconv_string.c,NONE,1.1 iconv_string.h,NONE,1.1 .cvsignore,1.1,1.2 Makefile.am,1.1,1.2 gg.c,1.4,1.5

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

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

Modified Files:
	.cvsignore Makefile.am gg.c 
Added Files:
	iconv_string.c iconv_string.h 
Log Message:
fun stuff.


--- NEW FILE: iconv_string.c ---
/* Copyright (C) 1999-2001 Bruno Haible.
   This file is not part of the GNU LIBICONV Library.
   This file is put into the public domain.  */

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#ifdef HAVE_ICONV
#include "iconv_string.h"
#include <iconv.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>

#define tmpbufsize 4096

int iconv_string (const char* tocode, const char* fromcode,
                  const char* start, const char* end,
                  char** resultp, size_t* lengthp)
{
  iconv_t cd = iconv_open(tocode,fromcode);
  size_t length;
  char* result;
  if (cd == (iconv_t)(-1)) {
    if (errno != EINVAL)
      return -1;
    /* Unsupported fromcode or tocode. Check whether the caller requested
       autodetection. */
    if (!strcmp(fromcode,"autodetect_utf8")) {
      int ret;
      /* Try UTF-8 first. There are very few ISO-8859-1 inputs that would
         be valid UTF-8, but many UTF-8 inputs are valid ISO-8859-1. */
      ret = iconv_string(tocode,"UTF-8",start,end,resultp,lengthp);
      if (!(ret < 0 && errno == EILSEQ))
        return ret;
      ret = iconv_string(tocode,"ISO-8859-1",start,end,resultp,lengthp);
      return ret;
    }
    if (!strcmp(fromcode,"autodetect_jp")) {
      int ret;
      /* Try 7-bit encoding first. If the input contains bytes >= 0x80,
         it will fail. */
      ret = iconv_string(tocode,"ISO-2022-JP-2",start,end,resultp,lengthp);
      if (!(ret < 0 && errno == EILSEQ))
        return ret;
      /* Try EUC-JP next. Short SHIFT_JIS inputs may come out wrong. This
         is unavoidable. People will condemn SHIFT_JIS.
         If we tried SHIFT_JIS first, then some short EUC-JP inputs would
         come out wrong, and people would condemn EUC-JP and Unix, which
         would not be good. */
      ret = iconv_string(tocode,"EUC-JP",start,end,resultp,lengthp);
      if (!(ret < 0 && errno == EILSEQ))
        return ret;
      /* Finally try SHIFT_JIS. */
      ret = iconv_string(tocode,"SHIFT_JIS",start,end,resultp,lengthp);
      return ret;
    }
    if (!strcmp(fromcode,"autodetect_kr")) {
      int ret;
      /* Try 7-bit encoding first. If the input contains bytes >= 0x80,
         it will fail. */
      ret = iconv_string(tocode,"ISO-2022-KR",start,end,resultp,lengthp);
      if (!(ret < 0 && errno == EILSEQ))
        return ret;
      /* Finally try EUC-KR. */
      ret = iconv_string(tocode,"EUC-KR",start,end,resultp,lengthp);
      return ret;
    }
    errno = EINVAL;
    return -1;
  }
  /* Determine the length we need. */
  {
    size_t count = 0;
    char tmpbuf[tmpbufsize];
    const char* inptr = start;
    size_t insize = end-start;
    while (insize > 0) {
      char* outptr = tmpbuf;
      size_t outsize = tmpbufsize;
      size_t res = iconv(cd,&inptr,&insize,&outptr,&outsize);
      if (res == (size_t)(-1)) {
        if (errno == EINVAL)
          break;
        else {
          int saved_errno = errno;
          iconv_close(cd);
          errno = saved_errno;
          return -1;
        }
      }
      count += outptr-tmpbuf;
    }
    {
      char* outptr = tmpbuf;
      size_t outsize = tmpbufsize;
      size_t res = iconv(cd,NULL,NULL,&outptr,&outsize);
      if (res == (size_t)(-1)) {
        int saved_errno = errno;
        iconv_close(cd);
        errno = saved_errno;
        return -1;
      }
      count += outptr-tmpbuf;
    }
    length = count;
  }
  if (lengthp != NULL)
    *lengthp = length;
  if (resultp == NULL) {
    iconv_close(cd);
    return 0;
  }
  result = (*resultp == NULL ? malloc(length) : realloc(*resultp,length));
  *resultp = result;
  if (length == 0) {
    iconv_close(cd);
    return 0;
  }
  if (result == NULL) {
    iconv_close(cd);
    errno = ENOMEM;
    return -1;
  }
  iconv(cd,NULL,NULL,NULL,NULL); /* return to the initial state */
  /* Do the conversion for real. */
  {
    const char* inptr = start;
    size_t insize = end-start;
    char* outptr = result;
    size_t outsize = length;
    while (insize > 0) {
      size_t res = iconv(cd,&inptr,&insize,&outptr,&outsize);
      if (res == (size_t)(-1)) {
        if (errno == EINVAL)
          break;
        else {
          int saved_errno = errno;
          iconv_close(cd);
          errno = saved_errno;
          return -1;
        }
      }
    }
    {
      size_t res = iconv(cd,NULL,NULL,&outptr,&outsize);
      if (res == (size_t)(-1)) {
        int saved_errno = errno;
        iconv_close(cd);
        errno = saved_errno;
        return -1;
      }
    }
    if (outsize != 0) abort();
  }
  iconv_close(cd);
  return 0;
}

#endif

--- NEW FILE: iconv_string.h ---
/* Copyright (C) 1999-2001 Bruno Haible.
   This file is not part of the GNU LIBICONV Library.
   This file is put into the public domain.  */

/*
 * This C function converts an entire string from one encoding to another,
 * using iconv. Easier to use than iconv() itself, and supports autodetect
 * encodings on input.
 *
 *   int iconv_string (const char* tocode, const char* fromcode,
 *                     const char* start, const char* end,
 *                     char** resultp, size_t* lengthp)
 *
 * Converts a memory region given in encoding FROMCODE to a new memory
 * region in encoding TOCODE. FROMCODE and TOCODE are as for iconv_open(3),
 * except that FROMCODE may be one of the values
 *    "autodetect_utf8"          supports ISO-8859-1 and UTF-8
 *    "autodetect_jp"            supports EUC-JP, ISO-2022-JP-2 and SHIFT_JIS
 *    "autodetect_kr"            supports EUC-KR and ISO-2022-KR
 * The input is in the memory region between start (inclusive) and end
 * (exclusive). If resultp is not NULL, the output string is stored in
 * *resultp; malloc/realloc is used to allocate the result.
 *
 * This function does not treat zero characters specially.
 *
 * Return value: 0 if successful, otherwise -1 and errno set. Particular
 * errno values: EILSEQ and ENOMEM.
 *
 * Example:
 *   const char* s = ...;
 *   char* result = NULL;
 *   if (iconv_string("UCS-4-INTERNAL", "autodetect_utf8",
 *                    s, s+strlen(s)+1, &result, NULL) < 0)
 *     perror("iconv_string");
 *
 */
#include <stddef.h>

#ifdef __cplusplus
extern "C" {
#endif

extern int iconv_string (const char* tocode, const char* fromcode, const char* start, const char* end, char** resultp, size_t* lengthp);

#ifdef __cplusplus
}
#endif

Index: .cvsignore
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	2001/09/29 23:06:30	1.1
+++ .cvsignore	2001/10/18 20:56:59	1.2
@@ -5,3 +5,4 @@
 gg.lo
 libgg.la
 libgg.lo
+iconv_string.lo

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	2001/09/29 23:06:30	1.1
+++ Makefile.am	2001/10/18 20:56:59	1.2
@@ -13,6 +13,8 @@
 
 libgg_a_SOURCES = libgg.c \
 		  libgg.h \
+		  iconv_string.c \
+		  iconv_string.h \
 		  gg.c
 
 else
@@ -23,6 +25,8 @@
 
 libgg_la_SOURCES = libgg.c \
 		   libgg.h \
+		   iconv_string.c \
+		   iconv_string.h \
 		   gg.c
 
 endif

Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gg.c	2001/10/16 23:24:34	1.4
+++ gg.c	2001/10/18 20:56:59	1.5
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <netdb.h>
 #include <unistd.h>
@@ -40,6 +42,7 @@
 #endif
 #ifdef HAVE_ICONV
 #include <iconv.h>
+#include "iconv_string.h"
 #endif
 /* Library from EKG (Eksperymentalny Klient Gadu-Gadu) */
 #include "libgg.h"
@@ -89,35 +92,12 @@
 
 static gchar *charset_convert(const gchar *locstr, char *encsrc, char *encdst)
 {
+       gchar *result = NULL;
 #ifdef HAVE_ICONV
-	gchar *dststr;
-	size_t loclen, dstlen;
-	gchar *fsave, *tsave;
-	size_t count;
-	static iconv_t cd = (iconv_t)(-1);
-
-	if (cd == (iconv_t)(-1)) {
-		cd = iconv_open(encdst, encsrc);
-		if (cd == (iconv_t)(-1)) {
-			return g_strdup(locstr);
-		}
-	}
-
-	loclen = strlen(locstr);
-	/* we are ready for multibyte conversions */
-	dstlen = MB_LEN_MAX * loclen;
-	dststr = g_new0(gchar, dstlen + 1);
-	fsave = (gchar *)locstr;
-	tsave = dststr;
-	count = iconv(cd, &fsave, &loclen, &tsave, &dstlen);
-	if (count == -1) {
-		g_free(dststr);
-		return g_strdup(locstr);
-	}
-	return dststr;
-#else
-	return g_strdup(locstr);
+        if (iconv_string(encdst, encsrc, locstr, locstr+strlen(locstr)+1, &result, NULL) < 0)
 #endif
+	return g_strdup(locstr);
+	return result;
 }
 
 static gboolean invalid_uin(char *uin)

[Gaim-commits] CVS: gaim ChangeLog,1.327,1.328 TODO,1.121,1.122 configure.ac,1.21,1.22

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

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

Modified Files:
	ChangeLog TODO configure.ac 
Log Message:
fun stuff.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- ChangeLog	2001/10/18 19:55:19	1.327
+++ ChangeLog	2001/10/18 20:56:58	1.328
@@ -1,6 +1,10 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.47:
+	* Better font loading (pays attention to charset now)
+	  (thanks Arkadiusz Miskiewicz)
+	* Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)
+	* Open Mail button for when you get new mail (Yahoo and MSN)
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- TODO	2001/10/03 09:48:33	1.121
+++ TODO	2001/10/18 20:56:59	1.122
@@ -50,6 +50,7 @@
 		that you can "send" more than one message before you're
 		actually connected. This is actually a bug that it doesn't do
 		this already.
+	Permit/Deny
 	Need some way of indicating "invite" in IM window
 	File Transfer
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	2001/10/18 19:55:19	1.21
+++ configure.ac	2001/10/18 20:56:59	1.22
@@ -100,7 +100,7 @@
 AC_ARG_WITH(krb4,      [  --with-krb4=PREFIX      Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no")
 
 if test "$enable_debug" = yes ; then
-	CFLAGS="$CFLAGS -Wall -g"
+	CFLAGS="$CFLAGS -Wall -g3"
 	AC_DEFINE(DEBUG)
 fi
 

[Gaim-commits] CVS: gaim configure.ac,1.20,1.21 ChangeLog,1.326,1.327 NEWS,1.93,1.94

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

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

Modified Files:
	configure.ac ChangeLog NEWS 
Log Message:
Scum of the earth, come on!



Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.ac	2001/10/08 20:37:32	1.20
+++ configure.ac	2001/10/18 19:55:19	1.21
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.46])
+AM_INIT_AUTOMAKE([gaim], [0.47])
 
 AC_PATH_PROG(sedpath, sed)
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- ChangeLog	2001/10/18 15:49:51	1.326
+++ ChangeLog	2001/10/18 19:55:19	1.327
@@ -1,5 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.47:
+
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)
 	* ICQ works on big-endian platforms, e.g. sparc and ppc

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- NEWS	2001/10/18 16:05:04	1.93
+++ NEWS	2001/10/18 19:55:19	1.94
@@ -1,5 +1,7 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
+0.47:
+
 0.46 (10/18/2001):
 	Rob: Hey guys! The smores were great! I really enjoyed meeting
 	up with all of you guys and singing campfire songs. It was 

[Gaim-commits] CVS: gaim NEWS,1.92,1.93

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

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

Modified Files:
	NEWS 
Log Message:
i-i
feel so alive
so alive
for the very first time


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- NEWS	2001/10/18 15:38:51	1.92
+++ NEWS	2001/10/18 16:05:04	1.93
@@ -8,6 +8,10 @@
 	This release has quite the number of bug fixes. I won't bother
 	going into detail here. Just ust it, love it, live it - SEGA!
 
+	Eric: Lots of fixes. Things compile well now. ICQ has stopped
+	crashing on PPC and Sparc. If you know someone who isn't using
+	Gaim because it was unstable, please get them to try this
+	version. It's much better, I promise.
 
 0.45 (10/04/2001):
 	Eric: Well, it seems that the time has come for yet another

[Gaim-commits] CVS: gaim gaim.spec.in,1.25,1.26 ChangeLog,1.325,1.326

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

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

Modified Files:
	gaim.spec.in ChangeLog 
Log Message:
I'm gonna keep on survivin'... Im a surviva''



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gaim.spec.in	2001/10/11 01:57:27	1.25
+++ gaim.spec.in	2001/10/18 15:49:51	1.26
@@ -97,6 +97,32 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Oct 18 2001 Rob Flynn <ro...@ma...> (0.46 release)
+- New applet icons (courtesy David Raeman)
+- ICQ works on big-endian platforms, e.g. sparc and ppc (thanks to Nathan Walp and Ben Miller)
+- Better applet icon drawing (thanks to Ari Pollak)
+- An extraordinary number of bug fixes
+- Updated Korean translation
+- Ability to stop animation on buddy icons, restart animation, hide certain buddy icons, and save people's buddy icons, all through a right-click menu
+- Event handlers in perl passed arguments as elements of an array rather than all concatenated as a string, making perl much easier to use (thanks Dennis Lambe Jr.)
+- Can pass an argument to timeout_handlers in perl (thanks Artem Litvinovich)
+- Redesigned Modify Account window (thanks Sean Egan)
+- Add buddy dialog now lets you select which protocol to add the buddy to
+- Pressing 'signon' on the first screen for accounts that do not require passwords no longer incorrectly displays an error message.
+
+* Thu Oct 04 2001 Rob Flynn <ro...@ma...> (0.45 release)
+- New plugin event: event_chat_send_invite
+- Major updates to the perl system (reread PERL-HOWTO and SIGNALS)
+- Major updates to event_chat_* events for plugins (reread SIGNALS)
+- Some GtkIMHtml improvements
+- Various bugfixes
+- Nick Highlighting in chat
+- Tab-completion for nicks in chat (thanks to Sean Egan)
+- Large internal reworkings
+- New Protocol: Gadu-Gadu, written by Arkadiusz Miskiewicz
+- Can choose buddy icon to send (for Oscar)
+- New Translation: Polish translation by Przemysaw Suek
+
 * Thu Sep 20 2001 Rob Flynn <ro...@ma...> (0.44 release)
 - More sane scaling of buddy icons (intelligently scale to either 48x48 or 50x50 depending on icon)
 - Have you ever had it happen where you cancel a login and Gaim starts using all the available processing power? I think I fixed that.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- ChangeLog	2001/10/18 12:12:36	1.325
+++ ChangeLog	2001/10/18 15:49:51	1.326
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.46:
+version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)
 	* ICQ works on big-endian platforms, e.g. sparc and ppc
 	  (thanks to Nathan Walp and Ben Miller)

[Gaim-commits] CVS: gaim NEWS,1.91,1.92

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

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

Modified Files:
	NEWS 
Log Message:
Intergalactic planitary.. planitary...



Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- NEWS	2001/10/18 12:12:36	1.91
+++ NEWS	2001/10/18 15:38:51	1.92
@@ -1,5 +1,14 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
+0.46 (10/18/2001):
+	Rob: Hey guys! The smores were great! I really enjoyed meeting
+	up with all of you guys and singing campfire songs. It was 
+	really awesome.  Thanks for the beer, too. Next time, it's on me.
+	
+	This release has quite the number of bug fixes. I won't bother
+	going into detail here. Just ust it, love it, live it - SEGA!
+
+
 0.45 (10/04/2001):
 	Eric: Well, it seems that the time has come for yet another
 	release. There are several yummy additions in this release, and

[Gaim-commits] CVS: gaim/doc FAQ,1.18,1.19 gaim.1,1.36,1.37 gaims_funniest_home_convos.txt,1.3,1.4

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

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

Modified Files:
	FAQ gaim.1 gaims_funniest_home_convos.txt 
Log Message:
I got an itty bitty diff for you now ;-)


Index: FAQ
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/FAQ,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- FAQ	2001/10/15 05:04:04	1.18
+++ FAQ	2001/10/18 12:12:36	1.19
@@ -1,4 +1,4 @@
-GAIM: The Pimpin' Penguin IM Clone Thats Good For The Soul
+Gaim: The Pimpin' Penguin IM Clone Thats Good For The Soul
 
 1  The Basics
 	1.1  What does 'gaim' stand for?
@@ -70,8 +70,8 @@
 
 1.3  What are GtkHTML and GtkIMHtml, and why not just use GNOME's GtkHTML?
 
-The widget GAIM had previously used to display HTML was called GtkHTML, and
-was written by Mark and Jim specifically for GAIM. Over time, Rob and Eric
+The widget Gaim had previously used to display HTML was called GtkHTML, and
+was written by Mark and Jim specifically for Gaim. Over time, Rob and Eric
 hacked at it (read: broke it) and it's gotten to be very fragile and fairly
 buggy.
 
@@ -81,9 +81,9 @@
 could use it. He based it somewhat off of the old GtkHTML and GNOME's GtkHTML.
 
 GNOME's GtkHTML is a very powerful HTML viewer. Because of this, it isn't
-well-suited for GAIM. It wouldn't be very good if we let you have IFrames in
+well-suited for Gaim. It wouldn't be very good if we let you have IFrames in
 your conversation, for example. Also, GNOME's GtkHTML depends on a lot of
-GNOME libraries that we don't want to force people to use in GAIM. (There is
+GNOME libraries that we don't want to force people to use in Gaim. (There is
 a strip-down version, CSCHTML, which doesn't use the GNOME libraries; but the
 first objection (that it supports too many tags) still applies.)
 

Index: gaim.1
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaim.1,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gaim.1	2001/10/05 22:08:13	1.36
+++ gaim.1	2001/10/18 12:12:36	1.37
@@ -19,9 +19,9 @@
 .\" License along with this manual; if not, write to the Free
 .\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
 .\" USA.
-.TH GAIM 1
+.TH gaim 1
 .SH NAME
-gaim v0.46 \- Instant Messaging client
+Gaim v0.46 \- Instant Messaging client
 .SH SYNOPSIS
 .TP 5
 \fBgaim \fI[options]\fR
@@ -215,7 +215,7 @@
 This opens a debug window into which \fBgaim\fR sends more verbose information about what it's doing.
 .TP
 .B Report Idle Times
-For protocol's that require the client to report idle times, this option sets the method of determining idle times.  If \fINone\fR is chosen, idleness will not be reported.  If \fIGAIM Use\fR is chosen, it will send idle times relative to the last time \fBgaim\fR was used.  If \fIX Use\fR is chosen, idle times will be reported based on the last time the mouse or keyboard was used.
+For protocol's that require the client to report idle times, this option sets the method of determining idle times.  If \fINone\fR is chosen, idleness will not be reported.  If \fIGaim Use\fR is chosen, it will send idle times relative to the last time \fBgaim\fR was used.  If \fIX Use\fR is chosen, idle times will be reported based on the last time the mouse or keyboard was used.
 .TP
 .B Logging
 Log all conversations will automatically log conversations into ~/.gaim/logs/.  Unless \fIStrip HTML from logs\fR is checked, they will be saved as an HTML file with a .log extension.  The preferences window provides options to specify exactly what to log.

Index: gaims_funniest_home_convos.txt
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaims_funniest_home_convos.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gaims_funniest_home_convos.txt	2000/11/20 11:59:09	1.3
+++ gaims_funniest_home_convos.txt	2001/10/18 12:12:36	1.4
@@ -114,7 +114,7 @@
 13:45:00 WinFreak : Where can I download tar xvzf gaim-0.9.5.tar.gz?  Is this for windows?
 
 
-*** This is what happens when GAIM Developers get bored.
+*** This is what happens when Gaim Developers get bored.
 
 22:39:18 RobFlynn: Umm
 22:39:19 RobFlynn: My brain is dead.

[Gaim-commits] CVS: gaim ChangeLog,1.324,1.325 NEWS,1.90,1.91 README,1.20,1.21 STATUS,1.39,1.40

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

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

Modified Files:
	ChangeLog NEWS README STATUS 
Log Message:
I got an itty bitty diff for you now ;-)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -d -r1.324 -r1.325
--- ChangeLog	2001/10/18 06:59:26	1.324
+++ ChangeLog	2001/10/18 12:12:36	1.325
@@ -1,4 +1,4 @@
-GAIM: The Pimpin' Penguin IM Clone thats good for the soul! 
+Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.46:
 	* New applet icons (courtesy David Raeman)
@@ -360,7 +360,7 @@
 	  fixed.
 	* Pressing enter once again sends a message in buddy chatrooms (oops)
 	* More fixes for the change on the AOL sign-on process. 
-	* Fixed bug where GAIM sometimes doesn't find a font to use.
+	* Fixed bug where Gaim sometimes doesn't find a font to use.
 	* Per-conversation font and color dialogs (thanks fflewddur)
 	* Chat in oscar works (somewhat)
 	* Even more fixes for the sign-on process, and now you don't flash when
@@ -442,7 +442,7 @@
 	* Better support for multiple screen names
 	* Font Properties
 	* Saving of buddylist window position 
-	* Fixed a problem with GAIM and the Netscape-branded version
+	* Fixed a problem with Gaim and the Netscape-branded version
 	  of Mozilla 
 	* New Sound Properties
 	* More General Properties
@@ -450,7 +450,7 @@
 	* Various Random Bug fixes
 
 version 0.9.10 (11/03/1999):
-	* Fixed a nasty memory leak.  No more 40M GAIM processes. LOL
+	* Fixed a nasty memory leak.  No more 40M Gaim processes. LOL
 	* IDLE Times are displayed in a neater fashion.
  
 version 0.9.9  (10/31/1999):
@@ -473,7 +473,7 @@
 	* Some logging fixes and improvements
 	* configurable host/port selection
 	* Clickable Links in buddy chat
-	* New GAIM Logo 
+	* New Gaim Logo 
 	* Display Signon/Signoff messages in conversation windows 
 	* Option to strip HTML from logged messages
 	* GNOME cleanups (It might work now haha)
@@ -550,5 +550,5 @@
 	* Scroll-Wheel Mice work in Conversation Window
 	* Fixed WindowMaker Appicon 
 	* Version Number in About Box
-	* GAIM Slogan in about box :)
+	* Gaim Slogan in about box :)
 	* Created Changelog File :) 

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- NEWS	2001/10/05 06:37:34	1.90
+++ NEWS	2001/10/18 12:12:36	1.91
@@ -1,4 +1,4 @@
--=[ GAIM ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
+-=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
 0.45 (10/04/2001):
 	Eric: Well, it seems that the time has come for yet another
@@ -383,7 +383,7 @@
 	of work to the user interface.  It's still not in the state that I
 	would like it to be, though.  Over the next few versions you will
 	notice a few more interface changes as we try to bring a more
-	professional look to GAIM.  As always, we will stay true to our
+	professional look to Gaim.  As always, we will stay true to our
 	pimpin' penguin atittude. 
 
 	Eric: While Rob's been busy making things pretty, I've been busy
@@ -427,7 +427,7 @@
 
 0.9.18 (06/02/2000):
 	Rob: Talk about release early, release often - sheesh!  We're going
-	insane.  Ya know, I'm not too happy with the GAIM UI.  I dont know
+	insane.  Ya know, I'm not too happy with the Gaim UI.  I dont know
 	how the rest of you feel but it's time for a nice overhaul.  In the
 	next few days I'll be sitting down with some of my friends and coming
 	up with an improved interface.  I hope you all enjoy it.  It'll
@@ -530,7 +530,7 @@
 0.9.11:
 	Jeramey got a new Comfy Chair! Its very very comfy!  Whee!
 Jim also had a little hyper-drunken moment and started hacking away at
-a new configuration format for GAIM.  Looks like we're running .gaimrc
+a new configuration format for Gaim.  Looks like we're running .gaimrc
 version 1 now.  Gotta love it.  I got bored and hacked in a couple font
 properties that will, in time, contain more features.  That's about it
 for this version -- cept for that memory leak we fixed.  Shush! We're
@@ -552,7 +552,7 @@
 
 0.9.9:
 	Welp, All of you boys and girls who run Mandrake and have some
-problems with GAIM working properly, please check out the FAQ file.  It 
+problems with Gaim working properly, please check out the FAQ file.  It 
 contains a nice fix submitted by one of our users.  I hope this works for
 you guys!
 	Jim appears to have intoxicated himself.  This is, as always, a
@@ -573,7 +573,7 @@
 life.  This is a special release of gaim.  We will be releasing some wonderful
 photographs soon .. or perhaps if we get the bloody webcam working then we
 will take a couple of quick snapshots.
-	Looks like the GAIM developers convention (cool name huh) that we
+	Looks like the Gaim developers convention (cool name huh) that we
 had this weekend in Auburn, AL went wonderfully :).  yum yum yum. Hahahah. Oh
 by the way.  Beware of insecure rednecks in the deli.  Bad things.
 	In (non)related news, Jeramey could not successfully slaughter the

Index: README
===================================================================
RCS file: /cvsroot/gaim/gaim/README,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- README	2001/09/20 21:44:52	1.20
+++ README	2001/10/18 12:12:36	1.21
@@ -44,7 +44,7 @@
 
 * Plugins:
 
-If you do not wish to enable the plugin support within GAIM, run the
+If you do not wish to enable the plugin support within Gaim, run the
 ./configure script with the --disable-plugins option and recompile your
 source code.  This will prevent the ability to load plugins.
 

Index: STATUS
===================================================================
RCS file: /cvsroot/gaim/gaim/STATUS,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- STATUS	2001/09/20 08:13:25	1.39
+++ STATUS	2001/10/18 12:12:36	1.40
@@ -1,4 +1,4 @@
-STATUS of GAIM CVS tree. Last modified $Date$ by
+STATUS of Gaim CVS tree. Last modified $Date$ by
 $Author$.
 
 This file is meant to provide gaim users who use the CVS version to see whether

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.42,1.43

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

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

Modified Files:
	irc.c 
Log Message:
I got an itty bitty diff for you now ;-)


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- irc.c	2001/10/14 11:36:36	1.42
+++ irc.c	2001/10/18 12:12:38	1.43
@@ -677,7 +677,7 @@
 	char buf[IRC_BUF_LEN];
 
 	if (!g_strncasecmp(msg, "VERSION", 7)) {
-		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION GAIM " VERSION ": The Pimpin "
+		g_snprintf(buf, sizeof(buf), "NOTICE %s :\001VERSION Gaim " VERSION ": The Pimpin "
 					     "Penguin AIM Clone: " WEBSITE "\001\r\n", nick);
 		irc_write(id->fd, buf, strlen(buf));
 	}
@@ -899,7 +899,7 @@
 	hostname[sizeof(hostname) - 1] = 0;
 	if (!*hostname)
 		g_snprintf(hostname, sizeof(hostname), "localhost");
-	g_snprintf(buf, sizeof(buf), "USER %s %s %s :GAIM (%s)\r\n",
+	g_snprintf(buf, sizeof(buf), "USER %s %s %s :Gaim (%s)\r\n",
 		   g_get_user_name(), hostname, gc->user->proto_opt[USEROPT_SERV], WEBSITE);
 	if (irc_write(idata->fd, buf, strlen(buf)) < 0) {
 		hide_login_progress(gc, "Write error");
@@ -943,7 +943,7 @@
 	struct irc_data *idata = (struct irc_data *)gc->proto_data;
 	gchar buf[IRC_BUF_LEN];
 
-	g_snprintf(buf, sizeof(buf), "QUIT :Download GAIM [%s]\r\n", WEBSITE);
+	g_snprintf(buf, sizeof(buf), "QUIT :Download Gaim [%s]\r\n", WEBSITE);
 	irc_write(idata->fd, buf, strlen(buf));
 
 	g_free(idata->chantypes);

[Gaim-commits] CVS: gaim/src gaim.h,1.282,1.283 list.c,1.2,1.3 prefs.c,1.184,1.185

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

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

Modified Files:
	gaim.h list.c prefs.c 
Log Message:
I got an itty bitty diff for you now ;-)


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- gaim.h	2001/10/12 21:12:56	1.282
+++ gaim.h	2001/10/18 12:12:37	1.283
@@ -129,7 +129,7 @@
 #define OPT_USR_REM_PASS	0x00000004
 #define OPT_USR_MAIL_CHECK      0x00000008
 
-#define DEFAULT_INFO "Visit the GAIM website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
+#define DEFAULT_INFO "Visit the Gaim website at <A HREF=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net/</A>."
 
 enum log_event {
 	log_signon = 0,

Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- list.c	2001/10/17 20:24:11	1.2
+++ list.c	2001/10/18 12:12:37	1.3
@@ -487,7 +487,7 @@
 }
 
 
-/* translate an AIM 3 buddylist (*.lst) to a GAIM buddylist */
+/* translate an AIM 3 buddylist (*.lst) to a Gaim buddylist */
 static void translate_lst(FILE *src_fp, char *dest)
 {
 	char line[BUF_LEN], *line2;
@@ -520,7 +520,7 @@
 }
 
 
-/* translate an AIM 4 buddylist (*.blt) to GAIM format */
+/* translate an AIM 4 buddylist (*.blt) to Gaim format */
 static void translate_blt(FILE *src_fp, char *dest)
 {
 	int i;
@@ -708,7 +708,7 @@
 		buf = g_malloc(8193);
 		g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2);
 		g_free(buf2);
-		/* GAIM buddy list - no translation */
+		/* Gaim buddy list - no translation */
 	} else if (first[0] == 'm') {
 		rewind(f);
 		len = fread(buf, 1, BUF_LONG * 2, f);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- prefs.c	2001/10/10 00:26:26	1.184
+++ prefs.c	2001/10/18 12:12:37	1.185
@@ -236,7 +236,7 @@
 	gtk_widget_show(mbox);
 
 	idle = idle_radio(_("None"), IDLE_NONE, mbox, NULL);
-	idle = idle_radio(_("GAIM Use"), IDLE_GAIM, mbox, idle);
+	idle = idle_radio(_("Gaim Use"), IDLE_GAIM, mbox, idle);
 #ifdef USE_SCREENSAVER
 	idle = idle_radio(_("X Use"), IDLE_SCREENSAVER, mbox, idle);
 #endif
@@ -2359,7 +2359,7 @@
 		dw = g_new0(struct debug_window, 1);
 
 	dw->window = gtk_window_new(GTK_WINDOW_DIALOG);
-	gtk_window_set_title(GTK_WINDOW(dw->window), _("GAIM debug output window"));
+	gtk_window_set_title(GTK_WINDOW(dw->window), _("Gaim debug output window"));
 	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
 

[Gaim-commits] CVS: gaim/po de.po,1.29,1.30 es.po,1.16,1.17 fr.po,1.18,1.19 ko.po,1.18,1.19 pl.po,1.4,1.5 ru.po,1.3,1.4 zh_CN.po,1.15,1.16

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

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

Modified Files:
	de.po es.po fr.po ko.po pl.po ru.po zh_CN.po 
Log Message:
I got an itty bitty diff for you now ;-)


Index: de.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/de.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- de.po	2001/09/05 16:55:19	1.29
+++ de.po	2001/10/18 12:12:36	1.30
@@ -1,4 +1,4 @@
-# German translation for "GAIM"
+# German translation for "Gaim"
 # Copyright (C) YEAR Free Software Foundation, Inc.
 #
 msgid ""
@@ -48,12 +48,12 @@
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "Über GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "Über Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -147,7 +147,7 @@
 msgstr "Neue Abwesenheits-Mitteilung"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
+msgid "Can't create Gaim applet!"
 msgstr "Kann Gaim-Applet nicht erstellen"
 
 #: src/applet.c:352
@@ -1063,7 +1063,7 @@
 msgstr "Beschreibung"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - Url hinzufügen"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
@@ -1568,7 +1568,7 @@
 msgstr "Nein"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
+msgid "Gaim Use"
 msgstr "von Gaim"
 
 #: src/prefs.c:243
@@ -2057,7 +2057,7 @@
 msgstr "Gaim - Einstellungen"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
+msgid "Gaim debug output window"
 msgstr "Gaim Debug-Ausgabefenster"
 
 #: src/prefs.c:2653

Index: es.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/es.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- es.po	2001/06/20 16:56:34	1.16
+++ es.po	2001/10/18 12:12:37	1.17
@@ -53,12 +53,12 @@
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "Sobre GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "Sobre Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@
 msgstr "Nuevo Mensaje de Ausencia"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "No pudo crearse el programa GAIM"
+msgid "Can't create Gaim applet!"
+msgstr "No pudo crearse el programa Gaim"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1101,8 +1101,8 @@
 msgstr "Descripción"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
-msgstr "GAIM - Agregar dirección"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Agregar dirección"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 msgid "Select Text Color"
@@ -1154,7 +1154,7 @@
 #: src/dialogs.c:3203
 #, fuzzy
 msgid "Use"
-msgstr "GAIM Usar"
+msgstr "Gaim Usar"
 
 #: src/dialogs.c:3207
 msgid "Save & Use"
@@ -1634,13 +1634,13 @@
 msgstr ""
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "GAIM Usar"
+msgid "Gaim Use"
+msgstr "Gaim Usar"
 
 #: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
-msgstr "GAIM Usar"
+msgstr "Gaim Usar"
 
 #: src/prefs.c:254
 #, fuzzy
@@ -2178,8 +2178,8 @@
 msgstr "Gaim - Preferencias"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "GAIM ventana de respuestas del programa"
+msgid "Gaim debug output window"
+msgstr "Gaim ventana de respuestas del programa"
 
 #: src/prefs.c:2653
 msgid "General"
@@ -2440,8 +2440,8 @@
 #~ msgid "Make Away Now"
 #~ msgstr "Hacerme ausente ahora"
 
-#~ msgid "GAIM"
-#~ msgstr "GAIM"
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
 
 #~ msgid "HTML Link:"
 #~ msgstr "Dirección:"

Index: fr.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/fr.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- fr.po	2001/08/26 19:18:39	1.18
+++ fr.po	2001/10/18 12:12:37	1.19
@@ -38,7 +38,7 @@
 #: plugins/yay/yay.c:203
 #, fuzzy
 msgid "Gaim - Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
 #: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
@@ -53,12 +53,12 @@
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "A propos de GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "A propos de Gaim v%s"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@
 msgstr "Nouveau Message d'absence"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "Impossible de créer l'applet GAIM"
+msgid "Can't create Gaim applet!"
+msgstr "Impossible de créer l'applet Gaim"
 
 #: src/applet.c:352
 msgid "About..."
@@ -450,7 +450,7 @@
 
 #: src/buddy.c:2847
 msgid "Gaim - Buddy List"
-msgstr "GAIM - Liste des Potes"
+msgstr "Gaim - Liste des Potes"
 
 #: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
 msgid "Join what group:"
@@ -887,11 +887,11 @@
 #: src/dialogs.c:921
 #, fuzzy
 msgid "Gaim - Add Group"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:948
 msgid "Gaim - Add Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:962
 msgid "Add Buddy"
@@ -1098,7 +1098,7 @@
 msgstr "Description"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
@@ -1171,7 +1171,7 @@
 #: src/dialogs.c:3466
 #, fuzzy
 msgid "Gaim - Alias Buddy"
-msgstr "GAIM - Ajouter un Pote"
+msgstr "Gaim - Ajouter un Pote"
 
 #: src/dialogs.c:3543
 #, fuzzy
@@ -1200,7 +1200,7 @@
 #: src/dialogs.c:3821
 #, fuzzy
 msgid "Gaim - Rename Group"
-msgstr "GAIM - Renommer un groupe"
+msgstr "Gaim - Renommer un groupe"
 
 #: src/dialogs.c:3831
 msgid "Rename Group"
@@ -1214,12 +1214,12 @@
 #: src/dialogs.c:3909
 #, fuzzy
 msgid "Gaim - Rename Buddy"
-msgstr "GAIM - Renommer un Pote"
+msgstr "Gaim - Renommer un Pote"
 
 #: src/dialogs.c:3919
 #, fuzzy
 msgid "Rename Buddy"
-msgstr "GAIM - Renommer un Pote"
+msgstr "Gaim - Renommer un Pote"
 
 #: src/gaimrc.c:980
 #, c-format
@@ -1649,8 +1649,8 @@
 msgstr "Aucune"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "Utilisation de GAIM"
+msgid "Gaim Use"
+msgstr "Utilisation de Gaim"
 
 #: src/prefs.c:243
 #, fuzzy
@@ -2191,8 +2191,8 @@
 msgstr "Gaim - Préférences"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "fenêtre de debug GAIM"
+msgid "Gaim debug output window"
+msgstr "fenêtre de debug Gaim"
 
 #: src/prefs.c:2653
 msgid "General"
@@ -2458,8 +2458,8 @@
 #~ msgid "Make Away Now"
 #~ msgstr "Etre absent maintenant"
 
-#~ msgid "GAIM"
-#~ msgstr "GAIM"
+#~ msgid "Gaim"
+#~ msgstr "Gaim"
 
 #~ msgid "HTML Link:"
 #~ msgstr "Lien HTML:"

Index: ko.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ko.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ko.po	2001/10/13 19:00:48	1.18
+++ ko.po	2001/10/18 12:12:37	1.19
@@ -516,18 +516,18 @@
 # src/about.c:87
 #: src/about.c:96
 #, c-format
-msgid "About GAIM v%s"
-msgstr "GAIM v%s ¿¡ ´ëÇÏ¿©"
+msgid "About Gaim v%s"
+msgstr "Gaim v%s ¿¡ ´ëÇÏ¿©"
 
 # src/about.c:124
 #: src/about.c:126
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"GAIMÀº AOL ÇÁ·ÎÅäÄÝÀ» »ç¿ëÇÏ´Â ¸Þ½ÅÀúÀÔ´Ï´Ù. Gtk+¸¦ ÀÌ¿ëÇÏ¿© ¸¸µé¾îÁ³À¸¸ç\n"
+"GaimÀº AOL ÇÁ·ÎÅäÄÝÀ» »ç¿ëÇÏ´Â ¸Þ½ÅÀúÀÔ´Ï´Ù. Gtk+¸¦ ÀÌ¿ëÇÏ¿© ¸¸µé¾îÁ³À¸¸ç\n"
 "GPL ¶óÀ̼¾½º·Î ¹èÆ÷ÇÕ´Ï´Ù.\n"
 "\n"
 "ÀÎÅͳÝÁÖ¼Ò:"
@@ -709,8 +709,8 @@
 
 # src/applet.c:309
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "GAIM ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
+msgid "Can't create Gaim applet!"
+msgstr "Gaim ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
 
 # src/applet.c:352
 #: src/applet.c:352
@@ -1086,7 +1086,7 @@
 # src/buddy.c:2708
 #: src/buddy.c:2752
 msgid "About Gaim"
-msgstr "GAIM ˼"
+msgstr "Gaim ˼"
 
 # src/buddy.c:2727 src/prefs.c:2671
 #: src/buddy.c:2771
@@ -1969,8 +1969,8 @@
 
 # src/dialogs.c:2381
 #: src/dialogs.c:2364
-msgid "GAIM - Add URL"
-msgstr "GAIM - URL Ãß°¡"
+msgid "Gaim - Add URL"
+msgstr "Gaim - URL Ãß°¡"
 
 # src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 #: src/dialogs.c:2512
@@ -2359,8 +2359,8 @@
 
 # src/prefs.c:241
 #: src/prefs.c:240
-msgid "GAIM Use"
-msgstr "GAIM »ç¿ë"
+msgid "Gaim Use"
+msgstr "Gaim »ç¿ë"
 
 # src/prefs.c:243
 #: src/prefs.c:242
@@ -3004,8 +3004,8 @@
 
 # src/prefs.c:2459
 #: src/prefs.c:2323
-msgid "GAIM debug output window"
-msgstr "GAIM µð¹ö±ë Ãâ·Ââ"
+msgid "Gaim debug output window"
+msgstr "Gaim µð¹ö±ë Ãâ·Ââ"
 
 # src/prefs.c:2653
 #: src/prefs.c:2578

Index: pl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/pl.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pl.po	2001/10/03 19:42:31	1.4
+++ pl.po	2001/10/18 12:12:37	1.5
@@ -1,4 +1,4 @@
-# GAIM polish translation .
+# Gaim polish translation .
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Przemys³aw Su³ek <pb...@li...> <ps...@pl...>, 2001.
 #
@@ -717,18 +717,18 @@
 
 #: src/about.c:96
 #, c-format
-msgid "About GAIM v%s"
-msgstr "O GAIM v%s"
+msgid "About Gaim v%s"
+msgstr "O Gaim v%s"
 
 #: src/about.c:128
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
 msgstr ""
-"GAIM jest klientem obs³uguj±cym protokó³ Instant Messenger AOL. Napisany\n"
+"Gaim jest klientem obs³uguj±cym protokó³ Instant Messenger AOL. Napisany\n"
 "z u¿yciem Gtk+ i licencjonowany wg. GPL.\n"
 "\n"
 "URL: "
@@ -879,8 +879,8 @@
 msgstr "Nowy komunikat Zajêty"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "Nie mo¿na stworzyæ apletu GAIM!"
+msgid "Can't create Gaim applet!"
+msgstr "Nie mo¿na stworzyæ apletu Gaim!"
 
 #: src/applet.c:348
 msgid "About..."
@@ -1670,8 +1670,8 @@
 msgstr "Opis"
 
 #: src/dialogs.c:2225
-msgid "GAIM - Add URL"
-msgstr "GAIM - Dodaj URL"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Dodaj URL"
 
 #: src/dialogs.c:2376 src/dialogs.c:2397 src/dialogs.c:2451
 msgid "Select Text Color"
@@ -1966,7 +1966,7 @@
 msgstr "Brak"
 
 #: src/prefs.c:239
-msgid "GAIM Use"
+msgid "Gaim Use"
 msgstr "U¿yj Gaim"
 
 #: src/prefs.c:241
@@ -2483,8 +2483,8 @@
 msgstr "Gaim - preferencje"
 
 #: src/prefs.c:2358
-msgid "GAIM debug output window"
-msgstr "GAIM okno wyj¶cia odplukswiania"
+msgid "Gaim debug output window"
+msgstr "Gaim okno wyj¶cia odplukswiania"
 
 #: src/prefs.c:2612
 msgid "General"

Index: ru.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ru.po	2001/10/01 16:39:10	1.3
+++ ru.po	2001/10/18 12:12:37	1.4
@@ -65,12 +65,12 @@
 
 #: src/about.c:89
 #, c-format
-msgid "About GAIM v%s"
+msgid "About Gaim v%s"
 msgstr "ï Gaim ×ÅÒÓÉÑ%s "
 
 #: src/about.c:119
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
@@ -199,8 +199,8 @@
 msgstr "îÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ GAIM ÁÐÐÌÅÔ!"
+msgid "Can't create Gaim applet!"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ Gaim ÁÐÐÌÅÔ!"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1236,7 +1236,7 @@
 msgstr "ïÐÉÓÁÎÉÅ"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
+msgid "Gaim - Add URL"
 msgstr "Gaim - äÏÂÁ×ÉÔØ URL"
 
 #: src/dialogs.c:2524
@@ -1787,8 +1787,8 @@
 msgstr "îÅÔ"
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ GAIM"
+msgid "Gaim Use"
+msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ Gaim"
 
 #: src/prefs.c:243
 msgid "X Use"
@@ -2304,8 +2304,8 @@
 msgstr "Gaim - îÁÓÔÒÏÊËÉ"
 
 #: src/prefs.c:2482
-msgid "GAIM debug output window"
-msgstr "ÏËÎÏ ÏÔÌÁÄËÉ GAIM"
+msgid "Gaim debug output window"
+msgstr "ÏËÎÏ ÏÔÌÁÄËÉ Gaim"
 
 #: src/prefs.c:2676
 msgid "General"

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/zh_CN.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- zh_CN.po	2001/06/20 16:56:34	1.15
+++ zh_CN.po	2001/10/18 12:12:37	1.16
@@ -1,4 +1,4 @@
-# Simplified Chinese translation for GAIM.
+# Simplified Chinese translation for Gaim.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Hashao <ha...@ch...>, 2000.
 # 
@@ -53,12 +53,12 @@
 
 #: src/about.c:87
 #, c-format
-msgid "About GAIM v%s"
-msgstr "¹ØÓÚ GAIM µÚ %s °æ"
+msgid "About Gaim v%s"
+msgstr "¹ØÓÚ Gaim µÚ %s °æ"
 
 #: src/about.c:124
 msgid ""
-"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written using Gtk+ and is licensed under the GPL.\n"
 "URL: "
 msgstr ""
@@ -152,8 +152,8 @@
 msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
 
 #: src/applet.c:309
-msgid "Can't create GAIM applet!"
-msgstr "ÎÞ·¨½¨Á¢ GAIM applet!"
+msgid "Can't create Gaim applet!"
+msgstr "ÎÞ·¨½¨Á¢ Gaim applet!"
 
 #: src/applet.c:352
 msgid "About..."
@@ -1098,8 +1098,8 @@
 msgstr "ÃèÊö"
 
 #: src/dialogs.c:2381
-msgid "GAIM - Add URL"
-msgstr "GAIM - Ôö¼Ó URL"
+msgid "Gaim - Add URL"
+msgstr "Gaim - Ôö¼Ó URL"
 
 #: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
 msgid "Select Text Color"
@@ -1151,7 +1151,7 @@
 #: src/dialogs.c:3203
 #, fuzzy
 msgid "Use"
-msgstr "GAIM ʹÓÃ"
+msgstr "Gaim ʹÓÃ"
 
 #: src/dialogs.c:3207
 msgid "Save & Use"
@@ -1628,13 +1628,13 @@
 msgstr ""
 
 #: src/prefs.c:241
-msgid "GAIM Use"
-msgstr "GAIM ʹÓÃ"
+msgid "Gaim Use"
+msgstr "Gaim ʹÓÃ"
 
 #: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
-msgstr "GAIM ʹÓÃ"
+msgstr "Gaim ʹÓÃ"
 
 #: src/prefs.c:254
 #, fuzzy
@@ -2166,8 +2166,8 @@
 msgstr "Gaim - ÓÅÏÈÉ趨"
 
 #: src/prefs.c:2459
-msgid "GAIM debug output window"
-msgstr "GAIM ³ý³æÊä³ö´°¿Ú"
+msgid "Gaim debug output window"
+msgstr "Gaim ³ý³æÊä³ö´°¿Ú"
 
 #: src/prefs.c:2653
 msgid "General"

[Gaim-commits] CVS: gaim/plugins PERL-HOWTO,1.12,1.13 gtik.c,1.4,1.5

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

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

Modified Files:
	PERL-HOWTO gtik.c 
Log Message:
I got an itty bitty diff for you now ;-)


Index: PERL-HOWTO
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/PERL-HOWTO,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- PERL-HOWTO	2001/10/15 20:08:14	1.12
+++ PERL-HOWTO	2001/10/18 12:12:36	1.13
@@ -3,7 +3,7 @@
 
 If you've ever written a perl script for X-Chat then you've basically written
 one for gaim as well. perl.c in gaim's source is basically an exact copy of
-X-Chat's perl.c file, with small modifications to suit GAIM rather than IRC.
+X-Chat's perl.c file, with small modifications to suit Gaim rather than IRC.
 
 Basically the reason for including perl is based on the experience with the
 plugins. X-Chat's docs on Perl Scripting sums it up nicely:

Index: gtik.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/gtik.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtik.c	2001/08/14 21:50:38	1.4
+++ gtik.c	2001/10/18 12:12:36	1.5
@@ -607,7 +607,7 @@
 	}
 
 	char *name() {
-		return "The Gnome Stock Ticker for GAIM";
+		return "The Gnome Stock Ticker for Gaim";
 	}
 
 

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

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

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

Modified Files:
	about.c 
Log Message:
oops



Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- about.c	2001/10/18 07:22:26	1.51
+++ about.c	2001/10/18 07:29:13	1.52
@@ -91,7 +91,7 @@
 
 		about = gtk_window_new(GTK_WINDOW_DIALOG);
 		gtk_widget_set_usize(GTK_WIDGET(about), 450, -1);
-		g_snprintf(abouttitle, sizeof(abouttitle), _("About GAIM v%s"), VERSION);
+		g_snprintf(abouttitle, sizeof(abouttitle), _("About Gaim v%s"), VERSION);
 		gtk_window_set_title(GTK_WINDOW(about), abouttitle);
 		gtk_window_set_wmclass(GTK_WINDOW(about), "about", "Gaim");
 		gtk_window_set_policy(GTK_WINDOW(about), FALSE, TRUE, TRUE);

[Gaim-commits] CVS: gaim/src applet.c,1.19,1.20 dialogs.c,1.261,1.262 ticker.c,1.15,1.16

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

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

Modified Files:
	applet.c dialogs.c ticker.c 
Log Message:
I got an itty bitty diff for you ;-)



Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- applet.c	2001/10/13 03:23:55	1.19
+++ applet.c	2001/10/18 07:26:56	1.20
@@ -324,11 +324,11 @@
 {
 	GdkPixmap *pm;
 
-	applet_widget_init("GAIM", VERSION, argc, argv, NULL, 0, NULL);
+	applet_widget_init("Gaim", VERSION, argc, argv, NULL, 0, NULL);
 
 	applet = applet_widget_new("gaim_applet");
 	if (!applet)
-		g_error(_("Can't create GAIM applet!"));
+		g_error(_("Can't create Gaim applet!"));
 	gtk_widget_set_events(applet, gtk_widget_get_events(applet) | GDK_BUTTON_PRESS_MASK);
 	gtk_widget_realize(applet);
 

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- dialogs.c	2001/10/18 00:30:34	1.261
+++ dialogs.c	2001/10/18 07:26:56	1.262
@@ -2284,7 +2284,7 @@
 
 		gtk_container_add(GTK_CONTAINER(c->link_dialog), fbox);
 		gtk_container_border_width(GTK_CONTAINER(c->link_dialog), 10);
-		gtk_window_set_title(GTK_WINDOW(c->link_dialog), _("GAIM - Add URL"));
+		gtk_window_set_title(GTK_WINDOW(c->link_dialog), _("Gaim - Add URL"));
 		gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url);
 		b->window = c->link_dialog;
 		b->toggle = linky;

Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ticker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ticker.c	2001/09/20 01:20:29	1.15
+++ ticker.c	2001/10/18 07:26:56	1.16
@@ -66,7 +66,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, and Syd Logan"; 
 
 void
 BuddyTickerCreateWindow()
@@ -76,7 +76,7 @@
         tickerwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         gtk_signal_connect (GTK_OBJECT(tickerwindow), "destroy",
                 GTK_SIGNAL_FUNC (BuddyTickerDestroyWindow), "WM destroy");
-        gtk_window_set_title (GTK_WINDOW(tickerwindow), "GAIM - Buddy Ticker");
+        gtk_window_set_title (GTK_WINDOW(tickerwindow), "Gaim - Buddy Ticker");
         gtk_window_set_wmclass (GTK_WINDOW(tickerwindow), 
                                 "ticker", "Gaim");
 

[Gaim-commits] CVS: gaim/src about.c,1.50,1.51 aim.c,1.168,1.169

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

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

Modified Files:
	about.c aim.c 
Log Message:
I gotta big ol' fat diff for you.



Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- about.c	2001/10/08 15:07:42	1.50
+++ about.c	2001/10/18 07:22:26	1.51
@@ -115,7 +115,7 @@
 		/* Left side, TOP */
 		style = gtk_widget_get_style(about);
 		pm = gdk_pixmap_create_from_xpm_d(about->window, &bm,
-						  &style->bg[GTK_STATE_NORMAL], (gchar **)aol_logo);
+						  &style->bg[GTK_STATE_NORMAL], (gchar **)gaim_logo_xpm);
 		pixmap = gtk_pixmap_new(pm, bm);
 		gdk_pixmap_unref(pm);
 		gdk_bitmap_unref(bm);
@@ -124,7 +124,7 @@
 
 		label =
 		    gtk_label_new(
-				  _("GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+				  _("Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
 				   "using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n"
 				   "IRC: #gaim on irc.openprojects.net"));
 

Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- aim.c	2001/10/18 00:44:42	1.168
+++ aim.c	2001/10/18 07:22:26	1.169
@@ -246,7 +246,7 @@
 
 	style = gtk_widget_get_style(mainwindow);
 	pm = gdk_pixmap_create_from_xpm_d(mainwindow->window, &mask,
-					  &style->bg[GTK_STATE_NORMAL], (gchar **)aol_logo);
+					  &style->bg[GTK_STATE_NORMAL], (gchar **)gaim_logo_xpm);
 	pmw = gtk_pixmap_new(pm, mask);
 	gtk_table_attach(GTK_TABLE(table), pmw, 0, 2, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(pmw);

[Gaim-commits] CVS: gaim/pixmaps logo.xpm,1.1,1.2

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

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

Modified Files:
	logo.xpm 
Log Message:
I gotta big ol' fat diff for you.



Index: logo.xpm
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/logo.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logo.xpm	2000/03/23 03:13:54	1.1
+++ logo.xpm	2001/10/18 07:22:26	1.2
@@ -1,410 +1,749 @@
-static char *aol_logo[] = {
-"190 150 256 2",
-"   c #020102",
-".  c #01010c",
-"X  c #0c0502",
-"o  c #010114",
-"O  c #03031a",
-"+  c #160601",
-"@  c #1b1303",
-"#  c #161118",
-"$  c #010224",
[...1128 lines suppressed...]
+". . . . . . . . . . . . . . ++++b@V+z#z#Y@Y@*#{%6.`$m@m@. . . . . . . . ++++l+U@:@m+W@W@:@V+@+t ,$. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . ++++b@V+n@z#Y@Y@~#=#6.T$m@m@. . . . . . . . ' ++l+l+:@:@W@W@:@V+@+t . ' . . . . . ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . ' ++V@b@X@n@:$:$Z$e%W$c.' ' . . . . . . . . . . ++++@+l+b@V+V@V@m@t . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . ' ++V@b@X@X@z#:$Z$I$U$A#' ' . @ . . . . . . . . ' ++@+l+b@b@V@V@t t . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . ' ' U@U@z@z@W@W@c.W$w @+@ @ . + . . . . . . + + . . ++++t @+m@t ' ' . . . . . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . ' ' l+U@m+z@W@W@A##$@+@+@ @ . + . . . . . . + + + . ' ' t t t t ' ' . . . . . . . . + + . . . . + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . @+@+b@V+V+V+@+@+' ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . @+@+b@V+b@b@@+q#' ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . ++t @+l+l+l+++++. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . ++++@+@+@+@+++' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . ' ' ' ' . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . ' ' ' @ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};

[Gaim-commits] CVS: gaim ChangeLog,1.323,1.324

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

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

Modified Files:
	ChangeLog 
Log Message:
My wording sucked before. It still sucks. Im sleepy.

North Carolina come on and raise up, take off your shirt, twist it round your head, spin it like a helicopter...



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- ChangeLog	2001/10/18 00:44:42	1.323
+++ ChangeLog	2001/10/18 06:59:26	1.324
@@ -18,8 +18,9 @@
 	* Redesigned Modify Account window (thanks Sean Egan)
 	* Add buddy dialog now lets you select which protocol
 	  to add the buddy to
-	* Attempting to sign on to accounts, from the main screen,  
-	  which do not require a password now functions properly.
+	* Pressing 'signon' on the first screen for accounts that
+	  do not require passwords no longer incorrectly displays 
+	  an error message.
 
 version 0.45 (10/04/2001):
 	* New plugin event: event_chat_send_invite

[Gaim-commits] CVS: gaim/src aim.c,1.167,1.168 server.c,1.200,1.201

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

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

Modified Files:
	aim.c server.c 
Log Message:
This was kinda annoying. I was trying to sign on to my IRC account from the
first screen. Wouldn't let me. It kept bitching about my password being empty.
This should fix it.



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- aim.c	2001/10/15 19:52:44	1.167
+++ aim.c	2001/10/18 00:44:42	1.168
@@ -141,13 +141,10 @@
 		return;
 	}
 
-	if (!strlen(password)) {
-		do_error_dialog(_("Please enter your password"), _("Signon Error"));
-		return;
-	}
+	/* if there is more than one user of the same name, then fuck 
+	 * them, they just have to use the account editor to sign in 
+	 * the second one */
 
-	/* if there is more than one user of the same name, then fuck them, they just have
-	 * to use the account editor to sign in the second one */
 	u = find_user(username, -1);
 	if (!u)
 		u = new_user(username, DEFAULT_PROTO, OPT_USR_REM_PASS);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- server.c	2001/10/15 02:43:44	1.200
+++ server.c	2001/10/18 00:44:43	1.201
@@ -44,9 +44,16 @@
 void serv_login(struct aim_user *user)
 {
 	struct prpl *p = find_prpl(user->protocol);
+	
 	if (user->gc != NULL)
 		return;
+
 	if (p && p->login) {
+		if (!strlen(user->password) && !(p->options & OPT_PROTO_NO_PASSWORD)) {
+			do_error_dialog(_("Please enter your password"), _("Signon Error"));
+			return;
+		}
+
 		debug_printf("Logging in using %s\n", (*p->name)());
 		(*p->login)(user);
 	} else {

[Gaim-commits] CVS: gaim ChangeLog,1.322,1.323

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

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

Modified Files:
	ChangeLog 
Log Message:
This was kinda annoying. I was trying to sign on to my IRC account from the
first screen. Wouldn't let me. It kept bitching about my password being empty.
This should fix it.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- ChangeLog	2001/10/18 00:24:17	1.322
+++ ChangeLog	2001/10/18 00:44:42	1.323
@@ -18,6 +18,8 @@
 	* Redesigned Modify Account window (thanks Sean Egan)
 	* Add buddy dialog now lets you select which protocol
 	  to add the buddy to
+	* Attempting to sign on to accounts, from the main screen,  
+	  which do not require a password now functions properly.
 
 version 0.45 (10/04/2001):
 	* New plugin event: event_chat_send_invite

[Gaim-commits] CVS: gaim/src dialogs.c,1.260,1.261

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

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

Modified Files:
	dialogs.c 
Log Message:
I'm pissing myself off.



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- dialogs.c	2001/10/18 00:29:05	1.260
+++ dialogs.c	2001/10/18 00:30:34	1.261
@@ -873,7 +873,6 @@
 	GtkWidget *cancel;
 	GtkWidget *add;
 	GtkWidget *label;
-	GList *tmp;
 
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc;

[Gaim-commits] CVS: gaim/src dialogs.c,1.259,1.260

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

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

Modified Files:
	dialogs.c 
Log Message:
Drugs are bad, mmmkay.



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- dialogs.c	2001/10/18 00:24:08	1.259
+++ dialogs.c	2001/10/18 00:29:05	1.260
@@ -897,7 +897,7 @@
 	gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
-	table = gtk_table_new(3, 3, FALSE);
+	table = gtk_table_new(4, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
 	gtk_container_set_border_width(GTK_CONTAINER(table), 5);

[Gaim-commits] CVS: gaim ChangeLog,1.321,1.322

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

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

Modified Files:
	ChangeLog 
Log Message:
I forgot to commit this.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- ChangeLog	2001/10/17 15:10:36	1.321
+++ ChangeLog	2001/10/18 00:24:17	1.322
@@ -16,6 +16,8 @@
 	* Can pass an argument to timeout_handlers in perl
 	  (thanks Artem Litvinovich)
 	* Redesigned Modify Account window (thanks Sean Egan)
+	* Add buddy dialog now lets you select which protocol
+	  to add the buddy to
 
 version 0.45 (10/04/2001):
 	* New plugin event: event_chat_send_invite