From 6a083d52ba5a37826535f76f3a446a268f3b8c89 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 23 Jun 2008 18:44:44 +0200
Subject: [PATCH] Refine error handling and fix some indentation.

---
 src/mm-dbus-manager.c | 14 +++++++++++---
 src/mm-dbus-manager.h |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/mm-dbus-manager.c b/src/mm-dbus-manager.c
index 74336a3..645b7fa 100644
--- a/src/mm-dbus-manager.c
+++ b/src/mm-dbus-manager.c
@@ -47,11 +47,15 @@ static void
 mm_dbus_manager_finalize (GObject *o)
 {
   MMDBusManager *m = MM_DBUS_MANAGER (o);
-  
+
   g_ptr_array_foreach (m->details->application_paths,
                        (GFunc) g_free,
                        NULL);
   g_ptr_array_free (m->details->application_paths, TRUE);
+  
+  if (m->details->bus_proxy) {
+    g_object_unref (m->details->bus_proxy);
+  }
 
   G_OBJECT_CLASS (mm_dbus_manager_parent_class)->finalize (o);
 }
@@ -114,7 +118,7 @@ mm_dbus_manager_register_app (MMDBusManager *manager, char *path, GError **error
   if (path == NULL) {
     /* set the error, the path can't be NULL */
     g_set_error (error, MM_DBUS_ERROR_QUARK,
-                 MM_DBUS_ERROR_NULL_PATH,
+                 MM_DBUS_ERROR_NULL_ATTRIBUTE,
                  "Error: can't register an app with NULL path");
     return FALSE;
   }
@@ -134,7 +138,11 @@ mm_dbus_manager_get_registered_apps (MMDBusManager *manager,
   g_return_val_if_fail (MM_IS_DBUS_MANAGER (manager), FALSE);
 
   if (app_paths == NULL) {
-   return FALSE;
+    /* set the error, the client is doing something wrong */
+    g_set_error (error, MM_DBUS_ERROR_QUARK,
+                 MM_DBUS_ERROR_NULL_ATTRIBUTE,
+                 "Error: pointers passed to GetRegisteredApps can't be NULL");
+    return FALSE;
   }
 
   *app_paths = g_new (gchar *, size + 1);
diff --git a/src/mm-dbus-manager.h b/src/mm-dbus-manager.h
index 247eab6..2d952c7 100644
--- a/src/mm-dbus-manager.h
+++ b/src/mm-dbus-manager.h
@@ -92,7 +92,7 @@ typedef struct _MMDBusManagerDetails MMDBusManagerDetails;
 
 typedef enum {
   MM_DBUS_ERROR_FAILED,
-  MM_DBUS_ERROR_NULL_PATH
+  MM_DBUS_ERROR_NULL_ATTRIBUTE
 } MMDBusErrorEnum;
 
 struct _MMDBusManager {
-- 
2.11.4.GIT