Fri, 01 Apr 2022 01:14:35 -0500
Add gdk-pixbuf as a libpurple dependency and move helpers from pidgin to purple
Adding gdk-pixbuf as a dependency to libpurple is kind of questionable, but it's dependencies are really just libpng, libjpeg, and libtiff. In other words, nothing UI specific. Which means we can remove a bunch of API with this change which is awesome.
This is the first step in replacing `PurpleImage` with `GdkPixbuf`. Which will also eventually include `PurpleBuddyIcon` and remove the need for `PurpleBuddyIconSpec` as protocol plugins will just be able to scale and format images themselves.
* Move `pidgingdkpixbuf.[ch]` to `purplegdkpixbuf.[ch]`
* Renamed all function from `purplegdkpixbuf.[ch]` to be in the purple_gdk_pixbuf namespace
* Removed all unused function from `purplegdkpixbuf.[ch]`
I also did some research on how much disk space adding gdkpixbuf would add.
The base is a base debian container and this is against libpurple2 which is obviously going to be different. But the question was how much additional disk space will be used by adding gdkpixbuf.
```
base: 157680
bitlbee: 216452
bitlbee+gdkpixbuf: 222388
bitlbee-purple *: 363860
bitlbee-purple+gdkpixbuf *: 369796
* --no-install-recommends
```
We can see that for gdkpixbuf will about about 6MB of of disk usage which I would hope would be acceptable when libpurple adds 141MB by itself.
Testing Done:
Ran and verified that an animated buddy icon was still displayed properly in the infopane and the buddy list.
Reviewed at https://reviews.imfreedom.org/r/1224/
|
20330
650a7af9c238
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@pidgin.im>
parents:
19859
diff
changeset
|
1 | /* pidgin |
| 5563 | 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 | 4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 5 | * source distribution. | |
|
6485
3c7ba18e32f1
[gaim-migrate @ 6999]
Christian Hammond <chipx86@chipx86.com>
parents:
6371
diff
changeset
|
6 | * |
| 5563 | 7 | * This program is free software; you can redistribute it and/or modify |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 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:
19773
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 5563 | 20 | */ |
| 9308 | 21 | |
|
40439
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
22 | #ifdef HAVE_CONFIG_H |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
23 | # include <config.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
24 | #endif |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
25 | |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
26 | #include <glib/gi18n-lib.h> |
|
e9838d634d5e
Make sure that internal.h can only be included by libpurple and split out some pieces to purpleprivate.h
Gary Kramlich <grim@reaperworld.com>
parents:
40350
diff
changeset
|
27 | |
|
40350
72271baf92bc
Split PurpleKeyValuePair out to it's own file and try to do some cleanup in the files that need to include it.
Gary Kramlich <grim@reaperworld.com>
parents:
40299
diff
changeset
|
28 | #include <purple.h> |
|
40756
3a58ef28ee44
Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents:
40741
diff
changeset
|
29 | #include "libpurple/glibcompat.h" |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
30 | |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5870
diff
changeset
|
31 | #include "gtkaccount.h" |
|
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5870
diff
changeset
|
32 | #include "gtkblist.h" |
|
9709
2e73f176cc80
[gaim-migrate @ 10570]
Mark Doliner <markdoliner@pidgin.im>
parents:
9705
diff
changeset
|
33 | #include "gtkdialogs.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5870
diff
changeset
|
34 | #include "gtkutils.h" |
| 10649 | 35 | #include "gtkstatusbox.h" |
|
40496
6941fece679b
phase2 of pidgin.h: move existing file to pidgincore.h
Gary Kramlich <grim@reaperworld.com>
parents:
40490
diff
changeset
|
36 | #include "pidgincore.h" |
|
40533
b1921b17b683
Replace some utility functions with actual widgets
Gary Kramlich <grim@reaperworld.com>
parents:
40496
diff
changeset
|
37 | #include "pidgindialog.h" |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
38 | #include "minidialog.h" |
|
40297
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
39 | #include "pidginprotocolchooser.h" |
|
5620
c5f0a3c434fd
[gaim-migrate @ 6027]
Christian Hammond <chipx86@chipx86.com>
parents:
5617
diff
changeset
|
40 | |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
41 | enum |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
42 | { |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
43 | COLUMN_ICON, |
| 15240 | 44 | COLUMN_BUDDYICON, |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
45 | COLUMN_USERNAME, |
| 10400 | 46 | COLUMN_ENABLED, |
|
5781
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
47 | COLUMN_PROTOCOL, |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
48 | COLUMN_DATA, |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
49 | NUM_COLUMNS |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
50 | }; |
| 5563 | 51 | |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
52 | enum { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
53 | RESPONSE_ADD = 0, |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
54 | RESPONSE_MODIFY, |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
55 | RESPONSE_DELETE, |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
56 | RESPONSE_CLOSE, |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
57 | }; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
58 | |
| 5563 | 59 | typedef struct |
| 60 | { | |
| 15884 | 61 | PurpleAccount *account; |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
62 | char *username; |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
63 | char *alias; |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
64 | |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
65 | } PidginAccountAddUserData; |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
66 | |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
67 | typedef struct |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
68 | { |
| 5563 | 69 | GtkWidget *window; |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
70 | GtkWidget *treeview; |
| 5563 | 71 | |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
72 | GtkWidget *modify_button; |
|
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
73 | GtkWidget *delete_button; |
|
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
74 | |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
75 | GtkListStore *model; |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
76 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
77 | GtkTreeViewColumn *username_col; |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
78 | |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
79 | } AccountsWindow; |
| 5563 | 80 | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
81 | typedef struct |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
82 | { |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
83 | GtkWidget *widget; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
84 | gchar *setting; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
85 | PurplePrefType type; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
86 | } ProtocolOptEntry; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
87 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
88 | typedef struct |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
89 | { |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
90 | PidginAccountDialogType type; |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
91 | |
| 15884 | 92 | PurpleAccount *account; |
|
5978
e9bbb1ec8c89
[gaim-migrate @ 6425]
Christian Hammond <chipx86@chipx86.com>
parents:
5966
diff
changeset
|
93 | char *protocol_id; |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
94 | PurpleProtocol *protocol; |
| 15884 | 95 | |
| 96 | PurpleProxyType new_proxy_type; | |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
97 | |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
98 | GList *user_split_entries; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
99 | GList *protocol_opt_entries; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
100 | |
|
5688
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
101 | GtkSizeGroup *sg; |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
102 | GtkWidget *window; |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
103 | |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
104 | GtkWidget *notebook; |
|
5688
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
105 | GtkWidget *top_vbox; |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
106 | GtkWidget *ok_button; |
| 6141 | 107 | GtkWidget *register_button; |
|
5688
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
108 | |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
109 | /* Login Options */ |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
110 | GtkWidget *login_frame; |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
111 | GtkWidget *protocol_menu; |
|
34145
fa72f1e5cd77
Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
112 | gchar *password; |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
113 | GtkWidget *username_entry; |
|
33704
9abf92629647
Implement a GTK3 version of the placeholder text.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33703
diff
changeset
|
114 | GdkRGBA username_entry_hint_color; |
|
5657
6c1febf7aca1
[gaim-migrate @ 6071]
Christian Hammond <chipx86@chipx86.com>
parents:
5656
diff
changeset
|
115 | GtkWidget *alias_entry; |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
116 | |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
117 | /* User Options */ |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
118 | GtkWidget *user_frame; |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
119 | GtkWidget *icon_hbox; |
| 14195 | 120 | GtkWidget *icon_check; |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
121 | GtkWidget *icon_entry; |
|
39930
411f3df51bcd
Convert to GtkFileChooserNative.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
122 | GtkFileChooserNative *icon_filesel; |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
123 | GtkWidget *icon_preview; |
|
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
124 | GtkWidget *icon_text; |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
125 | PurpleImage *icon_img; |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
126 | |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
127 | /* Protocol Options */ |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
128 | GtkWidget *protocol_frame; |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
129 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
130 | /* Proxy Options */ |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
131 | GtkWidget *proxy_frame; |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
132 | GtkWidget *proxy_vbox; |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
133 | GtkWidget *proxy_dropdown; |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
134 | GtkWidget *proxy_host_entry; |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
135 | GtkWidget *proxy_port_entry; |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
136 | GtkWidget *proxy_user_entry; |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
137 | GtkWidget *proxy_pass_entry; |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
138 | |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
139 | /* Voice & Video Options*/ |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
140 | GtkWidget *voice_frame; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
141 | GtkWidget *suppression_check; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
142 | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
143 | } AccountPrefsDialog; |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
144 | |
|
40680
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
145 | typedef struct { |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
146 | PurpleAccount *account; |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
147 | PidginAccountDialogType type; |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
148 | } PidginAccountDialogShowData; |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
149 | |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
150 | static AccountsWindow *accounts_window = NULL; |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
151 | static GHashTable *account_pref_wins; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
152 | |
| 15884 | 153 | static void add_account_to_liststore(PurpleAccount *account, gpointer user_data); |
| 5774 | 154 | static void set_account(GtkListStore *store, GtkTreeIter *iter, |
| 15884 | 155 | PurpleAccount *account, GdkPixbuf *global_buddyicon); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
156 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
157 | /************************************************************************** |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
158 | * Add/Modify Account dialog |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
159 | **************************************************************************/ |
| 5774 | 160 | static void add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent); |
| 161 | static void add_user_options(AccountPrefsDialog *dialog, GtkWidget *parent); | |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
36928
diff
changeset
|
162 | static void add_account_options(AccountPrefsDialog *dialog); |
| 5774 | 163 | static void add_proxy_options(AccountPrefsDialog *dialog, GtkWidget *parent); |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
164 | static void add_voice_options(AccountPrefsDialog *dialog); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
165 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
166 | static GtkWidget * |
| 5774 | 167 | add_pref_box(AccountPrefsDialog *dialog, GtkWidget *parent, |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
168 | const char *text, GtkWidget *widget) |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
169 | { |
|
22131
12b395dc8c59
Remove a lot of duplication from a lot of places. Closes #4558.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22056
diff
changeset
|
170 | return pidgin_add_widget_to_vbox(GTK_BOX(parent), text, dialog->sg, widget, TRUE, NULL); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
171 | } |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
172 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
173 | static void |
|
16658
d5b9b112b758
Part of the patch in ticket #383:
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
16545
diff
changeset
|
174 | set_dialog_icon(AccountPrefsDialog *dialog, gpointer data, size_t len, gchar *new_icon_path) |
|
11286
148a24541acd
[gaim-migrate @ 13483]
Richard Laager <rlaager@pidgin.im>
parents:
11256
diff
changeset
|
175 | { |
|
14248
caf7bdfc3e0f
[gaim-migrate @ 16849]
Daniel Atallah <datallah@pidgin.im>
parents:
14235
diff
changeset
|
176 | GdkPixbuf *pixbuf = NULL; |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
177 | PurpleBuddyIconSpec *icon_spec = NULL; |
|
14671
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
178 | |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
179 | if (dialog->icon_img) { |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
180 | g_object_unref(dialog->icon_img); |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
181 | dialog->icon_img = NULL; |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
182 | } |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
183 | |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
184 | if (new_icon_path != NULL) { |
|
38285
72824d3b7190
Update pidgin for the PurpleImage and PurpleSmiley changes
Gary Kramlich <grim@reaperworld.com>
parents:
38277
diff
changeset
|
185 | dialog->icon_img = purple_image_new_from_file(new_icon_path, NULL); |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
186 | purple_debug_warning("gtkaccount", "data was not necessary"); |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
187 | g_free(data); |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
188 | } else if (data != NULL) { |
|
16539
75a20ae3a527
Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents:
16538
diff
changeset
|
189 | if (len > 0) |
|
39463
d47e230b9d75
Fix leaky calls to purple_image_new_from_data.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39333
diff
changeset
|
190 | dialog->icon_img = purple_image_new_take_data(data, len); |
|
16539
75a20ae3a527
Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents:
16538
diff
changeset
|
191 | else |
|
75a20ae3a527
Change the imgstore and by extension, then the buddy icon code to take over
Richard Laager <rlaager@pidgin.im>
parents:
16538
diff
changeset
|
192 | g_free(data); |
|
16544
945caa0d6436
Kill some compiler warnings and TODOs of mine.
Richard Laager <rlaager@pidgin.im>
parents:
16539
diff
changeset
|
193 | } |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
194 | |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
195 | if (dialog->icon_img != NULL) { |
|
41319
04d027ed3d63
Add gdk-pixbuf as a libpurple dependency and move helpers from pidgin to purple
Gary Kramlich <grim@reaperworld.com>
parents:
41318
diff
changeset
|
196 | pixbuf = purple_gdk_pixbuf_from_image(dialog->icon_img); |
|
14671
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
197 | } |
|
13222
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
198 | |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
199 | if (dialog->protocol) |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
200 | icon_spec = purple_protocol_get_icon_spec(dialog->protocol); |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
201 | |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
202 | if (pixbuf && icon_spec && (icon_spec->scale_rules & PURPLE_ICON_SCALE_DISPLAY)) |
|
13222
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
203 | { |
|
14671
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
204 | /* Scale the icon to something reasonable */ |
|
13222
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
205 | int width, height; |
|
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
206 | GdkPixbuf *scale; |
|
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
207 | |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
208 | pidgin_buddy_icon_get_scale_size(pixbuf, icon_spec, |
| 15884 | 209 | PURPLE_ICON_SCALE_DISPLAY, &width, &height); |
|
13222
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
210 | scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14087
diff
changeset
|
211 | |
|
13222
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
212 | g_object_unref(G_OBJECT(pixbuf)); |
|
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
213 | pixbuf = scale; |
|
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
214 | } |
|
03cf8fa2f29e
[gaim-migrate @ 15585]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
13091
diff
changeset
|
215 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
216 | purple_buddy_icon_spec_free(icon_spec); |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
217 | |
|
14671
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
218 | if (pixbuf == NULL) |
|
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
219 | { |
|
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
220 | /* Show a placeholder icon */ |
|
39053
58a0a87c7038
gtkaccount: Port avatar selector default image to GtkIconTheme
Mike Ruprecht <cmaiku@gmail.com>
parents:
39052
diff
changeset
|
221 | gtk_image_set_from_icon_name(GTK_IMAGE(dialog->icon_entry), |
|
58a0a87c7038
gtkaccount: Port avatar selector default image to GtkIconTheme
Mike Ruprecht <cmaiku@gmail.com>
parents:
39052
diff
changeset
|
222 | "select-avatar", GTK_ICON_SIZE_LARGE_TOOLBAR); |
|
58a0a87c7038
gtkaccount: Port avatar selector default image to GtkIconTheme
Mike Ruprecht <cmaiku@gmail.com>
parents:
39052
diff
changeset
|
223 | } else { |
|
58a0a87c7038
gtkaccount: Port avatar selector default image to GtkIconTheme
Mike Ruprecht <cmaiku@gmail.com>
parents:
39052
diff
changeset
|
224 | gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_entry), pixbuf); |
|
58a0a87c7038
gtkaccount: Port avatar selector default image to GtkIconTheme
Mike Ruprecht <cmaiku@gmail.com>
parents:
39052
diff
changeset
|
225 | g_object_unref(G_OBJECT(pixbuf)); |
|
14671
4981d4ab59f8
[gaim-migrate @ 17337]
Mark Doliner <markdoliner@pidgin.im>
parents:
14670
diff
changeset
|
226 | } |
|
11286
148a24541acd
[gaim-migrate @ 13483]
Richard Laager <rlaager@pidgin.im>
parents:
11256
diff
changeset
|
227 | } |
|
148a24541acd
[gaim-migrate @ 13483]
Richard Laager <rlaager@pidgin.im>
parents:
11256
diff
changeset
|
228 | |
|
148a24541acd
[gaim-migrate @ 13483]
Richard Laager <rlaager@pidgin.im>
parents:
11256
diff
changeset
|
229 | static void |
|
40299
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
230 | set_account_protocol_cb(GtkWidget *widget, AccountPrefsDialog *dialog) { |
|
40297
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
231 | PidginProtocolChooser *chooser = PIDGIN_PROTOCOL_CHOOSER(widget); |
|
40299
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
232 | PurpleProtocol *protocol = pidgin_protocol_chooser_get_selected(chooser); |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
233 | |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
234 | if(g_set_object(&dialog->protocol, protocol)) { |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
235 | g_clear_pointer(&dialog->protocol_id, g_free); |
|
5955
4f964635c095
[gaim-migrate @ 6399]
Christian Hammond <chipx86@chipx86.com>
parents:
5943
diff
changeset
|
236 | } |
|
40299
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
237 | g_object_unref(G_OBJECT(protocol)); |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
238 | |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
239 | if(PURPLE_IS_PROTOCOL(dialog->protocol)) { |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
240 | dialog->protocol_id = g_strdup(purple_protocol_get_id(dialog->protocol)); |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
241 | } |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
242 | |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
243 | if (dialog->account != NULL) { |
| 15884 | 244 | purple_account_clear_settings(dialog->account); |
|
40299
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
245 | } |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
246 | |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
247 | add_login_options(dialog, dialog->top_vbox); |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
248 | add_user_options(dialog, dialog->top_vbox); |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
36928
diff
changeset
|
249 | add_account_options(dialog); |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
250 | add_voice_options(dialog); |
| 6141 | 251 | |
|
20092
814ecfc91244
applied changes from bb3c9dec65d16afdcc4bcedd5fd184b7207cc624
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
252 | gtk_widget_grab_focus(dialog->protocol_menu); |
|
814ecfc91244
applied changes from bb3c9dec65d16afdcc4bcedd5fd184b7207cc624
Richard Laager <rlaager@pidgin.im>
parents:
19859
diff
changeset
|
253 | |
|
40299
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
254 | if (!dialog->protocol || |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
255 | !PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, SERVER, register_user)) |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
256 | { |
|
e2f8638bac5a
Clean up set_account_protocol_cb and change some accessors for PidginProtocolChooser
Gary Kramlich <grim@reaperworld.com>
parents:
40297
diff
changeset
|
257 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->register_button), FALSE); |
| 6141 | 258 | gtk_widget_hide(dialog->register_button); |
| 11358 | 259 | } else { |
|
39913
ce96d4639dc7
Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
260 | if (purple_protocol_get_options(dialog->protocol) & |
|
ce96d4639dc7
Remove redundant conditions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
261 | OPT_PROTO_REGISTER_NOSCREENNAME) { |
| 11358 | 262 | gtk_widget_set_sensitive(dialog->register_button, TRUE); |
| 263 | } else { | |
|
33055
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
264 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
265 | dialog->register_button), FALSE); |
| 11358 | 266 | gtk_widget_set_sensitive(dialog->register_button, FALSE); |
| 267 | } | |
| 6141 | 268 | gtk_widget_show(dialog->register_button); |
| 11358 | 269 | } |
|
5688
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
270 | } |
|
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
271 | |
|
c185c90d9811
[gaim-migrate @ 6109]
Christian Hammond <chipx86@chipx86.com>
parents:
5687
diff
changeset
|
272 | static void |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
273 | username_changed_cb(GtkEntry *entry, AccountPrefsDialog *dialog) |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
274 | { |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
275 | gboolean opt_noscreenname = (dialog->protocol != NULL && |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
276 | (purple_protocol_get_options(dialog->protocol) & OPT_PROTO_REGISTER_NOSCREENNAME)); |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
277 | gboolean username_valid = purple_validate(dialog->protocol, |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
278 | gtk_entry_get_text(entry)); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
279 | |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
280 | if (dialog->ok_button) { |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
281 | if (opt_noscreenname && dialog->register_button && |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
282 | gtk_toggle_button_get_active( |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
283 | GTK_TOGGLE_BUTTON(dialog->register_button))) |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
284 | gtk_widget_set_sensitive(dialog->ok_button, TRUE); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
285 | else |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
286 | gtk_widget_set_sensitive(dialog->ok_button, |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
287 | username_valid); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
288 | } |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
289 | |
| 11358 | 290 | if (dialog->register_button) { |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
291 | if (opt_noscreenname) |
| 11358 | 292 | gtk_widget_set_sensitive(dialog->register_button, TRUE); |
| 293 | else | |
| 294 | gtk_widget_set_sensitive(dialog->register_button, | |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
295 | username_valid); |
| 11358 | 296 | } |
| 5826 | 297 | } |
| 6732 | 298 | |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
299 | static void |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
300 | register_button_cb(GtkWidget *checkbox, AccountPrefsDialog *dialog) |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
301 | { |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
302 | int register_checked = gtk_toggle_button_get_active( |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
303 | GTK_TOGGLE_BUTTON(dialog->register_button)); |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
304 | int opt_noscreenname = (dialog->protocol != NULL && |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
305 | (purple_protocol_get_options(dialog->protocol) & OPT_PROTO_REGISTER_NOSCREENNAME)); |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
306 | int register_noscreenname = (opt_noscreenname && register_checked); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
307 | |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
308 | if (register_noscreenname) { |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
309 | gtk_entry_set_text(GTK_ENTRY(dialog->username_entry), ""); |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
310 | } |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
311 | gtk_widget_set_sensitive(dialog->username_entry, !register_noscreenname); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
312 | |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
313 | if (dialog->ok_button) { |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
314 | gtk_widget_set_sensitive(dialog->ok_button, |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
315 | (opt_noscreenname && register_checked) || |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
316 | *gtk_entry_get_text(GTK_ENTRY(dialog->username_entry)) |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
317 | != '\0'); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
318 | } |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
319 | } |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
320 | |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
321 | static void |
|
14203
f3a50c328ddc
[gaim-migrate @ 16783]
Mark Doliner <markdoliner@pidgin.im>
parents:
14195
diff
changeset
|
322 | icon_filesel_choose_cb(const char *filename, gpointer data) |
| 5826 | 323 | { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
324 | AccountPrefsDialog *dialog = data; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
325 | |
|
14765
c5c0c325481d
[gaim-migrate @ 17455]
Mark Doliner <markdoliner@pidgin.im>
parents:
14764
diff
changeset
|
326 | if (filename != NULL) |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
327 | { |
|
34988
81d8c99ac9b3
Initialize len = 0 before pidgin_convert_buddy_icon()
Ankit Vani <a@nevitus.org>
parents:
34955
diff
changeset
|
328 | size_t len = 0; |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
329 | gpointer data = pidgin_convert_buddy_icon(dialog->protocol, filename, &len); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
330 | set_dialog_icon(dialog, data, len, g_strdup(filename)); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
331 | } |
|
14203
f3a50c328ddc
[gaim-migrate @ 16783]
Mark Doliner <markdoliner@pidgin.im>
parents:
14195
diff
changeset
|
332 | |
|
39930
411f3df51bcd
Convert to GtkFileChooserNative.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
333 | g_clear_object(&dialog->icon_filesel); |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
334 | } |
|
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
335 | |
|
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
336 | static void |
|
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
337 | icon_select_cb(GtkWidget *button, AccountPrefsDialog *dialog) |
|
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
338 | { |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
339 | dialog->icon_filesel = pidgin_buddy_icon_chooser_new(GTK_WINDOW(dialog->window), icon_filesel_choose_cb, dialog); |
|
39930
411f3df51bcd
Convert to GtkFileChooserNative.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
340 | gtk_native_dialog_show(GTK_NATIVE_DIALOG(dialog->icon_filesel)); |
| 5826 | 341 | } |
| 342 | ||
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
343 | static void |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
344 | icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog) |
| 5826 | 345 | { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
346 | set_dialog_icon(dialog, NULL, 0, NULL); |
| 9308 | 347 | } |
| 348 | ||
| 9314 | 349 | static void |
| 15884 | 350 | update_editable(PurpleConnection *gc, AccountPrefsDialog *dialog) |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
351 | { |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35475
diff
changeset
|
352 | GtkStyleContext *style; |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
353 | gboolean set; |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
354 | GList *l; |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
355 | |
|
12843
323bd864a6f1
[gaim-migrate @ 15191]
Richard Laager <rlaager@pidgin.im>
parents:
12671
diff
changeset
|
356 | if (dialog->account == NULL) |
|
323bd864a6f1
[gaim-migrate @ 15191]
Richard Laager <rlaager@pidgin.im>
parents:
12671
diff
changeset
|
357 | return; |
|
323bd864a6f1
[gaim-migrate @ 15191]
Richard Laager <rlaager@pidgin.im>
parents:
12671
diff
changeset
|
358 | |
| 15884 | 359 | if (gc != NULL && dialog->account != purple_connection_get_account(gc)) |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
360 | return; |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
361 | |
| 15884 | 362 | set = !(purple_account_is_connected(dialog->account) || purple_account_is_connecting(dialog->account)); |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
363 | gtk_widget_set_sensitive(dialog->protocol_menu, set); |
|
29226
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
364 | gtk_editable_set_editable(GTK_EDITABLE(dialog->username_entry), set); |
|
39054
1b17478d1d4f
gtkaccount: Fix accidental double-space
Mike Ruprecht <cmaiku@gmail.com>
parents:
39053
diff
changeset
|
365 | style = gtk_widget_get_style_context(dialog->username_entry); |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
366 | |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
367 | if (set) { |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
368 | gtk_style_context_remove_class(style, "copyable-insensitive"); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35475
diff
changeset
|
369 | } else { |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
370 | gtk_style_context_add_class(style, "copyable-insensitive"); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35475
diff
changeset
|
371 | } |
|
29226
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
372 | |
|
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
373 | for (l = dialog->user_split_entries ; l != NULL ; l = l->next) { |
|
36020
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
374 | if (l->data == NULL) |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
375 | continue; |
|
29226
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
376 | if (GTK_IS_EDITABLE(l->data)) { |
|
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
377 | gtk_editable_set_editable(GTK_EDITABLE(l->data), set); |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
378 | style = gtk_widget_get_style_context(GTK_WIDGET(l->data)); |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
379 | if (set) { |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
380 | gtk_style_context_remove_class(style, |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
381 | "copyable-insensitive"); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35475
diff
changeset
|
382 | } else { |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
383 | gtk_style_context_add_class(style, |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
384 | "copyable-insensitive"); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35475
diff
changeset
|
385 | } |
|
29226
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
386 | } else { |
|
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
387 | gtk_widget_set_sensitive(GTK_WIDGET(l->data), set); |
|
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
388 | } |
|
88232e6c5591
Allow copying username (and other settings) for a connected account from
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
27668
diff
changeset
|
389 | } |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
390 | } |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
391 | |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
392 | static void |
| 5774 | 393 | add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent) |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
394 | { |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
395 | GtkWidget *frame; |
|
17035
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
396 | GtkWidget *hbox; |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
397 | GtkWidget *vbox; |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
398 | GtkWidget *entry; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
399 | GList *user_splits; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
400 | GList *l, *l2; |
|
5656
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
401 | char *username = NULL; |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
402 | GtkCssProvider *entry_css; |
|
41030
ec8b76f3bf0a
Fix the resource path so we can use the automatic stuff that GtkApplication supports
Gary Kramlich <grim@reaperworld.com>
parents:
41012
diff
changeset
|
403 | const gchar *res = "/im/pidgin/Pidgin3/Accounts/entry.css"; |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
404 | |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
405 | entry_css = gtk_css_provider_new(); |
|
40552
eb0f386cea6b
Moved all of the inline css in pidgin to resource files
Gary Kramlich <grim@reaperworld.com>
parents:
40533
diff
changeset
|
406 | gtk_css_provider_load_from_resource(entry_css, res); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
407 | |
|
17035
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
408 | if (dialog->protocol_menu != NULL) |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
409 | { |
|
26820
76f90ca8f6f2
Use g_object_ref/unref instead of the deprecated versions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26543
diff
changeset
|
410 | g_object_ref(G_OBJECT(dialog->protocol_menu)); |
|
17035
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
411 | hbox = g_object_get_data(G_OBJECT(dialog->protocol_menu), "container"); |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
412 | gtk_container_remove(GTK_CONTAINER(hbox), dialog->protocol_menu); |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
413 | } |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
414 | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
415 | if (dialog->login_frame != NULL) |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
416 | gtk_widget_destroy(dialog->login_frame); |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
417 | |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
418 | /* Build the login options frame. */ |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
419 | frame = pidgin_make_frame(parent, _("Login Options")); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
420 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
421 | /* cringe */ |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
422 | dialog->login_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
423 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
424 | gtk_box_reorder_child(GTK_BOX(parent), dialog->login_frame, 0); |
|
5641
a9d1f7917dd4
[gaim-migrate @ 6054]
Christian Hammond <chipx86@chipx86.com>
parents:
5638
diff
changeset
|
425 | gtk_widget_show(dialog->login_frame); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
426 | |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
427 | /* Main vbox */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
428 | vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
429 | gtk_container_add(GTK_CONTAINER(frame), vbox); |
|
5641
a9d1f7917dd4
[gaim-migrate @ 6054]
Christian Hammond <chipx86@chipx86.com>
parents:
5638
diff
changeset
|
430 | gtk_widget_show(vbox); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
431 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
432 | /* Protocol */ |
|
40297
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
433 | if(dialog->protocol_menu == NULL) { |
|
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
434 | dialog->protocol_menu = pidgin_protocol_chooser_new(); |
|
40741
850137e8737c
Select the proper protocol in the account editor.
Gary Kramlich <grim@reaperworld.com>
parents:
40707
diff
changeset
|
435 | pidgin_protocol_chooser_set_selected_id(PIDGIN_PROTOCOL_CHOOSER(dialog->protocol_menu), |
|
850137e8737c
Select the proper protocol in the account editor.
Gary Kramlich <grim@reaperworld.com>
parents:
40707
diff
changeset
|
436 | dialog->protocol_id); |
|
40297
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
437 | g_signal_connect(G_OBJECT(dialog->protocol_menu), "changed", |
|
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
438 | G_CALLBACK(set_account_protocol_cb), dialog); |
|
082c07053a79
Add the new PidginProtocolChooser and implement it in account dialog
Gary Kramlich <grim@reaperworld.com>
parents:
40197
diff
changeset
|
439 | gtk_widget_show(dialog->protocol_menu); |
|
26820
76f90ca8f6f2
Use g_object_ref/unref instead of the deprecated versions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26543
diff
changeset
|
440 | g_object_ref(G_OBJECT(dialog->protocol_menu)); |
|
17035
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
441 | } |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
442 | |
|
17563
eb3c8a19ceff
Add some mnemonics to the new/modify account dialog. These are also taken
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17562
diff
changeset
|
443 | hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu); |
|
17035
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
444 | g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox); |
|
c3070e07f6a7
Make Google Talk stick when chosen, rather than jumping right to XMPP.
Richard Laager <rlaager@pidgin.im>
parents:
16889
diff
changeset
|
445 | |
|
26820
76f90ca8f6f2
Use g_object_ref/unref instead of the deprecated versions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26543
diff
changeset
|
446 | g_object_unref(G_OBJECT(dialog->protocol_menu)); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
447 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
448 | /* Username */ |
|
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
449 | dialog->username_entry = gtk_entry_new(); |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
450 | gtk_style_context_add_provider( |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
451 | gtk_widget_get_style_context(dialog->username_entry), |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
452 | GTK_STYLE_PROVIDER(entry_css), |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
453 | GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
454 | g_object_set(G_OBJECT(dialog->username_entry), "truncate-multiline", TRUE, NULL); |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
455 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
456 | add_pref_box(dialog, vbox, _("_Username:"), dialog->username_entry); |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
457 | |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
458 | if (dialog->account != NULL) |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
459 | username = g_strdup(purple_account_get_username(dialog->account)); |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
460 | |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
461 | if (!username && dialog->protocol |
|
39759
ea1401483849
Rename *_GET_*_IFACE to more standard *_GET_IFACE.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39611
diff
changeset
|
462 | && PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, CLIENT, get_account_text_table)) { |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
463 | GHashTable *table; |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
464 | const char *label; |
|
40634
4d3018b00ad4
Fix the PurpleProtocolClient interface and split it out to its own file.
Gary Kramlich <grim@reaperworld.com>
parents:
40552
diff
changeset
|
465 | table = purple_protocol_client_get_account_text_table(PURPLE_PROTOCOL_CLIENT(dialog->protocol), NULL); |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
466 | label = g_hash_table_lookup(table, "login_label"); |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
467 | |
|
33705
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
468 | gtk_entry_set_placeholder_text(GTK_ENTRY(dialog->username_entry), label); |
|
777039ec6a98
Use the builtin placeholder function on GTK3.2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33704
diff
changeset
|
469 | |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
470 | g_hash_table_destroy(table); |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
471 | } |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
472 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
473 | g_signal_connect(G_OBJECT(dialog->username_entry), "changed", |
|
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
474 | G_CALLBACK(username_changed_cb), dialog); |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
475 | |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
476 | /* Do the user split thang */ |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
477 | if (dialog->protocol == NULL) |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
478 | user_splits = NULL; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
479 | else |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
480 | user_splits = purple_protocol_get_user_splits(dialog->protocol); |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
481 | |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
482 | if (dialog->user_split_entries != NULL) { |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
483 | g_list_free(dialog->user_split_entries); |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
484 | dialog->user_split_entries = NULL; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
485 | } |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
486 | |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
487 | for (l = user_splits; l != NULL; l = l->next) { |
| 15884 | 488 | PurpleAccountUserSplit *split = l->data; |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
489 | char *buf; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
490 | |
|
36020
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
491 | if (purple_account_user_split_is_constant(split)) |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
492 | entry = NULL; |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
493 | else { |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
494 | buf = g_strdup_printf("_%s:", purple_account_user_split_get_text(split)); |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
495 | entry = gtk_entry_new(); |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
496 | gtk_style_context_add_provider( |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
497 | gtk_widget_get_style_context(entry), |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
498 | GTK_STYLE_PROVIDER(entry_css), |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
499 | GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); |
|
36020
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
500 | add_pref_box(dialog, vbox, buf, entry); |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
501 | g_free(buf); |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
502 | } |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
503 | |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
504 | dialog->user_split_entries = |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
505 | g_list_append(dialog->user_split_entries, entry); |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
506 | } |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
507 | |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
508 | for (l = g_list_last(dialog->user_split_entries), |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
509 | l2 = g_list_last(user_splits); |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
510 | l != NULL && l2 != NULL; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
511 | l = l->prev, l2 = l2->prev) { |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
512 | |
|
5708
43f6fbb894d5
[gaim-migrate @ 6129]
Christian Hammond <chipx86@chipx86.com>
parents:
5705
diff
changeset
|
513 | GtkWidget *entry = l->data; |
| 15884 | 514 | PurpleAccountUserSplit *split = l2->data; |
|
17851
02fbbecd95f5
Make sure if some plugin used pidgin_protocol_option_menu_new, they continue
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17302
diff
changeset
|
515 | const char *value = NULL; |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
516 | char *c; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
517 | |
|
35689
1e257009ac10
Fix Pidgin clang scan-build warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
518 | if (dialog->account != NULL && username != NULL) { |
|
18099
f38988d232f7
jabber can contain @ symbols and / in the resource, so we have to look for
Nathan Walp <nwalp@pidgin.im>
parents:
18096
diff
changeset
|
519 | if(purple_account_user_split_get_reverse(split)) |
|
f38988d232f7
jabber can contain @ symbols and / in the resource, so we have to look for
Nathan Walp <nwalp@pidgin.im>
parents:
18096
diff
changeset
|
520 | c = strrchr(username, |
|
f38988d232f7
jabber can contain @ symbols and / in the resource, so we have to look for
Nathan Walp <nwalp@pidgin.im>
parents:
18096
diff
changeset
|
521 | purple_account_user_split_get_separator(split)); |
|
f38988d232f7
jabber can contain @ symbols and / in the resource, so we have to look for
Nathan Walp <nwalp@pidgin.im>
parents:
18096
diff
changeset
|
522 | else |
|
f38988d232f7
jabber can contain @ symbols and / in the resource, so we have to look for
Nathan Walp <nwalp@pidgin.im>
parents:
18096
diff
changeset
|
523 | c = strchr(username, |
| 15884 | 524 | purple_account_user_split_get_separator(split)); |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
525 | |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
526 | if (c != NULL) { |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
527 | *c = '\0'; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
528 | c++; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
529 | |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
530 | value = c; |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
531 | } |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
532 | } |
|
5656
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
533 | if (value == NULL) |
| 15884 | 534 | value = purple_account_user_split_get_default_value(split); |
|
5656
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
535 | |
|
36020
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
536 | if (value != NULL && entry != NULL) |
|
5657
6c1febf7aca1
[gaim-migrate @ 6071]
Christian Hammond <chipx86@chipx86.com>
parents:
5656
diff
changeset
|
537 | gtk_entry_set_text(GTK_ENTRY(entry), value); |
|
5653
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
538 | } |
|
a9e3cbee4d0c
[gaim-migrate @ 6067]
Christian Hammond <chipx86@chipx86.com>
parents:
5651
diff
changeset
|
539 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
540 | g_list_free_full(user_splits, |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
541 | (GDestroyNotify)purple_account_user_split_destroy); |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
542 | |
|
5656
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
543 | if (username != NULL) |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
544 | gtk_entry_set_text(GTK_ENTRY(dialog->username_entry), username); |
|
5656
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
545 | |
|
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
546 | g_free(username); |
|
b3eb9f503cdc
[gaim-migrate @ 6070]
Christian Hammond <chipx86@chipx86.com>
parents:
5653
diff
changeset
|
547 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
548 | /* Do not let the user change the protocol/username while connected. */ |
|
12555
3c978a4400f2
[gaim-migrate @ 14874]
Richard Laager <rlaager@pidgin.im>
parents:
12521
diff
changeset
|
549 | update_editable(NULL, dialog); |
| 15884 | 550 | purple_signal_connect(purple_connections_get_handle(), "signing-on", dialog, |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
551 | G_CALLBACK(update_editable), dialog); |
| 15884 | 552 | purple_signal_connect(purple_connections_get_handle(), "signed-off", dialog, |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
553 | G_CALLBACK(update_editable), dialog); |
|
39050
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
554 | |
|
2d6a6d41702b
gtkaccount: Replace deprecated gtk_widget_override_background_color()
Mike Ruprecht <cmaiku@gmail.com>
parents:
38712
diff
changeset
|
555 | g_object_unref(entry_css); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
556 | } |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
557 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
558 | static void |
| 14195 | 559 | icon_check_cb(GtkWidget *checkbox, AccountPrefsDialog *dialog) |
| 560 | { | |
| 561 | gtk_widget_set_sensitive(dialog->icon_hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))); | |
| 562 | } | |
| 563 | ||
| 564 | static void | |
| 5774 | 565 | add_user_options(AccountPrefsDialog *dialog, GtkWidget *parent) |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
566 | { |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
567 | GtkWidget *frame; |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
568 | GtkWidget *vbox; |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
569 | GtkWidget *vbox2; |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
570 | GtkWidget *hbox; |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
571 | GtkWidget *hbox2; |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
572 | GtkWidget *button; |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
573 | GtkWidget *label; |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
574 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
575 | if (dialog->user_frame != NULL) |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
576 | gtk_widget_destroy(dialog->user_frame); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
577 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
578 | /* Build the user options frame. */ |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
579 | frame = pidgin_make_frame(parent, _("User Options")); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
580 | dialog->user_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
581 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
582 | gtk_box_reorder_child(GTK_BOX(parent), dialog->user_frame, 1); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
583 | gtk_widget_show(dialog->user_frame); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
584 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
585 | /* Main vbox */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
586 | vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
587 | gtk_container_add(GTK_CONTAINER(frame), vbox); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
588 | gtk_widget_show(vbox); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
589 | |
|
22933
fe1e09e03bcb
Move the Local Alias field into the User Options section of the account
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22455
diff
changeset
|
590 | /* Alias */ |
|
fe1e09e03bcb
Move the Local Alias field into the User Options section of the account
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22455
diff
changeset
|
591 | dialog->alias_entry = gtk_entry_new(); |
|
fe1e09e03bcb
Move the Local Alias field into the User Options section of the account
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22455
diff
changeset
|
592 | add_pref_box(dialog, vbox, _("_Local alias:"), dialog->alias_entry); |
|
fe1e09e03bcb
Move the Local Alias field into the User Options section of the account
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22455
diff
changeset
|
593 | |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
594 | /* Buddy icon */ |
|
17563
eb3c8a19ceff
Add some mnemonics to the new/modify account dialog. These are also taken
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17562
diff
changeset
|
595 | dialog->icon_check = gtk_check_button_new_with_mnemonic(_("Use this buddy _icon for this account:")); |
| 14195 | 596 | g_signal_connect(G_OBJECT(dialog->icon_check), "toggled", G_CALLBACK(icon_check_cb), dialog); |
| 597 | gtk_widget_show(dialog->icon_check); | |
| 598 | gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0); | |
| 599 | ||
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
600 | dialog->icon_hbox = hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); |
| 14195 | 601 | gtk_widget_set_sensitive(hbox, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
602 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
603 | gtk_widget_show(hbox); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
604 | |
| 14195 | 605 | label = gtk_label_new(" "); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
606 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
607 | gtk_widget_show(label); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
608 | |
|
14764
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
609 | button = gtk_button_new(); |
|
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
610 | gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); |
|
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
611 | gtk_widget_show(button); |
|
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
612 | g_signal_connect(G_OBJECT(button), "clicked", |
|
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
613 | G_CALLBACK(icon_select_cb), dialog); |
|
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
614 | |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
615 | dialog->icon_entry = gtk_image_new(); |
|
14764
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
616 | gtk_container_add(GTK_CONTAINER(button), dialog->icon_entry); |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
617 | gtk_widget_show(dialog->icon_entry); |
|
14764
1a07873891aa
[gaim-migrate @ 17454]
Mark Doliner <markdoliner@pidgin.im>
parents:
14671
diff
changeset
|
618 | /* TODO: Uh, isn't this next line pretty useless? */ |
|
35721
abae078d0525
Fix some warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
619 | pidgin_set_accessible_label(dialog->icon_entry, GTK_LABEL(label)); |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
620 | if (dialog->icon_img) { |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
621 | g_object_unref(dialog->icon_img); |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
622 | dialog->icon_img = NULL; |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
623 | } |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
624 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
625 | vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
626 | gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 0); |
|
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
627 | gtk_widget_show(vbox2); |
|
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
628 | |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
629 | hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
630 | gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, 12); |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
631 | gtk_widget_show(hbox2); |
|
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
632 | |
|
39051
1b8c6378f8ba
gtkaccount: Replace GTK_STOCK_* and PIDGIN_STOCK_* usage with strings
Mike Ruprecht <cmaiku@gmail.com>
parents:
39050
diff
changeset
|
633 | button = gtk_button_new_with_mnemonic(_("_Remove")); |
| 5826 | 634 | g_signal_connect(G_OBJECT(button), "clicked", |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
635 | G_CALLBACK(icon_reset_cb), dialog); |
|
9333
d8b5ebef7b28
[gaim-migrate @ 10141]
Christian Hammond <chipx86@chipx86.com>
parents:
9318
diff
changeset
|
636 | gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
637 | gtk_widget_show(button); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
638 | |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
639 | if (dialog->protocol != NULL) { |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
640 | PurpleBuddyIconSpec *icon_spec = purple_protocol_get_icon_spec(dialog->protocol); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
641 | |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
642 | if (!icon_spec || icon_spec->format == NULL) { |
|
19764
9485b7cccfca
If a prpl doesn't support icons then hide the "use a custom icon?"
Mark Doliner <markdoliner@pidgin.im>
parents:
19683
diff
changeset
|
643 | gtk_widget_hide(dialog->icon_check); |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
644 | gtk_widget_hide(dialog->icon_hbox); |
| 19773 | 645 | } |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
646 | |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
647 | purple_buddy_icon_spec_free(icon_spec); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
648 | } |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
649 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
650 | if (dialog->account != NULL) { |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
651 | PurpleImage *img; |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
652 | gpointer data = NULL; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
653 | size_t len = 0; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
654 | |
|
34589
428e92c79631
Renamed purple_account_[get,set]_alias to purple_account[get,set]_private_alias.
Ankit Vani <a@nevitus.org>
parents:
34586
diff
changeset
|
655 | if (purple_account_get_private_alias(dialog->account)) |
|
22982
bd5a732d899b
Fix the breakage with account aliases that I introduced when I moved the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22942
diff
changeset
|
656 | gtk_entry_set_text(GTK_ENTRY(dialog->alias_entry), |
|
34589
428e92c79631
Renamed purple_account_[get,set]_alias to purple_account[get,set]_private_alias.
Ankit Vani <a@nevitus.org>
parents:
34586
diff
changeset
|
657 | purple_account_get_private_alias(dialog->account)); |
|
22982
bd5a732d899b
Fix the breakage with account aliases that I introduced when I moved the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22942
diff
changeset
|
658 | |
| 14195 | 659 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->icon_check), |
| 15884 | 660 | !purple_account_get_bool(dialog->account, "use-global-buddyicon", |
| 14195 | 661 | TRUE)); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
662 | |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
663 | img = purple_buddy_icons_find_account_icon(dialog->account); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
664 | if (img) |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
665 | { |
|
38298
f0a8f63f9312
rename purple_image_get_size to purple_image_get_data_size and deal with the fallout
Gary Kramlich <grim@reaperworld.com>
parents:
38285
diff
changeset
|
666 | len = purple_image_get_data_size(img); |
|
40756
3a58ef28ee44
Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents:
40741
diff
changeset
|
667 | data = g_memdup2(purple_image_get_data(img), len); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
668 | } |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
669 | set_dialog_icon(dialog, data, len, |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
670 | g_strdup(purple_account_get_buddy_icon_path(dialog->account))); |
|
15132
672c39839af1
[gaim-migrate @ 17854]
Mark Huetsch <markhuetsch@users.sourceforge.net>
parents:
15119
diff
changeset
|
671 | } else { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
672 | set_dialog_icon(dialog, NULL, 0, NULL); |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
673 | } |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
674 | |
|
22940
380c5bd5df65
This fixes the lack of the Local Alias field for IRC accounts since I moved
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22933
diff
changeset
|
675 | #if 0 |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
676 | if (!dialog->protocol || |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
677 | (!(purple_protocol_get_options(dialog->protocol) & OPT_PROTO_MAIL_CHECK) && |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
678 | (purple_protocol_get_icon_spec(dialog->protocol).format == NULL))) { |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
679 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
680 | /* Nothing to see :( aww. */ |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
681 | gtk_widget_hide(dialog->user_frame); |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
682 | } |
|
22940
380c5bd5df65
This fixes the lack of the Local Alias field for IRC accounts since I moved
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22933
diff
changeset
|
683 | #endif |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
684 | } |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
685 | |
|
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
686 | static void |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
687 | protocol_opt_entry_free(ProtocolOptEntry *opt_entry) |
|
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
688 | { |
| 40139 | 689 | g_return_if_fail(opt_entry != NULL); |
| 690 | ||
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
691 | g_free(opt_entry->setting); |
|
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
692 | g_free(opt_entry); |
|
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
693 | } |
|
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
694 | |
|
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
695 | static void |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
36928
diff
changeset
|
696 | add_account_options(AccountPrefsDialog *dialog) |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
697 | { |
| 15884 | 698 | PurpleAccountOption *option; |
| 699 | PurpleAccount *account; | |
|
38091
be8d0f7d0041
Remove Facebook (XMPP) account option and support code
Mike Ruprecht <cmaiku@gmail.com>
parents:
35929
diff
changeset
|
700 | GtkWidget *vbox, *check, *entry, *combo; |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
701 | GList *list, *node, *opts; |
| 12185 | 702 | gint i, idx, int_value; |
| 12106 | 703 | GtkListStore *model; |
| 704 | GtkTreeIter iter; | |
| 705 | GtkCellRenderer *renderer; | |
| 15884 | 706 | PurpleKeyValuePair *kvp; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
707 | GList *l; |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
708 | char buf[1024]; |
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
709 | char *title, *tmp; |
|
17851
02fbbecd95f5
Make sure if some plugin used pidgin_protocol_option_menu_new, they continue
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
17302
diff
changeset
|
710 | const char *str_value; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
711 | gboolean bool_value; |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
712 | ProtocolOptEntry *opt_entry; |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
713 | const GSList *str_hints; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
714 | |
|
5689
340d70c1ba9d
[gaim-migrate @ 6110]
Christian Hammond <chipx86@chipx86.com>
parents:
5688
diff
changeset
|
715 | if (dialog->protocol_frame != NULL) { |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
716 | gtk_notebook_remove_page (GTK_NOTEBOOK(dialog->notebook), 1); |
|
5689
340d70c1ba9d
[gaim-migrate @ 6110]
Christian Hammond <chipx86@chipx86.com>
parents:
5688
diff
changeset
|
717 | dialog->protocol_frame = NULL; |
|
340d70c1ba9d
[gaim-migrate @ 6110]
Christian Hammond <chipx86@chipx86.com>
parents:
5688
diff
changeset
|
718 | } |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
719 | |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
720 | g_list_free_full(dialog->protocol_opt_entries, (GDestroyNotify)protocol_opt_entry_free); |
| 40141 | 721 | dialog->protocol_opt_entries = NULL; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
722 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
723 | if (dialog->protocol == NULL) { |
|
25730
c2698534cbb1
Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)
Daniel Atallah <datallah@pidgin.im>
parents:
25529
diff
changeset
|
724 | return; |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
725 | } |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
726 | |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
727 | opts = purple_protocol_get_account_options(dialog->protocol); |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
728 | if(opts == NULL) { |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
729 | return; |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
730 | } |
|
25730
c2698534cbb1
Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)
Daniel Atallah <datallah@pidgin.im>
parents:
25529
diff
changeset
|
731 | |
|
5690
282596819f53
[gaim-migrate @ 6111]
Christian Hammond <chipx86@chipx86.com>
parents:
5689
diff
changeset
|
732 | account = dialog->account; |
|
282596819f53
[gaim-migrate @ 6111]
Christian Hammond <chipx86@chipx86.com>
parents:
5689
diff
changeset
|
733 | |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
734 | /* Main vbox */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
735 | dialog->protocol_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
736 | gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
737 | gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox, |
|
27668
536cb7a2d348
s/_Advanced/Ad_vanced/ and s/_Proxy/P_roxy/ in the tabs of the Add/Modify
Etan Reisner <deryni@pidgin.im>
parents:
27603
diff
changeset
|
738 | gtk_label_new_with_mnemonic(_("Ad_vanced")), 1); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
739 | gtk_widget_show(vbox); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
740 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
741 | for (l = opts; l != NULL; l = l->next) |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
742 | { |
| 15884 | 743 | option = (PurpleAccountOption *)l->data; |
| 744 | ||
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
745 | opt_entry = g_new0(ProtocolOptEntry, 1); |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35040
diff
changeset
|
746 | opt_entry->type = purple_account_option_get_pref_type(option); |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
747 | opt_entry->setting = g_strdup(purple_account_option_get_setting(option)); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
748 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
749 | switch (opt_entry->type) |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
750 | { |
| 15884 | 751 | case PURPLE_PREF_BOOLEAN: |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
752 | if (account == NULL || |
|
38259
c593fc9f5438
Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38258
diff
changeset
|
753 | !purple_strequal(purple_account_get_protocol_id(account), |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
754 | dialog->protocol_id)) |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
755 | { |
| 15884 | 756 | bool_value = purple_account_option_get_default_bool(option); |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
757 | } |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
758 | else |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
759 | { |
| 15884 | 760 | bool_value = purple_account_get_bool(account, |
| 761 | purple_account_option_get_setting(option), | |
| 762 | purple_account_option_get_default_bool(option)); | |
| 7956 | 763 | } |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
764 | |
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
765 | tmp = g_strconcat("_", purple_account_option_get_text(option), NULL); |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
766 | opt_entry->widget = check = gtk_check_button_new_with_mnemonic(tmp); |
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
767 | g_free(tmp); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
768 | |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
769 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
770 | bool_value); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
771 | |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
772 | gtk_box_pack_start(GTK_BOX(vbox), check, FALSE, FALSE, 0); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
773 | gtk_widget_show(check); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
774 | break; |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
775 | |
| 15884 | 776 | case PURPLE_PREF_INT: |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
777 | if (account == NULL || |
|
38259
c593fc9f5438
Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38258
diff
changeset
|
778 | !purple_strequal(purple_account_get_protocol_id(account), |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
779 | dialog->protocol_id)) |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
780 | { |
| 15884 | 781 | int_value = purple_account_option_get_default_int(option); |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
782 | } |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
783 | else |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
784 | { |
| 15884 | 785 | int_value = purple_account_get_int(account, |
| 786 | purple_account_option_get_setting(option), | |
| 787 | purple_account_option_get_default_int(option)); | |
| 7956 | 788 | } |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
789 | |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
790 | g_snprintf(buf, sizeof(buf), "%d", int_value); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
791 | |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
792 | opt_entry->widget = entry = gtk_entry_new(); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
793 | gtk_entry_set_text(GTK_ENTRY(entry), buf); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
794 | |
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
795 | title = g_strdup_printf("_%s:", |
| 15884 | 796 | purple_account_option_get_text(option)); |
| 5774 | 797 | add_pref_box(dialog, vbox, title, entry); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
798 | g_free(title); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
799 | break; |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
800 | |
| 15884 | 801 | case PURPLE_PREF_STRING: |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
802 | if (account == NULL || |
|
38259
c593fc9f5438
Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38258
diff
changeset
|
803 | !purple_strequal(purple_account_get_protocol_id(account), |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
804 | dialog->protocol_id)) |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
805 | { |
| 15884 | 806 | str_value = purple_account_option_get_default_string(option); |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
807 | } |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
808 | else |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
809 | { |
| 15884 | 810 | str_value = purple_account_get_string(account, |
| 811 | purple_account_option_get_setting(option), | |
| 812 | purple_account_option_get_default_string(option)); | |
| 7956 | 813 | } |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
814 | |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
815 | str_hints = purple_account_option_string_get_hints(option); |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
816 | if (str_hints) |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
817 | { |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
818 | const GSList *hint_it = str_hints; |
|
33268
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
819 | entry = gtk_combo_box_text_new_with_entry(); |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
820 | while (hint_it) |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
821 | { |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
822 | const gchar *hint = hint_it->data; |
|
33268
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
823 | hint_it = g_slist_next(hint_it); |
|
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
824 | gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(entry), |
|
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
825 | hint); |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
826 | } |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
827 | } |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
828 | else |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
829 | entry = gtk_entry_new(); |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
830 | |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
831 | opt_entry->widget = entry; |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
832 | if (purple_account_option_string_get_masked(option) && str_hints) |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
833 | g_warn_if_reached(); |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
834 | else if (purple_account_option_string_get_masked(option)) |
|
11986
21d2ab6421a7
[gaim-migrate @ 14279]
Mark Doliner <markdoliner@pidgin.im>
parents:
11985
diff
changeset
|
835 | { |
|
10658
6223ea383921
[gaim-migrate @ 12190]
Richard Laager <rlaager@pidgin.im>
parents:
10649
diff
changeset
|
836 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
|
11986
21d2ab6421a7
[gaim-migrate @ 14279]
Mark Doliner <markdoliner@pidgin.im>
parents:
11985
diff
changeset
|
837 | } |
|
5663
05c9effe5b5f
[gaim-migrate @ 6077]
Christian Hammond <chipx86@chipx86.com>
parents:
5662
diff
changeset
|
838 | |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
839 | if (str_value != NULL && str_hints) |
|
33268
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
840 | gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), |
|
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
841 | str_value); |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
842 | else |
|
36019
b12e7444a0cb
Facebook XMPP: disable some unsupported features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35972
diff
changeset
|
843 | gtk_entry_set_text(GTK_ENTRY(entry), str_value ? str_value : ""); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
844 | |
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
845 | title = g_strdup_printf("_%s:", |
| 15884 | 846 | purple_account_option_get_text(option)); |
| 5774 | 847 | add_pref_box(dialog, vbox, title, entry); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
848 | g_free(title); |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
849 | break; |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
850 | |
| 15884 | 851 | case PURPLE_PREF_STRING_LIST: |
| 12106 | 852 | i = 0; |
|
12172
717fa0ec02c4
[gaim-migrate @ 14474]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12152
diff
changeset
|
853 | idx = 0; |
| 12106 | 854 | |
| 855 | if (account == NULL || | |
|
38259
c593fc9f5438
Replace strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38258
diff
changeset
|
856 | !purple_strequal(purple_account_get_protocol_id(account), |
| 12106 | 857 | dialog->protocol_id)) |
| 858 | { | |
| 15884 | 859 | str_value = purple_account_option_get_default_list_value(option); |
| 12106 | 860 | } |
| 861 | else | |
| 862 | { | |
| 15884 | 863 | str_value = purple_account_get_string(account, |
| 864 | purple_account_option_get_setting(option), | |
| 865 | purple_account_option_get_default_list_value(option)); | |
| 12106 | 866 | } |
| 867 | ||
| 15884 | 868 | list = purple_account_option_get_list(option); |
| 12106 | 869 | model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
870 | opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); |
| 12106 | 871 | |
| 15884 | 872 | /* Loop through list of PurpleKeyValuePair items */ |
| 12106 | 873 | for (node = list; node != NULL; node = node->next) { |
| 874 | if (node->data != NULL) { | |
| 15884 | 875 | kvp = (PurpleKeyValuePair *) node->data; |
|
12172
717fa0ec02c4
[gaim-migrate @ 14474]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12152
diff
changeset
|
876 | if ((kvp->value != NULL) && (str_value != NULL) && |
|
15080
bb09a291a99b
[gaim-migrate @ 17800]
Daniel Atallah <datallah@pidgin.im>
parents:
15054
diff
changeset
|
877 | !g_utf8_collate(kvp->value, str_value)) |
|
12172
717fa0ec02c4
[gaim-migrate @ 14474]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12152
diff
changeset
|
878 | idx = i; |
| 12106 | 879 | |
| 880 | gtk_list_store_append(model, &iter); | |
| 881 | gtk_list_store_set(model, &iter, | |
| 882 | 0, kvp->key, | |
| 883 | 1, kvp->value, | |
| 884 | -1); | |
| 885 | } | |
| 886 | ||
| 887 | i++; | |
| 888 | } | |
| 889 | ||
| 890 | /* Set default */ | |
|
12172
717fa0ec02c4
[gaim-migrate @ 14474]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12152
diff
changeset
|
891 | gtk_combo_box_set_active(GTK_COMBO_BOX(combo), idx); |
| 12106 | 892 | |
| 893 | /* Define renderer */ | |
| 894 | renderer = gtk_cell_renderer_text_new(); | |
| 895 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, | |
| 896 | TRUE); | |
| 897 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), | |
| 898 | renderer, "text", 0, NULL); | |
| 899 | ||
|
17672
a5c4e192659a
Add mnemonics to prpl provided account options, from OpenSolaris patch
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
17654
diff
changeset
|
900 | title = g_strdup_printf("_%s:", |
| 15884 | 901 | purple_account_option_get_text(option)); |
| 12106 | 902 | add_pref_box(dialog, vbox, title, combo); |
| 903 | g_free(title); | |
| 904 | break; | |
| 905 | ||
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
906 | default: |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
907 | purple_debug_error("gtkaccount", "Invalid Account Option pref type (%d)\n", |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
908 | opt_entry->type); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
909 | g_free(opt_entry->setting); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
910 | g_free(opt_entry); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
911 | continue; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
912 | } |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
913 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
914 | dialog->protocol_opt_entries = |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
915 | g_list_append(dialog->protocol_opt_entries, opt_entry); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
916 | |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
917 | } |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
918 | g_list_free_full(opts, (GDestroyNotify)purple_account_option_destroy); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
919 | } |
|
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
920 | |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
921 | static GtkWidget * |
| 5774 | 922 | make_proxy_dropdown(void) |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
923 | { |
|
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
924 | GtkWidget *dropdown; |
| 8555 | 925 | GtkListStore *model; |
| 926 | GtkTreeIter iter; | |
| 927 | GtkCellRenderer *renderer; | |
| 928 | ||
| 929 | model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT); | |
| 930 | dropdown = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); | |
| 931 | ||
| 932 | gtk_list_store_append(model, &iter); | |
| 933 | gtk_list_store_set(model, &iter, | |
| 15884 | 934 | 0, purple_running_gnome() ? _("Use GNOME Proxy Settings") |
| 15109 | 935 | :_("Use Global Proxy Settings"), |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
936 | 1, PURPLE_PROXY_TYPE_USE_GLOBAL, |
| 8555 | 937 | -1); |
| 938 | ||
| 939 | gtk_list_store_append(model, &iter); | |
| 940 | gtk_list_store_set(model, &iter, | |
| 941 | 0, _("No Proxy"), | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
942 | 1, PURPLE_PROXY_TYPE_NONE, |
| 8555 | 943 | -1); |
| 944 | ||
| 945 | gtk_list_store_append(model, &iter); | |
| 946 | gtk_list_store_set(model, &iter, | |
| 947 | 0, _("SOCKS 4"), | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
948 | 1, PURPLE_PROXY_TYPE_SOCKS4, |
| 8555 | 949 | -1); |
| 950 | ||
| 951 | gtk_list_store_append(model, &iter); | |
| 952 | gtk_list_store_set(model, &iter, | |
| 953 | 0, _("SOCKS 5"), | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
954 | 1, PURPLE_PROXY_TYPE_SOCKS5, |
| 8555 | 955 | -1); |
| 956 | ||
| 957 | gtk_list_store_append(model, &iter); | |
| 958 | gtk_list_store_set(model, &iter, | |
|
31677
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31642
diff
changeset
|
959 | 0, _("Tor/Privacy (SOCKS5)"), |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
960 | 1, PURPLE_PROXY_TYPE_TOR, |
|
31677
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31642
diff
changeset
|
961 | -1); |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31642
diff
changeset
|
962 | |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31642
diff
changeset
|
963 | gtk_list_store_append(model, &iter); |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31642
diff
changeset
|
964 | gtk_list_store_set(model, &iter, |
|
31734
cec02d1d1c13
Fix account-specific proxy config GUI to use same ordering as global proxy GUI.
Daniel Atallah <datallah@pidgin.im>
parents:
31733
diff
changeset
|
965 | 0, _("HTTP"), |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
966 | 1, PURPLE_PROXY_TYPE_HTTP, |
|
31734
cec02d1d1c13
Fix account-specific proxy config GUI to use same ordering as global proxy GUI.
Daniel Atallah <datallah@pidgin.im>
parents:
31733
diff
changeset
|
967 | -1); |
|
cec02d1d1c13
Fix account-specific proxy config GUI to use same ordering as global proxy GUI.
Daniel Atallah <datallah@pidgin.im>
parents:
31733
diff
changeset
|
968 | |
|
cec02d1d1c13
Fix account-specific proxy config GUI to use same ordering as global proxy GUI.
Daniel Atallah <datallah@pidgin.im>
parents:
31733
diff
changeset
|
969 | gtk_list_store_append(model, &iter); |
|
cec02d1d1c13
Fix account-specific proxy config GUI to use same ordering as global proxy GUI.
Daniel Atallah <datallah@pidgin.im>
parents:
31733
diff
changeset
|
970 | gtk_list_store_set(model, &iter, |
| 8555 | 971 | 0, _("Use Environmental Settings"), |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
972 | 1, PURPLE_PROXY_TYPE_USE_ENVVAR, |
| 8555 | 973 | -1); |
| 974 | ||
| 975 | renderer = gtk_cell_renderer_text_new(); | |
| 976 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, TRUE); | |
| 977 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer, | |
| 978 | "text", 0, NULL); | |
| 979 | ||
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
980 | return dropdown; |
|
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
981 | } |
|
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
982 | |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
983 | static void |
| 8555 | 984 | proxy_type_changed_cb(GtkWidget *menu, AccountPrefsDialog *dialog) |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
985 | { |
|
31733
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
986 | GtkTreeIter iter; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
987 | |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
988 | if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(menu), &iter)) { |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
989 | int int_value; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
990 | gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(menu)), &iter, |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
991 | 1, &int_value, -1); |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
992 | dialog->new_proxy_type = int_value; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
993 | } |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
994 | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
995 | if (dialog->new_proxy_type == PURPLE_PROXY_TYPE_USE_GLOBAL || |
|
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
996 | dialog->new_proxy_type == PURPLE_PROXY_TYPE_NONE || |
|
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
997 | dialog->new_proxy_type == PURPLE_PROXY_TYPE_USE_ENVVAR) { |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
998 | |
|
33133
9a31f084f259
Fix some merge errors.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33132
diff
changeset
|
999 | gtk_widget_hide(dialog->proxy_vbox); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1000 | } |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1001 | else |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1002 | gtk_widget_show_all(dialog->proxy_vbox); |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1003 | } |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1004 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1005 | static void |
| 5774 | 1006 | port_popup_cb(GtkWidget *w, GtkMenu *menu, gpointer data) |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1007 | { |
|
13702
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1008 | GtkWidget *item1; |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1009 | GtkWidget *item2; |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1010 | |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1011 | /* This is an easter egg. |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1012 | It means one of two things, both intended as humourus: |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1013 | A) your network is really slow and you have nothing better to do than |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1014 | look at butterflies. |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1015 | B)You are looking really closely at something that shouldn't matter. */ |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1016 | item1 = gtk_menu_item_new_with_label(_("If you look real closely")); |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1017 | |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1018 | /* This is an easter egg. See the comment on the previous line in the source. */ |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1019 | item2 = gtk_menu_item_new_with_label(_("you can see the butterflies mating")); |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1020 | |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1021 | gtk_widget_show(item1); |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1022 | gtk_widget_show(item2); |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1023 | |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1024 | /* Prepend these in reverse order so they appear correctly. */ |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1025 | gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item2); |
|
35310965f38a
[gaim-migrate @ 16103]
Richard Laager <rlaager@pidgin.im>
parents:
13640
diff
changeset
|
1026 | gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item1); |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1027 | } |
|
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1028 | |
|
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1029 | static void |
| 5774 | 1030 | add_proxy_options(AccountPrefsDialog *dialog, GtkWidget *parent) |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1031 | { |
| 15884 | 1032 | PurpleProxyInfo *proxy_info; |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1033 | GtkWidget *vbox; |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1034 | GtkWidget *vbox2; |
|
31733
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1035 | GtkTreeIter iter; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1036 | GtkTreeModel *proxy_model; |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1037 | |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1038 | if (dialog->proxy_frame != NULL) |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1039 | gtk_widget_destroy(dialog->proxy_frame); |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1040 | |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1041 | /* Main vbox */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1042 | dialog->proxy_frame = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1043 | gtk_container_add(GTK_CONTAINER(parent), vbox); |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1044 | gtk_widget_show(vbox); |
|
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1045 | |
|
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1046 | /* Proxy Type drop-down. */ |
| 5774 | 1047 | dialog->proxy_dropdown = make_proxy_dropdown(); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1048 | |
| 5774 | 1049 | add_pref_box(dialog, vbox, _("Proxy _type:"), dialog->proxy_dropdown); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1050 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1051 | /* Setup the second vbox, which may be hidden at times. */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1052 | dialog->proxy_vbox = vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1053 | gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 12); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1054 | gtk_widget_show(vbox2); |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1055 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1056 | /* Host */ |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1057 | dialog->proxy_host_entry = gtk_entry_new(); |
| 5774 | 1058 | add_pref_box(dialog, vbox2, _("_Host:"), dialog->proxy_host_entry); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1059 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1060 | /* Port */ |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1061 | dialog->proxy_port_entry = gtk_entry_new(); |
| 5774 | 1062 | add_pref_box(dialog, vbox2, _("_Port:"), dialog->proxy_port_entry); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1063 | |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1064 | g_signal_connect(G_OBJECT(dialog->proxy_port_entry), "populate-popup", |
| 5774 | 1065 | G_CALLBACK(port_popup_cb), NULL); |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1066 | |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1067 | /* User */ |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1068 | dialog->proxy_user_entry = gtk_entry_new(); |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1069 | |
| 5774 | 1070 | add_pref_box(dialog, vbox2, _("_Username:"), dialog->proxy_user_entry); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1071 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1072 | /* Password */ |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1073 | dialog->proxy_pass_entry = gtk_entry_new(); |
|
5700
8a0df68ba664
[gaim-migrate @ 6121]
Christian Hammond <chipx86@chipx86.com>
parents:
5699
diff
changeset
|
1074 | gtk_entry_set_visibility(GTK_ENTRY(dialog->proxy_pass_entry), FALSE); |
| 5774 | 1075 | add_pref_box(dialog, vbox2, _("Pa_ssword:"), dialog->proxy_pass_entry); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1076 | |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1077 | if (dialog->account != NULL && |
| 15884 | 1078 | (proxy_info = purple_account_get_proxy_info(dialog->account)) != NULL) { |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1079 | const char *value; |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1080 | int int_val; |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1081 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35040
diff
changeset
|
1082 | dialog->new_proxy_type = purple_proxy_info_get_proxy_type(proxy_info); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1083 | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1084 | if ((value = purple_proxy_info_get_hostname(proxy_info)) != NULL) |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1085 | gtk_entry_set_text(GTK_ENTRY(dialog->proxy_host_entry), value); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1086 | |
| 15884 | 1087 | if ((int_val = purple_proxy_info_get_port(proxy_info)) != 0) { |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1088 | char buf[11]; |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1089 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1090 | g_snprintf(buf, sizeof(buf), "%d", int_val); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1091 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1092 | gtk_entry_set_text(GTK_ENTRY(dialog->proxy_port_entry), buf); |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1093 | } |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1094 | |
| 15884 | 1095 | if ((value = purple_proxy_info_get_username(proxy_info)) != NULL) |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1096 | gtk_entry_set_text(GTK_ENTRY(dialog->proxy_user_entry), value); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1097 | |
| 15884 | 1098 | if ((value = purple_proxy_info_get_password(proxy_info)) != NULL) |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1099 | gtk_entry_set_text(GTK_ENTRY(dialog->proxy_pass_entry), value); |
|
31733
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1100 | |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1101 | } else |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1102 | dialog->new_proxy_type = PURPLE_PROXY_TYPE_USE_GLOBAL; |
|
31733
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1103 | |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1104 | proxy_model = gtk_combo_box_get_model( |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1105 | GTK_COMBO_BOX(dialog->proxy_dropdown)); |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1106 | if (gtk_tree_model_get_iter_first(proxy_model, &iter)) { |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1107 | int int_val; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1108 | do { |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1109 | gtk_tree_model_get(proxy_model, &iter, 1, &int_val, -1); |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1110 | if (int_val == dialog->new_proxy_type) { |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1111 | gtk_combo_box_set_active_iter( |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1112 | GTK_COMBO_BOX(dialog->proxy_dropdown), &iter); |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1113 | break; |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1114 | } |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1115 | } while(gtk_tree_model_iter_next(proxy_model, &iter)); |
|
6856
5ed6b8356ebc
[gaim-migrate @ 7401]
Mark Doliner <markdoliner@pidgin.im>
parents:
6751
diff
changeset
|
1116 | } |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1117 | |
|
31733
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1118 | proxy_type_changed_cb(dialog->proxy_dropdown, dialog); |
|
047a697778c3
Fix account-specific proxy selection GUI to not be dependent enum ordering.
Daniel Atallah <datallah@pidgin.im>
parents:
31677
diff
changeset
|
1119 | |
|
5687
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1120 | /* Connect signals. */ |
|
2c8a3137f1b8
[gaim-migrate @ 6108]
Christian Hammond <chipx86@chipx86.com>
parents:
5686
diff
changeset
|
1121 | g_signal_connect(G_OBJECT(dialog->proxy_dropdown), "changed", |
| 5774 | 1122 | G_CALLBACK(proxy_type_changed_cb), dialog); |
|
5681
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1123 | } |
|
514fbc5374dc
[gaim-migrate @ 6100]
Christian Hammond <chipx86@chipx86.com>
parents:
5664
diff
changeset
|
1124 | |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1125 | static void |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1126 | add_voice_options(AccountPrefsDialog *dialog) |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1127 | { |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1128 | #ifdef USE_VV |
|
39759
ea1401483849
Rename *_GET_*_IFACE to more standard *_GET_IFACE.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39611
diff
changeset
|
1129 | if (!dialog->protocol || !PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, MEDIA, initiate_session)) { |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1130 | if (dialog->voice_frame) { |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1131 | gtk_widget_destroy(dialog->voice_frame); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1132 | dialog->voice_frame = NULL; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1133 | dialog->suppression_check = NULL; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1134 | } |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1135 | return; |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1136 | } |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1137 | |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1138 | if (!dialog->voice_frame) { |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1139 | dialog->voice_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1140 | gtk_container_set_border_width(GTK_CONTAINER(dialog->voice_frame), 12); |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1141 | |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1142 | dialog->suppression_check = |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1143 | gtk_check_button_new_with_mnemonic(_("Use _silence suppression")); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1144 | gtk_box_pack_start(GTK_BOX(dialog->voice_frame), dialog->suppression_check, |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1145 | FALSE, FALSE, 0); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1146 | |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1147 | gtk_notebook_append_page(GTK_NOTEBOOK(dialog->notebook), |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1148 | dialog->voice_frame, gtk_label_new_with_mnemonic(_("_Voice and Video"))); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1149 | gtk_widget_show_all(dialog->voice_frame); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1150 | } |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1151 | |
|
32931
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1152 | if (dialog->account) { |
|
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1153 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->suppression_check), |
|
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1154 | purple_account_get_silence_suppression(dialog->account)); |
|
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1155 | } else { |
|
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1156 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->suppression_check), FALSE); |
|
5aaf2dd75f1c
Use a reasonable default in VV prefs if the account isn't created yet.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32929
diff
changeset
|
1157 | } |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1158 | #endif |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1159 | } |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1160 | |
|
22032
8136dd5eeda3
Make some more event handlers return appropriate gboolean values. This turns
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22023
diff
changeset
|
1161 | static gboolean |
| 5774 | 1162 | account_win_destroy_cb(GtkWidget *w, GdkEvent *event, |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1163 | AccountPrefsDialog *dialog) |
|
5692
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1164 | { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1165 | g_hash_table_remove(account_pref_wins, dialog->account); |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1166 | |
| 7450 | 1167 | gtk_widget_destroy(dialog->window); |
| 1168 | ||
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14087
diff
changeset
|
1169 | g_list_free(dialog->user_split_entries); |
|
40137
016690872c6c
Add new and free functions for structs to reduce duplication
qarkai <qarkai@gmail.com>
parents:
40046
diff
changeset
|
1170 | g_list_free_full(dialog->protocol_opt_entries, (GDestroyNotify)protocol_opt_entry_free); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14087
diff
changeset
|
1171 | g_free(dialog->protocol_id); |
|
21123
7dbce8723eff
Fix a leak of a GtkSizeGroup.
Daniel Atallah <datallah@pidgin.im>
parents:
20228
diff
changeset
|
1172 | g_object_unref(dialog->sg); |
|
5978
e9bbb1ec8c89
[gaim-migrate @ 6425]
Christian Hammond <chipx86@chipx86.com>
parents:
5966
diff
changeset
|
1173 | |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
1174 | if (dialog->icon_img) |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
1175 | g_object_unref(dialog->icon_img); |
|
10519
80801a34a246
[gaim-migrate @ 11833]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10432
diff
changeset
|
1176 | |
|
39930
411f3df51bcd
Convert to GtkFileChooserNative.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39759
diff
changeset
|
1177 | g_clear_object(&dialog->icon_filesel); |
| 5826 | 1178 | |
| 15884 | 1179 | purple_signals_disconnect_by_handle(dialog); |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
1180 | |
|
34145
fa72f1e5cd77
Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
1181 | purple_str_wipe(dialog->password); |
|
34064
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1182 | |
|
5692
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1183 | g_free(dialog); |
|
22032
8136dd5eeda3
Make some more event handlers return appropriate gboolean values. This turns
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22023
diff
changeset
|
1184 | return FALSE; |
|
5692
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1185 | } |
|
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1186 | |
|
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1187 | static void |
|
33055
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1188 | account_register_cb(PurpleAccount *account, gboolean succeeded, void *user_data) |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1189 | { |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1190 | if (succeeded) |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1191 | { |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1192 | const PurpleSavedStatus *saved_status = purple_savedstatus_get_current(); |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
1193 | purple_signal_emit(pidgin_accounts_get_handle(), "account-modified", account); |
|
33090
99d719d058df
Remove extra trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33088
diff
changeset
|
1194 | |
|
33055
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1195 | if (saved_status != NULL && purple_account_get_remember_password(account)) { |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1196 | purple_savedstatus_activate_for_account(saved_status, account); |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1197 | purple_account_set_enabled(account, PIDGIN_UI, TRUE); |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1198 | } |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1199 | } |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1200 | else |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1201 | purple_accounts_delete(account); |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1202 | } |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1203 | |
|
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1204 | static void |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1205 | account_prefs_save(AccountPrefsDialog *dialog) { |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1206 | PurpleAccountManager *manager = NULL; |
| 15884 | 1207 | PurpleProxyInfo *proxy_info = NULL; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1208 | GList *l, *l2; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1209 | const char *value; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1210 | char *username; |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1211 | char *tmp; |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1212 | gboolean new_acct = FALSE, icon_change = FALSE; |
| 15884 | 1213 | PurpleAccount *account; |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1214 | PurpleBuddyIconSpec *icon_spec = NULL; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1215 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1216 | manager = purple_account_manager_get_default(); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1217 | |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1218 | /* Build the username string. */ |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1219 | username = g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->username_entry))); |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1220 | |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
1221 | if (dialog->protocol != NULL) |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1222 | { |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1223 | for (l = purple_protocol_get_user_splits(dialog->protocol), |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1224 | l2 = dialog->user_split_entries; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1225 | l != NULL && l2 != NULL; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1226 | l = l->next, l2 = l2->next) |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1227 | { |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1228 | PurpleAccountUserSplit *split = l->data; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1229 | GtkEntry *entry = l2->data; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1230 | char sep[2] = " "; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1231 | |
|
36020
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
1232 | value = entry ? gtk_entry_get_text(entry) : ""; |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
1233 | if (!value) |
|
47474e8b92dd
Implement purple_account_user_split_(is|set)_constant, remove unsupported Facebook XMPP features
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
36019
diff
changeset
|
1234 | value = ""; |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1235 | |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1236 | *sep = purple_account_user_split_get_separator(split); |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1237 | |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1238 | tmp = g_strconcat(username, sep, |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1239 | (*value ? value : |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1240 | purple_account_user_split_get_default_value(split)), |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1241 | NULL); |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1242 | |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1243 | g_free(username); |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1244 | username = tmp; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1245 | } |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1246 | } |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1247 | |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1248 | if (dialog->account == NULL) |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1249 | { |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1250 | account = purple_account_manager_find(manager, username, |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1251 | dialog->protocol_id); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1252 | if(PURPLE_IS_ACCOUNT(account)) { |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1253 | purple_debug_warning("gtkaccount", |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1254 | "Trying to add a duplicate %s account (%s).\n", |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1255 | dialog->protocol_id, username); |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1256 | |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1257 | purple_notify_error(NULL, NULL, _("Unable to save new account"), |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1258 | _("An account already exists with the " |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1259 | "specified criteria."), |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1260 | NULL); |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1261 | |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1262 | g_free(username); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1263 | |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1264 | return; |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1265 | } |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1266 | |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1267 | account = purple_account_new(username, dialog->protocol_id); |
|
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1268 | new_acct = TRUE; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1269 | } |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1270 | else |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1271 | { |
|
11739
cc15987b3937
[gaim-migrate @ 14030]
Mark Doliner <markdoliner@pidgin.im>
parents:
11733
diff
changeset
|
1272 | account = dialog->account; |
|
cc15987b3937
[gaim-migrate @ 14030]
Mark Doliner <markdoliner@pidgin.im>
parents:
11733
diff
changeset
|
1273 | |
|
5699
b47a3b7d1247
[gaim-migrate @ 6120]
Christian Hammond <chipx86@chipx86.com>
parents:
5698
diff
changeset
|
1274 | /* Protocol */ |
| 15884 | 1275 | purple_account_set_protocol_id(account, dialog->protocol_id); |
|
5699
b47a3b7d1247
[gaim-migrate @ 6120]
Christian Hammond <chipx86@chipx86.com>
parents:
5698
diff
changeset
|
1276 | } |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1277 | |
|
5697
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1278 | /* Alias */ |
|
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1279 | value = gtk_entry_get_text(GTK_ENTRY(dialog->alias_entry)); |
|
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1280 | |
|
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1281 | if (*value != '\0') |
|
34589
428e92c79631
Renamed purple_account_[get,set]_alias to purple_account[get,set]_private_alias.
Ankit Vani <a@nevitus.org>
parents:
34586
diff
changeset
|
1282 | purple_account_set_private_alias(account, value); |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1283 | else |
|
34589
428e92c79631
Renamed purple_account_[get,set]_alias to purple_account[get,set]_private_alias.
Ankit Vani <a@nevitus.org>
parents:
34586
diff
changeset
|
1284 | purple_account_set_private_alias(account, NULL); |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1285 | |
|
5697
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1286 | /* Buddy Icon */ |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1287 | if (dialog->protocol != NULL) |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1288 | icon_spec = purple_protocol_get_icon_spec(dialog->protocol); |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1289 | |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1290 | if (icon_spec && icon_spec->format != NULL) |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1291 | { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1292 | const char *filename; |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1293 | |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1294 | if (new_acct || purple_account_get_bool(account, "use-global-buddyicon", TRUE) == |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1295 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))) |
|
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1296 | { |
|
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1297 | icon_change = TRUE; |
|
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1298 | } |
| 15884 | 1299 | purple_account_set_bool(account, "use-global-buddyicon", !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1300 | |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1301 | if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))) |
|
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1302 | { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1303 | if (dialog->icon_img) |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1304 | { |
|
38298
f0a8f63f9312
rename purple_image_get_size to purple_image_get_data_size and deal with the fallout
Gary Kramlich <grim@reaperworld.com>
parents:
38285
diff
changeset
|
1305 | size_t len = purple_image_get_data_size(dialog->icon_img); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1306 | purple_buddy_icons_set_account_icon(account, |
|
40756
3a58ef28ee44
Implement mitigation for GHSL-2021-045
Gary Kramlich <grim@reaperworld.com>
parents:
40741
diff
changeset
|
1307 | g_memdup2(purple_image_get_data(dialog->icon_img), len), len); |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
1308 | purple_account_set_buddy_icon_path(account, |
|
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
1309 | purple_image_get_path(dialog->icon_img)); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1310 | } |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1311 | else |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1312 | { |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1313 | purple_buddy_icons_set_account_icon(account, NULL, 0); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1314 | purple_account_set_buddy_icon_path(account, NULL); |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1315 | } |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1316 | } |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1317 | else if ((filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon")) && icon_change) |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1318 | { |
|
34988
81d8c99ac9b3
Initialize len = 0 before pidgin_convert_buddy_icon()
Ankit Vani <a@nevitus.org>
parents:
34955
diff
changeset
|
1319 | size_t len = 0; |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
1320 | gpointer data = pidgin_convert_buddy_icon(dialog->protocol, filename, &len); |
| 15884 | 1321 | purple_account_set_buddy_icon_path(account, filename); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1322 | purple_buddy_icons_set_account_icon(account, data, len); |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1323 | } |
| 14195 | 1324 | } |
|
14313
c766ccc907f7
[gaim-migrate @ 16933]
Mark Doliner <markdoliner@pidgin.im>
parents:
14258
diff
changeset
|
1325 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
1326 | purple_buddy_icon_spec_free(icon_spec); |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
1327 | |
| 15884 | 1328 | purple_account_set_username(account, username); |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1329 | g_free(username); |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1330 | |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1331 | /* Add the protocol settings */ |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
1332 | if (dialog->protocol) { |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1333 | ProtocolOptEntry *opt_entry; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1334 | GtkTreeIter iter; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1335 | char *value2; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1336 | int int_value; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1337 | gboolean bool_value; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1338 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1339 | for (l2 = dialog->protocol_opt_entries; l2; l2 = l2->next) { |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1340 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1341 | opt_entry = l2->data; |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1342 | |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1343 | switch (opt_entry->type) { |
| 15884 | 1344 | case PURPLE_PREF_STRING: |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
1345 | if (GTK_IS_COMBO_BOX(opt_entry->widget)) |
|
33268
a24713d9bbb3
Fix GTK+3 compile.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33267
diff
changeset
|
1346 | value = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(opt_entry->widget)); |
|
33267
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
1347 | else |
|
c3ee96290bfd
Account Options: hinted string options; fix perl plugins compilation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33170
diff
changeset
|
1348 | value = gtk_entry_get_text(GTK_ENTRY(opt_entry->widget)); |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1349 | purple_account_set_string(account, opt_entry->setting, value); |
| 7208 | 1350 | break; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1351 | |
| 15884 | 1352 | case PURPLE_PREF_INT: |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1353 | int_value = atoi(gtk_entry_get_text(GTK_ENTRY(opt_entry->widget))); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1354 | purple_account_set_int(account, opt_entry->setting, int_value); |
| 7208 | 1355 | break; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1356 | |
| 15884 | 1357 | case PURPLE_PREF_BOOLEAN: |
| 7208 | 1358 | bool_value = |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1359 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(opt_entry->widget)); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1360 | purple_account_set_bool(account, opt_entry->setting, bool_value); |
| 7208 | 1361 | break; |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1362 | |
| 15884 | 1363 | case PURPLE_PREF_STRING_LIST: |
|
20228
ce019944d765
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
1364 | value2 = NULL; |
|
25450
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1365 | if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(opt_entry->widget), &iter)) |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1366 | gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(opt_entry->widget)), &iter, 1, &value2, -1); |
|
0ae013105e09
When saving the account settings, use the protocol options that were present at
Daniel Atallah <datallah@pidgin.im>
parents:
25390
diff
changeset
|
1367 | purple_account_set_string(account, opt_entry->setting, value2); |
| 12106 | 1368 | break; |
| 1369 | ||
| 7208 | 1370 | default: |
| 1371 | break; | |
| 1372 | } | |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1373 | } |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1374 | } |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1375 | |
|
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1376 | /* Set the proxy stuff. */ |
| 15884 | 1377 | proxy_info = purple_account_get_proxy_info(account); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1378 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1379 | /* Create the proxy info if it doesn't exist. */ |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1380 | if (proxy_info == NULL) { |
| 15884 | 1381 | proxy_info = purple_proxy_info_new(); |
| 1382 | purple_account_set_proxy_info(account, proxy_info); | |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1383 | } else { |
|
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1384 | /* Add a reference to make sure the proxy info stays around. */ |
|
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1385 | g_object_ref(proxy_info); |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1386 | } |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1387 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1388 | /* Set the proxy info type. */ |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35040
diff
changeset
|
1389 | purple_proxy_info_set_proxy_type(proxy_info, dialog->new_proxy_type); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1390 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1391 | /* Host */ |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1392 | value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_host_entry)); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1393 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1394 | if (*value != '\0') |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1395 | purple_proxy_info_set_hostname(proxy_info, value); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1396 | else |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1397 | purple_proxy_info_set_hostname(proxy_info, NULL); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1398 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1399 | /* Port */ |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1400 | value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_port_entry)); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1401 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1402 | if (*value != '\0') |
| 15884 | 1403 | purple_proxy_info_set_port(proxy_info, atoi(value)); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1404 | else |
| 15884 | 1405 | purple_proxy_info_set_port(proxy_info, 0); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1406 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1407 | /* Username */ |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1408 | value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_user_entry)); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1409 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1410 | if (*value != '\0') |
| 15884 | 1411 | purple_proxy_info_set_username(proxy_info, value); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1412 | else |
| 15884 | 1413 | purple_proxy_info_set_username(proxy_info, NULL); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1414 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1415 | /* Password */ |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1416 | value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_pass_entry)); |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1417 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1418 | if (*value != '\0') |
| 15884 | 1419 | purple_proxy_info_set_password(proxy_info, value); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1420 | else |
| 15884 | 1421 | purple_proxy_info_set_password(proxy_info, NULL); |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1422 | |
|
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1423 | /* If there are no values set then proxy_info NULL */ |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1424 | if ((purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_TYPE_USE_GLOBAL) && |
|
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1425 | (purple_proxy_info_get_hostname(proxy_info) == NULL) && |
| 15884 | 1426 | (purple_proxy_info_get_port(proxy_info) == 0) && |
| 1427 | (purple_proxy_info_get_username(proxy_info) == NULL) && | |
| 1428 | (purple_proxy_info_get_password(proxy_info) == NULL)) | |
|
15041
18a6f6cdce33
[gaim-migrate @ 17758]
Daniel Atallah <datallah@pidgin.im>
parents:
14921
diff
changeset
|
1429 | { |
| 15884 | 1430 | purple_account_set_proxy_info(account, NULL); |
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1431 | g_clear_object(&proxy_info); |
|
5696
3f0ee30f10ff
[gaim-migrate @ 6117]
Christian Hammond <chipx86@chipx86.com>
parents:
5693
diff
changeset
|
1432 | } |
|
5697
146c609c3733
[gaim-migrate @ 6118]
Christian Hammond <chipx86@chipx86.com>
parents:
5696
diff
changeset
|
1433 | |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1434 | /* Voice and Video settings */ |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1435 | if (dialog->voice_frame) { |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1436 | purple_account_set_silence_suppression(account, |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1437 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->suppression_check))); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1438 | } |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1439 | |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1440 | /* If this is a new account, add it to our list */ |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1441 | if(new_acct) { |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1442 | purple_account_manager_add(manager, account); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1443 | } else { |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
1444 | purple_signal_emit(pidgin_accounts_get_handle(), "account-modified", account); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1445 | } |
|
11739
cc15987b3937
[gaim-migrate @ 14030]
Mark Doliner <markdoliner@pidgin.im>
parents:
11733
diff
changeset
|
1446 | |
|
11987
a6eb4a3f1136
[gaim-migrate @ 14280]
Mark Doliner <markdoliner@pidgin.im>
parents:
11986
diff
changeset
|
1447 | /* If this is a new account, then sign on! */ |
|
19575
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1448 | if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->register_button))) { |
|
33055
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1449 | purple_account_set_register_callback(account, account_register_cb, NULL); |
|
19575
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1450 | purple_account_register(account); |
|
19669
999fdd697e69
Don't allow duplicate accounts to be added. Ideally some of these checks should be in the core, but I don't see a way of doing that without forcing 3.0.0. Fixes #2269 (the part that was actually broken).
Daniel Atallah <datallah@pidgin.im>
parents:
19575
diff
changeset
|
1451 | } else if (new_acct) { |
| 15884 | 1452 | const PurpleSavedStatus *saved_status; |
| 1453 | ||
| 1454 | saved_status = purple_savedstatus_get_current(); | |
|
12125
c1e55f812ded
[gaim-migrate @ 14425]
Mark Doliner <markdoliner@pidgin.im>
parents:
12123
diff
changeset
|
1455 | if (saved_status != NULL) { |
| 15884 | 1456 | purple_savedstatus_activate_for_account(saved_status, account); |
| 1457 | purple_account_set_enabled(account, PIDGIN_UI, TRUE); | |
|
12121
cc63210cdc8b
[gaim-migrate @ 14421]
Daniel Atallah <datallah@pidgin.im>
parents:
12106
diff
changeset
|
1458 | } |
|
11638
1821b40269a3
[gaim-migrate @ 13914]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11358
diff
changeset
|
1459 | } |
|
10932
a38fb730e964
[gaim-migrate @ 12711]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10931
diff
changeset
|
1460 | |
| 16889 | 1461 | /* We no longer need the data from the dialog window */ |
| 1462 | account_win_destroy_cb(NULL, NULL, dialog); | |
| 1463 | ||
|
41318
56092ffeae95
Move PurpleProxyInfo from a boxed type to a GObject
Gary Kramlich <grim@reaperworld.com>
parents:
41314
diff
changeset
|
1464 | g_clear_object(&proxy_info); |
|
5692
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1465 | } |
|
0ec004b516c2
[gaim-migrate @ 6113]
Christian Hammond <chipx86@chipx86.com>
parents:
5690
diff
changeset
|
1466 | |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1467 | static void |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1468 | account_prefs_response_cb(GtkDialog *dialog, gint response_id, gpointer data) { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1469 | AccountPrefsDialog *window = (AccountPrefsDialog *)data; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1470 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1471 | switch(response_id) { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1472 | case RESPONSE_ADD: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1473 | account_prefs_save(window); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1474 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1475 | case RESPONSE_CLOSE: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1476 | account_win_destroy_cb(NULL, NULL, window); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1477 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1478 | default: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1479 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1480 | } |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1481 | } |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1482 | |
|
34064
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1483 | static void |
| 40691 | 1484 | pidgin_account_dialog_show_continue(PidginAccountDialogType type, |
| 1485 | PurpleAccount *account, | |
| 1486 | const gchar *password) | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1487 | { |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1488 | AccountPrefsDialog *dialog; |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1489 | GtkWidget *win; |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1490 | GtkWidget *main_vbox; |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1491 | GtkWidget *vbox; |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
1492 | GtkWidget *dbox; |
|
11008
35900a535c11
[gaim-migrate @ 12868]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
10967
diff
changeset
|
1493 | GtkWidget *notebook; |
|
5657
6c1febf7aca1
[gaim-migrate @ 6071]
Christian Hammond <chipx86@chipx86.com>
parents:
5656
diff
changeset
|
1494 | GtkWidget *button; |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1495 | |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1496 | if (accounts_window != NULL && account != NULL && |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1497 | (dialog = g_hash_table_lookup(account_pref_wins, account)) != NULL) |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1498 | { |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1499 | gtk_window_present(GTK_WINDOW(dialog->window)); |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1500 | return; |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1501 | } |
|
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1502 | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1503 | dialog = g_new0(AccountPrefsDialog, 1); |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1504 | |
|
40787
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1505 | if(PURPLE_IS_ACCOUNT(account)) { |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1506 | dialog->protocol_id = g_strdup(purple_account_get_protocol_id(account)); |
|
39465
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1507 | } |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1508 | |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1509 | if (accounts_window != NULL && account != NULL) |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1510 | { |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1511 | g_hash_table_insert(account_pref_wins, account, dialog); |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1512 | } |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1513 | |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1514 | dialog->account = account; |
| 40691 | 1515 | dialog->password = g_strdup(password); |
|
39465
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1516 | dialog->type = type; |
|
3b48e07c3625
Fix a leak in Pidgin.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39463
diff
changeset
|
1517 | dialog->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
40787
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1518 | |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1519 | if(dialog->protocol_id != NULL) { |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1520 | PurpleProtocolManager *manager = purple_protocol_manager_get_default(); |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1521 | |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1522 | dialog->protocol = purple_protocol_manager_find(manager, |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1523 | dialog->protocol_id); |
|
8a5a20a49e9b
Fix some issues with the protocol chooser and clean up its usage in GtkAccount
Gary Kramlich <grim@reaperworld.com>
parents:
40765
diff
changeset
|
1524 | } |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
1525 | |
|
40533
b1921b17b683
Replace some utility functions with actual widgets
Gary Kramlich <grim@reaperworld.com>
parents:
40496
diff
changeset
|
1526 | dialog->window = win = pidgin_dialog_new((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"), |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1527 | 6, "account", FALSE); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1528 | |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1529 | g_signal_connect(win, "delete_event", G_CALLBACK(account_win_destroy_cb), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1530 | dialog); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1531 | g_signal_connect(win, "response", G_CALLBACK(account_prefs_response_cb), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1532 | dialog); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1533 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1534 | /* Setup the vbox */ |
|
41058
18f3ea2e7e6d
Remove pidgin_dialog* helper functions
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41036
diff
changeset
|
1535 | main_vbox = gtk_dialog_get_content_area(GTK_DIALOG(win)); |
|
18f3ea2e7e6d
Remove pidgin_dialog* helper functions
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41036
diff
changeset
|
1536 | gtk_box_set_spacing(GTK_BOX(main_vbox), 6); |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1537 | |
|
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1538 | dialog->notebook = notebook = gtk_notebook_new(); |
|
11008
35900a535c11
[gaim-migrate @ 12868]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
10967
diff
changeset
|
1539 | gtk_box_pack_start(GTK_BOX(main_vbox), notebook, FALSE, FALSE, 0); |
|
11638
1821b40269a3
[gaim-migrate @ 13914]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11358
diff
changeset
|
1540 | gtk_widget_show(GTK_WIDGET(notebook)); |
|
11008
35900a535c11
[gaim-migrate @ 12868]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
10967
diff
changeset
|
1541 | |
|
5686
45ae373be142
[gaim-migrate @ 6107]
Christian Hammond <chipx86@chipx86.com>
parents:
5681
diff
changeset
|
1542 | /* Setup the inner vbox */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1543 | dialog->top_vbox = vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1544 | gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); |
|
11008
35900a535c11
[gaim-migrate @ 12868]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
10967
diff
changeset
|
1545 | gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, |
|
12240
194dc3367706
[gaim-migrate @ 14542]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
12185
diff
changeset
|
1546 | gtk_label_new_with_mnemonic(_("_Basic"))); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1547 | gtk_widget_show(vbox); |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1548 | |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1549 | /* Setup the top frames. */ |
| 5774 | 1550 | add_login_options(dialog, vbox); |
| 1551 | add_user_options(dialog, vbox); | |
|
5658
c50a2c4faf9c
[gaim-migrate @ 6072]
Christian Hammond <chipx86@chipx86.com>
parents:
5657
diff
changeset
|
1552 | |
|
23266
4abc3fc944da
Add a mnemonic to "Create this new account on the server".
Will Thompson <resiak@pidgin.im>
parents:
22982
diff
changeset
|
1553 | button = gtk_check_button_new_with_mnemonic( |
|
4abc3fc944da
Add a mnemonic to "Create this new account on the server".
Will Thompson <resiak@pidgin.im>
parents:
22982
diff
changeset
|
1554 | _("Create _this new account on the server")); |
|
19575
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1555 | gtk_box_pack_start(GTK_BOX(main_vbox), button, FALSE, FALSE, 0); |
|
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1556 | gtk_widget_show(button); |
|
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1557 | dialog->register_button = button; |
|
33055
c810d4c510f2
Fix registration dialog for protocols with REGISTER_NOSCREENNAME option
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32932
diff
changeset
|
1558 | g_signal_connect(G_OBJECT(dialog->register_button), "toggled", G_CALLBACK(register_button_cb), dialog); |
|
19575
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1559 | if (dialog->account == NULL) |
|
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1560 | gtk_widget_set_sensitive(button, FALSE); |
|
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1561 | |
|
39759
ea1401483849
Rename *_GET_*_IFACE to more standard *_GET_IFACE.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39611
diff
changeset
|
1562 | if (!dialog->protocol || !PURPLE_PROTOCOL_IMPLEMENTS(dialog->protocol, SERVER, register_user)) |
|
19575
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1563 | gtk_widget_hide(button); |
|
b1829eda1afa
Instead of a Register button, show a checkbox between the Notebook and the button box. But don't show it if we're using the fake Google Talk prpl. Fixes #1647
Sean Egan <seanegan@pidgin.im>
parents:
19125
diff
changeset
|
1564 | |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1565 | /* Setup the page with 'Advanced' (protocol options). */ |
|
37038
8832d14d7d0c
Rename 'protocol_options' field of PurpleProtocol to more appropriate 'account_options'
Ankit Vani <a@nevitus.org>
parents:
36928
diff
changeset
|
1566 | add_account_options(dialog); |
|
26543
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1567 | |
|
2ff0a924a18e
Break the New Account dialog into three tabs. Move proxy options to the new
Michael Terry <michael.terry@canonical.com>
parents:
26475
diff
changeset
|
1568 | /* Setup the page with 'Proxy'. */ |
|
40490
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1569 | dbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); |
|
fb6e46c4c63c
Remove PIDGIN_HIG_* constants
Gary Kramlich <grim@reaperworld.com>
parents:
40439
diff
changeset
|
1570 | gtk_container_set_border_width(GTK_CONTAINER(dbox), 12); |
|
11008
35900a535c11
[gaim-migrate @ 12868]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
10967
diff
changeset
|
1571 | gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox, |
|
27668
536cb7a2d348
s/_Advanced/Ad_vanced/ and s/_Proxy/P_roxy/ in the tabs of the Add/Modify
Etan Reisner <deryni@pidgin.im>
parents:
27603
diff
changeset
|
1572 | gtk_label_new_with_mnemonic(_("P_roxy"))); |
|
11638
1821b40269a3
[gaim-migrate @ 13914]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11358
diff
changeset
|
1573 | gtk_widget_show(dbox); |
| 5774 | 1574 | add_proxy_options(dialog, dbox); |
|
5660
90787278c739
[gaim-migrate @ 6074]
Christian Hammond <chipx86@chipx86.com>
parents:
5658
diff
changeset
|
1575 | |
|
31566
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1576 | add_voice_options(dialog); |
|
fa37798387fa
Make the simple silence suppression stuff optional per-account. Fixes #13180.
Jakub Adam <jakub.adam@ktknet.cz>
parents:
31321
diff
changeset
|
1577 | |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1578 | /* Buttons */ |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1579 | gtk_dialog_add_button(GTK_DIALOG(win), _("_Cancel"), RESPONSE_CLOSE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1580 | dialog->ok_button = gtk_dialog_add_button(GTK_DIALOG(win), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1581 | (type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("_Add") : _("_Save"), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1582 | RESPONSE_ADD); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1583 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1584 | if (dialog->account == NULL) { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1585 | gtk_widget_set_sensitive(dialog->ok_button, FALSE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1586 | } |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
1587 | |
|
5657
6c1febf7aca1
[gaim-migrate @ 6071]
Christian Hammond <chipx86@chipx86.com>
parents:
5656
diff
changeset
|
1588 | /* Show the window. */ |
|
5641
a9d1f7917dd4
[gaim-migrate @ 6054]
Christian Hammond <chipx86@chipx86.com>
parents:
5638
diff
changeset
|
1589 | gtk_widget_show(win); |
|
23277
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
1590 | if (!account) |
|
ea315a8d5bad
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23272
diff
changeset
|
1591 | gtk_widget_grab_focus(dialog->protocol_menu); |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1592 | } |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1593 | |
| 40691 | 1594 | static void |
| 1595 | pidgin_account_dialog_read_password_cb(GObject *obj, GAsyncResult *res, | |
| 1596 | gpointer data) | |
| 1597 | { | |
| 1598 | PurpleCredentialManager *manager = PURPLE_CREDENTIAL_MANAGER(obj); | |
| 1599 | PidginAccountDialogShowData *d = (PidginAccountDialogShowData *)data; | |
|
40823
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1600 | GError *error = NULL; |
| 40691 | 1601 | gchar *password; |
| 1602 | ||
| 1603 | password = purple_credential_manager_read_password_finish(manager, res, | |
|
40823
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1604 | &error); |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1605 | |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1606 | if(error != NULL) { |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1607 | purple_debug_warning("gtkaccount", "failed to read password: %s", |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1608 | error->message); |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1609 | |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1610 | g_error_free(error); |
|
338bba38df77
Port the KWallet Keyring to the new CredentialProvider API.
Gary Kramlich <grim@reaperworld.com>
parents:
40813
diff
changeset
|
1611 | } |
| 40691 | 1612 | |
| 1613 | pidgin_account_dialog_show_continue(d->type, d->account, password); | |
| 1614 | ||
| 1615 | g_free(password); | |
| 1616 | g_free(d); | |
| 1617 | } | |
| 1618 | ||
|
34064
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1619 | void |
|
34145
fa72f1e5cd77
Some polishing on files modified on this branch (mostly formatting)
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
1620 | pidgin_account_dialog_show(PidginAccountDialogType type, PurpleAccount *account) |
|
34064
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1621 | { |
|
40680
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
1622 | PurpleCredentialManager *manager = NULL; |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
1623 | |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
1624 | manager = purple_credential_manager_get_default(); |
|
f9ea6d5e8992
Use PurpleCredentialManager instead of the old keyring api.
Gary Kramlich <grim@reaperworld.com>
parents:
40634
diff
changeset
|
1625 | |
| 40691 | 1626 | if(PURPLE_IS_ACCOUNT(account)) { |
|
40808
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1627 | /* this is kind of dangerous, but it's no worse than the old version. |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1628 | * Regardless this dialog needs a lot of TLC. |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1629 | */ |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1630 | PidginAccountDialogShowData *data = NULL; |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1631 | data = g_new0(PidginAccountDialogShowData, 1); |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1632 | data->account = account; |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1633 | data->type = type; |
|
afc646d2e7cb
Fix a possible leak.
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40803
diff
changeset
|
1634 | |
| 40691 | 1635 | purple_credential_manager_read_password_async(manager, account, NULL, |
| 1636 | pidgin_account_dialog_read_password_cb, | |
| 1637 | data); | |
| 1638 | } else { | |
| 1639 | pidgin_account_dialog_show_continue(type, account, NULL); | |
| 1640 | } | |
|
34064
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1641 | } |
|
8958f4a2386a
Clean up Pidgin account changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34029
diff
changeset
|
1642 | |
|
5638
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1643 | /************************************************************************** |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1644 | * Accounts Dialog |
|
53e752c88ea1
[gaim-migrate @ 6047]
Christian Hammond <chipx86@chipx86.com>
parents:
5637
diff
changeset
|
1645 | **************************************************************************/ |
|
7179
1769277c6e15
[gaim-migrate @ 7747]
Christian Hammond <chipx86@chipx86.com>
parents:
7159
diff
changeset
|
1646 | static void |
| 15884 | 1647 | signed_on_off_cb(PurpleConnection *gc, gpointer user_data) |
|
5615
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
1648 | { |
| 15884 | 1649 | PurpleAccount *account; |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1650 | PurpleAccountManager *manager = NULL; |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1651 | GtkTreeModel *model; |
|
5615
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
1652 | GtkTreeIter iter; |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1653 | GdkPixbuf *pixbuf; |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1654 | GList *accounts = NULL; |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1655 | size_t index; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1656 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1657 | /* Don't need to do anything if the accounts window is not visible */ |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1658 | if(accounts_window == NULL) { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1659 | return; |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1660 | } |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1661 | |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1662 | manager = purple_account_manager_get_default(); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1663 | accounts = purple_account_manager_get_all(manager); |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1664 | |
| 15884 | 1665 | account = purple_connection_get_account(gc); |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1666 | model = GTK_TREE_MODEL(accounts_window->model); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1667 | index = g_list_index(accounts, account); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1668 | |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1669 | if(gtk_tree_model_iter_nth_child(model, &iter, NULL, index)) { |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1670 | pixbuf = pidgin_create_protocol_icon(account, PIDGIN_PROTOCOL_ICON_MEDIUM); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1671 | if((pixbuf != NULL) && purple_account_is_disconnected(account)) { |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1672 | gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1673 | } |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1674 | |
|
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1675 | gtk_list_store_set(accounts_window->model, &iter, |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1676 | COLUMN_ICON, pixbuf, |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1677 | -1); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1678 | |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1679 | if(pixbuf != NULL) { |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1680 | g_object_unref(G_OBJECT(pixbuf)); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1681 | } |
|
5615
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
1682 | } |
|
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
1683 | } |
|
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
1684 | |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1685 | /* |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1686 | * Get the GtkTreeIter of the specified account in the |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1687 | * GtkListStore |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1688 | */ |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1689 | static gboolean |
| 15884 | 1690 | accounts_window_find_account_in_treemodel(GtkTreeIter *iter, PurpleAccount *account) |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1691 | { |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1692 | GtkTreeModel *model; |
| 15884 | 1693 | PurpleAccount *cur; |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1694 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1695 | g_return_val_if_fail(account != NULL, FALSE); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1696 | g_return_val_if_fail(accounts_window != NULL, FALSE); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1697 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1698 | model = GTK_TREE_MODEL(accounts_window->model); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1699 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1700 | if (!gtk_tree_model_get_iter_first(model, iter)) |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1701 | return FALSE; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1702 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1703 | gtk_tree_model_get(model, iter, COLUMN_DATA, &cur, -1); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1704 | if (cur == account) |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1705 | return TRUE; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1706 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1707 | while (gtk_tree_model_iter_next(model, iter)) |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1708 | { |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1709 | gtk_tree_model_get(model, iter, COLUMN_DATA, &cur, -1); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1710 | if (cur == account) |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1711 | return TRUE; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1712 | } |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1713 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1714 | return FALSE; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1715 | } |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1716 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1717 | static void |
| 15884 | 1718 | account_removed_cb(PurpleAccount *account, gpointer user_data) |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1719 | { |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1720 | AccountPrefsDialog *dialog; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1721 | GtkTreeIter iter; |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1722 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1723 | /* If the account was being modified, close the edit window */ |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1724 | if((dialog = g_hash_table_lookup(account_pref_wins, account)) != NULL) { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1725 | account_win_destroy_cb(NULL, NULL, dialog); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1726 | } |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1727 | |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1728 | if(accounts_window == NULL) { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1729 | return; |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1730 | } |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1731 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1732 | /* Remove the account from the GtkListStore */ |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1733 | if(accounts_window_find_account_in_treemodel(&iter, account)) { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1734 | gtk_list_store_remove(accounts_window->model, &iter); |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1735 | } |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1736 | } |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
1737 | |
|
5620
c5f0a3c434fd
[gaim-migrate @ 6027]
Christian Hammond <chipx86@chipx86.com>
parents:
5617
diff
changeset
|
1738 | static void |
| 15884 | 1739 | account_abled_cb(PurpleAccount *account, gpointer user_data) |
| 12070 | 1740 | { |
| 1741 | GtkTreeIter iter; | |
| 1742 | ||
| 1743 | if (accounts_window == NULL) | |
| 1744 | return; | |
| 1745 | ||
| 1746 | /* update the account in the GtkListStore */ | |
| 1747 | if (accounts_window_find_account_in_treemodel(&iter, account)) | |
| 1748 | gtk_list_store_set(accounts_window->model, &iter, | |
| 1749 | COLUMN_ENABLED, GPOINTER_TO_INT(user_data), | |
| 1750 | -1); | |
| 1751 | } | |
| 1752 | ||
|
22056
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
1753 | static gboolean |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
1754 | accedit_win_destroy_cb(GtkWidget *w, GdkEvent *event, AccountsWindow *dialog) |
| 5563 | 1755 | { |
|
18841
71c4218684cb
pidgin_accounts_window_hide() should actually dispose of the window. Fixes #2193.
Daniel Atallah <datallah@pidgin.im>
parents:
18706
diff
changeset
|
1756 | dialog->window = NULL; |
|
71c4218684cb
pidgin_accounts_window_hide() should actually dispose of the window. Fixes #2193.
Daniel Atallah <datallah@pidgin.im>
parents:
18706
diff
changeset
|
1757 | |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
1758 | pidgin_accounts_window_hide(); |
|
7159
7b8db8de4054
[gaim-migrate @ 7726]
Mark Doliner <markdoliner@pidgin.im>
parents:
7107
diff
changeset
|
1759 | |
| 5563 | 1760 | return FALSE; |
| 1761 | } | |
| 1762 | ||
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1763 | static void |
| 5774 | 1764 | modify_account_sel(GtkTreeModel *model, GtkTreePath *path, |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1765 | GtkTreeIter *iter, gpointer data) |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1766 | { |
| 15884 | 1767 | PurpleAccount *account; |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1768 | |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1769 | gtk_tree_model_get(model, iter, COLUMN_DATA, &account, -1); |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1770 | |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1771 | if (account != NULL) |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
1772 | pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, account); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1773 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1774 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1775 | static void |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1776 | modify_account(AccountsWindow *dialog) |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1777 | { |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1778 | GtkTreeSelection *selection; |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1779 | |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1780 | selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); |
|
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
1781 | |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1782 | gtk_tree_selection_selected_foreach(selection, modify_account_sel, dialog); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1783 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1784 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1785 | static void |
| 15884 | 1786 | delete_account_cb(PurpleAccount *account) |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1787 | { |
| 15884 | 1788 | purple_accounts_delete(account); |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1789 | } |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1790 | |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1791 | static void |
| 5774 | 1792 | ask_delete_account_sel(GtkTreeModel *model, GtkTreePath *path, |
|
8405
1893bfff3b82
[gaim-migrate @ 9135]
Christian Hammond <chipx86@chipx86.com>
parents:
8363
diff
changeset
|
1793 | GtkTreeIter *iter, gpointer data) |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1794 | { |
| 15884 | 1795 | PurpleAccount *account; |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1796 | |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1797 | gtk_tree_model_get(model, iter, COLUMN_DATA, &account, -1); |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1798 | |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1799 | if (account != NULL) { |
|
7677
4f40f17e1ad9
[gaim-migrate @ 8321]
Mark Doliner <markdoliner@pidgin.im>
parents:
7480
diff
changeset
|
1800 | char *buf; |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1801 | |
|
7677
4f40f17e1ad9
[gaim-migrate @ 8321]
Mark Doliner <markdoliner@pidgin.im>
parents:
7480
diff
changeset
|
1802 | buf = g_strdup_printf(_("Are you sure you want to delete %s?"), |
| 15884 | 1803 | purple_account_get_username(account)); |
| 1804 | ||
| 1805 | purple_request_close_with_handle(account); | |
|
22385
d14ac3ae2007
The Gnome Human Interface Guidelines say, "if pressing this button by
Mark Doliner <markdoliner@pidgin.im>
parents:
22214
diff
changeset
|
1806 | purple_request_action(account, NULL, buf, NULL, |
|
34331
c8486462bb63
Request API refactoring: switch purple_request_action to PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34329
diff
changeset
|
1807 | PURPLE_DEFAULT_ACTION_NONE, |
|
c8486462bb63
Request API refactoring: switch purple_request_action to PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34329
diff
changeset
|
1808 | purple_request_cpar_from_account(account), account, 2, |
|
c8486462bb63
Request API refactoring: switch purple_request_action to PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34329
diff
changeset
|
1809 | _("Delete"), delete_account_cb, _("Cancel"), NULL); |
|
7677
4f40f17e1ad9
[gaim-migrate @ 8321]
Mark Doliner <markdoliner@pidgin.im>
parents:
7480
diff
changeset
|
1810 | g_free(buf); |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1811 | } |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1812 | } |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1813 | |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1814 | static void |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1815 | ask_delete_account(AccountsWindow *dialog) |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1816 | { |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1817 | GtkTreeSelection *selection; |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1818 | |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1819 | selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->treeview)); |
|
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1820 | |
| 5774 | 1821 | gtk_tree_selection_selected_foreach(selection, ask_delete_account_sel, |
|
5701
4b941cc008c5
[gaim-migrate @ 6122]
Christian Hammond <chipx86@chipx86.com>
parents:
5700
diff
changeset
|
1822 | dialog); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1823 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1824 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1825 | static void |
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1826 | accedit_win_response_cb(GtkDialog *dialog, guint response, gpointer data) { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1827 | AccountsWindow *window = data; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1828 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1829 | switch(response) { |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1830 | case RESPONSE_ADD: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1831 | pidgin_account_dialog_show(PIDGIN_ADD_ACCOUNT_DIALOG, NULL); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1832 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1833 | case RESPONSE_MODIFY: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1834 | modify_account(window); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1835 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1836 | case RESPONSE_DELETE: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1837 | ask_delete_account(window); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1838 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1839 | case RESPONSE_CLOSE: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1840 | pidgin_accounts_window_hide(); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1841 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1842 | default: |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1843 | break; |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
1844 | } |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1845 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1846 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1847 | static void |
| 10400 | 1848 | enabled_cb(GtkCellRendererToggle *renderer, gchar *path_str, |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1849 | gpointer data) |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1850 | { |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
1851 | AccountsWindow *dialog = (AccountsWindow *)data; |
| 15884 | 1852 | PurpleAccount *account; |
|
5779
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1853 | GtkTreeModel *model = GTK_TREE_MODEL(dialog->model); |
|
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1854 | GtkTreeIter iter; |
| 10400 | 1855 | gboolean enabled; |
| 15884 | 1856 | const PurpleSavedStatus *saved_status; |
|
5779
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1857 | |
|
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1858 | gtk_tree_model_get_iter_from_string(model, &iter, path_str); |
|
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1859 | gtk_tree_model_get(model, &iter, |
|
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1860 | COLUMN_DATA, &account, |
| 10400 | 1861 | COLUMN_ENABLED, &enabled, |
|
5779
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1862 | -1); |
|
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1863 | |
|
14044
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1864 | /* |
|
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1865 | * If we just enabled the account, then set the statuses |
|
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1866 | * to the current status. |
|
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1867 | */ |
|
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1868 | if (!enabled) |
|
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1869 | { |
| 15884 | 1870 | saved_status = purple_savedstatus_get_current(); |
| 1871 | purple_savedstatus_activate_for_account(saved_status, account); | |
|
14044
024d74b6bb08
[gaim-migrate @ 16550]
Mark Doliner <markdoliner@pidgin.im>
parents:
13775
diff
changeset
|
1872 | } |
|
11724
d3f71bc34b4f
[gaim-migrate @ 14015]
Mark Doliner <markdoliner@pidgin.im>
parents:
11654
diff
changeset
|
1873 | |
| 15884 | 1874 | purple_account_set_enabled(account, PIDGIN_UI, !enabled); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1875 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1876 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1877 | static void |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
1878 | add_columns(GtkWidget *treeview, AccountsWindow *dialog) |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1879 | { |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1880 | GtkCellRenderer *renderer; |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1881 | GtkTreeViewColumn *column; |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1882 | |
| 15240 | 1883 | /* Enabled */ |
| 1884 | renderer = gtk_cell_renderer_toggle_new(); | |
| 1885 | ||
| 1886 | g_signal_connect(G_OBJECT(renderer), "toggled", | |
| 1887 | G_CALLBACK(enabled_cb), dialog); | |
| 1888 | ||
| 1889 | column = gtk_tree_view_column_new_with_attributes(_("Enabled"), | |
| 1890 | renderer, "active", COLUMN_ENABLED, NULL); | |
| 1891 | ||
|
23292
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
1892 | gtk_tree_view_column_set_resizable(column, FALSE); |
|
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
1893 | gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); |
| 15240 | 1894 | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1895 | /* Username column */ |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1896 | column = gtk_tree_view_column_new(); |
|
22942
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22941
diff
changeset
|
1897 | gtk_tree_view_column_set_title(column, _("Username")); |
| 9519 | 1898 | gtk_tree_view_column_set_resizable(column, TRUE); |
|
23292
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
1899 | gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1900 | |
|
15496
76b5ca00a36c
I think this takes care of protocol icons. Note there are still places
Sean Egan <seanegan@pidgin.im>
parents:
15435
diff
changeset
|
1901 | /* Buddy Icon */ |
| 15240 | 1902 | renderer = gtk_cell_renderer_pixbuf_new(); |
| 1903 | gtk_tree_view_column_pack_start(column, renderer, FALSE); | |
| 1904 | gtk_tree_view_column_add_attribute(column, renderer, | |
| 1905 | "pixbuf", COLUMN_BUDDYICON); | |
| 1906 | ||
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1907 | /* Username */ |
| 15240 | 1908 | renderer = gtk_cell_renderer_text_new(); |
| 1909 | gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
| 1910 | gtk_tree_view_column_add_attribute(column, renderer, | |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1911 | "text", COLUMN_USERNAME); |
|
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1912 | dialog->username_col = column; |
| 15240 | 1913 | |
| 1914 | ||
| 1915 | /* Protocol name */ | |
| 1916 | column = gtk_tree_view_column_new(); | |
| 1917 | gtk_tree_view_column_set_title(column, _("Protocol")); | |
|
23292
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
1918 | gtk_tree_view_column_set_resizable(column, FALSE); |
|
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
1919 | gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); |
| 15240 | 1920 | |
|
5779
8c8b8c8139c2
[gaim-migrate @ 6204]
Christian Hammond <chipx86@chipx86.com>
parents:
5774
diff
changeset
|
1921 | /* Icon */ |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1922 | renderer = gtk_cell_renderer_pixbuf_new(); |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1923 | gtk_tree_view_column_pack_start(column, renderer, FALSE); |
|
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1924 | gtk_tree_view_column_add_attribute(column, renderer, |
| 5693 | 1925 | "pixbuf", COLUMN_ICON); |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
1926 | |
|
5781
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
1927 | renderer = gtk_cell_renderer_text_new(); |
|
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
1928 | gtk_tree_view_column_pack_start(column, renderer, TRUE); |
|
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
1929 | gtk_tree_view_column_add_attribute(column, renderer, |
|
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
1930 | "text", COLUMN_PROTOCOL); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1931 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1932 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
1933 | static void |
| 15884 | 1934 | set_account(GtkListStore *store, GtkTreeIter *iter, PurpleAccount *account, GdkPixbuf *global_buddyicon) |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1935 | { |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1936 | GdkPixbuf *pixbuf, *buddyicon = NULL; |
|
35818
f01e2638301f
imgstore: rip the rest of imgstore references from Pidgin
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35815
diff
changeset
|
1937 | PurpleImage *img = NULL; |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
1938 | PurpleProtocol *protocol = NULL; |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1939 | PurpleBuddyIconSpec *icon_spec = NULL; |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1940 | |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
1941 | pixbuf = pidgin_create_protocol_icon(account, PIDGIN_PROTOCOL_ICON_MEDIUM); |
| 15884 | 1942 | if ((pixbuf != NULL) && purple_account_is_disconnected(account)) |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1943 | gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
|
6751
0edfd15b9f10
[gaim-migrate @ 7283]
Christian Hammond <chipx86@chipx86.com>
parents:
6732
diff
changeset
|
1944 | |
|
40803
0e11ce1049b2
Port Pidgin from purple_protocols to PurpleProtocolManager
Gary Kramlich <grim@reaperworld.com>
parents:
40787
diff
changeset
|
1945 | protocol = purple_account_get_protocol(account); |
|
36633
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1946 | if (protocol != NULL) |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1947 | icon_spec = purple_protocol_get_icon_spec(protocol); |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1948 | |
|
2dcb81a189bd
Refactored pidgin to use the new protocol API
Ankit Vani <a@nevitus.org>
parents:
36626
diff
changeset
|
1949 | if (icon_spec != NULL && icon_spec->format != NULL) { |
|
17484
9e134e98b42c
Don't display the buddy icon for accounts that don't support buddy icons. Fixes #1414. This also includes a fix for crashing caused by the gtalk hackery (the crashing is fixed, but the hackery still doesn't work).
Daniel Atallah <datallah@pidgin.im>
parents:
17416
diff
changeset
|
1950 | if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) { |
|
9e134e98b42c
Don't display the buddy icon for accounts that don't support buddy icons. Fixes #1414. This also includes a fix for crashing caused by the gtalk hackery (the crashing is fixed, but the hackery still doesn't work).
Daniel Atallah <datallah@pidgin.im>
parents:
17416
diff
changeset
|
1951 | if (global_buddyicon != NULL) |
|
39052
f0614ec30627
gtkaccount: Typecast GdkPixbuf to silence warning
Mike Ruprecht <cmaiku@gmail.com>
parents:
39051
diff
changeset
|
1952 | buddyicon = GDK_PIXBUF(g_object_ref(G_OBJECT(global_buddyicon))); |
|
25529
6e7e5c40d3a9
Fix a bug where the thumbnail buddy icon in the Accounts dialog would
Mark Doliner <markdoliner@pidgin.im>
parents:
25457
diff
changeset
|
1953 | else { |
|
6e7e5c40d3a9
Fix a bug where the thumbnail buddy icon in the Accounts dialog would
Mark Doliner <markdoliner@pidgin.im>
parents:
25457
diff
changeset
|
1954 | /* This is for when set_account() is called for a single account */ |
|
6e7e5c40d3a9
Fix a bug where the thumbnail buddy icon in the Accounts dialog would
Mark Doliner <markdoliner@pidgin.im>
parents:
25457
diff
changeset
|
1955 | const char *path; |
|
6e7e5c40d3a9
Fix a bug where the thumbnail buddy icon in the Accounts dialog would
Mark Doliner <markdoliner@pidgin.im>
parents:
25457
diff
changeset
|
1956 | path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); |
|
27581
c9711347326d
Don't try to load an image from an empty path. It just spews to the debug log.
Etan Reisner <deryni@pidgin.im>
parents:
26820
diff
changeset
|
1957 | if ((path != NULL) && (*path != '\0')) { |
|
38285
72824d3b7190
Update pidgin for the PurpleImage and PurpleSmiley changes
Gary Kramlich <grim@reaperworld.com>
parents:
38277
diff
changeset
|
1958 | img = purple_image_new_from_file(path, NULL); |
|
27581
c9711347326d
Don't try to load an image from an empty path. It just spews to the debug log.
Etan Reisner <deryni@pidgin.im>
parents:
26820
diff
changeset
|
1959 | } |
|
25529
6e7e5c40d3a9
Fix a bug where the thumbnail buddy icon in the Accounts dialog would
Mark Doliner <markdoliner@pidgin.im>
parents:
25457
diff
changeset
|
1960 | } |
|
17484
9e134e98b42c
Don't display the buddy icon for accounts that don't support buddy icons. Fixes #1414. This also includes a fix for crashing caused by the gtalk hackery (the crashing is fixed, but the hackery still doesn't work).
Daniel Atallah <datallah@pidgin.im>
parents:
17416
diff
changeset
|
1961 | } else { |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1962 | img = purple_buddy_icons_find_account_icon(account); |
|
17484
9e134e98b42c
Don't display the buddy icon for accounts that don't support buddy icons. Fixes #1414. This also includes a fix for crashing caused by the gtalk hackery (the crashing is fixed, but the hackery still doesn't work).
Daniel Atallah <datallah@pidgin.im>
parents:
17416
diff
changeset
|
1963 | } |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1964 | } |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1965 | |
|
40813
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
1966 | purple_buddy_icon_spec_free(icon_spec); |
|
71305a7d7423
Modernize PurpleProtocol
Gary Kramlich <grim@reaperworld.com>
parents:
40808
diff
changeset
|
1967 | |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1968 | if (img != NULL) { |
|
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1969 | GdkPixbuf *buddyicon_pixbuf; |
|
41319
04d027ed3d63
Add gdk-pixbuf as a libpurple dependency and move helpers from pidgin to purple
Gary Kramlich <grim@reaperworld.com>
parents:
41318
diff
changeset
|
1970 | buddyicon_pixbuf = purple_gdk_pixbuf_from_image(img); |
|
35814
8d99745b6214
imgstore: rip from Pidgin (mostly gtkwebview)
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35806
diff
changeset
|
1971 | g_object_unref(img); |
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16446
diff
changeset
|
1972 | |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1973 | if (buddyicon_pixbuf != NULL) { |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1974 | buddyicon = gdk_pixbuf_scale_simple(buddyicon_pixbuf, 22, 22, GDK_INTERP_HYPER); |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1975 | g_object_unref(G_OBJECT(buddyicon_pixbuf)); |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1976 | } |
| 15240 | 1977 | } |
| 1978 | ||
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1979 | gtk_list_store_set(store, iter, |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1980 | COLUMN_ICON, pixbuf, |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1981 | COLUMN_BUDDYICON, buddyicon, |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
1982 | COLUMN_USERNAME, purple_account_get_username(account), |
| 15884 | 1983 | COLUMN_ENABLED, purple_account_get_enabled(account, PIDGIN_UI), |
| 1984 | COLUMN_PROTOCOL, purple_account_get_protocol_name(account), | |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1985 | COLUMN_DATA, account, |
|
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1986 | -1); |
|
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1987 | |
|
13091
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1988 | if (pixbuf != NULL) |
|
b5ed878998dd
[gaim-migrate @ 15452]
Mark Doliner <markdoliner@pidgin.im>
parents:
13014
diff
changeset
|
1989 | g_object_unref(G_OBJECT(pixbuf)); |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1990 | if (buddyicon != NULL) |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1991 | g_object_unref(G_OBJECT(buddyicon)); |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1992 | } |
|
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1993 | |
|
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1994 | static void |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1995 | add_account_to_liststore(PurpleAccount *account, gpointer user_data) { |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1996 | GtkTreeIter iter; |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
1997 | GdkPixbuf *global_buddyicon = user_data; |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
1998 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
1999 | if(accounts_window == NULL) { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2000 | return; |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2001 | } |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2002 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2003 | gtk_list_store_append(accounts_window->model, &iter); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2004 | |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2005 | set_account(accounts_window->model, &iter, account, global_buddyicon); |
|
5698
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
2006 | } |
|
3066afeab46d
[gaim-migrate @ 6119]
Christian Hammond <chipx86@chipx86.com>
parents:
5697
diff
changeset
|
2007 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2008 | static void |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2009 | populate_accounts_list(AccountsWindow *dialog) { |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2010 | PurpleAccountManager *manager = NULL; |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2011 | GdkPixbuf *global_buddyicon = NULL; |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2012 | const gchar *path; |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2013 | |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2014 | gtk_list_store_clear(dialog->model); |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2015 | |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2016 | path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); |
|
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2017 | if(path != NULL && *path != '\0') { |
|
41319
04d027ed3d63
Add gdk-pixbuf as a libpurple dependency and move helpers from pidgin to purple
Gary Kramlich <grim@reaperworld.com>
parents:
41318
diff
changeset
|
2018 | GdkPixbuf *pixbuf = purple_gdk_pixbuf_new_from_file(path); |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2019 | if(pixbuf != NULL) { |
|
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2020 | global_buddyicon = gdk_pixbuf_scale_simple(pixbuf, 22, 22, |
|
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2021 | GDK_INTERP_HYPER); |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2022 | g_object_unref(G_OBJECT(pixbuf)); |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2023 | } |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2024 | } |
|
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2025 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2026 | manager = purple_account_manager_get_default(); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2027 | purple_account_manager_foreach(manager, add_account_to_liststore, |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2028 | global_buddyicon); |
| 15053 | 2029 | |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2030 | if(global_buddyicon != NULL) { |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2031 | g_object_unref(G_OBJECT(global_buddyicon)); |
|
41167
e2c60e7de2b1
Make sure the path for a buddy icon isn't an empty string before we attempt to load it as a pixbuf
Gary Kramlich <grim@reaperworld.com>
parents:
41144
diff
changeset
|
2032 | } |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2033 | } |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2034 | |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
2035 | static void |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2036 | account_selected_cb(GtkTreeSelection *sel, AccountsWindow *dialog) |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
2037 | { |
|
8406
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2038 | gboolean selected = FALSE; |
|
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2039 | |
|
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2040 | selected = (gtk_tree_selection_count_selected_rows(sel) > 0); |
|
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2041 | |
|
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2042 | gtk_widget_set_sensitive(dialog->modify_button, selected); |
|
4c764d24f29d
[gaim-migrate @ 9136]
Christian Hammond <chipx86@chipx86.com>
parents:
8405
diff
changeset
|
2043 | gtk_widget_set_sensitive(dialog->delete_button, selected); |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
2044 | } |
|
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
2045 | |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2046 | static gboolean |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2047 | account_treeview_double_click_cb(GtkTreeView *treeview, GdkEventButton *event, gpointer user_data) |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2048 | { |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2049 | AccountsWindow *dialog; |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2050 | GtkTreePath *path; |
| 11113 | 2051 | GtkTreeViewColumn *column; |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2052 | GtkTreeIter iter; |
| 15884 | 2053 | PurpleAccount *account; |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2054 | |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2055 | dialog = (AccountsWindow *)user_data; |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2056 | |
|
22056
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2057 | if (event->window != gtk_tree_view_get_bin_window(treeview)) |
|
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2058 | return FALSE; |
|
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2059 | |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2060 | /* Figure out which node was clicked */ |
| 11113 | 2061 | if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(dialog->treeview), event->x, event->y, &path, &column, NULL, NULL)) |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2062 | return FALSE; |
|
22455
1e4f21a50bc6
Plug some leaks caused by GtkTreePaths not being freed.
Daniel Atallah <datallah@pidgin.im>
parents:
22385
diff
changeset
|
2063 | if (column == gtk_tree_view_get_column(treeview, 0)) { |
|
1e4f21a50bc6
Plug some leaks caused by GtkTreePaths not being freed.
Daniel Atallah <datallah@pidgin.im>
parents:
22385
diff
changeset
|
2064 | gtk_tree_path_free(path); |
|
22056
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2065 | return FALSE; |
|
22455
1e4f21a50bc6
Plug some leaks caused by GtkTreePaths not being freed.
Daniel Atallah <datallah@pidgin.im>
parents:
22385
diff
changeset
|
2066 | } |
|
22056
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2067 | |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2068 | gtk_tree_model_get_iter(GTK_TREE_MODEL(dialog->model), &iter, path); |
|
10641
0a83c0aea347
[gaim-migrate @ 12149]
Mark Doliner <markdoliner@pidgin.im>
parents:
10640
diff
changeset
|
2069 | gtk_tree_path_free(path); |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2070 | gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter, COLUMN_DATA, &account, -1); |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2071 | |
|
38712
ea49cd76cf47
Use GDK button constants instead of magic numbers.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
38583
diff
changeset
|
2072 | if ((account != NULL) && (event->button == GDK_BUTTON_PRIMARY) && |
|
22056
d652ea774f31
Double clicking the column header/divider, or in the 'enabled' column shouldn't bring up the account-modify window. Fixes #3733.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22032
diff
changeset
|
2073 | (event->type == GDK_2BUTTON_PRESS)) |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2074 | { |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2075 | pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, account); |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2076 | return TRUE; |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2077 | } |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2078 | |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2079 | return FALSE; |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2080 | } |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2081 | |
| 5563 | 2082 | static GtkWidget * |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2083 | create_accounts_list(AccountsWindow *dialog) |
| 5563 | 2084 | { |
| 15053 | 2085 | GtkWidget *frame; |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2086 | GtkWidget *treeview; |
|
5703
3d4600423773
[gaim-migrate @ 6124]
Christian Hammond <chipx86@chipx86.com>
parents:
5702
diff
changeset
|
2087 | GtkTreeSelection *sel; |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2088 | |
| 15053 | 2089 | frame = gtk_frame_new(NULL); |
| 2090 | gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN); | |
| 2091 | ||
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2092 | /* Create the list model. */ |
|
5781
7c5b3e132a6d
[gaim-migrate @ 6206]
Christian Hammond <chipx86@chipx86.com>
parents:
5779
diff
changeset
|
2093 | dialog->model = gtk_list_store_new(NUM_COLUMNS, |
| 14921 | 2094 | GDK_TYPE_PIXBUF, /* COLUMN_ICON */ |
| 15240 | 2095 | GDK_TYPE_PIXBUF, /* COLUMN_BUDDYICON */ |
|
25889
26d9ca30335c
Change "screen name" to "username" or "buddy name" in a whole bunch of
Mark Doliner <markdoliner@pidgin.im>
parents:
25888
diff
changeset
|
2096 | G_TYPE_STRING, /* COLUMN_USERNAME */ |
| 14921 | 2097 | G_TYPE_BOOLEAN, /* COLUMN_ENABLED */ |
| 2098 | G_TYPE_STRING, /* COLUMN_PROTOCOL */ | |
|
23376
d8292fe4bb5c
eperez noticed that there's an extra unused column here.
Daniel Atallah <datallah@pidgin.im>
parents:
23313
diff
changeset
|
2099 | G_TYPE_POINTER /* COLUMN_DATA */ |
| 14921 | 2100 | ); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2101 | |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2102 | /* And now the actual treeview */ |
|
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2103 | treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model)); |
|
5651
ae0744d896bc
[gaim-migrate @ 6065]
Christian Hammond <chipx86@chipx86.com>
parents:
5648
diff
changeset
|
2104 | dialog->treeview = treeview; |
|
22214
e8a9916cb99e
It turns out the tree-models need to be unref'ed.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22177
diff
changeset
|
2105 | g_object_unref(G_OBJECT(dialog->model)); |
|
10418
7b632343a29c
[gaim-migrate @ 11669]
Mark Doliner <markdoliner@pidgin.im>
parents:
10413
diff
changeset
|
2106 | |
|
7b632343a29c
[gaim-migrate @ 11669]
Mark Doliner <markdoliner@pidgin.im>
parents:
10413
diff
changeset
|
2107 | sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); |
|
7b632343a29c
[gaim-migrate @ 11669]
Mark Doliner <markdoliner@pidgin.im>
parents:
10413
diff
changeset
|
2108 | gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE); |
|
7b632343a29c
[gaim-migrate @ 11669]
Mark Doliner <markdoliner@pidgin.im>
parents:
10413
diff
changeset
|
2109 | g_signal_connect(G_OBJECT(sel), "changed", |
|
7b632343a29c
[gaim-migrate @ 11669]
Mark Doliner <markdoliner@pidgin.im>
parents:
10413
diff
changeset
|
2110 | G_CALLBACK(account_selected_cb), dialog); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2111 | |
|
10640
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2112 | /* Handle double-clicking */ |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2113 | g_signal_connect(G_OBJECT(treeview), "button_press_event", |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2114 | G_CALLBACK(account_treeview_double_click_cb), dialog); |
|
440a5c056725
[gaim-migrate @ 12145]
Cestonaro Thilo <ephraim@users.sourceforge.net>
parents:
10605
diff
changeset
|
2115 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2116 | gtk_container_add(GTK_CONTAINER(frame), |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2117 | pidgin_make_scrollable(treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, -1)); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2118 | |
| 5774 | 2119 | add_columns(treeview, dialog); |
|
23292
4ffd6137ef9b
Change how the columns in the account-manager window are resized.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
23289
diff
changeset
|
2120 | gtk_tree_view_columns_autosize(GTK_TREE_VIEW(treeview)); |
|
5581
646cda748437
[gaim-migrate @ 5985]
Christian Hammond <chipx86@chipx86.com>
parents:
5573
diff
changeset
|
2121 | |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2122 | populate_accounts_list(dialog); |
|
5569
c0e413ace539
[gaim-migrate @ 5971]
Christian Hammond <chipx86@chipx86.com>
parents:
5567
diff
changeset
|
2123 | |
| 15053 | 2124 | gtk_widget_show_all(frame); |
| 2125 | return frame; | |
| 5563 | 2126 | } |
| 2127 | ||
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2128 | static void |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2129 | account_modified_cb(PurpleAccount *account, gpointer data) { |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2130 | AccountsWindow *window = (AccountsWindow *)data; |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2131 | GtkTreeIter iter; |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2132 | |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2133 | if (!accounts_window_find_account_in_treemodel(&iter, account)) |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2134 | return; |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2135 | |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2136 | set_account(window->model, &iter, account, NULL); |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2137 | } |
|
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2138 | |
|
15352
81a10752d5e0
[gaim-migrate @ 18080]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15301
diff
changeset
|
2139 | static void |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2140 | global_buddyicon_changed(const gchar *name, PurplePrefType type, |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2141 | gconstpointer value, gpointer window) |
|
15352
81a10752d5e0
[gaim-migrate @ 18080]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15301
diff
changeset
|
2142 | { |
|
41209
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2143 | PurpleAccountManager *manager = NULL; |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2144 | |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2145 | manager = purple_account_manager_get_default(); |
|
909561f42b1f
port Pidgin to the new PurpleAccountManager api
Gary Kramlich <grim@reaperworld.com>
parents:
41189
diff
changeset
|
2146 | purple_account_manager_foreach(manager, account_modified_cb, window); |
|
15352
81a10752d5e0
[gaim-migrate @ 18080]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15301
diff
changeset
|
2147 | } |
|
81a10752d5e0
[gaim-migrate @ 18080]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15301
diff
changeset
|
2148 | |
| 5563 | 2149 | void |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2150 | pidgin_accounts_window_show(void) |
| 5563 | 2151 | { |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2152 | AccountsWindow *dialog; |
| 5563 | 2153 | GtkWidget *win; |
| 2154 | GtkWidget *vbox; | |
| 2155 | GtkWidget *sw; | |
| 2156 | int width, height; | |
| 2157 | ||
|
6371
e92b66ee5518
[gaim-migrate @ 6876]
Christian Hammond <chipx86@chipx86.com>
parents:
6368
diff
changeset
|
2158 | if (accounts_window != NULL) { |
|
9482
8ade66642b6e
[gaim-migrate @ 10307]
Mark Doliner <markdoliner@pidgin.im>
parents:
9337
diff
changeset
|
2159 | gtk_window_present(GTK_WINDOW(accounts_window->window)); |
| 5563 | 2160 | return; |
|
6371
e92b66ee5518
[gaim-migrate @ 6876]
Christian Hammond <chipx86@chipx86.com>
parents:
6368
diff
changeset
|
2161 | } |
| 5563 | 2162 | |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2163 | accounts_window = dialog = g_new0(AccountsWindow, 1); |
| 5563 | 2164 | |
|
16123
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2165 | width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width"); |
|
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2166 | height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height"); |
| 5563 | 2167 | |
|
40533
b1921b17b683
Replace some utility functions with actual widgets
Gary Kramlich <grim@reaperworld.com>
parents:
40496
diff
changeset
|
2168 | dialog->window = win = pidgin_dialog_new(_("Accounts"), 0, "accounts", TRUE); |
| 5563 | 2169 | gtk_window_set_default_size(GTK_WINDOW(win), width, height); |
| 2170 | ||
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2171 | g_signal_connect(win, "delete_event", G_CALLBACK(accedit_win_destroy_cb), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2172 | accounts_window); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2173 | g_signal_connect(win, "response", G_CALLBACK(accedit_win_response_cb), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2174 | accounts_window); |
| 5563 | 2175 | |
| 2176 | /* Setup the vbox */ | |
|
41058
18f3ea2e7e6d
Remove pidgin_dialog* helper functions
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41036
diff
changeset
|
2177 | vbox = gtk_dialog_get_content_area(GTK_DIALOG(win)); |
|
18f3ea2e7e6d
Remove pidgin_dialog* helper functions
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41036
diff
changeset
|
2178 | gtk_box_set_spacing(GTK_BOX(vbox), 12); |
| 5563 | 2179 | |
| 2180 | /* Setup the scrolled window that will contain the list of accounts. */ | |
| 5774 | 2181 | sw = create_accounts_list(dialog); |
| 5563 | 2182 | gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); |
| 2183 | gtk_widget_show(sw); | |
| 2184 | ||
|
41036
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2185 | /* Add buttons */ |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2186 | gtk_dialog_add_button(GTK_DIALOG(win), _("_Add..."), RESPONSE_ADD); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2187 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2188 | dialog->modify_button = gtk_dialog_add_button(GTK_DIALOG(win), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2189 | _("_Modify..."), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2190 | RESPONSE_MODIFY); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2191 | gtk_widget_set_sensitive(dialog->modify_button, FALSE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2192 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2193 | dialog->delete_button = gtk_dialog_add_button(GTK_DIALOG(win), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2194 | _("_Delete"), |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2195 | RESPONSE_DELETE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2196 | gtk_widget_set_sensitive(dialog->delete_button, FALSE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2197 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2198 | gtk_dialog_add_button(GTK_DIALOG(win), _("_Close"), RESPONSE_CLOSE); |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2199 | |
|
c2a9da21b8c0
Replace the deprecated API in gtkaccount.c
Gary Kramlich <grim@reaperworld.com>
parents:
41030
diff
changeset
|
2200 | /* Signals */ |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2201 | purple_signal_connect(pidgin_accounts_get_handle(), "account-modified", |
|
12521
0284088b422d
[gaim-migrate @ 14833]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12493
diff
changeset
|
2202 | accounts_window, |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2203 | G_CALLBACK(account_modified_cb), accounts_window); |
| 15884 | 2204 | purple_prefs_connect_callback(accounts_window, |
|
16123
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2205 | PIDGIN_PREFS_ROOT "/accounts/buddyicon", |
|
15352
81a10752d5e0
[gaim-migrate @ 18080]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
15301
diff
changeset
|
2206 | global_buddyicon_changed, accounts_window); |
|
5615
2eb715cbbd9b
[gaim-migrate @ 6022]
Christian Hammond <chipx86@chipx86.com>
parents:
5592
diff
changeset
|
2207 | |
| 5563 | 2208 | gtk_widget_show(win); |
| 2209 | } | |
| 2210 | ||
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2211 | void |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2212 | pidgin_accounts_window_hide(void) |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2213 | { |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2214 | if (accounts_window == NULL) |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2215 | return; |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2216 | |
|
18841
71c4218684cb
pidgin_accounts_window_hide() should actually dispose of the window. Fixes #2193.
Daniel Atallah <datallah@pidgin.im>
parents:
18706
diff
changeset
|
2217 | if (accounts_window->window != NULL) |
|
71c4218684cb
pidgin_accounts_window_hide() should actually dispose of the window. Fixes #2193.
Daniel Atallah <datallah@pidgin.im>
parents:
18706
diff
changeset
|
2218 | gtk_widget_destroy(accounts_window->window); |
|
71c4218684cb
pidgin_accounts_window_hide() should actually dispose of the window. Fixes #2193.
Daniel Atallah <datallah@pidgin.im>
parents:
18706
diff
changeset
|
2219 | |
| 15884 | 2220 | purple_signals_disconnect_by_handle(accounts_window); |
| 2221 | purple_prefs_disconnect_by_handle(accounts_window); | |
|
6119
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2222 | |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2223 | g_free(accounts_window); |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2224 | accounts_window = NULL; |
|
5b4c66789a8c
[gaim-migrate @ 6588]
Christian Hammond <chipx86@chipx86.com>
parents:
6092
diff
changeset
|
2225 | } |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2226 | |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2227 | static void |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2228 | free_add_user_data(G_GNUC_UNUSED PidginMiniDialog *mini_dialog, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2229 | G_GNUC_UNUSED GtkButton *button, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2230 | gpointer user_data) |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2231 | { |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2232 | PidginAccountAddUserData *data = user_data; |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2233 | g_free(data->username); |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14087
diff
changeset
|
2234 | g_free(data->alias); |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2235 | g_free(data); |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2236 | } |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2237 | |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2238 | static void |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2239 | add_user_cb(G_GNUC_UNUSED PidginMiniDialog *mini_dialog, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2240 | G_GNUC_UNUSED GtkButton *button, gpointer user_data) |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2241 | { |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2242 | PidginAccountAddUserData *data = user_data; |
| 15884 | 2243 | PurpleConnection *gc = purple_account_get_connection(data->account); |
| 2244 | ||
|
18122
9bf9970c1b6a
disapproval of revision '2d8ea56b90971e7851442d96b7d74ecb4f052126'
Richard Laager <rlaager@pidgin.im>
parents:
18121
diff
changeset
|
2245 | if (g_list_find(purple_connections_get_all(), gc)) |
|
7060
717cbeb22b6d
[gaim-migrate @ 7623]
Christian Hammond <chipx86@chipx86.com>
parents:
7015
diff
changeset
|
2246 | { |
| 15884 | 2247 | purple_blist_request_add_buddy(data->account, data->username, |
|
7060
717cbeb22b6d
[gaim-migrate @ 7623]
Christian Hammond <chipx86@chipx86.com>
parents:
7015
diff
changeset
|
2248 | NULL, data->alias); |
|
717cbeb22b6d
[gaim-migrate @ 7623]
Christian Hammond <chipx86@chipx86.com>
parents:
7015
diff
changeset
|
2249 | } |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2250 | |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2251 | free_add_user_data(NULL, NULL, user_data); |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2252 | } |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2253 | |
| 12285 | 2254 | static char * |
| 15884 | 2255 | make_info(PurpleAccount *account, PurpleConnection *gc, const char *remote_user, |
| 12285 | 2256 | const char *id, const char *alias, const char *msg) |
| 2257 | { | |
|
12976
aedbdb6f9adb
[gaim-migrate @ 15329]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
12960
diff
changeset
|
2258 | if (msg != NULL && *msg == '\0') |
|
12960
69571cc82fda
[gaim-migrate @ 15313]
Richard Laager <rlaager@pidgin.im>
parents:
12843
diff
changeset
|
2259 | msg = NULL; |
|
69571cc82fda
[gaim-migrate @ 15313]
Richard Laager <rlaager@pidgin.im>
parents:
12843
diff
changeset
|
2260 | |
| 12286 | 2261 | return g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s"), |
| 12285 | 2262 | remote_user, |
| 2263 | (alias != NULL ? " (" : ""), | |
| 2264 | (alias != NULL ? alias : ""), | |
| 2265 | (alias != NULL ? ")" : ""), | |
| 2266 | (id != NULL | |
| 2267 | ? id | |
| 15884 | 2268 | : (purple_connection_get_display_name(gc) != NULL |
| 2269 | ? purple_connection_get_display_name(gc) | |
| 2270 | : purple_account_get_username(account))), | |
| 15096 | 2271 | (msg != NULL ? ": " : "."), |
| 12285 | 2272 | (msg != NULL ? msg : "")); |
| 2273 | } | |
| 2274 | ||
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2275 | static void |
| 15884 | 2276 | pidgin_accounts_notify_added(PurpleAccount *account, const char *remote_user, |
| 12285 | 2277 | const char *id, const char *alias, |
| 2278 | const char *msg) | |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2279 | { |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2280 | char *buffer; |
| 15884 | 2281 | PurpleConnection *gc; |
| 15094 | 2282 | GtkWidget *alert; |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2283 | |
| 15884 | 2284 | gc = purple_account_get_connection(account); |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2285 | |
| 12285 | 2286 | buffer = make_info(account, gc, remote_user, id, alias, msg); |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2287 | alert = pidgin_mini_dialog_new_with_buttons( |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2288 | buffer, NULL, "dialog-information", NULL, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2289 | _("Close"), NULL, NULL); |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2290 | pidgin_blist_add_alert(alert); |
| 12285 | 2291 | |
| 2292 | g_free(buffer); | |
| 2293 | } | |
| 2294 | ||
| 2295 | static void | |
| 15884 | 2296 | pidgin_accounts_request_add(PurpleAccount *account, const char *remote_user, |
| 12285 | 2297 | const char *id, const char *alias, |
| 2298 | const char *msg) | |
| 2299 | { | |
| 2300 | char *buffer; | |
| 15884 | 2301 | PurpleConnection *gc; |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2302 | PidginAccountAddUserData *data; |
| 15094 | 2303 | GtkWidget *alert; |
| 12285 | 2304 | |
| 15884 | 2305 | gc = purple_account_get_connection(account); |
| 12285 | 2306 | |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2307 | data = g_new0(PidginAccountAddUserData, 1); |
| 12285 | 2308 | data->account = account; |
| 2309 | data->username = g_strdup(remote_user); | |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
14087
diff
changeset
|
2310 | data->alias = g_strdup(alias); |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2311 | |
| 12285 | 2312 | buffer = make_info(account, gc, remote_user, id, alias, msg); |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2313 | alert = pidgin_mini_dialog_new_with_buttons( |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2314 | _("Add buddy to your list?"), buffer, "dialog-question", data, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2315 | _("Add"), add_user_cb, _("Cancel"), free_add_user_data, NULL); |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2316 | pidgin_blist_add_alert(alert); |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2317 | |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2318 | g_free(buffer); |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2319 | } |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2320 | |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2321 | struct auth_request |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2322 | { |
| 15884 | 2323 | PurpleAccountRequestAuthorizationCb auth_cb; |
| 2324 | PurpleAccountRequestAuthorizationCb deny_cb; | |
| 15119 | 2325 | void *data; |
| 2326 | char *username; | |
| 2327 | char *alias; | |
| 15884 | 2328 | PurpleAccount *account; |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2329 | gboolean add_buddy_after_auth; |
| 15119 | 2330 | }; |
| 2331 | ||
| 2332 | static void | |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2333 | free_auth_request(struct auth_request *ar) |
| 15119 | 2334 | { |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2335 | g_free(ar->username); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2336 | g_free(ar->alias); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2337 | g_free(ar); |
| 15119 | 2338 | } |
| 2339 | ||
| 2340 | static void | |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2341 | authorize_and_add_cb(struct auth_request *ar, const char *message) |
|
24861
482524bb3e81
A patch to clean up authorization request related stuff. Fixes #7695.
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
2342 | { |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2343 | ar->auth_cb(message, ar->data); |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2344 | if (ar->add_buddy_after_auth) { |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2345 | purple_blist_request_add_buddy(ar->account, ar->username, NULL, ar->alias); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2346 | } |
|
24861
482524bb3e81
A patch to clean up authorization request related stuff. Fixes #7695.
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
2347 | } |
|
482524bb3e81
A patch to clean up authorization request related stuff. Fixes #7695.
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
2348 | |
|
482524bb3e81
A patch to clean up authorization request related stuff. Fixes #7695.
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
2349 | static void |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2350 | authorize_noreason_cb(struct auth_request *ar) |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2351 | { |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2352 | authorize_and_add_cb(ar, NULL); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2353 | } |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2354 | |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2355 | static void |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2356 | authorize_reason_cb(G_GNUC_UNUSED PidginMiniDialog *mini_dialog, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2357 | G_GNUC_UNUSED GtkButton *button, gpointer user_data) |
| 15119 | 2358 | { |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2359 | struct auth_request *ar = user_data; |
|
40803
0e11ce1049b2
Port Pidgin from purple_protocols to PurpleProtocolManager
Gary Kramlich <grim@reaperworld.com>
parents:
40787
diff
changeset
|
2360 | PurpleProtocol *protocol = purple_account_get_protocol(ar->account); |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
2361 | |
|
36607
7ad7681dcfd8
Use purple_protocol_get_* API instead of protocol->member
Ankit Vani <a@nevitus.org>
parents:
36606
diff
changeset
|
2362 | if (protocol && (purple_protocol_get_options(protocol) & OPT_PROTO_AUTHORIZATION_GRANTED_MESSAGE)) { |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2363 | /* Duplicate information because ar is freed by closing minidialog */ |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2364 | struct auth_request *aa = g_new0(struct auth_request, 1); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2365 | aa->auth_cb = ar->auth_cb; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2366 | aa->deny_cb = ar->deny_cb; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2367 | aa->data = ar->data; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2368 | aa->account = ar->account; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2369 | aa->username = g_strdup(ar->username); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2370 | aa->alias = g_strdup(ar->alias); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2371 | aa->add_buddy_after_auth = ar->add_buddy_after_auth; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2372 | purple_request_input(ar->account, NULL, _("Authorization acceptance message:"), |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2373 | NULL, _("No reason given."), TRUE, FALSE, NULL, |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2374 | _("OK"), G_CALLBACK(authorize_and_add_cb), |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2375 | _("Cancel"), G_CALLBACK(authorize_noreason_cb), |
|
34329
ddbc1337332c
Request API refactoring: introduce PurpleRequestCommonParameters and switch purple_request_input to it
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34304
diff
changeset
|
2376 | purple_request_cpar_from_account(ar->account), |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2377 | aa); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2378 | /* FIXME: aa is going to leak now. */ |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2379 | } else { |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2380 | authorize_noreason_cb(ar); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2381 | } |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2382 | } |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2383 | |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2384 | static void |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2385 | deny_no_add_cb(struct auth_request *ar, const char *message) |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2386 | { |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2387 | ar->deny_cb(message, ar->data); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2388 | } |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2389 | |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2390 | static void |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2391 | deny_noreason_cb(struct auth_request *ar) |
|
24861
482524bb3e81
A patch to clean up authorization request related stuff. Fixes #7695.
Paul Aurich <darkrain42@pidgin.im>
parents:
24672
diff
changeset
|
2392 | { |
|
33687
0819d40769c8
Add a message to the authorization callbacks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33661
diff
changeset
|
2393 | ar->deny_cb(NULL, ar->data); |
| 15119 | 2394 | } |
| 2395 | ||
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2396 | static void |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2397 | deny_reason_cb(G_GNUC_UNUSED PidginMiniDialog *mini_dialog, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2398 | G_GNUC_UNUSED GtkButton *button, gpointer user_data) |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2399 | { |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2400 | struct auth_request *ar = user_data; |
|
40803
0e11ce1049b2
Port Pidgin from purple_protocols to PurpleProtocolManager
Gary Kramlich <grim@reaperworld.com>
parents:
40787
diff
changeset
|
2401 | PurpleProtocol *protocol = purple_account_get_protocol(ar->account); |
|
36544
1bf8b6ef5aea
Renamed PurplePluginProtocolInfo to PurpleProtocol
Ankit Vani <a@nevitus.org>
parents:
36543
diff
changeset
|
2402 | |
|
36607
7ad7681dcfd8
Use purple_protocol_get_* API instead of protocol->member
Ankit Vani <a@nevitus.org>
parents:
36606
diff
changeset
|
2403 | if (protocol && (purple_protocol_get_options(protocol) & OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE)) { |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2404 | /* Duplicate information because ar is freed by closing minidialog */ |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2405 | struct auth_request *aa = g_new0(struct auth_request, 1); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2406 | aa->auth_cb = ar->auth_cb; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2407 | aa->deny_cb = ar->deny_cb; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2408 | aa->data = ar->data; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2409 | aa->add_buddy_after_auth = ar->add_buddy_after_auth; |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2410 | purple_request_input(ar->account, NULL, _("Authorization denied message:"), |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2411 | NULL, _("No reason given."), TRUE, FALSE, NULL, |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2412 | _("OK"), G_CALLBACK(deny_no_add_cb), |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2413 | _("Cancel"), G_CALLBACK(deny_noreason_cb), |
|
34329
ddbc1337332c
Request API refactoring: introduce PurpleRequestCommonParameters and switch purple_request_input to it
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34304
diff
changeset
|
2414 | purple_request_cpar_from_account(ar->account), |
|
33697
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2415 | aa); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2416 | /* FIXME: aa is going to leak now. */ |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2417 | } else { |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2418 | deny_noreason_cb(ar); |
|
33a5cca20993
Add the authorization message back in Pidgin proper.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33687
diff
changeset
|
2419 | } |
| 15119 | 2420 | } |
| 2421 | ||
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2422 | static gboolean |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2423 | get_user_info_cb(GtkWidget *label, |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2424 | const gchar *uri, |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2425 | gpointer data) |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2426 | { |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2427 | struct auth_request *ar = data; |
|
38258
9a6551eba09c
Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38091
diff
changeset
|
2428 | if (purple_strequal(uri, "viewinfo")) { |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2429 | pidgin_retrieve_user_info(purple_account_get_connection(ar->account), ar->username); |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2430 | return TRUE; |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2431 | } |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2432 | return FALSE; |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2433 | } |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2434 | |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2435 | static void |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2436 | send_im_cb(G_GNUC_UNUSED PidginMiniDialog *mini_dialog, |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2437 | G_GNUC_UNUSED GtkButton *button, |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2438 | gpointer data) |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2439 | { |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2440 | struct auth_request *ar = data; |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2441 | pidgin_dialogs_im_with_user(ar->account, ar->username); |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2442 | } |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2443 | |
|
15537
5d7473f14c67
The accounts request API now keeps track of a returned ui_handle for authorization requests, which can be closed on demand individually or all-at-once by account. When a connection is destroyed, its associated requests are closed.
Evan Schoenberg <evands@pidgin.im>
parents:
15518
diff
changeset
|
2444 | static void * |
|
19125
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2445 | pidgin_accounts_request_authorization(PurpleAccount *account, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2446 | const char *remote_user, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2447 | const char *id, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2448 | const char *alias, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2449 | const char *message, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2450 | gboolean on_list, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2451 | PurpleAccountRequestAuthorizationCb auth_cb, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2452 | PurpleAccountRequestAuthorizationCb deny_cb, |
|
d92cd58cc6ba
Correct the types of the authorize_cb and deny_cb parameters of
Will Thompson <resiak@pidgin.im>
parents:
19049
diff
changeset
|
2453 | void *user_data) |
| 15119 | 2454 | { |
| 2455 | char *buffer; | |
| 15884 | 2456 | PurpleConnection *gc; |
| 15119 | 2457 | GtkWidget *alert; |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2458 | PidginMiniDialog *dialog; |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2459 | GdkPixbuf *protocol_icon; |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2460 | struct auth_request *aa; |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2461 | const char *our_name; |
|
33703
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2462 | gboolean have_valid_alias; |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2463 | char *escaped_remote_user; |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2464 | char *escaped_alias; |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2465 | char *escaped_our_name; |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2466 | char *escaped_message; |
| 15119 | 2467 | |
| 15884 | 2468 | gc = purple_account_get_connection(account); |
|
33703
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2469 | if (message != NULL && *message != '\0') |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2470 | escaped_message = g_markup_escape_text(message, -1); |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2471 | else |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2472 | escaped_message = g_strdup(""); |
|
15518
234684c3ed08
Avoid scaling the global buddy icon for each account when populating the Accounts dialog list.
Daniel Atallah <datallah@pidgin.im>
parents:
15498
diff
changeset
|
2473 | |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2474 | our_name = (id != NULL) ? id : |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2475 | (purple_connection_get_display_name(gc) != NULL) ? purple_connection_get_display_name(gc) : |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2476 | purple_account_get_username(account); |
|
33703
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2477 | escaped_our_name = g_markup_escape_text(our_name, -1); |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2478 | |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2479 | escaped_remote_user = g_markup_escape_text(remote_user, -1); |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2480 | |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2481 | have_valid_alias = alias && *alias; |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2482 | escaped_alias = have_valid_alias ? g_markup_escape_text(alias, -1) : g_strdup(""); |
|
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2483 | |
|
33685
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2484 | buffer = g_strdup_printf(_("<a href=\"viewinfo\">%s</a>%s%s%s wants to add you (%s) to his or her buddy list%s%s"), |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2485 | escaped_remote_user, |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2486 | (have_valid_alias ? " (" : ""), |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2487 | escaped_alias, |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2488 | (have_valid_alias ? ")" : ""), |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2489 | escaped_our_name, |
|
36122
638471098869
Small bug fix to the wording of add buddy requests.
Mark Doliner <mark@kingant.net>
parents:
36020
diff
changeset
|
2490 | (*escaped_message ? ": " : "."), |
|
33685
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2491 | escaped_message); |
|
33703
273ec0b090d9
Fix definition/code order from Mark's last commit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33702
diff
changeset
|
2492 | |
|
33685
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2493 | g_free(escaped_remote_user); |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2494 | g_free(escaped_alias); |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2495 | g_free(escaped_our_name); |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2496 | g_free(escaped_message); |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2497 | |
|
36545
23b59a16c808
Replaced some _prpl_ stuff with _protocol_
Ankit Vani <a@nevitus.org>
parents:
36544
diff
changeset
|
2498 | protocol_icon = pidgin_create_protocol_icon(account, PIDGIN_PROTOCOL_ICON_SMALL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31217
diff
changeset
|
2499 | |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2500 | aa = g_new0(struct auth_request, 1); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2501 | aa->auth_cb = auth_cb; |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2502 | aa->deny_cb = deny_cb; |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2503 | aa->data = user_data; |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2504 | aa->username = g_strdup(remote_user); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2505 | aa->alias = g_strdup(alias); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2506 | aa->account = account; |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2507 | aa->add_buddy_after_auth = !on_list; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
31217
diff
changeset
|
2508 | |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2509 | dialog = pidgin_mini_dialog_new_with_custom_icon( |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2510 | _("Authorize buddy?"), NULL, protocol_icon); |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2511 | alert = GTK_WIDGET(dialog); |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2512 | |
|
33685
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2513 | pidgin_mini_dialog_enable_description_markup(dialog); |
|
4a3c6a2f80e7
Remove unneeded function.
Mark Doliner <mark@kingant.net>
parents:
33683
diff
changeset
|
2514 | pidgin_mini_dialog_set_link_callback(dialog, G_CALLBACK(get_user_info_cb), aa); |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2515 | pidgin_mini_dialog_set_description(dialog, buffer); |
|
40991
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2516 | pidgin_mini_dialog_add_button(dialog, _("Authorize"), authorize_reason_cb, aa); |
|
d92defc9ba95
Move minidialog stuff from utils to its source file
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
40975
diff
changeset
|
2517 | pidgin_mini_dialog_add_button(dialog, _("Deny"), deny_reason_cb, aa); |
|
31642
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2518 | pidgin_mini_dialog_add_non_closing_button(dialog, _("Send Instant Message"), send_im_cb, aa); |
|
ad20028f085c
Finally merged the code that fixes #5038 to i.p.p.
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
31603
diff
changeset
|
2519 | |
|
30635
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2520 | g_signal_connect_swapped(G_OBJECT(alert), "destroy", G_CALLBACK(free_auth_request), aa); |
|
e9893ecc9057
Display the protocol icon for the authorization request dialog
Ivan Komarov <ivan.komarov@pidgin.im>
parents:
29686
diff
changeset
|
2521 | g_signal_connect(G_OBJECT(alert), "destroy", G_CALLBACK(purple_account_request_close), NULL); |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2522 | pidgin_blist_add_alert(alert); |
| 15119 | 2523 | |
| 2524 | g_free(buffer); | |
|
15999
77ac8981199b
Some pixmap path fixes and win32 fixes
Daniel Atallah <datallah@pidgin.im>
parents:
15931
diff
changeset
|
2525 | |
|
22177
d3858cc821a8
This makes authorization requests go away when the account is disconnected. It will leak the protocol's user_data, but without an API change, there isn't much that can be done about that. References #4609
Daniel Atallah <datallah@pidgin.im>
parents:
22131
diff
changeset
|
2526 | return alert; |
|
15537
5d7473f14c67
The accounts request API now keeps track of a returned ui_handle for authorization requests, which can be closed on demand individually or all-at-once by account. When a connection is destroyed, its associated requests are closed.
Evan Schoenberg <evands@pidgin.im>
parents:
15518
diff
changeset
|
2527 | } |
|
5d7473f14c67
The accounts request API now keeps track of a returned ui_handle for authorization requests, which can be closed on demand individually or all-at-once by account. When a connection is destroyed, its associated requests are closed.
Evan Schoenberg <evands@pidgin.im>
parents:
15518
diff
changeset
|
2528 | |
|
5d7473f14c67
The accounts request API now keeps track of a returned ui_handle for authorization requests, which can be closed on demand individually or all-at-once by account. When a connection is destroyed, its associated requests are closed.
Evan Schoenberg <evands@pidgin.im>
parents:
15518
diff
changeset
|
2529 | static void |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2530 | pidgin_accounts_request_close(void *ui_handle) |
|
15537
5d7473f14c67
The accounts request API now keeps track of a returned ui_handle for authorization requests, which can be closed on demand individually or all-at-once by account. When a connection is destroyed, its associated requests are closed.
Evan Schoenberg <evands@pidgin.im>
parents:
15518
diff
changeset
|
2531 | { |
|
22177
d3858cc821a8
This makes authorization requests go away when the account is disconnected. It will leak the protocol's user_data, but without an API change, there isn't much that can be done about that. References #4609
Daniel Atallah <datallah@pidgin.im>
parents:
22131
diff
changeset
|
2532 | gtk_widget_destroy(GTK_WIDGET(ui_handle)); |
| 15119 | 2533 | } |
| 2534 | ||
| 15884 | 2535 | static PurpleAccountUiOps ui_ops = |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2536 | { |
|
40707
f84f2b4ef0e5
Fix some warnings about missing braces by moving to struct initializers
Gary Kramlich <grim@reaperworld.com>
parents:
40694
diff
changeset
|
2537 | .notify_added = pidgin_accounts_notify_added, |
|
f84f2b4ef0e5
Fix some warnings about missing braces by moving to struct initializers
Gary Kramlich <grim@reaperworld.com>
parents:
40694
diff
changeset
|
2538 | .request_add = pidgin_accounts_request_add, |
|
f84f2b4ef0e5
Fix some warnings about missing braces by moving to struct initializers
Gary Kramlich <grim@reaperworld.com>
parents:
40694
diff
changeset
|
2539 | .request_authorize = pidgin_accounts_request_authorization, |
|
f84f2b4ef0e5
Fix some warnings about missing braces by moving to struct initializers
Gary Kramlich <grim@reaperworld.com>
parents:
40694
diff
changeset
|
2540 | .close_account_request = pidgin_accounts_request_close, |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2541 | }; |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2542 | |
| 15884 | 2543 | PurpleAccountUiOps * |
|
15562
8c8249fe5e3c
gaim_gtk to pidgin. I hope
Sean Egan <seanegan@pidgin.im>
parents:
15537
diff
changeset
|
2544 | pidgin_accounts_get_ui_ops(void) |
|
7015
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2545 | { |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2546 | return &ui_ops; |
|
bea9111282b3
[gaim-migrate @ 7578]
Christian Hammond <chipx86@chipx86.com>
parents:
6856
diff
changeset
|
2547 | } |
| 9609 | 2548 | |
| 2549 | void * | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2550 | pidgin_accounts_get_handle(void) { |
| 9609 | 2551 | static int handle; |
| 2552 | ||
| 2553 | return &handle; | |
| 2554 | } | |
| 2555 | ||
| 2556 | void | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2557 | pidgin_accounts_init(void) |
|
10163
a916c8d1ee5c
[gaim-migrate @ 11249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10159
diff
changeset
|
2558 | { |
|
16123
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2559 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/accounts"); |
|
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2560 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/accounts/dialog"); |
|
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2561 | purple_prefs_add_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width", 520); |
|
8b98683319e7
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
16071
diff
changeset
|
2562 | purple_prefs_add_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height", 321); |
|
41189
b779665790a2
Don't use ~/.face.icon as a default profile picture.
Gary Kramlich <grim@reaperworld.com>
parents:
41167
diff
changeset
|
2563 | |
|
b779665790a2
Don't use ~/.face.icon as a default profile picture.
Gary Kramlich <grim@reaperworld.com>
parents:
41167
diff
changeset
|
2564 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon", NULL); |
|
10163
a916c8d1ee5c
[gaim-migrate @ 11249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10159
diff
changeset
|
2565 | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2566 | purple_signal_register(pidgin_accounts_get_handle(), "account-modified", |
|
34827
1615d90aa584
Refactored pidgin to use GType instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34708
diff
changeset
|
2567 | purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, |
|
1615d90aa584
Refactored pidgin to use GType instead of PurpleValue
Ankit Vani <a@nevitus.org>
parents:
34708
diff
changeset
|
2568 | PURPLE_TYPE_ACCOUNT); |
| 15884 | 2569 | |
| 2570 | /* Setup some purple signal handlers. */ | |
| 2571 | purple_signal_connect(purple_connections_get_handle(), "signed-on", | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2572 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2573 | G_CALLBACK(signed_on_off_cb), NULL); |
| 15884 | 2574 | purple_signal_connect(purple_connections_get_handle(), "signed-off", |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2575 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2576 | G_CALLBACK(signed_on_off_cb), NULL); |
| 15884 | 2577 | purple_signal_connect(purple_accounts_get_handle(), "account-added", |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2578 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2579 | G_CALLBACK(add_account_to_liststore), NULL); |
| 15884 | 2580 | purple_signal_connect(purple_accounts_get_handle(), "account-removed", |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2581 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2582 | G_CALLBACK(account_removed_cb), NULL); |
| 15884 | 2583 | purple_signal_connect(purple_accounts_get_handle(), "account-disabled", |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2584 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2585 | G_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE)); |
| 15884 | 2586 | purple_signal_connect(purple_accounts_get_handle(), "account-enabled", |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2587 | pidgin_accounts_get_handle(), |
|
41314
0dc72eacd8bf
Replace PURPLE_CALLBACK by G_CALLBACK
Elliott Sales de Andrade <quantum.analyst@gmail.com>
parents:
41299
diff
changeset
|
2588 | G_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE)); |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2589 | |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2590 | account_pref_wins = |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2591 | g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, NULL); |
| 9609 | 2592 | } |
| 2593 | ||
| 2594 | void | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2595 | pidgin_accounts_uninit(void) |
|
10163
a916c8d1ee5c
[gaim-migrate @ 11249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10159
diff
changeset
|
2596 | { |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2597 | /* |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2598 | * TODO: Need to free all the dialogs in here. Could probably create |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2599 | * a callback function to use for the free-some-data-function |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2600 | * parameter of g_hash_table_new_full, above. |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2601 | */ |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2602 | g_hash_table_destroy(account_pref_wins); |
|
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2603 | |
|
34585
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2604 | purple_signals_disconnect_by_handle(pidgin_accounts_get_handle()); |
|
cc4b9443deb9
Renamed pidgin_account_[init,uninit,get_handle] to pidgin_accounts_[init,uninit,get_handle].
Ankit Vani <a@nevitus.org>
parents:
34145
diff
changeset
|
2605 | purple_signals_unregister_by_instance(pidgin_accounts_get_handle()); |
| 9609 | 2606 | } |
|
11789
a3310d5f454c
[gaim-migrate @ 14080]
Mark Doliner <markdoliner@pidgin.im>
parents:
11784
diff
changeset
|
2607 |