projects
/
m17n
/
m17n-im-config.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
109d454
)
*** empty log message ***
author
ntakahas
<ntakahas>
Mon, 23 Apr 2007 11:31:06 +0000
(11:31 +0000)
committer
ntakahas
<ntakahas>
Mon, 23 Apr 2007 11:31:06 +0000
(11:31 +0000)
src/mim-config.c
patch
|
blob
|
history
src/variable.c
patch
|
blob
|
history
diff --git
a/src/mim-config.c
b/src/mim-config.c
index
fff6c90
..
2fb25fc
100644
(file)
--- a/
src/mim-config.c
+++ b/
src/mim-config.c
@@
-78,14
+78,14
@@
get_mim_status (MSymbol lang, MSymbol name)
MPlist *p = mplist_value (plist);
MSymbol status_symbol;
MPlist *p = mplist_value (plist);
MSymbol status_symbol;
- if (status == MIM_STATUS_NO)
- status = MIM_STATUS_DEFAULT;
p = mplist_next (mplist_next (p));
status_symbol = mplist_value (p);
if (status_symbol == Mconfigured)
return MIM_STATUS_MODIFIED;
if (status_symbol == Mcustomized)
status = MIM_STATUS_CUSTOMIZED;
p = mplist_next (mplist_next (p));
status_symbol = mplist_value (p);
if (status_symbol == Mconfigured)
return MIM_STATUS_MODIFIED;
if (status_symbol == Mcustomized)
status = MIM_STATUS_CUSTOMIZED;
+ else if (status == MIM_STATUS_NO)
+ status = MIM_STATUS_DEFAULT;
}
for (plist = minput_get_command (lang, name, Mnil);
plist && mplist_key (plist) != Mnil; plist = mplist_next (plist))
}
for (plist = minput_get_command (lang, name, Mnil);
plist && mplist_key (plist) != Mnil; plist = mplist_next (plist))
@@
-93,14
+93,14
@@
get_mim_status (MSymbol lang, MSymbol name)
MPlist *p = mplist_value (plist);
MSymbol status_symbol;
MPlist *p = mplist_value (plist);
MSymbol status_symbol;
- if (status == MIM_STATUS_NO)
- status = MIM_STATUS_DEFAULT;
p = mplist_next (mplist_next (p));
status_symbol = mplist_value (p);
if (status_symbol == Mconfigured)
return MIM_STATUS_MODIFIED;
if (status_symbol == Mcustomized)
status = MIM_STATUS_CUSTOMIZED;
p = mplist_next (mplist_next (p));
status_symbol = mplist_value (p);
if (status_symbol == Mconfigured)
return MIM_STATUS_MODIFIED;
if (status_symbol == Mcustomized)
status = MIM_STATUS_CUSTOMIZED;
+ else if (status == MIM_STATUS_NO)
+ status = MIM_STATUS_DEFAULT;
}
return status;
}
}
return status;
}
@@
-213,7
+213,7
@@
edit_im (GtkTreeView *tree, MSymbol lang, MSymbol name)
FALSE, FALSE, 0);
gtk_widget_show_all (dialog);
FALSE, FALSE, 0);
gtk_widget_show_all (dialog);
- gtk_dialog_run (dialog);
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
gtk_widget_destroy (dialog);
}
diff --git
a/src/variable.c
b/src/variable.c
index
cb6fe9d
..
a5c26e4
100644
(file)
--- a/
src/variable.c
+++ b/
src/variable.c
@@
-63,7
+63,7
@@
entry_cb (GtkEntry *entry, gpointer data)
{
MText *mt;
{
MText *mt;
- mt = mtext_from_data (text, strlen (text), MTEXT_FORMAT_UTF_8);
+ mt = mconv_decode_buffer (Mcoding_utf_8, text, strlen (text));
mplist_add (plist, Mtext, mt);
CONFIG_VARIABLE (plist);
m17n_object_unref (mt);
mplist_add (plist, Mtext, mt);
CONFIG_VARIABLE (plist);
m17n_object_unref (mt);
@@
-118,7
+118,7
@@
combo_cb (GtkComboBox *combo, gpointer data)
{
MText *mt;
{
MText *mt;
- mt = mtext_from_data (text, strlen (text), MTEXT_FORMAT_UTF_8);
+ mt = mconv_decode_buffer (Mcoding_utf_8, text, strlen (text));
mplist_add (plist, Mtext, mt);
CONFIG_VARIABLE (plist);
m17n_object_unref (mt);
mplist_add (plist, Mtext, mt);
CONFIG_VARIABLE (plist);
m17n_object_unref (mt);