aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-cal-popup.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f70dbacae6..2ec439b641 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-23 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #572543
+
+ * gui/e-cal-popup.c: (ecalp_standard_menu_factory):
+ Always look for alternative apps for application/octet-stream.
+
2009-02-22 Tobias Mueller <tobiasmue@svn.gnome.org>
* gui/e-itip-control.c (refresh_options_object):
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 358fce90a1..94e488ec25 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -401,13 +401,14 @@ ecalp_standard_menu_factory (EPopup *ecalp, 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) {
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);
}