[gnome-settings-daemon] keyboard: Remove XFree86 4.3.0 check

[Bastien Nocera <hadess src gnome org>]

commit ed3bb1700ecc85950a685546fddac43aedd5e979
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 19 17:05:47 2010 +0100

    keyboard: Remove XFree86 4.3.0 check
    
    It's been released for nearly 7 years.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=632569

 plugins/keyboard/gsd-keyboard-xkb.c |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index c1255a1..33fa462 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -110,18 +110,12 @@ gsd_keyboard_log_appender (const char file[],
 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;
+	int release;
 	GtkWidget *dialog;
-	gboolean badXFree430Release;
 
-	badXFree430Release = (vendor != NULL)
-	    && (0 == strcmp (vendor, "The XFree86 Project, Inc"))
-	    && (release / 100000 == 403);
+	vendor = ServerVendor (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+	release = VendorRelease (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 
 	/* VNC viewers will not work, do not barrage them with warnings */
 	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
@@ -137,19 +131,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",
 						     "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd");
 	g_signal_connect (dialog, "response",