# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1028265592 0
# Node ID eb7b398051f230abdd136ccfd3d2525a24918c16
# Parent  ae9894ad81a0a129613c35bf98a5e52d146d65a9
[gaim-migrate @ 3389]
Is ISO-8859 a good default charset to use if one doesn't have nl_langinfo?

committer: Tailor Script <tailor@pidgin.im>

diff -r ae9894ad81a0 -r eb7b398051f2 gaim.spec.in
--- a/gaim.spec.in	Fri Aug 02 05:01:07 2002 +0000
+++ b/gaim.spec.in	Fri Aug 02 05:19:52 2002 +0000
@@ -74,7 +74,7 @@
 %{prefix}/man/man1/gaim.1.gz
 %attr(755,root,root) %{prefix}/lib/gaim/*
 %{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim.png
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 
 
@@ -85,7 +85,7 @@
 %{prefix}/man/man1/gaim.1.gz
 %{prefix}/lib/gaim/*
 %{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.xpm
+%{prefix}/share/pixmaps/gaim.png
 %{prefix}/share/pixmaps/gaim/*
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 %{sysconfdir}/CORBA/servers/*
diff -r ae9894ad81a0 -r eb7b398051f2 src/core.h
--- a/src/core.h	Fri Aug 02 05:01:07 2002 +0000
+++ b/src/core.h	Fri Aug 02 05:19:52 2002 +0000
@@ -26,8 +26,14 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_ICONV
 #include <iconv.h>
+#endif
+
+#ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
+#endif
+
 #include <stdio.h>
 #include <time.h>
 #include <glib.h>
diff -r ae9894ad81a0 -r eb7b398051f2 src/gaim.h
--- a/src/gaim.h	Fri Aug 02 05:01:07 2002 +0000
+++ b/src/gaim.h	Fri Aug 02 05:19:52 2002 +0000
@@ -433,8 +433,14 @@
 extern time_t get_time(int, int, int, int, int, int);
 extern FILE *gaim_mkstemp(gchar **);
 extern char *convert_string(char *, const char *, const char *);
+
+#ifdef HAVE_LANGINFO_CODESET
 #define utf8_to_str(in) convert_string(in, nl_langinfo(CODESET), "UTF-8");
 #define str_to_utf8(in) convert_string(in, "UTF-8", nl_langinfo(CODESET));
+#else
+#define utf8_to_str(in) convert_string(in, "ISO-8859-1", "UTF-8");
+#define str_to_utf8(in) convert_string(in, "UTF-8", "ISO-8859-1");
+#endif
 
 /*------------------------------------------------------------------------*/
 /*  Multi-Entry dialog and vCard dialog support                           */
diff -r ae9894ad81a0 -r eb7b398051f2 src/util.c
--- a/src/util.c	Fri Aug 02 05:01:07 2002 +0000
+++ b/src/util.c	Fri Aug 02 05:19:52 2002 +0000
@@ -1121,6 +1121,7 @@
 
 char *convert_string(char *str, const char *destset, const char *srcset)
 {
+#ifdef HAVE_ICONV
 	char *buf;
 	iconv_t cd;
 	size_t insize = 0;
@@ -1158,6 +1159,8 @@
 	g_free(buf);
 
 	return ret;
+#else
+	return g_strdup(str);
 }
 
 void strip_linefeed(gchar *text)