aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-cal-popup.c13
-rw-r--r--configure.in4
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-popup.c19
-rw-r--r--mail/em-utils.c7
7 files changed, 40 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 44028bea54..231a8e7f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-23 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #534476
+
+ * configure.in:
+ Require shared-mime-info >= 0.22 to make sure we pick up the fix
+ for correctly identifying "winmail.dat" attachments.
+
2008-05-12 Srinivasa Ragavan <sragavan@novell.com>
* NEWS, configure.in : Evolution 2.23.2 release and version bump.
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c5d7576e48..9b0b915d71 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-23 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #534476
+
+ * gui/e-cal-popup.c (ecalp_standard_menu_factory):
+ Remove the special check for "winmail.dat". GIO correctly
+ identifies it as "application/ms-tnef".
+
2008-05-23 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #523402
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 050cf0df89..f3c9913715 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -403,16 +403,11 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
if (filename) {
- /* will gvfs misidentify TNEF attachments as MPEG? */
- if (!strcmp (filename, "winmail.dat"))
- apps = g_app_info_get_all_for_type ("application/vnd.ms-tnef");
- else {
- char *name_type = e_util_guess_mime_type (filename);
+ gchar *name_type;
- apps = g_app_info_get_all_for_type (name_type);
-
- g_free (name_type);
- }
+ name_type = e_util_guess_mime_type (filename);
+ apps = g_app_info_get_all_for_type (name_type);
+ g_free (name_type);
}
}
g_free (mime_type);
diff --git a/configure.in b/configure.in
index 15b195cb6a..39c4ab67e4 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,7 @@ m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess
m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess
m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess
m4_define([libxml_minimum_version], [2.0.0]) # XXX Just a Guess
+m4_define([shared_mime_info_minimum_version], [0.22])
# Optional Packages
#
@@ -171,7 +172,8 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
libglade-2.0 >= libglade_minimum_version
libgnomecanvas-2.0 >= libgnomecanvas_minimum_version
libgnomeui-2.0 >= libgnomeui_minimum_version
- libxml-2.0 >= libxml_minimum_version])
+ libxml-2.0 >= libxml_minimum_version
+ shared-mime-info >= shared_mime_info_minimum_version])
AC_SUBST(GNOME_PLATFORM_CFLAGS)
AC_SUBST(GNOME_PLATFORM_LIBS)
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 30332e45bc..54d0d54365 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-23 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #534476
+
+ * em-utils.c (em_utils_snoop_type):
+ * em-popup.c (emp_standard_menu_factory):
+ Remove the special check for "winmail.dat". GIO correctly
+ identifies it as "application/ms-tnef".
+
2008-05-23 Srinivasa Ragavan <sragavan@novell.com>
* mail-mt.c: (mail_msg_check_error): Convert the the warning to a
diff --git a/mail/em-popup.c b/mail/em-popup.c
index b727bf552f..00c9bcbd1e 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -806,7 +806,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
if (mime_type) {
gchar *cp;
- /* does gvfs expect lowercase MIME types? */
+ /* GIO expects lowercase MIME types. */
for (cp = mime_type; *cp != '\0'; cp++)
*cp = g_ascii_tolower (*cp);
@@ -815,18 +815,13 @@ emp_standard_menu_factory(EPopup *emp, void *data)
these two soon. */
apps = g_app_info_get_all_for_type (mime_type);
- if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
- if (filename) {
- /* will gvfs misidentify TNEF attachments as MPEG? */
- if (!strcmp (filename, "winmail.dat"))
- apps = g_app_info_get_all_for_type ("application/vnd.ms-tnef");
- else {
- char *name_type = e_util_guess_mime_type (filename);
+ if (apps == NULL && strcmp (mime_type, "application/octet-stream") == 0) {
+ if (filename != NULL) {
+ gchar *name_type;
- apps = g_app_info_get_all_for_type (name_type);
-
- g_free (name_type);
- }
+ name_type = e_util_guess_mime_type (filename);
+ apps = g_app_info_get_all_for_type (name_type);
+ g_free (name_type);
}
}
diff --git a/mail/em-utils.c b/mail/em-utils.c
index efbfee34ea..799ff9c339 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2209,13 +2209,8 @@ em_utils_snoop_type(CamelMimePart *part)
CamelDataWrapper *dw;
filename = camel_mime_part_get_filename (part);
- if (filename) {
- /* will GVFS misidentify TNEF attachments as MPEG? */
- if (!strcmp (filename, "winmail.dat"))
- return "application/vnd.ms-tnef";
-
+ if (filename != NULL)
name_type = e_util_guess_mime_type (filename);
- }
dw = camel_medium_get_content_object((CamelMedium *)part);
if (!camel_data_wrapper_is_offline(dw)) {