[gedit] Factor out newline type names in utils
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Factor out newline type names in utils
- Date: Sat, 6 Sep 2014 07:44:41 +0000 (UTC)
commit 9a4dda2573e8f38de4648eb0fe4b98ecec1ee85a
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Sat Sep 6 09:43:09 2014 +0200
Factor out newline type names in utils
gedit/gedit-file-chooser-dialog-gtk.c | 7 ++++---
gedit/gedit-file-chooser-dialog-osx.c | 14 ++------------
gedit/gedit-utils.c | 16 ++++++++++++++++
gedit/gedit-utils.h | 2 ++
4 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/gedit/gedit-file-chooser-dialog-gtk.c b/gedit/gedit-file-chooser-dialog-gtk.c
index 4c1aeee..ca8373d 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.c
+++ b/gedit/gedit-file-chooser-dialog-gtk.c
@@ -35,6 +35,7 @@
#include "gedit-debug.h"
#include "gedit-enum-types.h"
#include "gedit-settings.h"
+#include "gedit-utils.h"
#define ALL_FILES _("All Files")
#define ALL_TEXT_FILES _("All Text Files")
@@ -341,19 +342,19 @@ create_newline_combo (GeditFileChooserDialogGtk *dialog)
newline_combo_append (GTK_COMBO_BOX (combo),
store,
&iter,
- _("Unix/Linux"),
+ gedit_utils_newline_type_to_string (GTK_SOURCE_NEWLINE_TYPE_LF),
GTK_SOURCE_NEWLINE_TYPE_LF);
newline_combo_append (GTK_COMBO_BOX (combo),
store,
&iter,
- _("Mac OS Classic"),
+ gedit_utils_newline_type_to_string (GTK_SOURCE_NEWLINE_TYPE_CR),
GTK_SOURCE_NEWLINE_TYPE_CR);
newline_combo_append (GTK_COMBO_BOX (combo),
store,
&iter,
- _("Windows"),
+ gedit_utils_newline_type_to_string (GTK_SOURCE_NEWLINE_TYPE_CR_LF),
GTK_SOURCE_NEWLINE_TYPE_CR_LF);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
diff --git a/gedit/gedit-file-chooser-dialog-osx.c b/gedit/gedit-file-chooser-dialog-osx.c
index 51565c5..94f5bee 100644
--- a/gedit/gedit-file-chooser-dialog-osx.c
+++ b/gedit/gedit-file-chooser-dialog-osx.c
@@ -29,6 +29,7 @@
#include "gedit-file-chooser-dialog-osx.h"
#include "gedit-encoding-items.h"
#include "gedit-encodings-dialog.h"
+#include "gedit-utils.h"
struct _GeditFileChooserDialogOSXPrivate
{
@@ -71,18 +72,7 @@ G_DEFINE_TYPE_EXTENDED (GeditFileChooserDialogOSX,
{
NSString *title;
- switch (type)
- {
- case GTK_SOURCE_NEWLINE_TYPE_LF:
- title = [NSString stringWithUTF8String:_("Unix/Linux")];
- break;
- case GTK_SOURCE_NEWLINE_TYPE_CR:
- title = [NSString stringWithUTF8String:_("Mac OS Classic")];
- break;
- case GTK_SOURCE_NEWLINE_TYPE_CR_LF:
- title = [NSString stringWithUTF8String:_("Windows")];
- break;
- }
+ title = [NSString stringWithUTF8String:gedit_utils_newline_type_to_string (type)];
self = [super initWithTitle:title action:nil keyEquivalent:@""];
diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
index b709dcf..8bcb0f4 100644
--- a/gedit/gedit-utils.c
+++ b/gedit/gedit-utils.c
@@ -1444,6 +1444,22 @@ gedit_utils_set_direct_save_filename (GdkDragContext *context)
return uri;
}
+const gchar *
+gedit_utils_newline_type_to_string (GtkSourceNewlineType newline_type)
+{
+ switch (newline_type)
+ {
+ case GTK_SOURCE_NEWLINE_TYPE_LF:
+ return _("Unix/Linux");
+ case GTK_SOURCE_NEWLINE_TYPE_CR:
+ return _("Mac OS Classic");
+ case GTK_SOURCE_NEWLINE_TYPE_CR_LF:
+ return _("Windows");
+ }
+
+ return NULL;
+}
+
static gboolean
data_exists (GSList *list,
const gpointer data)
diff --git a/gedit/gedit-utils.h b/gedit/gedit-utils.h
index 3229ae2..e1785ea 100644
--- a/gedit/gedit-utils.h
+++ b/gedit/gedit-utils.h
@@ -129,6 +129,8 @@ GtkSourceCompressionType
gchar *gedit_utils_set_direct_save_filename (GdkDragContext *context);
+const gchar *gedit_utils_newline_type_to_string (GtkSourceNewlineType newline_type);
+
/* Private */
GSList *_gedit_utils_encoding_strv_to_list (const gchar * const *enc_str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]