[libgnomekbd/gnome-3-4] Revert "starting 3.5.x"

[Sergey V. Udaltsov <svu src gnome org>]

commit e15848150004f46e4e73ddfe5d46456de9d2f235
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Thu Apr 5 05:34:58 2012 +0100

    Revert "starting 3.5.x"
    
    Reverting 2 patches that should be in the master, not in gnome-3-4

 configure.in                       |    2 +-
 libgnomekbd/gkbd-keyboard-config.c |   81 +++++++++++++++++------------------
 libgnomekbd/gkbd-keyboard-config.h |    3 -
 3 files changed, 40 insertions(+), 46 deletions(-)
---
diff --git a/configure.in b/configure.in
index 65b3669..afe19ae 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl ***************************************************************************
 dnl *** configure.in for libgnomekbd                                        ***
 dnl ***************************************************************************
-AC_INIT(libgnomekbd, 3.5.1, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
+AC_INIT(libgnomekbd, 3.4.0.2, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd])
 AC_PREREQ(2.62)
 
 VERSION_INFO=7:0:0
diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
index 6fbff37..2f15a42 100644
--- a/libgnomekbd/gkbd-keyboard-config.c
+++ b/libgnomekbd/gkbd-keyboard-config.c
@@ -523,16 +523,12 @@ gkbd_keyboard_config_options_equals (GkbdKeyboardConfig * kbd_config1,
 			char *group2, *option2;
 			gboolean are_equal = FALSE;
 
-			if (!gkbd_keyboard_config_split_items
-			    (kbd_config1->options[i], &group1, &option1))
+			if (!gkbd_keyboard_config_split_items (kbd_config1->options[i], &group1, &option1))
 				continue;
 
 			for (j = 0; j < num_options && !are_equal; j++) {
-				if (gkbd_keyboard_config_split_items
-				    (kbd_config2->options[j], &group2,
-				     &option2)) {
-					are_equal =
-					    strcmp (option1, option2) == 0;
+				if (gkbd_keyboard_config_split_items (kbd_config2->options[j], &group2, &option2)) {
+					are_equal = strcmp (option1, option2) == 0;
 				}
 			}
 
@@ -556,11 +552,10 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1,
 	    g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model))
 		return False;
 	if (!g_strv_equal (kbd_config1->layouts_variants,
-			   kbd_config2->layouts_variants))
+			     kbd_config2->layouts_variants))
 		return False;
 
-	if (!gkbd_keyboard_config_options_equals
-	    (kbd_config1, kbd_config2))
+	if (!gkbd_keyboard_config_options_equals (kbd_config1, kbd_config2))
 		return False;
 
 	return True;
@@ -630,44 +625,46 @@ gkbd_keyboard_config_activate (GkbdKeyboardConfig * kbd_config)
 	gkbd_keyboard_config_copy_to_xkl_config (kbd_config, data);
 	rv = xkl_config_rec_activate (data, kbd_config->engine);
 	g_object_unref (G_OBJECT (data));
-	return rv;
-}
 
-void
-gkbd_keyboard_config_patch (GkbdKeyboardConfig * kbd_config)
-{
 	/* Small bit of extensibility by using xmodmap */
-	int i =
-	    sizeof (XMODMAP_KNOWN_FILES) / sizeof (XMODMAP_KNOWN_FILES[0]);
-	while (--i >= 0) {
-		gchar *xmodmap_file = g_build_filename (g_get_home_dir (),
-							XMODMAP_KNOWN_FILES
-							[i],
-							NULL);
-		if (g_file_test (xmodmap_file, G_FILE_TEST_EXISTS)) {
-			GError *error = NULL;
-			gchar *command;
-			xkl_debug (150,
-				   "Loading custom xmodmap file %s\n",
-				   xmodmap_file);
-			command =
-			    g_strconcat (XMODMAP_CMD, " ",
-					 xmodmap_file, NULL);
-			/* Fire and forget - do not care about errors */
-			if (!g_spawn_command_line_async (command, &error)) {
-				xkl_debug (0,
-					   "Error loading custom xmodmap file: [%s]\n",
-					   error->message);
-				g_error_free (error);
+	if (rv) {
+		int i =
+		    sizeof (XMODMAP_KNOWN_FILES) /
+		    sizeof (XMODMAP_KNOWN_FILES[0]);
+		while (--i >= 0) {
+			gchar *xmodmap_file =
+			    g_build_filename (g_get_home_dir (),
+					      XMODMAP_KNOWN_FILES[i],
+					      NULL);
+			if (g_file_test (xmodmap_file, G_FILE_TEST_EXISTS)) {
+				GError *error = NULL;
+				gchar *command;
+				xkl_debug (150,
+					   "Loading custom xmodmap file %s\n",
+					   xmodmap_file);
+				command =
+				    g_strconcat (XMODMAP_CMD, " ",
+						 xmodmap_file,
+						 NULL);
+				/* Fire and forget - do not care about errors */
+				if (!g_spawn_command_line_async
+				    (command, &error)) {
+					xkl_debug (0,
+						   "Error loading custom xmodmap file: [%s]\n",
+						   error->message);
+					g_error_free (error);
+				}
+				g_free (command);
+
+				/* One file is enough */
+				i = 0;
 			}
-			g_free (command);
 
-			/* One file is enough */
-			i = 0;
+			g_free (xmodmap_file);
 		}
-
-		g_free (xmodmap_file);
 	}
+
+	return rv;
 }
 
 /**
diff --git a/libgnomekbd/gkbd-keyboard-config.h b/libgnomekbd/gkbd-keyboard-config.h
index 90f97c6..99ecac6 100644
--- a/libgnomekbd/gkbd-keyboard-config.h
+++ b/libgnomekbd/gkbd-keyboard-config.h
@@ -83,9 +83,6 @@ extern gboolean gkbd_keyboard_config_equals (GkbdKeyboardConfig *
 extern gboolean gkbd_keyboard_config_activate (GkbdKeyboardConfig *
 					       kbd_config);
 
-extern void gkbd_keyboard_config_patch (GkbdKeyboardConfig *
-					       kbd_config);
-
 extern const gchar *gkbd_keyboard_config_merge_items (const gchar * parent,
 						      const gchar * child);