diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 4c3ccbd51..84abbf4ea 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,7 @@ +2001-07-28 Carlos Perelló Marín + + * capplet-dir-view-html.c: Reverted my utf patch. Sorry :-( + 2001-07-28 Carlos Perelló Marín * main.c: /s/Configuraiton/Configuration/ diff --git a/control-center/capplet-dir-view-html.c b/control-center/capplet-dir-view-html.c index 11066e13f..2e9359e35 100644 --- a/control-center/capplet-dir-view-html.c +++ b/control-center/capplet-dir-view-html.c @@ -23,7 +23,6 @@ #include #include -#include #include #include @@ -67,7 +66,6 @@ handle_url_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *stream, CappletDi char buf[BUFLEN]; int fd; ssize_t s; - char *utfs; fd = open (url, O_RDONLY); if (fd == -1) @@ -84,9 +82,7 @@ handle_url_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *stream, CappletDi gtk_html_end (html, stream, GTK_HTML_STREAM_OK); return; default: - utfs = e_utf8_from_locale_string_sized (buf, s); - gtk_html_write (html, stream, utfs, strlen(utfs)); - g_free (utfs); + gtk_html_write (html, stream, buf, s); break; } } @@ -111,7 +107,7 @@ handle_link_cb (GtkHTML *html, const gchar *url, CappletDirView *view) static void write_parent_html (CappletDir *dir, GtkHTML *html, GtkHTMLStream *stream) { - char *s, *utfs; + char *s; if (!dir) return; @@ -121,11 +117,8 @@ write_parent_html (CappletDir *dir, GtkHTML *html, GtkHTMLStream *stream) write_parent_html (dir->entry.dir, html, stream); - utfs = e_utf8_from_locale_string (dir->entry.label); s = g_strdup_printf ("%s %s", dir->entry.dir ? " |" : "", - dir->entry.path, utfs); - g_free (utfs); - + dir->entry.path, dir->entry.label); gtk_html_write (html, stream, s, strlen (s)); g_free (s); } @@ -140,14 +133,11 @@ header_populate (CappletDirView *view) { GtkHTMLStream *stream; HtmlViewData *data; - char *s, *utf_title, *utf_path; + char *s; data = view->view_data; stream = gtk_html_begin (data->top); - utf_title = e_utf8_from_locale_string (_("GNOME Control Center:")); - utf_path = e_utf8_from_locale_string (CAPPLET_DIR_ENTRY (view->capplet_dir)->label); - s = g_strdup_printf ( "" "" @@ -156,10 +146,8 @@ header_populate (CappletDirView *view) "" "" "
\"\"%s   %s
" -"", utf_title, utf_path); - g_free (utf_title); - g_free (utf_path); - +"", + _("GNOME Control Center:"), CAPPLET_DIR_ENTRY (view->capplet_dir)->label); gtk_html_write (data->top, stream, s, strlen (s)); g_free (s); @@ -195,13 +183,12 @@ sidebar_populate (CappletDirView *view) HtmlViewData *data; CappletDirEntry *entry; GSList *item; - char *s, *utfs; + char *s; data = view->view_data; stream = gtk_html_begin (data->sidebar); - utfs = e_utf8_from_locale_string (CAPPLET_DIR_ENTRY (data->root_dir)->label); s = g_strdup_printf ( "" "" @@ -211,8 +198,7 @@ sidebar_populate (CappletDirView *view) "" "" "" -"", CAPPLET_DIR_ENTRY (data->root_dir)->path, CAPPLET_DIR_ENTRY (data->root_dir)->icon, CAPPLET_DIR_ENTRY (data->root_dir)->path, utfs, (data->root_dir == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png"); - g_free (utfs); +"", CAPPLET_DIR_ENTRY (data->root_dir)->path, CAPPLET_DIR_ENTRY (data->root_dir)->icon, CAPPLET_DIR_ENTRY (data->root_dir)->path, CAPPLET_DIR_ENTRY (data->root_dir)->label, (data->root_dir == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png"); gtk_html_write (data->sidebar, stream, s, strlen (s)); g_free (s); @@ -223,10 +209,7 @@ sidebar_populate (CappletDirView *view) if (total_num_items (CAPPLET_DIR (entry)->entries) < 1) continue; - utfs = e_utf8_from_locale_string (entry->label); - - s = g_strdup_printf ("", entry->path, entry->icon, entry->path, utfs, (CAPPLET_DIR (entry) == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png"); - g_free (utfs); + s = g_strdup_printf ("", entry->path, entry->icon, entry->path, entry->label, (CAPPLET_DIR (entry) == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png"); gtk_html_write (data->sidebar, stream, s, strlen (s)); g_free (s); } @@ -242,7 +225,7 @@ html_write_row (GtkHTML *html, GtkHTMLStream *stream, GSList *list, int the_max) { CappletDirEntry *entry; int i; - char *s, *utfs; + char *s; GSList *item; g_return_val_if_fail (list != NULL, NULL); @@ -275,9 +258,7 @@ html_write_row (GtkHTML *html, GtkHTMLStream *stream, GSList *list, int the_max) entry = CAPPLET_DIR_ENTRY (item->data); if (entry->type != TYPE_CAPPLET) continue; - utfs = e_utf8_from_locale_string (entry->label); - s = g_strdup_printf ("", entry->path, utfs); - g_free (utfs); + s = g_strdup_printf ("", entry->path, entry->label); gtk_html_write (html, stream, s, strlen (s)); g_free (s); @@ -379,8 +360,6 @@ html_create (CappletDirView *view) vbox = gtk_vbox_new (FALSE, 0); /* top widget */ data->top = GTK_HTML (gtk_html_new ()); - gtk_html_set_default_content_type (GTK_HTML (data->top), - "text/html; charset=utf-8"); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, @@ -394,8 +373,6 @@ html_create (CappletDirView *view) /* sidebar */ data->sidebar = GTK_HTML (gtk_html_new ()); - gtk_html_set_default_content_type (GTK_HTML (data->sidebar), - "text/html; charset=utf-8"); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, @@ -406,8 +383,6 @@ html_create (CappletDirView *view) /* main widget */ data->main = GTK_HTML (gtk_html_new ()); - gtk_html_set_default_content_type (GTK_HTML (data->main), - "text/html; charset=utf-8"); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER,
 
\"\"%s\"\"
\"\"%s\"\"
\"\"%s\"\"
\"\"%s\"\"
%s
%s