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/applet/notify.c.gtk-fixes gnome-bluetooth-2.90.0/applet/notify.c --- gnome-bluetooth-2.90.0/applet/notify.c.gtk-fixes 2010-09-22 23:23:52.724998001 -0400 +++ gnome-bluetooth-2.90.0/applet/notify.c 2010-09-22 23:24:10.960998000 -0400 @@ -167,15 +167,13 @@ void set_icon(gboolean enabled) void enable_blinking(void) { - gtk_status_icon_set_blinking(statusicon, TRUE); } void disable_blinking(void) { - gtk_status_icon_set_blinking(statusicon, FALSE); } gboolean query_blinking(void) { - return gtk_status_icon_get_blinking(statusicon); + return FALSE; } 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/moblin/moblin-copy-n-paste/mux-banner.c.gtk-fixes gnome-bluetooth-2.90.0/moblin/moblin-copy-n-paste/mux-banner.c --- gnome-bluetooth-2.90.0/moblin/moblin-copy-n-paste/mux-banner.c.gtk-fixes 2010-09-23 07:51:43.673997999 -0400 +++ gnome-bluetooth-2.90.0/moblin/moblin-copy-n-paste/mux-banner.c 2010-09-23 08:04:11.693997999 -0400 @@ -48,16 +48,15 @@ mux_banner_expose (GtkWidget *widget, Gd { MuxBanner *banner = MUX_BANNER (widget); GdkWindow *window; - GdkGC *gc; + cairo_t *cr; window = gtk_widget_get_window (widget); - gc = gdk_gc_new (window); - gdk_gc_set_foreground (gc, &banner->priv->colour); - - gdk_draw_rectangle (window, gc, TRUE, - event->area.x, event->area.y, - event->area.width, event->area.height); + cr = gdk_cairo_create (window); + gdk_cairo_set_source_color (cr, &banner->priv->colour); + gdk_cairo_rectangle (cr, &event->area); + cairo_fill (cr); + cairo_destroy (cr); return GTK_WIDGET_CLASS (mux_banner_parent_class)->expose_event (widget, event); } diff -up gnome-bluetooth-2.90.0/moblin/moblin-panel.c.gtk-fixes gnome-bluetooth-2.90.0/moblin/moblin-panel.c --- gnome-bluetooth-2.90.0/moblin/moblin-panel.c.gtk-fixes 2010-09-23 07:09:26.141997999 -0400 +++ gnome-bluetooth-2.90.0/moblin/moblin-panel.c 2010-09-23 07:09:50.938997899 -0400 @@ -399,8 +399,8 @@ entry_custom_event (GtkWidget *entry, Gd 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 -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); diff -up gnome-bluetooth-2.90.0/wizard/bluetooth-input.c.gtk-fixes gnome-bluetooth-2.90.0/wizard/bluetooth-input.c --- gnome-bluetooth-2.90.0/wizard/bluetooth-input.c.gtk-fixes 2010-09-23 07:18:17.987998308 -0400 +++ gnome-bluetooth-2.90.0/wizard/bluetooth-input.c 2010-09-23 07:38:24.391998001 -0400 @@ -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 (Bluet 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 -up gnome-bluetooth-2.90.0/wizard/main.c.gtk-fixes gnome-bluetooth-2.90.0/wizard/main.c --- gnome-bluetooth-2.90.0/wizard/main.c.gtk-fixes 2010-09-23 07:10:07.816997668 -0400 +++ gnome-bluetooth-2.90.0/wizard/main.c 2010-09-23 07:17:57.581998031 -0400 @@ -671,8 +671,8 @@ entry_custom_event (GtkWidget *entry, Gd 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;