summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2006-03-04 03:02:57 +0000
committerSergey Udaltsov <svu@gnome.org>2006-03-04 03:02:57 +0000
commit96f7f1fc9c3401f77db12058e4e55a11d5df7ae6 (patch)
tree07c13214a4113a3784ce7b99aab9ce26c5c35a01
parent285e65be60d046d51f43dfc6f4cf2879831cc146 (diff)
downloadlibxklavier-96f7f1fc9c3401f77db12058e4e55a11d5df7ae6.tar.gz
signals are emmitted somehow
-rw-r--r--libxklavier/xklavier.c12
-rw-r--r--libxklavier/xklavier_toplevel.c8
-rw-r--r--libxklavier/xklavier_xkb.c8
3 files changed, 9 insertions, 19 deletions
diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index 8a16784..4af77e8 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -457,15 +457,11 @@ xkl_engine_try_call_state_func(XklEngine * engine,
}
xkl_engine_one_switch_to_secondary_group_performed(engine);
}
-// TODO
-#if 0
- if (xkl_state_callback != NULL) {
- (*xkl_state_callback) (change_type,
- xkl_curr_state.group, restore,
- xkl_state_callback_data);
- }
-#endif
+ g_signal_emit_by_name(engine, "X-state-changed", change_type,
+ xkl_engine_priv(engine, curr_state).group,
+ restore);
+
}
void
diff --git a/libxklavier/xklavier_toplevel.c b/libxklavier/xklavier_toplevel.c
index f343ef4..7cdf6df 100644
--- a/libxklavier/xklavier_toplevel.c
+++ b/libxklavier/xklavier_toplevel.c
@@ -76,12 +76,8 @@ xkl_engine_add_toplevel_window(XklEngine * engine, Window toplevel_win,
}
}
-/* TODO
- if (xkl_new_window_callback != NULL)
- default_group_to_use =
- (*xkl_new_window_callback) (toplevel_win, parent,
- xkl_new_window_callback_data);
-*/
+ g_signal_emit_by_name(engine, "new-toplevel_window", toplevel_win,
+ parent, &default_group_to_use);
if (default_group_to_use == -1)
default_group_to_use =
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index b233aee..73dad6f 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -271,11 +271,9 @@ xkl_xkb_load_all_info(XklEngine * engine)
xkl_debug(200, "Real indicators are %X\n",
cached->indicators->phys_indicators);
-// TODO
-#if 0
- if (xkl_config_callback != NULL)
- (*xkl_config_callback) (xkl_config_callback_data);
-#endif
+
+ g_signal_emit_by_name(engine, "X-config-changed");
+
return TRUE;
}