Cleanup code.

diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index ca9808b..9f7e13a 100644 (file)
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -1651,8 +1651,6 @@ g_dbus_connection_send_message_unlocked (GDBusConnection   *connection,
   if (G_IS_KDBUS_CONNECTION (connection->stream)){
     if ((connection->bus_unique_name) != NULL) 
       {
-        //g_print ("SENDER: %s\n", g_kdbus_get_sender(g_kdbus_connection_get_kdbus(G_KDBUS_CONNECTION (connection->stream))));
-        //g_print ("SENDER CONNECTION: %s\n",g_dbus_connection_get_unique_name(connection));
         g_dbus_message_set_sender(message, connection->bus_unique_name);
         #ifdef KDBUS_DEBUG 
           g_print (" KDBUS_DEBUG: (%s()): set_sender ok!\n",__FUNCTION__);

diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 093ebc3..0e9e453 100644 (file)
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -134,7 +134,7 @@ typedef struct
 static void
 read_kdbus_data_free (ReadKdbusData *data)
 {
-  //g_object_unref (data->kdbus); TODO
+  g_object_unref (data->kdbus);
   if (data->cancellable != NULL)
     g_object_unref (data->cancellable);
   g_object_unref (data->simple);
@@ -235,7 +235,7 @@ _g_kdbus_read (GKdbus                  *kdbus,
   GSource *source;
 
   data = g_new0 (ReadKdbusData, 1);
-  data->kdbus = kdbus; /*g_object_ref (socket);*/
+  data->kdbus = g_object_ref (kdbus);
   data->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL;
   data->buffer = buffer;
   data->count = count;

diff --git a/gio/gkdbus.h b/gio/gkdbus.h
index 45b3f68..1e6a25d 100644 (file)
--- a/gio/gkdbus.h
+++ b/gio/gkdbus.h
@@ -74,39 +74,39 @@ struct _GKdbus
 };
 
 GLIB_AVAILABLE_IN_ALL
-GType                   g_kdbus_get_type                (void) G_GNUC_CONST;
+GType                                  g_kdbus_get_type                (void) G_GNUC_CONST;
 GLIB_AVAILABLE_IN_ALL
-gint                    g_kdbus_get_fd                  (GKdbus           *kdbus);
+gint                                   g_kdbus_get_fd                  (GKdbus                         *kdbus);
 GLIB_AVAILABLE_IN_ALL
-gboolean                           g_kdbus_open                                      (GKdbus           *kdbus,
-                                                                                            const gchar      *address,
-                                                                                      GCancellable     *cancellable,
-                                                                                            GError           **error);
+gboolean                               g_kdbus_open                    (GKdbus                         *kdbus,
+                                                                                               const gchar                     *address,
+                                                                                               GCancellable            *cancellable,
+                                                                                               GError                          **error);
 GLIB_AVAILABLE_IN_ALL
-gboolean                           g_kdbus_close                                   (GKdbus           *kdbus,
-                                                                                                  GError           **error);
+gboolean                               g_kdbus_close                   (GKdbus                         *kdbus,
+                                                                                               GError                          **error);
 GLIB_AVAILABLE_IN_ALL
-gboolean                           g_kdbus_is_closed                     (GKdbus           *kdbus);
+gboolean                               g_kdbus_is_closed               (GKdbus                         *kdbus);
 GLIB_AVAILABLE_IN_ALL
-gssize                  g_kdbus_receive                 (GKdbus       *kdbus,
-                                                         char         *data,
-                                                                    GError       **error);
+gssize                                 g_kdbus_receive                 (GKdbus                         *kdbus,
+                                                                                               char                            *data,
+                                                                                               GError                          **error);
 GLIB_AVAILABLE_IN_ALL
-gssize                  g_kdbus_send_message            (GDBusWorker     *worker,
-                                                         GKdbus          *kdbus,
-                                                         GDBusMessage    *dbus_msg,
-                                                         gchar           *blob,
-                                                         gsize            blob_size,
-                                                                    GError          **error);
+gssize                                 g_kdbus_send_message    (GDBusWorker            *worker,
+                                                                                               GKdbus                          *kdbus,
+                                                                                               GDBusMessage            *dbus_msg,
+                                                                                               gchar                           *blob,
+                                                                                               gsize                           blob_size,
+                                                                                               GError                          **error);
 GLIB_AVAILABLE_IN_ALL
-gboolean                g_kdbus_register                (GKdbus           *kdbus);
+gboolean                               g_kdbus_register                (GKdbus                         *kdbus);
 GLIB_AVAILABLE_IN_ALL
-GSource *              g_kdbus_create_source           (GKdbus                 *kdbus,
-                                                                                                  GIOCondition             condition,
-                                                                                                  GCancellable            *cancellable);
+GSource *                              g_kdbus_create_source   (GKdbus                         *kdbus,
+                                                                                               GIOCondition            condition,
+                                                                                               GCancellable            *cancellable);
 GLIB_AVAILABLE_IN_ALL
-GIOCondition           g_kdbus_condition_check         (GKdbus                 *kdbus,
-                                                                                                 GIOCondition             condition);
+GIOCondition                   g_kdbus_condition_check (GKdbus                         *kdbus,
+                                                                                               GIOCondition            condition);
 
 G_END_DECLS
 

diff --git a/gio/gkdbusconnection.h b/gio/gkdbusconnection.h
index 52d5d2b..716c9bc 100644 (file)
--- a/gio/gkdbusconnection.h
+++ b/gio/gkdbusconnection.h
@@ -73,18 +73,18 @@ GType              g_kdbus_connection_get_type                  (void) G_GNUC_CO
 GLIB_AVAILABLE_IN_ALL
 GKdbusConnection   *g_kdbus_connection_new                      (void);
 GLIB_AVAILABLE_IN_ALL
-gboolean           g_kdbus_connection_is_connected              (GKdbusConnection  *connection);
+gboolean           g_kdbus_connection_is_connected              (GKdbusConnection      *connection);
 GLIB_AVAILABLE_IN_ALL
-gboolean           g_kdbus_connection_connect                   (GKdbusConnection  *connection,
-                                                                                                const gchar       *address,
-                                                                                                GCancellable      *cancellable,
-                                                                                                GError           **error);
+gboolean           g_kdbus_connection_connect                   (GKdbusConnection      *connection,
+                                                               const gchar             *address,
+                                                               GCancellable            *cancellable,
+                                                               GError                  **error);
 GLIB_AVAILABLE_IN_ALL
-gboolean           g_kdbus_connection_close                                (GIOStream         *stream,
-                                                                                                GCancellable      *cancellable,
-                                                                                                GError           **error);
+gboolean           g_kdbus_connection_close                    (GIOStream              *stream,
+                                                               GCancellable            *cancellable,
+                                                               GError                  **error);
 GLIB_AVAILABLE_IN_ALL
-GKdbus            *g_kdbus_connection_get_kdbus                 (GKdbusConnection  *connection);
+GKdbus            *g_kdbus_connection_get_kdbus                 (GKdbusConnection      *connection);
 
 G_END_DECLS