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

« back to all changes in this revision

Viewing changes to gedit/gedit-tab.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:
1313
1313
                                          G_CALLBACK (no_backup_error_message_area_response),
1314
1314
                                          tab);
1315
1315
                }
1316
 
                else if (error->domain == GEDIT_DOCUMENT_ERROR || 
1317
 
                         error->domain == G_IO_ERROR)
 
1316
                else if (error->domain == GEDIT_DOCUMENT_ERROR ||
 
1317
                         (error->domain == G_IO_ERROR &&
 
1318
                          error->code != G_IO_ERROR_INVALID_DATA &&
 
1319
                          error->code != G_IO_ERROR_PARTIAL_INPUT))
1318
1320
                {
1319
1321
                        /* These errors are _NOT_ recoverable */
1320
1322
                        _gedit_recent_remove  (GEDIT_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tab))),
1334
1336
                else
1335
1337
                {
1336
1338
                        /* This error is recoverable */
1337
 
                        g_return_if_fail (error->domain == G_CONVERT_ERROR);
 
1339
                        g_return_if_fail (error->domain == G_CONVERT_ERROR ||
 
1340
                                          error->domain == G_IO_ERROR);
1338
1341
 
1339
1342
                        emsg = gedit_conversion_error_while_saving_message_area_new (
1340
1343
                                                                        tab->priv->tmp_save_uri,