mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-01-03 20:34:12 +01:00
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
diff -urN sylpheed-2.1.3.orig/libsylph/Makefile.am sylpheed-2.1.3/libsylph/Makefile.am
|
|
--- sylpheed-2.1.3.orig/libsylph/Makefile.am 2005-09-08 16:24:49.000000000 +0900
|
|
+++ sylpheed-2.1.3/libsylph/Makefile.am 2005-10-02 20:56:56.940000000 +0900
|
|
@@ -1,7 +1,8 @@
|
|
|
|
AM_CPPFLAGS = \
|
|
-DG_LOG_DOMAIN=\"LibSylph\" \
|
|
- -DSYSCONFDIR=\""$(sysconfdir)"\"
|
|
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
|
|
+ -DDATADIR=\""$(datadir)"\"
|
|
|
|
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)
|
|
|
|
diff -urN sylpheed-2.1.3.orig/libsylph/procmime.c sylpheed-2.1.3/libsylph/procmime.c
|
|
--- sylpheed-2.1.3.orig/libsylph/procmime.c 2005-09-22 20:18:02.000000000 +0900
|
|
+++ sylpheed-2.1.3/libsylph/procmime.c 2005-10-02 20:57:55.920000000 +0900
|
|
@@ -1051,6 +1051,9 @@
|
|
g_free(dir);
|
|
mime_type_list = g_list_concat(mime_type_list, list);
|
|
|
|
+ list = procmime_get_mime_type_list(DATADIR "/mime/globs");
|
|
+ mime_type_list = g_list_concat(mime_type_list, list);
|
|
+
|
|
if (!mime_type_list) {
|
|
g_warning("mime.types not found\n");
|
|
return NULL;
|
|
@@ -1103,7 +1106,7 @@
|
|
g_strstrip(buf);
|
|
|
|
p = buf;
|
|
- while (*p && !g_ascii_isspace(*p)) p++;
|
|
+ while (*p && !g_ascii_isspace(*p) && *p != ':') p++;
|
|
if (*p) {
|
|
*p = '\0';
|
|
p++;
|
|
@@ -1116,7 +1119,7 @@
|
|
mime_type->type = g_strdup(buf);
|
|
mime_type->sub_type = g_strdup(delim + 1);
|
|
|
|
- while (*p && g_ascii_isspace(*p)) p++;
|
|
+ while (*p && (g_ascii_isspace(*p) || *p == '*' || *p == '.')) p++;
|
|
if (*p)
|
|
mime_type->extension = g_strdup(p);
|
|
else
|
|
@@ -1128,7 +1131,7 @@
|
|
fclose(fp);
|
|
|
|
if (!list)
|
|
- g_warning("Can't read mime.types\n");
|
|
+ g_warning("Can't read %s\n", file);
|
|
|
|
return list;
|
|
}
|