Make gtk-im-context-none work

This was added a few years ago, as a way to have _no_ im context
at all. But it didn't actually work. Make it work, and streamline
the handling of none by moving it all to gtkimmodule.c.

As part of this, add context to the translated names of all
im modules we ship.

14 files changed, 15 insertions, 15 deletions

diff --git a/modules/input/imam-et.c b/modules/input/imam-et.c
index a45f580aec..f3d7628875 100644
--- a/modules/input/imam-et.c
+++ b/modules/input/imam-et.c
@@ -449,7 +449,7 @@ am_et_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo am_et_info = { 
   "am_et",		   /* ID */
-  N_("Amharic (EZ+)"),     /* Human readable name */
+  NC_("input method menu", "Amharic (EZ+)"),     /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain */
    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "am"			   /* Languages for which this module is the default */
diff --git a/modules/input/imbroadway.c b/modules/input/imbroadway.c
index d0394f3340..140aa0e8c6 100644
--- a/modules/input/imbroadway.c
+++ b/modules/input/imbroadway.c
@@ -48,7 +48,7 @@ static GObjectClass *parent_class;
 static const GtkIMContextInfo imbroadway_info =
 {
   "broadway",      /* ID */
-  "Broadway",      /* Human readable name */
+  NC_("input method menu", "Broadway"),      /* Human readable name */
   GETTEXT_PACKAGE, /* Translation domain */
   GTK_LOCALEDIR,   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "",              /* Languages for which this module is the default */
diff --git a/modules/input/imcedilla.c b/modules/input/imcedilla.c
index 9b230f4227..74790b79ca 100644
--- a/modules/input/imcedilla.c
+++ b/modules/input/imcedilla.c
@@ -87,7 +87,7 @@ cedilla_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo cedilla_info = { 
   "cedilla",		           /* ID */
-  N_("Cedilla"),                   /* Human readable name */
+  NC_("input method menu", "Cedilla"), /* Human readable name */
   GETTEXT_PACKAGE,		   /* Translation domain */
   GTK_LOCALEDIR,		   /* Dir for bindtextdomain */
   "az:ca:co:fr:gv:oc:pt:sq:tr:wa"  /* Languages for which this module is the default */
diff --git a/modules/input/imcyrillic-translit.c b/modules/input/imcyrillic-translit.c
index 48a54355a1..68b0392486 100644
--- a/modules/input/imcyrillic-translit.c
+++ b/modules/input/imcyrillic-translit.c
@@ -212,7 +212,7 @@ cyrillic_translit_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo cyrillic_translit_info = { 
   "cyrillic_translit",		   /* ID */
-  N_("Cyrillic (Transliterated)"), /* Human readable name */
+  NC_("input menthod menu", "Cyrillic (Transliterated)"), /* Human readable name */
   GETTEXT_PACKAGE,		   /* Translation domain */
    GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   ""			           /* Languages for which this module is the default */
diff --git a/modules/input/imime.c b/modules/input/imime.c
index 7bb5758bba..d2943cf9cd 100644
--- a/modules/input/imime.c
+++ b/modules/input/imime.c
@@ -27,8 +27,8 @@
 
 static const GtkIMContextInfo ime_info = {
   "ime",
-  "Windows IME",
-  "gtk+",
+  NC_("input method menu", "Windows IME"),
+  GETTEXT_PACKAGE,
   "",
   "ja:ko:zh",
 };
diff --git a/modules/input/iminuktitut.c b/modules/input/iminuktitut.c
index 35fdb90d7e..651e4beba2 100644
--- a/modules/input/iminuktitut.c
+++ b/modules/input/iminuktitut.c
@@ -122,7 +122,7 @@ inuktitut_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo inuktitut_info = { 
   "inuktitut",		   /* ID */
-  N_("Inuktitut (Transliterated)"),         /* Human readable name */
+  NC_("input method menu", "Inuktitut (Transliterated)"), /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain */
   GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "iu"			   /* Languages for which this module is the default */
diff --git a/modules/input/imipa.c b/modules/input/imipa.c
index 24ac684d86..efbc3bd2cb 100644
--- a/modules/input/imipa.c
+++ b/modules/input/imipa.c
@@ -140,7 +140,7 @@ ipa_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo ipa_info = { 
   "ipa",		   /* ID */
-  N_("IPA"),                       /* Human readable name */
+  NC_("input method menu", "IPA"), /* Human readable name */
   GETTEXT_PACKAGE,		   /* Translation domain */
    GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   ""			           /* Languages for which this module is the default */
diff --git a/modules/input/immultipress.c b/modules/input/immultipress.c
index c4c0202b28..89608cb173 100644
--- a/modules/input/immultipress.c
+++ b/modules/input/immultipress.c
@@ -27,7 +27,7 @@
  */
 static const GtkIMContextInfo info = { 
   CONTEXT_ID,		   /* ID */
-  N_("Multipress"),     /* Human readable name */
+  NC_("input method menu", "Multipress"),     /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain. Defined in configure.ac */
   MULTIPRESS_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+"). Defined in the Makefile.am */
   ""			   /* Languages for which this module is the default */
diff --git a/modules/input/imquartz.c b/modules/input/imquartz.c
index fa2afd3f81..5db6481f5c 100644
--- a/modules/input/imquartz.c
+++ b/modules/input/imquartz.c
@@ -55,7 +55,7 @@ static GObjectClass *parent_class;
 static const GtkIMContextInfo imquartz_info =
 {
   "quartz",
-  "Mac OS X Quartz",
+  NC_("input method menu", "Mac OS X Quartz"),
   GETTEXT_PACKAGE,
   GTK_LOCALEDIR,
   "ja:ko:zh:*",
diff --git a/modules/input/imthai.c b/modules/input/imthai.c
index 586c0b81c7..5a05a9a6ee 100644
--- a/modules/input/imthai.c
+++ b/modules/input/imthai.c
@@ -30,7 +30,7 @@ GType type_thai = 0;
 
 static const GtkIMContextInfo thai_info = { 
   "thai",	   /* ID */
-  N_("Thai-Lao"),  /* Human readable name */
+  NC_("input method menu", "Thai-Lao"),  /* Human readable name */
   GETTEXT_PACKAGE, /* Translation domain */
   GTK_LOCALEDIR,   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "lo:th"	   /* Languages for which this module is the default */
diff --git a/modules/input/imti-er.c b/modules/input/imti-er.c
index ec1af41afb..a95ed60c74 100644
--- a/modules/input/imti-er.c
+++ b/modules/input/imti-er.c
@@ -448,7 +448,7 @@ ti_er_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo ti_er_info = { 
   "ti_er",		   /* ID */
-  N_("Tigrigna-Eritrean (EZ+)"),         /* Human readable name */
+  NC_("input method menu", "Tigrigna-Eritrean (EZ+)"), /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain */
    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "ti"			   /* Languages for which this module is the default */
diff --git a/modules/input/imti-et.c b/modules/input/imti-et.c
index 23caadb2a7..0030020639 100644
--- a/modules/input/imti-et.c
+++ b/modules/input/imti-et.c
@@ -448,7 +448,7 @@ ti_et_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo ti_et_info = { 
   "ti_et",		   /* ID */
-  N_("Tigrigna-Ethiopian (EZ+)"),         /* Human readable name */
+  NC_("input method menu", "Tigrigna-Ethiopian (EZ+)"), /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain */
    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "ti"			   /* Languages for which this module is the default */
diff --git a/modules/input/imviqr.c b/modules/input/imviqr.c
index f074b29082..d9572f51ce 100644
--- a/modules/input/imviqr.c
+++ b/modules/input/imviqr.c
@@ -239,7 +239,7 @@ viqr_init (GtkIMContextSimple *im_context)
 
 static const GtkIMContextInfo viqr_info = { 
   "viqr",		   /* ID */
-  N_("Vietnamese (VIQR)"), /* Human readable name */
+  NC_("input method menu", "Vietnamese (VIQR)"), /* Human readable name */
   GETTEXT_PACKAGE,	   /* Translation domain */
    GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "vi"			   /* Languages for which this module is the default */
diff --git a/modules/input/imxim.c b/modules/input/imxim.c
index fd8f38bb54..aff332bdf1 100644
--- a/modules/input/imxim.c
+++ b/modules/input/imxim.c
@@ -23,7 +23,7 @@
 
 static const GtkIMContextInfo xim_ja_info = { 
   "xim",		           /* ID */
-  N_("X Input Method"),            /* Human readable name */
+  NC_("input method menu", "X Input Method"), /* Human readable name */
   GETTEXT_PACKAGE,		   /* Translation domain */
   GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
   "ko:ja:th:zh"		           /* Languages for which this module is the default */