Remove usage of deprecated GtkTooltips API. Use

[~andy/gtk] / gtk / gtkthemes.c

diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index c166c09333ba8a758955173c951132267073f6df..18559a81a7409be2fd53bffff24caa651125e2a1 100644 (file)
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -30,10 +30,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
-#include "gtkalias.h"
 #include "gtkthemes.h"
 #include "gtkrc.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
@@ -77,7 +77,7 @@ gtk_theme_engine_load (GTypeModule *module)
   
   GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
        
-  engine->library = g_module_open (engine_path, 0);
+  engine->library = g_module_open (engine_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
   g_free(engine_path);
   if (!engine->library)
     {
@@ -137,7 +137,7 @@ gtk_theme_engine_get_type (void)
 
   if (!theme_engine_type)
     {
-      static const GTypeInfo theme_engine_info = {
+      const GTypeInfo theme_engine_info = {
         sizeof (GtkThemeEngineClass),
         NULL,           /* base_init */
         NULL,           /* base_finalize */
@@ -150,7 +150,7 @@ gtk_theme_engine_get_type (void)
       };
 
       theme_engine_type =
-       g_type_register_static (G_TYPE_TYPE_MODULE, "GtkThemeEngine",
+       g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkThemeEngine"),
                                &theme_engine_info, 0);
     }
   
@@ -191,3 +191,6 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
 
   return engine->create_rc_style ();
 }
+
+#define __GTK_THEMES_C__
+#include "gtkaliasdef.c"