Merge lp://staging/~3v1n0/bamf/better-wmclass-filter into lp://staging/bamf/0.4

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 479
Merged at revision: 466
Proposed branch: lp://staging/~3v1n0/bamf/better-wmclass-filter
Merge into: lp://staging/bamf/0.4
Prerequisite: lp://staging/~3v1n0/bamf/desktopless-webapps-fix
Diff against target: 434 lines (+140/-75)
3 files modified
src/bamf-application.c (+29/-19)
src/bamf-matcher.c (+108/-56)
src/bamf-matcher.h (+3/-0)
To merge this branch: bzr merge lp://staging/~3v1n0/bamf/better-wmclass-filter
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+104036@code.staging.launchpad.net

Commit message

BamfMatcher: use both instance and class names for matching WMClass

Also, filter out the .desktop files that have a defined StartupWMClass
that doesn't match with our .desktop file.

Description of the change

We use both WMClass instance and class name to match proper .desktop files, also we filter out from possible_desktop list the .desktop files that have defined a wmclass that does not match with the one of the target window.

This allow to make both the custom applications .desktop files to work correctly and the web applications to be matched as new ones.

Plus, favorites are used only if their class matches.

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Looks good, nothing too scary.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The prerequisite lp:~3v1n0/bamf/desktopless-webapps-fix has not yet been merged into lp:bamf.

Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:bamf failed due to conflicts:

text conflict in src/bamf-matcher.c

479. By Marco Trevisan (Treviño)

Merging with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches