gtk+ r20144 - in trunk: . tests

[bjornl svn gnome org]

Author: bjornl
Date: Sun May 25 08:41:15 2008
New Revision: 20144
URL: http://svn.gnome.org/viewvc/gtk+?rev=20144&view=rev

Log:
2008-05-25  BjÃrn Lindqvist  <bjourne gmail com>

	* tests/pixbuf-lowmem.c
	* tests/pixbuf-random.c
	* tests/pixbuf-randomly-modified.c
	* tests/pixbuf-read.c
	* tests/pixbuf-threads.c
	* tests/testgtk.c
	* tests/testtreeview.c: Fix remaining compiler warnings in these
	files (#523751).


Modified:
   trunk/ChangeLog
   trunk/tests/pixbuf-lowmem.c
   trunk/tests/pixbuf-random.c
   trunk/tests/pixbuf-randomly-modified.c
   trunk/tests/pixbuf-read.c
   trunk/tests/pixbuf-threads.c
   trunk/tests/testgtk.c
   trunk/tests/testtreeview.c

Modified: trunk/tests/pixbuf-lowmem.c
==============================================================================
--- trunk/tests/pixbuf-lowmem.c	(original)
+++ trunk/tests/pixbuf-lowmem.c	Sun May 25 08:41:15 2008
@@ -133,7 +133,7 @@
 };
 
 static void
-mem_test (const guchar *bytes, gsize len)
+mem_test (const gchar *bytes, gsize len)
 {
   gboolean did_fail = FALSE;
   GError *err = NULL;
@@ -143,7 +143,7 @@
   
   do {
     loader = gdk_pixbuf_loader_new ();
-    gdk_pixbuf_loader_write (loader, bytes, len, &err);
+    gdk_pixbuf_loader_write (loader, (guchar *) bytes, len, &err);
     if (err)
       {
 	g_error_free (err);

Modified: trunk/tests/pixbuf-random.c
==============================================================================
--- trunk/tests/pixbuf-random.c	(original)
+++ trunk/tests/pixbuf-random.c	Sun May 25 08:41:15 2008
@@ -26,7 +26,7 @@
 #include <string.h>
 
 static void
-assault (const gchar *header, gsize header_size, int n_images)
+assault (const guchar *header, gsize header_size, int n_images)
 {
   FILE *f;
   enum { N_CHARACTERS = 10000 };

Modified: trunk/tests/pixbuf-randomly-modified.c
==============================================================================
--- trunk/tests/pixbuf-randomly-modified.c	(original)
+++ trunk/tests/pixbuf-randomly-modified.c	Sun May 25 08:41:15 2008
@@ -34,7 +34,7 @@
 }
 
 static void
-randomly_modify (const guchar *image, guint size)
+randomly_modify (const gchar *image, guint size)
 {
   int i;
 

Modified: trunk/tests/pixbuf-read.c
==============================================================================
--- trunk/tests/pixbuf-read.c	(original)
+++ trunk/tests/pixbuf-read.c	Sun May 25 08:41:15 2008
@@ -74,7 +74,7 @@
 	{
 	  err = NULL;
 
-	  if (test_loader (contents, size, &err))
+	  if (test_loader ((guchar *) contents, size, &err))
 	    g_print ("success\n");
 	  else
 	    g_print ("error: %s\n", err->message);

Modified: trunk/tests/pixbuf-threads.c
==============================================================================
--- trunk/tests/pixbuf-threads.c	(original)
+++ trunk/tests/pixbuf-threads.c	Sun May 25 08:41:15 2008
@@ -33,7 +33,7 @@
   gchar *filename = data;
   FILE *file;
   int nbytes;
-  char buf[1024];
+  guchar buf[1024];
   size_t bufsize = 1024;
   GdkPixbufLoader *loader;
   GError *error = NULL;

Modified: trunk/tests/testgtk.c
==============================================================================
--- trunk/tests/testgtk.c	(original)
+++ trunk/tests/testgtk.c	Sun May 25 08:41:15 2008
@@ -6761,15 +6761,8 @@
 
   if (!style1)
     {
-      GdkColor col1 = { 0, };
-      GdkColor col2 = { 0, };
-
-      col1.red   = 0;
-      col1.green = 56000;
-      col1.blue  = 0;
-      col2.red   = 32000;
-      col2.green = 0;
-      col2.blue  = 56000;
+      GdkColor col1 = { 0, 0, 56000, 0};
+      GdkColor col2 = { 0, 32000, 0, 56000};
 
       style1 = gtk_style_copy (GTK_WIDGET (data)->style);
       style1->base[GTK_STATE_NORMAL] = col1;
@@ -6887,8 +6880,8 @@
   GtkWidget *label;
 
   GtkStyle *style;
-  GdkColor col1 = { 0, };
-  GdkColor col2 = { 0, };
+  GdkColor red_col = { 0, 56000, 0, 0};
+  GdkColor light_green_col = { 0, 0, 56000, 32000};
 
   if (!window)
     {
@@ -7019,16 +7012,9 @@
       sprintf (text[1], "Right");
       sprintf (text[2], "Center");
 
-      col1.red   = 56000;
-      col1.green = 0;
-      col1.blue  = 0;
-      col2.red   = 0;
-      col2.green = 56000;
-      col2.blue  = 32000;
-
       style = gtk_style_new ();
-      style->fg[GTK_STATE_NORMAL] = col1;
-      style->base[GTK_STATE_NORMAL] = col2;
+      style->fg[GTK_STATE_NORMAL] = red_col;
+      style->base[GTK_STATE_NORMAL] = light_green_col;
 
       pango_font_description_set_size (style->font_desc, 14 * PANGO_SCALE);
       pango_font_description_set_weight (style->font_desc, PANGO_WEIGHT_BOLD);
@@ -7204,8 +7190,8 @@
   static GtkStyle *style2 = NULL;
 
   GtkCTreeNode *node;
-  GdkColor col1 = { 0, };
-  GdkColor col2 = { 0, };
+  GdkColor green_col = { 0, 0, 56000, 0};
+  GdkColor purple_col = { 0, 32000, 0, 56000};
 
   if (GTK_CLIST (ctree)->focus_row >= 0)
     node = GTK_CTREE_NODE
@@ -7218,21 +7204,14 @@
 
   if (!style1)
     {
-      col1.red   = 0;
-      col1.green = 56000;
-      col1.blue  = 0;
-      col2.red   = 32000;
-      col2.green = 0;
-      col2.blue  = 56000;
-
       style1 = gtk_style_new ();
-      style1->base[GTK_STATE_NORMAL] = col1;
-      style1->fg[GTK_STATE_SELECTED] = col2;
+      style1->base[GTK_STATE_NORMAL] = green_col;
+      style1->fg[GTK_STATE_SELECTED] = purple_col;
 
       style2 = gtk_style_new ();
-      style2->base[GTK_STATE_SELECTED] = col2;
-      style2->fg[GTK_STATE_NORMAL] = col1;
-      style2->base[GTK_STATE_NORMAL] = col2;
+      style2->base[GTK_STATE_SELECTED] = purple_col;
+      style2->fg[GTK_STATE_NORMAL] = green_col;
+      style2->base[GTK_STATE_NORMAL] = purple_col;
       pango_font_description_free (style2->font_desc);
       style2->font_desc = pango_font_description_from_string ("courier 30");
     }
@@ -10448,7 +10427,7 @@
       gtk_widget_realize (window);
       
       circles = gdk_bitmap_create_from_data (window->window,
-					     circles_bits,
+					     (gchar *) circles_bits,
 					     circles_width,
 					     circles_height);
       gdk_window_set_icon (window->window, NULL,

Modified: trunk/tests/testtreeview.c
==============================================================================
--- trunk/tests/testtreeview.c	(original)
+++ trunk/tests/testtreeview.c	Sun May 25 08:41:15 2008
@@ -1050,7 +1050,7 @@
         
         g_value_init (value, G_TYPE_STRING);
 
-        str = g_strdup_printf ("%ld", type);
+        str = g_strdup_printf ("%ld", (long int) type);
         g_value_set_string (value, str);
         g_free (str);
       }
@@ -1249,7 +1249,9 @@
   if (parent == G_TYPE_INVALID)
     {
       if (type > G_TYPE_FUNDAMENTAL_MAX)
-        g_warning ("no parent for %ld %s\n", type, g_type_name (type));
+        g_warning ("no parent for %ld %s\n",
+                   (long int) type,
+                   g_type_name (type));
       return FALSE;
     }
   else