From 3bd387bc25f784a259d2a99c997884bd36aee3e7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 11 Apr 2014 10:49:15 +0200 Subject: Bug #684425 - Do not pass NULL text to gtk_entry_set_text() --- modules/book-config-ldap/evolution-book-config-ldap.c | 8 ++++---- modules/cal-config-caldav/evolution-cal-config-caldav.c | 2 +- modules/mail-config/e-mail-config-remote-accounts.c | 4 ++-- modules/mail-config/e-mail-config-sendmail-backend.c | 5 +++-- modules/mail-config/e-mail-config-smtp-backend.c | 4 ++-- modules/startup-wizard/e-mail-config-import-progress-page.c | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) (limited to 'modules') diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c index 7e6880b42b..feb016734f 100644 --- a/modules/book-config-ldap/evolution-book-config-ldap.c +++ b/modules/book-config-ldap/evolution-book-config-ldap.c @@ -849,7 +849,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend, is_new_source = !e_source_has_extension (scratch_source, extension_name); extension = e_source_get_extension (scratch_source, extension_name); - g_object_bind_property ( + e_binding_bind_object_text_property ( extension, "host", context->host_entry, "text", G_BINDING_BIDIRECTIONAL | @@ -870,7 +870,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend, context->port_combo, "changed", G_CALLBACK (book_config_ldap_port_combo_changed), NULL); - g_object_bind_property ( + e_binding_bind_object_text_property ( extension, "user", context->auth_entry, "text", G_BINDING_BIDIRECTIONAL | @@ -899,7 +899,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend, widget = gtk_bin_get_child (GTK_BIN (context->search_base_combo)); - g_object_bind_property ( + e_binding_bind_object_text_property ( extension, "root-dn", widget, "text", G_BINDING_BIDIRECTIONAL | @@ -911,7 +911,7 @@ book_config_ldap_insert_widgets (ESourceConfigBackend *backend, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( extension, "filter", context->search_filter_entry, "text", G_BINDING_BIDIRECTIONAL | diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c index e6b73a439c..5cd165e16b 100644 --- a/modules/cal-config-caldav/evolution-cal-config-caldav.c +++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c @@ -261,7 +261,7 @@ cal_config_caldav_insert_widgets (ESourceConfigBackend *backend, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( extension, "email-address", context->email_entry, "text", G_BINDING_BIDIRECTIONAL | diff --git a/modules/mail-config/e-mail-config-remote-accounts.c b/modules/mail-config/e-mail-config-remote-accounts.c index 23b30986b9..15a3d3b0fe 100644 --- a/modules/mail-config/e-mail-config-remote-accounts.c +++ b/modules/mail-config/e-mail-config-remote-accounts.c @@ -258,7 +258,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend, remote_backend->auth_check = widget; /* do not reference */ gtk_widget_show (widget); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "host", remote_backend->host_entry, "text", G_BINDING_BIDIRECTIONAL | @@ -284,7 +284,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend, remote_backend->port_entry, "security-method", G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "user", remote_backend->user_entry, "text", G_BINDING_BIDIRECTIONAL | diff --git a/modules/mail-config/e-mail-config-sendmail-backend.c b/modules/mail-config/e-mail-config-sendmail-backend.c index 8508d02633..365c20f2da 100644 --- a/modules/mail-config/e-mail-config-sendmail-backend.c +++ b/modules/mail-config/e-mail-config-sendmail-backend.c @@ -22,6 +22,7 @@ #include #include +#include #include #include "e-mail-config-sendmail-backend.h" @@ -139,7 +140,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConfigServiceBackend *backend, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "custom-binary", custom_binary_entry, "text", G_BINDING_BIDIRECTIONAL | @@ -156,7 +157,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConfigServiceBackend *backend, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "custom-args", custom_args_entry, "text", G_BINDING_BIDIRECTIONAL | diff --git a/modules/mail-config/e-mail-config-smtp-backend.c b/modules/mail-config/e-mail-config-smtp-backend.c index 71ae6f57d8..368ffd8106 100644 --- a/modules/mail-config/e-mail-config-smtp-backend.c +++ b/modules/mail-config/e-mail-config-smtp-backend.c @@ -240,7 +240,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend, port = camel_network_settings_get_port ( CAMEL_NETWORK_SETTINGS (settings)); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "host", priv->host_entry, "text", G_BINDING_BIDIRECTIONAL | @@ -266,7 +266,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend, priv->port_entry, "security-method", G_BINDING_SYNC_CREATE); - g_object_bind_property ( + e_binding_bind_object_text_property ( settings, "user", priv->user_entry, "text", G_BINDING_BIDIRECTIONAL | diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.c b/modules/startup-wizard/e-mail-config-import-progress-page.c index 5d96a16f20..14280b7c7b 100644 --- a/modules/startup-wizard/e-mail-config-import-progress-page.c +++ b/modules/startup-wizard/e-mail-config-import-progress-page.c @@ -199,7 +199,7 @@ mail_config_import_progress_page_constructed (GObject *object) page->priv->progress_bar = widget; /* not referenced */ gtk_widget_show (widget); - g_object_bind_property ( + e_binding_bind_object_text_property ( activity, "text", widget, "text", G_BINDING_SYNC_CREATE); -- cgit v1.2.3