[gnac/devel] Code cleanup

[BenoÃt Dupasquier <bdupasqu src gnome org>]

commit 61c5832d73f0260cecee5529d263fe176c036786
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Tue Nov 15 16:47:51 2011 +0000

    Code cleanup

 src/profiles/gnac-profiles-utils.c |   54 ++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 21 deletions(-)
---
diff --git a/src/profiles/gnac-profiles-utils.c b/src/profiles/gnac-profiles-utils.c
index ff383f1..403e4f5 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -31,24 +31,39 @@ gchar *raw = NULL;
 gchar *audioconvert = NULL;
 
 
+static void
+gnac_profiles_utils_init_name(XMLDoc       *doc,
+                              const gchar  *format,
+                              gchar       **name)
+{
+  gchar *query;
+  query = g_strconcat("//profile[ id='", format, "']/name", NULL);
+  *name = gnac_profiles_xml_engine_get_text_node(doc, query);
+  g_free(query);
+}
+
+
+static void
+gnac_profiles_utils_init_extension(XMLDoc       *doc,
+                                   const gchar  *format,
+                                   gchar       **extension)
+{
+  gchar *query;
+  query = g_strconcat("//profile[ id='", format, "']/output-file-extension",
+      NULL);
+  *extension = gnac_profiles_xml_engine_get_text_node(doc, query);
+  g_free(query);
+}
+
+
 void
 gnac_profiles_utils_init_name_extension(XMLDoc       *doc,
                                         const gchar  *format,
                                         gchar       **name,
                                         gchar       **extension)
 {
-  gchar *query_name;
-  gchar *query_extension;
-
-  query_name = g_strconcat("//profile[ id='", format, "']/name", NULL);
-  query_extension = g_strconcat("//profile[ id='", format,
-      "']/output-file-extension", NULL);
-
-  *name = gnac_profiles_xml_engine_get_text_node(doc, query_name);
-  *extension = gnac_profiles_xml_engine_get_text_node(doc, query_extension);
-  
-  g_free(query_name);
-  g_free(query_extension);
+  gnac_profiles_utils_init_name(doc, format, name);
+  gnac_profiles_utils_init_extension(doc, format, extension);
 }
 
 
@@ -64,18 +79,15 @@ gchar *
 gnac_profiles_utils_init_description(XMLDoc      *doc,
                                      const gchar *format)
 {
-  gchar *xpath_query;
-  gchar *raw_desc;
-  gchar *desc;
+  gchar *query;
+  gchar *description;
 
-  xpath_query = g_strconcat("//profile[ id='", format, "']/description", NULL);
-  raw_desc = gnac_profiles_xml_engine_get_text_node(doc, xpath_query);
-  desc = g_strconcat("<i>", raw_desc, "</i>", NULL);
+  query = g_strconcat("//profile[ id='", format, "']/description", NULL);
+  description = gnac_profiles_xml_engine_get_text_node(doc, query);
 
-  g_free(xpath_query);
-  g_free(raw_desc);
+  g_free(query);
 
-  return desc;
+  return description;
 }