Changeset 28

Timestamp:

02/27/07 13:32:08 (2 years ago)

Author:

inz

Message:

Add error reporting to blog plugin API.

Files:

• maemo-blog/trunk/Makefile (modified) (8 diffs)
• maemo-blog/trunk/blog-blogger.c (modified) (6 diffs)
• maemo-blog/trunk/blog-metaweblog.c (modified) (10 diffs)
• maemo-blog/trunk/blog-plugin.h (modified) (1 diff)
• maemo-blog/trunk/blog.c (modified) (2 diffs)
• maemo-blog/trunk/blog.h (modified) (2 diffs)
• maemo-blog/trunk/debian/changelog (modified) (1 diff)
• maemo-blog/trunk/gui.c (modified) (2 diffs)
• maemo-blog/trunk/maemo-blog.desktop (modified) (1 diff)
• maemo-blog/trunk/main.c (modified) (3 diffs)

maemo-blog/trunk/Makefile

@@ -1 +1 @@
-# Makefile for maemo-blog
+
+CLEAN = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-VERSION := $(shell head -n1 debian/changelog | sed -e 's/^.*(\([^-]*\)\(-.*\)*).*$$/\1/')
@@ -25 +27 @@
-
-PACKAGE=maemo-blog
-_
+-
-
-WARNINGS += -Werror
@@ -53 +55 @@
-maemo_blog_LDFLAGS += `pkg-config gconf-2.0 gtk+-2.0 --libs` -export-dynamic
-
-
-
+ blog.c
+ mb-mainview.h mb-view.h mb-textview.h
-maemo_blog_DESKTOP := maemo-blog.desktop
-maemo_blog_PIXMAPS := maemo-blog.png
@@ -60 +62 @@
-libmetaweblog_la_CFLAGS += $(CFLAGS) `pkg-config glib-2.0 libsoup-2.2 --cflags`
-libmetaweblog_la_LDFLAGS = `pkg-config glib-2.0 libsoup-2.2 --libs` -module -shared -rpath $(LIBDIR) -avoid-version
-
-
+ blog.c
+ blog.h
-libmetaweblog_la_DIR := $(PLUGINDIR)
-
-libblogger_la_CFLAGS += $(CFLAGS) `pkg-config glib-2.0 libsoup-2.2 --cflags`
-libblogger_la_LDFLAGS = `pkg-config glib-2.0 libsoup-2.2 --libs` -module -shared -rpath $(LIBDIR) -avoid-version
-
-
+ blog.c
+ blog.h
-libblogger_la_DIR := $(PLUGINDIR)
-
@@ -77 +79 @@
-all: $(patsubst %, %.build, ${TARGETS})
-
-subst .,_,${PART})_SOURCES}) ${$(subst .,_
+call CLEAN,${PART})_SOURCES}) ${$(call CLEAN
-        @echo -n "  Linking..."
-subst .,_,${PART})_SOURCES}) -o $@ ${$(subst .,_
+call CLEAN,${PART})_SOURCES}) -o $@ ${$(call CLEAN
-        @echo "done."
-
@@ -86 +88 @@
-        @$(MAKE) LIBDIR="$(LIBDIR)" PLUGINDIR="$(PLUGINDIR)" -s PART="$(patsubst %.build,%,$@)" $(patsubst %.build,%,$@)
-
-subst .,_
+call CLEAN
-        @echo -n "  Building $@..."
-subst .,_
+call CLEAN
-
-        @echo "done."
@@ -103 +105 @@
-
-%.clean:
-subst .,_
+call CLEAN
-
-.PHONY: distclean
@@ -114 +116 @@
-
-%.install: %.build
-subst .,_
-subst .,_
-subst .,_,$(patsubst %.install,%,$@))_PC}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_PCDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_PC} ${$(subst .,_
-subst .,_,$(patsubst %.install,%,$@))_DESKTOP}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOPDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_DESKTOP} ${$(subst .,_
-subst .,_,$(patsubst %.install,%,$@))_PIXMAPS}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_PIXMAPS} ${$(subst .,_
-subst .,_,$(patsubst %.install,%,$@))_INCLUDES}" ]; then $(INSTALL_DIR) ${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDEDIR}; $(INSTALL_DATA) ${$(subst .,_,$(patsubst %.install,%,$@))_INCLUDES} ${$(subst .,_
+call CLEAN
+call CLEAN
+call CLEAN,$(patsubst %.install,%,$@))_PC}" ]; then $(INSTALL_DIR) ${$(call CLEAN,$(patsubst %.install,%,$@))_PCDIR}; $(INSTALL_DATA) ${$(call CLEAN,$(patsubst %.install,%,$@))_PC} ${$(call CLEAN
+call CLEAN,$(patsubst %.install,%,$@))_DESKTOP}" ]; then $(INSTALL_DIR) ${$(call CLEAN,$(patsubst %.install,%,$@))_DESKTOPDIR}; $(INSTALL_DATA) ${$(call CLEAN,$(patsubst %.install,%,$@))_DESKTOP} ${$(call CLEAN
+call CLEAN,$(patsubst %.install,%,$@))_PIXMAPS}" ]; then $(INSTALL_DIR) ${$(call CLEAN,$(patsubst %.install,%,$@))_PIXMAPDIR}; $(INSTALL_DATA) ${$(call CLEAN,$(patsubst %.install,%,$@))_PIXMAPS} ${$(call CLEAN
+call CLEAN,$(patsubst %.install,%,$@))_INCLUDES}" ]; then $(INSTALL_DIR) ${$(call CLEAN,$(patsubst %.install,%,$@))_INCLUDEDIR}; $(INSTALL_DATA) ${$(call CLEAN,$(patsubst %.install,%,$@))_INCLUDES} ${$(call CLEAN
-
-%: %.in Makefile debian/changelog

maemo-blog/trunk/blog-blogger.c

@@ -102 +102 @@
-        if (soup_xmlrpc_value_array_get_iterator(value, &iter)) {
-                while (iter) {
-g_new0(Blog, 1
+blog_new(
-                        GHashTable *hash;
-                        SoupXmlrpcValue *val;
@@ -128 +128 @@
-                }
-        } else {
-g_new0(Blog, 1
+blog_new(
-                        GHashTable *hash;
-                        SoupXmlrpcValue *val;
@@ -155 +155 @@
-        }
-
-
+NULL, 
-        g_free(clo->uri);
-        g_free(clo->user);
@@ -238 +238 @@
-                soup_xmlrpc_value_get_boolean(value, &status);
-        }
-
+NULL, 
-        g_free(clo);
-}
@@ -355 +355 @@
-        struct BlogBloggerFetchedClosure *clo = user_data;
-
-
+NULL, 
-
-        return FALSE;
@@ -423 +423 @@
-        }
-
-
+NULL, 
-        g_free(clo);
-}

maemo-blog/trunk/blog-metaweblog.c

@@ -13 +13 @@
-        SoupSession *session;
-};
+
+static gint _field_compare(gconstpointer a, gconstpointer b)
+{
+        const BlogParameter *pa = a;
+        const BlogParameter *pb = b;
+
+        return strcmp(pa->name, pb->name);
+}
-
-static BlogCategory *category_lookup(Blog *blog, const gchar *name)
@@ -130 +138 @@
-        SoupXmlrpcValueArrayIterator *iter;
-
+        if (soup_xmlrpc_response_is_fault(response)) {
+                BlogPluginError error = { 0, NULL };
+                error.error_string = "Unknown error";
+                error.error_code = 404;
+                clo->cb(retval, &error, clo->user_data);
+                g_free(clo->uri);
+                g_free(clo->user);
+                g_free(clo->pass);
+                g_free(clo);
+                return;
+        }
+
-        soup_xmlrpc_value_array_get_iterator(value, &iter);
-
-        while (iter) {
-g_new0(Blog, 1
+blog_new(
-                GHashTable *hash;
-                SoupXmlrpcValue *val;
@@ -165 +185 @@
-        }
-
-
+NULL, 
-        g_free(clo->uri);
-        g_free(clo->user);
@@ -248 +268 @@
-                soup_xmlrpc_value_get_boolean(value, &status);
-        }
-
+NULL, 
-        g_free(clo);
-}
@@ -259 +279 @@
-        struct MetaweblogPluginData *data = blog->plugin->plugin_data;
-        SoupXmlrpcMessage *msg;
+        GSList *param_copy = NULL;
+        GSList *struct_stack = g_slist_prepend(NULL, g_strdup(""));
+        guint top_len = 0;
-
-        if (!post || !post->content) {
@@ -314 +337 @@
-        soup_xmlrpc_message_end_array(msg);
-        soup_xmlrpc_message_end_member(msg);
-
+
+
+
-                BlogParameter *parm = iter->data;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                switch (G_VALUE_TYPE(&parm->value)) {
-                        case G_TYPE_STRING:
@@ -343 +392 @@
-                soup_xmlrpc_message_end_member(msg);
-        }
-
+
+
+
+
+
-        soup_xmlrpc_message_end_param(msg);
-        soup_xmlrpc_message_start_param(msg);
@@ -536 +589 @@
-        }
-
-
+NULL, 
-        g_free(clo);
-}
@@ -636 +689 @@
-        }
-
-
+NULL, 
-        g_free(clo);
-}
@@ -694 +747 @@
-        soup_xmlrpc_value_get_string(value, &url);
-
-
+NULL, 
-        g_free(url);
-        g_free(clo->image_name);

maemo-blog/trunk/blog-plugin.h

@@ -8 +8 @@
-#include "blog.h"
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-struct _BlogPlugin {

maemo-blog/trunk/blog.c

@@ -1 +1 @@
-#include "blog.h"
+
+static void blog_free(Blog *blog);
-
-void blog_parameter_free(BlogParameter *param)
@@ -24 +26 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        g_free(blog->url);

maemo-blog/trunk/blog.h

@@ -21 +21 @@
-        GSList *categories;
-        GSList *posts;
+        gint refcount;
-};
-
@@ -44 +45 @@
-void blog_post_free(BlogPost *post);
-void blog_category_free(BlogCategory *category);
-
+
+
+
-
-#endif /* _BLOG_H_ */

maemo-blog/trunk/debian/changelog

@@ +1 @@
+maemo-blog (0.1.8) mistral; urgency=low
+
+  * Add error reporting to blog plugin API.
+
+ -- Santtu Lakkala <inz@inz.fi>  Tue, 27 Feb 2007 13:31:34 +0200
+
-maemo-blog (0.1.7) mistral; urgency=low
-

maemo-blog/trunk/gui.c

@@ -34 +34 @@
-}
-
-
+const BlogPluginError *error, 
-{
-        struct UploadClosure *closure = user_data;
-        (void)blog;
+        (void)error;
-        (void)image_name;
-        closure->name = g_strdup(image_path);
@@ -73 +74 @@
-};
-
-
+const BlogPluginError *error, 
-{
-        struct PostClosure *closure = user_data;
-        (void)blog;
-        (void)post;
+        (void)error;
-
-        closure->status = status;

maemo-blog/trunk/maemo-blog.desktop

@@ -2 +2 @@
-Encoding=UTF-8
-Categories=Application;Network;
-_
+-
-Type=Application
-X-Osso-Type=application/x-executable

maemo-blog/trunk/main.c

@@ -37 +37 @@
-} */
-
-
+const BlogPluginError *error, 
-{
-        (void)blog;
+        (void)error;
-        struct Foo *foo = user_data;
-        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(foo->pbar), 1.00);
@@ -46 +47 @@
-}
-
-
+const BlogPluginError *error, 
-{
-        struct Foo *foo = user_data;
+        (void)error;
-
-        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(foo->pbar), "Getting recent posts...");
@@ -55 +57 @@
-}
-
-
+const BlogPluginError *error, 
-{
-        struct Foo *foo = user_data;
-        guint i;
-blogs
+error
-
-        *foo->blogs = blogs;