From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Fri, 4 Jan 2008 10:51:39 +0000 (+0000)
Subject: * applied two syntax patches from steve.kowalik@canonical.com for Ubuntu Mobile
X-Git-Tag: git_migration_finished~1866
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=9f4b19654c1a2e8190d754306a17ce1fd0c14fd6

* applied two syntax patches from steve.kowalik@canonical.com for Ubuntu Mobile
  (apparently, -Wall/-Werror broke compilations with newer gcc's)
* remove the now unused curl echo from configure.ac

pmo-trunk-r3976
---

diff --git a/configure.ac b/configure.ac
index 6e2b0e1..3c82a60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -477,7 +477,6 @@ echo "Prefix           : ${prefix}"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"
 echo "Gettext Package  : $GETTEXT_PACKAGE"
-echo "libcurl          : $have_libcurl"
 
 if test "x$with_platform" == "xmaemo"; then
    echo "Maemo Launcher   : $maemo_launcher"
diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 9004316..eecde23 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -496,25 +496,32 @@ modest_account_mgr_save_server_settings (ModestAccountMgr *self,
 
 		has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_HOSTNAME, 
 							    hostname, TRUE);
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_USERNAME,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_USERNAME,
 									   username, TRUE));
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PASSWORD,
 									   password, TRUE));
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO,
 									   protocol, TRUE));
-		has_errors || (has_errors = !modest_account_mgr_set_int (self, account_name, MODEST_ACCOUNT_PORT,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_int (self, account_name, MODEST_ACCOUNT_PORT,
 									port, TRUE));
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, 
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, 
 									   MODEST_ACCOUNT_AUTH_MECH,
 									   auth_protocol, TRUE));		
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_SECURITY,
 									   security,
 									   TRUE));
 	} else {
 		const gchar *uri = modest_server_account_settings_get_uri (settings);
 		has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_URI,
 							    uri, TRUE);
-		has_errors || (has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO,
+		if (!has_errors)
+			(has_errors = !modest_account_mgr_set_string (self, account_name, MODEST_ACCOUNT_PROTO,
 									   protocol, TRUE));
 	}
 
diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 8d58b9c..a4c6df1 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1809,7 +1809,7 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
 			GtkClipboard *clipboard;
 			if (GTK_IS_HTML (focused)) {
 				const gchar *sel;
-				guint len = -1;
+				int len = -1;
 				sel = gtk_html_get_selection_html (GTK_HTML (focused), &len);
 				do_check = !((sel == NULL) || (sel[0] == '\0'));
 			}
@@ -2314,7 +2314,7 @@ _invalid_clipboard_selected (ModestWindow *win,
 				result = !gtk_text_buffer_get_has_selection (buffer);
 			} else if (GTK_IS_HTML (focused)) {
 				const gchar *sel;
-				guint len = -1;
+				int len = -1;
 				sel = gtk_html_get_selection_html (GTK_HTML (focused), &len);
 				result = ((sel == NULL) || (sel[0] == '\0'));
 			} else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) {