Hiroyuki Ikezoe
ikezo****@users*****
2006年 11月 22日 (水) 20:56:55 JST
Index: libtomoe-gtk/src/tomoe-dictionary-page.c
diff -u libtomoe-gtk/src/tomoe-dictionary-page.c:1.18 libtomoe-gtk/src/tomoe-dictionary-page.c:1.19
--- libtomoe-gtk/src/tomoe-dictionary-page.c:1.18 Wed Nov 22 20:24:45 2006
+++ libtomoe-gtk/src/tomoe-dictionary-page.c Wed Nov 22 20:56:55 2006
@@ -173,12 +173,14 @@
priv->store = gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->store));
- g_signal_connect (G_OBJECT (list), "button-press-event",
- G_CALLBACK (on_tree_view_button_press), page);
-
priv->char_list = list;
+ g_signal_connect (G_OBJECT (priv->char_list), "button-press-event",
+ G_CALLBACK (on_tree_view_button_press), page);
char_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (list));
gtk_tree_selection_set_mode (char_sel, GTK_SELECTION_SINGLE);
+ g_signal_connect (G_OBJECT (char_sel), "changed",
+ G_CALLBACK (on_selection_changed),
+ (gpointer) page);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -208,9 +210,6 @@
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
gtk_box_pack_start (GTK_BOX (main_vbox), scrolled_window, TRUE, TRUE, 0);
- g_signal_connect (G_OBJECT (char_sel), "changed",
- G_CALLBACK (on_selection_changed),
- (gpointer) page);
gtk_widget_show (list);
/* button area */
@@ -264,15 +263,17 @@
droplist = gtk_combo_box_new_text ();
priv->dict_list = droplist;
gtk_box_pack_start (GTK_BOX (hbox), droplist, TRUE, TRUE, 4);
- g_signal_connect (G_OBJECT (droplist), "changed",
- G_CALLBACK (on_dict_list_changed),
- (gpointer) page);
gtk_widget_show (droplist);
-#if 0
+
_populate_dict_list (page);
_populate (page);
+
+ g_signal_connect (G_OBJECT (droplist), "changed",
+ G_CALLBACK (on_dict_list_changed),
+ (gpointer) page);
+
tomoe_dictionary_page_set_sensitive (page);
-#endif
+
return object;
}
@@ -427,7 +428,7 @@
dicts = tomoe_context_get_dict_names (priv->context);
- for (list = dicts; list; list = g_list_next (dicts)) {
+ for (list = dicts; list; list = g_list_next (list)) {
const gchar *dict_name = list->data;
GtkComboBox *def = GTK_COMBO_BOX (priv->dict_list);
gtk_combo_box_append_text (def, dict_name);