[evolution-ews/gnome-3-8] Make the statements explicit when using ternary if



commit a5a0c6c4df39005d1e88d04d619afd773cf3d129
Author: Fabiano Fidêncio <fidencio redhat com>
Date:   Sun Jun 16 04:32:15 2013 +0200

    Make the statements explicit when using ternary if
    
    Based on:
    https://git.gnome.org/browse/evolution-data-server/commit/?id=53a161d1eed173a

 src/addressbook/e-book-backend-ews.c |    4 ++--
 src/server/e-ews-connection.c        |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index bbc5d8b..72c3e66 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -851,7 +851,7 @@ ebews_set_notes_changes (ESoapMessage *message,
 
        if (g_strcmp0 (old_notes, new_notes) != 0) {
                convert_contact_property_to_updatexml (
-                               message, "Body", new_notes ?: "", "item", "BodyType", "Text");
+                               message, "Body", new_notes ? new_notes : "", "item", "BodyType", "Text");
        }
 
        g_free (old_notes);
@@ -2102,7 +2102,7 @@ ebews_start_gal_sync (gpointer data)
        if (!ret)
                goto exit;
 
-       e_book_backend_sqlitedb_set_key_value (priv->summary, priv->folder_id, "etag", etag?:"", NULL);
+       e_book_backend_sqlitedb_set_key_value (priv->summary, priv->folder_id, "etag", etag ? etag : "", 
NULL);
        if (e_book_backend_sqlitedb_set_key_value (priv->summary, priv->folder_id,
                                                   "oab-filename", uncompressed_filename,
                                                   NULL)) {
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 8060c82..1404f18 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -5095,7 +5095,7 @@ e_ews_connection_create_folder (EEwsConnection *cnc,
        if (is_distinguished_id || !parent_folder_id) {
                e_soap_message_start_element (msg, "DistinguishedFolderId", NULL, NULL);
                e_soap_message_add_attribute (
-                               msg, "Id", parent_folder_id ?: "msgfolderroot", NULL, NULL);
+                               msg, "Id", parent_folder_id ? parent_folder_id : "msgfolderroot", NULL, NULL);
                if (is_distinguished_id && cnc->priv->email) {
                        e_soap_message_start_element (msg, "Mailbox", NULL, NULL);
                        e_ews_message_write_string_parameter(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]