summaryrefslogtreecommitdiff
path: root/libmate-desktop
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-07-20 12:55:39 +0200
committerraveit65 <[email protected]>2015-07-20 12:55:39 +0200
commit9e84d7f44354eaeceae03df1933192b420f7c201 (patch)
treeaebbe0fe031b19d2567a5ba50d531df5034a4089 /libmate-desktop
parentdfdbc7f209053c29e467c23c45cee22dffa9011f (diff)
downloadmate-desktop-9e84d7f44354eaeceae03df1933192b420f7c201.tar.bz2
mate-desktop-9e84d7f44354eaeceae03df1933192b420f7c201.tar.xz
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
Diffstat (limited to 'libmate-desktop')
-rw-r--r--libmate-desktop/mate-bg.c7
1 files changed, 1 insertions, 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;
}