summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--configure.ac4
-rw-r--r--wizard/bluetooth-input.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index fff7c225..0a7a98bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+ver 2.32.0
+- Updated translations
+
ver 2.31.90
- More killswitch fixes
- Fix crasher when Bluetooth nautilus-sendto plugin is loaded
diff --git a/configure.ac b/configure.ac
index a53d4a82..8bbce4e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
AC_PREREQ(2.52)
m4_define(gnomebt_version_major, 2)
-m4_define(gnomebt_version_minor, 31)
-m4_define(gnomebt_version_micro, 90)
+m4_define(gnomebt_version_minor, 32)
+m4_define(gnomebt_version_micro, 0)
AC_INIT([gnome-bluetooth],
[gnomebt_version_major.gnomebt_version_minor.gnomebt_version_micro],
diff --git a/wizard/bluetooth-input.c b/wizard/bluetooth-input.c
index 449c9d8a..b3fbdaf5 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 &&