[uim-commit] r618 - trunk/helper

[makeinu at freedesktop.org]

Author: makeinu
Date: 2005-02-09 19:52:58 -0800 (Wed, 09 Feb 2005)
New Revision: 618

Modified:
   trunk/helper/pref-gtk.c
Log:
* helper/pref-gtk.c
  - Removed USE_SUB_GROUP macro.
  - Don't show the save confirm dialog on switching page.
  - (save_confirm_dialog_response_cb): Comment out.
  - (pref_tree_selection_changed): Disable confirm dialog.
  - (create_group_widget) Removed USE_SUB_GROUP macro.


Modified: trunk/helper/pref-gtk.c
===================================================================
--- trunk/helper/pref-gtk.c	2005-02-09 08:34:03 UTC (rev 617)
+++ trunk/helper/pref-gtk.c	2005-02-10 03:52:58 UTC (rev 618)
@@ -45,7 +45,6 @@
 #include "uim/gettext.h"
 #include "pref-gtk-custom-widgets.h"
 
-#define USE_SUB_GROUP 1
 #define DEFAULT_WINDOW_WIDTH_MAX 800
 #define DEFAULT_WINDOW_HEIGHT_MAX 600
 
@@ -67,11 +66,14 @@
 					     gpointer data);
 static GtkWidget *create_pref_treeview(void);
 static GtkWidget *create_group_widget(const char *group_name);
-#if USE_SUB_GROUP
 static void create_sub_group_widgets(GtkWidget *parent_widget,
 				     const char *parent_group);
-#endif
 
+/*
+ *  2005-02-10 Takuro Ashie <ashie at homa.ne.jp>
+ *    This feature is disabled according to [Anthy-dev 1795].
+ */
+#if 0
 static void
 save_confirm_dialog_response_cb(GtkDialog *dialog, gint arg, gpointer user_data)
 {
@@ -89,6 +91,7 @@
     break;
   }
 }
+#endif
 
 static gboolean
 pref_tree_selection_changed(GtkTreeSelection *selection,
@@ -100,6 +103,11 @@
   char *group_name;
   GtkWidget *group_widget;
 
+/*
+ *  2005-02-10 Takuro Ashie <ashie at homa.ne.jp>
+ *    This feature is disabled according to [Anthy-dev 1795].
+ */
+#if 0
   /* Preference save check should be here. */
   if (uim_pref_gtk_value_changed) {
     GtkWidget *dialog;
@@ -116,6 +124,7 @@
     gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
   }
+#endif
 
   if(gtk_tree_selection_get_selected(selection, &model, &iter) == FALSE)
     return TRUE;
@@ -355,20 +364,7 @@
 
   gtk_box_pack_start (GTK_BOX(vbox), group_label, FALSE, TRUE, 8);
 
-#if USE_SUB_GROUP
   create_sub_group_widgets(vbox, group_name);
-#else
-  {
-    char **custom_syms, **custom_sym;
-    custom_syms = uim_custom_collect_by_group(group_name);
-    if (custom_syms) {
-      for (custom_sym = custom_syms; *custom_sym; custom_sym++) {
-	uim_pref_gtk_add_custom(vbox, *custom_sym);
-      }
-      uim_custom_symbol_list_free(custom_syms);
-    }
-  }
-#endif
 
   uim_custom_group_free(group);
 
@@ -378,7 +374,6 @@
   return vbox;
 }
 
-#if USE_SUB_GROUP
 static void create_sub_group_widgets(GtkWidget *parent_widget, const char *parent_group)
 {
     char **sgrp_syms = uim_custom_group_subgroups(parent_group);
@@ -436,7 +431,6 @@
 
     uim_custom_symbol_list_free(sgrp_syms);
 }
-#endif
 
 static GtkWidget *
 create_pref_window(void)