From 983491bf39c03d46cba3020592cdf142b5f37675 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Mon, 11 Jan 2010 09:50:18 +0100
Subject: [PATCH] [AdgDress] s/adg_dress_name/adg_dress_get_name/

Renamed adg_dress_name() to adg_dress_get_name() to fulfill API
guidelines.

Fixing issue #8: http://dev.entidi.com/p/adg/issues/8/
---
 adg/adg-dress.c  | 42 +++++++++++++++++++++---------------------
 adg/adg-dress.h  |  4 ++--
 adg/adg-entity.c |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/adg/adg-dress.c b/adg/adg-dress.c
index f2b29a0c..a721963c 100644
--- a/adg/adg-dress.c
+++ b/adg/adg-dress.c
@@ -165,6 +165,21 @@ adg_dress_new_full(const gchar *name, AdgStyle *fallback, GType ancestor_type)
 }
 
 /**
+ * adg_dress_from_name:
+ * @name: the name of a dress
+ *
+ * Gets the dress bound to a @name string. No warnings are raised
+ * if the dress is not found.
+ *
+ * Returns: the #AdgDress code or #ADG_DRESS_UNDEFINED if not found
+ **/
+AdgDress
+adg_dress_from_name(const gchar *name)
+{
+    return quark_to_dress(g_quark_try_string(name));
+}
+
+/**
  * adg_dress_are_related:
  * @dress1: an #AdgDress
  * @dress2: another #AdgDress
@@ -213,11 +228,11 @@ adg_dress_set(AdgDress *dress, AdgDress src)
         const gchar *dress_name;
         const gchar *src_name;
 
-        dress_name = adg_dress_name(*dress);
+        dress_name = adg_dress_get_name(*dress);
         if (dress_name == NULL)
             dress_name = "UNDEFINED";
 
-        src_name = adg_dress_name(src);
+        src_name = adg_dress_get_name(src);
         if (src_name == NULL)
             src_name = "UNDEFINED";
 
@@ -233,7 +248,7 @@ adg_dress_set(AdgDress *dress, AdgDress src)
 }
 
 /**
- * adg_dress_name:
+ * adg_dress_get_name:
  * @dress: an #AdgDress
  *
  * Gets the name associated to @dress. No warnings are raised if
@@ -242,7 +257,7 @@ adg_dress_set(AdgDress *dress, AdgDress src)
  * Returns: the requested name or %NULL if not found
  **/
 const gchar *
-adg_dress_name(AdgDress dress)
+adg_dress_get_name(AdgDress dress)
 {
     if (dress <= 0 || dress >= array_len())
         return NULL;
@@ -251,21 +266,6 @@ adg_dress_name(AdgDress dress)
 }
 
 /**
- * adg_dress_from_name:
- * @name: the name of a dress
- *
- * Gets the dress bound to a @name string. No warnings are raised
- * if the dress is not found.
- *
- * Returns: the #AdgDress code or #ADG_DRESS_UNDEFINED if not found
- **/
-AdgDress
-adg_dress_from_name(const gchar *name)
-{
-    return quark_to_dress(g_quark_try_string(name));
-}
-
-/**
  * adg_dress_get_ancestor_type:
  * @dress: an #AdgDress
  *
@@ -344,7 +344,7 @@ adg_dress_set_fallback(AdgDress dress, AdgStyle *fallback)
     if (fallback != NULL && !adg_dress_style_is_compatible(dress, fallback)) {
         g_warning("%s: `%s' is not compatible with `%s' for `%s' dress",
                   G_STRLOC, g_type_name(G_TYPE_FROM_INSTANCE(fallback)),
-                  g_type_name(data->ancestor_type), adg_dress_name(dress));
+                  g_type_name(data->ancestor_type), adg_dress_get_name(dress));
         return;
     }
 
@@ -399,7 +399,7 @@ quark_to_dress(GQuark quark)
 static void
 dress_to_string(const GValue *src, GValue *dst)
 {
-    g_value_set_string(dst, adg_dress_name(g_value_get_int(src)));
+    g_value_set_string(dst, adg_dress_get_name(g_value_get_int(src)));
 }
 
 static void
diff --git a/adg/adg-dress.h b/adg/adg-dress.h
index 08b27143..b8848f31 100644
--- a/adg/adg-dress.h
+++ b/adg/adg-dress.h
@@ -42,12 +42,12 @@ AdgDress        adg_dress_new                   (const gchar    *name,
 AdgDress        adg_dress_new_full              (const gchar    *name,
                                                  AdgStyle       *fallback,
                                                  GType           ancestor_type);
+AdgDress        adg_dress_from_name             (const gchar    *name);
 gboolean        adg_dress_set                   (AdgDress       *dress,
                                                  AdgDress        src);
 gboolean        adg_dress_are_related           (AdgDress        dress1,
                                                  AdgDress        dress2);
-const gchar *   adg_dress_name                  (AdgDress        dress);
-AdgDress        adg_dress_from_name             (const gchar    *name);
+const gchar *   adg_dress_get_name              (AdgDress        dress);
 GType           adg_dress_get_ancestor_type     (AdgDress        dress);
 AdgStyle *      adg_dress_get_fallback          (AdgDress        dress);
 void            adg_dress_set_fallback          (AdgDress        dress,
diff --git a/adg/adg-entity.c b/adg/adg-entity.c
index 53ef1a8f..23bd9e9a 100644
--- a/adg/adg-entity.c
+++ b/adg/adg-entity.c
@@ -812,7 +812,7 @@ adg_entity_set_style(AdgEntity *entity, AdgDress dress, AdgStyle *style)
 
         g_warning(_("%s: `%s' is not compatible with `%s' for `%s' dress"),
                   G_STRLOC, g_type_name(G_TYPE_FROM_INSTANCE(style)),
-                  g_type_name(ancestor_type), adg_dress_name(dress));
+                  g_type_name(ancestor_type), adg_dress_get_name(dress));
 
         return;
     }
-- 
2.11.4.GIT