From 697ef7b8456ed8e1e5d8522bcc60fdf5dccc55ec Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 15 Nov 2011 11:05:02 -0500
Subject: Move some GBinding transform funcs to libedataserver.

Removes: e_binding_transform_enum_value_to_nick()
         e_binding_transform_enum_nick_to_value()

Those functions now live in libedataserver/e-data-server-util.h,
which e-util.h already includes.
---
 doc/reference/shell/eshell-sections.txt |  2 -
 e-util/e-util.c                         | 74 ---------------------------------
 e-util/e-util.h                         | 12 +-----
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 765bb28f8a..562af01fc9 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -1099,8 +1099,6 @@ e_util_guess_mime_type
 e_util_get_category_filter_options
 e_binding_transform_color_to_string
 e_binding_transform_string_to_color
-e_binding_transform_enum_nick_to_value
-e_binding_transform_enum_value_to_nick
 e_binding_transform_source_to_uid
 e_binding_transform_uid_to_source
 e_charset_add_radio_actions
diff --git a/e-util/e-util.c b/e-util/e-util.c
index cda17cbbc9..d41f43630e 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1439,80 +1439,6 @@ e_binding_transform_string_to_color (GBinding *binding,
 	return success;
 }
 
-/**
- * e_binding_transform_enum_value_to_nick:
- * @binding: a #GBinding
- * @source_value: a #GValue whose type is derived from #G_TYPE_ENUM
- * @target_value: a #GValue of type #G_TYPE_STRING
- * @not_used: not used
- *
- * Transforms an enumeration value to its corresponding nickname.
- *
- * Returns: %TRUE if the enum value has a corresponding nickname
- **/
-gboolean
-e_binding_transform_enum_value_to_nick (GBinding *binding,
-                                        const GValue *source_value,
-                                        GValue *target_value,
-                                        gpointer not_used)
-{
-	GEnumClass *enum_class;
-	GEnumValue *enum_value;
-	gint value;
-	gboolean success = FALSE;
-
-	g_return_val_if_fail (G_IS_BINDING (binding), FALSE);
-
-	enum_class = g_type_class_peek (G_VALUE_TYPE (source_value));
-	g_return_val_if_fail (G_IS_ENUM_CLASS (enum_class), FALSE);
-
-	value = g_value_get_enum (source_value);
-	enum_value = g_enum_get_value (enum_class, value);
-	if (enum_value != NULL) {
-		g_value_set_string (target_value, enum_value->value_nick);
-		success = TRUE;
-	}
-
-	return success;
-}
-
-/**
- * e_binding_transform_enum_nick_to_value:
- * @binding: a #GBinding
- * @source_value: a #GValue of type #G_TYPE_STRING
- * @target_value: a #GValue whose type is derived from #G_TYPE_ENUM
- * @not_used: not_used
- *
- * Transforms an enumeration nickname to its corresponding value.
- *
- * Returns: %TRUE if the enum nickname has a corresponding value
- **/
-gboolean
-e_binding_transform_enum_nick_to_value (GBinding *binding,
-                                        const GValue *source_value,
-                                        GValue *target_value,
-                                        gpointer not_used)
-{
-	GEnumClass *enum_class;
-	GEnumValue *enum_value;
-	const gchar *string;
-	gboolean success = FALSE;
-
-	g_return_val_if_fail (G_IS_BINDING (binding), FALSE);
-
-	enum_class = g_type_class_peek (G_VALUE_TYPE (target_value));
-	g_return_val_if_fail (G_IS_ENUM_CLASS (enum_class), FALSE);
-
-	string = g_value_get_string (source_value);
-	enum_value = g_enum_get_value_by_nick (enum_class, string);
-	if (enum_value != NULL) {
-		g_value_set_enum (target_value, enum_value->value);
-		success = TRUE;
-	}
-
-	return success;
-}
-
 /**
  * e_binding_transform_source_to_uid:
  * @binding: a #GBinding
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 1117781186..de2a817171 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -137,7 +137,7 @@ void		e_util_set_source_combo_box_list
 						(GtkWidget *source_combo_box,
 						 const gchar *source_gconf_path);
 
-/* Useful GBinding transformation functions */
+/* Useful GBinding transform functions */
 gboolean	e_binding_transform_color_to_string
 						(GBinding *binding,
 						 const GValue *source_value,
@@ -148,16 +148,6 @@ gboolean	e_binding_transform_string_to_color
 						 const GValue *source_value,
 						 GValue *target_value,
 						 gpointer not_used);
-gboolean	e_binding_transform_enum_value_to_nick
-						(GBinding *binding,
-						 const GValue *source_value,
-						 GValue *target_value,
-						 gpointer not_used);
-gboolean	e_binding_transform_enum_nick_to_value
-						(GBinding *binding,
-						 const GValue *source_value,
-						 GValue *target_value,
-						 gpointer not_used);
 gboolean	e_binding_transform_source_to_uid
 						(GBinding *binding,
 						 const GValue *source_value,
-- 
cgit v1.2.3