Changeset e31e5b8 for protocols

Timestamp:

2013-04-20T13:05:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd95ce4

Parents:

9b2a8c1 (diff), bfafb99 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging "storage" branch which I wrote long ago. It separates generation of
XML-formatted user configs from disk I/O so we can try to start using other
mechanisms to store them (a REST API or something, for example).

Location:

protocols

Files:

• account.c (modified) (2 diffs)
• account.h (modified) (1 diff)
• jabber/jabber.c (modified) (1 diff)
• msn/msn.c (modified) (1 diff)
• oscar/oscar.c (modified) (1 diff)
• skype/skype.c (modified) (2 diffs)
• twitter/twitter_lib.c (modified) (1 diff)

protocols/account.c

@@ -53 +53 @@
         
         s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= SET_NOSAVE;
         
         s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
@@ -61 +61 @@
         
         s = set_add( &a->set, "nick_source", "handle", set_eval_nick_source, a );
-        s->flags |= ACC_SET_NOSAVE; /* Just for bw compatibility! */
+        s->flags |= SET_NOSAVE; /* Just for bw compatibility! */
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
+        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
         
         s = set_add( &a->set, "tag", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= SET_NOSAVE;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         set_setstr( &a->set, "username", user );
         

protocols/account.h

@@ -61 +61 @@
 typedef enum
 {
-        ACC_SET_NOSAVE = 0x01,          /* Don't save this setting (i.e. stored elsewhere). */
         ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
         ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */

protocols/jabber/jabber.c

@@ -80 +80 @@
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         
         s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );

protocols/msn/msn.c

@@ -39 +39 @@
         
         s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
         
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );

protocols/oscar/oscar.c

@@ -378 +378 @@
                     icq ? AIM_DEFAULT_LOGIN_SERVER_ICQ
                         : AIM_DEFAULT_LOGIN_SERVER_AIM, set_eval_account, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
         if (icq) {

protocols/skype/skype.c

@@ -1561 +1561 @@
         s = set_add(&acc->set, "display_name", NULL, skype_set_display_name,
                 acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
@@ -1567 +1567 @@
 
         s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "balance", NULL, skype_set_balance, acc);
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
         s = set_add(&acc->set, "skypeout_offline", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -39 +39 @@
 #include <ctype.h>
 #include <errno.h>
-
-/* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
-/* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
-#if !GLIB_CHECK_VERSION(2,12,5)
-#include <stdlib.h>
-#include <limits.h>
-#define g_ascii_strtoll strtoll
-#endif
 
 #define TXL_STATUS 1