[balsa] geometry-manager: Remove a not-reached assertion
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] geometry-manager: Remove a not-reached assertion
- Date: Thu, 18 Apr 2019 19:23:56 +0000 (UTC)
commit 9755c22ee89b461595a947a5d0e3ef217cceacdf
Author: Albrecht Dreß <albrecht dress arcor de>
Date: Thu Apr 18 15:23:20 2019 -0400
geometry-manager: Remove a not-reached assertion
* libbalsa/geometry-manager.c (geometry_manager_init): a second
call with the same key is not necessarily an error.
ChangeLog | 7 +++++++
libbalsa/geometry-manager.c | 27 +++++++++++++--------------
2 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dac657c55..259077e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-18 Peter Bloomfield <pbloomfield bellsouth net>
+
+ geometry-manager: Remove a not-reached assertion
+
+ * libbalsa/geometry-manager.c (geometry_manager_init): a second
+ call with the same key is not necessarily an error.
+
2019-04-18 Peter Bloomfield <pbloomfield bellsouth net>
Call Gtk only from the main thread
diff --git a/libbalsa/geometry-manager.c b/libbalsa/geometry-manager.c
index a1c8ade68..83bbfb5b2 100644
--- a/libbalsa/geometry-manager.c
+++ b/libbalsa/geometry-manager.c
@@ -47,7 +47,6 @@ static void notify_is_maximized_cb(GtkWindow *window,
void
geometry_manager_init(const gchar *key, gint width, gint height, gboolean maximized)
{
- geometry_t *size_item;
gchar *config_key;
g_return_if_fail((key != NULL) && (key[0] != '\0') && (width > 0) && (height > 0));
@@ -59,24 +58,24 @@ geometry_manager_init(const gchar *key, gint width, gint height, gboolean maximi
atexit(geometry_manager_destroy);
}
- if (g_hash_table_contains(geometry_hash, key)) {
- g_assert_not_reached(); /* programming error: key must be unique */
- } else {
+ if (!g_hash_table_contains(geometry_hash, key)) {
+ geometry_t *size_item;
+
size_item = g_new0(geometry_t, 1);
g_hash_table_insert(geometry_hash, g_strdup(key), size_item);
- }
- config_key = g_strdup_printf("%sWidth=%d", key, width);
- size_item->width = libbalsa_conf_get_int(config_key);
- g_free(config_key);
+ config_key = g_strdup_printf("%sWidth=%d", key, width);
+ size_item->width = libbalsa_conf_get_int(config_key);
+ g_free(config_key);
- config_key = g_strdup_printf("%sHeight=%d", key, height);
- size_item->height = libbalsa_conf_get_int(config_key);
- g_free(config_key);
+ config_key = g_strdup_printf("%sHeight=%d", key, height);
+ size_item->height = libbalsa_conf_get_int(config_key);
+ g_free(config_key);
- config_key = g_strdup_printf("%sMaximized=%s", key, maximized ? "true" : "false");
- size_item->maximized = libbalsa_conf_get_bool(config_key);
- g_free(config_key);
+ config_key = g_strdup_printf("%sMaximized=%s", key, maximized ? "true" : "false");
+ size_item->maximized = libbalsa_conf_get_bool(config_key);
+ g_free(config_key);
+ }
G_UNLOCK(geometry_hash);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]