# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1053150078 0
# Node ID 2c4188300aba869fa58db657038478a481eebd01
# Parent  326136c49036258424a6024dbb8a6bc998c65367
[gaim-migrate @ 5787]
This fixes an i18n thing, I think.

I changed some stuff in oscar.c to use _() instead of calling gettext
directly.  That's ok, right?  I like the macro better.

I also fixed a compile warning or two.  If that function declaration
isn't supposed to be there, feel free to move it, or remove it, or
lemme know and I'll do it.

Viva 0.63!

committer: Tailor Script <tailor@pidgin.im>

diff -r 326136c49036 -r 2c4188300aba src/dialogs.c
--- a/src/dialogs.c	Sat May 17 04:10:16 2003 +0000
+++ b/src/dialogs.c	Sat May 17 05:41:18 2003 +0000
@@ -4275,7 +4275,6 @@
 {
 	const char *new_name;
 	struct group *g;
-	struct group *orig;
 
 	if (resp == GTK_RESPONSE_OK) {
 		new_name = gtk_entry_get_text(GTK_ENTRY(entry));
diff -r 326136c49036 -r 2c4188300aba src/gtkblist.h
--- a/src/gtkblist.h	Sat May 17 04:10:16 2003 +0000
+++ b/src/gtkblist.h	Sat May 17 05:41:18 2003 +0000
@@ -118,6 +118,7 @@
 void gaim_gtk_blist_docklet_add();
 void gaim_gtk_blist_docklet_remove();
 void gaim_gtk_blist_update_columns();
+void gaim_gtk_blist_update_refresh_timeout();
 
 /**
  * Useful for the buddy ticker
diff -r 326136c49036 -r 2c4188300aba src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sat May 17 04:10:16 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat May 17 05:41:18 2003 +0000
@@ -2911,7 +2911,7 @@
 			   (reason < msgerrreasonlen) ? msgerrreason[reason] : "unknown");
 
 	m = g_strdup_printf(_("SNAC threw error: %s\n"),
-			reason < msgerrreasonlen ? gettext(msgerrreason[reason]) : _("Unknown error"));
+			reason < msgerrreasonlen ? _(msgerrreason[reason]) : _("Unknown error"));
 	do_error_dialog(m, NULL, GAIM_ERROR);
 	g_free(m);
 
@@ -2947,7 +2947,7 @@
 
 	/* Data is assumed to be the destination sn */
 	buf = g_strdup_printf(_("Your message to %s did not get sent:"), data);
-	do_error_dialog(buf, (reason < msgerrreasonlen) ? gettext(msgerrreason[reason]) : _("No reason given."), GAIM_ERROR);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("No reason given."), GAIM_ERROR);
 	g_free(buf);
 
 	return 1;
@@ -2998,7 +2998,7 @@
 	va_end(ap);
 
 	snprintf(buf, sizeof(buf), _("User information for %s unavailable:"), destn);
-	do_error_dialog(buf, (reason < msgerrreasonlen) ? gettext(msgerrreason[reason]) : _("No reason given."), GAIM_ERROR);
+	do_error_dialog(buf, (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("No reason given."), GAIM_ERROR);
 
 	return 1;
 }
diff -r 326136c49036 -r 2c4188300aba src/server.c
--- a/src/server.c	Sat May 17 04:10:16 2003 +0000
+++ b/src/server.c	Sat May 17 05:41:18 2003 +0000
@@ -1403,7 +1403,7 @@
 	GAIM_DIALOG(window);
 	gtk_window_set_role(GTK_WINDOW(window), "popup");
 	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-	gtk_window_set_title(GTK_WINDOW(window), "Gaim - Popup");
+	gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Popup"));
 	gtk_container_set_border_width(GTK_CONTAINER(window), 5);
 	g_signal_connect(G_OBJECT(window), "destroy",
 					 G_CALLBACK(des_popup), window);