# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1138407978 0
# Node ID fd57413bc421830f7ce568663ba9dd9070d2a1b2
# Parent  d50c330e80898bdc28105ced39e2d87b78aec4f9
[gaim-migrate @ 15416]
Add some guards so we don't crash. Luke is seeing a crash here. I think the problem might be in the signals code, but I don't really know.

committer: Tailor Script <tailor@pidgin.im>

diff -r d50c330e8089 -r fd57413bc421 plugins/timestamp_format.c
--- a/plugins/timestamp_format.c	Fri Jan 27 23:58:35 2006 +0000
+++ b/plugins/timestamp_format.c	Sat Jan 28 00:26:18 2006 +0000
@@ -90,6 +90,10 @@
 				"/plugins/gtk/timestamp_format/force_24hr");
 	const char *dates = gaim_prefs_get_string(
 				"/plugins/gtk/timestamp_format/use_dates/conversation");
+
+	g_return_val_if_fail(conv != NULL, NULL);
+	g_return_val_if_fail(tm != NULL, NULL);
+
 	return timestamp_cb_common(conv, tm, force, dates);
 }
 
@@ -101,6 +105,9 @@
 	const char *dates = gaim_prefs_get_string(
 				"/plugins/gtk/timestamp_format/use_dates/log");
 
+	g_return_val_if_fail(log != NULL, NULL);
+	g_return_val_if_fail(tm != NULL, NULL);
+
 	if (log->type == GAIM_LOG_SYSTEM)
 	{
 		if (force)