[balsa] Do not crash after cancelling dialog
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Do not crash after cancelling dialog
- Date: Sun, 23 Oct 2016 16:16:37 +0000 (UTC)
commit 7bcfd9076d6831047c6b196e79d6807657135c38
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sun Oct 23 12:15:45 2016 -0400
Do not crash after cancelling dialog
* src/address-book-config.c (edit_book_response): do not free
the AddressBookConfig;
(add_vcard_cb),
(add_externq_cb), (add_ldif_cb), (add_ldap_cb), (add_gpe_cb),
(add_rubrica_cb): do not remove the weak ref that frees
the AddressBookConfig.
ChangeLog | 11 +++++++++++
src/address-book-config.c | 13 -------------
2 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 587e98c..8495bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-10-23 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Do not crash after cancelling the add-address-book dialog.
+
+ * src/address-book-config.c (edit_book_response): do not free
+ the AddressBookConfig;
+ (add_vcard_cb),
+ (add_externq_cb), (add_ldif_cb), (add_ldap_cb), (add_gpe_cb),
+ (add_rubrica_cb): do not remove the weak ref that frees
+ the AddressBookConfig.
+
2016-10-23 Albrecht Dreß
Support GCR to display a certificate widget
diff --git a/src/address-book-config.c b/src/address-book-config.c
index 2e2be93..f245524 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -161,7 +161,6 @@ edit_book_response(GtkWidget * dialog, gint response,
gtk_widget_destroy(dialog);
if (abc->address_book)
g_object_set_data(G_OBJECT(abc->address_book), "balsa-abc", NULL);
- g_free(abc);
}
/* Radio buttons */
@@ -783,8 +782,6 @@ modify_book(AddressBookConfig * abc)
static void
add_vcard_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_VCARD;
abc->window = create_vcard_dialog(abc);
gtk_widget_show_all(abc->window);
@@ -793,8 +790,6 @@ add_vcard_cb(GtkWidget * widget, AddressBookConfig * abc)
static void
add_externq_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_EXTERN;
abc->window = create_externq_dialog(abc);
gtk_widget_show_all(abc->window);
@@ -803,8 +798,6 @@ add_externq_cb(GtkWidget * widget, AddressBookConfig * abc)
static void
add_ldif_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_LDIF;
abc->window = create_ldif_dialog(abc);
gtk_widget_show_all(abc->window);
@@ -814,8 +807,6 @@ add_ldif_cb(GtkWidget * widget, AddressBookConfig * abc)
static void
add_ldap_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_LDAP;
abc->window = create_ldap_dialog(abc);
gtk_widget_show_all(abc->window);
@@ -826,8 +817,6 @@ add_ldap_cb(GtkWidget * widget, AddressBookConfig * abc)
static void
add_gpe_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_GPE;
abc->window = create_gpe_dialog(abc);
gtk_widget_show_all(abc->window);
@@ -838,8 +827,6 @@ add_gpe_cb(GtkWidget * widget, AddressBookConfig * abc)
static void
add_rubrica_cb(GtkWidget * widget, AddressBookConfig * abc)
{
- g_object_weak_unref(G_OBJECT(gtk_widget_get_parent(widget)),
- (GWeakNotify) g_free, abc);
abc->type = LIBBALSA_TYPE_ADDRESS_BOOK_RUBRICA;
abc->window = create_rubrica_dialog(abc);
gtk_widget_show_all(abc->window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]