summaryrefslogtreecommitdiff
path: root/bus
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-03-07 14:51:46 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-03-07 14:51:46 +0000
commit3013fafae5a6e731ca16b23ea32e96358a8c75f9 (patch)
treeee6cc1c7057f755e3ba6a96cd3b00918d933b0d7 /bus
parent07d2ca2b52570db6591b61b5ca24913d8f936e55 (diff)
parent2e408182809f58ac03b66989ee0b9d5bbe931edf (diff)
Merge branch 'dbus-1.4'
Diffstat (limited to 'bus')
-rw-r--r--bus/config-parser-common.c4
-rw-r--r--bus/config-parser-common.h3
-rw-r--r--bus/config-parser-trivial.c4
-rw-r--r--bus/config-parser.c8
4 files changed, 10 insertions, 9 deletions
diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c
index f8d75be7..c522ff49 100644
--- a/bus/config-parser-common.c
+++ b/bus/config-parser-common.c
@@ -49,7 +49,7 @@ bus_config_parser_element_name_to_type (const char *name)
}
else if (strcmp (name, "type") == 0)
{
- return ELEMENT_TYPE;
+ return ELEMENT_CONFIGTYPE;
}
else if (strcmp (name, "fork") == 0)
{
@@ -169,7 +169,7 @@ bus_config_parser_element_type_to_name (ElementType type)
return "servicehelper";
case ELEMENT_INCLUDEDIR:
return "includedir";
- case ELEMENT_TYPE:
+ case ELEMENT_CONFIGTYPE:
return "type";
case ELEMENT_SELINUX:
return "selinux";
diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h
index da745606..186bf4cf 100644
--- a/bus/config-parser-common.h
+++ b/bus/config-parser-common.h
@@ -41,7 +41,8 @@ typedef enum
ELEMENT_SERVICEDIR,
ELEMENT_SERVICEHELPER,
ELEMENT_INCLUDEDIR,
- ELEMENT_TYPE,
+ /* this is really <type>, but winioctl.h defines ELEMENT_TYPE */
+ ELEMENT_CONFIGTYPE,
ELEMENT_SELINUX,
ELEMENT_ASSOCIATE,
ELEMENT_STANDARD_SESSION_SERVICEDIRS,
diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
index 59ec2ba2..f37b4fb4 100644
--- a/bus/config-parser-trivial.c
+++ b/bus/config-parser-trivial.c
@@ -164,7 +164,7 @@ bus_config_parser_start_element (BusConfigParser *parser,
{
case ELEMENT_SERVICEHELPER:
case ELEMENT_USER:
- case ELEMENT_TYPE:
+ case ELEMENT_CONFIGTYPE:
/* content about to be handled */
break;
@@ -277,7 +277,7 @@ bus_config_parser_content (BusConfigParser *parser,
}
break;
- case ELEMENT_TYPE:
+ case ELEMENT_CONFIGTYPE:
{
if (!_dbus_string_copy (&content_sane, 0, &parser->bus_type, 0))
{
diff --git a/bus/config-parser.c b/bus/config-parser.c
index 9808d732..2543162f 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -690,12 +690,12 @@ start_busconfig_child (BusConfigParser *parser,
return TRUE;
}
- else if (element_type == ELEMENT_TYPE)
+ else if (element_type == ELEMENT_CONFIGTYPE)
{
if (!check_no_attributes (parser, "type", attribute_names, attribute_values, error))
return FALSE;
- if (push_element (parser, ELEMENT_TYPE) == NULL)
+ if (push_element (parser, ELEMENT_CONFIGTYPE) == NULL)
{
BUS_SET_OOM (error);
return FALSE;
@@ -2002,7 +2002,7 @@ bus_config_parser_end_element (BusConfigParser *parser,
case ELEMENT_INCLUDE:
case ELEMENT_USER:
- case ELEMENT_TYPE:
+ case ELEMENT_CONFIGTYPE:
case ELEMENT_LISTEN:
case ELEMENT_PIDFILE:
case ELEMENT_AUTH:
@@ -2472,7 +2472,7 @@ bus_config_parser_content (BusConfigParser *parser,
}
break;
- case ELEMENT_TYPE:
+ case ELEMENT_CONFIGTYPE:
{
char *s;