gnucash maint: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Sat Feb 7 09:30:49 EST 2015


Updated	 via  https://github.com/Gnucash/gnucash/commit/7bddcd95 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/068fc356 (commit)
	from  https://github.com/Gnucash/gnucash/commit/ac63d3a1 (commit)



commit 7bddcd95b02c4e845ccd5f07f67bb9c20ab1e052
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Feb 3 13:53:15 2015 +0000

    Bug 743807 Stops critical error messages.
    
    As you type a date into the calendar widget it tries to make a GDate
    with the current year and month, if you are typing 31/ in February
    you get a critical error in the trace file. This patch adds a test
    for a valid date before proceeding.

diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index 8d84740..0fc9ee1 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -254,6 +254,10 @@ gnc_handle_date_accelerator (GdkEventKey *event,
     if ((tm->tm_mday <= 0) || (tm->tm_mon == -1) || (tm->tm_year == -1))
         return FALSE;
 
+    // Make sure we have a valid date before we proceed
+    if (!g_date_valid_dmy (tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900))
+        return FALSE;
+
     g_date_set_dmy (&gdate,
                     tm->tm_mday,
                     tm->tm_mon + 1,

commit 068fc3567d3a33cbe151e95807db21fea8803fee
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Feb 3 13:55:10 2015 +0000

    Bug 743807 Wrong date value being used.
    
    In get_filter_times, the start_date_today was being tested instead of
    the end_date_today, corrected. Also corrected the default option for
    end date to match start date.

diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c
index db9aba2..25e74f2 100644
--- a/src/import-export/csv-exp/assistant-csv-export.c
+++ b/src/import-export/csv-exp/assistant-csv-export.c
@@ -504,7 +504,7 @@ get_filter_times (CsvExportInfo *info)
     }
     else
     {
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(info->csvd.start_date_today)))
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(info->csvd.end_date_today)))
             info->csvd.end_time = gnc_time64_get_today_end();
         else
             info->csvd.end_time = gnc_time (NULL);
diff --git a/src/import-export/csv-exp/assistant-csv-export.glade b/src/import-export/csv-exp/assistant-csv-export.glade
index 6b04330..ab7c872 100644
--- a/src/import-export/csv-exp/assistant-csv-export.glade
+++ b/src/import-export/csv-exp/assistant-csv-export.glade
@@ -639,6 +639,7 @@ Select the type of Export required and the separator that will be used.
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
+                        <property name="group">end_date_latest</property>
                         <signal name="clicked" handler="csv_export_end_date_cb" swapped="no"/>
                       </object>
                       <packing>
@@ -659,7 +660,7 @@ Select the type of Export required and the separator that will be used.
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">end_date_choose</property>
+                        <property name="group">end_date_latest</property>
                         <signal name="clicked" handler="csv_export_end_date_cb" swapped="no"/>
                       </object>
                       <packing>
@@ -681,7 +682,6 @@ Select the type of Export required and the separator that will be used.
                         <property name="use_underline">True</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">end_date_choose</property>
                         <signal name="clicked" handler="csv_export_end_date_cb" swapped="no"/>
                       </object>
                       <packing>



Summary of changes:
 src/gnome-utils/dialog-utils.c                       | 4 ++++
 src/import-export/csv-exp/assistant-csv-export.c     | 2 +-
 src/import-export/csv-exp/assistant-csv-export.glade | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list