Changes in / [5ca1416:b1dc403]

Files:

• configure (modified) (3 diffs)
• lib/Makefile (modified) (1 diff)
• lib/json.c (deleted)
• lib/json.h (deleted)
• lib/json_util.c (deleted)
• lib/json_util.h (deleted)
• lib/oauth2.c (modified) (3 diffs)
• lib/parson.c (added)
• lib/parson.h (added)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/rpc/Makefile (added)
• protocols/rpc/rpc.c (added)
• python/implugin.py (added)

configure

@@ -32 +32 @@
 jabber="default-on"
 oscar="default-on"
+rpc="rpc-on"
 yahoo="default-on"
 
@@ -118 +119 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
+--rpc=0/1       Disable/enable RPC interface            $rpc
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -815 +817 @@
         protocols=$protocols'twitter '
         protoobjs=$protoobjs'twitter_mod.o '
+fi
+
+if [ "$rpc" = 0 ]; then
+        echo '#undef WITH_RPC' >> config.h
+else
+        echo '#define WITH_RPC' >> config.h
+        protocols=$protocols'rpc '
+        protoobjs=$protoobjs'rpc_mod.o '
 fi
 

lib/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o md5.o misc.o oauth.o oauth2.o parson.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
 
 LFLAGS += -r

lib/oauth2.c

@@ -42 +42 @@
 #include "oauth2.h"
 #include "oauth.h"
-#include "json.h"
-#include "json_util.h"
+#include "parson.h"
 #include "url.h"
+
+#define JSON_O_FOREACH(o, k, v) \
+    const char *k; const JSON_Value *v; int __i; \
+    for (__i = 0; json_object_get_tuple(o, __i, &k, &v); __i++)
 
 char *oauth2_url(const struct oauth2_service *sp)
@@ -113 +116 @@
 }
 
-static char* oauth2_parse_error(json_value *e)
+static char* oauth2_parse_error(const JSON_Value *e)
 {
         /* This does a reasonable job with some of the flavours of error
            responses I've seen. Because apparently it's not standardised. */
 
-        if (e->type == json_object) {
+        if (json_type(e) == JSONObject) {
                 /* Facebook style */
-                const char *msg = json_o_str(e, "message");
-                const char *type = json_o_str(e, "type");
-                json_value *code_o = json_o_get(e, "code");
+                const char *msg = json_object_get_string(json_object(e), "message");
+                const char *type = json_object_get_string(json_object(e), "type");
+                JSON_Value *code_o = json_object_get_value(json_object(e), "code");
                 int code = 0;
 
-                if (code_o && code_o->type == json_integer) {
-                        code = code_o->u.integer;
+                if (json_type(code_o) == JSONNumber) {
+                        code = json_value_get_number(code_o);
                 }
 
                 return g_strdup_printf("Error %d: %s", code, msg ? msg : type ? type : "Unknown error");
-        } else if (e->type == json_string) {
-                return g_strdup(e->u.string.ptr);
+        } else if (json_type(e) == JSONString) {
+                return g_strdup(json_string(e));
         }
         return NULL;
@@ -150 +153 @@
         if (content_type && (strstr(content_type, "application/json") ||
                              strstr(content_type, "text/javascript"))) {
-                json_value *js = json_parse(req->reply_body, req->body_size);
-                if (js && js->type == json_object) {
-                        JSON_O_FOREACH(js, k, v){
+                JSON_Value *js = json_parse_string(req->reply_body);
+                if (js && json_type(js) == JSONObject) {
+                        JSON_O_FOREACH(json_object(js), k, v){
                                 if (strcmp(k, "error") == 0) {
                                         error = oauth2_parse_error(v);
                                 }
-                                if (v->type != json_string) {
+                                if (json_type(v) != JSONString) {
                                         continue;
                                 }
                                 if (strcmp(k, "access_token") == 0) {
-                                        atoken = g_strdup(v->u.string.ptr);
+                                        atoken = g_strdup(json_string(v));
                                 }
                                 if (strcmp(k, "refresh_token") == 0) {
-                                        rtoken = g_strdup(v->u.string.ptr);
+                                        rtoken = g_strdup(json_string(v));
                                 }
                         }

protocols/nogaim.c

@@ -132 +132 @@
         extern void twitter_initmodule();
         extern void purple_initmodule();
+        extern void rpc_initmodule();
 
 #ifdef WITH_MSN
@@ -155 +156 @@
 #ifdef WITH_PURPLE
         purple_initmodule();
+#endif
+
+#ifdef WITH_RPC
+        rpc_initmodule();
 #endif