try again

This commit is contained in:
Matthias Clasen 2010-09-23 07:24:27 -04:00
parent bbef761c21
commit eda91a80ae

View File

@ -63,6 +63,20 @@ diff -up gnome-bluetooth-2.90.0/lib/test-deviceselection.c.gtk-fixes gnome-bluet
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-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
@ -84,3 +98,38 @@ diff -up gnome-bluetooth-2.90.0/sendto/main.c.gtk-fixes gnome-bluetooth-2.90.0/s
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:23:55.277998000 -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_xdisplay ()), &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;