]> Pileus Git - ~andy/gtk/commitdiff
tests: Make forcing of class registers work without gcc warnings
authorBenjamin Otte <otte@redhat.com>
Fri, 27 May 2011 02:20:45 +0000 (04:20 +0200)
committerBenjamin Otte <otte@redhat.com>
Fri, 27 May 2011 14:11:09 +0000 (16:11 +0200)
tests/testtreeview.c

index 80efc90fb8b92ba6130ba7b6428f8f267fa126c9..312b4ec69f9ac2404cbffae57f955322eeae014a 100644 (file)
@@ -626,17 +626,15 @@ create_tree_model (void)
   GtkTreeStore *store;
   gint i;
   GType *t;
-  volatile GType dummy; /* G_GNUC_CONST makes the optimizer remove
-                         * get_type calls if you don't do something
-                         * like this
-                         */
   
   /* Make the tree more interesting */
-  dummy = gtk_scrolled_window_get_type ();
-  dummy = gtk_label_get_type ();
-  dummy = gtk_hscrollbar_get_type ();
-  dummy = gtk_vscrollbar_get_type ();
-  dummy = pango_layout_get_type ();
+  /* - we need this magic here so we are sure the type ends up being
+   * registered and gcc doesn't optimize away the code */
+  g_type_class_unref (g_type_class_ref (gtk_scrolled_window_get_type ()));
+  g_type_class_unref (g_type_class_ref (gtk_label_get_type ()));
+  g_type_class_unref (g_type_class_ref (gtk_hscrollbar_get_type ()));
+  g_type_class_unref (g_type_class_ref (gtk_vscrollbar_get_type ()));
+  g_type_class_unref (g_type_class_ref (pango_layout_get_type ()));
 
   t = get_model_types ();