Mercurial > pidgin
comparison libpurple/accountopt.c @ 19114:6de2e9ba0930
merge of '2970edca111b3535ae0703e3c866ad1c3b87df94'
and 'a2b508e8680ac3f20965226a5dd83f7e2a3b15bb'
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Sun, 24 Jun 2007 02:56:09 +0000 |
parents | 7df46d8bf114 |
children | 44b4e8bd759b |
comparison
equal
deleted
inserted
replaced
19102:7f26e5b98b15 | 19114:6de2e9ba0930 |
---|---|
20 * | 20 * |
21 * You should have received a copy of the GNU General Public License | 21 * You should have received a copy of the GNU General Public License |
22 * along with this program; if not, write to the Free Software | 22 * along with this program; if not, write to the Free Software |
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 */ | 24 */ |
25 #include "internal.h" | |
26 | |
25 #include "accountopt.h" | 27 #include "accountopt.h" |
26 #include "util.h" | 28 #include "util.h" |
27 | 29 |
28 PurpleAccountOption * | 30 PurpleAccountOption * |
29 purple_account_option_new(PurplePrefType type, const char *text, | 31 purple_account_option_new(PurplePrefType type, const char *text, |
280 g_return_val_if_fail(option->type == PURPLE_PREF_STRING, FALSE); | 282 g_return_val_if_fail(option->type == PURPLE_PREF_STRING, FALSE); |
281 | 283 |
282 return option->masked; | 284 return option->masked; |
283 } | 285 } |
284 | 286 |
285 const GList * | 287 GList * |
286 purple_account_option_get_list(const PurpleAccountOption *option) | 288 purple_account_option_get_list(const PurpleAccountOption *option) |
287 { | 289 { |
288 g_return_val_if_fail(option != NULL, NULL); | 290 g_return_val_if_fail(option != NULL, NULL); |
289 g_return_val_if_fail(option->type == PURPLE_PREF_STRING_LIST, NULL); | 291 g_return_val_if_fail(option->type == PURPLE_PREF_STRING_LIST, NULL); |
290 | 292 |