Mercurial > pidgin.yaz
changeset 13054:fd57413bc421
[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>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 28 Jan 2006 00:26:18 +0000 |
| parents | d50c330e8089 |
| children | 48a72998676c |
| files | plugins/timestamp_format.c |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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)