[maemo-commits] [maemo-commits] r15690 - in projects/haf/trunk/gtk+: . gtk/tests

[From: subversion at stage.maemo.org]

Author: kris
Date: 2008-06-25 16:17:06 +0300 (Wed, 25 Jun 2008)
New Revision: 15690

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/tests/treeview-hildon.c
Log:
2008-06-25  Kristian Rietveld  <kris at imendio.com>

	* gtk/tests/treeview-hildon.c: s/g_return_if_fail/g_assert/.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-06-25 13:15:23 UTC (rev 15689)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-06-25 13:17:06 UTC (rev 15690)
@@ -1,5 +1,9 @@
 2008-06-25  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/tests/treeview-hildon.c: s/g_return_if_fail/g_assert/.
+
+2008-06-25  Kristian Rietveld  <kris at imendio.com>
+
 	Implement GtkIconView behavior changes that are only in effect
 	when the hildon-mode style property is set to HILDON_FREMANTLE.
 

Modified: projects/haf/trunk/gtk+/gtk/tests/treeview-hildon.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/tests/treeview-hildon.c	2008-06-25 13:15:23 UTC (rev 15689)
+++ projects/haf/trunk/gtk+/gtk/tests/treeview-hildon.c	2008-06-25 13:17:06 UTC (rev 15690)
@@ -138,23 +138,23 @@
   GtkTreeIter iter;
 
   /* One item must be selected */
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
 
   /* Selection should move */
   path = gtk_tree_path_new_from_indices (10, -1);
   gtk_tree_selection_select_path (fixture->selection, path);
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
-  g_return_if_fail (gtk_tree_selection_path_is_selected (fixture->selection, path));
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_path_is_selected (fixture->selection, path));
 
   /* When selected item is deleted, first item should get selection */
   gtk_tree_model_get_iter (fixture->model, &iter, path);
   gtk_tree_path_free (path);
 
   gtk_list_store_remove (GTK_LIST_STORE (fixture->model), &iter);
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
 
   path = gtk_tree_path_new_from_indices (0, -1);
-  g_return_if_fail (gtk_tree_selection_path_is_selected (fixture->selection, path));
+  g_assert (gtk_tree_selection_path_is_selected (fixture->selection, path));
   gtk_tree_path_free (path);
 }
 
@@ -166,31 +166,31 @@
   GtkTreeIter iter;
 
   /* One item must be selected */
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
 
   /* Selection should move */
   path = gtk_tree_path_new_from_indices (10, -1);
   gtk_tree_selection_select_path (fixture->selection, path);
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 2);
-  g_return_if_fail (gtk_tree_selection_path_is_selected (fixture->selection, path));
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 2);
+  g_assert (gtk_tree_selection_path_is_selected (fixture->selection, path));
 
   /* When selected item is deleted, first item should get selection */
   gtk_tree_model_get_iter (fixture->model, &iter, path);
   gtk_tree_path_free (path);
 
   gtk_list_store_remove (GTK_LIST_STORE (fixture->model), &iter);
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
 
   /* Path 0 was selected and should still be selected */
   path = gtk_tree_path_new_from_indices (0, -1);
-  g_return_if_fail (gtk_tree_selection_path_is_selected (fixture->selection, path));
+  g_assert (gtk_tree_selection_path_is_selected (fixture->selection, path));
 
   /* Deleting path 0 should make the "new" path 0 selected */
   gtk_tree_model_get_iter (fixture->model, &iter, path);
   gtk_list_store_remove (GTK_LIST_STORE (fixture->model), &iter);
-  g_return_if_fail (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
+  g_assert (gtk_tree_selection_count_selected_rows (fixture->selection) == 1);
 
-  g_return_if_fail (gtk_tree_selection_path_is_selected (fixture->selection, path));
+  g_assert (gtk_tree_selection_path_is_selected (fixture->selection, path));
   gtk_tree_path_free (path);
 }