Changeset 40

Timestamp:

03/08/07 15:57:12 (2 years ago)

Author:

inz

Message:

Depend on dbus-glib 0.61 to get "aa{sv}" working.

Files:

• blog-service/trunk/bs-manager.c (modified) (8 diffs)
• blog-service/trunk/bs-manager.h (modified) (2 diffs)
• blog-service/trunk/debian/control (modified) (1 diff)

blog-service/trunk/bs-manager.c

@@ -6 +6 @@
-
-#include "bs-manager.h"
+#include "blog.h"
+
+typedef struct _BsManagerPrivate BsManagerPrivate;
+struct _BsManagerPrivate {
+        GHashTable *blogs;
+};
+#define BS_MANAGER_GET_PRIVATE(obj) \
+        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+                                      BS_TYPE_MANAGER, BsManagerPrivate));
-
-static void bs_manager_init(BsManager *manager);
-static void bs_manager_class_init(BsManagerClass *klass);
+static void bs_manager_finalize(GObject *object);
+static void _g_value_free(gpointer pointer);
-
-static gboolean bs_manager_get_blogs(BsManager *manager,
-                const gchar **fields,
-HashTable *
+PtrArray 
-                GError **error);
-static gboolean bs_manager_get_blog_posts(BsManager *manager,
-                const gchar *blog_id,
-                const gchar **fields,
-HashTable *
+PtrArray 
-                GError **error);
-static gboolean bs_manager_get_blog_categories(BsManager *manager,
@@ -32 +43 @@
-                GHashTable *fields,
-                gboolean *status,
-
+
+
+
+
+
+
+
-
-#include "bs-manager.inc"
+
+struct GetBlogClosure {
+        GPtrArray *array;
+        const gchar **fields;
+};
+
+static void _bs_manager_populate_blogs(gpointer key,
+                gpointer value,
+                gpointer closure)
+{
+        struct GetBlogClosure *clo = closure;
+        Blog *blog = value;
+        guint i;
+        GHashTable *return_blog = g_hash_table_new_full(g_str_hash,
+                        g_str_equal,
+                        g_free,
+                        _g_value_free);
+        for (i = 0; clo->fields[i]; i++) {
+                GValue *val = NULL;
+                if (!strcmp(clo->fields[i], "id")) {
+                        val = g_value_init(g_new0(GValue, 1), G_TYPE_STRING);
+                        g_value_set_string(val, key);
+                } else if (!strcmp(clo->fields[i], "name")) {
+                        val = g_value_init(g_new0(GValue, 1), G_TYPE_STRING);
+                        g_value_set_string(val, blog->name);
+                } else if (!strcmp(clo->fields[i], "categories")) {
+                        guint i = g_slist_length(blog->categories);
+                        GSList *iter;
+                        gchar **cats = g_new0(gchar *, i);
+                        i = 0;
+                        for (iter = blog->categories; iter;
+                                        iter = iter->next) {
+                                BlogCategory *cat = iter->data;
+                                cats[i] = g_strdup(cat->id);
+                                i++;
+                        }
+                        val = g_value_init(g_new0(GValue, 1),
+                                        G_TYPE_STRV);
+                        g_value_take_boxed(val, cats);
+                }
+                if (val) {
+                        g_hash_table_replace(return_blog,
+                                        g_strdup(clo->fields[i]),
+                                        val);
+                }
+        }
+        g_ptr_array_add(clo->array, return_blog);
+}
-
-static gboolean bs_manager_get_blogs(BsManager *manager,
-                const gchar **fields,
-HashTable ***return_values,
+PtrArray **return_values, 
-                GError **error)
-{
+        BsManagerPrivate *priv = BS_MANAGER_GET_PRIVATE(manager);
+        struct GetBlogClosure clo;
+
+        clo.array = g_ptr_array_new();
+        clo.fields = fields;
+        g_hash_table_foreach(priv->blogs, _bs_manager_populate_blogs, &clo);
+
+        *return_values = clo.array;
+
-        return TRUE;
-}
+
-static gboolean bs_manager_get_blog_posts(BsManager *manager,
-                const gchar *blog_id,
-                const gchar **fields,
-HashTable ***return_values,
+PtrArray **return_values, 
-                GError **error)
-{
-
+
+
+
+
+
-                *error = g_error_new(g_quark_from_string("blog-service"),
-                                404,
@@ -56 +135 @@
-                return FALSE;
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return TRUE;
@@ -70 +204 @@
-                GError **error)
-{
-
+
+
+
+
+
+
-                *error = g_error_new(g_quark_from_string("blog-service"),
-                                404,
@@ -77 +216 @@
-                return FALSE;
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
-        return TRUE;
-}
+
-static gboolean bs_manager_blog_create_category(BsManager *manager,
-                const gchar *blog_id,
@@ -88 +235 @@
-                GError **error)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                404,
-                                "No such blog."
-                                );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        *status = FALSE;
-        return TRUE;
-}
-
-
+
+
+
+
-                GHashTable *fields,
-                gboolean *status,
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                404,
-                                "No such blog."
-                                );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        *status = FALSE;
-        return TRUE;
@@ -147 +472 @@
-static void bs_manager_init(BsManager *manager)
-{
+        BsManagerPrivate *priv = BS_MANAGER_GET_PRIVATE(manager);
+        priv->blogs = g_hash_table_new_full(g_str_hash, g_str_equal,
+                        g_free, (GDestroyNotify)blog_unref);
-}
-
-static void bs_manager_class_init(BsManagerClass *klass)
-{
+        GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+        obj_class->finalize = bs_manager_finalize;
+        g_type_class_add_private(klass, sizeof(BsManagerPrivate));
+}
+
+static void bs_manager_finalize(GObject *object)
+{
+        BsManagerPrivate *priv = BS_MANAGER_GET_PRIVATE(object);
+        g_hash_table_destroy(priv->blogs);
-}
-
@@ -157 +495 @@
-        return (BsManager *)g_object_new(BS_TYPE_MANAGER, NULL);
-}
+
+void bs_manager_add_blog(BsManager *manager, const gchar *name, Blog *blog)
+{
+        BsManagerPrivate *priv = BS_MANAGER_GET_PRIVATE(manager);
+
+        g_hash_table_replace(priv->blogs, g_strdup(name), blog_ref(blog));
+}
+void bs_manager_drop_blog(BsManager *manager, const gchar *name)
+{
+        BsManagerPrivate *priv = BS_MANAGER_GET_PRIVATE(manager);
+
+        g_hash_table_remove(priv->blogs, name);
+}
+
+static void _g_value_free(gpointer pointer)
+{
+        g_value_unset(pointer);
+        g_free(pointer);
+}

blog-service/trunk/bs-manager.h

@@ -3 +3 @@
-
-#include <glib.h>
+#include "blog.h"
-
-#define BS_TYPE_MANAGER (bs_manager_get_type())
@@ -25 +26 @@
-GType bs_manager_get_type(void);
-BsManager *bs_manager_new(void);
+void bs_manager_add_blog(BsManager *manager, const gchar *name, Blog *blog);
+void bs_manager_drop_blog(BsManager *manager, const gchar *name);
-
-#endif

blog-service/trunk/debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
-
+ (>= 0.61)
-Standards-Version: 3.6.0
-