applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't bother VNC users with warnings of XKB breakage, we already know it

Browse source 
2005-02-28  Jody Goldberg <jody@gnome.org>

	* gnome-settings-daemon/gnome-settings-keyboard-xkb.c
	(activation_error) : don't bother VNC users with warnings of XKB
	  breakage, we already know it is not going to work.
This commit is contained in:
Jody Goldberg 2005-02-28 23:04:52 +00:00 • committed by Jody Goldberg
parent c7f83884d6
commit b4f39cc148
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-02-28 Jody Goldberg <jody@gnome.org>
* gnome-settings-daemon/gnome-settings-keyboard-xkb.c
(activation_error) : don't bother VNC users with warnings of XKB
breakage, we already know it is not going to work.
2005-02-09 Sebastien Bacher <seb128@debian.org> 2005-02-09 Sebastien Bacher <seb128@debian.org>
* configure.in: update version to 2.9.92 * configure.in: update version to 2.9.92

6
NEWS
View file

@ -1,3 +1,9 @@
gnome-control-center 2.9.92
general:
- do not warn vnc users that their XKB does not work. We already know.
------------------------------------------------------------------------------
gnome-control-center 2.9.91 gnome-control-center 2.9.91
general: general:

18
gnome-settings-daemon/gnome-settings-keyboard-xkb.c
View file

@ -85,13 +85,19 @@ gnome_settings_keyboard_log_appender (const char file[], const char function[],
static void static void
activation_error (void) activation_error (void)
{ {
char *vendor = ServerVendor (GDK_DISPLAY ()); char const *vendor = ServerVendor (GDK_DISPLAY ());
int release = VendorRelease (GDK_DISPLAY ()); int release = VendorRelease (GDK_DISPLAY ());
gboolean badXFree430Release = (!strcmp (vendor, gboolean badXFree430Release = (vendor != NULL)
"The XFree86 Project, Inc")) && (0 == strcmp (vendor, "The XFree86 Project, Inc"))
&& (release / 100000 == 403); && (release / 100000 == 403);
GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL, GtkWidget *dialog;
/* VNC viewers will not work, do not barrage them with warnings */
if (NULL != vendor && NULL != strstr (vendor, "VNC"))
return;
dialog = gtk_message_dialog_new_with_markup (NULL,
0, 0,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, GTK_BUTTONS_CLOSE,
@ -116,9 +122,9 @@ activation_error (void)
: "", : "",
"<b>xprop -root | grep XKB</b>", "<b>xprop -root | grep XKB</b>",
"<b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd</b>"); "<b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd</b>");
g_signal_connect (msg, "response", g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy), NULL); G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (msg); gtk_widget_show (dialog);
} }
static void static void