Merge branch 'dbus-1.2'

Conflicts:
	bus/bus.c
	bus/config-parser-common.c
	bus/config-parser-common.h
	bus/config-parser.c
	bus/connection.c
	bus/dbus-daemon.1.in
	dbus/dbus-marshal-validate-util.c
	dbus/dbus-marshal-validate.c
	dbus/dbus-sysdeps-util-unix.c
	test/name-test/tmp-session-like-system.conf

1 files changed, 6 insertions, 6 deletions

diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c
index 4965c192..5cdbba26 100644
--- a/bus/config-parser-common.c
+++ b/bus/config-parser-common.c
@@ -114,14 +114,14 @@ bus_config_parser_element_name_to_type (const char *name)
     {
       return ELEMENT_ASSOCIATE;
     }
-  else if (strcmp (name, "keep_umask") == 0)
-    {
-      return ELEMENT_KEEP_UMASK;
-    }
   else if (strcmp (name, "syslog") == 0)
     {
       return ELEMENT_SYSLOG;
     }
+  else if (strcmp (name, "keep_umask") == 0)
+    {
+      return ELEMENT_KEEP_UMASK;
+    }
   else if (strcmp (name, "allow_anonymous") == 0)
     {
       return ELEMENT_ALLOW_ANONYMOUS;
@@ -174,10 +174,10 @@ bus_config_parser_element_type_to_name (ElementType type)
       return "selinux";
     case ELEMENT_ASSOCIATE:
       return "associate";
-    case ELEMENT_KEEP_UMASK:
-      return "keep_umask";
     case ELEMENT_SYSLOG:
       return "syslog";
+    case ELEMENT_KEEP_UMASK:
+      return "keep_umask";
     case ELEMENT_ALLOW_ANONYMOUS:
       return "allow_anonymous";
     }