Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2181
Modified Files:
gtkimhtml.c
Log Message:
people are going to hate me for this but for some reason my encoding was coming up as ANSI_X3.4-1968. so it didn't work for me, so i removed it.
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- gtkimhtml.c 2001/11/08 02:29:31 1.68
+++ gtkimhtml.c 2001/11/08 02:39:02 1.69
@@ -91,22 +91,6 @@
gchar **image;
};
-static gchar*
-getcharset ()
-{
- static gchar charset [64];
-#ifdef HAVE_LANGINFO_CODESET
- gchar *ch = nl_langinfo (CODESET);
- if (!g_strncasecmp (ch, "iso-", 4))
- g_snprintf (charset, sizeof (charset), "iso%s", ch + 4);
- else
- g_snprintf (charset, sizeof (charset), ch);
-#else
- g_snprintf (charset, sizeof (charset), "iso8859-*");
-#endif
- return charset;
-}
-
static GtkSmileyTree*
gtk_smiley_tree_new ()
{
@@ -1862,20 +1846,16 @@
#endif
}
-#define TRY_FONT { \
- gchar *tmp = g_strjoinv ("-", newvals); \
- GdkFont *ret_font; \
- if (default_font->type == GDK_FONT_FONT) \
- ret_font = gdk_font_load (tmp); \
- else \
- ret_font = gdk_fontset_load (tmp); \
- g_free (tmp); \
- if (ret_font) { \
- g_strfreev (xflds); \
- g_strfreev (names); \
- g_strfreev (csvals); \
- return ret_font; \
- } \
+#define TRY_FONT tmp = g_strjoinv ("-", newvals); \
+ if (default_font->type == GDK_FONT_FONT) \
+ ret_font = gdk_font_load (tmp); \
+ else \
+ ret_font = gdk_fontset_load (tmp); \
+ g_free (tmp); \
+ if (ret_font) { \
+ g_strfreev (xflds); \
+ g_strfreev (names); \
+ return ret_font; \
}
@@ -1894,9 +1874,10 @@
gint i;
gchar **names;
gchar fs[10];
- gchar *charset;
- gchar **csvals;
+ gchar *tmp;
+ GdkFont *ret_font;
+
if (!name && !bold && !italics && !fontsize)
return gdk_font_ref (default_font);
@@ -1908,8 +1889,6 @@
#define ITALICS 4
#define SIZE 6
#define PTSZ 7
-#define REG 13
-#define ENC 14
#define END 15
if (name)
@@ -1918,8 +1897,6 @@
names = g_new0 (gchar *, 2);
names [0] = g_strdup (xflds [NAME]);
}
- charset = getcharset ();
- csvals = g_strsplit (charset, "-", 2);
for (i = 0; xflds [i]; i++)
newvals [i] = xflds [i];
@@ -1933,8 +1910,6 @@
newvals [SIZE] = fs;
newvals [PTSZ] = "";
}
- newvals [REG] = csvals [0];
- newvals [ENC] = csvals [1];
newvals [END] = NULL;
TRY_FONT;
@@ -1983,7 +1958,6 @@
g_strfreev (xflds);
g_strfreev (names);
- g_strfreev (csvals);
return gdk_font_ref (default_font);
}
|
