Index: protocols/account.c
===================================================================
--- protocols/account.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/account.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -53,5 +53,5 @@
 	
 	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,14 +61,14 @@
 	
 	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 );
 	
Index: protocols/account.h
===================================================================
--- protocols/account.h	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/account.h	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -61,5 +61,4 @@
 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. */
Index: protocols/jabber/jabber.c
===================================================================
--- protocols/jabber/jabber.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/jabber/jabber.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -80,5 +80,5 @@
 	
 	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 );
Index: protocols/msn/msn.c
===================================================================
--- protocols/msn/msn.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/msn/msn.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -39,5 +39,5 @@
 	
 	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 );
Index: protocols/oscar/oscar.c
===================================================================
--- protocols/oscar/oscar.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/oscar/oscar.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -378,5 +378,5 @@
 	            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) {
Index: protocols/skype/skype.c
===================================================================
--- protocols/skype/skype.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/skype/skype.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -1561,5 +1561,5 @@
 	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,8 +1567,8 @@
 
 	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);
Index: protocols/twitter/twitter_lib.c
===================================================================
--- protocols/twitter/twitter_lib.c	(revision 215e17185699655c10a6f7e190c47f3b3f47d9d0)
+++ protocols/twitter/twitter_lib.c	(revision e277e80022e9cad3f7a3dbadbc25a6a2da9bf40d)
@@ -39,12 +39,4 @@
 #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
