Mercurial > pidgin

changeset 15564:45d3dd67fa13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
With the refactoring I did, it's now possible to reach timestamp_cb_common with conv == NULL. It happens with system logs. I've reworked the code accordingly to avoid an assertion failure.
author Richard Laager <rlaager@wiktel.com>
date Mon, 05 Feb 2007 05:28:54 +0000
parents 2286aac43694
children 3b6ce2116f74
files pidgin/plugins/timestamp_format.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/timestamp_format.c	Mon Feb 05 03:37:35 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Mon Feb 05 05:28:54 2007 +0000
@@ -57,12 +57,11 @@
                                  gboolean force,
                                  const char *dates)
 {
-	g_return_val_if_fail(conv != NULL, NULL);
 	g_return_val_if_fail(dates != NULL, NULL);
 
 	if (show_date ||
 	    !strcmp(dates, "always") ||
-	    (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
+	    (conv != NULL && gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
 	{
 		struct tm *tm = localtime(&t);
 		if (force)