On Apr 2, 2013, at 1:37 PM, Robert Fewell <14ubo...@gmail.com> wrote:
> Hi Guy's,
>
> I thought 2.5.0 was being released in mid April so was not checking
> activity. I have several blocker bugs with patches on them that may be a
> good idea for this release or .1 the last containing a patch to check old
> and new registers being opened at the same time which I think was mentioned
> in other posts.
>
> With these patches applied, I think that is all the broad strokes done with
> the register but obviously there will be loads of changes for the stuff I
> have missed or got wrong or just is not working !!!
>
> Main Bug is 673193
I tried to apply them and didn't get very far. Errors follow.
I hope you've got this on a branch so you can pull the latest trunk, rebase
your branch, and create a new set of patches.
In the meantime, I think we'll go ahead with 2.5.0 and get the patches into
2.5.1 next month.
Regards,
John Ralls
git apply --reject --whitespace=fix 0012-reg2-update12-git.patch
0012-reg2-update12-git.patch:274: trailing whitespace.
} else if (col_list[i] == COL_NUMACT) {
Checking patch src/gnome-utils/gnc-tree-model-split-reg.c...
Hunk #2 succeeded at 487 (offset 4 lines).
Hunk #3 succeeded at 755 (offset 4 lines).
Hunk #4 succeeded at 956 (offset -19 lines).
Hunk #5 succeeded at 1198 (offset -19 lines).
Hunk #6 succeeded at 2234 (offset -72 lines).
Hunk #7 succeeded at 2280 (offset -72 lines).
Hunk #8 succeeded at 2296 (offset -72 lines).
Hunk #9 succeeded at 2328 (offset -72 lines).
Hunk #10 succeeded at 2367 (offset -72 lines).
error: while searching for:
gtk_list_store_insert_with_values (store, &iter, 100, 0, _("Sell"), -1);
break;
}
priv->numact_list = store;
}
/* Update the model with entries for the Number field ... */
void
gnc_tree_model_split_reg_update_num_list (GncTreeModelSplitReg *model)
{
GncTreeModelSplitRegPrivate *priv;
GtkTreeIter iter, num_iter;
gboolean valid;
priv = model->priv;
/* Clear the liststore */
gtk_list_store_clear (priv->numact_list);
/* Here we copy the num_list to the numact_list */
valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->num_list),
&num_iter);
while (valid)
{
gchar *text;
// Walk through the list, reading each row
gtk_tree_model_get (GTK_TREE_MODEL (priv->num_list), &num_iter, 0,
&text, -1);
gtk_list_store_append (priv->numact_list, &iter);
gtk_list_store_set (priv->numact_list, &iter, 0, text, -1);
g_free (text);
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->num_list),
&num_iter);
}
}
static int
error: patch failed: src/gnome-utils/gnc-tree-model-split-reg.c:2554
Checking patch src/gnome-utils/gnc-tree-model-split-reg.h...
Checking patch src/gnome-utils/gnc-tree-view-split-reg.c...
Hunk #2 succeeded at 653 (offset -1 lines).
Hunk #3 succeeded at 676 (offset -1 lines).
Hunk #4 succeeded at 715 (offset -1 lines).
Hunk #5 succeeded at 750 (offset -1 lines).
Hunk #6 succeeded at 828 (offset -1 lines).
Hunk #7 succeeded at 978 (offset -4 lines).
Hunk #8 succeeded at 1865 (offset -59 lines).
Hunk #9 succeeded at 1913 (offset -59 lines).
Hunk #10 succeeded at 2078 (offset -59 lines).
Hunk #11 succeeded at 2607 (offset -59 lines).
Hunk #12 succeeded at 3156 (offset -65 lines).
Hunk #13 succeeded at 3172 (offset -65 lines).
Hunk #14 succeeded at 3201 (offset -65 lines).
Hunk #15 succeeded at 3219 (offset -65 lines).
Hunk #16 succeeded at 3962 (offset -65 lines).
error: while searching for:
gnc_set_num_action (trans, get_this_split (view, trans),
new_text, NULL);
// Set the last number value for this account.
if (gnc_strisnum (new_text))
xaccAccountSetLastNum (xaccSplitGetAccount (get_this_split
(view, trans)), new_text);
}
if (is_trow2)
{
/* set per book option */
gnc_set_num_action (trans, get_this_split (view, trans),
NULL, new_text);
}
if (is_split)
{
/* Set split-action with gnc_set_num_action which is the same as
* xaccSplitSetAction with these arguments */
gnc_set_num_action (NULL, split, NULL, new_text);
// Set the last number value for this account.
if (gnc_strisnum (new_text))
xaccAccountSetLastNum (xaccSplitGetAccount (split), new_text);
}
break;
error: patch failed: src/gnome-utils/gnc-tree-view-split-reg.c:4227
error: while searching for:
}
/* Callback for Account seperator key */
static void
gtv_split_reg_acct_cb (GtkEntry *entry,
error: patch failed: src/gnome-utils/gnc-tree-view-split-reg.c:4457
Hunk #19 succeeded at 4750 (offset -320 lines).
Applying patch src/gnome-utils/gnc-tree-model-split-reg.c with 1 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Rejected hunk #11.
Applied patch src/gnome-utils/gnc-tree-model-split-reg.h cleanly.
Applying patch src/gnome-utils/gnc-tree-view-split-reg.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Hunk #16 applied cleanly.
Rejected hunk #17.
Rejected hunk #18.
Hunk #19 applied cleanly.
_______________________________________________
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
