[gnome-bluetooth] Make it compile against latest GTK+ 3.x

[Bastien Nocera <hadess src gnome org>]

commit 4c9034c4f334c97b43cbbde11ba596904cb3591c
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 23 13:20:18 2010 +0100

    Make it compile against latest GTK+ 3.x

 applet/main.c                  |    2 +-
 applet/notify.c                |   10 +++++++---
 lib/bluetooth-chooser-button.c |    2 +-
 lib/test-deviceselection.c     |    4 ++--
 moblin/pin.ui                  |    1 -
 sendto/main.c                  |    4 ++--
 wizard/bluetooth-input.c       |    4 ++--
 wizard/main.c                  |    4 ++--
 wizard/wizard.ui               |    1 -
 9 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/applet/main.c b/applet/main.c
index 3631135..25bda9a 100644
--- a/applet/main.c
+++ b/applet/main.c
@@ -144,7 +144,7 @@ void browse_callback(GObject *widget, gpointer user_data)
 		int response_id;
 
 		dialog = gtk_dialog_new_with_buttons(_("Select Device to Browse"), NULL,
-						     GTK_DIALOG_NO_SEPARATOR,
+						     0,
 						     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 						     NULL);
 		gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Browse"), GTK_RESPONSE_ACCEPT);
diff --git a/applet/notify.c b/applet/notify.c
index 6beb0d1..47d8452 100644
--- a/applet/notify.c
+++ b/applet/notify.c
@@ -171,15 +171,19 @@ void set_icon(gboolean enabled)
 
 void enable_blinking(void)
 {
-	gtk_status_icon_set_blinking(statusicon, TRUE);
+	/* FIXME
+	gtk_status_icon_set_blinking(statusicon, TRUE); */
 }
 
 void disable_blinking(void)
 {
-	gtk_status_icon_set_blinking(statusicon, FALSE);
+	/* FIXME
+	gtk_status_icon_set_blinking(statusicon, FALSE); */
 }
 
 gboolean query_blinking(void)
 {
-	return gtk_status_icon_get_blinking(statusicon);
+	/* FIXME
+	 * return gtk_status_icon_get_blinking(statusicon); */
+	return FALSE;
 }
diff --git a/lib/bluetooth-chooser-button.c b/lib/bluetooth-chooser-button.c
index e61797d..1ee1201 100644
--- a/lib/bluetooth-chooser-button.c
+++ b/lib/bluetooth-chooser-button.c
@@ -201,7 +201,7 @@ bluetooth_chooser_button_clicked (GtkButton *widget)
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
 	//FIXME title
 	button->dialog = gtk_dialog_new_with_buttons("", GTK_WINDOW (parent),
-						     GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+						     GTK_DIALOG_MODAL,
 						     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 						     GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
 	g_signal_connect (button->dialog, "response",
diff --git a/lib/test-deviceselection.c b/lib/test-deviceselection.c
index 6271bb8..632cd3c 100644
--- a/lib/test-deviceselection.c
+++ b/lib/test-deviceselection.c
@@ -130,7 +130,7 @@ create_phone_dialogue (const char *bdaddr)
 	GtkWidget *dialog, *button;
 
 	dialog = gtk_dialog_new_with_buttons("My test prefs", NULL,
-					     GTK_DIALOG_NO_SEPARATOR,
+					     0,
 					     GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
 	button = bluetooth_chooser_button_new ();
 	if (bdaddr != NULL)
@@ -153,7 +153,7 @@ create_dialogue (const char *title)
 	GtkWidget *dialog;
 
 	dialog = gtk_dialog_new_with_buttons(title, NULL,
-					     GTK_DIALOG_NO_SEPARATOR,
+					     0,
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 					     GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
 	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
diff --git a/moblin/pin.ui b/moblin/pin.ui
index dd304c5..820f0e7 100644
--- a/moblin/pin.ui
+++ b/moblin/pin.ui
@@ -7,7 +7,6 @@
     <property name="title" translatable="yes">PIN Options</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/sendto/main.c b/sendto/main.c
index 5552184..d2f7aa8 100644
--- a/sendto/main.c
+++ b/sendto/main.c
@@ -247,7 +247,7 @@ static void create_window(void)
 	gchar *text;
 
 	dialog = gtk_dialog_new_with_buttons(_("File Transfer"), NULL,
-				GTK_DIALOG_NO_SEPARATOR,
+				0,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 				_("_Retry"), RESPONSE_RETRY,
@@ -639,7 +639,7 @@ show_browse_dialog (char **device_name)
 	int response_id;
 
 	dialog = gtk_dialog_new_with_buttons(_("Select Device to Send To"), NULL,
-					     GTK_DIALOG_NO_SEPARATOR,
+					     0,
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 					     NULL);
 	send_button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Send _To"), GTK_RESPONSE_ACCEPT);
diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c
index 449c9d8..b3fbdaf 100644
--- a/wizard/bluetooth-input.c
+++ b/wizard/bluetooth-input.c
@@ -104,7 +104,7 @@ supports_xinput_devices (void)
 {
 	gint op_code, event, error;
 
-	return XQueryExtension (GDK_DISPLAY (),
+	return XQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
 				"XInputExtension",
 				&op_code,
 				&event,
@@ -179,7 +179,7 @@ bluetooth_input_check_for_devices (BluetoothInput *input)
 	has_keyboard = FALSE;
 	has_mouse = FALSE;
 
-	device_info = XListInputDevices (GDK_DISPLAY (), &n_devices);
+	device_info = XListInputDevices (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &n_devices);
 	for (i = 0; i < n_devices; i++) {
 		gboolean is_mouse, is_keyboard;
 		if (device_info[i].use != IsXExtensionKeyboard &&
diff --git a/wizard/main.c b/wizard/main.c
index 291f30a..bb1f969 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -672,8 +672,8 @@ entry_custom_event (GtkWidget *entry, GdkEventKey *event)
 	if (event->length == 0)
 		return FALSE;
 
-	if ((event->keyval >= GDK_0 && event->keyval <= GDK_9) ||
-	    (event->keyval >= GDK_KP_0 && event->keyval <= GDK_KP_9))
+	if ((event->keyval >= GDK_KEY_0 && event->keyval <= GDK_KEY_9) ||
+	    (event->keyval >= GDK_KEY_KP_0 && event->keyval <= GDK_KEY_KP_9))
 		return FALSE;
 
 	return TRUE;
diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index 7459022..d2c0eff 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -362,7 +362,6 @@
     <property name="title" translatable="yes">PIN Options</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>