use dbus_gproxy_new_for_service_owner so that we can receive the
signal.
+2004-04-15 John (J5) Palmieri <johnp@redhat.com>
+
+ * dbus/dbus-internals.c, dbus/dbus-message-builder.c,
+ dbus/dbus-message.c, dbus/dbus-protocol.h
+ (DBUS_HEADER_FIELD_SERVICE): renamed DBUS_HEADER_FIELD_DESTINATION
+
+ * dbus/dbus-internals.c, dbus/dbus-message-builder.c,
+ dbus/dbus-message.c, dbus/dbus-protocol.h
+ (DBUS_HEADER_FIELD_SENDER_SERVICE): renamed DBUS_HEADER_FIELD_SENDER
+
+ * dbus/dbus-internals.c (_dbus_header_field_to_string):
+ DBUS_HEADER_FIELD_DESTINATION resolves to "destination"
+ DBUS_HEADER_FIELD_SENDER resolves to "sender"
+
+ * doc/dbus-specification.xml (Header Fields Table):
+ s/SERVICE/DESTINATION
+ s/SENDER_SERVICE/SENDER
+
+
2004-04-14 Olivier Andrieu <oliv__a@users.sourceforge.net>
* test/glib/test-dbus-glib.c (timed_exit): fail the test after
return "error-name";
case DBUS_HEADER_FIELD_REPLY_SERIAL:
return "reply-serial";
- case DBUS_HEADER_FIELD_SERVICE:
- return "service";
- case DBUS_HEADER_FIELD_SENDER_SERVICE:
- return "sender-service";
+ case DBUS_HEADER_FIELD_DESTINATION:
+ return "destination";
+ case DBUS_HEADER_FIELD_SENDER:
+ return "sender";
default:
return "unknown";
}
field = DBUS_HEADER_FIELD_ERROR_NAME;
else if (_dbus_string_starts_with_c_str (&line, "REPLY_SERIAL"))
field = DBUS_HEADER_FIELD_REPLY_SERIAL;
- else if (_dbus_string_starts_with_c_str (&line, "SERVICE"))
- field = DBUS_HEADER_FIELD_SERVICE;
- else if (_dbus_string_starts_with_c_str (&line, "SENDER_SERVICE"))
- field = DBUS_HEADER_FIELD_SENDER_SERVICE;
+ else if (_dbus_string_starts_with_c_str (&line, "DESTINATION"))
+ field = DBUS_HEADER_FIELD_DESTINATION;
+ else if (_dbus_string_starts_with_c_str (&line, "SENDER"))
+ field = DBUS_HEADER_FIELD_SENDER;
else if (_dbus_string_starts_with_c_str (&line, "UNKNOWN"))
field = 22; /* random unknown header field */
else
if (service != NULL)
{
if (!append_string_field (message,
- DBUS_HEADER_FIELD_SERVICE,
+ DBUS_HEADER_FIELD_DESTINATION,
DBUS_TYPE_STRING,
service))
return FALSE;
_dbus_return_val_if_fail (method_call != NULL, NULL);
sender = get_string_field (method_call,
- DBUS_HEADER_FIELD_SENDER_SERVICE,
+ DBUS_HEADER_FIELD_SENDER,
NULL);
/* sender is allowed to be null here in peer-to-peer case */
_dbus_return_val_if_fail (error_name != NULL, NULL);
sender = get_string_field (reply_to,
- DBUS_HEADER_FIELD_SENDER_SERVICE,
+ DBUS_HEADER_FIELD_SENDER,
NULL);
/* sender may be NULL for non-message-bus case or
_dbus_return_val_if_fail (!message->locked, FALSE);
return set_string_field (message,
- DBUS_HEADER_FIELD_SERVICE,
+ DBUS_HEADER_FIELD_DESTINATION,
DBUS_TYPE_STRING,
destination);
}
_dbus_return_val_if_fail (message != NULL, NULL);
return get_string_field (message,
- DBUS_HEADER_FIELD_SERVICE,
+ DBUS_HEADER_FIELD_DESTINATION,
NULL);
}
_dbus_return_val_if_fail (!message->locked, FALSE);
return set_string_field (message,
- DBUS_HEADER_FIELD_SENDER_SERVICE,
+ DBUS_HEADER_FIELD_SENDER,
DBUS_TYPE_STRING,
sender);
}
_dbus_return_val_if_fail (message != NULL, NULL);
return get_string_field (message,
- DBUS_HEADER_FIELD_SENDER_SERVICE,
+ DBUS_HEADER_FIELD_SENDER,
NULL);
}
switch (field)
{
- case DBUS_HEADER_FIELD_SERVICE:
+ case DBUS_HEADER_FIELD_DESTINATION:
if (!decode_string_field (data, field, &fields[field],
&field_data, pos, type))
return FALSE;
}
break;
- case DBUS_HEADER_FIELD_SENDER_SERVICE:
+ case DBUS_HEADER_FIELD_SENDER:
if (!decode_string_field (data, field, &fields[field],
&field_data, pos, type))
return FALSE;
#define DBUS_HEADER_FIELD_MEMBER 3
#define DBUS_HEADER_FIELD_ERROR_NAME 4
#define DBUS_HEADER_FIELD_REPLY_SERIAL 5
-#define DBUS_HEADER_FIELD_SERVICE 6
-#define DBUS_HEADER_FIELD_SENDER_SERVICE 7
+#define DBUS_HEADER_FIELD_DESTINATION 6
+#define DBUS_HEADER_FIELD_SENDER 7
-#define DBUS_HEADER_FIELD_LAST DBUS_HEADER_FIELD_SENDER_SERVICE
+#define DBUS_HEADER_FIELD_LAST DBUS_HEADER_FIELD_SENDER
/* Services */
#define DBUS_SERVICE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus"
base64, then we can dump the base64 implementation and
save some bloat.
- - rename HEADER_FIELD_SERVICE -> HEADER_FIELD_DESTINATION
- and HEADER_FIELD_SENDER_SERVICE -> HEADER_FIELD_SENDER
- for both dbus-protocol.h and in the spec
-
- Better error checking for bogus configuration files. Currently if a
configuration file tries to include itself the bus crashes on start. We
should probably have a check against this.
see <xref linkend="message-protocol-header-encoding"/>.)</entry>
</row>
<row>
- <entry>SERVICE</entry>
+ <entry>DESTINATION</entry>
<entry>6</entry>
<entry>STRING</entry>
<entry>The name of the service this message should be routed to.
<xref linkend="message-bus"/>.</entry>
</row>
<row>
- <entry>SENDER_SERVICE</entry>
+ <entry>SENDER</entry>
<entry>7</entry>
<entry>STRING</entry>
<entry>Sender service. The name of the base service that sent