[gedit/wip/merge-encoding-settings: 2/2] Remove auto-detected and shown-in-menu gsettings (not finished)

[Sébastien Wilmet <swilmet src gnome org>]

commit 4b7dc1300f50e7448b8e59f3836340b2d121a331
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Aug 1 16:06:55 2014 +0200

    Remove auto-detected and shown-in-menu gsettings (not finished)

 data/gedit.convert     |    4 ----
 gedit/gedit-settings.h |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/data/gedit.convert b/data/gedit.convert
index 811bc91..9b38bbe 100644
--- a/data/gedit.convert
+++ b/data/gedit.convert
@@ -37,9 +37,5 @@ print-font-body-pango = /apps/gedit-2/preferences/print/fonts/print_font_body_pa
 print-font-header-pango = /apps/gedit-2/preferences/print/fonts/print_font_header_pango
 print-font-numbers-pango = /apps/gedit-2/preferences/print/fonts/print_font_numbers_pango
 
-[org.gnome.gedit.preferences.encodings]
-auto-detected = /apps/gedit-2/preferences/encodings/auto_detected
-shown-in-menu = /apps/gedit-2/preferences/encodings/shown_in_menu
-
 [org.gnome.gedit.plugins]
 active-plugins = /apps/gedit-2/plugins/active-plugins
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index de03f6a..cd8228d 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -106,8 +106,6 @@ void                         gedit_settings_set_list                        (GSettings    
 *settings,
 #define GEDIT_SETTINGS_PRINT_FONT_BODY_PANGO           "print-font-body-pango"
 #define GEDIT_SETTINGS_PRINT_FONT_HEADER_PANGO         "print-font-header-pango"
 #define GEDIT_SETTINGS_PRINT_FONT_NUMBERS_PANGO                "print-font-numbers-pango"
-#define GEDIT_SETTINGS_ENCODING_AUTO_DETECTED          "auto-detected"
-#define GEDIT_SETTINGS_ENCODING_SHOWN_IN_MENU          "shown-in-menu"
 #define GEDIT_SETTINGS_CANDIDATE_ENCODINGS             "candidate-encodings"
 #define GEDIT_SETTINGS_ACTIVE_PLUGINS                  "active-plugins"
 #define GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE         "ensure-trailing-newline"