Modify the gettext translation domain for the gtk3 rename

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

diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index b17668eb8a1f83f27b2ec6b1e8e9d8c5d17a2c5e..d6d9f7940fab50872b388bdb0eb2fe9cdfd7eafd 100644 (file)
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -25,13 +25,15 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
 #include "gtkthemes.h"
 #include "gtkrc.h"
-#include "config.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
@@ -75,11 +77,11 @@ 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)
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       return FALSE;
     }
   
@@ -91,7 +93,7 @@ gtk_theme_engine_load (GTypeModule *module)
       !g_module_symbol (engine->library, "theme_create_rc_style", 
                        (gpointer *)&engine->create_rc_style))
     {
-      g_warning (g_module_error());
+      g_warning ("%s", g_module_error());
       g_module_close (engine->library);
       
       return FALSE;
@@ -135,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 */
@@ -147,7 +149,9 @@ gtk_theme_engine_get_type (void)
         NULL,           /* instance_init */
       };
 
-      theme_engine_type = g_type_register_static (G_TYPE_TYPE_MODULE, "GtkThemeEngine", &theme_engine_info, 0);
+      theme_engine_type =
+       g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkThemeEngine"),
+                               &theme_engine_info, 0);
     }
   
   return theme_engine_type;
@@ -167,7 +171,7 @@ gtk_theme_engine_get (const gchar *name)
 
   if (!result)
     {
-      result = GTK_THEME_ENGINE (g_object_new (GTK_TYPE_THEME_ENGINE, NULL));
+      result = g_object_new (GTK_TYPE_THEME_ENGINE, NULL);
       g_type_module_set_name (G_TYPE_MODULE (result), name);
       result->name = g_strdup (name);
 
@@ -187,3 +191,6 @@ gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
 
   return engine->create_rc_style ();
 }
+
+#define __GTK_THEMES_C__
+#include "gtkaliasdef.c"