summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@collabora.co.uk>2010-11-17 14:07:10 (GMT)
committerVivek Dasmohapatra <vivek@collabora.co.uk>2010-11-17 14:07:10 (GMT)
commit98d2148d313c928f88a5c588bf0fa60041998e97 (patch)
tree9be84b3fcb00d2a1ff26a26b817d233f4d9197e2
parent0b9464ee78eb063e1ee8bf7b833a6bd378f1fa90 (diff)
downloadtelepathy-mission-control-98d2148d313c928f88a5c588bf0fa60041998e97.tar.gz
telepathy-mission-control-98d2148d313c928f88a5c588bf0fa60041998e97.tar.xz
abort()'s from inside g_error get trapped as core dumps by test suites
We get a lot of noise in the form of bug reports as a result of these three because g_error ends in an abort() - we exit(1) anyway, so hopefully downgrading the error to a warning will calm things down.
-rw-r--r--src/mcd-account-manager.c4
-rw-r--r--src/mcd-dispatcher.c4
-rw-r--r--src/mcd-service.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index c48e24c..f0196d5 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -1331,8 +1331,8 @@ register_dbus_service (McdAccountManager *account_manager)
{
/* FIXME: put in proper error handling when MC gains the ability to
* be the AM or the CD but not both */
- g_error ("Failed registering '%s' service: %s",
- MC_ACCOUNT_MANAGER_DBUS_SERVICE, error->message);
+ g_warning("Failed registering '%s' service: %s",
+ MC_ACCOUNT_MANAGER_DBUS_SERVICE, error->message);
g_error_free (error);
exit (1);
}
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 650753c..7caa555 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1047,8 +1047,8 @@ mcd_dispatcher_constructed (GObject *object)
{
/* FIXME: put in proper error handling when MC gains the ability to
* be the AM or the CD but not both */
- g_error ("Failed registering '%s' service: %s",
- MCD_CHANNEL_DISPATCHER_BUS_NAME, error->message);
+ g_warning ("Failed registering '%s' service: %s",
+ MCD_CHANNEL_DISPATCHER_BUS_NAME, error->message);
g_error_free (error);
exit (1);
}
diff --git a/src/mcd-service.c b/src/mcd-service.c
index c018f5c..9a326fa 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -90,8 +90,8 @@ mcd_service_obtain_bus_name (McdService * obj)
MISSION_CONTROL_DBUS_SERVICE,
TRUE /* idempotent */, &error))
{
- g_error ("Failed registering '%s' service: %s",
- MISSION_CONTROL_DBUS_SERVICE, error->message);
+ g_warning ("Failed registering '%s' service: %s",
+ MISSION_CONTROL_DBUS_SERVICE, error->message);
g_error_free (error);
exit (1);
}