gnome-xkb-info.c: Add to existing option group when scanning extras,

instead of replacing the original group.

The xkb 'extras' file includes many additional, unique layouts,
but also option groups which already exist from the base file.

Previously, if extras were enable, the only the extra options from
an option group would be available, not the sum of both files.

Author: mtwebster

libcinnamon-desktop/gnome-xkb-info.c

@@ -459,16 +459,39 @@ parse_end_element (GMarkupParseContext  *context,
     }
   else if (strcmp (element_name, "group") == 0)
     {
+      XkbOptionGroup *existing_group;
+
       if (!priv->current_parser_group->description || !priv->current_parser_group->id)
         {
           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
                        "'group' elements must enclose 'description' and 'name' elements");
           return;
         }
 
-      g_hash_table_replace (priv->option_groups_table,
-                            priv->current_parser_group->id,
-                            priv->current_parser_group);
+      existing_group = g_hash_table_lookup (priv->option_groups_table,
+                                            priv->current_parser_group->id);
+
+      if (existing_group)
+        {
+          GHashTableIter iter;
+          gpointer key, value;
+
+          g_hash_table_iter_init (&iter, priv->current_parser_group->options_table);
+          while (g_hash_table_iter_next (&iter, &key, &value))
+            {
+              g_hash_table_iter_steal (&iter);
+              g_hash_table_replace (existing_group->options_table, key, value);
+            }
+
+          free_option_group (priv->current_parser_group);
+        }
+      else
+        {
+          g_hash_table_replace (priv->option_groups_table,
+                                priv->current_parser_group->id,
+                                priv->current_parser_group);
+        }
+
       priv->current_parser_group = NULL;
     }
   else if (strcmp (element_name, "option") == 0)