aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-02-23 23:12:28 +0800
committerMilan Crha <mcrha@src.gnome.org>2009-02-23 23:12:28 +0800
commit24274985023bdb9e5f5a5e553d5f7b8f8ae742d8 (patch)
treebaf411e777d2e88a7abb3ccb96a3068c0632fadb /mail
parent87e1c46c336a3b0764bfe17caa3168eeca90a281 (diff)
downloadgsoc2013-evolution-24274985023bdb9e5f5a5e553d5f7b8f8ae742d8.tar.gz
gsoc2013-evolution-24274985023bdb9e5f5a5e553d5f7b8f8ae742d8.tar.zst
gsoc2013-evolution-24274985023bdb9e5f5a5e553d5f7b8f8ae742d8.zip
** Fix for bug #572543
2009-02-23 Milan Crha <mcrha@redhat.com> ** Fix for bug #572543 * calendar/gui/e-cal-popup.c: (ecalp_standard_menu_factory): * mail/em-popup.c: (emp_standard_menu_factory): Always look for alternative apps for application/octet-stream. svn path=/trunk/; revision=37312
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-popup.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3be6315b11..9c1b05cf28 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-23 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572543
+
+ * em-popup.c: (emp_standard_menu_factory):
+ Always look for alternative apps for application/octet-stream.
+
2009-02-11 Andre Klapper <a9016009@gmx.de>
* em-folder-browser.c:
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 2c18d60041..9603a08a75 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -799,13 +799,14 @@ emp_standard_menu_factory(EPopup *emp, void *data)
apps = g_app_info_get_all_for_type (cp ? cp : mime_type);
g_free (cp);
- if (apps == NULL && strcmp (mime_type, "application/octet-stream") == 0) {
+ if (apps == NULL || strcmp (mime_type, "application/octet-stream") == 0) {
if (filename != NULL) {
gchar *name_type;
name_type = e_util_guess_mime_type (filename, FALSE);
cp = g_content_type_from_mime_type (name_type);
- apps = g_app_info_get_all_for_type (cp ? cp : name_type);
+ /* show alternative apps first */
+ apps = g_list_concat (g_app_info_get_all_for_type (cp ? cp : name_type), apps);
g_free (cp);
g_free (name_type);
}