Hiroyuki Ikezoe
ikezo****@users*****
Tue May 16 09:18:52 JST 2006
Index: kazehakase/src/prefs_ui/prefs_entry.c diff -u kazehakase/src/prefs_ui/prefs_entry.c:1.7 kazehakase/src/prefs_ui/prefs_entry.c:1.8 --- kazehakase/src/prefs_ui/prefs_entry.c:1.7 Mon Jun 20 13:37:37 2005 +++ kazehakase/src/prefs_ui/prefs_entry.c Tue May 16 09:18:52 2006 @@ -189,7 +189,6 @@ G_CALLBACK(cb_changed), prefsui); gtk_widget_show(check); -#if GTK_CHECK_VERSION(2,6,0) /* inline-completion */ check = gtk_check_button_new_with_mnemonic(_("Use _inline-completion in URL entry box")); prefsui->inline_completion = check; @@ -200,7 +199,7 @@ g_signal_connect(check, "toggled", G_CALLBACK(cb_inline_changed), prefsui); gtk_widget_show(check); -#endif + prefsui->changed = FALSE; return main_vbox; @@ -245,14 +244,14 @@ (GTK_TOGGLE_BUTTON(prefsui->auto_completion)); /* Should change the section name? */ KZ_CONF_SET("Global", "use_auto_completion", autocompletion, BOOL); -#if GTK_CHECK_VERSION(2,6,0) + /* inline-completion */ inline_completion = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(prefsui->inline_completion)); /* Should change the section name? */ KZ_CONF_SET("Global", "use_inline_completion", inline_completion, BOOL); -#endif + prefsui->changed = FALSE; break; Index: kazehakase/src/prefs_ui/prefs_font.c diff -u kazehakase/src/prefs_ui/prefs_font.c:1.24 kazehakase/src/prefs_ui/prefs_font.c:1.25 --- kazehakase/src/prefs_ui/prefs_font.c:1.24 Mon Aug 29 10:07:45 2005 +++ kazehakase/src/prefs_ui/prefs_font.c Tue May 16 09:18:52 2006 @@ -237,7 +237,6 @@ i++; } -#if GTK_CHECK_VERSION(2,6,0) /* for separator */ gtk_combo_box_append_text(combo, "---"); i++; @@ -249,7 +248,6 @@ gtk_combo_box_append_text(combo, node->data); i++; } -#endif gtk_combo_box_set_active(combo, select); @@ -634,11 +632,11 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), combo); g_signal_connect (combo, "changed", G_CALLBACK(cb_serif_entry_changed), prefsui); -#if GTK_CHECK_VERSION(2,6,0) + gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo), combo_box_row_separator_func, NULL, NULL); -#endif + gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, @@ -665,11 +663,11 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), combo); g_signal_connect (combo, "changed", G_CALLBACK(cb_sans_serif_entry_changed), prefsui); -#if GTK_CHECK_VERSION(2,6,0) + gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo), combo_box_row_separator_func, NULL, NULL); -#endif + gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, 0, @@ -696,11 +694,11 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), combo); g_signal_connect (combo, "changed", G_CALLBACK(cb_monospace_entry_changed), prefsui); -#if GTK_CHECK_VERSION(2,6,0) + gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo), combo_box_row_separator_func, NULL, NULL); -#endif + gtk_table_attach(GTK_TABLE(table), combo, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0,