summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Jon McCann <mccann@jhu.edu>2006-11-06 00:35:01 -0500
committerWilliam Jon McCann <mccann@jhu.edu>2006-11-06 00:35:01 -0500
commitbe02d5de51072235c20d6974f0cccb485055a02e (patch)
tree5a1c823a64df0c4ac136ad3f3567af63b4605dfb
parent7e817628550ab4932baf6059b06049944893af7e (diff)
Show message even when error is NULL. Fix valgrind script.
-rw-r--r--src/ck-manager.c1
-rw-r--r--src/main.c4
-rwxr-xr-xsrc/valgrind.sh4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c
index 8ebd1b8..76677cb 100644
--- a/src/ck-manager.c
+++ b/src/ck-manager.c
@@ -821,7 +821,6 @@ register_manager (CkManager *manager)
exit (1);
}
-
manager->priv->bus_proxy = dbus_g_proxy_new_for_name (manager->priv->connection,
DBUS_SERVICE_DBUS,
DBUS_PATH_DBUS,
diff --git a/src/main.c b/src/main.c
index 683d394..de0370e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -99,6 +99,8 @@ main (int argc,
if (error != NULL) {
g_warning ("Failed to acquire %s: %s", CK_DBUS_NAME, error->message);
g_error_free (error);
+ } else {
+ g_warning ("Failed to acquire %s", CK_DBUS_NAME);
}
exit (1);
}
@@ -107,6 +109,8 @@ main (int argc,
if (error != NULL) {
g_warning ("Failed to acquire %s: %s", CK_DBUS_NAME, error->message);
g_error_free (error);
+ } else {
+ g_warning ("Failed to acquire %s", CK_DBUS_NAME);
}
exit (1);
}
diff --git a/src/valgrind.sh b/src/valgrind.sh
index a11a1f0..845da8b 100755
--- a/src/valgrind.sh
+++ b/src/valgrind.sh
@@ -6,7 +6,7 @@ export G_SLICE=always-malloc
#valgrind --tool=massif --depth=5 --alloc-fn=g_malloc \
# --alloc-fn=g_realloc --alloc-fn=g_try_malloc \
# --alloc-fn=g_malloc0 --alloc-fn=g_mem_chunk_alloc \
-# console-manager --no-daemon
+# console-kit-daemon --no-daemon
valgrind --tool=memcheck --leak-check=full --show-reachable=yes \
- console-manager --no-daemon
+ console-kit-daemon --no-daemon