diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2008-04-05 10:12:18 +0000 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@src.gnome.org> | 2008-04-05 10:12:18 +0000 |
| commit | fbb8e2f281a6df777cb46bb880bbcbb8531ca04b (patch) | |
| tree | 963022e1046fcc892f8f1fdba25c470bfcf18cc2 /src/nautilus-autorun-software.c | |
| parent | d3e0837baacf80396395275f7db7fc3a82a7e809 (diff) | |
| download | nautilus-fbb8e2f281a6df777cb46bb880bbcbb8531ca04b.tar.gz | |
Disable autorun when detecting autorun.exe and autorun.inf, as we do not
2008-04-05 Cosimo Cecchi <cosimoc@gnome.org>
* libnautilus-private/nautilus-autorun.c:
(_g_mount_guess_content_type):
Disable autorun when detecting autorun.exe and autorun.inf,
as we do not support those yet (part of bug #524270).
* src/nautilus-autorun-software.c: (autorun), (main):
Plug some minor leaks.
svn path=/trunk/; revision=14042
Diffstat (limited to 'src/nautilus-autorun-software.c')
| -rw-r--r-- | src/nautilus-autorun-software.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nautilus-autorun-software.c b/src/nautilus-autorun-software.c index cec2028e6..63616e3a9 100644 --- a/src/nautilus-autorun-software.c +++ b/src/nautilus-autorun-software.c @@ -153,6 +153,9 @@ out: if (program_to_spawn != NULL) { g_object_unref (program_to_spawn); } + if (root != NULL) { + g_object_unref (root); + } g_free (path_to_spawn); g_free (cwd_for_program); @@ -266,15 +269,21 @@ main (int argc, char *argv[]) file = g_file_new_for_commandline_arg (argv[1]); if (file == NULL) { + g_object_unref (monitor); goto out; } mount = g_file_find_enclosing_mount (file, NULL, NULL); if (mount == NULL) { + g_object_unref (file); + g_object_unref (monitor); goto out; } present_autorun_for_software_dialog (mount); + g_object_unref (file); + g_object_unref (monitor); + g_object_unref (mount); out: return 0; |