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

[Gaim-commits] CVS: gaim/src gaimrc.c,1.100,1.101 prefs.c,1.240,1.241

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

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

Modified Files:
	gaimrc.c prefs.c 
Log Message:
I'm amusement value.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- gaimrc.c	25 Aug 2002 10:51:23 -0000	1.100
+++ gaimrc.c	25 Aug 2002 23:36:26 -0000	1.101
@@ -1059,7 +1059,7 @@
 	report_idle = IDLE_GAIM;
 #endif
 	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: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- prefs.c	25 Aug 2002 23:15:40 -0000	1.240
+++ prefs.c	25 Aug 2002 23:36:26 -0000	1.241
@@ -1,7 +1,7 @@
 /*
  * gaim
  *
- * Copyright (C) 2002, Sean Egan <bj...@bi...>
+ * Copyright (C) 1998-2002, Mark Spencer <mar...@ma...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1362,7 +1362,7 @@
 	proxytype_new = proxytype;
 	g_snprintf(sound_cmd_new, sizeof(sound_cmd_new), "%s", sound_cmd);
 	g_snprintf(web_command_new, sizeof(web_command_new), "%s", 
-		   web_command ? web_command : "xterm -e lynx \"%%s\"");
+		   web_command ? web_command : "xterm -e lynx %%s");
 	g_snprintf(fontface_new, sizeof(fontface_new), fontface);
 #if !GTK_CHECK_VERSION(1,3,0)
 	g_snprintf(fontxfld_new, sizeof(fontxfld_new), fontxfld);

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.3,1.509.2.4

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

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

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
Ethan's proxy fix patch.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.3
retrieving revision 1.509.2.4
diff -u -d -r1.509.2.3 -r1.509.2.4
--- ChangeLog	25 Aug 2002 02:29:19 -0000	1.509.2.3
+++ ChangeLog	25 Aug 2002 23:31:48 -0000	1.509.2.4
@@ -6,6 +6,7 @@
 	  Uekawa)
 	* Will work with Perl 5.8 (thanks, Timothy Lee and Dan 
 	  Colascione)
+	* Fix for HTTP proxies (thanks, Ethan Blanton)	
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

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

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

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

Modified Files:
      Tag: gtk1-stable
	proxy.c 
Log Message:
Ethan's proxy fix patch.


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -d -r1.42 -r1.42.2.1
--- proxy.c	31 May 2002 02:00:41 -0000	1.42
+++ proxy.c	25 Aug 2002 23:31:48 -0000	1.42.2.1
@@ -222,8 +222,8 @@
 	return fd;
 }
 
-#define HTTP_GOODSTRING "HTTP/1.0 200 Connection established"
-#define HTTP_GOODSTRING2 "HTTP/1.1 200 Connection established"
+#define HTTP_GOODSTRING "HTTP/1.0 200"
+#define HTTP_GOODSTRING2 "HTTP/1.1 200"
 
 static void http_canread(gpointer data, gint source, GaimInputCondition cond)
 {

[Gaim-commits] CVS: gaim/src list.c,1.14,1.14.2.1

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

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

Modified Files:
      Tag: gtk1-stable
	list.c 
Log Message:
Fix by 162923752


Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- list.c	12 Apr 2002 02:15:24 -0000	1.14
+++ list.c	25 Aug 2002 23:25:51 -0000	1.14.2.1
@@ -799,7 +799,7 @@
 		toc_build_config(g, buf, 8192 - 1, TRUE);
 		fprintf(f, "%s\n", buf);
 		fclose(f);
-		chmod(buf, S_IRUSR | S_IWUSR);
+		chmod(path, S_IRUSR | S_IWUSR);
 	} else {
 		debug_printf("unable to write %s\n", path);
 	}

[Gaim-commits] CVS: gaim/src prefs.c,1.239,1.240

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

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

Modified Files:
	prefs.c 
Log Message:
Here, Luke.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- prefs.c	25 Aug 2002 23:06:36 -0000	1.239
+++ prefs.c	25 Aug 2002 23:15:40 -0000	1.240
@@ -118,7 +118,7 @@
 	
 	 prefs = NULL;
 	 for (v = 0; v < NUM_SOUNDS; v++) {
-		if (sound_file_new[v])
+		if (sound_file_new[v] && (sound_file_new[v] != sound_file[v]))
 			g_free(sound_file_new[v]);
 		sound_file_new[v] = NULL;
 	 }

[Gaim-commits] CVS: gaim/src prefs.c,1.238,1.239

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

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

Modified Files:
	prefs.c 
Log Message:
Cool camels use Gaim!  And even cowboys!

Thanks, Etan.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- prefs.c	25 Aug 2002 20:13:07 -0000	1.238
+++ prefs.c	25 Aug 2002 23:06:36 -0000	1.239
@@ -1,7 +1,7 @@
 /*
  * gaim
  *
- * Copyright (C) 1998-2002, Mark Spencer <mar...@ma...>
+ * Copyright (C) 2002, Sean Egan <bj...@bi...>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -652,6 +652,10 @@
 	return ret;
 }
 
+static void browser_print_option(GtkEntry *entry, void *nullish) {
+	g_snprintf(web_command_new, sizeof(web_command_new), "%s", gtk_entry_get_text(entry));
+}
+
 GtkWidget *browser_page() {
 	GtkWidget *ret;
 	GtkWidget *vbox, *hbox;
@@ -686,6 +690,10 @@
 		gtk_widget_set_sensitive(browser_entry, FALSE);
 	gtk_box_pack_start (GTK_BOX (hbox), browser_entry, FALSE, FALSE, 0);
 
+	gtk_entry_set_text(GTK_ENTRY(browser_entry), web_command_new);
+	gtk_signal_connect(GTK_OBJECT(browser_entry), "changed",
+			   GTK_SIGNAL_FUNC(browser_print_option), NULL);
+
 	vbox = make_frame (ret, _("Browser Options"));
 	gaim_button(_("Open new _window by default"), &misc_options_new, OPT_MISC_BROWSER_POPUP, vbox);
 
@@ -1353,7 +1361,8 @@
 	web_browser_new = web_browser;
 	proxytype_new = proxytype;
 	g_snprintf(sound_cmd_new, sizeof(sound_cmd_new), "%s", sound_cmd);
-	g_snprintf(web_command_new, sizeof(web_command_new), "%s", web_command);
+	g_snprintf(web_command_new, sizeof(web_command_new), "%s", 
+		   web_command ? web_command : "xterm -e lynx \"%%s\"");
 	g_snprintf(fontface_new, sizeof(fontface_new), fontface);
 #if !GTK_CHECK_VERSION(1,3,0)
 	g_snprintf(fontxfld_new, sizeof(fontxfld_new), fontxfld);

[Gaim-commits] CVS: gaim gaim.spec.in,1.53,1.54

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

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

Modified Files:
	gaim.spec.in 
Log Message:
Cool camels use Gaim!  And even cowboys!

Thanks, Etan.


Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gaim.spec.in	2 Aug 2002 05:19:52 -0000	1.53
+++ gaim.spec.in	25 Aug 2002 23:06:36 -0000	1.54
@@ -17,7 +17,7 @@
 Source:		%{name}-%{version}.tar.gz
 Packager:	Rob Flynn <ro...@ma...>
 BuildRoot:	/var/tmp/%{name}-%{version}-root
-Requires:	gtk+ >= 1.2.5
+Requires:	gtk+ >= 2.0.0
 
 %description
 Gaim allows you to talk to anyone using a variety of messaging 
@@ -31,38 +31,17 @@
 
 Gaim is NOT affiliated with or endorsed by AOL.
 
-%package applet
-Summary:	A Gnome based multiprotocol instant messaging applet
-Group:		Applications/Internet
-Requires:	gtk+ >= 1.2.5
-
-%description applet
-Gaim allows you to talk to anyone using a variety of messaging 
-protocols, including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, 
-MSN Messenger, Jabber, Gadu-Gadu, Napster, and Zephyr.  These 
-protocols are implemented using a modular, easy to use design.  
-To use a protocol, just load the plugin for it.
-
-Gaim supports many common features of other clients, as well as many 
-unique features, such as perl scripting and C plugins.
-
-The applet sits in your Gnome panel. It has all the same functionality
-as the regular application but takes less desktop space.
-
-Gaim is NOT affiliated with or endorsed by AOL.
-
 %prep
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-gnome --disable-artsc
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-artsc
 make
 if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
 mkdir -p $RPM_BUILD_ROOT%{prefix}
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 make -C src mostlyclean-compile
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=%{sysconfdir} --enable-distrib --disable-artsc
-make -C src gaim_applet
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT prefix=%{prefix} sysconfdir=%{sysconfdir} install
@@ -76,20 +55,6 @@
 %{prefix}/share/locale/*/*/*
 %{prefix}/share/pixmaps/gaim.png
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
-
-
-%files applet
-%defattr(-,root,root)
-%attr(755,root,root) %{prefix}/bin/gaim_applet
-%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog plugins/PERL-HOWTO HACKING
-%{prefix}/man/man1/gaim.1.gz
-%{prefix}/lib/gaim/*
-%{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.png
-%{prefix}/share/pixmaps/gaim/*
-%{prefix}/share/gnome/apps/Internet/gaim.desktop
-%{sysconfdir}/CORBA/servers/*
-%{prefix}/share/applets/Network/*
 
 %clean
 rm -r $RPM_BUILD_ROOT

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

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

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

Modified Files:
      Tag: gtk1-stable
	conversation.c 
Log Message:
Believe me when I tell you, I'll never  do you know harm.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.358
retrieving revision 1.358.2.1
diff -u -d -r1.358 -r1.358.2.1
--- conversation.c	15 Jun 2002 17:24:07 -0000	1.358
+++ conversation.c	25 Aug 2002 21:29:03 -0000	1.358.2.1
@@ -2244,7 +2244,7 @@
 
 	speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 					     GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					     NULL, NULL, _("Sound"),
+					     NULL, NULL, _("Toggle Sound"),
 					     _("Sound"), speaker_p, GTK_SIGNAL_FUNC(toggle_sound), c);
 	c->makesound = 1;
 

[Gaim-commits] CVS: gaim/src conversation.c,1.365,1.366

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

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

Modified Files:
	conversation.c 
Log Message:
Luke Schierer came up with this list of colors.  He's like a giant rainbow!

And Robert McQueen did that browser fix--I incorrectly credited Christian 
Hammond--he doesn't do anything, the slacker.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -d -r1.365 -r1.366
--- conversation.c	25 Aug 2002 10:51:23 -0000	1.365
+++ conversation.c	25 Aug 2002 20:54:37 -0000	1.366
@@ -1751,10 +1751,40 @@
 /*  Takin care of the window..                                            */
 /*------------------------------------------------------------------------*/
 
-static char* nick_colors[] = {"#ff0000", "#ff00ff", "#00ffff", "#04a241",
-			      "#ffae00", "#bd008a", "#4c9f9c", "#7f0000",
-			      "#6477a2"};
-#define NUM_NICK_COLORS 9
+static char* nick_colors[] = {
+	"#ba55d3",              /* Medium Orchid */
+	"#ee82ee",              /* Violet */
+	"#c715b4",              /* Medium Violet Red */
+	"#ff69b4",              /* Hot Pink */
+	"#ff6347",              /* Tomato */
+	"#fa8c00",              /* Dark Orange */
+	"#fa8072"               /* Salmon */
+	"#b22222",              /* Fire Brick */
+	"#f4a460",              /* Sandy Brown */
+	"#cd5c5c",              /* Indian Red */
+	"#bc8f8f",              /* Rosy Brown */
+	"#f0e68c",              /* Khaki */
+	"#bdb76b",              /* Dark Khaki */
+	"#228b22",              /* Forest Green */
+	"#9acd32",              /* Yellow Green */
+	"#32cd32",              /* Lime Green */
+	"#3cb371",              /* Medium Sea Green */
+	"#2e8b57",              /* Sea Green */
+	"#8fbc8f",              /* Dark Sea Green */
+	"#66cdaa",              /* Medium Aquamarine */
+	"#5f9ea0",              /* Cadet Blue */
+	"#48d1cc",              /* Medium Turquoise */
+	"#00ced1",              /* Dark Turquoise */
+	"#4682b4",              /* Stell Blue */
+	"#00bfff",              /* Deep Sky Blue */
+	"#1690ff",              /* Dodger Blue */
+	"#4169ff",              /* Royal Blue */
+	"#6a5acd",              /* Slate Blue */
+	"#6495ed",              /* Cornflower Blue */
+	"#708090",              /* Slate gray */
+	"#ffdead",              /* Navajo White */
+};
+#define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(char *)) 
 
 /* this is going to be interesting since the conversation could either be a
  * normal IM conversation or a chat window. but hopefully it won't matter */

[Gaim-commits] CVS: gaim/m4 gnome-gnorba-check.m4,1.1,NONE gnome-orbit-check.m4,1.1,NONE gnome-x-checks.m4,1.1,NONE gnome.m4,1.2,NONE

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

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

Removed Files:
	gnome-gnorba-check.m4 gnome-orbit-check.m4 gnome-x-checks.m4 
	gnome.m4 
Log Message:
Bye bye, GNOME.


--- gnome-gnorba-check.m4 DELETED ---

--- gnome-orbit-check.m4 DELETED ---

--- gnome-x-checks.m4 DELETED ---

--- gnome.m4 DELETED ---

[Gaim-commits] CVS: gaim/src prefs.c,1.237,1.238

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

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

Modified Files:
	prefs.c 
Log Message:
+       sound selection dialog remembers what directory it was last in erradically


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- prefs.c	25 Aug 2002 10:51:23 -0000	1.237
+++ prefs.c	25 Aug 2002 20:13:07 -0000	1.238
@@ -935,7 +935,7 @@
 
 	if (last_sound_dir)
 		g_free(last_sound_dir);
-	last_sound_dir = g_dirname(sound_file[snd]);
+	last_sound_dir = g_dirname(sound_file_new[snd]);
 }
 
 static void sel_sound(GtkWidget *button, gpointer being_NULL_is_fun)

[Gaim-commits] CVS: gaim/plugins notify.c,1.12,1.13

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

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

Modified Files:
	notify.c 
Log Message:
Thanks Etan.


Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- notify.c	25 Aug 2002 10:51:22 -0000	1.12
+++ notify.c	25 Aug 2002 19:24:30 -0000	1.13
@@ -15,13 +15,14 @@
 #define GAIM_PLUGINS
 #include "gaim.h"
 
-#include <gtk/gtk.h>
 #include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <gtk/gtk.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
-#include <errno.h>
 
 guint choice = 1;
 #define NOTIFY_FOCUS		0x00000001
@@ -53,6 +54,7 @@
 void count_remove(GtkWidget *widget);
 void quote_remove(GtkWidget *widget);
 void urgent_remove(struct conversation *c);
+int counter (char *buf, int *length);
 
 int received_im(struct gaim_connection *gc, char **who, char **what, void *m) {
 	char buf[256];
@@ -122,7 +124,7 @@
 }
 
 int sent_im(struct gaim_connection *gc, char *who, char **what, void *m) {
-	char buf[256];
+	/* char buf[256]; */
 	struct conversation *c = find_conversation(who);
 
 	if (method & METHOD_QUOTE)
@@ -158,6 +160,7 @@
 		gtk_signal_connect_while_alive(GTK_OBJECT(c->entry), "key-press-event", GTK_SIGNAL_FUNC(un_star_window), NULL, GTK_OBJECT(really_evil_hack));
 		gtk_object_set_user_data(GTK_OBJECT(c->entry), (gpointer) c);
 	}
+	return 0;
 }
 
 void un_star(GtkWidget *widget, gpointer data) {
@@ -243,12 +246,11 @@
 }
 
 void urgent_remove(struct conversation *c) {
-	char buf[256];
 	GdkWindow *win = c->window->window;
 
-	XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window));
+	XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win));
 	hints->flags &= ~XUrgencyHint;
-	XSetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window), hints);
+	XSetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win), hints);
 	return;
 }
 
@@ -258,7 +260,7 @@
 
 	snprintf(buf, 1000, "%s/.gaim/.notify", getenv("HOME"));
 	if (!(fp = fopen(buf, "w"))) {
-		do_error_dialog(_("Unable to write notify plugin config file"), strerror(errno), GAIM_ERROR);
+		do_error_dialog(_("Unable to write to config file"), _("Notify plugin"), GAIM_ERROR);
 		return;
 	}
 
@@ -380,7 +382,7 @@
 
 void gaim_plugin_remove() {
 	GList *c = conversations;
-	guint options;
+	/* guint options; */
 
 	gtk_widget_destroy(really_evil_hack);
 

[Gaim-commits] CVS: gaim/src aim.c,1.183,1.184 buddy.c,1.322,1.323 buddy_chat.c,1.154,1.155 conversation.c,1.364,1.365 dialogs.c,1.328,1.329 gaim.h,1.330,1.331 gaimrc.c,1.99,1.100 module.c,1.16,1.17 multi.c,1.122,1.123 perl.c,1.73,1.74 prefs.c,1.236,1.237 prpl.c,1.56,1.57 server.c,1.228,1.229 ui.h,1.46,1.47 util.c,1.127,1.128

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

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

Modified Files:
	aim.c buddy.c buddy_chat.c conversation.c dialogs.c gaim.h 
	gaimrc.c module.c multi.c perl.c prefs.c prpl.c server.c ui.h 
	util.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- aim.c	11 Aug 2002 06:42:16 -0000	1.183
+++ aim.c	25 Aug 2002 10:51:22 -0000	1.184
@@ -159,7 +159,7 @@
 	const char *password = gtk_entry_get_text(GTK_ENTRY(pass));
 
 	if (!strlen(username)) {
-		do_error_dialog(_("Please enter your logon"), _("Signon Error"));
+		do_error_dialog(_("Please enter your login."), NULL, GAIM_ERROR);
 		return;
 	}
 

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- buddy.c	22 Aug 2002 00:45:49 -0000	1.322
+++ buddy.c	25 Aug 2002 10:51:22 -0000	1.323
@@ -1626,7 +1626,7 @@
 					   (when & OPT_POUNCE_UNIDLE) ? "returned from being idle" : 
 					   "returned from being away");
 				
-				do_error_dialog(tmp, _("Buddy Pounce"));
+				do_error_dialog(tmp, NULL, GAIM_INFO);
 			}
 			if (b->options & OPT_POUNCE_SEND_IM) {
 				if (strlen(b->message) > 0) {

Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- buddy_chat.c	2 Aug 2002 04:52:45 -0000	1.154
+++ buddy_chat.c	25 Aug 2002 10:51:23 -0000	1.155
@@ -251,7 +251,7 @@
 	}
 	if (gc == NULL) {
 		do_error_dialog("You are not currently signed on with any protocols that have "
-				"the ability to chat.", "Unable to chat");
+				"the ability to chat.", NULL, GAIM_ERROR);
 		return;
 	}
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- conversation.c	8 Aug 2002 12:30:29 -0000	1.364
+++ conversation.c	25 Aug 2002 10:51:23 -0000	1.365
@@ -1333,11 +1333,11 @@
 
 	if (err < 0) {
 		if (err == -E2BIG)
-			do_error_dialog(_("Unable to send message: too large"), _("Message Error"));
+			do_error_dialog(_("Unable to send message.  The message is too large"), NULL, GAIM_ERROR);
 		else if (err == -ENOTCONN)
 			debug_printf("Not yet connected\n");
 		else
-			do_error_dialog(_("Unable to send message: Unknown reason"), _("Message Error"));
+			do_error_dialog(_("Unable to send message"), NULL, GAIM_ERROR);
 	} else {
 		gtk_editable_delete_text(GTK_EDITABLE(c->entry), 0, -1);
 
@@ -3478,7 +3478,7 @@
 			fwrite(data, 1, len, file);
 		fclose(file);
 	} else {
-		do_error_dialog("Can't open file for writing", "Error");
+		do_error_dialog("Can't save icon file to disk", strerror(errno), GAIM_ERROR);
 	}
 
 	gtk_widget_destroy(c->save_icon);

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- dialogs.c	5 Aug 2002 07:33:09 -0000	1.328
+++ dialogs.c	25 Aug 2002 10:51:23 -0000	1.329
@@ -551,55 +551,69 @@
 /*  The dialog for getting an error                                       */
 /*------------------------------------------------------------------------*/
 
-GtkWidget *do_error_dialog(char *message, char *title)
+GtkWidget *do_error_dialog(char *primary, char *secondary, int type)
 {
 	GtkWidget *d;
 	GtkWidget *label;
 	GtkWidget *close;
 	GtkWidget *img = NULL;
-	/*
-#if GTK_CHECK_VERSION(1,3,0)
-	char *filename;
+	GtkWidget *hbox;
+	char labeltext[1024 * 2];
+ 	char *filename = NULL;
+
+	/* These are the GTK stock dialog icons with our little Gaim logo on top.
+	 * Inspired by the GIMP. */
 	switch (type){
 	case GAIM_LOGO:
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "gaim.png", NULL);
-		break;
-	case GAIM_INFO:
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_info.png", NULL);
-		break;
-	case GAIM_WARNING:
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_warning.png", NULL);
-		break;
-	case GAIM_ERROR:
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_error.png", NULL);
-		break;
-	case GAIM_QUESTION:
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
-		break;
+		 filename = g_build_filename(DATADIR, "pixmaps", "gaim", "gaim.png", NULL);
+		 break;
+ 	case GAIM_INFO:
+	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_info.png", NULL);
+		break; 
+	 case GAIM_WARNING:
+	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_warning.png", NULL);
+	  	break;
+	 case GAIM_ERROR:
+	 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_error.png", NULL);
+	 	break;
+		/*	 case GAIM_QUESTION:
+			 filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
+			 break;
+		*/
 	}
-	img = gtk_image_new_from_file(filename);
-#endif
-	*/
+	if (filename) {
+		img = gtk_image_new_from_file(filename);
+		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+	}
+	d = gtk_dialog_new_with_buttons(NULL, NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+	g_signal_connect(d, "response", G_CALLBACK(gtk_widget_destroy), NULL);
+	
+	gtk_container_set_border_width (GTK_CONTAINER(d), 6);
+	gtk_window_set_resizable(GTK_WINDOW(d), FALSE);
+	gtk_dialog_set_has_separator(GTK_DIALOG(d), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(d)->vbox), 12);
+	gtk_container_set_border_width (GTK_CONTAINER(GTK_DIALOG(d)->vbox), 6);
 
-	d = gtk_dialog_new();
-	gtk_window_set_policy(GTK_WINDOW(d), FALSE, FALSE, TRUE);
-	gtk_widget_realize(d);
-	label = gtk_label_new(message);
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(d)->vbox), hbox);
+	if (filename) {
+		gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
+	}
+	gtk_widget_show(img);
+
+	g_snprintf(labeltext, sizeof(labeltext), "<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", primary, secondary ? secondary : "");
+	
+	label = gtk_label_new(NULL);
+	gtk_label_set_markup(GTK_LABEL(label), labeltext);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), label, FALSE, FALSE, 5);
-
-	close = picture_button(d, _("Close"), cancel_xpm);
-
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), close, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-	gtk_container_set_border_width(GTK_CONTAINER(d), 5);
-	gtk_window_set_title(GTK_WINDOW(d), title);
-	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), d);
+	gtk_widget_show(hbox);
 	aol_icon(d->window);
 
 	gtk_widget_show(d);
-	gtk_widget_grab_focus(close);
 	return d;
 }
 
@@ -1543,7 +1557,7 @@
 	struct buddy_pounce *bp;
 	
 	if (strlen(gtk_entry_get_text(GTK_ENTRY(b->nameentry))) == 0) {
-		do_error_dialog(_("Please enter a buddy to pounce."), _("Buddy Pounce Error"));
+		do_error_dialog(_("Please enter a buddy to pounce."), NULL, GAIM_ERROR);
 		return;
 	}
 
@@ -2109,12 +2123,12 @@
 	new2 = gtk_entry_get_text(GTK_ENTRY(b->new2));
 
 	if (g_strcasecmp(new1, new2)) {
-		do_error_dialog(_("New Passwords Do Not Match"), _("Gaim - Change Password Error"));
+		do_error_dialog(_("New Passwords Do Not Match"), NULL, GAIM_ERROR);
 		return;
 	}
 
 	if ((strlen(orig) < 1) || (strlen(new1) < 1) || (strlen(new2) < 1)) {
-		do_error_dialog(_("Fill out all fields completely"), _("Gaim - Change Password Error"));
+		do_error_dialog(_("Fill out all fields completely"), NULL, GAIM_ERROR);
 		return;
 	}
 
@@ -3428,14 +3442,15 @@
 {
 	if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) {
 		/* We shouldn't allow a blank title */
-		do_error_dialog(_("You cannot create an away message with a blank title"),
-				_("Gaim - Error"));
+		do_error_dialog(_("You cannot save an away message with a blank title"), 
+				_("Please give the message a title, or choose \"Make Away\" to use "
+				  "without saving."), GAIM_ERROR);
 		return 0;
 	}
 
 	if ((gtk_text_get_length(GTK_TEXT(ca->text)) == 0) && (type <= 1)) {
 		/* We shouldn't allow a blank message */
-		do_error_dialog(_("You cannot create an empty away message"), _("Gaim - Error"));
+		do_error_dialog(_("You cannot create an empty away message"), NULL, GAIM_ERROR);
 		return 0;
 	}
 
@@ -3915,15 +3930,15 @@
 
 	if ((fp_new = fopen(path, "w")) == NULL) {
 		g_snprintf(error, BUF_LONG,
-			   "Can't open file %s for writing - %s", path, strerror(errno));
-		do_error_dialog(error, "Error");
+			   _("Couldn't write to %s."), path);
+		do_error_dialog(error, strerror(errno), GAIM_ERROR);
 		return;
 	}
 
 	if ((fp_old = fopen(filename, "r")) == NULL) {
 		g_snprintf(error, BUF_LONG,
-			   "Can't open file %s for reading - %s", filename, strerror(errno));
-		do_error_dialog(error, "Error");
+			   _("Couldn't write to %s."), filename);
+		do_error_dialog(error, strerror(errno), GAIM_ERROR);
 		fclose(fp_new);
 		return;
 	}
@@ -3978,8 +3993,8 @@
 	g_free(tmp);
 
 	if ((remove(filename)) == -1) {
-		g_snprintf(buf, 256, _("Unable to remove file %s - %s"), filename, strerror(errno));
-		do_error_dialog(buf, _("Error"));
+		g_snprintf(buf, 256, _("Couldn't remove file %s." ), filename);
+		do_error_dialog(buf, strerror(errno), GAIM_ERROR);
 	}
 
 	window = gtk_object_get_user_data(GTK_OBJECT(w));
@@ -4054,8 +4069,8 @@
 		g_free(tmp);
 	}
 	if ((fp = fopen(filename, "r")) == NULL) {
-		g_snprintf(buf, BUF_LONG, "Unable to open log file %s", filename);
-		do_error_dialog(buf, "Error!");
+		g_snprintf(buf, BUF_LONG, "Couldn't open log file %s.", filename);
+		do_error_dialog(buf, strerror(errno), GAIM_ERROR);
 		return;
 	}
 
@@ -4185,8 +4200,8 @@
 		g_snprintf(filename, 256, "%s/logs/%s.log", tmp, normalize(name));
 		g_free(tmp);
 		if ((fp = fopen(filename, "r")) == NULL) {
-			g_snprintf(buf, BUF_LONG, "Unable to open log file %s", filename);
-			do_error_dialog(buf, "Error!");
+			g_snprintf(buf, BUF_LONG, "Couldn't open log file %s", filename);
+			do_error_dialog(buf, strerror(errno), GAIM_ERROR);
 			return;
 		}
 
@@ -4603,8 +4618,7 @@
 		gdk_window_set_group(w, mainwindow->window);
 #endif
 }
-
-#if GTK_CHECK_VERSION(1,3,0)
+ 
 GtkWidget *pixbuf_button(char *text, char *iconfile)
 {
 	GtkWidget *button, *image, *label, *bbox;
@@ -4628,7 +4642,7 @@
 	gtk_widget_show_all(bbox);
 	return button;
 }
-#endif
+
 
 GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
 {

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- gaim.h	11 Aug 2002 06:42:16 -0000	1.330
+++ gaim.h	25 Aug 2002 10:51:23 -0000	1.331
@@ -348,7 +348,7 @@
 
 /* Functions in dialogs.c */
 extern void g_show_info_text(struct gaim_connection *, char *, int, char *, ...);
-extern GtkWidget *do_error_dialog(char *, char *);
+extern GtkWidget *do_error_dialog(char *, char *, int type);
 extern void show_change_passwd(struct gaim_connection *);
 extern void show_set_dir(struct gaim_connection *);
 extern void show_find_email(struct gaim_connection *);

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- gaimrc.c	11 Aug 2002 09:03:32 -0000	1.99
+++ gaimrc.c	25 Aug 2002 10:51:23 -0000	1.100
@@ -1139,7 +1139,7 @@
 		fclose(f);
 	} else if (opt_rcfile_arg) {
 		g_snprintf(buf, sizeof(buf), _("Could not open config file %s."), opt_rcfile_arg);
-		do_error_dialog(buf, _("Preferences Error"));
+		do_error_dialog(buf, NULL, GAIM_ERROR);
 		set_defaults();
 	} else {
 		set_defaults();

Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- module.c	23 Apr 2002 16:30:09 -0000	1.16
+++ module.c	25 Aug 2002 10:51:23 -0000	1.17
@@ -103,13 +103,13 @@
 	plug->handle = g_module_open(filename, 0);
 	if (!plug->handle) {
 		error = (char *)g_module_error();
-		do_error_dialog(error, _("Plugin Error"));
+		do_error_dialog(_("Gaim was unable to load your plugin."), error, GAIM_ERROR);
 		g_free(plug);
 		return NULL;
 	}
 
 	if (!g_module_symbol(plug->handle, "gaim_plugin_init", (gpointer *)&gaim_plugin_init)) {
-		do_error_dialog(g_module_error(), _("Plugin Error"));
+		do_error_dialog(_("Gaim was unable to load your plugin."), g_module_error(), GAIM_ERROR);
 		g_module_close(plug->handle);
 		g_free(plug);
 		return NULL;
@@ -119,7 +119,7 @@
 	debug_printf("loaded plugin returned %s\n", retval ? retval : "NULL");
 	if (retval) {
 		plugin_remove_callbacks(plug->handle);
-		do_error_dialog(retval, _("Plugin Error"));
+		do_error_dialog("Gaim was unable to load your plugin.", retval, GAIM_ERROR);
 		g_module_close(plug->handle);
 		g_free(plug);
 		return NULL;

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- multi.c	11 Aug 2002 06:42:16 -0000	1.122
+++ multi.c	25 Aug 2002 10:51:23 -0000	1.123
@@ -945,15 +945,17 @@
 			signoff(u->gc);
 		} else {
 			if (u->protocol == PROTO_TOC)
-				do_error_dialog(_("You have attempted to login an IM account using the "
+				do_error_dialog(_("TOC not found."), 
+						_("You have attempted to login an IM account using the "
 						 "TOC protocol.  Because this protocol is inferior to "
 						 "OSCAR, it is now compiled as a plugin by default.  "
 						 "To login, edit this account to use OSCAR or load the "
-						  "TOC plugin."), _("Login Error"));
+						  "TOC plugin."), GAIM_ERROR);
 			else
-				do_error_dialog(_("You cannot log this account in; you do not have "
+				do_error_dialog(_("Protocol not found."), 
+						_("You cannot log this account in; you do not have "
 						  "the protocol it uses loaded, or the protocol does "
-						  "not have a login function."), _("Login Error"));
+						  "not have a login function."), GAIM_ERROR);
 		}
 		l = l->next;
 	}
@@ -1389,7 +1391,7 @@
 		gtk_widget_destroy(k->dlg);
 	k = g_new0(struct kick_dlg, 1);
 	k->user = gc->user;
-	k->dlg = do_error_dialog(buf, title);
+	k->dlg = do_error_dialog(title, buf, GAIM_ERROR);
 	kicks = g_slist_append(kicks, k);
 	gtk_signal_connect(GTK_OBJECT(k->dlg), "destroy", GTK_SIGNAL_FUNC(set_kick_null), k);
 	if (meter) {

Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- perl.c	16 Aug 2002 01:18:01 -0000	1.73
+++ perl.c	25 Aug 2002 10:51:23 -0000	1.74
@@ -410,7 +410,7 @@
 
 	title = SvPV(ST(0), junk);
 	message = SvPV(ST(1), junk);
-	do_error_dialog(message, title);
+	do_error_dialog(message, NULL, GAIM_INFO);
 	XSRETURN(0);
 }
 
@@ -876,7 +876,7 @@
 		s = s->next;
 	}
 
-	do_error_dialog(buf, _("Perl Scripts"));
+	do_error_dialog(buf, NULL, GAIM_INFO);
 }
 
 #endif /* USE_PERL */

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- prefs.c	18 Aug 2002 17:01:13 -0000	1.236
+++ prefs.c	25 Aug 2002 10:51:23 -0000	1.237
@@ -83,7 +83,6 @@
 #endif
 char fontface[128];
 
-
 GtkWidget *prefs_away_list = NULL;
 GtkWidget *prefs_away_menu = NULL;
 GtkWidget *preftree = NULL;
@@ -104,7 +103,7 @@
 GtkCTreeNode *deny_node = NULL;
 GtkWidget *prefs_proxy_frame = NULL;
 static GtkWidget *gaim_button(const char *, guint *, int, GtkWidget *);
[...1530 lines suppressed...]
@@ -2345,7 +1972,9 @@
 	
 	dropdown = gtk_option_menu_new();
 	menu = gtk_menu_new();
-
+	
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), dropdown);
+	
 	while (text) {
 		value = va_arg(menuitems, int);
 		opt = gtk_menu_item_new_with_label(text);
@@ -2368,7 +1997,7 @@
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(dropdown), menu);	
 	gtk_box_pack_start(GTK_BOX(hbox), dropdown, FALSE, FALSE, 0);
 	gtk_widget_show(dropdown);
-	return dropdown;
+	return label;
 }	
 	
 static GtkWidget *show_color_pref(GtkWidget *box, gboolean fgc)

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- prpl.c	10 Aug 2002 02:42:55 -0000	1.56
+++ prpl.c	25 Aug 2002 10:51:23 -0000	1.57
@@ -67,11 +67,12 @@
 	struct prpl *p;
 	struct prpl *old;
 	if (size != sizeof(struct prpl)) {
-		do_error_dialog(_("You have attempted to load a protocol which was not compiled"
+		do_error_dialog(_("Incompatible protocol detected."),
+				_("You have attempted to load a protocol which was not compiled"
 				  " from the same version of the source as this application was."
 				  " Unfortunately, because it is not the same version I cannot"
 				  " safely tell you which one it was. Needless to say, it was not"
-				  " successfully loaded."), _("Protocol Error"));
+				  " successfully loaded."), GAIM_ERROR);
 		return;
 	}
 	
@@ -81,11 +82,12 @@
 		unload_protocol(old);
 
 	if (p->protocol == PROTO_ICQ) 
-		do_error_dialog(_("Gaim has loaded the ICQ plugin.  This plugin has been deprecated. "
+		do_error_dialog(_("Libicq.so detected."),
+				_("Gaim has loaded the ICQ plugin.  This plugin has been deprecated. "
 				  "As such, it was probably not compiled from the same version of the "
 				  "source as this application was, and cannot be guaranteed to work.  "
 				  "It is reccomended that you use the AIM/ICQ protocol to connect to ICQ"),
-				_("Protocol Warning"));
+				GAIM_WARNING);
 
 
 	protocols = g_slist_insert_sorted(protocols, p, (GCompareFunc)proto_compare);
@@ -103,7 +105,7 @@
 			g_snprintf(buf, sizeof buf, _("%s was using %s, which got removed."
 						      " %s is now offline."), g->username,
 				   p->name(), g->username);
-			do_error_dialog(buf, _("Disconnect"));
+			do_error_dialog(buf, NULL, GAIM_ERROR);
 			signoff(g);
 			c = connections;
 		} else
@@ -587,7 +589,7 @@
 		   msg ? msg : "",
 		   find_buddy(gc, ga->who) ? "" : _("\n\nDo you wish to add him or her to your buddy list?"));
 	if (find_buddy(gc, ga->who))
-		do_error_dialog(buf, "Added to List");
+		do_error_dialog(buf, NULL, GAIM_INFO);
 	else
 		do_ask_dialog(buf, ga, do_add, dont_add);
 }

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- server.c	7 Jul 2002 14:31:57 -0000	1.228
+++ server.c	25 Aug 2002 10:51:23 -0000	1.229
@@ -52,7 +52,7 @@
 
 	if (p && p->login) {
 		if (!strlen(user->password) && !(p->options & OPT_PROTO_NO_PASSWORD)) {
-			do_error_dialog(_("Please enter your password"), _("Signon Error"));
+			do_error_dialog(_("Please enter your password"), NULL, GAIM_ERROR);
 			return;
 		}
 
@@ -805,7 +805,7 @@
 	g_snprintf(buf2, sizeof(buf2), "%s has just been warned by %s.\nYour new warning level is %d%%",
 		   gc->username, ((name == NULL)? "an anonymous person" : name), lev);
 
-	do_error_dialog(buf2, _("Warned"));
+	do_error_dialog(buf2, NULL, GAIM_INFO);
 }
 
 void serv_got_typing(struct gaim_connection *gc, char *name, int timeout) {

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ui.h	11 Aug 2002 06:42:17 -0000	1.46
+++ ui.h	25 Aug 2002 10:51:23 -0000	1.47
@@ -81,10 +81,10 @@
 #define FACE_YELL 15
 #define FACE_TOTAL 16
 
-#define GAIM_PIXMAP_ICON 0
-#define GAIM_PIXMAP_ERROR 1
-#define GAIM_PIXMAP_WARNING 2
-#define GAIM_PIXMAP_
+#define GAIM_LOGO 0
+#define GAIM_ERROR 1
+#define GAIM_WARNING 2
+#define GAIM_INFO 3
 
 struct debug_window {
 	GtkWidget *window;

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- util.c	2 Aug 2002 21:25:34 -0000	1.127
+++ util.c	25 Aug 2002 10:51:23 -0000	1.128
@@ -353,7 +353,7 @@
 		if (res < 0) {
 			g_snprintf(buf, BUF_LONG, "Unable to make directory %s for logging",
 				   log_all_file);
-			do_error_dialog(buf, "Error!");
+			do_error_dialog(buf, NULL, GAIM_ERROR);
 			g_free(buf);
 			g_free(buf2);
 			g_free(gaim_dir);
@@ -375,7 +375,7 @@
 		if (res < 0) {
 			g_snprintf(buf, BUF_LONG, "Unable to make directory %s for logging",
 				   log_all_file);
-			do_error_dialog(buf, "Error!");
+			do_error_dialog(buf, NULL, GAIM_ERROR);
 			g_free(buf);
 			g_free(buf2);
 			g_free(gaim_dir);

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.88,1.89

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

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

Modified Files:
	msn.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- msn.c	5 Aug 2002 07:44:11 -0000	1.88
+++ msn.c	25 Aug 2002 10:51:23 -0000	1.89
@@ -348,7 +348,7 @@
 	}
 
 	if (show)
-		do_error_dialog(msg, _("MSN Error"));
+		do_error_dialog(msg, NULL, GAIM_ERROR);
 
 	return msg;
 }
@@ -555,7 +555,7 @@
 		ms->msguser = g_strdup(user);
 		ms->msglen = length;
 	} else if (!g_strncasecmp(buf, "NAK", 3)) {
-		do_error_dialog(_("A message may not have been received."), _("MSN Error"));
+		do_error_dialog(_("An MSN message may not have been received."), NULL, GAIM_ERROR);
 	} else if (!g_strncasecmp(buf, "NLN", 3)) {
 	} else if (!g_strncasecmp(buf, "OUT", 3)) {
 		if (ms->chat)
@@ -812,7 +812,9 @@
 		close(source);
 		if (g_slist_find(connections, gc)) {
 			msn_kill_switch(ms);
-			do_error_dialog(_("MSN Error"), _("Gaim was unable to send a message"));
+			do_error_dialog(_("Gaim was unable to send an MSN message"),
+					_("Gaim encountered an error communicating with the "
+					  "MSN switchboard server.  Please try again later."), GAIM_ERROR);
 		}
 		return;
 	}
@@ -2113,7 +2115,7 @@
 	alias = str_to_utf8(url_encode(entry));
 	
 	if (strlen(alias) >= BUDDY_ALIAS_MAXLEN) {
-		do_error_dialog(_("Friendly name too long."), _("MSN Error"));
+		do_error_dialog(_("New MSN friendly name too long."), NULL, GAIM_ERROR);
 		return;
 	}
 	
@@ -2282,7 +2284,11 @@
 	char *dupl;
 
 	if (!strchr(who, '@')) {
-		do_error_dialog(_("Invalid name"), _("MSN Error"));
+		g_snprintf(buf, sizeof(buf), 
+			   _("An MSN screenname must be in the form \"us...@se...\".  "
+			     "Perhaps you meant %s...@ho....  No changes were made to your "
+			     "allow list."), who);
+		do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR);
 		gc->permit = g_slist_remove(gc->permit, who);
 		g_free(who);
 		return;
@@ -2335,7 +2341,11 @@
 	char *dupl;
 	
 	if (!strchr(who, '@')) {
-		do_error_dialog(_("Invalid name"), _("MSN Error"));
+		g_snprintf(buf, sizeof(buf), 
+			   _("An MSN screenname must be in the form \"us...@se...\".  "
+			     "Perhaps you meant %s...@ho....  No changes were made to your "
+			     "block list."), who);
+		do_error_dialog(_("Invalid MSN screenname"), buf, GAIM_ERROR);
 		gc->deny = g_slist_remove(gc->deny, who);
 		g_free(who);
 		return;

[Gaim-commits] CVS: gaim/src/protocols/zephyr zephyr.c,1.22,1.23

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

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

Modified Files:
	zephyr.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- zephyr.c	28 May 2002 08:40:48 -0000	1.22
+++ zephyr.c	25 Aug 2002 10:51:24 -0000	1.23
@@ -588,7 +588,8 @@
 	ZSubscription_t sub;
 
 	if (zgc) {
-		do_error_dialog("Already logged in with Zephyr", "Zephyr");
+		do_error_dialog("Already logged in with Zephyr", "Because Zephyr uses your system username, you are unable to "
+                                "have multiple accounts on it when logged in as the same user.", GAIM_ERROR);
 		return;
 	}
 

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.43,1.44

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

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

Modified Files:
	yahoo.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- yahoo.c	1 May 2002 04:26:01 -0000	1.43
+++ yahoo.c	25 Aug 2002 10:51:24 -0000	1.44
@@ -450,7 +450,7 @@
 		case 60: /* no clue */
 			 break;
 		case 16: /* Custom error message */
-			do_error_dialog(pair->value, "Gaim -- Yahoo! Error");
+			do_error_dialog(pair->value, NULL, GAIM_ERROR);
 			break;
 		default:
 			debug_printf("unknown status key %d\n", pair->key);
@@ -591,7 +591,7 @@
 		msg[j] = 0;
 		serv_got_im(gc, from, msg, 0, tm, -1);
 	} else if (pkt->status == 2) {
-		do_error_dialog(_("Your message did not get sent."), _("Gaim - Error"));
+		do_error_dialog(_("Your Yahoo! message did not get sent."), NULL, GAIM_ERROR);
 	}
 }
 

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.49,1.50

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

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

Modified Files:
	toc.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- toc.c	27 Apr 2002 19:41:07 -0000	1.49
+++ toc.c	25 Aug 2002 10:51:24 -0000	1.50
@@ -596,7 +596,7 @@
 			g_snprintf(snd, sizeof snd, "toc_init_done");
 			sflap_send(gc, snd, -1, TYPE_DATA);
 			do_error_dialog(_("TOC has come back from its pause. You may now send"
-					  " messages again."), _("TOC Resume"));
+					  " messages again."), NULL, GAIM_INFO);
 		}
 	} else if (!strcasecmp(c, "CONFIG")) {
 		c = strtok(NULL, ":");
@@ -669,7 +669,7 @@
 
 		serv_got_update(gc, c, logged, evil, signon, time_idle, type, 0);
 	} else if (!strcasecmp(c, "ERROR")) {
-		do_error_dialog(show_error_message(), "TOC Error");
+		do_error_dialog(show_error_message(), NULL, GAIM_ERROR);
 	} else if (!strcasecmp(c, "EVILED")) {
 		int lev;
 		char *name;
@@ -760,7 +760,7 @@
 			b->gc = NULL;
 			g_snprintf(error_buf, sizeof error_buf, _("You have been disconnected"
 								  " from chat room %s."), b->name);
-			do_error_dialog(error_buf, _("Chat Error"));
+			do_error_dialog(error_buf, NULL, GAIM_ERROR);
 		} else
 			serv_got_chat_left(gc, id);
 	} else if (!strcasecmp(c, "GOTO_URL")) {
@@ -779,13 +779,13 @@
 	} else if (!strcasecmp(c, "DIR_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_NICK_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_PASSWD_STATUS")) {
-		do_error_dialog(_("Password Change Successful"), _("Gaim - Password Change"));
+		do_error_dialog(_("Password Change Successful"), NULL, GAIM_INFO);
 	} else if (!strcasecmp(c, "PAUSE")) {
 		tdt->state = STATE_PAUSE;
-		do_error_dialog(_("TOC has sent a PAUSE command. When this happens, TOC ignores"
+		do_error_dialog(_("TOC has sent a PAUSE command."), _("When this happens, TOC ignores"
 				  " any messages sent to it, and may kick you off if you send a"
 				  " message. Gaim will prevent anything from going through. This"
-				  " is only temporary, please be patient."), _("TOC Pause"));
+				  " is only temporary, please be patient."), GAIM_WARNING);
 	} else if (!strcasecmp(c, "RVOUS_PROPOSE")) {
 		char *user, *uuid, *cookie;
 		int seq;
@@ -1561,7 +1561,7 @@
 			ft->file = fopen(ft->filename, "w");
 			if (!ft->file) {
 				buf = g_strdup_printf("Could not open %s for writing!", ft->filename);
-				do_error_dialog(buf, _("Error"));
+				do_error_dialog(buf, strerror(errno), GAIM_ERROR);
 				g_free(buf);
 				gaim_input_remove(ft->inpa);
 				close(source);
@@ -1578,7 +1578,7 @@
 			if (!ft->file) {
 				buf = g_strdup_printf("Could not open %s/%s for writing!", ft->filename,
 						ft->hdr.name);
-				do_error_dialog(buf, _("Error"));
+				do_error_dialog(buf, strerror(errno), GAIM_ERROR);
 				g_free(buf);
 				gaim_input_remove(ft->inpa);
 				close(source);
@@ -1595,7 +1595,7 @@
 
 	rt = read(source, buf, MIN(ntohl(ft->hdr.size) - ft->recvsize, 1024));
 	if (rt < 0) {
-		do_error_dialog("File transfer failed; other side probably canceled.", "Error");
+		do_error_dialog("File transfer failed; other side probably canceled.", NULL, GAIM_ERROR);
 		gaim_input_remove(ft->inpa);
 		close(source);
 		g_free(ft->user);
@@ -1638,7 +1638,7 @@
 	struct file_transfer *ft = data;
 
 	if (src == -1) {
-		do_error_dialog(_("Could not connect for transfer!"), _("Error"));
+		do_error_dialog(_("Could not connect for transfer."), NULL, GAIM_ERROR);
 		g_free(ft->filename);
 		g_free(ft->cookie);
 		g_free(ft->user);
@@ -1680,7 +1680,7 @@
 	fd =
 	    proxy_connect(ft->ip, ft->port, toc_send_file_connect, ft);
 	if (fd < 0) {
-		do_error_dialog(_("Could not connect for transfer!"), _("Error"));
+		do_error_dialog(_("Could not connect for transfer."), NULL, GAIM_ERROR);
 		g_free(ft->filename);
 		g_free(ft->cookie);
 		g_free(ft->user);
@@ -1743,7 +1743,7 @@
 
 		if (ft->hdr.hdrtype != htons(0x120c)) {
 			g_snprintf(buf, sizeof(buf), "%s decided to cancel the transfer", ft->user);
-			do_error_dialog(buf, "Error");
+			do_error_dialog(buf, NULL, GAIM_ERROR);
 			gaim_input_remove(ft->inpa);
 			close(source);
 			g_free(ft->filename);
@@ -1799,7 +1799,7 @@
 	char *buf;
 
 	if (src == -1) {
-		do_error_dialog(_("Could not connect for transfer!"), _("Error"));
+		do_error_dialog(_("Could not connect for transfer!"), NULL, GAIM_ERROR);
 		fclose(ft->file);
 		g_free(ft->filename);
 		g_free(ft->cookie);
@@ -1829,7 +1829,7 @@
 	hdr->lsizeoffset = 0x10;
 	g_snprintf(hdr->name, 64, "listing.txt");
 	if (write(src, hdr, 256) < 0) {
-		do_error_dialog(_("Could not write file header!"), _("Error"));
+		do_error_dialog(_("Could not write file header.  The file will not be transferred."), NULL, GAIM_ERROR);
 		fclose(ft->file);
 		g_free(ft->filename);
 		g_free(ft->cookie);
@@ -1856,16 +1856,16 @@
 	ft->filename = g_strdup(dirname);
 	ft->file = fopen(ft->filename, "r");
 	if (!ft->file) {
-		buf = g_strdup_printf("Unable to open %s for transfer!", ft->filename);
-		do_error_dialog(buf, "Error");
+		buf = g_strdup_printf("Unable to open %s for transfer.", ft->filename);
+		do_error_dialog(buf, NULL, GAIM_ERROR);
 		g_free(buf);
 		g_free(ft->filename);
 		g_free(ft);
 		return;
 	}
 	if (stat(dirname, &ft->st)) {
-		buf = g_strdup_printf("Unable to examine %s!", dirname);
-		do_error_dialog(buf, "Error");
+		buf = g_strdup_printf("Unable to examine %s.", dirname);
+		do_error_dialog(buf, NULL, GAIM_ERROR);
 		g_free(buf);
 		g_free(ft->filename);
 		g_free(ft);
@@ -1885,7 +1885,7 @@
 	fd =
 	    proxy_connect(ft->ip, ft->port, toc_get_file_connect, ft);
 	if (fd < 0) {
-		do_error_dialog(_("Could not connect for transfer!"), _("Error"));
+		do_error_dialog(_("Could not connect for transfer."), NULL, GAIM_ERROR);
 		fclose(ft->file);
 		g_free(ft->filename);
 		g_free(ft->cookie);

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.142,1.143

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

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

Modified Files:
	oscar.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- oscar.c	7 Jul 2002 14:31:57 -0000	1.142
+++ oscar.c	25 Aug 2002 10:51:24 -0000	1.143
@@ -392,7 +392,7 @@
 					c->fd = -1;
 					aim_conn_kill(odata->sess, &conn);
 					sprintf(buf, _("You have been disconnected from chat room %s."), c->name);
-					do_error_dialog(buf, _("Chat Error!"));
+					do_error_dialog(buf, NULL, GAIM_ERROR);
 				} else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
 					if (odata->cnpa > 0)
 						gaim_input_remove(odata->cnpa);
@@ -404,8 +404,7 @@
 						odata->create_rooms =
 							g_slist_remove(odata->create_rooms, cr);
 						g_free(cr);
-						do_error_dialog(_("Chat is currently unavailable"),
-								_("Gaim - Chat"));
+						do_error_dialog(_("Chat is currently unavailable"), NULL, GAIM_ERROR);
 					}
 					aim_conn_kill(odata->sess, &conn);
 				} else if (conn->type == AIM_CONN_TYPE_AUTH) {
@@ -765,8 +764,9 @@
 		in = '\0';
 	}
 	if (in != '\n') {
-		do_error_dialog("Gaim was unable to get a valid hash for logging into AIM."
-				" You may be disconnected shortly.", "Login Error");
+		do_error_dialog(_("Gaim was Unable to get a valid AIM login hash."),
+				_("You may be disconnected shortly.  You may want to use TOC until "
+				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 		gaim_input_remove(pos->inpa);
 		close(pos->fd);
 		g_free(pos);
@@ -789,8 +789,9 @@
 	char buf[BUF_LONG];
 
 	if (source < 0) {
-		do_error_dialog("Gaim was unable to get a valid hash for logging into AIM."
-				" You may be disconnected shortly.", "Login Error");
+		do_error_dialog(_("Gaim was Unable to get a valid AIM login hash."),
+				_("You may be disconnected shortly.  You may want to use TOC until "
+				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 		if (pos->modname)
 			g_free(pos->modname);
 		g_free(pos);
@@ -870,8 +871,9 @@
 		if (pos->modname)
 			g_free(pos->modname);
 		g_free(pos);
-		do_error_dialog("Gaim was unable to get a valid hash for logging into AIM."
-				" You may be disconnected shortly.", "Login Error");
+		do_error_dialog(_("Gaim was Unable to get valid login hash."),
+				_("You may be disconnected shortly.  You may want to use TOC until "
+				  "this is fixed.  Check " WEBSITE " for updates."), GAIM_WARNING);
 	}
 	pos->fd = fd;
 
@@ -1502,14 +1504,14 @@
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
 			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), args->uin, args->msg ? args->msg : _("No reason given."));
-			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
+			do_error_dialog(_("ICQ authorization denied."), dialog_msg, GAIM_ERROR);
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
 			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), args->uin);
-			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
+			do_error_dialog("ICQ authorization accepted.", dialog_msg, GAIM_INFO);
 			g_free(dialog_msg);
 		} break;
 
@@ -1637,7 +1639,7 @@
 				   userinfo->sn);
 			break;
 	}
-	do_error_dialog(buf, _("Gaim - Error"));
+	do_error_dialog(buf, NULL, GAIM_ERROR);
 
 	return 1;
 }
@@ -1733,7 +1735,7 @@
 
 	m = g_strdup_printf(_("SNAC threw error: %s\n"),
 			reason < msgerrreasonlen ? msgerrreason[reason] : "Unknown error");
-	do_error_dialog(m, _("Gaim - Oscar SNAC Error"));
+	do_error_dialog(m, NULL, GAIM_ERROR);
 	g_free(m);
 
 	return 1;
@@ -1750,9 +1752,8 @@
 	destn = va_arg(ap, char *);
 	va_end(ap);
 
-	sprintf(buf, _("Your message to %s did not get sent: %s"), destn,
-			(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
-	do_error_dialog(buf, _("Gaim - Error"));
+	sprintf(buf, _("Your message to %s did not get sent: %s"), destn);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
 
 	return 1;
 }
@@ -1768,9 +1769,8 @@
 	destn = va_arg(ap, char *);
 	va_end(ap);
 
-	sprintf(buf, _("User information for %s unavailable: %s"), destn,
-			(reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
-	do_error_dialog(buf, _("Gaim - Error"));
+	sprintf(buf, _("User information for %s unavailable: %s"), destn);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? msgerrreason[reason] : _("No reason was given."), GAIM_ERROR);
 
 	return 1;
 }
@@ -1986,8 +1986,7 @@
 
 	debug_printf("MOTD: %s (%d)\n", msg ? msg : "Unknown", id);
 	if (id < 4)
-		do_error_dialog(_("Your connection may be lost."),
-				_("AOL error"));
+		do_error_dialog(_("Your AIM connection may be lost."), NULL, GAIM_WARNING);
 
 	return 1;
 }
@@ -2222,8 +2221,9 @@
 	} else if (code == AIM_RATE_CODE_WARNING) {
 		aim_conn_setlatency(fr->conn, windowsize/4);
 	} else if (code == AIM_RATE_CODE_LIMIT) {
-		do_error_dialog(_("The last message was not sent because you are over the rate limit. "
-				  "Please wait 10 seconds and try again."), _("Gaim - Error"));
+		do_error_dialog(_("Rate limiting error."),
+				_("The last message was not sent because you are over the rate limit.  "
+				  "Please wait 10 seconds and try again."), GAIM_ERROR);
 		aim_conn_setlatency(fr->conn, windowsize/2);
 	} else if (code == AIM_RATE_CODE_CLEARLIMIT) {
 		aim_conn_setlatency(fr->conn, 0);
@@ -2454,14 +2454,14 @@
 		case 0x0007: { /* Someone has denied you authorization */
 			char *dialog_msg;
 			dialog_msg = g_strdup_printf(_("The user %lu has denied your request to add them to your contact list for the following reason:\n%s"), msg->sender, msg->msg ? msg->msg : _("No reason given."));
-			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Denied"));
+			do_error_dialog(_("ICQ Authorization denied"), dialog_msg, GAIM_ERROR);
 			g_free(dialog_msg);
 		} break;
 
 		case 0x0008: { /* Someone has granted you authorization */
 			char *dialog_msg;
 			dialog_msg = g_strdup_printf(_("The user %lu has granted your request to add them to your contact list."), msg->sender);
-			do_error_dialog(dialog_msg, _("Gaim - ICQ Authorization Granted"));
+			do_error_dialog(_("ICQ Authorization Granted"), dialog_msg, GAIM_INFO);
 			g_free(dialog_msg);
 		} break;
 
@@ -2586,7 +2586,7 @@
 	va_end(ap);
 
 	g_snprintf(buf, sizeof(buf), "No results found for email address %s", address);
-	do_error_dialog(buf, _("Error"));
+	do_error_dialog(buf, NULL, GAIM_ERROR);
 
 	return 1;
 }
@@ -2606,7 +2606,7 @@
 	if (status) {
 		g_snprintf(msg, sizeof(msg), "You should receive an email asking to confirm %s.",
 				gc->username);
-		do_error_dialog(msg, "Confirm");
+		do_error_dialog("Account confirmation requested.", msg, GAIM_INFO);
 	}
 
 	return 1;
@@ -2635,7 +2635,7 @@
 	/* XXX Do something for other types too. */
 	if ((type == 0x0011) && str && length) {
 		g_snprintf(buf, sizeof(buf), "The email address for %s is %s", gc->username, val);
-		do_error_dialog(buf, "Email");
+		do_error_dialog(buf, NULL, GAIM_INFO);
 	}
 
 	return 1;
@@ -2788,14 +2788,16 @@
 	gchar *inforeal;
 
 	if (odata->rights.maxsiglen == 0)
-		do_error_dialog("oscar_set_info called before locate rights received", "Protocol Error");
+		do_error_dialog(_("Unable to set AIM profile."), 
+				_("You have probably requested to set your profile before the login procedure completed.  "
+				  "Your profile remains unset; try setting it again when you are fully connected."), GAIM_ERROR);
 
 	if (strlen(info) > odata->rights.maxsiglen) {
 		gchar *errstr;
 
-		errstr = g_strdup_printf("Maximum info length of %d bytes exceeded, truncating", odata->rights.maxsiglen);
-
-		do_error_dialog(errstr, "Info Too Long");
+		errstr = g_strdup_printf(_("The maximum profile length of %d bytes has been exceeded.  "
+					   "Gaim has truncated and set it."), odata->rights.maxsiglen);
+		do_error_dialog("Profile too long.", errstr, GAIM_WARNING);
 
 		g_free(errstr);
 	}
@@ -2813,8 +2815,10 @@
 {
 
 	if (od->rights.maxawaymsglen == 0)
-		do_error_dialog("oscar_set_away_aim called before locate rights received", "Protocol Error");
-
+		do_error_dialog(_("Unable to set AIM away message."), 
+				_("You have probably requested to set your away message before the login procedure completed.  "
+				  "You remain in a \"present\" state; try setting it again when you are fully connected."), GAIM_ERROR);
+	
 	if (gc->away)
 		g_free(gc->away);
 	gc->away = NULL;
@@ -2827,10 +2831,9 @@
 	if (strlen(message) > od->rights.maxawaymsglen) {
 		gchar *errstr;
 
-		errstr = g_strdup_printf("Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
-
-		do_error_dialog(errstr, "Away Message Too Long");
-
+		errstr = g_strdup_printf(_("The away message length of %d bytes has been exceeded.  "
+					   "Gaim has truncated it and set you away."), od->rights.maxawaymsglen);
+		do_error_dialog("Away message too long.", errstr, GAIM_WARNING);
 		g_free(errstr);
 	}
 
@@ -3207,7 +3210,7 @@
 			char *dialog_msg = g_strdup_printf(_("The maximum number of buddies allowed in your buddy list is %d, and you have %d."
 							     "  Until you are below the limit, some buddies will not show up as online."), 
 							   odata->rights.maxbuddies, tmp);
-			do_error_dialog(dialog_msg, _("Gaim - Warning"));
+			do_error_dialog("Maximum buddy list length exceeded.", dialog_msg, GAIM_WARNING);
 			g_free(dialog_msg);
 		}
 		
@@ -3537,7 +3540,7 @@
 			g_free(dim);
 			debug_printf("Gave up on old direct IM, trying again\n");
 		} else {
-			do_error_dialog("DirectIM already open.", "Gaim");
+			do_error_dialog("DirectIM already open.", NULL, GAIM_ERROR);
 			return;
 		}
 	}
@@ -3553,7 +3556,7 @@
 		aim_conn_addhandler(od->sess, dim->conn, AIM_CB_FAM_OFT, AIM_CB_OFT_DIRECTIMINITIATE,
 					gaim_directim_initiate, 0);
 	} else {
-		do_error_dialog(_("Unable to open Direct IM"), _("Error"));
+		do_error_dialog(_("Unable to open Direct IM"), NULL, GAIM_ERROR);
 		g_free(dim);
 	}
 }
@@ -3593,7 +3596,7 @@
 				free(dialog_msg);
 			}
 		else
-			do_error_dialog("Could not find contact in local list, therefore unable to request status message.\n", "Gaim - Error");
+			do_error_dialog("Could not find contact in local list, therefore unable to request status message.\n", NULL, GAIM_ERROR);
 	} else
 		oscar_get_info(gc, who);
 }
@@ -3797,7 +3800,8 @@
 			aim_admin_setnick(od->sess, aim_getconn_type(od->sess, AIM_CONN_TYPE_AUTH), nick);
 		}
 	} else {
-		do_error_dialog("The new formatting is invalid.", "Gaim");
+		do_error_dialog("The new formatting is invalid.",
+				"Screenname formatting can change only capitalization and whitespace.", GAIM_ERROR);
 	}
 }
 

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

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

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

Modified Files:
	irc.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- irc.c	7 Jun 2002 18:57:18 -0000	1.78
+++ irc.c	25 Aug 2002 10:51:23 -0000	1.79
@@ -822,12 +822,12 @@
 		irc_request_buddy_update(gc);
 		break;
 	case 401:
-		do_error_dialog(_("No such nick/channel"), _("IRC Error"));
+		do_error_dialog(_("There is no such nick or channel on this IRC channel."), NULL, GAIM_ERROR);
 		break;
 	case 402:
-		do_error_dialog(_("No such server"), _("IRC Error"));
+		do_error_dialog(_("There is no such IRC Server"), NULL, GAIM_ERROR);
 	case 431:
-		do_error_dialog(_("No nickname given"), _("IRC Error"));
+		do_error_dialog(_("No IRC nickname given"), NULL, GAIM_ERROR);
 		break;
 	}
 }
@@ -1068,9 +1068,9 @@
 				return FALSE;
 			gc->buddy_chats = g_slist_remove(gc->buddy_chats, c);
 			c->gc = NULL;
-			g_snprintf(outbuf, sizeof(outbuf), _("You have been kicked from %s: %s"),
-					word[3], *word_eol[5] == ':' ? word_eol[5] + 1 : word_eol[5]);
-			do_error_dialog(outbuf, _("IRC Error"));
+			g_snprintf(outbuf, sizeof(outbuf), _("You have been kicked from %s:"),
+				   word[3]);
+			do_error_dialog(outbuf, *word_eol[5] == ':' ? word_eol[5] + 1 : word_eol[5], GAIM_INFO);
 		} else {
 			char *reason = *word_eol[5] == ':' ? word_eol[5] + 1 : word_eol[5];
 			char *msg = g_strdup_printf(_("Kicked by %s: %s"), nick, reason);
@@ -1579,7 +1579,7 @@
 			gc->buddy_chats = g_slist_remove(gc->buddy_chats, c);
 			c->gc = NULL;
 			g_snprintf(buf, sizeof(buf), _("You have left %s"), chan);
-			do_error_dialog(buf, _("IRC Part"));
+			do_error_dialog(buf, NULL, GAIM_INFO);
 		}
 	} else if (!g_strcasecmp(pdibuf, "WHOIS")) {
 		g_snprintf(buf, sizeof(buf), "WHOIS %s\r\n", word_eol[2]);

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

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

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

Modified Files:
	napster.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- napster.c	17 Jun 2002 01:04:10 -0000	1.18
+++ napster.c	25 Aug 2002 10:51:24 -0000	1.19
@@ -286,7 +286,7 @@
 	}
 
 	if (command == 0x194) {
-		do_error_dialog(buf, "Gaim: Napster Error");
+		do_error_dialog(buf, NULL, GAIM_ERROR);
 		g_free(buf);
 		return;
 	}
@@ -294,8 +294,8 @@
 	if (command == 0x12e) {
 		gchar buf2[NAP_BUF_LEN];
 
-		g_snprintf(buf2, NAP_BUF_LEN, "Unable to add '%s' to your hotlist", buf);
-		do_error_dialog(buf2, "Gaim: Napster Error");
+		g_snprintf(buf2, NAP_BUF_LEN, "Unable to add '%s' to your Napster hotlist", buf);
+		do_error_dialog(buf2, NULL, GAIM_ERROR);
 
 		g_free(buf);
 		return;
@@ -375,7 +375,7 @@
 	/* If we have some kind of error, get outta here */
 	if (command == 0x00)
 	{
-		do_error_dialog(buf, "Gaim: Napster Error");
+		do_error_dialog(buf, NULL, GAIM_ERROR);
 		gaim_input_remove(ndata->inpa);
 		ndata->inpa = 0;
 		close(source);

[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.59,1.60

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

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

Modified Files:
	jabber.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- jabber.c	7 Jul 2002 14:34:41 -0000	1.59
+++ jabber.c	25 Aug 2002 10:51:23 -0000	1.60
@@ -947,13 +947,15 @@
 
 	if(strcmp(old, gjc->pass))
 	{
-		do_error_dialog(_("Incorrect current password! Password NOT Changed!"),
-			_("Password Change Error!"));
+		do_error_dialog(_("Unable to change password."),
+			_("The current password you entered is incorrect.  Your password has "
+			  "not been changed."), GAIM_ERROR);
 	}
 	else if(!strcmp(old, new))
 	{
-		do_error_dialog(_("New password same as old password! Password NOT Changed!"),
-			_("Password Change Error!"));
+		do_error_dialog(_("Unable to change password"),
+			_("The new password you entered is the same as your current passord.  "
+			  "Your password remains the same."), GAIM_ERROR);
 	}
 	else
 	{
@@ -1342,8 +1344,8 @@
 		}
 
 		if (msg) {
-			from = g_strdup_printf("Error %s", type ? type : "");
-			do_error_dialog(msg, from);
+			from = g_strdup_printf(_("Jabber Error %s"), type ? type : "");
+			do_error_dialog(from, msg, GAIM_ERROR);
 			g_free(from);
 		}
 	} else if (!strcasecmp(type, "groupchat")) {
@@ -1652,9 +1654,10 @@
 			char *status;
 			if((y = xmlnode_get_tag(p->x, "status")) && (status = xmlnode_get_data(y)) &&
 					!strcmp(status, "Not Found")) {
-				char *msg = g_strdup_printf("%s: \"%s\"", _("No such user"), 
-					xmlnode_get_attrib(p->x, "from"));
-				do_error_dialog(msg, _("Jabber Error"));
+				char *msg = g_strdup_printf(_("The Jabber user %s does not exist and was therefore "
+							      "not added to your roster."), 
+							    xmlnode_get_attrib(p->x, "from"));
+				do_error_dialog(_("No such user."), msg, GAIM_ERROR );
 				g_free(msg);
 			}
 		}
@@ -2032,7 +2035,7 @@
 					   char buf[BUF_LONG];
 					   sprintf(buf, _("Password successfully changed."));
 
-					   do_error_dialog(buf, _("Password Change"));
+					   do_error_dialog(buf, NULL, GAIM_INFO);
 					}
 				}
 			}
@@ -2050,8 +2053,8 @@
 					errcode = atoi(xmlnode_get_attrib(xerr, "code"));
 			}
 
-			from = g_strdup_printf("Error %d (%s)", errcode, from);
-			do_error_dialog(errmsg, from);
+			from = g_strdup_printf("Jabber Error %d (%s)", errcode, from);
+			do_error_dialog(from, errmsg, GAIM_ERROR);
 			g_free(from);
 
 		}
@@ -2409,8 +2412,9 @@
 		return;
 
 	if((realwho = get_realwho(gjc, name, FALSE, &gjid)) == NULL) {
-		char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), name);
-		do_error_dialog(msg, _("Jabber Error"));
+		char *msg = g_strdup_printf(_("The user %s is an invalid Jabber I.D. and was "
+					      "therefore not added."),  name);
+		do_error_dialog("Unable to add buddy.", _("Jabber Error"), GAIM_ERROR);
 		g_free(msg);
 		jabber_remove_gaim_buddy(gc, name);
 		return;
@@ -2677,8 +2681,8 @@
 	debug_printf("%s\n", realwho);
 
 	if((gjid = gaim_jid_new(realwho)) == NULL) {
-		char *msg = g_strdup_printf("%s: \"%s\"", _("Invalid Jabber I.D."), realwho);
-		do_error_dialog(msg, _("Jabber Error"));
+		char *msg = g_strdup_printf("The Jabber I.D. %s is invalid.", realwho);
+		do_error_dialog(_("Unable to join chat"), msg, GAIM_ERROR);
 		g_free(msg);
 		g_free(realwho);
 		return;

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

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

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

Modified Files:
	gaim_icq.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: gaim_icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/gaim_icq.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gaim_icq.c	12 Mar 2002 17:21:43 -0000	1.24
+++ gaim_icq.c	25 Aug 2002 10:51:23 -0000	1.25
@@ -230,7 +230,7 @@
 
 static void icq_req_not(icq_Link *link, unsigned long id, int type, int arg, void *data) {
 	if (type == ICQ_NOTIFY_FAILED)
-		do_error_dialog("Failure in sending packet", "ICQ error");
+		do_error_dialog(_("Gaim encountered an error communicating with the ICQ server."), NULL, GAIM_ERROR);
 	return;
 }
 

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

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

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

Modified Files:
	gg.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gg.c	28 Jun 2002 01:47:12 -0000	1.20
+++ gg.c	25 Aug 2002 10:51:23 -0000	1.21
@@ -591,8 +591,8 @@
 	gchar *imsg;
 
 	if (invalid_uin(who)) {
-		do_error_dialog(_("You are trying to send a message to an invalid Gadu-Gadu UIN."),
-				_("Gadu-Gadu Error"));
+		do_error_dialog(_("You are trying to send a message to an invalid Gadu-Gadu UIN."), NULL,
+				GAIM_ERROR);
 		return -1;
 	}
 
@@ -654,7 +654,7 @@
 
 	if ((ptr = strstr(webdata, "query_results:")) == NULL || (ptr = strchr(ptr, '\n')) == NULL) {
 		debug_printf("search_callback: pubdir result [%s]\n", webdata);
-		do_error_dialog(_("Couldn't get search results"), _("Gadu-Gadu Error"));
+		do_error_dialog(_("Couldn't get search results"), NULL, GAIM_ERROR);
 		return;
 	}
 	ptr++;
@@ -758,14 +758,13 @@
 	gchar **users_tbl;
 	int i;
 	if (strstr(webdata, "no_data:")) {
-		do_error_dialog(_("There is no Buddy List stored on server. Sorry!"),
-				_("Gadu-Gadu Error"));
+		do_error_dialog(_("There is no Buddy List stored on the Gadu-Gadu server."), NULL, GAIM_ERROR);
 		return;
 	}
 
 	if ((ptr = strstr(webdata, "get_results:")) == NULL || (ptr = strchr(ptr, ':')) == NULL) {
 		debug_printf("import_buddies_server_results: import buddies result [%s]\n", webdata);
-		do_error_dialog(_("Couldn't Import Buddies List from Server"), _("Gadu-Gadu Error"));
+		do_error_dialog(_("Couldn't Import Buddies List from Server"), NULL, GAIM_ERROR);
 		return;
 	}
 	ptr++;
@@ -812,37 +811,34 @@
 static void export_buddies_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "put_success:")) {
-		do_error_dialog(_("Buddy List successfully transferred to server"),
-				_("Gadu-Gadu Information"));
+		do_error_dialog(_("Buddy List successfully transferred to Gadu-Gadu server"), NULL, GAIM_INFO);
 		return;
 	}
 
 	debug_printf("export_buddies_server_results: webdata [%s]\n", webdata);
-	do_error_dialog(_("Couldn't transfer Buddy List to server"), _("Gadu-Gadu Error"));
+	do_error_dialog(_("Couldn't transfer Buddy List to Gadu-Gadu server"), NULL, GAIM_ERROR);
 }
 
 static void delete_buddies_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "put_success:")) {
-		do_error_dialog(_("Buddy List sucessfully deleted from server"),
-				_("Gadu-Gadu Information"));
+		do_error_dialog(_("Buddy List sucessfully deleted from Gadu-Gadu server"), NULL, GAIM_INFO);
 		return;
 	}
 
 	debug_printf("delete_buddies_server_results: webdata [%s]\n", webdata);
-	do_error_dialog(_("Couldn't delete Buddy List from server"), _("Gadu-Gadu Error"));
+	do_error_dialog(_("Couldn't delete Buddy List from Gadu-Gadu server"), NULL, GAIM_ERROR);
 }
 
 static void password_change_server_results(struct gaim_connection *gc, gchar *webdata)
 {
 	if (strstr(webdata, "reg_success:")) {
-		do_error_dialog(_("Password changed successfully"),
-				_("Gadu-Gadu Information"));
+		do_error_dialog(_("Password changed successfully"), NULL, GAIM_INFO);
 		return;
 	}
 
 	debug_printf("delete_buddies_server_results: webdata [%s]\n", webdata);
-	do_error_dialog(_("Password couldn't be changed"), _("Gadu-Gadu Error"));
+	do_error_dialog(_("Password couldn't be changed"), NULL, GAIM_ERROR);
 }
 
 static void http_results(gpointer data, gint source, GaimInputCondition cond)
@@ -953,7 +949,10 @@
 		g_free(buf);
 		g_free(hdata);
 		close(source);
-		do_error_dialog(_("Couldn't send http request"), _("Gadu-Gadu Error"));
+		do_error_dialog(_("Error communicating with Gadu-Gadu server"),
+				_("Gaim was unable to complete your request due to a problem "
+				  "communicating to the Gadu-Gadu HTTP server.  Please try again "
+				  "later."), GAIM_ERROR);
 		return;
 	}
 
@@ -965,7 +964,6 @@
 static void import_buddies_server(struct gaim_connection *gc)
 {
 	struct agg_http *hi = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
 	gchar *u = gg_urlencode(gc->username);
 	gchar *p = gg_urlencode(gc->password);
 
@@ -979,9 +977,9 @@
 	g_free(p);
 
 	if (proxy_connect(GG_PUBDIR_HOST, GG_PUBDIR_PORT, http_req_callback, hi) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Buddies List import from Server failed (%s)"),
-			   GG_PUBDIR_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+		do_error_dialog(_("Unable to import Gadu-Gadu buddy list"), 
+				_("Gaim was unable to connect to the Gadu-Gadu buddy list "
+				  "server.  Please try again later."), GAIM_ERROR);
 		g_free(hi->request);
 		g_free(hi);
 		return;
@@ -991,7 +989,6 @@
 static void export_buddies_server(struct gaim_connection *gc)
 {
 	struct agg_http *he = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
 	gchar *ptr;
 	gchar *u = gg_urlencode(gc->username);
 	gchar *p = gg_urlencode(gc->password);
@@ -1038,9 +1035,9 @@
 	}
 
 	if (proxy_connect(GG_PUBDIR_HOST, GG_PUBDIR_PORT, http_req_callback, he) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Buddies List export to Server failed (%s)"),
-			   GG_PUBDIR_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+		do_error_dialog(_("Couldn't export buddy list"), 
+				_("Gaim was unable to connect to the buddy list server.  "
+				  "Please try again later."), GAIM_ERROR);
 		g_free(he->request);
 		g_free(he);
 		return;
@@ -1050,7 +1047,6 @@
 static void delete_buddies_server(struct gaim_connection *gc)
 {
 	struct agg_http *he = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
 	gchar *u = gg_urlencode(gc->username);
 	gchar *p = gg_urlencode(gc->password);
 
@@ -1061,9 +1057,9 @@
 	he->request = g_strdup_printf("FmNum=%s&Pass=%s&Delete=1", u, p);
 
 	if (proxy_connect(GG_PUBDIR_HOST, GG_PUBDIR_PORT, http_req_callback, he) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Deletion of Buddies List from Server failed (%s)"),
-			   GG_PUBDIR_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+		do_error_dialog(_("Unable to delete Gadu-Gadu buddy list"), 
+				_("Gaim was unable to connect to the buddy list server.  "
+				  "Please try again later."), GAIM_ERROR);
 		g_free(he->request);
 		g_free(he);
 		return;
@@ -1075,8 +1071,6 @@
 			   char *country, char *email)
 {
 	struct agg_http *srch = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
-
 	srch->gc = gc;
 	srch->type = AGG_HTTP_SEARCH;
 	srch->form = AGG_PUBDIR_SEARCH_FORM;
@@ -1111,9 +1105,10 @@
 	}
 
 	if (proxy_connect(GG_PUBDIR_HOST, GG_PUBDIR_PORT, http_req_callback, srch) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Connect to search service failed (%s)"),
-			   GG_PUBDIR_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+		do_error_dialog(_("Unable to access directory"), 
+				_("Gaim was unable to search the Directory because it "
+				  "was unable to connect to the directory server.  Please try"
+				  "again later."), GAIM_ERROR);
 		g_free(srch->request);
 		g_free(srch);
 		return;
@@ -1123,7 +1118,6 @@
 static void agg_change_passwd(struct gaim_connection *gc, char *old, char *new)
 {
 	struct agg_http *hpass = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
 	gchar *u = gg_urlencode(gc->username);
 	gchar *p = gg_urlencode(gc->password);
 	gchar *enew = gg_urlencode(new);
@@ -1144,9 +1138,9 @@
 	g_free(eold);
 
 	if (proxy_connect(GG_REGISTER_HOST, GG_REGISTER_PORT, http_req_callback, hpass) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Changing Password failed (%s)"),
-			   GG_REGISTER_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+	       	do_error_dialog(_("Unable to change Gadu-Gadu password"), 
+				_("Gaim was unable to change your password due to an error connecting "
+				  "to the Gadu-Gadu server.  Please try again later."), GAIM_ERROR);
 		g_free(hpass->request);
 		g_free(hpass);
 		return;
@@ -1186,8 +1180,6 @@
 static void agg_get_info(struct gaim_connection *gc, char *who)
 {
 	struct agg_http *srch = g_new0(struct agg_http, 1);
-	static char msg[AGG_BUF_LEN];
-
 	srch->gc = gc;
 	srch->type = AGG_HTTP_SEARCH;
 	srch->form = AGG_PUBDIR_SEARCH_FORM;
@@ -1209,9 +1201,9 @@
 		srch->request = g_strdup_printf("Mode=3&UserId=%s", who);
 
 	if (proxy_connect(GG_PUBDIR_HOST, GG_PUBDIR_PORT, http_req_callback, srch) < 0) {
-		g_snprintf(msg, sizeof(msg), _("Connect to search service failed (%s)"),
-			   GG_PUBDIR_HOST);
-		do_error_dialog(msg, _("Gadu-Gadu Error"));
+		do_error_dialog(_("Unable to access user profile."), 
+				_("Gaim was unable to access this users profile due to an error "
+				  "connecting to the directory server.  Please try again later."), GAIM_ERROR);
 		g_free(srch->request);
 		g_free(srch);
 		return;

[Gaim-commits] CVS: gaim/pixmaps gaim_error.png,NONE,1.1 gaim_info.png,NONE,1.1 gaim_question.png,NONE,1.1 gaim_warning.png,NONE,1.1 Makefile.am,1.74,1.75

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

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

Modified Files:
	Makefile.am 
Added Files:
	gaim_error.png gaim_info.png gaim_question.png 
	gaim_warning.png 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



--- NEW FILE: gaim_error.png ---
‰PNG


üӊV©*PZUIPC©± 4…†4Nœ8$^oǎõzíÝõz½{ß÷Îë|_ÿ83{ï]_Û»qüGÍܹgîÎ÷›ï}fá×ã×ãLÜËÅÿûÙÛú¦}û'S•ÚÍe?¼$´2hEój㌈ˆªúžH)#v"‹îxñÄÜ·~p`bö•ºùWc¼, Û?ǝ/*_ªúWªˆ·qÕ —¬èa}/Ã}½äãˆ(Ž)ÓÅ2…ãó%f+5‹÷õ ÷üÃÈÁ{è–çœÇ²€<ò¥O¼cd¶tïábu˅ƒýÜ°é"Þ°¢‡øø1¢SØR¸ZCBE
29Èwczz){]ìªì›-RnøÏcã/?pdöa@^é^ÆX2>{Ç÷žœž¿s0ŸõÞwåålÎ+þ#„ÇŽ Ö"ª¨€ª"
*êÎ-§ß)~¾—U˳庵Vïÿ÷éÂç€ê«(ç’Ç’€|÷î۟9>wý;¶lâÆV>÷á±qTœÀ) õ¸Œ$óUeVۋ
3¡}âGsõ
¿rÿ’9ۄºûŽ½£3óoÞzý›¸>š£±ã§Äł¼EÈN0Üwæ%ÇÝ(¯ËxÌEvÃʌwÓ¡ÀnãW¬)gòÝÏüÁÓ£3'¯½ýoeóáÝÏÿ±Úf­B¦fѪ-æµjUÖÀ%9ª•u+<sÃK¡lꯑü§ŒÓyðŸøק'OÞò‘ë¯åucϾ´Yä#Î
#™ßª-æeÔ°>ë1ë†AϬ‹äa |
9,ŒŽ@û³Ï½ûç“sûö+.3ם<Dp`´Åö›Î±Í‰&~á¬óNãlsÀšŒáH$Wæ`ÿq«{_c
Ñ
ÆÙ¢H«¯X¸ö,óz€²èZ`vÊꓼÆ9Ê)r°ìmýª•l˜ØëòÑ¡Ýq{Y,¤œ	†°H“N—7pu.àá6àÂ×@¶õÃc_ùTÿöõ×}à²aüGNç¹E”å8ÛÐ
c¡0YJ¢oòà/Žà\Ì
ãÀó@
7l]Ç>ÓEßP˜,¨fT,=ùZ÷æ¾`Ãåù¶þ¦ÿö|(»ë›÷Ç«
À³€Ë]jɾž@I5æå
)GrñÕ¶†ÄQ›í×c¡ûÛ±e˖A€¶ýRÎuú~llŒ·„[?;Ä-wa²ƒéÁ˜<*‚‘šíC2<ké[aó_ú¨¼s¸Ë[õåû¤È
û „+Ij4ÍfÉPڀøÖö­©UO©Kz=ÃÐE1<<|VÁ—+FFFxÏ]›¸åÓ9Ln&»ã

9 ¶Þ4ž*Òa"‹iDÜñÛޕ‡Ç%¸ç< ˜€è¢9µÃ¶< ql³µ“§¦Ø
"‚ˆ¼,ÁO÷ýèè(ªÂûï4˜ì*L~#&»
ã­
2¨ú3š­A¶¼:êyàßc®þΣz<®
ƒD6“sî;U×Wu!\°aˆZET(fjߋÔnŒèÏ7ÐL8
j>P•Y4œD‚Ä/a
lÕ••¨a	*Õ¶FµI„Ï´lK†q*ï8&™7‹DíÙd£At`/µö.¯3¶hÞâBÐ÷c&öñúþ
˜<FcˆKò¨† U$(cý"¶\".¥˜°b‰kJì+û¦¨à¢J
$Ý^ƪBC3³'ó¹Rägú=¯)䢔}IM ÓÕ4-óŒþŸ°ùª:"`r>&SÂi{ŒD4ö‰J¤B‚c– ¶Q
‚ùÑ\ÆT@}Ú4¿¤T敓E¢‡&8
œ\BhyËJÝO±¯ÁÞÞïìoÄÔlKÙß©À“¦Ú"är
Á
ÆUª<tD¥€`¾Dc¶ˆ?S$8QŸ©Ð˜¬QŸ‰hÌÄøsŠ?¯øeˆbø‹Ç9€+è¦[`¤•ok·dM9¥A´óèôî+†‡¶†¾¿vc>Óbûí
v
YbglÑ<O!«Ê/_ô‰3]\vqŒ– ׅ°•„¨h	ç”zQ	ëÊ·Ÿâ¥_œ`x—º“
¤Rä¡ïMNå?âgqm€8S™Ã9Û¹ä³Ï
½ìé¾
*eŒÔ16Âh„QÁSÁ `AWúKâÃè
)Ü~?»m@|Q/=oZÇÐÇÞÀ%¿£VŠX‹ëÌÑÞ(JM©M[ÎäT;
Žíå[À¿ô¶lÎÈ]=pU1ëúT{0=C&±
%¨@£(T
0{F-Lâ¼
Îår54ÀxH´Jƀ•ÁËY$v÷nDÈäi
DŠQ÷ ©{-C\Oäp÷²Í°f×Ó»vrŒØ›Ö²þ[¸îŸ_âٚ¥×Zì”ÞÇç$Š‹ñuà(®LM[wÝÉ^’óà:X’܈
ºr¹¬ïz
ØFÒ)ó“g(xâ|(*‚ÄÎ/‘	”‘“p~œ#=–|^ù³d~vbÁ4Ò¿›6r,Ꙝ+JœüpZ\Õi.	˜–½G³
5ÀŠ\6 >hÕzó'¬E­E­€ˆë¥†`’~ªõ•Ø‡8‚¾ݕf›(ý}g"5šïš¤fpšåÎWH+CSýBšÝ«t¤ÍKn¨œÍå#ã­D刏ÆUÔF¨uPˆ‰
BAq¾Ã†
ÖöГ
$OsÁê¬+xË©e^­1ðèŽý«¾üûù›ÔÆÄs
Á¬ÅŸ¿¨ÔkðÌa-|õçìÿ»gØ}ï(;BåŠ
º‡{é±É¿àÙe\/$v!.’øt±ÆùàT÷L—	[	PÏ#*+aEiTáïÓ±/>ÆGjìǽ[öÜÁ
/Üý(ýÑÏy:›¤z¿»Žu8‡“ßÍà4¤§%éúï¯Î 
eÖ҄’šNê\Ϩ!çƒS—=¾ñí×v_0àÉÊ»þM¶ù1‡qZ£ÙF¨ÓLÃçq)ø<°Oá’³Lß°ŠÍcuFpÀZëšÍdì´¹Èù` w՚žƒGƒ‰_ìÆ€Çi–êŠ{⚊8Ói$ç§j–Éc
ŽX§E34[
)SRõÅãœþ+óëq1í©Ìá"Æ
--- NEW FILE: gaim_info.png ---
‰PNG


†ÁÁ›lK–µ"ْzWïýö»œóûÍçÞ~Oò¦…”üGNÕ©{ß{w9ç{~¿ïo;þµÕÌ\g€°­Bvd¿kÖ]ÖSÀ¶}Ö¶þŽloH; t+€•À2`qö›ÁPfi DYi
$¼CAy+@~å@~ò×ÝsÏ'îÞ¹óßíØ´i󪁁5ÝݽAHӔry^†‡‡âƒ_žÞ½ûñWž}ö©§ƒÀP
ê@ŒÃóŽjoHF	/
Ûî¿ÿ·>｟¼í=﹡Ë_¢€AD
EUQçüùþý{›=ô»wïúðc<0e<01^ZÞQ*ôF€´ƒ±Øùøã»ؾ}GŒñ·ä“·VpîlPœkøþ÷vU>ó™_}
ø{à^*xUÊUèÑÂs>·ƒ1p×]û꣏þã—n¸akw±P,†‹
aEÄ/®1 šƒ•-{¶ö›ÞuMÇÝwÿûÏïyúꙙéi`ŽѺìÝï)9
F@\(š}'Ù¨
;zˆ™™©¾%K¿÷˟Y|Íûoeͺ•ÁòŽ¢íŒê6wSÏp'¿ö'¦j;€€£IPœÿÌBœL‹ÀûOž}bÙ²eAιÈ/ˆ>U9¨ÜcõV¥ÝG±N‰SGbN'~¼/í}žý/½Èõ›N釶>£KúºLÁ›gqhZG“iFÔf¢ä߶{ø;{íÃ[¦>hdýgb©Ú%¤{ñâÞÀOhAñ	Cï‘9ýfQ~»•Q£5Þ'1ƀQD…0ð$+xõ:zøû÷íåŽ[Nð›S¸ÂvaL	ÁH-t#ást÷¸Òçî•÷-ï–þöÃҝ-Þ±Œ*>62Ùç\†/”v@‚03±÷œàWßOZÄŸ·bÑ»0i*tt„D‘¥««@­–€ÉTjŒý+’$æ…çŸaÛ{ÆøÀ-Ç1ŕ˜ÂJLÐ=Ô®Á8*ҙbR‡i¦üÒ‚-§NKüõ
K1¥«0¥Í˜ÒLé(®Ç®ÀVA¡
„h`€ßØa®+ôWãÍuÐOËt—¸DÓ´'årYD<É{Îæ‹ÊüIâHG©’$Bgg‘$ººŠ4›–zÃzÂE™ÉÔxdpð·\ý‹ºK˜B¦°^	0áJL°Â~L°vr§F0t–Lñ3·²Xwæ=@/>qÕáoºxPrS§@ell$n—
ŸÛÈ%¦Pê¡Q›AšM‹ˆP¯'X+Ôj	.K
4j3±ÖáœCph¨ÌÎN³yí„]˜p	Æôc‚>LØf1&èÀ˜¢'µ€A­'iM=i߶U
.:„D¯áš“ØÆ<¶RƖcâ²%©:l]±‘rdŒ*­,›i;^´š´·Ü†çk<xÀm½ù–Û×_µ±Ãh€3ÎG©(NªÂOöícõÚ«p"ž;Ä"Î!*ÌOe``a×´` 4hà!91ŒkγqéIT,jÔ6¤†¦ó¸æ—Iç˸zL:;âY°UH›ð¿ö3x¤Ì0N+Ž‰ðå*Þk¹Èø¦C${Ð>ýË÷>>:6bEI%#NA²‹¬8$#]Qç-’
a(h tö_Ó`
†uë6òÔÁ«dv¢¡¶RÃVæI+S¤•1â¹QÒ¹9âÙ2éLƒæXLcÜ7•¨¬Tg•éyÒo1„ORçãÎǞƒsI®û¹9UÅ×M÷¾°ç¦;?:ÐÕ±Ø.DÕK©
,îŒqiRG?>Æ
%ÃSÏîaû¯öR€: ¢b5ßûâýõ¹º™Ü~µ[b£ˆ´ãj¶ÖÄVb’Ù˜xÎÏ8’y%)+QÒþÛÓk2ƒòòÉ'x©¨Ð’„‹,†HÞÊgN>ýԏ®Ý¾}NJÅ=½q
.u™?ÒÇþý/²by6®b“
ꪔºóê‰ã¬ß°Á'›E0LŒŒ¹_½ï#ӓ“gì;í¿ríâôêþd­ÄŽ¸œ`B2—’–…tޑÌ(y%i@+¶—W4Á)àÞm'%ÆÇ1•¬·Â.¸½ œ™šš8òðÃyåµ[®_ºaû;“(áÌàaæ§ÇXÝßE½ZÃ&5°5iÖ&X¾¤iNáb„„…nžþÿ·þ>vg¹R)ø0õý=ziÉòúæþƕDR°sŽdNI*JRSâ&¸Ì×5ýò3ùç3œÊ&ß\
LÐ
ÿëx©ÓÊÑ^T<óf…ª<ߙ½ü7o¿ýŽ;ÿä}ã\½‡D„
˜ÌÎë\¤Ú¼U)3ϳvà¨_ž~æÇGGH¬Ba9]¤©`Œšˆ±:»ºqÉ,{Ÿû.ÿù·
þ_±ë~¾:ñÈWö¬vé¬yiÿèä©Ói’Ô;Ó¤Zr6-8™›6Çý«úlçÊÞ¤sóÚ¤ß%Âî¤:Ï·ÿztüÙ}ø4ÀOñª2ƒ'Û^_<oP
oò}»¸ÅÙNíO¹jÃ5”º7bÂNÄYšµqT,a¡Ÿ ¨ÍS¯Œ3<úƒ×é3xÂs_þòÝv^Ï-7W®µŸpӖÞ-.šÇ¥;$±¨¦hš¥¦-¸&˜’!@àÎkÍÀ]/³a×I/
§ðA^{öìÜ4Àyòf€ä-Ïo¦@z¨Î§'Sui…¸1MµY%ŽbšQJ3²LÍÔX·¶?Hš
[
‚PM
…A[²ïÞÒy» @ÂEë™?@oc˜°Ô¸OÕ§‰š’$¡Z‹‰bË蔡³«ëMžä1Aà!‚Š ¢ Š,j=ÆÁá×dîþÝý¥køð&îÜÄÀ×rç¯íâ'ƒ
và‰v¯úšçâÒ
©bò± ©ßU âs"§*Dx¿cX±w†ñ½{aîΕ¬ùìf¶ýÕkì«;:ñ©Å¼°Õ^¿±—
ˆ—\Çìä	zÓ&&pI4ž§Y›¢Ñ˜'‰S¬uT)ãSUæʍŒ¶®Ù1\TP‰²5‚…M8ŠŠ 6ÛE‚$ ±òò4sx¢ﱎdŸûžœ$|rrÁ¢¤´œÌbÖß2gr¾€(@©{=Kz¨Wg™™$Šš4«4jÓÄQ$µÄ‰eͺm\¿µƒjõÉüÞ6†W´jƒ…ê¤s¨s¨OÌú\j&˧ºH±Øº‹tV[i¢öÀqZ^*´Ôä¼Ó
Hüçò»îS÷~0ìYµ¥knš•alÚÀÚ(R©œajô‡¼ÈW|Rðžc_&Ä}¨L‚D¨­¡.E+H*h¢û¨KÁ%
Vvѕ
’Kž¥äÍáÉShIBæÀ\’•É	赿~乃;ï¸~«•½`^
u$Q…FuŠfTÁZKš3U¾ùw/P©FsÀcx/5ä«_ý£ƒ_úìc÷!šVд6‚4E‚D‚$
VqM%m(®á§¡1¤±/šá3ïg²1¶KI^ÑËe(—’|#qz©€ä/ý鉑¯ß|ÇW>wÇûoYßÇoëê[҃Mjœ?M¥Zc|2eï¾ãZ­ÅöøÉ銈~_-ãWí0ð‹ï
©¢.F¯áºZê1ëyCj‚³ 1Ø:$uÅeSܺŒ¾S5:Þdári‰Î™xJÞE’¿¨)"ßžþÁ_¸ë?|áÞ-[¶Ürß}÷™ju=öõzñññ1|d;
<ŸËÙ `h4ºrÅô:‘f‰$µ^©¤`k™Vñ9mdjÓP®ì¢/!yËÍj»ŠäÛ%Úc™·M	\‡ä"9<왞žþÓS§NÝÔÛÛkÒ4ezzºüð(ž;ÊøV‹C`xn®V¾bÉê¤ÖÄ6S¤f±5!©y•\SqÙ:;.Vm+éçøè¹Îٙ÷ÜïhO-^r´ûF-¿œ˜ONN~顇úu`}6ág30Îà#ä<×}VM‡®]S¾^ÓÒL°GZlU‰ëŠ«xõLET¼d ¾ ×_¢3cIöŽ¼>ÓnZóÔÆåC.È1£…vŽüàeZ›æòDu¾á?m»'ØØÈx­¬q׌ˆ+[’y!ž‡x^Ib°A®éփ!¹
°¦“•øô¦ÃO<¤ƒ³Ýôó®è]6@¦÷ k
N¼5ùڏõ…“5†ðœtœ–ôåU¹cÀ·NúyvU,õO®e
--- NEW FILE: gaim_question.png ---
‰PNG


–m‚ã±b»èš^‘JMÏ?wvö¿
¡1]_7ÇBJ®OÁñ˜¯Ú,Ú.¡”ïhhOþhüÂ÷€àý©{m¹* _Ú»ó/íxúïmëͳµ7ÏP¾ƒd2S*`¯,Só*ŽK©fJ	€®ih@"f
øaÒÙÙ¹:O×unºé&†‡‡9þ|Ä;‡Z­F*•Z]ìØ1Nœ8Áí;ç9¸ûuÒ´¨v”L“‰×¹5çqËÍ.¿~ÈíüÎÿ5ö<þ}!AàMÀ%â&õƧÝ
M‹£¤D“uT,ƒ4JèBíÚcÈ}ý•úýïÊ`c
0j@…ÈzꬹÍ5AYŸeêõcËM×ékKQX\dif
!ăisX–Åç?ÿyòù<º®ãyÞêüD"Áøø8“““!0ƒ-[¶P¯×‘Rây¯¾ú*{nYàÀãh‰^´Ä züf4ó&ôÄN´øv´D7ºÙ–L£%L´˜Î?>¨äw±¸è#Š+y¢”œ%ÊDfC×k³ëˆÙ®ŽLÉö¼qÇMÛÑìe/ ³wÛvL&¯H”R!À0úûûùò—¿L&“!‘H
###
ì蟉b†‘CÓ:Ñô4£´64=¦™ é B@C…
)*P(	†ÙÔ
}vœ©©©ëb–ñxœB¡Àã?Îøø8A088È¡C‡¸óÎ;×­õ<ÞìòºûUH”¬ƒrQÒC)%,T衔T*D¨P¾b(K;k±"ĉ¬%Ùøn4.p]Âá33^±êՂ`ÄôfRLœàܹs«µÈ{a–BŽ9Âìì,óóó†Áç>÷9úúúÈçóëÖ*¥Hšn¤ƒ’Ue”(¡d	%Ë Pá
R8H×Ey
ÒˆšBøÔ1[tj‚k€k
æPþ$ÊCºHoéVŽƒ°AUÔÁ«@ÍZ×EÓº-ãš`\	â†ñąå¾™Ä4tºR	N½ü78Žóžl3ëd³Y,ËB×uŽ?N"‘ØÐåLÓda%‹tjHoéÏ"ÜÓHwážDºçΡ]&¬V+^%į	º"tïÎS#b¥M@šŸ×t“V16:8¶R¹¸­=}¿0Í¡TŒŒ¡3½\dÇöíÌÖ†††.[s)0Žã°ÿ~J¥sssär9|ðA.[7;;KèUîšBÉú¨ÐFú*(#œe¤W!(Wu èáÍ
¼"„5øÞÓïV˜
X«c\¢4\#b­רo6P;:ÛÏU¬úïØuØ1]c~fšô-%ÓÖÖvU^J¥èììd×®]Üwß}lݺõ²uQþ‘Ó!{zßĐ
*‘ƒôj„vY·	ê6aÉÁ[p—~]á–vIQ®|õo³DUñ§
H•ˆ±ú?/ œ/Õæ¶wå…ñĶ¡\†„’ÌVÈw²ÀÖ­[7Ì0­’H$&ÓÑÑA:&_^gg'£££Tý,ÛSç]—Àö–Kh9„U¿èá•ފÀ/+üŠÂ­@ÀWÂؼK¨Èks~Ã*ª¬Yˆßøïú

Ôö\úlÅv¾xû®[‘Õ"É£££ä?²‡t6wY¥Úªh&“!NóÈ#ðÔSO122ÂîÝ»1M“X,¶]×I¥R¼uÚ©ÕH^Dz¯âÚ¿T$AYà¯(ì²Â·Á÷Ogò•%&3DÖAÈ*ªá°Vý^Q®ßùÓg–^ûÑs)Úέ·m@¹6¾¥ê¹<}}}hšvQJ‘Ëå8|ø0O=õ–eáº.µZ¡¡!:::ÖY”aâ¼ðÌk,V3lÉUÐ<IXø%…_Uø–Âs@ØP²Tørî'‹LŊ0
ß÷©×ëlß¾žž”R†A.—#‹±8úSÞ8‚kÄÙÿ‰»A3Áò
„ߢm®–'KĈ‚íb(—Z¹@˜*[3ÉøèL¡ü«ù\6žoKƒtP:s*êŽÇÓô÷÷“H$0MӈÅb˜¦I:&‹Qœ›eú™ÿI\”&Ç)×jÝ=üÒ'vƒ°Pá.š¨r"-eu?tJ4%£Ö¢RHW!=
ðá—µžY²/Nc
ۈ¸ˆÇú0q©•¨ëà¢åœíLÅGgŠ•_Íç²ñît%í	oa†Ê™“,¯¬à§ÚVɘiš†W-3ûÒ)½üº’T/L#Ÿ%ËÁÊæ¹ï= PÓh²†’U4i£‰
åK4Òá@`ÿ¬¦Þ,pöÄ"…?;ÍìÈ,µNó«ØÝ¡ˆ]â,ÐÉcmÒd·×o!—€òÎl±rH)՞M˜Ä
¸a2c"$¼8KeôՓ?Ã_^ ¨[ÏE†!(ÅrÝá­ù"¯Ï-/nÚ¹kåáÏÜމ²@œQŽXX‚F`„$(¡Ž"ôÂUø5øÞê‚Íp¨Ï9T^¼@ùGy7	±‡·?Y¦(ŠDYÖ6¸ ¯JÌ®%#‹
Ü'¤z|¦Rÿ•»·äéͤH›W?mÍó9_¬2V¨†£‹Å±ñ²õÚ¡TòN”;¬š\I”tÆ-ÑeÔ2…’F­C	GzŠ·
”ˆâDôBãwÇKK/-­ºF@ä2Í’I£gò¾
„ `»”ŸsÅjpºPž›([/Ú¾x0âqs'Òe£”ͪ%%$HõR}ÐýTá*BÂ
$ˆ
kÑ=¶ŸpVþߨà,¢zTQA
å؈š‡tC¤/!TGØ
aCP{YQ¯Àç«‘I‹D6€(¹O(õ6m¨i%Mz
ÑPñŽn:&-Ü[xÈ…ä%ÿ¯Þˍ¤y‘¦’Mä!
X²ñ©ˆ¬©YK¬Fù™9of°§°¤SGº>2¶@:2"_–B‚ªBù ì†Û؊ÁIÖ¿3Òä­.Òº‹×¼÷U‚v£
R;y:˜ÙÝ_ù¨
l¤ãVAUÖ^]!ª‘{ȼJF–Œ6ô:ã$‰ÀÈÅ«f\kM­­õ2ù 
çç5ˆ,$Ad%W}WäÃÀܹYmFù€[·
¿õœzýӜf€Ÿ¥õà5à·+L~òG<[ô°ã1èOÒKTÄ5ƒ|-4
@ùÐ
òWG³ïG"d”MþðÇêø„ÅðájrŠæ®ÜðŒ„©/ãÙjHý7·°™(¸69‡Î(—×uòadì/ÏT,UѤâÄ4gŸŸãm`˜cG¸¬±Ð0
ü¹„ñzŒïî롋(Ëô²JÓušÁuCù0Uˆ¨õí÷ܑܔÕeÇþD>ë†LYA“éDÊVˆ^ë.•Eà][.³po7OؼEXk]ã4>6à"6@
3³eh¬UÑ>Wߚ¼ôµªÖŠ·9.Û¬úÿˆž‚ÿuàÐ^
--- NEW FILE: gaim_warning.png ---
‰PNG


u|UŠâ¨Œ5Véè̀ãX–ViY3à«,G§4րŠ8
$	!¤I î¼º“îû¾÷¼ö^óǾ§ïéw©)¿ªSçÞ}îÙgïo¯µöZß=ðgü/z[Ÿ
;jmïzå†öò¢ø:ãI˜îÀ’öÿ·27"¦"fÓ+0ޗ½À^ñãœs#õî‰ÈX:ÕÅ%Ò¼ÿú5\¹áUˆh~ô‹Ç¸ûþ3õ÷_À»_À8^<_B¦%£g~Š/ýíëøÀ{®
	Š +”‹YöïßÏOî;Åw¶M×ï9CÊó!dZ2¾ð¡õ|ñ³ïƒ ‹”"îiˀADÊÊ#‡î8ȣϔ§êÿœ %1ÇßMIƒiþÙ-Üð¶Ë1Ù'ÜðGÀøØ
J)ZdÒÏðWW/äø°Kÿ€;ñkðȋšÑ‹Ä\	¹¸"Þ°lQ#»ÿçèíð‘3A0JDÂTH§:Z“hç/ibӚVîy8;ñgo
ž®¯æBÈׁÅ–-jäÑ_}žŽÔ(’Û
ÆzlFÍ[ƒjZJwBрµ–¦L‚Æ×Z»NrŸMX÷)¼ˆy½`ÌFÈ&உ[ÿý#¬^ä"ù'Ǔ¡¨ÎËP-+Q‰&Tj˜ÀºQÍ5RÏo P
xfpœûÌÃZã¤ç¾pf¹þ³‰
?ºý¼vm3R<X‹u¨Ö>œyëø̗@ꂿ#uáçøì×~7eÇÝóÓô,Hsӛ»èîLN¼|¯PF;“…Üʄ¨Íe½|õ¶·#ù}ÖâP	œ…¯ç³_ù!ßüÑαæO(”C^½²™–ÆñëhM"¢¸èUÍürÛèÄç¿Ø
lÞ\
\¼¸X,
å¤Á1(T’Øt¾Y¶¨I2÷í‘6&ºX·‰¨¬…Hìû´˜ÊBÆYG2™ä¶¿
“}lr܈C{ôΟ~
ښ¤“Ó[ВùiJUÍ­ìá¶O,F¥:QÉ.”Ó
¤l0ÐypNáˆ`2
*ШjÀMotÖ9j¼oÿ
È
yl<‰|ªÂrJL\®^àÓñ†‹û–ðΫ{Á;3íd"ˆLO~K&ãLOȁcUZ[[øûu¢’¨ôy¨ôjTz
*}
¤–£’½¨ä"H6B²
œâ8(àãW«u)‡6 »u·µÏMX«q˜¥\™HȤrü¶\…ûgêÃBWA—¯mŸtiã-dÒ©Äôcyî¤Ëƍ)šÛZPÉvT²•èE%ºQ‰.”3(§•h’à؍ĠȤUêcY, hš±“dR&2Î]–w7³eóùà•ñ³ >›ÖuNºvم­´4%HÌ@Èp6`Å
‰FTbJu œvT¢TÊi@©(§–*$Œ$ÄÀ•+XT# I}+ŽŽˆ9[È&&o¼a=R=Áœv¬°
:Ä–·Ñ
DÁ5‰u“F ÃäüdJÄG9É]>|Ӑґ'R½F*ƒlÚp!½ÓcÍK¤Yܙ¦½eö²©!­ã"¦Š˜è¢³ˆÉ"&úŽ`t㺈`\.
ڇŒC*6¯ˆ”$–¤$–WfZB^wñ|:›CÐSjSÃ;ƒøYny÷«Æšn|ÓŒ0«…
BP/ÅA¬;U›_"vÌ:ˆhÛíe‚»¼ËzðF&ß1*|rËÙ7?Þ»¹‹U½ÔI@CÊax8dY¦*’Â<Š4">˜Æ+ Ýº'Ì{xù¿¨	ËBè
OŸ¤ˆÍ9 îŠYÜ$Žˆ+&^xëU«ÿäœ8ßc¨w}á5ŒäJt6ifw—®ŽG(–,¬`¨”‹Jä±Öb‚"ºù"¦êd}¼ã¯
ÁÏ
qGwTp„ðÅôcºS124¶†‰x3$²åwa5M
—¯i¥!íÌè:Ʉ¢1í°s_…PeX”*c<—÷	+?ä
AN㏕œàWÀ÷„oíâÙ?q8„MÛ©àa‹¼Bí¨Æșzµó¸€³¬·ËZÈó‚ƒx£lß3¾„ßÕ_¢ìB=»_¼²™\I³m_ÑÂb6t$LÙ–íÚ×&ƹŠ_ÞAÿî³b'¿8x¬ö}:W™V'™²üß±û0oZ»dÖ	Œƒñê	®¼¨íûêE঵­xa^ótJCÿöÓ±*ÂÀ	ŸÇ,fÁ<—íúZšSB%ƒN"ûÐéôðÝ;œl6n¹vE÷«WTÛ¯XXè~ûÕ~(«°R
«|ê_¾JçâYÑ×GH‡‡›Ø5ÐɃÜ?8Ÿí'Û+Ë:s}«›Zn¾.µìËm¹è-›’Ýë×wvt.L$»«¥Ìï˜6vdk“ô¸.2£…ìnˆ·=9ÂýåymŸ¡93{B5㱦Ûð›olâÔð(¹‚K{k’ÞYȈÐwé›Id.bÍ¥çVãµ
í:è x#ßGDš$ÐË
P)Ð'@< 
¦„Ââ(rBÔDnƒT=Lµˆ{"‹?pÕj>ñ¥“š±Ö§î"Ñ6<e~rØŒîÍs÷ï‡95âÑÑjë“TR‘L¨Y3Ϲ"Ô™\ÀÓG+»=\ºqb†ÑîN´
ö¥–'°ZecõÔê•t\¨‘Ø5;¨d*í*§1Ã`\$,!:@´%…Ð`ƒø¾ÁxÆÆíhèj¤±FH|a£"/‹
žÑ³¡^zÄ\&"EbŸuí¦º•jä4Ôˆ>'¨‹¸‘+Ôeÿ8"Ý3zF$õÉw¿{çoüóu¯Á¸HP@‚2„.
¦b0®Áø¡ «BP+µh›ÃžÝÕ°Êûé	Ïqk¤ks‰/R;ƒ¸…D+Æ&´~m2.ã}¯¡ö»‰Ö‘ŒM8")„‰ý&Ê+÷0˜"¢=D{˜ª‹.ˆ¯‘ÐÆ
S2èŒg_eó˂®Mñ’ù´)1±VˆžY‹Ëd¯Ð€INhŒ[H4øQŠ&7"‚¢{Z_*Ö6QהZñß玺ÇÏ[t¶˜jãú˜ DW4¦jlòU²yGPÄ©Ôܦ",m$ƒµѶw‘Èê'Ɍ³Õäñ<?.ªLT·£s´ú‘)F×dBÛDb¢kÏår¥Ü²Ž¡^Ñ>¦T%¬˜RHX2ø%Dº*èÚ:k
Ú|ºè ̥ˌWÞ£¼cbM3†ÙEŠ©!Ó|~±Èí[’_'ASõ	š `‹‚WtÁº‡©-‰k«xv¤É`ɘ‡Ý
X-$Úz}ì–ëRÏ=&©ðÏCýyYÐ0pÚ袇8AAð‹BµßzHê!v+ӏMæö*ràÃðÐ'~Ï£ÉZVóÝtc'¼ Öo‚úŽ˜¦þÿï$
ã\#àÄ¡A5 ¾Fpsàà¿’‡ÿûOak”ÝØ<ãö
ë]{ó¹æ^¶ŽzTÒIèÉЅ͢£­?"¤z,™DÊ9IÈ/¶µíÓUƒ6v7¹ý
Ùy¸Ä
®“,ä\ª`S닯¸$³¨Í1í7ÿØluCŽ`­ …@€l­ÙÚùieÛÎp굝¬:\a–°x]S­&ä"ç"!
û:ÔvÇhÚ»ýk2KŒxŸ¨Ý‰@ªÖSû]k]‘0f%ç*!PO¨±Âw;V‹I`W¶ˆ%¥„]íø‹¹Q풢.QDò„ÆZH¥vŽë>ç\¦GToøØÁƒxDH4©8‹µès¤y$Ÿ¨MªeÎeza–ŠŠñ’ÄLMN|­*^ñFǸ¿!þ^
, ÿF´b
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/Makefile.am,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- Makefile.am	25 Aug 2002 04:59:34 -0000	1.74
+++ Makefile.am	25 Aug 2002 10:51:22 -0000	1.75
@@ -46,6 +46,10 @@
 		free_icon.xpm			\
 		gaim.png			\
 		gaim.xpm			\
+		gaim_error.png			\
+		gaim_info.png			\
+		gaim_question.png		\
+		gaim_warning.png		\
 		gg_suncloud.xpm			\
 		gg_sunred.xpm			\
 		gg_sunwhitered.xpm		\
@@ -126,6 +130,9 @@
 
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
 gaimbuttonpix_DATA = edit.png
+
+gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs
+gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
 gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png

[Gaim-commits] CVS: gaim/plugins notify.c,1.11,1.12

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

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

Modified Files:
	notify.c 
Log Message:
Who never commits anything *now*, Etan?

I changed most of the error message text around.  If you think any of it
should be different, just let me know, or send a patch.



Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- notify.c	11 Aug 2002 06:43:23 -0000	1.11
+++ notify.c	25 Aug 2002 10:51:22 -0000	1.12
@@ -21,6 +21,7 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
+#include <errno.h>
 
 guint choice = 1;
 #define NOTIFY_FOCUS		0x00000001
@@ -257,7 +258,7 @@
 
 	snprintf(buf, 1000, "%s/.gaim/.notify", getenv("HOME"));
 	if (!(fp = fopen(buf, "w"))) {
-		do_error_dialog(_("Unable to write to config file"), _("Notify plugin"));
+		do_error_dialog(_("Unable to write notify plugin config file"), strerror(errno), GAIM_ERROR);
 		return;
 	}