gtk+ r19454 - in trunk: . tests

[mitch svn gnome org]

Author: mitch
Date: Fri Feb  1 11:20:47 2008
New Revision: 19454
URL: http://svn.gnome.org/viewvc/gtk+?rev=19454&view=rev

Log:
2008-02-01  Michael Natterer  <mitch imendio com>

	* tests/testgtk.c: initialize GdkColor structs to fix warning
	about uninitialized "pixel" member.

	* tests/testactions.c: connect the toolbar_style() callback so it
	does something useful and doesn't warn about being defined but not
	used.



Modified:
   trunk/ChangeLog
   trunk/tests/testactions.c
   trunk/tests/testgtk.c

Modified: trunk/tests/testactions.c
==============================================================================
--- trunk/tests/testactions.c	(original)
+++ trunk/tests/testactions.c	Fri Feb  1 11:20:47 2008
@@ -95,13 +95,15 @@
 }
 
 static void
-toolbar_style (GtkAction *action, 
-	       gpointer   user_data)
+toolbar_style (GtkAction *action)
 {
   GtkToolbarStyle style;
 
   g_return_if_fail (toolbar != NULL);
-  style = GPOINTER_TO_INT (user_data);
+
+  radio_action (action);
+
+  style = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action));
 
   gtk_toolbar_set_style (toolbar, style);
 }
@@ -430,7 +432,7 @@
   gtk_action_group_add_radio_actions (action_group, 
 				      toolbar_entries, n_toolbar_entries, 
 				      GTK_TOOLBAR_BOTH,
-				      G_CALLBACK (radio_action), NULL);
+				      G_CALLBACK (toolbar_style), NULL);
   gtk_action_group_add_action_with_accel (action_group, action, NULL);
 
   create_window (action_group);

Modified: trunk/tests/testgtk.c
==============================================================================
--- trunk/tests/testgtk.c	(original)
+++ trunk/tests/testgtk.c	Fri Feb  1 11:20:47 2008
@@ -6761,8 +6761,8 @@
 
   if (!style1)
     {
-      GdkColor col1;
-      GdkColor col2;
+      GdkColor col1 = { 0, };
+      GdkColor col2 = { 0, };
 
       col1.red   = 0;
       col1.green = 56000;
@@ -6887,8 +6887,8 @@
   GtkWidget *label;
 
   GtkStyle *style;
-  GdkColor col1;
-  GdkColor col2;
+  GdkColor col1 = { 0, };
+  GdkColor col2 = { 0, };
 
   if (!window)
     {
@@ -7204,8 +7204,8 @@
   static GtkStyle *style2 = NULL;
 
   GtkCTreeNode *node;
-  GdkColor col1;
-  GdkColor col2;
+  GdkColor col1 = { 0, };
+  GdkColor col2 = { 0, };
 
   if (GTK_CLIST (ctree)->focus_row >= 0)
     node = GTK_CTREE_NODE