summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-07 21:43:11 +1100
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-11-07 21:45:57 +1100
commit1ee66951f5cf501d139477fcff940306446520d3 (patch)
treea0cc9fbee498832a53d49aeede32f7babf8fb348
parent1f2949120297e4ac2b3abbbe916a8f9b34f702ce (diff)
downloadwocky-gabble-0.14.tar.gz
wocky-muc: return NULL if a timestamp can't be determinedgabble-0.14
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=42652
-rw-r--r--wocky/wocky-muc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/wocky/wocky-muc.c b/wocky/wocky-muc.c
index f23c72a..86a55cc 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -1333,9 +1333,6 @@ extract_timestamp (WockyNode *msg)
}
}
- if (stamp == NULL)
- stamp = g_date_time_new_from_unix_local (0);
-
return stamp;
}
@@ -1443,7 +1440,8 @@ handle_message (WockyPorter *porter,
if (member_is_temporary)
free_member (who);
- g_date_time_unref (datetime);
+ if (datetime != NULL)
+ g_date_time_unref (datetime);
return TRUE;
}