author | yippi |
Mon, 27 Sep 2010 21:07:51 +0000 | |
changeset 20108 | 51df67ca9307 |
parent 16705 | 1a247f0a77da |
permissions | -rw-r--r-- |
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
1 |
/jds/bin/diff -uprN gnome-desktop-2.27.91.old/gnome-about/contributors.list gnome-desktop-2.27.91/gnome-about/contributors.list |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
2 |
--- gnome-desktop-2.27.91.old/gnome-about/contributors.list 2009-08-26 16:52:03.564205000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
3 |
+++ gnome-desktop-2.27.91/gnome-about/contributors.list 2009-08-26 16:54:14.870164000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
4 |
@@ -555,3 +555,96 @@ Simon Zheng |
11217
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
5 |
Sascha Ziemann |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
6 |
Michael Zucchi |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
7 |
Jason van Zyl |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
8 |
+Alfred Peng |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
9 |
+Alvaro Lopez Ortega |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
10 |
+Amith Yamasani |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
11 |
+Anand Subramanian |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
12 |
+Antonio Xu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
13 |
+Archana Shah |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
14 |
+Ashish Mukharji |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
15 |
+Balamurali Viswanathan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
16 |
+Biswa Lal |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
17 |
+Bolian Yin |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
18 |
+Brian Lu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
19 |
+Brian Nitz |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
20 |
+Calvin Liu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
21 |
+Carl Gadener |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
22 |
+Chandrashekhar BK |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
23 |
+Curtis Sasaki |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
24 |
+Dan Baigent |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
25 |
+Darren Kenny |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
26 |
+Dave Lin |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
27 |
+Deirdre Williams |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
28 |
+Derek Rafter |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
29 |
+Dermot McCluskey |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
30 |
+Dinoop Thomas |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
31 |
+Dirk Grobler |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
32 |
+Ervin Yan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
33 |
+Evan Yan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
34 |
+Gary Little |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
35 |
+Geoff Baysinger |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
36 |
+Ghee Teo |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
37 |
+Ginn Chen |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
38 |
+Girish Kulkarni |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
39 |
+Halton Huo |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
40 |
+Hema Seetharamaiah |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
41 |
+Henry Jia |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
42 |
+Ii Gyoung Park |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
43 |
+Jack Jia |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
44 |
+Jedy Wang |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
45 |
+Jeff McMeekin |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
46 |
+Jerry Tan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
47 |
+Jessie Li |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
48 |
+Jijun Yu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
49 |
+John Fischer |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
50 |
+John Rice |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
51 |
+Joshua Xia |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
52 |
+Kalpesh Shah |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
53 |
+Kaveri Murthy |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
54 |
+Kyle Yuan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
55 |
+Lalith Kumar |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
56 |
+Laszlo Kovacs |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
57 |
+Laszlo Peter |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
58 |
+Leena Gunda |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
59 |
+Leo Binchy |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
60 |
+Leon Sha |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
61 |
+Leon Zhang |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
62 |
+Louie Zhao |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
63 |
+Louise Siu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
64 |
+Luke Shi |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
65 |
+Mark Duggan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
66 |
+Mark Yang |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
67 |
+Martin Damboldt |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
68 |
+Michael Krivoruchko |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
69 |
+Michael Twomey |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
70 |
+Michal Pryc |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
71 |
+Mike Lei |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
72 |
+Muktha Narayan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
73 |
+Nancy Lee |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
74 |
+Narayana Pattipati |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
75 |
+Neo Liu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
76 |
+Niall Power |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
77 |
+Olaf Felka |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
78 |
+Oliver Braun |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
79 |
+Partha Pratim |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
80 |
+Patrick Gu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
81 |
+Pete Zha |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
82 |
+Rick Ju |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
83 |
+Robert Kinsella |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
84 |
+Robert O'Dea |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
85 |
+Robin Lu |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
86 |
+Simford Dong |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
87 |
+Sowmya Adiga |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
88 |
+Srirama Sharma |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
89 |
+Suresh Chandrasekharan |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
90 |
+Susan Jefferies |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
91 |
+Takao Fujiwara |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
92 |
+Terry Ponce |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
93 |
+Thorsten Laux |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
94 |
+Vijay Anand |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
95 |
+Vijaykumar Patwari |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
96 |
+Vinay M R |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
97 |
+Vishnu Kumar |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
98 |
+Yan Dong Yao |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
99 |
+Yogeesh MB |
d1778cc22a58
* patches/gnome-desktop-01-jds-about-branding.diff : gnome-about has been
mattman
parents:
10561
diff
changeset
|
100 |
+Young J. Song |
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
101 |
/jds/bin/diff -uprN gnome-desktop-2.27.91.old/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.27.91/gnome-about/gnome-about.desktop.in.in |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
102 |
--- gnome-desktop-2.27.91.old/gnome-about/gnome-about.desktop.in.in 2009-08-26 16:52:03.596334000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
103 |
+++ gnome-desktop-2.27.91/gnome-about/gnome-about.desktop.in.in 2009-08-26 16:55:00.686659000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
104 |
@@ -1,6 +1,7 @@ |
13532 | 105 |
[Desktop Entry] |
106 |
_Name=About GNOME |
|
107 |
-_Comment=Learn more about GNOME |
|
108 |
+# SUN_BRANDING |
|
109 |
+_Comment=GNOME version, licence and useful links |
|
110 |
Exec=gnome-about |
|
111 |
Icon=gnome-logo-icon-transparent |
|
112 |
Terminal=false |
|
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
113 |
/jds/bin/diff -uprN gnome-desktop-2.27.91.old/configure.in gnome-desktop-2.27.91/configure.in |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
114 |
--- gnome-desktop-2.27.91.old/configure.in 2009-08-26 16:52:03.667194000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
115 |
+++ gnome-desktop-2.27.91/configure.in 2009-08-26 16:56:43.460999000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
116 |
@@ -40,12 +40,17 @@ GNOME_MICRO=91 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
117 |
GNOME_DISTRIBUTOR="GNOME.Org" |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
118 |
GNOME_DATE=`date +"%Y-%m-%d"` |
16170 | 119 |
|
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
120 |
-AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor]) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
121 |
- |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
122 |
+AC_ARG_WITH(gnome_distributor_version, [ --with-gnome-distributor-version=DISTRIBUTOR Specify version of GNOME distributor |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
123 |
+]) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
124 |
+ |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
125 |
if test "x$with_gnome_distributor" != x ; then |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
126 |
GNOME_DISTRIBUTOR=$with_gnome_distributor |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
127 |
fi |
16170 | 128 |
|
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
129 |
+if test "x$with_gnome_distributor_version" != x ; then |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
130 |
+ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
131 |
+fi |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
132 |
+ |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
133 |
AC_ARG_ENABLE([date-in-gnome-version], |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
134 |
[AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])], |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
135 |
[],[enable_date_in_gnome_version=yes]) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
136 |
@@ -62,6 +67,7 @@ AC_SUBST(GNOME_PLATFORM) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
137 |
AC_SUBST(GNOME_MINOR) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
138 |
AC_SUBST(GNOME_MICRO) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
139 |
AC_SUBST(GNOME_DISTRIBUTOR) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
140 |
+AC_SUBST(GNOME_DISTRIBUTOR_VERSION) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
141 |
AC_SUBST(GNOME_DATE) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
142 |
AC_SUBST(GNOME_DATE_COMMENT_START) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
143 |
AC_SUBST(GNOME_DATE_COMMENT_END) |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
144 |
/jds/bin/diff -uprN gnome-desktop-2.27.91.old/Makefile.am gnome-desktop-2.27.91/Makefile.am |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
145 |
--- gnome-desktop-2.27.91.old/Makefile.am 2009-08-26 16:52:03.828642000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
146 |
+++ gnome-desktop-2.27.91/Makefile.am 2009-08-26 17:04:15.716264000 +0100 |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
147 |
@@ -9,17 +9,21 @@ SUBDIRS = \ |
16328
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
148 |
docs \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
149 |
man |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
150 |
|
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
151 |
+XML_IN_FILES=gnome-version.xml.in |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
152 |
+XML_FILES=$(XML_IN_FILES:.xml.in=.xml) |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
153 |
+versiondir=$(datadir)/gnome-about |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
154 |
+version_DATA=$(XML_FILES) |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
155 |
+ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
156 |
EXTRA_DIST = \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
157 |
MAINTAINERS \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
158 |
ChangeLog.pre-git \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
159 |
- gnome-version.xml.in.in \ |
16368
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
160 |
+ $(XML_IN_FILES) \ |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
161 |
+ $(XML_FILES) \ |
0adbf5667f22
* base-specs/gnome-desktop.spec : Bump to 2.27.91
mattman
parents:
16328
diff
changeset
|
162 |
gnome-version.xml \ |
16328
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
163 |
COPYING-DOCS \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
164 |
HACKING \ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
165 |
gnome-doc-utils.make |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
166 |
|
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
167 |
-versiondir=$(datadir)/gnome-about |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
168 |
-version_DATA=gnome-version.xml |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
169 |
@INTLTOOL_XML_RULE@ |
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
170 |
|
8f73a9ca6508
* patches/gnome-desktop-01-jds-about-branding.diff : Fix d.o.o.:10829,
mattman
parents:
16170
diff
changeset
|
171 |
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper |
16705
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
172 |
/jds/bin/diff -uprN gnome-desktop-2.28.0.old/gnome-about/gnome-about.in gnome-desktop-2.28.0/gnome-about/gnome-about.in |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
173 |
--- gnome-desktop-2.28.0.old/gnome-about/gnome-about.in 2009-10-08 15:01:51.073593799 +0100 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
174 |
+++ gnome-desktop-2.28.0/gnome-about/gnome-about.in 2009-10-08 15:03:11.026274982 +0100 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
175 |
@@ -33,11 +33,12 @@ pygtk.require ('2.0') |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
176 |
import gobject |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
177 |
from gobject.option import OptionParser, make_option |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
178 |
import gtk |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
179 |
+import gnome |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
180 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
181 |
import cairo |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
182 |
from math import pi |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
183 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
184 |
-import os, sys, random, time, gettext, locale |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
185 |
+import os, sys, random, time, gettext, locale, string |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
186 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
187 |
import xml.dom.minidom |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
188 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
189 |
@@ -57,11 +58,18 @@ LOGO_FILE = "gnome-64.png" |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
190 |
gettext.install (GETTEXT_PACKAGE, LOCALEDIR, unicode = True) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
191 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
192 |
header_links = [ |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
193 |
- (_("About GNOME"), "http://www.gnome.org/about/"), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
194 |
- (_("News"), "http://news.gnome.org/"), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
195 |
- (_("GNOME Library"), "http://library.gnome.org/"), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
196 |
- (_("Friends of GNOME"), "http://www.gnome.org/friends/"), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
197 |
- (_("Contact"), "http://www.gnome.org/contact/"), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
198 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
199 |
+ (_("About Solaris Desktop"), "http://www.opensolaris.com/learn/features/desktop", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
200 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
201 |
+ (_("About GNOME"), "http://www.gnome.org/about/", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
202 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
203 |
+ (_("Software"), "http://www.sun.com/software/", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
204 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
205 |
+ (_("Developers"), "http://developers.sun.com/", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
206 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
207 |
+ (_("GNOME Library"), "http://library.gnome.org/", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
208 |
+ # SUN_BRANDING # |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
209 |
+ (_("Contact"), "http://www.sun.com/contact/", True), |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
210 |
] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
211 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
212 |
translated_contributors = [ |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
213 |
@@ -81,6 +89,12 @@ def locate_file (file): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
214 |
return filename |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
215 |
return False |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
216 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
217 |
+def locate_program (program): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
218 |
+ for dir in string.split(os.environ['PATH'], os.pathsep): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
219 |
+ if os.access(os.path.join(dir, program), os.X_OK): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
220 |
+ return os.path.join(dir, program) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
221 |
+ return None |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
222 |
+ |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
223 |
def cleanup_date (date): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
224 |
'''Parse a date as found in gnome-version.xml and nicely format it''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
225 |
try: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
226 |
@@ -543,14 +557,16 @@ class HyperLink (WindowedLabel): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
227 |
url = "" |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
228 |
menu = None |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
229 |
selection = None |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
230 |
+ is_link = False |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
231 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
232 |
- def __init__ (self, label, url): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
233 |
+ def __init__ (self, label, url, is_link): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
234 |
'''Initialize object''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
235 |
super (HyperLink, self).__init__ () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
236 |
markup = "<b><u>%s</u></b>" % label |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
237 |
self.set_markup (markup) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
238 |
self.set_selectable (True) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
239 |
self.url = url |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
240 |
+ self.is_link = is_link |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
241 |
self.create_menu () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
242 |
link_color = self.style_get_property ("link-color") |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
243 |
if not link_color: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
244 |
@@ -559,10 +575,16 @@ class HyperLink (WindowedLabel): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
245 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
246 |
def open_url (self, *args): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
247 |
'''Use GNOME API to open the url''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
248 |
- try: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
249 |
- gtk.show_uri (self.get_screen(), self.url, 0) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
250 |
- except Exception, e: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
251 |
- print '''Warning: could not open "%s": %s''' % (self.url, e) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
252 |
+ if self.is_link != False: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
253 |
+ try: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
254 |
+ gnome.url_show (self.url) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
255 |
+ except Exception, e: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
256 |
+ print '''Warning: could not open "%s": %s''' % (self.url, e) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
257 |
+ else: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
258 |
+ try: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
259 |
+ os.system (self.url) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
260 |
+ except Exception, e: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
261 |
+ print '''Warning: could not launch "%s": %s''' % (self.url, e) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
262 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
263 |
def copy_url (self, *args): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
264 |
'''Copy URL to Clipboard''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
265 |
@@ -730,22 +752,33 @@ class GnomeAboutHeader (gtk.Layout): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
266 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
267 |
def make_link_widget (link): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
268 |
'''Helper function which makes an HyperLink and shows it''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
269 |
- label = HyperLink (link[0], link[1]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
270 |
- label.show_all () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
271 |
- return label |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
272 |
+ '''if link[2] is False, then a program, so check if on path''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
273 |
+ if link[2] == True: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
274 |
+ label = HyperLink (link[0], link[1], link[2]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
275 |
+ label.show_all () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
276 |
+ return label |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
277 |
+ else: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
278 |
+ path = locate_program(link[1]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
279 |
+ if path: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
280 |
+ label = HyperLink (link[0], link[1], link[2]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
281 |
+ label.show_all () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
282 |
+ return label |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
283 |
+ else: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
284 |
+ return None |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
285 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
286 |
widgets = map (make_link_widget, self.links) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
287 |
put_widgets = 0 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
288 |
for widget in widgets: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
289 |
- if put_widgets > 0: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
290 |
- if dot: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
291 |
- image = gtk.Image () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
292 |
- image.set_from_pixmap (dot, None) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
293 |
- self.put (image, current_x + 5, base_y + 6) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
294 |
- current_x += 16 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
295 |
- self.put (widget, current_x, base_y) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
296 |
- current_x += widget.size_request ()[0] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
297 |
- put_widgets += 1 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
298 |
+ if widget: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
299 |
+ if put_widgets > 0: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
300 |
+ if dot: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
301 |
+ image = gtk.Image () |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
302 |
+ image.set_from_pixmap (dot, None) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
303 |
+ self.put (image, current_x + 5, base_y + 6) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
304 |
+ current_x += 16 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
305 |
+ self.put (widget, current_x, base_y) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
306 |
+ current_x += widget.size_request ()[0] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
307 |
+ put_widgets += 1 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
308 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
309 |
self.width = current_x + 10 |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
310 |
self.height = current_y |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
311 |
@@ -882,7 +915,7 @@ class GnomeAbout (gtk.Dialog): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
312 |
main_box.pack_start (welcome_label) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
313 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
314 |
descriptions_label = VertAnimatedLabel (self.description_messages, |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
315 |
- 300, 120, |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
316 |
+ 402, 184, |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
317 |
DESCRIPTION_DELAY, "%s") |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
318 |
welcome_label.connect ("button-press-event", |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
319 |
descriptions_label.on_button_press) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
320 |
@@ -956,6 +989,7 @@ contributors list) correctly positionned |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
321 |
"minor" : "", |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
322 |
"micro" : "", |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
323 |
"distributor" : "", |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
324 |
+ "distributor-version" : "", |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
325 |
"date" : "" |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
326 |
} |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
327 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
328 |
@@ -966,15 +1000,19 @@ contributors list) correctly positionned |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
329 |
self.load_description_messages (node) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
330 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
331 |
'''Format version''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
332 |
- if not len (infos["platform"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
333 |
- version = "" |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
334 |
- elif not len (infos["minor"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
335 |
- version = infos["platform"] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
336 |
- elif not len (infos["micro"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
337 |
- version = "%s.%s" % (infos["platform"], infos["minor"]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
338 |
+ if infos["distributor-version"]: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
339 |
+ '''Use Distributor's version over gnome version''' |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
340 |
+ version = infos["distributor-version"] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
341 |
else: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
342 |
- version = "%s.%s.%s" % (infos["platform"], infos["minor"], |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
343 |
- infos["micro"]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
344 |
+ if not len (infos["platform"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
345 |
+ version = "" |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
346 |
+ elif not len (infos["minor"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
347 |
+ version = infos["platform"] |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
348 |
+ elif not len (infos["micro"]): |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
349 |
+ version = "%s.%s" % (infos["platform"], infos["minor"]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
350 |
+ else: |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
351 |
+ version = "%s.%s.%s" % (infos["platform"], infos["minor"], |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
352 |
+ infos["micro"]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
353 |
|
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
354 |
date = cleanup_date (infos["date"]) |
1a247f0a77da
* patches/gnome-desktop-01-jds-about-branding.diff: Fix two bugs, #10616
mattman
parents:
16368
diff
changeset
|
355 |