[gedit] tab: no need to triple-check the auto save feature
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] tab: no need to triple-check the auto save feature
- Date: Sun, 15 Jun 2014 20:05:24 +0000 (UTC)
commit b069719f6a6fa94fb4a6ee13b7c5d45a8666d66a
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Jun 15 21:46:14 2014 +0200
tab: no need to triple-check the auto save feature
Keep the auto save independent of the other features.
gedit_tab_set_state() does the right thing.
gedit/gedit-tab.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 777e82b..f154440 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -586,8 +586,6 @@ io_loading_error_info_bar_response (GtkWidget *info_bar,
set_info_bar (tab, NULL, GTK_RESPONSE_NONE);
gedit_tab_set_state (tab, GEDIT_TAB_STATE_LOADING);
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
-
gedit_document_load (doc,
location,
tab->priv->tmp_encoding,
@@ -965,7 +963,6 @@ document_loaded (GeditDocument *document,
g_return_if_fail ((tab->priv->state == GEDIT_TAB_STATE_LOADING) ||
(tab->priv->state == GEDIT_TAB_STATE_REVERTING));
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
if (tab->priv->timer != NULL)
{
@@ -1224,8 +1221,6 @@ invalid_character_info_bar_response (GtkWidget *info_bar,
/* don't bug the user again with this... */
tab->priv->save_flags |= GEDIT_DOCUMENT_SAVE_IGNORE_INVALID_CHARS;
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
-
/* Force saving */
/* FIXME there is a bug here when the action was a "save as".
@@ -1257,8 +1252,6 @@ no_backup_error_info_bar_response (GtkWidget *info_bar,
gedit_tab_set_state (tab, GEDIT_TAB_STATE_SAVING);
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
-
/* Force saving */
gedit_document_save (doc, tab->priv->save_flags);
}
@@ -1286,8 +1279,6 @@ externally_modified_error_info_bar_response (GtkWidget *info_bar,
gedit_tab_set_state (tab, GEDIT_TAB_STATE_SAVING);
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
-
/* ignore mtime should not be persisted in save flags across saves */
/* Force saving */
@@ -1330,8 +1321,6 @@ recoverable_saving_error_info_bar_response (GtkWidget *info_bar,
gedit_debug_message (DEBUG_TAB, "Force saving with URI '%s'", tmp_uri);
g_free (tmp_uri);
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
-
gedit_document_save_as (doc,
tab->priv->tmp_save_location,
tab->priv->tmp_encoding,
@@ -1358,7 +1347,6 @@ document_saved (GeditDocument *document,
g_return_if_fail (tab->priv->tmp_save_location != NULL);
g_return_if_fail (tab->priv->tmp_encoding != NULL);
- g_return_if_fail (tab->priv->auto_save_timeout <= 0);
if (tab->priv->timer != NULL)
{
@@ -2139,10 +2127,6 @@ gedit_tab_auto_save (GeditTab *tab)
g_return_val_if_fail (!gedit_document_is_untitled (doc), FALSE);
g_return_val_if_fail (!gedit_document_get_readonly (doc), FALSE);
- g_return_val_if_fail (tab->priv->auto_save_timeout > 0, FALSE);
- g_return_val_if_fail (tab->priv->auto_save, FALSE);
- g_return_val_if_fail (tab->priv->auto_save_interval > 0, FALSE);
-
if (!gtk_text_buffer_get_modified (GTK_TEXT_BUFFER(doc)))
{
gedit_debug_message (DEBUG_TAB, "Document not modified");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]