[maemo-commits] [maemo-commits] r15968 - projects/haf/branches/hildon-thumbnail/daemonize/daemon

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-02 19:05:29 +0300 (Tue, 02 Sep 2008)
New Revision: 15968

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
Log:
Removed some uninteresting code

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c	2008-09-02 16:02:37 UTC (rev 15967)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/manager.c	2008-09-02 16:05:29 UTC (rev 15968)
@@ -15,14 +15,12 @@
 #endif
 
 typedef struct {
-	DBusGProxy *proxy;
 	DBusGConnection *connection;
 	GHashTable *handlers;
 } ManagerPrivate;
 
 enum {
 	PROP_0,
-	PROP_PROXY,
 	PROP_CONNECTION
 };
 
@@ -85,8 +83,6 @@
 	ManagerPrivate *priv = MANAGER_GET_PRIVATE (object);
 
 	g_hash_table_unref (priv->handlers);
-	g_object_unref (priv->proxy);
-	g_object_unref (priv->connection);
 
 	G_OBJECT_CLASS (manager_parent_class)->finalize (object);
 }
@@ -98,16 +94,7 @@
 	priv->connection = connection;
 }
 
-static void 
-manager_set_proxy (Manager *object, DBusGProxy *proxy)
-{
-	ManagerPrivate *priv = MANAGER_GET_PRIVATE (object);
 
-	if (priv->proxy)
-		g_object_unref (priv->proxy);
-	priv->proxy = g_object_ref (proxy);
-}
-
 static void
 manager_set_property (GObject      *object,
 		      guint         prop_id,
@@ -115,10 +102,6 @@
 		      GParamSpec   *pspec)
 {
 	switch (prop_id) {
-	case PROP_PROXY:
-		manager_set_proxy (MANAGER (object),
-				   g_value_get_object (value));
-		break;
 	case PROP_CONNECTION:
 		manager_set_connection (MANAGER (object),
 					g_value_get_pointer (value));
@@ -140,9 +123,6 @@
 	priv = MANAGER_GET_PRIVATE (object);
 
 	switch (prop_id) {
-	case PROP_PROXY:
-		g_value_set_object (value, priv->proxy);
-		break;
 	case PROP_CONNECTION:
 		g_value_set_pointer (value, priv->connection);
 		break;
@@ -161,15 +141,6 @@
 	object_class->get_property = manager_get_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_PROXY,
-					 g_param_spec_object ("proxy",
-							      "DBus proxy",
-							      "DBus proxy",
-							      DBUS_TYPE_G_PROXY,
-							      G_PARAM_READWRITE |
-							      G_PARAM_CONSTRUCT));
-
-	g_object_class_install_property (object_class,
 					 PROP_CONNECTION,
 					 g_param_spec_pointer ("connection",
 							       "DBus connection",
@@ -191,14 +162,11 @@
 
 }
 
-
-
 void 
 manager_do_stop (void)
 {
 }
 
-
 void 
 manager_do_init (DBusGConnection *connection, Manager **manager, GError **error)
 {
@@ -216,7 +184,6 @@
 					   &result, error);
 
 	object = g_object_new (TYPE_MANAGER, 
-			       "proxy", proxy, 
 			       "connection", connection,
 			       NULL);
 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-02 16:02:37 UTC (rev 15967)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-02 16:05:29 UTC (rev 15968)
@@ -23,8 +23,6 @@
 G_DEFINE_TYPE (Thumbnailer, thumbnailer, G_TYPE_OBJECT)
 
 typedef struct {
-	DBusGProxy *proxy;
-	DBusGConnection *connection;
 	Manager *manager;
 	GHashTable *plugins;
 	GThreadPool *pool;
@@ -32,8 +30,6 @@
 
 enum {
 	PROP_0,
-	PROP_PROXY,
-	PROP_CONNECTION,
 	PROP_MANAGER
 };
 
@@ -289,8 +285,6 @@
 	g_thread_pool_free (priv->pool, TRUE, TRUE);
 
 	g_object_unref (priv->manager);
-	g_object_unref (priv->proxy);
-	g_object_unref (priv->connection);
 	g_hash_table_unref (priv->plugins);
 
 
@@ -298,13 +292,6 @@
 }
 
 static void 
-thumbnailer_set_connection (Thumbnailer *object, DBusGConnection *connection)
-{
-	ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object);
-	priv->connection = connection;
-}
-
-static void 
 thumbnailer_set_manager (Thumbnailer *object, Manager *manager)
 {
 	ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object);
@@ -313,16 +300,6 @@
 	priv->manager = g_object_ref (manager);
 }
 
-static void 
-thumbnailer_set_proxy (Thumbnailer *object, DBusGProxy *proxy)
-{
-	ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object);
-
-	if (priv->proxy)
-		g_object_unref (priv->proxy);
-	priv->proxy = g_object_ref (proxy);
-}
-
 static void
 thumbnailer_set_property (GObject      *object,
 		      guint         prop_id,
@@ -330,14 +307,6 @@
 		      GParamSpec   *pspec)
 {
 	switch (prop_id) {
-	case PROP_PROXY:
-		thumbnailer_set_proxy (THUMBNAILER (object),
-				   g_value_get_object (value));
-		break;
-	case PROP_CONNECTION:
-		thumbnailer_set_connection (THUMBNAILER (object),
-					    g_value_get_pointer (value));
-		break;
 	case PROP_MANAGER:
 		thumbnailer_set_manager (THUMBNAILER (object),
 					 g_value_get_object (value));
@@ -359,12 +328,6 @@
 	priv = THUMBNAILER_GET_PRIVATE (object);
 
 	switch (prop_id) {
-	case PROP_PROXY:
-		g_value_set_object (value, priv->proxy);
-		break;
-	case PROP_CONNECTION:
-		g_value_set_pointer (value, priv->connection);
-		break;
 	case PROP_MANAGER:
 		g_value_set_object (value, priv->manager);
 		break;
@@ -383,23 +346,6 @@
 	object_class->get_property = thumbnailer_get_property;
 
 	g_object_class_install_property (object_class,
-					 PROP_PROXY,
-					 g_param_spec_object ("proxy",
-							      "DBus proxy",
-							      "DBus proxy",
-							      DBUS_TYPE_G_PROXY,
-							      G_PARAM_READWRITE |
-							      G_PARAM_CONSTRUCT));
-
-	g_object_class_install_property (object_class,
-					 PROP_CONNECTION,
-					 g_param_spec_pointer ("connection",
-							       "DBus connection",
-							       "DBus connection",
-							       G_PARAM_READWRITE |
-							       G_PARAM_CONSTRUCT));
-
-	g_object_class_install_property (object_class,
 					 PROP_MANAGER,
 					 g_param_spec_object ("manager",
 							      "Manager",
@@ -454,8 +400,6 @@
 					   &result, error);
 
 	object = g_object_new (TYPE_THUMBNAILER, 
-			       "proxy", proxy, 
-			       "connection", connection,
 			       "manager", manager,
 			       NULL);