[Xfce4-commits] <exo:stephan/icon-bar-improvements> Use the correct number of arguments for the 'row-deleted' callback.

[Stephan Arts]

Updating branch refs/heads/stephan/icon-bar-improvements
         to a88f774e37d4ce8c1e50fa01d0ed3da7b9963f1f (commit)
       from 421c9dfec322fc34a8b8ce049007b60a1d20296c (commit)

commit a88f774e37d4ce8c1e50fa01d0ed3da7b9963f1f
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Jan 29 22:09:44 2012 +0100

    Use the correct number of arguments for the 'row-deleted' callback.
    
     - Fix segfault when deleting rows from the treemodel
     - Add g_return_if_fail () to check the type of the supplied
       user_data argument.

 exo/exo-icon-bar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/exo/exo-icon-bar.c b/exo/exo-icon-bar.c
index 22732a6..a81ead3 100644
--- a/exo/exo-icon-bar.c
+++ b/exo/exo-icon-bar.c
@@ -176,7 +176,6 @@ static void            exo_icon_bar_row_inserted          (GtkTreeModel     *mod
                                                            ExoIconBar       *icon_bar);
 static void            exo_icon_bar_row_deleted           (GtkTreeModel     *model,
                                                            GtkTreePath      *path,
-                                                           GtkTreeIter      *iter,
                                                            ExoIconBar       *icon_bar);
 static void            exo_icon_bar_rows_reordered        (GtkTreeModel     *model,
                                                            GtkTreePath      *path,
@@ -1450,7 +1449,6 @@ exo_icon_bar_row_inserted (GtkTreeModel *model,
 static void
 exo_icon_bar_row_deleted (GtkTreeModel *model,
                           GtkTreePath  *path,
-                          GtkTreeIter  *iter,
                           ExoIconBar   *icon_bar)
 {
   ExoIconBarItem *item;
@@ -1459,6 +1457,8 @@ exo_icon_bar_row_deleted (GtkTreeModel *model,
   GList          *lp;
   gint            idx;
 
+  g_return_if_fail (EXO_IS_ICON_BAR (icon_bar));
+
   idx = gtk_tree_path_get_indices (path)[0];
   lp = g_list_nth (icon_bar->priv->items, idx);
   item = lp->data;