[telepathy-mission-control/master] McdDispatchOperation: fix confusing variable name
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed May 20 02:30:45 PDT 2009
The argument to HandleWith is a bus name, not an object path, so call it
handler_name rather than handler_path.
---
src/mcd-dispatch-operation.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 3864ddd..7e74de0 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -231,13 +231,13 @@ mcd_dispatch_operation_finish (McdDispatchOperation *operation)
static void
dispatch_operation_handle_with (McSvcChannelDispatchOperation *self,
- const gchar *handler_path,
+ const gchar *handler_name,
DBusGMethodInvocation *context)
{
GError *error = NULL;
mcd_dispatch_operation_handle_with (MCD_DISPATCH_OPERATION (self),
- handler_path, &error);
+ handler_name, &error);
if (error)
{
dbus_g_method_return_error (context, error);
@@ -617,7 +617,7 @@ mcd_dispatch_operation_get_handler (McdDispatchOperation *operation)
void
mcd_dispatch_operation_handle_with (McdDispatchOperation *operation,
- const gchar *handler_path,
+ const gchar *handler_name,
GError **error)
{
McdDispatchOperationPrivate *priv;
@@ -635,18 +635,18 @@ mcd_dispatch_operation_handle_with (McdDispatchOperation *operation,
return;
}
- if (handler_path != NULL && handler_path[0] != '\0')
+ if (handler_name != NULL && handler_name[0] != '\0')
{
- if (!g_str_has_prefix (handler_path, MCD_CLIENT_BASE_NAME) ||
- !tp_dbus_check_valid_bus_name (handler_path,
+ if (!g_str_has_prefix (handler_name, MCD_CLIENT_BASE_NAME) ||
+ !tp_dbus_check_valid_bus_name (handler_name,
TP_DBUS_NAME_TYPE_WELL_KNOWN, NULL))
{
- DEBUG ("InvalidArgument: handler name %s is bad", handler_path);
+ DEBUG ("InvalidArgument: handler name %s is bad", handler_name);
g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
"Invalid handler name");
return;
}
- priv->handler = g_strdup (handler_path + MCD_CLIENT_BASE_NAME_LEN);
+ priv->handler = g_strdup (handler_name + MCD_CLIENT_BASE_NAME_LEN);
}
mcd_dispatch_operation_finish (operation);
--
1.5.6.5
More information about the telepathy-commits
mailing list