Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream into lp:~ubuntu-desktop/indicator-appmenu/ubuntu

Proposed by Charles Kerr
Status: Merged
Merged at revision: 227
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream
Merge into: lp:~ubuntu-desktop/indicator-appmenu/ubuntu
Diff against target: 1560 lines (+613/-245)
32 files modified
ChangeLog (+255/-0)
Makefile.am (+1/-35)
Makefile.am.coverage (+48/-0)
Makefile.in (+45/-39)
configure (+106/-68)
configure.ac (+4/-1)
data/Makefile.in (+5/-11)
debian/changelog (+19/-1)
debian/control (+4/-0)
docs/devel/html/HudAppMenuRegistrar.html (+1/-1)
docs/devel/html/HudDbusmenuCollector.html (+3/-3)
docs/devel/html/HudResult.html (+4/-4)
docs/devel/html/HudSource.html (+7/-7)
docs/devel/html/ch01.html (+1/-1)
docs/devel/html/ch02.html (+1/-1)
docs/devel/html/ch03.html (+1/-1)
docs/devel/html/ch04.html (+1/-1)
docs/devel/html/ch05.html (+1/-1)
docs/devel/html/hud-HudSettings.html (+2/-20)
docs/man/hud-cli.1 (+2/-2)
docs/man/hud-dump-application.1 (+2/-2)
docs/man/hud-list-applications.1 (+2/-2)
docs/man/hud-verify-app-info.1 (+2/-2)
m4/gcov.m4 (+13/-10)
src/Makefile.in (+18/-18)
src/hudquery.c (+1/-1)
src/hudtoken.c (+6/-0)
src/hudtoken.h (+1/-0)
src/indicator-appmenu.c (+2/-0)
tests/Makefile.in (+53/-11)
tests/test-dbus-message-count.in (+1/-1)
tools-vala/hud-gtk.c (+1/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+101004@code.launchpad.net

Description of the change

indicator-appmenu 0.3.97

  * New upstream release.
    * Faster searches and better search results. (lp: #947283, lp: #972354)
    * Don't submit searches with zero tokens. (lp: #973203)
    * Propertly emit the WindowUnregistered signal when windows go away.
    * Improvements to the gcov automake rules.
    * Fix bootstrap error in tests.

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 'ChangeLog'
2--- ChangeLog 2012-03-28 23:49:57 +0000
3+++ ChangeLog 2012-04-05 17:04:38 +0000
4@@ -1,5 +1,260 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-04-05 Charles Kerr <charles.kerr@canonical.com>
8+
9+ 0.3.97
10+
11+2012-04-05 Charles Kerr <charles.kerr@canonical.com>
12+
13+ merge lp:~desrt/indicator-appmenu/emit-unregister-signal to properly emit the WindowUnregistered signal when windows go away
14+
15+2012-04-04 Ryan Lortie <desrt@desrt.ca>
16+
17+ appmenu registrar: properly emit the "WindowUnregistered" signal when windows go away
18+
19+2012-04-04 Charles Kerr <charles.kerr@canonical.com>
20+
21+ merge lp:~desrt/indicator-appmenu/no-search-tokens to check for search with no tokens before searching.
22+
23+ The search algorithm assumes that there will be at least one search token, so be sure not to submit any searches with zero tokens. This can happen if the user searches for " ", for example.
24+
25+2012-04-04 Ryan Lortie <desrt@desrt.ca>
26+
27+ hud-service: check for search with no tokens before searching
28+
29+ The search algorithm assumes that there will be at least one search
30+ token, so be sure not to submit any searches with zero tokens. This can
31+ happen if the user searches for " ", for example.
32+
33+2012-04-04 Charles Kerr <charles.kerr@canonical.com>
34+
35+ merge lp:~charlesk/indicator-appmenu/remove-dead-file to remove a file that should have been deleted in the previous commit but was incorrectly resolved. h/t seb128
36+
37+2012-04-04 Charles Kerr <charles.kerr@canonical.com>
38+
39+ remove file that should have been deleted in previous commit but was incorrectly resolved. h/t seb128
40+
41+2012-04-03 Charles Kerr <charles.kerr@canonical.com>
42+
43+ merge lp:~allanlesage/indicator-appmenu/TDD to remove a dependency on gcovr, move gcov targets to their own makefile, and clean up .gcno files.
44+
45+2012-03-27 Allan LeSage <allanlesage@gmail.com>
46+
47+ Pedantic name change for gcovr xml coverage results.
48+
49+2012-03-27 Allan LeSage <allanlesage@gmail.com>
50+
51+ Removed gcovr dependency, cleaned up *.gcno files.
52+
53+2012-04-03 Charles Kerr <charles.kerr@canonical.com>
54+
55+ merge lp:~desrt/indicator-appmenu/hud-performance to improve hud-service performance and search result quality by substantially reworking the core distance algorithm and the needle/haystack assignment algorithm.
56+
57+2012-04-03 Ryan Lortie <desrt@desrt.ca>
58+
59+ HudWindowSource: fix a couple of leaks
60+
61+ - don't leak icon name while changing windows (fixes lp:972354)
62+
63+ - don't leak the collector on finalize (which never happens)
64+
65+2012-04-02 Ryan Lortie <desrt@desrt.ca>
66+
67+ Adjustments for Ted's review comments.
68+
69+2012-04-02 Ryan Lortie <desrt@desrt.ca>
70+
71+ Increase the default swap penalty to 15
72+
73+ The current value is too low. It allows "xyze" as a valid match for "File" (3
74+ swapped characters at a cost of 10 each gives a total cost of 30, which is the
75+ maximum permitted value).
76+
77+ It also causes an issue with accents. Consider the case of typing
78+ "pref" and encountering the menu items "préférence" and "précédent".
79+ Clearly the user wants "préférence". During normalisation, we convert
80+ each of these strings to "pre'fe'rence" and "pre'ce'dent".
81+
82+ "pref" vs "pre'fe'rence" is best scored as the first "'" being dropped
83+ and the trailing "e'rence" also being dropped. 10 points for the accent
84+ drop plus 7 for the trailing "e'rence". Total of 17 points.
85+
86+ "pref" vs "pre'ce'dent" seems like it should be scored worse since the
87+ accent is dropped and the following character is incorrect. Instead,
88+ however, the algorithm assigns a lower score for the possibility that
89+ the accent is replaced by the letter "f" (10 points) and then the rest
90+ of the characters "ce'dent" are dropped (7 points). Also a total of 17
91+ points.
92+
93+ This tie would be prevented with a higher swap cost.
94+
95+ This problem could be fixed by special-casing the dropping of accents in
96+ the core search algorithm and I tested this approach but it had a
97+ substantial performance cost on the rather tight inner loop (nearly
98+ doubling the amount of time to do a search).
99+
100+ Another possibility would be to drop all accents entirely during the
101+ normalisation process. This sounds acceptable for French, but I imagine
102+ other languages may find this to be less than ideal.
103+
104+ Also, consider "fl" against "file" and "fix" as another example that
105+ doesn't rely on accents to make its case (although the argument is
106+ somewhat weaker here). This shows that we should probably just increase
107+ the swap cost.
108+
109+2012-04-02 Ryan Lortie <desrt@desrt.ca>
110+
111+ hud-performance: increase the size of the test again
112+
113+ The testcase size was reduced for easier valgrinding. That accidentally
114+ got committed with a fix for a leak that was found while valgrinding.
115+ Put it back to the larger value.
116+
117+2012-04-02 Ryan Lortie <desrt@desrt.ca>
118+
119+ 'make distcheck' fixes
120+
121+ - fix srcdir != builddir issue for new testcase
122+ - make sure the new gsettings schemas get disted
123+
124+2012-04-02 Ryan Lortie <desrt@desrt.ca>
125+
126+ fix small leak in testcase
127+
128+2012-04-02 Ryan Lortie <desrt@desrt.ca>
129+
130+ really. don't delete schemas on 'make clean'.
131+
132+2012-04-01 Ryan Lortie <desrt@desrt.ca>
133+
134+ Skip checking of search terms when it's not possible to take the term
135+
136+ There are two situations in which a term will never be taken:
137+
138+ - the max cost has already been exceeded
139+
140+ - the cost of taking the term can't possibly beat the cost of dropping it
141+
142+ In those two cases, don't do the extra work.
143+
144+2012-04-01 Ryan Lortie <desrt@desrt.ca>
145+
146+ Add a good search performance test
147+
148+2012-03-31 Ryan Lortie <desrt@desrt.ca>
149+
150+ test that the new distance algorithm fixes bug 947283
151+
152+ The new needle/haystack matching algorithm penalises trailing haystack
153+ terms that are not matched to needles. Result: "save" now matches "File
154+ > Save" better than it matches "File > Save As...".
155+
156+2012-03-31 Ryan Lortie <desrt@desrt.ca>
157+
158+ don't blow away GSettings schemas on 'make clean'
159+
160+2012-03-31 Ryan Lortie <desrt@desrt.ca>
161+
162+ update POTFILES.in
163+
164+2012-03-30 Ryan Lortie <desrt@desrt.ca>
165+
166+ tests: test-distance: write compatibility shim
167+
168+ Write a compatibility shim for the old calculate_distance() API so that
169+ we can use the existing testcases to test the new code for regressions.
170+
171+2012-03-30 Ryan Lortie <desrt@desrt.ca>
172+
173+ Don't leak the app icon.
174+
175+ The app icon was leaking once per menu item. This could get pretty substantial
176+ over time.
177+
178+2012-03-30 Ryan Lortie <desrt@desrt.ca>
179+
180+ bring back the results highlighting
181+
182+2012-03-30 Ryan Lortie <desrt@desrt.ca>
183+
184+ HudStringList -> HudTokenList conversion: do it in the right order
185+
186+ The current algorithm was resulting in "File > Save" turning into the
187+ token list "Save", "File", which is problematic given the
188+ order-sensitive nature of the new assignment algorithm.
189+
190+2012-03-30 Ryan Lortie <desrt@desrt.ca>
191+
192+ Remove exponential algorithm for matching haystack and needle tokens
193+
194+ Instead, use a new O(n^2) algorithm inspired by the Levenshtein distance.
195+
196+2012-03-30 Ryan Lortie <desrt@desrt.ca>
197+
198+ Clean up GSettings
199+
200+ Drop the no-longer used settings. Improve the documentation for the
201+ remaining ones.
202+
203+ Change the default end-drop penalty from 10 to 1.
204+
205+ Rename "drop-penalty-end" to "end-drop-penalty" for consistency (all
206+ other penalties have the form '*-penalty') and also because the default
207+ value changed and we don't want to accidentally pick up any old value
208+ the user may have around.
209+
210+2012-03-30 Ryan Lortie <desrt@desrt.ca>
211+
212+ Switch to using new intltool gschema support.
213+
214+ Drop the .gschema.xml.in dance.
215+
216+2012-03-30 Ryan Lortie <desrt@desrt.ca>
217+
218+ Simplify the improve the performance of the distance calculation.
219+
220+ - we now normalise to casefolded normal-form ucs4 ahead of time and
221+ operate on that instead of doing the normalisation at each search.
222+ This removes normalisation steps and utf8 operations from the main
223+ path of searching.
224+
225+ - the innermost loop has been simplified free it of special-cases: it
226+ is now exactly equal to the reference implementation of Levenshtein
227+ distance from Wikipedia
228+
229+ - we continue to support post-drops as a special-case, but other
230+ special cases have been removed. pre-adds were probably a bad idea
231+ to start with, but it's worth talking about bringing back transposes.
232+
233+ - 'bold' highlighting of matching search terms is broken again (and
234+ will come back soon)
235+
236+2012-04-03 Charles Kerr <charles.kerr@canonical.com>
237+
238+ merge p:~charlesk/indicator-appmenu/lp-957417 to silence a coverity warning by removing a goto.
239+
240+2012-04-03 Charles Kerr <charles.kerr@canonical.com>
241+
242+ remove a goto to silence a Coverity warning reported in lp bug #957417
243+
244+2012-03-29 Charles Kerr <charles.kerr@canonical.com>
245+
246+ Merge lp:~desrt/indicator-appmenu/simplify-math to perform some explicit strength reduction to clarify an algorithm. Also, use a signed integer to correct an error due to unsigned substraction.
247+
248+2012-03-29 Ryan Lortie <desrt@desrt.ca>
249+
250+ Perform some explicit strength reduction to clarify an algorithm
251+
252+ Also, use a signed integer to correct an error due to unsigned substraction.
253+
254+2012-03-29 Charles Kerr <charles.kerr@canonical.com>
255+
256+ merge lp:~ken-vandine/indicator-appmenu/tests_use_builddir to use mock-json-app in the builddir instead of depending on an installed version of indicator-appmenu-tools, which caused a bootstrapping problem
257+
258+2012-03-29 Ken VanDine <ken.vandine@canonical.com>
259+
260+ Use mock-json-app in the builddir instead of depending on an installed version of indicator-appmenu-tools, which causes a bootstrapping problem
261+
262 2012-03-28 Charles Kerr <charles.kerr@canonical.com>
263
264 0.3.96
265
266=== modified file 'Makefile.am'
267--- Makefile.am 2012-03-21 17:27:26 +0000
268+++ Makefile.am 2012-04-05 17:04:38 +0000
269@@ -44,38 +44,4 @@
270 echo Failed to generate AUTHORS: not a branch >&2; \
271 fi
272
273-
274-# Coverage targets
275-
276-.PHONY: clean-gcda
277-clean-gcda:
278- @echo Removing old coverage results
279- -find -name '*.gcda' -print | xargs -r rm
280-
281-.PHONY: coverage-html generate-coverage-html clean-coverage-html
282-coverage-html: clean-gcda
283- -$(MAKE) $(AM_MAKEFLAGS) -k check
284- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
285-
286-generate-coverage-html:
287- @echo Collecting coverage data
288- $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
289- LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
290-
291-clean-coverage-html: clean-gcda
292- -$(LCOV) --directory $(top_builddir) -z
293- -rm -rf coverage.info coveragereport
294-
295-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
296-coverage-xml: clean-gcda
297- -$(MAKE) $(AM_MAKEFLAGS) -k check
298- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
299-
300-generate-coverage-xml:
301- @echo Generating coverage XML report
302- $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
303-
304-clean-coverage-xml: clean-gcda
305- -rm -rf $(top_builddir)/coverage.xml
306-
307-clean-local: clean-coverage-html clean-coverage-xml
308+include $(top_srcdir)/Makefile.am.coverage
309
310=== added file 'Makefile.am.coverage'
311--- Makefile.am.coverage 1970-01-01 00:00:00 +0000
312+++ Makefile.am.coverage 2012-04-05 17:04:38 +0000
313@@ -0,0 +1,48 @@
314+
315+# Coverage targets
316+
317+.PHONY: clean-gcno clean-gcda \
318+ coverage-html generate-coverage-html clean-coverage-html \
319+ coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
320+
321+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
322+
323+if HAVE_GCOV
324+
325+clean-gcno:
326+ @echo Removing old coverage instrumentation
327+ -find -name '*.gcno' -print | xargs -r rm
328+
329+clean-gcda:
330+ @echo Removing old coverage results
331+ -find -name '*.gcda' -print | xargs -r rm
332+
333+coverage-html: clean-gcda
334+ -$(MAKE) $(AM_MAKEFLAGS) -k check
335+ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
336+
337+generate-coverage-html:
338+ @echo Collecting coverage data
339+ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
340+ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
341+
342+clean-coverage-html: clean-gcda
343+ -$(LCOV) --directory $(top_builddir) -z
344+ -rm -rf coverage.info coveragereport
345+
346+if HAVE_GCOVR
347+
348+coverage-gcovr: clean-gcda
349+ -$(MAKE) $(AM_MAKEFLAGS) -k check
350+ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
351+
352+generate-coverage-gcovr:
353+ @echo Generating coverage GCOVR report
354+ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
355+
356+clean-coverage-gcovr: clean-gcda
357+ -rm -rf $(top_builddir)/coverage.xml
358+
359+endif # HAVE_GCOVR
360+
361+endif # HAVE_GCOV
362
363=== modified file 'Makefile.in'
364--- Makefile.in 2012-03-21 18:36:17 +0000
365+++ Makefile.in 2012-04-05 17:04:38 +0000
366@@ -14,6 +14,8 @@
367 # PARTICULAR PURPOSE.
368
369 @SET_MAKE@
370+
371+# Coverage targets
372 VPATH = @srcdir@
373 pkgdatadir = $(datadir)/@PACKAGE@
374 pkgincludedir = $(includedir)/@PACKAGE@
375@@ -39,12 +41,12 @@
376 @BUILD_TESTS_TRUE@ tools \
377 @BUILD_TESTS_TRUE@ tools-vala
378
379-subdir = .
380 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
381 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
382- $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
383- NEWS compile config.guess config.rpath config.sub depcomp \
384- install-sh ltmain.sh missing
385+ $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
386+ ABOUT-NLS AUTHORS COPYING ChangeLog NEWS compile config.guess \
387+ config.rpath config.sub depcomp install-sh ltmain.sh missing
388+subdir = .
389 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
390 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
391 $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \
392@@ -316,7 +318,7 @@
393 .SUFFIXES:
394 am--refresh: Makefile
395 @:
396-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
397+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps)
398 @for dep in $?; do \
399 case '$(am__configure_deps)' in \
400 *$$dep*) \
401@@ -339,6 +341,7 @@
402 echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
403 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
404 esac;
405+$(top_srcdir)/Makefile.am.coverage:
406
407 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
408 $(SHELL) ./config.status --recheck
409@@ -855,40 +858,43 @@
410 echo Failed to generate AUTHORS: not a branch >&2; \
411 fi
412
413-# Coverage targets
414-
415-.PHONY: clean-gcda
416-clean-gcda:
417- @echo Removing old coverage results
418- -find -name '*.gcda' -print | xargs -r rm
419-
420-.PHONY: coverage-html generate-coverage-html clean-coverage-html
421-coverage-html: clean-gcda
422- -$(MAKE) $(AM_MAKEFLAGS) -k check
423- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
424-
425-generate-coverage-html:
426- @echo Collecting coverage data
427- $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
428- LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
429-
430-clean-coverage-html: clean-gcda
431- -$(LCOV) --directory $(top_builddir) -z
432- -rm -rf coverage.info coveragereport
433-
434-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
435-coverage-xml: clean-gcda
436- -$(MAKE) $(AM_MAKEFLAGS) -k check
437- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
438-
439-generate-coverage-xml:
440- @echo Generating coverage XML report
441- $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
442-
443-clean-coverage-xml: clean-gcda
444- -rm -rf $(top_builddir)/coverage.xml
445-
446-clean-local: clean-coverage-html clean-coverage-xml
447+.PHONY: clean-gcno clean-gcda \
448+ coverage-html generate-coverage-html clean-coverage-html \
449+ coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
450+
451+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
452+
453+@HAVE_GCOV_TRUE@clean-gcno:
454+@HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation
455+@HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm
456+
457+@HAVE_GCOV_TRUE@clean-gcda:
458+@HAVE_GCOV_TRUE@ @echo Removing old coverage results
459+@HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm
460+
461+@HAVE_GCOV_TRUE@coverage-html: clean-gcda
462+@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check
463+@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
464+
465+@HAVE_GCOV_TRUE@generate-coverage-html:
466+@HAVE_GCOV_TRUE@ @echo Collecting coverage data
467+@HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
468+@HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
469+
470+@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda
471+@HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z
472+@HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport
473+
474+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda
475+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check
476+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
477+
478+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr:
479+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report
480+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
481+
482+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda
483+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml
484
485 # Tell versions [3.59,3.63) of GNU make to not export all variables.
486 # Otherwise a system limit (for SysV at least) may be exceeded.
487
488=== modified file 'configure'
489--- configure 2012-03-28 23:49:57 +0000
490+++ configure 2012-04-05 17:04:38 +0000
491@@ -1,6 +1,6 @@
492 #! /bin/sh
493 # Guess values for system-dependent variables and create Makefiles.
494-# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.96.
495+# Generated by GNU Autoconf 2.68 for indicator-appmenu 0.3.97.
496 #
497 # Report bugs to <http://bugs.launchpad.net/indicator-appmenu>.
498 #
499@@ -632,8 +632,8 @@
500 # Identity of this package.
501 PACKAGE_NAME='indicator-appmenu'
502 PACKAGE_TARNAME='indicator-appmenu'
503-PACKAGE_VERSION='0.3.96'
504-PACKAGE_STRING='indicator-appmenu 0.3.96'
505+PACKAGE_VERSION='0.3.97'
506+PACKAGE_STRING='indicator-appmenu 0.3.97'
507 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-appmenu'
508 PACKAGE_URL='http://launchpad.net/indicator-appmenu'
509
510@@ -736,6 +736,12 @@
511 COVERAGE_LDFLAGS
512 COVERAGE_CXXFLAGS
513 COVERAGE_CFLAGS
514+HAVE_GCOVR_FALSE
515+HAVE_GCOVR_TRUE
516+HAVE_LCOV_FALSE
517+HAVE_LCOV_TRUE
518+HAVE_GCOV_FALSE
519+HAVE_GCOV_TRUE
520 GCOVR
521 GENHTML
522 LCOV
523@@ -1485,7 +1491,7 @@
524 # Omit some internal or obsolete options to make the list less imposing.
525 # This message is too long to be a string in the A/UX 3.1 sh.
526 cat <<_ACEOF
527-\`configure' configures indicator-appmenu 0.3.96 to adapt to many kinds of systems.
528+\`configure' configures indicator-appmenu 0.3.97 to adapt to many kinds of systems.
529
530 Usage: $0 [OPTION]... [VAR=VALUE]...
531
532@@ -1556,7 +1562,7 @@
533
534 if test -n "$ac_init_help"; then
535 case $ac_init_help in
536- short | recursive ) echo "Configuration of indicator-appmenu 0.3.96:";;
537+ short | recursive ) echo "Configuration of indicator-appmenu 0.3.97:";;
538 esac
539 cat <<\_ACEOF
540
541@@ -1702,7 +1708,7 @@
542 test -n "$ac_init_help" && exit $ac_status
543 if $ac_init_version; then
544 cat <<\_ACEOF
545-indicator-appmenu configure 0.3.96
546+indicator-appmenu configure 0.3.97
547 generated by GNU Autoconf 2.68
548
549 Copyright (C) 2010 Free Software Foundation, Inc.
550@@ -2073,7 +2079,7 @@
551 This file contains any messages produced by compilers while
552 running configure, to aid debugging if configure makes a mistake.
553
554-It was created by indicator-appmenu $as_me 0.3.96, which was
555+It was created by indicator-appmenu $as_me 0.3.97, which was
556 generated by GNU Autoconf 2.68. Invocation command line was
557
558 $ $0 $@
559@@ -2899,7 +2905,7 @@
560
561 # Define the identity of the package.
562 PACKAGE='indicator-appmenu'
563- VERSION='0.3.96'
564+ VERSION='0.3.97'
565
566
567 cat >>confdefs.h <<_ACEOF
568@@ -13244,13 +13250,7 @@
569 # AC_TDD_GCOV
570
571
572-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5
573-$as_echo_n "checking whether code coverage tools are available... " >&6; }
574-if ${ac_cv_check_gcov+:} false; then :
575- $as_echo_n "(cached) " >&6
576-else
577-
578-# Check whether --enable-gcov was given.
579+ # Check whether --enable-gcov was given.
580 if test "${enable_gcov+set}" = set; then :
581 enableval=$enable_gcov; use_gcov=$enableval
582 else
583@@ -13386,43 +13386,6 @@
584 fi
585
586
587- # Extract the first word of "gcovr", so it can be a program name with args.
588-set dummy gcovr; ac_word=$2
589-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
590-$as_echo_n "checking for $ac_word... " >&6; }
591-if ${ac_cv_prog_GCOVR+:} false; then :
592- $as_echo_n "(cached) " >&6
593-else
594- if test -n "$GCOVR"; then
595- ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
596-else
597-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
598-for as_dir in $PATH
599-do
600- IFS=$as_save_IFS
601- test -z "$as_dir" && as_dir=.
602- for ac_exec_ext in '' $ac_executable_extensions; do
603- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
604- ac_cv_prog_GCOVR="gcovr"
605- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
606- break 2
607- fi
608-done
609- done
610-IFS=$as_save_IFS
611-
612-fi
613-fi
614-GCOVR=$ac_cv_prog_GCOVR
615-if test -n "$GCOVR"; then
616- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
617-$as_echo "$GCOVR" >&6; }
618-else
619- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
620-$as_echo "no" >&6; }
621-fi
622-
623-
624
625 if test "$LCOV"; then
626 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
627@@ -13459,10 +13422,8 @@
628 as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
629 fi
630
631- if test -z "$GCOVR"; then
632- as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5
633- fi
634-
635+ ac_cv_check_gcov=yes
636+ ac_cv_check_lcov=yes
637
638 # Remove all optimization flags from CFLAGS
639
640@@ -13474,11 +13435,76 @@
641 COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
642 COVERAGE_LDFLAGS="-lgcov"
643
644-fi
645-
646-fi
647-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5
648-$as_echo "$ac_cv_check_gcov" >&6; }
649+ # Check availability of gcovr
650+ # Extract the first word of "gcovr", so it can be a program name with args.
651+set dummy gcovr; ac_word=$2
652+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
653+$as_echo_n "checking for $ac_word... " >&6; }
654+if ${ac_cv_prog_GCOVR+:} false; then :
655+ $as_echo_n "(cached) " >&6
656+else
657+ if test -n "$GCOVR"; then
658+ ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
659+else
660+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
661+for as_dir in $PATH
662+do
663+ IFS=$as_save_IFS
664+ test -z "$as_dir" && as_dir=.
665+ for ac_exec_ext in '' $ac_executable_extensions; do
666+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
667+ ac_cv_prog_GCOVR="gcovr"
668+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
669+ break 2
670+ fi
671+done
672+ done
673+IFS=$as_save_IFS
674+
675+fi
676+fi
677+GCOVR=$ac_cv_prog_GCOVR
678+if test -n "$GCOVR"; then
679+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
680+$as_echo "$GCOVR" >&6; }
681+else
682+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
683+$as_echo "no" >&6; }
684+fi
685+
686+
687+ if test -z "$GCOVR"; then
688+ ac_cv_check_gcovr=no
689+ else
690+ ac_cv_check_gcovr=yes
691+ fi
692+
693+fi
694+
695+ if test "x$ac_cv_check_gcov" = xyes; then
696+ HAVE_GCOV_TRUE=
697+ HAVE_GCOV_FALSE='#'
698+else
699+ HAVE_GCOV_TRUE='#'
700+ HAVE_GCOV_FALSE=
701+fi
702+
703+ if test "x$ac_cv_check_lcov" = xyes; then
704+ HAVE_LCOV_TRUE=
705+ HAVE_LCOV_FALSE='#'
706+else
707+ HAVE_LCOV_TRUE='#'
708+ HAVE_LCOV_FALSE=
709+fi
710+
711+ if test "x$ac_cv_check_gcovr" = xyes; then
712+ HAVE_GCOVR_TRUE=
713+ HAVE_GCOVR_FALSE='#'
714+else
715+ HAVE_GCOVR_TRUE='#'
716+ HAVE_GCOVR_FALSE=
717+fi
718+
719
720
721
722@@ -13605,16 +13631,16 @@
723 ;;
724 esac
725
726-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.41.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
727+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.50.2 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
728 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
729 INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
730-if test -n "0.41.0"; then
731- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.41.0" >&5
732-$as_echo_n "checking for intltool >= 0.41.0... " >&6; }
733+if test -n "0.50.2"; then
734+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.50.2" >&5
735+$as_echo_n "checking for intltool >= 0.50.2... " >&6; }
736 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
737 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
738 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
739- as_fn_error $? "Your intltool is too old. You need intltool 0.41.0 or later." "$LINENO" 5
740+ as_fn_error $? "Your intltool is too old. You need intltool 0.50.2 or later." "$LINENO" 5
741 fi
742
743 # Extract the first word of "intltool-update", so it can be a program name with args.
744@@ -16235,6 +16261,18 @@
745 as_fn_error $? "conditional \"BUILD_TESTS\" was never defined.
746 Usually this means the macro was only invoked conditionally." "$LINENO" 5
747 fi
748+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
749+ as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
750+Usually this means the macro was only invoked conditionally." "$LINENO" 5
751+fi
752+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
753+ as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
754+Usually this means the macro was only invoked conditionally." "$LINENO" 5
755+fi
756+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
757+ as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
758+Usually this means the macro was only invoked conditionally." "$LINENO" 5
759+fi
760
761 ac_config_commands="$ac_config_commands po/stamp-it"
762
763@@ -16648,7 +16686,7 @@
764 # report actual input values of CONFIG_FILES etc. instead of their
765 # values after options handling.
766 ac_log="
767-This file was extended by indicator-appmenu $as_me 0.3.96, which was
768+This file was extended by indicator-appmenu $as_me 0.3.97, which was
769 generated by GNU Autoconf 2.68. Invocation command line was
770
771 CONFIG_FILES = $CONFIG_FILES
772@@ -16715,7 +16753,7 @@
773 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
774 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
775 ac_cs_version="\\
776-indicator-appmenu config.status 0.3.96
777+indicator-appmenu config.status 0.3.97
778 configured by $0, generated by GNU Autoconf 2.68,
779 with options \\"\$ac_cs_config\\"
780
781
782=== modified file 'configure.ac'
783--- configure.ac 2012-04-02 17:51:29 +0000
784+++ configure.ac 2012-04-05 17:04:38 +0000
785@@ -1,5 +1,5 @@
786 AC_INIT([indicator-appmenu],
787- [0.3.96],
788+ [0.3.97],
789 [http://bugs.launchpad.net/indicator-appmenu],
790 [indicator-appmenu],
791 [http://launchpad.net/indicator-appmenu])
792@@ -155,6 +155,9 @@
793
794 m4_include([m4/gcov.m4])
795 AC_TDD_GCOV
796+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
797+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
798+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
799 AC_SUBST(COVERAGE_CFLAGS)
800 AC_SUBST(COVERAGE_CXXFLAGS)
801 AC_SUBST(COVERAGE_LDFLAGS)
802
803=== modified file 'data/Makefile.in'
804--- data/Makefile.in 2012-03-21 18:36:17 +0000
805+++ data/Makefile.in 2012-04-05 17:04:38 +0000
806@@ -271,24 +271,19 @@
807 top_build_prefix = @top_build_prefix@
808 top_builddir = @top_builddir@
809 top_srcdir = @top_srcdir@
810-gsettings_in_files = \
811- com.canonical.indicator.appmenu.gschema.xml.in \
812- com.canonical.indicator.appmenu.hud.gschema.xml.in \
813- com.canonical.indicator.appmenu.hud.search.gschema.xml.in
814-
815 gsettings_SCHEMAS = \
816- $(gsettings_in_files:.xml.in=.xml)
817+ com.canonical.indicator.appmenu.gschema.xml \
818+ com.canonical.indicator.appmenu.hud.gschema.xml \
819+ com.canonical.indicator.appmenu.hud.search.gschema.xml
820
821 dbus_servicesdir = $(DBUSSERVICEDIR)
822 dbus_services_DATA = com.canonical.hud.service
823 EXTRA_DIST = \
824 $(dbus_services_DATA:.service=.service.in) \
825- $(gsettings_in_files)
826+ $(gsettings_SCHEMAS)
827
828 CLEANFILES = \
829- $(dbus_services_DATA) \
830- $(gsettings_SCHEMAS:.xml=.valid) \
831- $(gsettings_SCHEMAS)
832+ $(dbus_services_DATA)
833
834 all: all-am
835
836@@ -503,7 +498,6 @@
837 ps ps-am uninstall uninstall-am uninstall-dbus_servicesDATA
838
839
840-@INTLTOOL_XML_NOMERGE_RULE@
841 @GSETTINGS_RULES@
842
843 %.service: %.service.in
844
845=== modified file 'debian/changelog'
846--- debian/changelog 2012-04-03 15:59:10 +0000
847+++ debian/changelog 2012-04-05 17:04:38 +0000
848@@ -1,7 +1,18 @@
849+indicator-appmenu (0.3.97-0ubuntu1) precise; urgency=low
850+
851+ * New upstream release.
852+ * Faster searches and better search results. (lp: #947283, lp: #972354)
853+ * Don't submit searches with zero tokens. (lp: #973203)
854+ * Propertly emit the WindowUnregistered signal when windows go away.
855+ * Improvements to the gcov automake rules.
856+ * Fix bootstrap error in tests.
857+
858+ -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 11:58:41 -0500
859+
860 indicator-appmenu (0.3.96-0ubuntu3) precise; urgency=low
861
862 * Backport desrt's performance improvement work:
863- - reduce hud cpu usage and DoS on long strings (lp: #938584, ##948820)
864+ - reduce hud cpu usage and DoS on long strings (lp: #938584, lp: #948820)
865 - should stop stripping issues (lp: #937020)
866 - fixes a small leak (lp: #972354)
867
868@@ -13,6 +24,13 @@
869
870 -- Sebastien Bacher <seb128@ubuntu.com> Mon, 02 Apr 2012 15:03:25 +0200
871
872+indicator-appmenu (0.3.96-0ubuntu2~ppa1) UNRELEASED; urgency=low
873+
874+ * debian/control
875+ - Added build depends needed for test-dbus-message-count
876+
877+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Mar 2012 10:57:55 -0400
878+
879 indicator-appmenu (0.3.96-0ubuntu1) precise; urgency=low
880
881 [ Charles Kerr ]
882
883=== modified file 'debian/control'
884--- debian/control 2012-03-20 12:47:10 +0000
885+++ debian/control 2012-04-05 17:04:38 +0000
886@@ -25,6 +25,10 @@
887 libappindicator3-dev,
888 indicator-application (>= 0.4.90),
889 xvfb,
890+ bamfdaemon,
891+ metacity,
892+ bustle,
893+ libindicator3-tools,
894 valac-0.16
895 Standards-Version: 3.9.2
896 Homepage: http://launchpad.net/indicator-appmenu
897
898=== modified file 'docs/devel/html/HudAppMenuRegistrar.html'
899--- docs/devel/html/HudAppMenuRegistrar.html 2012-03-28 23:48:15 +0000
900+++ docs/devel/html/HudAppMenuRegistrar.html 2012-04-05 17:04:38 +0000
901@@ -117,7 +117,7 @@
902 </p>
903 <p>
904 You should pass the values of <em class="parameter"><code>bus_name</code></em> and <em class="parameter"><code>object_path</code></em> to
905-<code class="function">dbusmenu_client_new()</code> to get started.
906+<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#dbusmenu-client-new"><code class="function">dbusmenu_client_new()</code></a> to get started.
907 </p>
908 <p>
909 If no menu is available then <em class="parameter"><code>bus_name</code></em> and <em class="parameter"><code>object_path</code></em> will both be
910
911=== modified file 'docs/devel/html/HudDbusmenuCollector.html'
912--- docs/devel/html/HudDbusmenuCollector.html 2012-03-28 23:48:15 +0000
913+++ docs/devel/html/HudDbusmenuCollector.html 2012-04-05 17:04:38 +0000
914@@ -74,7 +74,7 @@
915 <div class="refsect1">
916 <a name="HudDbusmenuCollector.description"></a><h2>Description</h2>
917 <p>
918-The <a class="link" href="HudDbusmenuCollector.html" title="HudDbusmenuCollector"><span class="type">HudDbusmenuCollector</span></a> collects menu items from a <span class="type">DbusmenuClient</span>.
919+The <a class="link" href="HudDbusmenuCollector.html" title="HudDbusmenuCollector"><span class="type">HudDbusmenuCollector</span></a> collects menu items from a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a>.
920 </p>
921 <p>
922 There are two modes of operation.
923@@ -82,7 +82,7 @@
924 <p>
925 In the simple mode, the collector is created with a specified
926 endpoint using <a class="link" href="HudDbusmenuCollector.html#hud-dbusmenu-collector-new-for-endpoint" title="hud_dbusmenu_collector_new_for_endpoint ()"><code class="function">hud_dbusmenu_collector_new_for_endpoint()</code></a>. A
927-<span class="type">DbusmenuClient</span> is constructed using this endpoint and the collector
928+<a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a> is constructed using this endpoint and the collector
929 constructs <a href="HudItem.html"><span class="type">HudItems</span></a> for the contents of the menu found there. This
930 mode is intended for use with indicators.
931 </p>
932@@ -116,7 +116,7 @@
933 Creates a new <a class="link" href="HudDbusmenuCollector.html" title="HudDbusmenuCollector"><span class="type">HudDbusmenuCollector</span></a> for the specified endpoint.
934 </p>
935 <p>
936-Internally, a <span class="type">DbusmenuClient</span> is created for this endpoint. Searches
937+Internally, a <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuClient.html#DbusmenuClient"><span class="type">DbusmenuClient</span></a> is created for this endpoint. Searches
938 are performed against the contents of those menus.
939 </p>
940 <p>
941
942=== modified file 'docs/devel/html/HudResult.html'
943--- docs/devel/html/HudResult.html 2012-03-07 21:16:55 +0000
944+++ docs/devel/html/HudResult.html 2012-04-05 17:04:38 +0000
945@@ -45,11 +45,11 @@
946 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> max_usage</code></em>);
947 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="HudResult.html#hud-result-get-html-description" title="hud_result_get_html_description ()">hud_result_get_html_description</a> (<em class="parameter"><code><a class="link" href="HudResult.html" title="HudResult"><span class="type">HudResult</span></a> *result</code></em>);
948 <a class="link" href="HudResult.html" title="HudResult"><span class="returnvalue">HudResult</span></a> * <a class="link" href="HudResult.html#hud-result-get-if-matched" title="hud_result_get_if_matched ()">hud_result_get_if_matched</a> (<em class="parameter"><code><a class="link" href="HudItem.html" title="HudItem"><span class="type">HudItem</span></a> *item</code></em>,
949- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>,
950+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>,
951 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> penalty</code></em>);
952 <a class="link" href="HudItem.html" title="HudItem"><span class="returnvalue">HudItem</span></a> * <a class="link" href="HudResult.html#hud-result-get-item" title="hud_result_get_item ()">hud_result_get_item</a> (<em class="parameter"><code><a class="link" href="HudResult.html" title="HudResult"><span class="type">HudResult</span></a> *result</code></em>);
953 <a class="link" href="HudResult.html" title="HudResult"><span class="returnvalue">HudResult</span></a> * <a class="link" href="HudResult.html#hud-result-new" title="hud_result_new ()">hud_result_new</a> (<em class="parameter"><code><a class="link" href="HudItem.html" title="HudItem"><span class="type">HudItem</span></a> *item</code></em>,
954- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>,
955+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>,
956 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> penalty</code></em>);
957 </pre>
958 </div>
959@@ -140,7 +140,7 @@
960 <div class="refsect2">
961 <a name="hud-result-get-if-matched"></a><h3>hud_result_get_if_matched ()</h3>
962 <pre class="programlisting"><a class="link" href="HudResult.html" title="HudResult"><span class="returnvalue">HudResult</span></a> * hud_result_get_if_matched (<em class="parameter"><code><a class="link" href="HudItem.html" title="HudItem"><span class="type">HudItem</span></a> *item</code></em>,
963- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>,
964+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>,
965 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> penalty</code></em>);</pre>
966 <p>
967 Creates a <a class="link" href="HudResult.html" title="HudResult"><span class="type">HudResult</span></a> for <em class="parameter"><code>item</code></em>, only if the resulting unadjusted
968@@ -207,7 +207,7 @@
969 <div class="refsect2">
970 <a name="hud-result-new"></a><h3>hud_result_new ()</h3>
971 <pre class="programlisting"><a class="link" href="HudResult.html" title="HudResult"><span class="returnvalue">HudResult</span></a> * hud_result_new (<em class="parameter"><code><a class="link" href="HudItem.html" title="HudItem"><span class="type">HudItem</span></a> *item</code></em>,
972- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>,
973+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>,
974 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> penalty</code></em>);</pre>
975 <p>
976 Creates a <a class="link" href="HudResult.html" title="HudResult"><span class="type">HudResult</span></a> for <em class="parameter"><code>item</code></em> as search for using <em class="parameter"><code>search_string</code></em>.
977
978=== modified file 'docs/devel/html/HudSource.html'
979--- docs/devel/html/HudSource.html 2012-03-21 18:22:46 +0000
980+++ docs/devel/html/HudSource.html 2012-04-05 17:04:38 +0000
981@@ -50,7 +50,7 @@
982 <span class="returnvalue">void</span> <a class="link" href="HudSource.html#hud-source-changed" title="hud_source_changed ()">hud_source_changed</a> (<em class="parameter"><code><a class="link" href="HudSource.html" title="HudSource"><span class="type">HudSource</span></a> *source</code></em>);
983 <span class="returnvalue">void</span> <a class="link" href="HudSource.html#hud-source-search" title="hud_source_search ()">hud_source_search</a> (<em class="parameter"><code><a class="link" href="HudSource.html" title="HudSource"><span class="type">HudSource</span></a> *source</code></em>,
984 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *results_array</code></em>,
985- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>);
986+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>);
987 </pre>
988 </div>
989 <div class="refsect1">
990@@ -128,11 +128,11 @@
991 <pre class="programlisting">struct HudSourceInterface {
992 GTypeInterface g_iface;
993
994- void (* use) (HudSource *source);
995- void (* unuse) (HudSource *source);
996- void (* search) (HudSource *source,
997- GPtrArray *results_array,
998- const gchar *search_string);
999+ void (* use) (HudSource *source);
1000+ void (* unuse) (HudSource *source);
1001+ void (* search) (HudSource *source,
1002+ GPtrArray *results_array,
1003+ HudTokenList *search_tokens);
1004 };
1005 </pre>
1006 <p>
1007@@ -188,7 +188,7 @@
1008 <a name="hud-source-search"></a><h3>hud_source_search ()</h3>
1009 <pre class="programlisting"><span class="returnvalue">void</span> hud_source_search (<em class="parameter"><code><a class="link" href="HudSource.html" title="HudSource"><span class="type">HudSource</span></a> *source</code></em>,
1010 <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> *results_array</code></em>,
1011- <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *search_string</code></em>);</pre>
1012+ <em class="parameter"><code><span class="type">HudTokenList</span> *search_tokens</code></em>);</pre>
1013 <p>
1014 Searches for <a href="HudItem.html"><span class="type">HudItems</span></a> in <em class="parameter"><code>source</code></em> that potentially match
1015 <em class="parameter"><code>search_string</code></em> and creates <a href="HudResult.html"><span class="type">HudResults</span></a> for them, appending them to
1016
1017=== modified file 'docs/devel/html/ch01.html'
1018--- docs/devel/html/ch01.html 2012-03-28 23:48:15 +0000
1019+++ docs/devel/html/ch01.html 2012-04-05 17:04:38 +0000
1020@@ -21,7 +21,7 @@
1021 </tr></table>
1022 <div class="chapter">
1023 <div class="titlepage"><div><div><h2 class="title">
1024-<a name="idp6008440"></a>Overview</h2></div></div></div>
1025+<a name="idp20913768"></a>Overview</h2></div></div></div>
1026 <p>
1027 The HUD consists of the interface in the shell and a backend service, <code class="literal">hud-service</code>. This
1028 document attempts to describe the internal architecture of the service.
1029
1030=== modified file 'docs/devel/html/ch02.html'
1031--- docs/devel/html/ch02.html 2012-03-28 23:48:15 +0000
1032+++ docs/devel/html/ch02.html 2012-04-05 17:04:38 +0000
1033@@ -21,7 +21,7 @@
1034 </tr></table>
1035 <div class="chapter">
1036 <div class="titlepage"><div><div><h2 class="title">
1037-<a name="idp2770824"></a>Data Types</h2></div></div></div>
1038+<a name="idp18162512"></a>Data Types</h2></div></div></div>
1039 <div class="toc"><dl><dt>
1040 <span class="refentrytitle"><a href="hud-HudStringList.html">HudStringList</a></span><span class="refpurpose"> — a refcounted list of strings</span>
1041 </dt></dl></div>
1042
1043=== modified file 'docs/devel/html/ch03.html'
1044--- docs/devel/html/ch03.html 2012-03-28 23:48:15 +0000
1045+++ docs/devel/html/ch03.html 2012-04-05 17:04:38 +0000
1046@@ -21,7 +21,7 @@
1047 </tr></table>
1048 <div class="chapter">
1049 <div class="titlepage"><div><div><h2 class="title">
1050-<a name="idp2167168"></a>Queries, Results, Items</h2></div></div></div>
1051+<a name="idp18018752"></a>Queries, Results, Items</h2></div></div></div>
1052 <div class="toc"><dl>
1053 <dt>
1054 <span class="refentrytitle"><a href="HudItem.html">HudItem</a></span><span class="refpurpose"> — a user-interesting item that can be activated</span>
1055
1056=== modified file 'docs/devel/html/ch04.html'
1057--- docs/devel/html/ch04.html 2012-03-28 23:48:15 +0000
1058+++ docs/devel/html/ch04.html 2012-04-05 17:04:38 +0000
1059@@ -21,7 +21,7 @@
1060 </tr></table>
1061 <div class="chapter">
1062 <div class="titlepage"><div><div><h2 class="title">
1063-<a name="idp1749944"></a>Sources</h2></div></div></div>
1064+<a name="idp18867176"></a>Sources</h2></div></div></div>
1065 <div class="toc"><dl>
1066 <dt>
1067 <span class="refentrytitle"><a href="HudSource.html">HudSource</a></span><span class="refpurpose"> — a source of <a href="HudResult.html"><span class="type">HudResults</span></a></span>
1068
1069=== modified file 'docs/devel/html/ch05.html'
1070--- docs/devel/html/ch05.html 2012-03-28 23:48:15 +0000
1071+++ docs/devel/html/ch05.html 2012-04-05 17:04:38 +0000
1072@@ -21,7 +21,7 @@
1073 </tr></table>
1074 <div class="chapter">
1075 <div class="titlepage"><div><div><h2 class="title">
1076-<a name="idp2257336"></a>Utility API</h2></div></div></div>
1077+<a name="idp17865344"></a>Utility API</h2></div></div></div>
1078 <div class="toc"><dl>
1079 <dt>
1080 <span class="refentrytitle"><a href="hud-HudSettings.html">HudSettings</a></span><span class="refpurpose"> — tunable parameters</span>
1081
1082=== modified file 'docs/devel/html/hud-HudSettings.html'
1083--- docs/devel/html/hud-HudSettings.html 2012-03-07 21:16:55 +0000
1084+++ docs/devel/html/hud-HudSettings.html 2012-04-05 17:04:38 +0000
1085@@ -76,12 +76,9 @@
1086 guint max_distance;
1087
1088 guint add_penalty;
1089- guint add_penalty_pre;
1090 guint drop_penalty;
1091- guint drop_penalty_end;
1092- guint transpose_penalty;
1093+ guint end_drop_penalty;
1094 guint swap_penalty;
1095- guint swap_penalty_case;
1096 };
1097 </pre>
1098 <p>
1099@@ -111,37 +108,22 @@
1100 that does not exist in the item being matched</td>
1101 </tr>
1102 <tr>
1103-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.add-penalty-pre"></a>add_penalty_pre</code></em>;</span></p></td>
1104-<td>the penalty incurred by a character in the search
1105-term that does not exist in the item being matched when that
1106-character comes at the beginning of the term</td>
1107-</tr>
1108-<tr>
1109 <td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.drop-penalty"></a>drop_penalty</code></em>;</span></p></td>
1110 <td>the penalty incurred by a character missing from the
1111 search string as compared to the item being matched</td>
1112 </tr>
1113 <tr>
1114-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.drop-penalty-end"></a>drop_penalty_end</code></em>;</span></p></td>
1115+<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.end-drop-penalty"></a>end_drop_penalty</code></em>;</span></p></td>
1116 <td>the penalty incurred by a character missing from
1117 the search string as compared to the item being matched when the
1118 character is at the end of the item (ie: the search term is a
1119 prefix of the item)</td>
1120 </tr>
1121 <tr>
1122-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.transpose-penalty"></a>transpose_penalty</code></em>;</span></p></td>
1123-<td>the penalty incurred for transposed characters</td>
1124-</tr>
1125-<tr>
1126 <td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.swap-penalty"></a>swap_penalty</code></em>;</span></p></td>
1127 <td>the penalty incurred for the substitution of one
1128 character for another</td>
1129 </tr>
1130-<tr>
1131-<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="HudSettings.swap-penalty-case"></a>swap_penalty_case</code></em>;</span></p></td>
1132-<td>the penalty incurred for the substitution of one
1133-character for another when the characters differ only in case</td>
1134-</tr>
1135 </tbody>
1136 </table></div>
1137 </div>
1138
1139=== modified file 'docs/man/hud-cli.1'
1140--- docs/man/hud-cli.1 2012-03-28 23:49:57 +0000
1141+++ docs/man/hud-cli.1 2012-04-05 17:04:38 +0000
1142@@ -2,12 +2,12 @@
1143 .\" Title: hud-cli
1144 .\" Author: [see the "AUTHOR" section]
1145 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
1146-.\" Date: 03/28/2012
1147+.\" Date: 04/05/2012
1148 .\" Manual: User Commands
1149 .\" Source: User Commands
1150 .\" Language: English
1151 .\"
1152-.TH "HUD\-CLI" "1" "03/28/2012" "User Commands" "User Commands"
1153+.TH "HUD\-CLI" "1" "04/05/2012" "User Commands" "User Commands"
1154 .\" -----------------------------------------------------------------
1155 .\" * Define some portability stuff
1156 .\" -----------------------------------------------------------------
1157
1158=== modified file 'docs/man/hud-dump-application.1'
1159--- docs/man/hud-dump-application.1 2012-03-28 23:49:57 +0000
1160+++ docs/man/hud-dump-application.1 2012-04-05 17:04:38 +0000
1161@@ -2,12 +2,12 @@
1162 .\" Title: hud-dump-application
1163 .\" Author: [see the "AUTHOR" section]
1164 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
1165-.\" Date: 03/28/2012
1166+.\" Date: 04/05/2012
1167 .\" Manual: User Commands
1168 .\" Source: User Commands
1169 .\" Language: English
1170 .\"
1171-.TH "HUD\-DUMP\-APPLICATI" "1" "03/28/2012" "User Commands" "User Commands"
1172+.TH "HUD\-DUMP\-APPLICATI" "1" "04/05/2012" "User Commands" "User Commands"
1173 .\" -----------------------------------------------------------------
1174 .\" * Define some portability stuff
1175 .\" -----------------------------------------------------------------
1176
1177=== modified file 'docs/man/hud-list-applications.1'
1178--- docs/man/hud-list-applications.1 2012-03-28 23:49:57 +0000
1179+++ docs/man/hud-list-applications.1 2012-04-05 17:04:38 +0000
1180@@ -2,12 +2,12 @@
1181 .\" Title: hud-list-applications
1182 .\" Author: [see the "AUTHOR" section]
1183 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
1184-.\" Date: 03/28/2012
1185+.\" Date: 04/05/2012
1186 .\" Manual: User Commands
1187 .\" Source: User Commands
1188 .\" Language: English
1189 .\"
1190-.TH "HUD\-LIST\-APPLICATI" "1" "03/28/2012" "User Commands" "User Commands"
1191+.TH "HUD\-LIST\-APPLICATI" "1" "04/05/2012" "User Commands" "User Commands"
1192 .\" -----------------------------------------------------------------
1193 .\" * Define some portability stuff
1194 .\" -----------------------------------------------------------------
1195
1196=== modified file 'docs/man/hud-verify-app-info.1'
1197--- docs/man/hud-verify-app-info.1 2012-03-28 23:49:57 +0000
1198+++ docs/man/hud-verify-app-info.1 2012-04-05 17:04:38 +0000
1199@@ -2,12 +2,12 @@
1200 .\" Title: hud-verify-app-info
1201 .\" Author: [see the "AUTHOR" section]
1202 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
1203-.\" Date: 03/28/2012
1204+.\" Date: 04/05/2012
1205 .\" Manual: User Commands
1206 .\" Source: User Commands
1207 .\" Language: English
1208 .\"
1209-.TH "HUD\-VERIFY\-APP\-IN" "1" "03/28/2012" "User Commands" "User Commands"
1210+.TH "HUD\-VERIFY\-APP\-IN" "1" "04/05/2012" "User Commands" "User Commands"
1211 .\" -----------------------------------------------------------------
1212 .\" * Define some portability stuff
1213 .\" -----------------------------------------------------------------
1214
1215=== modified file 'm4/gcov.m4'
1216--- m4/gcov.m4 2011-12-07 00:25:50 +0000
1217+++ m4/gcov.m4 2012-04-05 17:04:38 +0000
1218@@ -5,11 +5,10 @@
1219 # * gcovr
1220 #
1221 # Sets ac_cv_check_gcov to yes if tooling is present
1222-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
1223+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
1224 AC_DEFUN([AC_TDD_GCOV],
1225-[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov,
1226 [
1227-AC_ARG_ENABLE(gcov,
1228+ AC_ARG_ENABLE(gcov,
1229 AS_HELP_STRING([--enable-gcov],
1230 [enable coverage testing with gcov]),
1231 [use_gcov=$enableval], [use_gcov=no])
1232@@ -34,7 +33,6 @@
1233 lcov_version_list="1.6 1.7 1.8 1.9"
1234 AC_CHECK_PROG(LCOV, lcov, lcov)
1235 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
1236- AC_CHECK_PROG(GCOVR, gcovr, gcovr)
1237
1238 if test "$LCOV"; then
1239 AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
1240@@ -63,10 +61,8 @@
1241 AC_MSG_ERROR([Could not find genhtml from the lcov package])
1242 fi
1243
1244- if test -z "$GCOVR"; then
1245- AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
1246- fi
1247-
1248+ ac_cv_check_gcov=yes
1249+ ac_cv_check_lcov=yes
1250
1251 # Remove all optimization flags from CFLAGS
1252 changequote({,})
1253@@ -78,6 +74,13 @@
1254 COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
1255 COVERAGE_LDFLAGS="-lgcov"
1256
1257+ # Check availability of gcovr
1258+ AC_CHECK_PROG(GCOVR, gcovr, gcovr)
1259+ if test -z "$GCOVR"; then
1260+ ac_cv_check_gcovr=no
1261+ else
1262+ ac_cv_check_gcovr=yes
1263+ fi
1264+
1265 fi
1266-])]) # AC_TDD_GCOV
1267-
1268+]) # AC_TDD_GCOV
1269
1270=== modified file 'src/Makefile.in'
1271--- src/Makefile.in 2012-03-21 18:36:17 +0000
1272+++ src/Makefile.in 2012-04-05 17:04:38 +0000
1273@@ -93,7 +93,6 @@
1274 libhud_service_a_AR = $(AR) $(ARFLAGS)
1275 libhud_service_a_LIBADD =
1276 am_libhud_service_a_OBJECTS = libhud_service_a-create-db.$(OBJEXT) \
1277- libhud_service_a-distance.$(OBJEXT) \
1278 libhud_service_a-dump-app-info.$(OBJEXT) \
1279 libhud_service_a-hudsettings.$(OBJEXT) \
1280 libhud_service_a-hudappmenuregistrar.$(OBJEXT) \
1281@@ -105,6 +104,7 @@
1282 libhud_service_a-huddebugsource.$(OBJEXT) \
1283 libhud_service_a-hudsourcelist.$(OBJEXT) \
1284 libhud_service_a-hudsource.$(OBJEXT) \
1285+ libhud_service_a-hudtoken.$(OBJEXT) \
1286 libhud_service_a-hudquery.$(OBJEXT) \
1287 libhud_service_a-hudstringlist.$(OBJEXT) \
1288 libhud_service_a-huditem.$(OBJEXT) \
1289@@ -497,8 +497,6 @@
1290 libhud_service_a_SOURCES = \
1291 create-db.h \
1292 create-db.c \
1293- distance.h \
1294- distance.c \
1295 dump-app-info.h \
1296 dump-app-info.c \
1297 shared-values.h \
1298@@ -522,6 +520,8 @@
1299 hudsourcelist.c \
1300 hudsource.h \
1301 hudsource.c \
1302+ hudtoken.h \
1303+ hudtoken.c \
1304 hudquery.h \
1305 hudquery.c \
1306 hudstringlist.h \
1307@@ -844,7 +844,6 @@
1308 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappmenu_la-window-menu-model.Plo@am__quote@
1309 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappmenu_la-window-menu.Plo@am__quote@
1310 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-create-db.Po@am__quote@
1311-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-distance.Po@am__quote@
1312 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-dump-app-info.Po@am__quote@
1313 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hud.interface.Po@am__quote@
1314 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudappindicatorsource.Po@am__quote@
1315@@ -860,6 +859,7 @@
1316 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudsource.Po@am__quote@
1317 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudsourcelist.Po@am__quote@
1318 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudstringlist.Po@am__quote@
1319+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudtoken.Po@am__quote@
1320 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-hudwindowsource.Po@am__quote@
1321 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-load-app-info.Po@am__quote@
1322 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhud_service_a-usage-tracker.Po@am__quote@
1323@@ -902,20 +902,6 @@
1324 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1325 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-create-db.obj `if test -f 'create-db.c'; then $(CYGPATH_W) 'create-db.c'; else $(CYGPATH_W) '$(srcdir)/create-db.c'; fi`
1326
1327-libhud_service_a-distance.o: distance.c
1328-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-distance.o -MD -MP -MF $(DEPDIR)/libhud_service_a-distance.Tpo -c -o libhud_service_a-distance.o `test -f 'distance.c' || echo '$(srcdir)/'`distance.c
1329-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-distance.Tpo $(DEPDIR)/libhud_service_a-distance.Po
1330-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='distance.c' object='libhud_service_a-distance.o' libtool=no @AMDEPBACKSLASH@
1331-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1332-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-distance.o `test -f 'distance.c' || echo '$(srcdir)/'`distance.c
1333-
1334-libhud_service_a-distance.obj: distance.c
1335-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-distance.obj -MD -MP -MF $(DEPDIR)/libhud_service_a-distance.Tpo -c -o libhud_service_a-distance.obj `if test -f 'distance.c'; then $(CYGPATH_W) 'distance.c'; else $(CYGPATH_W) '$(srcdir)/distance.c'; fi`
1336-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-distance.Tpo $(DEPDIR)/libhud_service_a-distance.Po
1337-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='distance.c' object='libhud_service_a-distance.obj' libtool=no @AMDEPBACKSLASH@
1338-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1339-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-distance.obj `if test -f 'distance.c'; then $(CYGPATH_W) 'distance.c'; else $(CYGPATH_W) '$(srcdir)/distance.c'; fi`
1340-
1341 libhud_service_a-dump-app-info.o: dump-app-info.c
1342 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-dump-app-info.o -MD -MP -MF $(DEPDIR)/libhud_service_a-dump-app-info.Tpo -c -o libhud_service_a-dump-app-info.o `test -f 'dump-app-info.c' || echo '$(srcdir)/'`dump-app-info.c
1343 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-dump-app-info.Tpo $(DEPDIR)/libhud_service_a-dump-app-info.Po
1344@@ -1070,6 +1056,20 @@
1345 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1346 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-hudsource.obj `if test -f 'hudsource.c'; then $(CYGPATH_W) 'hudsource.c'; else $(CYGPATH_W) '$(srcdir)/hudsource.c'; fi`
1347
1348+libhud_service_a-hudtoken.o: hudtoken.c
1349+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-hudtoken.o -MD -MP -MF $(DEPDIR)/libhud_service_a-hudtoken.Tpo -c -o libhud_service_a-hudtoken.o `test -f 'hudtoken.c' || echo '$(srcdir)/'`hudtoken.c
1350+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-hudtoken.Tpo $(DEPDIR)/libhud_service_a-hudtoken.Po
1351+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hudtoken.c' object='libhud_service_a-hudtoken.o' libtool=no @AMDEPBACKSLASH@
1352+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1353+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-hudtoken.o `test -f 'hudtoken.c' || echo '$(srcdir)/'`hudtoken.c
1354+
1355+libhud_service_a-hudtoken.obj: hudtoken.c
1356+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-hudtoken.obj -MD -MP -MF $(DEPDIR)/libhud_service_a-hudtoken.Tpo -c -o libhud_service_a-hudtoken.obj `if test -f 'hudtoken.c'; then $(CYGPATH_W) 'hudtoken.c'; else $(CYGPATH_W) '$(srcdir)/hudtoken.c'; fi`
1357+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-hudtoken.Tpo $(DEPDIR)/libhud_service_a-hudtoken.Po
1358+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hudtoken.c' object='libhud_service_a-hudtoken.obj' libtool=no @AMDEPBACKSLASH@
1359+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1360+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -c -o libhud_service_a-hudtoken.obj `if test -f 'hudtoken.c'; then $(CYGPATH_W) 'hudtoken.c'; else $(CYGPATH_W) '$(srcdir)/hudtoken.c'; fi`
1361+
1362 libhud_service_a-hudquery.o: hudquery.c
1363 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhud_service_a_CFLAGS) $(CFLAGS) -MT libhud_service_a-hudquery.o -MD -MP -MF $(DEPDIR)/libhud_service_a-hudquery.Tpo -c -o libhud_service_a-hudquery.o `test -f 'hudquery.c' || echo '$(srcdir)/'`hudquery.c
1364 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhud_service_a-hudquery.Tpo $(DEPDIR)/libhud_service_a-hudquery.Po
1365
1366=== modified file 'src/hudquery.c'
1367--- src/hudquery.c 2012-03-30 13:32:40 +0000
1368+++ src/hudquery.c 2012-04-05 17:04:38 +0000
1369@@ -107,7 +107,7 @@
1370
1371 g_ptr_array_set_size (query->results, 0);
1372
1373- if (query->search_string[0] != '\0')
1374+ if (hud_token_list_get_length (query->token_list) != 0)
1375 hud_source_search (query->source, query->results, query->token_list);
1376
1377 g_ptr_array_foreach (query->results, hud_query_find_max_usage, &max_usage);
1378
1379=== modified file 'src/hudtoken.c'
1380--- src/hudtoken.c 2012-04-03 00:29:19 +0000
1381+++ src/hudtoken.c 2012-04-05 17:04:38 +0000
1382@@ -392,3 +392,9 @@
1383
1384 return d[needle->length - 1][haystack->length - 1];
1385 }
1386+
1387+guint
1388+hud_token_list_get_length (HudTokenList *list)
1389+{
1390+ return list->length;
1391+}
1392
1393=== modified file 'src/hudtoken.h'
1394--- src/hudtoken.h 2012-03-31 03:54:13 +0000
1395+++ src/hudtoken.h 2012-04-05 17:04:38 +0000
1396@@ -32,6 +32,7 @@
1397
1398 HudTokenList * hud_token_list_new_from_string (const gchar *string);
1399 HudTokenList * hud_token_list_new_from_string_list (HudStringList *string_list);
1400+guint hud_token_list_get_length (HudTokenList *list);
1401 void hud_token_list_free (HudTokenList *list);
1402 guint hud_token_list_distance (HudTokenList *haystack,
1403 HudTokenList *needle,
1404
1405=== modified file 'src/indicator-appmenu.c'
1406--- src/indicator-appmenu.c 2012-03-28 23:49:57 +0000
1407+++ src/indicator-appmenu.c 2012-04-05 17:04:38 +0000
1408@@ -1240,6 +1240,8 @@
1409 /* If it's a desktop window remove it from that table as well */
1410 g_hash_table_remove(iapp->desktop_windows, GUINT_TO_POINTER(windowid));
1411
1412+ emit_signal(iapp, "WindowUnregistered", g_variant_new ("(u)", windowid));
1413+
1414 /* Now let's see if we've got a WM object for it then
1415 we need to mark it as destroyed and unreference to
1416 actually destroy it. */
1417
1418=== modified file 'tests/Makefile.in'
1419--- tests/Makefile.in 2012-03-28 23:49:57 +0000
1420+++ tests/Makefile.in 2012-04-05 17:04:38 +0000
1421@@ -36,7 +36,7 @@
1422 check_PROGRAMS = test-distance$(EXEEXT) test-usage-db-simple$(EXEEXT) \
1423 test-usage-db-old$(EXEEXT) test-usage-db-ancient$(EXEEXT) \
1424 test-usage-db-testapp$(EXEEXT) test-bad-app-info$(EXEEXT) \
1425- test-load-app-info$(EXEEXT)
1426+ test-load-app-info$(EXEEXT) hud-performance$(EXEEXT)
1427 XFAIL_TESTS =
1428 subdir = tests
1429 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
1430@@ -57,15 +57,24 @@
1431 CONFIG_HEADER = $(top_builddir)/config.h
1432 CONFIG_CLEAN_FILES =
1433 CONFIG_CLEAN_VPATH_FILES =
1434+am_hud_performance_OBJECTS = \
1435+ hud_performance-hud-performance.$(OBJEXT)
1436+hud_performance_OBJECTS = $(am_hud_performance_OBJECTS)
1437+am__DEPENDENCIES_1 =
1438+hud_performance_DEPENDENCIES = ../src/libhud-service.a \
1439+ $(am__DEPENDENCIES_1)
1440+AM_V_lt = $(am__v_lt_@AM_V@)
1441+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
1442+am__v_lt_0 = --silent
1443+hud_performance_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
1444+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
1445+ $(hud_performance_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
1446+ -o $@
1447 am_test_bad_app_info_OBJECTS = \
1448 test_bad_app_info-test-bad-app-info.$(OBJEXT)
1449 test_bad_app_info_OBJECTS = $(am_test_bad_app_info_OBJECTS)
1450-am__DEPENDENCIES_1 =
1451 test_bad_app_info_DEPENDENCIES = ../src/libhud-service.a \
1452 $(am__DEPENDENCIES_1)
1453-AM_V_lt = $(am__v_lt_@AM_V@)
1454-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
1455-am__v_lt_0 = --silent
1456 test_bad_app_info_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
1457 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
1458 $(test_bad_app_info_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
1459@@ -148,13 +157,15 @@
1460 AM_V_GEN = $(am__v_GEN_@AM_V@)
1461 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
1462 am__v_GEN_0 = @echo " GEN " $@;
1463-SOURCES = $(test_bad_app_info_SOURCES) $(test_distance_SOURCES) \
1464- $(test_load_app_info_SOURCES) $(test_usage_db_ancient_SOURCES) \
1465- $(test_usage_db_old_SOURCES) $(test_usage_db_simple_SOURCES) \
1466+SOURCES = $(hud_performance_SOURCES) $(test_bad_app_info_SOURCES) \
1467+ $(test_distance_SOURCES) $(test_load_app_info_SOURCES) \
1468+ $(test_usage_db_ancient_SOURCES) $(test_usage_db_old_SOURCES) \
1469+ $(test_usage_db_simple_SOURCES) \
1470 $(test_usage_db_testapp_SOURCES)
1471-DIST_SOURCES = $(test_bad_app_info_SOURCES) $(test_distance_SOURCES) \
1472- $(test_load_app_info_SOURCES) $(test_usage_db_ancient_SOURCES) \
1473- $(test_usage_db_old_SOURCES) $(test_usage_db_simple_SOURCES) \
1474+DIST_SOURCES = $(hud_performance_SOURCES) $(test_bad_app_info_SOURCES) \
1475+ $(test_distance_SOURCES) $(test_load_app_info_SOURCES) \
1476+ $(test_usage_db_ancient_SOURCES) $(test_usage_db_old_SOURCES) \
1477+ $(test_usage_db_simple_SOURCES) \
1478 $(test_usage_db_testapp_SOURCES)
1479 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
1480 html-recursive info-recursive install-data-recursive \
1481@@ -559,6 +570,19 @@
1482 ../src/libhud-service.a \
1483 $(HUD_LIBS)
1484
1485+hud_performance_CFLAGS = \
1486+ -I$(top_builddir)/src \
1487+ -I$(top_srcdir)/src \
1488+ $(HUD_CFLAGS)
1489+
1490+hud_performance_LDADD = \
1491+ ../src/libhud-service.a \
1492+ $(HUD_LIBS)
1493+
1494+hud_performance_SOURCES = \
1495+ hud-performance.c \
1496+ word-list.h
1497+
1498 all: all-recursive
1499
1500 .SUFFIXES:
1501@@ -602,6 +626,9 @@
1502 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
1503 echo " rm -f" $$list; \
1504 rm -f $$list
1505+hud-performance$(EXEEXT): $(hud_performance_OBJECTS) $(hud_performance_DEPENDENCIES) $(EXTRA_hud_performance_DEPENDENCIES)
1506+ @rm -f hud-performance$(EXEEXT)
1507+ $(AM_V_CCLD)$(hud_performance_LINK) $(hud_performance_OBJECTS) $(hud_performance_LDADD) $(LIBS)
1508 test-bad-app-info$(EXEEXT): $(test_bad_app_info_OBJECTS) $(test_bad_app_info_DEPENDENCIES) $(EXTRA_test_bad_app_info_DEPENDENCIES)
1509 @rm -f test-bad-app-info$(EXEEXT)
1510 $(AM_V_CCLD)$(test_bad_app_info_LINK) $(test_bad_app_info_OBJECTS) $(test_bad_app_info_LDADD) $(LIBS)
1511@@ -630,6 +657,7 @@
1512 distclean-compile:
1513 -rm -f *.tab.c
1514
1515+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hud_performance-hud-performance.Po@am__quote@
1516 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bad_app_info-test-bad-app-info.Po@am__quote@
1517 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_distance-test-distance.Po@am__quote@
1518 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_load_app_info-test-load-app-info.Po@am__quote@
1519@@ -662,6 +690,20 @@
1520 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1521 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
1522
1523+hud_performance-hud-performance.o: hud-performance.c
1524+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hud_performance_CFLAGS) $(CFLAGS) -MT hud_performance-hud-performance.o -MD -MP -MF $(DEPDIR)/hud_performance-hud-performance.Tpo -c -o hud_performance-hud-performance.o `test -f 'hud-performance.c' || echo '$(srcdir)/'`hud-performance.c
1525+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hud_performance-hud-performance.Tpo $(DEPDIR)/hud_performance-hud-performance.Po
1526+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hud-performance.c' object='hud_performance-hud-performance.o' libtool=no @AMDEPBACKSLASH@
1527+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1528+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hud_performance_CFLAGS) $(CFLAGS) -c -o hud_performance-hud-performance.o `test -f 'hud-performance.c' || echo '$(srcdir)/'`hud-performance.c
1529+
1530+hud_performance-hud-performance.obj: hud-performance.c
1531+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hud_performance_CFLAGS) $(CFLAGS) -MT hud_performance-hud-performance.obj -MD -MP -MF $(DEPDIR)/hud_performance-hud-performance.Tpo -c -o hud_performance-hud-performance.obj `if test -f 'hud-performance.c'; then $(CYGPATH_W) 'hud-performance.c'; else $(CYGPATH_W) '$(srcdir)/hud-performance.c'; fi`
1532+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hud_performance-hud-performance.Tpo $(DEPDIR)/hud_performance-hud-performance.Po
1533+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hud-performance.c' object='hud_performance-hud-performance.obj' libtool=no @AMDEPBACKSLASH@
1534+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1535+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hud_performance_CFLAGS) $(CFLAGS) -c -o hud_performance-hud-performance.obj `if test -f 'hud-performance.c'; then $(CYGPATH_W) 'hud-performance.c'; else $(CYGPATH_W) '$(srcdir)/hud-performance.c'; fi`
1536+
1537 test_bad_app_info-test-bad-app-info.o: test-bad-app-info.c
1538 @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_bad_app_info_CFLAGS) $(CFLAGS) -MT test_bad_app_info-test-bad-app-info.o -MD -MP -MF $(DEPDIR)/test_bad_app_info-test-bad-app-info.Tpo -c -o test_bad_app_info-test-bad-app-info.o `test -f 'test-bad-app-info.c' || echo '$(srcdir)/'`test-bad-app-info.c
1539 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_bad_app_info-test-bad-app-info.Tpo $(DEPDIR)/test_bad_app_info-test-bad-app-info.Po
1540
1541=== modified file 'tests/test-dbus-message-count.in'
1542--- tests/test-dbus-message-count.in 2012-03-27 16:38:41 +0000
1543+++ tests/test-dbus-message-count.in 2012-04-05 17:04:38 +0000
1544@@ -11,7 +11,7 @@
1545 --task /usr/lib/bamf/bamfdaemon --task-name bamf \
1546 --task @top_builddir@/src/hud-service --task-name hud --wait-for org.ayatana.bamf \
1547 --task /usr/lib/libindicator/indicator-loader3 --parameter @top_builddir@/src/.libs/libappmenu.so --task-name appmenu --wait-for org.ayatana.bamf \
1548- --task /usr/lib/indicator-appmenu/mock-json-app --parameter @srcdir@/test-dbus-message-count.json --wait-for com.canonical.AppMenu.Registrar --task-name app \
1549+ --task @top_builddir@/tools/mock-json-app --parameter @srcdir@/test-dbus-message-count.json --wait-for com.canonical.AppMenu.Registrar --task-name app \
1550 --task @srcdir@/test-dbus-message-count-send-query --wait-for com.canonical.AppMenu.Registrar --task-name query
1551
1552 sleep 1
1553
1554=== modified file 'tools-vala/hud-gtk.c'
1555--- tools-vala/hud-gtk.c 2012-03-28 23:48:15 +0000
1556+++ tools-vala/hud-gtk.c 2012-04-05 17:04:38 +0000
1557@@ -1,4 +1,4 @@
1558-/* hud-gtk.c generated by valac 0.15.2, the Vala compiler
1559+/* hud-gtk.c generated by valac 0.16.0, the Vala compiler
1560 * generated from hud-gtk.vala, do not modify */
1561
1562

Subscribers

People subscribed via source and target branches