Merge 2 simple PRs from Richard Cohen into maint.

This commit is contained in:
John Ralls 2023-01-22 10:41:02 -08:00
commit ae6efa39ca
2 changed files with 6 additions and 7 deletions

View File

@ -756,9 +756,7 @@ sxftd_update_excal_adapt( GObject *o, gpointer ud )
void
gnc_sx_create_from_trans( GtkWindow *parent, Transaction *trans )
{
#ifndef __MINGW32__
int errno;
#endif
int sx_error;
SXFromTransInfo *sxfti = g_new0( SXFromTransInfo, 1);
GtkBuilder *builder;
GtkWidget *dialog;
@ -782,9 +780,9 @@ gnc_sx_create_from_trans( GtkWindow *parent, Transaction *trans )
sxfti->sx = xaccSchedXactionMalloc(gnc_get_current_book ());
if ( (errno = sxftd_init( sxfti )) < 0 )
if ( (sx_error = sxftd_init( sxfti )) < 0 )
{
if ( errno == SXFTD_ERRNO_OPEN_XACTION )
if ( sx_error == SXFTD_ERRNO_OPEN_XACTION )
{
gnc_error_dialog (NULL, "%s",
_( "Cannot create a Scheduled Transaction "
@ -796,7 +794,7 @@ gnc_sx_create_from_trans( GtkWindow *parent, Transaction *trans )
}
else
{
g_error("sxftd_init: %d", errno);
g_error("sxftd_init: %d", sx_error);
}
}

View File

@ -1234,8 +1234,9 @@ GDate* gnc_g_date_new_today ()
auto result = g_date_new_dmy (ymd.day, month, ymd.year);
g_assert(g_date_valid (result));
return result;
}void
}
void
gnc_gdate_set_today (GDate* gd)
{
GDate *today = gnc_g_date_new_today ();