gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Mar 3 16:22:02 EST 2022
Updated via https://github.com/Gnucash/gnucash/commit/8ef8d380 (commit)
via https://github.com/Gnucash/gnucash/commit/93f5e23c (commit)
via https://github.com/Gnucash/gnucash/commit/9d458d1e (commit)
from https://github.com/Gnucash/gnucash/commit/bd4a4570 (commit)
commit 8ef8d3807ce516f3423e00745f4f96d6e31da499
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 3 13:21:51 2022 -0800
Silence spurious conditional uninitialized warning in gnc-owner-sql.cpp.
diff --git a/libgnucash/backend/sql/gnc-owner-sql.cpp b/libgnucash/backend/sql/gnc-owner-sql.cpp
index c2f299088..c25e00b26 100644
--- a/libgnucash/backend/sql/gnc-owner-sql.cpp
+++ b/libgnucash/backend/sql/gnc-owner-sql.cpp
@@ -182,7 +182,7 @@ GncSqlColumnTableEntryImpl<CT_OWNERREF>::add_to_query(QofIdTypeConst obj_name,
auto owner = (*getter) (pObject);
QofInstance* inst = nullptr;
- GncOwnerType type;
+ GncOwnerType type = GNC_OWNER_NONE;
auto type_hdr = std::string{m_col_name} + "_type";
auto guid_hdr = std::string{m_col_name} + "_guid";
commit 93f5e23cf5e9b78c5e4525f4d34efbada155ec96
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 3 13:20:41 2022 -0800
Open gzfile if thread creation fails.
diff --git a/libgnucash/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp
index e6129726a..8a7b4f40d 100644
--- a/libgnucash/backend/xml/io-gncxml-v2.cpp
+++ b/libgnucash/backend/xml/io-gncxml-v2.cpp
@@ -1550,8 +1550,6 @@ try_gz_open (const char* filename, const char* perms, gboolean compress,
{
int filedes[2]{};
- gz_thread_params_t* params;
- FILE* file;
#ifdef G_OS_WIN32
if (_pipe (filedes, 4096, _O_BINARY) < 0)
@@ -1578,7 +1576,7 @@ try_gz_open (const char* filename, const char* perms, gboolean compress,
nullptr);
}
- params = g_new (gz_thread_params_t, 1);
+ gz_thread_params_t* params = g_new (gz_thread_params_t, 1);
params->fd = filedes[write ? 0 : 1];
params->filename = g_strdup (filename);
params->perms = g_strdup (perms);
@@ -1586,6 +1584,9 @@ try_gz_open (const char* filename, const char* perms, gboolean compress,
auto thread = g_thread_new ("xml_thread", (GThreadFunc) gz_thread_func,
params);
+
+ FILE* file = nullptr;
+
if (!thread)
{
g_warning ("Could not create thread for (de)compression.");
@@ -1594,6 +1595,7 @@ try_gz_open (const char* filename, const char* perms, gboolean compress,
g_free (params);
close (filedes[0]);
close (filedes[1]);
+ file = g_fopen (filename, perms);
}
else
commit 9d458d1e7f4905448ed5f06447ea556fd983e525
Author: John Ralls <jralls at ceridwen.us>
Date: Tue Mar 1 16:15:18 2022 -0800
Bug 798386 - Cannot increment date by 1 day with Japanese keyboard.
diff --git a/gnucash/gnome-utils/dialog-dup-trans.c b/gnucash/gnome-utils/dialog-dup-trans.c
index f8bee87d1..9ee515eeb 100644
--- a/gnucash/gnome-utils/dialog-dup-trans.c
+++ b/gnucash/gnome-utils/dialog-dup-trans.c
@@ -124,7 +124,9 @@ gnc_dup_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, gpointer user
(event->state & modifiers) == GDK_MOD1_MASK)
return FALSE;
- if (event->keyval == GDK_KEY_plus || event->keyval == GDK_KEY_KP_Add)
+ /* See https://bugs.gnucash.org/show_bug.cgi?id=798386 for semicolon */
+ if (event->keyval == GDK_KEY_plus || event->keyval == GDK_KEY_KP_Add ||
+ event->keyval == GDK_KEY_semicolon)
increment = 1;
else if (event->keyval == GDK_KEY_minus || event->keyval == GDK_KEY_KP_Subtract)
increment = -1;
diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index eddb02c3c..b717bf344 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -486,7 +486,8 @@ gnc_handle_date_accelerator (GdkEventKey *event,
case GDK_KEY_KP_Add:
case GDK_KEY_plus:
case GDK_KEY_equal:
- if (event->state & GDK_SHIFT_MASK)
+ case GDK_KEY_semicolon: // See https://bugs.gnucash.org/show_bug.cgi?id=798386
+ if (event->state & GDK_SHIFT_MASK)
g_date_add_days (&gdate, 7);
else if (event->state & GDK_MOD1_MASK)
g_date_add_months (&gdate, 1);
diff --git a/gnucash/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
index 2171536c3..bc8cd7a8c 100644
--- a/gnucash/gnome-utils/gnc-tree-view-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
@@ -3772,7 +3772,7 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
case GDK_KEY_minus:
case GDK_KEY_KP_Add:
case GDK_KEY_KP_Subtract:
-
+ case GDK_KEY_semicolon: // See https://bugs.gnucash.org/show_bug.cgi?id=798386
if (!spath)
return TRUE;
Summary of changes:
gnucash/gnome-utils/dialog-dup-trans.c | 4 +++-
gnucash/gnome-utils/dialog-utils.c | 3 ++-
gnucash/gnome-utils/gnc-tree-view-split-reg.c | 2 +-
libgnucash/backend/sql/gnc-owner-sql.cpp | 2 +-
libgnucash/backend/xml/io-gncxml-v2.cpp | 8 +++++---
5 files changed, 12 insertions(+), 7 deletions(-)
More information about the gnucash-changes
mailing list