Mercurial > pidgin
comparison libpurple/protocols/myspace/myspace.c @ 25840:10e1f3c1d0db
explicit merge of '8c6ea3b255d94e0f2867fea830b1380415e6d47a'
and '5459c606fe645dac4dddd188eca62eb52a9f7745'
to branch 'im.pidgin.pidgin.next.minor'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 27 Nov 2008 06:05:42 +0000 |
parents | 94fa7211eb98 3a3d36791a47 |
children | 65cfc59858cf 1260a3fb60f4 |
comparison
equal
deleted
inserted
replaced
25839:54a1c63873b2 | 25840:10e1f3c1d0db |
---|---|
137 #define _MSIM_ADD_NEW_STATUS(prim) status = \ | 137 #define _MSIM_ADD_NEW_STATUS(prim) status = \ |
138 purple_status_type_new_with_attrs( \ | 138 purple_status_type_new_with_attrs( \ |
139 prim, /* PurpleStatusPrimitive */ \ | 139 prim, /* PurpleStatusPrimitive */ \ |
140 NULL, /* id - use default */ \ | 140 NULL, /* id - use default */ \ |
141 NULL, /* name - use default */ \ | 141 NULL, /* name - use default */ \ |
142 TRUE, /* savable */ \ | 142 TRUE, /* saveable */ \ |
143 TRUE, /* user_settable */ \ | 143 TRUE, /* user_settable */ \ |
144 FALSE, /* not independent */ \ | 144 FALSE, /* not independent */ \ |
145 \ | 145 \ |
146 /* Attributes - each status can have a message. */ \ | 146 /* Attributes - each status can have a message. */ \ |
147 "message", \ | 147 "message", \ |
161 /* Except tune status is different... */ | 161 /* Except tune status is different... */ |
162 status = purple_status_type_new_with_attrs( | 162 status = purple_status_type_new_with_attrs( |
163 PURPLE_STATUS_TUNE, /* primitive */ | 163 PURPLE_STATUS_TUNE, /* primitive */ |
164 "tune", /* ID */ | 164 "tune", /* ID */ |
165 NULL, /* name - use default */ | 165 NULL, /* name - use default */ |
166 TRUE, /* savable */ | 166 FALSE, /* saveable */ |
167 TRUE, /* should be user_settable some day */ | 167 TRUE, /* should be user_settable some day */ |
168 TRUE, /* independent */ | 168 TRUE, /* independent */ |
169 | 169 |
170 PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), | 170 PURPLE_TUNE_ARTIST, _("Artist"), purple_value_new(PURPLE_TYPE_STRING), |
171 PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING), | 171 PURPLE_TUNE_TITLE, _("Title"), purple_value_new(PURPLE_TYPE_STRING), |