BAMF

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

  1. libbamf-safer-factory-rematch-2.0
  2. Merge into bamf-0.2
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Omer Akram
Approved revision: 481
Merged at revision: 481
Proposed branch: lp:~3v1n0/bamf/libbamf-safer-factory-rematch-2.0
Merge into: lp:bamf/0.2
Diff against target: 12 lines (+1/-1)
1 file modified
lib/libbamf/bamf-factory.c (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/bamf/libbamf-safer-factory-rematch-2.0
Reviewer Review Type Date Requested Status
Omer Akram (community) Approve
Brandon Schaefer Pending
Review via email: mp+128519@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

(required by, I meant)

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

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.

Revision history for this message
Omer Akram (om26er) wrote :

WFM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/bamf-factory.c'
2--- lib/libbamf/bamf-factory.c 2012-06-13 14:03:31 +0000
3+++ lib/libbamf/bamf-factory.c 2012-10-08 15:14:31 +0000
4@@ -280,7 +280,7 @@
5
6 /* If the primary search doesn't give out any result, we fallback
7 * to children window comparison */
8- if (!matched_view)
9+ if (!list_desktop_file && !matched_view)
10 {
11 GList *list_children, *ll;
12 list_children = _bamf_application_get_cached_xids (list_app);

Subscribers

People subscribed via source and target branches