diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-10-01 18:08:05 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-10-01 18:08:05 +0800 |
| commit | 01d08b507450d89e1c8bfd5bb4862f21367adc3f (patch) | |
| tree | 5a6e80e1f651ea1ba39868425b25c0e8b11c17d2 | |
| parent | 92255f70f3d1a757e9bfa1eed18bcad150a23719 (diff) | |
| download | gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar.gz gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar.bz2 gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar.lz gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar.xz gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.tar.zst gsoc2013-evolution-01d08b507450d89e1c8bfd5bb4862f21367adc3f.zip | |
** Fix for bug #554458
2008-10-01 Milan Crha <mcrha@redhat.com>
** Fix for bug #554458
* configure.in: Bump glib version to 2.18.0 because of g_content_type_from_mime_type.
* mail/em-popup.c: (emp_standard_menu_factory):
* calendar/gui/e-cal-popup.c: (ecalp_standard_menu_factory):
Use content-type to call of g_app_info_get_all_for_type.
svn path=/trunk/; revision=36526
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/e-cal-popup.c | 11 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-popup.c | 11 |
6 files changed, 34 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #554458 + + * configure.in: + Bump glib version to 2.18.0 because of g_content_type_from_mime_type. + 2008-09-22 Srinivasa Ragavan <sragavan@novell.com> * configure.in: Fix 'cs' build break due to my git-merge issues. diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d2c1877ece..8a53aa81e7 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #554458 + + * gui/e-cal-popup.c: (ecalp_standard_menu_factory): + Use content-type to call of g_app_info_get_all_for_type. + 2008-10-01 Sankar P <psankar@novell.com> License Changes diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index 9a2c0aec15..bec0e9c94d 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -397,17 +397,18 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data) for (cp = mime_type; *cp != '\0'; cp++) *cp = g_ascii_tolower (*cp); - /* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine - on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between - these two soon. */ - apps = g_app_info_get_all_for_type (mime_type); + cp = g_content_type_from_mime_type (mime_type); + 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 (filename) { gchar *name_type; name_type = e_util_guess_mime_type (filename); - apps = g_app_info_get_all_for_type (name_type); + cp = g_content_type_from_mime_type (name_type); + apps = g_app_info_get_all_for_type (cp ? cp : name_type); + g_free (cp); g_free (name_type); } } diff --git a/configure.in b/configure.in index abc73fc415..d0c11fafc0 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ EDS_PACKAGE=1.2 GTKHTML_PACKAGE=3.14 # Required Packages -m4_define([glib_minimum_version], [2.16.0]) +m4_define([glib_minimum_version], [2.18.0]) m4_define([gtk_minimum_version], [2.12.0]) m4_define([eds_minimum_version], [2.23.91]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) diff --git a/mail/ChangeLog b/mail/ChangeLog index 7066c55bd2..7ecbee7885 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #554458 + + * em-popup.c: (emp_standard_menu_factory): + Use content-type to call of g_app_info_get_all_for_type. + 2008-10-01 Sankar P <psankar@novell.com> License Changes diff --git a/mail/em-popup.c b/mail/em-popup.c index 799e77e98a..b05e7753c3 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -799,17 +799,18 @@ emp_standard_menu_factory(EPopup *emp, void *data) for (cp = mime_type; *cp != '\0'; cp++) *cp = g_ascii_tolower (*cp); - /* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine - on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between - these two soon. */ - apps = g_app_info_get_all_for_type (mime_type); + cp = g_content_type_from_mime_type (mime_type); + 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 (filename != NULL) { gchar *name_type; name_type = e_util_guess_mime_type (filename); - apps = g_app_info_get_all_for_type (name_type); + cp = g_content_type_from_mime_type (name_type); + apps = g_app_info_get_all_for_type (cp ? cp : name_type); + g_free (cp); g_free (name_type); } } |