[evolution-data-server] CamelService: Minor cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 3ffa370a39d2aef3211bd9851e2ed62831371f01
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Oct 10 12:04:46 2013 -0400

    CamelService: Minor cleanups.

 camel/camel-service.c |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 6bda062..a177bc0 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -596,43 +596,50 @@ service_get_property (GObject *object,
        switch (property_id) {
                case PROP_CONNECTION_STATUS:
                        g_value_set_enum (
-                               value, camel_service_get_connection_status (
+                               value,
+                               camel_service_get_connection_status (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_DISPLAY_NAME:
                        g_value_set_string (
-                               value, camel_service_get_display_name (
+                               value,
+                               camel_service_get_display_name (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_PASSWORD:
                        g_value_set_string (
-                               value, camel_service_get_password (
+                               value,
+                               camel_service_get_password (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_PROVIDER:
                        g_value_set_pointer (
-                               value, camel_service_get_provider (
+                               value,
+                               camel_service_get_provider (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_SESSION:
                        g_value_take_object (
-                               value, camel_service_ref_session (
+                               value,
+                               camel_service_ref_session (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_SETTINGS:
                        g_value_take_object (
-                               value, camel_service_ref_settings (
+                               value,
+                               camel_service_ref_settings (
                                CAMEL_SERVICE (object)));
                        return;
 
                case PROP_UID:
                        g_value_set_string (
-                               value, camel_service_get_uid (
+                               value,
+                               camel_service_get_uid (
                                CAMEL_SERVICE (object)));
                        return;
        }
@@ -653,10 +660,7 @@ service_dispose (GObject *object)
 
        g_weak_ref_set (&priv->session, NULL);
 
-       if (priv->settings != NULL) {
-               g_object_unref (priv->settings);
-               priv->settings = NULL;
-       }
+       g_clear_object (&priv->settings);
 
        /* Chain up to parent's dispose() method. */
        G_OBJECT_CLASS (camel_service_parent_class)->dispose (object);