[Goodies-commits] r5452 - xfce4-xkb-plugin/trunk/panel-plugin

[Alexander Iliev]

Author: sasoiliev
Date: 2008-09-24 12:21:18 +0000 (Wed, 24 Sep 2008)
New Revision: 5452

Modified:
   xfce4-xkb-plugin/trunk/panel-plugin/xfce4-xkb-plugin.c
   xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.c
   xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.h
Log:
added a hidden option - never_modify_config


Modified: xfce4-xkb-plugin/trunk/panel-plugin/xfce4-xkb-plugin.c
===================================================================
--- xfce4-xkb-plugin/trunk/panel-plugin/xfce4-xkb-plugin.c	2008-09-24 09:37:10 UTC (rev 5451)
+++ xfce4-xkb-plugin/trunk/panel-plugin/xfce4-xkb-plugin.c	2008-09-24 12:21:18 UTC (rev 5452)
@@ -261,6 +261,7 @@
     xfce_rc_write_int_entry (rcfile, "display_type", xkb->display_type);
     xfce_rc_write_int_entry (rcfile, "group_policy", xkb->settings->group_policy);
     xfce_rc_write_int_entry (rcfile, "default_group", xkb->settings->default_group);
+    xfce_rc_write_bool_entry (rcfile, "never_modify_config", xkb->settings->never_modify_config);
 
     if (xkb->settings->kbd_config != NULL)
     {
@@ -290,6 +291,8 @@
             xkb->settings->default_group = xfce_rc_read_int_entry (rcfile, "default_group", 0);
         }
 
+        xkb->settings->never_modify_config = xfce_rc_read_bool_entry (rcfile, "never_modify_config", FALSE);
+
         if (xkb->settings->kbd_config == NULL)
         {
             xkb->settings->kbd_config = g_new0 (t_xkb_kbd_config, 1);

Modified: xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.c
===================================================================
--- xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.c	2008-09-24 09:37:10 UTC (rev 5451)
+++ xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.c	2008-09-24 12:21:18 UTC (rev 5452)
@@ -269,7 +269,7 @@
         config->config_rec = xkl_config_rec_new ();
     }
 
-    if (settings->kbd_config == NULL)
+    if (settings->kbd_config == NULL || settings->never_modify_config)
     {
         xkl_config_rec_get_from_server (config->config_rec, config->engine);
         settings->kbd_config = g_new (t_xkb_kbd_config, 1);
@@ -305,7 +305,7 @@
         opt++;
     }
     
-    if (activate_settings)
+    if (activate_settings && !settings->never_modify_config)
         xkl_config_rec_activate (config->config_rec, config->engine);
 
     xkb_config_initialize_xkb_options (settings);

Modified: xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.h
===================================================================
--- xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.h	2008-09-24 09:37:10 UTC (rev 5451)
+++ xfce4-xkb-plugin/trunk/panel-plugin/xkb-config.h	2008-09-24 12:21:18 UTC (rev 5452)
@@ -54,6 +54,7 @@
 {
     t_group_policy      group_policy;
     gint                default_group;
+    gboolean            never_modify_config;
     t_xkb_kbd_config*   kbd_config;
 } t_xkb_settings;