gtk+ r21797 - in branches/gtk-2-14: . gtk gtk/tests tests

[kmaraas svn gnome org]

Author: kmaraas
Date: Fri Nov 21 14:55:44 2008
New Revision: 21797
URL: http://svn.gnome.org/viewvc/gtk+?rev=21797&view=rev

Log:
2008-11-21  Kjartan Maraas  <kmaraas gnome org>

	* gtk/gtkbuilder.c: (_gtk_builder_flags_from_string):
	* gtk/gtkfilechooserdefault.c:
	(file_list_drag_data_received_get_info_cb):
	* gtk/gtkiconfactory.c: (icon_source_start_element):
	* gtk/gtkprintbackend.c: (gtk_print_backend_module_load):
	* gtk/gtkprintoperation.c: (run_pdf):
	* gtk/gtkthemes.c: (gtk_theme_engine_load):
	* gtk/tests/builder.c: (test_file):
	* tests/testmerge.c: (dump_tree):
	Missing format specifiers and some other small bits.
	Bugzilla bug #554567.

Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkbuilder.c
   branches/gtk-2-14/gtk/gtkfilechooserdefault.c
   branches/gtk-2-14/gtk/gtkiconfactory.c
   branches/gtk-2-14/gtk/gtkprintbackend.c
   branches/gtk-2-14/gtk/gtkprintoperation.c
   branches/gtk-2-14/gtk/gtkthemes.c
   branches/gtk-2-14/gtk/tests/builder.c
   branches/gtk-2-14/tests/testmerge.c

Modified: branches/gtk-2-14/gtk/gtkbuilder.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkbuilder.c	(original)
+++ branches/gtk-2-14/gtk/gtkbuilder.c	Fri Nov 21 14:55:44 2008
@@ -1456,7 +1456,7 @@
   gboolean eos, ret;
 
   g_return_val_if_fail (G_TYPE_IS_FLAGS (type), FALSE);
-  g_return_val_if_fail (string != 0, FALSE);
+  g_return_val_if_fail (string != NULL, FALSE);
 
   ret = TRUE;
   

Modified: branches/gtk-2-14/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c	Fri Nov 21 14:55:44 2008
@@ -4165,7 +4165,7 @@
 
   if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
        data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
-      data->uris[1] == 0 && !error &&
+      data->uris[1] == NULL && !error &&
       g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
     change_folder_and_display_error (data->impl, data->file, FALSE);
   else

Modified: branches/gtk-2-14/gtk/gtkiconfactory.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkiconfactory.c	(original)
+++ branches/gtk-2-14/gtk/gtkiconfactory.c	Fri Nov 21 14:55:44 2008
@@ -2863,7 +2863,7 @@
 		 error_domain,
 		 tmp);
 #else
-    g_warning (tmp);
+    g_warning ("%s", tmp);
 #endif    
     g_free (tmp);
     g_free (stock_id);

Modified: branches/gtk-2-14/gtk/gtkprintbackend.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkprintbackend.c	(original)
+++ branches/gtk-2-14/gtk/gtkprintbackend.c	Fri Nov 21 14:55:44 2008
@@ -119,7 +119,7 @@
   pb_module->library = g_module_open (pb_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   if (!pb_module->library)
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       return FALSE;
     }
   
@@ -131,7 +131,7 @@
       !g_module_symbol (pb_module->library, "pb_module_create", 
 			&createp))
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       g_module_close (pb_module->library);
       
       return FALSE;

Modified: branches/gtk-2-14/gtk/gtkprintoperation.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkprintoperation.c	(original)
+++ branches/gtk-2-14/gtk/gtkprintoperation.c	Fri Nov 21 14:55:44 2008
@@ -1848,10 +1848,10 @@
 				      width, height);
   if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
     {
-      g_set_error (&priv->error,
-		   GTK_PRINT_ERROR,
-		   GTK_PRINT_ERROR_GENERAL,
-		   cairo_status_to_string (cairo_surface_status (surface)));
+      g_set_error_literal (&priv->error,
+		           GTK_PRINT_ERROR,
+		           GTK_PRINT_ERROR_GENERAL,
+		           cairo_status_to_string (cairo_surface_status (surface)));
       *do_print = FALSE;
       return GTK_PRINT_OPERATION_RESULT_ERROR;
     }

Modified: branches/gtk-2-14/gtk/gtkthemes.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkthemes.c	(original)
+++ branches/gtk-2-14/gtk/gtkthemes.c	Fri Nov 21 14:55:44 2008
@@ -81,7 +81,7 @@
   g_free(engine_path);
   if (!engine->library)
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       return FALSE;
     }
   
@@ -93,7 +93,7 @@
       !g_module_symbol (engine->library, "theme_create_rc_style", 
 			(gpointer *)&engine->create_rc_style))
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       g_module_close (engine->library);
       
       return FALSE;

Modified: branches/gtk-2-14/gtk/tests/builder.c
==============================================================================
--- branches/gtk-2-14/gtk/tests/builder.c	(original)
+++ branches/gtk-2-14/gtk/tests/builder.c	Fri Nov 21 14:55:44 2008
@@ -2293,7 +2293,7 @@
 
   if (!gtk_builder_add_from_file (builder, filename, &error))
     {
-      g_error (error->message);
+      g_error ("%s", error->message);
       g_error_free (error);
       return;
     }

Modified: branches/gtk-2-14/tests/testmerge.c
==============================================================================
--- branches/gtk-2-14/tests/testmerge.c	(original)
+++ branches/gtk-2-14/tests/testmerge.c	Fri Nov 21 14:55:44 2008
@@ -43,7 +43,7 @@
   gchar *dump;
 
   dump = gtk_ui_manager_get_ui (merge);
-  g_message (dump);
+  g_message ("%s", dump);
   g_free (dump);
 }