filechooserbutton: When the combo box changes, set the *file*, not the current folder

[~andy/gtk] / modules / input / imime.c

diff --git a/modules/input/imime.c b/modules/input/imime.c
index 6100876e5e2f6859685023a6b772ff0c77442be9..7bb5758bba9823cf7e1fb7d09d51fec9936ecc5e 100644 (file)
--- a/modules/input/imime.c
+++ b/modules/input/imime.c
@@ -13,54 +13,56 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * $Id$
  */
 
-#include <gtk/gtkimmodule.h>
-#include "gtkimcontextime.h"
-
+#include "config.h"
 #include <string.h>
 
+#include "gtk/gtkintl.h"
+#include "gtk/gtkimmodule.h"
+#include "gtkimcontextime.h"
+
 static const GtkIMContextInfo ime_info = {
-  "win32ime",
+  "ime",
   "Windows IME",
   "gtk+",
   "",
-  "*",
+  "ja:ko:zh",
 };
 
 static const GtkIMContextInfo *info_list[] = {
   &ime_info,
 };
 
-void
-im_module_init (GTypeModule * module)
+#ifndef INCLUDE_IM_ime
+#define MODULE_ENTRY(type,function) G_MODULE_EXPORT type im_module_ ## function
+#else
+#define MODULE_ENTRY(type, function) type _gtk_immodule_ime_ ## function
+#endif
+
+MODULE_ENTRY (void, init) (GTypeModule * module)
 {
   gtk_im_context_ime_register_type (module);
 }
 
-void
-im_module_exit (void)
+MODULE_ENTRY (void, exit) (void)
 {
 }
 
-void
-im_module_list (const GtkIMContextInfo *** contexts, int *n_contexts)
+MODULE_ENTRY (void, list) (const GtkIMContextInfo *** contexts, int *n_contexts)
 {
   *contexts = info_list;
   *n_contexts = G_N_ELEMENTS (info_list);
 }
 
-GtkIMContext *
-im_module_create (const gchar * context_id)
+MODULE_ENTRY (GtkIMContext *, create) (const gchar * context_id)
 {
   g_return_val_if_fail (context_id, NULL);
 
-  if (!strcmp (context_id, "win32ime"))
+  if (!strcmp (context_id, "ime"))
     return g_object_new (GTK_TYPE_IM_CONTEXT_IME, NULL);
   else
     return NULL;