From: handa <handa>
Date: Wed, 20 Jun 2007 01:19:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-0-9-0~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac7f64c850628158d6cfca3404ed246d67500fc7;p=m17n%2Fm17n-im-config.git

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

diff --git a/README b/README
index 90ff8f4..b4a52bb 100644
--- a/README
+++ b/README
@@ -60,39 +60,46 @@ GtkWidget *mim_config_new (GCallback func, gpointer data)
 	function must have two arguments; the widget created by this
 	function, and DATA.
 
-	The widget returned is actually a GtkScrolledWindow widget
-	that contains a GtkTreeView widget.  You can get this
-	GtkTreeView widget by mim_config_get_tree_view () function.
+	The widget returned must be the argument to the following
+	functions.
+
+	This widget is actually a GtkScrolledWindow widget that
+	contains a GtkTreeView widget.  You can get this GtkTreeView
+	widget by mim_config_get_tree_view () function.
 
 gboolean mim_config_modified (GtkWidget *config)
 
 	The mim_config_modified () function checks if there are any
 	unsaved configurations.  If any, TRUE is returned.  Othewise,
-	FALSE is returned.  The argument CONFIG must be what created
-	by mim_config_new ().
+	FALSE is returned.
+
+gboolean mim_config_default (GtkWidget *config)
+
+	The mim_config_default () function reset all configurations
+	done by a user at the current session, and all customization
+	saved in a per-user customization file to the default state.
+	If there are any configurations actually reverted, TRUE is
+	returned.  Othewise FALSE is returned.
 
 gboolean mim_config_revert (GtkWidget *config)
 
 	The mim_config_revert () function reverts all configurations
 	done by a user to the original state.  If there are any
 	configurations actually reverted, TRUE is returned.  Othewise
-	FALSE is returned.  The argument CONFIG must be what created
-	by mim_config_new ().
+	FALSE is returned.
 
 gboolean mim_config_save (GtkWidget *config)
 
        The mim_config_save () function saves all configurations done
        by a user into a per-user customization file.  If the file is
        actually written, TRUE is returned.  If there's no configuraion
-       to save, FALSE is returned.  The argument CONFIG must be what
-       created by mim_config_new ().
+       to save, FALSE is returned.
 
 GtkTreeView *mim_config_get_tree_view (GtkWidget *config)
 
 	The mim_config_get_tree_view () function returns the
 	GtkTreeView widget used in the widget created by
-	mim_config_new ().  The argument CONFIG must be what created
-	by mim_config_new ().
+	mim_config_new ().
 
 (3-2) Compiling and Linking
 
diff --git a/po/fr.po b/po/fr.po
index 14a1e5f..a70df56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,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-05-18 14:55+0900\n"
+"POT-Creation-Date: 2007-06-20 10:19+0900\n"
 "PO-Revision-Date: 2007-05-18 15:53+0900\n"
 "Last-Translator: Kenichi Handa <m17n-lib@m17n.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,84 +16,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/mim-config.c:301
+#: src/mim-config.c:292
 msgid "Other"
 msgstr "Autre"
 
-#: src/mim-config.c:324
+#: src/mim-config.c:315
 msgid "global"
 msgstr "global"
 
-#: src/mim-config.c:749 src/mim-config.c:814 src/mim-config.c:1730
+#: src/mim-config.c:764 src/mim-config.c:829 src/mim-config.c:1687
 msgid "Status"
 msgstr "Statut"
 
-#: src/mim-config.c:793
+#: src/mim-config.c:808
 msgid "No customizable item."
 msgstr "Aucun entree personnalisable."
 
-#: src/mim-config.c:811
+#: src/mim-config.c:826
 msgid "Name"
 msgstr "Nom"
 
-#: src/mim-config.c:858
+#: src/mim-config.c:873
 msgid "_Variables"
 msgstr "_Variables"
 
-#: src/mim-config.c:871
+#: src/mim-config.c:886
 msgid "Co_mmands"
-msgstr "Co_mmandes"""
+msgstr "Co_mmandes"
 
-#: src/mim-config.c:972
+#: src/mim-config.c:987
 msgid "The value must be an integer."
 msgstr "La valeur doit être un nombre entier."
 
-#: src/mim-config.c:1034 src/mim-config.c:1702
+#: src/mim-config.c:1049 src/mim-config.c:1659
 msgid "modified"
 msgstr "modifié"
 
-#: src/mim-config.c:1204 src/mim-config.c:1299
+#: src/mim-config.c:1219 src/mim-config.c:1314 src/main.c:186
 msgid "_Default"
 msgstr "_Défaut"
 
-#: src/mim-config.c:1274
+#: src/mim-config.c:1289
 msgid "Current key bindings:"
 msgstr "Actuel raccourcis clavier:"
 
-#: src/mim-config.c:1554
+#: src/mim-config.c:1515
 msgid "New key binding:"
 msgstr "Nouveau raccourcis clavier:"
 
-#: src/mim-config.c:1700
+#: src/mim-config.c:1657
 msgid "default"
 msgstr "défaut"
 
-#: src/mim-config.c:1701
+#: src/mim-config.c:1658
 msgid "customized"
 msgstr "personalisé"
 
-#: src/mim-config.c:1703
+#: src/mim-config.c:1660
 msgid "uncustomizable"
 msgstr "non personnalisable"
 
-#: src/mim-config.c:1705
+#: src/mim-config.c:1662
 msgid "Value"
 msgstr "Valeur"
 
-#: src/mim-config.c:1712
+#: src/mim-config.c:1669
 msgid "Key Bindings"
 msgstr "Raccourcis clavier"
 
-#: src/mim-config.c:1725
+#: src/mim-config.c:1682
 msgid "Input Method"
 msgstr "Mèthode de saisie"
 
-#: src/main.c:108
+#: src/main.c:120
 msgid "Save configuration?"
 msgstr "Enregistrer le règlage?"
 
-#: src/main.c:149
+#: src/main.c:161
 msgid "M17N-IM Configuration"
 msgstr "M17N-IM règlage"
-
-
diff --git a/po/ja.po b/po/ja.po
index cde23b5..7bc9fe7 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-05-18 14:55+0900\n"
+"POT-Creation-Date: 2007-06-20 10:19+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,82 +17,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/mim-config.c:301
+#: src/mim-config.c:292
 msgid "Other"
 msgstr "¤½¤Î¾"
 
-#: src/mim-config.c:324
+#: src/mim-config.c:315
 msgid "global"
 msgstr "¥°¥í¡¼¥Ð¥ë"
 
-#: src/mim-config.c:749 src/mim-config.c:814 src/mim-config.c:1730
+#: src/mim-config.c:764 src/mim-config.c:829 src/mim-config.c:1687
 msgid "Status"
 msgstr "¾õÂÖ"
 
-#: src/mim-config.c:793
+#: src/mim-config.c:808
 msgid "No customizable item."
 msgstr "Êѹ¹²Äǽ¤Ê¹àÌܤϤ¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/mim-config.c:811
+#: src/mim-config.c:826
 msgid "Name"
 msgstr "̾Á°"
 
-#: src/mim-config.c:858
+#: src/mim-config.c:873
 msgid "_Variables"
 msgstr "ÊÑ¿ô (_V)"
 
-#: src/mim-config.c:871
+#: src/mim-config.c:886
 msgid "Co_mmands"
 msgstr "¥³¥Þ¥ó¥É (_m)"
 
-#: src/mim-config.c:972
+#: src/mim-config.c:987
 msgid "The value must be an integer."
 msgstr "ÃͤÏÀ°¿ô"
 
-#: src/mim-config.c:1034 src/mim-config.c:1702
+#: src/mim-config.c:1049 src/mim-config.c:1659
 msgid "modified"
 msgstr "Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/mim-config.c:1204 src/mim-config.c:1299
+#: src/mim-config.c:1219 src/mim-config.c:1314 src/main.c:186
 msgid "_Default"
 msgstr "¥Ç¥Õ¥©¥ë¥ÈÃÍ (_D)"
 
-#: src/mim-config.c:1274
+#: src/mim-config.c:1289
 msgid "Current key bindings:"
 msgstr "¸½ºß¤Î¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°:"
 
-#: src/mim-config.c:1554
+#: src/mim-config.c:1515
 msgid "New key binding:"
 msgstr "¿·¤·¤¤¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°:"
 
-#: src/mim-config.c:1700
+#: src/mim-config.c:1657
 msgid "default"
 msgstr "¥Ç¥Õ¥©¥ë¥ÈÃÍ"
 
-#: src/mim-config.c:1701
+#: src/mim-config.c:1658
 msgid "customized"
 msgstr "¥æ¡¼¥¶ÀßÄê"
 
-#: src/mim-config.c:1703
+#: src/mim-config.c:1660
 msgid "uncustomizable"
 msgstr "Êѹ¹ÉÔ²Ä"
 
-#: src/mim-config.c:1705
+#: src/mim-config.c:1662
 msgid "Value"
 msgstr "ÃÍ"
 
-#: src/mim-config.c:1712
+#: src/mim-config.c:1669
 msgid "Key Bindings"
 msgstr "¥­¡¼¥Ð¥¤¥ó¥Ç¥£¥ó¥°"
 
-#: src/mim-config.c:1725
+#: src/mim-config.c:1682
 msgid "Input Method"
 msgstr "ÆþÎϥ᥽¥Ã¥É"
 
-#: src/main.c:108
+#: src/main.c:120
 msgid "Save configuration?"
 msgstr "Êѹ¹ÅÀ¤ò¥»¡¼¥Ö¤·¤Þ¤¹¤«¡©"
 
-#: src/main.c:149
+#: src/main.c:161
 msgid "M17N-IM Configuration"
 msgstr "M17N-IM ¤Î¥«¥¹¥¿¥Þ¥¤¥º"
diff --git a/src/mim-config.c b/src/mim-config.c
index ae19749..04c01cf 100644
--- a/src/mim-config.c
+++ b/src/mim-config.c
@@ -475,7 +475,7 @@ static gboolean
 reset_to_default (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
 		  gpointer data)
 {
-  enum MimStatus status;
+  enum MimStatus status, new_status;
   MSymbol lang, name;
   MimConfigStatus *config_status = data;
   MPlist *empty = mplist ();
@@ -488,8 +488,9 @@ reset_to_default (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
     return FALSE;
   minput_config_variable (lang, name, Mnil, empty);
   minput_config_command (lang, name, Mnil, empty);
-  status = get_mim_status (lang, name);
-  update_child_row (model, iter, status, config_status, NULL);
+  new_status = get_mim_status (lang, name);
+  if (status != new_status)
+    update_child_row (model, iter, new_status, config_status, NULL);
   return FALSE;
 }