#include <glade/glade.h>
#include <time.h>
#include <sys/time.h>
+#include <string.h>
enum
{
return g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
}
+/* This is cut out of gconvert.c from glib (and mildly modified). Not all
+ backends give valid UTF-8 for properties, so we make sure that is.
+ */
+static gchar *
+make_valid_utf8 (const gchar *name)
+{
+ GString *string;
+ const gchar *remainder, *invalid;
+ gint remaining_bytes, valid_bytes;
+
+ string = NULL;
+ remainder = name;
+ remaining_bytes = strlen (name);
+
+ while (remaining_bytes != 0)
+ {
+ if (g_utf8_validate (remainder, remaining_bytes, &invalid))
+ break;
+ valid_bytes = invalid - remainder;
+
+ if (string == NULL)
+ string = g_string_sized_new (remaining_bytes);
+
+ g_string_append_len (string, remainder, valid_bytes);
+ g_string_append_c (string, '?');
+
+ remaining_bytes -= valid_bytes + 1;
+ remainder = invalid + 1;
+ }
+
+ if (string == NULL)
+ return g_strdup (name);
+
+ g_string_append (string, remainder);
+
+ g_assert (g_utf8_validate (string->str, -1, NULL));
+
+ return g_string_free (string, FALSE);
+}
+
static void
set_property (GladeXML *xml, Property property, const char *text)
{
GtkWidget *widget;
+ char *valid_text;
widget = glade_xml_get_widget (xml, properties_info[property].label_id);
g_return_if_fail (GTK_IS_LABEL (widget));
- gtk_label_set_text (GTK_LABEL (widget), text ? text : "");
+ if (text == NULL || text[0] == '\000') {
+ gchar *markup;
+
+ markup = g_markup_printf_escaped ("<i>%s</i>", _("None"));
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
+ g_free (markup);
+
+ return;
+ }
+ text = text ? text : "";
+
+ valid_text = make_valid_utf8 (text);
+
+ gtk_label_set_text (GTK_LABEL (widget), valid_text);
+
+ g_free (valid_text);
}
static void
(int) (progress * 100));
gtk_label_set_text (GTK_LABEL (label), progress_text);
g_free (progress_text);
+ gtk_widget_show (label);
} else {
- gtk_label_set_text (GTK_LABEL (label), "");
+ gtk_widget_hide (label);
}
}
model = gtk_tree_view_get_model
(GTK_TREE_VIEW (properties->fonts_treeview));
+ ev_document_doc_mutex_lock ();
ev_document_fonts_fill_model (document_fonts, model);
+ ev_document_doc_mutex_unlock ();
new_job = ev_job_fonts_new (job->document);
ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW);
g_object_unref (new_job);
g_free (text);
}
if (info->fields_mask & EV_DOCUMENT_INFO_FORMAT) {
- char **format_str = g_strsplit (info->format, "-", 2);
-
- text = g_strdup_printf (_("%s"), format_str[1]);
+ text = g_strdup_printf ("%s", info->format);
set_property (xml, FORMAT_PROPERTY, text);
-
- g_free (text);
- g_strfreev (format_str);
}
if (info->fields_mask & EV_DOCUMENT_INFO_N_PAGES) {
- text = g_strdup_printf (_("%d"), info->n_pages);
+ text = g_strdup_printf ("%d", info->n_pages);
set_property (xml, N_PAGES_PROPERTY, text);
g_free (text);
}