Removed unneeded xmodmap support

Implemented in g-s-d through custom scripts
https://bugzilla.gnome.org/show_bug.cgi?id=674874

2 files changed, 0 insertions, 44 deletions

diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
index 6c00f48..e4e035e 100644
--- a/libgnomekbd/gkbd-keyboard-config.c
+++ b/libgnomekbd/gkbd-keyboard-config.c
@@ -37,8 +37,6 @@
 #define GROUP_SWITCHERS_GROUP "grp"
 #define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle"
 
-#define XMODMAP_CMD "xmodmap"
-
 const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] = "model";
 const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
 const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
@@ -49,8 +47,6 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = {
 	GKBD_KEYBOARD_CONFIG_KEY_OPTIONS
 };
 
-const gchar *XMODMAP_KNOWN_FILES[] = { ".xmodmap", ".Xmodmap" };
-
 /**
  * static common functions
  */
@@ -637,43 +633,6 @@ gkbd_keyboard_config_activate (GkbdKeyboardConfig * kbd_config)
 	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);
-			}
-			g_free (command);
-
-			/* One file is enough */
-			i = 0;
-		}
-
-		g_free (xmodmap_file);
-	}
-}
-
 /**
  * gkbd_keyboard_config_start_listen:
  * @func: (scope notified): a function to call when settings are changed
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);