$NetBSD: patch-bb,v 1.3 2012/04/20 12:13:48 obache Exp $

--- extras/gtk_immodule/gtkimcontextscim.cpp.orig	2012-04-10 10:30:58.000000000 +0000
+++ extras/gtk_immodule/gtkimcontextscim.cpp
@@ -282,11 +282,11 @@ static int                              
 static FrontEndHotkeyMatcher                            _frontend_hotkey_matcher;
 static IMEngineHotkeyMatcher                            _imengine_hotkey_matcher;
 
-static IMEngineInstancePointer                          _default_instance;
+static IMEngineInstancePointer                          _default_instance = IMEngineInstancePointer(0);
 
 static ConfigModule                                    *_config_module              = 0;
-static ConfigPointer                                    _config;
-static BackEndPointer                                   _backend;
+static ConfigPointer                                    _config = ConfigPointer(0);
+static BackEndPointer                                   _backend = BackEndPointer(0);
 
 static GtkIMContextSCIM                                *_focused_ic                 = 0;
 static GtkWidget                                       *_focused_widget             = 0;
@@ -304,8 +304,8 @@ static bool                             
 static int                                              _instance_count             = 0;
 static int                                              _context_count              = 0;
 
-static IMEngineFactoryPointer                           _fallback_factory;
-static IMEngineInstancePointer                          _fallback_instance;
+static IMEngineFactoryPointer                           _fallback_factory = IMEngineFactoryPointer(0);
+static IMEngineInstancePointer                          _fallback_instance = IMEngineInstancePointer(0);
 
 static PanelClient                                      _panel_client;
 
@@ -318,6 +318,7 @@ static bool                             
 static bool                                             _shared_input_method        = false;
 static bool                                             _use_key_snooper            = false;
 
+#if 0
 // A hack to shutdown the immodule cleanly even if im_module_exit () is not called when exiting.
 class FinalizeHandler
 {
@@ -334,6 +335,7 @@ public:
 };
 
 static FinalizeHandler                                  _finalize_handler;
+#endif
 
 /* Function Implementations */
 
@@ -446,6 +448,7 @@ gtk_im_context_scim_register_type (GType
         sizeof               (GtkIMContextSCIM),
         0,
         (GInstanceInitFunc)  gtk_im_context_scim_init,
+        0
     };
 
     SCIM_DEBUG_FRONTEND(1) << "gtk_im_context_scim_register_type...\n";