summaryrefslogtreecommitdiff
path: root/plugins/keyboard
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-07-28 01:10:22 +0300
committerMonsta <[email protected]>2015-07-28 01:10:22 +0300
commite1f00a2c7283d65c2f7b96497177e6d84943d1b3 (patch)
tree63c0f85fe883e444781a44fedde1a1ea251f4c81 /plugins/keyboard
parent296d56a0ec991c835ad15214663a140da79430d1 (diff)
downloadmate-settings-daemon-e1f00a2c7283d65c2f7b96497177e6d84943d1b3.tar.bz2
mate-settings-daemon-e1f00a2c7283d65c2f7b96497177e6d84943d1b3.tar.xz
keyboard: remove XFree86 4.3.0 check which is from stone age
from https://github.com/GNOME/gnome-settings-daemon/commit/ed3bb1700ecc85950a685546fddac43aedd5e979
Diffstat (limited to 'plugins/keyboard')
-rw-r--r--plugins/keyboard/msd-keyboard-xkb.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index 2e6e0ec..b126fa1 100644
--- a/plugins/keyboard/msd-keyboard-xkb.c
+++ b/plugins/keyboard/msd-keyboard-xkb.c
@@ -103,14 +103,9 @@ g_strv_behead (gchar **arr)
static void
activation_error (void)
{
- char const *vendor = ServerVendor (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
- int release = VendorRelease (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
+ char const *vendor = ServerVendor (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+ int release = VendorRelease (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
GtkWidget *dialog;
- gboolean badXFree430Release;
-
- badXFree430Release = (vendor != NULL)
- && (0 == strcmp (vendor, "The XFree86 Project, Inc"))
- && (release / 100000 == 403);
/* VNC viewers will not work, do not barrage them with warnings */
if (NULL != vendor && NULL != strstr (vendor, "VNC"))
@@ -126,19 +121,12 @@ activation_error (void)
" • a bug in libxklavier library\n"
" • a bug in X server (xkbcomp, xmodmap utilities)\n"
" • X server with incompatible libxkbfile implementation\n\n"
- "X server version data:\n%s\n%d\n%s\n"
+ "X server version data:\n%s\n%d\n"
"If you report this situation as a bug, please include:\n"
" • The result of <b>%s</b>\n"
" • The result of <b>%s</b>"),
vendor,
release,
- badXFree430Release
- ?
- _
- ("You are using XFree 4.3.0.\n"
- "There are known problems with complex XKB configurations.\n"
- "Try using a simpler configuration or using a later version of the XFree software.")
- : "",
"xprop -root | grep XKB",
"gsettings list-keys org.mate.peripherals-keyboard-xkb.kbd");
g_signal_connect (dialog, "response",