1 files changed, 8 insertions, 10 deletions
diff --git a/modules/gtk3/caribou-module.c b/modules/gtk3/caribou-module.c
index 90f0534..7792bd9 100644
--- a/modules/gtk3/caribou-module.c
+++ b/modules/gtk3/caribou-module.c
@@ -1,11 +1,7 @@
 #include <gtk/gtk.h>
-#include <gtk/gtkimmodule.h>
 #include "caribou-gtk-module.h"
-#include <stdio.h>
 
-#define CARIBOU_LOCALDIR ""
-
-G_MODULE_EXPORT CaribouGtkModule * gtk_module;
+CaribouGtkModule * gtk_module;
 
 G_MODULE_EXPORT CaribouGtkModule *
 gtk_module_init (gint *argc, gchar ***argv[]) {
@@ -17,10 +13,12 @@ gtk_module_init (gint *argc, gchar ***argv[]) {
 G_MODULE_EXPORT const gchar*
 g_module_check_init (GModule *module)
 {
-    return gtk_check_version (GTK_MAJOR_VERSION, 0, 0);
-}
+    const gchar *error;
+
+    error = gtk_check_version (GTK_MAJOR_VERSION, 0, 0);
+    if (error)
+        return error;
 
-G_MODULE_EXPORT void
-g_module_unload(GModule *module) {
-    caribou_gtk_module_unload (gtk_module);
+    g_module_make_resident (module);
+    return NULL;
 }