callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 99192 - Add --with-include-input-modules

Browse Source 
2008-03-18  Tor Lillqvist  <tml@novell.com>

	Bug 99192 - Add --with-include-input-modules

	* configure.in: Add --with-included-immodules switch. Handled in a
	similar way as the --with-included-loaders switch. For each input
	method module foo: Collect the list of input modules to be built
	into libgtk into INCLUDED_IMMODULE_OBJ. Collect a list of
	-DINCLUDE_IM_foo definitions into INCLUDED_IMMODULE_DEFINE.
	Define Automake conditionals INCLUDE_IM_FOO.

	* modules/input/Makefile.am: For modules to be included in libgtk,
	build a static library.
	
	* modules/input/im*.c: Use MODULE_ENTRY macros much like in
	gdk-pixbuf to get unique names for the functions called by libgtk
	in the included case. Use G_MODULE_EXPORT in the non-included case
	so that we don't unnecessarily export unneeded random global
	symbols on Windows.

	* gtk/Makefile.am: Build the included modules and link them into libgtk.

	* gtk/gtkimmodule.c: Handle the built-in modules. Remove
	copy/paste leftover mentions of "themes" in comments.


svn path=/trunk/; revision=19896
This commit is contained in:
Tor Lillqvist
2008-03-17 23:53:18 +00:00
committed by Tor Lillqvist
parent 39e8f9e58a
commit 6ce7b71f9c
17 changed files with 487 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/input/imcyrillic-translit.c
View File

@ -224,27 +224,33 @@ static const GtkIMContextInfo *info_list[] = {
&cyrillic_translit_info
};
#ifndef INCLUDE_IM_cyrillic_translit
#define MODULE_ENTRY(function) G_MODULE_EXPORT im_module_ ## function
#else
#define MODULE_ENTRY(function) _gtk_immodule_cyrillic_translit_ ## function
#endif
void
im_module_init (GTypeModule *module)
MODULE_ENTRY (init) (GTypeModule *module)
{
cyrillic_translit_register_type (module);
}
void
im_module_exit (void)
MODULE_ENTRY (exit) (void)
{
}
void
im_module_list (const GtkIMContextInfo ***contexts,
int *n_contexts)
MODULE_ENTRY (list) (const GtkIMContextInfo ***contexts,
int *n_contexts)
{
*contexts = info_list;
*n_contexts = G_N_ELEMENTS (info_list);
}
GtkIMContext *
im_module_create (const gchar *context_id)
MODULE_ENTRY (create) (const gchar *context_id)
{
if (strcmp (context_id, "cyrillic_translit") == 0)
return g_object_new (type_cyrillic_translit, NULL);