From 2130b41c3722f14f8bda39544aff1c93c50ae8b4 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 15 Sep 2009 16:20:37 +0200 Subject: [PATCH] Fixes NB#135463, crash in check_data --- src/gnome/modest-default-account-settings-dialog.c | 2 +- .../modest-default-account-settings-dialog.c | 14 +++++++------- src/maemo/modest-default-account-settings-dialog.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gnome/modest-default-account-settings-dialog.c b/src/gnome/modest-default-account-settings-dialog.c index 85fe69a..0295822 100644 --- a/src/gnome/modest-default-account-settings-dialog.c +++ b/src/gnome/modest-default-account-settings-dialog.c @@ -996,7 +996,7 @@ check_data (ModestAccountSettingsDialog *self) if (!account_title) return FALSE; /* Should be prevented already anyway. */ - if (strcmp(account_title, priv->original_account_title) != 0) { + if (g_strcmp0 (account_title, priv->original_account_title) != 0) { /* Check the changed title: */ const gboolean name_in_use = modest_account_mgr_account_with_display_name_exists (priv->account_manager, account_title); diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index b688662..6126408 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -790,7 +790,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self, return GTK_WIDGET (box); } - + static gboolean check_data (ModestDefaultAccountSettingsDialog *self) { @@ -806,23 +806,23 @@ check_data (ModestDefaultAccountSettingsDialog *self) account_title = get_entered_account_title (self); if (!account_title) return FALSE; /* Should be prevented already anyway. */ - - if (strcmp(account_title, priv->original_account_title) != 0) { + + if (g_strcmp0 (account_title, priv->original_account_title) != 0) { gboolean name_in_use; /* Check the changed title: */ name_in_use = modest_account_mgr_account_with_display_name_exists (priv->account_manager, account_title); - + if (name_in_use) { /* Warn the user via a dialog: */ modest_platform_information_banner(NULL, NULL, _("mail_ib_account_name_already_existing")); - + g_free (account_title); return FALSE; } } - + g_free (account_title); account_title = NULL; @@ -831,7 +831,7 @@ check_data (ModestDefaultAccountSettingsDialog *self) if ((!email_address) || (strlen(email_address) == 0)) { return FALSE; } - + if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_email")); diff --git a/src/maemo/modest-default-account-settings-dialog.c b/src/maemo/modest-default-account-settings-dialog.c index eb41e84..089f1c2 100644 --- a/src/maemo/modest-default-account-settings-dialog.c +++ b/src/maemo/modest-default-account-settings-dialog.c @@ -923,7 +923,7 @@ check_data (ModestDefaultAccountSettingsDialog *self) if (!account_title) return FALSE; /* Should be prevented already anyway. */ - if (strcmp(account_title, priv->original_account_title) != 0) { + if (g_strcmp0 (account_title, priv->original_account_title) != 0) { gboolean name_in_use; /* Check the changed title: */ -- 1.7.9.5