Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp:~ubuntu-desktop/indicator-session/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Merged at revision: | 196 |
Proposed branch: | lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
Merge into: | lp:~ubuntu-desktop/indicator-session/ubuntu |
Diff against target: |
2140 lines (+775/-189) 37 files modified
AUTHORS (+1/-0) ChangeLog (+36/-0) Makefile.am (+2/-0) Makefile.am.coverage (+48/-0) Makefile.in (+59/-11) configure (+312/-11) configure.ac (+19/-6) data/Makefile.am (+0/-27) data/Makefile.in (+28/-64) data/extra-sessions/Makefile.in (+8/-1) data/icons/16x16/Makefile.in (+8/-1) data/icons/16x16/actions/Makefile.in (+8/-1) data/icons/16x16/status/Makefile.in (+8/-1) data/icons/22x22/Makefile.in (+8/-1) data/icons/22x22/actions/Makefile.in (+8/-1) data/icons/22x22/status/Makefile.in (+8/-1) data/icons/24x24/Makefile.in (+8/-1) data/icons/24x24/actions/Makefile.in (+8/-1) data/icons/24x24/status/Makefile.in (+8/-1) data/icons/32x32/Makefile.in (+8/-1) data/icons/32x32/actions/Makefile.in (+8/-1) data/icons/32x32/status/Makefile.in (+8/-1) data/icons/Makefile.in (+8/-1) data/icons/scalable/Makefile.in (+8/-1) data/icons/scalable/actions/Makefile.in (+8/-1) data/icons/scalable/status/Makefile.in (+8/-1) data/indicator-session-lock-screen.desktop.in.in (+0/-10) data/indicator-session-logout.desktop.in.in (+0/-10) data/indicator-session-restart.desktop.in.in (+0/-10) data/indicator-session-shutdown.desktop.in.in (+0/-10) debian/changelog (+8/-0) m4/gcov.m4 (+86/-0) po/POTFILES.in (+0/-4) src/Makefile.am (+12/-2) src/Makefile.in (+26/-7) src/gtk-logout-helper.c (+1/-0) src/session-service.c (+1/-0) |
To merge this branch: | bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+101014@code.launchpad.net |
Commit message
Description of the change
indicator-session 0.3.96
* Remove desktop files so they don't appear in the dash. (LP: #973181)
* Add gcov to the build for coverage statistics
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' | |||
2 | --- AUTHORS 2012-03-14 18:34:16 +0000 | |||
3 | +++ AUTHORS 2012-04-05 17:54:28 +0000 | |||
4 | @@ -2,6 +2,7 @@ | |||
5 | 2 | 2 | ||
6 | 3 | Alberto Mardegan | 3 | Alberto Mardegan |
7 | 4 | Alexander Sack | 4 | Alexander Sack |
8 | 5 | Allan LeSage | ||
9 | 5 | Charles Kerr | 6 | Charles Kerr |
10 | 6 | Christoph Korn | 7 | Christoph Korn |
11 | 7 | Cody Russell | 8 | Cody Russell |
12 | 8 | 9 | ||
13 | === modified file 'ChangeLog' | |||
14 | --- ChangeLog 2012-03-21 17:24:44 +0000 | |||
15 | +++ ChangeLog 2012-04-05 17:54:28 +0000 | |||
16 | @@ -1,5 +1,41 @@ | |||
17 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
18 | 2 | 2 | ||
19 | 3 | 2012-04-05 Charles Kerr <charles.kerr@canonical.com> | ||
20 | 4 | |||
21 | 5 | 0.3.96 | ||
22 | 6 | |||
23 | 7 | 2012-04-04 Charles Kerr <charles.kerr@canonical.com> | ||
24 | 8 | |||
25 | 9 | merge lp:~ted/indicator-session/no-system-desktop-files to remove the desktop files so they don't appear in the dash. | ||
26 | 10 | |||
27 | 11 | 2012-04-04 Ted Gould <ted@gould.cx> | ||
28 | 12 | |||
29 | 13 | Attaching bug | ||
30 | 14 | |||
31 | 15 | 2012-04-04 Ted Gould <ted@gould.cx> | ||
32 | 16 | |||
33 | 17 | Dropping the desktop files from translations | ||
34 | 18 | |||
35 | 19 | 2012-04-04 Ted Gould <ted@gould.cx> | ||
36 | 20 | |||
37 | 21 | Dropping the desktop files from the build | ||
38 | 22 | |||
39 | 23 | 2012-03-29 Charles Kerr <charles.kerr@canonical.com> | ||
40 | 24 | |||
41 | 25 | merge lp:~allanlesage/indicator-session/TDD to add gcov to the build for coverage statitistics | ||
42 | 26 | |||
43 | 27 | 2012-03-29 Allan LeSage <allanlesage@gmail.com> | ||
44 | 28 | |||
45 | 29 | Advised changes to fix implicit declarations. | ||
46 | 30 | |||
47 | 31 | 2012-03-28 Allan LeSage <allanlesage@gmail.com> | ||
48 | 32 | |||
49 | 33 | Merged from trunk. | ||
50 | 34 | |||
51 | 35 | 2012-03-27 Allan LeSage <allanlesage@gmail.com> | ||
52 | 36 | |||
53 | 37 | Added gcov coverage tooling. | ||
54 | 38 | |||
55 | 3 | 2012-03-21 Charles Kerr <charles.kerr@canonical.com> | 39 | 2012-03-21 Charles Kerr <charles.kerr@canonical.com> |
56 | 4 | 40 | ||
57 | 5 | 0.3.95 | 41 | 0.3.95 |
58 | 6 | 42 | ||
59 | === modified file 'Makefile.am' | |||
60 | --- Makefile.am 2011-08-31 18:38:17 +0000 | |||
61 | +++ Makefile.am 2012-04-05 17:54:28 +0000 | |||
62 | @@ -72,3 +72,5 @@ | |||
63 | 72 | @chmod +x $@ | 72 | @chmod +x $@ |
64 | 73 | 73 | ||
65 | 74 | CLEANFILES = $(TESTS) | 74 | CLEANFILES = $(TESTS) |
66 | 75 | |||
67 | 76 | include $(top_srcdir)/Makefile.am.coverage | ||
68 | 75 | 77 | ||
69 | === added file 'Makefile.am.coverage' | |||
70 | --- Makefile.am.coverage 1970-01-01 00:00:00 +0000 | |||
71 | +++ Makefile.am.coverage 2012-04-05 17:54:28 +0000 | |||
72 | @@ -0,0 +1,48 @@ | |||
73 | 1 | |||
74 | 2 | # Coverage targets | ||
75 | 3 | |||
76 | 4 | .PHONY: clean-gcno clean-gcda \ | ||
77 | 5 | coverage-html generate-coverage-html clean-coverage-html \ | ||
78 | 6 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr | ||
79 | 7 | |||
80 | 8 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr | ||
81 | 9 | |||
82 | 10 | if HAVE_GCOV | ||
83 | 11 | |||
84 | 12 | clean-gcno: | ||
85 | 13 | @echo Removing old coverage instrumentation | ||
86 | 14 | -find -name '*.gcno' -print | xargs -r rm | ||
87 | 15 | |||
88 | 16 | clean-gcda: | ||
89 | 17 | @echo Removing old coverage results | ||
90 | 18 | -find -name '*.gcda' -print | xargs -r rm | ||
91 | 19 | |||
92 | 20 | coverage-html: clean-gcda | ||
93 | 21 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
94 | 22 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
95 | 23 | |||
96 | 24 | generate-coverage-html: | ||
97 | 25 | @echo Collecting coverage data | ||
98 | 26 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
99 | 27 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
100 | 28 | |||
101 | 29 | clean-coverage-html: clean-gcda | ||
102 | 30 | -$(LCOV) --directory $(top_builddir) -z | ||
103 | 31 | -rm -rf coverage.info coveragereport | ||
104 | 32 | |||
105 | 33 | if HAVE_GCOVR | ||
106 | 34 | |||
107 | 35 | coverage-gcovr: clean-gcda | ||
108 | 36 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
109 | 37 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | ||
110 | 38 | |||
111 | 39 | generate-coverage-gcovr: | ||
112 | 40 | @echo Generating coverage GCOVR report | ||
113 | 41 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
114 | 42 | |||
115 | 43 | clean-coverage-gcovr: clean-gcda | ||
116 | 44 | -rm -rf $(top_builddir)/coverage.xml | ||
117 | 45 | |||
118 | 46 | endif # HAVE_GCOVR | ||
119 | 47 | |||
120 | 48 | endif # HAVE_GCOV | ||
121 | 0 | 49 | ||
122 | === modified file 'Makefile.in' | |||
123 | --- Makefile.in 2012-03-14 18:34:16 +0000 | |||
124 | +++ Makefile.in 2012-04-05 17:54:28 +0000 | |||
125 | @@ -14,6 +14,8 @@ | |||
126 | 14 | # PARTICULAR PURPOSE. | 14 | # PARTICULAR PURPOSE. |
127 | 15 | 15 | ||
128 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
129 | 17 | |||
130 | 18 | # Coverage targets | ||
131 | 17 | VPATH = @srcdir@ | 19 | VPATH = @srcdir@ |
132 | 18 | pkgdatadir = $(datadir)/@PACKAGE@ | 20 | pkgdatadir = $(datadir)/@PACKAGE@ |
133 | 19 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkgincludedir = $(includedir)/@PACKAGE@ |
134 | @@ -33,17 +35,18 @@ | |||
135 | 33 | POST_UNINSTALL = : | 35 | POST_UNINSTALL = : |
136 | 34 | build_triplet = @build@ | 36 | build_triplet = @build@ |
137 | 35 | host_triplet = @host@ | 37 | host_triplet = @host@ |
138 | 36 | subdir = . | ||
139 | 37 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 38 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
140 | 38 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 39 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
144 | 39 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | 40 | $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \ |
145 | 40 | compile config.guess config.sub depcomp install-sh ltmain.sh \ | 41 | AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \ |
146 | 41 | missing mkinstalldirs | 42 | config.sub depcomp install-sh ltmain.sh missing mkinstalldirs |
147 | 43 | subdir = . | ||
148 | 42 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 44 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
149 | 43 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 45 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
150 | 44 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 46 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
151 | 45 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 47 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
153 | 46 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 48 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
154 | 49 | $(top_srcdir)/configure.ac | ||
155 | 47 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 50 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
156 | 48 | $(ACLOCAL_M4) | 51 | $(ACLOCAL_M4) |
157 | 49 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | 52 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
158 | @@ -133,6 +136,8 @@ | |||
159 | 133 | CC = @CC@ | 136 | CC = @CC@ |
160 | 134 | CCDEPMODE = @CCDEPMODE@ | 137 | CCDEPMODE = @CCDEPMODE@ |
161 | 135 | CFLAGS = @CFLAGS@ | 138 | CFLAGS = @CFLAGS@ |
162 | 139 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
163 | 140 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
164 | 136 | CPP = @CPP@ | 141 | CPP = @CPP@ |
165 | 137 | CPPFLAGS = @CPPFLAGS@ | 142 | CPPFLAGS = @CPPFLAGS@ |
166 | 138 | CYGPATH_W = @CYGPATH_W@ | 143 | CYGPATH_W = @CYGPATH_W@ |
167 | @@ -149,6 +154,8 @@ | |||
168 | 149 | EGREP = @EGREP@ | 154 | EGREP = @EGREP@ |
169 | 150 | EXEEXT = @EXEEXT@ | 155 | EXEEXT = @EXEEXT@ |
170 | 151 | FGREP = @FGREP@ | 156 | FGREP = @FGREP@ |
171 | 157 | GCOVR = @GCOVR@ | ||
172 | 158 | GENHTML = @GENHTML@ | ||
173 | 152 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 159 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
174 | 153 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 160 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
175 | 154 | GMOFILES = @GMOFILES@ | 161 | GMOFILES = @GMOFILES@ |
176 | @@ -177,6 +184,7 @@ | |||
177 | 177 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 184 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
178 | 178 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 185 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
179 | 179 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 186 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
180 | 187 | LCOV = @LCOV@ | ||
181 | 180 | LD = @LD@ | 188 | LD = @LD@ |
182 | 181 | LDFLAGS = @LDFLAGS@ | 189 | LDFLAGS = @LDFLAGS@ |
183 | 182 | LIBOBJS = @LIBOBJS@ | 190 | LIBOBJS = @LIBOBJS@ |
184 | @@ -222,6 +230,7 @@ | |||
185 | 222 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 230 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
186 | 223 | SET_MAKE = @SET_MAKE@ | 231 | SET_MAKE = @SET_MAKE@ |
187 | 224 | SHELL = @SHELL@ | 232 | SHELL = @SHELL@ |
188 | 233 | SHTOOL = @SHTOOL@ | ||
189 | 225 | STRIP = @STRIP@ | 234 | STRIP = @STRIP@ |
190 | 226 | USE_NLS = @USE_NLS@ | 235 | USE_NLS = @USE_NLS@ |
191 | 227 | VERSION = @VERSION@ | 236 | VERSION = @VERSION@ |
192 | @@ -300,7 +309,7 @@ | |||
193 | 300 | .SUFFIXES: | 309 | .SUFFIXES: |
194 | 301 | am--refresh: Makefile | 310 | am--refresh: Makefile |
195 | 302 | @: | 311 | @: |
197 | 303 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 312 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) |
198 | 304 | @for dep in $?; do \ | 313 | @for dep in $?; do \ |
199 | 305 | case '$(am__configure_deps)' in \ | 314 | case '$(am__configure_deps)' in \ |
200 | 306 | *$$dep*) \ | 315 | *$$dep*) \ |
201 | @@ -323,6 +332,7 @@ | |||
202 | 323 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 332 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
203 | 324 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 333 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
204 | 325 | esac; | 334 | esac; |
205 | 335 | $(top_srcdir)/Makefile.am.coverage: | ||
206 | 326 | 336 | ||
207 | 327 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 337 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
208 | 328 | $(SHELL) ./config.status --recheck | 338 | $(SHELL) ./config.status --recheck |
209 | @@ -817,7 +827,7 @@ | |||
210 | 817 | @echo "it deletes files that may require special tools to rebuild." | 827 | @echo "it deletes files that may require special tools to rebuild." |
211 | 818 | clean: clean-recursive | 828 | clean: clean-recursive |
212 | 819 | 829 | ||
214 | 820 | clean-am: clean-generic clean-libtool mostlyclean-am | 830 | clean-am: clean-generic clean-libtool clean-local mostlyclean-am |
215 | 821 | 831 | ||
216 | 822 | distclean: distclean-recursive | 832 | distclean: distclean-recursive |
217 | 823 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) | 833 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
218 | @@ -890,10 +900,10 @@ | |||
219 | 890 | 900 | ||
220 | 891 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 901 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
221 | 892 | all all-am am--refresh check check-TESTS check-am clean \ | 902 | all all-am am--refresh check check-TESTS check-am clean \ |
226 | 893 | clean-generic clean-libtool ctags ctags-recursive dist \ | 903 | clean-generic clean-libtool clean-local ctags ctags-recursive \ |
227 | 894 | dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ | 904 | dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \ |
228 | 895 | dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ | 905 | dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ |
229 | 896 | distclean-generic distclean-hdr distclean-libtool \ | 906 | distclean distclean-generic distclean-hdr distclean-libtool \ |
230 | 897 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ | 907 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
231 | 898 | dvi-am html html-am info info-am install install-am \ | 908 | dvi-am html html-am info info-am install install-am \ |
232 | 899 | install-data install-data-am install-dvi install-dvi-am \ | 909 | install-data install-data-am install-dvi install-dvi-am \ |
233 | @@ -964,6 +974,44 @@ | |||
234 | 964 | @echo "exit 0" >> $@ | 974 | @echo "exit 0" >> $@ |
235 | 965 | @chmod +x $@ | 975 | @chmod +x $@ |
236 | 966 | 976 | ||
237 | 977 | .PHONY: clean-gcno clean-gcda \ | ||
238 | 978 | coverage-html generate-coverage-html clean-coverage-html \ | ||
239 | 979 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr | ||
240 | 980 | |||
241 | 981 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr | ||
242 | 982 | |||
243 | 983 | @HAVE_GCOV_TRUE@clean-gcno: | ||
244 | 984 | @HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation | ||
245 | 985 | @HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm | ||
246 | 986 | |||
247 | 987 | @HAVE_GCOV_TRUE@clean-gcda: | ||
248 | 988 | @HAVE_GCOV_TRUE@ @echo Removing old coverage results | ||
249 | 989 | @HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm | ||
250 | 990 | |||
251 | 991 | @HAVE_GCOV_TRUE@coverage-html: clean-gcda | ||
252 | 992 | @HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
253 | 993 | @HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
254 | 994 | |||
255 | 995 | @HAVE_GCOV_TRUE@generate-coverage-html: | ||
256 | 996 | @HAVE_GCOV_TRUE@ @echo Collecting coverage data | ||
257 | 997 | @HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
258 | 998 | @HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
259 | 999 | |||
260 | 1000 | @HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda | ||
261 | 1001 | @HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z | ||
262 | 1002 | @HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport | ||
263 | 1003 | |||
264 | 1004 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda | ||
265 | 1005 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
266 | 1006 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | ||
267 | 1007 | |||
268 | 1008 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr: | ||
269 | 1009 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report | ||
270 | 1010 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
271 | 1011 | |||
272 | 1012 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda | ||
273 | 1013 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml | ||
274 | 1014 | |||
275 | 967 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 1015 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
276 | 968 | # Otherwise a system limit (for SysV at least) may be exceeded. | 1016 | # Otherwise a system limit (for SysV at least) may be exceeded. |
277 | 969 | .NOEXPORT: | 1017 | .NOEXPORT: |
278 | 970 | 1018 | ||
279 | === modified file 'configure' | |||
280 | --- configure 2012-03-21 17:24:44 +0000 | |||
281 | +++ configure 2012-04-05 17:54:28 +0000 | |||
282 | @@ -615,6 +615,18 @@ | |||
283 | 615 | LIBOBJS | 615 | LIBOBJS |
284 | 616 | HAS_GUDEV_FALSE | 616 | HAS_GUDEV_FALSE |
285 | 617 | HAS_GUDEV_TRUE | 617 | HAS_GUDEV_TRUE |
286 | 618 | COVERAGE_LDFLAGS | ||
287 | 619 | COVERAGE_CFLAGS | ||
288 | 620 | HAVE_GCOVR_FALSE | ||
289 | 621 | HAVE_GCOVR_TRUE | ||
290 | 622 | HAVE_LCOV_FALSE | ||
291 | 623 | HAVE_LCOV_TRUE | ||
292 | 624 | HAVE_GCOV_FALSE | ||
293 | 625 | HAVE_GCOV_TRUE | ||
294 | 626 | GCOVR | ||
295 | 627 | GENHTML | ||
296 | 628 | LCOV | ||
297 | 629 | SHTOOL | ||
298 | 618 | MKINSTALLDIRS | 630 | MKINSTALLDIRS |
299 | 619 | POSUB | 631 | POSUB |
300 | 620 | POFILES | 632 | POFILES |
301 | @@ -824,6 +836,7 @@ | |||
302 | 824 | enable_gtklogouthelper | 836 | enable_gtklogouthelper |
303 | 825 | enable_apt | 837 | enable_apt |
304 | 826 | enable_localinstall | 838 | enable_localinstall |
305 | 839 | enable_gcov | ||
306 | 827 | ' | 840 | ' |
307 | 828 | ac_precious_vars='build_alias | 841 | ac_precious_vars='build_alias |
308 | 829 | host_alias | 842 | host_alias |
309 | @@ -1482,6 +1495,7 @@ | |||
310 | 1482 | --disable-apt disable APT support | 1495 | --disable-apt disable APT support |
311 | 1483 | --enable-localinstall install all of the files localy instead of system | 1496 | --enable-localinstall install all of the files localy instead of system |
312 | 1484 | directories (for distcheck) | 1497 | directories (for distcheck) |
313 | 1498 | --enable-gcov enable coverage testing with gcov | ||
314 | 1485 | 1499 | ||
315 | 1486 | Optional Packages: | 1500 | Optional Packages: |
316 | 1487 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] | 1501 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
317 | @@ -2774,7 +2788,7 @@ | |||
318 | 2774 | 2788 | ||
319 | 2775 | # Define the identity of the package. | 2789 | # Define the identity of the package. |
320 | 2776 | PACKAGE=indicator-session | 2790 | PACKAGE=indicator-session |
322 | 2777 | VERSION=0.3.95 | 2791 | VERSION=0.3.96 |
323 | 2778 | 2792 | ||
324 | 2779 | 2793 | ||
325 | 2780 | cat >>confdefs.h <<_ACEOF | 2794 | cat >>confdefs.h <<_ACEOF |
326 | @@ -14758,6 +14772,279 @@ | |||
327 | 14758 | 14772 | ||
328 | 14759 | 14773 | ||
329 | 14760 | ########################### | 14774 | ########################### |
330 | 14775 | # gcov coverage reporting | ||
331 | 14776 | ########################### | ||
332 | 14777 | |||
333 | 14778 | # Checks for existence of coverage tools: | ||
334 | 14779 | # * gcov | ||
335 | 14780 | # * lcov | ||
336 | 14781 | # * genhtml | ||
337 | 14782 | # * gcovr | ||
338 | 14783 | # | ||
339 | 14784 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
340 | 14785 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
341 | 14786 | # AC_TDD_GCOV | ||
342 | 14787 | |||
343 | 14788 | |||
344 | 14789 | # Check whether --enable-gcov was given. | ||
345 | 14790 | if test "${enable_gcov+set}" = set; then : | ||
346 | 14791 | enableval=$enable_gcov; use_gcov=$enableval | ||
347 | 14792 | else | ||
348 | 14793 | use_gcov=no | ||
349 | 14794 | fi | ||
350 | 14795 | |||
351 | 14796 | |||
352 | 14797 | if test "x$use_gcov" = "xyes"; then | ||
353 | 14798 | # we need gcc: | ||
354 | 14799 | if test "$GCC" != "yes"; then | ||
355 | 14800 | as_fn_error $? "GCC is required for --enable-gcov" "$LINENO" 5 | ||
356 | 14801 | fi | ||
357 | 14802 | |||
358 | 14803 | # Check if ccache is being used | ||
359 | 14804 | # Extract the first word of "shtool", so it can be a program name with args. | ||
360 | 14805 | set dummy shtool; ac_word=$2 | ||
361 | 14806 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
362 | 14807 | $as_echo_n "checking for $ac_word... " >&6; } | ||
363 | 14808 | if ${ac_cv_prog_SHTOOL+:} false; then : | ||
364 | 14809 | $as_echo_n "(cached) " >&6 | ||
365 | 14810 | else | ||
366 | 14811 | if test -n "$SHTOOL"; then | ||
367 | 14812 | ac_cv_prog_SHTOOL="$SHTOOL" # Let the user override the test. | ||
368 | 14813 | else | ||
369 | 14814 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
370 | 14815 | for as_dir in $PATH | ||
371 | 14816 | do | ||
372 | 14817 | IFS=$as_save_IFS | ||
373 | 14818 | test -z "$as_dir" && as_dir=. | ||
374 | 14819 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
375 | 14820 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
376 | 14821 | ac_cv_prog_SHTOOL="shtool" | ||
377 | 14822 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
378 | 14823 | break 2 | ||
379 | 14824 | fi | ||
380 | 14825 | done | ||
381 | 14826 | done | ||
382 | 14827 | IFS=$as_save_IFS | ||
383 | 14828 | |||
384 | 14829 | fi | ||
385 | 14830 | fi | ||
386 | 14831 | SHTOOL=$ac_cv_prog_SHTOOL | ||
387 | 14832 | if test -n "$SHTOOL"; then | ||
388 | 14833 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHTOOL" >&5 | ||
389 | 14834 | $as_echo "$SHTOOL" >&6; } | ||
390 | 14835 | else | ||
391 | 14836 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
392 | 14837 | $as_echo "no" >&6; } | ||
393 | 14838 | fi | ||
394 | 14839 | |||
395 | 14840 | |||
396 | 14841 | case `$SHTOOL path $CC` in | ||
397 | 14842 | *ccache*) gcc_ccache=yes;; | ||
398 | 14843 | *) gcc_ccache=no;; | ||
399 | 14844 | esac | ||
400 | 14845 | |||
401 | 14846 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
402 | 14847 | as_fn_error $? "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5 | ||
403 | 14848 | fi | ||
404 | 14849 | |||
405 | 14850 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
406 | 14851 | # Extract the first word of "lcov", so it can be a program name with args. | ||
407 | 14852 | set dummy lcov; ac_word=$2 | ||
408 | 14853 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
409 | 14854 | $as_echo_n "checking for $ac_word... " >&6; } | ||
410 | 14855 | if ${ac_cv_prog_LCOV+:} false; then : | ||
411 | 14856 | $as_echo_n "(cached) " >&6 | ||
412 | 14857 | else | ||
413 | 14858 | if test -n "$LCOV"; then | ||
414 | 14859 | ac_cv_prog_LCOV="$LCOV" # Let the user override the test. | ||
415 | 14860 | else | ||
416 | 14861 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
417 | 14862 | for as_dir in $PATH | ||
418 | 14863 | do | ||
419 | 14864 | IFS=$as_save_IFS | ||
420 | 14865 | test -z "$as_dir" && as_dir=. | ||
421 | 14866 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
422 | 14867 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
423 | 14868 | ac_cv_prog_LCOV="lcov" | ||
424 | 14869 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
425 | 14870 | break 2 | ||
426 | 14871 | fi | ||
427 | 14872 | done | ||
428 | 14873 | done | ||
429 | 14874 | IFS=$as_save_IFS | ||
430 | 14875 | |||
431 | 14876 | fi | ||
432 | 14877 | fi | ||
433 | 14878 | LCOV=$ac_cv_prog_LCOV | ||
434 | 14879 | if test -n "$LCOV"; then | ||
435 | 14880 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 | ||
436 | 14881 | $as_echo "$LCOV" >&6; } | ||
437 | 14882 | else | ||
438 | 14883 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
439 | 14884 | $as_echo "no" >&6; } | ||
440 | 14885 | fi | ||
441 | 14886 | |||
442 | 14887 | |||
443 | 14888 | # Extract the first word of "genhtml", so it can be a program name with args. | ||
444 | 14889 | set dummy genhtml; ac_word=$2 | ||
445 | 14890 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
446 | 14891 | $as_echo_n "checking for $ac_word... " >&6; } | ||
447 | 14892 | if ${ac_cv_prog_GENHTML+:} false; then : | ||
448 | 14893 | $as_echo_n "(cached) " >&6 | ||
449 | 14894 | else | ||
450 | 14895 | if test -n "$GENHTML"; then | ||
451 | 14896 | ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. | ||
452 | 14897 | else | ||
453 | 14898 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
454 | 14899 | for as_dir in $PATH | ||
455 | 14900 | do | ||
456 | 14901 | IFS=$as_save_IFS | ||
457 | 14902 | test -z "$as_dir" && as_dir=. | ||
458 | 14903 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
459 | 14904 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
460 | 14905 | ac_cv_prog_GENHTML="genhtml" | ||
461 | 14906 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
462 | 14907 | break 2 | ||
463 | 14908 | fi | ||
464 | 14909 | done | ||
465 | 14910 | done | ||
466 | 14911 | IFS=$as_save_IFS | ||
467 | 14912 | |||
468 | 14913 | fi | ||
469 | 14914 | fi | ||
470 | 14915 | GENHTML=$ac_cv_prog_GENHTML | ||
471 | 14916 | if test -n "$GENHTML"; then | ||
472 | 14917 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 | ||
473 | 14918 | $as_echo "$GENHTML" >&6; } | ||
474 | 14919 | else | ||
475 | 14920 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
476 | 14921 | $as_echo "no" >&6; } | ||
477 | 14922 | fi | ||
478 | 14923 | |||
479 | 14924 | |||
480 | 14925 | |||
481 | 14926 | if test "$LCOV"; then | ||
482 | 14927 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 | ||
483 | 14928 | $as_echo_n "checking for lcov version... " >&6; } | ||
484 | 14929 | if ${glib_cv_lcov_version+:} false; then : | ||
485 | 14930 | $as_echo_n "(cached) " >&6 | ||
486 | 14931 | else | ||
487 | 14932 | |||
488 | 14933 | glib_cv_lcov_version=invalid | ||
489 | 14934 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
490 | 14935 | for lcov_check_version in $lcov_version_list; do | ||
491 | 14936 | if test "$lcov_version" = "$lcov_check_version"; then | ||
492 | 14937 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
493 | 14938 | fi | ||
494 | 14939 | done | ||
495 | 14940 | |||
496 | 14941 | fi | ||
497 | 14942 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_lcov_version" >&5 | ||
498 | 14943 | $as_echo "$glib_cv_lcov_version" >&6; } | ||
499 | 14944 | else | ||
500 | 14945 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
501 | 14946 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
502 | 14947 | fi | ||
503 | 14948 | |||
504 | 14949 | case $glib_cv_lcov_version in | ||
505 | 14950 | ""|invalid) | ||
506 | 14951 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
507 | 14952 | as_fn_error $? "$lcov_msg" "$LINENO" 5 | ||
508 | 14953 | LCOV="exit 0;" | ||
509 | 14954 | ;; | ||
510 | 14955 | esac | ||
511 | 14956 | |||
512 | 14957 | if test -z "$GENHTML"; then | ||
513 | 14958 | as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 | ||
514 | 14959 | fi | ||
515 | 14960 | |||
516 | 14961 | ac_cv_check_gcov=yes | ||
517 | 14962 | ac_cv_check_lcov=yes | ||
518 | 14963 | |||
519 | 14964 | # Remove all optimization flags from CFLAGS | ||
520 | 14965 | |||
521 | 14966 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
522 | 14967 | |||
523 | 14968 | |||
524 | 14969 | # Add the special gcc flags | ||
525 | 14970 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
526 | 14971 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
527 | 14972 | COVERAGE_LDFLAGS="-lgcov" | ||
528 | 14973 | |||
529 | 14974 | # Check availability of gcovr | ||
530 | 14975 | # Extract the first word of "gcovr", so it can be a program name with args. | ||
531 | 14976 | set dummy gcovr; ac_word=$2 | ||
532 | 14977 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
533 | 14978 | $as_echo_n "checking for $ac_word... " >&6; } | ||
534 | 14979 | if ${ac_cv_prog_GCOVR+:} false; then : | ||
535 | 14980 | $as_echo_n "(cached) " >&6 | ||
536 | 14981 | else | ||
537 | 14982 | if test -n "$GCOVR"; then | ||
538 | 14983 | ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. | ||
539 | 14984 | else | ||
540 | 14985 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
541 | 14986 | for as_dir in $PATH | ||
542 | 14987 | do | ||
543 | 14988 | IFS=$as_save_IFS | ||
544 | 14989 | test -z "$as_dir" && as_dir=. | ||
545 | 14990 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
546 | 14991 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
547 | 14992 | ac_cv_prog_GCOVR="gcovr" | ||
548 | 14993 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
549 | 14994 | break 2 | ||
550 | 14995 | fi | ||
551 | 14996 | done | ||
552 | 14997 | done | ||
553 | 14998 | IFS=$as_save_IFS | ||
554 | 14999 | |||
555 | 15000 | fi | ||
556 | 15001 | fi | ||
557 | 15002 | GCOVR=$ac_cv_prog_GCOVR | ||
558 | 15003 | if test -n "$GCOVR"; then | ||
559 | 15004 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 | ||
560 | 15005 | $as_echo "$GCOVR" >&6; } | ||
561 | 15006 | else | ||
562 | 15007 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
563 | 15008 | $as_echo "no" >&6; } | ||
564 | 15009 | fi | ||
565 | 15010 | |||
566 | 15011 | |||
567 | 15012 | if test -z "$GCOVR"; then | ||
568 | 15013 | ac_cv_check_gcovr=no | ||
569 | 15014 | else | ||
570 | 15015 | ac_cv_check_gcovr=yes | ||
571 | 15016 | fi | ||
572 | 15017 | |||
573 | 15018 | fi | ||
574 | 15019 | |||
575 | 15020 | if test "x$ac_cv_check_gcov" = xyes; then | ||
576 | 15021 | HAVE_GCOV_TRUE= | ||
577 | 15022 | HAVE_GCOV_FALSE='#' | ||
578 | 15023 | else | ||
579 | 15024 | HAVE_GCOV_TRUE='#' | ||
580 | 15025 | HAVE_GCOV_FALSE= | ||
581 | 15026 | fi | ||
582 | 15027 | |||
583 | 15028 | if test "x$ac_cv_check_lcov" = xyes; then | ||
584 | 15029 | HAVE_LCOV_TRUE= | ||
585 | 15030 | HAVE_LCOV_FALSE='#' | ||
586 | 15031 | else | ||
587 | 15032 | HAVE_LCOV_TRUE='#' | ||
588 | 15033 | HAVE_LCOV_FALSE= | ||
589 | 15034 | fi | ||
590 | 15035 | |||
591 | 15036 | if test "x$ac_cv_check_gcovr" = xyes; then | ||
592 | 15037 | HAVE_GCOVR_TRUE= | ||
593 | 15038 | HAVE_GCOVR_FALSE='#' | ||
594 | 15039 | else | ||
595 | 15040 | HAVE_GCOVR_TRUE='#' | ||
596 | 15041 | HAVE_GCOVR_FALSE= | ||
597 | 15042 | fi | ||
598 | 15043 | |||
599 | 15044 | |||
600 | 15045 | |||
601 | 15046 | |||
602 | 15047 | ########################### | ||
603 | 14761 | # Files | 15048 | # Files |
604 | 14762 | ########################### | 15049 | ########################### |
605 | 14763 | 15050 | ||
606 | @@ -14922,6 +15209,18 @@ | |||
607 | 14922 | as_fn_error $? "conditional \"BUILD_APT\" was never defined. | 15209 | as_fn_error $? "conditional \"BUILD_APT\" was never defined. |
608 | 14923 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 15210 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
609 | 14924 | fi | 15211 | fi |
610 | 15212 | if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then | ||
611 | 15213 | as_fn_error $? "conditional \"HAVE_GCOV\" was never defined. | ||
612 | 15214 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
613 | 15215 | fi | ||
614 | 15216 | if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then | ||
615 | 15217 | as_fn_error $? "conditional \"HAVE_LCOV\" was never defined. | ||
616 | 15218 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
617 | 15219 | fi | ||
618 | 15220 | if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then | ||
619 | 15221 | as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined. | ||
620 | 15222 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
621 | 15223 | fi | ||
622 | 14925 | if test -z "${HAS_GUDEV_TRUE}" && test -z "${HAS_GUDEV_FALSE}"; then | 15224 | if test -z "${HAS_GUDEV_TRUE}" && test -z "${HAS_GUDEV_FALSE}"; then |
623 | 14926 | as_fn_error $? "conditional \"HAS_GUDEV\" was never defined. | 15225 | as_fn_error $? "conditional \"HAS_GUDEV\" was never defined. |
624 | 14927 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 15226 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
625 | @@ -17224,19 +17523,21 @@ | |||
626 | 17224 | 17523 | ||
627 | 17225 | SUS Indicator Configuration: | 17524 | SUS Indicator Configuration: |
628 | 17226 | 17525 | ||
634 | 17227 | Prefix: $prefix | 17526 | Prefix: $prefix |
635 | 17228 | Indicator Dir: $INDICATORDIR | 17527 | Indicator Dir: $INDICATORDIR |
636 | 17229 | Indicator GTK: $with_gtk | 17528 | Indicator GTK: $with_gtk |
637 | 17230 | Logout Helper: $have_gtklogouthelper | 17529 | Logout Helper: $have_gtklogouthelper |
638 | 17231 | APT support: $enable_apt | 17530 | APT support: $enable_apt |
639 | 17531 | Coverage reporting: $use_gcov | ||
640 | 17232 | " >&5 | 17532 | " >&5 |
641 | 17233 | $as_echo "$as_me: | 17533 | $as_echo "$as_me: |
642 | 17234 | 17534 | ||
643 | 17235 | SUS Indicator Configuration: | 17535 | SUS Indicator Configuration: |
644 | 17236 | 17536 | ||
650 | 17237 | Prefix: $prefix | 17537 | Prefix: $prefix |
651 | 17238 | Indicator Dir: $INDICATORDIR | 17538 | Indicator Dir: $INDICATORDIR |
652 | 17239 | Indicator GTK: $with_gtk | 17539 | Indicator GTK: $with_gtk |
653 | 17240 | Logout Helper: $have_gtklogouthelper | 17540 | Logout Helper: $have_gtklogouthelper |
654 | 17241 | APT support: $enable_apt | 17541 | APT support: $enable_apt |
655 | 17542 | Coverage reporting: $use_gcov | ||
656 | 17242 | " >&6;} | 17543 | " >&6;} |
657 | 17243 | 17544 | ||
658 | === modified file 'configure.ac' | |||
659 | --- configure.ac 2012-03-21 17:26:42 +0000 | |||
660 | +++ configure.ac 2012-04-05 17:54:28 +0000 | |||
661 | @@ -4,7 +4,7 @@ | |||
662 | 4 | AC_PREREQ(2.53) | 4 | AC_PREREQ(2.53) |
663 | 5 | 5 | ||
664 | 6 | AM_CONFIG_HEADER(config.h) | 6 | AM_CONFIG_HEADER(config.h) |
666 | 7 | AM_INIT_AUTOMAKE(indicator-session, 0.3.95) | 7 | AM_INIT_AUTOMAKE(indicator-session, 0.3.96) |
667 | 8 | 8 | ||
668 | 9 | AM_MAINTAINER_MODE | 9 | AM_MAINTAINER_MODE |
669 | 10 | 10 | ||
670 | @@ -198,6 +198,18 @@ | |||
671 | 198 | AM_GLIB_GNU_GETTEXT | 198 | AM_GLIB_GNU_GETTEXT |
672 | 199 | 199 | ||
673 | 200 | ########################### | 200 | ########################### |
674 | 201 | # gcov coverage reporting | ||
675 | 202 | ########################### | ||
676 | 203 | |||
677 | 204 | m4_include([m4/gcov.m4]) | ||
678 | 205 | AC_TDD_GCOV | ||
679 | 206 | AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) | ||
680 | 207 | AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) | ||
681 | 208 | AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) | ||
682 | 209 | AC_SUBST(COVERAGE_CFLAGS) | ||
683 | 210 | AC_SUBST(COVERAGE_LDFLAGS) | ||
684 | 211 | |||
685 | 212 | ########################### | ||
686 | 201 | # Files | 213 | # Files |
687 | 202 | ########################### | 214 | ########################### |
688 | 203 | 215 | ||
689 | @@ -237,9 +249,10 @@ | |||
690 | 237 | 249 | ||
691 | 238 | SUS Indicator Configuration: | 250 | SUS Indicator Configuration: |
692 | 239 | 251 | ||
698 | 240 | Prefix: $prefix | 252 | Prefix: $prefix |
699 | 241 | Indicator Dir: $INDICATORDIR | 253 | Indicator Dir: $INDICATORDIR |
700 | 242 | Indicator GTK: $with_gtk | 254 | Indicator GTK: $with_gtk |
701 | 243 | Logout Helper: $have_gtklogouthelper | 255 | Logout Helper: $have_gtklogouthelper |
702 | 244 | APT support: $enable_apt | 256 | APT support: $enable_apt |
703 | 257 | Coverage reporting: $use_gcov | ||
704 | 245 | ]) | 258 | ]) |
705 | 246 | 259 | ||
706 | === modified file 'data/Makefile.am' | |||
707 | --- data/Makefile.am 2011-11-23 21:58:41 +0000 | |||
708 | +++ data/Makefile.am 2012-04-05 17:54:28 +0000 | |||
709 | @@ -25,30 +25,3 @@ | |||
710 | 25 | CLEANFILES = \ | 25 | CLEANFILES = \ |
711 | 26 | $(dbus_services_DATA) \ | 26 | $(dbus_services_DATA) \ |
712 | 27 | $(gsettings_SCHEMAS) | 27 | $(gsettings_SCHEMAS) |
713 | 28 | |||
714 | 29 | if BUILD_GTKLOGOUTHELPER | ||
715 | 30 | @INTLTOOL_DESKTOP_RULE@ | ||
716 | 31 | |||
717 | 32 | %.desktop.in: %.desktop.in.in | ||
718 | 33 | sed \ | ||
719 | 34 | -e "s|\@libexecdir\@|$(libexecdir)|" \ | ||
720 | 35 | -e "s|\@bindir\@|$(bindir)|" \ | ||
721 | 36 | $< > $@ | ||
722 | 37 | |||
723 | 38 | logout_helper_desktop_in_in_files = \ | ||
724 | 39 | indicator-session-lock-screen.desktop.in.in \ | ||
725 | 40 | indicator-session-logout.desktop.in.in \ | ||
726 | 41 | indicator-session-restart.desktop.in.in \ | ||
727 | 42 | indicator-session-shutdown.desktop.in.in | ||
728 | 43 | |||
729 | 44 | logout_helperdir = $(datadir)/applications | ||
730 | 45 | logout_helper_desktop_files = \ | ||
731 | 46 | $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) | ||
732 | 47 | logout_helper_DATA = $(logout_helper_desktop_files) | ||
733 | 48 | |||
734 | 49 | EXTRA_DIST += \ | ||
735 | 50 | $(logout_helper_desktop_in_in_files) | ||
736 | 51 | |||
737 | 52 | CLEANFILES += \ | ||
738 | 53 | $(logout_helper_desktop_files) | ||
739 | 54 | endif | ||
740 | 55 | 28 | ||
741 | === modified file 'data/Makefile.in' | |||
742 | --- data/Makefile.in 2012-03-14 18:34:16 +0000 | |||
743 | +++ data/Makefile.in 2012-04-05 17:54:28 +0000 | |||
744 | @@ -34,12 +34,6 @@ | |||
745 | 34 | POST_UNINSTALL = : | 34 | POST_UNINSTALL = : |
746 | 35 | build_triplet = @build@ | 35 | build_triplet = @build@ |
747 | 36 | host_triplet = @host@ | 36 | host_triplet = @host@ |
748 | 37 | @BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \ | ||
749 | 38 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files) | ||
750 | 39 | |||
751 | 40 | @BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \ | ||
752 | 41 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_files) | ||
753 | 42 | |||
754 | 43 | subdir = data | 37 | subdir = data |
755 | 44 | DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ | 38 | DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \ |
756 | 45 | $(srcdir)/Makefile.in | 39 | $(srcdir)/Makefile.in |
757 | @@ -47,7 +41,8 @@ | |||
758 | 47 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 41 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
759 | 48 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 42 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
760 | 49 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 43 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
762 | 50 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 44 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
763 | 45 | $(top_srcdir)/configure.ac | ||
764 | 51 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 46 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
765 | 52 | $(ACLOCAL_M4) | 47 | $(ACLOCAL_M4) |
766 | 53 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 48 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
767 | @@ -97,9 +92,8 @@ | |||
768 | 97 | $(am__cd) "$$dir" && rm -f $$files; }; \ | 92 | $(am__cd) "$$dir" && rm -f $$files; }; \ |
769 | 98 | } | 93 | } |
770 | 99 | am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ | 94 | am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ |
774 | 100 | "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)" | 95 | "$(DESTDIR)$(convertdir)" |
775 | 101 | DATA = $(dbus_services_DATA) $(dist_convert_DATA) \ | 96 | DATA = $(dbus_services_DATA) $(dist_convert_DATA) |
773 | 102 | $(logout_helper_DATA) | ||
776 | 103 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 97 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
777 | 104 | distclean-recursive maintainer-clean-recursive | 98 | distclean-recursive maintainer-clean-recursive |
778 | 105 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | 99 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
779 | @@ -150,6 +144,8 @@ | |||
780 | 150 | CC = @CC@ | 144 | CC = @CC@ |
781 | 151 | CCDEPMODE = @CCDEPMODE@ | 145 | CCDEPMODE = @CCDEPMODE@ |
782 | 152 | CFLAGS = @CFLAGS@ | 146 | CFLAGS = @CFLAGS@ |
783 | 147 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
784 | 148 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
785 | 153 | CPP = @CPP@ | 149 | CPP = @CPP@ |
786 | 154 | CPPFLAGS = @CPPFLAGS@ | 150 | CPPFLAGS = @CPPFLAGS@ |
787 | 155 | CYGPATH_W = @CYGPATH_W@ | 151 | CYGPATH_W = @CYGPATH_W@ |
788 | @@ -166,6 +162,8 @@ | |||
789 | 166 | EGREP = @EGREP@ | 162 | EGREP = @EGREP@ |
790 | 167 | EXEEXT = @EXEEXT@ | 163 | EXEEXT = @EXEEXT@ |
791 | 168 | FGREP = @FGREP@ | 164 | FGREP = @FGREP@ |
792 | 165 | GCOVR = @GCOVR@ | ||
793 | 166 | GENHTML = @GENHTML@ | ||
794 | 169 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 167 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
795 | 170 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 168 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
796 | 171 | GMOFILES = @GMOFILES@ | 169 | GMOFILES = @GMOFILES@ |
797 | @@ -194,6 +192,7 @@ | |||
798 | 194 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 192 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
799 | 195 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 193 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
800 | 196 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 194 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
801 | 195 | LCOV = @LCOV@ | ||
802 | 197 | LD = @LD@ | 196 | LD = @LD@ |
803 | 198 | LDFLAGS = @LDFLAGS@ | 197 | LDFLAGS = @LDFLAGS@ |
804 | 199 | LIBOBJS = @LIBOBJS@ | 198 | LIBOBJS = @LIBOBJS@ |
805 | @@ -239,6 +238,7 @@ | |||
806 | 239 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 238 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
807 | 240 | SET_MAKE = @SET_MAKE@ | 239 | SET_MAKE = @SET_MAKE@ |
808 | 241 | SHELL = @SHELL@ | 240 | SHELL = @SHELL@ |
809 | 241 | SHTOOL = @SHTOOL@ | ||
810 | 242 | STRIP = @STRIP@ | 242 | STRIP = @STRIP@ |
811 | 243 | USE_NLS = @USE_NLS@ | 243 | USE_NLS = @USE_NLS@ |
812 | 244 | VERSION = @VERSION@ | 244 | VERSION = @VERSION@ |
813 | @@ -308,21 +308,14 @@ | |||
814 | 308 | gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml | 308 | gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml |
815 | 309 | convertdir = $(datadir)/GConf/gsettings | 309 | convertdir = $(datadir)/GConf/gsettings |
816 | 310 | dist_convert_DATA = indicator-session.convert | 310 | dist_convert_DATA = indicator-session.convert |
832 | 311 | EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \ | 311 | EXTRA_DIST = \ |
833 | 312 | $(am__append_1) | 312 | $(service_in_files) \ |
834 | 313 | CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \ | 313 | $(gsettings_SCHEMAS:.xml=.xml.in) |
835 | 314 | $(am__append_2) | 314 | |
836 | 315 | @BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \ | 315 | CLEANFILES = \ |
837 | 316 | @BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-lock-screen.desktop.in.in \ | 316 | $(dbus_services_DATA) \ |
838 | 317 | @BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-logout.desktop.in.in \ | 317 | $(gsettings_SCHEMAS) |
839 | 318 | @BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-restart.desktop.in.in \ | 318 | |
825 | 319 | @BUILD_GTKLOGOUTHELPER_TRUE@ indicator-session-shutdown.desktop.in.in | ||
826 | 320 | |||
827 | 321 | @BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications | ||
828 | 322 | @BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \ | ||
829 | 323 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) | ||
830 | 324 | |||
831 | 325 | @BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files) | ||
840 | 326 | all: all-recursive | 319 | all: all-recursive |
841 | 327 | 320 | ||
842 | 328 | .SUFFIXES: | 321 | .SUFFIXES: |
843 | @@ -398,24 +391,6 @@ | |||
844 | 398 | @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ | 391 | @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \ |
845 | 399 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | 392 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
846 | 400 | dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) | 393 | dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) |
847 | 401 | install-logout_helperDATA: $(logout_helper_DATA) | ||
848 | 402 | @$(NORMAL_INSTALL) | ||
849 | 403 | test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)" | ||
850 | 404 | @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ | ||
851 | 405 | for p in $$list; do \ | ||
852 | 406 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
853 | 407 | echo "$$d$$p"; \ | ||
854 | 408 | done | $(am__base_list) | \ | ||
855 | 409 | while read files; do \ | ||
856 | 410 | echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \ | ||
857 | 411 | $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \ | ||
858 | 412 | done | ||
859 | 413 | |||
860 | 414 | uninstall-logout_helperDATA: | ||
861 | 415 | @$(NORMAL_UNINSTALL) | ||
862 | 416 | @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \ | ||
863 | 417 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | ||
864 | 418 | dir='$(DESTDIR)$(logout_helperdir)'; $(am__uninstall_files_from_dir) | ||
865 | 419 | 394 | ||
866 | 420 | # This directory's subdirectories are mostly independent; you can cd | 395 | # This directory's subdirectories are mostly independent; you can cd |
867 | 421 | # into them and run `make' without going through this Makefile. | 396 | # into them and run `make' without going through this Makefile. |
868 | @@ -615,7 +590,7 @@ | |||
869 | 615 | all-am: Makefile $(DATA) | 590 | all-am: Makefile $(DATA) |
870 | 616 | installdirs: installdirs-recursive | 591 | installdirs: installdirs-recursive |
871 | 617 | installdirs-am: | 592 | installdirs-am: |
873 | 618 | for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \ | 593 | for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)"; do \ |
874 | 619 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | 594 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
875 | 620 | done | 595 | done |
876 | 621 | install: install-recursive | 596 | install: install-recursive |
877 | @@ -669,8 +644,7 @@ | |||
878 | 669 | 644 | ||
879 | 670 | info-am: | 645 | info-am: |
880 | 671 | 646 | ||
883 | 672 | install-data-am: install-dbus_servicesDATA install-dist_convertDATA \ | 647 | install-data-am: install-dbus_servicesDATA install-dist_convertDATA |
882 | 673 | install-logout_helperDATA | ||
884 | 674 | 648 | ||
885 | 675 | install-dvi: install-dvi-recursive | 649 | install-dvi: install-dvi-recursive |
886 | 676 | 650 | ||
887 | @@ -714,8 +688,7 @@ | |||
888 | 714 | 688 | ||
889 | 715 | ps-am: | 689 | ps-am: |
890 | 716 | 690 | ||
893 | 717 | uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \ | 691 | uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA |
892 | 718 | uninstall-logout_helperDATA | ||
894 | 719 | 692 | ||
895 | 720 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ | 693 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
896 | 721 | install-am install-strip tags-recursive | 694 | install-am install-strip tags-recursive |
897 | @@ -728,14 +701,13 @@ | |||
898 | 728 | install-data-am install-dbus_servicesDATA \ | 701 | install-data-am install-dbus_servicesDATA \ |
899 | 729 | install-dist_convertDATA install-dvi install-dvi-am \ | 702 | install-dist_convertDATA install-dvi install-dvi-am \ |
900 | 730 | install-exec install-exec-am install-html install-html-am \ | 703 | install-exec install-exec-am install-html install-html-am \ |
909 | 731 | install-info install-info-am install-logout_helperDATA \ | 704 | install-info install-info-am install-man install-pdf \ |
910 | 732 | install-man install-pdf install-pdf-am install-ps \ | 705 | install-pdf-am install-ps install-ps-am install-strip \ |
911 | 733 | install-ps-am install-strip installcheck installcheck-am \ | 706 | installcheck installcheck-am installdirs installdirs-am \ |
912 | 734 | installdirs installdirs-am maintainer-clean \ | 707 | maintainer-clean maintainer-clean-generic mostlyclean \ |
913 | 735 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | 708 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
914 | 736 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | 709 | tags tags-recursive uninstall uninstall-am \ |
915 | 737 | uninstall uninstall-am uninstall-dbus_servicesDATA \ | 710 | uninstall-dbus_servicesDATA uninstall-dist_convertDATA |
908 | 738 | uninstall-dist_convertDATA uninstall-logout_helperDATA | ||
916 | 739 | 711 | ||
917 | 740 | 712 | ||
918 | 741 | %.service: %.service.in | 713 | %.service: %.service.in |
919 | @@ -746,14 +718,6 @@ | |||
920 | 746 | 718 | ||
921 | 747 | @GSETTINGS_RULES@ | 719 | @GSETTINGS_RULES@ |
922 | 748 | 720 | ||
923 | 749 | @BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@ | ||
924 | 750 | |||
925 | 751 | @BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in | ||
926 | 752 | @BUILD_GTKLOGOUTHELPER_TRUE@ sed \ | ||
927 | 753 | @BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@libexecdir\@|$(libexecdir)|" \ | ||
928 | 754 | @BUILD_GTKLOGOUTHELPER_TRUE@ -e "s|\@bindir\@|$(bindir)|" \ | ||
929 | 755 | @BUILD_GTKLOGOUTHELPER_TRUE@ $< > $@ | ||
930 | 756 | |||
931 | 757 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 721 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
932 | 758 | # Otherwise a system limit (for SysV at least) may be exceeded. | 722 | # Otherwise a system limit (for SysV at least) may be exceeded. |
933 | 759 | .NOEXPORT: | 723 | .NOEXPORT: |
934 | 760 | 724 | ||
935 | === modified file 'data/extra-sessions/Makefile.in' | |||
936 | --- data/extra-sessions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
937 | +++ data/extra-sessions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
938 | @@ -44,7 +44,8 @@ | |||
939 | 44 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 44 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
940 | 45 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 45 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
941 | 46 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 46 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
943 | 47 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 47 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
944 | 48 | $(top_srcdir)/configure.ac | ||
945 | 48 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 49 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
946 | 49 | $(ACLOCAL_M4) | 50 | $(ACLOCAL_M4) |
947 | 50 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 51 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
948 | @@ -105,6 +106,8 @@ | |||
949 | 105 | CC = @CC@ | 106 | CC = @CC@ |
950 | 106 | CCDEPMODE = @CCDEPMODE@ | 107 | CCDEPMODE = @CCDEPMODE@ |
951 | 107 | CFLAGS = @CFLAGS@ | 108 | CFLAGS = @CFLAGS@ |
952 | 109 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
953 | 110 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
954 | 108 | CPP = @CPP@ | 111 | CPP = @CPP@ |
955 | 109 | CPPFLAGS = @CPPFLAGS@ | 112 | CPPFLAGS = @CPPFLAGS@ |
956 | 110 | CYGPATH_W = @CYGPATH_W@ | 113 | CYGPATH_W = @CYGPATH_W@ |
957 | @@ -121,6 +124,8 @@ | |||
958 | 121 | EGREP = @EGREP@ | 124 | EGREP = @EGREP@ |
959 | 122 | EXEEXT = @EXEEXT@ | 125 | EXEEXT = @EXEEXT@ |
960 | 123 | FGREP = @FGREP@ | 126 | FGREP = @FGREP@ |
961 | 127 | GCOVR = @GCOVR@ | ||
962 | 128 | GENHTML = @GENHTML@ | ||
963 | 124 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 129 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
964 | 125 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 130 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
965 | 126 | GMOFILES = @GMOFILES@ | 131 | GMOFILES = @GMOFILES@ |
966 | @@ -149,6 +154,7 @@ | |||
967 | 149 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 154 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
968 | 150 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 155 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
969 | 151 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 156 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
970 | 157 | LCOV = @LCOV@ | ||
971 | 152 | LD = @LD@ | 158 | LD = @LD@ |
972 | 153 | LDFLAGS = @LDFLAGS@ | 159 | LDFLAGS = @LDFLAGS@ |
973 | 154 | LIBOBJS = @LIBOBJS@ | 160 | LIBOBJS = @LIBOBJS@ |
974 | @@ -194,6 +200,7 @@ | |||
975 | 194 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
976 | 195 | SET_MAKE = @SET_MAKE@ | 201 | SET_MAKE = @SET_MAKE@ |
977 | 196 | SHELL = @SHELL@ | 202 | SHELL = @SHELL@ |
978 | 203 | SHTOOL = @SHTOOL@ | ||
979 | 197 | STRIP = @STRIP@ | 204 | STRIP = @STRIP@ |
980 | 198 | USE_NLS = @USE_NLS@ | 205 | USE_NLS = @USE_NLS@ |
981 | 199 | VERSION = @VERSION@ | 206 | VERSION = @VERSION@ |
982 | 200 | 207 | ||
983 | === modified file 'data/icons/16x16/Makefile.in' | |||
984 | --- data/icons/16x16/Makefile.in 2012-03-14 18:34:16 +0000 | |||
985 | +++ data/icons/16x16/Makefile.in 2012-04-05 17:54:28 +0000 | |||
986 | @@ -39,7 +39,8 @@ | |||
987 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
988 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
989 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
991 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
992 | 43 | $(top_srcdir)/configure.ac | ||
993 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
994 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
995 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
996 | @@ -111,6 +112,8 @@ | |||
997 | 111 | CC = @CC@ | 112 | CC = @CC@ |
998 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
999 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1000 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1001 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1002 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1003 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1004 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1005 | @@ -127,6 +130,8 @@ | |||
1006 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1007 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1008 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1009 | 133 | GCOVR = @GCOVR@ | ||
1010 | 134 | GENHTML = @GENHTML@ | ||
1011 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1012 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1013 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1014 | @@ -155,6 +160,7 @@ | |||
1015 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1016 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1017 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1018 | 163 | LCOV = @LCOV@ | ||
1019 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1020 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1021 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1022 | @@ -200,6 +206,7 @@ | |||
1023 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1024 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1025 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1026 | 209 | SHTOOL = @SHTOOL@ | ||
1027 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1028 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1029 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1030 | 206 | 213 | ||
1031 | === modified file 'data/icons/16x16/actions/Makefile.in' | |||
1032 | --- data/icons/16x16/actions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1033 | +++ data/icons/16x16/actions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1034 | @@ -40,7 +40,8 @@ | |||
1035 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1036 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1037 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1039 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1040 | 44 | $(top_srcdir)/configure.ac | ||
1041 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1042 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1043 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1044 | @@ -101,6 +102,8 @@ | |||
1045 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1046 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1047 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1048 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1049 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1050 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1051 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1052 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1053 | @@ -117,6 +120,8 @@ | |||
1054 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1055 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1056 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1057 | 123 | GCOVR = @GCOVR@ | ||
1058 | 124 | GENHTML = @GENHTML@ | ||
1059 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1060 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1061 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1062 | @@ -145,6 +150,7 @@ | |||
1063 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1064 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1065 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1066 | 153 | LCOV = @LCOV@ | ||
1067 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1068 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1069 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1070 | @@ -190,6 +196,7 @@ | |||
1071 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1072 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1073 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1074 | 199 | SHTOOL = @SHTOOL@ | ||
1075 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1076 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1077 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1078 | 196 | 203 | ||
1079 | === modified file 'data/icons/16x16/status/Makefile.in' | |||
1080 | --- data/icons/16x16/status/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1081 | +++ data/icons/16x16/status/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1082 | @@ -40,7 +40,8 @@ | |||
1083 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1084 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1085 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1087 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1088 | 44 | $(top_srcdir)/configure.ac | ||
1089 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1090 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1091 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1092 | @@ -101,6 +102,8 @@ | |||
1093 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1094 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1095 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1096 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1097 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1098 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1099 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1100 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1101 | @@ -117,6 +120,8 @@ | |||
1102 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1103 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1104 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1105 | 123 | GCOVR = @GCOVR@ | ||
1106 | 124 | GENHTML = @GENHTML@ | ||
1107 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1108 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1109 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1110 | @@ -145,6 +150,7 @@ | |||
1111 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1112 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1113 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1114 | 153 | LCOV = @LCOV@ | ||
1115 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1116 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1117 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1118 | @@ -190,6 +196,7 @@ | |||
1119 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1120 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1121 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1122 | 199 | SHTOOL = @SHTOOL@ | ||
1123 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1124 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1125 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1126 | 196 | 203 | ||
1127 | === modified file 'data/icons/22x22/Makefile.in' | |||
1128 | --- data/icons/22x22/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1129 | +++ data/icons/22x22/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1130 | @@ -39,7 +39,8 @@ | |||
1131 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1132 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1133 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1135 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1136 | 43 | $(top_srcdir)/configure.ac | ||
1137 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1138 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
1139 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1140 | @@ -111,6 +112,8 @@ | |||
1141 | 111 | CC = @CC@ | 112 | CC = @CC@ |
1142 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
1143 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1144 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1145 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1146 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1147 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1148 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1149 | @@ -127,6 +130,8 @@ | |||
1150 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1151 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1152 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1153 | 133 | GCOVR = @GCOVR@ | ||
1154 | 134 | GENHTML = @GENHTML@ | ||
1155 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1156 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1157 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1158 | @@ -155,6 +160,7 @@ | |||
1159 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1160 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1161 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1162 | 163 | LCOV = @LCOV@ | ||
1163 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1164 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1165 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1166 | @@ -200,6 +206,7 @@ | |||
1167 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1168 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1169 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1170 | 209 | SHTOOL = @SHTOOL@ | ||
1171 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1172 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1173 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1174 | 206 | 213 | ||
1175 | === modified file 'data/icons/22x22/actions/Makefile.in' | |||
1176 | --- data/icons/22x22/actions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1177 | +++ data/icons/22x22/actions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1178 | @@ -40,7 +40,8 @@ | |||
1179 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1180 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1181 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1183 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1184 | 44 | $(top_srcdir)/configure.ac | ||
1185 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1186 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1187 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1188 | @@ -101,6 +102,8 @@ | |||
1189 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1190 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1191 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1192 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1193 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1194 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1195 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1196 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1197 | @@ -117,6 +120,8 @@ | |||
1198 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1199 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1200 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1201 | 123 | GCOVR = @GCOVR@ | ||
1202 | 124 | GENHTML = @GENHTML@ | ||
1203 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1204 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1205 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1206 | @@ -145,6 +150,7 @@ | |||
1207 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1208 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1209 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1210 | 153 | LCOV = @LCOV@ | ||
1211 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1212 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1213 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1214 | @@ -190,6 +196,7 @@ | |||
1215 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1216 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1217 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1218 | 199 | SHTOOL = @SHTOOL@ | ||
1219 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1220 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1221 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1222 | 196 | 203 | ||
1223 | === modified file 'data/icons/22x22/status/Makefile.in' | |||
1224 | --- data/icons/22x22/status/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1225 | +++ data/icons/22x22/status/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1226 | @@ -40,7 +40,8 @@ | |||
1227 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1228 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1229 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1231 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1232 | 44 | $(top_srcdir)/configure.ac | ||
1233 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1234 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1235 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1236 | @@ -101,6 +102,8 @@ | |||
1237 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1238 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1239 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1240 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1241 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1242 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1243 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1244 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1245 | @@ -117,6 +120,8 @@ | |||
1246 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1247 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1248 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1249 | 123 | GCOVR = @GCOVR@ | ||
1250 | 124 | GENHTML = @GENHTML@ | ||
1251 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1252 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1253 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1254 | @@ -145,6 +150,7 @@ | |||
1255 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1256 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1257 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1258 | 153 | LCOV = @LCOV@ | ||
1259 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1260 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1261 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1262 | @@ -190,6 +196,7 @@ | |||
1263 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1264 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1265 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1266 | 199 | SHTOOL = @SHTOOL@ | ||
1267 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1268 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1269 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1270 | 196 | 203 | ||
1271 | === modified file 'data/icons/24x24/Makefile.in' | |||
1272 | --- data/icons/24x24/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1273 | +++ data/icons/24x24/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1274 | @@ -39,7 +39,8 @@ | |||
1275 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1276 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1277 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1279 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1280 | 43 | $(top_srcdir)/configure.ac | ||
1281 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1282 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
1283 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1284 | @@ -111,6 +112,8 @@ | |||
1285 | 111 | CC = @CC@ | 112 | CC = @CC@ |
1286 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
1287 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1288 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1289 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1290 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1291 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1292 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1293 | @@ -127,6 +130,8 @@ | |||
1294 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1295 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1296 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1297 | 133 | GCOVR = @GCOVR@ | ||
1298 | 134 | GENHTML = @GENHTML@ | ||
1299 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1300 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1301 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1302 | @@ -155,6 +160,7 @@ | |||
1303 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1304 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1305 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1306 | 163 | LCOV = @LCOV@ | ||
1307 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1308 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1309 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1310 | @@ -200,6 +206,7 @@ | |||
1311 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1312 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1313 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1314 | 209 | SHTOOL = @SHTOOL@ | ||
1315 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1316 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1317 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1318 | 206 | 213 | ||
1319 | === modified file 'data/icons/24x24/actions/Makefile.in' | |||
1320 | --- data/icons/24x24/actions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1321 | +++ data/icons/24x24/actions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1322 | @@ -40,7 +40,8 @@ | |||
1323 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1324 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1325 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1327 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1328 | 44 | $(top_srcdir)/configure.ac | ||
1329 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1330 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1331 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1332 | @@ -101,6 +102,8 @@ | |||
1333 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1334 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1335 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1336 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1337 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1338 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1339 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1340 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1341 | @@ -117,6 +120,8 @@ | |||
1342 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1343 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1344 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1345 | 123 | GCOVR = @GCOVR@ | ||
1346 | 124 | GENHTML = @GENHTML@ | ||
1347 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1348 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1349 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1350 | @@ -145,6 +150,7 @@ | |||
1351 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1352 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1353 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1354 | 153 | LCOV = @LCOV@ | ||
1355 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1356 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1357 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1358 | @@ -190,6 +196,7 @@ | |||
1359 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1360 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1361 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1362 | 199 | SHTOOL = @SHTOOL@ | ||
1363 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1364 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1365 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1366 | 196 | 203 | ||
1367 | === modified file 'data/icons/24x24/status/Makefile.in' | |||
1368 | --- data/icons/24x24/status/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1369 | +++ data/icons/24x24/status/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1370 | @@ -40,7 +40,8 @@ | |||
1371 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1372 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1373 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1375 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1376 | 44 | $(top_srcdir)/configure.ac | ||
1377 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1378 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1379 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1380 | @@ -101,6 +102,8 @@ | |||
1381 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1382 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1383 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1384 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1385 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1386 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1387 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1388 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1389 | @@ -117,6 +120,8 @@ | |||
1390 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1391 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1392 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1393 | 123 | GCOVR = @GCOVR@ | ||
1394 | 124 | GENHTML = @GENHTML@ | ||
1395 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1396 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1397 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1398 | @@ -145,6 +150,7 @@ | |||
1399 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1400 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1401 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1402 | 153 | LCOV = @LCOV@ | ||
1403 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1404 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1405 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1406 | @@ -190,6 +196,7 @@ | |||
1407 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1408 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1409 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1410 | 199 | SHTOOL = @SHTOOL@ | ||
1411 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1412 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1413 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1414 | 196 | 203 | ||
1415 | === modified file 'data/icons/32x32/Makefile.in' | |||
1416 | --- data/icons/32x32/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1417 | +++ data/icons/32x32/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1418 | @@ -39,7 +39,8 @@ | |||
1419 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1420 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1421 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1423 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1424 | 43 | $(top_srcdir)/configure.ac | ||
1425 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1426 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
1427 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1428 | @@ -111,6 +112,8 @@ | |||
1429 | 111 | CC = @CC@ | 112 | CC = @CC@ |
1430 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
1431 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1432 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1433 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1434 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1435 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1436 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1437 | @@ -127,6 +130,8 @@ | |||
1438 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1439 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1440 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1441 | 133 | GCOVR = @GCOVR@ | ||
1442 | 134 | GENHTML = @GENHTML@ | ||
1443 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1444 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1445 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1446 | @@ -155,6 +160,7 @@ | |||
1447 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1448 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1449 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1450 | 163 | LCOV = @LCOV@ | ||
1451 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1452 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1453 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1454 | @@ -200,6 +206,7 @@ | |||
1455 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1456 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1457 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1458 | 209 | SHTOOL = @SHTOOL@ | ||
1459 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1460 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1461 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1462 | 206 | 213 | ||
1463 | === modified file 'data/icons/32x32/actions/Makefile.in' | |||
1464 | --- data/icons/32x32/actions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1465 | +++ data/icons/32x32/actions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1466 | @@ -40,7 +40,8 @@ | |||
1467 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1468 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1469 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1471 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1472 | 44 | $(top_srcdir)/configure.ac | ||
1473 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1474 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1475 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1476 | @@ -101,6 +102,8 @@ | |||
1477 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1478 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1479 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1480 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1481 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1482 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1483 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1484 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1485 | @@ -117,6 +120,8 @@ | |||
1486 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1487 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1488 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1489 | 123 | GCOVR = @GCOVR@ | ||
1490 | 124 | GENHTML = @GENHTML@ | ||
1491 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1492 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1493 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1494 | @@ -145,6 +150,7 @@ | |||
1495 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1496 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1497 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1498 | 153 | LCOV = @LCOV@ | ||
1499 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1500 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1501 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1502 | @@ -190,6 +196,7 @@ | |||
1503 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1504 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1505 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1506 | 199 | SHTOOL = @SHTOOL@ | ||
1507 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1508 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1509 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1510 | 196 | 203 | ||
1511 | === modified file 'data/icons/32x32/status/Makefile.in' | |||
1512 | --- data/icons/32x32/status/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1513 | +++ data/icons/32x32/status/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1514 | @@ -40,7 +40,8 @@ | |||
1515 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1516 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1517 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1519 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1520 | 44 | $(top_srcdir)/configure.ac | ||
1521 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1522 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1523 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1524 | @@ -101,6 +102,8 @@ | |||
1525 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1526 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1527 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1528 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1529 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1530 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1531 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1532 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1533 | @@ -117,6 +120,8 @@ | |||
1534 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1535 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1536 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1537 | 123 | GCOVR = @GCOVR@ | ||
1538 | 124 | GENHTML = @GENHTML@ | ||
1539 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1540 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1541 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1542 | @@ -145,6 +150,7 @@ | |||
1543 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1544 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1545 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1546 | 153 | LCOV = @LCOV@ | ||
1547 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1548 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1549 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1550 | @@ -190,6 +196,7 @@ | |||
1551 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1552 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1553 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1554 | 199 | SHTOOL = @SHTOOL@ | ||
1555 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1556 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1557 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1558 | 196 | 203 | ||
1559 | === modified file 'data/icons/Makefile.in' | |||
1560 | --- data/icons/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1561 | +++ data/icons/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1562 | @@ -39,7 +39,8 @@ | |||
1563 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1564 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1565 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1567 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1568 | 43 | $(top_srcdir)/configure.ac | ||
1569 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1570 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
1571 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1572 | @@ -111,6 +112,8 @@ | |||
1573 | 111 | CC = @CC@ | 112 | CC = @CC@ |
1574 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
1575 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1576 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1577 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1578 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1579 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1580 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1581 | @@ -127,6 +130,8 @@ | |||
1582 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1583 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1584 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1585 | 133 | GCOVR = @GCOVR@ | ||
1586 | 134 | GENHTML = @GENHTML@ | ||
1587 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1588 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1589 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1590 | @@ -155,6 +160,7 @@ | |||
1591 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1592 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1593 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1594 | 163 | LCOV = @LCOV@ | ||
1595 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1596 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1597 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1598 | @@ -200,6 +206,7 @@ | |||
1599 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1600 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1601 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1602 | 209 | SHTOOL = @SHTOOL@ | ||
1603 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1604 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1605 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1606 | 206 | 213 | ||
1607 | === modified file 'data/icons/scalable/Makefile.in' | |||
1608 | --- data/icons/scalable/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1609 | +++ data/icons/scalable/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1610 | @@ -39,7 +39,8 @@ | |||
1611 | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 39 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1612 | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 40 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1613 | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 41 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1615 | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 42 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1616 | 43 | $(top_srcdir)/configure.ac | ||
1617 | 43 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1618 | 44 | $(ACLOCAL_M4) | 45 | $(ACLOCAL_M4) |
1619 | 45 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1620 | @@ -111,6 +112,8 @@ | |||
1621 | 111 | CC = @CC@ | 112 | CC = @CC@ |
1622 | 112 | CCDEPMODE = @CCDEPMODE@ | 113 | CCDEPMODE = @CCDEPMODE@ |
1623 | 113 | CFLAGS = @CFLAGS@ | 114 | CFLAGS = @CFLAGS@ |
1624 | 115 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1625 | 116 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1626 | 114 | CPP = @CPP@ | 117 | CPP = @CPP@ |
1627 | 115 | CPPFLAGS = @CPPFLAGS@ | 118 | CPPFLAGS = @CPPFLAGS@ |
1628 | 116 | CYGPATH_W = @CYGPATH_W@ | 119 | CYGPATH_W = @CYGPATH_W@ |
1629 | @@ -127,6 +130,8 @@ | |||
1630 | 127 | EGREP = @EGREP@ | 130 | EGREP = @EGREP@ |
1631 | 128 | EXEEXT = @EXEEXT@ | 131 | EXEEXT = @EXEEXT@ |
1632 | 129 | FGREP = @FGREP@ | 132 | FGREP = @FGREP@ |
1633 | 133 | GCOVR = @GCOVR@ | ||
1634 | 134 | GENHTML = @GENHTML@ | ||
1635 | 130 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 135 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1636 | 131 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 136 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1637 | 132 | GMOFILES = @GMOFILES@ | 137 | GMOFILES = @GMOFILES@ |
1638 | @@ -155,6 +160,7 @@ | |||
1639 | 155 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 160 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1640 | 156 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 161 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1641 | 157 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 162 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1642 | 163 | LCOV = @LCOV@ | ||
1643 | 158 | LD = @LD@ | 164 | LD = @LD@ |
1644 | 159 | LDFLAGS = @LDFLAGS@ | 165 | LDFLAGS = @LDFLAGS@ |
1645 | 160 | LIBOBJS = @LIBOBJS@ | 166 | LIBOBJS = @LIBOBJS@ |
1646 | @@ -200,6 +206,7 @@ | |||
1647 | 200 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 206 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1648 | 201 | SET_MAKE = @SET_MAKE@ | 207 | SET_MAKE = @SET_MAKE@ |
1649 | 202 | SHELL = @SHELL@ | 208 | SHELL = @SHELL@ |
1650 | 209 | SHTOOL = @SHTOOL@ | ||
1651 | 203 | STRIP = @STRIP@ | 210 | STRIP = @STRIP@ |
1652 | 204 | USE_NLS = @USE_NLS@ | 211 | USE_NLS = @USE_NLS@ |
1653 | 205 | VERSION = @VERSION@ | 212 | VERSION = @VERSION@ |
1654 | 206 | 213 | ||
1655 | === modified file 'data/icons/scalable/actions/Makefile.in' | |||
1656 | --- data/icons/scalable/actions/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1657 | +++ data/icons/scalable/actions/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1658 | @@ -40,7 +40,8 @@ | |||
1659 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1660 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1661 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1663 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1664 | 44 | $(top_srcdir)/configure.ac | ||
1665 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1666 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1667 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1668 | @@ -101,6 +102,8 @@ | |||
1669 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1670 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1671 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1672 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1673 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1674 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1675 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1676 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1677 | @@ -117,6 +120,8 @@ | |||
1678 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1679 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1680 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1681 | 123 | GCOVR = @GCOVR@ | ||
1682 | 124 | GENHTML = @GENHTML@ | ||
1683 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1684 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1685 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1686 | @@ -145,6 +150,7 @@ | |||
1687 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1688 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1689 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1690 | 153 | LCOV = @LCOV@ | ||
1691 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1692 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1693 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1694 | @@ -190,6 +196,7 @@ | |||
1695 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1696 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1697 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1698 | 199 | SHTOOL = @SHTOOL@ | ||
1699 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1700 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1701 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1702 | 196 | 203 | ||
1703 | === modified file 'data/icons/scalable/status/Makefile.in' | |||
1704 | --- data/icons/scalable/status/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1705 | +++ data/icons/scalable/status/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1706 | @@ -40,7 +40,8 @@ | |||
1707 | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 40 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1708 | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 41 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1709 | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 42 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1711 | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 43 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
1712 | 44 | $(top_srcdir)/configure.ac | ||
1713 | 44 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1714 | 45 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
1715 | 46 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 47 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
1716 | @@ -101,6 +102,8 @@ | |||
1717 | 101 | CC = @CC@ | 102 | CC = @CC@ |
1718 | 102 | CCDEPMODE = @CCDEPMODE@ | 103 | CCDEPMODE = @CCDEPMODE@ |
1719 | 103 | CFLAGS = @CFLAGS@ | 104 | CFLAGS = @CFLAGS@ |
1720 | 105 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
1721 | 106 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
1722 | 104 | CPP = @CPP@ | 107 | CPP = @CPP@ |
1723 | 105 | CPPFLAGS = @CPPFLAGS@ | 108 | CPPFLAGS = @CPPFLAGS@ |
1724 | 106 | CYGPATH_W = @CYGPATH_W@ | 109 | CYGPATH_W = @CYGPATH_W@ |
1725 | @@ -117,6 +120,8 @@ | |||
1726 | 117 | EGREP = @EGREP@ | 120 | EGREP = @EGREP@ |
1727 | 118 | EXEEXT = @EXEEXT@ | 121 | EXEEXT = @EXEEXT@ |
1728 | 119 | FGREP = @FGREP@ | 122 | FGREP = @FGREP@ |
1729 | 123 | GCOVR = @GCOVR@ | ||
1730 | 124 | GENHTML = @GENHTML@ | ||
1731 | 120 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 125 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1732 | 121 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 126 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
1733 | 122 | GMOFILES = @GMOFILES@ | 127 | GMOFILES = @GMOFILES@ |
1734 | @@ -145,6 +150,7 @@ | |||
1735 | 145 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 150 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1736 | 146 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 151 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1737 | 147 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 152 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1738 | 153 | LCOV = @LCOV@ | ||
1739 | 148 | LD = @LD@ | 154 | LD = @LD@ |
1740 | 149 | LDFLAGS = @LDFLAGS@ | 155 | LDFLAGS = @LDFLAGS@ |
1741 | 150 | LIBOBJS = @LIBOBJS@ | 156 | LIBOBJS = @LIBOBJS@ |
1742 | @@ -190,6 +196,7 @@ | |||
1743 | 190 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 196 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
1744 | 191 | SET_MAKE = @SET_MAKE@ | 197 | SET_MAKE = @SET_MAKE@ |
1745 | 192 | SHELL = @SHELL@ | 198 | SHELL = @SHELL@ |
1746 | 199 | SHTOOL = @SHTOOL@ | ||
1747 | 193 | STRIP = @STRIP@ | 200 | STRIP = @STRIP@ |
1748 | 194 | USE_NLS = @USE_NLS@ | 201 | USE_NLS = @USE_NLS@ |
1749 | 195 | VERSION = @VERSION@ | 202 | VERSION = @VERSION@ |
1750 | 196 | 203 | ||
1751 | === removed file 'data/indicator-session-lock-screen.desktop.in.in' | |||
1752 | --- data/indicator-session-lock-screen.desktop.in.in 2011-09-26 15:07:33 +0000 | |||
1753 | +++ data/indicator-session-lock-screen.desktop.in.in 1970-01-01 00:00:00 +0000 | |||
1754 | @@ -1,10 +0,0 @@ | |||
1755 | 1 | [Desktop Entry] | ||
1756 | 2 | _Name=Lock Screen | ||
1757 | 3 | TryExec=@bindir@/xdg-screensaver | ||
1758 | 4 | Exec=@bindir@/xdg-screensaver lock | ||
1759 | 5 | Icon=system-lock-screen | ||
1760 | 6 | Terminal=false | ||
1761 | 7 | Type=Application | ||
1762 | 8 | OnlyShowIn=Unity; | ||
1763 | 9 | Categories=System; | ||
1764 | 10 | Version=1.0 | ||
1765 | 11 | 0 | ||
1766 | === removed file 'data/indicator-session-logout.desktop.in.in' | |||
1767 | --- data/indicator-session-logout.desktop.in.in 2011-09-26 15:07:33 +0000 | |||
1768 | +++ data/indicator-session-logout.desktop.in.in 1970-01-01 00:00:00 +0000 | |||
1769 | @@ -1,10 +0,0 @@ | |||
1770 | 1 | [Desktop Entry] | ||
1771 | 2 | _Name=Log Out | ||
1772 | 3 | TryExec=@libexecdir@/gtk-logout-helper | ||
1773 | 4 | Exec=@libexecdir@/gtk-logout-helper --logout | ||
1774 | 5 | Icon=system-log-out | ||
1775 | 6 | Terminal=false | ||
1776 | 7 | Type=Application | ||
1777 | 8 | OnlyShowIn=Unity; | ||
1778 | 9 | Categories=System; | ||
1779 | 10 | Version=1.0 | ||
1780 | 11 | 0 | ||
1781 | === removed file 'data/indicator-session-restart.desktop.in.in' | |||
1782 | --- data/indicator-session-restart.desktop.in.in 2011-09-26 15:07:33 +0000 | |||
1783 | +++ data/indicator-session-restart.desktop.in.in 1970-01-01 00:00:00 +0000 | |||
1784 | @@ -1,10 +0,0 @@ | |||
1785 | 1 | [Desktop Entry] | ||
1786 | 2 | _Name=Restart | ||
1787 | 3 | TryExec=@libexecdir@/gtk-logout-helper | ||
1788 | 4 | Exec=@libexecdir@/gtk-logout-helper --restart | ||
1789 | 5 | Icon=system-restart | ||
1790 | 6 | Terminal=false | ||
1791 | 7 | Type=Application | ||
1792 | 8 | OnlyShowIn=Unity; | ||
1793 | 9 | Categories=System; | ||
1794 | 10 | Version=1.0 | ||
1795 | 11 | 0 | ||
1796 | === removed file 'data/indicator-session-shutdown.desktop.in.in' | |||
1797 | --- data/indicator-session-shutdown.desktop.in.in 2011-09-26 15:07:33 +0000 | |||
1798 | +++ data/indicator-session-shutdown.desktop.in.in 1970-01-01 00:00:00 +0000 | |||
1799 | @@ -1,10 +0,0 @@ | |||
1800 | 1 | [Desktop Entry] | ||
1801 | 2 | _Name=Shut Down | ||
1802 | 3 | TryExec=@libexecdir@/gtk-logout-helper | ||
1803 | 4 | Exec=@libexecdir@/gtk-logout-helper --shutdown | ||
1804 | 5 | Icon=system-shutdown | ||
1805 | 6 | Terminal=false | ||
1806 | 7 | Type=Application | ||
1807 | 8 | OnlyShowIn=Unity; | ||
1808 | 9 | Categories=System; | ||
1809 | 10 | Version=1.0 | ||
1810 | 11 | 0 | ||
1811 | === modified file 'debian/changelog' | |||
1812 | --- debian/changelog 2012-03-21 19:34:07 +0000 | |||
1813 | +++ debian/changelog 2012-04-05 17:54:28 +0000 | |||
1814 | @@ -1,3 +1,11 @@ | |||
1815 | 1 | indicator-session (0.3.96-0ubuntu1) precise; urgency=low | ||
1816 | 2 | |||
1817 | 3 | * New upstream release. | ||
1818 | 4 | * Remove desktop files so they don't appear in the dash. (LP: #973181) | ||
1819 | 5 | * Add gcov to the build for coverage statistics | ||
1820 | 6 | |||
1821 | 7 | -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 12:50:09 -0500 | ||
1822 | 8 | |||
1823 | 1 | indicator-session (0.3.95-0ubuntu1) precise; urgency=low | 9 | indicator-session (0.3.95-0ubuntu1) precise; urgency=low |
1824 | 2 | 10 | ||
1825 | 3 | * New upstream release. | 11 | * New upstream release. |
1826 | 4 | 12 | ||
1827 | === added directory 'm4' | |||
1828 | === removed directory 'm4' | |||
1829 | === added file 'm4/gcov.m4' | |||
1830 | --- m4/gcov.m4 1970-01-01 00:00:00 +0000 | |||
1831 | +++ m4/gcov.m4 2012-04-05 17:54:28 +0000 | |||
1832 | @@ -0,0 +1,86 @@ | |||
1833 | 1 | # Checks for existence of coverage tools: | ||
1834 | 2 | # * gcov | ||
1835 | 3 | # * lcov | ||
1836 | 4 | # * genhtml | ||
1837 | 5 | # * gcovr | ||
1838 | 6 | # | ||
1839 | 7 | # Sets ac_cv_check_gcov to yes if tooling is present | ||
1840 | 8 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | ||
1841 | 9 | AC_DEFUN([AC_TDD_GCOV], | ||
1842 | 10 | [ | ||
1843 | 11 | AC_ARG_ENABLE(gcov, | ||
1844 | 12 | AS_HELP_STRING([--enable-gcov], | ||
1845 | 13 | [enable coverage testing with gcov]), | ||
1846 | 14 | [use_gcov=$enableval], [use_gcov=no]) | ||
1847 | 15 | |||
1848 | 16 | if test "x$use_gcov" = "xyes"; then | ||
1849 | 17 | # we need gcc: | ||
1850 | 18 | if test "$GCC" != "yes"; then | ||
1851 | 19 | AC_MSG_ERROR([GCC is required for --enable-gcov]) | ||
1852 | 20 | fi | ||
1853 | 21 | |||
1854 | 22 | # Check if ccache is being used | ||
1855 | 23 | AC_CHECK_PROG(SHTOOL, shtool, shtool) | ||
1856 | 24 | case `$SHTOOL path $CC` in | ||
1857 | 25 | *ccache*[)] gcc_ccache=yes;; | ||
1858 | 26 | *[)] gcc_ccache=no;; | ||
1859 | 27 | esac | ||
1860 | 28 | |||
1861 | 29 | if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then | ||
1862 | 30 | AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) | ||
1863 | 31 | fi | ||
1864 | 32 | |||
1865 | 33 | lcov_version_list="1.6 1.7 1.8 1.9" | ||
1866 | 34 | AC_CHECK_PROG(LCOV, lcov, lcov) | ||
1867 | 35 | AC_CHECK_PROG(GENHTML, genhtml, genhtml) | ||
1868 | 36 | |||
1869 | 37 | if test "$LCOV"; then | ||
1870 | 38 | AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ | ||
1871 | 39 | glib_cv_lcov_version=invalid | ||
1872 | 40 | lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` | ||
1873 | 41 | for lcov_check_version in $lcov_version_list; do | ||
1874 | 42 | if test "$lcov_version" = "$lcov_check_version"; then | ||
1875 | 43 | glib_cv_lcov_version="$lcov_check_version (ok)" | ||
1876 | 44 | fi | ||
1877 | 45 | done | ||
1878 | 46 | ]) | ||
1879 | 47 | else | ||
1880 | 48 | lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" | ||
1881 | 49 | AC_MSG_ERROR([$lcov_msg]) | ||
1882 | 50 | fi | ||
1883 | 51 | |||
1884 | 52 | case $glib_cv_lcov_version in | ||
1885 | 53 | ""|invalid[)] | ||
1886 | 54 | lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." | ||
1887 | 55 | AC_MSG_ERROR([$lcov_msg]) | ||
1888 | 56 | LCOV="exit 0;" | ||
1889 | 57 | ;; | ||
1890 | 58 | esac | ||
1891 | 59 | |||
1892 | 60 | if test -z "$GENHTML"; then | ||
1893 | 61 | AC_MSG_ERROR([Could not find genhtml from the lcov package]) | ||
1894 | 62 | fi | ||
1895 | 63 | |||
1896 | 64 | ac_cv_check_gcov=yes | ||
1897 | 65 | ac_cv_check_lcov=yes | ||
1898 | 66 | |||
1899 | 67 | # Remove all optimization flags from CFLAGS | ||
1900 | 68 | changequote({,}) | ||
1901 | 69 | CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` | ||
1902 | 70 | changequote([,]) | ||
1903 | 71 | |||
1904 | 72 | # Add the special gcc flags | ||
1905 | 73 | COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
1906 | 74 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | ||
1907 | 75 | COVERAGE_LDFLAGS="-lgcov" | ||
1908 | 76 | |||
1909 | 77 | # Check availability of gcovr | ||
1910 | 78 | AC_CHECK_PROG(GCOVR, gcovr, gcovr) | ||
1911 | 79 | if test -z "$GCOVR"; then | ||
1912 | 80 | ac_cv_check_gcovr=no | ||
1913 | 81 | else | ||
1914 | 82 | ac_cv_check_gcovr=yes | ||
1915 | 83 | fi | ||
1916 | 84 | |||
1917 | 85 | fi | ||
1918 | 86 | ]) # AC_TDD_GCOV | ||
1919 | 0 | 87 | ||
1920 | === renamed file 'm4/intltool.m4' => 'm4/intltool.m4' | |||
1921 | === renamed file 'm4/libtool.m4' => 'm4/libtool.m4' | |||
1922 | === renamed file 'm4/ltoptions.m4' => 'm4/ltoptions.m4' | |||
1923 | === renamed file 'm4/ltsugar.m4' => 'm4/ltsugar.m4' | |||
1924 | === renamed file 'm4/ltversion.m4' => 'm4/ltversion.m4' | |||
1925 | === renamed file 'm4/lt~obsolete.m4' => 'm4/lt~obsolete.m4' | |||
1926 | === modified file 'po/POTFILES.in' | |||
1927 | --- po/POTFILES.in 2011-08-25 10:11:50 +0000 | |||
1928 | +++ po/POTFILES.in 2012-04-05 17:54:28 +0000 | |||
1929 | @@ -1,10 +1,6 @@ | |||
1930 | 1 | [encoding: UTF-8] | 1 | [encoding: UTF-8] |
1931 | 2 | data/com.canonical.indicator.session.gschema.xml.in | 2 | data/com.canonical.indicator.session.gschema.xml.in |
1932 | 3 | data/extra-sessions/classic-desktop.desktop.in.in | 3 | data/extra-sessions/classic-desktop.desktop.in.in |
1933 | 4 | data/indicator-session-lock-screen.desktop.in.in | ||
1934 | 5 | data/indicator-session-shutdown.desktop.in.in | ||
1935 | 6 | data/indicator-session-logout.desktop.in.in | ||
1936 | 7 | data/indicator-session-restart.desktop.in.in | ||
1937 | 8 | src/settings-helper.c | 4 | src/settings-helper.c |
1938 | 9 | src/lock-helper.c | 5 | src/lock-helper.c |
1939 | 10 | src/gtk-logout-helper.c | 6 | src/gtk-logout-helper.c |
1940 | 11 | 7 | ||
1941 | === modified file 'src/Makefile.am' | |||
1942 | --- src/Makefile.am 2012-02-23 15:17:10 +0000 | |||
1943 | +++ src/Makefile.am 2012-04-05 17:54:28 +0000 | |||
1944 | @@ -26,10 +26,13 @@ | |||
1945 | 26 | accounts-service-user-client.h | 26 | accounts-service-user-client.h |
1946 | 27 | libsession_la_CFLAGS = \ | 27 | libsession_la_CFLAGS = \ |
1947 | 28 | $(APPLET_CFLAGS) \ | 28 | $(APPLET_CFLAGS) \ |
1948 | 29 | $(COVERAGE_CFLAGS) \ | ||
1949 | 29 | -Wall -Werror \ | 30 | -Wall -Werror \ |
1950 | 30 | -DG_LOG_DOMAIN=\"Indicator-Session\" | 31 | -DG_LOG_DOMAIN=\"Indicator-Session\" |
1951 | 31 | libsession_la_LIBADD = $(APPLET_LIBS) | 32 | libsession_la_LIBADD = $(APPLET_LIBS) |
1953 | 32 | libsession_la_LDFLAGS = -module -avoid-version | 33 | libsession_la_LDFLAGS = \ |
1954 | 34 | $(COVERAGE_LDFLAGS) \ | ||
1955 | 35 | -module -avoid-version | ||
1956 | 33 | 36 | ||
1957 | 34 | consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml | 37 | consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml |
1958 | 35 | dbus-binding-tool \ | 38 | dbus-binding-tool \ |
1959 | @@ -137,11 +140,14 @@ | |||
1960 | 137 | -DLIBEXECDIR=\"$(libexecdir)\" \ | 140 | -DLIBEXECDIR=\"$(libexecdir)\" \ |
1961 | 138 | -Wall -Werror \ | 141 | -Wall -Werror \ |
1962 | 139 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ | 142 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ |
1964 | 140 | $(GUDEV_CFLAGS) | 143 | $(GUDEV_CFLAGS) \ |
1965 | 144 | $(COVERAGE_CFLAGS) | ||
1966 | 141 | indicator_session_service_LDADD = \ | 145 | indicator_session_service_LDADD = \ |
1967 | 142 | $(SESSIONSERVICE_LIBS) \ | 146 | $(SESSIONSERVICE_LIBS) \ |
1968 | 143 | $(GCONF_LIBS) \ | 147 | $(GCONF_LIBS) \ |
1969 | 144 | $(GUDEV_LIBS) | 148 | $(GUDEV_LIBS) |
1970 | 149 | indicator_session_service_LDFLAGS = \ | ||
1971 | 150 | $(COVERAGE_LDFLAGS) | ||
1972 | 145 | 151 | ||
1973 | 146 | ################# | 152 | ################# |
1974 | 147 | # GTK Logout Stuff | 153 | # GTK Logout Stuff |
1975 | @@ -159,6 +165,7 @@ | |||
1976 | 159 | $(SESSIONSERVICE_CFLAGS) \ | 165 | $(SESSIONSERVICE_CFLAGS) \ |
1977 | 160 | $(GTKLOGOUTHELPER_CFLAGS) \ | 166 | $(GTKLOGOUTHELPER_CFLAGS) \ |
1978 | 161 | $(GCONF_CFLAGS) \ | 167 | $(GCONF_CFLAGS) \ |
1979 | 168 | $(COVERAGE_CFLAGS) \ | ||
1980 | 162 | -Wall -Werror \ | 169 | -Wall -Werror \ |
1981 | 163 | -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" | 170 | -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" |
1982 | 164 | 171 | ||
1983 | @@ -166,6 +173,9 @@ | |||
1984 | 166 | $(SESSIONSERVICE_LIBS) \ | 173 | $(SESSIONSERVICE_LIBS) \ |
1985 | 167 | $(GTKLOGOUTHELPER_LIBS) \ | 174 | $(GTKLOGOUTHELPER_LIBS) \ |
1986 | 168 | $(GCONF_LIBS) | 175 | $(GCONF_LIBS) |
1987 | 176 | |||
1988 | 177 | gtk_logout_helper_LDFLAGS = \ | ||
1989 | 178 | $(COVERAGE_LDFLAGS) | ||
1990 | 169 | endif | 179 | endif |
1991 | 170 | 180 | ||
1992 | 171 | 181 | ||
1993 | 172 | 182 | ||
1994 | === modified file 'src/Makefile.in' | |||
1995 | --- src/Makefile.in 2012-03-14 18:34:16 +0000 | |||
1996 | +++ src/Makefile.in 2012-04-05 17:54:28 +0000 | |||
1997 | @@ -61,7 +61,8 @@ | |||
1998 | 61 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 61 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1999 | 62 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 62 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
2000 | 63 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 63 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
2002 | 64 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac | 64 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \ |
2003 | 65 | $(top_srcdir)/configure.ac | ||
2004 | 65 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 66 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2005 | 66 | $(ACLOCAL_M4) | 67 | $(ACLOCAL_M4) |
2006 | 67 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 68 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
2007 | @@ -122,8 +123,8 @@ | |||
2008 | 122 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(am__DEPENDENCIES_1) | 123 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(am__DEPENDENCIES_1) |
2009 | 123 | gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | 124 | gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2010 | 124 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 125 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2013 | 125 | $(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ | 126 | $(gtk_logout_helper_CFLAGS) $(CFLAGS) \ |
2014 | 126 | -o $@ | 127 | $(gtk_logout_helper_LDFLAGS) $(LDFLAGS) -o $@ |
2015 | 127 | am__indicator_session_service_SOURCES_DIST = lock-helper.c \ | 128 | am__indicator_session_service_SOURCES_DIST = lock-helper.c \ |
2016 | 128 | lock-helper.h session-service.c session-dbus.c session-dbus.h \ | 129 | lock-helper.h session-service.c session-dbus.c session-dbus.h \ |
2017 | 129 | gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \ | 130 | gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \ |
2018 | @@ -149,8 +150,8 @@ | |||
2019 | 149 | $(am__DEPENDENCIES_1) | 150 | $(am__DEPENDENCIES_1) |
2020 | 150 | indicator_session_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | 151 | indicator_session_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2021 | 151 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | 152 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2024 | 152 | $(indicator_session_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 153 | $(indicator_session_service_CFLAGS) $(CFLAGS) \ |
2025 | 153 | $(LDFLAGS) -o $@ | 154 | $(indicator_session_service_LDFLAGS) $(LDFLAGS) -o $@ |
2026 | 154 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 155 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2027 | 155 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 156 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
2028 | 156 | am__depfiles_maybe = depfiles | 157 | am__depfiles_maybe = depfiles |
2029 | @@ -201,6 +202,8 @@ | |||
2030 | 201 | CC = @CC@ | 202 | CC = @CC@ |
2031 | 202 | CCDEPMODE = @CCDEPMODE@ | 203 | CCDEPMODE = @CCDEPMODE@ |
2032 | 203 | CFLAGS = @CFLAGS@ | 204 | CFLAGS = @CFLAGS@ |
2033 | 205 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | ||
2034 | 206 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | ||
2035 | 204 | CPP = @CPP@ | 207 | CPP = @CPP@ |
2036 | 205 | CPPFLAGS = @CPPFLAGS@ | 208 | CPPFLAGS = @CPPFLAGS@ |
2037 | 206 | CYGPATH_W = @CYGPATH_W@ | 209 | CYGPATH_W = @CYGPATH_W@ |
2038 | @@ -217,6 +220,8 @@ | |||
2039 | 217 | EGREP = @EGREP@ | 220 | EGREP = @EGREP@ |
2040 | 218 | EXEEXT = @EXEEXT@ | 221 | EXEEXT = @EXEEXT@ |
2041 | 219 | FGREP = @FGREP@ | 222 | FGREP = @FGREP@ |
2042 | 223 | GCOVR = @GCOVR@ | ||
2043 | 224 | GENHTML = @GENHTML@ | ||
2044 | 220 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | 225 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
2045 | 221 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ | 226 | GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ |
2046 | 222 | GMOFILES = @GMOFILES@ | 227 | GMOFILES = @GMOFILES@ |
2047 | @@ -245,6 +250,7 @@ | |||
2048 | 245 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ | 250 | INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
2049 | 246 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ | 251 | INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
2050 | 247 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ | 252 | INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
2051 | 253 | LCOV = @LCOV@ | ||
2052 | 248 | LD = @LD@ | 254 | LD = @LD@ |
2053 | 249 | LDFLAGS = @LDFLAGS@ | 255 | LDFLAGS = @LDFLAGS@ |
2054 | 250 | LIBOBJS = @LIBOBJS@ | 256 | LIBOBJS = @LIBOBJS@ |
2055 | @@ -290,6 +296,7 @@ | |||
2056 | 290 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ | 296 | SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@ |
2057 | 291 | SET_MAKE = @SET_MAKE@ | 297 | SET_MAKE = @SET_MAKE@ |
2058 | 292 | SHELL = @SHELL@ | 298 | SHELL = @SHELL@ |
2059 | 299 | SHTOOL = @SHTOOL@ | ||
2060 | 293 | STRIP = @STRIP@ | 300 | STRIP = @STRIP@ |
2061 | 294 | USE_NLS = @USE_NLS@ | 301 | USE_NLS = @USE_NLS@ |
2062 | 295 | VERSION = @VERSION@ | 302 | VERSION = @VERSION@ |
2063 | @@ -373,11 +380,15 @@ | |||
2064 | 373 | 380 | ||
2065 | 374 | libsession_la_CFLAGS = \ | 381 | libsession_la_CFLAGS = \ |
2066 | 375 | $(APPLET_CFLAGS) \ | 382 | $(APPLET_CFLAGS) \ |
2067 | 383 | $(COVERAGE_CFLAGS) \ | ||
2068 | 376 | -Wall -Werror \ | 384 | -Wall -Werror \ |
2069 | 377 | -DG_LOG_DOMAIN=\"Indicator-Session\" | 385 | -DG_LOG_DOMAIN=\"Indicator-Session\" |
2070 | 378 | 386 | ||
2071 | 379 | libsession_la_LIBADD = $(APPLET_LIBS) | 387 | libsession_la_LIBADD = $(APPLET_LIBS) |
2073 | 380 | libsession_la_LDFLAGS = -module -avoid-version | 388 | libsession_la_LDFLAGS = \ |
2074 | 389 | $(COVERAGE_LDFLAGS) \ | ||
2075 | 390 | -module -avoid-version | ||
2076 | 391 | |||
2077 | 381 | 392 | ||
2078 | 382 | ################# | 393 | ################# |
2079 | 383 | # Session Stuff | 394 | # Session Stuff |
2080 | @@ -394,13 +405,17 @@ | |||
2081 | 394 | -DLIBEXECDIR=\"$(libexecdir)\" \ | 405 | -DLIBEXECDIR=\"$(libexecdir)\" \ |
2082 | 395 | -Wall -Werror \ | 406 | -Wall -Werror \ |
2083 | 396 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ | 407 | -DG_LOG_DOMAIN=\"Indicator-Session\" \ |
2085 | 397 | $(GUDEV_CFLAGS) | 408 | $(GUDEV_CFLAGS) \ |
2086 | 409 | $(COVERAGE_CFLAGS) | ||
2087 | 398 | 410 | ||
2088 | 399 | indicator_session_service_LDADD = \ | 411 | indicator_session_service_LDADD = \ |
2089 | 400 | $(SESSIONSERVICE_LIBS) \ | 412 | $(SESSIONSERVICE_LIBS) \ |
2090 | 401 | $(GCONF_LIBS) \ | 413 | $(GCONF_LIBS) \ |
2091 | 402 | $(GUDEV_LIBS) | 414 | $(GUDEV_LIBS) |
2092 | 403 | 415 | ||
2093 | 416 | indicator_session_service_LDFLAGS = \ | ||
2094 | 417 | $(COVERAGE_LDFLAGS) | ||
2095 | 418 | |||
2096 | 404 | 419 | ||
2097 | 405 | ################# | 420 | ################# |
2098 | 406 | # GTK Logout Stuff | 421 | # GTK Logout Stuff |
2099 | @@ -416,6 +431,7 @@ | |||
2100 | 416 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(SESSIONSERVICE_CFLAGS) \ | 431 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(SESSIONSERVICE_CFLAGS) \ |
2101 | 417 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_CFLAGS) \ | 432 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_CFLAGS) \ |
2102 | 418 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_CFLAGS) \ | 433 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_CFLAGS) \ |
2103 | 434 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_CFLAGS) \ | ||
2104 | 419 | @BUILD_GTKLOGOUTHELPER_TRUE@ -Wall -Werror \ | 435 | @BUILD_GTKLOGOUTHELPER_TRUE@ -Wall -Werror \ |
2105 | 420 | @BUILD_GTKLOGOUTHELPER_TRUE@ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" | 436 | @BUILD_GTKLOGOUTHELPER_TRUE@ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" |
2106 | 421 | 437 | ||
2107 | @@ -424,6 +440,9 @@ | |||
2108 | 424 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_LIBS) \ | 440 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GTKLOGOUTHELPER_LIBS) \ |
2109 | 425 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_LIBS) | 441 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(GCONF_LIBS) |
2110 | 426 | 442 | ||
2111 | 443 | @BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_LDFLAGS = \ | ||
2112 | 444 | @BUILD_GTKLOGOUTHELPER_TRUE@ $(COVERAGE_LDFLAGS) | ||
2113 | 445 | |||
2114 | 427 | 446 | ||
2115 | 428 | ############### | 447 | ############### |
2116 | 429 | # Other Stuff | 448 | # Other Stuff |
2117 | 430 | 449 | ||
2118 | === modified file 'src/gtk-logout-helper.c' | |||
2119 | --- src/gtk-logout-helper.c 2011-09-27 14:52:56 +0000 | |||
2120 | +++ src/gtk-logout-helper.c 2012-04-05 17:54:28 +0000 | |||
2121 | @@ -22,6 +22,7 @@ | |||
2122 | 22 | */ | 22 | */ |
2123 | 23 | 23 | ||
2124 | 24 | #include <config.h> | 24 | #include <config.h> |
2125 | 25 | #include <locale.h> | ||
2126 | 25 | #include <glib.h> | 26 | #include <glib.h> |
2127 | 26 | #include <gtk/gtk.h> | 27 | #include <gtk/gtk.h> |
2128 | 27 | #include <dbus/dbus-glib.h> | 28 | #include <dbus/dbus-glib.h> |
2129 | 28 | 29 | ||
2130 | === modified file 'src/session-service.c' | |||
2131 | --- src/session-service.c 2012-02-08 03:14:45 +0000 | |||
2132 | +++ src/session-service.c 2012-04-05 17:54:28 +0000 | |||
2133 | @@ -26,6 +26,7 @@ | |||
2134 | 26 | #include <config.h> | 26 | #include <config.h> |
2135 | 27 | 27 | ||
2136 | 28 | #include <unistd.h> | 28 | #include <unistd.h> |
2137 | 29 | #include <locale.h> | ||
2138 | 29 | 30 | ||
2139 | 30 | #include <glib/gi18n.h> | 31 | #include <glib/gi18n.h> |
2140 | 31 | #include <gio/gio.h> | 32 | #include <gio/gio.h> |