Bug #684425 - Do not pass NULL text to gtk_entry_set_text()

6 files changed, 15 insertions, 14 deletions

diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 1078fc2ff2..5688494161 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -728,7 +728,7 @@ mail_config_assistant_constructed (GObject *object)
 	e_mail_config_assistant_add_page (assistant, page);
 	assistant->priv->receiving_page = g_object_ref (page);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		mail_identity_extension, "address",
 		page, "email-address",
 		G_BINDING_SYNC_CREATE);
@@ -811,7 +811,7 @@ mail_config_assistant_constructed (GObject *object)
 	e_mail_config_assistant_add_page (assistant, page);
 	assistant->priv->sending_page = g_object_ref (page);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		mail_identity_extension, "address",
 		page, "email-address",
 		G_BINDING_SYNC_CREATE);
diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c
index 7298e09fd6..5e85d64d24 100644
--- a/mail/e-mail-config-defaults-page.c
+++ b/mail/e-mail-config-defaults-page.c
@@ -573,7 +573,7 @@ mail_config_defaults_page_constructed (GObject *object)
 	page->priv->drafts_button = widget;  /* not referenced */
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		composition_ext, "drafts-folder",
 		widget, "folder-uri",
 		G_BINDING_BIDIRECTIONAL |
@@ -602,7 +602,7 @@ mail_config_defaults_page_constructed (GObject *object)
 		gtk_widget_set_sensitive (widget, FALSE);
 	}
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		submission_ext, "sent-folder",
 		widget, "folder-uri",
 		G_BINDING_BIDIRECTIONAL |
diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c
index 6c9072f3bf..5526105140 100644
--- a/mail/e-mail-config-identity-page.c
+++ b/mail/e-mail-config-identity-page.c
@@ -323,7 +323,7 @@ mail_config_identity_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		source, "display-name",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
@@ -369,7 +369,7 @@ mail_config_identity_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		extension, "name",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
@@ -401,7 +401,7 @@ mail_config_identity_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		extension, "address",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
@@ -452,7 +452,7 @@ mail_config_identity_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 2, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		extension, "reply-to",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
@@ -479,7 +479,7 @@ mail_config_identity_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 2, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		extension, "organization",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c
index 0bd0033d6b..32c5473aa6 100644
--- a/mail/e-mail-config-provider-page.c
+++ b/mail/e-mail-config-provider-page.c
@@ -343,7 +343,7 @@ mail_config_provider_page_add_entry (EMailConfigProviderPage *page,
 	gtk_box_pack_start (GTK_BOX (hbox), input, TRUE, TRUE, 0);
 	gtk_widget_show (input);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		settings, entry->name,
 		input, "text",
 		G_BINDING_BIDIRECTIONAL |
diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c
index 4f0dc4b4bb..74c125126d 100644
--- a/mail/e-mail-config-security-page.c
+++ b/mail/e-mail-config-security-page.c
@@ -405,7 +405,7 @@ mail_config_security_page_constructed (GObject *object)
 	g_warn_if_fail (GTK_IS_ENTRY (widget));
 #endif /* HAVE_LIBCRYPTUI */
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		openpgp_ext, "key-id",
 		widget, "text",
 		G_BINDING_SYNC_CREATE |
@@ -525,7 +525,7 @@ mail_config_security_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		smime_ext, "signing-certificate",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
@@ -631,7 +631,7 @@ mail_config_security_page_constructed (GObject *object)
 	gtk_grid_attach (GTK_GRID (container), widget, 1, 4, 1, 1);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		smime_ext, "encryption-certificate",
 		widget, "text",
 		G_BINDING_BIDIRECTIONAL |
diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c
index 4459a23e46..3f00c0f4c7 100644
--- a/mail/e-mail-config-welcome-page.c
+++ b/mail/e-mail-config-welcome-page.c
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
+#include <e-util/e-util.h>
 #include <libebackend/libebackend.h>
 
 #define E_MAIL_CONFIG_WELCOME_PAGE_GET_PRIVATE(obj) \
@@ -123,7 +124,7 @@ mail_config_welcome_page_constructed (GObject *object)
 	gtk_box_pack_start (GTK_BOX (page), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
-	g_object_bind_property (
+	e_binding_bind_object_text_property (
 		page, "text",
 		widget, "label",
 		G_BINDING_BIDIRECTIONAL |