[tracker] libtracker-common: Clean up TrackerPropertyType enum

[Jürg Billeter <juergbi src gnome org>]

commit 46d7868984282b964cf4e7f35b9d3be679f2338e
Author: Jürg Billeter <j bitron ch>
Date:   Fri Oct 2 13:02:35 2009 +0200

    libtracker-common: Clean up TrackerPropertyType enum

 src/libtracker-common/libtracker-common.vapi |    6 ++----
 src/libtracker-common/tracker-property.c     |   12 +++---------
 src/libtracker-common/tracker-property.h     |    5 +----
 src/libtracker-data/tracker-data-manager.c   |    3 ---
 src/libtracker-data/tracker-data-update.c    |    6 ------
 5 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/src/libtracker-common/libtracker-common.vapi b/src/libtracker-common/libtracker-common.vapi
index c2478c8..866c94b 100644
--- a/src/libtracker-common/libtracker-common.vapi
+++ b/src/libtracker-common/libtracker-common.vapi
@@ -42,16 +42,14 @@ namespace Tracker {
 
 	[CCode (cheader_filename = "libtracker-common/tracker-property.h")]
 	public enum PropertyType {
+		UNKNOWN,
 		STRING,
 		BOOLEAN,
 		INTEGER,
 		DOUBLE,
 		DATE,
 		DATETIME,
-		BLOB,
-		STRUCT,
-		RESOURCE,
-		FULLTEXT
+		RESOURCE
 	}
 
 	[CCode (cheader_filename = "libtracker-common/tracker-ontology.h")]
diff --git a/src/libtracker-common/tracker-property.c b/src/libtracker-common/tracker-property.c
index 59a24e9..a414757 100644
--- a/src/libtracker-common/tracker-property.c
+++ b/src/libtracker-common/tracker-property.c
@@ -90,6 +90,9 @@ tracker_property_type_get_type (void)
 
 	if (etype == 0) {
 		static const GEnumValue values[] = {
+			{ TRACKER_PROPERTY_TYPE_UNKNOWN,
+			  "TRACKER_PROPERTY_TYPE_UNKNOWN",
+			  "unknown" },
 			{ TRACKER_PROPERTY_TYPE_STRING,
 			  "TRACKER_PROPERTY_TYPE_STRING",
 			  "string" },
@@ -108,18 +111,9 @@ tracker_property_type_get_type (void)
 			{ TRACKER_PROPERTY_TYPE_DATETIME,
 			  "TRACKER_PROPERTY_TYPE_DATETIME",
 			  "datetime" },
-			{ TRACKER_PROPERTY_TYPE_BLOB,
-			  "TRACKER_PROPERTY_TYPE_BLOB",
-			  "blob" },
-			{ TRACKER_PROPERTY_TYPE_STRUCT,
-			  "TRACKER_PROPERTY_TYPE_STRUCT",
-			  "struct" },
 			{ TRACKER_PROPERTY_TYPE_RESOURCE,
 			  "TRACKER_PROPERTY_TYPE_RESOURCE",
 			  "resource" },
-			{ TRACKER_PROPERTY_TYPE_FULLTEXT,
-			  "TRACKER_PROPERTY_TYPE_FULLTEXT",
-			  "fulltext" },
 			{ 0, NULL, NULL }
 		};
 
diff --git a/src/libtracker-common/tracker-property.h b/src/libtracker-common/tracker-property.h
index e8e3530..e73d380 100644
--- a/src/libtracker-common/tracker-property.h
+++ b/src/libtracker-common/tracker-property.h
@@ -36,17 +36,14 @@ G_BEGIN_DECLS
 
 typedef enum {
 	/* metadata */
+	TRACKER_PROPERTY_TYPE_UNKNOWN,
 	TRACKER_PROPERTY_TYPE_STRING,
 	TRACKER_PROPERTY_TYPE_BOOLEAN,
 	TRACKER_PROPERTY_TYPE_INTEGER,
 	TRACKER_PROPERTY_TYPE_DOUBLE,
 	TRACKER_PROPERTY_TYPE_DATE,
 	TRACKER_PROPERTY_TYPE_DATETIME,
-	TRACKER_PROPERTY_TYPE_BLOB,
-	TRACKER_PROPERTY_TYPE_STRUCT,
 	TRACKER_PROPERTY_TYPE_RESOURCE,
-	/* content */
-	TRACKER_PROPERTY_TYPE_FULLTEXT,
 } TrackerPropertyType;
 
 GType	     tracker_property_type_get_type  (void) G_GNUC_CONST;
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index a022f0e..5c3ba1a 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -528,9 +528,6 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 	case TRACKER_PROPERTY_TYPE_DOUBLE:
 		sql_type = "REAL";
 		break;
-	case TRACKER_PROPERTY_TYPE_BLOB:
-	case TRACKER_PROPERTY_TYPE_STRUCT:
-	case TRACKER_PROPERTY_TYPE_FULLTEXT:
 	default:
 		sql_type = "";
 		break;
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 09c6b84..6f11b2b 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -801,9 +801,6 @@ cache_set_metadata_decomposed (TrackerProperty	*property,
 		g_value_init (&gvalue, G_TYPE_INT);
 		g_value_set_int (&gvalue, object_id);
 		break;
-	case TRACKER_PROPERTY_TYPE_BLOB:
-	case TRACKER_PROPERTY_TYPE_STRUCT:
-	case TRACKER_PROPERTY_TYPE_FULLTEXT:
 	default:
 		return;
 	}
@@ -902,9 +899,6 @@ delete_metadata_decomposed (gint resource_id,
 		object_id = ensure_resource_id (value);
 		tracker_db_statement_bind_int (stmt, 1, object_id);
 		break;
-	case TRACKER_PROPERTY_TYPE_BLOB:
-	case TRACKER_PROPERTY_TYPE_STRUCT:
-	case TRACKER_PROPERTY_TYPE_FULLTEXT:
 	default:
 		g_assert_not_reached ();
 	}