Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Install service files for handling SASL auth channels
  • Loading branch information
John Brooks committed Dec 4, 2012
1 parent 74a144f commit 0257fbe
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 1 deletion.
13 changes: 13 additions & 0 deletions SaslSignonAuth.client
@@ -0,0 +1,13 @@
[org.freedesktop.Telepathy.Client]
Interfaces=org.freedesktop.Telepathy.Client.Handler;org.freedesktop.Telepathy.Client.Observer

[org.freedesktop.Telepathy.Client.Observer]
DelayApprovers=true

[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.AuthenticationMethod s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication

[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.ServerAuthentication
org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.AuthenticationMethod s=org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication
4 changes: 3 additions & 1 deletion empathy-auth-factory.c
Expand Up @@ -648,13 +648,15 @@ empathy_auth_factory_constructed (GObject *obj)
tp_base_client_set_handler_bypass_approval (client, FALSE);

/* Handle ServerTLSConnection and ServerAuthentication channels */
#if 0
tp_base_client_take_handler_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
/* AuthenticationMethod */
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_NONE, NULL));
#endif

tp_base_client_take_handler_filter (client, tp_asv_new (
/* ChannelType */
Expand Down Expand Up @@ -757,7 +759,7 @@ empathy_auth_factory_new (TpSimpleClientFactory *factory)
{
return g_object_new (EMPATHY_TYPE_AUTH_FACTORY,
"factory", factory,
"name", "Empathy.Auth",
"name", "SaslSignonAuth",
NULL);
}

Expand Down
3 changes: 3 additions & 0 deletions org.freedesktop.Telepathy.Client.SaslSignonAuth.service
@@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Client.SaslSignonAuth
Exec=/usr/libexec/telepathy-sasl-client
Binary file removed telepathy-sasl-client
Binary file not shown.
10 changes: 10 additions & 0 deletions telepathy-sasl-client.pro
Expand Up @@ -11,3 +11,13 @@ SOURCES += empathy-auth-client.c \
empathy-uoa-utils.c \
empathy-sasl-mechanisms.c

target.path = /usr/libexec/

service.files = org.freedesktop.Telepathy.Client.SaslSignonAuth.service
service.path = /usr/share/dbus-1/services/

client.files = SaslSignonAuth.client
client.path = /usr/share/telepathy/clients/

INSTALLS += target service client

0 comments on commit 0257fbe

Please sign in to comment.