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