# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 995394657 0
# Node ID 75c06bcb022ef4bff8431de8f7520aebc87ff569
# Parent  a4367a6478eb48d56bc78715b4bd579721cfc948
[gaim-migrate @ 2085]
Grigory Bakunov (black_bmc) patch for some internationalization stuff

committer: Tailor Script <tailor@pidgin.im>

diff -r a4367a6478eb -r 75c06bcb022e src/aim.c
--- a/src/aim.c	Tue Jul 17 18:05:21 2001 +0000
+++ b/src/aim.c	Tue Jul 17 18:30:57 2001 +0000
@@ -537,6 +537,7 @@
 	}
 	*/
 
+	gtk_set_locale();
 #ifdef USE_GNOME
 	gnome_init_with_popt_table(PACKAGE, VERSION, argc, argv, popt_options, 0, NULL);
 #else
diff -r a4367a6478eb -r 75c06bcb022e src/gtkimhtml.c
--- a/src/gtkimhtml.c	Tue Jul 17 18:05:21 2001 +0000
+++ b/src/gtkimhtml.c	Tue Jul 17 18:30:57 2001 +0000
@@ -1626,7 +1626,7 @@
 	if (!choice) {
 		if (imhtml->default_font)
 			return gdk_font_ref (imhtml->default_font);
-		return gdk_font_load ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+		return gdk_fontset_load ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
 	}
 
 	g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-%d-*-*-*-*-iso8859-*",
@@ -1634,34 +1634,34 @@
 		    bold ? "bold" : "medium",
 		    italics ? 'i' : 'r',
 		    size);
-	font = gdk_font_load (buf);
+	font = gdk_fontset_load (buf);
 
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice,
 			    bold ? "bold" : "medium",
 			    italics ? 'i' : 'r');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice,
 			    italics ? 'i' : 'r');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice,
 			    italics ? 'o' : '*');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font && italics) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-*-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice);
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
@@ -1670,7 +1670,7 @@
 			    bold ? "bold" : "medium",
 			    italics ? 'i' : 'r',
 			    size);
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
@@ -1678,27 +1678,27 @@
 			    choice,
 			    bold ? "bold" : "medium",
 			    italics ? 'i' : 'r');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-*-*",
 			    choice,
 			    italics ? 'i' : 'r');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-*-*",
 			    choice,
 			    italics ? 'o' : '*');
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	if (!font && italics) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-*-*-*-*-*-*-*-*-*-*-*",
 			    choice);
-		font = gdk_font_load (buf);
+		font = gdk_fontset_load (buf);
 	}
 
 	g_free (choice);
@@ -1707,7 +1707,7 @@
 		return gdk_font_ref (imhtml->default_font);
 
 	if (!font)
-		return gdk_font_load ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+		return gdk_fontset_load ("-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
 
 	return font;
 }