diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2010-02-24 19:06:50 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2010-02-25 15:24:35 -0500 |
| commit | 8cb822743f7cdf225750591f476908e0b1277cac (patch) | |
| tree | 41291baf4d3d8a90f856316d9bb6db2ddeadc060 /src | |
| parent | c57c0ba99d025b9bcca2ff7815650373f4722135 (diff) | |
| download | telepathy-gabble-8cb822743f7cdf225750591f476908e0b1277cac.tar.gz | |
Don't use GNU extension operator ?: in conn-mail-notif.c
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/conn-mail-notif.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c index 76d3251ac..4d7bc6d37 100644 --- a/src/conn-mail-notif.c +++ b/src/conn-mail-notif.c @@ -231,7 +231,7 @@ gabble_mail_notification_request_inbox_url ( empty_array = g_ptr_array_new (); result = tp_value_array_build (3, - G_TYPE_STRING, conn->inbox_url ?: "", + G_TYPE_STRING, conn->inbox_url ? conn->inbox_url : "", G_TYPE_UINT, GABBLE_HTTP_METHOD_GET, GABBLE_ARRAY_TYPE_HTTP_POST_DATA_LIST, empty_array, G_TYPE_INVALID); @@ -272,7 +272,7 @@ gabble_mail_notification_request_mail_url ( empty_array = g_ptr_array_new (); result = tp_value_array_build (3, - G_TYPE_STRING, url ?: "", + G_TYPE_STRING, url ? url : "", G_TYPE_UINT, GABBLE_HTTP_METHOD_GET, GABBLE_ARRAY_TYPE_HTTP_POST_DATA_LIST, empty_array, G_TYPE_INVALID); @@ -295,14 +295,26 @@ sender_each (WockyXmppNode *node, { GType addr_type = GABBLE_STRUCT_TYPE_MAIL_ADDRESS; GValue sender = {0}; + const gchar *name; + const gchar *address; g_value_init (&sender, addr_type); g_value_set_static_boxed (&sender, dbus_g_type_specialized_construct (addr_type)); + name = wocky_xmpp_node_get_attribute (node, "name"); + + if (name == NULL) + name = ""; + + address = wocky_xmpp_node_get_attribute (node, "address"); + + if (address == NULL) + address = ""; + dbus_g_type_struct_set (&sender, - 0, wocky_xmpp_node_get_attribute (node, "name") ?: "", - 1, wocky_xmpp_node_get_attribute (node, "address") ?: "", + 0, name, + 1, address, G_MAXUINT); g_ptr_array_add (senders, g_value_get_boxed (&sender)); |