Changeset e31e5b8 for protocols


Ignore:
Timestamp:
2013-04-20T13:05:55Z (7 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:
7 edited

Legend:

Unmodified
Added
Removed
  • protocols/account.c

    r9b2a8c1 re31e5b8  
    5353       
    5454        s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
    55         s->flags |= ACC_SET_NOSAVE;
     55        s->flags |= SET_NOSAVE;
    5656       
    5757        s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
     
    6161       
    6262        s = set_add( &a->set, "nick_source", "handle", set_eval_nick_source, a );
    63         s->flags |= ACC_SET_NOSAVE; /* Just for bw compatibility! */
     63        s->flags |= SET_NOSAVE; /* Just for bw compatibility! */
    6464       
    6565        s = set_add( &a->set, "password", NULL, set_eval_account, a );
    66         s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
     66        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
    6767       
    6868        s = set_add( &a->set, "tag", NULL, set_eval_account, a );
    69         s->flags |= ACC_SET_NOSAVE;
     69        s->flags |= SET_NOSAVE;
    7070       
    7171        s = set_add( &a->set, "username", NULL, set_eval_account, a );
    72         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
     72        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
    7373        set_setstr( &a->set, "username", user );
    7474       
  • protocols/account.h

    r9b2a8c1 re31e5b8  
    6161typedef enum
    6262{
    63         ACC_SET_NOSAVE = 0x01,          /* Don't save this setting (i.e. stored elsewhere). */
    6463        ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
    6564        ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */
  • protocols/jabber/jabber.c

    r9b2a8c1 re31e5b8  
    8080       
    8181        s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
    82         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
     82        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
    8383       
    8484        s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );
  • protocols/msn/msn.c

    r9b2a8c1 re31e5b8  
    3939       
    4040        s = set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
    41         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
     41        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
    4242       
    4343        set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
  • protocols/oscar/oscar.c

    r9b2a8c1 re31e5b8  
    378378                    icq ? AIM_DEFAULT_LOGIN_SERVER_ICQ
    379379                        : AIM_DEFAULT_LOGIN_SERVER_AIM, set_eval_account, acc);
    380         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
     380        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
    381381       
    382382        if (icq) {
  • protocols/skype/skype.c

    r9b2a8c1 re31e5b8  
    15611561        s = set_add(&acc->set, "display_name", NULL, skype_set_display_name,
    15621562                acc);
    1563         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
     1563        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
    15641564
    15651565        s = set_add(&acc->set, "mood_text", NULL, skype_set_mood_text, acc);
     
    15671567
    15681568        s = set_add(&acc->set, "call", NULL, skype_set_call, acc);
    1569         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
     1569        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
    15701570
    15711571        s = set_add(&acc->set, "balance", NULL, skype_set_balance, acc);
    1572         s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
     1572        s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
    15731573
    15741574        s = set_add(&acc->set, "skypeout_offline", "true", set_eval_bool, acc);
  • protocols/twitter/twitter_lib.c

    r9b2a8c1 re31e5b8  
    3939#include <ctype.h>
    4040#include <errno.h>
    41 
    42 /* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
    43 /* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
    44 #if !GLIB_CHECK_VERSION(2,12,5)
    45 #include <stdlib.h>
    46 #include <limits.h>
    47 #define g_ascii_strtoll strtoll
    48 #endif
    4941
    5042#define TXL_STATUS 1
Note: See TracChangeset for help on using the changeset viewer.