~ubuntu-branches/ubuntu/precise/unity-lens-music/precise

« back to all changes in this revision

Viewing changes to src/banshee-scope.vala

Committer: Package Import Robot
Author(s): Didier Roche
Date: 2012-02-03 11:33:57 UTC
mto: This revision was merged to the branch mainline in revision 11.
Revision ID: package-import@ubuntu.com-20120203113357-yop2ipbkuwiizbih

Tags: upstream-5.2.0

Import upstream version 5.2.0

files added:
src/categories.c

src/categories.vala

files removed:
m4

m4/intltool.m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

files modified:
ChangeLog

Makefile.in

aclocal.m4

configure

configure.ac

data/Makefile.in

po/POTFILES.in

po/POTFILES.skip

src/Makefile.am

src/Makefile.in

src/album.c

src/banshee-collection.c

src/banshee-collection.vala

src/banshee-filter-parser-decade.c

src/banshee-filter-parser-genre.c

src/banshee-filter-parser-genre.vala

src/banshee-filter-parser.c

src/banshee-scope.c

src/banshee-scope.vala

src/config.c

src/config.vala

src/daemon.c

src/daemon.vala

src/filter-parser-decade.c

src/filter-parser-genre.c

src/filter-parser-genre.vala

src/filter-parser.c

src/genre.c

src/main.c

src/musicstore-collection.c

src/musicstore-collection.vala

src/musicstore-daemon.c

src/musicstore-filter-parser-decade.c

src/musicstore-filter-parser-genre.c

src/musicstore-filter-parser-genre.vala

src/musicstore-filter-parser.c

src/musicstore-scope.c

src/musicstore-scope.vala

src/simple-scope.c

src/simple-scope.vala

src/track.c

Show diffs side-by-side

added added

removed removed

src/banshee-scope.vala

}

public override void perform_search (LensSearch? search, Dee.Model results_model,

List<FilterParser> filters, int max_results = -1)

public override async void perform_search (LensSearch search,

SearchType search_type,

owned List<FilterParser> filters,

int max_results = -1)

{

collection.search (search, results_model, filters, max_results);

int category_override = -1;

100

if (search_type == SearchType.GLOBAL)

101

{

102

category_override = Category.MUSIC;

103

// the lens shouldn't display anything for empty search

104

if (is_search_empty (search)) return;

105

}

106

107

collection.search (search, search_type, filters,

108

max_results, category_override);

109

}

110

}

100

111

}

Older »