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

Daemon probably should not show popups - but I see no choice

Browse source
This commit is contained in:
Sergey V. Udaltsov 2003-11-23 02:44:21 +00:00
parent 5e43341746
commit 11f723907c
1 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,8 @@
#include <string.h> #include <string.h>
#include <libgnome/gnome-i18n.h>
#include <libxklavier/xklavier.h> #include <libxklavier/xklavier.h>
#include <libgswitchit/gswitchit_xkb_config.h> #include <libgswitchit/gswitchit_xkb_config.h>
@ -41,12 +43,40 @@
static GSwitchItXkbConfig gswic; static GSwitchItXkbConfig gswic;
static gboolean initedOk; static gboolean initedOk;
static void
activation_error (void)
{
char *vendor = ServerVendor (GDK_DISPLAY ());
int release = VendorRelease (GDK_DISPLAY ());
gboolean badXFree430Release = (!strcmp (vendor,
"The XFree86 Project, Inc"))
&& (release == 40300000);
GtkWidget *msg = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
_
("Error activating XKB configuration.\n"
"Probably internal X server problem.\n\nX server version data:\n%s\n%d%s"),
vendor,
release,
badXFree430Release ?
_
("You are using XFree 4.3.0.\n"
"There are known problems with complex XKB configurations.\n"
"Try using simpler configuration or taking more fresh version of XFree software.")
: "");
gtk_dialog_run (GTK_DIALOG (msg));
gtk_widget_destroy (msg);
}
static void static void
apply_settings (void) apply_settings (void)
{ {
GConfClient *confClient; GConfClient *confClient;
printf ("xkb.apply_settings!\n");
memset (&gswic, 0, sizeof (gswic)); memset (&gswic, 0, sizeof (gswic));
confClient = gconf_client_get_default (); confClient = gconf_client_get_default ();
@ -57,8 +87,10 @@ apply_settings (void)
if (!gswic.overrideSettings) if (!gswic.overrideSettings)
GSwitchItXkbConfigLoadInitial (&gswic); GSwitchItXkbConfigLoadInitial (&gswic);
if (!GSwitchItXkbConfigActivate (&gswic)) if (!GSwitchItXkbConfigActivate (&gswic)) {
g_warning ("Could not activate the XKB configuration"); g_warning ("Could not activate the XKB configuration");
activation_error ();
}
GSwitchItXkbConfigTerm (&gswic); GSwitchItXkbConfigTerm (&gswic);
} }