[gtk+/gtk-style-context: 261/490] Make loading of theming engines from modules work
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-style-context: 261/490] Make loading of theming engines from modules work
- Date: Wed, 24 Nov 2010 14:01:35 +0000 (UTC)
commit e1d391474bf92a8fdfc9446e474caba7f620e5a5
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 20 13:26:27 2010 +0200
Make loading of theming engines from modules work
gtk/gtkthemingengine.c | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 0f035c0..99518f8 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -154,8 +154,11 @@ typedef struct GtkThemingModuleClass GtkThemingModuleClass;
struct GtkThemingModule
{
GTypeModule parent_instance;
+ GModule *module;
gchar *name;
+ void (*init) (GTypeModule *module);
+ void (*exit) (void);
GtkThemingEngine * (*create_engine) (void);
};
@@ -622,26 +625,50 @@ gtk_theming_module_load (GTypeModule *type_module)
return FALSE;
}
- if (!g_module_symbol (module, "create_engine",
+ if (!g_module_symbol (module, "theme_init",
+ (gpointer *) &theming_module->init) ||
+ !g_module_symbol (module, "theme_exit",
+ (gpointer *) &theming_module->exit) ||
+ !g_module_symbol (module, "create_engine",
(gpointer *) &theming_module->create_engine))
{
- g_warning ("%s", g_module_error());
+ g_warning ("%s", g_module_error ());
g_module_close (module);
return FALSE;
}
- g_module_make_resident (module);
+ theming_module->module = module;
+
+ theming_module->init (theming_module);
return TRUE;
}
static void
+gtk_theming_module_unload (GTypeModule *type_module)
+{
+ GtkThemingModule *theming_module;
+
+ theming_module = GTK_THEMING_MODULE (type_module);
+
+ theming_module->exit ();
+
+ g_module_close (theming_module->module);
+
+ theming_module->module = NULL;
+ theming_module->init = NULL;
+ theming_module->exit = NULL;
+ theming_module->create_engine = NULL;
+}
+
+static void
gtk_theming_module_class_init (GtkThemingModuleClass *klass)
{
GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
module_class->load = gtk_theming_module_load;
+ module_class->unload = gtk_theming_module_unload;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]