Changeset 12

Timestamp:

11/08/06 15:26:02 (2 years ago)

Author:

inz

Message:

First try for geoclue support.

Files:

• maemo-blog/trunk/Makefile (modified) (1 diff)
• maemo-blog/trunk/blog-metaweblog.c (modified) (4 diffs)
• maemo-blog/trunk/blog.c (modified) (3 diffs)
• maemo-blog/trunk/blog.h (modified) (2 diffs)
• maemo-blog/trunk/debian/changelog (modified) (1 diff)
• maemo-blog/trunk/gui.c (modified) (5 diffs)

maemo-blog/trunk/Makefile

@@ -45 +45 @@
-maemo_blog_CFLAGS += $(shell if pkg-config libgnomeui-2.0 --exists; then pkg-config libgnomeui-2.0 --cflags; echo -DHAVE_VFS_UTIL; fi)
-maemo_blog_LDFLAGS += $(shell if pkg-config libgnomeui-2.0 --exists; then pkg-config libgnomeui-2.0 --libs; fi)
+maemo_blog_CFLAGS += $(shell if pkg-config geoclue --exists; then pkg-config geoclue --cflags; echo -DGEOCLUE; fi)
+maemo_blog_LDFLAGS += $(shell if pkg-config geoclue --exists; then pkg-config geoclue --libs; fi)
-
-maemo_blog_CFLAGS += `pkg-config gconf-2.0 gtk+-2.0 --cflags` \

maemo-blog/trunk/blog-metaweblog.c

@@ -293 +293 @@
-{
-        xmlrpc_value *array;
+        xmlrpc_value *stru;
-        GSList *iter;
-        struct BlogMetaweblogPostedClosure *clo;
@@ -308 +309 @@
-        clo->user_data = user_data;
-
-build_value(&data->env, "()"
+array_new(&data->env
-        die_if_fault_occurred(&data->env);
-
@@ -321 +322 @@
-        }
-
+        stru = xmlrpc_struct_new(&data->env);
+        xmlrpc_struct_set_value(&data->env,
+                        stru,
+                        "title",
+                        xmlrpc_string_new(&data->env, post->title));
+        xmlrpc_struct_set_value(&data->env,
+                        stru,
+                        "description",
+                        xmlrpc_string_new(&data->env, post->content));
+        xmlrpc_struct_set_value(&data->env,
+                        stru,
+                        "category",
+                        array);
+        xmlrpc_struct_set_value(&data->env,
+                        stru,
+                        "categories",
+                        array);
+        for (iter = post->extra_fields; iter; iter = iter->next) {
+                BlogParameter *parm = iter->data;
+                xmlrpc_value *value = NULL;
+                switch (G_VALUE_TYPE(&parm->value)) {
+                        case G_TYPE_STRING:
+                                value = xmlrpc_string_new(&data->env,
+                                                g_value_get_string(
+                                                        &parm->value));
+                                break;
+                        case G_TYPE_INT:
+                                value = xmlrpc_int_new(&data->env,
+                                                g_value_get_int(
+                                                        &parm->value));
+                                break;
+                        case G_TYPE_UINT:
+                                value = xmlrpc_int_new(&data->env,
+                                                (int)g_value_get_uint(
+                                                        &parm->value));
+                                break;
+                        case G_TYPE_BOOLEAN:
+                                value = xmlrpc_bool_new(&data->env,
+                                                g_value_get_boolean(
+                                                        &parm->value));
+                                break;
+                        default:
+                                break;
+                }
+                if (value) {
+                        xmlrpc_struct_set_value(&data->env,
+                                        stru,
+                                        parm->name,
+                                        value);
+                }
+        }
+
-        xmlrpc_client_start_rpcf(&data->env,
-                        data->client,
@@ -326 +379 @@
-                        _blog_metaweblog_posted,
-                        clo,
-{s:s,s:s,s:V,s:V}
+V
-                        blog->id,
-                        blog->user,
-                        blog->pass,
-
-
-
-
-
-
-
-
+
-                        publish);
-

maemo-blog/trunk/blog.c

@@ -1 +1 @@
-#include "blog.h"
+
+void blog_parameter_free(BlogParameter *param)
+{
+        g_free(param->name);
+        g_value_unset(&param->value);
+        g_free(param);
+}
-
-void blog_post_free(BlogPost *post)
@@ -6 +13 @@
-        g_free(post->title);
-        g_free(post->content);
+        g_slist_foreach(post->extra_fields, (GFunc)blog_parameter_free, NULL);
+        g_free(post);
-}
-
@@ -12 +21 @@
-        g_free(category->name);
-        g_free(category->id);
+        g_free(category);
-}
-

maemo-blog/trunk/blog.h

@@ -3 +3 @@
-
-#include <glib.h>
+#include <glib-object.h>
-
-typedef struct _Blog Blog;
-typedef struct _BlogCategory BlogCategory;
-typedef struct _BlogPost BlogPost;
+typedef struct _BlogParameter BlogParameter;
-
-#include "blog-plugin.h"
@@ -30 +32 @@
-        gchar *title;
-        GSList *categories;
+        GSList *extra_fields;
-        gchar *content;
-};
-
+struct _BlogParameter {
+        gchar *name;
+        GValue value;
+};
+
+void blog_parameter_free(BlogParameter *param);
-void blog_post_free(BlogPost *post);
-void blog_category_free(BlogCategory *category);

maemo-blog/trunk/debian/changelog

@@ +1 @@
+maemo-blog (0.1.4) mistral; urgency=low
+
+  * First try for geoclue support.
+
+ -- Santtu Lakkala <inz@localhost.localdomain>  Wed,  8 Nov 2006 15:25:03 +0200
+
-maemo-blog (0.1.3) mistral; urgency=low
-

maemo-blog/trunk/gui.c

@@ -14 +14 @@
-#ifdef HAVE_VFS_UTIL
-#include <libgnomeui/gnome-vfs-util.h>
+#endif
+#ifdef GEOCLUE
+#include <geoclue/position.h>
-#endif
-#include "blog-plugin.h"
@@ -254 +257 @@
-        gtk_widget_destroy(dialog);
-}
+
+#ifdef GEOCLUE
+static void _geo(GObject *object, GObject *window)
+{
+        gdouble lat, lon;
+
+        (void)object;
+
+        geoclue_position_init();
+        geoclue_position_current_position(&lat, &lon);
+        g_object_set_data_full(window, "position",
+                        g_strdup_printf("%f %f", lat, lon),
+                        g_free);
+        fprintf(stderr, "Position now: %s\n", (gchar *)g_object_get_data(window, "position"));
+}
+#endif
-
-static void _send(GObject *object, GObject *window)
@@ -282 +301 @@
-        gchar *pos;
-        guint image_count, i;
+        gchar *position = g_object_get_data(window, "position");
-
-        (void)object;
@@ -376 +396 @@
-                                g_slist_append(post->categories, category);
-                }
+        }
+
+        if (position) {
+                BlogParameter *parm = g_new0(BlogParameter, 1);
+
+                parm->name = g_strdup("georss:point");
+                g_value_init(&parm->value, G_TYPE_STRING);
+                g_value_set_string(&parm->value, position);
+                post->extra_fields = g_slist_append(post->extra_fields,
+                                parm);
-        }
-        
@@ -1007 +1037 @@
-        gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
-        g_signal_connect(button, "clicked", G_CALLBACK(_img), gtk_text_view_get_buffer(GTK_TEXT_VIEW(view)));
+#ifdef GEOCLUE
+        button = gtk_tool_button_new(NULL, "Geo");
+        gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+        g_signal_connect(button, "clicked", G_CALLBACK(_geo), window);
+#endif
-#ifdef HILDON
-        button = gtk_toggle_tool_button_new();