diff options
| author | David Zeuthen <davidz@redhat.com> | 2008-07-29 21:40:22 +0000 |
|---|---|---|
| committer | David Zeuthen <davidz@src.gnome.org> | 2008-07-29 21:40:22 +0000 |
| commit | d99071af2fae9a1468a87d928ab6502bc29b23f8 (patch) | |
| tree | 96bc09cb68326ee1badd520a85e7e3e4ef75dd86 /libnautilus-private/nautilus-autorun.h | |
| parent | f564363d4256f19587fac88e827a4caf5423babd (diff) | |
| download | nautilus-d99071af2fae9a1468a87d928ab6502bc29b23f8.tar.gz | |
Require gio 2.17.5 for g_mount_guess_content_type().
2008-07-29 David Zeuthen <davidz@redhat.com>
* configure.in:
Require gio 2.17.5 for g_mount_guess_content_type().
* data/nautilus.xml.in:
Delete x-content/* definitions; these are in shared-mime-info 0.50
and greater.
* libnautilus-private/nautilus-global-preferences.c:
* libnautilus-private/nautilus-global-preferences.h:
* libnautilus-private/apps_nautilus_preferences.schemas.in:
Remove /apps/nautilus/preferences/media_autorun_x_content_ask
and add /apps/nautilus/preferences/media_autorun_x_content_start_app
instead since we're inverting the logic. Now, by default (except
for x-content/software for which we're shipping an app ourselves)
we default to asking the user what action to take.
* libnautilus-private/nautilus-autorun.c:
* libnautilus-private/nautilus-autorun.h:
Use g_mount_guess_content_type() instead of using our own
sniffing code. Also provide an option for the user to select
an application to use (#532474).
* src/nautilus-file-management-properties.c:
Catch up with API changes to nautilus_autorun_prepare_combo_box()
svn path=/trunk/; revision=14425
Diffstat (limited to 'libnautilus-private/nautilus-autorun.h')
| -rw-r--r-- | libnautilus-private/nautilus-autorun.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/libnautilus-private/nautilus-autorun.h b/libnautilus-private/nautilus-autorun.h index c89a5d10c..81d758e14 100644 --- a/libnautilus-private/nautilus-autorun.h +++ b/libnautilus-private/nautilus-autorun.h @@ -44,21 +44,6 @@ #include <eel/eel-background.h> #include <libnautilus-private/nautilus-file.h> -void _g_mount_guess_content_type_async (GMount *mount, - gboolean force_rescan, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -char ** _g_mount_guess_content_type_finish (GMount *mount, - GAsyncResult *result, - GError **error); - -char ** _g_mount_guess_content_type (GMount *mount, - gboolean force_rescan, - GError **error); - - typedef void (*NautilusAutorunComboBoxChanged) (gboolean selected_ask, gboolean selected_ignore, gboolean selected_open_folder, @@ -71,6 +56,7 @@ typedef void (*NautilusAutorunGetContent) (char **content, gpointer user_data); void nautilus_autorun_prepare_combo_box (GtkWidget *combo_box, const char *x_content_type, gboolean include_ask, + gboolean include_open_with_other_app, gboolean update_settings, NautilusAutorunComboBoxChanged changed_cb, gpointer user_data); |