[gedit] Change the create backup copy default value to FALSE and removed extension.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit bf94719d3c00b7d07faf176d379e06693ac791cd
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Feb 6 14:44:51 2010 +0100

    Change the create backup copy default value to FALSE and removed extension.
    
    We are now managing the backup extension with gio and as it is not
    configurable we just remove that schema and options.

 data/gedit.schemas.in.in     |   16 +---------------
 gedit/gedit-document-saver.c |    7 -------
 gedit/gedit-document-saver.h |    2 --
 gedit/gedit-prefs-manager.c  |   10 ----------
 gedit/gedit-prefs-manager.h  |    7 +------
 5 files changed, 2 insertions(+), 40 deletions(-)
---
diff --git a/data/gedit.schemas.in.in b/data/gedit.schemas.in.in
index b8cd4fa..f6e5989 100644
--- a/data/gedit.schemas.in.in
+++ b/data/gedit.schemas.in.in
@@ -48,7 +48,7 @@
       <applyto>/apps/gedit-2/preferences/editor/save/create_backup_copy</applyto>
       <owner>gedit</owner>
       <type>bool</type>
-      <default>TRUE</default>
+      <default>FALSE</default>
       <locale name="C">
 	<short>Create Backup Copies</short>
 	<long>Whether gedit should create backup copies for the files
@@ -58,20 +58,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gedit-2/preferences/editor/save/backup_copy_extension</key>
-      <applyto>/apps/gedit-2/preferences/editor/save/backup_copy_extension</applyto>
-      <owner>gedit</owner>
-      <type>string</type>
-      <default>~</default>
-      <locale name="C">
-	<short>Backup Copy Extension</short>
-	<long>Extension or suffix to use for backup file names.  This
-	will only take effect if the "Create Backup Copies" option is
-	turned on.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gedit-2/preferences/editor/save/auto_save</key>
       <applyto>/apps/gedit-2/preferences/editor/save/auto_save</applyto>
       <owner>gedit</owner>
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index dc11c1b..d7d107f 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -139,7 +139,6 @@ gedit_document_saver_finalize (GObject *object)
 	GeditDocumentSaver *saver = GEDIT_DOCUMENT_SAVER (object);
 
 	g_free (saver->uri);
-	g_free (saver->backup_ext);
 
 	G_OBJECT_CLASS (gedit_document_saver_parent_class)->finalize (object);
 }
@@ -485,18 +484,12 @@ gedit_document_saver_save (GeditDocumentSaver     *saver,
 	// report async (in an idle handler) or sync (bool ret)
 	// async is extra work here, sync is special casing in the caller
 
-	/* fetch saving options */
-	saver->backup_ext = gedit_prefs_manager_get_backup_extension ();
-
 	/* never keep backup of autosaves */
 	if ((saver->flags & GEDIT_DOCUMENT_SAVE_PRESERVE_BACKUP) != 0)
 		saver->keep_backup = FALSE;
 	else
 		saver->keep_backup = gedit_prefs_manager_get_create_backup_copy ();
 
-	/* TODO: add support for configurable backup dir */
-	saver->backups_in_curr_dir = TRUE;
-
 	GEDIT_DOCUMENT_SAVER_GET_CLASS (saver)->save (saver, old_mtime);
 }
 
diff --git a/gedit/gedit-document-saver.h b/gedit/gedit-document-saver.h
index 52c1cf2..b1bd828 100644
--- a/gedit/gedit-document-saver.h
+++ b/gedit/gedit-document-saver.h
@@ -67,8 +67,6 @@ struct _GeditDocumentSaver
 	GeditDocumentSaveFlags    flags;
 
 	gboolean		  keep_backup;
-	gchar			 *backup_ext;
-	gboolean                  backups_in_curr_dir;
 };
 
 /*
diff --git a/gedit/gedit-prefs-manager.c b/gedit/gedit-prefs-manager.c
index b4b68c8..b16081b 100644
--- a/gedit/gedit-prefs-manager.c
+++ b/gedit/gedit-prefs-manager.c
@@ -318,16 +318,6 @@ DEFINE_BOOL_PREF (create_backup_copy,
 		  GPM_CREATE_BACKUP_COPY,
 		  GPM_DEFAULT_CREATE_BACKUP_COPY)
 
-/* Backup extension. This is configurable only using gconftool or gconf-editor */
-gchar *
-gedit_prefs_manager_get_backup_extension (void)
-{
-	gedit_debug (DEBUG_PREFS);
-
-	return gedit_prefs_manager_get_string (GPM_BACKUP_COPY_EXTENSION,	
-					       GPM_DEFAULT_BACKUP_COPY_EXTENSION);
-}
-
 /* Auto save */
 DEFINE_BOOL_PREF (auto_save,
 		  GPM_AUTO_SAVE,
diff --git a/gedit/gedit-prefs-manager.h b/gedit/gedit-prefs-manager.h
index c001f12..1a0a283 100644
--- a/gedit/gedit-prefs-manager.h
+++ b/gedit/gedit-prefs-manager.h
@@ -47,7 +47,6 @@
 
 #define GPM_SAVE_DIR			GPM_PREFS_DIR  "/editor/save"
 #define GPM_CREATE_BACKUP_COPY  	GPM_SAVE_DIR "/create_backup_copy"
-#define GPM_BACKUP_COPY_EXTENSION	GPM_SAVE_DIR "/backup_copy_extension"
 
 #define GPM_AUTO_SAVE			GPM_SAVE_DIR "/auto_save"
 #define GPM_AUTO_SAVE_INTERVAL		GPM_SAVE_DIR "/auto_save_interval"
@@ -154,8 +153,7 @@
 #define GPM_DEFAULT_SYSTEM_FONT		(const gchar*) "Monaco 12"
 #endif
 
-#define GPM_DEFAULT_CREATE_BACKUP_COPY	1 /* TRUE */
-#define GPM_DEFAULT_BACKUP_COPY_EXTENSION (const gchar*) "~"
+#define GPM_DEFAULT_CREATE_BACKUP_COPY	0 /* FALSE */
 
 #define GPM_DEFAULT_AUTO_SAVE		0 /* FALSE */
 #define GPM_DEFAULT_AUTO_SAVE_INTERVAL	10 /* minutes */
@@ -251,9 +249,6 @@ gboolean		 gedit_prefs_manager_get_create_backup_copy	(void);
 void			 gedit_prefs_manager_set_create_backup_copy	(gboolean cbc);
 gboolean		 gedit_prefs_manager_create_backup_copy_can_set	(void);
 
-/* Backup extension. This is configurable only using gconftool or gconf-editor */
-gchar			*gedit_prefs_manager_get_backup_extension	(void);
-
 /* Auto save */
 gboolean		 gedit_prefs_manager_get_auto_save		(void);
 void			 gedit_prefs_manager_set_auto_save		(gboolean as);