From: handa <handa>
Date: Tue, 20 Mar 2007 13:00:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-0-9-0~39
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01986d7ad11cbafb20ea2d6882a8f7155a5b91a9;p=m17n%2Fm17n-im-config.git

*** empty log message ***
---

diff --git a/po/ja.po b/po/ja.po
index 0c93f84..c475ed3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: m17n-im-config 0.9.0\n"
 "Report-Msgid-Bugs-To: m17n-lib@m17n.org\n"
-"POT-Creation-Date: 2007-03-18 18:08+0900\n"
+"POT-Creation-Date: 2007-03-19 11:23+0900\n"
 "PO-Revision-Date: 2007-03-18 18:19+0900\n"
 "Last-Translator: Kenichi Handa <m17n-lib@m17n.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -17,46 +17,46 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/mim-config.c:133
+#: src/mim-config.c:135
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: src/mim-config.c:136
+#: src/mim-config.c:138
 msgid "Default"
 msgstr "¥Ç¥Õ¥©¥ë¥ÈÃÍ"
 
-#: src/mim-config.c:308
+#: src/mim-config.c:317
 msgid "global"
 msgstr "¥°¥í¡¼¥Ð¥ë"
 
-#: src/mim-config.c:451
+#: src/mim-config.c:467
 msgid "default"
 msgstr "¥Ç¥Õ¥©¥ë¥ÈÃÍ"
 
-#: src/mim-config.c:452
+#: src/mim-config.c:468
 msgid "customized"
-msgstr ""
+msgstr "¥æ¡¼¥¶ÀßÄê"
 
-#: src/mim-config.c:453
+#: src/mim-config.c:469
 msgid "modified"
 msgstr "Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/mim-config.c:454
+#: src/mim-config.c:470
 msgid "uncustomizable"
 msgstr "Êѹ¹ÉÔ²Ä"
 
-#: src/mim-config.c:464
+#: src/mim-config.c:480
 msgid "Input Method"
 msgstr "ÆþÎϥ᥽¥Ã¥É"
 
-#: src/mim-config.c:469
+#: src/mim-config.c:485
 msgid "status"
 msgstr "¾õÂÖ"
 
-#: src/main.c:81
+#: src/main.c:80
 msgid "Save configuration?"
 msgstr "Êѹ¹ÅÀ¤ò¥»¡¼¥Ö¤·¤Þ¤¹¤«¡©"
 
-#: src/main.c:117
+#: src/main.c:119
 msgid "M17N-IM Configuration"
 msgstr "M17N-IM ¤Î¥«¥¹¥¿¥Þ¥¤¥º"
diff --git a/src/main.c b/src/main.c
index 13d765e..d4590fd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -115,10 +115,10 @@ main (int argc, char **argv)
 #endif
   gtk_init (&argc, &argv);
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_size_request (window, 400, 300);
+  gtk_widget_set_size_request (window, 500, 300);
   gtk_window_set_title (GTK_WINDOW (window), _("M17N-IM Configuration"));
-  g_signal_connect (G_OBJECT (window), "delete_event",
-		    G_CALLBACK (delete), NULL);
+  g_signal_connect (G_OBJECT (window), "destroy",
+		    G_CALLBACK (gtk_main_quit), NULL);
     
   /* We create these widgets:
      +-vbox----------------------------------+
diff --git a/src/mim-config.c b/src/mim-config.c
index ed03ca5..ff2dc31 100644
--- a/src/mim-config.c
+++ b/src/mim-config.c
@@ -147,38 +147,36 @@ edit_im (GtkTreeView *tree, MSymbol lang, MSymbol name)
   if (response != GTK_RESPONSE_CANCEL
       && lang == Mt && (name == Mnil || name == msymbol ("unicode")))
     {
-      MSymbol command = msymbol (name == Mnil ? "commit" : "start");
+      MSymbol variable = msymbol (name == Mnil ? "candidates-group-size"
+				  : "prompt");
 
       if (response == GTK_RESPONSE_NO)
 	{
-	  minput_config_command (lang, name, command, NULL);
+	  minput_config_variable (lang, name, variable, NULL);
 	}
       else if (response == 0)
 	{
 	  MPlist *plist = mplist ();
 
-	  minput_config_command (lang, name, command, plist);
+	  minput_config_variable (lang, name, variable, plist);
 	  m17n_object_unref (plist);
 	}
       else
 	{
-	  MPlist *cmd;
+	  MPlist *plist = mplist ();
 
-	  cmd = minput_get_command (lang, name, command);
-	  if (cmd)
+	  if (name == Mnil)
 	    {
-	      MPlist *plist, *key_seq_list, *key_seq;
-
-	      plist = mplist_next (mplist_next (mplist_next (mplist_value (cmd))));
-	      key_seq_list = mplist_copy (plist);
-	      key_seq = mplist ();
-	      mplist_add (key_seq, Msymbol, msymbol ("C-x"));
-	      mplist_add (key_seq, Msymbol, msymbol ("t"));
-	      mplist_add (key_seq_list, Mplist, key_seq);
-	      m17n_object_unref (key_seq);
-	      minput_config_command (lang, name, command, key_seq_list);
-	      m17n_object_unref (key_seq_list);
+	      mplist_add (plist, Minteger, (void *) 3);
 	    }
+	  else
+	    {
+	      MText *mt = mtext_from_data (">>", 2, MTEXT_FORMAT_US_ASCII);
+	      mplist_add (plist, Mtext, mt);
+	      m17n_object_unref (mt);
+	    }
+	  minput_config_variable (lang, name, variable, plist);
+	  m17n_object_unref (plist);
 	}
     }
 
@@ -494,7 +492,7 @@ mim_config_widget (MimConfigCallback *callback)
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (config),
 				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (config), tree);
-  g_signal_connect (G_OBJECT (config), "delete_event",
+  g_signal_connect (G_OBJECT (config), "destroy",
 		    G_CALLBACK (config_deleted_cb), NULL);
 
   g_object_set_data (G_OBJECT (config), CONFIG_TREE_VIEW, tree);