[uim-commit] r782 - in trunk: gtk helper uim xim
yamaken at freedesktop.org
yamaken at freedesktop.org
Wed Mar 9 08:13:29 PST 2005
Author: yamaken
Date: 2005-03-09 08:13:17 -0800 (Wed, 09 Mar 2005)
New Revision: 782
Modified:
trunk/gtk/gtk-im-uim.c
trunk/helper/dict-anthy.c
trunk/helper/dict-canna.c
trunk/helper/dict-cclass-dialog.c
trunk/helper/dict-main-gtk.c
trunk/helper/dict-util.c
trunk/helper/dict-word-list-view-gtk.c
trunk/helper/dict-word-list-win-gtk.c
trunk/helper/dict-word-win-gtk.c
trunk/helper/dict-word.c
trunk/helper/im-switcher-gtk.c
trunk/helper/input-pad-ja.c
trunk/helper/pref-gtk-custom-widgets.c
trunk/helper/pref-gtk.c
trunk/helper/toolbar-common-gtk.c
trunk/helper/toolbar-standalone-gtk.c
trunk/uim/anthy.c
trunk/uim/canna.c
trunk/uim/m17nlib.c
trunk/uim/plugin.c
trunk/uim/prime.c
trunk/uim/scim.cpp
trunk/uim/skk-dic.c
trunk/uim/slib.c
trunk/uim/spellcheck.c
trunk/uim/uim-func.c
trunk/uim/uim-helper-client.c
trunk/uim/uim-helper-server.c
trunk/uim/uim-helper.c
trunk/uim/uim-ipc.c
trunk/uim/uim-table.c
trunk/uim/uim-util.c
trunk/uim/uim.c
trunk/xim/util.cpp
trunk/xim/ximtrans.cpp
Log:
* uim/uim-ipc.c
* uim/uim-util.c
* uim/m17nlib.c
* uim/prime.c
* uim/spellcheck.c
* uim/uim-helper-client.c
* uim/skk-dic.c
* uim/scim.cpp
* uim/plugin.c
* uim/uim-helper.c
* uim/uim-helper-server.c
* uim/uim-table.c
* uim/canna.c
* uim/anthy.c
* uim/uim-func.c
* uim/slib.c
* uim/uim.c
* helper/dict-util.c
* helper/dict-canna.c
* helper/dict-anthy.c
* helper/toolbar-common-gtk.c
* helper/toolbar-standalone-gtk.c
* helper/dict-word-list-win-gtk.c
* helper/dict-cclass-dialog.c
* helper/pref-gtk-custom-widgets.c
* helper/dict-word.c
* helper/dict-word-list-view-gtk.c
* helper/dict-word-win-gtk.c
* helper/im-switcher-gtk.c
* helper/pref-gtk.c
* helper/dict-main-gtk.c
* helper/input-pad-ja.c
* gtk/gtk-im-uim.c
* xim/ximtrans.cpp
* xim/util.cpp
- Cosmetic change by tools/trim-src.sh
Modified: trunk/gtk/gtk-im-uim.c
===================================================================
--- trunk/gtk/gtk-im-uim.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/gtk/gtk-im-uim.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -466,7 +466,7 @@
disable_focused_context = FALSE;
/* XXX:Use of key snooper is not recommended way!! */
- if(snooper_installed == FALSE) {
+ if (snooper_installed == FALSE) {
snooper_id = gtk_key_snooper_install((GtkKeySnoopFunc)uim_key_snoop, NULL );
snooper_installed = TRUE;
}
@@ -494,7 +494,7 @@
{
IMUIMContext *uic = IM_UIM_CONTEXT(ic);
- if(snooper_installed == TRUE) {
+ if (snooper_installed == TRUE) {
gtk_key_snooper_remove(snooper_id);
snooper_installed = FALSE;
}
@@ -760,11 +760,11 @@
g_string_append(msg, name);
g_string_append(msg, "\t");
- if(lang) g_string_append(msg, lang);
+ if (lang) g_string_append(msg, lang);
g_string_append(msg, "\t");
- if(short_desc) g_string_append(msg, short_desc);
+ if (short_desc) g_string_append(msg, short_desc);
g_string_append(msg, "\t");
- if(strcmp(name, current_im_name) == 0) {
+ if (strcmp(name, current_im_name) == 0) {
g_string_append(msg, "selected");
}
g_string_append(msg, "\n");
@@ -933,19 +933,19 @@
IMUIMContext *cc;
gchar **lines = g_strsplit(str, "\n", -1);
gchar *im_name = lines[1];
- if(g_str_has_prefix(str, "im_change_this_text_area_only") == TRUE) {
- if(focused_context) {
+ if (g_str_has_prefix(str, "im_change_this_text_area_only") == TRUE) {
+ if (focused_context) {
uim_switch_im(focused_context->uc, im_name);
uim_prop_list_update(focused_context->uc);
}
- } else if(g_str_has_prefix(str, "im_change_whole_desktop") == TRUE) {
+ } else if (g_str_has_prefix(str, "im_change_whole_desktop") == TRUE) {
for (cc = context_list.next; cc != &context_list; cc = cc->next) {
uim_switch_im(cc->uc, im_name);
if (focused_context && cc == focused_context)
uim_prop_list_update(cc->uc);
}
- } else if(g_str_has_prefix(str, "im_change_this_application_only") == TRUE) {
- if(focused_context) {
+ } else if (g_str_has_prefix(str, "im_change_this_application_only") == TRUE) {
+ if (focused_context) {
for (cc = context_list.next; cc != &context_list; cc = cc->next) {
uim_switch_im(cc->uc, im_name);
if (cc == focused_context)
@@ -974,7 +974,7 @@
g_strfreev(lines);
}
} else if (focused_context && !disable_focused_context) {
- if (g_str_has_prefix(str, "prop_list_get") == TRUE){
+ if (g_str_has_prefix(str, "prop_list_get") == TRUE) {
uim_prop_list_update(focused_context->uc);
} else if (g_str_has_prefix(str, "prop_label_get") == TRUE) {
uim_prop_label_update(focused_context->uc);
@@ -1044,7 +1044,7 @@
void
im_module_init(GTypeModule *type_module)
{
- if(uim_init() == -1) {
+ if (uim_init() == -1) {
return;
}
Modified: trunk/helper/dict-anthy.c
===================================================================
--- trunk/helper/dict-anthy.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-anthy.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -101,7 +101,7 @@
get_anthydic_api()
{
anthy_dic_lib = dlopen("libanthydic.so.0", RTLD_GLOBAL |RTLD_NOW);
- if(anthy_dic_lib == NULL) {
+ if (anthy_dic_lib == NULL) {
return -1;
}
@@ -121,7 +121,7 @@
anthy_dic_api.priv_dic_add_entry = dlsym(anthy_dic_lib, "anthy_priv_dic_add_entry");
- if(!anthy_dic_api.util_init && !anthy_dic_api.util_set_personality
+ if (!anthy_dic_api.util_init && !anthy_dic_api.util_set_personality
&& !anthy_dic_api.util_get_anthydir && !anthy_dic_api.priv_dic_delete
&& !anthy_dic_api.priv_dic_select_first_entry
&& !anthy_dic_api.priv_dic_select_next_entry
@@ -140,7 +140,7 @@
static int
dict_anthy_init(void)
{
- if(get_anthydic_api() == -1)
+ if (get_anthydic_api() == -1)
return -1;
anthy_dic_api.util_init();
return 0;
@@ -149,7 +149,7 @@
static int
dict_anthy_exit(void)
{
- if(anthy_dic_lib)
+ if (anthy_dic_lib)
return dlclose(anthy_dic_lib);
else
return -1;
@@ -161,13 +161,13 @@
char phon[100], desc[100], cclass_code[100];
int ret = 0;
- if(anthy_dic_api.priv_dic_select_first_entry() == -1) {
+ if (anthy_dic_api.priv_dic_select_first_entry() == -1) {
*head = NULL;
return -1;
}
- while(ret == 0) {
- if(anthy_dic_api.priv_dic_get_index(phon, sizeof(phon))
+ while (ret == 0) {
+ if (anthy_dic_api.priv_dic_get_index(phon, sizeof(phon))
&& anthy_dic_api.priv_dic_get_wtype(cclass_code, sizeof(cclass_code))
&& anthy_dic_api.priv_dic_get_word(desc, sizeof(desc))) {
gint pos;
@@ -193,7 +193,7 @@
dict_anthy_add_priv_dic_with_flags(char *phon, char *desc,
char *cclass_code, int freq)
{
- if((strlen(phon) == 0) ||
+ if ((strlen(phon) == 0) ||
(strlen(desc) == 0) ||
(strlen(cclass_code) == 0)) {
return -1;
Modified: trunk/helper/dict-canna.c
===================================================================
--- trunk/helper/dict-canna.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-canna.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -309,13 +309,13 @@
};
do {
- for(j = 0; j < num[i]; j++) {
- if(strcmp(code, (category[i])[j].code) == 0
+ for (j = 0; j < num[i]; j++) {
+ if (strcmp(code, (category[i])[j].code) == 0
&& ((category[i])[j].type & type) == type)
pos = strdup((category[i])[j].desc);
}
i++;
- } while(category[i] != NULL);
+ } while (category[i] != NULL);
return pos;
}
@@ -342,13 +342,13 @@
};
do {
- for(j = 0; j < num[i]; j++) {
- if(strcmp(pos, (category[i])[j].desc) == 0
+ for (j = 0; j < num[i]; j++) {
+ if (strcmp(pos, (category[i])[j].desc) == 0
&& ((category[i])[j].type & type) == type)
code = strdup((category[i])[j].code);
}
i++;
- } while(category[i] != NULL);
+ } while (category[i] != NULL);
return code;
}
Modified: trunk/helper/dict-cclass-dialog.c
===================================================================
--- trunk/helper/dict-cclass-dialog.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-cclass-dialog.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -127,7 +127,7 @@
gtk_tree_view_set_model(GTK_TREE_VIEW(treeview_pos),
GTK_TREE_MODEL(store));
- switch(pos_type) {
+ switch (pos_type) {
case POS_SUBSTANTIVE:
narrow_size = nr_substantive_code;
code = substantive_code;
@@ -150,8 +150,8 @@
break;
}
- for(i = 0; i < narrow_size; i++) {
- if(code[i].type & system) {
+ for (i = 0; i < narrow_size; i++) {
+ if (code[i].type & system) {
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
COLUMN_ID, i,
@@ -163,9 +163,9 @@
result = gtk_dialog_run(GTK_DIALOG(dialog));
- switch(result) {
+ switch (result) {
case GTK_RESPONSE_ACCEPT:
- if(gtk_tree_selection_get_selected(selection, NULL, &iter)) {
+ if (gtk_tree_selection_get_selected(selection, NULL, &iter)) {
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
COLUMN_ID, &id, -1);
pos_utf8 = g_strdup(code[id].code);
Modified: trunk/helper/dict-main-gtk.c
===================================================================
--- trunk/helper/dict-main-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-main-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -92,9 +92,9 @@
static void
check_helper_connection(void)
{
- if(uim_fd < 0) {
+ if (uim_fd < 0) {
uim_fd = uim_helper_init_client_fd(helper_disconnect_cb);
- if(uim_fd > 0) {
+ if (uim_fd > 0) {
GIOChannel *channel;
channel = g_io_channel_unix_new(uim_fd);
read_tag = g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR,
@@ -118,9 +118,9 @@
ae_mode = MODE_EDIT;
- while((ch = getopt(argc, argv, "aei:")) != -1)
+ while ((ch = getopt(argc, argv, "aei:")) != -1)
{
- switch(ch) {
+ switch (ch) {
case 'a':
ae_mode = MODE_ADD;
break;
@@ -155,7 +155,7 @@
GtkWidget *window;
uim_dict *dict;
- if(ae_mode == MODE_EDIT) {
+ if (ae_mode == MODE_EDIT) {
window = word_list_window_new();
} else {
dict = uim_dict_open(N_("Anthy private dictionary"));
@@ -179,7 +179,7 @@
{
GtkWidget *window = NULL;
- switch(input_method) {
+ switch (input_method) {
case IM_ANTHY:
window = create_window_anthy();
break;
@@ -220,7 +220,7 @@
result = create_window();
- if(result == -1) {
+ if (result == -1) {
g_printerr(_("Error:%s\n"), get_error_msg());
exit(-1);
}
Modified: trunk/helper/dict-util.c
===================================================================
--- trunk/helper/dict-util.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-util.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -46,7 +46,7 @@
g_return_val_if_fail(outcode && *outcode, g_strdup(in));
out = g_convert(in, -1, outcode, incode, &rbytes, &wbytes, &error);
- if(error != NULL) {
+ if (error != NULL) {
g_printerr("g_convert failed: %s\nin: %s out: %s\n",
error->message, in, out);
g_error_free(error);
@@ -63,8 +63,8 @@
g_return_val_if_fail(in, NULL);
out = g_locale_to_utf8(in, -1, &rbytes, &wbytes, &error);
- if(out == NULL && error != NULL) {
- if(g_utf8_validate(in, -1, NULL)) {
+ if (out == NULL && error != NULL) {
+ if (g_utf8_validate(in, -1, NULL)) {
out = g_strdup(in);
} else {
g_printerr("g_locale_to_utf8 failed: %s\n", error->message);
@@ -79,7 +79,7 @@
gchar *eucjp = NULL;
g_return_val_if_fail(utf8, NULL);
- if(g_utf8_validate(utf8, -1, NULL)) {
+ if (g_utf8_validate(utf8, -1, NULL)) {
eucjp = charset_convert(utf8, "UTF-8", "EUC-JP");
}
Modified: trunk/helper/dict-word-list-view-gtk.c
===================================================================
--- trunk/helper/dict-word-list-view-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-word-list-view-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -91,7 +91,7 @@
{
static GType type = 0;
- if(type == 0) {
+ if (type == 0) {
static const GTypeInfo info = {
sizeof(WordListViewClass),
NULL, /* base_init */
@@ -316,14 +316,14 @@
{
WordListView *view = WORD_LIST_VIEW(object);
- if(view->model != NULL) {
+ if (view->model != NULL) {
GObject *model = G_OBJECT(view->model);
view->model = NULL;
g_object_unref(model);
}
- if(G_OBJECT_CLASS(parent_class)->finalize)
+ if (G_OBJECT_CLASS(parent_class)->finalize)
G_OBJECT_CLASS(parent_class)->finalize(object);
}
@@ -337,14 +337,14 @@
view->dict = NULL;
}
- if(GTK_OBJECT_CLASS(parent_class)->destroy) {
+ if (GTK_OBJECT_CLASS(parent_class)->destroy) {
GTK_OBJECT_CLASS(parent_class)->destroy(object);
}
}
/*
static void find_initial_path_helper(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter iter, GtkTreePath **initial_path) {
- if(*initial_path != NULL) {
+ if (*initial_path != NULL) {
return;
}
@@ -357,20 +357,20 @@
GtkTreeIter iter;
gtk_tree_view_get_cursor(view->view, &path, NULL);
- if(path != NULL) {
+ if (path != NULL) {
return path;
}
gtk_widget_grab_focus(GTK_WIDGET(view));
gtk_tree_view_get_cursor(view->view, &path, NULL);
- if(path != NULL) {
+ if (path != NULL) {
return path;
}
gtk_tree_selection_selected_foreach(view->selection, find_initial_path_helper, &path);
- if(path != NULL) {
+ if (path != NULL) {
return path;
}
- if(!gtk_tree_model_get_iter_first(view->model, &iter)) {
+ if (!gtk_tree_model_get_iter_first(view->model, &iter)) {
return NULL;
}
@@ -419,7 +419,7 @@
{
g_return_if_fail(IS_WORD_LIST_VIEW(view));
- if(view->cclass_code_show != show) {
+ if (view->cclass_code_show != show) {
view->cclass_code_show = show;
gtk_tree_view_column_set_visible(view->cclass_code_column, show);
g_object_notify(G_OBJECT(view), "cclass_code_show");
@@ -439,7 +439,7 @@
{
g_return_if_fail(IS_WORD_LIST_VIEW(view));
- if(view->freq_show != show) {
+ if (view->freq_show != show) {
view->freq_show = show;
gtk_tree_view_column_set_visible(view->freq_column, show);
g_object_notify(G_OBJECT(view), "freq_show");
@@ -459,7 +459,7 @@
{
g_return_if_fail(IS_WORD_LIST_VIEW(view));
- if(view->okuri_show != show) {
+ if (view->okuri_show != show) {
view->okuri_show = show;
gtk_tree_view_column_set_visible(view->okuri_column, show);
g_object_notify(G_OBJECT(view), "okuri_show");
@@ -481,14 +481,14 @@
GtkTreeIter iter;
g_return_if_fail(IS_WORD_LIST_VIEW(view));
- if(view->editable != editable) {
+ if (view->editable != editable) {
view->editable = editable;
- if(gtk_tree_model_get_iter_first(view->model, &iter)) {
+ if (gtk_tree_model_get_iter_first(view->model, &iter)) {
do {
gtk_list_store_set(GTK_LIST_STORE(view->model), &iter,
WORD_LIST_EDITABLE, editable,
TERMINATOR);
- } while(gtk_tree_model_iter_next(view->model, &iter));
+ } while (gtk_tree_model_iter_next(view->model, &iter));
g_object_notify(G_OBJECT(view), "editable");
}
@@ -509,7 +509,7 @@
{
g_return_if_fail(IS_WORD_LIST_VIEW(view));
- if(view->selection_mode != mode) {
+ if (view->selection_mode != mode) {
view->selection_mode = mode;
gtk_tree_selection_set_mode(view->selection, mode);
g_object_notify(G_OBJECT(view), "selection_mode");
@@ -532,7 +532,7 @@
{
WordListView *view = WORD_LIST_VIEW(object);
- switch(prop_id) {
+ switch (prop_id) {
case PROP_CCLASS_CODE_SHOW:
word_list_view_set_visible_cclass_code_column(view, g_value_get_boolean(value));
break;
@@ -562,7 +562,7 @@
{
WordListView *view = WORD_LIST_VIEW(object);
- switch(prop_id) {
+ switch (prop_id) {
case PROP_CCLASS_CODE_SHOW:
g_value_set_boolean(value, view->cclass_code_show);
break;
@@ -615,11 +615,11 @@
g_return_if_fail(data != NULL);
for (w = data; w; w = w->next) {
- if(w->phon == NULL)
+ if (w->phon == NULL)
w->phon = g_strdup("");
- if(w->desc == NULL)
+ if (w->desc == NULL)
w->desc = g_strdup("");
- if(w->cclass_code == NULL)
+ if (w->cclass_code == NULL)
w->cclass_code = g_strdup("");
phonetic = charset_convert(w->phon, w->charset, "UTF-8");
@@ -677,11 +677,11 @@
g_return_val_if_fail(IS_WORD_LIST_VIEW(view), NULL);
- if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(view->model), &iter)) {
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(view->model), &iter)) {
do {
#if 0
data = g_new0(word, 1);
- if(data != NULL) {
+ if (data != NULL) {
gtk_tree_model_get(view->model, &iter,
WORD_LIST_WORD_TYPE, &data->type,
WORD_LIST_PHON, &data->phon,
@@ -691,7 +691,7 @@
WORD_LIST_OKURI, &data->okuri,
TERMINATOR);
- if(data->phon != NULL && data->desc != NULL &&
+ if (data->phon != NULL && data->desc != NULL &&
data->cclass_code != NULL)
{
list = g_list_append(list, data);
@@ -704,7 +704,7 @@
if (data)
list = g_list_append(list, data);
#endif
- } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(view->model), &iter));
+ } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(view->model), &iter));
}
return list;
}
@@ -720,18 +720,18 @@
list = gtk_tree_selection_get_selected_rows(view->selection, &view->model);
- for(pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
+ for (pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
GtkTreePath *path = pos->data;
pos->data = gtk_tree_row_reference_new(view->model, path);
gtk_tree_path_free(path);
}
- for(pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
+ for (pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
GtkTreePath *path = gtk_tree_row_reference_get_path(pos->data);
- if(path) {
- if(gtk_tree_model_get_iter(view->model, &iter, path)) {
+ if (path) {
+ if (gtk_tree_model_get_iter(view->model, &iter, path)) {
uim_word *data;
#if 0
@@ -773,18 +773,18 @@
list = gtk_tree_selection_get_selected_rows(view->selection, &view->model);
- for(pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
+ for (pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
GtkTreePath *path = pos->data;
pos->data = gtk_tree_row_reference_new(view->model, path);
gtk_tree_path_free(path);
}
- for(pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
+ for (pos = g_list_first(list); pos != NULL; pos = g_list_next(pos)) {
GtkTreePath *path = gtk_tree_row_reference_get_path(pos->data);
- if(path) {
- if(gtk_tree_model_get_iter(view->model, &iter, path)) {
+ if (path) {
+ if (gtk_tree_model_get_iter(view->model, &iter, path)) {
gtk_list_store_remove(GTK_LIST_STORE(view->model), &iter);
gtk_tree_row_reference_free(pos->data);
gtk_tree_path_free(path);
@@ -812,7 +812,7 @@
gtk_tree_model_get_iter(model, &iter, path);
- switch(GPOINTER_TO_INT(column)) {
+ switch (GPOINTER_TO_INT(column)) {
case WORD_LIST_PHON:
case WORD_LIST_DESC:
case WORD_LIST_CCLASS_CODE:
Modified: trunk/helper/dict-word-list-win-gtk.c
===================================================================
--- trunk/helper/dict-word-list-win-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-word-list-win-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -160,7 +160,7 @@
GType word_list_window_get_type(void) {
static GType type = 0;
- if(type == 0) {
+ if (type == 0) {
static const GTypeInfo info = {
sizeof(WordListWindowClass),
NULL, /* base_init */
Modified: trunk/helper/dict-word-win-gtk.c
===================================================================
--- trunk/helper/dict-word-win-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-word-win-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -84,7 +84,7 @@
word_window_get_type(void) {
static GType type = 0;
- if(type == 0) {
+ if (type == 0) {
static const GTypeInfo info = {
sizeof(WordWindowClass),
NULL, /* base_init */
@@ -298,7 +298,7 @@
gtk_label_set_mnemonic_widget(GTK_LABEL(label), combobox_pos_broad);
gtk_widget_show(combobox_pos_broad);
- for(i = 0; i < pos_num; i++) {
+ for (i = 0; i < pos_num; i++) {
gtk_combo_box_append_text(GTK_COMBO_BOX(combobox_pos_broad),
_(pos_broad[i]));
}
@@ -480,7 +480,7 @@
ret = -1;
}
- if(ret == -1) {
+ if (ret == -1) {
dialog = gtk_message_dialog_new(NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
Modified: trunk/helper/dict-word.c
===================================================================
--- trunk/helper/dict-word.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/dict-word.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -43,26 +43,26 @@
{
uim_word *entry, *pos;
entry = malloc(sizeof(uim_word));
- if(entry != NULL) {
+ if (entry != NULL) {
/* If each arguments is NULL, allocate '\0' */
entry->type = type;
- if(charset != NULL)
+ if (charset != NULL)
entry->charset = strdup(charset);
else
entry->charset = strdup("");
- if(phon != NULL)
+ if (phon != NULL)
entry->phon = strdup(phon);
else
entry->phon = strdup("");
- if(desc != NULL)
+ if (desc != NULL)
entry->desc = strdup(desc);
else
entry->desc = strdup("");
- if(cclass_code != NULL) {
+ if (cclass_code != NULL) {
entry->cclass_code = strdup(cclass_code);
} else
entry->cclass_code = strdup("");
@@ -71,14 +71,14 @@
/* SKK specific */
entry->okuri = okuri;
- if(annotation != NULL)
+ if (annotation != NULL)
entry->annotation = strdup(annotation);
else
entry->annotation = strdup("");
entry->next = NULL;
- if(*head == NULL) {
+ if (*head == NULL) {
*head = entry;
} else {
pos = word_last(*head);
@@ -89,16 +89,16 @@
void word_free_list(uim_word *head) {
uim_word *pos, *pos_prev;
- for(pos = head; pos != NULL; ) {
- if(pos->charset != NULL)
+ for (pos = head; pos != NULL; ) {
+ if (pos->charset != NULL)
free(pos->charset);
- if(pos->phon != NULL)
+ if (pos->phon != NULL)
free(pos->phon);
- if(pos->desc != NULL)
+ if (pos->desc != NULL)
free(pos->desc);
- if(pos->cclass_code != NULL)
+ if (pos->cclass_code != NULL)
free(pos->cclass_code);
- if(pos->annotation != NULL)
+ if (pos->annotation != NULL)
free(pos->annotation);
pos_prev = pos;
@@ -108,8 +108,8 @@
}
uim_word *word_last(uim_word *list) {
- if(list != NULL) {
- while(list->next) {
+ if (list != NULL) {
+ while (list->next) {
list = list->next;
}
}
Modified: trunk/helper/im-switcher-gtk.c
===================================================================
--- trunk/helper/im-switcher-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/im-switcher-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -93,9 +93,9 @@
GString *line = g_string_new("");
/* I don't want to depend on glib, but GString is too convenience... */
- while(fgets(buf, sizeof(buf), fp) != NULL) {
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
g_string_append(line, buf);
- if(line->str[line->len - 1] == '\n') {
+ if (line->str[line->len - 1] == '\n') {
return g_string_free(line, FALSE);
}
}
@@ -108,13 +108,13 @@
int i;
char **splitted1 = g_strsplit(line, "=", -1);
char **splitted2;
- if(splitted1 && splitted1[1] ) {
+ if (splitted1 && splitted1[1] ) {
splitted2 = g_strsplit(splitted1[1], ",", -1);
g_strfreev(splitted1);
} else {
return;
}
- for(i = 0 ;splitted2[i] != NULL; i++) {
+ for (i = 0 ;splitted2[i] != NULL; i++) {
g_print("%s", splitted2[i]);
}
g_strfreev(splitted2);
@@ -134,11 +134,11 @@
static void
parse_config_line(const char *line)
{
- if(g_strrstr(line, "history=") == line) {
+ if (g_strrstr(line, "history=") == line) {
parse_config_line_history(line);
- } else if(g_strrstr(line, "grouped=") == line) {
+ } else if (g_strrstr(line, "grouped=") == line) {
parse_config_line_grouped(line);
- } else if(g_strrstr(line, "sorting_way=") == line) {
+ } else if (g_strrstr(line, "sorting_way=") == line) {
parse_config_line_sorting_way(line);
}
}
@@ -149,20 +149,20 @@
const char *f;
char *line;
FILE *fp;
- if(filename == NULL) {
+ if (filename == NULL) {
return;/* FIXME:later get correct file path here */
} else {
f= filename;
}
fp = fopen(f, "r");
- if(fp == NULL) {
+ if (fp == NULL) {
fprintf(stderr, "%s\n", strerror(errno));
return;
}
/* XXX: I want you to write more beaftiful loop */
- while((line = get_next_line(fp)) != NULL) {
+ while ((line = get_next_line(fp)) != NULL) {
parse_config_line(line);
free(line);
}
@@ -186,7 +186,7 @@
GtkTreeStore *store;
GtkTreeIter iter;
gchar *str_data;
- if(gtk_tree_selection_get_selected (sel, &model, &iter) == TRUE) {
+ if (gtk_tree_selection_get_selected (sel, &model, &iter) == TRUE) {
store = GTK_TREE_STORE(model);
gtk_tree_model_get (model, &iter,
NAME_COLUMN, &str_data,
@@ -201,7 +201,7 @@
{
GString *msg = g_string_new(type);
gchar *im_name = get_selected_im_name();
- if(im_name == NULL) {
+ if (im_name == NULL) {
g_string_free(msg, TRUE);
return; /* Or should pop-up alert window here? */
}
@@ -411,7 +411,7 @@
static void
parse_helper_str(const char *sent_str)
{
- if(g_str_has_prefix(sent_str, "im_list") == TRUE) {
+ if (g_str_has_prefix(sent_str, "im_list") == TRUE) {
parse_helper_str_im_list(sent_str);
}
}
@@ -419,7 +419,7 @@
static char *
get_text(const char *str)
{
- if(strcmp("", str) == 0)
+ if (strcmp("", str) == 0)
return "-";
else
return gettext(str);
@@ -434,7 +434,7 @@
GtkTreeStore *tree_store;
GtkTreeIter iter;
GtkTreePath *path = NULL;
- if(im_list_str_old && strcmp(im_list_str_new, im_list_str_old) == 0) {
+ if (im_list_str_old && strcmp(im_list_str_new, im_list_str_old) == 0) {
return; /* No need to update */
}
@@ -444,20 +444,20 @@
G_TYPE_STRING,
G_TYPE_STRING);
- for(i=2; lines[i] != NULL; i++) {
+ for (i=2; lines[i] != NULL; i++) {
- if(!lines[i] || strcmp(lines[i], "") == 0) {
+ if (!lines[i] || strcmp(lines[i], "") == 0) {
break;
}
info = g_strsplit(lines[i], "\t", -1);
- if(info && info[0] && info[1] && info[2]) {
+ if (info && info[0] && info[1] && info[2]) {
gtk_tree_store_append(tree_store, &iter, NULL/* parent iter */);
gtk_tree_store_set(tree_store, &iter,
NAME_COLUMN, info[0],
LANG_COLUMN, get_text(info[1]),
DESC_COLUMN, get_text(info[2]),
-1);
- if(info[3] && (strcmp(info[3], "") != 0)) {
+ if (info[3] && (strcmp(info[3], "") != 0)) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store),
&iter);
@@ -468,7 +468,7 @@
gtk_tree_view_set_model(GTK_TREE_VIEW(switcher_tree_view),
GTK_TREE_MODEL(tree_store));
- if(path != NULL) {
+ if (path != NULL) {
gtk_tree_view_set_cursor(GTK_TREE_VIEW(switcher_tree_view),
path, NULL, FALSE);
}
@@ -503,9 +503,9 @@
static void
check_helper_connection(void)
{
- if(uim_fd < 0) {
+ if (uim_fd < 0) {
uim_fd = uim_helper_init_client_fd(helper_disconnect_cb);
- if(uim_fd > 0) {
+ if (uim_fd > 0) {
GIOChannel *channel;
channel = g_io_channel_unix_new(uim_fd);
read_tag = g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR,
@@ -530,7 +530,7 @@
result = create_switcher();
- if(result == -1) {
+ if (result == -1) {
fprintf(stderr, "Error:%s\n", get_error_msg());
exit(-1);
}
Modified: trunk/helper/input-pad-ja.c
===================================================================
--- trunk/helper/input-pad-ja.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/input-pad-ja.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -273,11 +273,11 @@
gtk_table_set_row_spacings(GTK_TABLE(_table), 3);
gtk_table_set_col_spacings(GTK_TABLE(_table), 3);
- for(i=0; i < rows; i++) {
- for(j=0; j < BUTTON_H_ALIGN; j++) {
- if(table[i*BUTTON_H_ALIGN + j] == NULL)
+ for (i=0; i < rows; i++) {
+ for (j=0; j < BUTTON_H_ALIGN; j++) {
+ if (table[i*BUTTON_H_ALIGN + j] == NULL)
goto out;
- if(strcmp(table[i*BUTTON_H_ALIGN + j], "") == 0)
+ if (strcmp(table[i*BUTTON_H_ALIGN + j], "") == 0)
continue;
button = gtk_button_new_with_label(table[i*BUTTON_H_ALIGN + j]);
Modified: trunk/helper/pref-gtk-custom-widgets.c
===================================================================
--- trunk/helper/pref-gtk-custom-widgets.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/pref-gtk-custom-widgets.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -389,7 +389,7 @@
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
char *filename;
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- if(filename) {
+ if (filename) {
gtk_entry_set_text(GTK_ENTRY(entry), filename);
g_free (filename);
}
@@ -501,7 +501,7 @@
g_return_if_fail (custom && custom->type == UCustom_Choice);
item = custom->range->as_choice.valid_items;
- if(item == NULL || *item == NULL) {
+ if (item == NULL || *item == NULL) {
uim_custom_free(custom);
return;
}
@@ -513,9 +513,9 @@
default_symbol = custom->value->as_choice->symbol;
- while(*item) {
+ while (*item) {
gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), (*item)->label);
- if(!strcmp(default_symbol, (*item)->symbol))
+ if (!strcmp(default_symbol, (*item)->symbol))
default_index = i;
i++;
item++;
Modified: trunk/helper/pref-gtk.c
===================================================================
--- trunk/helper/pref-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/pref-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -126,7 +126,7 @@
}
#endif
- if(gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
+ if (gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
return TRUE;
store = GTK_TREE_STORE(model);
@@ -135,15 +135,15 @@
GROUP_WIDGET, &group_widget,
-1);
- if(group_name == NULL)
+ if (group_name == NULL)
return TRUE;
/* hide current selected group's widget */
- if(current_group_widget)
+ if (current_group_widget)
gtk_widget_hide(current_group_widget);
/* whether group_widget is already packed or not */
- if(!gtk_widget_get_parent(group_widget))
+ if (!gtk_widget_get_parent(group_widget))
gtk_box_pack_start (GTK_BOX (pref_hbox), group_widget, TRUE, TRUE, 0);
/* show selected group's widget */
@@ -355,7 +355,7 @@
group = uim_custom_group_get(group_name);
- if(group == NULL)
+ if (group == NULL)
return NULL;
group_label = gtk_label_new("");
@@ -381,7 +381,7 @@
char **sgrp_syms = uim_custom_group_subgroups(parent_group);
char **sgrp_sym;
- for(sgrp_sym = sgrp_syms; *sgrp_sym; sgrp_sym++)
+ for (sgrp_sym = sgrp_syms; *sgrp_sym; sgrp_sym++)
{
struct uim_custom_group *sgrp = uim_custom_group_get(*sgrp_sym);
char **custom_syms, **custom_sym;
@@ -389,7 +389,7 @@
GtkWidget *frame;
GtkWidget *vbox;
- if(!sgrp)
+ if (!sgrp)
continue;
/* XXX quick hack to use AND expression of groups */
Modified: trunk/helper/toolbar-common-gtk.c
===================================================================
--- trunk/helper/toolbar-common-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/toolbar-common-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -186,7 +186,7 @@
splitted = g_strsplit(line, "=", 0);
- if(splitted && splitted[0] && splitted[1]
+ if (splitted && splitted[0] && splitted[1]
&& strcmp("charset", splitted[0]) == 0) {
gchar *charset = g_strdup(splitted[1]);
g_strfreev(splitted);
@@ -249,7 +249,7 @@
append_button(GtkWidget *hbox, GtkWidget *button)
{
GList *menu_buttons;
- if(button) {
+ if (button) {
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
menu_buttons = g_object_get_data(G_OBJECT(hbox), OBJECT_DATA_MENU_BUTTONS);
@@ -261,7 +261,7 @@
static gchar *
convert_charset(const gchar *charset, const gchar *line)
{
- if(charset == NULL) {
+ if (charset == NULL) {
return NULL;
}
return g_convert(line, strlen(line),
@@ -286,13 +286,13 @@
{
const gchar *command = g_object_get_data(G_OBJECT(prop_button), OBJECT_DATA_COMMAND);
gint type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), OBJECT_DATA_TOOLBAR_TYPE));
- if(event->button == 3) {
- if(type == TYPE_APPLET)
+ if (event->button == 3) {
+ if (type == TYPE_APPLET)
gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
else
prop_right_button_pressed(prop_button, event, prop_menu);
return TRUE;
- } else if(event->button == 2) {
+ } else if (event->button == 2) {
gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
return TRUE;
} else if (command && *command) {
@@ -317,30 +317,30 @@
menu_buttons = g_object_get_data(G_OBJECT(widget), OBJECT_DATA_MENU_BUTTONS);
sg = g_object_get_data(G_OBJECT(widget), OBJECT_DATA_SIZE_GROUP);
- if(menu_buttons) {
+ if (menu_buttons) {
g_list_foreach(menu_buttons, button_destroy, NULL);
g_list_free(menu_buttons);
g_object_set_data(G_OBJECT(widget), OBJECT_DATA_MENU_BUTTONS, NULL);
}
- while(tmp[i] && strcmp("", tmp[i]) != 0) {
+ while (tmp[i] && strcmp("", tmp[i]) != 0) {
gchar *utf8_str;
utf8_str = convert_charset(charset, tmp[i]);
- if(utf8_str != NULL) {
+ if (utf8_str != NULL) {
tmp2 = g_strsplit(utf8_str, "\t", 0);
g_free(utf8_str);
} else {
tmp2 = g_strsplit(tmp[i], "\t", 0);
}
- if(tmp2 && tmp2[0]) {
- if(strcmp("branch", tmp2[0]) == 0) {
+ if (tmp2 && tmp2[0]) {
+ if (strcmp("branch", tmp2[0]) == 0) {
button = menu_button_create(widget, tmp2[1], tmp2[2]);
append_button(widget, button);
- } else if(strcmp("leaf", tmp2[0]) == 0) {
+ } else if (strcmp("leaf", tmp2[0]) == 0) {
menu_button_append_menu(button, tmp2[2], tmp2[3], tmp2[4], tmp2[5]);
}
g_strfreev(tmp2);
@@ -357,7 +357,7 @@
uim_bool show_pref;
show_pref = uim_scm_symbol_value_bool(command_entry[i].pref_button_show_symbol);
- if(show_pref == UIM_FALSE)
+ if (show_pref == UIM_FALSE)
continue;
button = gtk_button_new();
@@ -385,7 +385,7 @@
gtk_widget_show_all(widget);
- if(charset)
+ if (charset)
g_free(charset);
}
@@ -400,20 +400,20 @@
charset = get_charset(lines[1]);
- while(lines[i] && strcmp("", lines[i]) != 0) {
+ while (lines[i] && strcmp("", lines[i]) != 0) {
i++;
}
menu_buttons = g_object_get_data(G_OBJECT(widget), OBJECT_DATA_MENU_BUTTONS);
- if(!menu_buttons || i - 2 != g_list_length(menu_buttons)) {
+ if (!menu_buttons || i - 2 != g_list_length(menu_buttons)) {
uim_helper_client_get_prop_list();
return;
}
i = 1; /* resetting temporary variable */
- while(lines[i] && strcmp("", lines[i]) != 0) {
+ while (lines[i] && strcmp("", lines[i]) != 0) {
if (charset) {
gchar *utf8_str;
@@ -429,7 +429,7 @@
pair = g_strsplit(lines[i], "\t", 0);
}
- if(pair && pair[0] && pair[1])
+ if (pair && pair[0] && pair[1])
{
button = g_list_nth_data(menu_buttons, i - 2 );
gtk_button_set_label(GTK_BUTTON(button), pair[0]);
@@ -438,7 +438,7 @@
i++;
}
- if(charset)
+ if (charset)
g_free(charset);
}
@@ -449,10 +449,10 @@
gchar **lines;
lines = g_strsplit(str, "\n", 0);
- if(lines && lines[0]) {
- if( strcmp("prop_list_update", lines[0]) == 0) {
+ if (lines && lines[0]) {
+ if ( strcmp("prop_list_update", lines[0]) == 0) {
helper_toolbar_prop_list_update(widget, lines);
- } else if( strcmp("prop_label_update", lines[0]) == 0) {
+ } else if ( strcmp("prop_label_update", lines[0]) == 0) {
helper_toolbar_prop_label_update(widget, lines);
}
g_strfreev(lines);
@@ -470,20 +470,20 @@
charset = get_charset(tmp[1]);
- while(tmp[i] && strcmp("", tmp[i]) != 0) {
+ while (tmp[i] && strcmp("", tmp[i]) != 0) {
gchar *utf8_str;
utf8_str = convert_charset(charset, tmp[i]);
- if(utf8_str != NULL) {
+ if (utf8_str != NULL) {
tmp2 = g_strsplit(utf8_str, "\t", 0);
g_free(utf8_str);
} else {
tmp2 = g_strsplit(tmp[i], "\t", 0);
}
- if(tmp2 && tmp2[0]) {
- if(strcmp("branch", tmp2[0]) == 0) {
- if(updated) {
+ if (tmp2 && tmp2[0]) {
+ if (strcmp("branch", tmp2[0]) == 0) {
+ if (updated) {
break;
} else {
GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
@@ -495,7 +495,7 @@
prop_data_flush(widget);
updated = TRUE;
}
- } else if(strcmp("leaf", tmp2[0]) == 0) {
+ } else if (strcmp("leaf", tmp2[0]) == 0) {
menu_button_append_menu(widget, tmp2[2], tmp2[3], tmp2[4], tmp2[5]);
}
g_strfreev(tmp2);
@@ -505,7 +505,7 @@
gtk_widget_show_all(widget);
- if(charset)
+ if (charset)
g_free(charset);
}
@@ -515,8 +515,8 @@
gchar **lines;
lines = g_strsplit(str, "\n", 0);
- if(lines && lines[0]) {
- if( strcmp("prop_list_update", lines[0]) == 0) {
+ if (lines && lines[0]) {
+ if ( strcmp("prop_list_update", lines[0]) == 0) {
helper_icon_prop_list_update(widget, lines);
}
g_strfreev(lines);
@@ -532,7 +532,7 @@
uim_helper_read_proc(fd);
- if(g_object_get_data(G_OBJECT(widget), OBJECT_DATA_SIZE_GROUP))
+ if (g_object_get_data(G_OBJECT(widget), OBJECT_DATA_SIZE_GROUP))
while ((tmp = uim_helper_get_message())) {
helper_toolbar_parse_helper_str(widget, tmp);
free(tmp); tmp = NULL;
@@ -608,12 +608,12 @@
prop_button_pressed(GtkButton *prop_button, GdkEventButton *event, GtkWidget *widget)
{
gint type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), OBJECT_DATA_TOOLBAR_TYPE));
- if(event->button == 3) {
- if(type == TYPE_APPLET)
+ if (event->button == 3) {
+ if (type == TYPE_APPLET)
gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
else
prop_right_button_pressed(prop_button, event, widget);
- } else if(event->button == 2) {
+ } else if (event->button == 2) {
gtk_propagate_event(gtk_widget_get_parent(GTK_WIDGET(prop_button)), (GdkEvent *) event);
}
return FALSE;
@@ -622,9 +622,9 @@
static void
check_helper_connection(GtkWidget *widget)
{
- if(uim_fd < 0) {
+ if (uim_fd < 0) {
uim_fd = uim_helper_init_client_fd(helper_disconnect_cb);
- if(uim_fd > 0) {
+ if (uim_fd > 0) {
GIOChannel *channel;
channel = g_io_channel_unix_new(uim_fd);
read_tag = g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR,
@@ -660,7 +660,7 @@
menu_item_list = gtk_container_get_children(GTK_CONTAINER(prop_menu));
- while((menu_item = g_list_nth_data(menu_item_list, i)) != NULL) {
+ while ((menu_item = g_list_nth_data(menu_item_list, i)) != NULL) {
gtk_container_remove(GTK_CONTAINER(prop_menu), menu_item);
i++;
}
@@ -733,13 +733,13 @@
menu_height = requisition.height;
- if(*y + button_height + menu_height < sc_height){
+ if (*y + button_height + menu_height < sc_height) {
*y = *y + button_height;
} else {
*y = *y - menu_height;
}
- if(*x + menu_width > sc_width){
+ if (*x + menu_width > sc_width) {
*x = sc_width - menu_width;
}
}
Modified: trunk/helper/toolbar-standalone-gtk.c
===================================================================
--- trunk/helper/toolbar-standalone-gtk.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/helper/toolbar-standalone-gtk.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -180,7 +180,7 @@
gint width, height;
gtk_window_get_size(GTK_WINDOW(widget), &width, &height);
- if(width != req->width || height != req->height) {
+ if (width != req->width || height != req->height) {
gtk_window_resize(GTK_WINDOW(widget), req->width, req->height);
}
}
Modified: trunk/uim/anthy.c
===================================================================
--- trunk/uim/anthy.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/anthy.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -138,7 +138,7 @@
}
context_slot = malloc(sizeof(struct context) *
MAX_CONTEXT);
- if(!context_slot) {
+ if (!context_slot) {
return uim_scm_f();
}
for (i = 0; i < MAX_CONTEXT; i++) {
@@ -322,7 +322,7 @@
}
for (i = 0; i < MAX_CONTEXT; i++) {
- if(context_slot[i].ac) {
+ if (context_slot[i].ac) {
api.release_context(context_slot[i].ac);
}
}
Modified: trunk/uim/canna.c
===================================================================
--- trunk/uim/canna.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/canna.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -81,9 +81,9 @@
context = context_array;
- if(id >= MAX_CONTEXT || id < 0)
+ if (id >= MAX_CONTEXT || id < 0)
return NULL;
- for(i = 0; i < id; i++)
+ for (i = 0; i < id; i++)
context++;
#ifdef UIM_CANNA_DEBUG
printf("rk_context_id: %d\n", context->rk_context_id);
@@ -98,13 +98,13 @@
struct canna_context *context;
int i;
- if(str_ != uim_scm_f())
+ if (str_ != uim_scm_f())
cannaserver = uim_scm_c_str(str_);
else
cannaserver = NULL;
context_array = malloc(sizeof(struct canna_context) * MAX_CONTEXT);
- if(context_array == NULL)
+ if (context_array == NULL)
return uim_scm_f();
context = context_array;
@@ -123,8 +123,8 @@
context++;
}
- if(rk_initialized == -1) {
- if(RkInitialize(cannaserver) == -1) {
+ if (rk_initialized == -1) {
+ if (RkInitialize(cannaserver) == -1) {
fprintf(stderr, "%s\n", strerror(errno));
return uim_scm_f();
}
@@ -141,30 +141,30 @@
int buflen;
struct canna_context *cc = context_array;
- if(rk_initialized == -1) {
- if(RkInitialize(cannaserver) == -1) {
+ if (rk_initialized == -1) {
+ if (RkInitialize(cannaserver) == -1) {
fprintf(stderr, "%s\n", strerror(errno));
return uim_scm_f();
}
rk_initialized = 1;
}
- for(i = 0; i < MAX_CONTEXT; i++) {
- if(cc->rk_context_id == -1) {
+ for (i = 0; i < MAX_CONTEXT; i++) {
+ if (cc->rk_context_id == -1) {
int dic_num;
cc->rk_context_id = RkCreateContext();
dic_num = RkGetDicList(cc->rk_context_id,
cc->diclist, BUFSIZE);
- if(dic_num == 0) {
+ if (dic_num == 0) {
return uim_scm_f();
- } else if(dic_num == -1) {
+ } else if (dic_num == -1) {
/* invalid context number */
return uim_scm_f();
} else {
int j;
/* buf[] = "dicname1\0dicname2\0dicname3\0...dicname_n\0\0" */
buf = cc->diclist;
- for(j = 0; j < dic_num; j++) {
+ for (j = 0; j < dic_num; j++) {
RkMountDic(cc->rk_context_id, buf, 0);
buflen = strlen(buf) + 1;
buf += buflen;
@@ -183,13 +183,13 @@
int id = uim_scm_c_int(id_);
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
- if(RkCloseContext(cc->rk_context_id) != -1) {
+ if (RkCloseContext(cc->rk_context_id) != -1) {
cc->rk_context_id = -1;
return uim_scm_t();
} else {
@@ -201,10 +201,10 @@
_reset_conversion(int id)
{
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return;
- if(cc->segment_num >= 0) {
+ if (cc->segment_num >= 0) {
cc->segment_num = -1;
RkEndBun(cc->rk_context_id, 0);
}
@@ -215,13 +215,13 @@
{
RkStat stat;
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return;
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return;
- if(RkGetStat(cc->rk_context_id, &stat) == 0)
+ if (RkGetStat(cc->rk_context_id, &stat) == 0)
{
cc->current_segment_num = stat.bunnum;
cc->current_cand_num = stat.candnum;
@@ -238,17 +238,17 @@
char buf[BUFSIZE];
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return;
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return;
tmp_segment_num = segment_num;
- if(segment_num >= cc->segment_num)
+ if (segment_num >= cc->segment_num)
tmp_segment_num = 0;
- for(i = 0; i <= tmp_segment_num; i++) {
+ for (i = 0; i <= tmp_segment_num; i++) {
int len;
RkGoTo(cc->rk_context_id, i);
len = RkGetKanji(cc->rk_context_id, (unsigned char *)buf, BUFSIZE);
@@ -269,10 +269,10 @@
int len, segment_num, mode;
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
mode = cc->rk_mode;
@@ -281,9 +281,9 @@
segment_num = RkBgnBun(cc->rk_context_id, str, len, mode);
- if(segment_num == -1) {
+ if (segment_num == -1) {
/* failed to conversion */
- if(str != NULL)
+ if (str != NULL)
free(str);
return uim_scm_f();
}
@@ -291,7 +291,7 @@
cc->segment_num = segment_num;
_update_segment(id, 0);
- if(str != NULL)
+ if (str != NULL)
free(str);
return uim_scm_make_int(cc->segment_num);
@@ -307,11 +307,11 @@
char buf[BUFSIZE];
int len;
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
_update_segment(id, seg);
- if(nth > cc->max_current_cand_num)
+ if (nth > cc->max_current_cand_num)
nth = 0;
RkXfer(cc->rk_context_id, nth);
@@ -329,10 +329,10 @@
/* RkStat stat; */
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
return uim_scm_make_int(cc->segment_num);
@@ -346,15 +346,15 @@
RkStat stat;
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
RkGoTo(cc->rk_context_id, nth);
- if(RkGetStat(cc->rk_context_id, &stat) == 0)
+ if (RkGetStat(cc->rk_context_id, &stat) == 0)
return uim_scm_make_int(stat.maxcand);
else
return uim_scm_f();
@@ -368,16 +368,16 @@
int nth = uim_scm_c_int(nth_);
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
RkGoTo(cc->rk_context_id, s);
RkNfer(cc->rk_context_id);
- if(nth > 0)
+ if (nth > 0)
cc->segment_num = RkEnlarge(cc->rk_context_id);
else
cc->segment_num = RkShorten(cc->rk_context_id);
@@ -397,10 +397,10 @@
#endif
struct canna_context *cc = get_canna_context(id);
- if(cc == NULL)
+ if (cc == NULL)
return uim_scm_f();
- if(cc->rk_context_id == -1)
+ if (cc->rk_context_id == -1)
return uim_scm_f();
RkEndBun(cc->rk_context_id, 1);
@@ -438,17 +438,17 @@
void
uim_plugin_instance_quit(void)
{
- if(cannaserver != NULL) {
+ if (cannaserver != NULL) {
free(cannaserver);
cannaserver = NULL;
}
- if(/* RkFinalize && */ rk_initialized == 1) {
+ if (/* RkFinalize && */ rk_initialized == 1) {
RkFinalize();
rk_initialized = -1;
}
- if(context_array != NULL) {
+ if (context_array != NULL) {
free(context_array);
context_array = NULL;
}
Modified: trunk/uim/m17nlib.c
===================================================================
--- trunk/uim/m17nlib.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/m17nlib.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -134,7 +134,7 @@
im_array = realloc(im_array,
sizeof(struct im_) * (nr_input_methods + 1));
- if(lang != NULL) {
+ if (lang != NULL) {
im_array[nr_input_methods].lang = strdup(lang);
} else {
im_array[nr_input_methods].lang = NULL;
@@ -268,10 +268,10 @@
int id = uim_scm_c_int(id_);
/* range check of id might need. */
MInputContext *ic = ic_array[id].mic;
- if(!ic) {
+ if (!ic) {
return uim_scm_f();
}
- if(ic->candidate_from == ic->candidate_to ||
+ if (ic->candidate_from == ic->candidate_to ||
ic->candidate_from > ic->candidate_to) {
return uim_scm_f();
} else {
@@ -285,10 +285,10 @@
int id = uim_scm_c_int(id_);
/* range check of id might need. */
MInputContext *ic = ic_array[id].mic;
- if(!ic) {
+ if (!ic) {
return uim_scm_f();
}
- if(ic->preedit_changed == 1) {
+ if (ic->preedit_changed == 1) {
return uim_scm_t();
} else {
return uim_scm_f();
@@ -308,13 +308,13 @@
if (!ic) {
return uim_scm_make_str("");
}
- if(ic->cursor_pos == 0) {
+ if (ic->cursor_pos == 0) {
return uim_scm_make_str("");
}
buf = convert_mtext2str(ic->preedit);
p = (char *)buf;
- for(i=0; i<ic->cursor_pos ;i++) {
+ for (i=0; i<ic->cursor_pos ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
*p = 0;
@@ -341,7 +341,7 @@
buf = convert_mtext2str(ic->preedit);
p = buf;
- for(i=0; i<ic->cursor_pos ;i++) {
+ for (i=0; i<ic->cursor_pos ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
buflen = strlen((char *)p);
@@ -362,13 +362,13 @@
if (!ic) {
return uim_scm_make_str("");
}
- if(ic->candidate_from == 0) {
+ if (ic->candidate_from == 0) {
return uim_scm_make_str("");
}
buf = convert_mtext2str(ic->preedit);
p = buf;
- for(i=0; i<ic->candidate_from ;i++) {
+ for (i=0; i<ic->candidate_from ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
*p = 0;
@@ -395,16 +395,16 @@
buf = convert_mtext2str(ic->preedit);
p = buf;
- if(!p) {
+ if (!p) {
return uim_scm_make_str("");
}
- for(i=0; i<ic->candidate_from ;i++) {
+ for (i=0; i<ic->candidate_from ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
start = p;
- for(i=0; i<ic->candidate_to - ic->candidate_from ;i++) {
+ for (i=0; i<ic->candidate_to - ic->candidate_from ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
*p = 0;
@@ -431,7 +431,7 @@
buf = convert_mtext2str(ic->preedit);
p = buf;
- for(i=0; i<ic->candidate_to ;i++) {
+ for (i=0; i<ic->candidate_to ;i++) {
p = m17nlib_utf8_find_next_char(p);
}
buflen = strlen(p);
@@ -453,7 +453,7 @@
if (nth < nr_input_methods) {
char *name = alloca(strlen(im_array[nth].name) + 20);
- if(im_array[nth].lang != NULL)
+ if (im_array[nth].lang != NULL)
sprintf(name, "m17n-%s-%s", im_array[nth].lang, im_array[nth].name);
else
sprintf(name, "m17n-%s", im_array[nth].name);
@@ -469,7 +469,7 @@
int nth = uim_scm_c_int(nth_);
if (nth < nr_input_methods) {
char *lang = im_array[nth].lang;
- if(lang != NULL) {
+ if (lang != NULL) {
return uim_scm_make_str(lang);
} else {
return uim_scm_make_str("unknown");
@@ -488,7 +488,7 @@
name = &name[5];
for (i = 0; i < nr_input_methods; i++) {
char buf[100];
- if(im_array[i].lang == NULL) {
+ if (im_array[i].lang == NULL) {
snprintf(buf, 100, "%s", im_array[i].name);
} else {
snprintf(buf, 100, "%s-%s", im_array[i].lang, im_array[i].name);
@@ -593,7 +593,7 @@
consumed = minput_lookup(ic, NULL, NULL, produced);
- if(consumed == -1) {
+ if (consumed == -1) {
consumed_ = uim_scm_f();
} else {
consumed_ = uim_scm_t();
@@ -637,13 +637,13 @@
MPlist *group;
MInputContext *ic = ic_array[id].mic;
- if(!ic || !ic->candidate_list)
+ if (!ic || !ic->candidate_list)
return 0;
group = ic->candidate_list;
- while(mplist_value(group) != Mnil) {
- if(mplist_key(group) == Mtext) {
+ while (mplist_value(group) != Mnil) {
+ if (mplist_key(group) == Mtext) {
for (; mplist_key(group) != Mnil; group = mplist_next(group)) {
result += mtext_len(mplist_value(group));
}
@@ -660,8 +660,8 @@
old_cands_free(char **old_cands)
{
int i = 0;
- if(old_cands) {
- for(i=0; old_cands[i]; i++) {
+ if (old_cands) {
+ for (i=0; old_cands[i]; i++) {
free(old_cands[i]);
}
free(old_cands);
@@ -682,7 +682,7 @@
char **new_cands;
uim_lisp buf_;
- if(!ic || !ic->candidate_list)
+ if (!ic || !ic->candidate_list)
return uim_scm_f();
group = ic->candidate_list;
@@ -692,7 +692,7 @@
new_cands = malloc (cands_num * sizeof(char *) + 2);
- if(mplist_key(group) == Mtext) {
+ if (mplist_key(group) == Mtext) {
for (i=0; mplist_key(group) != Mnil; group = mplist_next(group)) {
int j;
@@ -719,7 +719,7 @@
return uim_scm_t();
- if(!buf) {
+ if (!buf) {
return uim_scm_make_str("");
} else {
buf_ = uim_scm_make_str(buf);
@@ -732,11 +732,11 @@
same_candidatesp(const char **old, const char **new)
{
int i;
- if(!old)
+ if (!old)
return UIM_FALSE;
- for(i=0; old[i] && new[i]; i++) {
- if(strcmp(old[i], new[i]) != 0) {
+ for (i=0; old[i] && new[i]; i++) {
+ if (strcmp(old[i], new[i]) != 0) {
return UIM_FALSE;
}
}
@@ -750,7 +750,7 @@
char **old_cands = ic_array[id].old_candidates;
char **new_cands = ic_array[id].new_candidates;
- if(!same_candidatesp(old_cands, new_cands)) {
+ if (!same_candidatesp(old_cands, new_cands)) {
return uim_scm_t();
}
return uim_scm_f();
@@ -770,7 +770,7 @@
int nth = uim_scm_c_int(nth_);
int nr = ic_array[id].nr_candidates;
- if(nr >= nth) {
+ if (nr >= nth) {
return uim_scm_make_str(ic_array[id].new_candidates[nth]);
} else {
return uim_scm_make_str("");
Modified: trunk/uim/plugin.c
===================================================================
--- trunk/uim/plugin.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/plugin.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -76,7 +76,7 @@
plugin_name = uim_scm_refer_c_str(_name);
- if(plugin_name == NULL) {
+ if (plugin_name == NULL) {
return uim_scm_f();
}
@@ -93,7 +93,7 @@
snprintf(plugin_lib_filename, len, "%s/%s%s%s",
path, PLUGIN_PREFIX, plugin_name, PLUGIN_SUFFIX);
fd = open(plugin_lib_filename, O_RDONLY);
- if(fd >= 0) {
+ if (fd >= 0) {
close(fd);
break;
}
@@ -113,7 +113,7 @@
plugin_scm_filename = malloc(sizeof(char) * len);
snprintf(plugin_scm_filename, len, "%s/%s.scm", path, plugin_name);
fd = open(plugin_scm_filename, O_RDONLY);
- if(fd >= 0) {
+ if (fd >= 0) {
close(fd);
break;
}
@@ -121,7 +121,7 @@
plugin_scm_filename = NULL;
}
- if(plugin_lib_filename == NULL) {
+ if (plugin_lib_filename == NULL) {
free(plugin_scm_filename);
return uim_scm_f();
}
@@ -129,7 +129,7 @@
library = dlopen(plugin_lib_filename, RTLD_NOW);
free(plugin_lib_filename);
- if(library == NULL) {
+ if (library == NULL) {
fprintf(stderr, "load failed %s\n", dlerror());
free(plugin_scm_filename);
return uim_scm_f();
@@ -139,7 +139,7 @@
"uim_plugin_instance_init");
plugin_instance_quit = (void (*)(void))dlfunc(library,
"uim_plugin_instance_quit");
- if(!plugin_instance_init) {
+ if (!plugin_instance_init) {
fprintf(stderr, "%s plugin init failed\n", plugin_name);
free(plugin_scm_filename);
return uim_scm_f();
@@ -219,7 +219,7 @@
uim_scm_gc_protect_stack(&stack_start);
alist = uim_scm_eval_c_string("plugin-alist");
- for(rest = alist; !uim_scm_nullp(rest); rest = uim_scm_cdr(rest)) {
+ for (rest = alist; !uim_scm_nullp(rest); rest = uim_scm_cdr(rest)) {
entry = uim_scm_car(rest);
name = uim_scm_car(entry);
Modified: trunk/uim/prime.c
===================================================================
--- trunk/uim/prime.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/prime.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -66,7 +66,7 @@
int fd;
struct sockaddr_un server;
- if(!path)
+ if (!path)
return -1;
bzero(&server, sizeof(server));
@@ -87,7 +87,7 @@
}
#endif
- if(connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1){
+ if (connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1) {
close(fd);
/* fprintf(stderr, "connect failed\n"); */
return -1;
@@ -129,15 +129,15 @@
char buf[BUFFER_SIZE];
int rc;
- if(fd == -1)
+ if (fd == -1)
return NULL;
- while(uim_helper_fd_readable(fd) > 0) {
+ while (uim_helper_fd_readable(fd) > 0) {
rc = read(fd, buf, sizeof(buf)-1);
buf[rc] = '\0';
- if(rc == 0) {
+ if (rc == 0) {
fprintf(stderr, "disconnected\n");
return NULL;
}
@@ -150,10 +150,10 @@
static void
prime_write_msg_to_ud(int fd, const char *message)
{
- if(strcmp(message, "") ==0) {
+ if (strcmp(message, "") ==0) {
return;
}
- if(fd == -1)
+ if (fd == -1)
return;
uim_helper_send_message(fd, message);
@@ -167,11 +167,11 @@
char *result;
uim_lisp ret;
- if(use_unix_domain_socket) {
+ if (use_unix_domain_socket) {
prime_write_msg_to_ud(prime_fd, str);
result = prime_read_msg_from_ud(prime_fd);
- /* if(!result) {
+ /* if (!result) {
prime_fd = prime_init_ud(prime_ud_path);
}*/
} else {
@@ -182,7 +182,7 @@
free(buf);
}
- if(!result) {
+ if (!result) {
return uim_scm_make_str("");
}
@@ -197,34 +197,34 @@
{
char *option;
uim_bool use_udp = uim_scm_c_bool(use_udp_);
- if(use_udp == UIM_TRUE)
+ if (use_udp == UIM_TRUE)
use_unix_domain_socket = UIM_TRUE;
else
use_unix_domain_socket = UIM_FALSE;
- if(use_unix_domain_socket == UIM_TRUE) {
+ if (use_unix_domain_socket == UIM_TRUE) {
prime_ud_path = prime_get_ud_path();
- if(!prime_ud_path)
+ if (!prime_ud_path)
return uim_scm_f();
prime_fd = prime_init_ud(prime_ud_path);
- if(prime_fd == -1) {
+ if (prime_fd == -1) {
unlink(prime_ud_path);
option = malloc(strlen("-u ") + strlen(prime_ud_path) + 1);
sprintf(option, "-u %s", prime_ud_path);
prime_pid = uim_ipc_open_command_with_option(prime_pid, &primer, &primew, prime_command, option);
free(option);
- if(prime_pid == 0) {
+ if (prime_pid == 0) {
return uim_scm_f();
} else {
prime_fd = prime_init_ud(prime_ud_path);
- while(prime_fd == -1) {
+ while (prime_fd == -1) {
prime_fd = prime_init_ud(prime_ud_path);
}
}
}
- if(prime_fd == -1)
+ if (prime_fd == -1)
return uim_scm_f();
else
return uim_scm_t();
@@ -232,7 +232,7 @@
if (prime_pid == 0) {
prime_pid = uim_ipc_open_command( prime_pid, &primer, &primew, prime_command );
}
- if(prime_pid == 0) {
+ if (prime_pid == 0) {
return uim_scm_f();
}
return uim_scm_t();
@@ -249,16 +249,16 @@
void
uim_plugin_instance_quit(void)
{
- if(use_unix_domain_socket && prime_fd > 0) {
+ if (use_unix_domain_socket && prime_fd > 0) {
prime_write_msg_to_ud(prime_fd, "close\n");
prime_fd = -1;
} else {
- if(primew) {
+ if (primew) {
uim_ipc_send_command(&prime_pid, &primer, &primew, prime_command, "close\n");
fclose(primew);
primew = NULL;
}
- if(primer) {
+ if (primer) {
fclose(primer);
primer = NULL;
}
Modified: trunk/uim/scim.cpp
===================================================================
--- trunk/uim/scim.cpp 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/scim.cpp 2005-03-09 16:13:17 UTC (rev 782)
@@ -141,7 +141,7 @@
int num = be->get_factories_for_language( factories );
std::vector<IMEngineFactoryPointer>::iterator it = factories.begin();
- for( ; it != factories.end(); ++it )
+ for ( ; it != factories.end(); ++it )
{
SCIMInputMethod *scim_im = new SCIMInputMethod();
scim_im->imname = (*it)->get_name();
@@ -157,39 +157,39 @@
init_scim()
{
fprintf( stderr, "init_scm()\n" );
- if( !initialized )
+ if ( !initialized )
{
context_list.clear();
scim_get_imengine_module_list( engine_list );
- if( std::find( engine_list.begin() , engine_list.end() , "socket") == engine_list.end() )
+ if ( std::find( engine_list.begin() , engine_list.end() , "socket") == engine_list.end() )
{
fprintf(stderr, "Could not find socket module.\n");
return uim_scm_f();
}
config_module = new ConfigModule( "simple" );
- if( !config_module )
+ if ( !config_module )
{
fprintf(stderr, "Could not create ConfigModule\n");
return uim_scm_f();
}
config = config_module->create_config( "scim" );
- if( config.null() )
+ if ( config.null() )
{
fprintf(stderr, "create_config failed\n");
return uim_scm_f();
}
be = new CommonBackEnd( config, engine_list );
- if( be.null() )
+ if ( be.null() )
{
fprintf(stderr, "create CommonBackEnd failed\n");
return uim_scm_f();
}
- if( !check_socket_frontend() )
+ if ( !check_socket_frontend() )
{
/*
* 2004-03-03 Kazuki Ohta <mover at hct.zaq.ne.jp> @ChinaOSS CodeFest
@@ -226,7 +226,7 @@
{
// FIXME
int nth = uim_scm_c_int( nth_ );
- if( nth < im_list.size() )
+ if ( nth < im_list.size() )
{
return uim_scm_make_str( im_list.at( nth )->lang.c_str() );
}
@@ -251,7 +251,7 @@
get_input_method_name(uim_lisp nth_)
{
int nth = uim_scm_c_int( nth_ );
- if( nth < im_list.size() )
+ if ( nth < im_list.size() )
{
// remove space
String imname = WideStr_to_String( im_list.at( nth )->imname );
@@ -260,7 +260,7 @@
// add "scim" as prefix
char *name = (char *)alloca( strlen(orig_name) + 20 );
- if( name )
+ if ( name )
{
sprintf(name, "scim-%s", orig_name);
return uim_scm_make_str( name );
@@ -279,13 +279,13 @@
std::vector<SCIMInputMethod*>::iterator it = im_list.begin();
- for( ; it != im_list.end(); ++it )
+ for ( ; it != im_list.end(); ++it )
{
fprintf(stderr, "im = %s\n", WideStr_to_CStr( (*it)->imname));
// remove "scim-" prefix
String name = imname.substr( 5, imname.length() - 5 );
- if( WideStr_to_String((*it)->imname) == name )
+ if ( WideStr_to_String((*it)->imname) == name )
{
return (*it)->uuid;
}
@@ -304,7 +304,7 @@
// create factory by specifying the uuid
String uuid = search_uuid_by_imname( imname );
- if( uuid.empty() )
+ if ( uuid.empty() )
{
fprintf( stderr, "failed to search uuid\n" );
return uim_scm_f();
@@ -316,7 +316,7 @@
// initialize context's member variable
context->instance = context->factory->create_instance( "UTF-8", instance_count );
- if( context->instance.null() )
+ if ( context->instance.null() )
{
fprintf(stderr, "failed to create IMEngineInstance\n");
return uim_scm_f();
@@ -358,9 +358,9 @@
static SCIMContext *get_context_from_id(int id)
{
std::vector<SCIMContext*>::iterator it = context_list.begin();
- for( ; it != context_list.end(); ++it )
+ for ( ; it != context_list.end(); ++it )
{
- if( id == (*it)->id )
+ if ( id == (*it)->id )
{
return (*it);
}
@@ -384,7 +384,7 @@
scim_key.mask = mod;
SCIMContext *ic = get_context_from_id( id );
- if( ic->instance->process_key_event( scim_key ) )
+ if ( ic->instance->process_key_event( scim_key ) )
{
return uim_scm_t();
}
@@ -405,7 +405,7 @@
free( sym );
SCIMContext *ic = get_context_from_id( id );
- if( ic->instance->process_key_event( scim_key ) )
+ if ( ic->instance->process_key_event( scim_key ) )
{
return uim_scm_t();
@@ -421,7 +421,7 @@
int idx = uim_scm_c_int( idx_ );
SCIMContext *ic = get_context_from_id( id );
- if( !ic )
+ if ( !ic )
{
return uim_scm_f();
}
@@ -433,7 +433,7 @@
{
fprintf(stdout, "cb_commit\n");
SCIMContext *ic = static_cast<SCIMContext*>(instance->get_frontend_data());
- if( !ic )
+ if ( !ic )
{
return;
}
@@ -452,7 +452,7 @@
fprintf(stdout, "cb_preedit_update : preedit_str = [%s]\n", WideStr_to_CStr(wstr));
SCIMContext *ic = static_cast<SCIMContext*>(instance->get_frontend_data());
- if( !ic )
+ if ( !ic )
{
return;
}
@@ -469,7 +469,7 @@
fprintf(stdout, "cb_preedit_hide\n");
SCIMContext *ic = static_cast<SCIMContext*>(instance->get_frontend_data());
- if( !ic )
+ if ( !ic )
{
return;
}
@@ -484,7 +484,7 @@
fprintf(stdout, "cb_preedit_caret\n");
SCIMContext *ic = static_cast<SCIMContext*>(instance->get_frontend_data());
- if( !ic )
+ if ( !ic )
{
return;
}
@@ -500,7 +500,7 @@
fprintf(stdout, "cb_lookup_update\n");
SCIMContext *ic = static_cast<SCIMContext*>(instance->get_frontend_data());
- if( !ic )
+ if ( !ic )
{
return;
}
@@ -547,7 +547,7 @@
uim_scm_make_symbol("preedit-cursor"),
uim_scm_make_str(""));
uim_scm_eval(form);
- } else if (flag & UIM_PREEDIT_FLAG_REVERSE) {
+ } else if (flag & UIM_PREEDIT_FLAG_REVERSE) {
form = uim_scm_list4(uim_scm_make_symbol("im-pushback-preedit"),
uim_scm_make_int(id),
uim_scm_make_symbol("preedit-reverse"),
@@ -641,9 +641,9 @@
};
struct keycode_map_ *l;
- for( l = keycode_map; l->symbol; l++ )
+ for ( l = keycode_map; l->symbol; l++ )
{
- if( strcmp(sym, l->symbol) == 0 )
+ if ( strcmp(sym, l->symbol) == 0 )
{
fprintf(stderr, "keysymbol = %s\n", l->symbol);
(*key).code = l->keycode;
Modified: trunk/uim/skk-dic.c
===================================================================
--- trunk/uim/skk-dic.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/skk-dic.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -1563,7 +1563,7 @@
for (p = word; *p; p++) {
len = strlen(str);
- switch(*p) {
+ switch (*p) {
case '/':
str = realloc(str, len + strlen("\\057") + 1);
strcat(str, "\\057");
@@ -1620,7 +1620,7 @@
return NULL;
}
for (p = arg; *p; p++) {
- switch(*p) {
+ switch (*p) {
case '/':
case '[':
case ']':
Modified: trunk/uim/slib.c
===================================================================
--- trunk/uim/slib.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/slib.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -3356,7 +3356,7 @@
static LISP
leval_setq (LISP args, LISP env)
{
- if(symbol_boundp( car(args), env) == sym_t) {
+ if (symbol_boundp( car(args), env) == sym_t) {
return (setvar (car (args), leval (car (cdr (args)), env), env));
} else {
my_err ("unbound variable", car(args));
@@ -4860,9 +4860,9 @@
int i;
int d = 1, num = 0;
- for(i=len-1; i>=0; i--) {
+ for (i=len-1; i>=0; i--) {
int n = s[i];
- if(n < 48 || n > 57)
+ if (n < 48 || n > 57)
return sym_f;
num += d * (n - 48);
Modified: trunk/uim/spellcheck.c
===================================================================
--- trunk/uim/spellcheck.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/spellcheck.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -41,7 +41,7 @@
{
spell_pid = uim_ipc_open_command(spell_pid, &spell_r,
&spell_w, get_spell_command() );
- if(spell_pid == 0) {
+ if (spell_pid == 0) {
return NIL;
}
return siod_true_value();
@@ -56,7 +56,7 @@
result = uim_ipc_send_command(&spell_pid, &spell_r, &spell_w, get_spell_command(), str);
- if(result == NULL)
+ if (result == NULL)
{
return NIL;
}
Modified: trunk/uim/uim-func.c
===================================================================
--- trunk/uim/uim-func.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-func.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -94,7 +94,7 @@
{
int i;
- if(!uc)
+ if (!uc)
return;
if (!uc->psegs) {
@@ -254,7 +254,7 @@
const char *inbuf;
ic = (iconv_t)obj;
- if(!str)
+ if (!str)
return NULL;
if (!ic)
@@ -439,7 +439,7 @@
const char *e = uim_scm_refer_c_str(enc);
uim_context uc = retrieve_uim_context(id);
- if(!uc)
+ if (!uc)
return uim_scm_f();
if (uc->conv) {
@@ -459,7 +459,7 @@
int i;
uim_context uc = retrieve_uim_context(id);
- if(!uc)
+ if (!uc)
return uim_scm_f();
for (i = 0; i < uc->nr_modes; i++) {
@@ -482,7 +482,7 @@
const char *s;
uim_context uc = retrieve_uim_context(id);
- if(!uc)
+ if (!uc)
return uim_scm_f();
uc->modes = realloc(uc->modes,
@@ -498,7 +498,7 @@
{
uim_context uc = retrieve_uim_context(id);
- if(!uc)
+ if (!uc)
return uim_scm_f();
if (uc->mode_list_update_cb) {
@@ -516,7 +516,7 @@
if (!uc)
return uim_scm_f();
- if(uc && uc->propstr)
+ if (uc && uc->propstr)
free(uc->propstr);
uc->propstr = uc->conv_if->convert(uc->conv, prop);
@@ -533,7 +533,7 @@
if (!uc)
return uim_scm_f();
- if(uc && uc->proplabelstr)
+ if (uc && uc->proplabelstr)
free(uc->proplabelstr);
uc->proplabelstr = uc->conv_if->convert(uc->conv, prop);
@@ -546,7 +546,7 @@
int mode = uim_scm_c_int(mode_);
uim_context uc = retrieve_uim_context(id);
- if(!uc)
+ if (!uc)
return uim_scm_f();
uc->mode = mode;
@@ -660,7 +660,7 @@
int i;
if (uim_return_str_list) {
- for (i = 0; i < (int)UIM_RETURN_STR_LIST_SIZE; i++){
+ for (i = 0; i < (int)UIM_RETURN_STR_LIST_SIZE; i++) {
if (uim_return_str_list[i]) {
free(uim_return_str_list[i]);
uim_return_str_list[i] = NULL;
Modified: trunk/uim/uim-helper-client.c
===================================================================
--- trunk/uim/uim-helper-client.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-helper-client.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -75,7 +75,7 @@
uim_fd = -1;
- if(!path)
+ if (!path)
return -1;
bzero(&server, sizeof(server));
@@ -99,23 +99,23 @@
#endif
- if (connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1){
+ if (connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1) {
int serv_pid = 0;
FILE *serv_r = NULL, *serv_w = NULL;
char buf[128];
serv_pid = uim_ipc_open_command(serv_pid, &serv_r, &serv_w, get_server_command());
- if(serv_pid == 0) {
+ if (serv_pid == 0) {
return -1;
}
while (fgets (buf, sizeof(buf), serv_r ) != NULL ) {
- if(strcmp( buf, "\n" ) == 0)
+ if (strcmp( buf, "\n" ) == 0)
break;
}
- if(connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1){
+ if (connect(fd, (struct sockaddr *)&server,sizeof(server)) == -1) {
return -1;
}
}
@@ -170,13 +170,13 @@
static void
uim_helper_client_focus(uim_context uc, int flg)
{
- if(uim_fd < 0)
+ if (uim_fd < 0)
return;
- if(!uc)
+ if (!uc)
return;
- if(flg == 0)
+ if (flg == 0)
snprintf(uim_help_buf, BUFFER_SIZE, "focus_in\n");
else
snprintf(uim_help_buf, BUFFER_SIZE, "focus_out\n");
Modified: trunk/uim/uim-helper-server.c
===================================================================
--- trunk/uim/uim-helper-server.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-helper-server.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -95,9 +95,9 @@
chmod(path, S_IRUSR|S_IWUSR);
logname = getenv("LOGNAME");
- if(logname) {
+ if (logname) {
pw = getpwnam(logname);
- if(pw)
+ if (pw)
chown(path, pw->pw_uid, -1);
}
@@ -259,7 +259,7 @@
struct client *cl;
new_fd = accept(serv_fd, (struct sockaddr *)&clientsoc, &len);
- if(new_fd < 0) {
+ if (new_fd < 0) {
perror("accpet failed");
continue;
}
Modified: trunk/uim/uim-helper.c
===================================================================
--- trunk/uim/uim-helper.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-helper.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -66,7 +66,7 @@
fd_set fds;
struct timeval tv;
- /* if(!fd || fd < 0)
+ /* if (!fd || fd < 0)
return -1;*/
FD_ZERO(&fds);
@@ -167,7 +167,7 @@
char *login = NULL;
struct passwd *pw = NULL;
- if(is_setugid() == 0) {
+ if (is_setugid() == 0) {
login = getenv("LOGNAME");
}
@@ -197,10 +197,10 @@
int uim_helper_str_terminated(const char *str)
{
- if(!str)
+ if (!str)
return 0;
- if(strlen(str) > 2&&
+ if (strlen(str) > 2&&
str[strlen(str)-1] == '\n' &&
str[strlen(str)-2] == '\n' )
return 1;
Modified: trunk/uim/uim-ipc.c
===================================================================
--- trunk/uim/uim-ipc.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-ipc.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -197,17 +197,17 @@
}
*ap = NULL;
}
- if(is_setugid() != 0) {
+ if (is_setugid() != 0) {
int cmd_len = strlen(command) + 30;
char *fullpath_command = malloc(cmd_len);
- /*if(setuid(getuid())!=0) abort();*/ /* discarding privilege */
+ /*if (setuid(getuid())!=0) abort();*/ /* discarding privilege */
snprintf(fullpath_command, cmd_len, "/usr/local/bin/%s", command);
result = execvp(fullpath_command, argv);
- if(result == -1) {
+ if (result == -1) {
snprintf(fullpath_command, cmd_len, "/usr/bin/%s", command);
result = execvp(fullpath_command, argv);
}
@@ -217,7 +217,7 @@
}
free(str);
- if(result == -1) {
+ if (result == -1) {
write(1,"err",strlen("err"));
}
_exit(127);
@@ -244,7 +244,7 @@
if (*read_fp == NULL || *write_fp == NULL) {
*pid = uim_ipc_open_command(*pid, read_fp, write_fp, command);
}
- if(*pid == 0) {
+ if (*pid == 0) {
free(tmp);
return NULL;
}
@@ -271,7 +271,7 @@
}
while (fgets (buf, sizeof(buf), *read_fp) != NULL) {
- if(strcmp( buf, "\n" ) == 0) {
+ if (strcmp( buf, "\n" ) == 0) {
break;
}
Modified: trunk/uim/uim-table.c
===================================================================
--- trunk/uim/uim-table.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-table.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -82,8 +82,8 @@
table->size = st.st_size;
table->filename = strdup(fn);
- for(i=0;i<16;i++){
- if(!tables[i]) {
+ for (i=0;i<16;i++) {
+ if (!tables[i]) {
tables[i] = table;
return i;
}
@@ -102,9 +102,9 @@
static char *
find_line_head(struct table_info *table, char *from)
{
- while(table->addr <= (void *)from){
+ while (table->addr <= (void *)from) {
- if( *from == '\n') {
+ if ( *from == '\n') {
from++;
return from;
}
@@ -117,8 +117,8 @@
find_table(const char *fn)
{
int i;
- for(i=0;i<16;i++){
- if(tables[i] && strcmp(tables[i]->filename, fn ) == 0)
+ for (i=0;i<16;i++) {
+ if (tables[i] && strcmp(tables[i]->filename, fn ) == 0)
return i;
}
return -1;
@@ -127,9 +127,9 @@
static char *
find_next_linefeed(struct table_info *table, char *from)
{
- while(((char *)(table->addr) + table->size) >= from){
+ while (((char *)(table->addr) + table->size) >= from) {
- if( *from == '\n') {
+ if ( *from == '\n') {
return from;
}
from++;
@@ -164,9 +164,9 @@
struct table_info *table = tables[table_id];
char *p = table->addr;
- while(*(p+ strlen(str))){
+ while (*(p+ strlen(str))) {
- if(!strncmp(p, str, strlen(str))){
+ if (!strncmp(p, str, strlen(str))) {
char *tmp = cut_off_line_from_table(table,
find_line_head(table, p));
LISP res = strcons(strlen(tmp), tmp);
@@ -174,7 +174,7 @@
return res;
}
- if(flag || *(p+ strlen(str)) == '\t') {
+ if (flag || *(p+ strlen(str)) == '\t') {
p = find_next_linefeed(table, p);
}
p++;
@@ -215,7 +215,7 @@
char *filename = get_c_string(filename_);
int table_id;
- if((table_id = find_table(filename))<0) {
+ if ((table_id = find_table(filename))<0) {
table_id = open_table_internal(filename);
}
return intcons(table_id);
@@ -225,7 +225,7 @@
uim_init_table_subrs()
{
int i;
- for(i=0;i<16;i++){tables[i] = NULL;}
+ for (i=0;i<16;i++) {tables[i] = NULL;}
init_subr_1("open-table", open_table);
init_subr_2("find-entry-matched-complete", find_entry_matched_complete);
init_subr_2("find-entry-matched-continual", find_entry_matched_continual);
Modified: trunk/uim/uim-util.c
===================================================================
--- trunk/uim/uim-util.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim-util.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -330,7 +330,7 @@
int len;
int i;
- if(!splittee || !splitter)
+ if (!splittee || !splitter)
return NULL;
@@ -391,12 +391,12 @@
if (!uim_scm_stringp(_splittee) || !uim_scm_stringp(_splitter))
return uim_scm_f();
- if(splittee == NULL || splitter == NULL)
+ if (splittee == NULL || splitter == NULL)
return uim_scm_f();
strs = uim_strsplit(splittee, splitter);
- if(!strs || !*strs)
+ if (!strs || !*strs)
return uim_scm_f();
for (n_strs = 0; strs[n_strs] != '\0'; n_strs++);
@@ -452,8 +452,8 @@
get_language_name_from_locale(const char *localename)
{
unsigned int i;
- for(i = 0; i < NR_LOCALE_LANGUAGE; i++) {
- if(strcmp(locale_language_table[i].locale, localename) == 0) {
+ for (i = 0; i < NR_LOCALE_LANGUAGE; i++) {
+ if (strcmp(locale_language_table[i].locale, localename) == 0) {
return locale_language_table[i].language;
}
}
@@ -488,7 +488,7 @@
static uim_lisp
is_setugidp(void)
{
- if(is_setugid()) {
+ if (is_setugid()) {
return uim_scm_t();
}
return uim_scm_f();
Modified: trunk/uim/uim.c
===================================================================
--- trunk/uim/uim.c 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/uim/uim.c 2005-03-09 16:13:17 UTC (rev 782)
@@ -120,7 +120,7 @@
return NULL;
}
get_context_id(uc);
- if(uc->id == -1)
+ if (uc->id == -1)
return NULL;
uc->ptr = ptr;
@@ -250,7 +250,7 @@
{
int i;
- if(!uc)
+ if (!uc)
return;
UIM_EVAL_FSTRING1(uc, "(release-context %d)", uc->id);
@@ -319,7 +319,7 @@
void
uim_prop_activate(uim_context uc, const char *str)
{
- if(!str)
+ if (!str)
return;
UIM_EVAL_FSTRING2(uc, "(prop-activate-handler %d \"%s\")",
@@ -336,7 +336,7 @@
void
uim_prop_update_custom(uim_context uc, const char *custom, const char *val)
{
- if(!custom || !val)
+ if (!custom || !val)
return;
UIM_EVAL_FSTRING3(uc, "(custom-set-handler %d '%s %s)",
@@ -366,14 +366,14 @@
void
uim_prop_list_update(uim_context uc)
{
- if(uc && uc->propstr)
+ if (uc && uc->propstr)
uc->prop_list_update_cb(uc->ptr, uc->propstr);
}
void
uim_prop_label_update(uim_context uc)
{
- if(uc && uc->proplabelstr)
+ if (uc && uc->proplabelstr)
uc->prop_label_update_cb(uc->ptr, uc->proplabelstr);
}
@@ -382,7 +382,7 @@
{
int i, nr = 0;
- if(!uc)
+ if (!uc)
return 0;
for (i = 0; i < uim_nr_im; i++) {
@@ -411,7 +411,7 @@
const char *
uim_get_current_im_name(uim_context uc)
{
- if(uc) {
+ if (uc) {
return uc->current_im_name;
}
return NULL;
@@ -422,7 +422,7 @@
{
struct uim_im *im = get_nth_im(uc, nth);
- if(im) {
+ if (im) {
return im->name;
}
return NULL;
@@ -433,7 +433,7 @@
{
struct uim_im *im = get_nth_im(uc, nth);
- if(im) {
+ if (im) {
return im->lang;
}
return NULL;
@@ -460,7 +460,7 @@
{
struct uim_im *im = get_nth_im(uc, nth);
- if(im) {
+ if (im) {
return im->encoding;
}
return NULL;
@@ -474,7 +474,7 @@
if (im_engine_name == NULL)
return NULL;
- for(i = 0; i < uim_nr_im; i++) {
+ for (i = 0; i < uim_nr_im; i++) {
struct uim_im *im = &uim_im_array[i];
if (strcmp(im_engine_name, im->name) == 0) {
return im->name;
@@ -607,7 +607,7 @@
char *scm_files = NULL;
char *env = NULL;
- /* if(is_setugid() == 0) {*/
+ /* if (is_setugid() == 0) {*/
env = getenv("LIBUIM_VERBOSE");
/* }*/
uim_scm_init(env); /* init Scheme interpreter */
@@ -625,7 +625,7 @@
#endif
- if(is_setugid() == 0) {
+ if (is_setugid() == 0) {
scm_files = getenv("LIBUIM_SCM_FILES");
}
uim_scm_set_lib_path((scm_files) ? scm_files : SCM_FILES);
@@ -633,7 +633,7 @@
uim_scm_require_file("init.scm");
uim_return_str = NULL;
- for (i = 0; i < (int)UIM_RETURN_STR_LIST_SIZE; i++){
+ for (i = 0; i < (int)UIM_RETURN_STR_LIST_SIZE; i++) {
uim_return_str_list[i] = NULL;
}
Modified: trunk/xim/util.cpp
===================================================================
--- trunk/xim/util.cpp 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/xim/util.cpp 2005-03-09 16:13:17 UTC (rev 782)
@@ -227,7 +227,7 @@
if (ch == '\0')
state = DP_S_DONE;
- switch(state) {
+ switch (state) {
case DP_S_DEFAULT:
if (ch == '%')
state = DP_S_FLAGS;
@@ -516,8 +516,8 @@
uvalue = value;
- if(!(flags & DP_F_UNSIGNED)) {
- if( value < 0 ) {
+ if (!(flags & DP_F_UNSIGNED)) {
+ if ( value < 0 ) {
signvalue = '-';
uvalue = -value;
} else {
@@ -535,7 +535,7 @@
(caps? "0123456789ABCDEF":"0123456789abcdef")
[uvalue % (unsigned)base ];
uvalue = (uvalue / (unsigned)base );
- } while(uvalue && (place < 20));
+ } while (uvalue && (place < 20));
if (place == 20) place--;
convert[place] = 0;
@@ -746,7 +746,7 @@
/* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */
fconvert[fplace++] =
(caps? "0123456789ABCDEF":"0123456789abcdef")[index];
- } while(fracpart && (fplace < 311));
+ } while (fracpart && (fplace < 311));
if (fplace == 311) fplace--;
}
fconvert[fplace] = 0;
Modified: trunk/xim/ximtrans.cpp
===================================================================
--- trunk/xim/ximtrans.cpp 2005-03-09 16:06:14 UTC (rev 781)
+++ trunk/xim/ximtrans.cpp 2005-03-09 16:13:17 UTC (rev 782)
@@ -805,10 +805,10 @@
#define XIM_SYNC_REPLY_TIMEOUT_SEC 5
#define TIMEDELTA(dest, src1, src2) { \
- if(((dest).tv_usec = (src1).tv_usec - (src2).tv_usec) < 0) {\
+ if (((dest).tv_usec = (src1).tv_usec - (src2).tv_usec) < 0) {\
(dest).tv_usec += 1000000;\
(dest).tv_sec = (src1).tv_sec - (src2).tv_sec - 1;\
- } else (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; }
+ } else (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; }
bool Connection::is_xim_sync_reply_timeout(void)
{
More information about the Uim-commit
mailing list