Ubuntu
predict package

Merge lp:~ciemon/ubuntu/lucid/predict/4-fixes into lp:ubuntu/lucid/predict

  1. Lucid (10.04)
  2. 4-fixes
  3. Merge into lucid
Proposed by Ciemon Dunville
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ciemon/ubuntu/lucid/predict/4-fixes
Merge into: lp:ubuntu/lucid/predict
Diff against target: 806 lines (+781/-0)
4 files modified
debian/changelog (+11/-0)
debian/patches/141_buffer_overflow.diff (+28/-0)
debian/patches/180_reworked_gui.diff (+739/-0)
debian/patches/series (+3/-0)
To merge this branch: bzr merge lp:~ciemon/ubuntu/lucid/predict/4-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+23223@code.launchpad.net

Description of the change

This branch has 5 patches included:

552568 - adds support for hamlib's rotctld rotator control daemon.
553106 - adds control for gsat and all radios and rotators supported by hamlib.
553140 - fixes buffer overflow in predict-g1yyh
555706 - resizes and repositions the widgets after gtk2 update broke them.

Packages for testing are available in my PPA
https://launchpad.net/~ciemon/+archive/ciemon/+sourcepub/1075094/+listing-archive-extra

To post a comment you must log in.
lp:~ciemon/ubuntu/lucid/predict/4-fixes updated
12. By Ciemon Dunville

Removed patches 150_rotctld.diff 160_rotctld-g1yyh.diff and 170_gsat_hamlib_plugins.diff due to feature freeze

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-31 10:18:23 +0000
3+++ debian/changelog 2010-04-13 18:04:25 +0000
4@@ -1,3 +1,14 @@
5+predict (2.2.3-2ubuntu2) lucid; urgency=low
6+
7+ * debian/patches/180_reworked_gui.diff: resizes and repositions
8+ widgets after GTK2 changes. Patch courtesy of Norvald H. Ryeng
9+ (LP: #555706)
10+ * debian/patches/141_buffer_overflow.diff: Fix a buffer overflow that
11+ makes predict-g1yyh crash when printing predictions (p, v, s, n and
12+ o commands). Patch courtesy of Norvald H. Ryeng (LP: #553140)
13+
14+ -- Ciemon Dunville <ciemon@gmail.com> Tue, 13 Apr 2010 18:53:40 +0100
15+
16 predict (2.2.3-2ubuntu1) lucid; urgency=low
17
18 * Apply patch to fix buffer overflow on launching with -s (patch from
19
20=== added file 'debian/patches/141_buffer_overflow.diff'
21--- debian/patches/141_buffer_overflow.diff 1970-01-01 00:00:00 +0000
22+++ debian/patches/141_buffer_overflow.diff 2010-04-13 18:04:25 +0000
23@@ -0,0 +1,28 @@
24+## Description: The attached patch extends header line 2 (head2) with an extra byte for the terminating \0 and shortens two strings that were 1 byte too long.
25+## Origin/Author: Norvald H. Ryeng
26+## Bug: https://bugs.launchpad.net/ubuntu/+source/predict/+bug/553140
27+Index: predict-2.2.3/predict-g1yyh.c
28+===================================================================
29+--- predict-2.2.3.orig/predict-g1yyh.c 2010-04-01 11:03:53.472663321 +0200
30++++ predict-2.2.3/predict-g1yyh.c 2010-04-01 11:11:19.876662739 +0200
31+@@ -4018,7 +4018,7 @@
32+ /* This function buffers and displays orbital predictions
33+ and allows screens to be saved to a disk file. */
34+
35+- char type[20], spaces[80], head1[80], head2[80];
36++ char type[20], spaces[80], head1[80], head2[81];
37+ int key, ans=0, l, x, t;
38+ static char buffer[5000], lines, quit;
39+ static FILE *fd;
40+@@ -4068,9 +4068,9 @@
41+ sprintf(head2," Date Mins/Day Sun Date Mins/Day Sun ");
42+ else {
43+ if (calc_squint)
44+- sprintf(head2," Date Time El Az Phase %s %s Range Squint ",(io_lat=='N'?"LatN":"LatS"),(io_lon=='W'?"LonW":"LonE"));
45++ sprintf(head2," Date Time El Az Phase %s %s Range Squint ",(io_lat=='N'?"LatN":"LatS"),(io_lon=='W'?"LonW":"LonE"));
46+ else
47+- sprintf(head2," Date Time El Az Phase %s %s Range Orbit ",(io_lat=='N'?"LatN":"LatS"),(io_lon=='W'?"LonW":"LonE"));
48++ sprintf(head2," Date Time El Az Phase %s %s Range Orbit ",(io_lat=='N'?"LatN":"LatS"),(io_lon=='W'?"LonW":"LonE"));
49+ }
50+ }
51+
52
53=== added file 'debian/patches/180_reworked_gui.diff'
54--- debian/patches/180_reworked_gui.diff 1970-01-01 00:00:00 +0000
55+++ debian/patches/180_reworked_gui.diff 2010-04-13 18:04:25 +0000
56@@ -0,0 +1,739 @@
57+## Description: resizes and repositions widgets after GTK2 changes.
58+## Origin/Author: Norvald H. Ryeng
59+## Bug: https://bugs.launchpad.net/ubuntu/+source/predict/+bug/555706
60+--- a/clients/gsat-1.1.0/src/interface.c
61++++ b/clients/gsat-1.1.0/src/interface.c
62+@@ -18,6 +18,15 @@
63+ #include "interface.h"
64+ #include "support.h"
65+
66++void set_font (GtkWidget *widget, gpointer data)
67++{
68++ PangoFontDescription *font = (PangoFontDescription *) data;
69++ if (GTK_IS_WIDGET (widget))
70++ gtk_widget_modify_font (widget, font);
71++ if (GTK_IS_CONTAINER (widget))
72++ gtk_container_forall(GTK_CONTAINER (widget), &set_font, data);
73++}
74++
75+ GtkWidget*
76+ create_mainwindow (void)
77+ {
78+@@ -94,6 +103,7 @@
79+ GtkWidget *lb_velocity;
80+ GtkWidget *lb_ma;
81+ GtkWidget *lb_squint;
82++ PangoFontDescription *font_desc;
83+
84+ mainwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
85+ gtk_widget_set_name (mainwindow, "mainwindow");
86+@@ -331,8 +341,8 @@
87+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "drawingframe", drawingframe,
88+ (GtkDestroyNotify) gtk_widget_unref);
89+ gtk_widget_show (drawingframe);
90+- gtk_fixed_put (GTK_FIXED (fixed), drawingframe, 0, 24);
91+- gtk_widget_set_uposition (drawingframe, 0, 24);
92++ gtk_fixed_put (GTK_FIXED (fixed), drawingframe, 0, 30);
93++ gtk_widget_set_uposition (drawingframe, 0, 30);
94+ gtk_widget_set_usize (drawingframe, 704, 354);
95+ gtk_container_set_border_width (GTK_CONTAINER (drawingframe), 2);
96+ gtk_frame_set_shadow_type (GTK_FRAME (drawingframe), GTK_SHADOW_ETCHED_OUT);
97+@@ -349,14 +359,15 @@
98+
99+ /* toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT); */
100+ toolbar = gtk_toolbar_new ();
101++ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
102+ gtk_widget_set_name (toolbar, "toolbar");
103+ gtk_widget_ref (toolbar);
104+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "toolbar", toolbar,
105+ (GtkDestroyNotify) gtk_widget_unref);
106+ gtk_widget_show (toolbar);
107+- gtk_fixed_put (GTK_FIXED (fixed), toolbar, 0, 0);
108+- gtk_widget_set_uposition (toolbar, 0, 0);
109+- gtk_widget_set_usize (toolbar, 696, 24);
110++ gtk_fixed_put (GTK_FIXED (fixed), toolbar, -12, -12);
111++ gtk_widget_set_uposition (toolbar, -12, -12);
112++ gtk_widget_set_usize (toolbar, 720, 48);
113+ gtk_container_set_border_width (GTK_CONTAINER (toolbar), 5);
114+ /* gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 10); */
115+ /* gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE); */
116+@@ -568,8 +579,8 @@
117+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_downlink", lb_downlink,
118+ (GtkDestroyNotify) gtk_widget_unref);
119+ gtk_widget_show (lb_downlink);
120+- gtk_fixed_put (GTK_FIXED (fixed), lb_downlink, 8, 500);
121+- gtk_widget_set_uposition (lb_downlink, 8, 500);
122++ gtk_fixed_put (GTK_FIXED (fixed), lb_downlink, 4, 500);
123++ gtk_widget_set_uposition (lb_downlink, 4, 500);
124+ gtk_widget_set_usize (lb_downlink, 0, 0);
125+
126+ lb_beacon = gtk_label_new (_("Beacon Frequency"));
127+@@ -578,8 +589,8 @@
128+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_beacon", lb_beacon,
129+ (GtkDestroyNotify) gtk_widget_unref);
130+ gtk_widget_show (lb_beacon);
131+- gtk_fixed_put (GTK_FIXED (fixed), lb_beacon, 8, 524);
132+- gtk_widget_set_uposition (lb_beacon, 8, 524);
133++ gtk_fixed_put (GTK_FIXED (fixed), lb_beacon, 4, 524);
134++ gtk_widget_set_uposition (lb_beacon, 4, 524);
135+ gtk_widget_set_usize (lb_beacon, 0, 0);
136+
137+ lb_satellite = gtk_label_new (_("Satellite"));
138+@@ -588,8 +599,8 @@
139+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_satellite", lb_satellite,
140+ (GtkDestroyNotify) gtk_widget_unref);
141+ gtk_widget_show (lb_satellite);
142+- gtk_fixed_put (GTK_FIXED (fixed), lb_satellite, 8, 388);
143+- gtk_widget_set_uposition (lb_satellite, 8, 388);
144++ gtk_fixed_put (GTK_FIXED (fixed), lb_satellite, 4, 388);
145++ gtk_widget_set_uposition (lb_satellite, 4, 388);
146+ gtk_widget_set_usize (lb_satellite, 0, 0);
147+
148+ lb_uplink = gtk_label_new (_("Uplink Frequency"));
149+@@ -598,8 +609,8 @@
150+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_uplink", lb_uplink,
151+ (GtkDestroyNotify) gtk_widget_unref);
152+ gtk_widget_show (lb_uplink);
153+- gtk_fixed_put (GTK_FIXED (fixed), lb_uplink, 8, 476);
154+- gtk_widget_set_uposition (lb_uplink, 8, 476);
155++ gtk_fixed_put (GTK_FIXED (fixed), lb_uplink, 4, 476);
156++ gtk_widget_set_uposition (lb_uplink, 4, 476);
157+ gtk_widget_set_usize (lb_uplink, 0, 0);
158+
159+ lb_latitude = gtk_label_new (_("Latitude"));
160+@@ -608,8 +619,8 @@
161+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_latitude", lb_latitude,
162+ (GtkDestroyNotify) gtk_widget_unref);
163+ gtk_widget_show (lb_latitude);
164+- gtk_fixed_put (GTK_FIXED (fixed), lb_latitude, 8, 416);
165+- gtk_widget_set_uposition (lb_latitude, 8, 416);
166++ gtk_fixed_put (GTK_FIXED (fixed), lb_latitude, 4, 416);
167++ gtk_widget_set_uposition (lb_latitude, 4, 416);
168+ gtk_widget_set_usize (lb_latitude, 0, 0);
169+
170+ lb_longitude = gtk_label_new (_("Longitude"));
171+@@ -618,8 +629,8 @@
172+ gtk_object_set_data_full (GTK_OBJECT (mainwindow), "lb_longitude", lb_longitude,
173+ (GtkDestroyNotify) gtk_widget_unref);
174+ gtk_widget_show (lb_longitude);
175+- gtk_fixed_put (GTK_FIXED (fixed), lb_longitude, 8, 444);
176+- gtk_widget_set_uposition (lb_longitude, 8, 444);
177++ gtk_fixed_put (GTK_FIXED (fixed), lb_longitude, 4, 444);
178++ gtk_widget_set_uposition (lb_longitude, 4, 444);
179+ gtk_widget_set_usize (lb_longitude, 0, 0);
180+
181+ lb_orbit = gtk_label_new (_("Orbit"));
182+@@ -955,6 +966,13 @@
183+
184+ gtk_widget_grab_focus (combo_tx_satname);
185+ gtk_widget_grab_default (combo_tx_satname);
186++
187++ font_desc = gtk_widget_get_style (mainwindow)->font_desc;
188++ pango_font_description_set_absolute_size (font_desc, 10 * PANGO_SCALE);
189++ set_font (mainwindow, font_desc);
190++ pango_font_description_set_absolute_size (font_desc, 9 * PANGO_SCALE);
191++ set_font (toolbar, font_desc);
192++
193+ return mainwindow;
194+ }
195+
196+@@ -1071,8 +1089,8 @@
197+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_downpluginconfig", tx_downpluginconfig,
198+ (GtkDestroyNotify) gtk_widget_unref);
199+ gtk_widget_show (tx_downpluginconfig);
200+- gtk_fixed_put (GTK_FIXED (fixed3), tx_downpluginconfig, 104, 40);
201+- gtk_widget_set_uposition (tx_downpluginconfig, 104, 40);
202++ gtk_fixed_put (GTK_FIXED (fixed3), tx_downpluginconfig, 420, 70);
203++ gtk_widget_set_uposition (tx_downpluginconfig, 420, 70);
204+ gtk_widget_set_usize (tx_downpluginconfig, 160, 24);
205+
206+ tx_uppluginconfig = gtk_entry_new ();
207+@@ -1081,8 +1099,8 @@
208+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_uppluginconfig", tx_uppluginconfig,
209+ (GtkDestroyNotify) gtk_widget_unref);
210+ gtk_widget_show (tx_uppluginconfig);
211+- gtk_fixed_put (GTK_FIXED (fixed3), tx_uppluginconfig, 104, 112);
212+- gtk_widget_set_uposition (tx_uppluginconfig, 104, 112);
213++ gtk_fixed_put (GTK_FIXED (fixed3), tx_uppluginconfig, 420, 142);
214++ gtk_widget_set_uposition (tx_uppluginconfig, 420, 142);
215+ gtk_widget_set_usize (tx_uppluginconfig, 160, 24);
216+
217+ tx_beaconpluginconfig = gtk_entry_new ();
218+@@ -1091,8 +1109,8 @@
219+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_beaconpluginconfig", tx_beaconpluginconfig,
220+ (GtkDestroyNotify) gtk_widget_unref);
221+ gtk_widget_show (tx_beaconpluginconfig);
222+- gtk_fixed_put (GTK_FIXED (fixed3), tx_beaconpluginconfig, 104, 184);
223+- gtk_widget_set_uposition (tx_beaconpluginconfig, 104, 184);
224++ gtk_fixed_put (GTK_FIXED (fixed3), tx_beaconpluginconfig, 420, 214);
225++ gtk_widget_set_uposition (tx_beaconpluginconfig, 420, 214);
226+ gtk_widget_set_usize (tx_beaconpluginconfig, 160, 24);
227+
228+ lb_prefs_upconfig = gtk_label_new (_("Plugin Config"));
229+@@ -1101,8 +1119,8 @@
230+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_upconfig", lb_prefs_upconfig,
231+ (GtkDestroyNotify) gtk_widget_unref);
232+ gtk_widget_show (lb_prefs_upconfig);
233+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_upconfig, 0, 112);
234+- gtk_widget_set_uposition (lb_prefs_upconfig, 0, 112);
235++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_upconfig, 310, 142);
236++ gtk_widget_set_uposition (lb_prefs_upconfig, 310, 142);
237+ gtk_widget_set_usize (lb_prefs_upconfig, 96, 24);
238+
239+ lb_prefs_beacon = gtk_label_new (_("Beacon plugin"));
240+@@ -1111,8 +1129,8 @@
241+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_beacon", lb_prefs_beacon,
242+ (GtkDestroyNotify) gtk_widget_unref);
243+ gtk_widget_show (lb_prefs_beacon);
244+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beacon, 0, 152);
245+- gtk_widget_set_uposition (lb_prefs_beacon, 0, 152);
246++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beacon, 310, 182);
247++ gtk_widget_set_uposition (lb_prefs_beacon, 310, 182);
248+ gtk_widget_set_usize (lb_prefs_beacon, 96, 24);
249+
250+ lb_prefs_beaconconfig = gtk_label_new (_("Plugin Config"));
251+@@ -1121,8 +1139,8 @@
252+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_beaconconfig", lb_prefs_beaconconfig,
253+ (GtkDestroyNotify) gtk_widget_unref);
254+ gtk_widget_show (lb_prefs_beaconconfig);
255+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beaconconfig, 0, 184);
256+- gtk_widget_set_uposition (lb_prefs_beaconconfig, 0, 184);
257++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_beaconconfig, 310, 214);
258++ gtk_widget_set_uposition (lb_prefs_beaconconfig, 310, 214);
259+ gtk_widget_set_usize (lb_prefs_beaconconfig, 96, 24);
260+
261+ combo_downplugin = gtk_combo_new ();
262+@@ -1131,8 +1149,8 @@
263+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_downplugin", combo_downplugin,
264+ (GtkDestroyNotify) gtk_widget_unref);
265+ gtk_widget_show (combo_downplugin);
266+- gtk_fixed_put (GTK_FIXED (fixed3), combo_downplugin, 104, 8);
267+- gtk_widget_set_uposition (combo_downplugin, 104, 8);
268++ gtk_fixed_put (GTK_FIXED (fixed3), combo_downplugin, 420, 38);
269++ gtk_widget_set_uposition (combo_downplugin, 420, 38);
270+ gtk_widget_set_usize (combo_downplugin, 160, 24);
271+
272+ entry_downplugin = GTK_COMBO (combo_downplugin)->entry;
273+@@ -1149,8 +1167,8 @@
274+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_beaconplugin", combo_beaconplugin,
275+ (GtkDestroyNotify) gtk_widget_unref);
276+ gtk_widget_show (combo_beaconplugin);
277+- gtk_fixed_put (GTK_FIXED (fixed3), combo_beaconplugin, 104, 152);
278+- gtk_widget_set_uposition (combo_beaconplugin, 104, 152);
279++ gtk_fixed_put (GTK_FIXED (fixed3), combo_beaconplugin, 420, 182);
280++ gtk_widget_set_uposition (combo_beaconplugin, 420, 182);
281+ gtk_widget_set_usize (combo_beaconplugin, 160, 24);
282+
283+ entry_beaconplugin = GTK_COMBO (combo_beaconplugin)->entry;
284+@@ -1167,9 +1185,9 @@
285+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_downlink", lb_prefs_downlink,
286+ (GtkDestroyNotify) gtk_widget_unref);
287+ gtk_widget_show (lb_prefs_downlink);
288+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downlink, 0, 8);
289+- gtk_widget_set_uposition (lb_prefs_downlink, 0, 8);
290+- gtk_widget_set_usize (lb_prefs_downlink, 96, 24);
291++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downlink, 310, 38);
292++ gtk_widget_set_uposition (lb_prefs_downlink, 310, 38);
293++ gtk_widget_set_usize (lb_prefs_downlink, 106, 24);
294+
295+ lb_prefs_downconfig = gtk_label_new (_("Plugin Config"));
296+ gtk_widget_set_name (lb_prefs_downconfig, "lb_prefs_downconfig");
297+@@ -1177,8 +1195,8 @@
298+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_downconfig", lb_prefs_downconfig,
299+ (GtkDestroyNotify) gtk_widget_unref);
300+ gtk_widget_show (lb_prefs_downconfig);
301+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downconfig, 0, 40);
302+- gtk_widget_set_uposition (lb_prefs_downconfig, 0, 40);
303++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_downconfig, 310, 70);
304++ gtk_widget_set_uposition (lb_prefs_downconfig, 310, 70);
305+ gtk_widget_set_usize (lb_prefs_downconfig, 96, 24);
306+
307+ lb_prefs_uplink = gtk_label_new (_("Uplink plugin"));
308+@@ -1187,8 +1205,8 @@
309+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_uplink", lb_prefs_uplink,
310+ (GtkDestroyNotify) gtk_widget_unref);
311+ gtk_widget_show (lb_prefs_uplink);
312+- gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_uplink, 0, 80);
313+- gtk_widget_set_uposition (lb_prefs_uplink, 0, 80);
314++ gtk_fixed_put (GTK_FIXED (fixed3), lb_prefs_uplink, 310, 110);
315++ gtk_widget_set_uposition (lb_prefs_uplink, 310, 110);
316+ gtk_widget_set_usize (lb_prefs_uplink, 96, 24);
317+
318+ combo_upplugin = gtk_combo_new ();
319+@@ -1197,8 +1215,8 @@
320+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_upplugin", combo_upplugin,
321+ (GtkDestroyNotify) gtk_widget_unref);
322+ gtk_widget_show (combo_upplugin);
323+- gtk_fixed_put (GTK_FIXED (fixed3), combo_upplugin, 104, 80);
324+- gtk_widget_set_uposition (combo_upplugin, 104, 80);
325++ gtk_fixed_put (GTK_FIXED (fixed3), combo_upplugin, 420, 110);
326++ gtk_widget_set_uposition (combo_upplugin, 420, 110);
327+ gtk_widget_set_usize (combo_upplugin, 160, 24);
328+
329+ entry_upplugin = GTK_COMBO (combo_upplugin)->entry;
330+@@ -1234,8 +1252,8 @@
331+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_rotorpluginconfig", tx_rotorpluginconfig,
332+ (GtkDestroyNotify) gtk_widget_unref);
333+ gtk_widget_show (tx_rotorpluginconfig);
334+- gtk_fixed_put (GTK_FIXED (fixed8), tx_rotorpluginconfig, 96, 40);
335+- gtk_widget_set_uposition (tx_rotorpluginconfig, 96, 40);
336++ gtk_fixed_put (GTK_FIXED (fixed8), tx_rotorpluginconfig, 420, 310);
337++ gtk_widget_set_uposition (tx_rotorpluginconfig, 420, 310);
338+ gtk_widget_set_usize (tx_rotorpluginconfig, 160, 24);
339+
340+ lb_prefs_rotor = gtk_label_new (_("Rotor plugin"));
341+@@ -1244,8 +1262,8 @@
342+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_rotor", lb_prefs_rotor,
343+ (GtkDestroyNotify) gtk_widget_unref);
344+ gtk_widget_show (lb_prefs_rotor);
345+- gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotor, 0, 8);
346+- gtk_widget_set_uposition (lb_prefs_rotor, 0, 8);
347++ gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotor, 310, 278);
348++ gtk_widget_set_uposition (lb_prefs_rotor, 310, 278);
349+ gtk_widget_set_usize (lb_prefs_rotor, 96, 24);
350+
351+ lb_prefs_rotorpluginconfig = gtk_label_new (_("Plugin Config"));
352+@@ -1254,8 +1272,8 @@
353+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_rotorpluginconfig", lb_prefs_rotorpluginconfig,
354+ (GtkDestroyNotify) gtk_widget_unref);
355+ gtk_widget_show (lb_prefs_rotorpluginconfig);
356+- gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotorpluginconfig, 0, 40);
357+- gtk_widget_set_uposition (lb_prefs_rotorpluginconfig, 0, 40);
358++ gtk_fixed_put (GTK_FIXED (fixed8), lb_prefs_rotorpluginconfig, 310, 310);
359++ gtk_widget_set_uposition (lb_prefs_rotorpluginconfig, 310, 310);
360+ gtk_widget_set_usize (lb_prefs_rotorpluginconfig, 96, 24);
361+
362+ combo_rotorplugin = gtk_combo_new ();
363+@@ -1264,8 +1282,8 @@
364+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "combo_rotorplugin", combo_rotorplugin,
365+ (GtkDestroyNotify) gtk_widget_unref);
366+ gtk_widget_show (combo_rotorplugin);
367+- gtk_fixed_put (GTK_FIXED (fixed8), combo_rotorplugin, 96, 8);
368+- gtk_widget_set_uposition (combo_rotorplugin, 96, 8);
369++ gtk_fixed_put (GTK_FIXED (fixed8), combo_rotorplugin, 420, 278);
370++ gtk_widget_set_uposition (combo_rotorplugin, 420, 278);
371+ gtk_widget_set_usize (combo_rotorplugin, 160, 24);
372+
373+ entry_rotorplugin = GTK_COMBO (combo_rotorplugin)->entry;
374+@@ -1301,8 +1319,8 @@
375+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_aoscommand", tx_aoscommand,
376+ (GtkDestroyNotify) gtk_widget_unref);
377+ gtk_widget_show (tx_aoscommand);
378+- gtk_fixed_put (GTK_FIXED (fixed2), tx_aoscommand, 104, 216);
379+- gtk_widget_set_uposition (tx_aoscommand, 104, 216);
380++ gtk_fixed_put (GTK_FIXED (fixed2), tx_aoscommand, 126, 278);
381++ gtk_widget_set_uposition (tx_aoscommand, 126, 278);
382+ gtk_widget_set_usize (tx_aoscommand, 160, 24);
383+
384+ tx_loscommand = gtk_entry_new ();
385+@@ -1311,8 +1329,8 @@
386+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "tx_loscommand", tx_loscommand,
387+ (GtkDestroyNotify) gtk_widget_unref);
388+ gtk_widget_show (tx_loscommand);
389+- gtk_fixed_put (GTK_FIXED (fixed2), tx_loscommand, 104, 264);
390+- gtk_widget_set_uposition (tx_loscommand, 104, 264);
391++ gtk_fixed_put (GTK_FIXED (fixed2), tx_loscommand, 126, 310);
392++ gtk_widget_set_uposition (tx_loscommand, 126, 310);
393+ gtk_widget_set_usize (tx_loscommand, 160, 24);
394+
395+ lb_prefs_time = gtk_label_new (_("Time format"));
396+@@ -1321,9 +1339,9 @@
397+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_time", lb_prefs_time,
398+ (GtkDestroyNotify) gtk_widget_unref);
399+ gtk_widget_show (lb_prefs_time);
400+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_time, 8, 48);
401+- gtk_widget_set_uposition (lb_prefs_time, 8, 48);
402+- gtk_widget_set_usize (lb_prefs_time, 88, 24);
403++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_time, 16, 70);
404++ gtk_widget_set_uposition (lb_prefs_time, 16, 70);
405++ gtk_widget_set_usize (lb_prefs_time, 84, 24);
406+
407+ rd_prefs_local = gtk_radio_button_new_with_label (timeprefs_group, _("Local time"));
408+ timeprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_local));
409+@@ -1332,9 +1350,9 @@
410+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_local", rd_prefs_local,
411+ (GtkDestroyNotify) gtk_widget_unref);
412+ gtk_widget_show (rd_prefs_local);
413+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_local, 104, 48);
414+- gtk_widget_set_uposition (rd_prefs_local, 104, 48);
415+- gtk_widget_set_usize (rd_prefs_local, 64, 24);
416++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_local, 146, 70);
417++ gtk_widget_set_uposition (rd_prefs_local, 146, 70);
418++ gtk_widget_set_usize (rd_prefs_local, 94, 24);
419+
420+ rd_prefs_utc = gtk_radio_button_new_with_label (timeprefs_group, _("UTC time"));
421+ timeprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_utc));
422+@@ -1343,9 +1361,9 @@
423+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_utc", rd_prefs_utc,
424+ (GtkDestroyNotify) gtk_widget_unref);
425+ gtk_widget_show (rd_prefs_utc);
426+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_utc, 176, 48);
427+- gtk_widget_set_uposition (rd_prefs_utc, 176, 48);
428+- gtk_widget_set_usize (rd_prefs_utc, 64, 24);
429++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_utc, 146, 90);
430++ gtk_widget_set_uposition (rd_prefs_utc, 146, 90);
431++ gtk_widget_set_usize (rd_prefs_utc, 94, 24);
432+
433+ lb_prefs_grid = gtk_label_new (_("Map grid"));
434+ gtk_widget_set_name (lb_prefs_grid, "lb_prefs_grid");
435+@@ -1353,9 +1371,9 @@
436+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_grid", lb_prefs_grid,
437+ (GtkDestroyNotify) gtk_widget_unref);
438+ gtk_widget_show (lb_prefs_grid);
439+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_grid, 8, 16);
440+- gtk_widget_set_uposition (lb_prefs_grid, 8, 16);
441+- gtk_widget_set_usize (lb_prefs_grid, 88, 24);
442++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_grid, 16, 38);
443++ gtk_widget_set_uposition (lb_prefs_grid, 16, 38);
444++ gtk_widget_set_usize (lb_prefs_grid, 58, 24);
445+
446+ rd_prefs_gridon = gtk_radio_button_new_with_label (gridprefs_group, _("On"));
447+ gridprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_gridon));
448+@@ -1364,8 +1382,8 @@
449+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_gridon", rd_prefs_gridon,
450+ (GtkDestroyNotify) gtk_widget_unref);
451+ gtk_widget_show (rd_prefs_gridon);
452+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridon, 104, 16);
453+- gtk_widget_set_uposition (rd_prefs_gridon, 104, 16);
454++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridon, 146, 38);
455++ gtk_widget_set_uposition (rd_prefs_gridon, 146, 38);
456+ gtk_widget_set_usize (rd_prefs_gridon, 48, 24);
457+
458+ rd_prefs_gridoff = gtk_radio_button_new_with_label (gridprefs_group, _("Off"));
459+@@ -1375,8 +1393,8 @@
460+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_gridoff", rd_prefs_gridoff,
461+ (GtkDestroyNotify) gtk_widget_unref);
462+ gtk_widget_show (rd_prefs_gridoff);
463+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridoff, 152, 16);
464+- gtk_widget_set_uposition (rd_prefs_gridoff, 152, 16);
465++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_gridoff, 194, 38);
466++ gtk_widget_set_uposition (rd_prefs_gridoff, 194, 38);
467+ gtk_widget_set_usize (rd_prefs_gridoff, 48, 24);
468+
469+ lb_prefs_fpsat = gtk_label_new (_("Satellite footprint"));
470+@@ -1385,9 +1403,9 @@
471+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_fpsat", lb_prefs_fpsat,
472+ (GtkDestroyNotify) gtk_widget_unref);
473+ gtk_widget_show (lb_prefs_fpsat);
474+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpsat, 8, 80);
475+- gtk_widget_set_uposition (lb_prefs_fpsat, 8, 80);
476+- gtk_widget_set_usize (lb_prefs_fpsat, 88, 24);
477++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpsat, 16, 122);
478++ gtk_widget_set_uposition (lb_prefs_fpsat, 16, 122);
479++ gtk_widget_set_usize (lb_prefs_fpsat, 114, 24);
480+
481+ rd_prefs_fpsaton = gtk_radio_button_new_with_label (fpsatprefs_group, _("On"));
482+ fpsatprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_fpsaton));
483+@@ -1396,8 +1414,8 @@
484+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpsaton", rd_prefs_fpsaton,
485+ (GtkDestroyNotify) gtk_widget_unref);
486+ gtk_widget_show (rd_prefs_fpsaton);
487+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsaton, 104, 80);
488+- gtk_widget_set_uposition (rd_prefs_fpsaton, 104, 80);
489++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsaton, 146, 122);
490++ gtk_widget_set_uposition (rd_prefs_fpsaton, 146, 122);
491+ gtk_widget_set_usize (rd_prefs_fpsaton, 48, 24);
492+
493+ rd_prefs_fpsatoff = gtk_radio_button_new_with_label (fpsatprefs_group, _("Off"));
494+@@ -1407,8 +1425,8 @@
495+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpsatoff", rd_prefs_fpsatoff,
496+ (GtkDestroyNotify) gtk_widget_unref);
497+ gtk_widget_show (rd_prefs_fpsatoff);
498+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsatoff, 152, 80);
499+- gtk_widget_set_uposition (rd_prefs_fpsatoff, 152, 80);
500++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpsatoff, 194, 122);
501++ gtk_widget_set_uposition (rd_prefs_fpsatoff, 194, 122);
502+ gtk_widget_set_usize (rd_prefs_fpsatoff, 48, 24);
503+
504+ lb_prefs_fpqth = gtk_label_new (_("Station footprint"));
505+@@ -1417,9 +1435,9 @@
506+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_fpqth", lb_prefs_fpqth,
507+ (GtkDestroyNotify) gtk_widget_unref);
508+ gtk_widget_show (lb_prefs_fpqth);
509+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpqth, 8, 112);
510+- gtk_widget_set_uposition (lb_prefs_fpqth, 8, 112);
511+- gtk_widget_set_usize (lb_prefs_fpqth, 88, 24);
512++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_fpqth, 16, 154);
513++ gtk_widget_set_uposition (lb_prefs_fpqth, 16, 154);
514++ gtk_widget_set_usize (lb_prefs_fpqth, 108, 24);
515+
516+ rd_prefs_fpqthon = gtk_radio_button_new_with_label (fpqthprefs_group, _("On"));
517+ fpqthprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_fpqthon));
518+@@ -1428,8 +1446,8 @@
519+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpqthon", rd_prefs_fpqthon,
520+ (GtkDestroyNotify) gtk_widget_unref);
521+ gtk_widget_show (rd_prefs_fpqthon);
522+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthon, 104, 112);
523+- gtk_widget_set_uposition (rd_prefs_fpqthon, 104, 112);
524++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthon, 146, 154);
525++ gtk_widget_set_uposition (rd_prefs_fpqthon, 146, 154);
526+ gtk_widget_set_usize (rd_prefs_fpqthon, 48, 24);
527+
528+ rd_prefs_fpqthoff = gtk_radio_button_new_with_label (fpqthprefs_group, _("Off"));
529+@@ -1439,8 +1457,8 @@
530+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_fpqthoff", rd_prefs_fpqthoff,
531+ (GtkDestroyNotify) gtk_widget_unref);
532+ gtk_widget_show (rd_prefs_fpqthoff);
533+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthoff, 152, 112);
534+- gtk_widget_set_uposition (rd_prefs_fpqthoff, 152, 112);
535++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_fpqthoff, 194, 154);
536++ gtk_widget_set_uposition (rd_prefs_fpqthoff, 194, 154);
537+ gtk_widget_set_usize (rd_prefs_fpqthoff, 48, 24);
538+
539+ lb_prefs_track = gtk_label_new (_("Ground Track"));
540+@@ -1449,8 +1467,8 @@
541+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_track", lb_prefs_track,
542+ (GtkDestroyNotify) gtk_widget_unref);
543+ gtk_widget_show (lb_prefs_track);
544+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_track, 8, 144);
545+- gtk_widget_set_uposition (lb_prefs_track, 8, 144);
546++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_track, 16, 186);
547++ gtk_widget_set_uposition (lb_prefs_track, 16, 186);
548+ gtk_widget_set_usize (lb_prefs_track, 88, 24);
549+
550+ rd_prefs_trackon = gtk_radio_button_new_with_label (trackprefs_group, _("On"));
551+@@ -1460,8 +1478,8 @@
552+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_trackon", rd_prefs_trackon,
553+ (GtkDestroyNotify) gtk_widget_unref);
554+ gtk_widget_show (rd_prefs_trackon);
555+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackon, 104, 144);
556+- gtk_widget_set_uposition (rd_prefs_trackon, 104, 144);
557++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackon, 146, 186);
558++ gtk_widget_set_uposition (rd_prefs_trackon, 146, 186);
559+ gtk_widget_set_usize (rd_prefs_trackon, 48, 24);
560+
561+ rd_prefs_trackoff = gtk_radio_button_new_with_label (trackprefs_group, _("Off"));
562+@@ -1471,8 +1489,8 @@
563+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_trackoff", rd_prefs_trackoff,
564+ (GtkDestroyNotify) gtk_widget_unref);
565+ gtk_widget_show (rd_prefs_trackoff);
566+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackoff, 152, 144);
567+- gtk_widget_set_uposition (rd_prefs_trackoff, 152, 144);
568++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_trackoff, 194, 186);
569++ gtk_widget_set_uposition (rd_prefs_trackoff, 194, 186);
570+ gtk_widget_set_usize (rd_prefs_trackoff, 48, 24);
571+
572+ lb_prefs_autofreq = gtk_label_new (_("Auto Frequency"));
573+@@ -1481,9 +1499,9 @@
574+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_autofreq", lb_prefs_autofreq,
575+ (GtkDestroyNotify) gtk_widget_unref);
576+ gtk_widget_show (lb_prefs_autofreq);
577+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_autofreq, 8, 176);
578+- gtk_widget_set_uposition (lb_prefs_autofreq, 8, 176);
579+- gtk_widget_set_usize (lb_prefs_autofreq, 88, 24);
580++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_autofreq, 16, 218);
581++ gtk_widget_set_uposition (lb_prefs_autofreq, 16, 218);
582++ gtk_widget_set_usize (lb_prefs_autofreq, 108, 24);
583+
584+ rd_prefs_autofreqon = gtk_radio_button_new_with_label (autofreqprefs_group, _("On"));
585+ autofreqprefs_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rd_prefs_autofreqon));
586+@@ -1492,8 +1510,8 @@
587+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_autofreqon", rd_prefs_autofreqon,
588+ (GtkDestroyNotify) gtk_widget_unref);
589+ gtk_widget_show (rd_prefs_autofreqon);
590+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqon, 104, 176);
591+- gtk_widget_set_uposition (rd_prefs_autofreqon, 104, 176);
592++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqon, 146, 218);
593++ gtk_widget_set_uposition (rd_prefs_autofreqon, 146, 218);
594+ gtk_widget_set_usize (rd_prefs_autofreqon, 48, 24);
595+
596+ rd_prefs_autofreqoff = gtk_radio_button_new_with_label (autofreqprefs_group, _("Off"));
597+@@ -1503,8 +1521,8 @@
598+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "rd_prefs_autofreqoff", rd_prefs_autofreqoff,
599+ (GtkDestroyNotify) gtk_widget_unref);
600+ gtk_widget_show (rd_prefs_autofreqoff);
601+- gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqoff, 152, 176);
602+- gtk_widget_set_uposition (rd_prefs_autofreqoff, 152, 176);
603++ gtk_fixed_put (GTK_FIXED (fixed2), rd_prefs_autofreqoff, 194, 218);
604++ gtk_widget_set_uposition (rd_prefs_autofreqoff, 194, 218);
605+ gtk_widget_set_usize (rd_prefs_autofreqoff, 48, 24);
606+
607+ lb_prefs_aoscommand = gtk_label_new (_("AOS command"));
608+@@ -1513,8 +1531,8 @@
609+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_aoscommand", lb_prefs_aoscommand,
610+ (GtkDestroyNotify) gtk_widget_unref);
611+ gtk_widget_show (lb_prefs_aoscommand);
612+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_aoscommand, 8, 216);
613+- gtk_widget_set_uposition (lb_prefs_aoscommand, 8, 216);
614++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_aoscommand, 16, 278);
615++ gtk_widget_set_uposition (lb_prefs_aoscommand, 16, 278);
616+ gtk_widget_set_usize (lb_prefs_aoscommand, 96, 24);
617+
618+ lb_prefs_loscommand = gtk_label_new (_("LOS command"));
619+@@ -1523,8 +1541,8 @@
620+ gtk_object_set_data_full (GTK_OBJECT (dialog_preferences), "lb_prefs_loscommand", lb_prefs_loscommand,
621+ (GtkDestroyNotify) gtk_widget_unref);
622+ gtk_widget_show (lb_prefs_loscommand);
623+- gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_loscommand, 8, 264);
624+- gtk_widget_set_uposition (lb_prefs_loscommand, 8, 264);
625++ gtk_fixed_put (GTK_FIXED (fixed2), lb_prefs_loscommand, 16, 310);
626++ gtk_widget_set_uposition (lb_prefs_loscommand, 16, 310);
627+ gtk_widget_set_usize (lb_prefs_loscommand, 96, 24);
628+
629+ dialog_action_area1 = GTK_DIALOG (dialog_preferences)->action_area;
630+@@ -1817,8 +1835,7 @@
631+ gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "tx_azel_sat", tx_azel_sat,
632+ (GtkDestroyNotify) gtk_widget_unref);
633+ gtk_widget_show (tx_azel_sat);
634+- gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_sat, 96, 8);
635+- gtk_widget_set_uposition (tx_azel_sat, 96, 8);
636++ gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_sat, 112, 8);
637+ gtk_widget_set_usize (tx_azel_sat, 80, 16);
638+ gtk_entry_set_editable (GTK_ENTRY (tx_azel_sat), FALSE);
639+
640+@@ -1829,7 +1846,6 @@
641+ (GtkDestroyNotify) gtk_widget_unref);
642+ gtk_widget_show (tx_azel_azimuth);
643+ gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_azimuth, 64, 32);
644+- gtk_widget_set_uposition (tx_azel_azimuth, 64, 32);
645+ gtk_widget_set_usize (tx_azel_azimuth, 48, 16);
646+ GTK_WIDGET_UNSET_FLAGS (tx_azel_azimuth, GTK_CAN_FOCUS);
647+ gtk_entry_set_editable (GTK_ENTRY (tx_azel_azimuth), FALSE);
648+@@ -1840,8 +1856,7 @@
649+ gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "tx_azel_elevation", tx_azel_elevation,
650+ (GtkDestroyNotify) gtk_widget_unref);
651+ gtk_widget_show (tx_azel_elevation);
652+- gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_elevation, 184, 32);
653+- gtk_widget_set_uposition (tx_azel_elevation, 184, 32);
654++ gtk_fixed_put (GTK_FIXED (fixed7), tx_azel_elevation, 200, 32);
655+ gtk_widget_set_usize (tx_azel_elevation, 48, 16);
656+ GTK_WIDGET_UNSET_FLAGS (tx_azel_elevation, GTK_CAN_FOCUS);
657+ gtk_entry_set_editable (GTK_ENTRY (tx_azel_elevation), FALSE);
658+@@ -1852,9 +1867,8 @@
659+ gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "lb_azel_sat", lb_azel_sat,
660+ (GtkDestroyNotify) gtk_widget_unref);
661+ gtk_widget_show (lb_azel_sat);
662+- gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_sat, 48, 8);
663+- gtk_widget_set_uposition (lb_azel_sat, 48, 8);
664+- gtk_widget_set_usize (lb_azel_sat, 48, 16);
665++ gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_sat, 38, 8);
666++ gtk_widget_set_usize (lb_azel_sat, 58, 16);
667+
668+ lb_azel_elevation = gtk_label_new (_("Elevation"));
669+ gtk_widget_set_name (lb_azel_elevation, "lb_azel_elevation");
670+@@ -1863,8 +1877,7 @@
671+ (GtkDestroyNotify) gtk_widget_unref);
672+ gtk_widget_show (lb_azel_elevation);
673+ gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_elevation, 128, 32);
674+- gtk_widget_set_uposition (lb_azel_elevation, 128, 32);
675+- gtk_widget_set_usize (lb_azel_elevation, 48, 16);
676++ gtk_widget_set_usize (lb_azel_elevation, 64, 16);
677+
678+ lb_azel_azimuth = gtk_label_new (_("Azimuth"));
679+ gtk_widget_set_name (lb_azel_azimuth, "lb_azel_azimuth");
680+@@ -1872,9 +1885,8 @@
681+ gtk_object_set_data_full (GTK_OBJECT (dialog_azel_graph), "lb_azel_azimuth", lb_azel_azimuth,
682+ (GtkDestroyNotify) gtk_widget_unref);
683+ gtk_widget_show (lb_azel_azimuth);
684+- gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_azimuth, 16, 32);
685+- gtk_widget_set_uposition (lb_azel_azimuth, 16, 32);
686+- gtk_widget_set_usize (lb_azel_azimuth, 40, 16);
687++ gtk_fixed_put (GTK_FIXED (fixed7), lb_azel_azimuth, 0, 32);
688++ gtk_widget_set_usize (lb_azel_azimuth, 58, 16);
689+
690+ gtk_signal_connect (GTK_OBJECT (dialog_azel_graph), "delete_event",
691+ GTK_SIGNAL_FUNC (on_dialog_azel_graph_delete_event),
692+@@ -2020,7 +2032,6 @@
693+ (GtkDestroyNotify) gtk_widget_unref);
694+ gtk_widget_show (tx_dbsat);
695+ gtk_fixed_put (GTK_FIXED (fixed10), tx_dbsat, 8, 24);
696+- gtk_widget_set_uposition (tx_dbsat, 8, 24);
697+ gtk_widget_set_usize (tx_dbsat, 80, 20);
698+
699+ tx_dbuplink = gtk_entry_new ();
700+@@ -2030,7 +2041,6 @@
701+ (GtkDestroyNotify) gtk_widget_unref);
702+ gtk_widget_show (tx_dbuplink);
703+ gtk_fixed_put (GTK_FIXED (fixed10), tx_dbuplink, 144, 24);
704+- gtk_widget_set_uposition (tx_dbuplink, 144, 24);
705+ gtk_widget_set_usize (tx_dbuplink, 76, 20);
706+
707+ tx_dbdownlink = gtk_entry_new ();
708+@@ -2040,7 +2050,6 @@
709+ (GtkDestroyNotify) gtk_widget_unref);
710+ gtk_widget_show (tx_dbdownlink);
711+ gtk_fixed_put (GTK_FIXED (fixed10), tx_dbdownlink, 228, 24);
712+- gtk_widget_set_uposition (tx_dbdownlink, 228, 24);
713+ gtk_widget_set_usize (tx_dbdownlink, 76, 20);
714+
715+ tx_dbbeacon = gtk_entry_new ();
716+@@ -2050,7 +2059,6 @@
717+ (GtkDestroyNotify) gtk_widget_unref);
718+ gtk_widget_show (tx_dbbeacon);
719+ gtk_fixed_put (GTK_FIXED (fixed10), tx_dbbeacon, 312, 24);
720+- gtk_widget_set_uposition (tx_dbbeacon, 312, 24);
721+ gtk_widget_set_usize (tx_dbbeacon, 76, 20);
722+
723+ bt_dbadd = gtk_button_new_with_label (_("Add"));
724+@@ -2060,7 +2068,6 @@
725+ (GtkDestroyNotify) gtk_widget_unref);
726+ gtk_widget_show (bt_dbadd);
727+ gtk_fixed_put (GTK_FIXED (fixed10), bt_dbadd, 16, 56);
728+- gtk_widget_set_uposition (bt_dbadd, 16, 56);
729+ gtk_widget_set_usize (bt_dbadd, 64, 24);
730+
731+ bt_dbupdate = gtk_button_new_with_label (_("Update"));
732+@@ -2070,7 +2077,6 @@
733+ (GtkDestroyNotify) gtk_widget_unref);
734+ gtk_widget_show (bt_dbupdate);
735+ gtk_fixed_put (GTK_FIXED (fixed10), bt_dbupdate, 167, 56);
736+- gtk_widget_set_uposition (bt_dbupdate, 167, 56);
737+ gtk_widget_set_usize (bt_dbupdate, 64, 24);
738+
739+ bt_dbdelete = gtk_button_new_with_label (_("Delete"));
740+@@ -2080,7 +2086,6 @@
741+ (GtkDestroyNotify) gtk_widget_unref);
742+ gtk_widget_show (bt_dbdelete);
743+ gtk_fixed_put (GTK_FIXED (fixed10), bt_dbdelete, 317, 56);
744+- gtk_widget_set_uposition (bt_dbdelete, 317, 56);
745+ gtk_widget_set_usize (bt_dbdelete, 64, 24);
746+
747+ lb_dbsat = gtk_label_new (_("Satellite"));
748+@@ -2090,7 +2095,6 @@
749+ (GtkDestroyNotify) gtk_widget_unref);
750+ gtk_widget_show (lb_dbsat);
751+ gtk_fixed_put (GTK_FIXED (fixed10), lb_dbsat, 8, 6);
752+- gtk_widget_set_uposition (lb_dbsat, 8, 6);
753+ gtk_widget_set_usize (lb_dbsat, 80, 16);
754+
755+ lb_dbmode = gtk_label_new (_("Mode"));
756+@@ -2100,7 +2104,6 @@
757+ (GtkDestroyNotify) gtk_widget_unref);
758+ gtk_widget_show (lb_dbmode);
759+ gtk_fixed_put (GTK_FIXED (fixed10), lb_dbmode, 96, 6);
760+- gtk_widget_set_uposition (lb_dbmode, 96, 6);
761+ gtk_widget_set_usize (lb_dbmode, 40, 16);
762+
763+ tx_dbmode = gtk_entry_new ();
764+@@ -2110,7 +2113,6 @@
765+ (GtkDestroyNotify) gtk_widget_unref);
766+ gtk_widget_show (tx_dbmode);
767+ gtk_fixed_put (GTK_FIXED (fixed10), tx_dbmode, 96, 24);
768+- gtk_widget_set_uposition (tx_dbmode, 96, 24);
769+ gtk_widget_set_usize (tx_dbmode, 40, 20);
770+
771+ lb_dbuplink = gtk_label_new (_("Uplink"));
772+@@ -2120,7 +2122,6 @@
773+ (GtkDestroyNotify) gtk_widget_unref);
774+ gtk_widget_show (lb_dbuplink);
775+ gtk_fixed_put (GTK_FIXED (fixed10), lb_dbuplink, 144, 6);
776+- gtk_widget_set_uposition (lb_dbuplink, 144, 6);
777+ gtk_widget_set_usize (lb_dbuplink, 76, 16);
778+
779+ lb_dbdownlink = gtk_label_new (_("Downlink"));
780+@@ -2130,7 +2131,6 @@
781+ (GtkDestroyNotify) gtk_widget_unref);
782+ gtk_widget_show (lb_dbdownlink);
783+ gtk_fixed_put (GTK_FIXED (fixed10), lb_dbdownlink, 228, 6);
784+- gtk_widget_set_uposition (lb_dbdownlink, 228, 6);
785+ gtk_widget_set_usize (lb_dbdownlink, 76, 16);
786+
787+ lb_dbbeacon = gtk_label_new (_("Beacon"));
788+@@ -2140,7 +2140,6 @@
789+ (GtkDestroyNotify) gtk_widget_unref);
790+ gtk_widget_show (lb_dbbeacon);
791+ gtk_fixed_put (GTK_FIXED (fixed10), lb_dbbeacon, 312, 6);
792+- gtk_widget_set_uposition (lb_dbbeacon, 312, 6);
793+ gtk_widget_set_usize (lb_dbbeacon, 76, 16);
794+
795+ gtk_signal_connect (GTK_OBJECT (dialog_dbedit), "delete_event",
796
797=== modified file 'debian/patches/series'
798--- debian/patches/series 2010-03-31 10:18:23 +0000
799+++ debian/patches/series 2010-04-13 18:04:25 +0000
800@@ -14,3 +14,6 @@
801 121_predict-g1yyh.diff
802 130_gtk2.diff
803 140_fix-buffer-overflow.diff
804+141_buffer_overflow.diff
805+180_reworked_gui.diff
806+

Subscribers

People subscribed via source and target branches