[gnome-settings-daemon] common: Remove egg copy/paste code
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] common: Remove egg copy/paste code
- Date: Fri, 4 Nov 2011 16:54:43 +0000 (UTC)
commit ac0a7b45a77ad6a6f031ca5e06c8797367f13a53
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 3 17:12:03 2011 +0000
common: Remove egg copy/paste code
https://bugzilla.gnome.org/show_bug.cgi?id=663343
plugins/common/Makefile.am | 2 -
plugins/common/eggaccelerators.c | 678 ---------------------------------
plugins/common/eggaccelerators.h | 102 -----
plugins/common/test-egg-key-parsing.c | 12 +-
4 files changed, 2 insertions(+), 792 deletions(-)
---
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 21dd1e4..25522cc 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -3,8 +3,6 @@ plugin_name = common
noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
- eggaccelerators.c \
- eggaccelerators.h \
gsd-keygrab.c \
gsd-keygrab.h \
gsd-input-helper.c \
diff --git a/plugins/common/test-egg-key-parsing.c b/plugins/common/test-egg-key-parsing.c
index b5416f3..46dfd79 100644
--- a/plugins/common/test-egg-key-parsing.c
+++ b/plugins/common/test-egg-key-parsing.c
@@ -1,25 +1,17 @@
#include <gtk/gtk.h>
-#include "eggaccelerators.h"
#define KEY "<Alt>XF86AudioMute"
int main (int argc, char **argv)
{
- guint gdk_accel_key, egg_accel_key;
- guint *gdk_accel_codes, *egg_accel_codes;
+ guint gdk_accel_key;
+ guint *gdk_accel_codes;
GdkModifierType gdk_mods;
- EggVirtualModifierType egg_mods;
- EggParseError retval;
gtk_init (&argc, &argv);
g_message ("gdk_keyval_from_name ('%s') == %d", KEY, gdk_keyval_from_name(KEY));
- retval = egg_accelerator_parse_virtual (KEY, &egg_accel_key, &egg_accel_codes, &egg_mods);
- g_message ("egg_accelerator_parse_virtual ('%s') returned keyval '%d' keycode[0]: '%d' mods: 0x%x (%s)",
- KEY, egg_accel_key, egg_accel_codes ? egg_accel_codes[0] : 0, egg_mods,
- (retval == EGG_PARSE_ERROR_NONE) ? "success" : "failure");
-
gtk_accelerator_parse_with_keycode (KEY, &gdk_accel_key, &gdk_accel_codes, &gdk_mods);
g_message ("gtk_accelerator_parse_full ('%s') returned keyval '%d' keycode[0]: '%d' mods: 0x%x",
KEY, gdk_accel_key, gdk_accel_codes ? gdk_accel_codes[0] : 0, gdk_mods);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]