s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add eek_init().

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-18 11:48:18 +09:00
parent 6a7b256676
commit 1b5bab9c18
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eek/Makefile.am
View File

@ -54,6 +54,7 @@ libeek_private_headers = \
$(srcdir)/eek-theme-node.h $(srcdir)/eek-theme-node.h
libeek_sources = \ libeek_sources = \
$(srcdir)/eek.c \
$(srcdir)/eek-layout.c \ $(srcdir)/eek-layout.c \
$(srcdir)/eek-element.c \ $(srcdir)/eek-element.c \
$(srcdir)/eek-container.c \ $(srcdir)/eek-container.c \

14
eek/eek.c Normal file
View File

@ -0,0 +1,14 @@
#include "eek.h"
void
eek_init (void)
{
g_type_init ();
/* preload Eek* types for EekKeyboard deserialization */
g_type_class_ref (EEK_TYPE_KEYBOARD);
g_type_class_ref (EEK_TYPE_SECTION);
g_type_class_ref (EEK_TYPE_KEY);
g_type_class_ref (EEK_TYPE_SYMBOL);
g_type_class_ref (EEK_TYPE_KEYSYM);
}

2
eek/eek.h
View File

@ -32,4 +32,6 @@
#include "eek-serializable.h" #include "eek-serializable.h"
#include "eek-theme.h" #include "eek-theme.h"
void eek_init (void);
#endif /* EEK_H */ #endif /* EEK_H */

7
src/client-main.c
View File

@ -122,12 +122,7 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
/* preload Eek* types for EekKeyboard deserialization */ eek_init ();
g_type_class_ref (EEK_TYPE_KEYBOARD);
g_type_class_ref (EEK_TYPE_SECTION);
g_type_class_ref (EEK_TYPE_KEY);
g_type_class_ref (EEK_TYPE_SYMBOL);
g_type_class_ref (EEK_TYPE_KEYSYM);
option_context = g_option_context_new ("eekboard-desktop-client"); option_context = g_option_context_new ("eekboard-desktop-client");
g_option_context_add_main_entries (option_context, options, NULL); g_option_context_add_main_entries (option_context, options, NULL);

9
src/server-main.c
View File

@ -91,14 +91,9 @@ main (int argc, char **argv)
} }
#endif #endif
g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); eek_init ();
/* preload Eek* types for EekKeyboard deserialization */ g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
g_type_class_ref (EEK_TYPE_KEYBOARD);
g_type_class_ref (EEK_TYPE_SECTION);
g_type_class_ref (EEK_TYPE_KEY);
g_type_class_ref (EEK_TYPE_SYMBOL);
g_type_class_ref (EEK_TYPE_KEYSYM);
if (opt_system) if (opt_system)
bus_type = G_BUS_TYPE_SYSTEM; bus_type = G_BUS_TYPE_SYSTEM;