[gitg: 8/23] clean up sort callback

[Ignacio Casal Quinteiro <icq src gnome org>]

commit fd82ab29b71f14c8991c18e68427c22f16a73baa
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Aug 16 15:08:29 2012 +0200

    clean up sort callback

 egg-list-box.c |   33 ++++++++-------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/egg-list-box.c b/egg-list-box.c
index 91d8f73..8d7c19e 100644
--- a/egg-list-box.c
+++ b/egg-list-box.c
@@ -129,12 +129,6 @@ GtkWidget            *widget);
 static void                  egg_list_box_update_selected                     (EggListBox           *self,
 EggListBoxChildInfo  *child);
 static void                  egg_list_box_apply_filter_all                    (EggListBox           *self);
-static gint                  egg_list_box_do_sort                             (EggListBox           *self,
-EggListBoxChildInfo  *a,
-EggListBoxChildInfo  *b);
-static gint                  _egg_list_box_do_sort_gcompare_data_func         (gconstpointer         a,
-gconstpointer         b,
-gpointer              self);
 static void                  egg_list_box_update_separator                    (EggListBox           *self,
 GSequenceIter        *iter);
 static GSequenceIter *       egg_list_box_get_next_visible                    (EggListBox           *self,
@@ -508,22 +502,20 @@ egg_list_box_refilter (EggListBox *self)
 }
 
 static gint
-_egg_list_box_do_sort_gcompare_data_func (gconstpointer a,
-					  gconstpointer b,
-					  gpointer self)
+do_sort (EggListBoxChildInfo *a,
+	 EggListBoxChildInfo *b,
+	 EggListBox *self)
 {
-  return egg_list_box_do_sort (self,
-			       (EggListBoxChildInfo*)a,
-			       (EggListBoxChildInfo*)b);
+  return self->priv->sort_func (a->widget, b->widget,
+				self->priv->sort_func_target);
 }
 
-
 void
 egg_list_box_resort (EggListBox *self)
 {
   g_return_if_fail (self != NULL);
 
-  g_sequence_sort (self->priv->children, _egg_list_box_do_sort_gcompare_data_func, self);
+  g_sequence_sort (self->priv->children, (GCompareDataFunc)do_sort, self);
   egg_list_box_reseparate (self);
   gtk_widget_queue_resize ((GtkWidget*) self);
 }
@@ -577,7 +569,7 @@ egg_list_box_child_changed (EggListBox *self, GtkWidget *widget)
   if (self->priv->sort_func != NULL)
     {
       g_sequence_sort_changed (info->iter,
-			       _egg_list_box_do_sort_gcompare_data_func,
+			       (GCompareDataFunc)do_sort,
 			       self);
       gtk_widget_queue_resize ((GtkWidget*) self);
     }
@@ -600,15 +592,6 @@ egg_list_box_set_activate_on_single_click (EggListBox *self,
   self->priv->activate_single_click = single;
 }
 
-static gint
-egg_list_box_do_sort (EggListBox *self,
-		      EggListBoxChildInfo *a,
-		      EggListBoxChildInfo *b)
-{
-  return self->priv->sort_func (a->widget, b->widget,
-				self->priv->sort_func_target);
-}
-
 static void
 egg_list_box_add_move_binding (GtkBindingSet *binding_set,
 			       guint keyval,
@@ -1287,7 +1270,7 @@ egg_list_box_real_add (GtkContainer* base, GtkWidget* child)
   g_hash_table_insert (self->priv->child_hash, child, info);
   if (self->priv->sort_func != NULL)
     iter = g_sequence_insert_sorted (self->priv->children, info,
-				     _egg_list_box_do_sort_gcompare_data_func, self);
+				     (GCompareDataFunc)do_sort, self);
   else
     iter = g_sequence_append (self->priv->children, info);