From 4eab2eff34765e751b8c67c684f2b1e996f77258 Mon Sep 17 00:00:00 2001 From: Joshua Sled Date: Wed, 4 Jan 2006 04:56:54 +0000 Subject: [PATCH] Since-last-run dialog cleanups. * gnc-sxed-window-ui.xml: Remove unreferenced `TransactionAction`. * dialog-sxsincelast.c (sxsld_disposition_changed): change the assertion into a simple return-if-fail due to apparent change in the calling order in gtk 2.x... git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12256 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 8 ++++++++ GNOME2_STATUS | 11 ++++++++++- src/gnome/dialog-sxsincelast.c | 6 ++++-- src/gnome/glade/sched-xact.glade | 2 +- src/gnome/ui/gnc-plugin-page-sxregister-ui.xml | 4 ++-- src/gnome/ui/gnc-sxed-window-ui.xml | 3 --- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index de0d1c8a2e..8289889955 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-01-03 Joshua Sled + + * gnc-sxed-window-ui.xml: Remove unreferenced `TransactionAction`. + + * dialog-sxsincelast.c (sxsld_disposition_changed): change the + assertion into a simple return-if-fail due to apparent change in + the calling order in gtk 2.x... + 2006-01-03 David Hampton * src/engine/Transaction.c: When setting the amount of a split, diff --git a/GNOME2_STATUS b/GNOME2_STATUS index e01ac5b923..7e6eeac65a 100644 --- a/GNOME2_STATUS +++ b/GNOME2_STATUS @@ -124,6 +124,12 @@ Resources - 2006-01-02: do these problems still exist? + - [jsled, 2006-01-03] yes... + + - After opening, mousing over the existing account-tree changes all my + '$'s to 'USD'. + + - I'm unable to cancel this dialog. - Account Hierarchy Merge - BROKEN @@ -150,7 +156,10 @@ Resources - Scheduled Transactions - - Since Last Run dialog spews console-crap on init, generally broken? + - Since Last Run dialog should be audited for menus and ledger capabilities. + + - e.g. The To-Create-Transaction read-only review ledger doesn't need any + menus or editing functionality. - SX Editor diff --git a/src/gnome/dialog-sxsincelast.c b/src/gnome/dialog-sxsincelast.c index 6f1ff2d5e8..bc215f2717 100644 --- a/src/gnome/dialog-sxsincelast.c +++ b/src/gnome/dialog-sxsincelast.c @@ -531,7 +531,7 @@ dialog_widgets_attach_handlers(GladeXML *dialog_xml, int i; GtkWidget *w; - for(i = 0; handler_info[i].name != NULL; i++) + for (i = 0; handler_info[i].name != NULL; i++) { w = glade_xml_get_widget(dialog_xml, handler_info[i].name); g_signal_connect( G_OBJECT(w), handler_info[i].signal, @@ -3418,7 +3418,9 @@ sxsld_disposition_changed( GtkMenuShell *b, gpointer d ) glade_xml_get_widget( sxsld->gxml, SX_DISPOSITION_OPT )); /* Change the state of the TCI */ - g_assert( sxsld->curSelTCI != NULL ); + //g_assert( sxsld->curSelTCI != NULL ); + g_return_if_fail(sxsld->curSelTCI != NULL); + sxsld->curSelTCI->state = newState; newSensitivity = TRUE; diff --git a/src/gnome/glade/sched-xact.glade b/src/gnome/glade/sched-xact.glade index 5bbe174c8c..e73ac23219 100644 --- a/src/gnome/glade/sched-xact.glade +++ b/src/gnome/glade/sched-xact.glade @@ -5997,7 +5997,7 @@ Select any which you would like to create now, and click 3 True - True + False 0 diff --git a/src/gnome/ui/gnc-plugin-page-sxregister-ui.xml b/src/gnome/ui/gnc-plugin-page-sxregister-ui.xml index b756dd421f..519d337349 100644 --- a/src/gnome/ui/gnc-plugin-page-sxregister-ui.xml +++ b/src/gnome/ui/gnc-plugin-page-sxregister-ui.xml @@ -1,6 +1,6 @@ - + diff --git a/src/gnome/ui/gnc-sxed-window-ui.xml b/src/gnome/ui/gnc-sxed-window-ui.xml index 5e728a2cfd..4b51930183 100644 --- a/src/gnome/ui/gnc-sxed-window-ui.xml +++ b/src/gnome/ui/gnc-sxed-window-ui.xml @@ -11,9 +11,6 @@ - - -