Index: gtk/gtkthemes.c
===================================================================
--- gtk/gtkthemes.c	(revisjon 21554)
+++ gtk/gtkthemes.c	(arbeidskopi)
@@ -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;
Index: gtk/gtkiconfactory.c
===================================================================
--- gtk/gtkiconfactory.c	(revisjon 21554)
+++ gtk/gtkiconfactory.c	(arbeidskopi)
@@ -2863,7 +2863,7 @@
 		 error_domain,
 		 tmp);
 #else
-    g_warning (tmp);
+    g_warning ("%s", tmp);
 #endif    
     g_free (tmp);
     g_free (stock_id);
Index: gtk/gtkbuilder.c
===================================================================
--- gtk/gtkbuilder.c	(revisjon 21554)
+++ gtk/gtkbuilder.c	(arbeidskopi)
@@ -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;
   
Index: gtk/gtkfilechooserdefault.c
===================================================================
--- gtk/gtkfilechooserdefault.c	(revisjon 21554)
+++ gtk/gtkfilechooserdefault.c	(arbeidskopi)
@@ -4157,7 +4157,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
Index: gtk/tests/builder.c
===================================================================
--- gtk/tests/builder.c	(revisjon 21554)
+++ gtk/tests/builder.c	(arbeidskopi)
@@ -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;
     }
Index: gtk/gtkprintbackend.c
===================================================================
--- gtk/gtkprintbackend.c	(revisjon 21554)
+++ gtk/gtkprintbackend.c	(arbeidskopi)
@@ -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;
Index: gtk/gtkfilesystem.c
===================================================================
--- gtk/gtkfilesystem.c	(revisjon 21554)
+++ gtk/gtkfilesystem.c	(arbeidskopi)
@@ -323,7 +323,7 @@
 				NULL, FALSE, 0, NULL,
 				NULL, &error))
     {
-      g_critical (error->message);
+      g_critical ("%s", error->message);
       g_error_free (error);
     }
 
@@ -531,7 +531,7 @@
 						 G_FILE_MONITOR_NONE,
 						 NULL, &error);
   if (error)
-    g_warning (error->message);
+    g_warning ("%s", error->message);
   else
     g_signal_connect (priv->bookmarks_monitor, "changed",
 		      G_CALLBACK (bookmarks_file_changed), file_system);
@@ -1304,7 +1304,7 @@
 
   if (error)
     {
-      g_warning (error->message);
+      g_warning ("%s", error->message);
       g_error_free (error);
       return;
     }
@@ -1360,7 +1360,7 @@
   priv->directory_monitor = g_file_monitor_directory (priv->folder_file, G_FILE_MONITOR_NONE, NULL, &error);
 
   if (error)
-    g_warning (error->message);
+    g_warning ("%s", error->message);
   else
     g_signal_connect (priv->directory_monitor, "changed",
 		      G_CALLBACK (directory_monitor_changed), object);
Index: gtk/gtkprintoperation.c
===================================================================
--- gtk/gtkprintoperation.c	(revisjon 21554)
+++ gtk/gtkprintoperation.c	(arbeidskopi)
@@ -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;
     }
Index: tests/testmerge.c
===================================================================
--- tests/testmerge.c	(revisjon 21554)
+++ tests/testmerge.c	(arbeidskopi)
@@ -43,7 +43,7 @@
   gchar *dump;
 
   dump = gtk_ui_manager_get_ui (merge);
-  g_message (dump);
+  g_message ("%s", dump);
   g_free (dump);
 }
 
Index: modules/other/gail/gailtextview.c
===================================================================
--- modules/other/gail/gailtextview.c	(revisjon 21554)
+++ modules/other/gail/gailtextview.c	(arbeidskopi)
@@ -1733,11 +1733,11 @@
 	    gio = g_io_channel_unix_new (fd);
 	    g_io_channel_set_encoding (gio, NULL, &err);
 	    if (!err) g_io_channel_write_chars (gio, (const char *) cbuf, (gssize) len, &written, &err);
-	    else g_message (err->message);
+	    else g_message ("%s", err->message);
 	    if (!err) g_io_channel_seek_position (gio, 0, G_SEEK_SET, &err);
-	    else g_message (err->message);
+	    else g_message ("%s", err->message);
 	    if (!err) g_io_channel_flush (gio, &err);
-	    else g_message (err->message);
+	    else g_message ("%s", err->message);
 	    if (err) {
 		g_message ("<error writing to stream [%s]>", tname);
 		g_error_free (err);
