[Gnucash-changes] r13302 - gnucash/trunk/src/gnome - Build fix; finish removing obsolete merge "error" check.

[Joshua Sled]

Author: jsled
Date: 2006-02-19 15:52:10 -0500 (Sun, 19 Feb 2006)
New Revision: 13302
Trac: http://svn.gnucash.org/trac/changeset/13302

Modified:
   gnucash/trunk/src/gnome/druid-hierarchy.c
   gnucash/trunk/src/gnome/glade/account.glade
Log:
Build fix; finish removing obsolete merge "error" check.

Modified: gnucash/trunk/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.c	2006-02-19 20:48:50 UTC (rev 13301)
+++ gnucash/trunk/src/gnome/druid-hierarchy.c	2006-02-19 20:52:10 UTC (rev 13302)
@@ -103,10 +103,6 @@
 void on_final_account_prepare (GnomeDruidPage  *gnomedruidpage,
 			       gpointer         arg1,
 			       hierarchy_data  *data);
-gboolean on_final_account_next (GnomeDruidPage  *gnomedruidpage,
-                                gpointer         arg1,
-                                hierarchy_data  *data);
-
 void on_cancel (GnomeDruid      *gnomedruid, hierarchy_data *data);
 void on_finish (GnomeDruidPage  *gnomedruidpage, gpointer arg1, hierarchy_data *data);
 
@@ -839,37 +835,6 @@
   gnc_resume_gui_refresh ();
 }
 
-static void _glist_free_helper(gpointer elt, gpointer user_data)
-{
-  g_free(elt);
-}
-
-gboolean
-on_final_account_next (GnomeDruidPage  *gnomedruidpage,
-                       gpointer         arg1,
-                       hierarchy_data  *data)
-{
-  GList *errors;
-  gboolean has_errors;
-
-  errors  = account_merge_error_detection(gnc_book_get_group(gnc_get_current_book()),
-                                          data->our_final_group);
-  has_errors = (g_list_length(errors) > 0);
-  if (has_errors)
-  {
-    gnc_info_dialog(data->dialog, 
-        "%d accounts have placeholdders that conflict "
-        "with existing accounts, please resolve.", g_list_length(errors));
-  }
-
-  {
-    g_list_foreach(errors, _glist_free_helper, NULL);
-    g_list_free(errors);
-  }
-
-  return has_errors;
-}
-
 void
 on_cancel (GnomeDruid      *gnomedruid,
 	   hierarchy_data  *data)

Modified: gnucash/trunk/src/gnome/glade/account.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/account.glade	2006-02-19 20:48:50 UTC (rev 13301)
+++ gnucash/trunk/src/gnome/glade/account.glade	2006-02-19 20:52:10 UTC (rev 13302)
@@ -728,7 +728,6 @@
 			  <property name="rules_hint">False</property>
 			  <property name="reorderable">False</property>
 			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">False</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1350,7 +1349,6 @@
 				      <property name="rules_hint">True</property>
 				      <property name="reorderable">True</property>
 				      <property name="enable_search">True</property>
-				      <property name="fixed_height_mode">False</property>
 				    </widget>
 				  </child>
 				</widget>
@@ -1597,7 +1595,6 @@
 	  <property name="visible">True</property>
 	  <property name="title" translatable="yes">Setup new accounts</property>
 	  <signal name="prepare" handler="on_final_account_prepare"/>
-	  <signal name="next" handler="on_final_account_next" last_modification_time="Sun, 15 Jan 2006 16:54:20 GMT"/>
 
 	  <child internal-child="vbox">
 	    <widget class="GtkVBox" id="druid-vbox3">
@@ -1931,8 +1928,6 @@
 			      <property name="items">USD
 GBP
 EUR</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -2025,7 +2020,6 @@
 					  <property name="rules_hint">False</property>
 					  <property name="reorderable">False</property>
 					  <property name="enable_search">True</property>
-					  <property name="fixed_height_mode">False</property>
 					</widget>
 				      </child>
 				    </widget>
@@ -2177,7 +2171,6 @@
 				      <property name="rules_hint">False</property>
 				      <property name="reorderable">False</property>
 				      <property name="enable_search">True</property>
-				      <property name="fixed_height_mode">False</property>
 				    </widget>
 				  </child>
 				</widget>
@@ -2278,7 +2271,6 @@
 		      <property name="rules_hint">False</property>
 		      <property name="reorderable">False</property>
 		      <property name="enable_search">True</property>
-		      <property name="fixed_height_mode">False</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -2998,7 +2990,6 @@
 		  <property name="rules_hint">True</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">True</property>
-		  <property name="fixed_height_mode">False</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>