summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2008-03-04 10:14:03 +0000
committerCarlos Garcia Campos <carlosgc@src.gnome.org>2008-03-04 10:14:03 +0000
commit3cd81d08a157eb3723ed105f770b8da042d9bb54 (patch)
tree700e7e278d834c6717d59db8212fefc753942b81
parent1eb8a29bf060a4d07f065f939c2a0263363d627f (diff)
downloadgvfs-3cd81d08a157eb3723ed105f770b8da042d9bb54.tar.gz
Fix memory leaks.
2008-03-04 Carlos Garcia Campos <carlosgc@gnome.org> * common/gmountspec.c: (g_mount_spec_copy): * daemon/gvfsdaemon.c: (g_vfs_daemon_initiate_mount): * daemon/main.c: (main): Fix memory leaks. svn path=/trunk/; revision=1519
-rw-r--r--ChangeLog7
-rw-r--r--common/gmountspec.c2
-rw-r--r--daemon/gvfsdaemon.c1
-rw-r--r--daemon/main.c3
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e295b4e..5cea6b8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-04 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * common/gmountspec.c: (g_mount_spec_copy):
+ * daemon/gvfsdaemon.c: (g_vfs_daemon_initiate_mount):
+ * daemon/main.c: (main):
+ Fix memory leaks.
+
2008-03-04 Alexander Larsson <alexl@redhat.com>
* client/gdaemonvfs.c:
diff --git a/common/gmountspec.c b/common/gmountspec.c
index 09faac92..744e0a90 100644
--- a/common/gmountspec.c
+++ b/common/gmountspec.c
@@ -175,7 +175,7 @@ g_mount_spec_copy (GMountSpec *spec)
int i;
copy = g_mount_spec_new (NULL);
- copy->mount_prefix = g_strdup (spec->mount_prefix);
+ g_mount_spec_set_mount_prefix (copy, spec->mount_prefix);
for (i = 0; i < spec->items->len; i++)
{
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index 2a84a3b5..f9f52769 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -1050,6 +1050,7 @@ g_vfs_daemon_initiate_mount (GVfsDaemon *daemon,
"daemon", daemon,
"object_path", obj_path,
NULL);
+ g_free (obj_path);
g_vfs_daemon_add_job_source (daemon, G_VFS_JOB_SOURCE (backend));
g_object_unref (backend);
diff --git a/daemon/main.c b/daemon/main.c
index ebfe9d19..79f361a1 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -77,9 +77,12 @@ main (int argc, char *argv[])
g_get_prgname ());
g_printerr ("\n");
g_error_free (error);
+ g_option_context_free (context);
return 1;
}
+ g_option_context_free (context);
+
dbus_threads_init_default ();
g_type_init ();