early return in setters if the arg is NULL

Making properties "construct only" as the side effect to set the prop with the
default value (NULL) if it hasn't been specified in the g_object_new() call.

2 files changed, 17 insertions, 3 deletions

diff --git a/telepathy-logger/entry-text.c b/telepathy-logger/entry-text.c
index 75423dcda..aff334340 100644
--- a/telepathy-logger/entry-text.c
+++ b/telepathy-logger/entry-text.c
@@ -324,8 +324,10 @@ _tpl_entry_text_set_message (TplEntryText *self,
 {
   TplEntryTextPriv *priv;
 
+  if (data == NULL)
+    return;
+
   g_return_if_fail (TPL_IS_ENTRY_TEXT (self));
-  g_return_if_fail (data != NULL); /* allow zero length */
 
   priv = self->priv;
 
diff --git a/telepathy-logger/entry.c b/telepathy-logger/entry.c
index 7c8591ac7..0242b6290 100644
--- a/telepathy-logger/entry.c
+++ b/telepathy-logger/entry.c
@@ -447,8 +447,11 @@ _tpl_entry_set_sender (TplEntry *self,
 {
   TplEntryPriv *priv;
 
+  if (data == NULL)
+    return;
+
   g_return_if_fail (TPL_IS_ENTRY (self));
-  g_return_if_fail (TPL_IS_CONTACT (data) || data == NULL);
+  g_return_if_fail (TPL_IS_CONTACT (data));
 
   priv = self->priv;
 
@@ -465,8 +468,11 @@ _tpl_entry_set_receiver (TplEntry *self,
 {
   TplEntryPriv *priv;
 
+  if (data == NULL)
+    return;
+
   g_return_if_fail (TPL_IS_ENTRY (self));
-  g_return_if_fail (TPL_IS_CONTACT (data) || data == NULL);
+  g_return_if_fail (TPL_IS_CONTACT (data));
 
   priv = self->priv;
 
@@ -483,6 +489,9 @@ void
 _tpl_entry_set_chat_id (TplEntry *self,
     const gchar *data)
 {
+  if (data == NULL)
+    return;
+
   g_return_if_fail (TPL_IS_ENTRY (self));
   g_return_if_fail (!TPL_STR_EMPTY (data));
   g_return_if_fail (self->priv->chat_id == NULL);
@@ -509,6 +518,9 @@ void
 _tpl_entry_set_channel_path (TplEntry *self,
     const gchar *data)
 {
+  if (data == NULL)
+    return;
+
   g_return_if_fail (TPL_IS_ENTRY (self));
   g_return_if_fail (!TPL_STR_EMPTY (data));
   g_return_if_fail (self->priv->channel_path == NULL);