[gentoo-commits] gentoo-x86 commit in mail-client/sylpheed/files: sylpheed-2.7-shared-mime-info.diff

[gentoo-commits] gentoo-x86 commit in mail-client/sylpheed/files: sylpheed-2.7-shared-mime-info.diff

[Akinori Hattori (hattya)]

hattya      09/07/26 15:14:31

  Added:                sylpheed-2.7-shared-mime-info.diff
  Log:
  new upstream release.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.1                  mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/sylpheed/files/sylpheed-2.7-shared-mime-info.diff?rev=1.1&content-type=text/plain

Index: sylpheed-2.7-shared-mime-info.diff
===================================================================
Index: libsylph/procmime.c
===================================================================
--- libsylph/procmime.c	(revision 2195)
+++ libsylph/procmime.c	(working copy)
@@ -1483,6 +1483,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) {
 			debug_print("mime.types not found\n");
 			return NULL;
@@ -1535,7 +1538,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++;
@@ -1548,7 +1551,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
@@ -1560,7 +1563,7 @@
 	fclose(fp);
 
 	if (!list)
-		g_warning("Can't read mime.types\n");
+		g_warning("Can't read %s\n", file);
 
 	return list;
 }
Index: libsylph/Makefile.am
===================================================================
--- libsylph/Makefile.am	(revision 2195)
+++ libsylph/Makefile.am	(working copy)
@@ -2,7 +2,8 @@
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"LibSylph\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DLOCALEDIR=\""$(localedir)"\"
+	-DLOCALEDIR=\""$(localedir)"\" \
+	-DDATADIR=\""$(datadir)"\"
 
 INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir)