From 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Oct 2013 02:34:09 -0700 Subject: Tue Oct 8 02:32:53 PDT 2013 --- .../revert-input-sources.patch | 123 --------------------- 1 file changed, 123 deletions(-) delete mode 100644 community/gnome-settings-daemon-compat/revert-input-sources.patch (limited to 'community/gnome-settings-daemon-compat/revert-input-sources.patch') diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch deleted file mode 100644 index dc769de4e..000000000 --- a/community/gnome-settings-daemon-compat/revert-input-sources.patch +++ /dev/null @@ -1,123 +0,0 @@ -From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Wed, 12 Dec 2012 09:31:40 +0000 -Subject: Revert "media-keys: Add key bindings to switch input sources" - -These are now provided by gnome-shell. - -This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d. - -https://bugzilla.gnome.org/show_bug.cgi?id=690106 ---- -diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -index b56b5d1..25e5f3e 100644 ---- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in -@@ -175,16 +175,6 @@ - <_summary>Magnifier zoom out - <_description>Binding for the magnifier to zoom out - -- -- '' -- <_summary>Switch input source -- <_description>Binding to select the next input source -- -- -- '' -- <_summary>Switch input source backward -- <_description>Binding to select the previous input source -- - - - -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index e5977d0..cd6fbc2 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -98,10 +98,6 @@ static const gchar introspection_xml[] = - #define VOLUME_STEP 6 /* percents for one volume button press */ - #define MAX_VOLUME 65536.0 - --#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" --#define KEY_CURRENT_INPUT_SOURCE "current" --#define KEY_INPUT_SOURCES "sources" -- - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager, - } - - static void --do_switch_input_source_action (GsdMediaKeysManager *manager, -- MediaKeyType type) --{ -- GSettings *settings; -- GVariant *sources; -- gint i, n; -- -- settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR); -- sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); -- -- n = g_variant_n_children (sources); -- if (n < 2) -- goto out; -- -- i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE); -- -- if (type == SWITCH_INPUT_SOURCE_KEY) -- i += 1; -- else -- i -= 1; -- -- if (i < 0) -- i = n - 1; -- else if (i >= n) -- i = 0; -- -- g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i); -- -- out: -- g_variant_unref (sources); -- g_object_unref (settings); --} -- --static void - do_custom_action (GsdMediaKeysManager *manager, - MediaKey *key, - gint64 timestamp) -@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager, - case BATTERY_KEY: - do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp); - break; -- case SWITCH_INPUT_SOURCE_KEY: -- case SWITCH_INPUT_SOURCE_BACKWARD_KEY: -- do_switch_input_source_action (manager, type); -- break; - /* Note, no default so compiler catches missing keys */ - case CUSTOM_KEY: - g_assert_not_reached (); -diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h -index a16d0e7..437ed2c 100644 ---- a/plugins/media-keys/shortcuts-list.h -+++ b/plugins/media-keys/shortcuts-list.h -@@ -80,8 +80,6 @@ typedef enum { - KEYBOARD_BRIGHTNESS_DOWN_KEY, - KEYBOARD_BRIGHTNESS_TOGGLE_KEY, - BATTERY_KEY, -- SWITCH_INPUT_SOURCE_KEY, -- SWITCH_INPUT_SOURCE_BACKWARD_KEY, - CUSTOM_KEY - } MediaKeyType; - -@@ -148,8 +146,6 @@ static struct { - { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" }, - { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" }, - { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" }, -- { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL }, -- { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL }, - { BATTERY_KEY, NULL, "XF86Battery" }, - }; - --- -cgit v0.9.1 -- cgit v1.2.3-54-g00ecf