# HG changeset patch # User zas_ # Date 1235249015 0 # Node ID e8f21b91885dfc04ce838543bde5d8eade1ec71e # Parent c59358ba7ad163d781bea140aa2d3b0ae56ed955 Glibification again. diff -r c59358ba7ad1 -r e8f21b91885d src/cache_maint.c --- a/src/cache_maint.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/cache_maint.c Sat Feb 21 20:43:35 2009 +0000 @@ -182,7 +182,7 @@ while (work) { FileData *fd_list = work->data; - gchar *path_buf = strdup(fd_list->path); + gchar *path_buf = g_strdup(fd_list->path); gchar *dot; dot = extension_find_dot(path_buf); diff -r c59358ba7ad1 -r e8f21b91885d src/editors.c --- a/src/editors.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/editors.c Sat Feb 21 20:43:35 2009 +0000 @@ -318,7 +318,7 @@ gchar *namel = dir->d_name; size_t len = strlen(namel); - if (len > 8 && strncasecmp(namel + len - 8, ".desktop", 8) == 0) + if (len > 8 && g_ascii_strncasecmp(namel + len - 8, ".desktop", 8) == 0) { gchar *name = path_to_utf8(namel); gchar *dpath = g_build_filename(path, name, NULL); @@ -594,7 +594,7 @@ work = work->next; if (strcmp(ext, "*") == 0 || - strcasecmp(ext, fd->extension) == 0) + g_ascii_strcasecmp(ext, fd->extension) == 0) { p = fd->path; break; @@ -606,7 +606,7 @@ FileData *sfd = work2->data; work2 = work2->next; - if (strcasecmp(ext, sfd->extension) == 0) + if (g_ascii_strcasecmp(ext, sfd->extension) == 0) { p = sfd->path; break; diff -r c59358ba7ad1 -r e8f21b91885d src/filedata.c --- a/src/filedata.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/filedata.c Sat Feb 21 20:43:35 2009 +0000 @@ -395,7 +395,7 @@ work = work->next; - if (strcasecmp(ext, fd->extension) == 0) + if (g_ascii_strcasecmp(ext, fd->extension) == 0) { new_fd = fd; /* processing the original file */ } @@ -687,7 +687,7 @@ { FileData *sfd = work->data; work = work->next; - if (strcasecmp(sfd->extension, ".xmp") == 0) + if (g_ascii_strcasecmp(sfd->extension, ".xmp") == 0) { sidecar_path = g_strdup(sfd->path); break; @@ -728,7 +728,7 @@ gchar *ext = work->data; work = work->next; - if (strcasecmp(extension, ext) == 0) return i; + if (g_ascii_strcasecmp(extension, ext) == 0) return i; i++; } return 0; @@ -1880,7 +1880,7 @@ const gchar *dest_ext = extension_from_path(fd->change->dest); if (!dest_ext) dest_ext = ""; - if (strcasecmp(fd->extension, dest_ext) != 0) + if (g_ascii_strcasecmp(fd->extension, dest_ext) != 0) { ret |= CHANGE_WARN_CHANGED_EXT; DEBUG_1("Change checked: source and destination have different extensions: %s -> %s", fd->path, fd->change->dest); diff -r c59358ba7ad1 -r e8f21b91885d src/filefilter.c --- a/src/filefilter.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/filefilter.c Sat Feb 21 20:43:35 2009 +0000 @@ -285,9 +285,9 @@ ext = g_strndup(b, l); - if (strcasecmp(ext, "%image") == 0) file_class = FORMAT_CLASS_IMAGE; - else if (strcasecmp(ext, "%raw") == 0) file_class = FORMAT_CLASS_RAWIMAGE; - else if (strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META; + if (g_ascii_strcasecmp(ext, "%image") == 0) file_class = FORMAT_CLASS_IMAGE; + else if (g_ascii_strcasecmp(ext, "%raw") == 0) file_class = FORMAT_CLASS_RAWIMAGE; + else if (g_ascii_strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META; if (file_class == -1) { @@ -383,7 +383,7 @@ if (ln >= lf) { /* FIXME: utf8 */ - if (strncasecmp(name + ln - lf, filter, lf) == 0) return TRUE; + if (g_ascii_strncasecmp(name + ln - lf, filter, lf) == 0) return TRUE; } work = work->next; } diff -r c59358ba7ad1 -r e8f21b91885d src/format_raw.c --- a/src/format_raw.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/format_raw.c Sat Feb 21 20:43:35 2009 +0000 @@ -321,7 +321,7 @@ while (!match && format_raw_list[i].magic_pattern) { if (format_raw_list[i].extension && - strcasecmp(format_raw_list[i].extension, ext) == 0) + g_ascii_strcasecmp(format_raw_list[i].extension, ext) == 0) { match = TRUE; } diff -r c59358ba7ad1 -r e8f21b91885d src/pan-item.c --- a/src/pan-item.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/pan-item.c Sat Feb 21 20:43:35 2009 +0000 @@ -762,7 +762,7 @@ } else if (ignore_case) { - if (strcasecmp(path, pi->fd->name) == 0) match = TRUE; + if (g_ascii_strcasecmp(path, pi->fd->name) == 0) match = TRUE; } else { diff -r c59358ba7ad1 -r e8f21b91885d src/remote.c --- a/src/remote.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/remote.c Sat Feb 21 20:43:35 2009 +0000 @@ -429,7 +429,7 @@ { gdouble n; - n = strtod(text, NULL); + n = g_ascii_strtod(text, NULL); if (n < SLIDESHOW_MIN_SECONDS || n > SLIDESHOW_MAX_SECONDS) { printf_term("Remote slideshow delay out of range (%.1f to %.1f)\n", diff -r c59358ba7ad1 -r e8f21b91885d src/search.c --- a/src/search.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/search.c Sat Feb 21 20:43:35 2009 +0000 @@ -1702,7 +1702,7 @@ } else { - match = (strcasecmp(fd->name, sd->search_name) == 0); + match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0); } } else if (sd->match_name == SEARCH_MATCH_CONTAINS) @@ -1809,7 +1809,7 @@ haystack = list; while (haystack && !found) { - found = (strcasecmp((gchar *)needle->data, + found = (g_ascii_strcasecmp((gchar *)needle->data, (gchar *)haystack->data) == 0); haystack = haystack->next; } @@ -1828,7 +1828,7 @@ haystack = list; while (haystack && !found) { - found = (strcasecmp((gchar *)needle->data, + found = (g_ascii_strcasecmp((gchar *)needle->data, (gchar *)haystack->data) == 0); haystack = haystack->next; } @@ -1847,7 +1847,7 @@ haystack = list; while (haystack && !found) { - found = (strcasecmp((gchar *)needle->data, + found = (g_ascii_strcasecmp((gchar *)needle->data, (gchar *)haystack->data) == 0); haystack = haystack->next; } diff -r c59358ba7ad1 -r e8f21b91885d src/ui_fileops.c --- a/src/ui_fileops.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/ui_fileops.c Sat Feb 21 20:43:35 2009 +0000 @@ -781,7 +781,7 @@ e = strlen(ext); /* FIXME: utf8 */ - return (p > e && strncasecmp(path + p - e, ext, e) == 0); + return (p > e && g_ascii_strncasecmp(path + p - e, ext, e) == 0); } gchar *remove_extension_from_path(const gchar *path) diff -r c59358ba7ad1 -r e8f21b91885d src/ui_pathsel.c --- a/src/ui_pathsel.c Sat Feb 21 18:28:53 2009 +0000 +++ b/src/ui_pathsel.c Sat Feb 21 20:43:35 2009 +0000 @@ -136,7 +136,7 @@ if (*f_ptr != '\0' && f_ptr[1] == ' ') f_ptr++; /* skip space immediately after separator */ f_ptr++; /* FIXME: utf8 */ - if (l >= i && strncasecmp(file + l - i, strt_ptr, i) == 0) return TRUE; + if (l >= i && g_ascii_strncasecmp(file + l - i, strt_ptr, i) == 0) return TRUE; } return FALSE; }