tracker r1291 - branches/xesam-support/src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed Apr 23 12:22:45 2008
New Revision: 1291
URL: http://svn.gnome.org/viewvc/tracker?rev=1291&view=rev

Log:
Cleaning up code

Modified:
   branches/xesam-support/src/trackerd/tracker-dbus.c
   branches/xesam-support/src/trackerd/tracker-xesam-search.c

Modified: branches/xesam-support/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-dbus.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-dbus.c	Wed Apr 23 12:22:45 2008
@@ -231,9 +231,6 @@
                 return FALSE;
         }
 
-        g_object_set (object, "db-connection", tracker->index_db, NULL);
-        g_object_set (object, "file-index", tracker->file_index, NULL);
-        g_object_set (object, "email-index", tracker->email_index, NULL);
         objects = g_slist_prepend (objects, object);
 
 

Modified: branches/xesam-support/src/trackerd/tracker-xesam-search.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-search.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-search.c	Wed Apr 23 12:22:45 2008
@@ -46,28 +46,9 @@
 
 #define DEFAULT_SEARCH_MAX_HITS 1024
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_XESAM_SEARCH, TrackerXesamSearchPriv))
-
-typedef struct {
-	DBusGProxy   *fd_proxy;
-	DBConnection *db_con;
-	Indexer      *file_index;
-	Indexer      *email_index;
-} TrackerXesamSearchPriv;
-
-enum {
-	PROP_0,
-	PROP_DB_CONNECTION,
-	PROP_FILE_INDEX,
-	PROP_EMAIL_INDEX
-};
 
 
 static void xesam_search_finalize     (GObject *object);
-static void xesam_search_set_property (GObject *object,
-				      guint param_id,
-				      const GValue *value,
-				      GParamSpec *pspec);
 
 G_DEFINE_TYPE(TrackerXesamSearch, tracker_xesam_search, G_TYPE_OBJECT)
 
@@ -79,26 +60,6 @@
 	object_class = G_OBJECT_CLASS (klass);
 
 	object_class->finalize = xesam_search_finalize;
-	object_class->set_property = xesam_search_set_property;
-
-	g_object_class_install_property (object_class,
-					 PROP_DB_CONNECTION,
-					 g_param_spec_pointer ("db-connection",
-							       "DB connection",
-							       "Database connection to use in transactions",
-							       G_PARAM_WRITABLE));
-	g_object_class_install_property (object_class,
-					 PROP_FILE_INDEX,
-					 g_param_spec_pointer ("file-index",
-							       "File index",
-							       "File index",
-							       G_PARAM_WRITABLE));
-	g_object_class_install_property (object_class,
-					 PROP_EMAIL_INDEX,
-					 g_param_spec_pointer ("email-index",
-							       "Email index",
-							       "Email index",
-							       G_PARAM_WRITABLE));
 
 	xesam_signals[XESAM_HITS_ADDED] =
 		g_signal_new ("hits-added",
@@ -159,7 +120,6 @@
 			1, 
 			G_TYPE_POINTER);
 
-	g_type_class_add_private (object_class, sizeof (TrackerXesamSearchPriv));
 }
 
 static void
@@ -170,45 +130,9 @@
 static void
 xesam_search_finalize (GObject *object)
 {
-	TrackerXesamSearchPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	if (priv->fd_proxy) {
-		g_object_unref (priv->fd_proxy);
-	}
-
 	G_OBJECT_CLASS (tracker_xesam_search_parent_class)->finalize (object);
 }
 
-static void
-xesam_search_set_property (GObject *object,
-			  guint param_id,
-			  const GValue *value,
-			  GParamSpec *pspec)
-{
-	TrackerXesamSearchPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_DB_CONNECTION:
-		tracker_xesam_search_set_db_connection (TRACKER_XESAM_SEARCH (object),
-							g_value_get_pointer (value));
-		break;
-	case PROP_FILE_INDEX:
-		tracker_xesam_search_set_file_index (TRACKER_XESAM_SEARCH (object),
-						     g_value_get_pointer (value));
-		break;
-	case PROP_EMAIL_INDEX:
-		tracker_xesam_search_set_email_index (TRACKER_XESAM_SEARCH (object),
-						      g_value_get_pointer (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	};
-}
 
 TrackerXesamSearch *
 tracker_xesam_search_new (DBConnection *db_con)
@@ -222,54 +146,6 @@
 	return object;
 }
 
-void
-tracker_xesam_search_set_db_connection (TrackerXesamSearch *object,
-				        DBConnection      *db_con)
-{
-	TrackerXesamSearchPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_XESAM_SEARCH (object));
-	g_return_if_fail (db_con != NULL);
-
-	priv = GET_PRIV (object);
-
-	priv->db_con = db_con;
-	
-	g_object_notify (G_OBJECT (object), "db-connection");
-}
-
-void
-tracker_xesam_search_set_file_index (TrackerXesamSearch *object,
-				     Indexer           *file_index)
-{
-	TrackerXesamSearchPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_XESAM_SEARCH (object));
-	g_return_if_fail (file_index != NULL);
-
-	priv = GET_PRIV (object);
-
-	priv->file_index = file_index;
-	
-	g_object_notify (G_OBJECT (object), "file-index");
-}
-
-void
-tracker_xesam_search_set_email_index (TrackerXesamSearch *object,
-				     Indexer           *email_index)
-{
-	TrackerXesamSearchPriv *priv;
-
-	g_return_if_fail (TRACKER_IS_XESAM_SEARCH (object));
-	g_return_if_fail (email_index != NULL);
-
-	priv = GET_PRIV (object);
-
-	priv->email_index = email_index;
-	
-	g_object_notify (G_OBJECT (object), "email-index");
-}
-
 /*
  * Functions
  */