author | dcarbery |
Mon, 09 Jul 2007 16:13:27 +0000 | |
changeset 10169 | 8dba9a12689b |
parent 9543 | b77030628301 |
child 10464 | 36c23cc181d8 |
permissions | -rw-r--r-- |
8943 | 1 |
diff -urN gnome-desktop-2.17.5/Makefile.am gnome-desktop-2.17.5-hacked/Makefile.am |
2 |
--- gnome-desktop-2.17.5/Makefile.am 2006-04-11 01:17:35.000000000 +1200 |
|
3 |
+++ gnome-desktop-2.17.5-hacked/Makefile.am 2006-04-28 12:31:36.869661000 +1200 |
|
4 |
@@ -1,5 +1,10 @@ |
|
5 |
ACLOCAL_AMFLAGS = -I m4 |
|
6 |
||
6128 | 7 |
+XML_IN_FILES= gnome-version.xml.in |
8 |
+XML_FILES = $(XML_IN_FILES:.xml.in=.xml) |
|
9 |
+versiondir=$(datadir)/gnome-about |
|
10 |
+version_DATA= $(XML_FILES) |
|
11 |
+ |
|
12 |
SUBDIRS = \ |
|
13 |
po \ |
|
14 |
libgnome-desktop \ |
|
9466 | 15 |
@@ -16,8 +16,8 @@ |
6128 | 16 |
|
17 |
EXTRA_DIST = \ |
|
9466 | 18 |
MAINTAINERS \ |
6128 | 19 |
- gnome-version.xml.in.in \ |
20 |
- gnome-version.xml \ |
|
21 |
+ $(XML_IN_FILES) \ |
|
22 |
+ $(XML_FILES) \ |
|
23 |
gnome-desktop.spec.in \ |
|
24 |
gnome-desktop.spec \ |
|
25 |
COPYING-DOCS \ |
|
7161 | 26 |
@@ -19,8 +25,9 @@ |
6128 | 27 |
intltool-update.in \ |
28 |
gnome-doc-utils.make |
|
29 |
||
30 |
-versiondir=$(datadir)/gnome-about |
|
31 |
-version_DATA=gnome-version.xml |
|
32 |
+ |
|
33 |
+ |
|
34 |
+ |
|
35 |
@INTLTOOL_XML_RULE@ |
|
36 |
||
7161 | 37 |
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper |
10169 | 38 |
--- gnome-desktop-2.19.5/gnome-about/contributors.list.orig 2007-07-09 15:38:27.500214799 +0100 |
39 |
+++ gnome-desktop-2.19.5/gnome-about/contributors.list 2007-07-09 15:47:12.106338716 +0100 |
|
40 |
@@ -555,3 +555,84 @@ |
|
41 |
Sascha Ziemann |
|
42 |
Michael Zucchi |
|
43 |
Jason van Zyl |
|
44 |
+Amith Yamasani |
|
45 |
+Anand Subramanian |
|
46 |
+Antonio Xu |
|
47 |
+Archana Shah |
|
48 |
+Ashish Mukharji |
|
49 |
+Balamurali Viswanathan |
|
50 |
+Biswa Lal |
|
51 |
+Bolian Yin |
|
52 |
+Brian Nitz |
|
53 |
+Calvin Liu |
|
54 |
+Carl Gadener |
|
55 |
+Chandrashekhar BK |
|
56 |
+Curtis Sasaki |
|
57 |
+Dan Baigent |
|
58 |
+Deirdre Williams |
|
59 |
+Derek Rafter |
|
60 |
+Dermot McCluskey |
|
61 |
+Dinoop Thomas |
|
62 |
+Dirk Grobler |
|
63 |
+Ervin Yan |
|
64 |
+Gary Little |
|
65 |
+Geoff Baysinger |
|
66 |
+Ghee Teo |
|
67 |
+Girish Kulkarni |
|
68 |
+Harry Lu |
|
69 |
+Hema Seetharamaiah |
|
70 |
+Henry Jia |
|
71 |
+Ii Gyoung Park |
|
72 |
+Jack Jia |
|
73 |
+Jason van Zyl |
|
74 |
+Jeff McMeekin |
|
75 |
+Jerry Tan |
|
76 |
+Jessie Li |
|
77 |
+Joshua Xia |
|
78 |
+Kalpesh Shah |
|
79 |
+Karl Gaffney |
|
80 |
+Kaveri Murthy |
|
81 |
+Kyle Yuan |
|
82 |
+Lalith Kumar |
|
83 |
+Laszlo Kovacs |
|
84 |
+Laszlo Peter |
|
85 |
+Leena Gunda |
|
86 |
+Leo Binchy |
|
87 |
+Leon Sha |
|
88 |
+Leon Zhang |
|
89 |
+Louie Zhao |
|
90 |
+Louise Siu |
|
91 |
+Luke Shi |
|
92 |
+Mark Duggan |
|
93 |
+Mark Yang |
|
94 |
+Martin Damboldt |
|
95 |
+Matt Keenan |
|
96 |
+Michael Krivoruchko |
|
97 |
+Michael Twomey |
|
98 |
+Mike Lei |
|
99 |
+Muktha Narayan |
|
100 |
+Nancy Lee |
|
101 |
+Narayana Pattipati |
|
102 |
+Niall Power |
|
103 |
+Olaf Felka |
|
104 |
+Oliver Braun |
|
105 |
+Partha Pratim |
|
106 |
+Patrick Gu |
|
107 |
+Pete Zha |
|
108 |
+Rick Ju |
|
109 |
+Robert Kinsella |
|
110 |
+Robert O'Dea |
|
111 |
+Robin Lu |
|
112 |
+Shane O'Connor |
|
113 |
+Simford Dong |
|
114 |
+Sowmya Adiga |
|
115 |
+Srirama Sharma |
|
116 |
+Suresh Chandrasekharan |
|
117 |
+Susan Jefferies |
|
118 |
+Terry Ponce |
|
119 |
+Thorsten Laux |
|
120 |
+Vijay Anand |
|
121 |
+Vijaykumar Patwari |
|
122 |
+Vinay M R |
|
123 |
+Vishnu Kumar |
|
124 |
+Yogeesh MB |
|
125 |
diff -urN gnome-desktop-2.19.5/gnome-about/gnome-about.c gnome-desktop-2.19.5-hacked/gnome-about/gnome-about.c |
|
126 |
--- gnome-desktop-2.19.5/gnome-about/gnome-about.c 2006-02-27 13:27:13.000000000 +1300 |
|
127 |
+++ gnome-desktop-2.19.5-hacked/gnome-about/gnome-about.c 2006-04-28 12:31:36.874015000 +1200 |
|
128 |
@@ -55,6 +55,9 @@ |
|
2465 | 129 |
|
130 |
static char **introduction_messages = NULL; |
|
131 |
static GnomeCanvasItem *subheader = NULL; |
|
132 |
+static GnomeCanvasItem *welcome_text = NULL; |
|
133 |
+static GnomeCanvasItem *version_text = NULL; |
|
134 |
+static char *version_string = NULL; |
|
135 |
static gdouble version_info_height = 0.0; |
|
136 |
static gint contrib_i = 0; |
|
10169 | 137 |
|
7161 | 138 |
@@ -318,7 +321,7 @@ |
5518 | 139 |
"text", introduction_messages[intro_i], |
140 |
"editable", FALSE, |
|
141 |
/* FIXME */ |
|
142 |
- "width", 300.0, |
|
143 |
+ "width", 400.0, |
|
144 |
"height", 80.0, |
|
145 |
"grow_height", TRUE, |
|
146 |
"cursor_visible", FALSE, |
|
7161 | 147 |
@@ -501,6 +504,7 @@ |
2582 | 148 |
|
149 |
const gchar *text; |
|
150 |
const gchar *url; |
|
151 |
+ gboolean is_link; |
|
152 |
} HRefItem; |
|
153 |
||
154 |
static gboolean |
|
9275 | 155 |
@@ -527,18 +531,39 @@ |
2582 | 156 |
case GDK_BUTTON_PRESS: { |
157 |
GError *error= NULL; |
|
158 |
||
159 |
- gnome_url_show (href->url, &error); |
|
160 |
- if (error) { |
|
161 |
- char *message; |
|
162 |
- |
|
163 |
- message = g_strdup_printf (_("Could not open the address \"%s\": %s"), |
|
164 |
- href->url, error->message); |
|
165 |
- show_error_dialog (message); |
|
166 |
+ if (!href->is_link) { |
|
167 |
+ gnome_url_show (href->url, &error); |
|
168 |
+ if (error) { |
|
169 |
+ char *message; |
|
170 |
+ |
|
171 |
+ message = g_strdup_printf (_("Could not open the address \"%s\": %s"), |
|
172 |
+ href->url, error->message); |
|
173 |
+ show_error_dialog (message); |
|
174 |
||
175 |
- g_free (message); |
|
176 |
- g_error_free (error); |
|
177 |
- } |
|
178 |
+ g_free (message); |
|
179 |
+ g_error_free (error); |
|
180 |
+ } |
|
181 |
+ } else { |
|
182 |
+ char *tmp; |
|
183 |
+ tmp = g_find_program_in_path (href->url); |
|
184 |
+ |
|
185 |
+ if (tmp) { |
|
186 |
+ g_spawn_command_line_async (tmp, &error); |
|
187 |
+ g_free (tmp); |
|
188 |
+ } |
|
189 |
+ |
|
190 |
+ if (error) { |
|
191 |
+ char *message; |
|
192 |
+ |
|
9275 | 193 |
+ /* SUN_BRANDING */ |
2582 | 194 |
+ message = g_strdup_printf (_("Could not execute \"%s\": %s"), |
195 |
+ href->url, error->message); |
|
196 |
+ show_error_dialog (message); |
|
197 |
||
198 |
+ g_free (message); |
|
199 |
+ g_error_free (error); |
|
200 |
+ } |
|
201 |
+ } |
|
202 |
return TRUE; |
|
203 |
} |
|
204 |
||
9275 | 205 |
@@ -553,6 +578,7 @@ |
2582 | 206 |
href_item_new (GnomeCanvasGroup *group, |
207 |
const gchar *text, |
|
208 |
const gchar *url, |
|
209 |
+ gboolean is_link, |
|
210 |
gdouble *current_x, |
|
211 |
gdouble *current_y) |
|
212 |
{ |
|
9275 | 213 |
@@ -562,6 +588,7 @@ |
2582 | 214 |
item = g_new0 (HRefItem, 1); |
215 |
item->text = g_strdup (text); |
|
216 |
item->url = g_strdup (url); |
|
217 |
+ item->is_link = is_link; |
|
218 |
||
219 |
item->item = |
|
220 |
gnome_canvas_item_new (group, |
|
9275 | 221 |
@@ -750,8 +777,8 @@ |
5518 | 222 |
|
223 |
g_date_set_dmy (date, day, month, year); |
|
224 |
||
225 |
- result = g_new0 (char, 24); |
|
226 |
- g_date_strftime (result, 24, "%x", date); |
|
227 |
+ result = g_new0 (char, 30); |
|
228 |
+ g_date_strftime (result, 30, "%x", date); |
|
229 |
||
230 |
g_date_free (date); |
|
231 |
||
9275 | 232 |
@@ -823,6 +824,7 @@ |
2465 | 233 |
char *platform = NULL; |
234 |
char *minor = NULL; |
|
235 |
char *micro = NULL; |
|
236 |
+ char *distributor_version_string = NULL; |
|
237 |
||
8943 | 238 |
file = gnome_program_locate_file (NULL, |
239 |
GNOME_FILE_DOMAIN_APP_DATADIR, |
|
9275 | 240 |
@@ -866,6 +868,8 @@ |
8943 | 241 |
*distributor_string = g_strdup (value); |
242 |
else if (!g_ascii_strcasecmp (name, "date") && value && value[0]) |
|
243 |
*build_date_string = create_date_string (value); |
|
2465 | 244 |
+ if (!g_ascii_strcasecmp (name, "distributor-version") && value && value[0]) |
245 |
+ distributor_version_string = g_strdup (value); |
|
246 |
||
8943 | 247 |
bits = bits->next; |
248 |
xmlFree (value); |
|
9275 | 249 |
@@ -880,7 +884,7 @@ |
8943 | 250 |
*version_string = g_strconcat (platform, ".", minor, NULL); |
2465 | 251 |
|
8943 | 252 |
if (!*version_string) |
253 |
- *version_string = g_strconcat (platform, ".", minor, ".", |
|
254 |
+ *version_string = g_strconcat (platform, " ", minor, ".", |
|
255 |
micro, NULL); |
|
2465 | 256 |
|
257 |
g_free (platform); |
|
9275 | 258 |
@@ -923,6 +924,7 @@ |
8950 | 259 |
{ |
260 |
char *version_string = NULL; |
|
261 |
char *distributor_string = NULL; |
|
262 |
+ char *distributor_version_string = NULL; |
|
263 |
char *build_date_string = NULL; |
|
264 |
char *format = NULL; |
|
265 |
char *text = NULL; |
|
9275 | 266 |
@@ -939,22 +943,39 @@ |
8943 | 267 |
|
268 |
format = g_strdup_printf ("<b>%s</b>%%s", _("%s: ")); |
|
2465 | 269 |
|
270 |
- if (version_string && version_string[0]) { |
|
271 |
+ if (distributor_version_string && distributor_version_string[0]) { |
|
272 |
+ gdouble tmp; |
|
273 |
+ |
|
274 |
+ text = g_strdup_printf ("<b>%s: </b>%s", |
|
9275 | 275 |
+ /* SUN_BRANDING */ |
2465 | 276 |
+ _("Version"), distributor_version_string); |
277 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
8943 | 278 |
+ gnome_canvas_text_get_type (), |
279 |
+ "markup", text, |
|
280 |
+ "anchor", GTK_ANCHOR_NW, |
|
281 |
+ "x", 0.0, |
|
282 |
+ "y", height, |
|
283 |
+ NULL); |
|
2465 | 284 |
+ g_free (text); |
285 |
+ |
|
286 |
+ g_object_get (version_text, "text_height", &tmp, NULL); |
|
287 |
+ height += tmp + 4.0; |
|
288 |
+ } |
|
289 |
+ else if (version_string && version_string[0]) { |
|
290 |
gdouble tmp; |
|
291 |
- GnomeCanvasItem *item; |
|
292 |
||
8943 | 293 |
text = g_strdup_printf (format, |
2465 | 294 |
_("Version"), version_string); |
295 |
- item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
296 |
- gnome_canvas_text_get_type (), |
|
297 |
- "markup", text, |
|
298 |
- "anchor", GTK_ANCHOR_NW, |
|
299 |
- "x", 0.0, |
|
300 |
- "y", height, |
|
301 |
- NULL); |
|
302 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
8943 | 303 |
+ gnome_canvas_text_get_type (), |
304 |
+ "markup", text, |
|
305 |
+ "anchor", GTK_ANCHOR_NW, |
|
306 |
+ "x", 0.0, |
|
307 |
+ "y", height, |
|
308 |
+ NULL); |
|
2465 | 309 |
g_free (text); |
310 |
||
311 |
- g_object_get (item, "text_height", &tmp, NULL); |
|
312 |
+ g_object_get (version_text, "text_height", &tmp, NULL); |
|
313 |
height += tmp + 4.0; |
|
314 |
} |
|
315 |
||
9275 | 316 |
@@ -997,8 +1018,8 @@ |
2465 | 317 |
} |
318 |
||
8943 | 319 |
g_free (format); |
2465 | 320 |
- g_free (version_string); |
321 |
g_free (distributor_string); |
|
322 |
+ g_free (distributor_version_string); |
|
323 |
g_free (build_date_string); |
|
324 |
||
325 |
gnome_canvas_item_set (info, "y", canvas_height - height, NULL); |
|
9275 | 326 |
@@ -919,7 +965,7 @@ |
3031 | 327 |
GtkWidget *canvas; |
328 |
||
329 |
HRefItem *href; |
|
330 |
- gchar *text; |
|
331 |
+ gchar *text, *path; |
|
332 |
||
333 |
GnomeCanvasItem *item; |
|
334 |
GnomeCanvasGroup *root; |
|
9275 | 335 |
@@ -972,8 +1018,10 @@ |
2465 | 336 |
current_y = (gdouble)gdk_pixbuf_get_height (header) + 5.0; |
337 |
||
338 |
href = href_item_new (root, |
|
339 |
- _("About GNOME"), |
|
340 |
- "http://www.gnome.org/about/", |
|
9275 | 341 |
+ /* SUN_BRANDING */ |
2465 | 342 |
+ _("About JDS"), |
343 |
+ "http://www.sun.com/software/javadesktopsystem/", |
|
2582 | 344 |
+ FALSE, |
2465 | 345 |
¤t_x, ¤t_y); |
346 |
||
347 |
/* make a nice guess for the dot delta */ |
|
9275 | 348 |
@@ -986,8 +1034,10 @@ |
2465 | 349 |
/* and more items on a likewise way. |
350 |
*/ |
|
351 |
href = href_item_new (root, |
|
352 |
- _("News"), |
|
5518 | 353 |
- "http://news.gnome.org", |
9275 | 354 |
+ /* SUN_BRANDING */ |
2582 | 355 |
+ _("About GNOME"), |
356 |
+ "http://www.gnome.org/about/", |
|
357 |
+ FALSE, |
|
2465 | 358 |
¤t_x, ¤t_y); |
359 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
360 |
||
9275 | 361 |
@@ -997,29 +1047,43 @@ |
2582 | 362 |
*/ |
363 |
href = href_item_new (root, |
|
364 |
_("Software"), |
|
365 |
- "http://www.gnome.org/softwaremap", |
|
5518 | 366 |
+ "http://www.sun.com/software", |
2582 | 367 |
+ FALSE, |
368 |
¤t_x, ¤t_y); |
|
369 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
370 |
||
371 |
href = href_item_new (root, |
|
372 |
_("Developers"), |
|
373 |
- "http://developer.gnome.org/", |
|
3030 | 374 |
- ¤t_x, ¤t_y); |
375 |
- item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
376 |
- |
|
377 |
- href = href_item_new (root, |
|
378 |
- _("Friends of GNOME"), |
|
379 |
- "http://www.gnome.org/friends/", |
|
2582 | 380 |
+ "http://developers.sun.com/", |
381 |
+ FALSE, |
|
382 |
¤t_x, ¤t_y); |
|
2465 | 383 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
384 |
||
385 |
href = href_item_new (root, |
|
3030 | 386 |
_("Contact"), |
387 |
- "http://www.gnome.org/contact/", |
|
2582 | 388 |
+ "http://www.sun.com/contact/", |
389 |
+ FALSE, |
|
390 |
¤t_x, ¤t_y); |
|
391 |
||
3031 | 392 |
+ path = g_find_program_in_path ("bug-buddy"); |
393 |
+ |
|
394 |
+ if (path != NULL) { |
|
3030 | 395 |
+ item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
396 |
+ href = href_item_new (root, |
|
9275 | 397 |
+ /* SUN_BRANDING */ |
3030 | 398 |
+ _("Report a bug"), |
399 |
+ "bug-buddy", |
|
400 |
+ TRUE, |
|
401 |
+ ¤t_x, ¤t_y); |
|
3031 | 402 |
+ g_free (path); |
3030 | 403 |
+ } |
404 |
+ |
|
2465 | 405 |
/* resize */ |
406 |
canvas_width = current_x; |
|
407 |
+ |
|
408 |
+ if (current_x > canvas_width) |
|
409 |
+ canvas_width = current_x; |
|
410 |
+ |
|
411 |
gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, |
|
412 |
canvas_width, canvas_height); |
|
413 |
gtk_widget_set_size_request (GTK_WIDGET (canvas), |
|
9275 | 414 |
@@ -1029,7 +1093,7 @@ |
2465 | 415 |
points = gnome_canvas_points_new (2); |
416 |
points->coords[0] = 0.0; |
|
417 |
points->coords[1] = gdk_pixbuf_get_height (header); |
|
418 |
- points->coords[2] = current_x; |
|
419 |
+ points->coords[2] = canvas_width; |
|
420 |
points->coords[3] = gdk_pixbuf_get_height (header); |
|
421 |
||
422 |
item = gnome_canvas_item_new (root, |
|
9275 | 423 |
@@ -1066,6 +1130,7 @@ |
6128 | 424 |
"x", (canvas_width - tmp) / 2.0, |
2465 | 425 |
NULL); |
426 |
||
427 |
+ welcome_text = item; |
|
428 |
||
429 |
text = g_strdup_printf ("<big><b>%s</b></big>", |
|
430 |
_("Brought to you by:")); |
|
9543 | 431 |
diff -urN gnome-desktop-2.18.0/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.18.0-hacked/gnome-about/gnome-about.desktop.in.in |
432 |
--- gnome-desktop-2.18.0/gnome-about/gnome-about.desktop.in.in 2006-04-11 00:48:42.000000000 +1200 |
|
433 |
+++ gnome-desktop-2.18.0-hacked/gnome-about/gnome-about.desktop.in.in 2006-04-28 12:32:33.271037000 +1200 |
|
9275 | 434 |
@@ -1,12 +1,14 @@ |
7161 | 435 |
[Desktop Entry] |
436 |
Encoding=UTF-8 |
|
437 |
-_Name=About GNOME |
|
7753 | 438 |
-_Comment=Learn more about GNOME |
9275 | 439 |
+#SUN_BRANDING |
7161 | 440 |
+_Name=About Java Desktop System |
9275 | 441 |
+#SUN_BRANDING |
8628
c3b3c1d14139
Merged 217update branch changes r9777:9830 into trunk branch.
dcarbery
parents:
8379
diff
changeset
|
442 |
+_Comment=Learn more about Java Desktop System |
7161 | 443 |
Exec=gnome-about |
8628
c3b3c1d14139
Merged 217update branch changes r9777:9830 into trunk branch.
dcarbery
parents:
8379
diff
changeset
|
444 |
Icon=gnome-logo-icon-transparent |
7161 | 445 |
Terminal=false |
446 |
Type=Application |
|
9543 | 447 |
-Categories=GNOME;GTK;Core; |
7161 | 448 |
+Categories=GNOME;GTK;Application;System; |
449 |
OnlyShowIn=GNOME; |
|
450 |
X-GNOME-Bugzilla-Bugzilla=GNOME |
|
451 |
X-GNOME-Bugzilla-Product=gnome-desktop |
|
8943 | 452 |
--- gnome-desktop-2.17.5.old/configure.in 2006-10-19 16:54:29.498958000 +0100 |
453 |
+++ gnome-desktop-2.17.5/configure.in 2006-10-19 16:57:57.110569000 +0100 |
|
454 |
@@ -40,15 +40,21 @@ |
|
8379 | 455 |
GNOME_DATE=`date +"%Y-%m-%d"` |
456 |
||
457 |
AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor]) |
|
458 |
+AC_ARG_WITH(gnome_distributor_version, [ --with-gnome-distributor-version=DISTRIBUTOR Specify version of GNOME distributor]) |
|
459 |
||
460 |
if test "x$with_gnome_distributor" != x ; then |
|
461 |
GNOME_DISTRIBUTOR=$with_gnome_distributor |
|
462 |
fi |
|
463 |
||
464 |
+if test "x$with_gnome_distributor_version" != x ; then |
|
465 |
+ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version |
|
466 |
+fi |
|
467 |
+ |
|
468 |
AC_SUBST(GNOME_PLATFORM) |
|
469 |
AC_SUBST(GNOME_MINOR) |
|
470 |
AC_SUBST(GNOME_MICRO) |
|
471 |
AC_SUBST(GNOME_DISTRIBUTOR) |
|
472 |
+AC_SUBST(GNOME_DISTRIBUTOR_VERSION) |
|
473 |
AC_SUBST(GNOME_DATE) |
|
474 |
||
8943 | 475 |
GNOME_COMMON_INIT |