Merge lp://staging/~alecu/ubuntuone-client/highlight-search into lp://staging/ubuntuone-client

Proposed by Alejandro J. Cura
Status: Merged
Approved by: Rodrigo Moya
Approved revision: 586
Merged at revision: 588
Proposed branch: lp://staging/~alecu/ubuntuone-client/highlight-search
Merge into: lp://staging/ubuntuone-client
Diff against target: 554 lines (+325/-14)
6 files modified
.bzrignore (+1/-0)
nautilus/Makefile.am (+13/-1)
nautilus/contacts-view.c (+28/-13)
nautilus/highlight.c (+161/-0)
nautilus/highlight.h (+29/-0)
nautilus/test-highlight.c (+93/-0)
To merge this branch: bzr merge lp://staging/~alecu/ubuntuone-client/highlight-search
Reviewer Review Type Date Requested Status
Rodrigo Moya (community) Approve
John Lenton (community) Approve
Review via email: mp+30434@code.staging.launchpad.net

Commit message

Highlight the strings that were found in the contacts search

Description of the change

Highlight the strings that were found in the contacts search

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

Yes, it does!

review: Approve
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Looks great, very good code! Only one thing:

379 + while (*needle != NULL) {
380 + glong needle_len = g_utf8_strlen (*needle, -1);
381 + if (needle_len < 1) {
382 + needle++;
383 + continue;
384 + }
385 + gchar *search_start = folded_haystack;
386 + gchar *start_ptr = g_strstr_len (search_start,
387 + -1,
388 + *needle);

Don't declare variables after executed code, since that would make it fail when running strict compilation (C99). But not holding this branch for this, so fix it in another one, please

review: Approve

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