← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/beagle/jaunty-security

« back to all changes in this revision

Viewing changes to beagled/QueryStringParser.cs

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-05-04 00:31:32 UTC
  • mfrom: (1.1.21 upstream)
  • Revision ID: james.westby@ubuntu.com-20080504003132-2tkm5o8moo5952ri
Tags: 0.3.7-2ubuntu1
https://launchpad.net/bugs/225746
 * Merge from Debian unstable. (LP: #225746) Remaining Ubuntu changes:
  - debian/control:
    + Rename ice{weasel,dove}-beagle to {mozilla,thunderbird}-beagle and
      and update the dependencies accordingly.
    + Change Maintainer to Ubuntu Mono Team.
  - debian/rules:
    + Install the mozilla-beagle and thunderbird-beagle extensions.
  - ice{dove,weasel}.dirs:
    + Renamed to {mozilla,thunderbird}-beagle.dirs.
    + Fixed paths to point to usr/lib/{firefox,thunderbird}

Show diffs side-by-side

added added

removed removed

Lines of Context:
beagled/QueryStringParser.cs
216
216
                                try {
217
217
                                        QueryPart_Uri part = new QueryPart_Uri ();
218
218
                                        part.Logic = (IsProhibited ? QueryPartLogic.Prohibited : QueryPartLogic.Required);
219
 
                                        part.Uri = UriFu.EscapedStringToUri (text);
 
219
                                        part.Uri = UriFu.UserUritoEscapedUri (text);
220
220
                                        return part;
221
221
                                } catch (System.UriFormatException) {
222
222
                                        Log.Warn ("Could not parse [{0}] as uri query. Assuming text.", text);
277
277
                        PropertyType[] prop_type;
278
278
                        int num;
279
279
 
280
 
                        is_present = PropertyKeywordFu.GetPropertyDetails (key, out num, out prop_string, out prop_type);
 
280
                        is_present = PropertyKeywordFu.GetMapping (key, out num, out prop_string, out prop_type);
281
281
                        // if key is not present in the mapping, assume the query is a text query
282
282
                        // i.e. if token is foo:bar and there is no mappable property named foo,
283
283
                        // assume "foo:bar" as text query