Fri, 14 Feb 2014 04:24:08 -0500
Minor re-arrangement for VV prefs code.
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1 | /* pidgin |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2 | * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3 | * Pidgin is the legal property of its developers, whose names are too numerous |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
5 | * source distribution. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
6 | * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
7 | * This program is free software; you can redistribute it and/or modify |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
8 | * it under the terms of the GNU General Public License as published by |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
9 | * the Free Software Foundation; either version 2 of the License, or |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
10 | * (at your option) any later version. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
11 | * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
12 | * This program is distributed in the hope that it will be useful, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
15 | * GNU General Public License for more details. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
16 | * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
17 | * You should have received a copy of the GNU General Public License |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
18 | * along with this program; if not, write to the Free Software |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
20 | * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
21 | */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
22 | #include "internal.h" |
|
34241
8b905ef8081d
Fix build with older glib versions
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34225
diff
changeset
|
23 | #include "glibcompat.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
24 | #include "pidgin.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
25 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
26 | #include "debug.h" |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
27 | #include "http.h" |
|
27522
9f8afd7cd40d
In the Network prefs page, always show the auto-detected IP address by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27521
diff
changeset
|
28 | #include "nat-pmp.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
29 | #include "notify.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
30 | #include "prefs.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
31 | #include "proxy.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
32 | #include "prpl.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
33 | #include "request.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
34 | #include "savedstatuses.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
35 | #include "sound.h" |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
36 | #include "sound-theme.h" |
|
27522
9f8afd7cd40d
In the Network prefs page, always show the auto-detected IP address by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27521
diff
changeset
|
37 | #include "stun.h" |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
38 | #include "theme-manager.h" |
|
27522
9f8afd7cd40d
In the Network prefs page, always show the auto-detected IP address by
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27521
diff
changeset
|
39 | #include "upnp.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
40 | #include "util.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
41 | #include "network.h" |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
42 | #include "keyring.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
43 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
44 | #include "gtkblist.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
45 | #include "gtkconv.h" |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
46 | #include "gtkconv-theme.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
47 | #include "gtkdebug.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
48 | #include "gtkdialogs.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
49 | #include "gtkprefs.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
50 | #include "gtksavedstatuses.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
51 | #include "gtksound.h" |
|
23967
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
52 | #include "gtkstatus-icon-theme.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
53 | #include "gtkthemes.h" |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
54 | #include "gtkutils.h" |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
55 | #include "gtkwebview.h" |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
56 | #include "pidginstock.h" |
|
33634
dff087863072
Fix macro tests for USE_VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33622
diff
changeset
|
57 | #ifdef USE_VV |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
58 | #include "media-gst.h" |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
59 | #if GST_CHECK_VERSION(1,0,0) |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
60 | #include <gst/video/videooverlay.h> |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
61 | #else |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
62 | #include <gst/interfaces/xoverlay.h> |
|
33512
ac7b43f34108
Fix compile error in Preferences for GStreamer-0.10.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33509
diff
changeset
|
63 | #include <gst/interfaces/propertyprobe.h> |
|
ac7b43f34108
Fix compile error in Preferences for GStreamer-0.10.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33509
diff
changeset
|
64 | #endif |
|
33520
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
65 | #ifdef GDK_WINDOWING_WIN32 |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
66 | #include <gdk/gdkwin32.h> |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
67 | #endif |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
68 | #ifdef GDK_WINDOWING_X11 |
|
33512
ac7b43f34108
Fix compile error in Preferences for GStreamer-0.10.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33509
diff
changeset
|
69 | #include <gdk/gdkx.h> |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
70 | #endif |
|
33520
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
71 | #ifdef GDK_WINDOWING_QUARTZ |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
72 | #include <gdk/gdkquartz.h> |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
73 | #endif |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
74 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
75 | |
|
33170
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
76 | #include "gtk3compat.h" |
|
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
77 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
78 | #define PROXYHOST 0 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
79 | #define PROXYPORT 1 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
80 | #define PROXYUSER 2 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
81 | #define PROXYPASS 3 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
82 | |
|
23668
a3f9f6c42dff
Fixed some small rendering errors in conversations and prefs
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23664
diff
changeset
|
83 | #define PREFS_OPTIMAL_ICON_SIZE 32 |
|
a3f9f6c42dff
Fixed some small rendering errors in conversations and prefs
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23664
diff
changeset
|
84 | |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
85 | /* 25MB */ |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
86 | #define PREFS_MAX_DOWNLOADED_THEME_SIZE 26214400 |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
87 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
88 | struct theme_info { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
89 | gchar *type; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
90 | gchar *extension; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
91 | gchar *original_name; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
92 | }; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
93 | |
|
29149
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
94 | /* Main dialog */ |
|
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
95 | static GtkWidget *prefs = NULL; |
|
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
96 | |
|
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
97 | /* Notebook */ |
|
29150
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
98 | static GtkWidget *prefsnotebook = NULL; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
99 | static int notebook_page = 0; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
100 | |
|
29152
8462e73fa1b5
Re-themeize the sample GtkIMHtml entry in the prefs Conversations page when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29151
diff
changeset
|
101 | /* Conversations page */ |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
102 | static GtkWidget *sample_webview = NULL; |
|
29152
8462e73fa1b5
Re-themeize the sample GtkIMHtml entry in the prefs Conversations page when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29151
diff
changeset
|
103 | |
|
29149
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
104 | /* Themes page */ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
105 | static GtkWidget *prefs_sound_themes_combo_box; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
106 | static GtkWidget *prefs_blist_themes_combo_box; |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
107 | static GtkWidget *prefs_conv_themes_combo_box; |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
108 | static GtkWidget *prefs_conv_variants_combo_box; |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
109 | static GtkWidget *prefs_status_themes_combo_box; |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
110 | static GtkWidget *prefs_smiley_themes_combo_box; |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
111 | static PurpleHttpConnection *prefs_conv_themes_running_request = NULL; |
|
23645
6901039a86fb
Fixed purple sound loader class init function (bug on startup) and added shell sound theme selector
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23261
diff
changeset
|
112 | |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
113 | /* Keyrings page */ |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
114 | static GtkWidget *keyring_page_instance = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
115 | static GtkComboBox *keyring_combo = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
116 | static GtkBox *keyring_vbox = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
117 | static PurpleRequestFields *keyring_settings = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
118 | static GList *keyring_settings_fields = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
119 | static GtkWidget *keyring_apply = NULL; |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
120 | |
|
29149
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
121 | /* Sound theme specific */ |
|
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
122 | static GtkWidget *sound_entry = NULL; |
|
773c9d17e637
Re-order variables to follow widget hierarchy.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29148
diff
changeset
|
123 | static int sound_row_sel = 0; |
|
28482
6181f5c9a60e
Don't reset the sound theme pref if we're just loading the list of themes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28076
diff
changeset
|
124 | static gboolean prefs_sound_themes_loading; |
|
6181f5c9a60e
Don't reset the sound theme pref if we're just loading the list of themes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28076
diff
changeset
|
125 | |
|
29151
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
126 | /* These exist outside the lifetime of the prefs dialog */ |
|
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
127 | static GtkListStore *prefs_sound_themes; |
|
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
128 | static GtkListStore *prefs_blist_themes; |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
129 | static GtkListStore *prefs_conv_themes; |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
130 | static GtkListStore *prefs_conv_variants; |
|
29151
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
131 | static GtkListStore *prefs_status_icon_themes; |
|
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
132 | static GtkListStore *prefs_smiley_themes; |
|
e7102801c04b
Oops, the GtkListStore's for the themes have a lifetime that extends over
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29150
diff
changeset
|
133 | |
|
33634
dff087863072
Fix macro tests for USE_VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33622
diff
changeset
|
134 | #ifdef USE_VV |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
135 | |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
136 | static const gchar *AUDIO_SRC_PLUGINS[] = { |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
137 | "alsasrc", "ALSA", |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
138 | "directsoundsrc", "DirectSound", |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
139 | /* "esdmon", "ESD", ? */ |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
140 | "osssrc", "OSS", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
141 | "pulsesrc", "PulseAudio", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
142 | "sndiosrc", "sndio", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
143 | /* "audiotestsrc wave=silence", "Silence", */ |
|
34281
ad957d0a467a
Keyring (and some GTK): fix translation callbacks
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34274
diff
changeset
|
144 | "audiotestsrc", N_("Test Sound"), |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
145 | NULL |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
146 | }; |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
147 | |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
148 | static const gchar *AUDIO_SINK_PLUGINS[] = { |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
149 | "alsasink", "ALSA", |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
150 | "directsoundsink", "DirectSound", |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
151 | /* "gconfaudiosink", "GConf", */ |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
152 | "artsdsink", "aRts", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
153 | "esdsink", "ESD", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
154 | "osssink", "OSS", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
155 | "pulsesink", "PulseAudio", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
156 | "sndiosink", "sndio", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
157 | NULL |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
158 | }; |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
159 | |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
160 | static const gchar *VIDEO_SRC_PLUGINS[] = { |
|
33957
0a4c13fa94ba
VV: some cleanup, add ffmpeg filter to ksvideosrc
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33949
diff
changeset
|
161 | "videodisabledsrc", N_("Disabled"), |
|
34281
ad957d0a467a
Keyring (and some GTK): fix translation callbacks
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34274
diff
changeset
|
162 | "videotestsrc", N_("Test Input"), |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
163 | "dshowvideosrc","DirectDraw", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
164 | "ksvideosrc", "KS Video", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
165 | "qcamsrc", "Quickcam", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
166 | "v4lsrc", "Video4Linux", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
167 | "v4l2src", "Video4Linux2", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
168 | "v4lmjpegsrc", "Video4Linux MJPEG", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
169 | NULL |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
170 | }; |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
171 | |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
172 | static const gchar *VIDEO_SINK_PLUGINS[] = { |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
173 | /* "aasink", "AALib", Didn't work for me */ |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
174 | "directdrawsink", "DirectDraw", |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
175 | /* "gconfvideosink", "GConf", */ |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
176 | "glimagesink", "OpenGL", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
177 | "ximagesink", "X Window System", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
178 | "xvimagesink", "X Window System (Xv)", |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
179 | NULL |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
180 | }; |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
181 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
182 | static GtkWidget *voice_level; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
183 | static GtkWidget *voice_threshold; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
184 | static GtkWidget *voice_volume; |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
185 | static GstElement *voice_pipeline; |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
186 | |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
187 | static GtkWidget *video_drawing_area; |
|
33506
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
188 | static GstElement *video_pipeline; |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
189 | |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
190 | #endif |
|
1ed332c1975d
Rearrange things slightly.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33505
diff
changeset
|
191 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
192 | /* |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
193 | * PROTOTYPES |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
194 | */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
195 | static void delete_prefs(GtkWidget *, void *); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
196 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
197 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
198 | update_spin_value(GtkWidget *w, GtkWidget *spin) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
199 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
200 | const char *key = g_object_get_data(G_OBJECT(spin), "val"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
201 | int value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
202 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
203 | value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
204 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
205 | purple_prefs_set_int(key, value); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
206 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
207 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
208 | GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
209 | pidgin_prefs_labeled_spin_button(GtkWidget *box, const gchar *title, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
210 | const char *key, int min, int max, GtkSizeGroup *sg) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
211 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
212 | GtkWidget *spin; |
|
32394
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
213 | GtkAdjustment *adjust; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
214 | int val; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
215 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
216 | val = purple_prefs_get_int(key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
217 | |
|
33172
9fb9057fc55c
Fix warnings about GtkAdjustments on GTK+2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33170
diff
changeset
|
218 | adjust = GTK_ADJUSTMENT(gtk_adjustment_new(val, min, max, 1, 1, 0)); |
|
9fb9057fc55c
Fix warnings about GtkAdjustments on GTK+2.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33170
diff
changeset
|
219 | spin = gtk_spin_button_new(adjust, 1, 0); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
220 | g_object_set_data(G_OBJECT(spin), "val", (char *)key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
221 | if (max < 10000) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
222 | gtk_widget_set_size_request(spin, 50, -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
223 | else |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
224 | gtk_widget_set_size_request(spin, 60, -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
225 | g_signal_connect(G_OBJECT(adjust), "value-changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
226 | G_CALLBACK(update_spin_value), GTK_WIDGET(spin)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
227 | gtk_widget_show(spin); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
228 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
229 | return pidgin_add_widget_to_vbox(GTK_BOX(box), title, sg, spin, FALSE, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
230 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
231 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
232 | static void |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
233 | entry_set(GtkEntry *entry, gpointer data) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
234 | { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
235 | const char *key = (const char*)data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
236 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
237 | purple_prefs_set_string(key, gtk_entry_get_text(entry)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
238 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
239 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
240 | GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
241 | pidgin_prefs_labeled_entry(GtkWidget *page, const gchar *title, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
242 | const char *key, GtkSizeGroup *sg) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
243 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
244 | GtkWidget *entry; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
245 | const gchar *value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
246 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
247 | value = purple_prefs_get_string(key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
248 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
249 | entry = gtk_entry_new(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
250 | gtk_entry_set_text(GTK_ENTRY(entry), value); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
251 | g_signal_connect(G_OBJECT(entry), "changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
252 | G_CALLBACK(entry_set), (char*)key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
253 | gtk_widget_show(entry); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
254 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
255 | return pidgin_add_widget_to_vbox(GTK_BOX(page), title, sg, entry, TRUE, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
256 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
257 | |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
258 | GtkWidget * |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
259 | pidgin_prefs_labeled_password(GtkWidget *page, const gchar *title, |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
260 | const char *key, GtkSizeGroup *sg) |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
261 | { |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
262 | GtkWidget *entry; |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
263 | const gchar *value; |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
264 | |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
265 | value = purple_prefs_get_string(key); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
266 | |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
267 | entry = gtk_entry_new(); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
268 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
269 | gtk_entry_set_text(GTK_ENTRY(entry), value); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
270 | g_signal_connect(G_OBJECT(entry), "changed", |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
271 | G_CALLBACK(entry_set), (char*)key); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
272 | gtk_widget_show(entry); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
273 | |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
274 | return pidgin_add_widget_to_vbox(GTK_BOX(page), title, sg, entry, TRUE, NULL); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
275 | } |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
276 | |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
277 | /* TODO: Maybe move this up somewheres... */ |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
278 | enum { |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
279 | PREF_DROPDOWN_TEXT, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
280 | PREF_DROPDOWN_VALUE, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
281 | PREF_DROPDOWN_COUNT |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
282 | }; |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
283 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
284 | typedef struct |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
285 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
286 | PurplePrefType type; |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
287 | union { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
288 | const char *string; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
289 | int integer; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
290 | gboolean boolean; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
291 | } value; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
292 | } PidginPrefValue; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
293 | |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
294 | typedef void (*PidginPrefsDropdownCallback)(GtkComboBox *combo_box, |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
295 | PidginPrefValue value); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
296 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
297 | static void |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
298 | dropdown_set(GtkComboBox *combo_box, gpointer _cb) |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
299 | { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
300 | PidginPrefsDropdownCallback cb = _cb; |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
301 | GtkTreeIter iter; |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
302 | GtkTreeModel *tree_model; |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
303 | PidginPrefValue active; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
304 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
305 | tree_model = gtk_combo_box_get_model(combo_box); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
306 | if (!gtk_combo_box_get_active_iter(combo_box, &iter)) |
|
32379
a983d17d92d3
With 2.7.0, we don't need these GTK_CHECK_VERSION's any more.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32378
diff
changeset
|
307 | return; |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
308 | active.type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo_box), |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
309 | "type")); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
310 | |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
311 | g_object_set_data(G_OBJECT(combo_box), "previously_active", |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
312 | g_object_get_data(G_OBJECT(combo_box), "current_active")); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
313 | g_object_set_data(G_OBJECT(combo_box), "current_active", |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
314 | GINT_TO_POINTER(gtk_combo_box_get_active(combo_box))); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
315 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
316 | if (active.type == PURPLE_PREF_INT) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
317 | gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
318 | &active.value.integer, -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
319 | } |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
320 | else if (active.type == PURPLE_PREF_STRING) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
321 | gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
322 | &active.value.string, -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
323 | } |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
324 | else if (active.type == PURPLE_PREF_BOOLEAN) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
325 | gtk_tree_model_get(tree_model, &iter, PREF_DROPDOWN_VALUE, |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
326 | &active.value.boolean, -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
327 | } |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
328 | |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
329 | cb(combo_box, active); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
330 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
331 | |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
332 | static void pidgin_prefs_dropdown_revert_active(GtkComboBox *combo_box) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
333 | { |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
334 | gint previously_active; |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
335 | |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
336 | g_return_if_fail(combo_box != NULL); |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
337 | |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
338 | previously_active = GPOINTER_TO_INT(g_object_get_data( |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
339 | G_OBJECT(combo_box), "previously_active")); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
340 | g_object_set_data(G_OBJECT(combo_box), "current_active", |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
341 | GINT_TO_POINTER(previously_active)); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
342 | |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
343 | gtk_combo_box_set_active(combo_box, previously_active); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
344 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
345 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
346 | static GtkWidget * |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
347 | pidgin_prefs_dropdown_from_list_with_cb(GtkWidget *box, const gchar *title, |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
348 | GtkComboBox **dropdown_out, GList *menuitems, |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
349 | PidginPrefValue initial, PidginPrefsDropdownCallback cb) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
350 | { |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
351 | GtkWidget *dropdown; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
352 | GtkWidget *label = NULL; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
353 | gchar *text; |
|
32904
f62f39d03dc7
Silence a warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32900
diff
changeset
|
354 | GtkListStore *store = NULL; |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
355 | GtkTreeIter iter; |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
356 | GtkTreeIter active; |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
357 | GtkCellRenderer *renderer; |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
358 | gpointer current_active; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
359 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
360 | g_return_val_if_fail(menuitems != NULL, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
361 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
362 | if (initial.type == PURPLE_PREF_INT) { |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
363 | store = gtk_list_store_new(PREF_DROPDOWN_COUNT, G_TYPE_STRING, G_TYPE_INT); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
364 | } else if (initial.type == PURPLE_PREF_STRING) { |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
365 | store = gtk_list_store_new(PREF_DROPDOWN_COUNT, G_TYPE_STRING, G_TYPE_STRING); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
366 | } else if (initial.type == PURPLE_PREF_BOOLEAN) { |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
367 | store = gtk_list_store_new(PREF_DROPDOWN_COUNT, G_TYPE_STRING, G_TYPE_BOOLEAN); |
|
32904
f62f39d03dc7
Silence a warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32900
diff
changeset
|
368 | } else { |
|
f62f39d03dc7
Silence a warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32900
diff
changeset
|
369 | g_warn_if_reached(); |
|
f62f39d03dc7
Silence a warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32900
diff
changeset
|
370 | return NULL; |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
371 | } |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
372 | |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
373 | dropdown = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store)); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
374 | if (dropdown_out != NULL) |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
375 | *dropdown_out = GTK_COMBO_BOX(dropdown); |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
376 | g_object_set_data(G_OBJECT(dropdown), "type", GINT_TO_POINTER(initial.type)); |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
377 | |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
378 | while (menuitems != NULL && (text = (char *)menuitems->data) != NULL) { |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
379 | int int_value = 0; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
380 | const char *str_value = NULL; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
381 | gboolean bool_value = FALSE; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
382 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
383 | menuitems = g_list_next(menuitems); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
384 | g_return_val_if_fail(menuitems != NULL, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
385 | |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
386 | gtk_list_store_append(store, &iter); |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
387 | gtk_list_store_set(store, &iter, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
388 | PREF_DROPDOWN_TEXT, text, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
389 | -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
390 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
391 | if (initial.type == PURPLE_PREF_INT) { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
392 | int_value = GPOINTER_TO_INT(menuitems->data); |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
393 | gtk_list_store_set(store, &iter, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
394 | PREF_DROPDOWN_VALUE, int_value, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
395 | -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
396 | } |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
397 | else if (initial.type == PURPLE_PREF_STRING) { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
398 | str_value = (const char *)menuitems->data; |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
399 | gtk_list_store_set(store, &iter, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
400 | PREF_DROPDOWN_VALUE, str_value, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
401 | -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
402 | } |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
403 | else if (initial.type == PURPLE_PREF_BOOLEAN) { |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
404 | bool_value = (gboolean)GPOINTER_TO_INT(menuitems->data); |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
405 | gtk_list_store_set(store, &iter, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
406 | PREF_DROPDOWN_VALUE, bool_value, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
407 | -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
408 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
409 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
410 | if ((initial.type == PURPLE_PREF_INT && |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
411 | initial.value.integer == int_value) || |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
412 | (initial.type == PURPLE_PREF_STRING && |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
413 | !g_strcmp0(initial.value.string, str_value)) || |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
414 | (initial.type == PURPLE_PREF_BOOLEAN && |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
415 | (initial.value.boolean == bool_value))) { |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
416 | |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
417 | active = iter; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
418 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
419 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
420 | menuitems = g_list_next(menuitems); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
421 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
422 | |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
423 | renderer = gtk_cell_renderer_text_new(); |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
424 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, TRUE); |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
425 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
426 | "text", 0, |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
427 | NULL); |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
428 | |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
429 | gtk_combo_box_set_active_iter(GTK_COMBO_BOX(dropdown), &active); |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
430 | current_active = GINT_TO_POINTER(gtk_combo_box_get_active(GTK_COMBO_BOX( |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
431 | dropdown))); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
432 | g_object_set_data(G_OBJECT(dropdown), "current_active", current_active); |
|
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
433 | g_object_set_data(G_OBJECT(dropdown), "previously_active", current_active); |
|
26934
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
434 | |
|
988bd68379f8
Replace GtkOptionMenu with a GtkComboBox in the preferences dropdowns for
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
435 | g_signal_connect(G_OBJECT(dropdown), "changed", |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
436 | G_CALLBACK(dropdown_set), cb); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
437 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
438 | pidgin_add_widget_to_vbox(GTK_BOX(box), title, NULL, dropdown, FALSE, &label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
439 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
440 | return label; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
441 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
442 | |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
443 | static void |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
444 | pidgin_prefs_dropdown_from_list_cb(GtkComboBox *combo_box, |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
445 | PidginPrefValue value) |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
446 | { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
447 | const char *key; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
448 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
449 | key = g_object_get_data(G_OBJECT(combo_box), "key"); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
450 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
451 | if (value.type == PURPLE_PREF_INT) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
452 | purple_prefs_set_int(key, value.value.integer); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
453 | } else if (value.type == PURPLE_PREF_STRING) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
454 | purple_prefs_set_string(key, value.value.string); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
455 | } else if (value.type == PURPLE_PREF_BOOLEAN) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
456 | purple_prefs_set_bool(key, value.value.boolean); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
457 | } else { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
458 | g_return_if_reached(); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
459 | } |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
460 | } |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
461 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
462 | GtkWidget * |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
463 | pidgin_prefs_dropdown_from_list(GtkWidget *box, const gchar *title, |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
464 | PurplePrefType type, const char *key, GList *menuitems) |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
465 | { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
466 | PidginPrefValue initial; |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
467 | GtkComboBox *dropdown = NULL; |
|
34121
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
468 | GtkWidget *label; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
469 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
470 | initial.type = type; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
471 | if (type == PURPLE_PREF_INT) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
472 | initial.value.integer = purple_prefs_get_int(key); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
473 | } else if (type == PURPLE_PREF_STRING) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
474 | initial.value.string = purple_prefs_get_string(key); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
475 | } else if (type == PURPLE_PREF_BOOLEAN) { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
476 | initial.value.boolean = purple_prefs_get_bool(key); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
477 | } else { |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
478 | g_return_val_if_reached(NULL); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
479 | } |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
480 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
481 | label = pidgin_prefs_dropdown_from_list_with_cb(box, title, &dropdown, |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
482 | menuitems, initial, pidgin_prefs_dropdown_from_list_cb); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
483 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
484 | g_object_set_data(G_OBJECT(dropdown), "key", (gpointer)key); |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
485 | |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
486 | return label; |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
487 | } |
|
797caf9ff740
pidgin_prefs_dropdown_from_list_with_cb implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34120
diff
changeset
|
488 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
489 | GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
490 | pidgin_prefs_dropdown(GtkWidget *box, const gchar *title, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
491 | const char *key, ...) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
492 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
493 | va_list ap; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
494 | GList *menuitems = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
495 | GtkWidget *dropdown = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
496 | char *name; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
497 | int int_value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
498 | const char *str_value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
499 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
500 | g_return_val_if_fail(type == PURPLE_PREF_BOOLEAN || type == PURPLE_PREF_INT || |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
501 | type == PURPLE_PREF_STRING, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
502 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
503 | va_start(ap, key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
504 | while ((name = va_arg(ap, char *)) != NULL) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
505 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
506 | menuitems = g_list_prepend(menuitems, name); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
507 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
508 | if (type == PURPLE_PREF_INT || type == PURPLE_PREF_BOOLEAN) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
509 | int_value = va_arg(ap, int); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
510 | menuitems = g_list_prepend(menuitems, GINT_TO_POINTER(int_value)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
511 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
512 | else { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
513 | str_value = va_arg(ap, const char *); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
514 | menuitems = g_list_prepend(menuitems, (char *)str_value); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
515 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
516 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
517 | va_end(ap); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
518 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
519 | g_return_val_if_fail(menuitems != NULL, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
520 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
521 | menuitems = g_list_reverse(menuitems); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
522 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
523 | dropdown = pidgin_prefs_dropdown_from_list(box, title, type, key, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
524 | menuitems); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
525 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
526 | g_list_free(menuitems); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
527 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
528 | return dropdown; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
529 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
530 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
531 | static void keyring_page_cleanup(void); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
532 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
533 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
534 | delete_prefs(GtkWidget *asdf, void *gdsa) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
535 | { |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
536 | /* Cancel HTTP requests */ |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
537 | purple_http_conn_cancel(prefs_conv_themes_running_request); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
538 | prefs_conv_themes_running_request = NULL; |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
539 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
540 | /* Close any "select sound" request dialogs */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
541 | purple_request_close_with_handle(prefs); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
542 | |
|
34188
0680f2c10db3
Validation for internal keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34187
diff
changeset
|
543 | purple_notify_close_with_handle(prefs); |
|
0680f2c10db3
Validation for internal keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34187
diff
changeset
|
544 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
545 | /* Unregister callbacks. */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
546 | purple_prefs_disconnect_by_handle(prefs); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
547 | |
|
29150
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
548 | /* NULL-ify globals */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
549 | sound_entry = NULL; |
|
29150
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
550 | sound_row_sel = 0; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
551 | prefs_sound_themes_loading = FALSE; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
552 | |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
553 | prefs_sound_themes_combo_box = NULL; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
554 | prefs_blist_themes_combo_box = NULL; |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
555 | prefs_conv_themes_combo_box = NULL; |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
556 | prefs_conv_variants_combo_box = NULL; |
|
29150
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
557 | prefs_status_themes_combo_box = NULL; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
558 | prefs_smiley_themes_combo_box = NULL; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
559 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
560 | keyring_page_cleanup(); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
561 | |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
562 | sample_webview = NULL; |
|
29152
8462e73fa1b5
Re-themeize the sample GtkIMHtml entry in the prefs Conversations page when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29151
diff
changeset
|
563 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
564 | #if USE_VV |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
565 | voice_level = NULL; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
566 | voice_threshold = NULL; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
567 | voice_volume = NULL; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
568 | video_drawing_area = NULL; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
569 | #endif |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
570 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
571 | notebook_page = 0; |
|
29150
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
572 | prefsnotebook = NULL; |
|
6e6f7be71d50
Make sure all globals are NULL when the prefs page is destroyed.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29149
diff
changeset
|
573 | prefs = NULL; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
574 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
575 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
576 | static gchar * |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
577 | get_theme_markup(const char *name, gboolean custom, const char *author, |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
578 | const char *description) |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
579 | { |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
580 | |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
581 | return g_strdup_printf("<b>%s</b>%s%s%s%s\n<span foreground='dim grey'>%s</span>", |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
582 | name, custom ? " " : "", custom ? _("(Custom)") : "", |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
583 | author != NULL ? " - " : "", author != NULL ? author : "", |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
584 | description != NULL ? description : ""); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
585 | } |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
586 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
587 | static void |
|
28901
e0098fe083e4
Rename a smiley theme function to be a bit more descriptive.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28900
diff
changeset
|
588 | smileys_refresh_theme_list(void) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
589 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
590 | GdkPixbuf *pixbuf; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
591 | GSList *themes; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
592 | GtkTreeIter iter; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
593 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
594 | pidgin_themes_smiley_theme_probe(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
595 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
596 | if (!(themes = smiley_themes)) |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
597 | return; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
598 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
599 | while (themes) { |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
600 | struct PidginSmileyTheme *theme = themes->data; |
|
28898
2c4e735113f6
Remove some code duplication which also fixes a small inconsistency in the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28897
diff
changeset
|
601 | char *description = get_theme_markup(_(theme->name), FALSE, |
|
2c4e735113f6
Remove some code duplication which also fixes a small inconsistency in the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28897
diff
changeset
|
602 | _(theme->author), _(theme->desc)); |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
603 | gtk_list_store_append(prefs_smiley_themes, &iter); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
604 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
605 | /* |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
606 | * LEAK - Gentoo memprof thinks pixbuf is leaking here... but it |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
607 | * looks like it should be ok to me. Anyone know what's up? --Mark |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
608 | */ |
|
31889
96183796df0c
Start looking at the GError parameter every time we call these functions:
Mark Doliner <markdoliner@pidgin.im>
parents:
31831
diff
changeset
|
609 | pixbuf = (theme->icon ? pidgin_pixbuf_new_from_file(theme->icon) : NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
610 | |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
611 | gtk_list_store_set(prefs_smiley_themes, &iter, |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
612 | 0, pixbuf, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
613 | 1, description, |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
614 | 2, theme->name, |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
615 | -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
616 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
617 | if (pixbuf != NULL) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
618 | g_object_unref(G_OBJECT(pixbuf)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
619 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
620 | g_free(description); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
621 | themes = themes->next; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
622 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
623 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
624 | |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
625 | /* Rebuild the markup for the sound theme selection for "(Custom)" themes */ |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
626 | static void |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
627 | pref_sound_generate_markup(void) |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
628 | { |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
629 | gboolean print_custom, customized; |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
630 | const gchar *author, *description, *current_theme; |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
631 | gchar *name, *markup; |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
632 | PurpleSoundTheme *theme; |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
633 | GtkTreeIter iter; |
|
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
634 | |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
635 | customized = pidgin_sound_is_customized(); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
636 | current_theme = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme"); |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
637 | |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
638 | if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(prefs_sound_themes), &iter)) { |
|
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
639 | do { |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
640 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &iter, 2, &name, -1); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
641 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
642 | print_custom = customized && name && g_str_equal(current_theme, name); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
643 | |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
644 | if (!name || *name == '\0') { |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
645 | g_free(name); |
|
28875
c82190571ce8
Make the default themes' names consistent with the default smiley theme.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28874
diff
changeset
|
646 | name = g_strdup(_("Default")); |
|
28849
5b4c00b8227f
The theme authors for default/nonexistant themes should be consistent. Since
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28848
diff
changeset
|
647 | author = _("Penguin Pimps"); |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
648 | description = _("The default Pidgin sound theme"); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
649 | } else { |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
650 | theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound")); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
651 | author = purple_theme_get_author(PURPLE_THEME(theme)); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
652 | description = purple_theme_get_description(PURPLE_THEME(theme)); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
653 | } |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
654 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
655 | markup = get_theme_markup(name, print_custom, author, description); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
656 | |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
657 | gtk_list_store_set(prefs_sound_themes, &iter, 1, markup, -1); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
658 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
659 | g_free(name); |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
660 | g_free(markup); |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
661 | |
|
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
662 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(prefs_sound_themes), &iter)); |
|
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
663 | } |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
664 | } |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
665 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
666 | /* adds the themes to the theme list from the manager so they can be displayed in prefs */ |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
667 | static void |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
668 | prefs_themes_sort(PurpleTheme *theme) |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
669 | { |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
670 | GdkPixbuf *pixbuf = NULL; |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
671 | GtkTreeIter iter; |
|
23668
a3f9f6c42dff
Fixed some small rendering errors in conversations and prefs
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23664
diff
changeset
|
672 | gchar *image_full = NULL, *markup; |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
673 | const gchar *name, *author, *description; |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
674 | |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
675 | if (PURPLE_IS_SOUND_THEME(theme)){ |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
676 | |
|
23653
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
677 | image_full = purple_theme_get_image_full(theme); |
|
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
678 | if (image_full != NULL){ |
|
31889
96183796df0c
Start looking at the GError parameter every time we call these functions:
Mark Doliner <markdoliner@pidgin.im>
parents:
31831
diff
changeset
|
679 | pixbuf = pidgin_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE); |
|
23653
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
680 | g_free(image_full); |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
681 | } else |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
682 | pixbuf = NULL; |
|
23653
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
683 | |
|
23967
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
684 | gtk_list_store_append(prefs_sound_themes, &iter); |
|
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
685 | gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, purple_theme_get_name(theme), -1); |
|
23653
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
686 | |
|
79934bf9a349
Fixed up a few typos, readability, leaks, and bugs, all minor and mostly in theme and theme loader classes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23652
diff
changeset
|
687 | if (pixbuf != NULL) |
|
26820
76f90ca8f6f2
Use g_object_ref/unref instead of the deprecated versions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
688 | g_object_unref(G_OBJECT(pixbuf)); |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
689 | |
|
23967
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
690 | } else if (PIDGIN_IS_BLIST_THEME(theme) || PIDGIN_IS_STATUS_ICON_THEME(theme)){ |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
691 | GtkListStore *store; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
692 | |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
693 | if (PIDGIN_IS_BLIST_THEME(theme)) |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
694 | store = prefs_blist_themes; |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
695 | else |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
696 | store = prefs_status_icon_themes; |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
697 | |
|
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
698 | image_full = purple_theme_get_image_full(theme); |
|
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
699 | if (image_full != NULL){ |
|
31889
96183796df0c
Start looking at the GError parameter every time we call these functions:
Mark Doliner <markdoliner@pidgin.im>
parents:
31831
diff
changeset
|
700 | pixbuf = pidgin_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE); |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
701 | g_free(image_full); |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
702 | } else |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
703 | pixbuf = NULL; |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
704 | |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
705 | name = purple_theme_get_name(theme); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
706 | author = purple_theme_get_author(theme); |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
707 | description = purple_theme_get_description(theme); |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
708 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
709 | markup = get_theme_markup(name, FALSE, author, description); |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
710 | |
|
23967
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
711 | gtk_list_store_append(store, &iter); |
|
cc5667bc8f1e
Clean up status icon themes a bit
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23964
diff
changeset
|
712 | gtk_list_store_set(store, &iter, 0, pixbuf, 1, markup, 2, name, -1); |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
713 | |
|
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
714 | g_free(markup); |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
715 | if (pixbuf != NULL) |
|
26820
76f90ca8f6f2
Use g_object_ref/unref instead of the deprecated versions.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
26628
diff
changeset
|
716 | g_object_unref(G_OBJECT(pixbuf)); |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
717 | |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
718 | } else if (PIDGIN_IS_CONV_THEME(theme)) { |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
719 | /* No image available? */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
720 | |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
721 | name = purple_theme_get_name(theme); |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
722 | /* No author available */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
723 | /* No description available */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
724 | |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
725 | markup = get_theme_markup(name, FALSE, NULL, NULL); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
726 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
727 | gtk_list_store_append(prefs_conv_themes, &iter); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
728 | gtk_list_store_set(prefs_conv_themes, &iter, 1, markup, 2, name, -1); |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
729 | } |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
730 | } |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
731 | |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
732 | static void |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
733 | prefs_set_active_theme_combo(GtkWidget *combo_box, GtkListStore *store, const gchar *current_theme) |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
734 | { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
735 | GtkTreeIter iter; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
736 | gchar *theme = NULL; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
737 | gboolean unset = TRUE; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
738 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
739 | if (current_theme && *current_theme && gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
740 | do { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
741 | gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &theme, -1); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
742 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
743 | if (g_str_equal(current_theme, theme)) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
744 | gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo_box), &iter); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
745 | unset = FALSE; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
746 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
747 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
748 | g_free(theme); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
749 | } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter)); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
750 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
751 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
752 | if (unset) |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
753 | gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
754 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
755 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
756 | static void |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
757 | prefs_themes_refresh(void) |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
758 | { |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
759 | GdkPixbuf *pixbuf = NULL; |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
760 | gchar *tmp; |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
761 | GtkTreeIter iter; |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
762 | |
|
28482
6181f5c9a60e
Don't reset the sound theme pref if we're just loading the list of themes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28076
diff
changeset
|
763 | prefs_sound_themes_loading = TRUE; |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
764 | /* refresh the list of themes in the manager */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
765 | purple_theme_manager_refresh(); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
766 | |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
767 | tmp = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL); |
|
31889
96183796df0c
Start looking at the GError parameter every time we call these functions:
Mark Doliner <markdoliner@pidgin.im>
parents:
31831
diff
changeset
|
768 | pixbuf = pidgin_pixbuf_new_from_file_at_scale(tmp, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE); |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
769 | g_free(tmp); |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
770 | |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
771 | /* sound themes */ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
772 | gtk_list_store_clear(prefs_sound_themes); |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
773 | gtk_list_store_append(prefs_sound_themes, &iter); |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
774 | gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, "", -1); |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
775 | |
|
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
776 | /* blist themes */ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
777 | gtk_list_store_clear(prefs_blist_themes); |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
778 | gtk_list_store_append(prefs_blist_themes, &iter); |
|
28875
c82190571ce8
Make the default themes' names consistent with the default smiley theme.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28874
diff
changeset
|
779 | tmp = get_theme_markup(_("Default"), FALSE, _("Penguin Pimps"), |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
780 | _("The default Pidgin buddy list theme")); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
781 | gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
782 | g_free(tmp); |
|
23659
8251d0f67df5
restructured much of the loader and themes for the buddy list, along with a basic trial of group background
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23653
diff
changeset
|
783 | |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
784 | /* conversation themes */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
785 | gtk_list_store_clear(prefs_conv_themes); |
|
32581
d86376d8e168
Add the "default" theme to the beginning of the conversation
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32563
diff
changeset
|
786 | gtk_list_store_append(prefs_conv_themes, &iter); |
|
d86376d8e168
Add the "default" theme to the beginning of the conversation
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32563
diff
changeset
|
787 | tmp = get_theme_markup(_("Default"), FALSE, _("Penguin Pimps"), |
|
d86376d8e168
Add the "default" theme to the beginning of the conversation
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32563
diff
changeset
|
788 | _("The default Pidgin conversation theme")); |
|
d86376d8e168
Add the "default" theme to the beginning of the conversation
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32563
diff
changeset
|
789 | gtk_list_store_set(prefs_conv_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1); |
|
d86376d8e168
Add the "default" theme to the beginning of the conversation
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32563
diff
changeset
|
790 | g_free(tmp); |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
791 | |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
792 | /* conversation theme variants */ |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
793 | gtk_list_store_clear(prefs_conv_variants); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
794 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
795 | /* status icon themes */ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
796 | gtk_list_store_clear(prefs_status_icon_themes); |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
797 | gtk_list_store_append(prefs_status_icon_themes, &iter); |
|
28875
c82190571ce8
Make the default themes' names consistent with the default smiley theme.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28874
diff
changeset
|
798 | tmp = get_theme_markup(_("Default"), FALSE, _("Penguin Pimps"), |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
799 | _("The default Pidgin status icon theme")); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
800 | gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1); |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
801 | g_free(tmp); |
|
28741
48c271584931
Prevent an assertion when the status icon pixbuf isn't found.
Daniel Atallah <datallah@pidgin.im>
parents:
28627
diff
changeset
|
802 | if (pixbuf) |
|
48c271584931
Prevent an assertion when the status icon pixbuf isn't found.
Daniel Atallah <datallah@pidgin.im>
parents:
28627
diff
changeset
|
803 | g_object_unref(G_OBJECT(pixbuf)); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
804 | |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
805 | /* smiley themes */ |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
806 | gtk_list_store_clear(prefs_smiley_themes); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
807 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
808 | purple_theme_manager_for_each_theme(prefs_themes_sort); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
809 | pref_sound_generate_markup(); |
|
28901
e0098fe083e4
Rename a smiley theme function to be a bit more descriptive.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28900
diff
changeset
|
810 | smileys_refresh_theme_list(); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
811 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
812 | /* set active */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
813 | prefs_set_active_theme_combo(prefs_sound_themes_combo_box, prefs_sound_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme")); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
814 | prefs_set_active_theme_combo(prefs_blist_themes_combo_box, prefs_blist_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/theme")); |
|
32563
27024ee86815
Use a consistent prefs name. It should be conversation*s* to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32562
diff
changeset
|
815 | prefs_set_active_theme_combo(prefs_conv_themes_combo_box, prefs_conv_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/theme")); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
816 | prefs_set_active_theme_combo(prefs_status_themes_combo_box, prefs_status_icon_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme")); |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
817 | prefs_set_active_theme_combo(prefs_smiley_themes_combo_box, prefs_smiley_themes, purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme")); |
|
28482
6181f5c9a60e
Don't reset the sound theme pref if we're just loading the list of themes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28076
diff
changeset
|
818 | prefs_sound_themes_loading = FALSE; |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
819 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
820 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
821 | /* init all the theme variables so that the themes can be sorted later and used by pref pages */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
822 | static void |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
823 | prefs_themes_init(void) |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
824 | { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
825 | prefs_sound_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
826 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
827 | prefs_blist_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
828 | |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
829 | prefs_conv_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
830 | |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
831 | prefs_conv_variants = gtk_list_store_new(1, G_TYPE_STRING); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
832 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
833 | prefs_status_icon_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
834 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
835 | prefs_smiley_themes = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
836 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
837 | |
|
35455
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
838 | /* |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
839 | * prefs_theme_find_theme: |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
840 | * @path: A directory containing a theme. The theme could be at the |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
841 | * top level of this directory or in any subdirectory thereof. |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
842 | * @type: The type of theme to load. The loader for this theme type |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
843 | * will be used and this loader will determine what constitutes a |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
844 | * "theme." |
|
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
845 | * |
|
33562
d35beaf69a32
Documentationliness is next to beardliness.
Mark Doliner <mark@kingant.net>
parents:
33534
diff
changeset
|
846 | * Attempt to load the given directory as a theme. If we are unable to |
|
d35beaf69a32
Documentationliness is next to beardliness.
Mark Doliner <mark@kingant.net>
parents:
33534
diff
changeset
|
847 | * open the path as a theme then we recurse into path and attempt to |
|
d35beaf69a32
Documentationliness is next to beardliness.
Mark Doliner <mark@kingant.net>
parents:
33534
diff
changeset
|
848 | * load each subdirectory that we encounter. |
|
d35beaf69a32
Documentationliness is next to beardliness.
Mark Doliner <mark@kingant.net>
parents:
33534
diff
changeset
|
849 | * |
|
35455
216a37403c5b
Fix a bunch of gtk-doc warnings in pidgin
Ankit Vani <a@nevitus.org>
parents:
35454
diff
changeset
|
850 | * Returns: A new reference to a #PurpleTheme. |
|
33562
d35beaf69a32
Documentationliness is next to beardliness.
Mark Doliner <mark@kingant.net>
parents:
33534
diff
changeset
|
851 | */ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
852 | static PurpleTheme * |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
853 | prefs_theme_find_theme(const gchar *path, const gchar *type) |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
854 | { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
855 | PurpleTheme *theme = purple_theme_manager_load_theme(path, type); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
856 | GDir *dir = g_dir_open(path, 0, NULL); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
857 | const gchar *next; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
858 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
859 | while (!PURPLE_IS_THEME(theme) && (next = g_dir_read_name(dir))) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
860 | gchar *next_path = g_build_filename(path, next, NULL); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
861 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
862 | if (g_file_test(next_path, G_FILE_TEST_IS_DIR)) |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
863 | theme = prefs_theme_find_theme(next_path, type); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
864 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
865 | g_free(next_path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
866 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
867 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
868 | g_dir_close(dir); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
869 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
870 | return theme; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
871 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
872 | |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
873 | /* Eww. Seriously ewww. But thanks, grim! This is taken from guifications2 */ |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
874 | static gboolean |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
875 | purple_theme_file_copy(const gchar *source, const gchar *destination) |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
876 | { |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
877 | FILE *src, *dest; |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
878 | gint chr = EOF; |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
879 | |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
880 | if(!(src = g_fopen(source, "rb"))) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
881 | return FALSE; |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
882 | if(!(dest = g_fopen(destination, "wb"))) { |
|
27451
6dcd55e2c594
Handle dest failing to open properly by closing the src handle.
Paul Aurich <darkrain42@pidgin.im>
parents:
27450
diff
changeset
|
883 | fclose(src); |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
884 | return FALSE; |
|
27451
6dcd55e2c594
Handle dest failing to open properly by closing the src handle.
Paul Aurich <darkrain42@pidgin.im>
parents:
27450
diff
changeset
|
885 | } |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
886 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
887 | while((chr = fgetc(src)) != EOF) { |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
888 | fputc(chr, dest); |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
889 | } |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
890 | |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
891 | fclose(dest); |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
892 | fclose(src); |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
893 | |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
894 | return TRUE; |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
895 | } |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
896 | |
| 28552 | 897 | static void |
| 898 | free_theme_info(struct theme_info *info) | |
| 899 | { | |
| 900 | if (info != NULL) { | |
| 901 | g_free(info->type); | |
| 902 | g_free(info->extension); | |
| 903 | g_free(info->original_name); | |
| 904 | g_free(info); | |
| 905 | } | |
| 906 | } | |
| 907 | ||
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
908 | /* installs a theme, info is freed by function */ |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
909 | static void |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
910 | theme_install_theme(char *path, struct theme_info *info) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
911 | { |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
912 | #ifndef _WIN32 |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
913 | gchar *command; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
914 | #endif |
| 28552 | 915 | gchar *destdir; |
| 916 | const char *tail; | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
917 | gboolean is_smiley_theme, is_archive; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
918 | PurpleTheme *theme = NULL; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
919 | |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
920 | if (info == NULL) |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
921 | return; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
922 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
923 | /* check the extension */ |
| 28552 | 924 | tail = info->extension ? info->extension : strrchr(path, '.'); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
925 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
926 | if (!tail) { |
| 28552 | 927 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
928 | return; |
| 28552 | 929 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
930 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
931 | is_archive = !g_ascii_strcasecmp(tail, ".gz") || !g_ascii_strcasecmp(tail, ".tgz"); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
932 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
933 | /* Just to be safe */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
934 | g_strchomp(path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
935 | |
| 28552 | 936 | if ((is_smiley_theme = g_str_equal(info->type, "smiley"))) |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
937 | destdir = g_build_filename(purple_user_dir(), "smileys", NULL); |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
938 | else |
|
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
939 | destdir = g_build_filename(purple_user_dir(), "themes", "temp", NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
940 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
941 | /* We'll check this just to make sure. This also lets us do something different on |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
942 | * other platforms, if need be */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
943 | if (is_archive) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
944 | #ifndef _WIN32 |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
945 | gchar *path_escaped = g_shell_quote(path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
946 | gchar *destdir_escaped = g_shell_quote(destdir); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
947 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
948 | if (!g_file_test(destdir, G_FILE_TEST_IS_DIR)) |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
949 | purple_build_dir(destdir, S_IRUSR | S_IWUSR | S_IXUSR); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
950 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
951 | command = g_strdup_printf("tar > /dev/null xzf %s -C %s", path_escaped, destdir_escaped); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
952 | g_free(path_escaped); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
953 | g_free(destdir_escaped); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
954 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
955 | /* Fire! */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
956 | if (system(command)) { |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
957 | purple_notify_error(NULL, NULL, _("Theme failed to unpack."), NULL, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
958 | g_free(command); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
959 | g_free(destdir); |
| 28552 | 960 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
961 | return; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
962 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
963 | #else |
| 28552 | 964 | if (!winpidgin_gz_untar(path, destdir)) { |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
965 | purple_notify_error(NULL, NULL, _("Theme failed to unpack."), NULL, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
966 | g_free(destdir); |
| 28552 | 967 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
968 | return; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
969 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
970 | #endif |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
971 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
972 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
973 | if (is_smiley_theme) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
974 | /* just extract the folder to the smiley directory */ |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
975 | prefs_themes_refresh(); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
976 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
977 | } else if (is_archive) { |
| 28552 | 978 | theme = prefs_theme_find_theme(destdir, info->type); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
979 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
980 | if (PURPLE_IS_THEME(theme)) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
981 | /* create the location for the theme */ |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
982 | gchar *theme_dest = g_build_filename(purple_user_dir(), "themes", |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
983 | purple_theme_get_name(theme), |
| 28552 | 984 | "purple", info->type, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
985 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
986 | if (!g_file_test(theme_dest, G_FILE_TEST_IS_DIR)) |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
987 | purple_build_dir(theme_dest, S_IRUSR | S_IWUSR | S_IXUSR); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
988 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
989 | g_free(theme_dest); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
990 | theme_dest = g_build_filename(purple_user_dir(), "themes", |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
991 | purple_theme_get_name(theme), |
| 28552 | 992 | "purple", info->type, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
993 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
994 | /* move the entire directory to new location */ |
|
33563
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
995 | if (g_rename(purple_theme_get_dir(theme), theme_dest)) { |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
996 | purple_debug_error("gtkprefs", "Error renaming %s to %s: " |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
997 | "%s\n", purple_theme_get_dir(theme), theme_dest, |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
998 | g_strerror(errno)); |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
999 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1000 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1001 | g_free(theme_dest); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1002 | g_remove(destdir); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1003 | g_object_unref(theme); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1004 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1005 | prefs_themes_refresh(); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1006 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1007 | } else { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1008 | /* something was wrong with the theme archive */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1009 | g_unlink(destdir); |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
1010 | purple_notify_error(NULL, NULL, _("Theme failed to load."), NULL, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1011 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1012 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1013 | } else { /* just a single file so copy it to a new temp directory and attempt to load it*/ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1014 | gchar *temp_path, *temp_file; |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
1015 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1016 | temp_path = g_build_filename(purple_user_dir(), "themes", "temp", "sub_folder", NULL); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1017 | |
| 28552 | 1018 | if (info->original_name != NULL) { |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1019 | /* name was changed from the original (probably a dnd) change it back before loading */ |
| 28552 | 1020 | temp_file = g_build_filename(temp_path, info->original_name, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1021 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1022 | } else { |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1023 | gchar *source_name = g_path_get_basename(path); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1024 | temp_file = g_build_filename(temp_path, source_name, NULL); |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1025 | g_free(source_name); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
1026 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1027 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1028 | if (!g_file_test(temp_path, G_FILE_TEST_IS_DIR)) |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1029 | purple_build_dir(temp_path, S_IRUSR | S_IWUSR | S_IXUSR); |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1030 | |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1031 | if (purple_theme_file_copy(path, temp_file)) { |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1032 | /* find the theme, could be in subfolder */ |
| 28552 | 1033 | theme = prefs_theme_find_theme(temp_path, info->type); |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1034 | |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1035 | if (PURPLE_IS_THEME(theme)) { |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1036 | gchar *theme_dest = g_build_filename(purple_user_dir(), "themes", |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1037 | purple_theme_get_name(theme), |
| 28552 | 1038 | "purple", info->type, NULL); |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1039 | |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1040 | if(!g_file_test(theme_dest, G_FILE_TEST_IS_DIR)) |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1041 | purple_build_dir(theme_dest, S_IRUSR | S_IWUSR | S_IXUSR); |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1042 | |
|
33563
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
1043 | if (g_rename(purple_theme_get_dir(theme), theme_dest)) { |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
1044 | purple_debug_error("gtkprefs", "Error renaming %s to %s: " |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
1045 | "%s\n", purple_theme_get_dir(theme), theme_dest, |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
1046 | g_strerror(errno)); |
|
981ea717afd2
Log an error if g_rename fails when installing a theme.
Mark Doliner <mark@kingant.net>
parents:
33562
diff
changeset
|
1047 | } |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1048 | |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1049 | g_free(theme_dest); |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1050 | g_object_unref(theme); |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1051 | |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1052 | prefs_themes_refresh(); |
|
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1053 | } else { |
| 33564 | 1054 | if (g_remove(temp_path)) { |
| 1055 | purple_debug_error("gtkprefs", "Error removing %s: %s\n", | |
| 1056 | temp_path, g_strerror(errno)); | |
| 1057 | } | |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
1058 | purple_notify_error(NULL, NULL, _("Theme failed to load."), NULL, NULL); |
|
27450
acf9ce9edb4a
Update this to not use GIO, so it should build for poizon. Refs #8085.
Paul Aurich <darkrain42@pidgin.im>
parents:
27449
diff
changeset
|
1059 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1060 | } else { |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
1061 | purple_notify_error(NULL, NULL, _("Theme failed to copy."), NULL, NULL); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1062 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1063 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1064 | g_free(temp_file); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1065 | g_free(temp_path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1066 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1067 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1068 | g_free(destdir); |
| 28552 | 1069 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1070 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1071 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1072 | static void |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1073 | theme_got_url(PurpleHttpConnection *http_conn, PurpleHttpResponse *response, |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1074 | gpointer _info) |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1075 | { |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1076 | struct theme_info *info = _info; |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1077 | const gchar *themedata; |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1078 | size_t len; |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1079 | FILE *f; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1080 | gchar *path; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1081 | size_t wc; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1082 | |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1083 | g_assert(http_conn == prefs_conv_themes_running_request); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1084 | prefs_conv_themes_running_request = NULL; |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1085 | |
|
34287
6cd0c77b1f6a
HTTP: successful is spelled with one l
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34281
diff
changeset
|
1086 | if (!purple_http_response_is_successful(response)) { |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1087 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1088 | return; |
| 28552 | 1089 | } |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1090 | |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1091 | themedata = purple_http_response_get_data(response, &len); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1092 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1093 | f = purple_mkstemp(&path, TRUE); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1094 | wc = fwrite(themedata, len, 1, f); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1095 | if (wc != 1) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1096 | purple_debug_warning("theme_got_url", "Unable to write theme data.\n"); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1097 | fclose(f); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1098 | g_unlink(path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1099 | g_free(path); |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1100 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1101 | return; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1102 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1103 | fclose(f); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1104 | |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1105 | theme_install_theme(path, info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1106 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1107 | g_unlink(path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1108 | g_free(path); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1109 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1110 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1111 | static void |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1112 | theme_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1113 | GtkSelectionData *sd, guint info, guint t, gpointer user_data) |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1114 | { |
|
32394
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
1115 | gchar *name = g_strchomp((gchar *)gtk_selection_data_get_data(sd)); |
|
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
1116 | |
|
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
1117 | if ((gtk_selection_data_get_length(sd) >= 0) |
|
32422
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
1118 | && (gtk_selection_data_get_format(sd) == 8)) { |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1119 | /* Well, it looks like the drag event was cool. |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1120 | * Let's do something with it */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1121 | gchar *temp; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1122 | struct theme_info *info = g_new0(struct theme_info, 1); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1123 | info->type = g_strdup((gchar *)user_data); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
1124 | info->extension = g_strdup(g_strrstr(name,".")); |
|
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
1125 | temp = g_strrstr(name, "/"); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1126 | info->original_name = temp ? g_strdup(++temp) : NULL; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1127 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1128 | if (!g_ascii_strncasecmp(name, "file://", 7)) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1129 | GError *converr = NULL; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1130 | gchar *tmp; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1131 | /* It looks like we're dealing with a local file. Let's |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1132 | * just untar it in the right place */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1133 | if(!(tmp = g_filename_from_uri(name, NULL, &converr))) { |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1134 | purple_debug(PURPLE_DEBUG_ERROR, "theme dnd", "%s\n", |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1135 | (converr ? converr->message : |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1136 | "g_filename_from_uri error")); |
| 28552 | 1137 | free_theme_info(info); |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1138 | return; |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1139 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1140 | theme_install_theme(tmp, info); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1141 | g_free(tmp); |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1142 | } else if (!g_ascii_strncasecmp(name, "http://", 7) || |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1143 | !g_ascii_strncasecmp(name, "https://", 8)) { |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1144 | /* Oo, a web drag and drop. This is where things |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1145 | * will start to get interesting */ |
|
34225
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1146 | PurpleHttpRequest *hr; |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1147 | purple_http_conn_cancel(prefs_conv_themes_running_request); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1148 | |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1149 | hr = purple_http_request_new(name); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1150 | purple_http_request_set_max_len(hr, |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1151 | PREFS_MAX_DOWNLOADED_THEME_SIZE); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1152 | prefs_conv_themes_running_request = purple_http_request( |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1153 | NULL, hr, theme_got_url, info); |
|
3bba206f27f6
HTTP: migrate purple_util_fetch_url to new API for Pidgin UI
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34208
diff
changeset
|
1154 | purple_http_request_unref(hr); |
| 28552 | 1155 | } else |
| 1156 | free_theme_info(info); | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1157 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1158 | gtk_drag_finish(dc, TRUE, FALSE, t); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1159 | } |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
1160 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1161 | gtk_drag_finish(dc, FALSE, FALSE, t); |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
1162 | } |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
1163 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1164 | /* builds a theme combo box from a list store with colums: icon preview, markup, theme name */ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1165 | static GtkWidget * |
| 28552 | 1166 | prefs_build_theme_combo_box(GtkListStore *store, const char *current_theme, const char *type) |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1167 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1168 | GtkCellRenderer *cell_rend; |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1169 | GtkWidget *combo_box; |
|
28483
cb2bf1551a0e
Wordwrap just a little bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28482
diff
changeset
|
1170 | GtkTargetEntry te[3] = { |
|
cb2bf1551a0e
Wordwrap just a little bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28482
diff
changeset
|
1171 | {"text/plain", 0, 0}, |
|
cb2bf1551a0e
Wordwrap just a little bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28482
diff
changeset
|
1172 | {"text/uri-list", 0, 1}, |
|
cb2bf1551a0e
Wordwrap just a little bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28482
diff
changeset
|
1173 | {"STRING", 0, 2} |
|
cb2bf1551a0e
Wordwrap just a little bit.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28482
diff
changeset
|
1174 | }; |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1175 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1176 | g_return_val_if_fail(store != NULL && current_theme != NULL, NULL); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1177 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1178 | combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store)); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1179 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1180 | cell_rend = gtk_cell_renderer_pixbuf_new(); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1181 | gtk_cell_renderer_set_fixed_size(cell_rend, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1182 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1183 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "pixbuf", 0, NULL); |
|
25887
6eac2f6c32e2
s/sucess/success/ in a few places
Mark Doliner <markdoliner@pidgin.im>
parents:
25874
diff
changeset
|
1184 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1185 | cell_rend = gtk_cell_renderer_text_new(); |
|
29391
b3df20769362
Expand and fill.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
29381
diff
changeset
|
1186 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, TRUE); |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1187 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL); |
|
29381
cc1e5ad24728
Remove/comment on some GTK_CHECK_VERSION calls.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29361
diff
changeset
|
1188 | g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); |
|
25887
6eac2f6c32e2
s/sucess/success/ in a few places
Mark Doliner <markdoliner@pidgin.im>
parents:
25874
diff
changeset
|
1189 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1190 | gtk_drag_dest_set(combo_box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te, |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1191 | sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1192 | |
| 28552 | 1193 | g_signal_connect(G_OBJECT(combo_box), "drag_data_received", G_CALLBACK(theme_dnd_recv), (gpointer) type); |
|
23972
90e0da03c053
theme loader cleanup, and remove a few warnings
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23970
diff
changeset
|
1194 | |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1195 | return combo_box; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1196 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23668
diff
changeset
|
1197 | |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1198 | /* sets the current sound theme */ |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1199 | static void |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
1200 | prefs_set_sound_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1201 | { |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1202 | gint i; |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1203 | gchar *pref; |
|
23661
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
1204 | gchar *new_theme; |
|
6cfcb043b068
fixed segfault when changing blist themes, changed prefs to not rely on static iter, fixed a few leaks
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23659
diff
changeset
|
1205 | GtkTreeIter new_iter; |
|
25887
6eac2f6c32e2
s/sucess/success/ in a few places
Mark Doliner <markdoliner@pidgin.im>
parents:
25874
diff
changeset
|
1206 | |
|
28482
6181f5c9a60e
Don't reset the sound theme pref if we're just loading the list of themes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28076
diff
changeset
|
1207 | if(gtk_combo_box_get_active_iter(combo_box, &new_iter) && !prefs_sound_themes_loading) { |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1208 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1209 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_sound_themes), &new_iter, 2, &new_theme, -1); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1210 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1211 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/sound/theme", new_theme); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1212 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1213 | /* New theme removes all customization */ |
|
28551
3e1e60af8256
Mark theme prefs as translatable, refactor slightly for consistency and plug a small leak.
Daniel Atallah <datallah@pidgin.im>
parents:
28514
diff
changeset
|
1214 | for(i = 0; i < PURPLE_NUM_SOUNDS; i++){ |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1215 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1216 | pidgin_sound_get_event_option(i)); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1217 | purple_prefs_set_path(pref, ""); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1218 | g_free(pref); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1219 | } |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1220 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1221 | /* gets rid of the "(Custom)" from the last selection */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1222 | pref_sound_generate_markup(); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1223 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1224 | gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)")); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1225 | |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1226 | g_free(new_theme); |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1227 | } |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1228 | } |
|
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
1229 | |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1230 | /* sets the current smiley theme */ |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1231 | static void |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1232 | prefs_set_smiley_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1233 | { |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1234 | gchar *new_theme; |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1235 | GtkTreeIter new_iter; |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1236 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1237 | if (gtk_combo_box_get_active_iter(combo_box, &new_iter)) { |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1238 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1239 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_smiley_themes), &new_iter, 2, &new_theme, -1); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1240 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1241 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/smileys/theme", new_theme); |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1242 | #if 0 |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1243 | /* TODO: WebKit-ify smileys */ |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1244 | pidgin_themes_smiley_themeize(sample_webview); |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1245 | #endif |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1246 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1247 | g_free(new_theme); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1248 | } |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1249 | } |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1250 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
1251 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1252 | /* Does same as normal sort, except "none" is sorted first */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1253 | static gint pidgin_sort_smileys (GtkTreeModel *model, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1254 | GtkTreeIter *a, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1255 | GtkTreeIter *b, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1256 | gpointer userdata) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1257 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1258 | gint ret = 0; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1259 | gchar *name1 = NULL, *name2 = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1260 | |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1261 | gtk_tree_model_get(model, a, 2, &name1, -1); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1262 | gtk_tree_model_get(model, b, 2, &name2, -1); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1263 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1264 | if (name1 == NULL || name2 == NULL) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1265 | if (!(name1 == NULL && name2 == NULL)) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1266 | ret = (name1 == NULL) ? -1: 1; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1267 | } else if (!g_ascii_strcasecmp(name1, "none")) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1268 | if (!g_utf8_collate(name1, name2)) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1269 | ret = 0; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1270 | else |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1271 | /* Sort name1 first */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1272 | ret = -1; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1273 | } else if (!g_ascii_strcasecmp(name2, "none")) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1274 | /* Sort name2 first */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1275 | ret = 1; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1276 | } else { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1277 | /* Neither string is "none", default to normal sort */ |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1278 | ret = purple_utf8_strcasecmp(name1, name2); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1279 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1280 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1281 | g_free(name1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1282 | g_free(name2); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1283 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1284 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1285 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1286 | |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1287 | /* sets the current buddy list theme */ |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1288 | static void |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1289 | prefs_set_blist_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1290 | { |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1291 | PidginBlistTheme *theme = NULL; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1292 | GtkTreeIter iter; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1293 | gchar *name = NULL; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1294 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1295 | if(gtk_combo_box_get_active_iter(combo_box, &iter)) { |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1296 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1297 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_blist_themes), &iter, 2, &name, -1); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1298 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1299 | if(!name || !g_str_equal(name, "")) |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1300 | theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(name, "blist")); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1301 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1302 | g_free(name); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1303 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1304 | pidgin_blist_set_theme(theme); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1305 | } |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1306 | } |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1307 | |
|
32964
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1308 | /* sets the current conversation theme variant */ |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1309 | static void |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1310 | prefs_set_conv_variant_cb(GtkComboBox *combo_box, gpointer user_data) |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1311 | { |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1312 | PidginConvTheme *theme = NULL; |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1313 | GtkTreeIter iter; |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1314 | gchar *name = NULL; |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1315 | |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1316 | if (gtk_combo_box_get_active_iter(GTK_COMBO_BOX(prefs_conv_themes_combo_box), &iter)) { |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1317 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_conv_themes), &iter, 2, &name, -1); |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1318 | if (name && *name) |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1319 | theme = PIDGIN_CONV_THEME(purple_theme_manager_find_theme(name, "conversation")); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1320 | else |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1321 | theme = PIDGIN_CONV_THEME(pidgin_conversations_get_default_theme()); |
|
32964
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1322 | g_free(name); |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1323 | |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1324 | if (gtk_combo_box_get_active_iter(combo_box, &iter)) { |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1325 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_conv_variants), &iter, 0, &name, -1); |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1326 | pidgin_conversation_theme_set_variant(theme, name); |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1327 | g_free(name); |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1328 | } |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1329 | } |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1330 | } |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1331 | |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1332 | /* sets the current conversation theme */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1333 | static void |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1334 | prefs_set_conv_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1335 | { |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1336 | GtkTreeIter iter; |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1337 | |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1338 | if (gtk_combo_box_get_active_iter(combo_box, &iter)) { |
|
32963
1b5222154b6c
Correctly save the conversation theme pref when re-choosing the Default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32952
diff
changeset
|
1339 | gchar *name = NULL; |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1340 | PidginConvTheme *theme; |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1341 | const char *current_variant; |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1342 | const GList *variants; |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1343 | gboolean unset = TRUE; |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1344 | |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1345 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_conv_themes), &iter, 2, &name, -1); |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1346 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1347 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/theme", name); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1348 | |
|
32964
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1349 | g_signal_handlers_block_by_func(prefs_conv_variants_combo_box, |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1350 | prefs_set_conv_variant_cb, NULL); |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1351 | |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1352 | /* Update list of variants */ |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1353 | gtk_list_store_clear(prefs_conv_variants); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1354 | |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1355 | if (name && *name) |
|
32963
1b5222154b6c
Correctly save the conversation theme pref when re-choosing the Default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32952
diff
changeset
|
1356 | theme = PIDGIN_CONV_THEME(purple_theme_manager_find_theme(name, "conversation")); |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1357 | else |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1358 | theme = PIDGIN_CONV_THEME(pidgin_conversations_get_default_theme()); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1359 | |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1360 | current_variant = pidgin_conversation_theme_get_variant(theme); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1361 | |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1362 | variants = pidgin_conversation_theme_get_variants(theme); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1363 | for (; variants && current_variant; variants = g_list_next(variants)) { |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1364 | gtk_list_store_append(prefs_conv_variants, &iter); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1365 | gtk_list_store_set(prefs_conv_variants, &iter, 0, variants->data, -1); |
|
32963
1b5222154b6c
Correctly save the conversation theme pref when re-choosing the Default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32952
diff
changeset
|
1366 | |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1367 | if (g_str_equal(variants->data, current_variant)) { |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1368 | gtk_combo_box_set_active_iter(GTK_COMBO_BOX(prefs_conv_variants_combo_box), &iter); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1369 | unset = FALSE; |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1370 | } |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1371 | } |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1372 | |
|
32992
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1373 | if (unset) |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1374 | gtk_combo_box_set_active(GTK_COMBO_BOX(prefs_conv_variants_combo_box), 0); |
|
89f064bdd762
Add a conversation theme with no timestamps.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32965
diff
changeset
|
1375 | |
|
32964
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1376 | g_signal_handlers_unblock_by_func(prefs_conv_variants_combo_box, |
|
6934c0712cdc
Fix some boring asserts when using the Default conversation theme.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32963
diff
changeset
|
1377 | prefs_set_conv_variant_cb, NULL); |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1378 | g_free(name); |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1379 | } |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1380 | } |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1381 | |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1382 | /* sets the current icon theme */ |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1383 | static void |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1384 | prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data) |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1385 | { |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1386 | PidginStatusIconTheme *theme = NULL; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1387 | GtkTreeIter iter; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1388 | gchar *name = NULL; |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1389 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1390 | if(gtk_combo_box_get_active_iter(combo_box, &iter)) { |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1391 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1392 | gtk_tree_model_get(GTK_TREE_MODEL(prefs_status_icon_themes), &iter, 2, &name, -1); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1393 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1394 | if(!name || !g_str_equal(name, "")) |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1395 | theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon")); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1396 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1397 | g_free(name); |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1398 | |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1399 | pidgin_stock_load_status_icon_theme(theme); |
|
34726
af52ff6660c0
Replaced purple_get_blist() with purple_blist_get_buddy_list()
Ankit Vani <a@nevitus.org>
parents:
34708
diff
changeset
|
1400 | pidgin_blist_refresh(purple_blist_get_buddy_list()); |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1401 | } |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1402 | } |
|
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1403 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1404 | static GtkWidget * |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1405 | add_theme_prefs_combo(GtkWidget *vbox, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1406 | GtkSizeGroup *combo_sg, GtkSizeGroup *label_sg, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1407 | GtkListStore *theme_store, |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
1408 | GCallback combo_box_cb, gpointer combo_box_cb_user_data, |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1409 | const char *label_str, const char *prefs_path, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1410 | const char *theme_type) |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1411 | { |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1412 | GtkWidget *label; |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1413 | GtkWidget *combo_box = NULL; |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1414 | GtkWidget *themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1415 | |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1416 | label = gtk_label_new(label_str); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1417 | gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1418 | gtk_size_group_add_widget(label_sg, label); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1419 | gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1420 | |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1421 | combo_box = prefs_build_theme_combo_box(theme_store, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1422 | purple_prefs_get_string(prefs_path), |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1423 | theme_type); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1424 | g_signal_connect(G_OBJECT(combo_box), "changed", |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1425 | (GCallback)combo_box_cb, combo_box_cb_user_data); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1426 | gtk_size_group_add_widget(combo_sg, combo_box); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1427 | gtk_box_pack_start(GTK_BOX(themesel_hbox), combo_box, TRUE, TRUE, 0); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1428 | |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1429 | gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0); |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1430 | |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1431 | return combo_box; |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1432 | } |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1433 | |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1434 | static GtkWidget * |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1435 | add_child_theme_prefs_combo(GtkWidget *vbox, GtkSizeGroup *combo_sg, |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1436 | GtkSizeGroup *label_sg, GtkListStore *theme_store, |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1437 | GCallback combo_box_cb, gpointer combo_box_cb_user_data, |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1438 | const char *label_str) |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1439 | { |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1440 | GtkWidget *label; |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1441 | GtkWidget *combo_box; |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1442 | GtkWidget *themesel_hbox; |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1443 | GtkCellRenderer *cell_rend; |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1444 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1445 | themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1446 | gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1447 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1448 | label = gtk_label_new(label_str); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1449 | gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1450 | gtk_size_group_add_widget(label_sg, label); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1451 | gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1452 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1453 | combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(theme_store)); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1454 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1455 | cell_rend = gtk_cell_renderer_text_new(); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1456 | gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), cell_rend, TRUE); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1457 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "text", 0, NULL); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1458 | g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1459 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1460 | g_signal_connect(G_OBJECT(combo_box), "changed", |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1461 | (GCallback)combo_box_cb, combo_box_cb_user_data); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1462 | gtk_size_group_add_widget(combo_sg, combo_box); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1463 | gtk_box_pack_start(GTK_BOX(themesel_hbox), combo_box, TRUE, TRUE, 0); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1464 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1465 | return combo_box; |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1466 | } |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1467 | |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1468 | static GtkWidget * |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1469 | theme_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1470 | { |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1471 | GtkWidget *label; |
|
28900
229b187af5b5
Fix merge error
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28899
diff
changeset
|
1472 | GtkWidget *ret, *vbox; |
|
28854
c0d497fdc4c7
Use a couple size groups to make the buddy list and status icon theme selectors
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28853
diff
changeset
|
1473 | GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
c0d497fdc4c7
Use a couple size groups to make the buddy list and status icon theme selectors
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28853
diff
changeset
|
1474 | GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1475 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1476 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1477 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1478 | |
|
28895
e18ed9175076
Make a frame for the combo box theme selectors and make the labels left-aligned
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28894
diff
changeset
|
1479 | vbox = pidgin_make_frame(ret, _("Theme Selections")); |
|
e18ed9175076
Make a frame for the combo box theme selectors and make the labels left-aligned
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28894
diff
changeset
|
1480 | |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1481 | /* Instructions */ |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1482 | label = gtk_label_new(_("Select a theme that you would like to use from " |
|
28903
0b574a9afbac
Make the instructions wrap a bit nicer.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28902
diff
changeset
|
1483 | "the lists below.\nNew themes can be installed by " |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1484 | "dragging and dropping them onto the theme list.")); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1485 | |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1486 | gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1487 | gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1488 | |
|
28903
0b574a9afbac
Make the instructions wrap a bit nicer.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28902
diff
changeset
|
1489 | gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 0); |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1490 | gtk_widget_show(label); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1491 | |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1492 | /* Buddy List Themes */ |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1493 | prefs_blist_themes_combo_box = add_theme_prefs_combo( |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1494 | vbox, combo_sg, label_sg, prefs_blist_themes, |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
1495 | (GCallback)prefs_set_blist_theme_cb, NULL, |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1496 | _("Buddy List Theme:"), PIDGIN_PREFS_ROOT "/blist/theme", "blist"); |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1497 | |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1498 | /* Conversation Themes */ |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1499 | prefs_conv_themes_combo_box = add_theme_prefs_combo( |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1500 | vbox, combo_sg, label_sg, prefs_conv_themes, |
|
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1501 | (GCallback)prefs_set_conv_theme_cb, NULL, |
|
32563
27024ee86815
Use a consistent prefs name. It should be conversation*s* to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32562
diff
changeset
|
1502 | _("Conversation Theme:"), PIDGIN_PREFS_ROOT "/conversations/theme", "conversation"); |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
1503 | |
|
32583
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1504 | /* Conversation Theme Variants */ |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1505 | prefs_conv_variants_combo_box = add_child_theme_prefs_combo( |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1506 | vbox, combo_sg, label_sg, prefs_conv_variants, |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1507 | (GCallback)prefs_set_conv_variant_cb, NULL, _("\tVariant:")); |
|
0308e54f7762
Add a separate combo box for selecting the theme variant, and actually
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32581
diff
changeset
|
1508 | |
|
32589
0722927d76ce
Sort the variant list in the Preferences. It tends to be very
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32583
diff
changeset
|
1509 | gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(prefs_conv_variants), |
|
0722927d76ce
Sort the variant list in the Preferences. It tends to be very
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32583
diff
changeset
|
1510 | 0, GTK_SORT_ASCENDING); |
|
0722927d76ce
Sort the variant list in the Preferences. It tends to be very
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32583
diff
changeset
|
1511 | |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1512 | /* Status Icon Themes */ |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1513 | prefs_status_themes_combo_box = add_theme_prefs_combo( |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1514 | vbox, combo_sg, label_sg, prefs_status_icon_themes, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1515 | (GCallback)prefs_set_status_icon_theme_cb, NULL, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1516 | _("Status Icon Theme:"), PIDGIN_PREFS_ROOT "/status/icon-theme", "icon"); |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1517 | |
|
28874
bd93abcfb207
Move the sound theme selector to the Themes tab and make the smiley section
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28854
diff
changeset
|
1518 | /* Sound Themes */ |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1519 | prefs_sound_themes_combo_box = add_theme_prefs_combo( |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1520 | vbox, combo_sg, label_sg, prefs_sound_themes, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1521 | (GCallback)prefs_set_sound_theme_cb, NULL, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1522 | _("Sound Theme:"), PIDGIN_PREFS_ROOT "/sound/theme", "sound"); |
|
28874
bd93abcfb207
Move the sound theme selector to the Themes tab and make the smiley section
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28854
diff
changeset
|
1523 | |
|
28852
26cb345c8757
Move the status icon and blist theme comboboxes to the Themes tab. This looks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28851
diff
changeset
|
1524 | /* Smiley Themes */ |
|
30722
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1525 | prefs_smiley_themes_combo_box = add_theme_prefs_combo( |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1526 | vbox, combo_sg, label_sg, prefs_smiley_themes, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1527 | (GCallback)prefs_set_smiley_theme_cb, NULL, |
|
375497ecb944
Reduce some code duplication in the Prefs dialog creation function.
Gabriel Schulhof <nix@go-nix.ca>
parents:
30622
diff
changeset
|
1528 | _("Smiley Theme:"), PIDGIN_PREFS_ROOT "/smileys/theme", "smiley"); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1529 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1530 | /* Custom sort so "none" theme is at top of list */ |
|
28897
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1531 | gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(prefs_smiley_themes), |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1532 | 2, pidgin_sort_smileys, NULL, NULL); |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1533 | gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(prefs_smiley_themes), |
|
953b76a4cca7
Convert Smiley theme selection to the simpler combo box affair that's in
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28893
diff
changeset
|
1534 | 2, GTK_SORT_ASCENDING); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1535 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1536 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1537 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1538 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1539 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1540 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1541 | static void |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1542 | formatting_toggle_cb(PidginWebView *webview, PidginWebViewButtons buttons, void *data) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1543 | { |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1544 | gboolean bold, italic, uline, strike; |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1545 | |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1546 | pidgin_webview_get_current_format(webview, &bold, &italic, &uline, &strike); |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1547 | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1548 | if (buttons & PIDGIN_WEBVIEW_BOLD) |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1549 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1550 | bold); |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1551 | if (buttons & PIDGIN_WEBVIEW_ITALIC) |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1552 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1553 | italic); |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1554 | if (buttons & PIDGIN_WEBVIEW_UNDERLINE) |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1555 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1556 | uline); |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1557 | if (buttons & PIDGIN_WEBVIEW_STRIKE) |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1558 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_strike", |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1559 | strike); |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1560 | |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1561 | if (buttons & PIDGIN_WEBVIEW_GROW || buttons & PIDGIN_WEBVIEW_SHRINK) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1562 | purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/font_size", |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1563 | pidgin_webview_get_current_fontsize(webview)); |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1564 | if (buttons & PIDGIN_WEBVIEW_FACE) { |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1565 | char *face = pidgin_webview_get_current_fontface(webview); |
|
32897
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1566 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1567 | if (face) |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1568 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", face); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1569 | else |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1570 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", ""); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1571 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1572 | g_free(face); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1573 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1574 | |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1575 | if (buttons & PIDGIN_WEBVIEW_FORECOLOR) { |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1576 | char *color = pidgin_webview_get_current_forecolor(webview); |
|
32897
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1577 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1578 | if (color) |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1579 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", color); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1580 | else |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1581 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", ""); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1582 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1583 | g_free(color); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1584 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1585 | |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1586 | if (buttons & PIDGIN_WEBVIEW_BACKCOLOR) { |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1587 | char *color = pidgin_webview_get_current_backcolor(webview); |
|
32897
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1588 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1589 | if (color) |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1590 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", color); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1591 | else |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1592 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", ""); |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1593 | |
|
1b29ae6c7b65
Update prefs usage of the webview for previous changes.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32882
diff
changeset
|
1594 | g_free(color); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1595 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1596 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1597 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1598 | static void |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1599 | formatting_clear_cb(PidginWebView *webview, void *data) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1600 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1601 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1602 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1603 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", FALSE); |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1604 | purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_strike", FALSE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1605 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1606 | purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/font_size", 3); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1607 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1608 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1609 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1610 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1611 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1612 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1613 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1614 | conversation_usetabs_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1615 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1616 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1617 | gboolean usetabs = GPOINTER_TO_INT(value); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1618 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1619 | if (usetabs) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1620 | gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1621 | else |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1622 | gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1623 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1624 | |
|
22944
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1625 | |
|
33949
e09a02bc06d0
Fix closing convs with Escape key
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33948
diff
changeset
|
1626 | #define CONVERSATION_CLOSE_ACCEL_PATH "<Actions>/ConversationActions/Close" |
|
22944
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1627 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1628 | /* Filled in in keyboard_shortcuts(). */ |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1629 | static GtkAccelKey ctrl_w = { 0, 0, 0 }; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1630 | static GtkAccelKey escape = { 0, 0, 0 }; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1631 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1632 | static guint escape_closes_conversation_cb_id = 0; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1633 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1634 | static gboolean |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1635 | accel_is_escape(GtkAccelKey *k) |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1636 | { |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1637 | return (k->accel_key == escape.accel_key |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1638 | && k->accel_mods == escape.accel_mods); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1639 | } |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1640 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1641 | /* Update the tickybox in Preferences when the keybinding for Conversation -> |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1642 | * Close is changed via Gtk. |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1643 | */ |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1644 | static void |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1645 | conversation_close_accel_changed_cb (GtkAccelMap *object, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1646 | gchar *accel_path, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1647 | guint accel_key, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1648 | GdkModifierType accel_mods, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1649 | gpointer checkbox_) |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1650 | { |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1651 | GtkToggleButton *checkbox = GTK_TOGGLE_BUTTON(checkbox_); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1652 | GtkAccelKey new = { accel_key, accel_mods, 0 }; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1653 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1654 | g_signal_handler_block(checkbox, escape_closes_conversation_cb_id); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1655 | gtk_toggle_button_set_active(checkbox, accel_is_escape(&new)); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1656 | g_signal_handler_unblock(checkbox, escape_closes_conversation_cb_id); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1657 | } |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1658 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1659 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1660 | static void |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1661 | escape_closes_conversation_cb(GtkWidget *w, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1662 | gpointer unused) |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1663 | { |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1664 | gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1665 | gboolean changed; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1666 | GtkAccelKey *new_key = active ? &escape : &ctrl_w; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1667 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1668 | changed = gtk_accel_map_change_entry(CONVERSATION_CLOSE_ACCEL_PATH, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1669 | new_key->accel_key, new_key->accel_mods, TRUE); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1670 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1671 | /* If another path is already bound to the new accelerator, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1672 | * _change_entry tries to delete that binding (because it was passed |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1673 | * replace=TRUE). If that other path is locked, then _change_entry |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1674 | * will fail. We don't ever lock any accelerator paths, so this case |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1675 | * should never arise. |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1676 | */ |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1677 | if(!changed) |
|
22950
13152e113af9
Replace a notification that should never happen with a debug message that
Richard Laager <rlaager@pidgin.im>
parents:
22944
diff
changeset
|
1678 | purple_debug_warning("gtkprefs", "Escape accel failed to change\n"); |
|
22944
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1679 | } |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1680 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1681 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1682 | /* Creates preferences for keyboard shortcuts that it's hard to change with the |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1683 | * standard Gtk accelerator-changing mechanism. |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1684 | */ |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1685 | static void |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1686 | keyboard_shortcuts(GtkWidget *page) |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1687 | { |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1688 | GtkWidget *vbox = pidgin_make_frame(page, _("Keyboard Shortcuts")); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1689 | GtkWidget *checkbox; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1690 | GtkAccelKey current = { 0, 0, 0 }; |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1691 | GtkAccelMap *map = gtk_accel_map_get(); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1692 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1693 | /* Maybe it would be better just to hardcode the values? |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1694 | * -- resiak, 2007-04-30 |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1695 | */ |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1696 | if (ctrl_w.accel_key == 0) |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1697 | { |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1698 | gtk_accelerator_parse ("<Control>w", &(ctrl_w.accel_key), |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1699 | &(ctrl_w.accel_mods)); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1700 | g_assert(ctrl_w.accel_key != 0); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1701 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1702 | gtk_accelerator_parse ("Escape", &(escape.accel_key), |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1703 | &(escape.accel_mods)); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1704 | g_assert(escape.accel_key != 0); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1705 | } |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1706 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1707 | checkbox = gtk_check_button_new_with_mnemonic( |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1708 | _("Cl_ose conversations with the Escape key")); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1709 | gtk_accel_map_lookup_entry(CONVERSATION_CLOSE_ACCEL_PATH, ¤t); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1710 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1711 | accel_is_escape(¤t)); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1712 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1713 | escape_closes_conversation_cb_id = g_signal_connect(checkbox, |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1714 | "clicked", G_CALLBACK(escape_closes_conversation_cb), NULL); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1715 | |
|
23151
f12f7b3c0fd5
The checkbox needs to be toggled back on only when it's alive. And the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22984
diff
changeset
|
1716 | g_signal_connect_object(map, "changed::" CONVERSATION_CLOSE_ACCEL_PATH, |
|
f12f7b3c0fd5
The checkbox needs to be toggled back on only when it's alive. And the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22984
diff
changeset
|
1717 | G_CALLBACK(conversation_close_accel_changed_cb), checkbox, (GConnectFlags)0); |
|
22944
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1718 | |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1719 | gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1720 | } |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1721 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1722 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1723 | interface_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1724 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1725 | GtkWidget *ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1726 | GtkWidget *vbox; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1727 | GtkWidget *vbox2; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1728 | GtkWidget *label; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1729 | GtkSizeGroup *sg; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1730 | GList *names = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1731 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1732 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1733 | gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1734 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1735 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1736 | |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
1737 | /* System Tray */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1738 | vbox = pidgin_make_frame(ret, _("System Tray Icon")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1739 | label = pidgin_prefs_dropdown(vbox, _("_Show system tray icon:"), PURPLE_PREF_STRING, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1740 | PIDGIN_PREFS_ROOT "/docklet/show", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1741 | _("Always"), "always", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1742 | _("On unread messages"), "pending", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1743 | _("Never"), "never", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1744 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1745 | gtk_size_group_add_widget(sg, label); |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1746 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1747 | |
|
27592
c252cad34998
Rename the "Conversation Window Hiding" preferences section to "Conversation
Etan Reisner <deryni@pidgin.im>
parents:
27196
diff
changeset
|
1748 | vbox = pidgin_make_frame(ret, _("Conversation Window")); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1749 | label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1750 | PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1751 | _("Never"), "never", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1752 | _("When away"), "away", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1753 | _("Always"), "always", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1754 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1755 | gtk_size_group_add_widget(sg, label); |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1756 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1757 | |
|
27592
c252cad34998
Rename the "Conversation Window Hiding" preferences section to "Conversation
Etan Reisner <deryni@pidgin.im>
parents:
27196
diff
changeset
|
1758 | #ifdef _WIN32 |
|
c252cad34998
Rename the "Conversation Window Hiding" preferences section to "Conversation
Etan Reisner <deryni@pidgin.im>
parents:
27196
diff
changeset
|
1759 | pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox); |
|
c252cad34998
Rename the "Conversation Window Hiding" preferences section to "Conversation
Etan Reisner <deryni@pidgin.im>
parents:
27196
diff
changeset
|
1760 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1761 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1762 | /* All the tab options! */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1763 | vbox = pidgin_make_frame(ret, _("Tabs")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1764 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1765 | pidgin_prefs_checkbox(_("Show IMs and chats in _tabbed windows"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1766 | PIDGIN_PREFS_ROOT "/conversations/tabs", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1767 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1768 | /* |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1769 | * Connect a signal to the above preference. When conversations are not |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1770 | * shown in a tabbed window then all tabbing options should be disabled. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1771 | */ |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1772 | vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 9); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1773 | gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1774 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/conversations/tabs", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1775 | conversation_usetabs_cb, vbox2); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1776 | if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs")) |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1777 | gtk_widget_set_sensitive(vbox2, FALSE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1778 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1779 | pidgin_prefs_checkbox(_("Show close b_utton on tabs"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1780 | PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", vbox2); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1781 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1782 | label = pidgin_prefs_dropdown(vbox2, _("_Placement:"), PURPLE_PREF_INT, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1783 | PIDGIN_PREFS_ROOT "/conversations/tab_side", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1784 | _("Top"), GTK_POS_TOP, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1785 | _("Bottom"), GTK_POS_BOTTOM, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1786 | _("Left"), GTK_POS_LEFT, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1787 | _("Right"), GTK_POS_RIGHT, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1788 | _("Left Vertical"), GTK_POS_LEFT|8, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1789 | _("Right Vertical"), GTK_POS_RIGHT|8, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1790 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1791 | gtk_size_group_add_widget(sg, label); |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1792 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1793 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1794 | names = pidgin_conv_placement_get_options(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1795 | label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1796 | PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/placement", names); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1797 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1798 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1799 | gtk_size_group_add_widget(sg, label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1800 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1801 | g_list_free(names); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1802 | |
|
22944
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1803 | keyboard_shortcuts(ret); |
|
212075e27ec1
Add a tickybox to set the 'close conversation window' shortcut to Escape.
Will Thompson <resiak@pidgin.im>
parents:
22419
diff
changeset
|
1804 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1805 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1806 | g_object_unref(sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1807 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1808 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1809 | |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1810 | #ifdef _WIN32 |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1811 | static void |
|
29361
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1812 | apply_custom_font(void) |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1813 | { |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1814 | PangoFontDescription *desc = NULL; |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1815 | if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font")) { |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1816 | const char *font = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font"); |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1817 | desc = pango_font_description_from_string(font); |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1818 | } |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1819 | |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1820 | gtk_widget_modify_font(sample_webview, desc); |
|
29361
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1821 | if (desc) |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1822 | pango_font_description_free(desc); |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1823 | |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1824 | } |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1825 | static void |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1826 | pidgin_custom_font_set(GtkFontButton *font_button, gpointer nul) |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1827 | { |
|
29361
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1828 | |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1829 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", |
|
29361
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1830 | gtk_font_button_get_font_name(font_button)); |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1831 | |
|
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1832 | apply_custom_font(); |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1833 | } |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1834 | #endif |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1835 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1836 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1837 | conv_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1838 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1839 | GtkWidget *ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1840 | GtkWidget *vbox; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1841 | GtkWidget *iconpref1; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1842 | GtkWidget *iconpref2; |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1843 | GtkWidget *webview; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1844 | GtkWidget *frame; |
|
31941
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1845 | GtkWidget *hbox; |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1846 | GtkWidget *checkbox; |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1847 | GtkWidget *spin_button; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1848 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1849 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1850 | gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1851 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1852 | vbox = pidgin_make_frame(ret, _("Conversations")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1853 | |
|
33534
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1854 | pidgin_prefs_dropdown(vbox, _("Chat notification:"), |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1855 | PURPLE_PREF_INT, PIDGIN_PREFS_ROOT "/conversations/notification_chat", |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1856 | _("On unseen events"), PIDGIN_UNSEEN_EVENT, |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1857 | _("On unseen text"), PIDGIN_UNSEEN_TEXT, |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1858 | _("On unseen text and the nick was said"), PIDGIN_UNSEEN_NICK, |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1859 | NULL); |
|
97976e12368d
Add a preference to select the type of message that triggers the docklet notification.
Jorge Villaseñor <salinasv@pidgin.im>
parents:
33520
diff
changeset
|
1860 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1861 | pidgin_prefs_checkbox(_("Show _formatting on incoming messages"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1862 | PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1863 | pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1864 | PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1865 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1866 | iconpref1 = pidgin_prefs_checkbox(_("Show _detailed information"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1867 | PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1868 | iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1869 | PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1870 | if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1871 | gtk_widget_set_sensitive(iconpref2, FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1872 | g_signal_connect(G_OBJECT(iconpref1), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1873 | G_CALLBACK(pidgin_toggle_sensitive), iconpref2); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1874 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1875 | pidgin_prefs_checkbox(_("_Notify buddies that you are typing to them"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1876 | "/purple/conversations/im/send_typing", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1877 | pidgin_prefs_checkbox(_("Highlight _misspelled words"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1878 | PIDGIN_PREFS_ROOT "/conversations/spellcheck", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1879 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1880 | pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1881 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1882 | #ifdef _WIN32 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1883 | pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1884 | #endif |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
1885 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
31941
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1886 | |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1887 | checkbox = pidgin_prefs_checkbox(_("Resize incoming custom smileys"), |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1888 | PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", hbox); |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1889 | |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1890 | spin_button = pidgin_prefs_labeled_spin_button(hbox, |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1891 | _("Maximum size:"), |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1892 | PIDGIN_PREFS_ROOT "/conversations/custom_smileys_size", |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1893 | 16, 512, NULL); |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1894 | |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1895 | if (!purple_prefs_get_bool( |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1896 | PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys")) |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1897 | gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE); |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1898 | |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1899 | g_signal_connect(G_OBJECT(checkbox), "clicked", |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1900 | G_CALLBACK(pidgin_toggle_sensitive), spin_button); |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1901 | |
|
0ba7a6657b39
Make the max size of incoming smileys a pref instead of harcoding it. Patch from Xinef (with small modifications) Refs #5231
Jorge Villaseñor <masca@cpw.pidgin.im>
parents:
31889
diff
changeset
|
1902 | pidgin_add_widget_to_vbox(GTK_BOX(vbox), NULL, NULL, hbox, TRUE, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1903 | |
|
22974
ac33a497eaf0
Add a "minimum lines" pref for the im entry box thing; up to 8 lines.
Will Thompson <resiak@pidgin.im>
parents:
22950
diff
changeset
|
1904 | pidgin_prefs_labeled_spin_button(vbox, |
|
22984
0242b0a1e444
Change the label on the entry area height pref
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22974
diff
changeset
|
1905 | _("Minimum input area height in lines:"), |
|
22974
ac33a497eaf0
Add a "minimum lines" pref for the im entry box thing; up to 8 lines.
Will Thompson <resiak@pidgin.im>
parents:
22950
diff
changeset
|
1906 | PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", |
|
ac33a497eaf0
Add a "minimum lines" pref for the im entry box thing; up to 8 lines.
Will Thompson <resiak@pidgin.im>
parents:
22950
diff
changeset
|
1907 | 1, 8, NULL); |
|
ac33a497eaf0
Add a "minimum lines" pref for the im entry box thing; up to 8 lines.
Will Thompson <resiak@pidgin.im>
parents:
22950
diff
changeset
|
1908 | |
|
29656
2dfea274d539
Fix the Windows font pref for the new GTK version requirements.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
29655
diff
changeset
|
1909 | #ifdef _WIN32 |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1910 | { |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1911 | GtkWidget *fontpref, *font_button, *hbox; |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1912 | const char *font_name; |
|
28908
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1913 | vbox = pidgin_make_frame(ret, _("Font")); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1914 | |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1915 | fontpref = pidgin_prefs_checkbox(_("Use font from _theme"), |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1916 | PIDGIN_PREFS_ROOT "/conversations/use_theme_font", vbox); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1917 | |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1918 | font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font"); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1919 | if ((font_name == NULL) || (*font_name == '\0')) { |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1920 | font_button = gtk_font_button_new(); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1921 | } else { |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1922 | font_button = gtk_font_button_new_with_font(font_name); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1923 | } |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1924 | |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1925 | gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1926 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Conversation _font:"), NULL, font_button, FALSE, NULL); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1927 | if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font")) |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1928 | gtk_widget_set_sensitive(hbox, FALSE); |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1929 | g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox); |
|
29361
c73b60e914bb
Make the conversation text preview section dynamically update as the win32-only font override changes. Fixes #11168
Daniel Atallah <datallah@pidgin.im>
parents:
29154
diff
changeset
|
1930 | g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(apply_custom_font), hbox); |
|
28908
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1931 | g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL); |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1932 | |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
1933 | } |
|
28908
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1934 | #endif |
|
d8538334b167
I *think* this properly adds back the font preference stuff I axed earlier, but
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28907
diff
changeset
|
1935 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1936 | vbox = pidgin_make_frame(ret, _("Default Formatting")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1937 | |
|
34274
9169710b5af5
Hide GtkWebViewToolbar stuff within the GtkWebView.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34259
diff
changeset
|
1938 | frame = pidgin_create_webview(TRUE, &webview, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1939 | gtk_widget_show(frame); |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1940 | gtk_widget_set_name(webview, "pidgin_prefs_font_webview"); |
|
28930
4b7f980b13d3
Prevent an infinite loop from the preference window.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
28921
diff
changeset
|
1941 | gtk_widget_set_size_request(frame, 450, -1); |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1942 | pidgin_webview_set_whole_buffer_formatting_only(PIDGIN_WEBVIEW(webview), TRUE); |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1943 | pidgin_webview_set_format_functions(PIDGIN_WEBVIEW(webview), |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1944 | PIDGIN_WEBVIEW_BOLD | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1945 | PIDGIN_WEBVIEW_ITALIC | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1946 | PIDGIN_WEBVIEW_UNDERLINE | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1947 | PIDGIN_WEBVIEW_STRIKE | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1948 | PIDGIN_WEBVIEW_GROW | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1949 | PIDGIN_WEBVIEW_SHRINK | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1950 | PIDGIN_WEBVIEW_FACE | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1951 | PIDGIN_WEBVIEW_FORECOLOR | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1952 | PIDGIN_WEBVIEW_BACKCOLOR); |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1953 | |
|
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1954 | pidgin_webview_append_html(PIDGIN_WEBVIEW(webview), |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1955 | _("This is how your outgoing message text will " |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1956 | "appear when you use protocols that support " |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1957 | "formatting.")); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1958 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1959 | gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1960 | |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
1961 | pidgin_webview_setup_entry(PIDGIN_WEBVIEW(webview), |
|
34746
dc9c911dbd35
Started GObjectification of PurpleConnection.
Ankit Vani <a@nevitus.org>
parents:
34726
diff
changeset
|
1962 | PURPLE_CONNECTION_FLAG_HTML | |
|
dc9c911dbd35
Started GObjectification of PurpleConnection.
Ankit Vani <a@nevitus.org>
parents:
34726
diff
changeset
|
1963 | PURPLE_CONNECTION_FLAG_FORMATTING_WBFO); |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1964 | |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1965 | g_signal_connect_after(G_OBJECT(webview), "format-toggled", |
|
34274
9169710b5af5
Hide GtkWebViewToolbar stuff within the GtkWebView.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34259
diff
changeset
|
1966 | G_CALLBACK(formatting_toggle_cb), NULL); |
|
32821
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1967 | g_signal_connect_after(G_OBJECT(webview), "format-cleared", |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1968 | G_CALLBACK(formatting_clear_cb), NULL); |
|
e0dc2c194bca
Replace the sample imhtml in the prefs panel with a webview widget.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32745
diff
changeset
|
1969 | sample_webview = webview; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1970 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1971 | gtk_widget_show(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1972 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1973 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1974 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1975 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1976 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
1977 | network_ip_changed(GtkEntry *entry, gpointer data) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
1978 | { |
|
33924
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1979 | #if GTK_CHECK_VERSION(3,0,0) |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1980 | const gchar *text = gtk_entry_get_text(entry); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1981 | GtkStyleContext *context = gtk_widget_get_style_context(GTK_WIDGET(entry)); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1982 | |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1983 | if (text && *text) { |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1984 | if (purple_ip_address_is_valid(text)) { |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1985 | purple_network_set_public_ip(text); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1986 | gtk_style_context_add_class(context, "good-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1987 | gtk_style_context_remove_class(context, "bad-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1988 | } else { |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1989 | gtk_style_context_add_class(context, "bad-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1990 | gtk_style_context_remove_class(context, "good-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1991 | } |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1992 | |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1993 | } else { |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1994 | purple_network_set_public_ip(""); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1995 | gtk_style_context_remove_class(context, "bad-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1996 | gtk_style_context_remove_class(context, "good-ip"); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1997 | } |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
1998 | #else |
|
27501
a9b9d025395b
Change the background of the IP address input in the Network preferences to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27493
diff
changeset
|
1999 | const gchar *text = gtk_entry_get_text(entry); |
|
a9b9d025395b
Change the background of the IP address input in the Network preferences to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27493
diff
changeset
|
2000 | GdkColor color; |
|
a9b9d025395b
Change the background of the IP address input in the Network preferences to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27493
diff
changeset
|
2001 | |
|
27521
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2002 | if (text && *text) { |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2003 | if (purple_ip_address_is_valid(text)) { |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2004 | color.red = 0xAFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2005 | color.green = 0xFFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2006 | color.blue = 0xAFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2007 | |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2008 | purple_network_set_public_ip(text); |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2009 | } else { |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2010 | color.red = 0xFFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2011 | color.green = 0xAFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2012 | color.blue = 0xAFFF; |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2013 | } |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2014 | |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2015 | gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, &color); |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2016 | |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2017 | } else { |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2018 | purple_network_set_public_ip(""); |
|
7ea47bf6f859
Don't colourize the IP entry field when it's empty, and reset the actual
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27520
diff
changeset
|
2019 | gtk_widget_modify_base(GTK_WIDGET(entry), GTK_STATE_NORMAL, NULL); |
|
27501
a9b9d025395b
Change the background of the IP address input in the Network preferences to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27493
diff
changeset
|
2020 | } |
|
33924
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2021 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2022 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2023 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2024 | static gboolean |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2025 | network_stun_server_changed_cb(GtkWidget *widget, |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2026 | GdkEventFocus *event, gpointer data) |
|
26256
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2027 | { |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2028 | GtkEntry *entry = GTK_ENTRY(widget); |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2029 | purple_prefs_set_string("/purple/network/stun_server", |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2030 | gtk_entry_get_text(entry)); |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2031 | purple_network_set_stun_server(gtk_entry_get_text(entry)); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
2032 | |
|
26256
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2033 | return FALSE; |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2034 | } |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2035 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2036 | static gboolean |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2037 | network_turn_server_changed_cb(GtkWidget *widget, |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2038 | GdkEventFocus *event, gpointer data) |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2039 | { |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2040 | GtkEntry *entry = GTK_ENTRY(widget); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2041 | purple_prefs_set_string("/purple/network/turn_server", |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2042 | gtk_entry_get_text(entry)); |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2043 | purple_network_set_turn_server(gtk_entry_get_text(entry)); |
|
27449
ebd2e0ae2e3a
Kill whitespace at the end of lines.
Paul Aurich <darkrain42@pidgin.im>
parents:
27445
diff
changeset
|
2044 | |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2045 | return FALSE; |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2046 | } |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2047 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2048 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2049 | proxy_changed_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2050 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2051 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2052 | GtkWidget *frame = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2053 | const char *proxy = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2054 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2055 | if (strcmp(proxy, "none") && strcmp(proxy, "envvar")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2056 | gtk_widget_show_all(frame); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2057 | else |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2058 | gtk_widget_hide(frame); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2059 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2060 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2061 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2062 | proxy_print_option(GtkEntry *entry, int entrynum) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2063 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2064 | if (entrynum == PROXYHOST) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2065 | purple_prefs_set_string("/purple/proxy/host", gtk_entry_get_text(entry)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2066 | else if (entrynum == PROXYPORT) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2067 | purple_prefs_set_int("/purple/proxy/port", atoi(gtk_entry_get_text(entry))); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2068 | else if (entrynum == PROXYUSER) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2069 | purple_prefs_set_string("/purple/proxy/username", gtk_entry_get_text(entry)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2070 | else if (entrynum == PROXYPASS) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2071 | purple_prefs_set_string("/purple/proxy/password", gtk_entry_get_text(entry)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2072 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2073 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2074 | static void |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2075 | proxy_button_clicked_cb(GtkWidget *button, gchar *program) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2076 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2077 | GError *err = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2078 | |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2079 | if (g_spawn_command_line_async(program, &err)) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2080 | return; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2081 | |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
2082 | purple_notify_error(NULL, NULL, _("Cannot start proxy configuration program."), err->message, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2083 | g_error_free(err); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2084 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2085 | |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
2086 | #ifndef _WIN32 |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2087 | static void |
|
32882
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2088 | browser_button_clicked_cb(GtkWidget *button, gchar *path) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2089 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2090 | GError *err = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2091 | |
|
32882
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2092 | if (g_spawn_command_line_async(path, &err)) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2093 | return; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2094 | |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
2095 | purple_notify_error(NULL, NULL, _("Cannot start browser configuration program."), err->message, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2096 | g_error_free(err); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2097 | } |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
2098 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2099 | |
|
28512
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2100 | static void |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2101 | auto_ip_button_clicked_cb(GtkWidget *button, gpointer null) |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2102 | { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2103 | const char *ip; |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2104 | PurpleStunNatDiscovery *stun; |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2105 | char *auto_ip_text; |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2106 | |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2107 | /* purple_network_get_my_ip will return the IP that was set by the user with |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2108 | purple_network_set_public_ip, so make a lookup for the auto-detected IP |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2109 | ourselves. */ |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2110 | |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2111 | if (purple_prefs_get_bool("/purple/network/auto_ip")) { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2112 | /* Check if STUN discovery was already done */ |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2113 | stun = purple_stun_discover(NULL); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2114 | if ((stun != NULL) && (stun->status == PURPLE_STUN_STATUS_DISCOVERED)) { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2115 | ip = stun->publicip; |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2116 | } else { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2117 | /* Attempt to get the IP from a NAT device using UPnP */ |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2118 | ip = purple_upnp_get_public_ip(); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2119 | if (ip == NULL) { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2120 | /* Attempt to get the IP from a NAT device using NAT-PMP */ |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2121 | ip = purple_pmp_get_public_ip(); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2122 | if (ip == NULL) { |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2123 | /* Just fetch the IP of the local system */ |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2124 | ip = purple_network_get_local_system_ip(-1); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2125 | } |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2126 | } |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2127 | } |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2128 | } |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2129 | else |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2130 | ip = _("Disabled"); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2131 | |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2132 | auto_ip_text = g_strdup_printf(_("Use _automatically detected IP address: %s"), ip); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2133 | gtk_button_set_label(GTK_BUTTON(button), auto_ip_text); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2134 | g_free(auto_ip_text); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2135 | } |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2136 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2137 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2138 | network_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2139 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2140 | GtkWidget *ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2141 | GtkWidget *vbox, *hbox, *entry; |
|
28514
10cd24370f4a
Fix minor warning
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28513
diff
changeset
|
2142 | GtkWidget *label, *auto_ip_checkbox, *ports_checkbox, *spin_button; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2143 | GtkSizeGroup *sg; |
|
33929
014800693d22
Fix compilation for GTK2
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33924
diff
changeset
|
2144 | #if GTK_CHECK_VERSION(3,0,0) |
|
33924
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2145 | GtkStyleContext *context; |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2146 | GtkCssProvider *ip_css; |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2147 | const gchar ip_style[] = |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2148 | ".bad-ip {" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2149 | "color: @error_fg_color;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2150 | "text-shadow: 0 1px @error_text_shadow;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2151 | "background-image: none;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2152 | "background-color: @error_bg_color;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2153 | "}" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2154 | ".good-ip {" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2155 | "color: @question_fg_color;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2156 | "text-shadow: 0 1px @question_text_shadow;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2157 | "background-image: none;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2158 | "background-color: @success_color;" |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2159 | "}"; |
|
33929
014800693d22
Fix compilation for GTK2
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33924
diff
changeset
|
2160 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2161 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2162 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2163 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2164 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2165 | vbox = pidgin_make_frame (ret, _("IP Address")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2166 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
26256
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2167 | |
|
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2168 | entry = gtk_entry_new(); |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2169 | gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string( |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2170 | "/purple/network/stun_server")); |
|
26256
d2673c935184
Run an asynchronous DNS lookup for the STUN server IP (to set as a property
Marcus Lundblad <malu@pidgin.im>
parents:
26220
diff
changeset
|
2171 | g_signal_connect(G_OBJECT(entry), "focus-out-event", |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2172 | G_CALLBACK(network_stun_server_changed_cb), NULL); |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2173 | gtk_widget_show(entry); |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2174 | |
|
28627
0bff7d254b5f
Mark "STUN server:" for translation.
Paul Aurich <darkrain42@pidgin.im>
parents:
28552
diff
changeset
|
2175 | pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"), |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2176 | sg, entry, TRUE, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2177 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2178 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2179 | gtk_container_add(GTK_CONTAINER(vbox), hbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2180 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2181 | label = gtk_label_new(NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2182 | gtk_container_add(GTK_CONTAINER(hbox), label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2183 | gtk_size_group_add_widget(sg, label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2184 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2185 | label = gtk_label_new(NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2186 | gtk_label_set_markup(GTK_LABEL(label), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2187 | _("<span style=\"italic\">Example: stunserver.org</span>")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2188 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2189 | gtk_container_add(GTK_CONTAINER(hbox), label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2190 | |
|
28512
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2191 | auto_ip_checkbox = pidgin_prefs_checkbox("Use _automatically detected IP address", |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2192 | "/purple/network/auto_ip", vbox); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2193 | g_signal_connect(G_OBJECT(auto_ip_checkbox), "clicked", |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2194 | G_CALLBACK(auto_ip_button_clicked_cb), NULL); |
|
4e78d85b2375
Don't do IP discovery if the automatic IP detection pref is disabled, even
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28494
diff
changeset
|
2195 | auto_ip_button_clicked_cb(auto_ip_checkbox, NULL); /* Update label */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2196 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2197 | entry = gtk_entry_new(); |
|
28513
7dcf4884e142
I don't see why the Public IP entry needs to be different and use a Table
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28512
diff
changeset
|
2198 | gtk_entry_set_text(GTK_ENTRY(entry), purple_network_get_public_ip()); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2199 | g_signal_connect(G_OBJECT(entry), "changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2200 | G_CALLBACK(network_ip_changed), NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2201 | |
|
33929
014800693d22
Fix compilation for GTK2
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33924
diff
changeset
|
2202 | #if GTK_CHECK_VERSION(3,0,0) |
|
33924
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2203 | ip_css = gtk_css_provider_new(); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2204 | gtk_css_provider_load_from_data(ip_css, ip_style, -1, NULL); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2205 | context = gtk_widget_get_style_context(entry); |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2206 | gtk_style_context_add_provider(context, |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2207 | GTK_STYLE_PROVIDER(ip_css), |
|
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2208 | GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); |
|
33929
014800693d22
Fix compilation for GTK2
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33924
diff
changeset
|
2209 | #endif |
|
33924
788678d2e035
Fix background change in IP and debug filter entries.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33896
diff
changeset
|
2210 | |
|
28513
7dcf4884e142
I don't see why the Public IP entry needs to be different and use a Table
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28512
diff
changeset
|
2211 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Public _IP:"), |
|
7dcf4884e142
I don't see why the Public IP entry needs to be different and use a Table
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28512
diff
changeset
|
2212 | sg, entry, TRUE, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2213 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2214 | if (purple_prefs_get_bool("/purple/network/auto_ip")) { |
|
28513
7dcf4884e142
I don't see why the Public IP entry needs to be different and use a Table
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28512
diff
changeset
|
2215 | gtk_widget_set_sensitive(GTK_WIDGET(hbox), FALSE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2216 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2217 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2218 | g_signal_connect(G_OBJECT(auto_ip_checkbox), "clicked", |
|
28513
7dcf4884e142
I don't see why the Public IP entry needs to be different and use a Table
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28512
diff
changeset
|
2219 | G_CALLBACK(pidgin_toggle_sensitive), hbox); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2220 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2221 | g_object_unref(sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2222 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2223 | vbox = pidgin_make_frame (ret, _("Ports")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2224 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2225 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2226 | pidgin_prefs_checkbox(_("_Enable automatic router port forwarding"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2227 | "/purple/network/map_ports", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2228 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2229 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28794
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2230 | |
|
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2231 | ports_checkbox = pidgin_prefs_checkbox(_("_Manually specify range of ports to listen on:"), |
|
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2232 | "/purple/network/ports_range_use", hbox); |
|
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2233 | |
|
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2234 | spin_button = pidgin_prefs_labeled_spin_button(hbox, _("_Start:"), |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2235 | "/purple/network/ports_range_start", 0, 65535, sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2236 | if (!purple_prefs_get_bool("/purple/network/ports_range_use")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2237 | gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2238 | g_signal_connect(G_OBJECT(ports_checkbox), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2239 | G_CALLBACK(pidgin_toggle_sensitive), spin_button); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2240 | |
|
28794
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2241 | spin_button = pidgin_prefs_labeled_spin_button(hbox, _("_End:"), |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2242 | "/purple/network/ports_range_end", 0, 65535, sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2243 | if (!purple_prefs_get_bool("/purple/network/ports_range_use")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2244 | gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2245 | g_signal_connect(G_OBJECT(ports_checkbox), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2246 | G_CALLBACK(pidgin_toggle_sensitive), spin_button); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2247 | |
|
28794
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2248 | pidgin_add_widget_to_vbox(GTK_BOX(vbox), NULL, NULL, hbox, TRUE, NULL); |
|
42b8b3e334b5
Per discussion in devel@conference.pidgin.im a couple days ago, make the
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28741
diff
changeset
|
2249 | |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2250 | g_object_unref(sg); |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2251 | |
|
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2252 | /* TURN server */ |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2253 | vbox = pidgin_make_frame(ret, _("Relay Server (TURN)")); |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2254 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2255 | |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2256 | entry = gtk_entry_new(); |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2257 | gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string( |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2258 | "/purple/network/turn_server")); |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2259 | g_signal_connect(G_OBJECT(entry), "focus-out-event", |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2260 | G_CALLBACK(network_turn_server_changed_cb), NULL); |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2261 | gtk_widget_show(entry); |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2262 | |
|
28485
83f44e0a9ccf
Mark some "TURN server" strings for translation.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28483
diff
changeset
|
2263 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"), |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2264 | sg, entry, TRUE, NULL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
2265 | |
|
30743
f9599fe0199c
Removed the TCP and TLS TURN relaying options since libnice currently only supports these in Google mode. Added a note about this in fs-backend.c and changed the prefs label to read "UDP Port"
Marcus Lundblad <malu@pidgin.im>
parents:
30722
diff
changeset
|
2266 | pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"), |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2267 | "/purple/network/turn_port", 0, 65535, NULL); |
|
30743
f9599fe0199c
Removed the TCP and TLS TURN relaying options since libnice currently only supports these in Google mode. Added a note about this in fs-backend.c and changed the prefs label to read "UDP Port"
Marcus Lundblad <malu@pidgin.im>
parents:
30722
diff
changeset
|
2268 | |
|
31831
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31677
diff
changeset
|
2269 | pidgin_prefs_labeled_spin_button(hbox, _("T_CP Port:"), |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31677
diff
changeset
|
2270 | "/purple/network/turn_port_tcp", 0, 65535, NULL); |
|
c3778a69ecee
Add support for using TCP relaying with TURN
Marcus Lundblad <malu@pidgin.im>
parents:
31677
diff
changeset
|
2271 | |
|
28799
2ed8df75a7de
Fix the accelerators on the Network tab. Have I mentioned recently that I hate
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28798
diff
changeset
|
2272 | hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"), |
|
26261
ffabb135a4b6
Added support to generate relayed candidates (TURN).
Marcus Lundblad <malu@pidgin.im>
parents:
26256
diff
changeset
|
2273 | "/purple/network/turn_username", sg); |
|
28799
2ed8df75a7de
Fix the accelerators on the Network tab. Have I mentioned recently that I hate
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28798
diff
changeset
|
2274 | pidgin_prefs_labeled_password(hbox, _("Pass_word:"), |
|
26336
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2275 | "/purple/network/turn_password", NULL); |
|
46202497d8c3
Fix up the network preference window.
Michael Ruprecht <maiku@pidgin.im>
parents:
26319
diff
changeset
|
2276 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2277 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2278 | g_object_unref(sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2279 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2280 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2281 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2282 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2283 | #ifndef _WIN32 |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2284 | static gboolean |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2285 | manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2286 | { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2287 | const char *program = gtk_entry_get_text(GTK_ENTRY(entry)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2288 | |
|
30812
77e8d4906cfe
I thought I had done this in my last commit. Clearly I'm an idiot. This fixes
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30810
diff
changeset
|
2289 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", program); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2290 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2291 | /* carry on normally */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2292 | return FALSE; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2293 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2294 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2295 | static GList * |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2296 | get_available_browsers(void) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2297 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2298 | struct browser { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2299 | char *name; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2300 | char *command; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2301 | }; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2302 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2303 | /* Sorted reverse alphabetically */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2304 | static const struct browser possible_browsers[] = { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2305 | {N_("Seamonkey"), "seamonkey"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2306 | {N_("Opera"), "opera"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2307 | {N_("Mozilla"), "mozilla"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2308 | {N_("Konqueror"), "kfmclient"}, |
|
30798
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2309 | {N_("Google Chrome"), "google-chrome"}, |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2310 | /* Do not move the line below. Code below expects gnome-open to be in |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2311 | * this list immediately after xdg-open! */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2312 | {N_("Desktop Default"), "xdg-open"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2313 | {N_("GNOME Default"), "gnome-open"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2314 | {N_("Galeon"), "galeon"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2315 | {N_("Firefox"), "firefox"}, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2316 | {N_("Firebird"), "mozilla-firebird"}, |
|
30798
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2317 | {N_("Epiphany"), "epiphany"}, |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2318 | /* Translators: please do not translate "chromium-browser" here! */ |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2319 | {N_("Chromium (chromium-browser)"), "chromium-browser"}, |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2320 | /* Translators: please do not translate "chrome" here! */ |
|
2f8ba31e529c
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30743
diff
changeset
|
2321 | {N_("Chromium (chrome)"), "chrome"} |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2322 | }; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2323 | static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2324 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2325 | GList *browsers = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2326 | int i = 0; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2327 | char *browser_setting = (char *)purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2328 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2329 | browsers = g_list_prepend(browsers, (gpointer)"custom"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2330 | browsers = g_list_prepend(browsers, (gpointer)_("Manual")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2331 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2332 | for (i = 0; i < num_possible_browsers; i++) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2333 | if (purple_program_is_valid(possible_browsers[i].command)) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2334 | browsers = g_list_prepend(browsers, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2335 | possible_browsers[i].command); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2336 | browsers = g_list_prepend(browsers, (gpointer)_(possible_browsers[i].name)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2337 | if(browser_setting && !strcmp(possible_browsers[i].command, browser_setting)) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2338 | browser_setting = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2339 | /* If xdg-open is valid, prefer it over gnome-open and skip forward */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2340 | if(!strcmp(possible_browsers[i].command, "xdg-open")) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2341 | if (browser_setting && !strcmp("gnome-open", browser_setting)) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2342 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", possible_browsers[i].command); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2343 | browser_setting = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2344 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2345 | i++; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2346 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2347 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2348 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2349 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2350 | if(browser_setting) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2351 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "custom"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2352 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2353 | return browsers; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2354 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2355 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2356 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2357 | browser_changed1_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2358 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2359 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2360 | GtkWidget *hbox = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2361 | const char *browser = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2362 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2363 | gtk_widget_set_sensitive(hbox, strcmp(browser, "custom")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2364 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2365 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2366 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2367 | browser_changed2_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2368 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2369 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2370 | GtkWidget *hbox = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2371 | const char *browser = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2372 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2373 | gtk_widget_set_sensitive(hbox, !strcmp(browser, "custom")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2374 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2375 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2376 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2377 | browser_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2378 | { |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2379 | GtkWidget *ret, *vbox, *hbox, *label, *entry, *browser_button; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2380 | GtkSizeGroup *sg; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2381 | GList *browsers = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2382 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2383 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2384 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2385 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2386 | vbox = pidgin_make_frame (ret, _("Browser Selection")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2387 | |
|
32882
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2388 | if (purple_running_gnome()) { |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2389 | gchar *path; |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2390 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2391 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2392 | label = gtk_label_new(_("Browser preferences are configured in GNOME preferences")); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2393 | gtk_container_add(GTK_CONTAINER(vbox), hbox); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2394 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2395 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2396 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2397 | gtk_container_add(GTK_CONTAINER(vbox), hbox); |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2398 | |
|
32882
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2399 | path = g_find_program_in_path("gnome-control-center"); |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2400 | if (path != NULL) { |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2401 | gchar *tmp = g_strdup_printf("%s info", path); |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2402 | g_free(path); |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2403 | path = tmp; |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2404 | } else { |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2405 | path = g_find_program_in_path("gnome-default-applications-properties"); |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2406 | } |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2407 | |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2408 | if (path == NULL) { |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2409 | label = gtk_label_new(NULL); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2410 | gtk_label_set_markup(GTK_LABEL(label), |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2411 | _("<b>Browser configuration program was not found.</b>")); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2412 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2413 | } else { |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2414 | browser_button = gtk_button_new_with_mnemonic(_("Configure _Browser")); |
|
32882
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2415 | g_signal_connect_data(G_OBJECT(browser_button), "clicked", |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2416 | G_CALLBACK(browser_button_clicked_cb), path, |
|
704b8acc8893
Fix the Browser prefs on GNOME3. Unfortunately, there doesn't seem
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32859
diff
changeset
|
2417 | (GClosureNotify)g_free, 0); |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2418 | gtk_box_pack_start(GTK_BOX(hbox), browser_button, FALSE, FALSE, 0); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2419 | } |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2420 | |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2421 | gtk_widget_show_all(ret); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2422 | } else { |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2423 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
2424 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2425 | browsers = get_available_browsers(); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2426 | if (browsers != NULL) { |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2427 | label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), PURPLE_PREF_STRING, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2428 | PIDGIN_PREFS_ROOT "/browsers/browser", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2429 | browsers); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2430 | g_list_free(browsers); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2431 | gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2432 | gtk_size_group_add_widget(sg, label); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
2433 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2434 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2435 | label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2436 | PIDGIN_PREFS_ROOT "/browsers/place", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2437 | _("Browser default"), PIDGIN_BROWSER_DEFAULT, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2438 | _("New window"), PIDGIN_BROWSER_NEW_WINDOW, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2439 | _("New tab"), PIDGIN_BROWSER_NEW_TAB, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2440 | NULL); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2441 | gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2442 | gtk_size_group_add_widget(sg, label); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2443 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
2444 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2445 | if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2446 | gtk_widget_set_sensitive(hbox, FALSE); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2447 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2448 | browser_changed1_cb, hbox); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2449 | } |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2450 | |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2451 | entry = gtk_entry_new(); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2452 | gtk_entry_set_text(GTK_ENTRY(entry), |
|
30812
77e8d4906cfe
I thought I had done this in my last commit. Clearly I'm an idiot. This fixes
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30810
diff
changeset
|
2453 | purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/manual_command")); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2454 | g_signal_connect(G_OBJECT(entry), "focus-out-event", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2455 | G_CALLBACK(manual_browser_set), NULL); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2456 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2457 | if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2458 | gtk_widget_set_sensitive(hbox, FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2459 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser", |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2460 | browser_changed2_cb, hbox); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
30817
diff
changeset
|
2461 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2462 | gtk_widget_show_all(ret); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2463 | g_object_unref(sg); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2464 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2465 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2466 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2467 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2468 | #endif /*_WIN32*/ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2469 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2470 | static GtkWidget * |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2471 | proxy_page(void) |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2472 | { |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2473 | GtkWidget *ret = NULL, *vbox = NULL, *hbox = NULL; |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2474 | GtkWidget *table = NULL, *entry = NULL, *label = NULL, *proxy_button = NULL; |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2475 | GtkWidget *prefs_proxy_frame = NULL; |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2476 | PurpleProxyInfo *proxy_info; |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2477 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2478 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
28853
7f8852f3da5e
I forgot to set the border on the proxy tab. This looks much better now.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28852
diff
changeset
|
2479 | gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2480 | vbox = pidgin_make_frame(ret, _("Proxy Server")); |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2481 | prefs_proxy_frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2482 | |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2483 | if(purple_running_gnome()) { |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2484 | gchar *path = NULL; |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2485 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2486 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2487 | label = gtk_label_new(_("Proxy preferences are configured in GNOME preferences")); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2488 | gtk_container_add(GTK_CONTAINER(vbox), hbox); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2489 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2490 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2491 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2492 | gtk_container_add(GTK_CONTAINER(vbox), hbox); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2493 | |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2494 | path = g_find_program_in_path("gnome-network-properties"); |
|
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2495 | if (path == NULL) |
|
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2496 | path = g_find_program_in_path("gnome-network-preferences"); |
|
32079
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2497 | if (path == NULL) { |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2498 | path = g_find_program_in_path("gnome-control-center"); |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2499 | if (path != NULL) { |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2500 | char *tmp = g_strdup_printf("%s network", path); |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2501 | g_free(path); |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2502 | path = tmp; |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2503 | } |
|
6917cde256ec
*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic@pidgin.im):
Mark Doliner <markdoliner@pidgin.im>
parents:
31941
diff
changeset
|
2504 | } |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2505 | |
|
28904
3ce0b4fb25e9
Don't leak path.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28903
diff
changeset
|
2506 | if (path == NULL) { |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2507 | label = gtk_label_new(NULL); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2508 | gtk_label_set_markup(GTK_LABEL(label), |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2509 | _("<b>Proxy configuration program was not found.</b>")); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2510 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2511 | } else { |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2512 | proxy_button = gtk_button_new_with_mnemonic(_("Configure _Proxy")); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2513 | g_signal_connect(G_OBJECT(proxy_button), "clicked", |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2514 | G_CALLBACK(proxy_button_clicked_cb), |
|
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2515 | path); |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2516 | gtk_box_pack_start(GTK_BOX(hbox), proxy_button, FALSE, FALSE, 0); |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2517 | } |
|
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2518 | |
|
28905
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2519 | /* NOTE: path leaks, but only when the prefs window is destroyed, |
|
618681644b97
In GNOME 2.26, the program gnome-network-preferences was renamed to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
28904
diff
changeset
|
2520 | which is never */ |
|
28894
ce2f7d76f26d
Show the Configure Proxy and Configure Browser buttons if the relevant GNOME
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28893
diff
changeset
|
2521 | gtk_widget_show_all(ret); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2522 | } else { |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2523 | GtkWidget *prefs_proxy_subframe = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2524 | |
|
28891
6502040769d4
Silence some assertions QuLogic noticed.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28890
diff
changeset
|
2525 | /* This is a global option that affects SOCKS4 usage even with |
|
6502040769d4
Silence some assertions QuLogic noticed.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28890
diff
changeset
|
2526 | * account-specific proxy settings */ |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2527 | pidgin_prefs_checkbox(_("Use remote _DNS with SOCKS4 proxies"), |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2528 | "/purple/proxy/socks4_remotedns", prefs_proxy_frame); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2529 | gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2530 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2531 | pidgin_prefs_dropdown(prefs_proxy_frame, _("Proxy t_ype:"), PURPLE_PREF_STRING, |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2532 | "/purple/proxy/type", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2533 | _("No proxy"), "none", |
|
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:
31321
diff
changeset
|
2534 | _("SOCKS 4"), "socks4", |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31321
diff
changeset
|
2535 | _("SOCKS 5"), "socks5", |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31321
diff
changeset
|
2536 | _("Tor/Privacy (SOCKS5)"), "tor", |
|
042eaab1468c
Add a new proxy type of "Tor". This is really just a SOCKS5 proxy, but can be
Daniel Atallah <datallah@pidgin.im>
parents:
31321
diff
changeset
|
2537 | _("HTTP"), "http", |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2538 | _("Use Environmental Settings"), "envvar", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2539 | NULL); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2540 | gtk_box_pack_start(GTK_BOX(prefs_proxy_frame), prefs_proxy_subframe, 0, 0, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2541 | proxy_info = purple_global_proxy_get_info(); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2542 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2543 | gtk_widget_show_all(ret); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2544 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2545 | purple_prefs_connect_callback(prefs, "/purple/proxy/type", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2546 | proxy_changed_cb, prefs_proxy_subframe); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2547 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2548 | table = gtk_table_new(4, 2, FALSE); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2549 | gtk_container_set_border_width(GTK_CONTAINER(table), 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2550 | gtk_table_set_col_spacings(GTK_TABLE(table), 5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2551 | gtk_table_set_row_spacings(GTK_TABLE(table), 10); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2552 | gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), table); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2553 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2554 | label = gtk_label_new_with_mnemonic(_("_Host:")); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2555 | gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2556 | gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2557 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2558 | entry = gtk_entry_new(); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2559 | gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2560 | gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2561 | g_signal_connect(G_OBJECT(entry), "changed", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2562 | G_CALLBACK(proxy_print_option), (void *)PROXYHOST); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2563 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2564 | if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info)) |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2565 | gtk_entry_set_text(GTK_ENTRY(entry), |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2566 | purple_proxy_info_get_host(proxy_info)); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2567 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2568 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); |
|
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2569 | gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2570 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2571 | pidgin_set_accessible_label (entry, label); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2572 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2573 | label = gtk_label_new_with_mnemonic(_("P_ort:")); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2574 | gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2575 | gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2576 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2577 | entry = gtk_spin_button_new_with_range(0, 65535, 1); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2578 | gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2579 | gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2580 | g_signal_connect(G_OBJECT(entry), "changed", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2581 | G_CALLBACK(proxy_print_option), (void *)PROXYPORT); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2582 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2583 | if (proxy_info != NULL && purple_proxy_info_get_port(proxy_info) != 0) { |
|
28921
5a2ae43afd41
This appears to be the correct way to set the spin button value.
Daniel Atallah <datallah@pidgin.im>
parents:
28920
diff
changeset
|
2584 | gtk_spin_button_set_value(GTK_SPIN_BUTTON(entry), |
|
5a2ae43afd41
This appears to be the correct way to set the spin button value.
Daniel Atallah <datallah@pidgin.im>
parents:
28920
diff
changeset
|
2585 | purple_proxy_info_get_port(proxy_info)); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2586 | } |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2587 | pidgin_set_accessible_label (entry, label); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2588 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2589 | label = gtk_label_new_with_mnemonic(_("User_name:")); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2590 | gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2591 | gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2592 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2593 | entry = gtk_entry_new(); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2594 | gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2595 | gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2596 | g_signal_connect(G_OBJECT(entry), "changed", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2597 | G_CALLBACK(proxy_print_option), (void *)PROXYUSER); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2598 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2599 | if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL) |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2600 | gtk_entry_set_text(GTK_ENTRY(entry), |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2601 | purple_proxy_info_get_username(proxy_info)); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2602 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2603 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); |
|
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2604 | gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE); |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2605 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2606 | pidgin_set_accessible_label (entry, label); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2607 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2608 | label = gtk_label_new_with_mnemonic(_("Pa_ssword:")); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2609 | gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2610 | gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2611 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2612 | entry = gtk_entry_new(); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2613 | gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2614 | gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2615 | gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2616 | g_signal_connect(G_OBJECT(entry), "changed", |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2617 | G_CALLBACK(proxy_print_option), (void *)PROXYPASS); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2618 | |
|
28887
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2619 | if (proxy_info != NULL && purple_proxy_info_get_password(proxy_info) != NULL) |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2620 | gtk_entry_set_text(GTK_ENTRY(entry), |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2621 | purple_proxy_info_get_password(proxy_info)); |
|
0255b0a69452
Relocate the proxy and browser blurbs for GNOME users to the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28878
diff
changeset
|
2622 | pidgin_set_accessible_label (entry, label); |
|
28920
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2623 | |
|
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2624 | proxy_changed_cb("/purple/proxy/type", PURPLE_PREF_STRING, |
|
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2625 | purple_prefs_get_string("/purple/proxy/type"), |
|
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2626 | prefs_proxy_subframe); |
|
e38df78447aa
Fix the proxy configuration fields to appear as appropriate for the current proxy selection. Also reduce the scope on the proxy frame variables.
Daniel Atallah <datallah@pidgin.im>
parents:
28919
diff
changeset
|
2627 | |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2628 | } |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2629 | |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2630 | return ret; |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2631 | } |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2632 | |
|
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
2633 | static GtkWidget * |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2634 | logging_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2635 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2636 | GtkWidget *ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2637 | GtkWidget *vbox; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2638 | GList *names; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2639 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2640 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2641 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2642 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2643 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2644 | vbox = pidgin_make_frame (ret, _("Logging")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2645 | names = purple_log_logger_get_options(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2646 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2647 | pidgin_prefs_dropdown_from_list(vbox, _("Log _format:"), PURPLE_PREF_STRING, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2648 | "/purple/logging/format", names); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2649 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2650 | g_list_free(names); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2651 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2652 | pidgin_prefs_checkbox(_("Log all _instant messages"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2653 | "/purple/logging/log_ims", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2654 | pidgin_prefs_checkbox(_("Log all c_hats"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2655 | "/purple/logging/log_chats", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2656 | pidgin_prefs_checkbox(_("Log all _status changes to system log"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2657 | "/purple/logging/log_system", vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2658 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2659 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2660 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2661 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2662 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2663 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2664 | /*** keyring page *******************************************************/ |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2665 | |
|
33998
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2666 | static void |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2667 | keyring_page_settings_changed(GtkWidget *widget, gpointer _setting) |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2668 | { |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2669 | PurpleRequestField *setting = _setting; |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2670 | PurpleRequestFieldType field_type; |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2671 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2672 | gtk_widget_set_sensitive(keyring_apply, TRUE); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2673 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35106
diff
changeset
|
2674 | field_type = purple_request_field_get_field_type(setting); |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2675 | |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2676 | if (field_type == PURPLE_REQUEST_FIELD_BOOLEAN) { |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2677 | purple_request_field_bool_set_value(setting, |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2678 | gtk_toggle_button_get_active( |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2679 | GTK_TOGGLE_BUTTON(widget))); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2680 | } else if (field_type == PURPLE_REQUEST_FIELD_STRING) { |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2681 | purple_request_field_string_set_value(setting, |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2682 | gtk_entry_get_text(GTK_ENTRY(widget))); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2683 | } else if (field_type == PURPLE_REQUEST_FIELD_INTEGER) { |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2684 | purple_request_field_int_set_value(setting, |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2685 | gtk_spin_button_get_value_as_int( |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2686 | GTK_SPIN_BUTTON(widget))); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2687 | } else |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2688 | g_return_if_reached(); |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2689 | } |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2690 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2691 | static GtkWidget * |
|
34187
daf255359b96
Use GtkSizeGroup for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34186
diff
changeset
|
2692 | keyring_page_add_settings_field(GtkBox *vbox, PurpleRequestField *setting, |
|
daf255359b96
Use GtkSizeGroup for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34186
diff
changeset
|
2693 | GtkSizeGroup *sg) |
|
33998
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2694 | { |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2695 | GtkWidget *widget, *hbox; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2696 | PurpleRequestFieldType field_type; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2697 | const gchar *label; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2698 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2699 | label = purple_request_field_get_label(setting); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2700 | |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35106
diff
changeset
|
2701 | field_type = purple_request_field_get_field_type(setting); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2702 | if (field_type == PURPLE_REQUEST_FIELD_BOOLEAN) { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2703 | widget = gtk_check_button_new_with_label(label); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2704 | label = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2705 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2706 | purple_request_field_bool_get_value(setting)); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2707 | g_signal_connect(G_OBJECT(widget), "toggled", |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2708 | G_CALLBACK(keyring_page_settings_changed), setting); |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2709 | } else if (field_type == PURPLE_REQUEST_FIELD_STRING) { |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2710 | widget = gtk_entry_new(); |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2711 | gtk_entry_set_text(GTK_ENTRY(widget), |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2712 | purple_request_field_string_get_value(setting)); |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2713 | if (purple_request_field_string_is_masked(setting)) |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2714 | gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE); |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2715 | g_signal_connect(G_OBJECT(widget), "changed", |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2716 | G_CALLBACK(keyring_page_settings_changed), setting); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2717 | } else if (field_type == PURPLE_REQUEST_FIELD_INTEGER) { |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2718 | widget = gtk_spin_button_new_with_range( |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2719 | purple_request_field_int_get_lower_bound(setting), |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2720 | purple_request_field_int_get_upper_bound(setting), 1); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2721 | gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2722 | purple_request_field_int_get_value(setting)); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2723 | g_signal_connect(G_OBJECT(widget), "value-changed", |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2724 | G_CALLBACK(keyring_page_settings_changed), setting); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2725 | } else { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2726 | purple_debug_error("gtkprefs", "Unsupported field type\n"); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2727 | return NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2728 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2729 | |
|
34187
daf255359b96
Use GtkSizeGroup for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34186
diff
changeset
|
2730 | hbox = pidgin_add_widget_to_vbox(vbox, label, sg, widget, |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2731 | FALSE, NULL); |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2732 | return ((void*)hbox == (void*)vbox) ? widget : hbox; |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2733 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2734 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2735 | /* XXX: it could be available for all plugins, not keyrings only */ |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2736 | static GList * |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2737 | keyring_page_add_settings(PurpleRequestFields *settings) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2738 | { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2739 | GList *it, *groups, *added_fields; |
|
34187
daf255359b96
Use GtkSizeGroup for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34186
diff
changeset
|
2740 | GtkSizeGroup *sg; |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2741 | |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2742 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2743 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2744 | added_fields = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2745 | groups = purple_request_fields_get_groups(settings); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2746 | for (it = g_list_first(groups); it != NULL; it = g_list_next(it)) { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2747 | GList *it2, *fields; |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2748 | GtkBox *vbox; |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2749 | PurpleRequestFieldGroup *group; |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2750 | const gchar *group_title; |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2751 | |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2752 | group = it->data; |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2753 | group_title = purple_request_field_group_get_title(group); |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2754 | if (group_title) { |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2755 | vbox = GTK_BOX(pidgin_make_frame( |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2756 | GTK_WIDGET(keyring_vbox), group_title)); |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2757 | added_fields = g_list_prepend(added_fields, |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2758 | g_object_get_data(G_OBJECT(vbox), "main-vbox")); |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2759 | } else |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2760 | vbox = keyring_vbox; |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2761 | |
|
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2762 | fields = purple_request_field_group_get_fields(group); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2763 | for (it2 = g_list_first(fields); it2 != NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2764 | it2 = g_list_next(it2)) { |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2765 | GtkWidget *added = keyring_page_add_settings_field(vbox, |
|
34187
daf255359b96
Use GtkSizeGroup for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34186
diff
changeset
|
2766 | it2->data, sg); |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2767 | if (added == NULL || vbox != keyring_vbox) |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2768 | continue; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2769 | added_fields = g_list_prepend(added_fields, added); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2770 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2771 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2772 | |
|
34195
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2773 | g_object_unref(sg); |
|
31202151cde1
Initial master password implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34193
diff
changeset
|
2774 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2775 | return added_fields; |
|
33998
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2776 | } |
|
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2777 | |
|
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2778 | static void |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2779 | keyring_page_settings_apply(GtkButton *button, gpointer _unused) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2780 | { |
|
34188
0680f2c10db3
Validation for internal keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34187
diff
changeset
|
2781 | if (!purple_keyring_apply_settings(prefs, keyring_settings)) |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2782 | return; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2783 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2784 | gtk_widget_set_sensitive(keyring_apply, FALSE); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2785 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2786 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2787 | static void |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2788 | keyring_page_update_settings() |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2789 | { |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2790 | if (keyring_settings != NULL) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2791 | purple_request_fields_destroy(keyring_settings); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2792 | keyring_settings = purple_keyring_read_settings(); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2793 | if (!keyring_settings) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2794 | return; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2795 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2796 | keyring_settings_fields = keyring_page_add_settings(keyring_settings); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2797 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2798 | keyring_apply = gtk_button_new_with_mnemonic(_("_Apply")); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2799 | gtk_box_pack_start(keyring_vbox, keyring_apply, FALSE, FALSE, 1); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2800 | gtk_widget_set_sensitive(keyring_apply, FALSE); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2801 | keyring_settings_fields = g_list_prepend(keyring_settings_fields, |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2802 | keyring_apply); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2803 | g_signal_connect(G_OBJECT(keyring_apply), "clicked", |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2804 | G_CALLBACK(keyring_page_settings_apply), NULL); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2805 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2806 | gtk_widget_show_all(keyring_page_instance); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2807 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2808 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2809 | static void |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2810 | keyring_page_pref_set_inuse(GError *error, gpointer _keyring_page_instance) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2811 | { |
|
34155
567c48f9658c
Refactor the keyring API
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34151
diff
changeset
|
2812 | PurpleKeyring *in_use = purple_keyring_get_inuse(); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2813 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2814 | if (_keyring_page_instance != keyring_page_instance) { |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2815 | purple_debug_info("gtkprefs", "pref window already closed\n"); |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2816 | return; |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2817 | } |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2818 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2819 | gtk_widget_set_sensitive(GTK_WIDGET(keyring_combo), TRUE); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2820 | |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2821 | if (error != NULL) { |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2822 | pidgin_prefs_dropdown_revert_active(keyring_combo); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2823 | purple_notify_error(NULL, _("Keyring"), |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
2824 | _("Failed to set new keyring"), error->message, NULL); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2825 | return; |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2826 | } |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2827 | |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2828 | g_return_if_fail(in_use != NULL); |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2829 | purple_prefs_set_string("/purple/keyring/active", |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2830 | purple_keyring_get_id(in_use)); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2831 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2832 | keyring_page_update_settings(); |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2833 | } |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2834 | |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2835 | static void |
|
34130
ddd296858810
Simplify reverting dropdown changes
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34122
diff
changeset
|
2836 | keyring_page_pref_changed(GtkComboBox *combo_box, PidginPrefValue value) |
|
33998
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2837 | { |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2838 | const char *keyring_id; |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34023
diff
changeset
|
2839 | PurpleKeyring *keyring; |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2840 | GList *it; |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2841 | |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2842 | g_return_if_fail(combo_box != NULL); |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2843 | g_return_if_fail(value.type == PURPLE_PREF_STRING); |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2844 | |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2845 | keyring_id = value.value.string; |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2846 | keyring = purple_keyring_find_keyring_by_id(keyring_id); |
|
34120
50bc553c8c52
Handle the case of disabled KWallet system
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
2847 | if (keyring == NULL) { |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2848 | pidgin_prefs_dropdown_revert_active(keyring_combo); |
|
34120
50bc553c8c52
Handle the case of disabled KWallet system
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
2849 | purple_notify_error(NULL, _("Keyring"), |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34333
diff
changeset
|
2850 | _("Selected keyring is disabled"), NULL, NULL); |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2851 | return; |
|
34120
50bc553c8c52
Handle the case of disabled KWallet system
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
2852 | } |
|
50bc553c8c52
Handle the case of disabled KWallet system
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34111
diff
changeset
|
2853 | |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2854 | gtk_widget_set_sensitive(GTK_WIDGET(combo_box), FALSE); |
|
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2855 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2856 | for (it = keyring_settings_fields; it != NULL; it = g_list_next(it)) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2857 | { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2858 | GtkWidget *widget = it->data; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2859 | gtk_container_remove( |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2860 | GTK_CONTAINER(gtk_widget_get_parent(widget)), widget); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2861 | } |
|
34186
1d9ea89d4934
Group and string support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34185
diff
changeset
|
2862 | gtk_widget_show_all(keyring_page_instance); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2863 | g_list_free(keyring_settings_fields); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2864 | keyring_settings_fields = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2865 | if (keyring_settings) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2866 | purple_request_fields_destroy(keyring_settings); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2867 | keyring_settings = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2868 | |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2869 | purple_keyring_set_inuse(keyring, FALSE, keyring_page_pref_set_inuse, |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2870 | keyring_page_instance); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2871 | } |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2872 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2873 | static void |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2874 | keyring_page_cleanup(void) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2875 | { |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2876 | keyring_page_instance = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2877 | keyring_combo = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2878 | keyring_vbox = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2879 | g_list_free(keyring_settings_fields); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2880 | keyring_settings_fields = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2881 | if (keyring_settings) |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2882 | purple_request_fields_destroy(keyring_settings); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2883 | keyring_settings = NULL; |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2884 | keyring_apply = NULL; |
|
33998
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2885 | } |
|
5fcfc69be362
Added support for master password in pidgin's pref interface.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
33987
diff
changeset
|
2886 | |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2887 | static GtkWidget * |
|
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2888 | keyring_page(void) |
|
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2889 | { |
|
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2890 | GList *names; |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2891 | PidginPrefValue initial; |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2892 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2893 | g_return_val_if_fail(keyring_page_instance == NULL, |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2894 | keyring_page_instance); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2895 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
2896 | keyring_page_instance = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2897 | gtk_container_set_border_width(GTK_CONTAINER(keyring_page_instance), |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2898 | PIDGIN_HIG_BORDER); |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2899 | |
|
34131
e56d3dd7b0e4
Track migrating passwords in prefs window
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34130
diff
changeset
|
2900 | /* Keyring selection */ |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2901 | keyring_vbox = GTK_BOX(pidgin_make_frame(keyring_page_instance, |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2902 | _("Keyring"))); |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2903 | names = purple_keyring_get_options(); |
|
34122
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2904 | initial.type = PURPLE_PREF_STRING; |
|
2eeece506582
Don't let activate disabled keyring, pidgin_prefs_dropdown_revert_active implementation
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34121
diff
changeset
|
2905 | initial.value.string = purple_prefs_get_string("/purple/keyring/active"); |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2906 | pidgin_prefs_dropdown_from_list_with_cb(GTK_WIDGET(keyring_vbox), |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2907 | _("Keyring:"), &keyring_combo, names, initial, |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2908 | keyring_page_pref_changed); |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2909 | g_list_free(names); |
|
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2910 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2911 | keyring_page_update_settings(); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2912 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2913 | gtk_widget_show_all(keyring_page_instance); |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2914 | |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2915 | return keyring_page_instance; |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2916 | } |
|
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
2917 | |
|
34185
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2918 | /*** keyring page - end *************************************************/ |
|
cb2fe6b04447
Initial support for keyring settings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34181
diff
changeset
|
2919 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2920 | static gint |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
2921 | sound_cmd_yeah(GtkEntry *entry, gpointer d) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2922 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2923 | purple_prefs_set_path(PIDGIN_PREFS_ROOT "/sound/command", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2924 | gtk_entry_get_text(GTK_ENTRY(entry))); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2925 | return TRUE; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2926 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2927 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2928 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2929 | sound_changed1_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2930 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2931 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2932 | GtkWidget *hbox = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2933 | const char *method = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2934 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2935 | gtk_widget_set_sensitive(hbox, !strcmp(method, "custom")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2936 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2937 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2938 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2939 | sound_changed2_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2940 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2941 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2942 | GtkWidget *vbox = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2943 | const char *method = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2944 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2945 | gtk_widget_set_sensitive(vbox, strcmp(method, "none")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2946 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2947 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2948 | #ifdef USE_GSTREAMER |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2949 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2950 | sound_changed3_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2951 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2952 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2953 | GtkWidget *hbox = data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2954 | const char *method = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2955 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2956 | gtk_widget_set_sensitive(hbox, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2957 | !strcmp(method, "automatic") || |
|
30478
3d5cc717781c
Allow setting sound volume when ALSA is used
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
29739
diff
changeset
|
2958 | !strcmp(method, "alsa") || |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
2959 | !strcmp(method, "esd") || |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
2960 | !strcmp(method, "waveform") || |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
2961 | !strcmp(method, "directsound")); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2962 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2963 | #endif /* USE_GSTREAMER */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2964 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2965 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2966 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2967 | event_toggled(GtkCellRendererToggle *cell, gchar *pth, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2968 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2969 | GtkTreeModel *model = (GtkTreeModel *)data; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2970 | GtkTreeIter iter; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2971 | GtkTreePath *path = gtk_tree_path_new_from_string(pth); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2972 | char *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2973 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2974 | gtk_tree_model_get_iter (model, &iter, path); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2975 | gtk_tree_model_get (model, &iter, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2976 | 2, &pref, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2977 | -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2978 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2979 | purple_prefs_set_bool(pref, !gtk_cell_renderer_toggle_get_active(cell)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2980 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2981 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2982 | gtk_list_store_set(GTK_LIST_STORE (model), &iter, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2983 | 0, !gtk_cell_renderer_toggle_get_active(cell), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2984 | -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2985 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2986 | gtk_tree_path_free(path); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2987 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2988 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2989 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2990 | test_sound(GtkWidget *button, gpointer i_am_NULL) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2991 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2992 | char *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2993 | gboolean temp_enabled; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2994 | gboolean temp_mute; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2995 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2996 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2997 | pidgin_sound_get_event_option(sound_row_sel)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2998 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
2999 | temp_enabled = purple_prefs_get_bool(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3000 | temp_mute = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3001 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3002 | if (!temp_enabled) purple_prefs_set_bool(pref, TRUE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3003 | if (temp_mute) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3004 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3005 | purple_sound_play_event(sound_row_sel, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3006 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3007 | if (!temp_enabled) purple_prefs_set_bool(pref, FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3008 | if (temp_mute) purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", TRUE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3009 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3010 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3011 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3012 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3013 | /* |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3014 | * Resets a sound file back to default. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3015 | */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3016 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3017 | reset_sound(GtkWidget *button, gpointer i_am_also_NULL) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3018 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3019 | gchar *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3020 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3021 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3022 | pidgin_sound_get_event_option(sound_row_sel)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3023 | purple_prefs_set_path(pref, ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3024 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3025 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3026 | gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)")); |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
3027 | |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
3028 | pref_sound_generate_markup(); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3029 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3030 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3031 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3032 | sound_chosen_cb(void *user_data, const char *filename) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3033 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3034 | gchar *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3035 | int sound; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3036 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3037 | sound = GPOINTER_TO_INT(user_data); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3038 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3039 | /* Set it -- and forget it */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3040 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3041 | pidgin_sound_get_event_option(sound)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3042 | purple_prefs_set_path(pref, filename); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3043 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3044 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3045 | /* |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3046 | * If the sound we just changed is still the currently selected |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3047 | * sound, then update the box showing the file name. |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3048 | */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3049 | if (sound == sound_row_sel) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3050 | gtk_entry_set_text(GTK_ENTRY(sound_entry), filename); |
|
23652
3204ee69eab2
Fixes the display problems with (option 1) sound themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23649
diff
changeset
|
3051 | |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25887
diff
changeset
|
3052 | pref_sound_generate_markup(); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3053 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3054 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3055 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3056 | select_sound(GtkWidget *button, gpointer being_NULL_is_fun) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3057 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3058 | gchar *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3059 | const char *filename; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3060 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3061 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3062 | pidgin_sound_get_event_option(sound_row_sel)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3063 | filename = purple_prefs_get_path(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3064 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3065 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3066 | if (*filename == '\0') |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3067 | filename = NULL; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3068 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3069 | purple_request_file(prefs, _("Sound Selection"), filename, FALSE, |
|
34333
b92698241603
Request API refactoring: switch purple_request_file to PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34308
diff
changeset
|
3070 | G_CALLBACK(sound_chosen_cb), NULL, NULL, |
|
b92698241603
Request API refactoring: switch purple_request_file to PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34308
diff
changeset
|
3071 | GINT_TO_POINTER(sound_row_sel)); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3072 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3073 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3074 | #ifdef USE_GSTREAMER |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3075 | static gchar * |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3076 | prefs_sound_volume_format(GtkScale *scale, gdouble val) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3077 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3078 | if(val < 15) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3079 | return g_strdup_printf(_("Quietest")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3080 | } else if(val < 30) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3081 | return g_strdup_printf(_("Quieter")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3082 | } else if(val < 45) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3083 | return g_strdup_printf(_("Quiet")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3084 | } else if(val < 55) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3085 | return g_strdup_printf(_("Normal")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3086 | } else if(val < 70) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3087 | return g_strdup_printf(_("Loud")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3088 | } else if(val < 85) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3089 | return g_strdup_printf(_("Louder")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3090 | } else { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3091 | return g_strdup_printf(_("Loudest")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3092 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3093 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3094 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3095 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3096 | prefs_sound_volume_changed(GtkRange *range) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3097 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3098 | int val = (int)gtk_range_get_value(GTK_RANGE(range)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3099 | purple_prefs_set_int(PIDGIN_PREFS_ROOT "/sound/volume", val); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3100 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3101 | #endif |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3102 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3103 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3104 | prefs_sound_sel(GtkTreeSelection *sel, GtkTreeModel *model) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
3105 | { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3106 | GtkTreeIter iter; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3107 | GValue val; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3108 | const char *file; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3109 | char *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3110 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3111 | if (! gtk_tree_selection_get_selected (sel, &model, &iter)) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3112 | return; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3113 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3114 | val.g_type = 0; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3115 | gtk_tree_model_get_value (model, &iter, 3, &val); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3116 | sound_row_sel = g_value_get_uint(&val); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3117 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3118 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3119 | pidgin_sound_get_event_option(sound_row_sel)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3120 | file = purple_prefs_get_path(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3121 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3122 | if (sound_entry) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3123 | gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3124 | g_value_unset (&val); |
|
23649
5da5fe967d10
Working sound themes (option 1) theme is saved in prefs and there is no seperate custom theme, everything
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23648
diff
changeset
|
3125 | |
|
23664
cf938922baa5
Changed how the prefs handle themes
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23661
diff
changeset
|
3126 | pref_sound_generate_markup(); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3127 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3128 | |
|
24267
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3129 | |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3130 | static void |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3131 | mute_changed_cb(const char *pref_name, |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3132 | PurplePrefType pref_type, |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3133 | gconstpointer val, |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3134 | gpointer data) |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3135 | { |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3136 | GtkToggleButton *button = data; |
| 24533 | 3137 | gboolean muted = GPOINTER_TO_INT(val); |
|
24267
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3138 | |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3139 | g_return_if_fail(!strcmp (pref_name, PIDGIN_PREFS_ROOT "/sound/mute")); |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3140 | |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3141 | /* Block the handler that re-sets the preference. */ |
| 24533 | 3142 | g_signal_handlers_block_matched(button, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (gpointer)pref_name); |
|
24267
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3143 | gtk_toggle_button_set_active (button, muted); |
| 24533 | 3144 | g_signal_handlers_unblock_matched(button, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (gpointer)pref_name); |
|
24267
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3145 | } |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3146 | |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3147 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3148 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3149 | sound_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3150 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3151 | GtkWidget *ret; |
|
33896
fb896f14715b
win32: fix most of easy warnings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33892
diff
changeset
|
3152 | GtkWidget *vbox, *vbox2, *button, *parent, *parent_parent, *parent_parent_parent; |
|
fb896f14715b
win32: fix most of easy warnings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33892
diff
changeset
|
3153 | #ifdef USE_GSTREAMER |
|
fb896f14715b
win32: fix most of easy warnings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33892
diff
changeset
|
3154 | GtkWidget *sw; |
|
fb896f14715b
win32: fix most of easy warnings
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33892
diff
changeset
|
3155 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3156 | GtkSizeGroup *sg; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3157 | GtkTreeIter iter; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3158 | GtkWidget *event_view; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3159 | GtkListStore *event_store; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3160 | GtkCellRenderer *rend; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3161 | GtkTreeViewColumn *col; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3162 | GtkTreeSelection *sel; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3163 | GtkTreePath *path; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3164 | GtkWidget *hbox; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3165 | int j; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3166 | const char *file; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3167 | char *pref; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3168 | GtkWidget *dd; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3169 | GtkWidget *entry; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3170 | const char *cmd; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3171 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3172 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3173 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3174 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3175 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3176 | |
|
28877
1ec9f377bd78
Collapse "Sound Method" and "Sound Options" sections on the Sounds tab into one
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28876
diff
changeset
|
3177 | vbox2 = pidgin_make_frame(ret, _("Sound Options")); |
|
1ec9f377bd78
Collapse "Sound Method" and "Sound Options" sections on the Sounds tab into one
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28876
diff
changeset
|
3178 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3179 | vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_BOX_SPACE); |
|
28919
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
3180 | gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0); |
|
efd38b9bc1b1
Fix some stuff in the prefs dialog on Win32
Daniel Atallah <datallah@pidgin.im>
parents:
28916
diff
changeset
|
3181 | |
|
28877
1ec9f377bd78
Collapse "Sound Method" and "Sound Options" sections on the Sounds tab into one
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28876
diff
changeset
|
3182 | dd = pidgin_prefs_dropdown(vbox2, _("_Method:"), PURPLE_PREF_STRING, |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3183 | PIDGIN_PREFS_ROOT "/sound/method", |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3184 | _("Automatic"), "automatic", |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3185 | #ifdef USE_GSTREAMER |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3186 | #ifdef _WIN32 |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3187 | /* "WaveForm", "waveform", */ |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3188 | "DirectSound", "directsound", |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3189 | #else |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3190 | "ESD", "esd", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3191 | "ALSA", "alsa", |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3192 | #endif /* _WIN32 */ |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3193 | #endif /* USE_GSTREAMER */ |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3194 | #ifdef _WIN32 |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3195 | "PlaySound", "playsoundw", |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3196 | #else |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3197 | _("Console beep"), "beep", |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3198 | _("Command"), "custom", |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3199 | #endif /* _WIN32 */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3200 | _("No sounds"), "none", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3201 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3202 | gtk_size_group_add_widget(sg, dd); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3203 | gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3204 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3205 | entry = gtk_entry_new(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3206 | gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3207 | cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3208 | if(cmd) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3209 | gtk_entry_set_text(GTK_ENTRY(entry), cmd); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3210 | g_signal_connect(G_OBJECT(entry), "changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3211 | G_CALLBACK(sound_cmd_yeah), NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3212 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3213 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Sound c_ommand:\n(%s for filename)"), sg, entry, TRUE, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3214 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3215 | sound_changed1_cb, hbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3216 | gtk_widget_set_sensitive(hbox, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3217 | !strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3218 | "custom")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3219 | |
|
24267
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3220 | button = pidgin_prefs_checkbox(_("M_ute sounds"), PIDGIN_PREFS_ROOT "/sound/mute", vbox); |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3221 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/mute", mute_changed_cb, button); |
|
a0719843109d
Add a "Mute sounds" tickybox in Prefs, mirroring Tools/Mute Sounds.
Will Thompson <resiak@pidgin.im>
parents:
23261
diff
changeset
|
3222 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3223 | pidgin_prefs_checkbox(_("Sounds when conversation has _focus"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3224 | PIDGIN_PREFS_ROOT "/sound/conv_focus", vbox); |
|
24268
e725d9fa4cf4
Prefs/Sounds: add some mnemonics
Will Thompson <resiak@pidgin.im>
parents:
24267
diff
changeset
|
3225 | pidgin_prefs_dropdown(vbox, _("_Enable sounds:"), |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3226 | PURPLE_PREF_INT, "/purple/sound/while_status", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3227 | _("Only when available"), 1, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3228 | _("Only when not available"), 2, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3229 | _("Always"), 3, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3230 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3231 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3232 | #ifdef USE_GSTREAMER |
|
35532
2c802bb77720
Fix most of warnings for gtk 3.4
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
3233 | sw = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, |
|
2c802bb77720
Fix most of warnings for gtk 3.4
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
3234 | 0.0, 100.0, 5.0); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3235 | gtk_range_set_increments(GTK_RANGE(sw), 5.0, 25.0); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3236 | gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3237 | g_signal_connect (G_OBJECT (sw), "format-value", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3238 | G_CALLBACK (prefs_sound_volume_format), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3239 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3240 | g_signal_connect (G_OBJECT (sw), "value-changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3241 | G_CALLBACK (prefs_sound_volume_changed), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3242 | NULL); |
|
24268
e725d9fa4cf4
Prefs/Sounds: add some mnemonics
Will Thompson <resiak@pidgin.im>
parents:
24267
diff
changeset
|
3243 | hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("V_olume:"), NULL, sw, TRUE, NULL); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3244 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3245 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3246 | sound_changed3_cb, hbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3247 | sound_changed3_cb(PIDGIN_PREFS_ROOT "/sound/method", PURPLE_PREF_STRING, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3248 | purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), hbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3249 | #endif |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3250 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3251 | gtk_widget_set_sensitive(vbox, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3252 | strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3253 | purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3254 | sound_changed2_cb, vbox); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3255 | vbox = pidgin_make_frame(ret, _("Sound Events")); |
|
33170
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
3256 | |
|
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
3257 | /* The following is an ugly hack to make the frame expand so the |
|
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
3258 | * sound events list is big enough to be usable */ |
|
32422
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
3259 | parent = gtk_widget_get_parent(vbox); |
|
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
3260 | parent_parent = gtk_widget_get_parent(parent); |
|
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
3261 | parent_parent_parent = gtk_widget_get_parent(parent_parent); |
|
32394
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
3262 | gtk_box_set_child_packing(GTK_BOX(parent), vbox, TRUE, TRUE, 0, |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3263 | GTK_PACK_START); |
|
32394
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
3264 | gtk_box_set_child_packing(GTK_BOX(parent_parent), |
|
32422
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
3265 | parent, TRUE, TRUE, 0, GTK_PACK_START); |
|
c215bc5d85e4
Whitespace fixes. Try and check your editor settings before writing
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32414
diff
changeset
|
3266 | gtk_box_set_child_packing(GTK_BOX(parent_parent_parent), |
|
32394
f883709bdba4
compiles using GTK+ 3 from git, beware it does not yet run, in fact it crashes...
Marcus Lundblad <malu@pidgin.im>
parents:
32391
diff
changeset
|
3267 | parent_parent, TRUE, TRUE, 0, GTK_PACK_START); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3268 | |
|
23645
6901039a86fb
Fixed purple sound loader class init function (bug on startup) and added shell sound theme selector
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23261
diff
changeset
|
3269 | /* SOUND SELECTION */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3270 | event_store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3271 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3272 | for (j=0; j < PURPLE_NUM_SOUNDS; j++) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3273 | char *pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3274 | pidgin_sound_get_event_option(j)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3275 | const char *label = pidgin_sound_get_event_label(j); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3276 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3277 | if (label == NULL) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3278 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3279 | continue; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3280 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3281 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3282 | gtk_list_store_append (event_store, &iter); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3283 | gtk_list_store_set(event_store, &iter, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3284 | 0, purple_prefs_get_bool(pref), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3285 | 1, _(label), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3286 | 2, pref, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3287 | 3, j, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3288 | -1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3289 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3290 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3291 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3292 | event_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(event_store)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3293 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3294 | rend = gtk_cell_renderer_toggle_new(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3295 | sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (event_view)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3296 | g_signal_connect (G_OBJECT (sel), "changed", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3297 | G_CALLBACK (prefs_sound_sel), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3298 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3299 | g_signal_connect (G_OBJECT(rend), "toggled", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3300 | G_CALLBACK(event_toggled), event_store); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3301 | path = gtk_tree_path_new_first(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3302 | gtk_tree_selection_select_path(sel, path); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3303 | gtk_tree_path_free(path); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3304 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3305 | col = gtk_tree_view_column_new_with_attributes (_("Play"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3306 | rend, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3307 | "active", 0, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3308 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3309 | gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3310 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3311 | rend = gtk_cell_renderer_text_new(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3312 | col = gtk_tree_view_column_new_with_attributes (_("Event"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3313 | rend, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3314 | "text", 1, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3315 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3316 | gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3317 | g_object_unref(G_OBJECT(event_store)); |
|
31321
1fef3832cfa2
Add pidgin_make_scrollable and use it. Cleans up a bunch of duplicate code. Net code loss of 180 lines. Fixes #13073.
Gabriel Schulhof <nix@go-nix.ca>
parents:
31294
diff
changeset
|
3318 | gtk_box_pack_start(GTK_BOX(vbox), |
|
1fef3832cfa2
Add pidgin_make_scrollable and use it. Cleans up a bunch of duplicate code. Net code loss of 180 lines. Fixes #13073.
Gabriel Schulhof <nix@go-nix.ca>
parents:
31294
diff
changeset
|
3319 | pidgin_make_scrollable(event_view, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, 100), |
|
1fef3832cfa2
Add pidgin_make_scrollable and use it. Cleans up a bunch of duplicate code. Net code loss of 180 lines. Fixes #13073.
Gabriel Schulhof <nix@go-nix.ca>
parents:
31294
diff
changeset
|
3320 | TRUE, TRUE, 0); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3321 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3322 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3323 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3324 | sound_entry = gtk_entry_new(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3325 | pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3326 | pidgin_sound_get_event_option(0)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3327 | file = purple_prefs_get_path(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3328 | g_free(pref); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3329 | gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3330 | gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3331 | gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3332 | |
|
23261
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3333 | button = gtk_button_new_with_mnemonic(_("_Browse...")); |
|
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3334 | g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(select_sound), NULL); |
|
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3335 | gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); |
|
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3336 | |
|
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3337 | button = gtk_button_new_with_mnemonic(_("Pre_view")); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3338 | g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(test_sound), NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3339 | gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3340 | |
|
23261
dd500ffc2cbc
Rename and re-order the preference sound buttons to be "Browse...",
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23151
diff
changeset
|
3341 | button = gtk_button_new_with_mnemonic(_("_Reset")); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3342 | g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(reset_sound), NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3343 | gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3344 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3345 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3346 | g_object_unref(sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3347 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3348 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3349 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3350 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3351 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3352 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3353 | set_idle_away(PurpleSavedStatus *status) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3354 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3355 | purple_prefs_set_int("/purple/savedstatus/idleaway", purple_savedstatus_get_creation_time(status)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3356 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3357 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3358 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3359 | set_startupstatus(PurpleSavedStatus *status) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3360 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3361 | purple_prefs_set_int("/purple/savedstatus/startup", purple_savedstatus_get_creation_time(status)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3362 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3363 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3364 | static GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3365 | away_page(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3366 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3367 | GtkWidget *ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3368 | GtkWidget *vbox; |
|
28890
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3369 | GtkWidget *hbox; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3370 | GtkWidget *dd; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3371 | GtkWidget *label; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3372 | GtkWidget *button; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3373 | GtkWidget *menu; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3374 | GtkSizeGroup *sg; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3375 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3376 | ret = gtk_box_new(GTK_ORIENTATION_VERTICAL, PIDGIN_HIG_CAT_SPACE); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3377 | gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3378 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3379 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3380 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3381 | /* Idle stuff */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3382 | vbox = pidgin_make_frame(ret, _("Idle")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3383 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3384 | dd = pidgin_prefs_dropdown(vbox, _("_Report idle time:"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3385 | PURPLE_PREF_STRING, "/purple/away/idle_reporting", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3386 | _("Never"), "none", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3387 | _("From last sent message"), "purple", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3388 | #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3389 | _("Based on keyboard or mouse use"), "system", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3390 | #endif |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3391 | NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3392 | gtk_size_group_add_widget(sg, dd); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3393 | gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3394 | |
|
33892
ef97228bc5f0
Fix most of warnings for gtk2 and linux
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33838
diff
changeset
|
3395 | pidgin_prefs_labeled_spin_button(vbox, |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3396 | _("_Minutes before becoming idle:"), "/purple/away/mins_before_away", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3397 | 1, 24 * 60, sg); |
|
26396
7045f27f0a72
Move 'Minutes before becoming idle' above 'Change status when idle'
Paul Aurich <darkrain42@pidgin.im>
parents:
25911
diff
changeset
|
3398 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3399 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); |
|
28890
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3400 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3401 | |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3402 | button = pidgin_prefs_checkbox(_("Change to this status when _idle:"), |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3403 | "/purple/away/away_when_idle", hbox); |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3404 | gtk_size_group_add_widget(sg, button); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3405 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3406 | /* TODO: Show something useful if we don't have any saved statuses. */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3407 | menu = pidgin_status_menu(purple_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away)); |
|
28890
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3408 | gtk_size_group_add_widget(sg, menu); |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3409 | gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0); |
|
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3410 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3411 | g_signal_connect(G_OBJECT(button), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3412 | G_CALLBACK(pidgin_toggle_sensitive), menu); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3413 | |
|
28909
efb7f7c24390
Ok, clearly I'm an idiot. I removed the right line but from the wrong block.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28908
diff
changeset
|
3414 | if(!purple_prefs_get_bool("/purple/away/away_when_idle")) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3415 | gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3416 | |
|
28876
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3417 | /* Away stuff */ |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3418 | vbox = pidgin_make_frame(ret, _("Away")); |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3419 | |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3420 | dd = pidgin_prefs_dropdown(vbox, _("_Auto-reply:"), |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3421 | PURPLE_PREF_STRING, "/purple/away/auto_reply", |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3422 | _("Never"), "never", |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3423 | _("When away"), "away", |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3424 | _("When both away and idle"), "awayidle", |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3425 | NULL); |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3426 | gtk_size_group_add_widget(sg, dd); |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3427 | gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); |
|
838570225428
Get rid of the "Auto-away" section on the status/idle tab. Move all those
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28875
diff
changeset
|
3428 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3429 | /* Signon status stuff */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3430 | vbox = pidgin_make_frame(ret, _("Status at Startup")); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3431 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3432 | button = pidgin_prefs_checkbox(_("Use status from last _exit at startup"), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3433 | "/purple/savedstatus/startup_current_status", vbox); |
|
28890
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3434 | gtk_size_group_add_widget(sg, button); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3435 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3436 | /* TODO: Show something useful if we don't have any saved statuses. */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3437 | menu = pidgin_status_menu(purple_savedstatus_get_startup(), G_CALLBACK(set_startupstatus)); |
|
28890
9b5cd2396414
Move the "Change status to" menu to be beside the checkbox controlling it.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28889
diff
changeset
|
3438 | gtk_size_group_add_widget(sg, menu); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3439 | g_signal_connect(G_OBJECT(button), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3440 | G_CALLBACK(pidgin_toggle_sensitive), menu); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3441 | pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Status to a_pply at startup:"), sg, menu, TRUE, &label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3442 | g_signal_connect(G_OBJECT(button), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3443 | G_CALLBACK(pidgin_toggle_sensitive), label); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3444 | |
|
28909
efb7f7c24390
Ok, clearly I'm an idiot. I removed the right line but from the wrong block.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28908
diff
changeset
|
3445 | if(purple_prefs_get_bool("/purple/savedstatus/startup_current_status")) { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3446 | gtk_widget_set_sensitive(GTK_WIDGET(menu), FALSE); |
|
28909
efb7f7c24390
Ok, clearly I'm an idiot. I removed the right line but from the wrong block.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28908
diff
changeset
|
3447 | gtk_widget_set_sensitive(GTK_WIDGET(label), FALSE); |
|
efb7f7c24390
Ok, clearly I'm an idiot. I removed the right line but from the wrong block.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28908
diff
changeset
|
3448 | } |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3449 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3450 | gtk_widget_show_all(ret); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3451 | g_object_unref(sg); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3452 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3453 | return ret; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3454 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
3455 | |
|
33634
dff087863072
Fix macro tests for USE_VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33622
diff
changeset
|
3456 | #ifdef USE_VV |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3457 | static GList * |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3458 | get_vv_element_devices(const gchar *element_name) |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3459 | { |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3460 | GList *ret = NULL; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3461 | GstElement *element; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3462 | GObjectClass *klass; |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3463 | #if !GST_CHECK_VERSION(1,0,0) |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3464 | GstPropertyProbe *probe; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3465 | const GParamSpec *pspec; |
|
34308
cdb187c27360
Fix the rest of Pidgin's warnings about -Wsign-compare; remove -Wno-sign-compare from cflags
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34297
diff
changeset
|
3466 | guint i; |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3467 | GValueArray *array; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3468 | enum { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3469 | PROBE_NONE, |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3470 | PROBE_DEVICE, |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3471 | PROBE_NAME |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3472 | } probe_attr; |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3473 | #endif |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3474 | |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3475 | ret = g_list_prepend(ret, g_strdup(_("Default"))); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3476 | ret = g_list_prepend(ret, g_strdup("")); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3477 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3478 | if (!strcmp(element_name, "<custom>") || (*element_name == '\0')) { |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3479 | return g_list_reverse(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3480 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3481 | |
|
33957
0a4c13fa94ba
VV: some cleanup, add ffmpeg filter to ksvideosrc
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33949
diff
changeset
|
3482 | if (g_strcmp0(element_name, "videodisabledsrc") == 0) { |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3483 | ret = g_list_prepend(ret, g_strdup(_("Random noise"))); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3484 | ret = g_list_prepend(ret, g_strdup("snow")); |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3485 | |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3486 | return g_list_reverse(ret); |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3487 | } |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3488 | |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3489 | element = gst_element_factory_make(element_name, "test"); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3490 | if (!element) { |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3491 | purple_debug_info("vvconfig", "'%s' - unable to find element\n", |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3492 | element_name); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3493 | return g_list_reverse(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3494 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3495 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3496 | klass = G_OBJECT_GET_CLASS (element); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3497 | if (!klass) { |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3498 | purple_debug_info("vvconfig", "'%s' - unable to find GObject " |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3499 | "Class\n", element_name); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3500 | return g_list_reverse(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3501 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3502 | |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3503 | #if GST_CHECK_VERSION(1,0,0) |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3504 | purple_debug_info("vvconfig", "'%s' - gstreamer-1.0 doesn't suport " |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3505 | "property probing\n", element_name); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3506 | #else |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3507 | if (g_object_class_find_property(klass, "device")) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3508 | probe_attr = PROBE_DEVICE; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3509 | else if (g_object_class_find_property(klass, "device-index") && |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3510 | g_object_class_find_property(klass, "device-name")) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3511 | probe_attr = PROBE_NAME; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3512 | else |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3513 | probe_attr = PROBE_NONE; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3514 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3515 | if (!GST_IS_PROPERTY_PROBE(element)) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3516 | probe_attr = PROBE_NONE; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3517 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3518 | if (probe_attr == PROBE_NONE) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3519 | { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3520 | purple_debug_info("vvconfig", "'%s' - no possibility to probe " |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3521 | "for devices\n", element_name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3522 | gst_object_unref(element); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3523 | return g_list_reverse(ret); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3524 | } |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3525 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3526 | probe = GST_PROPERTY_PROBE(element); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3527 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3528 | if (probe_attr == PROBE_DEVICE) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3529 | pspec = gst_property_probe_get_property(probe, "device"); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3530 | else /* probe_attr == PROBE_NAME */ |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3531 | pspec = gst_property_probe_get_property(probe, "device-name"); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3532 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3533 | if (!pspec) { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3534 | purple_debug_info("vvconfig", "'%s' - creating probe failed\n", |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3535 | element_name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3536 | gst_object_unref(element); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3537 | return g_list_reverse(ret); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3538 | } |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3539 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3540 | /* Set autoprobe[-fps] to FALSE to avoid delays when probing. */ |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3541 | if (g_object_class_find_property(klass, "autoprobe")) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3542 | g_object_set(G_OBJECT(element), "autoprobe", FALSE, NULL); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3543 | if (g_object_class_find_property(klass, "autoprobe-fps")) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3544 | g_object_set(G_OBJECT(element), "autoprobe-fps", FALSE, NULL); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3545 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3546 | array = gst_property_probe_probe_and_get_values(probe, pspec); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3547 | if (array == NULL) { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3548 | purple_debug_info("vvconfig", "'%s' has no devices\n", |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3549 | element_name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3550 | gst_object_unref(element); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3551 | return g_list_reverse(ret); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3552 | } |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3553 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3554 | for (i = 0; i < array->n_values; i++) { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3555 | GValue *device; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3556 | const gchar *name; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3557 | const gchar *device_name; |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3558 | |
|
33959
04f9d68806c2
VV: use G_GNUC_BEGIN_IGNORE_DEPRECATIONS for ignoring warnings related with external APIs
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33958
diff
changeset
|
3559 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3560 | /* GValueArray is in gstreamer-0.10 API */ |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3561 | device = g_value_array_get_nth(array, i); |
|
33959
04f9d68806c2
VV: use G_GNUC_BEGIN_IGNORE_DEPRECATIONS for ignoring warnings related with external APIs
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33958
diff
changeset
|
3562 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3563 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3564 | if (probe_attr == PROBE_DEVICE) { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3565 | g_object_set_property(G_OBJECT(element), "device", |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3566 | device); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3567 | if (gst_element_set_state(element, GST_STATE_READY) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3568 | != GST_STATE_CHANGE_SUCCESS) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3569 | { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3570 | purple_debug_warning("vvconfig", "Error " |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3571 | "changing state of %s\n", element_name); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3572 | continue; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3573 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3574 | |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3575 | g_object_get(G_OBJECT(element), "device-name", &name, |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3576 | NULL); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3577 | device_name = g_strdup(g_value_get_string(device)); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3578 | } else /* probe_attr == PROBE_NAME */ { |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3579 | name = g_strdup(g_value_get_string(device)); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3580 | device_name = g_strdup_printf("%d", i); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3581 | } |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3582 | |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3583 | if (name == NULL) |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3584 | name = _("Unknown"); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3585 | purple_debug_info("vvconfig", "Found device %s: %s for %s\n", |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3586 | device_name, name, element_name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3587 | ret = g_list_prepend(ret, (gpointer)name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3588 | ret = g_list_prepend(ret, (gpointer)device_name); |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3589 | gst_element_set_state(element, GST_STATE_NULL); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3590 | } |
|
33959
04f9d68806c2
VV: use G_GNUC_BEGIN_IGNORE_DEPRECATIONS for ignoring warnings related with external APIs
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33958
diff
changeset
|
3591 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3592 | /* GValueArray is in gstreamer-0.10 API */ |
|
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3593 | g_value_array_free(array); |
|
33959
04f9d68806c2
VV: use G_GNUC_BEGIN_IGNORE_DEPRECATIONS for ignoring warnings related with external APIs
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33958
diff
changeset
|
3594 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3595 | #endif |
|
33958
d76b1d242829
VV: add another method of probing devices (by device-name), fix memleak
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33957
diff
changeset
|
3596 | |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3597 | gst_object_unref(element); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3598 | return g_list_reverse(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3599 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3600 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3601 | static GList * |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3602 | get_vv_element_plugins(const gchar **plugins) |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3603 | { |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3604 | GList *ret = NULL; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3605 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3606 | ret = g_list_prepend(ret, (gpointer)_("Default")); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3607 | ret = g_list_prepend(ret, ""); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3608 | for (; plugins[0] && plugins[1]; plugins += 2) { |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3609 | #if GST_CHECK_VERSION(1,0,0) |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3610 | if (gst_registry_check_feature_version(gst_registry_get(), |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3611 | plugins[0], 0, 0, 0) |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3612 | #else |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3613 | if (gst_default_registry_check_feature_version(plugins[0], 0, 0, 0) |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3614 | #endif |
|
33957
0a4c13fa94ba
VV: some cleanup, add ffmpeg filter to ksvideosrc
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33949
diff
changeset
|
3615 | || g_strcmp0(plugins[0], "videodisabledsrc") == 0) |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3616 | { |
|
34281
ad957d0a467a
Keyring (and some GTK): fix translation callbacks
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34274
diff
changeset
|
3617 | ret = g_list_prepend(ret, (gpointer)_(plugins[1])); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3618 | ret = g_list_prepend(ret, (gpointer)plugins[0]); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3619 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3620 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3621 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3622 | return g_list_reverse(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3623 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
3624 | |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3625 | static GstElement * |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3626 | create_test_element(PurpleMediaElementType type) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3627 | { |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3628 | PurpleMediaElementInfo *element_info; |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3629 | |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3630 | element_info = purple_media_manager_get_active_element(purple_media_manager_get(), type); |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3631 | |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3632 | g_return_val_if_fail(element_info, NULL); |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3633 | |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3634 | return purple_media_element_info_call_create(element_info, |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3635 | NULL, NULL, NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3636 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3637 | |
|
33505
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3638 | static void |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3639 | vv_test_switch_page_cb(GtkNotebook *notebook, GtkWidget *page, guint num, gpointer data) |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3640 | { |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3641 | GtkWidget *test = data; |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3642 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(test), FALSE); |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3643 | } |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3644 | |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3645 | static GstElement * |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3646 | create_voice_pipeline(void) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3647 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3648 | GstElement *pipeline; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3649 | GstElement *src, *sink; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3650 | GstElement *volume; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3651 | GstElement *level; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3652 | GstElement *valve; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3653 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3654 | pipeline = gst_pipeline_new("voicetest"); |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3655 | |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3656 | src = create_test_element(PURPLE_MEDIA_ELEMENT_AUDIO | PURPLE_MEDIA_ELEMENT_SRC); |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3657 | sink = create_test_element(PURPLE_MEDIA_ELEMENT_AUDIO | PURPLE_MEDIA_ELEMENT_SINK); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3658 | volume = gst_element_factory_make("volume", "volume"); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3659 | level = gst_element_factory_make("level", "level"); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3660 | valve = gst_element_factory_make("valve", "valve"); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3661 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3662 | gst_bin_add_many(GST_BIN(pipeline), src, volume, level, valve, sink, NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3663 | gst_element_link_many(src, volume, level, valve, sink, NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3664 | |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3665 | purple_debug_info("gtkprefs", "create_voice_pipeline: setting pipeline " |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3666 | "state to GST_STATE_PLAYING - it may hang here on win32\n"); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3667 | gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PLAYING); |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3668 | purple_debug_info("gtkprefs", "create_voice_pipeline: state is set\n"); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3669 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3670 | return pipeline; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3671 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3672 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3673 | static void |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3674 | on_volume_change_cb(GtkWidget *w, gdouble value, gpointer data) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3675 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3676 | GstElement *volume; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3677 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3678 | if (!voice_pipeline) |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3679 | return; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3680 | |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3681 | volume = gst_bin_get_by_name(GST_BIN(voice_pipeline), "volume"); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3682 | g_object_set(volume, "volume", |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3683 | gtk_scale_button_get_value(GTK_SCALE_BUTTON(w)) * 10.0, NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3684 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3685 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3686 | static gdouble |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3687 | gst_msg_db_to_percent(GstMessage *msg, gchar *value_name) |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3688 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3689 | const GValue *list; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3690 | const GValue *value; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3691 | gdouble value_db; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3692 | gdouble percent; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3693 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3694 | list = gst_structure_get_value(gst_message_get_structure(msg), value_name); |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3695 | #if GST_CHECK_VERSION(1,0,0) |
|
33838
3c73956dbeca
Ignore some deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33727
diff
changeset
|
3696 | G_GNUC_BEGIN_IGNORE_DEPRECATIONS |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3697 | value = g_value_array_get_nth(g_value_get_boxed(list), 0); |
|
33838
3c73956dbeca
Ignore some deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33727
diff
changeset
|
3698 | G_GNUC_END_IGNORE_DEPRECATIONS |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3699 | #else |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3700 | value = gst_value_list_get_value(list, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3701 | #endif |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3702 | value_db = g_value_get_double(value); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3703 | percent = pow(10, value_db / 20); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3704 | return (percent > 1.0) ? 1.0 : percent; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3705 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3706 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3707 | static gboolean |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3708 | gst_bus_cb(GstBus *bus, GstMessage *msg, gpointer data) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3709 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3710 | if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_ELEMENT && |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3711 | gst_structure_has_name(gst_message_get_structure(msg), "level")) { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3712 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3713 | GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg)); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3714 | gchar *name = gst_element_get_name(src); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3715 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3716 | if (!strcmp(name, "level")) { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3717 | gdouble percent; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3718 | gdouble threshold; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3719 | GstElement *valve; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3720 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3721 | percent = gst_msg_db_to_percent(msg, "rms"); |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3722 | gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(voice_level), percent); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3723 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3724 | percent = gst_msg_db_to_percent(msg, "decay"); |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3725 | threshold = gtk_range_get_value(GTK_RANGE(voice_threshold)) / 100.0; |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3726 | valve = gst_bin_get_by_name(GST_BIN(GST_ELEMENT_PARENT(src)), "valve"); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3727 | g_object_set(valve, "drop", (percent < threshold), NULL); |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3728 | g_object_set(voice_level, "text", |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3729 | (percent < threshold) ? _("DROP") : " ", NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3730 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3731 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3732 | g_free(name); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3733 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3734 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3735 | return TRUE; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3736 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3737 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3738 | static void |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3739 | voice_test_destroy_cb(GtkWidget *w, gpointer data) |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3740 | { |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3741 | if (!voice_pipeline) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3742 | return; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3743 | |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3744 | gst_element_set_state(voice_pipeline, GST_STATE_NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3745 | gst_object_unref(voice_pipeline); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3746 | voice_pipeline = NULL; |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3747 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3748 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3749 | static void |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3750 | toggle_voice_test_cb(GtkToggleButton *test, gpointer data) |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3751 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3752 | GstBus *bus; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3753 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3754 | if (gtk_toggle_button_get_active(test)) { |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3755 | gtk_widget_set_sensitive(voice_level, TRUE); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3756 | voice_pipeline = create_voice_pipeline(); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3757 | bus = gst_pipeline_get_bus(GST_PIPELINE(voice_pipeline)); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3758 | gst_bus_add_signal_watch(bus); |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3759 | g_signal_connect(bus, "message", G_CALLBACK(gst_bus_cb), NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3760 | gst_object_unref(bus); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3761 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3762 | g_signal_connect(voice_volume, "value-changed", |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3763 | G_CALLBACK(on_volume_change_cb), NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3764 | g_signal_connect(test, "destroy", |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3765 | G_CALLBACK(voice_test_destroy_cb), NULL); |
|
33505
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3766 | g_signal_connect(prefsnotebook, "switch-page", |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3767 | G_CALLBACK(vv_test_switch_page_cb), test); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3768 | } else { |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3769 | gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(voice_level), 0.0); |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3770 | gtk_widget_set_sensitive(voice_level, FALSE); |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3771 | g_object_disconnect(voice_volume, "any-signal::value-changed", |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3772 | G_CALLBACK(on_volume_change_cb), NULL, |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3773 | NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3774 | g_object_disconnect(test, "any-signal::destroy", |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3775 | G_CALLBACK(voice_test_destroy_cb), NULL, |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3776 | NULL); |
|
33505
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3777 | g_object_disconnect(prefsnotebook, "any-signal::switch-page", |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3778 | G_CALLBACK(vv_test_switch_page_cb), test, |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3779 | NULL); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3780 | voice_test_destroy_cb(NULL, NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3781 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3782 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3783 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3784 | static void |
|
33622
cd86e355b945
Fix some function arguments, which were the real cause of ce1a071ef316.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33564
diff
changeset
|
3785 | volume_changed_cb(GtkScaleButton *button, gdouble value, gpointer data) |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3786 | { |
|
33622
cd86e355b945
Fix some function arguments, which were the real cause of ce1a071ef316.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33564
diff
changeset
|
3787 | purple_prefs_set_int("/purple/media/audio/volume/input", value * 100); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3788 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3789 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3790 | static void |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3791 | threshold_value_changed_cb(GtkScale *scale, GtkWidget *label) |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3792 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3793 | int value; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3794 | char *tmp; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3795 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3796 | value = (int)gtk_range_get_value(GTK_RANGE(scale)); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3797 | tmp = g_strdup_printf(_("Silence threshold: %d%%"), value); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3798 | gtk_label_set_label(GTK_LABEL(label), tmp); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3799 | g_free(tmp); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3800 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3801 | purple_prefs_set_int("/purple/media/audio/silence_threshold", value); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3802 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3803 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3804 | static void |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3805 | make_voice_test(GtkWidget *vbox) |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3806 | { |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3807 | GtkWidget *test; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3808 | GtkWidget *hbox; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3809 | GtkWidget *label; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3810 | GtkWidget *level; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3811 | GtkWidget *volume; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3812 | GtkWidget *threshold; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3813 | char *tmp; |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3814 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3815 | label = gtk_label_new(NULL); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3816 | gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3817 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
3818 | hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_CAT_SPACE); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3819 | gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3820 | label = gtk_label_new(_("Volume:")); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3821 | gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3822 | volume = gtk_volume_button_new(); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3823 | gtk_box_pack_start(GTK_BOX(hbox), volume, TRUE, TRUE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3824 | gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume), |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3825 | purple_prefs_get_int("/purple/media/audio/volume/input") / 100.0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3826 | g_signal_connect(volume, "value-changed", |
|
33519
ce1a071ef316
Fix a crash when changing the volume.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33515
diff
changeset
|
3827 | G_CALLBACK(volume_changed_cb), NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3828 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3829 | tmp = g_strdup_printf(_("Silence threshold: %d%%"), |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3830 | purple_prefs_get_int("/purple/media/audio/silence_threshold")); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3831 | label = gtk_label_new(tmp); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3832 | gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3833 | gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3834 | g_free(tmp); |
|
35532
2c802bb77720
Fix most of warnings for gtk 3.4
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
3835 | threshold = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, |
|
2c802bb77720
Fix most of warnings for gtk 3.4
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35527
diff
changeset
|
3836 | 0, 100, 1); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3837 | gtk_box_pack_start(GTK_BOX(vbox), threshold, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3838 | gtk_range_set_value(GTK_RANGE(threshold), |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3839 | purple_prefs_get_int("/purple/media/audio/silence_threshold")); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3840 | gtk_scale_set_draw_value(GTK_SCALE(threshold), FALSE); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3841 | g_signal_connect(threshold, "value-changed", |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3842 | G_CALLBACK(threshold_value_changed_cb), label); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3843 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3844 | test = gtk_toggle_button_new_with_label(_("Test Audio")); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3845 | gtk_box_pack_start(GTK_BOX(vbox), test, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3846 | |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3847 | level = gtk_progress_bar_new(); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3848 | gtk_box_pack_start(GTK_BOX(vbox), level, FALSE, FALSE, 0); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3849 | gtk_widget_set_sensitive(level, FALSE); |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3850 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3851 | voice_volume = volume; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3852 | voice_level = level; |
|
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3853 | voice_threshold = threshold; |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3854 | g_signal_connect(test, "toggled", |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3855 | G_CALLBACK(toggle_voice_test_cb), NULL); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3856 | } |
|
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
3857 | |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3858 | static GstElement * |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3859 | create_video_pipeline(void) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3860 | { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3861 | GstElement *pipeline; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3862 | GstElement *src, *sink; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3863 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3864 | pipeline = gst_pipeline_new("videotest"); |
|
33947
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3865 | src = create_test_element(PURPLE_MEDIA_ELEMENT_VIDEO | PURPLE_MEDIA_ELEMENT_SRC); |
|
7c0420c7ac81
VV: make prefs actually working; add <Disabled> video source
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33934
diff
changeset
|
3866 | sink = create_test_element(PURPLE_MEDIA_ELEMENT_VIDEO | PURPLE_MEDIA_ELEMENT_SINK); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3867 | |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3868 | g_object_set_data(G_OBJECT(pipeline), "sink", sink); |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3869 | |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3870 | gst_bin_add_many(GST_BIN(pipeline), src, sink, NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3871 | gst_element_link_many(src, sink, NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3872 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3873 | return pipeline; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3874 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3875 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3876 | static void |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3877 | video_test_destroy_cb(GtkWidget *w, gpointer data) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3878 | { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3879 | if (!video_pipeline) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3880 | return; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3881 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3882 | gst_element_set_state(video_pipeline, GST_STATE_NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3883 | gst_object_unref(video_pipeline); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3884 | video_pipeline = NULL; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3885 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3886 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3887 | static void |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3888 | window_id_cb(GstBus *bus, GstMessage *msg, gulong window_id) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3889 | { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3890 | if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3891 | #if GST_CHECK_VERSION(1,0,0) |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3892 | || !gst_is_video_overlay_prepare_window_handle_message(msg)) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3893 | #else |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3894 | /* there may be have-xwindow-id also, in case something went wrong */ |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3895 | || !gst_structure_has_name(msg->structure, "prepare-xwindow-id")) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3896 | #endif |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3897 | return; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3898 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3899 | g_signal_handlers_disconnect_matched(bus, |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3900 | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3901 | 0, 0, NULL, window_id_cb, |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3902 | (gpointer)window_id); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3903 | |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3904 | #if GST_CHECK_VERSION(1,0,0) |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3905 | gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)), |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3906 | window_id); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3907 | #elif GST_CHECK_VERSION(0,10,31) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3908 | gst_x_overlay_set_window_handle(GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3909 | window_id); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3910 | #else |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3911 | gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(GST_MESSAGE_SRC(msg)), |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3912 | window_id); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3913 | #endif |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3914 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3915 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3916 | static void |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3917 | toggle_video_test_cb(GtkToggleButton *test, gpointer data) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3918 | { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3919 | GstBus *bus; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3920 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3921 | if (gtk_toggle_button_get_active(test)) { |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3922 | GdkWindow *window = gtk_widget_get_window(video_drawing_area); |
|
33520
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3923 | gulong window_id = 0; |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3924 | |
|
33520
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3925 | #ifdef GDK_WINDOWING_WIN32 |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3926 | if (GDK_IS_WIN32_WINDOW(window)) |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3927 | window_id = GPOINTER_TO_UINT(GDK_WINDOW_HWND(window)); |
|
33520
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3928 | else |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3929 | #endif |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3930 | #ifdef GDK_WINDOWING_X11 |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3931 | if (GDK_IS_X11_WINDOW(window)) |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3932 | window_id = gdk_x11_window_get_xid(window); |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3933 | else |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3934 | #endif |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3935 | #ifdef GDK_WINDOWING_QUARTZ |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3936 | if (GDK_IS_QUARTZ_WINDOW(window)) |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3937 | window_id = (gulong)gdk_quartz_window_get_nsview(window); |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3938 | else |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3939 | #endif |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3940 | g_warning("Unsupported GDK backend"); |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3941 | #if !(defined(GDK_WINDOWING_WIN32) \ |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3942 | || defined(GDK_WINDOWING_X11) \ |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3943 | || defined(GDK_WINDOWING_QUARTZ)) |
|
e7741c77c5b2
Add support for multiple GDK backends.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33519
diff
changeset
|
3944 | # error "Unsupported GDK windowing system" |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3945 | #endif |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3946 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3947 | video_pipeline = create_video_pipeline(); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3948 | bus = gst_pipeline_get_bus(GST_PIPELINE(video_pipeline)); |
|
33509
60647bc63acc
Bump GStreamer checks to 1.0.0 instead of 0.11.0.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33508
diff
changeset
|
3949 | #if GST_CHECK_VERSION(1,0,0) |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3950 | gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL, NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3951 | #else |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3952 | gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3953 | #endif |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3954 | g_signal_connect(bus, "sync-message::element", |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3955 | G_CALLBACK(window_id_cb), (gpointer)window_id); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3956 | gst_object_unref(bus); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3957 | |
|
33948
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3958 | gst_element_set_state(GST_ELEMENT(video_pipeline), GST_STATE_PLAYING); |
|
b6c9e5dd95d1
VV: win32 support. No runtimes dependencies in dep-bundle yet. Refs #11075
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
33947
diff
changeset
|
3959 | |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3960 | g_signal_connect(test, "destroy", |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3961 | G_CALLBACK(video_test_destroy_cb), NULL); |
|
33505
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3962 | g_signal_connect(prefsnotebook, "switch-page", |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3963 | G_CALLBACK(vv_test_switch_page_cb), test); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3964 | } else { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3965 | g_object_disconnect(test, "any-signal::destroy", |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3966 | G_CALLBACK(video_test_destroy_cb), NULL, |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3967 | NULL); |
|
33505
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3968 | g_object_disconnect(prefsnotebook, "any-signal::switch-page", |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3969 | G_CALLBACK(vv_test_switch_page_cb), test, |
|
76208141a643
Disable VV tests when changing notebook tabs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33504
diff
changeset
|
3970 | NULL); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3971 | video_test_destroy_cb(NULL, NULL); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3972 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3973 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3974 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3975 | static void |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3976 | make_video_test(GtkWidget *vbox) |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3977 | { |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3978 | GtkWidget *test; |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3979 | GtkWidget *video; |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3980 | #if GTK_CHECK_VERSION(3,0,0) |
|
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3981 | GdkRGBA color = {0.0, 0.0, 0.0, 1.0}; |
|
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3982 | #else |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3983 | GdkColor color = {0, 0, 0, 0}; |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3984 | #endif |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3985 | |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3986 | video_drawing_area = video = gtk_drawing_area_new(); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3987 | gtk_box_pack_start(GTK_BOX(vbox), video, TRUE, TRUE, 0); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3988 | #if GTK_CHECK_VERSION(3,0,0) |
|
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3989 | gtk_widget_override_background_color(video, GTK_STATE_FLAG_NORMAL, &color); |
|
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3990 | #else |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3991 | gtk_widget_modify_bg(video, GTK_STATE_NORMAL, &color); |
|
35510
0e6c78789caa
Fix some GtkStyle deprecations.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35500
diff
changeset
|
3992 | #endif |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3993 | gtk_widget_set_size_request(GTK_WIDGET(video), 240, 180); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3994 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3995 | test = gtk_toggle_button_new_with_label(_("Test Video")); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3996 | gtk_box_pack_start(GTK_BOX(vbox), test, FALSE, FALSE, 0); |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3997 | |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
3998 | g_signal_connect(test, "toggled", |
|
35567
ea40288b061e
Make some VV pref variables global.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35532
diff
changeset
|
3999 | G_CALLBACK(toggle_video_test_cb), NULL); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
4000 | } |
|
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
4001 | |
|
35568
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4002 | static void |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4003 | vv_plugin_changed_cb(const gchar *name, PurplePrefType type, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4004 | gconstpointer value, gpointer data) |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4005 | { |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4006 | GtkWidget *vbox = data; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4007 | GtkSizeGroup *sg; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4008 | GtkWidget *widget; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4009 | gchar *pref; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4010 | GList *devices; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4011 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4012 | sg = g_object_get_data(G_OBJECT(vbox), "size-group"); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4013 | widget = g_object_get_data(G_OBJECT(vbox), "device-hbox"); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4014 | gtk_widget_destroy(widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4015 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4016 | pref = g_strdup(name); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4017 | strcpy(pref + strlen(pref) - strlen("plugin"), "device"); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4018 | devices = get_vv_element_devices(value); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4019 | if (g_list_find_custom(devices, purple_prefs_get_string(pref), |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4020 | (GCompareFunc)strcmp) == NULL) |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4021 | purple_prefs_set_string(pref, g_list_next(devices)->data); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4022 | widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"), |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4023 | PURPLE_PREF_STRING, pref, devices); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4024 | g_list_free_full(devices, g_free); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4025 | gtk_size_group_add_widget(sg, widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4026 | gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4027 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4028 | g_object_set_data(G_OBJECT(vbox), "device-hbox", |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4029 | gtk_widget_get_parent(widget)); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4030 | g_signal_connect_swapped(widget, "destroy", G_CALLBACK(g_free), pref); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4031 | } |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4032 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4033 | static void |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4034 | make_vv_frame(GtkWidget *parent, GtkSizeGroup *sg, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4035 | const gchar *name, const gchar **plugin_strs, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4036 | const gchar *plugin_pref, const gchar *device_pref) |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4037 | { |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4038 | GtkWidget *vbox, *widget; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4039 | GList *plugins, *devices; |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4040 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4041 | vbox = pidgin_make_frame(parent, name); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4042 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4043 | /* Setup plugin preference */ |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4044 | plugins = get_vv_element_plugins(plugin_strs); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4045 | widget = pidgin_prefs_dropdown_from_list(vbox, _("_Plugin"), |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4046 | PURPLE_PREF_STRING, plugin_pref, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4047 | plugins); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4048 | g_list_free(plugins); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4049 | gtk_size_group_add_widget(sg, widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4050 | gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4051 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4052 | /* Setup device preference */ |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4053 | devices = get_vv_element_devices(purple_prefs_get_string(plugin_pref)); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4054 | if (g_list_find_custom(devices, purple_prefs_get_string(device_pref), |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4055 | (GCompareFunc)strcmp) == NULL) |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4056 | purple_prefs_set_string(device_pref, g_list_next(devices)->data); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4057 | widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"), |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4058 | PURPLE_PREF_STRING, device_pref, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4059 | devices); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4060 | g_list_free_full(devices, g_free); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4061 | gtk_size_group_add_widget(sg, widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4062 | gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4063 | |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4064 | widget = gtk_widget_get_parent(widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4065 | g_object_set_data(G_OBJECT(vbox), "size-group", sg); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4066 | g_object_set_data(G_OBJECT(vbox), "device-hbox", widget); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4067 | purple_prefs_connect_callback(vbox, plugin_pref, vv_plugin_changed_cb, |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4068 | vbox); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4069 | g_signal_connect_swapped(vbox, "destroy", |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4070 | G_CALLBACK(purple_prefs_disconnect_by_handle), vbox); |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4071 | } |
|
b66f1935b3d0
Minor re-arrangement for VV prefs code.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
35567
diff
changeset
|
4072 | |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4073 | static GtkWidget * |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4074 | vv_page(void) |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4075 | { |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4076 | GtkWidget *ret; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4077 | GtkWidget *vbox; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4078 | GtkSizeGroup *sg; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4079 | |
|
35527
707c3c2b2c8a
Fix more gtk_[hv]box_new gtk3 deprecation warnings
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
35510
diff
changeset
|
4080 | ret = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_CAT_SPACE); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4081 | gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4082 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4083 | sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4084 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4085 | vbox = pidgin_make_frame(ret, _("Audio")); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4086 | make_vv_frame(vbox, sg, _("Input"), AUDIO_SRC_PLUGINS, |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4087 | PIDGIN_PREFS_ROOT "/vvconfig/audio/src/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4088 | PIDGIN_PREFS_ROOT "/vvconfig/audio/src/device"); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4089 | make_vv_frame(vbox, sg, _("Output"), AUDIO_SINK_PLUGINS, |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4090 | PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4091 | PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/device"); |
|
33503
8959f9825768
Copy audio test from vvconfig into Preferences window.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33502
diff
changeset
|
4092 | make_voice_test(vbox); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4093 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4094 | vbox = pidgin_make_frame(ret, _("Video")); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4095 | make_vv_frame(vbox, sg, _("Input"), VIDEO_SRC_PLUGINS, |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4096 | PIDGIN_PREFS_ROOT "/vvconfig/video/src/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4097 | PIDGIN_PREFS_ROOT "/vvconfig/video/src/device"); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4098 | make_vv_frame(vbox, sg, _("Output"), VIDEO_SINK_PLUGINS, |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4099 | PIDGIN_PREFS_ROOT "/vvconfig/video/sink/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4100 | PIDGIN_PREFS_ROOT "/vvconfig/video/sink/device"); |
|
33504
c4af2548d047
Set up a video test in Preferences.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33503
diff
changeset
|
4101 | make_video_test(vbox); |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4102 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4103 | gtk_widget_show_all(ret); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4104 | |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4105 | return ret; |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4106 | } |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4107 | #endif |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4108 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4109 | static int |
|
27607
1d8bffba0505
That was some seriously screwed up formatting.
Etan Reisner <deryni@pidgin.im>
parents:
27606
diff
changeset
|
4110 | prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4111 | { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4112 | return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4113 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4114 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4115 | static void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4116 | prefs_notebook_init(void) |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4117 | { |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4118 | prefs_notebook_add_page(_("Interface"), interface_page(), notebook_page++); |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
4119 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4120 | #ifndef _WIN32 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4121 | /* We use the registered default browser in windows */ |
|
28888
b8638c677a20
Oops. If the user was running GNOME, he/she wouldn't see the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28887
diff
changeset
|
4122 | /* if the user is running Mac OS X, hide the browsers tab */ |
|
b8638c677a20
Oops. If the user was running GNOME, he/she wouldn't see the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28887
diff
changeset
|
4123 | if(purple_running_osx() == FALSE) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4124 | prefs_notebook_add_page(_("Browser"), browser_page(), notebook_page++); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4125 | #endif |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
4126 | |
|
28851
53ce9979a29e
Reorder the tabs alphabetically. I left Interface at the top because it's our
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28850
diff
changeset
|
4127 | prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++); |
|
53ce9979a29e
Reorder the tabs alphabetically. I left Interface at the top because it's our
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28850
diff
changeset
|
4128 | prefs_notebook_add_page(_("Logging"), logging_page(), notebook_page++); |
|
53ce9979a29e
Reorder the tabs alphabetically. I left Interface at the top because it's our
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28850
diff
changeset
|
4129 | prefs_notebook_add_page(_("Network"), network_page(), notebook_page++); |
|
28888
b8638c677a20
Oops. If the user was running GNOME, he/she wouldn't see the proxy and browser
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28887
diff
changeset
|
4130 | prefs_notebook_add_page(_("Proxy"), proxy_page(), notebook_page++); |
|
33983
317cd0a252c2
Fixed a bunch of bugs/errors, worked on making calls async, on configuration UI, and on Makefiles.
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
23261
diff
changeset
|
4131 | prefs_notebook_add_page(_("Password Storage"), keyring_page(), notebook_page++); |
|
28848
5004d2e82e68
Move the proxy stuff to a separate tab, per deryni's suggestion.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28847
diff
changeset
|
4132 | |
|
28851
53ce9979a29e
Reorder the tabs alphabetically. I left Interface at the top because it's our
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28850
diff
changeset
|
4133 | prefs_notebook_add_page(_("Sounds"), sound_page(), notebook_page++); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4134 | prefs_notebook_add_page(_("Status / Idle"), away_page(), notebook_page++); |
|
28851
53ce9979a29e
Reorder the tabs alphabetically. I left Interface at the top because it's our
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28850
diff
changeset
|
4135 | prefs_notebook_add_page(_("Themes"), theme_page(), notebook_page++); |
|
33634
dff087863072
Fix macro tests for USE_VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33622
diff
changeset
|
4136 | #ifdef USE_VV |
|
33502
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4137 | prefs_notebook_add_page(_("Voice/Video"), vv_page(), notebook_page++); |
|
f59489bd552b
Copy VV device settings into a Preferences pane.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33357
diff
changeset
|
4138 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4139 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4140 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4141 | void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4142 | pidgin_prefs_show(void) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4143 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4144 | GtkWidget *vbox; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4145 | GtkWidget *notebook; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4146 | GtkWidget *button; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4147 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4148 | if (prefs) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4149 | gtk_window_present(GTK_WINDOW(prefs)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4150 | return; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4151 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4152 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4153 | /* copy the preferences to tmp values... |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4154 | * I liked "take affect immediately" Oh well :-( */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4155 | /* (that should have been "effect," right?) */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4156 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4157 | /* Back to instant-apply! I win! BU-HAHAHA! */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4158 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4159 | /* Create the window */ |
|
33170
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
4160 | #if GTK_CHECK_VERSION(3,0,0) |
|
33141
2001ba1d6827
Remove extra padding that makes things look not-so-good.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33136
diff
changeset
|
4161 | prefs = pidgin_create_dialog(_("Preferences"), 0, "preferences", FALSE); |
|
33170
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
4162 | #else |
|
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
4163 | prefs = pidgin_create_dialog(_("Preferences"), PIDGIN_HIG_BORDER, "preferences", FALSE); |
|
ce4447562d64
Add checks for old GTK+2 stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33146
diff
changeset
|
4164 | #endif |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4165 | g_signal_connect(G_OBJECT(prefs), "destroy", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4166 | G_CALLBACK(delete_prefs), NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4167 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4168 | vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(prefs), FALSE, PIDGIN_HIG_BORDER); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4169 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4170 | /* The notebook */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4171 | prefsnotebook = notebook = gtk_notebook_new (); |
|
28847
f97b2dc18d64
Change to side-tabs in the prefs window.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28841
diff
changeset
|
4172 | gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_LEFT); |
|
f97b2dc18d64
Change to side-tabs in the prefs window.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
28841
diff
changeset
|
4173 | gtk_box_pack_start(GTK_BOX (vbox), notebook, FALSE, FALSE, 0); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4174 | gtk_widget_show(prefsnotebook); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4175 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4176 | button = pidgin_dialog_add_button(GTK_DIALOG(prefs), GTK_STOCK_CLOSE, NULL, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4177 | g_signal_connect_swapped(G_OBJECT(button), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4178 | G_CALLBACK(gtk_widget_destroy), prefs); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4179 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4180 | prefs_notebook_init(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4181 | |
|
27445
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
4182 | /* Refresh the list of themes before showing the preferences window */ |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
4183 | prefs_themes_refresh(); |
|
b8bbf88abd0f
Allow drag-and-drop of all sorts of themes.
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
27196
diff
changeset
|
4184 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4185 | /* Show everything. */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4186 | gtk_widget_show(prefs); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4187 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4188 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4189 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4190 | set_bool_pref(GtkWidget *w, const char *key) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4191 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4192 | purple_prefs_set_bool(key, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4193 | gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4194 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4195 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4196 | GtkWidget * |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4197 | pidgin_prefs_checkbox(const char *text, const char *key, GtkWidget *page) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4198 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4199 | GtkWidget *button; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4200 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4201 | button = gtk_check_button_new_with_mnemonic(text); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4202 | gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4203 | purple_prefs_get_bool(key)); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4204 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4205 | gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4206 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4207 | g_signal_connect(G_OBJECT(button), "clicked", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4208 | G_CALLBACK(set_bool_pref), (char *)key); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4209 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4210 | gtk_widget_show(button); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4211 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4212 | return button; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4213 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4214 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4215 | static void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4216 | smiley_theme_pref_cb(const char *name, PurplePrefType type, |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4217 | gconstpointer value, gpointer data) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4218 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4219 | const char *themename = value; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4220 | GSList *themes; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4221 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4222 | for (themes = smiley_themes; themes; themes = themes->next) { |
|
35500
ae6432ea326f
Fixed namespace issues in Pidgin.
Ankit Vani <a@nevitus.org>
parents:
35475
diff
changeset
|
4223 | struct PidginSmileyTheme *smile = themes->data; |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4224 | if (smile->name && strcmp(themename, smile->name) == 0) { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4225 | pidgin_themes_load_smiley_theme(smile->path, TRUE); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4226 | break; |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4227 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4228 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4229 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4230 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4231 | void |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4232 | pidgin_prefs_init(void) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4233 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4234 | purple_prefs_add_none(PIDGIN_PREFS_ROOT ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4235 | purple_prefs_add_none("/plugins/gtk"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4236 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4237 | #ifndef _WIN32 |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4238 | /* Browsers */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4239 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/browsers"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4240 | purple_prefs_add_int(PIDGIN_PREFS_ROOT "/browsers/place", PIDGIN_BROWSER_DEFAULT); |
|
30810
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4241 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/manual_command", ""); |
|
30817
826c743cb473
Change default browser for new non-Windows users to xdg-open. Fixes #12505.
Stanislav Brabec <sbrabec@suse.cz>
parents:
30812
diff
changeset
|
4242 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "xdg-open"); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4243 | #endif |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4244 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4245 | /* Plugins */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4246 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/plugins"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4247 | purple_prefs_add_path_list(PIDGIN_PREFS_ROOT "/plugins/loaded", NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4248 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4249 | /* File locations */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4250 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/filelocations"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4251 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4252 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4253 | purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", ""); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4254 | |
|
23648
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
4255 | /* Themes */ |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
4256 | prefs_themes_init(); |
|
a71b9a2345ea
fixed images to appear in pref menu
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23645
diff
changeset
|
4257 | |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
4258 | /* Conversation Themes */ |
|
32563
27024ee86815
Use a consistent prefs name. It should be conversation*s* to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32562
diff
changeset
|
4259 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations"); |
|
27024ee86815
Use a consistent prefs name. It should be conversation*s* to
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
32562
diff
changeset
|
4260 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/theme", "Default"); |
|
32560
60ee2f81bb3d
Add a prefs combo for the conversation theme. Variants are added as
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
31992
diff
changeset
|
4261 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4262 | /* Smiley Themes */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4263 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/smileys"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4264 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/smileys/theme", "Default"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4265 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4266 | /* Smiley Callbacks */ |
|
29154
630b98626232
Since the prefs variable holds the widget that refers to the prefs dialog,
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
29152
diff
changeset
|
4267 | purple_prefs_connect_callback(&prefs, PIDGIN_PREFS_ROOT "/smileys/theme", |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4268 | smiley_theme_pref_cb, NULL); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4269 | |
|
33634
dff087863072
Fix macro tests for USE_VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33622
diff
changeset
|
4270 | #ifdef USE_VV |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4271 | /* Voice/Video */ |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4272 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4273 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/audio"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4274 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/audio/src"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4275 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/src/plugin", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4276 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/src/device", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4277 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/audio/sink"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4278 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/plugin", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4279 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/device", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4280 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/video"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4281 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/video/src"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4282 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/video/src/plugin", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4283 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/video/src/device", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4284 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/video"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4285 | purple_prefs_add_none(PIDGIN_PREFS_ROOT "/vvconfig/video/sink"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4286 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/video/sink/plugin", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4287 | purple_prefs_add_string(PIDGIN_PREFS_ROOT "/vvconfig/video/sink/device", ""); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4288 | #endif |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4289 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4290 | pidgin_prefs_update_old(); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4291 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4292 | |
|
27493
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4293 | void |
|
96dc1b8abdf9
You should check the indenting before a copy & paste...
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27451
diff
changeset
|
4294 | pidgin_prefs_update_old(void) |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4295 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4296 | /* Rename some old prefs */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4297 | purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/purple/logging/log_ims"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4298 | purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/purple/logging/log_chats"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4299 | purple_prefs_rename("/purple/conversations/placement", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4300 | PIDGIN_PREFS_ROOT "/conversations/placement"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4301 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4302 | purple_prefs_rename(PIDGIN_PREFS_ROOT "/conversations/im/raise_on_events", "/plugins/gtk/X11/notify/method_raise"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4303 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4304 | purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4305 | PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4306 | |
|
30810
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4307 | /* |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4308 | * This path pref changed to a string, so migrate. I know this will |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4309 | * break things for and confuse users that use multiple versions with |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4310 | * the same config directory, but I'm not inclined to want to deal with |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4311 | * that at the moment. -- rekkanoryo |
|
30810
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4312 | */ |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4313 | if (purple_prefs_exists(PIDGIN_PREFS_ROOT "/browsers/command") && |
|
35378
5d9e2581005b
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
Ankit Vani <a@nevitus.org>
parents:
35106
diff
changeset
|
4314 | purple_prefs_get_pref_type(PIDGIN_PREFS_ROOT "/browsers/command") == |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4315 | PURPLE_PREF_PATH) |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4316 | { |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4317 | const char *str = purple_prefs_get_path( |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4318 | PIDGIN_PREFS_ROOT "/browsers/command"); |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4319 | purple_prefs_set_string( |
|
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
34287
diff
changeset
|
4320 | PIDGIN_PREFS_ROOT "/browsers/manual_command", str); |
|
30810
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4321 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/browsers/command"); |
|
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4322 | } |
|
9e2f351bb081
Change the "Manual" browser command pref's name to allow for a relatively simple
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
30800
diff
changeset
|
4323 | |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4324 | /* Remove some no-longer-used prefs */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4325 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4326 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4327 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4328 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/raise_on_events"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4329 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_group_count"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4330 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_warning_level"); |
|
34259
5309bb9956cf
Remove the tooltip_delay pref from prefs.xml.
Mark Doliner <mark@kingant.net>
parents:
34241
diff
changeset
|
4331 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/tooltip_delay"); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4332 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/button_type"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4333 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ctrl_enter_sends"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4334 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/enter_sends"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4335 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/escape_closes"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4336 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/html_shortcuts"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4337 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/icons_on_tabs"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4338 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/send_formatting"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4339 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/show_smileys"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4340 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/show_urls_as_links"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4341 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/smiley_shortcuts"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4342 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_bgcolor"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4343 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_fgcolor"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4344 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_font"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4345 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_size"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4346 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/old_tab_complete"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4347 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/tab_completion"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4348 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/im/hide_on_send"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4349 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/color_nicks"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4350 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/raise_on_events"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4351 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_fonts"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4352 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_font_sizes"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4353 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/passthrough_unknown_commands"); |
|
32732
3166ba6f2096
We haven't used this pref in a while. We stopped adding it in
Mark Doliner <markdoliner@pidgin.im>
parents:
32596
diff
changeset
|
4354 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/debug/timestamps"); |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4355 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/idle"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4356 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/logging/individual_logs"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4357 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/signon"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4358 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/silent_signon"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4359 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4360 | /* Convert old queuing prefs to hide_new 3-way pref. */ |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4361 | if (purple_prefs_exists("/plugins/gtk/docklet/queue_messages") && |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4362 | purple_prefs_get_bool("/plugins/gtk/docklet/queue_messages")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4363 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4364 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "always"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4365 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4366 | else if (purple_prefs_exists(PIDGIN_PREFS_ROOT "/away/queue_messages") && |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4367 | purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/away/queue_messages")) |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4368 | { |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4369 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "away"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4370 | } |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4371 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/away/queue_messages"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4372 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/away"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4373 | purple_prefs_remove("/plugins/gtk/docklet/queue_messages"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4374 | |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4375 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4376 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/default_height"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4377 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/im/default_width"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4378 | purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/im/default_height"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4379 | purple_prefs_rename(PIDGIN_PREFS_ROOT "/conversations/x", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4380 | PIDGIN_PREFS_ROOT "/conversations/im/x"); |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4381 | purple_prefs_rename(PIDGIN_PREFS_ROOT "/conversations/y", |
|
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4382 | PIDGIN_PREFS_ROOT "/conversations/im/y"); |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4383 | |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4384 | /* Fixup vvconfig plugin prefs */ |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4385 | if (purple_prefs_exists("/plugins/core/vvconfig/audio/src/plugin")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4386 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/src/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4387 | purple_prefs_get_string("/plugins/core/vvconfig/audio/src/plugin")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4388 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4389 | if (purple_prefs_exists("/plugins/core/vvconfig/audio/src/device")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4390 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/src/device", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4391 | purple_prefs_get_string("/plugins/core/vvconfig/audio/src/device")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4392 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4393 | if (purple_prefs_exists("/plugins/core/vvconfig/audio/sink/plugin")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4394 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4395 | purple_prefs_get_string("/plugins/core/vvconfig/audio/sink/plugin")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4396 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4397 | if (purple_prefs_exists("/plugins/core/vvconfig/audio/sink/device")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4398 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/audio/sink/device", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4399 | purple_prefs_get_string("/plugins/core/vvconfig/audio/sink/device")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4400 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4401 | if (purple_prefs_exists("/plugins/core/vvconfig/video/src/plugin")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4402 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/video/src/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4403 | purple_prefs_get_string("/plugins/core/vvconfig/video/src/plugin")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4404 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4405 | if (purple_prefs_exists("/plugins/core/vvconfig/video/src/device")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4406 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/video/src/device", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4407 | purple_prefs_get_string("/plugins/core/vvconfig/video/src/device")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4408 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4409 | if (purple_prefs_exists("/plugins/gtk/vvconfig/video/sink/plugin")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4410 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/video/sink/plugin", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4411 | purple_prefs_get_string("/plugins/gtk/vvconfig/video/sink/plugin")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4412 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4413 | if (purple_prefs_exists("/plugins/gtk/vvconfig/video/sink/device")) { |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4414 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/vvconfig/video/sink/device", |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4415 | purple_prefs_get_string("/plugins/gtk/vvconfig/video/sink/device")); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4416 | } |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4417 | |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4418 | purple_prefs_remove("/plugins/core/vvconfig"); |
|
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4419 | purple_prefs_remove("/plugins/gtk/vvconfig"); |
|
35105
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4420 | |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4421 | #ifndef _WIN32 |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4422 | /* Added in 3.0.0. */ |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4423 | if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/browsers/place") == 1) { |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4424 | /* If the "open link in" pref is set to the old value for "existing |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4425 | window" then change it to "default." */ |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4426 | purple_prefs_set_int(PIDGIN_PREFS_ROOT "/browsers/place", |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4427 | PIDGIN_BROWSER_DEFAULT); |
|
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4428 | } |
|
35106
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4429 | |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4430 | /* Added in 3.0.0. */ |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4431 | if (g_str_equal( |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4432 | purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4433 | "netscape")) { |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4434 | purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "xdg-open"); |
|
79ebfc0d91df
Drop support for Netscape because it's ancient, no longer exists, is
Mark Doliner <mark@kingant.net>
parents:
35105
diff
changeset
|
4435 | } |
|
35105
ed127ccd9b9f
Remove the "existing window" option for where to open URLs.
Mark Doliner <mark@kingant.net>
parents:
34955
diff
changeset
|
4436 | #endif /* !_WIN32 */ |
|
22419
e7d643f4de4b
Bring back the "Close IMs immediately when the tab is closed" pref. As far
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
22412
diff
changeset
|
4437 | } |
|
33508
188563e24535
Migrate and correctly create VV prefs.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
33507
diff
changeset
|
4438 |