← Back to branch summary

~ubuntu-branches/debian/sid/exo/sid

« back to all changes in this revision

Viewing changes to exo/exo-url.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez
  • Date: 2009-10-09 17:33:42 UTC
  • mfrom: (0.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20091009173342-67uwwcd3uj5amx1v
Tags: 0.3.103-1
http://bugs.debian.org/470412
* New upstream release.
  - support iocharset mount option.                           closes: #470412
* debian/patches:
  - 01_fix-exo-csource-manpage updated.
  - 02_fix-exo-open-manpage updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
exo/exo-url.c
149
149
    }
150
150
  else
151
151
    {
152
 
      /* check if url is an absolute path */
153
 
      if (g_path_is_absolute (url))
 
152
      /* check if url is an absolute path or trash uri (ie. something we
 
153
       * can send directly to the file manager) */
 
154
      if (g_path_is_absolute (url)
 
155
          || g_str_has_prefix (url, "trash://"))
154
156
        {
155
157
          /* well, we got our path then */
156
158
          path = g_strdup (url);
227
229
      /* determine the display name for the screen */
228
230
      display_name = gdk_screen_make_display_name (screen);
229
231
      
230
 
      /* check if we have a local HTML file here */
231
 
      if (fnmatch ("*.xhtml", local_path, FNM_CASEFOLD) == 0
232
 
          || fnmatch ("*.htm", local_path, FNM_CASEFOLD) == 0
233
 
          || fnmatch ("*.html", local_path, FNM_CASEFOLD) == 0)
 
232
      /* check if we have a local HTML file here that is not
 
233
       * in the trash */
 
234
      if (!g_str_has_prefix (url, "trash://")
 
235
          && (fnmatch ("*.xhtml", local_path, FNM_CASEFOLD) == 0
 
236
              || fnmatch ("*.htm", local_path, FNM_CASEFOLD) == 0
 
237
              || fnmatch ("*.html", local_path, FNM_CASEFOLD) == 0))
234
238
        {
235
239
          /* transform the path to a file:-URI */
236
240
          uri = g_filename_to_uri (local_path, NULL, error);