r3666 - trunk/src/target/OM-2007.2/daemons/neod/src
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Mon Dec 17 19:46:27 CET 2007
Author: mickey
Date: 2007-12-17 19:46:27 +0100 (Mon, 17 Dec 2007)
New Revision: 3666
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
neod: check for NULL as result of XGetWindowProperty -- closes #1096
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-12-17 17:52:55 UTC (rev 3665)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/Makefile.am 2007-12-17 18:46:27 UTC (rev 3666)
@@ -4,7 +4,7 @@
-DNEOD_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DDATADIR=\""$(datadir)"\" -D_GNU_SOURCE
-AM_CFLAGS = -Wall -pedantic -std=c99 @NEOD_CFLAGS@
+AM_CFLAGS = -Wall -g3 -pedantic -std=c99 @NEOD_CFLAGS@
bin_PROGRAMS = neod
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-12-17 17:52:55 UTC (rev 3665)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2007-12-17 18:46:27 UTC (rev 3666)
@@ -1,6 +1,7 @@
/*
+ * neod - buttonactions.c
+ *
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
* Copyright (C) 2007 OpenMoko, Inc.
*
* This program is free software; you can redistribute it and/or modify
@@ -223,6 +224,9 @@
XA_ATOM, &actual_type, &actual_format, &nitems, &bytesafter,
(unsigned char **) &window_type);
+ if ( !window_type )
+ return FALSE;
+
if (strcmp(XGetAtomName(display, *window_type), "_NET_WM_WINDOW_TYPE_DESKTOP") == 0)
return TRUE;
More information about the commitlog
mailing list