Changeset 15

Timestamp:

11/17/06 14:08:54 (2 years ago)

Author:

inz

Message:

Add icon, migrate metaweblog plugin to libsoup.

Files:

• maemo-blog/trunk/Makefile (modified) (4 diffs)
• maemo-blog/trunk/blog-blogger.c (modified) (2 diffs)
• maemo-blog/trunk/blog-metaweblog.c (modified) (21 diffs)
• maemo-blog/trunk/debian/changelog (modified) (1 diff)
• maemo-blog/trunk/maemo-blog.desktop (modified) (1 diff)
• maemo-blog/trunk/maemo-blog.png (added)

maemo-blog/trunk/Makefile

@@ -19 +19 @@
-INCLUDEDIR := $(DESTDIR)/usr/include
-DESKTOPDIR := $(DESTDIR)/usr/share/applications/hildon
+PIXMAPDIR := $(DESTDIR)/usr/share/pixmaps
-
-TOPDIR := $(shell /bin/pwd)
@@ -55 +56 @@
-maemo_blog_HEADERS := blog.h blog-plugin.h plugin-loader.h accounts.h login.h gui.h
-maemo_blog_DESKTOP := maemo-blog.desktop
+maemo_blog_PIXMAPS := maemo-blog.png
-
---cflags` `xmlrpc-c-config client
-xmlrpc-c-config client
+libsoup-2.2
+pkg-config glib-2.0 libsoup-2.2
-libmetaweblog_la_SOURCES := blog-metaweblog.c
-libmetaweblog_la_HEADERS := blog-plugin.h
@@ -70 +72 @@
-maemo_blog_DIR := $(BINDIR)
-maemo_blog_DESKTOPDIR := $(DESKTOPDIR)
+maemo_blog_PIXMAPDIR := $(PIXMAPDIR)
-
-.PHONY: all
@@ -115 +118 @@
-        @if [ x != "x${$(subst .,_,$(patsubst %.install,%,$@))_PC}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_PCDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_PC} ${$(subst .,_,$(patsubst %.install,%,$@))_PCDIR}; fi
-        @if [ x != "x${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOP}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOPDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOP} ${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOPDIR}; fi
+        @if [ x != "x${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPS}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPS} ${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPDIR}; fi
-        @if [ x != "x${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDES}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDEDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDES} ${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDEDIR}; fi
-

maemo-blog/trunk/blog-blogger.c

@@ -142 +142 @@
-        (void)method_name;
-        (void)param_array;
+
+        die_if_fault_occurred(fault);
-        
+        if (xmlrpc_value_type(blogs) == XMLRPC_TYPE_ARRAY) {
-        size = xmlrpc_array_size(fault, blogs);
-        die_if_fault_occurred(fault);
@@ -164 +167 @@
-        }
-        retval[i] = NULL;
+        } else {
+                retval = g_new0(Blog *, 2);
+                gchar *blogid = NULL, *name = NULL;
+                xmlrpc_parse_value(fault, blogs, "{s:s,s:s,*}",
+                                "blogid", &blogid,
+                                "blogName", &name);
+                retval[0] = g_new0(Blog, 1);
+                retval[0]->url = g_strdup(clo->uri);
+                retval[0]->user = g_strdup(clo->user);
+                retval[0]->pass = g_strdup(clo->pass);
+                retval[0]->id = g_strdup(blogid);
+                retval[0]->name = g_strdup(name);
+                retval[0]->plugin = clo->self;
+                retval[0]->posts = NULL;
+                retval[1] = NULL;
+        }
-
-        clo->cb(retval, clo->user_data);

maemo-blog/trunk/blog-metaweblog.c

@@ -2 +2 @@
-#include <stdio.h>
-#include <glib.h>
-
-
+
+
+
+
-#include <string.h>
-
-#include "blog-plugin.h"
-
-#define die_if_fault_occurred(x) die_if_fault(x, __FUNCTION__, __LINE__)
-
-struct MetaweblogPluginData {
-
-
+
-};
-
-static gboolean _event_loop(gpointer user_data)
-{
-        struct MetaweblogPluginData *data = user_data;
-
-        xmlrpc_client_event_loop_finish_timeout(data->client, 20);
-
-        return TRUE;
-}
-
-static BlogCategory *category_lookup(Blog *blog, const gchar *name)
@@ -39 +29 @@
-        return NULL;
-}
-
-/* We're a command-line utility, so we abort if an error occurs. */
-static void die_if_fault (xmlrpc_env *env, const char *func, unsigned int line)
-{
-    if (env->fault_occurred) {
-        fprintf(stderr, "%s:%u: XML-RPC Fault #%d: %s\n",
-                        func, line,
-                env->fault_code, env->fault_string);
-        exit(1);
-    }
-}
-
-
-struct BlogMetaweblogConnectedClosure {
@@ -61 +39 @@
-        gchar *pass;
-};
-
-
-
-
-
-
+
+
-static gboolean blog_metaweblog_connect(BlogPlugin *plugin,
-                const gchar *uri, const gchar *user,
@@ -79 +53 @@
-        gboolean new_post;
-};
-
-
-
-
-
-
+
+
-static gboolean blog_metaweblog_new_post(Blog *blog, BlogPost *post,
-                gboolean publish, BlogPostCb cb, gpointer user_data);
@@ -97 +67 @@
-};
-
-
-
-
-
-
-
+
+
-static void blog_metaweblog_get_categories(Blog *blog, BlogFetchCb cb, gpointer user_data);
-
-
-
-
-
-
+
+
-static void blog_metaweblog_get_recent(Blog *blog, BlogFetchCb cb, gpointer user_data);
-static void blog_metaweblog_unload(BlogPlugin *plugin);
@@ -121 +83 @@
-        gboolean new_post;
-};
-
-
-
-
-
-
+
+
-static gboolean blog_metaweblog_upload_image(Blog *blog, const gchar *image_name, 
-                const gchar *mime_type,
@@ -137 +95 @@
-{
-        BlogPlugin *retval = g_new0(BlogPlugin, 1);
-        struct xmlrpc_curl_xportparms transportParms;
-        struct xmlrpc_clientparms clientParms;
-        struct MetaweblogPluginData *data;
-
-        memset(&transportParms, 0, sizeof(transportParms));
-        memset(&clientParms, 0, sizeof(clientParms));
-
-        clientParms.transport = "curl";
-        clientParms.transportparmsP = (struct xmlrpc_xportparms *)&transportParms;
-        clientParms.transportparm_size = XMLRPC_CXPSIZE(no_ssl_verifyhost);
-
-        transportParms.no_ssl_verifypeer = 1;
-        transportParms.no_ssl_verifyhost = 1;
-
-        retval->connect = blog_metaweblog_connect;
@@ -161 +107 @@
-        retval->name = g_strdup("MetaWebLog");
-        retval->plugin_data = data = g_new0(struct MetaweblogPluginData, 1);
-
-
-
-
+
+
+
+
+
+
-        return retval;
-}
-
-
-
-
-
-
-
+
+
-{
-        struct BlogMetaweblogConnectedClosure *clo = (struct BlogMetaweblogConnectedClosure *)user_data;
-        Blog **retval = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        clo->cb(retval, clo->user_data);
-        g_source_remove(clo->timeout_id);
-        g_free(clo->uri);
-        g_free(clo->user);
@@ -219 +182 @@
-        struct BlogMetaweblogConnectedClosure *clo = g_new0(struct BlogMetaweblogConnectedClosure, 1);
-        struct MetaweblogPluginData *data = plugin->plugin_data;
+        SoupXmlrpcMessage *msg;
-
-        clo->cb = cb;
@@ -227 +191 @@
-        clo->self = plugin;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        pass);
-
-
+
+
+
+
+
+
-
-        return TRUE;
-}
-
-
-
-
-
-
-
+
+
-{
-        struct BlogMetaweblogPostedClosure *clo = (struct BlogMetaweblogPostedClosure *)user_data;
-        gboolean status = TRUE;
-gint
+long
-        gchar *string_id = NULL;
-
-(void)server_url
-
-(void)param_array
+
+               SOUP_XMLRPC_MESSAGE(message))
+
+SoupXmlrpcValue *value = soup_xmlrpc_response_get_value(response)
-
-        if (clo->new_post) {
-
-
-
+
+
+
+
-                        break;
-
-
+
+
+
-                        break;
-                default:
@@ -271 +241 @@
-                        break;
-                }
-                die_if_fault_occurred(fault);
-
-                if (string_id) {
-g_strdup(string_id)
+string_id
-                } else {
-
+l
-                }
-
-                clo->blog->posts = g_slist_prepend(clo->blog->posts, clo->post);
-        } else {
-xmlrpc_parse_value(fault, retval, "b"
+soup_xmlrpc_value_get_boolean(value
-        }
-        clo->cb(clo->blog, clo->post, status, clo->user_data);
-        g_source_remove(clo->timeout_id);
-        g_free(clo);
-}
@@ -291 +259 @@
-                gboolean publish, BlogPostCb cb, gpointer user_data)
-{
-        xmlrpc_value *array;
-        xmlrpc_value *stru;
-        GSList *iter;
-        struct BlogMetaweblogPostedClosure *clo;
-        struct MetaweblogPluginData *data = blog->plugin->plugin_data;
+        SoupXmlrpcMessage *msg;
-
-        if (!post || !post->content) {
@@ -308 +275 @@
-        clo->user_data = user_data;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for (iter = post->categories; iter; iter = iter->next)
-        {
-                BlogCategory *cat = (BlogCategory *)iter->data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for (iter = post->extra_fields; iter; iter = iter->next) {
-                BlogParameter *parm = iter->data;
-xmlrpc_value *value = NULL
+soup_xmlrpc_message_start_member(msg, parm->name)
-                switch (G_VALUE_TYPE(&parm->value)) {
-                        case G_TYPE_STRING:
-value = xmlrpc_string_new(&data->env
+soup_xmlrpc_message_write_string(msg
-                                                g_value_get_string(
-                                                        &parm->value));
-                                break;
-                        case G_TYPE_INT:
-value = xmlrpc_int_new(&data->env
+soup_xmlrpc_message_write_int(msg
-                                                g_value_get_int(
-                                                        &parm->value));
-                                break;
-                        case G_TYPE_UINT:
-value = xmlrpc_int_new(&data->env
+soup_xmlrpc_message_write_int(msg
-                                                (int)g_value_get_uint(
-                                                        &parm->value));
-                                break;
-                        case G_TYPE_BOOLEAN:
-value = xmlrpc_bool_new(&data->env
+soup_xmlrpc_message_write_boolean(msg
-                                                g_value_get_boolean(
-                                                        &parm->value));
@@ -365 +345 @@
-                                break;
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return TRUE;
@@ -393 +364 @@
-                gboolean publish, BlogPostCb cb, gpointer user_data)
-{
-        xmlrpc_env env;
-        xmlrpc_value *array;
-        GSList *iter;
-        struct BlogMetaweblogPostedClosure *clo;
-        struct MetaweblogPluginData *data = blog->plugin->plugin_data;
+        SoupXmlrpcMessage *msg;
-
-        if (!post || !post->content || !post->id) {
@@ -410 +380 @@
-        clo->new_post = FALSE;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for (iter = post->categories; iter; iter = iter->next)
-        {
-                BlogCategory *cat = (BlogCategory *)iter->data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return TRUE;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        struct BlogMetaweblogFetchedClosure *clo = (struct BlogMetaweblogFetchedClosure *)user_data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                                BlogCategory *category =
-                                        g_new0(BlogCategory, 1);
-
-
-
-
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        clo->cb(clo->blog, clo->user_data);
-        g_free(clo);
@@ -521 +548 @@
-        struct BlogMetaweblogFetchedClosure *clo = g_new0(struct BlogMetaweblogFetchedClosure, 1);
-        struct MetaweblogPluginData *data = blog->plugin->plugin_data;
+        SoupXmlrpcMessage *msg;
-        clo->blog = blog;
-        clo->cb = cb;
-        clo->user_data = user_data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+