[Goodies-commits] r6592 - xfce4-xkb-plugin/branches/compose-key/panel-plugin

[Alexander Iliev]

Author: sasoiliev
Date: 2009-01-28 18:18:39 +0000 (Wed, 28 Jan 2009)
New Revision: 6592

Modified:
   xfce4-xkb-plugin/branches/compose-key/panel-plugin/xkb-config.c
Log:
do not break when iterating over xkb options array

Modified: xfce4-xkb-plugin/branches/compose-key/panel-plugin/xkb-config.c
===================================================================
--- xfce4-xkb-plugin/branches/compose-key/panel-plugin/xkb-config.c	2009-01-28 16:22:48 UTC (rev 6591)
+++ xfce4-xkb-plugin/branches/compose-key/panel-plugin/xkb-config.c	2009-01-28 18:18:39 UTC (rev 6592)
@@ -144,9 +144,6 @@
         config->group_count++;
     }
     
-    //config->group_count = xkl_engine_get_num_groups (config->engine);
-
-
     xkb_config_free ();
     
     config->window_map = g_hash_table_new (g_direct_hash, NULL);
@@ -293,19 +290,17 @@
 
     /* select the first "grp" option and use it (should be fixed to support more options) */
     opt = config->config_rec->options;
-    /*settings->kbd_config->options;*/
     while (opt && *opt)
     {
         prefix = g_strsplit(*opt, ":", 2);
-        if (prefix && strcmp(*prefix, "grp") == 0)
+        if (settings->kbd_config->toggle_option == NULL
+                && prefix && strcmp(*prefix, "grp") == 0)
         {
             settings->kbd_config->toggle_option = *opt;
-            break;
         }
         else if (prefix && strcmp(*prefix, "compose") == 0)
         {
             settings->kbd_config->compose_key_position = *opt;
-            break;
         }
         opt++;
     }