Merge lp:~didrocks/bamf/rev into lp:bamf/0.3

Proposed by Didier Roche on 2012-11-13
Status: Rejected
Rejected by: Didier Roche on 2012-11-13
Proposed branch: lp:~didrocks/bamf/rev
Merge into: lp:bamf/0.3
Diff against target: 1896 lines (+1278/-137)
39 files modified
.bzr-builddeb/default.conf (+2/-0)
INSTALL (+2/-0)
autogen.sh (+1/-1)
config.h.in (+0/-71)
configure.ac (+2/-2)
data/Makefile.am (+1/-1)
data/org.ayatana.bamf.service.in (+1/-1)
debian/bamfdaemon.install (+2/-0)
debian/bamfdaemon.postinst (+15/-0)
debian/bamfdaemon.postrm (+8/-0)
debian/bamfdaemon.triggers (+2/-0)
debian/changelog (+677/-0)
debian/compat (+1/-0)
debian/control (+142/-0)
debian/copyright (+50/-0)
debian/gir1.2-bamf-0.2.install (+1/-0)
debian/libbamf-dev.install (+5/-0)
debian/libbamf-doc.install (+1/-0)
debian/libbamf0.install (+1/-0)
debian/libbamf0.symbols (+77/-0)
debian/libbamf3-0.install (+1/-0)
debian/libbamf3-0.symbols (+77/-0)
debian/libbamf3-dev.install (+5/-0)
debian/rules (+47/-0)
debian/sources/format (+1/-0)
debian/watch (+2/-0)
lib/libbamf/bamf-view.c (+27/-11)
lib/libbamf/bamf-view.h (+3/-0)
src/Makefile.am (+1/-1)
src/bamf-legacy-window-test.c (+11/-1)
src/bamf-legacy-window-test.h (+1/-0)
src/bamf-legacy-window.c (+11/-9)
src/bamf-legacy-window.h (+1/-0)
src/bamf-matcher.c (+42/-35)
src/bamf-matcher.h (+1/-1)
src/bamf-view.c (+4/-1)
tests/bamfdaemon/test-matcher.c (+48/-0)
tests/functional/alt-tabber.c (+2/-2)
tests/libbamf/test-libbamf.c (+2/-0)
To merge this branch: bzr merge lp:~didrocks/bamf/rev
Reviewer Review Type Date Requested Status
Unity Team 2012-11-13 Pending
Review via email: mp+134052@code.launchpad.net

Commit Message

Releasing 0.0.0 to ubuntu

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Francis. When I autoapprove this branch, I get:
Approved revision: "not available". Can we have a special case in jenkins for it (commit message with "Releasing .* to ubuntu" and no approved revision)?

Timo Jyrinki (timo-jyrinki) wrote :

Hmm should this be against lp:bamf instead of quantal branch 0.3?

Unmerged revisions

499. By Didier Roche on 2012-11-13

commit de test

498. By Didier Roche on 2012-11-13

dummy commit

497. By Rico Tzschichholz on 2012-11-12

tests: Don't call g_type_init while building against glib >= 2.35. Approved by Marco Trevisan (Treviño).

496. By Rico Tzschichholz on 2012-11-12

libbamf: add bamf_view_is_user_visible ()

This makes the gir/vala api nicer and avoids a conlict with the property.
Mark bamf_view_user_visible as deprecated using glib 2.32 macro. Approved by Marco Trevisan (Treviño).

495. By Michael Terry on 2012-11-08

Switch debian/ to debhelper 9 and other small build modernizations. Approved by Didier Roche, Stephen M. Webb.

494. By Didier Roche on 2012-11-07

Bring debian/ packaging inline, build with dh-autoregen, and update the debian symbols files.. Approved by Francis Ginther, Marco Trevisan (Treviño), Didier Roche.

493. By Marco Trevisan (Treviño) on 2012-10-17

BamfMatcher: always associate children windows to the parent application. Approved by Brandon Schaefer.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2012-11-13 09:37:25 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'INSTALL'
10--- INSTALL 2009-07-20 21:28:01 +0000
11+++ INSTALL 2012-11-13 09:37:25 +0000
12@@ -289,3 +289,5 @@
13 `configure' also accepts some other, not widely useful, options. Run
14 `configure --help' for more details.
15
16+
17+
18
19=== modified file 'autogen.sh'
20--- autogen.sh 2010-04-23 15:19:12 +0000
21+++ autogen.sh 2012-11-13 09:37:25 +0000
22@@ -10,7 +10,7 @@
23 REQUIRED_MACROS="python.m4"
24 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
25
26-(test -f $srcdir/configure.in) || {
27+(test -f $srcdir/configure.ac) || {
28 echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
29 echo " top-level $PKG_NAME directory"
30 exit 1
31
32=== removed file 'config.h.in'
33--- config.h.in 2012-11-05 10:23:27 +0000
34+++ config.h.in 1970-01-01 00:00:00 +0000
35@@ -1,71 +0,0 @@
36-/* config.h.in. Generated from configure.in by autoheader. */
37-
38-/* Define to 1 if you have the <dlfcn.h> header file. */
39-#undef HAVE_DLFCN_H
40-
41-/* Define to 1 if you have the <inttypes.h> header file. */
42-#undef HAVE_INTTYPES_H
43-
44-/* Define to 1 if you have the <memory.h> header file. */
45-#undef HAVE_MEMORY_H
46-
47-/* Define to 1 if you have the <stdint.h> header file. */
48-#undef HAVE_STDINT_H
49-
50-/* Define to 1 if you have the <stdlib.h> header file. */
51-#undef HAVE_STDLIB_H
52-
53-/* Define to 1 if you have the <strings.h> header file. */
54-#undef HAVE_STRINGS_H
55-
56-/* Define to 1 if you have the <string.h> header file. */
57-#undef HAVE_STRING_H
58-
59-/* Define to 1 if you have the <sys/stat.h> header file. */
60-#undef HAVE_SYS_STAT_H
61-
62-/* Define to 1 if you have the <sys/types.h> header file. */
63-#undef HAVE_SYS_TYPES_H
64-
65-/* Define to 1 if you have the <unistd.h> header file. */
66-#undef HAVE_UNISTD_H
67-
68-/* Use libunity-webapps */
69-#undef HAVE_WEBAPPS
70-
71-/* Define to the sub-directory in which libtool stores uninstalled libraries.
72- */
73-#undef LT_OBJDIR
74-
75-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
76-#undef NO_MINUS_C_MINUS_O
77-
78-/* Name of package */
79-#undef PACKAGE
80-
81-/* Define to the address where bug reports for this package should be sent. */
82-#undef PACKAGE_BUGREPORT
83-
84-/* Define to the full name of this package. */
85-#undef PACKAGE_NAME
86-
87-/* Define to the full name and version of this package. */
88-#undef PACKAGE_STRING
89-
90-/* Define to the one symbol short name of this package. */
91-#undef PACKAGE_TARNAME
92-
93-/* Define to the home page for this package. */
94-#undef PACKAGE_URL
95-
96-/* Define to the version of this package. */
97-#undef PACKAGE_VERSION
98-
99-/* Define to 1 if you have the ANSI C header files. */
100-#undef STDC_HEADERS
101-
102-/* Use GTK3 */
103-#undef USE_GTK3
104-
105-/* Version number of package */
106-#undef VERSION
107
108=== renamed file 'configure.in' => 'configure.ac'
109--- configure.in 2012-11-05 10:23:27 +0000
110+++ configure.ac 2012-11-13 09:37:25 +0000
111@@ -2,7 +2,7 @@
112 # Process this file with autoconf to produce a configure script.
113
114 AC_PREREQ([2.63])
115-AC_INIT(bamf, 0.3.4, dx-team@canonical.com)
116+AC_INIT(bamf, 0.3.2, dx-team@canonical.com)
117 AC_PREREQ(2.62)
118
119 AC_CONFIG_SRCDIR(src/main.c)
120@@ -57,7 +57,7 @@
121 #
122 # glib
123 #
124-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
125+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
126
127 #
128 # gdbus-codegen
129
130=== modified file 'data/Makefile.am'
131--- data/Makefile.am 2012-07-01 18:12:17 +0000
132+++ data/Makefile.am 2012-11-13 09:37:25 +0000
133@@ -4,6 +4,6 @@
134 EXTRA_DIST=org.ayatana.bamf.service.in
135
136 org.ayatana.bamf.service: org.ayatana.bamf.service.in
137- $(AM_V_GEN)sed "s,@LIBEXECDIR@,$(libexecdir)," $< > $@
138+ $(AM_V_GEN)sed "s,@PKGLIBEXECDIR@,$(pkglibexecdir)," $< > $@
139
140 CLEANFILES = org.ayatana.bamf.service
141
142=== modified file 'data/org.ayatana.bamf.service.in'
143--- data/org.ayatana.bamf.service.in 2010-04-23 15:19:12 +0000
144+++ data/org.ayatana.bamf.service.in 2012-11-13 09:37:25 +0000
145@@ -1,3 +1,3 @@
146 [D-BUS Service]
147 Name=org.ayatana.bamf
148-Exec=@LIBEXECDIR@/bamfdaemon
149+Exec=@PKGLIBEXECDIR@/bamfdaemon
150
151=== added directory 'debian'
152=== added file 'debian/bamfdaemon.install'
153--- debian/bamfdaemon.install 1970-01-01 00:00:00 +0000
154+++ debian/bamfdaemon.install 2012-11-13 09:37:25 +0000
155@@ -0,0 +1,2 @@
156+debian/tmp/usr/lib/*/bamf
157+debian/tmp/usr/share/dbus-1/services/
158
159=== added file 'debian/bamfdaemon.postinst'
160--- debian/bamfdaemon.postinst 1970-01-01 00:00:00 +0000
161+++ debian/bamfdaemon.postinst 2012-11-13 09:37:25 +0000
162@@ -0,0 +1,15 @@
163+#! /bin/sh
164+set -e
165+
166+if [ "$1" = "configure" ] || [ "$1" = "triggered" ]; then
167+ if [ -d /usr/share/applications ]; then
168+ # rebuild index
169+ I=/usr/share/applications/bamf.index
170+ echo "Rebuilding $I..."
171+ rm -f $I
172+ perl -e 'use File::Find; my $dir_name; sub strip_exec { my $f = $_; return unless $f =~ /\.desktop$/; return unless ("$File::Find::dir" eq "$dir_name"); my @lines; open F, $f; @lines = <F>; close F; my $in_desktop_entry = 0; foreach (@lines) { if (/^\[\s*(.+)\s*\]/) { $in_desktop_entry = ($1 eq "Desktop Entry"); } if (/^Exec=(.+)$/ && $in_desktop_entry) { print "$f\t$1\n"; } } }; $dir_name = $ARGV[-1]; $dir_name = $1 if($dir_name=~/(.*)\/$/); find(\&strip_exec, $dir_name);' /usr/share/applications > $I.new || rm -f $I.new
173+ [ -e $I.new ] && mv $I.new $I || true
174+ fi
175+fi
176+
177+#DEBHELPER#
178
179=== added file 'debian/bamfdaemon.postrm'
180--- debian/bamfdaemon.postrm 1970-01-01 00:00:00 +0000
181+++ debian/bamfdaemon.postrm 2012-11-13 09:37:25 +0000
182@@ -0,0 +1,8 @@
183+#! /bin/sh
184+set -e
185+
186+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
187+ rm -f /usr/share/applications/bamf.index
188+fi
189+
190+#DEBHELPER#
191
192=== added file 'debian/bamfdaemon.triggers'
193--- debian/bamfdaemon.triggers 1970-01-01 00:00:00 +0000
194+++ debian/bamfdaemon.triggers 2012-11-13 09:37:25 +0000
195@@ -0,0 +1,2 @@
196+interest /usr/share/applications
197+interest gmenucache
198
199=== added file 'debian/changelog'
200--- debian/changelog 1970-01-01 00:00:00 +0000
201+++ debian/changelog 2012-11-13 09:37:25 +0000
202@@ -0,0 +1,677 @@
203+bamf (0.3.4-0ubuntu2) UNRELEASED; urgency=low
204+
205+ * debian/control:
206+ - Update Bzr-Vcs
207+ - Build-Depend on dh-autoreconf
208+ - Bump needed debhelper to 9 and add some Build-Depends for tests
209+ * debian/rules:
210+ - Call dh_autoreconf
211+ - Switch to dh9, thereby enabling tests
212+
213+ -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 14:39:47 -0500
214+
215+bamf (0.3.4-0ubuntu1) quantal-proposed; urgency=low
216+
217+ [ Timo Jyrinki ]
218+ * New upstream release.
219+ - Autoconf: Make libunity-webapps an optional dependency (on by default)
220+ - Libbamf: Some signal, type and annotation fixes
221+ - libbamf: gir-annotion fixes and make gi-scanner verbose
222+ - Autoconf: Exclude generated sources from tarball and fix "make
223+ distcheck".
224+ - BamfMatcher: add support for libreoffice Base, and libreoffice matching
225+ tests (LP: #1063862)
226+
227+ [ Didier Roche ]
228+ * debian/bamfdaemon.postinst:
229+ - Fix bamf.index perl script generation to fix UOA g-c-c panel associated
230+ with empathy. (LP: #1045223)
231+
232+ -- Didier Roche <didrocks@ubuntu.com> Wed, 17 Oct 2012 07:49:01 +0200
233+
234+bamf (0.3.2-0ubuntu1) quantal-proposed; urgency=low
235+
236+ [ Łukasz 'sil2100' Zemczak ]
237+ * New upstream release.
238+ - bamfdaemon crashes in bamf_application_get_supported_mime_types
239+ (LP: #1058260)
240+ - Webapps close prematurely (LP: #1051042)
241+ - Broken UI and no window management (LP: #1053288)
242+
243+ [ Timo Jyrinki ]
244+ * Cherry-pick LibreOffice fix (LP: #1026426)
245+
246+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Mon, 01 Oct 2012 16:05:32 +0200
247+
248+bamf (0.3.0-0ubuntu2) quantal-proposed; urgency=low
249+
250+ * rebuild against libunity-webapps 2.3.3
251+
252+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 19 Sep 2012 12:32:09 -0400
253+
254+bamf (0.3.0-0ubuntu1) quantal-proposed; urgency=low
255+
256+ * Note that while technically that update breaks compatibility by
257+ dropping some public functions the corresponding code never worked and
258+ it has been verified those were not used by any rdepends.
259+ * debian/control:
260+ - Build-Depends on libunity-webapps-dev to prepare the landing of the
261+ branch using it
262+ * debian/libbamf3-0.symbols:
263+ - updated as well
264+
265+ [ Łukasz 'sil2100' Zemczak ]
266+ * New upstream release.
267+ - added webapps support
268+ * debian/libbamf0.symbols:
269+ - updated symbol file, removed some broken methods
270+
271+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 31 Aug 2012 21:59:04 +0200
272+
273+bamf (0.2.122-0ubuntu1) quantal-proposed; urgency=low
274+
275+ * New upstream release.
276+ - Type mismatch in libbamf bamf_control_register_application_for_pid()
277+ and dbus interface (LP: #1021143)
278+ - running applications without an icon use a blank icon (LP: #886778)
279+
280+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Fri, 10 Aug 2012 12:18:02 +0200
281+
282+bamf (0.2.120-0ubuntu1) quantal; urgency=low
283+
284+ [ Łukasz 'sil2100' Zemczak ]
285+ * New upstream release.
286+ - Started applications pinned to the launcher are not set as running
287+ (LP: #976642)
288+ - sometimes icons get dropped from the launcher when they should not
289+ (LP: #925421)
290+ * debian/libbamf0.symbols, debian/libbamf3-0.symbols:
291+ - removed symbols that were wrongly exported upstream before (private
292+ symbols)
293+
294+ -- Didier Roche <didrocks@ubuntu.com> Tue, 10 Jul 2012 08:41:32 +0200
295+
296+bamf (0.2.118-1ubuntu1) quantal; urgency=low
297+
298+ * Sync from debian. No more difference.
299+ * Cherry-pick from upstream:
300+ - Started applications pinned to the launcher are not set as running
301+ (LP: #976642)
302+ - sometimes icons get dropped from the launcher when they should not
303+ (LP: #925421)
304+ * debian/*symbols:
305+ - add new private symbol (will not be exported after next release)
306+ * debian/control:
307+ - change packaging location to canonical branch (lp:ubuntu/bamf)
308+
309+ -- Didier Roche <didrocks@ubuntu.com> Mon, 25 Jun 2012 11:01:57 +0200
310+
311+bamf (0.2.118-1) unstable; urgency=low
312+
313+ * Backport latest release to debian
314+ * debian/control:
315+ - bump Standards-Version to latest
316+ - remove build-dep only used for unit tests
317+ - replace the gtk2 variant of the wnck introspection gir package with
318+ gtk3 one
319+ - ensure the gtk2/gtk3 version doesn't have the same description
320+ * debian/*.symbols:
321+ - adding some PRIVATE symbols to make lintian happy. We saw that bamf
322+ is exporting by error some of its private symbols. This will be fixed
323+ in next released (and so the symbols will be removed from the .symbols
324+ files)
325+ * debian/rules:
326+ - add hardening flags (thanks Andrea)
327+ * debian/sources/format:
328+ - added to specify we use format 1.0
329+
330+ -- Didier Roche <didrocks@ubuntu.com> Fri, 01 Jun 2012 11:51:11 +0200
331+
332+bamf (0.2.118-0ubuntu1) quantal; urgency=low
333+
334+ [ Didier Roche ]
335+ * New upstream release. (0.2.116)
336+ - multiple instances or double icons of application detected on bamfdaemon
337+ respawn (LP: #928912)
338+ - unity confused with chrome/chromium web apps (LP: #692462)
339+ - BamfView's dispose() method doesn't invoke the superclass' dispose()
340+ (LP: #986888)
341+ * debian/control:
342+ - remove Multi-Arch: same for the -dbg package
343+ (Closes: #669980, #658057)
344+
345+ [ Alan Pope ]
346+ * New upstream release.
347+ - Unity crashed in bamf_application_on_window_removed (LP: #1000577)
348+ - Locked smuxi launcher icon does not indicate smuxi running status
349+ (LP: #999820)
350+ - No launcher icon or Alt+Tab entry for Gimp windows (LP: #995916)
351+ - the RunningApplicationsChanged signal is no longer emitted when an
352+ application is closed since r460 (LP: #989551)
353+
354+ -- Alan Pope <popey@ubuntu.com> Wed, 23 May 2012 09:10:08 +0100
355+
356+bamf (0.2.118-0ubuntu0.1) precise-proposed; urgency=low
357+
358+ [ Didier Roche ]
359+ * New upstream release. (0.2.116)
360+ - multiple instances or double icons of application detected on bamfdaemon
361+ respawn (LP: #928912)
362+ - unity confused with chrome/chromium web apps (LP: #692462)
363+ - BamfView's dispose() method doesn't invoke the superclass' dispose()
364+ (LP: #986888)
365+ * debian/control:
366+ - remove Multi-Arch: same for the -dbg package
367+ (Closes: #669980, #658057)
368+
369+ [ Alan Pope ]
370+ * New upstream release.
371+ - Unity crashed in bamf_application_on_window_removed (LP: #1000577)
372+ - Locked smuxi launcher icon does not indicate smuxi running status
373+ (LP: #999820)
374+ - No launcher icon or Alt+Tab entry for Gimp windows (LP: #995916)
375+ - the RunningApplicationsChanged signal is no longer emitted when an
376+ application is closed since r460 (LP: #989551)
377+
378+ -- Alan Pope <popey@ubuntu.com> Wed, 23 May 2012 09:10:08 +0100
379+
380+bamf (0.2.114-0ubuntu1) precise-proposed; urgency=low
381+
382+ * New upstream release.
383+ - invalid valgrind read errors (LP: #929468)
384+
385+ -- Didier Roche <didrocks@ubuntu.com> Fri, 23 Mar 2012 14:16:41 +0100
386+
387+bamf (0.2.112-0ubuntu1) precise; urgency=low
388+
389+ * New upstream release.
390+ - bamf matcher messes up refcounting on views (LP: #942070)
391+ - Chromium is running, but not showing in launcher or alt-tab.
392+ (LP: #918474)
393+ - libbamf leaks memory on view dispose (LP: #942148)
394+ - Coverity PW.PARAMETER_HIDDEN - CID 10449 (LP: #937398)
395+ - Coverity UNINIT - CID 10451 (LP: #937402)
396+ * debian/libbamf0.symbols, debian/libbamf3-0.symbols:
397+ - update symbols for new API
398+
399+ -- Didier Roche <didrocks@ubuntu.com> Mon, 12 Mar 2012 11:47:33 +0100
400+
401+bamf (0.2.110-0ubuntu1) precise; urgency=low
402+
403+ * New upstream release.
404+ - BAMF does not pass make check (LP: #897148)
405+ - BAMF requires a headless testing target (LP: #897150)
406+ - Clicking Nautilus launcher icon fails to open a Nautilus file explorer
407+ window when copying a file and all other Nautilus windows are closed /
408+ bamf should skip the taskbar (LP: #784804)
409+ * debian/libbamf0.symbols,
410+ debian/libbamf3-0.symbols:
411+ - updated symbols
412+
413+ -- Didier Roche <didrocks@ubuntu.com> Fri, 17 Feb 2012 13:36:25 +0100
414+
415+bamf (0.2.108-0ubuntu2) precise; urgency=low
416+
417+ * remove -Werror for now as there is just new glib deprecation making it
418+ FTBFS.
419+ * debian/source/
420+ - remove, doesn't play well with merge-upstream workflow
421+
422+ -- Didier Roche <didrocks@ubuntu.com> Fri, 03 Feb 2012 14:04:28 +0100
423+
424+bamf (0.2.108-0ubuntu1) precise; urgency=low
425+
426+ * New upstream release.
427+ - BAMF does not pass make check (LP: #897148)
428+ - BAMF requires a headless testing target (LP: #897150)
429+ - Clicking Nautilus launcher icon fails to open a Nautilus file explorer
430+ window when copying a file and all other Nautilus windows are closed /
431+ bamf should skip the taskbar (LP: #784804)
432+ * debian/libbamf0.symbols, debian/libbamf3-0.symbols:
433+ - updated symbols
434+
435+ -- Didier Roche <didrocks@ubuntu.com> Fri, 03 Feb 2012 11:36:48 +0100
436+
437+bamf (0.2.106-0ubuntu1) precise; urgency=low
438+
439+ * New upstream release.
440+ - Unity acts not as a dock for LibreOffice but as a launcher (LP: #741995)
441+ - Libreoffice Calc icon does not appear when opened via Writer
442+ (LP: #861355)
443+ - Bamf Ignores some local .desktop files with OnlyShowIn flag
444+ (LP: #863290)
445+ - Libreoffice and unity integration broken. (LP: #842566)
446+ * debian/control, debian/rules:
447+ - enable headless tests build
448+ * debian/control:
449+ - bump libglib2.0-dev to 2.28
450+
451+ -- Didier Roche <didrocks@ubuntu.com> Thu, 12 Jan 2012 17:01:43 +0100
452+
453+bamf (0.2.104-1) unstable; urgency=low
454+
455+ [ Didier Roche ]
456+ * Initial upload to Debian. Package grabbed from Ubuntu,
457+ we'll keep this package in sync within the two
458+ distributions.
459+ * debian/control:
460+ - removed gir's package for now, still not building
461+ correctly.
462+
463+ [ Andrea Veri ]
464+ * debian/control:
465+ - changed Maintainer accordingly.
466+ - added myself into uploaders.
467+ -- Didier Roche <didrocks@ubuntu.com> Mon, 21 Nov 2011 10:56:21 +0100
468+
469+bamf (0.2.104-0ubuntu1) oneiric; urgency=low
470+
471+ * New upstream release.
472+ - Hopefully really fix unity confused with chrome (not chromium) web apps
473+ (LP: #692462)
474+ - Fix to build with gtk2 version
475+
476+ -- Didier Roche <didrocks@ubuntu.com> Mon, 26 Sep 2011 13:51:22 +0200
477+
478+bamf (0.2.100-0ubuntu1) oneiric; urgency=low
479+
480+ * New upstream release.
481+ - Fix unity confused with chrome web apps (LP: #692462)
482+
483+ -- Didier Roche <didrocks@ubuntu.com> Thu, 22 Sep 2011 15:15:28 +0200
484+
485+bamf (0.2.98-0ubuntu2) oneiric; urgency=low
486+
487+ * Cherry-pick a crasher fix:
488+ - bamfdaemon crashed with SIGSEGV in sn_xcb_display_new()
489+
490+ -- Didier Roche <didrocks@ubuntu.com> Thu, 15 Sep 2011 15:54:20 +0200
491+
492+bamf (0.2.98-0ubuntu1) oneiric; urgency=low
493+
494+ * New upstream release.
495+ - Bamf doesn't recognize just installed applications (LP: #676593)
496+ * debian/control:
497+ - update Standards-Version
498+
499+ -- Didier Roche <didrocks@ubuntu.com> Thu, 08 Sep 2011 20:09:28 +0200
500+
501+bamf (0.2.96-0ubuntu1) oneiric; urgency=low
502+
503+ * New upstream release.
504+
505+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 25 Aug 2011 17:44:16 +0200
506+
507+bamf (0.2.94-0ubuntu1) oneiric; urgency=low
508+
509+ * New upstream release:
510+ - no more dependency on the gio ubuntu patch, use the upstream system now
511+ (LP: #687683)
512+ * debian/rules:
513+ - the new tests depends on a X server, desactivate them when building on
514+ buildd
515+ * debian/bamfdaemon.install:
516+ - do not install the gio module as it's not built anymore
517+
518+ -- Didier Roche <didrocks@ubuntu.com> Thu, 04 Aug 2011 14:56:07 +0200
519+
520+bamf (0.2.92-0ubuntu1) oneiric; urgency=low
521+
522+ * New upstream release.
523+ * debian/control, debian/rules:
524+ - Add libbamf3-0 and libbamf3-dev packages for GTK+ 3
525+
526+ -- Michael Terry <mterry@ubuntu.com> Fri, 17 Jun 2011 12:19:14 -0400
527+
528+bamf (0.2.90-0ubuntu3) natty-proposed; urgency=low
529+
530+ * Cherry-pick from upstream:
531+ - System Testing and Printers don't display proper menus when launched by
532+ command line (LP: #717134)
533+ - Unity Min,Max,Close buttons not available in Libreoffice when opened by
534+ double-clicking a file (LP: #728927)
535+
536+ -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Apr 2011 17:07:18 +0200
537+
538+bamf (0.2.90-0ubuntu2) natty; urgency=low
539+
540+ * Cherry-pick from upstream:
541+ - Thunderbird won't stay in launcher and no quicklist (LP: #765736)
542+
543+ -- Didier Roche <didrocks@ubuntu.com> Wed, 20 Apr 2011 18:07:49 +0200
544+
545+bamf (0.2.90-0ubuntu1) natty; urgency=low
546+
547+ * New upstream release.
548+ - compiz assert failure: *** glibc detected *** compiz: double free or
549+ corruption (out): 0x0a1c5a38 *** (LP: #761372)
550+ - "Authenticate" window shows in launcher as "Polkit-gnome-authentication-
551+ agent-1" (LP: #740844)
552+
553+ -- Didier Roche <didrocks@ubuntu.com> Tue, 19 Apr 2011 19:09:34 +0200
554+
555+bamf (0.2.86-0ubuntu3) natty; urgency=low
556+
557+ * Cherry-pick a crash fix in unity with double free corruption (LP: #761372)
558+
559+ -- Didier Roche <didrocks@ubuntu.com> Fri, 15 Apr 2011 12:49:24 +0200
560+
561+bamf (0.2.86-0ubuntu2) natty; urgency=low
562+
563+ * Trunk commit r358, really fixes the crash bug listed before (lp: #754225)
564+
565+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 12 Apr 2011 22:19:24 +0200
566+
567+bamf (0.2.86-0ubuntu1) natty; urgency=low
568+
569+ * New upstream release.
570+ - bamfdaemon crashed with SIGABRT in dbus_g_connection_register_g_object()
571+ (LP: #752137)
572+ - bamfdaemon crashed with SIGABRT in dbus_g_connection_register_g_object()
573+ (LP: #754225)
574+
575+ -- Didier Roche <didrocks@ubuntu.com> Mon, 11 Apr 2011 12:41:48 +0200
576+
577+bamf (0.2.84-0ubuntu2) natty; urgency=low
578+
579+ * Move the giomodule DSO back to /usr/lib/gio/modules, because something
580+ we haven't identified yet refuses to see it when it's installed to the
581+ multiarch path. LP: #751025
582+
583+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 07 Apr 2011 23:54:53 +0000
584+
585+bamf (0.2.84-0ubuntu1) natty; urgency=low
586+
587+ * New upstream release.
588+ - unity-panel-service crashed with SIGSEGV in bamf_factory_view_for_path()
589+ (LP: #717684)
590+ - bamfdaemon crashed with SIGABRT in dbus_g_connection_register_g_object()
591+ (LP: #739218)
592+ - compiz crashed with SIGSEGV in g_utf8_validate() (LP: #736792)
593+
594+ -- Didier Roche <didrocks@ubuntu.com> Thu, 07 Apr 2011 17:17:54 +0200
595+
596+bamf (0.2.82-0ubuntu1) natty; urgency=low
597+
598+ * New upstream release.
599+ - bamfdaemon crashed with SIGSEGV in XInternAtom() (LP: #743407)
600+ - catch more cases for 'Keep in Launcher' by recognizing StatupWMClass
601+ from .desktop file (LP: #693231)
602+
603+ -- Didier Roche <didrocks@ubuntu.com> Fri, 01 Apr 2011 11:17:17 +0200
604+
605+bamf (0.2.80-0ubuntu2) natty; urgency=low
606+
607+ * Fix a FTBFS with current libglib2.0 due to the giomodules path changing
608+ for multiarch.
609+ * As long as we're in here, multiarch the whole package; bamf has no
610+ reverse-depends, so there's no risk of causing other build failures, and
611+ moving the giomodules takes us halfway there anyway.
612+
613+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 29 Mar 2011 19:50:12 +0000
614+
615+bamf (0.2.80-0ubuntu1) natty; urgency=low
616+
617+ * New upstream release.
618+ - 'Keep in launcher' item missing for some applications (LP: #657771)
619+ - can't pin KTouch to the launcher (LP: #693755)
620+
621+ -- Didier Roche <didrocks@ubuntu.com> Thu, 17 Mar 2011 17:51:00 +0100
622+
623+bamf (0.2.78-0ubuntu1) natty; urgency=low
624+
625+ * New upstream release:
626+ - adapt bamf to LibreOffice (LP: #705461)
627+
628+ -- Didier Roche <didrocks@ubuntu.com> Thu, 10 Feb 2011 17:59:34 +0100
629+
630+bamf (0.2.76-0ubuntu1) natty; urgency=low
631+
632+ * New upstream release.
633+ - add a new signal to detect tab changes (LP: #691651)
634+
635+ -- Didier Roche <didrocks@ubuntu.com> Thu, 27 Jan 2011 13:50:42 +0100
636+
637+bamf (0.2.74-0ubuntu1) natty; urgency=low
638+
639+ * New upstream release.
640+ - Set the default application icon when the application desktop file has no icon=
641+ key. It was appearing fully black. (LP: #703521)
642+ * debian/control:
643+ - remove vala build-dep, not needed anymore
644+
645+ -- Didier Roche <didrocks@ubuntu.com> Thu, 20 Jan 2011 17:45:45 +0100
646+
647+bamf (0.2.72-0ubuntu1) natty; urgency=low
648+
649+ * New upstream release.
650+
651+ -- Didier Roche <didrocks@ubuntu.com> Fri, 14 Jan 2011 19:02:24 +0100
652+
653+bamf (0.2.70-0ubuntu1) natty; urgency=low
654+
655+ * New upstream release.
656+ * debian/control:
657+ bamf dbus protocol changed. Breaks: on old unity
658+
659+ -- Didier Roche <didrocks@ubuntu.com> Fri, 14 Jan 2011 17:30:12 +0100
660+
661+bamf (0.2.68-0ubuntu1) natty; urgency=low
662+
663+ [ Didier Roche ]
664+ * debian/control:
665+ - add Vcs-Bzr tag
666+
667+ [ Sebastien Bacher ]
668+ * New upstream release.
669+
670+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 17 Dec 2010 13:36:08 +0100
671+
672+bamf (0.2.66-0ubuntu1) natty; urgency=low
673+
674+ * New upstream release.
675+ - Fix the Ubuntu Starter Edition bug (LP: #683623)
676+ - check that desktop file is currently supported before creating the
677+ favorite (LP: #682345)
678+ - unity-panel-service crashed with SIGSEGV in free() (LP: #677580)
679+
680+ -- Didier Roche <didrocks@ubuntu.com> Thu, 09 Dec 2010 19:37:54 +0100
681+
682+bamf (0.2.64-0ubuntu1) natty; urgency=low
683+
684+ * New upstream release.
685+
686+ -- Didier Roche <didrocks@ubuntu.com> Tue, 30 Nov 2010 16:52:19 +0100
687+
688+bamf (0.2.62-0ubuntu1) natty; urgency=low
689+
690+ * New upstream release.
691+
692+ -- Didier Roche <didrocks@ubuntu.com> Thu, 18 Nov 2010 18:28:10 +0100
693+
694+bamf (0.2.60-0ubuntu1) natty; urgency=low
695+
696+ * new upstream release
697+ * debian/libbamf0.symbols:
698+ - add the new symbols
699+
700+ -- Didier Roche <didrocks@ubuntu.com> Thu, 11 Nov 2010 18:37:42 +0100
701+
702+bamf (0.2.58-0ubuntu2) maverick; urgency=low
703+
704+ * Fix tons of accuracy matching issues using the gio module
705+ (LP: #645849, #630066)
706+
707+ -- Didier Roche <didrocks@ubuntu.com> Thu, 30 Sep 2010 17:14:27 +0200
708+
709+bamf (0.2.58-0ubuntu1) maverick; urgency=low
710+
711+ * New upstream release:
712+ - Fix Nautilus' "File Operation" dialog gets stuck and prevents opening new
713+ Nautilus windows (LP: #647979)
714+ - Fix bamfdaemon crashed with SIGSEGV in g_str_hash() (LP: #638705)
715+
716+ -- Didier Roche <didrocks@ubuntu.com> Mon, 27 Sep 2010 22:28:40 +0200
717+
718+bamf (0.2.54-0ubuntu1) maverick; urgency=low
719+
720+ * New upstream release.
721+ * cherry pick some patches from upstream too for more fixes in special
722+ launchers (LP: #622146)
723+ * debian/libbamf0.symbols:
724+ - update to latest version
725+
726+ -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 19:21:45 +0200
727+
728+bamf (0.2.52-0ubuntu1) maverick; urgency=low
729+
730+ * New upstream release:
731+ - Take previous distro inline patch with next release (LP: #641229)
732+
733+ -- Didier Roche <didrocks@ubuntu.com> Fri, 17 Sep 2010 13:52:17 +0200
734+
735+bamf (0.2.50-0ubuntu1) maverick; urgency=low
736+
737+ * New upstream release.
738+ - Caching fixes
739+ - Ensure we ship proper strings to open office windows
740+
741+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 15 Sep 2010 17:23:41 -0400
742+
743+bamf (0.2.48-0ubuntu1) maverick; urgency=low
744+
745+ * New upstream release:
746+ - Dropbox 0.8.90 build shows in the launcher (LP: #610226)
747+ * update debian/libbamf0.symbols
748+
749+ -- Didier Roche <didrocks@ubuntu.com> Tue, 14 Sep 2010 19:13:51 +0200
750+
751+bamf (0.2.46-0ubuntu1) maverick; urgency=low
752+
753+ * New upstream release.
754+ - Handle non system launchers (LP: #622146)
755+ * Add new symbols to debian/libbamf0.symbols
756+
757+ -- Didier Roche <didrocks@ubuntu.com> Thu, 09 Sep 2010 19:15:45 +0200
758+
759+bamf (0.2.44-0ubuntu1) maverick; urgency=low
760+
761+ * New upstream release:
762+ - Fix potential NULL deref when XDG_DATA_DIRS is not set
763+ (lp: #602519)
764+ * debian/control:
765+ - updated for the new vala versioning
766+ * debian/libbamf0.symbols:
767+ - new version update
768+
769+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 19 Aug 2010 19:16:15 +0200
770+
771+bamf (0.2.42-0ubuntu2) maverick; urgency=low
772+
773+ * Update by Mikkel Kamstrup Erlandsen to match gio changes (lp: #616737)
774+
775+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 18 Aug 2010 22:31:44 +0200
776+
777+bamf (0.2.42-0ubuntu1) maverick; urgency=low
778+
779+ * New upstream release.
780+ * debian/rules:
781+ - enjoying and running testsuite during build (LP: #586340)
782+ * debian/control:
783+ - bumping Standards-Version to latest
784+ - remove gir-repository-dev from build-dep
785+
786+ -- Didier Roche <didrocks@ubuntu.com> Fri, 13 Aug 2010 12:44:39 +0200
787+
788+bamf (0.2.40-0ubuntu1) maverick; urgency=low
789+
790+ * New upstream release.
791+
792+ -- Didier Roche <didrocks@ubuntu.com> Mon, 02 Aug 2010 15:54:41 +0200
793+
794+bamf (0.2.38-0ubuntu1) maverick; urgency=low
795+
796+ * New upstream release.
797+
798+ -- Didier Roche <didrocks@ubuntu.com> Thu, 22 Jul 2010 19:07:31 +0200
799+
800+bamf (0.2.36-0ubuntu1) maverick; urgency=low
801+
802+ * New upstream release.
803+ * debian/libbamf0.symbols:
804+ - update to latest
805+
806+ -- Didier Roche <didrocks@ubuntu.com> Fri, 16 Jul 2010 14:44:16 +0200
807+
808+bamf (0.2.34-0ubuntu1) maverick; urgency=low
809+
810+ * New upstream release.
811+ - Hangs when nautilus device detected dialog are displayed (LP: #601017)
812+ - Netbeans does not show in Unity when open (LP: #598083)
813+ - The launcher doesn't list some running softwares (LP: #601082)
814+
815+ -- Didier Roche <didrocks@ubuntu.com> Mon, 12 Jul 2010 15:49:36 +0200
816+
817+bamf (0.2.32-0ubuntu1) maverick; urgency=low
818+
819+ * New upstream release.
820+ - fix bad matchin on OOo (LP: #595583)
821+ - fix crash in bamf_matcher_possible_applications_for_window (LP: #597986)
822+ - fix exaile icon not showing in launcher (LP: #593470)
823+
824+ -- Didier Roche <didrocks@ubuntu.com> Thu, 24 Jun 2010 16:21:22 +0200
825+
826+bamf (0.2.30-0ubuntu1) maverick; urgency=low
827+
828+ * New upstream release:
829+ - fix KDE applications not showing up in the Unity Launcher
830+ (LP: #592502)
831+ * debian/libbamf0.symbols:
832+ - adding new symbols
833+
834+ -- Didier Roche <didrocks@ubuntu.com> Thu, 17 Jun 2010 18:07:38 +0200
835+
836+bamf (0.2.28-0ubuntu1) maverick; urgency=low
837+
838+ * New upstream release.
839+
840+ -- Didier Roche <didrocks@ubuntu.com> Thu, 10 Jun 2010 17:16:17 +0200
841+
842+bamf (0.2.26-0ubuntu2) maverick; urgency=low
843+
844+ * debian/libbamf-dev.install:
845+ - don't try to install a vapi file right now
846+
847+ -- Didier Roche <didrocks@ubuntu.com> Mon, 07 Jun 2010 17:36:38 +0200
848+
849+bamf (0.2.26-0ubuntu1) maverick; urgency=low
850+
851+ * debian/control, debian/libbamf-doc.install:
852+ - add libbamf-doc package
853+ * debian/libbamf0.symbols:
854+ - updated
855+ * debian/control, debian/rules:
856+ - build the doc by default
857+ * debian/libbamf-dev.install:
858+ - install vapi files
859+ * debian/rules:
860+ - fix rm *{,l}a files
861+ * debian/watch:
862+ - use https
863+ * New upstream release.
864+
865+ -- Didier Roche <didrocks@ubuntu.com> Mon, 07 Jun 2010 10:45:49 +0200
866+
867+bamf (0.2.24-0ubuntu1) maverick; urgency=low
868+
869+ * New upstream release.
870+
871+ -- Didier Roche <didrocks@ubuntu.com> Thu, 27 May 2010 18:35:29 +0200
872+
873+bamf (0.2.22-0ubuntu1) maverick; urgency=low
874+
875+ * Initial Packaging (LP: #583880)
876+ * temporary disabling gir building due to bug:
877+ https://bugzilla.gnome.org/show_bug.cgi?id=619703
878+
879+ -- Didier Roche <didrocks@ubuntu.com> Tue, 25 May 2010 10:32:24 +0200
880
881=== added file 'debian/compat'
882--- debian/compat 1970-01-01 00:00:00 +0000
883+++ debian/compat 2012-11-13 09:37:25 +0000
884@@ -0,0 +1,1 @@
885+9
886
887=== added file 'debian/control'
888--- debian/control 1970-01-01 00:00:00 +0000
889+++ debian/control 2012-11-13 09:37:25 +0000
890@@ -0,0 +1,142 @@
891+Source: bamf
892+Section: libs
893+Priority: optional
894+Maintainer: Didier Roche <didrocks@ubuntu.com>
895+Uploaders: Andrea Veri <and@debian.org>
896+Build-Depends: dbus-x11,
897+ debhelper (>= 9),
898+ dh-autoreconf,
899+ libglib2.0-dev (>= 2.28.0~),
900+ libwnck-dev,
901+ libwnck-3-dev,
902+ libgtop2-dev,
903+ libgtk2.0-dev (>= 2.12.0),
904+ libgtk-3-dev (>= 3.0.0),
905+ libdbus-glib-1-dev,
906+ gtk-doc-tools,
907+ gobject-introspection (>= 0.6.5-3),
908+ libgirepository1.0-dev,
909+ gir1.2-atk-1.0,
910+ gir1.2-glib-2.0,
911+ gir1.2-gtk-2.0 (>= 2.19.5),
912+ gir1.2-gtk-3.0 (>= 3.0.0),
913+ gir1.2-pango-1.0,
914+ gir1.2-wnck-3.0,
915+ libunity-webapps-dev (>= 2.3.3),
916+ xvfb,
917+Standards-Version: 3.9.3
918+Homepage: https://launchpad.net/bamf
919+# If you aren't a member of ~unity-team but need to upload packaging changes,
920+# just go ahead. ~unity-team will notice and sync up the code again.
921+Vcs-Bzr: https://code.launchpad.net/~unity-team/bamf/trunk
922+
923+Package: bamfdaemon
924+Architecture: any
925+Depends: ${shlibs:Depends},
926+ ${misc:Depends},
927+Multi-Arch: foreign
928+Description: Window matching library - daemon
929+ bamf matches application windows to desktop files
930+ .
931+ This package contains the daemon used by the library and a gio
932+ module that facilitates the matching of applications started
933+ through GDesktopAppInfo
934+
935+Package: libbamf0
936+Architecture: any
937+Depends: ${shlibs:Depends},
938+ ${misc:Depends},
939+ bamfdaemon (= ${binary:Version}),
940+Breaks: unity (<< 3.2.12)
941+Pre-Depends: ${misc:Pre-Depends}
942+Multi-Arch: same
943+Description: Window matching library - shared library (gtk2)
944+ bamf matches application windows to desktop files
945+ .
946+ This package contains shared libraries to be used by gtk2 applications.
947+
948+Package: libbamf3-0
949+Architecture: any
950+Depends: ${shlibs:Depends},
951+ ${misc:Depends},
952+ bamfdaemon (= ${binary:Version}),
953+Breaks: unity (<< 3.2.12)
954+Pre-Depends: ${misc:Pre-Depends}
955+Multi-Arch: same
956+Description: Window matching library - shared library
957+ bamf matches application windows to desktop files
958+ .
959+ This package contains shared libraries to be used by applications.
960+
961+Package: libbamf-dev
962+Section: libdevel
963+Architecture: any
964+Depends: ${shlibs:Depends},
965+ ${misc:Depends},
966+ libbamf0 (= ${binary:Version}),
967+ libwnck-dev,
968+ libglib2.0-dev (>= 2.23.0-1ubuntu3~),
969+Suggests: libbamf-doc
970+Description: Window matching library - development files (gtk2)
971+ bamf matches application windows to desktop files
972+ .
973+ This package contains files that are needed to build applications on
974+ gtk2 stack.
975+
976+Package: libbamf3-dev
977+Section: libdevel
978+Architecture: any
979+Depends: ${shlibs:Depends},
980+ ${misc:Depends},
981+ libbamf3-0 (= ${binary:Version}),
982+ libwnck-3-dev,
983+ libglib2.0-dev (>= 2.23.0-1ubuntu3~),
984+Suggests: libbamf-doc
985+Description: Window matching library - development files
986+ bamf matches application windows to desktop files
987+ .
988+ This package contains files that are needed to build applications.
989+
990+Package: libbamf-doc
991+Section: doc
992+Architecture: all
993+Depends: ${misc:Depends}
994+Suggests: devhelp
995+Description: Window matching library - documentation
996+ bamf matches application windows to desktop files
997+ .
998+ This package contains the daemon used by the library and a gio
999+ module that facilitates the matching of applications started
1000+ through GDesktopAppInfo
1001+ .
1002+ This package contains the documentation
1003+
1004+Package: bamf-dbg
1005+Section: debug
1006+Architecture: any
1007+Priority: extra
1008+Depends: ${shlibs:Depends},
1009+ ${misc:Depends},
1010+ libbamf0 (= ${binary:Version}),
1011+ libbamf3-0 (= ${binary:Version}),
1012+Description: Window matching library - debugging symbols
1013+ bamf matches application windows to desktop files
1014+ .
1015+ This package contains the daemon used by the library and a gio
1016+ module that facilitates the matching of applications started
1017+ through GDesktopAppInfo
1018+ .
1019+ This package contains debugging symbols for the daemon and library.
1020+
1021+#Package: gir1.2-bamf-0.2
1022+#Section: libs
1023+#Architecture: any
1024+#Depends: ${gir:Depends},
1025+# ${shlibs:Depends},
1026+# ${misc:Depends}
1027+#Description: GObject introspection data for the Bamf 0 library
1028+# This package contains introspection data for the Bamf library.
1029+# .
1030+# It can be used by packages using the GIRepository format to generate
1031+# dynamic bindings.
1032+
1033
1034=== added file 'debian/copyright'
1035--- debian/copyright 1970-01-01 00:00:00 +0000
1036+++ debian/copyright 2012-11-13 09:37:25 +0000
1037@@ -0,0 +1,50 @@
1038+This package was debianized by Didier Roche <didrocks@ubuntu.com> on
1039+Tue, 25 May 2010 10:31:02 -0000.
1040+
1041+It was downloaded from <http://launchpad.net/bamf/>
1042+
1043+Upstream Author:
1044+
1045+ Jason Smith <jason.smith@canonical.com>
1046+
1047+Copyright:
1048+
1049+ Copyright (C) 2009-2010 Canonical Ltd.
1050+
1051+License:
1052+
1053+ When not otherwise specified, the following license applies:
1054+
1055+ This library is free software; you can redistribute it and/or
1056+ modify it under the terms of the GNU Lesser General Public
1057+ License Version 3.0 as published by the Free Software Foundation.
1058+
1059+ This library is distributed in the hope that it will be useful,
1060+ but WITHOUT ANY WARRANTY; without even the implied warranty of
1061+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1062+ Lesser General Public License for more details.
1063+
1064+On Debian systems, the complete text of the GNU Lesser General Public License
1065+can be found in `/usr/share/common-licenses/LGPL-3'
1066+
1067+
1068+ * src/*,test/*:
1069+
1070+ This program is free software: you can redistribute it and/or modify it
1071+ under the terms of the the GNU General Public License version 3, as
1072+ published by the Free Software Foundation.
1073+
1074+ This program is distributed in the hope that it will be useful, but
1075+ WITHOUT ANY WARRANTY; without even the implied warranties of
1076+ MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1077+ PURPOSE. See the applicable version of the GNU Lesser General Public
1078+ License for more details.
1079+
1080+On Debian systems, the complete text of the GNU General Public License
1081+can be found in `/usr/share/common-licenses/GPL-3'
1082+
1083+The Debian packaging is:
1084+
1085+ Copyright (C) 2010 Canonical Ltd.
1086+
1087+and is licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'.
1088
1089=== added file 'debian/gir1.2-bamf-0.2.install'
1090--- debian/gir1.2-bamf-0.2.install 1970-01-01 00:00:00 +0000
1091+++ debian/gir1.2-bamf-0.2.install 2012-11-13 09:37:25 +0000
1092@@ -0,0 +1,1 @@
1093+#debian/tmp/usr/lib/girepository-1.0/
1094
1095=== added file 'debian/libbamf-dev.install'
1096--- debian/libbamf-dev.install 1970-01-01 00:00:00 +0000
1097+++ debian/libbamf-dev.install 2012-11-13 09:37:25 +0000
1098@@ -0,0 +1,5 @@
1099+debian/tmp/usr/include/libbamf/libbamf/
1100+debian/tmp/usr/lib/*/pkgconfig/libbamf.pc
1101+debian/tmp/usr/lib/*/libbamf.so
1102+#debian/tmp/usr/share/vala/vapi/
1103+#debian/tmp/usr/share/gir-1.0/
1104
1105=== added file 'debian/libbamf-doc.install'
1106--- debian/libbamf-doc.install 1970-01-01 00:00:00 +0000
1107+++ debian/libbamf-doc.install 2012-11-13 09:37:25 +0000
1108@@ -0,0 +1,1 @@
1109+debian/tmp/usr/share/gtk-doc/
1110
1111=== added file 'debian/libbamf0.install'
1112--- debian/libbamf0.install 1970-01-01 00:00:00 +0000
1113+++ debian/libbamf0.install 2012-11-13 09:37:25 +0000
1114@@ -0,0 +1,1 @@
1115+debian/tmp/usr/lib/*/libbamf.so.*
1116
1117=== added file 'debian/libbamf0.symbols'
1118--- debian/libbamf0.symbols 1970-01-01 00:00:00 +0000
1119+++ debian/libbamf0.symbols 2012-11-13 09:37:25 +0000
1120@@ -0,0 +1,77 @@
1121+libbamf.so.0 libbamf0 #MINVER#
1122+ bamf_application_get_application_menu@Base 0.3.0
1123+ bamf_application_get_application_type@Base 0.2.20
1124+ bamf_application_get_desktop_file@Base 0.2.20
1125+ bamf_application_get_focusable_child@Base 0.3.0
1126+ bamf_application_get_show_menu_stubs@Base 0.2.48
1127+ bamf_application_get_supported_mime_types@Base 0.3.0
1128+ bamf_application_get_type@Base 0.2.20
1129+ bamf_application_get_windows@Base 0.2.20
1130+ bamf_application_get_xids@Base 0.2.20
1131+ bamf_application_new@Base 0.2.20
1132+ bamf_application_new_favorite@Base 0.2.60
1133+ bamf_control_get_default@Base 0.2.20
1134+ bamf_control_get_type@Base 0.2.20
1135+ bamf_control_insert_desktop_file@Base 0.2.20
1136+ bamf_control_register_application_for_pid@Base 0.2.20
1137+ bamf_control_register_tab_provider@Base 0.2.20
1138+ bamf_control_set_approver_behavior@Base 0.2.44
1139+ bamf_factory_get_type@Base 0.2.20
1140+ bamf_indicator_get_dbus_menu_path@Base 0.2.36
1141+ bamf_indicator_get_remote_address@Base 0.2.36
1142+ bamf_indicator_get_remote_path@Base 0.2.36
1143+ bamf_indicator_get_type@Base 0.2.36
1144+ bamf_indicator_new@Base 0.2.36
1145+ bamf_matcher_application_is_running@Base 0.2.20
1146+ bamf_matcher_get_active_application@Base 0.2.20
1147+ bamf_matcher_get_active_window@Base 0.2.20
1148+ bamf_matcher_get_application_for_desktop_file@Base 0.2.60
1149+ bamf_matcher_get_application_for_window@Base 0.2.48
1150+ bamf_matcher_get_application_for_xid@Base 0.2.20
1151+ bamf_matcher_get_applications@Base 0.2.20
1152+ bamf_matcher_get_default@Base 0.2.20
1153+ bamf_matcher_get_running_applications@Base 0.2.20
1154+ bamf_matcher_get_tabs@Base 0.2.20
1155+ bamf_matcher_get_type@Base 0.2.20
1156+ bamf_matcher_get_window_stack_for_monitor@Base 0.2.108
1157+ bamf_matcher_get_windows@Base 0.2.46
1158+ bamf_matcher_get_xids_for_application@Base 0.2.20
1159+ bamf_matcher_register_favorites@Base 0.2.46
1160+ bamf_tab_close@Base 0.3.0
1161+ bamf_tab_get_desktop_name@Base 0.3.0
1162+ bamf_tab_get_is_foreground_tab@Base 0.3.0
1163+ bamf_tab_get_location@Base 0.3.0
1164+ bamf_tab_get_type@Base 0.2.28
1165+ bamf_tab_get_xid@Base 0.3.0
1166+ bamf_tab_new@Base 0.2.28
1167+ bamf_tab_raise@Base 0.3.0
1168+ bamf_tab_request_preview@Base 0.3.0
1169+ bamf_tab_source_get_tab_ids@Base 0.2.20
1170+ bamf_tab_source_get_tab_preview@Base 0.2.20
1171+ bamf_tab_source_get_tab_uri@Base 0.2.20
1172+ bamf_tab_source_get_tab_xid@Base 0.2.20
1173+ bamf_tab_source_get_type@Base 0.2.20
1174+ bamf_tab_source_show_tab@Base 0.2.20
1175+ bamf_view_get_children@Base 0.2.20
1176+ bamf_view_get_click_suggestion@Base 0.2.60
1177+ bamf_view_get_icon@Base 0.2.20
1178+ bamf_view_get_name@Base 0.2.20
1179+ bamf_view_get_type@Base 0.2.20
1180+ bamf_view_get_view_type@Base 0.2.20
1181+ bamf_view_is_active@Base 0.2.20
1182+ bamf_view_is_closed@Base 0.2.54
1183+ bamf_view_is_running@Base 0.2.20
1184+ bamf_view_is_sticky@Base 0.2.60
1185+ bamf_view_is_urgent@Base 0.2.20
1186+ bamf_view_set_sticky@Base 0.2.60
1187+ bamf_view_user_visible@Base 0.2.20
1188+ bamf_window_get_monitor@Base 0.2.108
1189+ bamf_window_get_pid@Base 0.2.112
1190+ bamf_window_get_transient@Base 0.2.28
1191+ bamf_window_get_type@Base 0.2.20
1192+ bamf_window_get_utf8_prop@Base 0.2.110
1193+ bamf_window_get_window_type@Base 0.2.46
1194+ bamf_window_get_xid@Base 0.2.20
1195+ bamf_window_last_active@Base 0.2.30
1196+ bamf_window_maximized@Base 0.2.108
1197+ bamf_window_new@Base 0.2.20
1198
1199=== added file 'debian/libbamf3-0.install'
1200--- debian/libbamf3-0.install 1970-01-01 00:00:00 +0000
1201+++ debian/libbamf3-0.install 2012-11-13 09:37:25 +0000
1202@@ -0,0 +1,1 @@
1203+debian/tmp/usr/lib/*/libbamf3.so.*
1204
1205=== added file 'debian/libbamf3-0.symbols'
1206--- debian/libbamf3-0.symbols 1970-01-01 00:00:00 +0000
1207+++ debian/libbamf3-0.symbols 2012-11-13 09:37:25 +0000
1208@@ -0,0 +1,77 @@
1209+libbamf3.so.0 libbamf3-0 #MINVER#
1210+ bamf_application_get_application_menu@Base 0.3.0
1211+ bamf_application_get_application_type@Base 0.2.20
1212+ bamf_application_get_desktop_file@Base 0.2.20
1213+ bamf_application_get_focusable_child@Base 0.3.0
1214+ bamf_application_get_show_menu_stubs@Base 0.2.48
1215+ bamf_application_get_supported_mime_types@Base 0.3.0
1216+ bamf_application_get_type@Base 0.2.20
1217+ bamf_application_get_windows@Base 0.2.20
1218+ bamf_application_get_xids@Base 0.2.20
1219+ bamf_application_new@Base 0.2.20
1220+ bamf_application_new_favorite@Base 0.2.60
1221+ bamf_control_get_default@Base 0.2.20
1222+ bamf_control_get_type@Base 0.2.20
1223+ bamf_control_insert_desktop_file@Base 0.2.20
1224+ bamf_control_register_application_for_pid@Base 0.2.20
1225+ bamf_control_register_tab_provider@Base 0.2.20
1226+ bamf_control_set_approver_behavior@Base 0.2.44
1227+ bamf_factory_get_type@Base 0.2.20
1228+ bamf_indicator_get_dbus_menu_path@Base 0.2.36
1229+ bamf_indicator_get_remote_address@Base 0.2.36
1230+ bamf_indicator_get_remote_path@Base 0.2.36
1231+ bamf_indicator_get_type@Base 0.2.36
1232+ bamf_indicator_new@Base 0.2.36
1233+ bamf_matcher_application_is_running@Base 0.2.20
1234+ bamf_matcher_get_active_application@Base 0.2.20
1235+ bamf_matcher_get_active_window@Base 0.2.20
1236+ bamf_matcher_get_application_for_desktop_file@Base 0.2.60
1237+ bamf_matcher_get_application_for_window@Base 0.2.48
1238+ bamf_matcher_get_application_for_xid@Base 0.2.20
1239+ bamf_matcher_get_applications@Base 0.2.20
1240+ bamf_matcher_get_default@Base 0.2.20
1241+ bamf_matcher_get_running_applications@Base 0.2.20
1242+ bamf_matcher_get_tabs@Base 0.2.20
1243+ bamf_matcher_get_type@Base 0.2.20
1244+ bamf_matcher_get_window_stack_for_monitor@Base 0.2.108
1245+ bamf_matcher_get_windows@Base 0.2.46
1246+ bamf_matcher_get_xids_for_application@Base 0.2.20
1247+ bamf_matcher_register_favorites@Base 0.2.46
1248+ bamf_tab_close@Base 0.3.0
1249+ bamf_tab_get_desktop_name@Base 0.3.0
1250+ bamf_tab_get_is_foreground_tab@Base 0.3.0
1251+ bamf_tab_get_location@Base 0.3.0
1252+ bamf_tab_get_type@Base 0.2.28
1253+ bamf_tab_get_xid@Base 0.3.0
1254+ bamf_tab_new@Base 0.2.28
1255+ bamf_tab_raise@Base 0.3.0
1256+ bamf_tab_request_preview@Base 0.3.0
1257+ bamf_tab_source_get_tab_ids@Base 0.2.20
1258+ bamf_tab_source_get_tab_preview@Base 0.2.20
1259+ bamf_tab_source_get_tab_uri@Base 0.2.20
1260+ bamf_tab_source_get_tab_xid@Base 0.2.20
1261+ bamf_tab_source_get_type@Base 0.2.20
1262+ bamf_tab_source_show_tab@Base 0.2.20
1263+ bamf_view_get_children@Base 0.2.20
1264+ bamf_view_get_click_suggestion@Base 0.2.60
1265+ bamf_view_get_icon@Base 0.2.20
1266+ bamf_view_get_name@Base 0.2.20
1267+ bamf_view_get_type@Base 0.2.20
1268+ bamf_view_get_view_type@Base 0.2.20
1269+ bamf_view_is_active@Base 0.2.20
1270+ bamf_view_is_closed@Base 0.2.54
1271+ bamf_view_is_running@Base 0.2.20
1272+ bamf_view_is_sticky@Base 0.2.60
1273+ bamf_view_is_urgent@Base 0.2.20
1274+ bamf_view_set_sticky@Base 0.2.60
1275+ bamf_view_user_visible@Base 0.2.20
1276+ bamf_window_get_monitor@Base 0.2.108
1277+ bamf_window_get_pid@Base 0.2.112
1278+ bamf_window_get_transient@Base 0.2.28
1279+ bamf_window_get_type@Base 0.2.20
1280+ bamf_window_get_utf8_prop@Base 0.2.110
1281+ bamf_window_get_window_type@Base 0.2.46
1282+ bamf_window_get_xid@Base 0.2.20
1283+ bamf_window_last_active@Base 0.2.30
1284+ bamf_window_maximized@Base 0.2.108
1285+ bamf_window_new@Base 0.2.20
1286
1287=== added file 'debian/libbamf3-dev.install'
1288--- debian/libbamf3-dev.install 1970-01-01 00:00:00 +0000
1289+++ debian/libbamf3-dev.install 2012-11-13 09:37:25 +0000
1290@@ -0,0 +1,5 @@
1291+debian/tmp/usr/include/libbamf3/libbamf/
1292+debian/tmp/usr/lib/*/pkgconfig/libbamf3.pc
1293+debian/tmp/usr/lib/*/libbamf3.so
1294+#debian/tmp/usr/share/vala/vapi/
1295+#debian/tmp/usr/share/gir-1.0/
1296
1297=== added file 'debian/rules'
1298--- debian/rules 1970-01-01 00:00:00 +0000
1299+++ debian/rules 2012-11-13 09:37:25 +0000
1300@@ -0,0 +1,47 @@
1301+#!/usr/bin/make -f
1302+# -*- Mode: Makefile; indent-tabs-mode: t -*-
1303+
1304+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
1305+
1306+%:
1307+ dh $@ --with autoreconf
1308+
1309+override_dh_autoreconf:
1310+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
1311+
1312+override_dh_auto_configure:
1313+ dh_auto_configure -Bbuild/gtk2 -- --enable-introspection=no \
1314+ --enable-headless-tests \
1315+ --disable-webapps \
1316+ --with-gtk=2
1317+ dh_auto_configure -Bbuild/gtk3 -- --enable-introspection=no \
1318+ --enable-gtk-doc \
1319+ --enable-headless-tests \
1320+ --with-gtk=3
1321+
1322+override_dh_auto_build:
1323+ dh_auto_build -Bbuild/gtk2
1324+ dh_auto_build -Bbuild/gtk3
1325+
1326+override_dh_auto_clean:
1327+ dh_auto_clean -Bbuild/gtk2
1328+ dh_auto_clean -Bbuild/gtk3
1329+
1330+override_dh_auto_test:
1331+ dh_auto_test -Bbuild/gtk2
1332+ dh_auto_test -Bbuild/gtk3
1333+
1334+override_dh_auto_install:
1335+ dh_auto_install -Bbuild/gtk2
1336+ dh_auto_install -Bbuild/gtk3
1337+ find debian/tmp/usr/lib -name \*.la -exec rm {} \;
1338+ find debian/tmp/usr/lib -name \*.a -exec rm {} \;
1339+
1340+override_dh_install:
1341+ dh_install --fail-missing
1342+
1343+override_dh_strip:
1344+ dh_strip --dbg-package=bamf-dbg
1345+
1346+override_dh_girepository:
1347+ dh_girepository -pgir1.2-bamf-0.2
1348
1349=== added directory 'debian/sources'
1350=== added file 'debian/sources/format'
1351--- debian/sources/format 1970-01-01 00:00:00 +0000
1352+++ debian/sources/format 2012-11-13 09:37:25 +0000
1353@@ -0,0 +1,1 @@
1354+1.0
1355
1356=== added file 'debian/watch'
1357--- debian/watch 1970-01-01 00:00:00 +0000
1358+++ debian/watch 2012-11-13 09:37:25 +0000
1359@@ -0,0 +1,2 @@
1360+version=3
1361+https://launchpad.net/bamf/+download .*/bamf-([0-9.]+)\.tar\.gz
1362
1363=== modified file 'lib/libbamf/bamf-view.c'
1364--- lib/libbamf/bamf-view.c 2012-11-05 10:23:27 +0000
1365+++ lib/libbamf/bamf-view.c 2012-11-13 09:37:25 +0000
1366@@ -267,19 +267,35 @@
1367 }
1368
1369 /**
1370- * bamf_view_user_visible:
1371- * @view: a #BamfView
1372- *
1373- * Returns: a boolean useful for determining if a particular view is "user visible". User visible
1374- * is a concept relating to whether or not a window should be shown in a launcher tasklist.
1375+ * bamf_view_is_user_visible:
1376+ * @view: a #BamfView
1377+ *
1378+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
1379+ * is a concept relating to whether or not a window should be shown in a launcher tasklist.
1380+ *
1381+ * Since: 0.4.0
1382+ */
1383+gboolean
1384+bamf_view_is_user_visible (BamfView *self)
1385+{
1386+ g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
1387+
1388+ return bamf_view_get_boolean (self, "UserVisible", BAMF_VIEW_VISIBLE_FLAG);
1389+}
1390+
1391+/**
1392+ * bamf_view_user_visible: (skip)
1393+ * @view: a #BamfView
1394+ *
1395+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
1396+ * is a concept relating to whether or not a window should be shown in a launcher tasklist.
1397+ *
1398+ * Deprecated: 0.4.0
1399 */
1400 gboolean
1401 bamf_view_user_visible (BamfView *self)
1402 {
1403- g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
1404-
1405- return bamf_view_get_boolean (self, "UserVisible", BAMF_VIEW_VISIBLE_FLAG);
1406-
1407+ return bamf_view_is_user_visible (self);
1408 }
1409
1410 /**
1411@@ -706,7 +722,7 @@
1412 break;
1413
1414 case PROP_USER_VISIBLE:
1415- g_value_set_boolean (value, bamf_view_user_visible (self));
1416+ g_value_set_boolean (value, bamf_view_is_user_visible (self));
1417 break;
1418
1419 default:
1420@@ -827,7 +843,7 @@
1421 priv = view->priv;
1422 priv->checked_flags = 0x0;
1423
1424- if (bamf_view_user_visible (view))
1425+ if (bamf_view_is_user_visible (view))
1426 {
1427 g_signal_emit (G_OBJECT(view), view_signals[VISIBLE_CHANGED], 0, TRUE);
1428 g_object_notify (G_OBJECT (view), "user-visible");
1429
1430=== modified file 'lib/libbamf/bamf-view.h'
1431--- lib/libbamf/bamf-view.h 2012-11-05 10:23:27 +0000
1432+++ lib/libbamf/bamf-view.h 2012-11-13 09:37:25 +0000
1433@@ -116,10 +116,13 @@
1434
1435 gboolean bamf_view_is_urgent (BamfView *view);
1436
1437+gboolean bamf_view_is_user_visible (BamfView *view);
1438+
1439 gchar * bamf_view_get_name (BamfView *view);
1440
1441 gchar * bamf_view_get_icon (BamfView *view);
1442
1443+GLIB_DEPRECATED
1444 gboolean bamf_view_user_visible (BamfView *view);
1445
1446 const gchar * bamf_view_get_view_type (BamfView *view);
1447
1448=== modified file 'src/Makefile.am'
1449--- src/Makefile.am 2012-11-05 10:23:27 +0000
1450+++ src/Makefile.am 2012-11-13 09:37:25 +0000
1451@@ -6,7 +6,7 @@
1452
1453 include $(top_srcdir)/Makefile.am.marshal
1454
1455-bamfdaemondir = $(libexecdir)
1456+bamfdaemondir = $(pkglibexecdir)
1457
1458 bamfdaemon_PROGRAMS = \
1459 bamfdaemon \
1460
1461=== modified file 'src/bamf-legacy-window-test.c'
1462--- src/bamf-legacy-window-test.c 2012-10-10 17:18:56 +0000
1463+++ src/bamf-legacy-window-test.c 2012-11-13 09:37:25 +0000
1464@@ -160,7 +160,15 @@
1465
1466 self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
1467
1468- return self->name;
1469+ return self->name;
1470+}
1471+
1472+static BamfLegacyWindow *
1473+bamf_legacy_window_test_get_transient (BamfLegacyWindow *legacy_window)
1474+{
1475+ BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
1476+
1477+ return self->transient_window;
1478 }
1479
1480 static const char *
1481@@ -386,6 +394,7 @@
1482 GObjectClass *obj_class = G_OBJECT_CLASS (klass);
1483
1484 obj_class->finalize = bamf_legacy_window_test_finalize;
1485+ win_class->get_transient = bamf_legacy_window_test_get_transient;
1486 win_class->get_name = bamf_legacy_window_test_get_name;
1487 win_class->get_class_name = bamf_legacy_window_test_get_class_name;
1488 win_class->get_class_instance_name = bamf_legacy_window_test_get_class_instance_name;
1489@@ -434,6 +443,7 @@
1490 copy->application_id = g_strdup (self->application_id);
1491 copy->unique_bus_name = g_strdup (self->unique_bus_name);
1492 copy->dbus_menu_object_path = g_strdup (self->dbus_menu_object_path);
1493+ copy->transient_window = self->transient_window;
1494 copy->needs_attention = self->needs_attention;
1495 copy->is_desktop = self->is_desktop;
1496 copy->is_skip = self->is_skip;
1497
1498=== modified file 'src/bamf-legacy-window-test.h'
1499--- src/bamf-legacy-window-test.h 2012-10-10 17:18:56 +0000
1500+++ src/bamf-legacy-window-test.h 2012-11-13 09:37:25 +0000
1501@@ -60,6 +60,7 @@
1502 char * application_id;
1503 char * unique_bus_name;
1504 char * dbus_menu_object_path;
1505+ BamfLegacyWindow * transient_window;
1506 gboolean needs_attention;
1507 gboolean is_desktop;
1508 gboolean is_skip;
1509
1510=== modified file 'src/bamf-legacy-window.c'
1511--- src/bamf-legacy-window.c 2012-10-09 09:13:30 +0000
1512+++ src/bamf-legacy-window.c 2012-11-13 09:37:25 +0000
1513@@ -294,28 +294,30 @@
1514 BamfLegacyWindow *other;
1515 GList *windows, *l;
1516 WnckWindow *transient_legacy;
1517-
1518+
1519 g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
1520-
1521+
1522+ if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_transient)
1523+ return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_transient (self);
1524+
1525+ g_return_val_if_fail (self->priv->legacy_window, NULL);
1526+
1527 transient_legacy = wnck_window_get_transient (self->priv->legacy_window);
1528- if (transient_legacy == NULL)
1529- return NULL;
1530-
1531 screen = bamf_legacy_screen_get_default ();
1532 g_return_val_if_fail (BAMF_IS_LEGACY_SCREEN (screen), NULL);
1533-
1534+
1535 windows = bamf_legacy_screen_get_windows (screen);
1536 for (l = windows; l; l = l->next)
1537 {
1538 other = l->data;
1539-
1540+
1541 if (!BAMF_IS_LEGACY_WINDOW (other))
1542 continue;
1543-
1544+
1545 if (other->priv->legacy_window == transient_legacy)
1546 return other;
1547 }
1548-
1549+
1550 return NULL;
1551 }
1552
1553
1554=== modified file 'src/bamf-legacy-window.h'
1555--- src/bamf-legacy-window.h 2012-10-09 09:13:30 +0000
1556+++ src/bamf-legacy-window.h 2012-11-13 09:37:25 +0000
1557@@ -70,6 +70,7 @@
1558 {
1559 GObjectClass parent;
1560
1561+ BamfLegacyWindow * (*get_transient) (BamfLegacyWindow *legacy_window);
1562 const char * (*get_name) (BamfLegacyWindow *legacy_window);
1563 const char * (*get_class_name) (BamfLegacyWindow *legacy_window);
1564 const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
1565
1566=== modified file 'src/bamf-matcher.c'
1567--- src/bamf-matcher.c 2012-11-05 10:23:27 +0000
1568+++ src/bamf-matcher.c 2012-11-13 09:37:25 +0000
1569@@ -1050,10 +1050,10 @@
1570 return dirs;
1571 }
1572
1573-static GList * get_desktop_file_env_directories (GList *, const gchar *) G_GNUC_WARN_UNUSED_RESULT;
1574+static GList * list_prepend_desktop_file_env_directories (GList *, const gchar *) G_GNUC_WARN_UNUSED_RESULT;
1575
1576 static GList *
1577-get_desktop_file_env_directories (GList *dirs, const gchar *varname)
1578+list_prepend_desktop_file_env_directories (GList *dirs, const gchar *varname)
1579 {
1580 g_return_val_if_fail (varname, dirs);
1581
1582@@ -1067,7 +1067,7 @@
1583 if (env)
1584 {
1585 data_dirs = g_strsplit (env, ":", 0);
1586-
1587+
1588 for (data = data_dirs; *data; data++)
1589 {
1590 path = g_build_filename (*data, "applications", NULL);
1591@@ -1095,15 +1095,15 @@
1592 GList *dirs = NULL;
1593 char *path;
1594
1595- dirs = get_desktop_file_env_directories(dirs, "XDG_DATA_DIRS");
1596+ dirs = list_prepend_desktop_file_env_directories (dirs, "XDG_DATA_DIRS");
1597
1598 if (!g_list_find_custom (dirs, "/usr/share/applications", (GCompareFunc) g_strcmp0))
1599 dirs = g_list_prepend (dirs, g_strdup ("/usr/share/applications"));
1600-
1601+
1602 if (!g_list_find_custom (dirs, "/usr/local/share/applications", (GCompareFunc) g_strcmp0))
1603 dirs = g_list_prepend (dirs, g_strdup ("/usr/local/share/applications"));
1604-
1605- dirs = get_desktop_file_env_directories(dirs, "XDG_DATA_HOME");
1606+
1607+ dirs = list_prepend_desktop_file_env_directories (dirs, "XDG_DATA_HOME");
1608
1609 //If this doesn't exist, we need to track .local or the home itself!
1610 path = g_build_filename (g_get_home_dir (), ".local/share/applications", NULL);
1611@@ -1242,7 +1242,7 @@
1612 {
1613 if (g_str_has_suffix (path, ".desktop"))
1614 {
1615- /* Remove all the .desktop file referencies from the hash tables.
1616+ /* Remove all the .desktop file references from the hash tables.
1617 * Free the string itself only on the 2nd pass (tables share the same
1618 * string instance)
1619 */
1620@@ -1254,7 +1254,7 @@
1621 }
1622 else if (g_strcmp0 (monitored_dir, path) == 0)
1623 {
1624- /* Remove all the referencies to the .desktop files placed in subfolders
1625+ /* Remove all the references to the .desktop files placed in subfolders
1626 * of the current path. Free the strings itself only on the 2nd pass
1627 * (as before, the tables share the same string instance)
1628 */
1629@@ -1291,7 +1291,7 @@
1630 self->priv->desktop_file_table,
1631 self->priv->desktop_id_table,
1632 self->priv->desktop_class_table);
1633-
1634+
1635 g_list_free_full (dirs, g_free);
1636 }
1637 }
1638@@ -1387,13 +1387,13 @@
1639 g_hash_table_new_full ((GHashFunc) g_str_hash,
1640 (GEqualFunc) g_str_equal,
1641 (GDestroyNotify) g_free,
1642- (GDestroyNotify) g_free);
1643+ (GDestroyNotify) g_free);
1644
1645 directories = get_desktop_file_directories (self);
1646
1647 fill_desktop_file_table (self, directories, *desktop_file_table,
1648 *desktop_id_table, *desktop_class_table);
1649-
1650+
1651 g_list_free_full (directories, g_free);
1652 }
1653
1654@@ -1795,8 +1795,7 @@
1655
1656 static BamfApplication *
1657 bamf_matcher_get_application_for_window (BamfMatcher *self,
1658- BamfWindow *bamf_window,
1659- gboolean *new_application)
1660+ BamfWindow *bamf_window)
1661 {
1662 GList *possible_apps, *l;
1663 BamfLegacyWindow *window;
1664@@ -1810,6 +1809,21 @@
1665 g_return_val_if_fail (BAMF_IS_WINDOW (bamf_window), NULL);
1666
1667 window = bamf_window_get_window (bamf_window);
1668+
1669+ if (bamf_legacy_window_get_window_type (window) != BAMF_WINDOW_NORMAL)
1670+ {
1671+ BamfLegacyWindow *transient = bamf_legacy_window_get_transient (window);
1672+
1673+ if (transient)
1674+ {
1675+ Window xid = bamf_legacy_window_get_xid (transient);
1676+ app = bamf_matcher_get_application_by_xid (self, xid);
1677+
1678+ if (BAMF_IS_APPLICATION (app))
1679+ return app;
1680+ }
1681+ }
1682+
1683 win_class_name = bamf_legacy_window_get_class_name (window);
1684
1685 possible_apps = bamf_matcher_possible_applications_for_window (self, bamf_window, &target_class);
1686@@ -1929,14 +1943,6 @@
1687 }
1688
1689 bamf_application_set_wmclass (best, app_class);
1690-
1691- if (new_application)
1692- *new_application = TRUE;
1693- }
1694- else
1695- {
1696- if (new_application)
1697- *new_application = FALSE;
1698 }
1699
1700 g_list_free_full (possible_apps, g_free);
1701@@ -2011,8 +2017,8 @@
1702 static void
1703 handle_raw_window (BamfMatcher *self, BamfLegacyWindow *window)
1704 {
1705- BamfWindow *bamfwindow;
1706- BamfApplication *bamfapplication;
1707+ BamfWindow *bamf_win;
1708+ BamfApplication *bamf_app;
1709
1710 g_return_if_fail (BAMF_IS_MATCHER (self));
1711 g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
1712@@ -2027,18 +2033,17 @@
1713 * always the best is to simply go window by window creating new applications as needed.
1714 */
1715
1716- bamfwindow = bamf_window_new (window);
1717- bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (bamfwindow));
1718-
1719- gboolean new_app = FALSE;
1720- bamfapplication = bamf_matcher_get_application_for_window (self, bamfwindow, &new_app);
1721-
1722- if (new_app)
1723+ bamf_win = bamf_window_new (window);
1724+ bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (bamf_win));
1725+
1726+ bamf_app = bamf_matcher_get_application_for_window (self, bamf_win);
1727+
1728+ if (!bamf_view_get_path (BAMF_VIEW (bamf_app)))
1729 {
1730- bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (bamfapplication));
1731+ bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (bamf_app));
1732 }
1733
1734- bamf_view_add_child (BAMF_VIEW (bamfapplication), BAMF_VIEW (bamfwindow));
1735+ bamf_view_add_child (BAMF_VIEW (bamf_app), BAMF_VIEW (bamf_win));
1736 }
1737
1738 static void
1739@@ -2129,7 +2134,9 @@
1740 g_return_if_fail (BAMF_IS_MATCHER (self));
1741 g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
1742
1743- if (bamf_legacy_window_get_window_type (window) == BAMF_WINDOW_DESKTOP)
1744+ BamfWindowType win_type = bamf_legacy_window_get_window_type (window);
1745+
1746+ if (win_type == BAMF_WINDOW_DESKTOP)
1747 {
1748 BamfWindow *bamfwindow = bamf_window_new (window);
1749 bamf_matcher_register_view_stealing_ref (self, BAMF_VIEW (bamfwindow));
1750@@ -2139,7 +2146,7 @@
1751
1752 if (is_open_office_window (self, window))
1753 {
1754- BamfWindowType win_type = bamf_legacy_window_get_window_type (window);
1755+ win_type = bamf_legacy_window_get_window_type (window);
1756
1757 if (win_type == BAMF_WINDOW_SPLASHSCREEN || win_type == BAMF_WINDOW_TOOLBAR)
1758 {
1759
1760=== modified file 'src/bamf-matcher.h'
1761--- src/bamf-matcher.h 2012-08-21 22:01:48 +0000
1762+++ src/bamf-matcher.h 2012-11-13 09:37:25 +0000
1763@@ -97,7 +97,7 @@
1764
1765 void bamf_matcher_register_favorites (BamfMatcher *matcher,
1766 const char **favorites);
1767-
1768+
1769 GList * bamf_matcher_get_favorites (BamfMatcher *matcher);
1770
1771 GVariant * bamf_matcher_running_application_paths (BamfMatcher *matcher);
1772
1773=== modified file 'src/bamf-view.c'
1774--- src/bamf-view.c 2012-06-14 00:37:52 +0000
1775+++ src/bamf-view.c 2012-11-13 09:37:25 +0000
1776@@ -496,10 +496,13 @@
1777 GDBusInterfaceSkeleton *dbus_iface;
1778 const gchar *exported_path;
1779
1780+ if (!view->priv->path)
1781+ return FALSE;
1782+
1783 dbus_iface = G_DBUS_INTERFACE_SKELETON (view->priv->dbus_iface);
1784 exported_path = g_dbus_interface_skeleton_get_object_path (dbus_iface);
1785
1786- return (view->priv->path != NULL && exported_path != NULL);
1787+ return (exported_path != NULL);
1788 }
1789
1790 static void
1791
1792=== modified file 'tests/bamfdaemon/test-matcher.c'
1793--- tests/bamfdaemon/test-matcher.c 2012-10-10 17:21:47 +0000
1794+++ tests/bamfdaemon/test-matcher.c 2012-11-13 09:37:25 +0000
1795@@ -33,6 +33,7 @@
1796 static void test_match_desktop_application (void);
1797 static void test_match_libreoffice_windows (void);
1798 static void test_new_desktop_matches_unmatched_windows (void);
1799+static void test_match_transient_windows (void);
1800
1801 static GDBusConnection *gdbus_connection = NULL;
1802
1803@@ -52,6 +53,7 @@
1804 g_test_add_func (DOMAIN"/Matching/Application/Desktop", test_match_desktop_application);
1805 g_test_add_func (DOMAIN"/Matching/Application/LibreOffice", test_match_libreoffice_windows);
1806 g_test_add_func (DOMAIN"/Matching/Windows/UnmatchedOnNewDesktop", test_new_desktop_matches_unmatched_windows);
1807+ g_test_add_func (DOMAIN"/Matching/Windows/Transient", test_match_transient_windows);
1808 }
1809
1810 static void
1811@@ -480,3 +482,49 @@
1812 g_object_unref (screen);
1813 }
1814
1815+static void
1816+test_match_transient_windows (void)
1817+{
1818+ BamfMatcher *matcher;
1819+ BamfLegacyScreen *screen;
1820+ BamfLegacyWindowTest *main_window;
1821+ BamfLegacyWindowTest *child_window;
1822+ BamfApplication *main_app, *child_app;
1823+ GList *app_children;
1824+ guint32 xid;
1825+
1826+ screen = bamf_legacy_screen_get_default();
1827+ matcher = bamf_matcher_get_default ();
1828+ const char *exec = "test-bamf-app";
1829+ const char *class = "test-bamf-app";
1830+
1831+ cleanup_matcher_tables (matcher);
1832+ export_matcher_on_bus (matcher);
1833+
1834+ xid = g_random_int ();
1835+ main_window = bamf_legacy_window_test_new (xid, "Main Window", class, exec);
1836+ _bamf_legacy_screen_open_test_window (screen, main_window);
1837+
1838+ main_app = bamf_matcher_get_application_by_xid (matcher, xid);
1839+ g_assert (main_app);
1840+
1841+ app_children = bamf_view_get_children (BAMF_VIEW (main_app));
1842+ g_assert_cmpuint (g_list_length (app_children), ==, 1);
1843+ g_assert (find_window_in_app (main_app, BAMF_LEGACY_WINDOW (main_window)));
1844+
1845+ xid = g_random_int ();
1846+ child_window = bamf_legacy_window_test_new (xid, "Child Window", NULL, NULL);
1847+ child_window->window_type = BAMF_WINDOW_DIALOG;
1848+ child_window->transient_window = BAMF_LEGACY_WINDOW (main_window);
1849+ _bamf_legacy_screen_open_test_window (screen, child_window);
1850+
1851+ child_app = bamf_matcher_get_application_by_xid (matcher, xid);
1852+ g_assert (child_app == main_app);
1853+
1854+ app_children = bamf_view_get_children (BAMF_VIEW (main_app));
1855+ g_assert_cmpuint (g_list_length (app_children), ==, 2);
1856+ g_assert (find_window_in_app (main_app, BAMF_LEGACY_WINDOW (child_window)));
1857+
1858+ g_object_unref (matcher);
1859+ g_object_unref (screen);
1860+}
1861
1862=== modified file 'tests/functional/alt-tabber.c'
1863--- tests/functional/alt-tabber.c 2011-01-26 14:15:59 +0000
1864+++ tests/functional/alt-tabber.c 2012-11-13 09:37:25 +0000
1865@@ -58,7 +58,7 @@
1866 {
1867 app = BAMF_APPLICATION (l->data);
1868
1869- if (!bamf_view_user_visible (BAMF_VIEW (app)))
1870+ if (!bamf_view_is_user_visible (BAMF_VIEW (app)))
1871 continue;
1872
1873 gtk_tree_store_append (store, &position, NULL);
1874@@ -75,7 +75,7 @@
1875 {
1876 window = BAMF_WINDOW (c->data);
1877
1878- if (!bamf_view_user_visible (BAMF_VIEW (window)))
1879+ if (!bamf_view_is_user_visible (BAMF_VIEW (window)))
1880 continue;
1881
1882 const gchar *name = bamf_view_get_name (BAMF_VIEW (window));
1883
1884=== modified file 'tests/libbamf/test-libbamf.c'
1885--- tests/libbamf/test-libbamf.c 2010-05-05 14:17:07 +0000
1886+++ tests/libbamf/test-libbamf.c 2012-11-13 09:37:25 +0000
1887@@ -30,7 +30,9 @@
1888 gint
1889 main (gint argc, gchar *argv[])
1890 {
1891+#if !GLIB_CHECK_VERSION(2, 35, 0)
1892 g_type_init ();
1893+#endif
1894 g_test_init (&argc, &argv, NULL);
1895
1896 gtk_init (&argc, &argv);

Subscribers

People subscribed via source and target branches

to all changes: