gsd to msd complete rename patch by NiceandGently; code changes commit

1 files changed, 12 insertions, 12 deletions

diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index d94fd29..7a16f4e 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -32,25 +32,25 @@
 
 #include "eggaccelerators.h"
 
-#include "gsd-keygrab.h"
+#include "msd-keygrab.h"
 
 /* these are the mods whose combinations are ignored by the keygrabbing code */
-static GdkModifierType gsd_ignored_mods = 0;
+static GdkModifierType msd_ignored_mods = 0;
 
 /* these are the ones we actually use for global keys, we always only check
  * for these set */
-static GdkModifierType gsd_used_mods = 0;
+static GdkModifierType msd_used_mods = 0;
 
 static void
 setup_modifiers (void)
 {
-        if (gsd_used_mods == 0 || gsd_ignored_mods == 0) {
+        if (msd_used_mods == 0 || msd_ignored_mods == 0) {
                 GdkModifierType dynmods;
 
                 /* default modifiers */
-                gsd_ignored_mods = \
+                msd_ignored_mods = \
                         0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK | GDK_HYPER_MASK;
-		gsd_used_mods = \
+		msd_used_mods = \
                         GDK_SHIFT_MASK | GDK_CONTROL_MASK |\
                         GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK |\
                         GDK_MOD5_MASK | GDK_SUPER_MASK | GDK_META_MASK;
@@ -62,8 +62,8 @@ setup_modifiers (void)
                                                       EGG_VIRTUAL_NUM_LOCK_MASK,
                                                       &dynmods);
 
-                gsd_ignored_mods |= dynmods;
-                gsd_used_mods &= ~dynmods;
+                msd_ignored_mods |= dynmods;
+                msd_used_mods &= ~dynmods;
 	}
 }
 
@@ -89,7 +89,7 @@ grab_key_real (guint      keycode,
         }
 }
 
-/* Grab the key. In order to ignore GSD_IGNORED_MODS we need to grab
+/* Grab the key. In order to ignore MSD_IGNORED_MODS we need to grab
  * all combinations of the ignored modifiers and those actually used
  * for the binding (if any).
  *
@@ -124,7 +124,7 @@ grab_key_unsafe (Key                 *key,
 
         setup_modifiers ();
 
-        mask = gsd_ignored_mods & ~key->state & GDK_MODIFIER_MASK;
+        mask = msd_ignored_mods & ~key->state & GDK_MODIFIER_MASK;
 
         bit = 0;
         /* store the indexes of all set bits in mask in the array */
@@ -236,11 +236,11 @@ match_key (Key *key, XEvent *event)
 			consumed &= ~GDK_SHIFT_MASK;
 
 		return ((lower == key->keysym || upper == key->keysym)
-			&& (event->xkey.state & ~consumed & gsd_used_mods) == key->state);
+			&& (event->xkey.state & ~consumed & msd_used_mods) == key->state);
 	}
 
 	/* The key we passed doesn't have a keysym, so try with just the keycode */
         return (key != NULL
-                && key->state == (event->xkey.state & gsd_used_mods)
+                && key->state == (event->xkey.state & msd_used_mods)
                 && key_uses_keycode (key, event->xkey.keycode));
 }