From 9e84d7f44354eaeceae03df1933192b420f7c201 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 20 Jul 2015 12:55:39 +0200
Subject: Revert "changed checking for NULL a bit"
This reverts commit 48df7a0c71a2df4050abae40ec9ca2b35dee7988.
The commit causes a regression with timing xml background.
see https://github.com/mate-desktop/mate-control-center/issues/159
---
libmate-desktop/mate-bg.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
index 8666b73..b0c3c90 100644
--- a/libmate-desktop/mate-bg.c
+++ b/libmate-desktop/mate-bg.c
@@ -2857,15 +2857,10 @@ handle_text (GMarkupParseContext *context,
GError **err)
{
SlideShow *parser = user_data;
+ Slide *slide = parser->slides->tail? parser->slides->tail->data : NULL;
FileSize *fs;
gint i;
- g_return_if_fail (parser != NULL);
- g_return_if_fail (parser->slides != NULL);
- g_return_if_fail (parser->slides->tail != NULL);
-
- Slide *slide = parser->slides->tail->data;
-
if (stack_is (parser, "year", "starttime", "background", NULL)) {
parser->start_tm.tm_year = parse_int (text) - 1900;
}
--
cgit v1.2.1