← Back to branch summary

~ubuntu-branches/ubuntu/precise/gedit/precise

« back to all changes in this revision

Viewing changes to gedit/gedit-io-error-message-area.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-04-14 16:41:13 UTC
  • mfrom: (1.1.78 upstream)
  • Revision ID: james.westby@ubuntu.com-20100414164113-0xgl3u73pcs0ngbc
Tags: 2.30.0git20100413-0ubuntu1
* Updating to git snaptshot since 2.30.1 will be after lucid
* debian/patches/90_autoconf.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
gedit/gedit-io-error-message-area.c
721
721
        
722
722
        g_return_val_if_fail (uri != NULL, NULL);
723
723
        g_return_val_if_fail (error != NULL, NULL);
724
 
        g_return_val_if_fail (error->domain == G_CONVERT_ERROR, NULL);
 
724
        g_return_val_if_fail (error->domain == G_CONVERT_ERROR ||
 
725
                              error->domain == G_IO_ERROR, NULL);
725
726
        g_return_val_if_fail (encoding != NULL, NULL);
726
727
        
727
728
        full_formatted_uri = gedit_utils_uri_for_display (uri);