Releasing 1.20.0

[sojka/lightdm.git] / src / xdmcp-session.c

diff --git a/src/xdmcp-session.c b/src/xdmcp-session.c
index c3a1a63d0e4bdb694e14020261b75998beb5159f..bb78ac6635cb6067f2b0bb44aaf4843ddfc07f26 100644 (file)
--- a/src/xdmcp-session.c
+++ b/src/xdmcp-session.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2010-2011 Robert Ancell.
  * Author: Robert Ancell <robert.ancell@canonical.com>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation, either version 3 of the License, or (at your option) any later
@@ -27,48 +27,42 @@ xdmcp_session_new (guint16 id)
 guint16
 xdmcp_session_get_id (XDMCPSession *session)
 {
+    g_return_val_if_fail (session != NULL, 0);
     return session->priv->id;
 }
 
 const gchar *
 xdmcp_session_get_manufacturer_display_id (XDMCPSession *session)
 {
+    g_return_val_if_fail (session != NULL, NULL);
     return session->priv->manufacturer_display_id;
 }
 
-const GInetAddress *
+GInetAddress *
 xdmcp_session_get_address (XDMCPSession *session)
 {
+    g_return_val_if_fail (session != NULL, NULL);
     return session->priv->address;
 }
 
-const gchar *
-xdmcp_session_get_authorization_name (XDMCPSession *session)
-{
-    return session->priv->authorization_name;
-}
-
-const guchar *
-xdmcp_session_get_authorization_data (XDMCPSession *session)
-{
-    return session->priv->authorization_data;  
-}
-
-const gsize
-xdmcp_session_get_authorization_data_length (XDMCPSession *session)
+XAuthority *
+xdmcp_session_get_authority (XDMCPSession *session)
 {
-    return session->priv->authorization_data_length;
+    g_return_val_if_fail (session != NULL, NULL);
+    return session->priv->authority;
 }
 
 guint16
 xdmcp_session_get_display_number (XDMCPSession *session)
 {
+    g_return_val_if_fail (session != NULL, 0);
     return session->priv->display_number;
 }
 
 const gchar *
 xdmcp_session_get_display_class (XDMCPSession *session)
 {
+    g_return_val_if_fail (session != NULL, NULL);
     return session->priv->display_class;
 }
 
@@ -77,23 +71,17 @@ xdmcp_session_init (XDMCPSession *session)
 {
     session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, XDMCP_SESSION_TYPE, XDMCPSessionPrivate);
     session->priv->manufacturer_display_id = g_strdup ("");
-    session->priv->authorization_name = g_strdup ("");
     session->priv->display_class = g_strdup ("");
 }
 
 static void
 xdmcp_session_finalize (GObject *object)
 {
-    XDMCPSession *self;
+    XDMCPSession *self = XDMCP_SESSION (object);
 
-    self = XDMCP_SESSION (object);
-  
     g_free (self->priv->manufacturer_display_id);
-    if (self->priv->address)
-        g_object_unref (self->priv->address);
-    if (self->priv->address6)
-        g_object_unref (self->priv->address6);
-    g_free (self->priv->authorization_name);
+    g_clear_object (&self->priv->address);
+    g_clear_object (&self->priv->authority);
     g_free (self->priv->display_class);
 
     G_OBJECT_CLASS (xdmcp_session_parent_class)->finalize (object);
@@ -104,7 +92,7 @@ xdmcp_session_class_init (XDMCPSessionClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-    object_class->finalize = xdmcp_session_finalize;  
+    object_class->finalize = xdmcp_session_finalize;
 
     g_type_class_add_private (klass, sizeof (XDMCPSessionPrivate));
 }