debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Count font names added to the list, to fix font combo boxes

Browse source
This commit is contained in:
Christian Dywan 2009-09-28 23:54:39 +02:00
parent 6d31faecf3
commit 7a5329a1e0
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
katze/katze-utils.c
View file

@ -283,7 +283,7 @@ katze_property_proxy (gpointer object,
|| _hint == g_intern_string ("font-monospace"))) || _hint == g_intern_string ("font-monospace")))
{ {
GtkComboBox* combo; GtkComboBox* combo;
int n_families, i; gint n_families, i;
PangoContext* context; PangoContext* context;
PangoFontFamily** families; PangoFontFamily** families;
gboolean monospace = _hint == g_intern_string ("font-monospace"); gboolean monospace = _hint == g_intern_string ("font-monospace");
@ -296,14 +296,18 @@ katze_property_proxy (gpointer object,
if (!string) if (!string)
string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value); string = g_strdup (G_PARAM_SPEC_STRING (pspec)->default_value);
if (string) if (string)
for (i = 0; i < n_families; i++)
{ {
const gchar* font = pango_font_family_get_name (families[i]); gint j = 0;
if (monospace != pango_font_family_is_monospace (families[i])) for (i = 0; i < n_families; i++)
continue; {
gtk_combo_box_append_text (combo, font); const gchar* font = pango_font_family_get_name (families[i]);
if (!g_ascii_strcasecmp (font, string)) if (monospace != pango_font_family_is_monospace (families[i]))
gtk_combo_box_set_active (combo, i); continue;
gtk_combo_box_append_text (combo, font);
if (!g_ascii_strcasecmp (font, string))
gtk_combo_box_set_active (combo, j);
j++;
}
} }
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE ( gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (
gtk_combo_box_get_model (combo)), 0, GTK_SORT_ASCENDING); gtk_combo_box_get_model (combo)), 0, GTK_SORT_ASCENDING);