pidgin/gtkconn.c

Fri, 30 Jun 2017 13:13:13 -0500

author
Mike Ruprecht <cmaiku@gmail.com>
date
Fri, 30 Jun 2017 13:13:13 -0500
changeset 38547
1772a0f0f77c
parent 35455
216a37403c5b
child 40360
e21f3bbcc2a5
permissions
-rw-r--r--

tls-certificate: Fix docstring function references

Several function references in the documentation of PurpleTlsCertificate
were using the wrong function names or just the wrong function. This
patch fixes those references.

20147
66f05a854eee applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents: 19859
diff changeset
1 /* pidgin
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
2 *
15931
716b5fac1895 Re-sed the copyright notices so they don't all talk about Purple.
Richard Laager <rlaager@pidgin.im>
parents: 15884
diff changeset
3 * Pidgin is the legal property of its developers, whose names are too numerous
8046
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 8014
diff changeset
4 * to list here. Please refer to the COPYRIGHT file distributed with this
c581b20a47d6 [gaim-migrate @ 8730]
Sean Egan <seanegan@pidgin.im>
parents: 8014
diff changeset
5 * source distribution.
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
6 *
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
7 * This program is free software; you can redistribute it and/or modify
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
10 * (at your option) any later version.
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
11 *
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful,
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
15 * GNU General Public License for more details.
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
16 *
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
18 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 16752
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
20 */
9791
f5c5bda0b96b [gaim-migrate @ 10659]
Gary Kramlich <grim@pidgin.im>
parents: 9730
diff changeset
21 #include "internal.h"
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
22 #include "pidgin.h"
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
23
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
24 #include "account.h"
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5746
diff changeset
25 #include "debug.h"
6460
fc288e7221ca [gaim-migrate @ 6969]
Christian Hammond <chipx86@chipx86.com>
parents: 6371
diff changeset
26 #include "notify.h"
6216
38918d33547e [gaim-migrate @ 6702]
Nathan Walp <nwalp@pidgin.im>
parents: 6114
diff changeset
27 #include "prefs.h"
34708
dd67596485ca Undo renames of UI blist headers back to gntblist.h and gtkblist.h
Ankit Vani <a@nevitus.org>
parents: 34706
diff changeset
28 #include "gtkblist.h"
12404
657afdf0f596 [gaim-migrate @ 14711]
Richard Laager <rlaager@pidgin.im>
parents: 12296
diff changeset
29 #include "gtkconn.h"
657afdf0f596 [gaim-migrate @ 14711]
Richard Laager <rlaager@pidgin.im>
parents: 12296
diff changeset
30 #include "gtkdialogs.h"
10643
70f67d7c84c4 [gaim-migrate @ 12153]
Sean Egan <seanegan@pidgin.im>
parents: 10504
diff changeset
31 #include "gtkstatusbox.h"
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
32 #include "pidginstock.h"
12404
657afdf0f596 [gaim-migrate @ 14711]
Richard Laager <rlaager@pidgin.im>
parents: 12296
diff changeset
33 #include "gtkutils.h"
5872
754c63f29b77 [gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents: 5746
diff changeset
34 #include "util.h"
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
35
14053
76a5338cd4fa [gaim-migrate @ 16565]
Sean Egan <seanegan@pidgin.im>
parents: 13756
diff changeset
36 #define INITIAL_RECON_DELAY_MIN 8000
76a5338cd4fa [gaim-migrate @ 16565]
Sean Egan <seanegan@pidgin.im>
parents: 13756
diff changeset
37 #define INITIAL_RECON_DELAY_MAX 60000
76a5338cd4fa [gaim-migrate @ 16565]
Sean Egan <seanegan@pidgin.im>
parents: 13756
diff changeset
38
11721
c74083492667 [gaim-migrate @ 14012]
Mark Doliner <markdoliner@pidgin.im>
parents: 11638
diff changeset
39 #define MAX_RECON_DELAY 600000
20433
786f26a8dc6f Make pidgin use report_disconnect_reason rather than report_disconnect, and
Will Thompson <resiak@pidgin.im>
parents: 19859
diff changeset
40 #define MAX_RACCOON_DELAY "shorter in urban areas"
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
41
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
42 typedef struct {
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
43 int delay;
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
44 guint timeout;
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
45 } PidginAutoRecon;
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
46
35455
216a37403c5b Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents: 35454
diff changeset
47 /*
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
48 * Contains accounts that are auto-reconnecting.
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
49 * The key is a pointer to the PurpleAccount and the
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
50 * value is a pointer to a PidginAutoRecon.
13013
fde187d968dc [gaim-migrate @ 15366]
Mark Doliner <markdoliner@pidgin.im>
parents: 12607
diff changeset
51 */
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
52 static GHashTable *auto_reconns = NULL;
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
53
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
54 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
55 pidgin_connection_connect_progress(PurpleConnection *gc,
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
56 const char *text, size_t step, size_t step_count)
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
57 {
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
58 PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
10643
70f67d7c84c4 [gaim-migrate @ 12153]
Sean Egan <seanegan@pidgin.im>
parents: 10504
diff changeset
59 if (!gtkblist)
70f67d7c84c4 [gaim-migrate @ 12153]
Sean Egan <seanegan@pidgin.im>
parents: 10504
diff changeset
60 return;
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
61 pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox),
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
62 (purple_connections_get_connecting() != NULL));
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
63 pidgin_status_box_pulse_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox));
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
64 }
13756
c7679a3eefb6 [gaim-migrate @ 16165]
Mark Doliner <markdoliner@pidgin.im>
parents: 13732
diff changeset
65
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
66 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
67 pidgin_connection_connected(PurpleConnection *gc)
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
68 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
69 PurpleAccount *account;
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
70 PidginBuddyList *gtkblist;
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
71
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
72 account = purple_connection_get_account(gc);
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
73 gtkblist = pidgin_blist_get_default_gtk_blist();
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
74
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
75 if (gtkblist != NULL)
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
76 pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox),
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
77 (purple_connections_get_connecting() != NULL));
12607
4622f0adedf4 [gaim-migrate @ 14943]
Mark Doliner <markdoliner@pidgin.im>
parents: 12583
diff changeset
78
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
79 g_hash_table_remove(auto_reconns, account);
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
80 }
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
81
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
82 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
83 pidgin_connection_disconnected(PurpleConnection *gc)
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
84 {
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
85 PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
10643
70f67d7c84c4 [gaim-migrate @ 12153]
Sean Egan <seanegan@pidgin.im>
parents: 10504
diff changeset
86 if (!gtkblist)
70f67d7c84c4 [gaim-migrate @ 12153]
Sean Egan <seanegan@pidgin.im>
parents: 10504
diff changeset
87 return;
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
88 pidgin_status_box_set_connecting(PIDGIN_STATUS_BOX(gtkblist->statusbox),
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
89 (purple_connections_get_connecting() != NULL));
5883
290fe1d16e60 [gaim-migrate @ 6315]
Christian Hammond <chipx86@chipx86.com>
parents: 5872
diff changeset
90
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
91 if (purple_connections_get_all() != NULL)
5883
290fe1d16e60 [gaim-migrate @ 6315]
Christian Hammond <chipx86@chipx86.com>
parents: 5872
diff changeset
92 return;
290fe1d16e60 [gaim-migrate @ 6315]
Christian Hammond <chipx86@chipx86.com>
parents: 5872
diff changeset
93
16263
27e0ef0f38e6 Word on the street is that we don't want things named pidginfoo_bar(), but
Richard Laager <rlaager@pidgin.im>
parents: 16254
diff changeset
94 pidgin_dialogs_destroy_all();
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
95 }
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
96
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
97 static void
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
98 free_auto_recon(gpointer data)
7493
119e83389416 [gaim-migrate @ 8106]
Daniel Atallah <datallah@pidgin.im>
parents: 7483
diff changeset
99 {
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
100 PidginAutoRecon *info = data;
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
101
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
102 if (info->timeout != 0)
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
103 g_source_remove(info->timeout);
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
104
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
105 g_free(info);
7493
119e83389416 [gaim-migrate @ 8106]
Daniel Atallah <datallah@pidgin.im>
parents: 7483
diff changeset
106 }
119e83389416 [gaim-migrate @ 8106]
Daniel Atallah <datallah@pidgin.im>
parents: 7483
diff changeset
107
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
108 static gboolean
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
109 do_signon(gpointer data)
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
110 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
111 PurpleAccount *account = data;
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
112 PidginAutoRecon *info;
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
113 PurpleStatus *status;
10916
3de20dd2dade [gaim-migrate @ 12675]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10915
diff changeset
114
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
115 purple_debug_info("autorecon", "do_signon called\n");
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
116 g_return_val_if_fail(account != NULL, FALSE);
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
117 info = g_hash_table_lookup(auto_reconns, account);
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
118
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
119 if (info)
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
120 info->timeout = 0;
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
121
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
122 status = purple_account_get_active_status(account);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
123 if (purple_status_is_online(status))
13375
5ce3cb98de9f [gaim-migrate @ 15747]
Mark Doliner <markdoliner@pidgin.im>
parents: 13129
diff changeset
124 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
125 purple_debug_info("autorecon", "calling purple_account_connect\n");
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
126 purple_account_connect(account);
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
127 purple_debug_info("autorecon", "done calling purple_account_connect\n");
13375
5ce3cb98de9f [gaim-migrate @ 15747]
Mark Doliner <markdoliner@pidgin.im>
parents: 13129
diff changeset
128 }
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
129
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
130 return FALSE;
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
131 }
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
132
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
133 static void
32153
121f15699f88 Rename the report_disconnect_reason cb function to report_disconnect
Mark Doliner <markdoliner@pidgin.im>
parents: 32152
diff changeset
134 pidgin_connection_report_disconnect(PurpleConnection *gc,
121f15699f88 Rename the report_disconnect_reason cb function to report_disconnect
Mark Doliner <markdoliner@pidgin.im>
parents: 32152
diff changeset
135 PurpleConnectionError reason,
121f15699f88 Rename the report_disconnect_reason cb function to report_disconnect
Mark Doliner <markdoliner@pidgin.im>
parents: 32152
diff changeset
136 const char *text)
7399
3e13bcf99d76 [gaim-migrate @ 7995]
Sean Egan <seanegan@pidgin.im>
parents: 7108
diff changeset
137 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
138 PurpleAccount *account = NULL;
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
139 PidginAutoRecon *info;
7808
f810595f1bda [gaim-migrate @ 8455]
Daniel Atallah <datallah@pidgin.im>
parents: 7678
diff changeset
140
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
141 account = purple_connection_get_account(gc);
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
142 info = g_hash_table_lookup(auto_reconns, account);
7912
b8f84918e7c1 [gaim-migrate @ 8573]
Mark Doliner <markdoliner@pidgin.im>
parents: 7890
diff changeset
143
21279
40685e1f50ca Rename:
Will Thompson <resiak@pidgin.im>
parents: 21155
diff changeset
144 if (!purple_connection_error_is_fatal (reason)) {
12009
06852325c88f [gaim-migrate @ 14302]
Mark Doliner <markdoliner@pidgin.im>
parents: 11721
diff changeset
145 if (info == NULL) {
15883
969b74a3e27a According to etags, pidgin/ should be completely clean of references to 'gaim' as a client
Sean Egan <seanegan@pidgin.im>
parents: 15577
diff changeset
146 info = g_new0(PidginAutoRecon, 1);
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
147 g_hash_table_insert(auto_reconns, account, info);
14053
76a5338cd4fa [gaim-migrate @ 16565]
Sean Egan <seanegan@pidgin.im>
parents: 13756
diff changeset
148 info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
7483
08237091e8a5 [gaim-migrate @ 8096]
Mark Doliner <markdoliner@pidgin.im>
parents: 7431
diff changeset
149 } else {
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
150 info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
151 if (info->timeout != 0)
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
152 g_source_remove(info->timeout);
7483
08237091e8a5 [gaim-migrate @ 8096]
Mark Doliner <markdoliner@pidgin.im>
parents: 7431
diff changeset
153 }
11523
8089ad56093d [gaim-migrate @ 13771]
Sean Egan <seanegan@pidgin.im>
parents: 11251
diff changeset
154 info->timeout = g_timeout_add(info->delay, do_signon, account);
11559
8f56b742b3a7 [gaim-migrate @ 13823]
Sean Egan <seanegan@pidgin.im>
parents: 11536
diff changeset
155 } else {
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
156 if (info != NULL)
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
157 g_hash_table_remove(auto_reconns, account);
11721
c74083492667 [gaim-migrate @ 14012]
Mark Doliner <markdoliner@pidgin.im>
parents: 11638
diff changeset
158
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
159 purple_account_set_enabled(account, PIDGIN_UI, FALSE);
7399
3e13bcf99d76 [gaim-migrate @ 7995]
Sean Egan <seanegan@pidgin.im>
parents: 7108
diff changeset
160 }
3e13bcf99d76 [gaim-migrate @ 7995]
Sean Egan <seanegan@pidgin.im>
parents: 7108
diff changeset
161 }
3e13bcf99d76 [gaim-migrate @ 7995]
Sean Egan <seanegan@pidgin.im>
parents: 7108
diff changeset
162
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 22089
diff changeset
163 static void pidgin_connection_network_connected (void)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
164 {
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
165 GList *list, *l;
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
166 PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
14767
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
167
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
168 if(gtkblist)
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
169 pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), TRUE);
14767
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
170
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
171 l = list = purple_accounts_get_all_active();
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
172 while (l) {
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
173 PurpleAccount *account = (PurpleAccount*)l->data;
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
174 g_hash_table_remove(auto_reconns, account);
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
175 if (purple_account_is_disconnected(account))
14784
3a82321f46f2 [gaim-migrate @ 17476]
Daniel Atallah <datallah@pidgin.im>
parents: 14767
diff changeset
176 do_signon(account);
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
177 l = l->next;
14767
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
178 }
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
179 g_list_free(list);
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
180 }
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
181
22104
56970903b8e9 Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
Richard Laager <rlaager@pidgin.im>
parents: 22089
diff changeset
182 static void pidgin_connection_network_disconnected (void)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
183 {
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
184 GList *list, *l;
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
185 PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
186
14767
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
187 if(gtkblist)
15577
b8129373f65e More pidgin changes
Sean Egan <seanegan@pidgin.im>
parents: 15562
diff changeset
188 pidgin_status_box_set_network_available(PIDGIN_STATUS_BOX(gtkblist->statusbox), FALSE);
14767
34cc644b452f [gaim-migrate @ 17458]
Nathan Walp <nwalp@pidgin.im>
parents: 14758
diff changeset
189
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
190 l = list = purple_accounts_get_all_active();
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
191 while (l) {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
192 PurpleAccount *a = (PurpleAccount*)l->data;
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
193 if (!purple_account_is_disconnected(a)) {
24519
d4af3d043211 Improve our NetworkManager support in a couple of ways:
Richard Laager <rlaager@pidgin.im>
parents: 24414
diff changeset
194 purple_account_disconnect(a);
15090
d639b27a6491 [gaim-migrate @ 17811]
Sean Egan <seanegan@pidgin.im>
parents: 14969
diff changeset
195 }
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
196 l = l->next;
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
197 }
21942
8ee08ef6b2a3 Fix a GList being leaked when dealing with network connection/disconnection events.
Daniel Atallah <datallah@pidgin.im>
parents: 21512
diff changeset
198 g_list_free(list);
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
199 }
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
200
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
201 static void pidgin_connection_notice(PurpleConnection *gc, const char *text)
14758
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
202 { }
13b9adc9efd2 [gaim-migrate @ 17448]
Sean Egan <seanegan@pidgin.im>
parents: 14253
diff changeset
203
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
204 static PurpleConnectionUiOps conn_ui_ops =
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
205 {
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
206 pidgin_connection_connect_progress,
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
207 pidgin_connection_connected,
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
208 pidgin_connection_disconnected,
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
209 pidgin_connection_notice,
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
210 pidgin_connection_network_connected,
16752
e6bcb1628c57 Patch from John 'rekkanoryo' Bailey to add the padding struct members in pidgin
Gary Kramlich <grim@reaperworld.com>
parents: 16263
diff changeset
211 pidgin_connection_network_disconnected,
32153
121f15699f88 Rename the report_disconnect_reason cb function to report_disconnect
Mark Doliner <markdoliner@pidgin.im>
parents: 32152
diff changeset
212 pidgin_connection_report_disconnect,
16752
e6bcb1628c57 Patch from John 'rekkanoryo' Bailey to add the padding struct members in pidgin
Gary Kramlich <grim@reaperworld.com>
parents: 16263
diff changeset
213 NULL,
e6bcb1628c57 Patch from John 'rekkanoryo' Bailey to add the padding struct members in pidgin
Gary Kramlich <grim@reaperworld.com>
parents: 16263
diff changeset
214 NULL,
34906
6f5e8a7bfe8c Initialized new padding member in connection UI ops
Ankit Vani <a@nevitus.org>
parents: 34708
diff changeset
215 NULL,
16752
e6bcb1628c57 Patch from John 'rekkanoryo' Bailey to add the padding struct members in pidgin
Gary Kramlich <grim@reaperworld.com>
parents: 16263
diff changeset
216 NULL
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
217 };
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
218
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
219 PurpleConnectionUiOps *
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
220 pidgin_connections_get_ui_ops(void)
5717
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
221 {
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
222 return &conn_ui_ops;
2f3a377de638 [gaim-migrate @ 6138]
Nathan Walp <nwalp@pidgin.im>
parents:
diff changeset
223 }
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
224
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
225 static void
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
226 account_removed_cb(PurpleAccount *account, gpointer user_data)
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
227 {
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
228 g_hash_table_remove(auto_reconns, account);
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
229 }
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
230
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
231
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
232 /**************************************************************************
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
233 * GTK+ connection glue
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
234 **************************************************************************/
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
235
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
236 void *
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
237 pidgin_connection_get_handle(void)
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
238 {
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
239 static int handle;
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
240
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
241 return &handle;
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
242 }
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
243
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
244 void
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
245 pidgin_connection_init(void)
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
246 {
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
247 auto_reconns = g_hash_table_new_full(
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
248 g_direct_hash, g_direct_equal,
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
249 NULL, free_auto_recon);
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
250
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
251 purple_signal_connect(purple_accounts_get_handle(), "account-removed",
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
252 pidgin_connection_get_handle(),
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
253 PURPLE_CALLBACK(account_removed_cb), NULL);
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
254 }
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
255
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
256 void
15562
8c8249fe5e3c gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents: 15442
diff changeset
257 pidgin_connection_uninit(void)
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
258 {
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15883
diff changeset
259 purple_signals_disconnect_by_handle(pidgin_connection_get_handle());
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
260
20341
a20de3c1c254 Rename Pidgin's hash table of ongoing autoreconnections to 'auto_reconns'
Will Thompson <resiak@pidgin.im>
parents: 20147
diff changeset
261 g_hash_table_destroy(auto_reconns);
13014
fa17f785b6fe [gaim-migrate @ 15367]
Mark Doliner <markdoliner@pidgin.im>
parents: 13013
diff changeset
262 }

mercurial