[rhythmbox/gobject-introspection: 8/24] update for latest gtk api changes

[Jonathan Matthew <jmatthew src gnome org>]

commit 1aa7a1af416c6a3d04dcbcd0057ebca7af21284b
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sun Dec 26 13:26:49 2010 +1000

    update for latest gtk api changes

 lib/eggsmclient-private.h                          |    2 +-
 lib/eggsmclient-xsmp.c                             |    3 ++-
 .../rb-disc-recorder-plugin.c                      |    2 +-
 shell/main.c                                       |    2 +-
 tests/bench-rhythmdb-load.c                        |    3 ++-
 tests/test-file-helpers.c                          |    3 ++-
 tests/test-rhythmdb-property-model.c               |    3 ++-
 tests/test-rhythmdb-query-model.c                  |    3 ++-
 8 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/lib/eggsmclient-private.h b/lib/eggsmclient-private.h
index ccb10bf..e391218 100644
--- a/lib/eggsmclient-private.h
+++ b/lib/eggsmclient-private.h
@@ -20,7 +20,7 @@
 #ifndef __EGG_SM_CLIENT_PRIVATE_H__
 #define __EGG_SM_CLIENT_PRIVATE_H__
 
-#include <gdkconfig.h>
+#include <gdk/gdk.h>
 #include "eggsmclient.h"
 
 G_BEGIN_DECLS
diff --git a/lib/eggsmclient-xsmp.c b/lib/eggsmclient-xsmp.c
index 8bebfba..645da38 100644
--- a/lib/eggsmclient-xsmp.c
+++ b/lib/eggsmclient-xsmp.c
@@ -36,6 +36,7 @@
 #include <X11/SM/SMlib.h>
 
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 
 #define EGG_TYPE_SM_CLIENT_XSMP            (egg_sm_client_xsmp_get_type ())
 #define EGG_SM_CLIENT_XSMP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
@@ -367,7 +368,7 @@ sm_client_xsmp_startup (EggSMClient *client,
       free (ret_client_id);
 
       gdk_threads_enter ();
-      gdk_set_sm_client_id (xsmp->client_id);
+      gdk_x11_set_sm_client_id (xsmp->client_id);
       gdk_threads_leave ();
 
       g_debug ("Got client ID \"%s\"", xsmp->client_id);
diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
index d5e3b92..3756c71 100644
--- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
@@ -190,7 +190,7 @@ rb_disc_recorder_plugin_start_burning (RBDiscRecorderPlugin *pi,
 	args = (char **) g_ptr_array_free (array, FALSE);
 
 	ret = TRUE;
-	if (!gdk_spawn_on_screen (screen, NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
+	if (!g_spawn_async (NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error)) {
 		if (copy != FALSE) {
 			rb_error_dialog (GTK_WINDOW (main_window),
 					 _("Rhythmbox could not duplicate the disc"),
diff --git a/shell/main.c b/shell/main.c
index 446b7af..eeb4c76 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -147,7 +147,7 @@ main (int argc, char **argv)
 	g_option_context_add_group (context, egg_sm_client_get_option_group ());
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-	gtk_set_locale ();
+	setlocale (LC_ALL, NULL);
 
 	rb_profile_start ("parsing command line options");
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
diff --git a/tests/bench-rhythmdb-load.c b/tests/bench-rhythmdb-load.c
index be1f5f9..7438f0c 100644
--- a/tests/bench-rhythmdb-load.c
+++ b/tests/bench-rhythmdb-load.c
@@ -31,6 +31,7 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
+#include <locale.h>
 
 #include "rb-debug.h"
 #include "rb-file-helpers.h"
@@ -100,7 +101,7 @@ main (int argc, char **argv)
 
 	g_thread_init (NULL);
 	rb_threads_init ();
-	gtk_set_locale ();
+	setlocale (LC_ALL, NULL);
 	gtk_init (&argc, &argv);
 	rb_debug_init (FALSE);
 	rb_refstring_system_init ();
diff --git a/tests/test-file-helpers.c b/tests/test-file-helpers.c
index d84ecc2..c21d22e 100644
--- a/tests/test-file-helpers.c
+++ b/tests/test-file-helpers.c
@@ -31,6 +31,7 @@
 
 #include <check.h>
 #include <gtk/gtk.h>
+#include <locale.h>
 #include "test-utils.h"
 #include "rb-file-helpers.h"
 #include "rb-util.h"
@@ -123,7 +124,7 @@ main (int argc, char **argv)
 	rb_profile_start ("rb-file-helpers test suite");
 	g_thread_init (NULL);
 	rb_threads_init ();
-	gtk_set_locale ();
+	setlocale (LC_ALL, NULL);
 	rb_debug_init (TRUE);
 	rb_file_helpers_init (TRUE);
 
diff --git a/tests/test-rhythmdb-property-model.c b/tests/test-rhythmdb-property-model.c
index 7905b52..9e40912 100644
--- a/tests/test-rhythmdb-property-model.c
+++ b/tests/test-rhythmdb-property-model.c
@@ -29,6 +29,7 @@
 
 #include <check.h>
 #include <gtk/gtk.h>
+#include <locale.h>
 #include "test-utils.h"
 #include "rhythmdb-query-model.h"
 #include "rhythmdb-property-model.h"
@@ -700,7 +701,7 @@ main (int argc, char **argv)
 
 	g_thread_init (NULL);
 	rb_threads_init ();
-	gtk_set_locale ();
+	setlocale (LC_ALL, NULL);
 	rb_debug_init (TRUE);
 	rb_refstring_system_init ();
 	rb_file_helpers_init (TRUE);
diff --git a/tests/test-rhythmdb-query-model.c b/tests/test-rhythmdb-query-model.c
index 5c801b8..6fdfadd 100644
--- a/tests/test-rhythmdb-query-model.c
+++ b/tests/test-rhythmdb-query-model.c
@@ -29,6 +29,7 @@
 
 #include <check.h>
 #include <gtk/gtk.h>
+#include <locale.h>
 #include "test-utils.h"
 #include "rhythmdb-query-model.h"
 
@@ -318,7 +319,7 @@ main (int argc, char **argv)
 
 	g_thread_init (NULL);
 	rb_threads_init ();
-	gtk_set_locale ();
+	setlocale (LC_ALL, NULL);
 	rb_debug_init (TRUE);
 	rb_refstring_system_init ();
 	rb_file_helpers_init (TRUE);