Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / classes / statusnet.ini

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 3fb8ee208ba17c850abd0df50544028b0e504712..473bd6ff5f7180d81e80b5901b9cf83b111f4544 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -561,11 +561,6 @@ emailmicroid = 17
 language = 2
 timezone = 2
 emailpost = 17
-jabber = 2
-jabbernotify = 17
-jabberreplies = 17
-jabbermicroid = 17
-updatefrompresence = 17
 sms = 2
 carrier = 1
 smsnotify = 17
@@ -585,7 +580,6 @@ id = K
 nickname = U
 email = U
 incomingemail = U
-jabber = U
 sms = U
 uri = U
 
@@ -638,3 +632,20 @@ modified = 384
 
 [user_location_prefs__keys]
 user_id = K
+
+[user_im_prefs]
+user_id = 129
+screenname = 130
+transport = 130
+notify = 17
+replies = 17
+microid = 17
+updatefrompresence = 17
+created = 142
+modified = 384
+
+[user_im_prefs__keys]
+user_id = K
+transport = K
+transport = U
+screenname = U