diff options
Diffstat (limited to 'gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff')
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff b/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff deleted file mode 100644 index 31a1c394a318..000000000000 --- a/gnome-extra/gtkhtml/files/gtkhtml-properties.c.diff +++ /dev/null @@ -1,122 +0,0 @@ ---- gtkhtml-properties.c.orig Fri Nov 9 01:15:55 2001 -+++ gtkhtml-properties.c Tue Nov 20 23:59:29 2001 -@@ -181,59 +181,6 @@ - g_free (p->v); \ - GET(string,v,s) - --static gchar * --get_font_name (const GdkFont * font) --{ -- Atom font_atom, atom; -- Bool status; -- -- font_atom = gdk_atom_intern ("FONT", FALSE); -- -- if (font->type == GDK_FONT_FONTSET) { -- XFontStruct **font_structs; -- gint num_fonts; -- gchar **font_names; -- -- num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names); -- status = XGetFontProperty (font_structs[0], font_atom, &atom); -- } else { -- status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom); -- } -- -- if (status) { -- return gdk_atom_name (atom); -- } -- -- return NULL; --} -- --static void --get_default_fonts (gchar **var_name, gchar **fix_name) --{ -- GtkStyle *style; -- char *font_name = NULL; -- -- style = gtk_widget_get_default_style (); -- if (style->font) { -- font_name = get_font_name (style->font); -- } -- -- if (font_name) { -- gchar *enc1, *enc2; -- -- enc1 = html_font_manager_get_attr (font_name, 13); -- enc2 = html_font_manager_get_attr (font_name, 14); -- -- *var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); -- *fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); -- -- /* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */ -- } else { -- *var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*"); -- *fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*"); -- } --} -- - void - gtk_html_class_properties_load (GtkHTMLClassProperties *p) - { -@@ -319,6 +266,59 @@ - gnome_config_sync (); - } - #endif -+ -+static gchar * -+get_font_name (const GdkFont * font) -+{ -+ Atom font_atom, atom; -+ Bool status; -+ -+ font_atom = gdk_atom_intern ("FONT", FALSE); -+ -+ if (font->type == GDK_FONT_FONTSET) { -+ XFontStruct **font_structs; -+ gint num_fonts; -+ gchar **font_names; -+ -+ num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names); -+ status = XGetFontProperty (font_structs[0], font_atom, &atom); -+ } else { -+ status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom); -+ } -+ -+ if (status) { -+ return gdk_atom_name (atom); -+ } -+ -+ return NULL; -+} -+ -+static void -+get_default_fonts (gchar **var_name, gchar **fix_name) -+{ -+ GtkStyle *style; -+ char *font_name = NULL; -+ -+ style = gtk_widget_get_default_style (); -+ if (style->font) { -+ font_name = get_font_name (style->font); -+ } -+ -+ if (font_name) { -+ gchar *enc1, *enc2; -+ -+ enc1 = html_font_manager_get_attr (font_name, 13); -+ enc2 = html_font_manager_get_attr (font_name, 14); -+ -+ *var_name = g_strdup_printf ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); -+ *fix_name = g_strdup_printf ("-*-courier-*-*-*-*-12-*-*-*-*-*-%s-%s", enc1, enc2); -+ -+ /* printf ("default encoding %s-%s\n%s\n%s\n", enc1, enc2, *var_name, *fix_name); */ -+ } else { -+ *var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-*-*"); -+ *fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-*-*"); -+ } -+} - - #define COPYS(v) \ - g_free (p1->v); \ |