diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/config/dbus.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/config/dbus.c')
| -rw-r--r-- | xorg-server/config/dbus.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xorg-server/config/dbus.c b/xorg-server/config/dbus.c index d6316623b..5d11feaa1 100644 --- a/xorg-server/config/dbus.c +++ b/xorg-server/config/dbus.c @@ -27,7 +27,6 @@ #include <dix-config.h>
#endif
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <string.h>
@@ -184,10 +183,8 @@ unwind: while (options) {
tmpo = options;
options = options->next;
- if (tmpo->key)
- free(tmpo->key);
- if (tmpo->value)
- free(tmpo->value);
+ free(tmpo->key);
+ free(tmpo->value);
free(tmpo);
}
|