Do not ignore the return value of g_slist_remove. gtkstyle.c changes

2008-06-19  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkclist.c:
    * gtk/gtkstyle.c (gtk_style_finalize):
    Do not ignore the return value of g_slist_remove.
    gtkstyle.c changes rubberstamped by Owen.

svn path=/trunk/; revision=20469

diff --git a/ChangeLog b/ChangeLog
index 658f56d7bf3ac4c5544b33bd774fe323027b877f..bc8e968f42ae04a07c60c820c0645e01daab86c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-19  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkclist.c:
+       * gtk/gtkstyle.c (gtk_style_finalize):
+       Do not ignore the return value of g_slist_remove.
+       gtkstyle.c changes rubberstamped by Owen.
+
 2008-06-19  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_grid_lines),

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index ced0671dce1bfb08f2b1b544e0b0b1ea15fe5f1f..705cd48e994171dd67d35caa4ea6d5c7bd772ddb 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2826,7 +2826,7 @@ real_remove_row (GtkCList *clist,
     clist->row_list = g_list_next (list);
   if (clist->row_list_end == list)
     clist->row_list_end = g_list_previous (list);
-  g_list_remove (list, clist_row);
+  list = g_list_remove (list, clist_row);
 
   if (row < ROW_FROM_YPIXEL (clist, 0))
     clist->voffset += clist->row_height + CELL_SPACING;

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 8df1c74344b446df010e4e272d9ebfa02b1238fd..ea01c51e83e512ed2649935ca20ebf3743f2a484 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -590,7 +590,7 @@ gtk_style_finalize (GObject *object)
   if (style->styles)
     {
       if (style->styles->data != style)
-        g_slist_remove (style->styles, style);
+        style->styles = g_slist_remove (style->styles, style);
       else
         {
           GSList *tmp_list = style->styles->next;