From 91864ba2bcbe58b03659e64b55a9f3f85a43da67 Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Wed, 25 Nov 2009 22:32:37 +0000
Subject: [PATCH] A bit of optimization for symbols/inet

K6C maps to Eject in common media section
---
 ChangeLog           |  5 +++++
 rules/base.m_s.part |  4 ++--
 symbols/inet        | 13 +------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5bdfda..7c022dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-25 Sergey Udaltsov
+
+	* rules/base.m_s.part, symbols/inet: a bit of optimization, K6C to map
+	to Eject, always in media section
+
 2009-11-24 Sergey Udaltsov
 
 	* rules/base.xml.in, symbols/lt: removed unneeded lt(balticplus),
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 6ff950b..a032e0a 100644
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -42,8 +42,8 @@
   targa_v811    =       +inet(media_nav_acpi_common)
   thinkpad      =       +inet(media_nav_common)
   thinkpadz60   =       +inet(thinkpad60)
-  tm2030USB-102 =       +inet(tm2030USB)
-  tm2030USB-106 =       +inet(tm2030USB)
+  tm2030USB-102 =       +inet(media_nav_acpi_common)
+  tm2030USB-106 =       +inet(media_nav_acpi_common)
   trust_slimline =      +inet(media_nav_acpi_common)
   vsonku306     =       +inet(microsoftprooem)
   $inetkbds     =       +inet(%m)
diff --git a/symbols/inet b/symbols/inet
index 4f0be77..89e802e 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -32,6 +32,7 @@ xkb_symbols "media_common" {
     key <I2E>   {       [ XF86AudioLowerVolume  ] };	
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
     key <K5A>   {       [ XF86Eject             ] };
+    key <K6C>   {       [ XF86Eject             ] };
 };
 
 // popular web navigation combination
@@ -429,7 +430,6 @@ xkb_symbols "btc9019u" {
     include "inet(media_nav_acpi_common)"
     key <FK17> {	[ XF86Search		]	};
     key <I02>  {	[ XF86HomePage		]	};
-    key <K6C>  {	[ XF86Eject		]	};
 };
 
 // Cherry Blue Line
@@ -1722,7 +1722,6 @@ xkb_symbols "cymotionlinux" {
     key <I3C>	{	[	XF86Cut			]	};
     key <I78>	{	[	XF86Copy		]	};
     key <K65>	{	[	XF86Paste		]	};
-    key <K6C>	{	[	XF86Eject		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
     key <XFER>	{	[	XF86AudioMedia		]	};
 };
@@ -1821,13 +1820,3 @@ partial alphanumeric_keys
 xkb_symbols "pc105" {
     include "inet(media_nav_acpi_common)"
 };
-
-// TypeMatrix
-
-// TypeMatrix 2030USB
-partial alphanumeric_keys
-xkb_symbols "tm2030USB" {
-    include "inet(media_nav_acpi_common)"
-
-    key <K6C>  {	[ XF86Eject	]	};
-};
-- 
2.7.4