[gnome-online-accounts] dlna-server-manager: Make it a final class

[Debarshi Ray <debarshir src gnome org>]

commit 8430cb33d6adda6a0d5dab551f5e2e4586c0d2e7
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed May 31 12:23:27 2017 +0200

    dlna-server-manager: Make it a final class

 src/goabackend/goadlnaservermanager.c |   43 +++++++++++++++-----------------
 src/goabackend/goadlnaservermanager.h |   28 +--------------------
 2 files changed, 22 insertions(+), 49 deletions(-)
---
diff --git a/src/goabackend/goadlnaservermanager.c b/src/goabackend/goadlnaservermanager.c
index 284922f..72ff3cf 100644
--- a/src/goabackend/goadlnaservermanager.c
+++ b/src/goabackend/goadlnaservermanager.c
@@ -23,12 +23,18 @@
 #include "goadleynaservermediadevice.h"
 #include "goadlnaservermanager.h"
 
-struct _GoaDlnaServerManagerPrivate
+struct _GoaDlnaServerManager
 {
+  GObject parent_instance;
   DleynaServerManager *proxy;
   GHashTable *servers;
 };
 
+struct _GoaDlnaServerManagerClass
+{
+  GObjectClass parent_class;
+};
+
 enum
 {
   SERVER_FOUND,
@@ -38,7 +44,7 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GoaDlnaServerManager, goa_dlna_server_manager, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GoaDlnaServerManager, goa_dlna_server_manager, G_TYPE_OBJECT);
 
 static GObject *goa_dlna_server_manager_singleton = NULL;
 
@@ -48,7 +54,6 @@ goa_dlna_server_manager_server_new_cb (GObject      *source_object,
                                        gpointer      user_data)
 {
   GoaDlnaServerManager *self = GOA_DLNA_SERVER_MANAGER (user_data);
-  GoaDlnaServerManagerPrivate *priv = self->priv;
   DleynaServerMediaDevice *server;
   GError *error = NULL;
   const gchar *object_path;
@@ -68,7 +73,7 @@ goa_dlna_server_manager_server_new_cb (GObject      *source_object,
            dleyna_server_media_device_get_friendly_name (server),
            dleyna_server_media_device_get_udn (server),
            object_path);
-  g_hash_table_insert (priv->servers, (gpointer) object_path, server);
+  g_hash_table_insert (self->servers, (gpointer) object_path, server);
   g_signal_emit (self, signals[SERVER_FOUND], 0, server);
 
  out:
@@ -94,13 +99,12 @@ goa_dlna_server_manager_server_lost_cb (GoaDlnaServerManager *self,
                                         const gchar *object_path,
                                         gpointer *data)
 {
-  GoaDlnaServerManagerPrivate *priv = self->priv;
   DleynaServerMediaDevice *server;
 
-  server = DLEYNA_SERVER_MEDIA_DEVICE (g_hash_table_lookup (priv->servers, object_path));
+  server = DLEYNA_SERVER_MEDIA_DEVICE (g_hash_table_lookup (self->servers, object_path));
   g_return_if_fail (server != NULL);
 
-  g_hash_table_steal (priv->servers, object_path);
+  g_hash_table_steal (self->servers, object_path);
   g_debug ("%s '%s' %s %s",
            G_STRFUNC,
            dleyna_server_media_device_get_friendly_name (server),
@@ -116,12 +120,11 @@ goa_dlna_server_manager_proxy_get_servers_cb (GObject      *source_object,
                                               gpointer      user_data)
 {
   GoaDlnaServerManager *self = GOA_DLNA_SERVER_MANAGER (user_data);
-  GoaDlnaServerManagerPrivate *priv = self->priv;
   GError *error = NULL;
   gchar **object_paths = NULL;
   guint i;
 
-  dleyna_server_manager_call_get_servers_finish (priv->proxy, &object_paths, res, &error);
+  dleyna_server_manager_call_get_servers_finish (self->proxy, &object_paths, res, &error);
   if (error != NULL)
     {
       g_warning ("Unable to fetch the list of available servers: %s", error->message);
@@ -132,8 +135,8 @@ goa_dlna_server_manager_proxy_get_servers_cb (GObject      *source_object,
   for (i = 0; object_paths[i] != NULL; i++)
     goa_dlna_server_manager_server_found_cb (self, object_paths[i], NULL);
 
-  g_signal_connect_swapped (priv->proxy, "found-server", G_CALLBACK 
(goa_dlna_server_manager_server_found_cb), self);
-  g_signal_connect_swapped (priv->proxy, "lost-server", G_CALLBACK (goa_dlna_server_manager_server_lost_cb), 
self);
+  g_signal_connect_swapped (self->proxy, "found-server", G_CALLBACK 
(goa_dlna_server_manager_server_found_cb), self);
+  g_signal_connect_swapped (self->proxy, "lost-server", G_CALLBACK (goa_dlna_server_manager_server_lost_cb), 
self);
 
  out:
   g_strfreev (object_paths);
@@ -146,10 +149,9 @@ goa_dlna_server_manager_proxy_new_cb (GObject *source_object,
                                       gpointer user_data)
 {
   GoaDlnaServerManager *self = GOA_DLNA_SERVER_MANAGER (user_data);
-  GoaDlnaServerManagerPrivate *priv = self->priv;
   GError *error = NULL;
 
-  priv->proxy = dleyna_server_manager_proxy_new_for_bus_finish (res, &error);
+  self->proxy = dleyna_server_manager_proxy_new_for_bus_finish (res, &error);
   if (error != NULL)
     {
       g_warning ("Unable to connect to the dLeynaServer.Manager DBus object: %s",
@@ -160,7 +162,7 @@ goa_dlna_server_manager_proxy_new_cb (GObject *source_object,
 
   g_debug ("%s DLNA server manager initialized", G_STRFUNC);
 
-  dleyna_server_manager_call_get_servers (priv->proxy,
+  dleyna_server_manager_call_get_servers (self->proxy,
                                           NULL,
                                           goa_dlna_server_manager_proxy_get_servers_cb,
                                           g_object_ref (self));
@@ -173,10 +175,9 @@ static void
 goa_dlna_server_manager_dispose (GObject *object)
 {
   GoaDlnaServerManager *self = GOA_DLNA_SERVER_MANAGER (object);
-  GoaDlnaServerManagerPrivate *priv = self->priv;
 
-  g_clear_pointer (&priv->servers, (GDestroyNotify) g_hash_table_unref);
-  g_clear_object (&priv->proxy);
+  g_clear_pointer (&self->servers, (GDestroyNotify) g_hash_table_unref);
+  g_clear_object (&self->proxy);
 
   G_OBJECT_CLASS (goa_dlna_server_manager_parent_class)->dispose (object);
 }
@@ -203,9 +204,6 @@ goa_dlna_server_manager_constructor (GType type,
 static void
 goa_dlna_server_manager_init (GoaDlnaServerManager *self)
 {
-  GoaDlnaServerManagerPrivate *priv;
-
-  self->priv = priv = goa_dlna_server_manager_get_instance_private (self);
   dleyna_server_manager_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                            G_DBUS_PROXY_FLAGS_NONE,
                                            "com.intel.dleyna-server",
@@ -213,7 +211,7 @@ goa_dlna_server_manager_init (GoaDlnaServerManager *self)
                                            NULL, /* GCancellable */
                                            goa_dlna_server_manager_proxy_new_cb,
                                            g_object_ref (self));
-  priv->servers = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
+  self->servers = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
 }
 
 static void
@@ -256,10 +254,9 @@ goa_dlna_server_manager_dup_singleton (void)
 GList *
 goa_dlna_server_manager_dup_servers (GoaDlnaServerManager *self)
 {
-  GoaDlnaServerManagerPrivate *priv = self->priv;
   GList *servers;
 
-  servers = g_hash_table_get_values (priv->servers);
+  servers = g_hash_table_get_values (self->servers);
   g_list_foreach (servers, (GFunc) g_object_ref, NULL);
 
   return servers;
diff --git a/src/goabackend/goadlnaservermanager.h b/src/goabackend/goadlnaservermanager.h
index 0906ce9..b061346 100644
--- a/src/goabackend/goadlnaservermanager.h
+++ b/src/goabackend/goadlnaservermanager.h
@@ -29,36 +29,12 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    GOA_TYPE_DLNA_SERVER_MANAGER, GoaDlnaServerManager))
 
-#define GOA_DLNA_SERVER_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   GOA_TYPE_DLNA_SERVER_MANAGER, GoaDlnaServerManagerClass))
-
 #define GOA_IS_DLNA_SERVER_MANAGER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
    GOA_TYPE_DLNA_SERVER_MANAGER))
 
-#define GOA_IS_DLNA_SERVER_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-   GOA_TYPE_DLNA_SERVER_MANAGER))
-
-#define GOA_DLNA_SERVER_MANAGER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   GOA_TYPE_DLNA_SERVER_MANAGER, GoaDlnaServerManagerClass))
-
-typedef struct _GoaDlnaServerManager        GoaDlnaServerManager;
-typedef struct _GoaDlnaServerManagerClass   GoaDlnaServerManagerClass;
-typedef struct _GoaDlnaServerManagerPrivate GoaDlnaServerManagerPrivate;
-
-struct _GoaDlnaServerManager
-{
-  GObject parent_instance;
-  GoaDlnaServerManagerPrivate *priv;
-};
-
-struct _GoaDlnaServerManagerClass
-{
-  GObjectClass parent_class;
-};
+typedef struct _GoaDlnaServerManager      GoaDlnaServerManager;
+typedef struct _GoaDlnaServerManagerClass GoaDlnaServerManagerClass;
 
 GType                       goa_dlna_server_manager_get_type      (void) G_GNUC_CONST;