Thu, 15 Jun 2017 13:33:02 -0500
Remove purple_timeout_* function usage
Now that the purple_timeout_* functions internally just use their
GLib equivalents, we can just replace them with the GLib equivalents.
This patch replaces purple_timeout_* functions with
g_timeout_add{_seconds}() and g_source_remove() functions.
There are probably places in this which could use g_timeout_add_full()
or g_idle_add{_full}(), but this was a straight replacement to keep
the functionality identical for now. Further patches can update to use
these instead if desired.
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1 | /* purple |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
2 | * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
3 | * Purple is the legal property of its developers, whose names are too numerous |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
5 | * source distribution. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
6 | * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
7 | * This program is free software; you can redistribute it and/or modify |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
8 | * it under the terms of the GNU General Public License as published by |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
9 | * the Free Software Foundation; either version 2 of the License, or |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
10 | * (at your option) any later version. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
11 | * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
12 | * This program is distributed in the hope that it will be useful, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
15 | * GNU General Public License for more details. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
16 | * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
17 | * You should have received a copy of the GNU General Public License |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
18 | * along with this program; if not, write to the Free Software |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
20 | */ |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
21 | #include "internal.h" |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
22 | #include "accounts.h" |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
23 | #include "core.h" |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
24 | #include "dbus-maybe.h" |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
25 | #include "debug.h" |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
26 | #include "enums.h" |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
27 | #include "network.h" |
|
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
28 | #include "pounce.h" |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
29 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
30 | static PurpleAccountUiOps *account_ui_ops = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
31 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
32 | static GList *accounts = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
33 | static guint save_timer = 0; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
34 | static gboolean accounts_loaded = FALSE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
35 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
36 | /********************************************************************* |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
37 | * Writing to disk * |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
38 | *********************************************************************/ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
39 | static PurpleXmlNode * |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
40 | accounts_to_xmlnode(void) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
41 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
42 | PurpleXmlNode *node, *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
43 | GList *cur; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
44 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
45 | node = purple_xmlnode_new("account"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
46 | purple_xmlnode_set_attrib(node, "version", "1.0"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
47 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
48 | for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
49 | { |
|
35178
7c775624f964
Move (_)purple_account_to_xmlnode to internal.h
Ankit Vani <a@nevitus.org>
parents:
35176
diff
changeset
|
50 | child = _purple_account_to_xmlnode(cur->data); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
51 | purple_xmlnode_insert_child(node, child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
52 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
53 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
54 | return node; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
55 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
56 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
57 | static void |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
58 | sync_accounts(void) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
59 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
60 | PurpleXmlNode *node; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
61 | char *data; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
62 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
63 | if (!accounts_loaded) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
64 | { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
65 | purple_debug_error("accounts", "Attempted to save accounts before " |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
66 | "they were read!\n"); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
67 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
68 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
69 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
70 | node = accounts_to_xmlnode(); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
71 | data = purple_xmlnode_to_formatted_str(node, NULL); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
72 | purple_util_write_data_to_file("accounts.xml", data, -1); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
73 | g_free(data); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
74 | purple_xmlnode_free(node); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
75 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
76 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
77 | static gboolean |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
78 | save_cb(gpointer data) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
79 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
80 | sync_accounts(); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
81 | save_timer = 0; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
82 | return FALSE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
83 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
84 | |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
85 | void |
|
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
86 | purple_accounts_schedule_save(void) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
87 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
88 | if (save_timer == 0) |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37679
diff
changeset
|
89 | save_timer = g_timeout_add_seconds(5, save_cb, NULL); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
90 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
91 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
92 | static void |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
93 | migrate_icq_server(PurpleAccount *account) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
94 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
95 | /* Migrate the login server setting for ICQ accounts. See |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
96 | * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794' |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
97 | * for details on the change. */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
98 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
99 | if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
100 | const char *tmp = purple_account_get_string(account, "server", NULL); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
101 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
102 | /* Non-secure server */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
103 | if(purple_strequal(tmp, "login.messaging.aol.com") || |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
104 | purple_strequal(tmp, "login.oscar.aol.com")) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
105 | purple_account_set_string(account, "server", "login.icq.com"); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
106 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
107 | /* Secure server */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
108 | if(purple_strequal(tmp, "slogin.oscar.aol.com")) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
109 | purple_account_set_string(account, "server", "slogin.icq.com"); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
110 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
111 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
112 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
113 | static void |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
114 | migrate_xmpp_encryption(PurpleAccount *account) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
115 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
116 | /* When this is removed, nuke the "old_ssl" and "require_tls" settings */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
117 | if (g_str_equal(purple_account_get_protocol_id(account), "prpl-jabber")) { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
118 | const char *sec = purple_account_get_string(account, "connection_security", ""); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
119 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
120 | if (g_str_equal("", sec)) { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
121 | const char *val = "require_tls"; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
122 | if (purple_account_get_bool(account, "old_ssl", FALSE)) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
123 | val = "old_ssl"; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
124 | else if (!purple_account_get_bool(account, "require_tls", TRUE)) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
125 | val = "opportunistic_tls"; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
126 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
127 | purple_account_set_string(account, "connection_security", val); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
128 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
129 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
130 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
131 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
132 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
133 | parse_settings(PurpleXmlNode *node, PurpleAccount *account) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
134 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
135 | const char *ui; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
136 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
137 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
138 | /* Get the UI string, if these are UI settings */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
139 | ui = purple_xmlnode_get_attrib(node, "ui"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
140 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
141 | /* Read settings, one by one */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
142 | for (child = purple_xmlnode_get_child(node, "setting"); child != NULL; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
143 | child = purple_xmlnode_get_next_twin(child)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
144 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
145 | const char *name, *str_type; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
146 | PurplePrefType type; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
147 | char *data; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
148 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
149 | name = purple_xmlnode_get_attrib(child, "name"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
150 | if (name == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
151 | /* Ignore this setting */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
152 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
153 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
154 | str_type = purple_xmlnode_get_attrib(child, "type"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
155 | if (str_type == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
156 | /* Ignore this setting */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
157 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
158 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
159 | if (purple_strequal(str_type, "string")) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
160 | type = PURPLE_PREF_STRING; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
161 | else if (purple_strequal(str_type, "int")) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
162 | type = PURPLE_PREF_INT; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
163 | else if (purple_strequal(str_type, "bool")) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
164 | type = PURPLE_PREF_BOOLEAN; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
165 | else |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
166 | /* Ignore this setting */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
167 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
168 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
169 | data = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
170 | if (data == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
171 | /* Ignore this setting */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
172 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
173 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
174 | if (ui == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
175 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
176 | if (type == PURPLE_PREF_STRING) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
177 | purple_account_set_string(account, name, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
178 | else if (type == PURPLE_PREF_INT) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
179 | purple_account_set_int(account, name, atoi(data)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
180 | else if (type == PURPLE_PREF_BOOLEAN) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
181 | purple_account_set_bool(account, name, |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
182 | (*data == '0' ? FALSE : TRUE)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
183 | } else { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
184 | if (type == PURPLE_PREF_STRING) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
185 | purple_account_set_ui_string(account, ui, name, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
186 | else if (type == PURPLE_PREF_INT) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
187 | purple_account_set_ui_int(account, ui, name, atoi(data)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
188 | else if (type == PURPLE_PREF_BOOLEAN) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
189 | purple_account_set_ui_bool(account, ui, name, |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
190 | (*data == '0' ? FALSE : TRUE)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
191 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
192 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
193 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
194 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
195 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
196 | /* we do this here because we need access to account settings to determine |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
197 | * if we can/should migrate an ICQ account's server setting */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
198 | migrate_icq_server(account); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
199 | /* we do this here because we need to do it before the user views the |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
200 | * Edit Account dialog. */ |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
201 | migrate_xmpp_encryption(account); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
202 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
203 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
204 | static GList * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
205 | parse_status_attrs(PurpleXmlNode *node, PurpleStatus *status) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
206 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
207 | GList *list = NULL; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
208 | PurpleXmlNode *child; |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
209 | GValue *attr_value; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
210 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
211 | for (child = purple_xmlnode_get_child(node, "attribute"); child != NULL; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
212 | child = purple_xmlnode_get_next_twin(child)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
213 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
214 | const char *id = purple_xmlnode_get_attrib(child, "id"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
215 | const char *value = purple_xmlnode_get_attrib(child, "value"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
216 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
217 | if (!id || !*id || !value || !*value) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
218 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
219 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
220 | attr_value = purple_status_get_attr_value(status, id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
221 | if (!attr_value) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
222 | continue; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
223 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
224 | list = g_list_append(list, (char *)id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
225 | |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
226 | switch (G_VALUE_TYPE(attr_value)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
227 | { |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
228 | case G_TYPE_STRING: |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
229 | list = g_list_append(list, (char *)value); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
230 | break; |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
231 | case G_TYPE_INT: |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
232 | case G_TYPE_BOOLEAN: |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
233 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
234 | int v; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
235 | if (sscanf(value, "%d", &v) == 1) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
236 | list = g_list_append(list, GINT_TO_POINTER(v)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
237 | else |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
238 | list = g_list_remove(list, id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
239 | break; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
240 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
241 | default: |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
242 | break; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
243 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
244 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
245 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
246 | return list; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
247 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
248 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
249 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
250 | parse_status(PurpleXmlNode *node, PurpleAccount *account) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
251 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
252 | gboolean active = FALSE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
253 | const char *data; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
254 | const char *type; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
255 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
256 | GList *attrs = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
257 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
258 | /* Get the active/inactive state */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
259 | data = purple_xmlnode_get_attrib(node, "active"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
260 | if (data == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
261 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
262 | if (g_ascii_strcasecmp(data, "true") == 0) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
263 | active = TRUE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
264 | else if (g_ascii_strcasecmp(data, "false") == 0) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
265 | active = FALSE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
266 | else |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
267 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
268 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
269 | /* Get the type of the status */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
270 | type = purple_xmlnode_get_attrib(node, "type"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
271 | if (type == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
272 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
273 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
274 | /* Read attributes into a GList */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
275 | child = purple_xmlnode_get_child(node, "attributes"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
276 | if (child != NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
277 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
278 | attrs = parse_status_attrs(child, |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
279 | purple_account_get_status(account, type)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
280 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
281 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
282 | purple_account_set_status_list(account, type, active, attrs); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
283 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
284 | g_list_free(attrs); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
285 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
286 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
287 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
288 | parse_statuses(PurpleXmlNode *node, PurpleAccount *account) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
289 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
290 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
291 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
292 | for (child = purple_xmlnode_get_child(node, "status"); child != NULL; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
293 | child = purple_xmlnode_get_next_twin(child)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
294 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
295 | parse_status(child, account); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
296 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
297 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
298 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
299 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
300 | parse_proxy_info(PurpleXmlNode *node, PurpleAccount *account) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
301 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
302 | PurpleProxyInfo *proxy_info; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
303 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
304 | char *data; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
305 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
306 | proxy_info = purple_proxy_info_new(); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
307 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
308 | /* Use the global proxy settings, by default */ |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
309 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
310 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
311 | /* Read proxy type */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
312 | child = purple_xmlnode_get_child(node, "type"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
313 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
314 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
315 | if (purple_strequal(data, "global")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
316 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
317 | else if (purple_strequal(data, "none")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
318 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_NONE); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
319 | else if (purple_strequal(data, "http")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
320 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_HTTP); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
321 | else if (purple_strequal(data, "socks4")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
322 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_SOCKS4); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
323 | else if (purple_strequal(data, "socks5")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
324 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_SOCKS5); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
325 | else if (purple_strequal(data, "tor")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
326 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_TOR); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
327 | else if (purple_strequal(data, "envvar")) |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
328 | purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_ENVVAR); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
329 | else |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
330 | { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
331 | purple_debug_error("accounts", "Invalid proxy type found when " |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
332 | "loading account information for %s\n", |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
333 | purple_account_get_username(account)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
334 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
335 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
336 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
337 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
338 | /* Read proxy host */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
339 | child = purple_xmlnode_get_child(node, "host"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
340 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
341 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
342 | purple_proxy_info_set_host(proxy_info, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
343 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
344 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
345 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
346 | /* Read proxy port */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
347 | child = purple_xmlnode_get_child(node, "port"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
348 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
349 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
350 | purple_proxy_info_set_port(proxy_info, atoi(data)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
351 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
352 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
353 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
354 | /* Read proxy username */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
355 | child = purple_xmlnode_get_child(node, "username"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
356 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
357 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
358 | purple_proxy_info_set_username(proxy_info, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
359 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
360 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
361 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
362 | /* Read proxy password */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
363 | child = purple_xmlnode_get_child(node, "password"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
364 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
365 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
366 | purple_proxy_info_set_password(proxy_info, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
367 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
368 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
369 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
370 | /* If there are no values set then proxy_info NULL */ |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35178
diff
changeset
|
371 | if ((purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
372 | (purple_proxy_info_get_host(proxy_info) == NULL) && |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
373 | (purple_proxy_info_get_port(proxy_info) == 0) && |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
374 | (purple_proxy_info_get_username(proxy_info) == NULL) && |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
375 | (purple_proxy_info_get_password(proxy_info) == NULL)) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
376 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
377 | purple_proxy_info_destroy(proxy_info); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
378 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
379 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
380 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
381 | purple_account_set_proxy_info(account, proxy_info); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
382 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
383 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
384 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
385 | parse_current_error(PurpleXmlNode *node, PurpleAccount *account) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
386 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
387 | guint type; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
388 | char *type_str = NULL, *description = NULL; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
389 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
390 | PurpleConnectionErrorInfo *current_error = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
391 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
392 | child = purple_xmlnode_get_child(node, "type"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
393 | if (child == NULL || (type_str = purple_xmlnode_get_data(child)) == NULL) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
394 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
395 | type = atoi(type_str); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
396 | g_free(type_str); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
397 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
398 | if (type > PURPLE_CONNECTION_ERROR_OTHER_ERROR) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
399 | { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
400 | purple_debug_error("accounts", |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
401 | "Invalid PurpleConnectionError value %d found when " |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
402 | "loading account information for %s\n", |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
403 | type, purple_account_get_username(account)); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
404 | type = PURPLE_CONNECTION_ERROR_OTHER_ERROR; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
405 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
406 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
407 | child = purple_xmlnode_get_child(node, "description"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
408 | if (child) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
409 | description = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
410 | if (description == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
411 | description = g_strdup(""); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
412 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
413 | current_error = g_new0(PurpleConnectionErrorInfo, 1); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
414 | PURPLE_DBUS_REGISTER_POINTER(current_error, PurpleConnectionErrorInfo); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
415 | current_error->type = type; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
416 | current_error->description = description; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
417 | |
|
34767
38a5613c3e26
Prepended functions private to a subsystem but used over multiple files by underscore
Ankit Vani <a@nevitus.org>
parents:
34765
diff
changeset
|
418 | _purple_account_set_current_error(account, current_error); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
419 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
420 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
421 | static PurpleAccount * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
422 | parse_account(PurpleXmlNode *node) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
423 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
424 | PurpleAccount *ret; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
425 | PurpleXmlNode *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
426 | char *protocol_id = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
427 | char *name = NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
428 | char *data; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
429 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
430 | child = purple_xmlnode_get_child(node, "protocol"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
431 | if (child != NULL) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
432 | protocol_id = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
433 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
434 | child = purple_xmlnode_get_child(node, "name"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
435 | if (child != NULL) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
436 | name = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
437 | if (name == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
438 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
439 | /* Do we really need to do this? */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
440 | child = purple_xmlnode_get_child(node, "username"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
441 | if (child != NULL) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
442 | name = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
443 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
444 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
445 | if ((protocol_id == NULL) || (name == NULL)) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
446 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
447 | g_free(protocol_id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
448 | g_free(name); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
449 | return NULL; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
450 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
451 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
452 | ret = purple_account_new(name, protocol_id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
453 | g_free(name); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
454 | g_free(protocol_id); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
455 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
456 | /* Read the alias */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
457 | child = purple_xmlnode_get_child(node, "alias"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
458 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
459 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
460 | if (*data != '\0') |
|
34589
428e92c79631
Renamed purple_account_[get,set]_alias to purple_account[get,set]_private_alias.
Ankit Vani <a@nevitus.org>
parents:
34588
diff
changeset
|
461 | purple_account_set_private_alias(ret, data); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
462 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
463 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
464 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
465 | /* Read the statuses */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
466 | child = purple_xmlnode_get_child(node, "statuses"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
467 | if (child != NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
468 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
469 | parse_statuses(child, ret); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
470 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
471 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
472 | /* Read the userinfo */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
473 | child = purple_xmlnode_get_child(node, "userinfo"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
474 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
475 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
476 | purple_account_set_user_info(ret, data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
477 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
478 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
479 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
480 | /* Read an old buddyicon */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
481 | child = purple_xmlnode_get_child(node, "buddyicon"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
482 | if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
483 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
484 | const char *dirname = purple_buddy_icons_get_cache_dir(); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
485 | char *filename = g_build_filename(dirname, data, NULL); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
486 | gchar *contents; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
487 | gsize len; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
488 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
489 | if (g_file_get_contents(filename, &contents, &len, NULL)) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
490 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
491 | purple_buddy_icons_set_account_icon(ret, (guchar *)contents, len); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
492 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
493 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
494 | g_free(filename); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
495 | g_free(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
496 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
497 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
498 | /* Read settings (both core and UI) */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
499 | for (child = purple_xmlnode_get_child(node, "settings"); child != NULL; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
500 | child = purple_xmlnode_get_next_twin(child)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
501 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
502 | parse_settings(child, ret); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
503 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
504 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
505 | /* Read proxy */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
506 | child = purple_xmlnode_get_child(node, "proxy"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
507 | if (child != NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
508 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
509 | parse_proxy_info(child, ret); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
510 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
511 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
512 | /* Read current error */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
513 | child = purple_xmlnode_get_child(node, "current_error"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
514 | if (child != NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
515 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
516 | parse_current_error(child, ret); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
517 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
518 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
519 | /* Read the password */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
520 | child = purple_xmlnode_get_child(node, "password"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
521 | if (child != NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
522 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
523 | const char *keyring_id = purple_xmlnode_get_attrib(child, "keyring_id"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
524 | const char *mode = purple_xmlnode_get_attrib(child, "mode"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
525 | gboolean result; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
526 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
527 | data = purple_xmlnode_get_data(child); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
528 | result = purple_keyring_import_password(ret, keyring_id, mode, data, NULL); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
529 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
530 | if (result == TRUE || purple_keyring_get_inuse() == NULL) { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
531 | purple_account_set_remember_password(ret, TRUE); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
532 | } else { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
533 | purple_debug_error("accounts", "Failed to import password.\n"); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
534 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
535 | purple_str_wipe(data); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
536 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
537 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
538 | return ret; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
539 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
540 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
541 | static void |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
542 | load_accounts(void) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
543 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
544 | PurpleXmlNode *node, *child; |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
545 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
546 | accounts_loaded = TRUE; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
547 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
548 | node = purple_util_read_xml_from_file("accounts.xml", _("accounts")); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
549 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
550 | if (node == NULL) |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
551 | return; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
552 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
553 | for (child = purple_xmlnode_get_child(node, "account"); child != NULL; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
554 | child = purple_xmlnode_get_next_twin(child)) |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
555 | { |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
556 | PurpleAccount *new_acct; |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
557 | new_acct = parse_account(child); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
558 | purple_accounts_add(new_acct); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
559 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
560 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
561 | purple_xmlnode_free(node); |
|
34579
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
562 | |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
563 | _purple_buddy_icons_account_loaded_cb(); |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
564 | } |
|
e718d0eea155
Moved some local functions from account.c to accounts.c
Ankit Vani <a@nevitus.org>
parents:
34574
diff
changeset
|
565 | |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
566 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
567 | purple_accounts_add(PurpleAccount *account) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
568 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
569 | g_return_if_fail(account != NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
570 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
571 | if (g_list_find(accounts, account) != NULL) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
572 | return; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
573 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
574 | accounts = g_list_append(accounts, account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
575 | |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
576 | purple_accounts_schedule_save(); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
577 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
578 | purple_signal_emit(purple_accounts_get_handle(), "account-added", account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
579 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
580 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
581 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
582 | purple_accounts_remove(PurpleAccount *account) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
583 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
584 | g_return_if_fail(account != NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
585 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
586 | accounts = g_list_remove(accounts, account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
587 | |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
588 | purple_accounts_schedule_save(); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
589 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
590 | /* Clearing the error ensures that account-error-changed is emitted, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
591 | * which is the end of the guarantee that the the error's pointer is |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
592 | * valid. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
593 | */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
594 | purple_account_clear_current_error(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
595 | purple_signal_emit(purple_accounts_get_handle(), "account-removed", account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
596 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
597 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
598 | static void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
599 | purple_accounts_delete_set(PurpleAccount *account, GError *error, gpointer data) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
600 | { |
|
34588
1379416703af
Removed purple_account_destroy function declaration, use g_object_unref() instead.
Ankit Vani <a@nevitus.org>
parents:
34582
diff
changeset
|
601 | g_object_unref(G_OBJECT(account)); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
602 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
603 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
604 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
605 | purple_accounts_delete(PurpleAccount *account) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
606 | { |
|
34864
0e292d8887de
Renamed PurpleBListNode back to PurpleBlistNode
Ankit Vani <a@nevitus.org>
parents:
34812
diff
changeset
|
607 | PurpleBlistNode *gnode, *cnode, *bnode; |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
608 | GList *iter; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
609 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
610 | g_return_if_fail(account != NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
611 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
612 | /* |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
613 | * Disable the account before blowing it out of the water. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
614 | * Conceptually it probably makes more sense to disable the |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
615 | * account for all UIs rather than the just the current UI, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
616 | * but it doesn't really matter. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
617 | */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
618 | purple_account_set_enabled(account, purple_core_get_ui(), FALSE); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
619 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
620 | purple_notify_close_with_handle(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
621 | purple_request_close_with_handle(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
622 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
623 | purple_accounts_remove(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
624 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
625 | /* Remove this account's buddies */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
626 | for (gnode = purple_blist_get_root(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
627 | gnode != NULL; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
628 | gnode = purple_blist_node_get_sibling_next(gnode)) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
629 | { |
|
34696
6e0d13978666
Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents:
34656
diff
changeset
|
630 | if (!PURPLE_IS_GROUP(gnode)) |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
631 | continue; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
632 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
633 | cnode = purple_blist_node_get_first_child(gnode); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
634 | while (cnode) { |
|
34864
0e292d8887de
Renamed PurpleBListNode back to PurpleBlistNode
Ankit Vani <a@nevitus.org>
parents:
34812
diff
changeset
|
635 | PurpleBlistNode *cnode_next = purple_blist_node_get_sibling_next(cnode); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
636 | |
|
34696
6e0d13978666
Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents:
34656
diff
changeset
|
637 | if(PURPLE_IS_CONTACT(cnode)) { |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
638 | bnode = purple_blist_node_get_first_child(cnode); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
639 | while (bnode) { |
|
34864
0e292d8887de
Renamed PurpleBListNode back to PurpleBlistNode
Ankit Vani <a@nevitus.org>
parents:
34812
diff
changeset
|
640 | PurpleBlistNode *bnode_next = purple_blist_node_get_sibling_next(bnode); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
641 | |
|
34696
6e0d13978666
Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents:
34656
diff
changeset
|
642 | if (PURPLE_IS_BUDDY(bnode)) { |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
643 | PurpleBuddy *b = (PurpleBuddy *)bnode; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
644 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
645 | if (purple_buddy_get_account(b) == account) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
646 | purple_blist_remove_buddy(b); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
647 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
648 | bnode = bnode_next; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
649 | } |
|
34696
6e0d13978666
Global replace to use GObject-style macros. See details.
Ankit Vani <a@nevitus.org>
parents:
34656
diff
changeset
|
650 | } else if (PURPLE_IS_CHAT(cnode)) { |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
651 | PurpleChat *c = (PurpleChat *)cnode; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
652 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
653 | if (purple_chat_get_account(c) == account) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
654 | purple_blist_remove_chat(c); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
655 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
656 | cnode = cnode_next; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
657 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
658 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
659 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
660 | /* Remove any open conversation for this account */ |
|
34656
adbcbe04077c
Refactored remaining libpurple to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34645
diff
changeset
|
661 | for (iter = purple_conversations_get_all(); iter; ) { |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
662 | PurpleConversation *conv = iter->data; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
663 | iter = iter->next; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
664 | if (purple_conversation_get_account(conv) == account) |
|
34645
a04c721bebf1
Refactored accounts, blist, cmds and connection to use the GObject conversation API
Ankit Vani <a@nevitus.org>
parents:
34622
diff
changeset
|
665 | g_object_unref(conv); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
666 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
667 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
668 | /* Remove this account's pounces */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
669 | purple_pounce_destroy_all_by_account(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
670 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
671 | /* This will cause the deletion of an old buddy icon. */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
672 | purple_buddy_icons_set_account_icon(account, NULL, 0); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
673 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
674 | /* This is async because we do not want the |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
675 | * account being overwritten before we are done. |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
676 | */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
677 | purple_keyring_set_password(account, NULL, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
678 | purple_accounts_delete_set, NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
679 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
680 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
681 | void |
| 34889 | 682 | purple_accounts_reorder(PurpleAccount *account, guint new_index) |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
683 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
684 | gint index; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
685 | GList *l; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
686 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
687 | g_return_if_fail(account != NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
688 | g_return_if_fail(new_index <= g_list_length(accounts)); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
689 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
690 | index = g_list_index(accounts, account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
691 | |
| 34889 | 692 | if (index < 0) { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
693 | purple_debug_error("accounts", |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
694 | "Unregistered account (%s) discovered during reorder!\n", |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
695 | purple_account_get_username(account)); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
696 | return; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
697 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
698 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
699 | l = g_list_nth(accounts, index); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
700 | |
| 34889 | 701 | if (new_index > (guint)index) |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
702 | new_index--; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
703 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
704 | /* Remove the old one. */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
705 | accounts = g_list_delete_link(accounts, l); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
706 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
707 | /* Insert it where it should go. */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
708 | accounts = g_list_insert(accounts, account, new_index); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
709 | |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
710 | purple_accounts_schedule_save(); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
711 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
712 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
713 | GList * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
714 | purple_accounts_get_all(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
715 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
716 | return accounts; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
717 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
718 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
719 | GList * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
720 | purple_accounts_get_all_active(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
721 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
722 | GList *list = NULL; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
723 | GList *all = purple_accounts_get_all(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
724 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
725 | while (all != NULL) { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
726 | PurpleAccount *account = all->data; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
727 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
728 | if (purple_account_get_enabled(account, purple_core_get_ui())) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
729 | list = g_list_append(list, account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
730 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
731 | all = all->next; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
732 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
733 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
734 | return list; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
735 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
736 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
737 | PurpleAccount * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
738 | purple_accounts_find(const char *name, const char *protocol_id) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
739 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
740 | PurpleAccount *account = NULL; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
741 | GList *l; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
742 | char *who; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
743 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
744 | g_return_val_if_fail(name != NULL, NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
745 | g_return_val_if_fail(protocol_id != NULL, NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
746 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
747 | for (l = purple_accounts_get_all(); l != NULL; l = l->next) { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
748 | account = (PurpleAccount *)l->data; |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
749 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
750 | if (!purple_strequal(purple_account_get_protocol_id(account), protocol_id)) |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
751 | continue; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
752 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
753 | who = g_strdup(purple_normalize(account, name)); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
754 | if (purple_strequal(purple_normalize(account, purple_account_get_username(account)), who)) { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
755 | g_free(who); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
756 | return account; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
757 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
758 | g_free(who); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
759 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
760 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
761 | return NULL; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
762 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
763 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
764 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
765 | purple_accounts_restore_current_statuses() |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
766 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
767 | GList *l; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
768 | PurpleAccount *account; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
769 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
770 | /* If we're not connected to the Internet right now, we bail on this */ |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
771 | if (!purple_network_is_available()) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
772 | { |
|
35176
b0659f31989d
Update debug categories for new filenames
Ankit Vani <a@nevitus.org>
parents:
35091
diff
changeset
|
773 | purple_debug_warning("accounts", "Network not connected; skipping reconnect\n"); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
774 | return; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
775 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
776 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
777 | for (l = purple_accounts_get_all(); l != NULL; l = l->next) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
778 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
779 | account = (PurpleAccount *)l->data; |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
780 | |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
781 | if (purple_account_get_enabled(account, purple_core_get_ui()) && |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
782 | (purple_presence_is_online(purple_account_get_presence(account)))) |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
783 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
784 | purple_account_connect(account); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
785 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
786 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
787 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
788 | |
| 35572 | 789 | static PurpleAccountUiOps * |
| 790 | purple_account_ui_ops_copy(PurpleAccountUiOps *ops) | |
| 791 | { | |
| 792 | PurpleAccountUiOps *ops_new; | |
| 793 | ||
| 794 | g_return_val_if_fail(ops != NULL, NULL); | |
| 795 | ||
| 796 | ops_new = g_new(PurpleAccountUiOps, 1); | |
| 797 | *ops_new = *ops; | |
| 798 | ||
| 799 | return ops_new; | |
| 800 | } | |
| 801 | ||
| 802 | GType | |
| 803 | purple_account_ui_ops_get_type(void) | |
| 804 | { | |
| 805 | static GType type = 0; | |
| 806 | ||
| 807 | if (type == 0) { | |
| 808 | type = g_boxed_type_register_static("PurpleAccountUiOps", | |
| 809 | (GBoxedCopyFunc)purple_account_ui_ops_copy, | |
|
35597
7fcfcf147b99
Use g_free as UiOps structures GBoxed free function
Ankit Vani <a@nevitus.org>
parents:
35572
diff
changeset
|
810 | (GBoxedFreeFunc)g_free); |
| 35572 | 811 | } |
| 812 | ||
| 813 | return type; | |
| 814 | } | |
| 815 | ||
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
816 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
817 | purple_accounts_set_ui_ops(PurpleAccountUiOps *ops) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
818 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
819 | account_ui_ops = ops; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
820 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
821 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
822 | PurpleAccountUiOps * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
823 | purple_accounts_get_ui_ops(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
824 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
825 | return account_ui_ops; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
826 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
827 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
828 | void * |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
829 | purple_accounts_get_handle(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
830 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
831 | static int handle; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
832 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
833 | return &handle; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
834 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
835 | |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
836 | static void |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
837 | signed_on_cb(PurpleConnection *gc, |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
838 | gpointer unused) |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
839 | { |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
840 | PurpleAccount *account = purple_connection_get_account(gc); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
841 | purple_account_clear_current_error(account); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
842 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
843 | purple_signal_emit(purple_accounts_get_handle(), "account-signed-on", |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
844 | account); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
845 | } |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
846 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
847 | static void |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
848 | signed_off_cb(PurpleConnection *gc, |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
849 | gpointer unused) |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
850 | { |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
851 | PurpleAccount *account = purple_connection_get_account(gc); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
852 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
853 | purple_signal_emit(purple_accounts_get_handle(), "account-signed-off", |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
854 | account); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
855 | } |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
856 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
857 | static void |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
858 | connection_error_cb(PurpleConnection *gc, |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
859 | PurpleConnectionError type, |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
860 | const gchar *description, |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
861 | gpointer unused) |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
862 | { |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
863 | PurpleAccount *account; |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
864 | PurpleConnectionErrorInfo *err; |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
865 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
866 | account = purple_connection_get_account(gc); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
867 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
868 | g_return_if_fail(account != NULL); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
869 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
870 | err = g_new0(PurpleConnectionErrorInfo, 1); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
871 | PURPLE_DBUS_REGISTER_POINTER(err, PurpleConnectionErrorInfo); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
872 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
873 | err->type = type; |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
874 | err->description = g_strdup(description); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
875 | |
|
34767
38a5613c3e26
Prepended functions private to a subsystem but used over multiple files by underscore
Ankit Vani <a@nevitus.org>
parents:
34765
diff
changeset
|
876 | _purple_account_set_current_error(account, err); |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
877 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
878 | purple_signal_emit(purple_accounts_get_handle(), "account-connection-error", |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
879 | account, type, description); |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
880 | } |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
881 | |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
882 | static void |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
883 | password_migration_cb(PurpleAccount *account) |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
884 | { |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
885 | /* account may be NULL (means: all) */ |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
886 | |
|
34582
67a520874aa9
Exposed some functions to the header files to resolve dependencies.
Ankit Vani <a@nevitus.org>
parents:
34581
diff
changeset
|
887 | purple_accounts_schedule_save(); |
|
34581
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
888 | } |
|
b4e0236019e6
Fixed more PurpleAccount stuff.
Ankit Vani <a@nevitus.org>
parents:
34580
diff
changeset
|
889 | |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
890 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
891 | purple_accounts_init(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
892 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
893 | void *handle = purple_accounts_get_handle(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
894 | void *conn_handle = purple_connections_get_handle(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
895 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
896 | purple_signal_register(handle, "account-connecting", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
897 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
898 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
899 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
900 | purple_signal_register(handle, "account-disabled", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
901 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
902 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
903 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
904 | purple_signal_register(handle, "account-enabled", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
905 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
906 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
907 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
908 | purple_signal_register(handle, "account-setting-info", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
909 | purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
910 | PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
911 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
912 | purple_signal_register(handle, "account-set-info", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
913 | purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
914 | PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
915 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
916 | purple_signal_register(handle, "account-created", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
917 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
918 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
919 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
920 | purple_signal_register(handle, "account-destroying", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
921 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
922 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
923 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
924 | purple_signal_register(handle, "account-added", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
925 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
926 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
927 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
928 | purple_signal_register(handle, "account-removed", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
929 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
930 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
931 | |
|
37679
6ff708c38c04
Add "account-status-changing" signal from instantbird
Florian Quèze <florian@instantbird.org>
parents:
37195
diff
changeset
|
932 | purple_signal_register(handle, "account-status-changing", |
|
6ff708c38c04
Add "account-status-changing" signal from instantbird
Florian Quèze <florian@instantbird.org>
parents:
37195
diff
changeset
|
933 | purple_marshal_VOID__POINTER_POINTER_POINTER, |
|
6ff708c38c04
Add "account-status-changing" signal from instantbird
Florian Quèze <florian@instantbird.org>
parents:
37195
diff
changeset
|
934 | G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, |
|
6ff708c38c04
Add "account-status-changing" signal from instantbird
Florian Quèze <florian@instantbird.org>
parents:
37195
diff
changeset
|
935 | PURPLE_TYPE_STATUS, PURPLE_TYPE_STATUS); |
|
6ff708c38c04
Add "account-status-changing" signal from instantbird
Florian Quèze <florian@instantbird.org>
parents:
37195
diff
changeset
|
936 | |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
937 | purple_signal_register(handle, "account-status-changed", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
938 | purple_marshal_VOID__POINTER_POINTER_POINTER, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
939 | G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
940 | PURPLE_TYPE_STATUS, PURPLE_TYPE_STATUS); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
941 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
942 | purple_signal_register(handle, "account-actions-changed", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
943 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
944 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
945 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
946 | purple_signal_register(handle, "account-alias-changed", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
947 | purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
948 | PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
949 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
950 | purple_signal_register(handle, "account-authorization-requested", |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
951 | purple_marshal_INT__POINTER_POINTER_POINTER, |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
952 | G_TYPE_INT, 4, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
953 | G_TYPE_STRING, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
954 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
955 | purple_signal_register(handle, "account-authorization-denied", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
956 | purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 3, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
957 | PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
958 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
959 | purple_signal_register(handle, "account-authorization-granted", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
960 | purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 3, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
961 | PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
962 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
963 | purple_signal_register(handle, "account-error-changed", |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
964 | purple_marshal_VOID__POINTER_POINTER_POINTER, |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
965 | G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
966 | PURPLE_TYPE_CONNECTION_ERROR_INFO, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
967 | PURPLE_TYPE_CONNECTION_ERROR_INFO); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
968 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
969 | purple_signal_register(handle, "account-signed-on", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
970 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
971 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
972 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
973 | purple_signal_register(handle, "account-signed-off", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
974 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
975 | PURPLE_TYPE_ACCOUNT); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
976 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
977 | purple_signal_register(handle, "account-connection-error", |
|
34812
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
978 | purple_marshal_VOID__POINTER_INT_POINTER, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
979 | G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, |
|
3d6f7d9dc21d
Refactored account, buddylist, certificate to use GType and GValue instead of PurpleType and PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34767
diff
changeset
|
980 | PURPLE_TYPE_CONNECTION_ERROR, G_TYPE_STRING); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
981 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
982 | purple_signal_connect(conn_handle, "signed-on", handle, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
983 | PURPLE_CALLBACK(signed_on_cb), NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
984 | purple_signal_connect(conn_handle, "signed-off", handle, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
985 | PURPLE_CALLBACK(signed_off_cb), NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
986 | purple_signal_connect(conn_handle, "connection-error", handle, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
987 | PURPLE_CALLBACK(connection_error_cb), NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
988 | purple_signal_connect(purple_keyring_get_handle(), "password-migration", handle, |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
989 | PURPLE_CALLBACK(password_migration_cb), NULL); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
990 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
991 | load_accounts(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
992 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
993 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
994 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
995 | void |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
996 | purple_accounts_uninit(void) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
997 | { |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
998 | gpointer handle = purple_accounts_get_handle(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
999 | if (save_timer != 0) |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1000 | { |
|
38433
361c801c4536
Remove purple_timeout_* function usage
Mike Ruprecht <cmaiku@gmail.com>
parents:
37679
diff
changeset
|
1001 | g_source_remove(save_timer); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1002 | save_timer = 0; |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1003 | sync_accounts(); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1004 | } |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1005 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1006 | for (; accounts; accounts = g_list_delete_link(accounts, accounts)) |
|
34588
1379416703af
Removed purple_account_destroy function declaration, use g_object_unref() instead.
Ankit Vani <a@nevitus.org>
parents:
34582
diff
changeset
|
1007 | g_object_unref(G_OBJECT(accounts->data)); |
|
34574
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1008 | |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1009 | purple_signals_disconnect_by_handle(handle); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1010 | purple_signals_unregister_by_instance(handle); |
|
19850cd1b2de
Begun GObjectification of PurpleAccount. Moved things around, see details.
Ankit Vani <a@nevitus.org>
parents:
diff
changeset
|
1011 | } |