[gnac] Code optimisation



commit 0c27bbdb4e070299130af69aa39af8258d50ab48
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Thu Feb 9 22:11:23 2012 +0000

    Code optimisation

 libgnac/libgnac-output.c                |    3 +-
 src/gnac-options.c                      |    2 +-
 src/gnac-ui.c                           |   32 ++++++++++++++++--------------
 src/profiles/gnac-profiles-manager.c    |    8 ++++--
 src/profiles/gnac-profiles-xml-engine.c |   14 ++++++------
 5 files changed, 32 insertions(+), 27 deletions(-)
---
diff --git a/libgnac/libgnac-output.c b/libgnac/libgnac-output.c
index f3cd7e6..415cc5b 100644
--- a/libgnac/libgnac-output.c
+++ b/libgnac/libgnac-output.c
@@ -269,9 +269,10 @@ libgnac_output_rename_patterns_init(void)
 {
   guint i;
   for (i = 0; rename_pattern_id[i] != -1; i++) {
-    rename_patterns = g_slist_append(rename_patterns,
+    rename_patterns = g_slist_prepend(rename_patterns,
         libgnac_output_rename_pattern_new(rename_pattern_id[i]));
   }
+  rename_patterns = g_slist_reverse(rename_patterns);
 }
 
 
diff --git a/src/gnac-options.c b/src/gnac-options.c
index 79e245b..5b537ba 100644
--- a/src/gnac-options.c
+++ b/src/gnac-options.c
@@ -164,7 +164,7 @@ gnac_options_process_filenames(gchar **filenames)
 
     for (i = 0; i < len; i++) {
       uri = g_file_new_for_commandline_arg(filenames[i]);
-      list_files = g_slist_append(list_files, uri);
+      list_files = g_slist_prepend(list_files, uri);
     }
 
     gnac_add_files(list_files);
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 05ce579..e7020e2 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -191,7 +191,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   gtk_file_filter_set_name(filter, _("All files"));
   gtk_tree_store_append(store, &iter1, NULL);
   gtk_tree_store_set(store, &iter1, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Supported files */
   filter = gtk_file_filter_new();
@@ -218,7 +218,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter1, NULL);
   gtk_tree_store_set(store, &iter1, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
   default_file_filter = filter;
 
   /* Audio files */
@@ -241,7 +241,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter1, NULL);
   gtk_tree_store_set(store, &iter1, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Lossy files */
   filter = gtk_file_filter_new();
@@ -253,7 +253,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter2, &iter1);
   gtk_tree_store_set(store, &iter2, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Individual lossy files */
   i = 0;
@@ -263,7 +263,7 @@ gnac_ui_file_chooser_get_filters_model(void)
     gtk_file_filter_set_name(filter, lossy_mime[i][1]);
     gtk_tree_store_append(store, &iter3, &iter2);
     gtk_tree_store_set(store, &iter3, 0, filter, -1);
-    filters = g_slist_append(filters, filter);
+    filters = g_slist_prepend(filters, filter);
     i++;
   }
 
@@ -277,7 +277,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter2, &iter1);
   gtk_tree_store_set(store, &iter2, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Individual lossless files */
   i = 0;
@@ -287,7 +287,7 @@ gnac_ui_file_chooser_get_filters_model(void)
     gtk_file_filter_set_name(filter, lossless_mime[i][1]);
     gtk_tree_store_append(store, &iter3, &iter2);
     gtk_tree_store_set(store, &iter3, 0, filter, -1);
-    filters = g_slist_append(filters, filter);
+    filters = g_slist_prepend(filters, filter);
     i++;
   }
 
@@ -301,7 +301,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter1, NULL);
   gtk_tree_store_set(store, &iter1, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Individual playlists */
   i = 0;
@@ -311,7 +311,7 @@ gnac_ui_file_chooser_get_filters_model(void)
     gtk_file_filter_set_name(filter, playlists_mime[i][1]);
     gtk_tree_store_append(store, &iter2, &iter1);
     gtk_tree_store_set(store, &iter2, 0, filter, -1);
-    filters = g_slist_append(filters, filter);
+    filters = g_slist_prepend(filters, filter);
     i++;
   }
 
@@ -325,7 +325,7 @@ gnac_ui_file_chooser_get_filters_model(void)
   }
   gtk_tree_store_append(store, &iter1, NULL);
   gtk_tree_store_set(store, &iter1, 0, filter, -1);
-  filters = g_slist_append(filters, filter);
+  filters = g_slist_prepend(filters, filter);
 
   /* Individual video files */
   i = 0;
@@ -335,10 +335,12 @@ gnac_ui_file_chooser_get_filters_model(void)
     gtk_file_filter_set_name(filter, video_mime[i][1]);
     gtk_tree_store_append(store, &iter2, &iter1);
     gtk_tree_store_set(store, &iter2, 0, filter, -1);
-    filters = g_slist_append(filters, filter);
+    filters = g_slist_prepend(filters, filter);
     i++;
   }
 
+  filters = g_slist_reverse(filters);
+
   for (f = filters; f; f = g_slist_next(f)) {
     g_object_ref(f->data);
   }
@@ -353,7 +355,7 @@ gnac_ui_file_chooser_foreach(gpointer data,
 {
   GSList **list = (GSList **) user_data;
   GFile *file = g_file_new_for_uri((gchar *) data);
-  *list = g_slist_append(*list, file);
+  *list = g_slist_prepend(*list, file);
   g_free(data);
 }
 
@@ -903,17 +905,17 @@ gnac_ui_on_drag_data_received_cb(GtkWidget        *widget,
   gchar **uris = gtk_selection_data_get_uris(selection_data);
 
   if (!uris) {
-    gtk_drag_finish (context, FALSE, FALSE, time);
+    gtk_drag_finish(context, FALSE, FALSE, time);
     return;
   }
 
-  guint   index = 0;
+  guint index = 0;
   GSList *list_uris = NULL;
 
   gchar *uri = uris[index];
   while (uri) {
     GFile *file = g_file_new_for_uri(uri);
-    list_uris = g_slist_append(list_uris, file);
+    list_uris = g_slist_prepend(list_uris, file);
     index++;
     uri = uris[index];
   }
diff --git a/src/profiles/gnac-profiles-manager.c b/src/profiles/gnac-profiles-manager.c
index a049687..3ba18d1 100644
--- a/src/profiles/gnac-profiles-manager.c
+++ b/src/profiles/gnac-profiles-manager.c
@@ -302,7 +302,7 @@ gnac_profiles_mgr_list_profiles(void)
           &profile);
       if (profile) {
         gpointer name = (profile->generic)->name;
-        profiles = g_slist_append(profiles, name);
+        profiles = g_slist_prepend(profiles, name);
       }
 
       g_free(profile_file_path);
@@ -312,6 +312,8 @@ gnac_profiles_mgr_list_profiles(void)
     g_object_unref(file_info);
   }
 
+  profiles = g_slist_reverse(profiles);
+
   guint count = g_slist_length(profiles);
   if (count == 0) {
     g_print("\t");
@@ -506,11 +508,11 @@ gnac_profiles_mgr_get_profiles_list(void)
   while (has_next) {
     AudioProfileGeneric *profile;
     gtk_tree_model_get(model, &iter, COL_PROFILE, &profile, -1);
-    list = g_list_append(list, profile);
+    list = g_list_prepend(list, profile);
     has_next = gtk_tree_model_iter_next(model, &iter);
   }
 
-  return list;
+  return g_list_reverse(list);
 }
 
 
diff --git a/src/profiles/gnac-profiles-xml-engine.c b/src/profiles/gnac-profiles-xml-engine.c
index 44c74e0..bf27be7 100755
--- a/src/profiles/gnac-profiles-xml-engine.c
+++ b/src/profiles/gnac-profiles-xml-engine.c
@@ -216,13 +216,13 @@ gnac_profiles_xml_engine_get_list_values(XMLDoc      *doc,
           (gchar *) xmlNodeGetContent(current_node->children));
       val->value =
           (gchar *) xmlNodeGetContent(current_node->properties->children);
-      list = g_list_append(list, val);
+      list = g_list_prepend(list, val);
     }
   }
 
   xmlXPathFreeObject(xpath_obj);
 
-  return list;
+  return g_list_reverse(list);
 }
 
 
@@ -278,10 +278,10 @@ gnac_profiles_xml_engine_get_combo_values(XMLDoc      *doc,
 
     while (current_node && current_node != values_last) {
       if (!gnac_profiles_xml_engine_is_i18n_node(current_node)) {
-        values = g_list_append(values,
+        values = g_list_prepend(values,
             xmlNodeGetContent(current_node->properties->children));
         xmlChar *content = xmlNodeGetContent(current_node->children);
-        names = g_list_append(names, g_strdup(gettext((gchar *) content)));
+        names = g_list_prepend(names, g_strdup(gettext((gchar *) content)));
         xmlFree(content);
       }
 
@@ -295,8 +295,8 @@ gnac_profiles_xml_engine_get_combo_values(XMLDoc      *doc,
     xmlXPathFreeObject(xpath_obj);
 
     ComboValues *combo_values = g_malloc(sizeof(ComboValues));
-    combo_values->values = values;
-    combo_values->names = names;
+    combo_values->names = g_list_reverse(names);
+    combo_values->values = g_list_reverse(values);
     combo_values->default_value = default_value;
     combo_values->variable_name = variable_name;
 
@@ -553,7 +553,7 @@ gnac_profiles_xml_engine_free_combo_values(ComboValues *values)
 {
   if (!values) return;
 
-  g_list_free_full(values->values, (GDestroyNotify) g_free);
+  g_list_free_full(values->values, (GDestroyNotify) xmlFree);
   g_list_free_full(values->names, (GDestroyNotify) g_free);
   g_free(values->default_value);
   g_free(values->variable_name);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]