take GCallback, not GtkSignalFunc. (configure_sort_dialog): show the

2002-11-18  Chris Toshok  <toshok@ximian.com>

	* e-table-config.c (connect_button): take GCallback, not
	GtkSignalFunc.
	(configure_sort_dialog): show the custom widget.
	(configure_group_dialog): same.
	(configure_fields_dialog): same, also pass G_CALLBACK (func),
	instead of GTK_SIGNAL_FUNC (func), to connect_button.
	(setup_gui): pass G_CALLBACK (func), instead of GTK_SIGNAL_FUNC
	(func), to connect_button.

	* Makefile.am (glade_DATA): remove e-table-group.glade, since we
	don't use it anyplace.

svn path=/trunk/; revision=18832

2 files changed, 19 insertions, 214 deletions

diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index b4eaf53beb..4894fdb6d8 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -574,13 +574,13 @@ configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config)
 #endif
 
 static void
-connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GtkSignalFunc cback)
+connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GCallback cback)
 {
 	GtkWidget *button = glade_xml_get_widget (gui, widget_name);
 
 	if (button) {
 		g_signal_connect (G_OBJECT (button), "clicked",
-				  G_CALLBACK (cback), config);
+				  cback, config);
 	}
 }
 
@@ -642,7 +642,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui)
 		snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1);
 		config->sort [i].combo = GTK_COMBO_TEXT (
 			glade_xml_get_widget (gui, buffer));
-
+		gtk_widget_show (GTK_WIDGET (config->sort [i].combo));
 		gtk_combo_text_add_item (config->sort [i].combo, "", "");
 
 		snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1);
@@ -746,6 +746,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
 		snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1);
 		config->group [i].combo = GTK_COMBO_TEXT (
 			glade_xml_get_widget (gui, buffer));
+		gtk_widget_show (GTK_WIDGET (config->group [i].combo));
 
 		gtk_combo_text_add_item (config->group [i].combo, "", "");
 
@@ -961,20 +962,26 @@ config_button_down (GtkWidget *widget, ETableConfig *config)
 static void
 configure_fields_dialog (ETableConfig *config, GladeXML *gui)
 {
-	config->available = e_table_scrolled_get_table (E_TABLE_SCROLLED (glade_xml_get_widget (gui, "custom-available")));
+	GtkWidget *scrolled;
+
+	scrolled = glade_xml_get_widget (gui, "custom-available");
+	config->available = e_table_scrolled_get_table (E_TABLE_SCROLLED (scrolled));
 	g_object_get (config->available,
 		      "model", &config->available_model,
 		      NULL);
+	gtk_widget_show_all (scrolled);
 
-	config->shown = e_table_scrolled_get_table (E_TABLE_SCROLLED (glade_xml_get_widget (gui, "custom-shown")));
+	scrolled = glade_xml_get_widget (gui, "custom-shown");
+	config->shown = e_table_scrolled_get_table (E_TABLE_SCROLLED (scrolled));
 	g_object_get (config->shown,
 		      "model", &config->shown_model,
 		      NULL);
+	gtk_widget_show_all (scrolled);
 
-	connect_button (config, gui, "button-add",    GTK_SIGNAL_FUNC (config_button_add));
-	connect_button (config, gui, "button-remove", GTK_SIGNAL_FUNC (config_button_remove));
-	connect_button (config, gui, "button-up",     GTK_SIGNAL_FUNC (config_button_up));
-	connect_button (config, gui, "button-down",   GTK_SIGNAL_FUNC (config_button_down));
+	connect_button (config, gui, "button-add",    G_CALLBACK (config_button_add));
+	connect_button (config, gui, "button-remove", G_CALLBACK (config_button_remove));
+	connect_button (config, gui, "button-up",     G_CALLBACK (config_button_up));
+	connect_button (config, gui, "button-down",   G_CALLBACK (config_button_down));
 
 	setup_fields (config);
 }
@@ -1021,9 +1028,9 @@ setup_gui (ETableConfig *config)
 	config->fields_label = glade_xml_get_widget (
 		gui, "label-fields");
 
-	connect_button (config, gui, "button-sort", GTK_SIGNAL_FUNC (config_button_sort));
-	connect_button (config, gui, "button-group", GTK_SIGNAL_FUNC (config_button_group));
-	connect_button (config, gui, "button-fields", GTK_SIGNAL_FUNC (config_button_fields));
+	connect_button (config, gui, "button-sort", G_CALLBACK (config_button_sort));
+	connect_button (config, gui, "button-group", G_CALLBACK (config_button_group));
+	connect_button (config, gui, "button-fields", G_CALLBACK (config_button_fields));
 	
 	configure_sort_dialog (config, gui);
 	configure_group_dialog (config, gui);
diff --git a/widgets/table/e-table-group.glade b/widgets/table/e-table-group.glade
deleted file mode 100644
index 1b49a61522..0000000000
--- a/widgets/table/e-table-group.glade
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
-
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">window1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-    <property name="visible">yes</property>
-
-    <child>
-      <widget class="GtkTable" id="table1">
-        <property name="homogeneous">no</property>
-        <property name="row_spacing">0</property>
-        <property name="column_spacing">0</property>
-        <property name="n-rows">3</property>
-        <property name="n-columns">3</property>
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GtkFrame" id="frame1">
-            <property name="border_width">4</property>
-            <property name="label" translatable="yes">Available fields</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkTreeView" id="clist1">
-                    <property name="can_focus">yes</property>
-                    <property name="headers-visible">no</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="child_name">CList:title</property>
-                        <property name="label" translatable="yes">label1</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                        <property name="wrap">no</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="visible">yes</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-
-                <child internal-child="hscrollbar">
-                  <widget class="GtkHScrollbar" id="convertwidget1">
-                    <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                </child>
-
-                <child internal-child="vscrollbar">
-                  <widget class="GtkVScrollbar" id="convertwidget2">
-                    <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="right_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-            <property name="x_padding">0</property>
-            <property name="y_padding">0</property>
-            <property name="x_options">expand|fill</property>
-            <property name="y_options">expand|fill</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkFrame" id="frame2">
-            <property name="border_width">4</property>
-            <property name="label" translatable="yes">Show in this order</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow2">
-                <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkTreeView" id="clist2">
-                    <property name="can_focus">yes</property>
-                    <property name="headers-visible">no</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkLabel" id="label2">
-                        <property name="child_name">CList:title</property>
-                        <property name="label" translatable="yes">label2</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                        <property name="wrap">no</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="visible">yes</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-
-                <child internal-child="hscrollbar">
-                  <widget class="GtkHScrollbar" id="convertwidget3">
-                    <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                </child>
-
-                <child internal-child="vscrollbar">
-                  <widget class="GtkVScrollbar" id="convertwidget4">
-                    <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-                    <property name="visible">yes</property>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="left_attach">2</property>
-            <property name="right_attach">3</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-            <property name="x_padding">0</property>
-            <property name="y_padding">0</property>
-            <property name="x_options">expand|fill</property>
-            <property name="y_options">fill</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkVBox" id="vbox1">
-            <property name="border_width">4</property>
-            <property name="homogeneous">no</property>
-            <property name="spacing">0</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkButton" id="button1">
-                <property name="border_width">4</property>
-                <property name="can_focus">yes</property>
-                <property name="label" translatable="yes">Add &gt;&gt;</property>
-                <property name="visible">yes</property>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">no</property>
-                <property name="fill">no</property>
-              </packing>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="button2">
-                <property name="border_width">4</property>
-                <property name="can_focus">yes</property>
-                <property name="label" translatable="yes">&lt;&lt; Remove</property>
-                <property name="visible">yes</property>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">no</property>
-                <property name="fill">no</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">0</property>
-            <property name="bottom_attach">1</property>
-            <property name="x_padding">4</property>
-            <property name="y_padding">4</property>
-            <property name="x_options">expand</property>
-            <property name="y_options">fill</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>