[Xfce4-commits] <mousepad:matt/gtksourceview> Change mousepad_util_color_schemes_get_sorted to use GSList.

[Matthew Brush]

Updating branch refs/heads/matt/gtksourceview
         to 5d74b7018dd0f821f6f37a0293868466a9b836b3 (commit)
       from 81eb018689978502e6a128436ed4cb8ab5de77cf (commit)

commit 5d74b7018dd0f821f6f37a0293868466a9b836b3
Author: Matthew Brush <matt at xfce.org>
Date:   Wed Oct 5 20:50:06 2011 -0700

    Change mousepad_util_color_schemes_get_sorted to use GSList.
    
    Also add some comments and set default value on selected_color_scheme in
    mousepad_window_menu_color_schemes.

 mousepad/mousepad-util.c   |    8 ++++----
 mousepad/mousepad-util.h   |    6 +++++-
 mousepad/mousepad-window.c |   16 ++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mousepad/mousepad-util.c b/mousepad/mousepad-util.c
index 8e4bfa4..31bac40 100644
--- a/mousepad/mousepad-util.c
+++ b/mousepad/mousepad-util.c
@@ -1091,10 +1091,10 @@ mousepad_util_color_schemes_name_compare (gconstpointer a,
 
 
 
-GList *
+GSList *
 mousepad_util_color_schemes_get_sorted (void)
 {
-  GList                *list = NULL;
+  GSList               *list = NULL;
   const gchar * const  *schemes;
   GtkSourceStyleScheme *scheme;
 
@@ -1105,11 +1105,11 @@ mousepad_util_color_schemes_get_sorted (void)
     {
       scheme = gtk_source_style_scheme_manager_get_scheme (
                 gtk_source_style_scheme_manager_get_default (), *schemes);
-      list = g_list_prepend (list, scheme);
+      list = g_slist_prepend (list, scheme);
       schemes++;
     }
 
-  return g_list_sort (list, mousepad_util_color_schemes_name_compare);
+  return g_slist_sort (list, mousepad_util_color_schemes_name_compare);
 }
 
 
diff --git a/mousepad/mousepad-util.h b/mousepad/mousepad-util.h
index bdf22d1..539e11e 100644
--- a/mousepad/mousepad-util.h
+++ b/mousepad/mousepad-util.h
@@ -121,10 +121,14 @@ gint       mousepad_util_search                           (GtkTextBuffer       *
 
 gint       mousepad_util_color_schemes_name_compare       (gconstpointer        a,
                                                            gconstpointer        b);
-GList     *mousepad_util_color_schemes_get_sorted         (void);
+
+GSList    *mousepad_util_color_schemes_get_sorted         (void);
+
 gint       mousepad_util_languages_name_compare           (gconstpointer        a,
                                                            gconstpointer        b);
+
 GSList    *mousepad_util_language_sections_get_sorted     (void);
+
 GSList    *mousepad_util_languages_get_sorted_for_section (const gchar         *section);
 
 G_END_DECLS
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 07fddfe..e2d51db 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -3077,10 +3077,9 @@ static void
 mousepad_window_menu_color_schemes (MousepadWindow *window)
 {
   GtkRadioAction       *action;
-  GSList               *group = NULL;
-  GList                *schemes, *iter;
+  GSList               *group = NULL, *schemes, *iter;
   gint                  merge_id;
-  gchar                *name, *selected_color_scheme;
+  gchar                *name, *selected_color_scheme = NULL;
 
   /* lock menu updates */
   lock_menu_updates++;
@@ -3119,11 +3118,12 @@ mousepad_window_menu_color_schemes (MousepadWindow *window)
                          "color-scheme-separator", NULL, GTK_UI_MANAGER_SEPARATOR, FALSE);
 
   /* add the color schemes to the menu */
-  for (iter = schemes; iter != NULL; iter = g_list_next (iter))
+  for (iter = schemes; iter != NULL; iter = g_slist_next (iter))
     {
       /* create action name */
       name = g_strdup_printf ("color-scheme_%s", gtk_source_style_scheme_get_id (iter->data));
 
+      /* create action for colour scheme */
       action = gtk_radio_action_new (name,
                                      gtk_source_style_scheme_get_name (iter->data),
                                      gtk_source_style_scheme_get_description (iter->data),
@@ -3151,7 +3151,7 @@ mousepad_window_menu_color_schemes (MousepadWindow *window)
     }
 
   /* cleanup the list */
-  g_list_free (schemes);
+  g_slist_free (schemes);
 
   /* unlock */
   lock_menu_updates--;
@@ -4413,7 +4413,7 @@ mousepad_window_action_color_scheme (GtkToggleAction *action,
   GtkTextBuffer        *buffer;
   GtkSourceStyleScheme *scheme = NULL;
   MousepadDocument     *document;
-  GList                *schemes, *iter;
+  GSList               *schemes, *iter;
 
   mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window));
 
@@ -4429,7 +4429,7 @@ mousepad_window_action_color_scheme (GtkToggleAction *action,
         {
           /* lookup the scheme from the id hash */
           schemes = mousepad_util_color_schemes_get_sorted ();
-          for (iter = schemes; iter != NULL; iter = g_list_next (iter))
+          for (iter = schemes; iter != NULL; iter = g_slist_next (iter))
             {
               if (scheme_id_hash == g_str_hash (gtk_source_style_scheme_get_id (iter->data)))
                 {
@@ -4437,7 +4437,7 @@ mousepad_window_action_color_scheme (GtkToggleAction *action,
                   break;
                 }
             }
-          g_list_free (schemes);
+          g_slist_free (schemes);
         }
 
       /* store as last used value */