[gnome-settings-daemon] keyboard: Remove unused "feature"
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] keyboard: Remove unused "feature"
- Date: Thu, 26 Apr 2012 18:38:52 +0000 (UTC)
commit 68dea1fe8d9747af488734d36ca26fb64342a8de
Author: Bastien Nocera <hadess hadess net>
Date: Thu Apr 26 17:44:16 2012 +0100
keyboard: Remove unused "feature"
plugins/keyboard/gsd-keyboard-xkb.c | 18 ------------------
plugins/keyboard/gsd-keyboard-xkb.h | 6 ------
2 files changed, 0 insertions(+), 24 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 3671b79..6aae910 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -58,9 +58,6 @@ static gboolean inited_ok = FALSE;
static GSettings *settings_desktop = NULL;
static GSettings *settings_keyboard = NULL;
-static PostActivationCallback pa_callback = NULL;
-static void *pa_callback_user_data = NULL;
-
static GtkStatusIcon *icon = NULL;
static GHashTable *preview_dialogs = NULL;
@@ -322,11 +319,6 @@ try_activating_xkb_config_if_new (GkbdKeyboardConfig *
if (!gkbd_keyboard_config_equals
(¤t_kbd_config, current_sys_kbd_config)) {
if (gkbd_keyboard_config_activate (¤t_kbd_config)) {
- if (pa_callback != NULL) {
- (*pa_callback) (pa_callback_user_data);
- return TRUE;
- }
- } else {
return FALSE;
}
}
@@ -432,14 +424,6 @@ gsd_keyboard_xkb_analyze_sysconfig (void)
NULL);
}
-void
-gsd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
- void *user_data)
-{
- pa_callback = fun;
- pa_callback_user_data = user_data;
-}
-
static GdkFilterReturn
gsd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
{
@@ -521,8 +505,6 @@ gsd_keyboard_xkb_shutdown (void)
if (!inited_ok)
return;
- pa_callback = NULL;
- pa_callback_user_data = NULL;
manager = NULL;
if (preview_dialogs != NULL)
diff --git a/plugins/keyboard/gsd-keyboard-xkb.h b/plugins/keyboard/gsd-keyboard-xkb.h
index c5ac24c..fd798db 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.h
+++ b/plugins/keyboard/gsd-keyboard-xkb.h
@@ -30,10 +30,4 @@
void gsd_keyboard_xkb_init (GsdKeyboardManager *manager);
void gsd_keyboard_xkb_shutdown (void);
-typedef void (*PostActivationCallback) (void *userData);
-
-void
-gsd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
- void *userData);
-
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]