From dbf5d8f9bc6f0f1a6dc9dcdd42f933f5c697434e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 7 Apr 2014 10:46:50 -0400 Subject: [PATCH] ui: Kill off meta_ui_accelerator_name It's unused. --- src/ui/ui.c | 37 ------------------------------------- src/ui/ui.h | 4 ---- 2 files changed, 41 deletions(-) diff --git a/src/ui/ui.c b/src/ui/ui.c index c5d184285..6fe435e86 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -821,43 +821,6 @@ meta_ui_parse_accelerator (const char *accel, return TRUE; } -/* Caller responsible for freeing return string of meta_ui_accelerator_name! */ -gchar* -meta_ui_accelerator_name (unsigned int keysym, - MetaVirtualModifier mask) -{ - GdkModifierType mods = 0; - - if (keysym == 0 && mask == 0) - { - return g_strdup ("disabled"); - } - - if (mask & META_VIRTUAL_SHIFT_MASK) - mods |= GDK_SHIFT_MASK; - if (mask & META_VIRTUAL_CONTROL_MASK) - mods |= GDK_CONTROL_MASK; - if (mask & META_VIRTUAL_ALT_MASK) - mods |= GDK_MOD1_MASK; - if (mask & META_VIRTUAL_MOD2_MASK) - mods |= GDK_MOD2_MASK; - if (mask & META_VIRTUAL_MOD3_MASK) - mods |= GDK_MOD3_MASK; - if (mask & META_VIRTUAL_MOD4_MASK) - mods |= GDK_MOD4_MASK; - if (mask & META_VIRTUAL_MOD5_MASK) - mods |= GDK_MOD5_MASK; - if (mask & META_VIRTUAL_SUPER_MASK) - mods |= GDK_SUPER_MASK; - if (mask & META_VIRTUAL_HYPER_MASK) - mods |= GDK_HYPER_MASK; - if (mask & META_VIRTUAL_META_MASK) - mods |= GDK_META_MASK; - - return gtk_accelerator_name (keysym, mods); - -} - gboolean meta_ui_parse_modifier (const char *accel, MetaVirtualModifier *mask) diff --git a/src/ui/ui.h b/src/ui/ui.h index 165129fa8..9633b2c20 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -157,10 +157,6 @@ gboolean meta_ui_parse_accelerator (const char *accel, MetaVirtualModifier *mask); gboolean meta_ui_parse_modifier (const char *accel, MetaVirtualModifier *mask); - -/* Caller responsible for freeing return string of meta_ui_accelerator_name! */ -gchar* meta_ui_accelerator_name (unsigned int keysym, - MetaVirtualModifier mask); gboolean meta_ui_window_is_widget (MetaUI *ui, Window xwindow);