comparison: libpurple/account.c
libpurple/account.c
- changeset 41181
- e859c41d8996
- parent 41137
- 3c1574216aed
- child 41204
- c38a5a2a8d43
equal
deleted
inserted
replaced
| 41180:fb686c1483bf | 41181:e859c41d8996 |
|---|---|
| 27 #include "core.h" | 27 #include "core.h" |
| 28 #include "debug.h" | 28 #include "debug.h" |
| 29 #include "network.h" | 29 #include "network.h" |
| 30 #include "notify.h" | 30 #include "notify.h" |
| 31 #include "prefs.h" | 31 #include "prefs.h" |
| 32 #include "purpleaccountmanager.h" | |
| 32 #include "purpleaccountpresence.h" | 33 #include "purpleaccountpresence.h" |
| 33 #include "purpleconversationmanager.h" | 34 #include "purpleconversationmanager.h" |
| 34 #include "purplecredentialmanager.h" | 35 #include "purplecredentialmanager.h" |
| 35 #include "purpleprivate.h" | 36 #include "purpleprivate.h" |
| 36 #include "purpleprotocolclient.h" | 37 #include "purpleprotocolclient.h" |
| 1150 | 1151 |
| 1151 /****************************************************************************** | 1152 /****************************************************************************** |
| 1152 * Public API | 1153 * Public API |
| 1153 *****************************************************************************/ | 1154 *****************************************************************************/ |
| 1154 PurpleAccount * | 1155 PurpleAccount * |
| 1155 purple_account_new(const char *username, const char *protocol_id) | 1156 purple_account_new(const gchar *username, const gchar *protocol_id) { |
| 1156 { | |
| 1157 PurpleAccount *account; | 1157 PurpleAccount *account; |
| 1158 PurpleAccountManager *manager = NULL; | |
| 1158 | 1159 |
| 1159 g_return_val_if_fail(username != NULL, NULL); | 1160 g_return_val_if_fail(username != NULL, NULL); |
| 1160 g_return_val_if_fail(protocol_id != NULL, NULL); | 1161 g_return_val_if_fail(protocol_id != NULL, NULL); |
| 1161 | 1162 |
| 1162 account = purple_accounts_find(username, protocol_id); | 1163 manager = purple_account_manager_get_default(); |
| 1163 | 1164 account = purple_account_manager_find(manager, username, protocol_id); |
| 1164 if (account != NULL) | 1165 if(account != NULL) { |
| 1165 return account; | 1166 return account; |
| 1166 | 1167 } |
| 1167 account = g_object_new(PURPLE_TYPE_ACCOUNT, | 1168 |
| 1168 "username", username, | 1169 account = g_object_new( |
| 1169 "protocol-id", protocol_id, | 1170 PURPLE_TYPE_ACCOUNT, |
| 1170 NULL); | 1171 "username", username, |
| 1172 "protocol-id", protocol_id, | |
| 1173 NULL); | |
| 1171 | 1174 |
| 1172 return account; | 1175 return account; |
| 1173 } | 1176 } |
| 1174 | 1177 |
| 1175 void | 1178 void |
