summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-scalable-font.c
diff options
context:
space:
mode:
authorRamiro Estrugo <ramiro@src.gnome.org>2000-08-21 16:35:03 +0000
committerRamiro Estrugo <ramiro@src.gnome.org>2000-08-21 16:35:03 +0000
commitb08142cc0fba6ccdeef515c3ae521ef8c715f4c7 (patch)
treec14d2e7e3d137d0d8ef7ea4d1277305975eb37a2 /libnautilus-private/nautilus-scalable-font.c
parent9f5459ceea6a5a49dd0c0159c07e09e0b05b67bc (diff)
downloadnautilus-b08142cc0fba6ccdeef515c3ae521ef8c715f4c7.tar.gz
Add support for case insensitive string lists.
* libnautilus-extensions/nautilus-string-list.c: (nautilus_string_list_new), (nautilus_string_list_new_from_string), (nautilus_string_list_new_from_string_list), (nautilus_string_list_new_from_tokens), (nautilus_string_list_contains), (nautilus_string_list_equals), (nautilus_string_list_get_index_for_string), (nautilus_string_list_sort), (nautilus_string_list_remove_duplicates), (str_is_equal), (nautilus_self_check_string_list): * libnautilus-extensions/nautilus-string-list.h: Add support for case insensitive string lists. * libnautilus-extensions/nautilus-string-map.c, * libnautilus-extensions/nautilus-string-map.c: (nautilus_string_map_add), (map_entry_new), (map_entry_list_lookup_mapped_string), (str_is_equal), (nautilus_self_check_string_map): Add support for case insensitive string maps. * libnautilus-extensions/nautilus-string.c: (nautilus_istr_compare): Add missing function that apparentlt was missing and unnoticed. * libnautilus-extensions/nautilus-font-picker.c: (font_picker_update_weight_picker), (font_picker_update_slant_picker), (font_picker_update_set_width_picker): * libnautilus-extensions/nautilus-preference.c: (preference_allocate_type_info): * libnautilus-extensions/nautilus-preferences-item.c: (preferences_item_create_font_family), (preferences_item_create_theme): * libnautilus-extensions/nautilus-scalable-font.c: (parse_font_description_file), (font_family_table_add_fonts), (nautilus_scalable_font_largest_fitting_font_size), (font_family_table_get_family_list), (nautilus_scalable_font_query_font): * libnautilus-extensions/nautilus-string-picker.c: (nautilus_string_picker_initialize), (nautilus_string_picker_get_string_list), (nautilus_string_picker_insert_string): * libnautilus-extensions/nautilus-user-level-manager.c: (user_level_manager_new), (nautilus_user_level_manager_get_user_level_names): * src/file-manager/fm-directory-view.c: (real_get_emblem_names_to_exclude): * src/nautilus-application.c: (nautilus_application_check_user_directories): * test/test-nautilus-image.c: (create_font_picker_frame): * test/test-nautilus-label.c: (create_font_picker_frame): * test/test-nautilus-widgets.c: (test_string_picker): Update for case insensitive support changes in string list api.
Diffstat (limited to 'libnautilus-private/nautilus-scalable-font.c')
-rw-r--r--libnautilus-private/nautilus-scalable-font.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c
index b6128fd05..04e2a6b37 100644
--- a/libnautilus-private/nautilus-scalable-font.c
+++ b/libnautilus-private/nautilus-scalable-font.c
@@ -187,7 +187,7 @@ parse_font_description_file (const char *directory,
return FALSE;
}
- tokenized_list = nautilus_string_list_new_from_tokens (fonts_dir_content, "\n");
+ tokenized_list = nautilus_string_list_new_from_tokens (fonts_dir_content, "\n", TRUE);
g_free (fonts_dir_content);
if (tokenized_list == NULL) {
@@ -203,8 +203,8 @@ parse_font_description_file (const char *directory,
return FALSE;
}
- *font_pfb_list_out = nautilus_string_list_new ();
- *font_xfld_list_out = nautilus_string_list_new ();
+ *font_pfb_list_out = nautilus_string_list_new (TRUE);
+ *font_xfld_list_out = nautilus_string_list_new (TRUE);
for (i = 0; i < count; i++) {
char *line = nautilus_string_list_nth (tokenized_list, i + 1);
@@ -461,7 +461,7 @@ font_family_table_add_fonts (GHashTable *font_family_table, const char *font_pat
xfld = nautilus_string_list_nth (font_xfld_list, i);
g_assert (xfld != NULL);
- tokenized_xfld = nautilus_string_list_new_from_tokens (xfld, "-");
+ tokenized_xfld = nautilus_string_list_new_from_tokens (xfld, "-", TRUE);
foundry = nautilus_string_list_nth (tokenized_xfld, 1);
family = nautilus_string_list_nth (tokenized_xfld, 2);
@@ -663,7 +663,7 @@ nautilus_scalable_font_largest_fitting_font_size (const NautilusScalableFont *f
return font_sizes[num_font_sizes - 1];
}
- tokenized_string = nautilus_string_list_new_from_tokens (text, "\n");
+ tokenized_string = nautilus_string_list_new_from_tokens (text, "\n", TRUE);
longest_string = nautilus_string_list_get_longest_string (tokenized_string);
g_assert (longest_string != NULL);
nautilus_string_list_free (tokenized_string);
@@ -928,7 +928,7 @@ font_family_table_get_family_list (GHashTable *font_family_table)
g_return_val_if_fail (font_family_table != NULL, NULL);
- list = nautilus_string_list_new ();
+ list = nautilus_string_list_new (TRUE);
g_hash_table_foreach (font_family_table, font_family_table_for_each_append, list);
@@ -996,15 +996,15 @@ nautilus_scalable_font_query_font (const char *family,
}
if (weights_out != NULL) {
- *weights_out = nautilus_string_list_new ();
+ *weights_out = nautilus_string_list_new (TRUE);
}
if (slants_out != NULL) {
- *slants_out = nautilus_string_list_new ();
+ *slants_out = nautilus_string_list_new (TRUE);
}
if (set_widths_out != NULL) {
- *set_widths_out = nautilus_string_list_new ();
+ *set_widths_out = nautilus_string_list_new (TRUE);
}
for (iterator = family_entry->fonts; iterator != NULL; iterator = iterator->next) {