Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 34303)
+++ po/POTFILES.in	(working copy)
@@ -498,7 +498,6 @@
 widgets/table/e-cell-text.c
 widgets/table/e-table-click-to-add.c
 widgets/table/e-table-col.c
-widgets/table/e-table-config-no-group.glade
 widgets/table/e-table-config.c
 widgets/table/e-table-config.glade
 widgets/table/e-table-field-chooser-dialog.c
Index: po/ChangeLog
===================================================================
--- po/ChangeLog	(revision 34303)
+++ po/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2007-09-24  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #479716
+
+	* POTFILES.in: get rid of e-table-config-no-group.glade.
+
 2007-09-17  Priit Laes  <plaes@svn.gnome.org>
 
 	* et.po: Few typos fixed.
Index: widgets/table/ChangeLog
===================================================================
--- widgets/table/ChangeLog	(revision 34303)
+++ widgets/table/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2007-09-24  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #479716
+
+	* e-table-config.c: (setup_gui):
+	* Makefile.am: Get rid of e-table-config-no-group.glade and
+	keep consistent with behavior and appearence.
+
 2007-09-07  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #473903
Index: widgets/table/Makefile.am
===================================================================
--- widgets/table/Makefile.am	(revision 34303)
+++ widgets/table/Makefile.am	(working copy)
@@ -6,7 +6,6 @@
 
 glade_DATA = 					\
 	e-table-config.glade			\
-	e-table-config-no-group.glade		\
 	e-table-field-chooser.glade
 
 INCLUDES =					\
Index: widgets/table/e-table-config.c
===================================================================
--- widgets/table/e-table-config.c	(revision 34303)
+++ widgets/table/e-table-config.c	(working copy)
@@ -1196,24 +1196,17 @@
 setup_gui (ETableConfig *config)
 {
 	GladeXML *gui;
+	gboolean can_group;
+	gchar *filename;
 
 	create_global_store (config);
 
-	if (e_table_sort_info_get_can_group (config->state->sort_info)) {
-		gchar *filename =
-			g_build_filename (EVOLUTION_GLADEDIR,
+	can_group = e_table_sort_info_get_can_group (config->state->sort_info);
+	filename = g_build_filename (EVOLUTION_GLADEDIR,
 					  "e-table-config.glade",
 					  NULL);
-		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
-		g_free (filename);
-	} else {
-		gchar *filename =
-			g_build_filename (EVOLUTION_GLADEDIR,
-					  "e-table-config-no-group.glade",
-					  NULL);
-		gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
-		g_free (filename);
-	}
+	gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE);
+	g_free (filename);
 
 	g_object_unref (global_store);
 	
@@ -1240,7 +1233,23 @@
 	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));
-	
+
+	if (!can_group) {
+		GtkWidget *w;
+
+		w = glade_xml_get_widget (gui, "button-group");
+		if (w)
+			gtk_widget_hide (w);
+
+		w = glade_xml_get_widget (gui, "label3");
+		if (w)
+			gtk_widget_hide (w);
+
+		w = config->group_label;
+		if (w)
+			gtk_widget_hide (w);
+	}
+
 	configure_sort_dialog (config, gui);
 	configure_group_dialog (config, gui);
 	configure_fields_dialog (config, gui);
