summaryrefslogtreecommitdiffstats
path: root/src/ck-manager.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2006-11-06 15:28:41 -0500
committerWilliam Jon McCann <mccann@jhu.edu>2006-11-06 15:28:41 -0500
commitbabc733eff30a2be18fa3f99bc3ef4f14e35d259 (patch)
tree729bc3c4107c86dd833e7aef3a7efe883d75056e /src/ck-manager.c
parentbe02d5de51072235c20d6974f0cccb485055a02e (diff)
Fix some small leaks. Add --timed-exit to daemon for valgrinding.
Diffstat (limited to 'src/ck-manager.c')
-rw-r--r--src/ck-manager.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 76677cb..faf13ac 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -269,6 +269,7 @@ find_seat_for_session (CkManager *manager,
char *sid;
sid = g_strdup_printf ("%s/Seat%u", CK_DBUS_PATH, 1);
seat = g_hash_table_lookup (manager->priv->seats, sid);
+ g_free (sid);
}
return seat;
@@ -500,7 +501,7 @@ ck_manager_get_session_for_cookie (CkManager *manager,
ck_session_get_id (session, &ssid, NULL);
- dbus_g_method_return (context, g_strdup (ssid));
+ dbus_g_method_return (context, ssid);
g_free (ssid);
@@ -647,6 +648,8 @@ ck_manager_open_session (CkManager *manager,
dbus_g_method_return (context, cookie);
+ g_free (cookie);
+
return TRUE;
}
@@ -663,6 +666,8 @@ ck_manager_open_session_with_parameters (CkManager *manager,
error = NULL;
cookie = create_session_for_caller (manager, sender, parameters, &error);
+ g_free (sender);
+
if (cookie == NULL) {
dbus_g_method_return_error (context, error);
g_error_free (error);
@@ -671,6 +676,8 @@ ck_manager_open_session_with_parameters (CkManager *manager,
dbus_g_method_return (context, cookie);
+ g_free (cookie);
+
return TRUE;
}
@@ -910,6 +917,8 @@ ck_manager_get_sessions_for_user (CkManager *manager,
dbus_g_method_return (context, data->sessions);
+ g_ptr_array_foreach (data->sessions, (GFunc)g_free, NULL);
+ g_ptr_array_free (data->sessions, TRUE);
g_free (data);
return TRUE;