From af364b65ee8d664da02605718149773a8b5096b8 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sep 23 2010 03:11:04 +0000
Subject: fix build


---

diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index e6f0538..1337e9a 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,7 +1,7 @@
 Name:		gnome-bluetooth
 Epoch:		1
 Version:	2.90.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -41,6 +41,8 @@ Requires:	control-center
 Requires(post):		desktop-file-utils
 Requires(postun):	desktop-file-utils
 
+Patch0: gtk-build-fixes.patch
+
 %description
 The gnome-bluetooth package contains graphical utilities to setup,
 monitor and use Bluetooth devices.
@@ -79,6 +81,7 @@ This package contains the Moblin user interface for gnome-bluetooth.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtk-fixes
 
 %build
 %configure --disable-desktop-update --disable-icon-update --enable-nautilus-sendto=yes --disable-schemas-compile
@@ -228,6 +231,9 @@ fi
 %{_datadir}/mutter-moblin/panels/bluetooth-panel.desktop
 
 %changelog
+* Wed Sep 22 2010 Matthias Clasen <mclasen@redhat.com> 2.90.0-8
+- Fix the build against newer gtk
+
 * Tue Sep 21 2010 Matthias Clasen <mclasen@redhat.com> 2.90.0-7
 - Rebuild against newer gobject-introspection
 
diff --git a/gtk-build-fixes.patch b/gtk-build-fixes.patch
new file mode 100644
index 0000000..baa3912
--- /dev/null
+++ b/gtk-build-fixes.patch
@@ -0,0 +1,66 @@
+diff -up gnome-bluetooth-2.90.0/applet/main.c.gtk-fixes gnome-bluetooth-2.90.0/applet/main.c
+--- gnome-bluetooth-2.90.0/applet/main.c.gtk-fixes	2010-09-22 23:07:04.597998001 -0400
++++ gnome-bluetooth-2.90.0/applet/main.c	2010-09-22 23:08:11.499997977 -0400
+@@ -143,7 +143,7 @@ void browse_callback(GObject *widget, gp
+ 		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 -up gnome-bluetooth-2.90.0/lib/bluetooth-chooser-button.c.gtk-fixes gnome-bluetooth-2.90.0/lib/bluetooth-chooser-button.c
+--- gnome-bluetooth-2.90.0/lib/bluetooth-chooser-button.c.gtk-fixes	2010-09-22 23:08:28.212998002 -0400
++++ gnome-bluetooth-2.90.0/lib/bluetooth-chooser-button.c	2010-09-22 23:08:45.495997908 -0400
+@@ -201,7 +201,7 @@ bluetooth_chooser_button_clicked (GtkBut
+ 	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 -up gnome-bluetooth-2.90.0/lib/test-deviceselection.c.gtk-fixes gnome-bluetooth-2.90.0/lib/test-deviceselection.c
+--- gnome-bluetooth-2.90.0/lib/test-deviceselection.c.gtk-fixes	2010-09-22 23:08:55.337997999 -0400
++++ gnome-bluetooth-2.90.0/lib/test-deviceselection.c	2010-09-22 23:09:14.105000051 -0400
+@@ -130,7 +130,7 @@ create_phone_dialogue (const char *bdadd
+ 	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 -up gnome-bluetooth-2.90.0/sendto/main.c.gtk-fixes gnome-bluetooth-2.90.0/sendto/main.c
+--- gnome-bluetooth-2.90.0/sendto/main.c.gtk-fixes	2010-09-22 23:09:23.250998000 -0400
++++ gnome-bluetooth-2.90.0/sendto/main.c	2010-09-22 23:09:38.031997828 -0400
+@@ -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);