[gedit] Use a macro for the "ensure-trailing-newline" setting



commit 42a8884a2b9b58bf5216c608f8266fde2af280b6
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Jun 9 19:44:29 2014 +0200

    Use a macro for the "ensure-trailing-newline" setting
    
    So we can see that the setting is used in the document loader and saver.

 gedit/gedit-document-loader.c |    2 +-
 gedit/gedit-document-saver.c  |    2 +-
 gedit/gedit-settings.h        |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c
index 697782d..b70bf30 100644
--- a/gedit/gedit-document-loader.c
+++ b/gedit/gedit-document-loader.c
@@ -703,7 +703,7 @@ start_stream_read (AsyncData *async)
        }
 
        ensure_trailing_newline = g_settings_get_boolean (loader->priv->editor_settings,
-                                                         "ensure-trailing-newline");
+                                                         GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE);
 
        /* Output stream */
        loader->priv->output = gedit_document_output_stream_new (loader->priv->document,
diff --git a/gedit/gedit-document-saver.c b/gedit/gedit-document-saver.c
index 48481f3..eb57b72 100644
--- a/gedit/gedit-document-saver.c
+++ b/gedit/gedit-document-saver.c
@@ -745,7 +745,7 @@ async_replace_ready_callback (GFile        *source,
        }
 
        ensure_trailing_newline = g_settings_get_boolean (saver->priv->editor_settings,
-                                                         "ensure-trailing-newline");
+                                                         GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE);
 
 
        saver->priv->input = gedit_document_input_stream_new (GTK_TEXT_BUFFER (saver->priv->document),
diff --git a/gedit/gedit-settings.h b/gedit/gedit-settings.h
index cb9bedc..39ee82e 100644
--- a/gedit/gedit-settings.h
+++ b/gedit/gedit-settings.h
@@ -109,6 +109,7 @@ void                         gedit_settings_set_list                        (GSettings    
 *settings,
 #define GEDIT_SETTINGS_ENCODING_AUTO_DETECTED          "auto-detected"
 #define GEDIT_SETTINGS_ENCODING_SHOWN_IN_MENU          "shown-in-menu"
 #define GEDIT_SETTINGS_ACTIVE_PLUGINS                  "active-plugins"
+#define GEDIT_SETTINGS_ENSURE_TRAILING_NEWLINE         "ensure-trailing-newline"
 
 /* window state keys */
 #define GEDIT_SETTINGS_WINDOW_STATE                    "state"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]