Merge lp:~3v1n0/bamf/libbamf-safer-factory-rematch-2.0 into lp:bamf/0.2

[Marco Trevisan (Treviño)]

BamfFactory: don't use the secondary matching method for views with valid .desktop file

Backported branch lp:~3v1n0/bamf/libbamf-safer-factory-rematch

[Timo Jyrinki (timo-jyrinki)]

Is this required or just works in co-operation with lp:~3v1n0/bamf/libreoffice-base-and-tests-0.2 ?

[Timo Jyrinki (timo-jyrinki)]

> Is this required or just works in co-operation with lp:~3v1n0/bamf
> /libreoffice-base-and-tests-0.2 ?

(required by, I meant)

[Marco Trevisan (Treviño) (3v1n0)]

This is required, the branch lp:~3v1n0/bamf/libreoffice-base-and-tests-0.2 only includes support for libreoffice-base and some LO matching tests.

[Omer Akram (om26er)]

WFM

review: Approve

=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2012-06-13 14:03:31 +0000
+++ lib/libbamf/bamf-factory.c	2012-10-08 15:14:31 +0000
@@ -280,7 +280,7 @@
 
           /* If the primary search doesn't give out any result, we fallback
            * to children window comparison */
-          if (!matched_view)
+          if (!list_desktop_file && !matched_view)
             {
               GList *list_children, *ll;
               list_children = _bamf_application_get_cached_xids (list_app);