summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Borelli <pborelli@katamail.com>2008-07-16 14:13:29 +0000
committerPaolo Borelli <pborelli@src.gnome.org>2008-07-16 14:13:29 +0000
commit3e5cda3d3c59034d96498eff048fe16de964a29a (patch)
tree90e269752ac912ea18c2e5ce3dae93b30d27570c
parentf815c34a2b975ec7a74798850dd05527a6d80db7 (diff)
downloadgtk+-3e5cda3d3c59034d96498eff048fe16de964a29a.tar.gz
fix up broken test (cellview has no "clicked" signal) case and plug a
2008-07-15 Paolo Borelli <pborelli@katamail.com> * gtk/tests/builder.c: fix up broken test (cellview has no "clicked" signal) case and plug a couple of leaks. svn path=/trunk/; revision=20844
-rw-r--r--ChangeLog5
-rw-r--r--gtk/tests/builder.c11
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 41280b3e05..7257e58088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-15 Paolo Borelli <pborelli@katamail.com>
+
+ * gtk/tests/builder.c: fix up broken test (cellview has no "clicked"
+ signal) case and plug a couple of leaks.
+
2008-07-15 Matthias Clasen <mclasen@redhat.com>
Bug 543244 – crashes when renaming a bookmark
diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c
index 6d6d481015..115abc7753 100644
--- a/gtk/tests/builder.c
+++ b/gtk/tests/builder.c
@@ -64,7 +64,7 @@ test_parser (void)
g_assert (error != NULL);
g_assert (error->domain == GTK_BUILDER_ERROR);
g_assert (error->code == GTK_BUILDER_ERROR_UNHANDLED_TAG);
- g_error_free (error);
+ g_error_free (error);
error = NULL;
gtk_builder_add_from_string (builder, "<interface invalid=\"X\"/>", -1, &error);
@@ -622,7 +622,9 @@ test_list_store (void)
g_free (lastname);
g_assert (age == 50);
g_assert (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter) == FALSE);
-
+
+ g_object_unref (builder);
+
builder = builder_new_from_string (buffer3, -1, NULL);
store = gtk_builder_get_object (builder, "liststore1");
g_assert (gtk_tree_model_get_n_columns (GTK_TREE_MODEL (store)) == 3);
@@ -1392,9 +1394,9 @@ test_cell_view (void)
" <object class=\"GtkWindow\" id=\"window1\">"
" <child>"
" <object class=\"GtkCellView\" id=\"cellview1\">"
- " <accelerator key=\"q\" signal=\"clicked\"/>"
" <property name=\"visible\">True</property>"
" <property name=\"model\">liststore1</property>"
+ " <accelerator key=\"f\" modifiers=\"GDK_CONTROL_MASK\" signal=\"grab_focus\"/>"
" <child>"
" <object class=\"GtkCellRendererText\" id=\"renderer1\"/>"
" <attributes>"
@@ -1938,6 +1940,8 @@ test_icon_factory (void)
image = gtk_image_new_from_stock ("apple-red", GTK_ICON_SIZE_BUTTON);
g_assert (image != NULL);
+ g_object_unref (builder);
+
builder = builder_new_from_string (buffer2, -1, NULL);
factory = gtk_builder_get_object (builder, "iconfactory1");
g_assert (factory != NULL);
@@ -2099,7 +2103,6 @@ test_pango_attributes (void)
g_assert (error->code == GTK_BUILDER_ERROR_INVALID_ATTRIBUTE);
g_object_unref (builder);
g_error_free (error);
-
}