[gedit/docstream2: 12/16] Add GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gedit/docstream2: 12/16] Add GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT
- Date: Sat, 23 Jan 2010 13:31:10 +0000 (UTC)
commit 0ed9c49bbcbee5d6740adbc36f7e77f00484a8cf
Author: Jesse van den Kieboom <jesse icecrew nl>
Date: Sat Jan 23 14:26:03 2010 +0100
Add GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT
Contains the default newline type. The default is CR_LF on windows
and LF on all other platforms
gedit/gedit-document-loader.c | 7 +------
gedit/gedit-document.c | 6 +-----
gedit/gedit-document.h | 6 ++++++
3 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c
index b723a14..54d7bba 100644
--- a/gedit/gedit-document-loader.c
+++ b/gedit/gedit-document-loader.c
@@ -220,12 +220,7 @@ static void
gedit_document_loader_init (GeditDocumentLoader *loader)
{
loader->used = FALSE;
-
-#ifdef G_OS_WIN32
- loader->auto_detected_newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF;
-#else
- loader->auto_detected_newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_LF;
-#endif
+ loader->auto_detected_newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT;
}
void
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index b7aaae9..1e484a5 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -830,11 +830,7 @@ gedit_document_init (GeditDocument *doc)
doc->priv->encoding = gedit_encoding_get_utf8 ();
-#ifdef G_OS_WIN32
- doc->priv->newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF;
-#else
- doc->priv->newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_LF;
-#endif
+ doc->priv->newline_type = GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT;
gtk_source_buffer_set_max_undo_levels (GTK_SOURCE_BUFFER (doc),
gedit_prefs_manager_get_undo_actions_limit ());
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index 90f277b..a5d2730 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -68,6 +68,12 @@ typedef enum
GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF
} GeditDocumentNewlineType;
+#ifdef G_OS_WIN32
+#define GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT GEDIT_DOCUMENT_NEWLINE_TYPE_CR_LF
+#else
+#define GEDIT_DOCUMENT_NEWLINE_TYPE_DEFAULT GEDIT_DOCUMENT_NEWLINE_TYPE_LF
+#endif
+
typedef enum
{
GEDIT_SEARCH_DONT_SET_FLAGS = 1 << 0,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]