gnucash master: Multiple changes pushed
Mike Alexander
mta at code.gnucash.org
Mon Aug 10 03:15:02 EDT 2015
Updated via https://github.com/Gnucash/gnucash/commit/38bea103 (commit)
via https://github.com/Gnucash/gnucash/commit/054e6f7a (commit)
via https://github.com/Gnucash/gnucash/commit/05fdefa3 (commit)
via https://github.com/Gnucash/gnucash/commit/20242c5a (commit)
from https://github.com/Gnucash/gnucash/commit/1e16ba6c (commit)
commit 38bea1035e3d567365215e6f89dea6d91dfe6426
Merge: 1e16ba6 054e6f7
Author: Mike Alexander <mta at umich.edu>
Date: Mon Aug 10 03:29:13 2015 -0400
Merge branch 'maint'
commit 054e6f7a2284d58c66eb08fbd76694248e78b70e
Author: Mike Alexander <mta at umich.edu>
Date: Thu Aug 6 17:43:57 2015 -0400
Avoid passing invalid arguments to functions to get rid of some non-fatal asserts.
diff --git a/src/app-utils/gnc-sx-instance-model.c b/src/app-utils/gnc-sx-instance-model.c
index 2b3975d..560fe79 100644
--- a/src/app-utils/gnc-sx-instance-model.c
+++ b/src/app-utils/gnc-sx-instance-model.c
@@ -730,7 +730,8 @@ _find_unreferenced_vars(gchar *key,
gpointer value,
HashListPair *cb_pair)
{
- if (!g_hash_table_lookup_extended(cb_pair->hash, key, NULL, NULL))
+ if (cb_pair->hash == NULL ||
+ !g_hash_table_lookup_extended(cb_pair->hash, key, NULL, NULL))
{
g_debug("variable [%s] not found", key);
cb_pair->list = g_list_append(cb_pair->list, key);
@@ -804,20 +805,27 @@ gnc_sx_instance_model_update_sx_instances(GncSxInstanceModel *model, SchedXactio
// handle variables
{
- HashListPair removed_cb_data, added_cb_data;
GList *removed_var_names = NULL, *added_var_names = NULL;
GList *inst_iter = NULL;
- removed_cb_data.hash = new_instances->variable_names;
- removed_cb_data.list = NULL;
- g_hash_table_foreach(existing->variable_names, (GHFunc)_find_unreferenced_vars, &removed_cb_data);
- removed_var_names = removed_cb_data.list;
+ if (existing->variable_names != NULL)
+ {
+ HashListPair removed_cb_data;
+ removed_cb_data.hash = new_instances->variable_names;
+ removed_cb_data.list = NULL;
+ g_hash_table_foreach(existing->variable_names, (GHFunc)_find_unreferenced_vars, &removed_cb_data);
+ removed_var_names = removed_cb_data.list;
+ }
g_debug("%d removed variables", g_list_length(removed_var_names));
- added_cb_data.hash = existing->variable_names;
- added_cb_data.list = NULL;
- g_hash_table_foreach(new_instances->variable_names, (GHFunc)_find_unreferenced_vars, &added_cb_data);
- added_var_names = added_cb_data.list;
+ if (new_instances->variable_names != NULL)
+ {
+ HashListPair added_cb_data;
+ added_cb_data.hash = existing->variable_names;
+ added_cb_data.list = NULL;
+ g_hash_table_foreach(new_instances->variable_names, (GHFunc)_find_unreferenced_vars, &added_cb_data);
+ added_var_names = added_cb_data.list;
+ }
g_debug("%d added variables", g_list_length(added_var_names));
if (existing->variable_names != NULL)
diff --git a/src/engine/SchedXaction.c b/src/engine/SchedXaction.c
index 62bf445..d4d8232 100644
--- a/src/engine/SchedXaction.c
+++ b/src/engine/SchedXaction.c
@@ -633,7 +633,8 @@ xaccSchedXactionSetEndDate( SchedXaction *sx, const GDate *newEnd )
* the SX is to run "forever". See gnc_sxed_save_sx() and
* schedXact_editor_populate() in dialog-sx-editor.c.
*/
- if (newEnd == NULL || g_date_compare( newEnd, &sx->start_date ) < 0 )
+ if (newEnd == NULL ||
+ (g_date_valid(newEnd) && g_date_compare( newEnd, &sx->start_date ) < 0 ))
{
/* XXX: I reject the bad data - is this the right
* thing to do <rgmerk>.
commit 05fdefa306d8f278d1e9cac141bc0ce35b409ac2
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Aug 10 07:58:55 2015 +0100
Add note at the top to disuade users from contacting authors directly for support.
diff --git a/AUTHORS b/AUTHORS
index 5aee2fe..779ca3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,9 @@
+GETTING HELP: If you need help with GnuCash, please do not contact any of the
+Authors directly. Instead, first look at http://wiki.gnucash.org/wiki/FAQ to
+see if your question is common and is answered there. If that doesn't help, are
+mailing lists in English, Dutch, French, German, Italian, and Portuguese and an
+English IRC channel. More information can be found at
+http://wiki.gnucash.org/wiki/Mailing_Lists and http://wiki.gnucash.org/wiki/IRC.
Main Developers:
----------------
diff --git a/DOCUMENTERS b/DOCUMENTERS
index 099b8e4..9037d0c 100644
--- a/DOCUMENTERS
+++ b/DOCUMENTERS
@@ -1,3 +1,10 @@
+GETTING HELP: If you need help with GnuCash, please do not contact any of the
+Documentors directly. Instead, first look at http://wiki.gnucash.org/wiki/FAQ to
+see if your question is common and is answered there. If that doesn't help, are
+mailing lists in English, Dutch, French, German, Italian, and Portuguese and an
+English IRC channel. More information can be found at
+http://wiki.gnucash.org/wiki/Mailing_Lists and http://wiki.gnucash.org/wiki/IRC.
+
Contributors:
Current -
commit 20242c5a3d19e2ecdfae3aeb17b19eceb147b06b
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Aug 2 08:38:12 2015 -0700
Put the quotes back around the date string in gnc-fq-helper.
diff --git a/src/quotes/gnc-fq-helper.in b/src/quotes/gnc-fq-helper.in
index 16dd452..edb6220 100755
--- a/src/quotes/gnc-fq-helper.in
+++ b/src/quotes/gnc-fq-helper.in
@@ -205,18 +205,23 @@ sub get_quote_time {
my $datestr = $$quotehash{$item, 'date'};
my $timestr = $$quotehash{$item, 'time'};
my $format = "%Y-%m-%d %H:%M:%S";
+ my $result;
if ($datestr) {
my $parsestr = $datestr . " " . ($timestr ? $timestr : "12:00:00");
my $date = $base_date->new();
my $err = $date->parse($parsestr);
if ($err) {
- print $date->err(), " $parsestr\n";
- return $base_date->printf($format);
+ print $date->err(), " $parsestr\n";
+ $result = $base_date->printf($format);
}
- return $date->printf($format);
+ else {
+ $result = $date->printf($format);
+ }
+ } else {
+ $result = $base_date->printf($format);
}
- return $base_date->printf($format);
+ return("\"$result\"");
}
sub schemify_quote {
Summary of changes:
AUTHORS | 6 ++++++
DOCUMENTERS | 7 +++++++
src/quotes/gnc-fq-helper.in | 15 ++++++++++-----
3 files changed, 23 insertions(+), 5 deletions(-)
More information about the gnucash-changes
mailing list