|
2582
|
1 |
diff -urN gnome-desktop-2.6.0.1/configure.in gnome-desktop-2.6.0.1-hacked/configure.in
|
|
|
2 |
--- gnome-desktop-2.6.0.1/configure.in 2004-03-31 17:54:42.000000000 +1200
|
|
|
3 |
+++ gnome-desktop-2.6.0.1-hacked/configure.in 2004-04-29 13:16:55.000000000 +1200
|
|
2465
|
4 |
@@ -32,18 +32,25 @@
|
|
2582
|
5 |
GNOME_MINOR=6
|
|
|
6 |
GNOME_MICRO=0
|
|
2465
|
7 |
GNOME_DISTRIBUTOR="GNOME.Org"
|
|
|
8 |
+GNOME_DISTRIBUTOR_VERSION=
|
|
|
9 |
GNOME_DATE=`date +"%Y-%m-%d"`
|
|
|
10 |
|
|
|
11 |
AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor])
|
|
|
12 |
+AC_ARG_WITH(gnome_distributor_version, [ --with_gnome-distributor-version=DISTRIBUTORVERSION Specify version of GNOME distribution])
|
|
|
13 |
|
|
|
14 |
if test "x$with_gnome_distributor" != x ; then
|
|
|
15 |
GNOME_DISTRIBUTOR=$with_gnome_distributor
|
|
|
16 |
fi
|
|
|
17 |
|
|
|
18 |
+if test "x$with_gnome_distributor_version" != x ; then
|
|
|
19 |
+ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version
|
|
|
20 |
+fi
|
|
|
21 |
+
|
|
|
22 |
AC_SUBST(GNOME_PLATFORM)
|
|
|
23 |
AC_SUBST(GNOME_MINOR)
|
|
|
24 |
AC_SUBST(GNOME_MICRO)
|
|
|
25 |
AC_SUBST(GNOME_DISTRIBUTOR)
|
|
|
26 |
+AC_SUBST(GNOME_DISTRIBUTOR_VERSION)
|
|
|
27 |
AC_SUBST(GNOME_DATE)
|
|
|
28 |
|
|
|
29 |
GNOME_COMPILE_WARNINGS(yes)
|
|
2582
|
30 |
diff -urN gnome-desktop-2.6.0.1/gnome-about/contributors.h gnome-desktop-2.6.0.1-hacked/gnome-about/contributors.h
|
|
|
31 |
--- gnome-desktop-2.6.0.1/gnome-about/contributors.h 2004-03-23 03:20:30.000000000 +1200
|
|
|
32 |
+++ gnome-desktop-2.6.0.1-hacked/gnome-about/contributors.h 2004-04-29 13:16:55.000000000 +1200
|
|
2465
|
33 |
@@ -10,6 +10,88 @@
|
|
|
34 |
|
|
|
35 |
/* Please keep this in alphabetical order */
|
|
|
36 |
static gchar *contributors[] = {
|
|
|
37 |
+ "Sowmya Adiga",
|
|
|
38 |
+ "Dan Baigent",
|
|
|
39 |
+ "Geoff Baysinger",
|
|
|
40 |
+ "Calum Benson",
|
|
|
41 |
+ "Leo Binchy",
|
|
|
42 |
+ "Chandrashekhar BK",
|
|
|
43 |
+ "Oliver Braun",
|
|
|
44 |
+ "Stephen Browne",
|
|
|
45 |
+ "Brian Cameron",
|
|
|
46 |
+ "Suresh Chandrasekharan",
|
|
|
47 |
+ "Erwann Chenede",
|
|
|
48 |
+ "Martin Damboldt ",
|
|
|
49 |
+ "Simford Dong",
|
|
|
50 |
+ "York Du",
|
|
|
51 |
+ "Olaf Felka",
|
|
|
52 |
+ "Glynn Foster",
|
|
|
53 |
+ "Carl Gadener",
|
|
|
54 |
+ "Karl Gaffney",
|
|
|
55 |
+ "Dirk Grobler",
|
|
|
56 |
+ "Patrick Gu",
|
|
|
57 |
+ "Leena Gunda",
|
|
|
58 |
+ "Ii Gyoung Park",
|
|
|
59 |
+ "Susan Jefferies",
|
|
|
60 |
+ "Henry Jia",
|
|
|
61 |
+ "Jack Jia",
|
|
|
62 |
+ "Rick Ju",
|
|
|
63 |
+ "Matt Keenan",
|
|
|
64 |
+ "Robert Kinsella",
|
|
|
65 |
+ "Laszlo Kovacs",
|
|
|
66 |
+ "Michael Krivoruchko",
|
|
|
67 |
+ "Kaushal Kumar",
|
|
|
68 |
+ "Thorsten Laux",
|
|
|
69 |
+ "Nancy Lee",
|
|
|
70 |
+ "Mike Lei",
|
|
|
71 |
+ "Jessie Li",
|
|
|
72 |
+ "Gary Little",
|
|
|
73 |
+ "Calvin Liu",
|
|
|
74 |
+ "Harry Lu",
|
|
|
75 |
+ "Robin Lu",
|
|
|
76 |
+ "Yogeesh MB",
|
|
|
77 |
+ "Dermot McCluskey",
|
|
|
78 |
+ "Mark McLoughlin",
|
|
|
79 |
+ "Jeff McMeekin",
|
|
|
80 |
+ "Ashish Mukharji ",
|
|
|
81 |
+ "Kaveri Murthy",
|
|
|
82 |
+ "Muktha Narayan",
|
|
|
83 |
+ "Brian Nitz",
|
|
|
84 |
+ "Shane O'Connor",
|
|
|
85 |
+ "Robert O'Dea",
|
|
|
86 |
+ "Narayana Pattipati",
|
|
|
87 |
+ "Vijaykumar Patwari",
|
|
|
88 |
+ "Laszlo Peter",
|
|
|
89 |
+ "Terri Ponce",
|
|
|
90 |
+ "Niall Power",
|
|
|
91 |
+ "Derek Rafter ",
|
|
|
92 |
+ "Arvind Samptur",
|
|
|
93 |
+ "Curtis Sasaki",
|
|
|
94 |
+ "Hema Seetharamaiah",
|
|
|
95 |
+ "Leon Sha ",
|
|
|
96 |
+ "Archana Shah",
|
|
|
97 |
+ "Kalpesh Shah",
|
|
|
98 |
+ "Luke Shi",
|
|
|
99 |
+ "Sidhartha Sinha",
|
|
|
100 |
+ "Louise Siu",
|
|
|
101 |
+ "Anand Subramanian",
|
|
|
102 |
+ "Jerry Tan",
|
|
|
103 |
+ "Ghee Teo",
|
|
|
104 |
+ "Michael Twomey",
|
|
|
105 |
+ "Balamurali Viswanathan",
|
|
|
106 |
+ "Deirdre Williams",
|
|
|
107 |
+ "Joshua Xia",
|
|
|
108 |
+ "Antonio Xu ",
|
|
|
109 |
+ "Amith Yamasani",
|
|
|
110 |
+ "Ervin Yan",
|
|
|
111 |
+ "Jay Yan",
|
|
|
112 |
+ "Mark Yang",
|
|
|
113 |
+ "Bolian Yin",
|
|
|
114 |
+ "Kyle Yuan",
|
|
|
115 |
+ "Pete Zha",
|
|
|
116 |
+ "Leon Zhang",
|
|
|
117 |
+ "Louie Zhao",
|
|
|
118 |
+ "end_of_sun_contributors",
|
|
|
119 |
"J\xc3\xa9r\xc3\xb4me Abela",
|
|
|
120 |
"Rob Adams",
|
|
|
121 |
"Lauri Alanko",
|
|
2582
|
122 |
diff -urN gnome-desktop-2.6.0.1/gnome-about/gnome-about.c gnome-desktop-2.6.0.1-hacked/gnome-about/gnome-about.c
|
|
|
123 |
--- gnome-desktop-2.6.0.1/gnome-about/gnome-about.c 2004-03-30 21:50:51.000000000 +1200
|
|
|
124 |
+++ gnome-desktop-2.6.0.1-hacked/gnome-about/gnome-about.c 2004-04-29 13:38:53.000000000 +1200
|
|
2465
|
125 |
@@ -54,6 +54,9 @@
|
|
|
126 |
|
|
|
127 |
static char **introduction_messages = NULL;
|
|
|
128 |
static GnomeCanvasItem *subheader = NULL;
|
|
|
129 |
+static GnomeCanvasItem *welcome_text = NULL;
|
|
|
130 |
+static GnomeCanvasItem *version_text = NULL;
|
|
|
131 |
+static char *version_string = NULL;
|
|
|
132 |
static gdouble version_info_height = 0.0;
|
|
|
133 |
static gint contrib_i = 0;
|
|
|
134 |
|
|
|
135 |
@@ -136,6 +139,29 @@
|
|
|
136 |
|
|
|
137 |
if (!contributors[contrib_i])
|
|
|
138 |
text = g_strdup_printf ("<b>%s</b>", _("The End!"));
|
|
|
139 |
+ else if (g_strcasecmp (contributors[contrib_i], "end_of_sun_contributors") == 0 ) {
|
|
|
140 |
+ gchar *welcome;
|
|
|
141 |
+ welcome = g_strdup_printf ("<big><big><b>%s</b></big></big>",
|
|
|
142 |
+ _("Welcome to the GNOME Desktop"));
|
|
|
143 |
+ gnome_canvas_item_set (welcome_text,
|
|
|
144 |
+ "markup", welcome,
|
|
|
145 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
146 |
+ "fill_color", "#000000",
|
|
|
147 |
+ NULL);
|
|
|
148 |
+ if (version_string && version_string[0]) {
|
|
|
149 |
+ gchar *version = g_strdup_printf ("<b>%s: </b>%s",
|
|
|
150 |
+ _("Version"), version_string);
|
|
|
151 |
+ gnome_canvas_item_set (version_text,
|
|
|
152 |
+ "markup", version,
|
|
|
153 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
154 |
+ "fill_color", "#000000",
|
|
|
155 |
+ NULL);
|
|
|
156 |
+ g_free (version);
|
|
|
157 |
+ }
|
|
|
158 |
+ g_free (welcome);
|
|
|
159 |
+ contrib_i++;
|
|
|
160 |
+ text = g_strdup_printf ("<b>%s</b>", contributors[contrib_i]);
|
|
|
161 |
+ }
|
|
|
162 |
else {
|
|
|
163 |
text = g_strdup_printf ("<b>%s</b>", contributors[contrib_i]);
|
|
|
164 |
contrib_i++;
|
|
|
165 |
@@ -166,6 +192,28 @@
|
|
|
166 |
return FALSE;
|
|
|
167 |
}
|
|
|
168 |
|
|
|
169 |
+ if (g_strcasecmp (contributors[contrib_i], "end_of_sun_contributors") == 0 ) {
|
|
|
170 |
+ gchar *welcome;
|
|
|
171 |
+ welcome = g_strdup_printf ("<big><big><b>%s</b></big</big>",
|
|
|
172 |
+ _("Welcome to the GNOME Desktop"));
|
|
|
173 |
+ gnome_canvas_item_set (welcome_text,
|
|
|
174 |
+ "markup", welcome,
|
|
|
175 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
176 |
+ "fill_color", "#000000",
|
|
|
177 |
+ NULL);
|
|
|
178 |
+ if (version_string && version_string[0]) {
|
|
|
179 |
+ gchar *version = g_strdup_printf ("<b>%s: </b>%s",
|
|
|
180 |
+ _("Version"), version_string);
|
|
|
181 |
+ gnome_canvas_item_set (version_text,
|
|
|
182 |
+ "markup", version,
|
|
|
183 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
184 |
+ "fill_color", "#000000",
|
|
|
185 |
+ NULL);
|
|
|
186 |
+ g_free (version);
|
|
|
187 |
+ }
|
|
|
188 |
+ g_free (welcome);
|
|
|
189 |
+ }
|
|
|
190 |
+
|
|
|
191 |
if (!contributor) {
|
|
|
192 |
gchar *text;
|
|
|
193 |
|
|
2582
|
194 |
@@ -520,6 +568,7 @@
|
|
|
195 |
|
|
|
196 |
const gchar *text;
|
|
|
197 |
const gchar *url;
|
|
|
198 |
+ gboolean is_link;
|
|
|
199 |
} HRefItem;
|
|
|
200 |
|
|
|
201 |
static gboolean
|
|
|
202 |
@@ -546,18 +595,38 @@
|
|
|
203 |
case GDK_BUTTON_PRESS: {
|
|
|
204 |
GError *error= NULL;
|
|
|
205 |
|
|
|
206 |
- gnome_url_show (href->url, &error);
|
|
|
207 |
- if (error) {
|
|
|
208 |
- char *message;
|
|
|
209 |
-
|
|
|
210 |
- message = g_strdup_printf (_("Could not open the address \"%s\": %s"),
|
|
|
211 |
- href->url, error->message);
|
|
|
212 |
- show_error_dialog (message);
|
|
|
213 |
+ if (!href->is_link) {
|
|
|
214 |
+ gnome_url_show (href->url, &error);
|
|
|
215 |
+ if (error) {
|
|
|
216 |
+ char *message;
|
|
|
217 |
+
|
|
|
218 |
+ message = g_strdup_printf (_("Could not open the address \"%s\": %s"),
|
|
|
219 |
+ href->url, error->message);
|
|
|
220 |
+ show_error_dialog (message);
|
|
|
221 |
|
|
|
222 |
- g_free (message);
|
|
|
223 |
- g_error_free (error);
|
|
|
224 |
- }
|
|
|
225 |
+ g_free (message);
|
|
|
226 |
+ g_error_free (error);
|
|
|
227 |
+ }
|
|
|
228 |
+ } else {
|
|
|
229 |
+ char *tmp;
|
|
|
230 |
+ tmp = g_find_program_in_path (href->url);
|
|
|
231 |
+
|
|
|
232 |
+ if (tmp) {
|
|
|
233 |
+ g_spawn_command_line_async (tmp, &error);
|
|
|
234 |
+ g_free (tmp);
|
|
|
235 |
+ }
|
|
|
236 |
+
|
|
|
237 |
+ if (error) {
|
|
|
238 |
+ char *message;
|
|
|
239 |
+
|
|
|
240 |
+ message = g_strdup_printf (_("Could not execute \"%s\": %s"),
|
|
|
241 |
+ href->url, error->message);
|
|
|
242 |
+ show_error_dialog (message);
|
|
|
243 |
|
|
|
244 |
+ g_free (message);
|
|
|
245 |
+ g_error_free (error);
|
|
|
246 |
+ }
|
|
|
247 |
+ }
|
|
|
248 |
return TRUE;
|
|
|
249 |
}
|
|
|
250 |
|
|
|
251 |
@@ -572,6 +641,7 @@
|
|
|
252 |
href_item_new (GnomeCanvasGroup *group,
|
|
|
253 |
const gchar *text,
|
|
|
254 |
const gchar *url,
|
|
|
255 |
+ gboolean is_link,
|
|
|
256 |
gdouble *current_x,
|
|
|
257 |
gdouble *current_y)
|
|
|
258 |
{
|
|
|
259 |
@@ -581,6 +651,7 @@
|
|
|
260 |
item = g_new0 (HRefItem, 1);
|
|
|
261 |
item->text = g_strdup (text);
|
|
|
262 |
item->url = g_strdup (url);
|
|
|
263 |
+ item->is_link = is_link;
|
|
|
264 |
|
|
|
265 |
item->item =
|
|
|
266 |
gnome_canvas_item_new (group,
|
|
|
267 |
@@ -789,8 +860,8 @@
|
|
2465
|
268 |
char *platform = NULL;
|
|
|
269 |
char *minor = NULL;
|
|
|
270 |
char *micro = NULL;
|
|
|
271 |
- char *version_string = NULL;
|
|
|
272 |
char *distributor_string = NULL;
|
|
|
273 |
+ char *distributor_version_string = NULL;
|
|
|
274 |
char *build_date_string = NULL;
|
|
|
275 |
char *text = NULL;
|
|
|
276 |
|
|
2582
|
277 |
@@ -836,6 +907,8 @@
|
|
2465
|
278 |
minor = g_strdup (value);
|
|
|
279 |
if (!g_ascii_strcasecmp (name, "micro") && value && value[0])
|
|
|
280 |
micro = g_strdup (value);
|
|
|
281 |
+ if (!g_ascii_strcasecmp (name, "distributor-version") && value && value[0])
|
|
|
282 |
+ distributor_version_string = g_strdup (value);
|
|
|
283 |
if (!g_ascii_strcasecmp (name, "distributor") && value && value[0])
|
|
|
284 |
distributor_string = g_strdup (value);
|
|
|
285 |
if (!g_ascii_strcasecmp (name, "date") && value && value[0])
|
|
2582
|
286 |
@@ -851,10 +924,10 @@
|
|
2465
|
287 |
version_string = g_strconcat (platform, NULL);
|
|
|
288 |
|
|
|
289 |
if (!version_string && !micro)
|
|
|
290 |
- version_string = g_strconcat (platform, ".", minor, NULL);
|
|
|
291 |
+ version_string = g_strconcat (platform, " ", minor, NULL);
|
|
|
292 |
|
|
|
293 |
if (!version_string)
|
|
|
294 |
- version_string = g_strconcat (platform, ".", minor, ".",
|
|
|
295 |
+ version_string = g_strconcat (platform, " ", minor, ".",
|
|
|
296 |
micro, NULL);
|
|
|
297 |
|
|
|
298 |
g_free (platform);
|
|
2582
|
299 |
@@ -866,22 +939,38 @@
|
|
2465
|
300 |
"x", 10.0,
|
|
|
301 |
NULL);
|
|
|
302 |
|
|
|
303 |
- if (version_string && version_string[0]) {
|
|
|
304 |
+ if (distributor_version_string && distributor_version_string[0]) {
|
|
|
305 |
+ gdouble tmp;
|
|
|
306 |
+
|
|
|
307 |
+ text = g_strdup_printf ("<b>%s: </b>%s",
|
|
|
308 |
+ _("Version"), distributor_version_string);
|
|
|
309 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
|
|
|
310 |
+ gnome_canvas_text_get_type (),
|
|
|
311 |
+ "markup", text,
|
|
|
312 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
313 |
+ "x", 0.0,
|
|
|
314 |
+ "y", height,
|
|
|
315 |
+ NULL);
|
|
|
316 |
+ g_free (text);
|
|
|
317 |
+
|
|
|
318 |
+ g_object_get (version_text, "text_height", &tmp, NULL);
|
|
|
319 |
+ height += tmp + 4.0;
|
|
|
320 |
+ }
|
|
|
321 |
+ else if (version_string && version_string[0]) {
|
|
|
322 |
gdouble tmp;
|
|
|
323 |
- GnomeCanvasItem *item;
|
|
|
324 |
|
|
|
325 |
text = g_strdup_printf ("<b>%s: </b>%s",
|
|
|
326 |
_("Version"), version_string);
|
|
|
327 |
- item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
|
|
|
328 |
- gnome_canvas_text_get_type (),
|
|
|
329 |
- "markup", text,
|
|
|
330 |
- "anchor", GTK_ANCHOR_NW,
|
|
|
331 |
- "x", 0.0,
|
|
|
332 |
- "y", height,
|
|
|
333 |
- NULL);
|
|
|
334 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info),
|
|
|
335 |
+ gnome_canvas_text_get_type (),
|
|
|
336 |
+ "markup", text,
|
|
|
337 |
+ "anchor", GTK_ANCHOR_NW,
|
|
|
338 |
+ "x", 0.0,
|
|
|
339 |
+ "y", height,
|
|
|
340 |
+ NULL);
|
|
|
341 |
g_free (text);
|
|
|
342 |
|
|
|
343 |
- g_object_get (item, "text_height", &tmp, NULL);
|
|
|
344 |
+ g_object_get (version_text, "text_height", &tmp, NULL);
|
|
|
345 |
height += tmp + 4.0;
|
|
|
346 |
}
|
|
|
347 |
|
|
2582
|
348 |
@@ -923,8 +1012,8 @@
|
|
2465
|
349 |
height += tmp + 4.0;
|
|
|
350 |
}
|
|
|
351 |
|
|
|
352 |
- g_free (version_string);
|
|
|
353 |
g_free (distributor_string);
|
|
|
354 |
+ g_free (distributor_version_string);
|
|
|
355 |
g_free (build_date_string);
|
|
|
356 |
|
|
|
357 |
gnome_canvas_item_set (info, "y", canvas_height - height, NULL);
|
|
2582
|
358 |
@@ -991,8 +1080,9 @@
|
|
2465
|
359 |
current_y = (gdouble)gdk_pixbuf_get_height (header) + 5.0;
|
|
|
360 |
|
|
|
361 |
href = href_item_new (root,
|
|
|
362 |
- _("About GNOME"),
|
|
|
363 |
- "http://www.gnome.org/about/",
|
|
|
364 |
+ _("About JDS"),
|
|
|
365 |
+ "http://www.sun.com/software/javadesktopsystem/",
|
|
2582
|
366 |
+ FALSE,
|
|
2465
|
367 |
¤t_x, ¤t_y);
|
|
|
368 |
|
|
|
369 |
/* make a nice guess for the dot delta */
|
|
2582
|
370 |
@@ -1005,8 +1095,9 @@
|
|
2465
|
371 |
/* and more items on a likewise way.
|
|
|
372 |
*/
|
|
|
373 |
href = href_item_new (root,
|
|
|
374 |
- _("News"),
|
|
|
375 |
- "http://www.gnomedesktop.org",
|
|
2582
|
376 |
+ _("About GNOME"),
|
|
|
377 |
+ "http://www.gnome.org/about/",
|
|
|
378 |
+ FALSE,
|
|
2465
|
379 |
¤t_x, ¤t_y);
|
|
|
380 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta);
|
|
|
381 |
|
|
2582
|
382 |
@@ -1016,29 +1107,37 @@
|
|
|
383 |
*/
|
|
|
384 |
href = href_item_new (root,
|
|
|
385 |
_("Software"),
|
|
|
386 |
- "http://www.gnome.org/softwaremap",
|
|
|
387 |
+ "http://wwws.sun.com/software",
|
|
|
388 |
+ FALSE,
|
|
|
389 |
¤t_x, ¤t_y);
|
|
|
390 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta);
|
|
|
391 |
|
|
|
392 |
href = href_item_new (root,
|
|
|
393 |
_("Developers"),
|
|
|
394 |
- "http://developer.gnome.org/",
|
|
|
395 |
+ "http://developers.sun.com/",
|
|
|
396 |
+ FALSE,
|
|
|
397 |
¤t_x, ¤t_y);
|
|
2465
|
398 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta);
|
|
|
399 |
|
|
|
400 |
href = href_item_new (root,
|
|
|
401 |
- _("Friends of GNOME"),
|
|
|
402 |
- "http://www.gnome.org/friends/",
|
|
2582
|
403 |
+ _("Contact"),
|
|
|
404 |
+ "http://www.sun.com/contact/",
|
|
|
405 |
+ FALSE,
|
|
|
406 |
¤t_x, ¤t_y);
|
|
|
407 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta);
|
|
|
408 |
|
|
|
409 |
href = href_item_new (root,
|
|
|
410 |
- _("Contact"),
|
|
2465
|
411 |
- "http://www.gnome.org/contact/",
|
|
2582
|
412 |
+ _("Report a bug"),
|
|
|
413 |
+ "bug-buddy",
|
|
|
414 |
+ TRUE,
|
|
2465
|
415 |
¤t_x, ¤t_y);
|
|
|
416 |
|
|
|
417 |
/* resize */
|
|
|
418 |
canvas_width = current_x;
|
|
|
419 |
+
|
|
|
420 |
+ if (current_x > canvas_width)
|
|
|
421 |
+ canvas_width = current_x;
|
|
|
422 |
+
|
|
|
423 |
gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0,
|
|
|
424 |
canvas_width, canvas_height);
|
|
|
425 |
gtk_widget_set_size_request (GTK_WIDGET (canvas),
|
|
2582
|
426 |
@@ -1048,7 +1147,7 @@
|
|
2465
|
427 |
points = gnome_canvas_points_new (2);
|
|
|
428 |
points->coords[0] = 0.0;
|
|
|
429 |
points->coords[1] = gdk_pixbuf_get_height (header);
|
|
|
430 |
- points->coords[2] = current_x;
|
|
|
431 |
+ points->coords[2] = canvas_width;
|
|
|
432 |
points->coords[3] = gdk_pixbuf_get_height (header);
|
|
|
433 |
|
|
|
434 |
item = gnome_canvas_item_new (root,
|
|
2582
|
435 |
@@ -1070,7 +1169,7 @@
|
|
2465
|
436 |
|
|
|
437 |
/* and some introduction text */
|
|
|
438 |
text = g_strdup_printf ("<big><big><b>%s</b></big></big>",
|
|
|
439 |
- _("Welcome to the GNOME Desktop"));
|
|
|
440 |
+ _("Welcome to the Sun Java Desktop System"));
|
|
|
441 |
item = gnome_canvas_item_new (root,
|
|
|
442 |
gnome_canvas_text_get_type (),
|
|
|
443 |
"markup", text,
|
|
2582
|
444 |
@@ -1082,9 +1181,10 @@
|
|
2465
|
445 |
|
|
|
446 |
g_object_get (item, "text_width", &tmp, NULL);
|
|
|
447 |
gnome_canvas_item_set (item,
|
|
|
448 |
- "x", (canvas_width - tmp) / 2.0,
|
|
|
449 |
+ "x", (canvas_width - tmp + (gdouble)gdk_pixbuf_get_width (button)) / 2.0,
|
|
|
450 |
NULL);
|
|
|
451 |
|
|
|
452 |
+ welcome_text = item;
|
|
|
453 |
|
|
|
454 |
text = g_strdup_printf ("<big><b>%s</b></big>",
|
|
|
455 |
_("Brought to you by:"));
|
|
2582
|
456 |
@@ -1100,7 +1200,7 @@
|
|
2465
|
457 |
|
|
|
458 |
g_object_get (item, "text_width", &tmp, NULL);
|
|
|
459 |
gnome_canvas_item_set (item,
|
|
|
460 |
- "x", (canvas_width - tmp) / 2.0,
|
|
|
461 |
+ "x", (canvas_width - tmp + (gdouble)gdk_pixbuf_get_width (button)) / 2.0,
|
|
|
462 |
NULL);
|
|
|
463 |
|
|
|
464 |
/* and the version info */
|
|
2582
|
465 |
diff -urN gnome-desktop-2.6.0.1/Makefile.am gnome-desktop-2.6.0.1-hacked/Makefile.am
|
|
|
466 |
--- gnome-desktop-2.6.0.1/Makefile.am 2004-02-04 21:23:35.000000000 +1300
|
|
|
467 |
+++ gnome-desktop-2.6.0.1-hacked/Makefile.am 2004-04-29 13:16:55.000000000 +1200
|
|
2465
|
468 |
@@ -1,3 +1,9 @@
|
|
|
469 |
+
|
|
|
470 |
+XML_IN_FILES= gnome-version.xml.in
|
|
|
471 |
+XML_FILES = $(XML_IN_FILES:.xml.in=.xml)
|
|
|
472 |
+versiondir=$(datadir)/gnome-about
|
|
|
473 |
+version_DATA= $(XML_FILES)
|
|
|
474 |
+
|
|
|
475 |
SUBDIRS = \
|
|
|
476 |
po \
|
|
|
477 |
libgnome-desktop \
|
|
|
478 |
@@ -8,8 +14,8 @@
|
|
|
479 |
man
|
|
|
480 |
|
|
|
481 |
EXTRA_DIST = \
|
|
|
482 |
- gnome-version.xml.in.in \
|
|
|
483 |
- gnome-version.xml \
|
|
|
484 |
+ $(XML_IN_FILES) \
|
|
|
485 |
+ $(XML_FILES) \
|
|
|
486 |
gnome-desktop.spec.in \
|
|
|
487 |
gnome-desktop.spec \
|
|
|
488 |
COPYING-DOCS \
|
|
|
489 |
@@ -19,6 +25,7 @@
|
|
|
490 |
intltool-merge.in \
|
|
|
491 |
intltool-update.in
|
|
|
492 |
|
|
|
493 |
-versiondir=$(datadir)/gnome-about
|
|
|
494 |
-version_DATA=gnome-version.xml
|
|
|
495 |
+
|
|
|
496 |
+
|
|
|
497 |
+
|
|
|
498 |
@INTLTOOL_XML_RULE@
|