diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2012-03-06 18:52:08 +0900 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@gnome.org> | 2012-03-06 21:25:06 +0000 |
| commit | b96c7b22989dfeea3c1a52d6a528a320e7f5be3f (patch) | |
| tree | b635fe82cb2d554690da2213bea6fefb03a8415f | |
| parent | 6b1d5a4894c5905efd0322da8fa34d4c4c69df72 (diff) | |
Make XklEngine::X-state-changed signal introspectable.
| -rw-r--r-- | libxklavier/Makefile.am | 4 | ||||
| -rw-r--r-- | libxklavier/marshal.list | 2 | ||||
| -rw-r--r-- | libxklavier/xklavier.c | 15 |
3 files changed, 5 insertions, 16 deletions
diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index 63c5d8d..3ed8ad4 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -45,7 +45,7 @@ libxklavier_la_LIBADD = \ EXTRA_DIST=marshal.list libxklavier.public -GLIB_GENMARSHAL = `$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +GLIB_GENMARSHAL = `$(PKG_CONFIG) --variable=glib_genmarshal glib-2.0` xkl_engine_marshal.h: marshal.list $(GLIB_GENMARSHAL) --prefix=xkl_engine marshal.list --header > xkl_engine_marshal.h @@ -90,7 +90,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION # avoid introspecting private headers -introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) +introspection_sources = $(xklavier_headers) $(xklavier_built_headers) $(filter %.c, $(libxklavier_la_SOURCES)) Xkl-1.0.gir: libxklavier.la Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 diff --git a/libxklavier/marshal.list b/libxklavier/marshal.list index 3fcda01..66215b2 100644 --- a/libxklavier/marshal.list +++ b/libxklavier/marshal.list @@ -1,3 +1,3 @@ VOID:VOID INT:LONG,LONG -VOID:FLAGS,INT,BOOLEAN +VOID:ENUM,INT,BOOLEAN diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c index 15a4d37..8dde702 100644 --- a/libxklavier/xklavier.c +++ b/libxklavier/xklavier.c @@ -804,12 +804,6 @@ xkl_engine_finalize(GObject * obj) static void xkl_engine_class_init(XklEngineClass * klass) { - static GEnumValue state_change_values[] = { - {GROUP_CHANGED, "GROUP_CHANGED", NULL}, - {INDICATORS_CHANGED, "INDICATORS_CHANGED", NULL}, - {0, NULL, NULL} - }; - GObjectClass *object_class; GParamSpec *display_param_spec; GParamSpec *backend_name_param_spec; @@ -819,7 +813,6 @@ xkl_engine_class_init(XklEngineClass * klass) GParamSpec *default_group_param_spec; GParamSpec *secondary_groups_mask_param_spec; GParamSpec *indicators_handling_param_spec; - GType state_change_type; const gchar *sdl; @@ -843,10 +836,6 @@ xkl_engine_class_init(XklEngineClass * klass) NULL, G_PARAM_READABLE); - state_change_type = - g_enum_register_static("XklEngineStateChangeType", - state_change_values); - features_param_spec = g_param_spec_flags("features", "Features", "Backend features", @@ -923,8 +912,8 @@ xkl_engine_class_init(XklEngineClass * klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(XklEngineClass, state_notify), NULL, NULL, - xkl_engine_VOID__FLAGS_INT_BOOLEAN, - G_TYPE_NONE, 3, state_change_type, G_TYPE_INT, + xkl_engine_VOID__ENUM_INT_BOOLEAN, + G_TYPE_NONE, 3, XKL_TYPE_ENGINE_STATE_CHANGE, G_TYPE_INT, G_TYPE_BOOLEAN); /* static stuff initialized */ |