From b36d389721ea38442d3903cede34a4117ac7c3d4 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 30 Jun 2008 17:36:49 +0200
Subject: [PATCH] Fix includes and add prototypes for serializing/unserializing
 the HitCollection (todo).

---
 src/mm-dbus-category.c |  9 ++++---
 src/mm-string-utils.c  | 72 ++++++++++++++++++++++++++++++--------------------
 src/mm-string-utils.h  |  7 +++--
 3 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/src/mm-dbus-category.c b/src/mm-dbus-category.c
index ddc3036..01bf6da 100644
--- a/src/mm-dbus-category.c
+++ b/src/mm-dbus-category.c
@@ -20,9 +20,11 @@
  
 #include <glib.h>
 #include <glib-object.h>
+#include <dbus/dbus-glib.h>
 #include "mm-dbus-category.h"
 #include "mm-category.h"
 #include "mm-dbus-application.h"
+#include "mm-string-utils.h"
 
 G_DEFINE_TYPE (MMDBusCategory, mm_dbus_category, MM_TYPE_CATEGORY);
 
@@ -33,7 +35,7 @@ mm_dbus_category_get_hits (MMCategory *c,
   DBusGConnection *connection;
   DBusGProxy *app_proxy;
   MMApplication *app;
-  MMHitCollection *hit_collection;
+//  MMHitCollection *hit_collection;
   GError *error = NULL;
   gboolean ret;
   char *serial_filter;
@@ -54,7 +56,7 @@ mm_dbus_category_get_hits (MMCategory *c,
   app = mm_category_get_application (c);
   app_proxy = dbus_g_proxy_new_for_name (connection,
                                          mm_application_get_id (app),
-                                         mm_dbus_application_get_path (MM_DBUS_APPLICATION (app));
+                                         mm_dbus_application_get_path (MM_DBUS_APPLICATION (app)),
                                          "org.gnome.MediaManager.Application");
   serial_filter = mm_filter_serialize (f);
   ret = dbus_g_proxy_call (app_proxy,
@@ -82,7 +84,8 @@ out:
   g_free (serial_hit_collection);
   g_object_unref (app_proxy);
 
-  return hit_collection;
+//  return hit_collection;
+  return NULL;
 }
 
 static void
diff --git a/src/mm-string-utils.c b/src/mm-string-utils.c
index d1e8b03..bd16a8c 100644
--- a/src/mm-string-utils.c
+++ b/src/mm-string-utils.c
@@ -136,35 +136,6 @@ add_filter_param_to_xml (MMFilterParam *fp,
   xmlTextWriterEndElement (writer);
 }
 
-/* public functions */
-char *
-mm_filter_serialize (MMFilter *filter)
-{
-  char *serialized;
-  xmlBufferPtr buffer;
-  xmlTextWriterPtr writer;
-  GList *filter_params;
-
-  buffer = xmlBufferCreate ();
-  writer = xmlNewTextWriterMemory (buffer, 0);
-
-  xmlTextWriterStartDocument (writer, NULL, NULL, NULL);
-
-  xmlTextWriterStartElement (writer, BAD_CAST ("filter"));
-  filter_params = mm_filter_get_filtering_params (filter);
-  g_list_foreach (filter_params, (GFunc) add_filter_param_to_xml, writer);
-  /* close "filter" */
-  xmlTextWriterEndElement (writer);
-
-  xmlTextWriterEndDocument (writer);
-
-  xmlFreeTextWriter (writer);
-  serialized = g_strdup ((char *) xmlBufferContent (buffer));
-  xmlBufferFree (buffer);
-
-  return serialized;
-}
-
 static int
 unserialize_operator (xmlTextReaderPtr reader, MMComparisionOperator *op)
 {
@@ -364,6 +335,35 @@ unserialize_filter_param (xmlTextReaderPtr reader)
   return fp; 
 }
 
+/* public functions */
+char *
+mm_filter_serialize (MMFilter *filter)
+{
+  char *serialized;
+  xmlBufferPtr buffer;
+  xmlTextWriterPtr writer;
+  GList *filter_params;
+
+  buffer = xmlBufferCreate ();
+  writer = xmlNewTextWriterMemory (buffer, 0);
+
+  xmlTextWriterStartDocument (writer, NULL, NULL, NULL);
+
+  xmlTextWriterStartElement (writer, BAD_CAST ("filter"));
+  filter_params = mm_filter_get_filtering_params (filter);
+  g_list_foreach (filter_params, (GFunc) add_filter_param_to_xml, writer);
+  /* close "filter" */
+  xmlTextWriterEndElement (writer);
+
+  xmlTextWriterEndDocument (writer);
+
+  xmlFreeTextWriter (writer);
+  serialized = g_strdup ((char *) xmlBufferContent (buffer));
+  xmlBufferFree (buffer);
+
+  return serialized;
+}
+
 MMFilter *
 mm_filter_unserialize (const char *s)
 {
@@ -404,3 +404,17 @@ mm_filter_unserialize (const char *s)
 
   return f;
 }
+
+char *
+mm_hit_collection_serialize (MMHitCollection *hc)
+{
+  /* TODO: implement */
+  return NULL;
+}
+
+MMHitCollection *
+mm_hit_collection_unserialize (const char *s)
+{
+  /* TODO: implement */
+  return NULL;
+}
diff --git a/src/mm-string-utils.h b/src/mm-string-utils.h
index e5ba988..439e98e 100644
--- a/src/mm-string-utils.h
+++ b/src/mm-string-utils.h
@@ -22,8 +22,11 @@
 #define __MM_STRING_UTILS_H__
 
 #include "mm-filter.h"
+#include "mm-hit-collection.h"
 
-char *     mm_filter_serialize   (MMFilter *f);
-MMFilter * mm_filter_unserialize (const char *serialized_filter);
+char *            mm_filter_serialize           (MMFilter *f);
+MMFilter *        mm_filter_unserialize         (const char *serialized_filter);
+char *            mm_hit_collection_serialize   (MMHitCollection *hc);
+MMHitCollection * mm_hit_collection_unserialize (const char *serialized_coll);
 
 #endif /* __MM_STRING_UTILS_H__ */
-- 
2.11.4.GIT