[gtksourceview] encoding: make a private function static
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] encoding: make a private function static
- Date: Tue, 12 Aug 2014 14:11:37 +0000 (UTC)
commit 9dc8a159f8f442cad02194c34665eeb74932b6ce
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Aug 12 15:52:21 2014 +0200
encoding: make a private function static
The private function was used only in gtksourceencoding.c.
gtksourceview/gtksourceencoding.c | 90 ++++++++++++++++++------------------
gtksourceview/gtksourceencoding.h | 3 -
2 files changed, 45 insertions(+), 48 deletions(-)
---
diff --git a/gtksourceview/gtksourceencoding.c b/gtksourceview/gtksourceencoding.c
index 8de3b83..b0fc819 100644
--- a/gtksourceview/gtksourceencoding.c
+++ b/gtksourceview/gtksourceencoding.c
@@ -487,6 +487,50 @@ gtk_source_encoding_get_name (const GtkSourceEncoding* enc)
return (enc->name == NULL) ? _("Unknown") : _(enc->name);
}
+static gboolean
+data_exists (GSList *list,
+ const gpointer data)
+{
+ for (; list != NULL; list = g_slist_next (list))
+ {
+ if (list->data == data)
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static GSList *
+strv_to_list (const gchar * const *enc_str)
+{
+ GSList *res = NULL;
+ gchar **p;
+
+ for (p = (gchar **)enc_str; p != NULL && *p != NULL; p++)
+ {
+ const gchar *charset = *p;
+ const GtkSourceEncoding *enc;
+
+ if (g_str_equal (charset, "CURRENT"))
+ {
+ g_get_charset (&charset);
+ }
+
+ g_return_val_if_fail (charset != NULL, NULL);
+ enc = gtk_source_encoding_get_from_charset (charset);
+
+ if (enc != NULL &&
+ !data_exists (res, (gpointer)enc))
+ {
+ res = g_slist_prepend (res, (gpointer)enc);
+ }
+ }
+
+ return g_slist_reverse (res);
+}
+
/**
* gtk_source_encoding_get_default_candidates:
*
@@ -528,7 +572,7 @@ gtk_source_encoding_get_default_candidates (void)
encodings_strv = g_variant_get_strv (encodings_variant, NULL);
- encodings_list = _gtk_source_encoding_strv_to_list (encodings_strv);
+ encodings_list = strv_to_list (encodings_strv);
g_variant_unref (encodings_variant);
return encodings_list;
@@ -564,47 +608,3 @@ gtk_source_encoding_free (GtkSourceEncoding *enc)
{
g_return_if_fail (enc != NULL);
}
-
-static gboolean
-data_exists (GSList *list,
- const gpointer data)
-{
- for (; list != NULL; list = g_slist_next (list))
- {
- if (list->data == data)
- {
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-GSList *
-_gtk_source_encoding_strv_to_list (const gchar * const *enc_str)
-{
- GSList *res = NULL;
- gchar **p;
-
- for (p = (gchar **)enc_str; p != NULL && *p != NULL; p++)
- {
- const gchar *charset = *p;
- const GtkSourceEncoding *enc;
-
- if (g_str_equal (charset, "CURRENT"))
- {
- g_get_charset (&charset);
- }
-
- g_return_val_if_fail (charset != NULL, NULL);
- enc = gtk_source_encoding_get_from_charset (charset);
-
- if (enc != NULL &&
- !data_exists (res, (gpointer)enc))
- {
- res = g_slist_prepend (res, (gpointer)enc);
- }
- }
-
- return g_slist_reverse (res);
-}
diff --git a/gtksourceview/gtksourceencoding.h b/gtksourceview/gtksourceencoding.h
index 3b4dabc..d3bad55 100644
--- a/gtksourceview/gtksourceencoding.h
+++ b/gtksourceview/gtksourceencoding.h
@@ -67,9 +67,6 @@ GSList *gtk_source_encoding_get_default_candidates
GtkSourceEncoding *gtk_source_encoding_copy (const GtkSourceEncoding *enc);
void gtk_source_encoding_free (GtkSourceEncoding *enc);
-G_GNUC_INTERNAL
-GSList *_gtk_source_encoding_strv_to_list (const gchar * const *enc_str);
-
G_END_DECLS
#endif /* __GTK_SOURCE_ENCODING_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]