← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/totem-pl-parser/intrepid-updates

« back to all changes in this revision

Viewing changes to plparse/totem-pl-parser-wm.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-06-12 11:41:52 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080612114152-vgnfvcbtaef0bbel
Tags: 2.23.2-0ubuntu1
* New upstream version:
  - Remove lingering gnome-vfs requirements
  - Ignore pnm:// URLs that are passed to us
  - Fix block device detection code
  - Fix bad detection of itms feeds
  - Work-around problems with filenames when passed .php or .asp files by 
    the web browser
* debian/control.in:
  - remove gnomevfs requirement

Show diffs side-by-side

added added

removed removed

Lines of Context:
plparse/totem-pl-parser-wm.c
260
260
                return TOTEM_PL_PARSER_RESULT_ERROR;
261
261
 
262
262
 
263
 
        if (base_file != NULL)
 
263
        if (base_file != NULL && strstr (url, "://") == NULL)
264
264
                resolved = g_file_resolve_relative_path (base_file, url);
265
265
        else
266
266
                resolved = g_file_new_for_uri (url);
298
298
        if (url == NULL)
299
299
                return TOTEM_PL_PARSER_RESULT_ERROR;
300
300
 
301
 
        if (base_file != NULL)
 
301
        if (base_file != NULL && strstr (url, "://") == NULL)
302
302
                resolved = g_file_resolve_relative_path (base_file, url);
303
303
        else
304
304
                resolved = g_file_new_for_uri (url);