1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
|
Description: Fix FTBFS with GCC 10.
Author: Yavor Doganov <yavor@gnu.org>
Bug-Debian: https://bugs.debian.org/957308
Forwarded: https://savannah.nongnu.org/bugs/index.php?58645
Last-Update: 2020-06-23
---
--- grdesktop-0.23+d040330.orig/src/global.h
+++ grdesktop-0.23+d040330/src/global.h
@@ -64,49 +64,47 @@
#define KBPATH "/usr/local/share/rdesktop/keymaps/"
#endif
-GList *hostnames;
-GList *rdp_protocols;
-GList *screensize;
-GList *colors;
-GList *sound_options;
-GHashTable *config;
-GSettings *gcfg;
+extern GList *hostnames;
+extern GList *rdp_protocols;
+extern GList *screensize;
+extern GList *colors;
+extern GList *sound_options;
+extern GHashTable *config;
+extern GSettings *gcfg;
/* these widgets are used global */
-GtkWidget *window_main;
-GtkWidget *image_normal;
-GtkWidget *image_process;
-GtkWidget *box_server;
-GtkWidget *box_option;
-GtkWidget *btn_connect;
-GtkWidget *btn_cancel;
-GtkWidget *btn_option;
-GtkWidget *combo_host;
-GtkWidget *combo_host2;
-GtkWidget *input_username;
-GtkWidget *input_password;
-GtkWidget *input_domain;
-GtkWidget *check_savepw;
-GtkWidget *menu_rdp_proto;
-GtkAdjustment *adj_screensize;
-GtkWidget *scroll_screensize;
-GtkWidget *geometry_label;
-GtkWidget *menu_colorsize;
-GtkWidget *image_colorsize;
-GtkWidget *tree_keymap;
-GtkWidget *menu_sound;
-GtkWidget *check_prog;
-GtkWidget *input_program;
-GtkWidget *input_ppath;
-GtkWidget *check_bitmapupd;
-GtkWidget *check_motionevt;
-GtkWidget *check_hidewmdecoration;
-GtkWidget *check_noencr;
-GtkWidget *check_wmkeybindings;
-GtkWidget *check_attconsole;
-GtkWidget *combo_clientname;
-GtkWidget *check_sshopts;
-GtkWidget *btn_sshopts;
+extern GtkWidget *window_main;
+extern GtkWidget *image_normal;
+extern GtkWidget *image_process;
+extern GtkWidget *box_server;
+extern GtkWidget *box_option;
+extern GtkWidget *btn_option;
+extern GtkWidget *combo_host;
+extern GtkWidget *combo_host2;
+extern GtkWidget *input_username;
+extern GtkWidget *input_password;
+extern GtkWidget *input_domain;
+extern GtkWidget *check_savepw;
+extern GtkWidget *menu_rdp_proto;
+extern GtkAdjustment *adj_screensize;
+extern GtkWidget *scroll_screensize;
+extern GtkWidget *geometry_label;
+extern GtkWidget *menu_colorsize;
+extern GtkWidget *image_colorsize;
+extern GtkWidget *tree_keymap;
+extern GtkWidget *menu_sound;
+extern GtkWidget *check_prog;
+extern GtkWidget *input_program;
+extern GtkWidget *input_ppath;
+extern GtkWidget *check_bitmapupd;
+extern GtkWidget *check_motionevt;
+extern GtkWidget *check_hidewmdecoration;
+extern GtkWidget *check_noencr;
+extern GtkWidget *check_wmkeybindings;
+extern GtkWidget *check_attconsole;
+extern GtkWidget *combo_clientname;
+extern GtkWidget *check_sshopts;
+extern GtkWidget *btn_sshopts;
void error_dialog(gchar *msg, ...);
--- grdesktop-0.23+d040330.orig/src/main.c
+++ grdesktop-0.23+d040330/src/main.c
@@ -22,6 +22,18 @@
#include "main.h"
+GList *hostnames;
+GList *screensize;
+GList *colors;
+GHashTable *config;
+GSettings *gcfg;
+
+GtkWidget *window_main;
+GtkWidget *image_normal;
+GtkWidget *image_process;
+GtkWidget *box_server;
+GtkWidget *box_option;
+
void error_dialog(gchar *msg, ...) {
GtkWidget *dlg;
gchar *dlg_msg;
--- grdesktop-0.23+d040330.orig/src/options.c
+++ grdesktop-0.23+d040330/src/options.c
@@ -22,6 +22,9 @@
#include "options.h"
+GList *rdp_protocols;
+GList *sound_options;
+
void fillRdpProtocols() {
rdp_protocols = g_list_append(rdp_protocols, g_strdup(_("Windows NT/2000")));
rdp_protocols = g_list_append(rdp_protocols, g_strdup(_("Windows XP/2003")));
--- grdesktop-0.23+d040330.orig/src/btnbox.c
+++ grdesktop-0.23+d040330/src/btnbox.c
@@ -22,11 +22,16 @@
#include "btnbox.h"
+GtkWidget *btn_option;
+pid_t child_pid;
+
GtkWidget *button_box() {
GtkWidget *box;
GtkWidget *btnHelp;
GtkWidget *btnAbout;
GtkWidget *image;
+ GtkWidget *btn_connect;
+ GtkWidget *btn_cancel;
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
--- grdesktop-0.23+d040330.orig/src/optbox.c
+++ grdesktop-0.23+d040330/src/optbox.c
@@ -23,6 +23,32 @@
#include "optbox.h"
#include "sshbox.h"
+GtkWidget *combo_host2;
+GtkWidget *input_username;
+GtkWidget *input_password;
+GtkWidget *input_domain;
+GtkWidget *check_savepw;
+GtkWidget *menu_rdp_proto;
+GtkAdjustment *adj_screensize;
+GtkWidget *scroll_screensize;
+GtkWidget *geometry_label;
+GtkWidget *menu_colorsize;
+GtkWidget *image_colorsize;
+GtkWidget *tree_keymap;
+GtkWidget *menu_sound;
+GtkWidget *check_prog;
+GtkWidget *input_program;
+GtkWidget *input_ppath;
+GtkWidget *check_bitmapupd;
+GtkWidget *check_motionevt;
+GtkWidget *check_hidewmdecoration;
+GtkWidget *check_noencr;
+GtkWidget *check_wmkeybindings;
+GtkWidget *check_attconsole;
+GtkWidget *combo_clientname;
+GtkWidget *check_sshopts;
+GtkWidget *btn_sshopts;
+
GtkWidget *option_box() {
GtkWidget *note;
GtkWidget *page1, *page2, *page3, *page4, *page5;
--- grdesktop-0.23+d040330.orig/src/srvsel.c
+++ grdesktop-0.23+d040330/src/srvsel.c
@@ -22,6 +22,8 @@
#include "srvsel.h"
+GtkWidget *combo_host;
+
GtkWidget *server_box() {
GList *l;
GtkWidget *box;
--- grdesktop-0.23+d040330.orig/src/run.h
+++ grdesktop-0.23+d040330/src/run.h
@@ -31,7 +31,7 @@
#include "global.h"
#include "options.h"
-pid_t child_pid; /* infos about child processes */
+extern pid_t child_pid; /* infos about child processes */
void run_rdesktop();
--- grdesktop-0.23+d040330.orig/src/sshbox.c
+++ grdesktop-0.23+d040330/src/sshbox.c
@@ -22,6 +22,9 @@
#include "sshbox.h"
+GtkWidget *check_enablessh;
+GtkWidget *input_user, *input_host;
+
void ssh_showbox(GtkWidget *widget, int status) {
GtkWidget *dlg;
--- grdesktop-0.23+d040330.orig/src/sshbox.h
+++ grdesktop-0.23+d040330/src/sshbox.h
@@ -28,9 +28,6 @@
#include "config.h"
#include "global.h"
-GtkWidget *check_enablessh;
-GtkWidget *input_user, *input_host;
-
void ssh_showbox(GtkWidget *widget, int status);
void ssh_createdialog(GtkWidget *widget);
void ssh_updatebox(int status);
|
