Merge lp:~om26er/ubuntu/precise/bamf/SRU_for_lp_1026426 into lp:~ubuntu-desktop/bamf/precise

[Omer Akram]

backport the fix for a very important bug 1026426

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

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 08:53:39 +0000
+++ debian/changelog	2012-10-12 12:25:26 +0000
@@ -1,3 +1,11 @@
+bamf (0.2.118-0ubuntu0.3) precise-proposed; urgency=low
+
+  * lib/libbamf/bamf-factory.c:
+    - LibreOffice Unity integration (launcher and switcher) is broken.
+      (LP: #1026426)
+
+ -- Omer Akram <[e-mail]>  Fri, 12 Oct 2012 17:20:49 +0500
+
 bamf (0.2.118-0ubuntu0.2) precise-proposed; urgency=low
 
   * Cherry-pick from upstream:

=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2012-06-20 18:21:10 +0000
+++ lib/libbamf/bamf-factory.c	2012-10-12 12:25:26 +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);