summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2010-07-15 15:14:43 +0200
committerXavier Claessens <xclaesse@gmail.com>2010-07-15 15:14:43 +0200
commitbff3545d10ccbf9569ff1cd0018ba459b254b023 (patch)
tree392bf254b1d01c95a8fe8e99ca0ecc1b26d18f83
parent5d610845b5a8b7f5592380788aea76156d5f72ba (diff)
Rename telepathy-ssh to ssh-contact
-rw-r--r--.gitignore6
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am16
-rw-r--r--src/SSHContact.client (renamed from src/TelepathySSH.client)2
-rw-r--r--src/client.c4
-rw-r--r--src/common.h2
-rw-r--r--src/org.freedesktop.Telepathy.Client.SSHContact.service.in3
-rw-r--r--src/org.freedesktop.Telepathy.Client.TelepathySSH.service.in3
-rw-r--r--src/service.c2
9 files changed, 21 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 60ad3ab..b8cd153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,6 @@ ltmain.sh
missing
stamp-h1
-src/telepathy-ssh
-src/telepathy-sshd
-src/org.freedesktop.Telepathy.Client.TelepathySSH.service
+src/ssh-contact
+src/ssh-contact-service
+src/org.freedesktop.Telepathy.Client.SSHContact.service
diff --git a/configure.ac b/configure.ac
index e44c2e5..2a61f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(telepathy-ssh, 0.1)
+AC_INIT(ssh-contact, 0.1)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -11,7 +11,7 @@ AM_PROG_CC_STDC
AC_HEADER_STDC
AM_PROG_LIBTOOL
-PKG_CHECK_MODULES(TELEPATHY_SSH,
+PKG_CHECK_MODULES(SSH_CONTACT,
[
telepathy-glib >= 0.11.9
glib-2.0 >= 2.24
diff --git a/src/Makefile.am b/src/Makefile.am
index 7384075..c15ad31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,34 +2,34 @@ AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- $(TELEPATHY_SSH_CFLAGS)
+ $(SSH_CONTACT_CFLAGS)
AM_CFLAGS = -Wall -g -Werror
-LDADD = $(TELEPATHY_SSH_LIBS)
+LDADD = $(SSH_CONTACT_LIBS)
-bin_PROGRAMS = telepathy-ssh telepathy-sshd
+bin_PROGRAMS = ssh-contact ssh-contact-service
-telepathy_ssh_SOURCES = \
+ssh_contact_SOURCES = \
common.c common.h \
client.c
-telepathy_sshd_SOURCES = \
+ssh_contact_service_SOURCES = \
common.c common.h \
service.c
servicefiledir = $(datadir)/dbus-1/services
servicefile_in_files = \
- org.freedesktop.Telepathy.Client.TelepathySSH.service.in
+ org.freedesktop.Telepathy.Client.SSHContact.service.in
servicefile_DATA = $(servicefile_in_files:.service.in=.service)
-org.freedesktop.Telepathy.Client.TelepathySSH.service: org.freedesktop.Telepathy.Client.TelepathySSH.service.in
+org.freedesktop.Telepathy.Client.SSHContact.service: org.freedesktop.Telepathy.Client.SSHContact.service.in
$(AM_V_GEN)sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@
clientfiledir = $(datarootdir)/telepathy/clients
clientfile_DATA = \
- TelepathySSH.client
+ SSHContact.client
EXTRA_DIST = \
$(clientfile_DATA) \
diff --git a/src/TelepathySSH.client b/src/SSHContact.client
index 2721ac5..f26207c 100644
--- a/src/TelepathySSH.client
+++ b/src/SSHContact.client
@@ -4,6 +4,6 @@ Interfaces=org.freedesktop.Telepathy.Client.Handler
[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamTube
org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.Type.StreamTube.Service s=reverse-ssh
+org.freedesktop.Telepathy.Channel.Type.StreamTube.Service s=x-ssh-contact
org.freedesktop.Telepathy.Channel.Requested b=false
diff --git a/src/client.c b/src/client.c
index b41d6fb..9bc4394 100644
--- a/src/client.c
+++ b/src/client.c
@@ -742,7 +742,7 @@ main (gint argc, gchar *argv[])
g_type_init ();
- optcontext = g_option_context_new ("- Telepaty-ssh");
+ optcontext = g_option_context_new ("- ssh-contact");
g_option_context_add_main_entries (optcontext, options, NULL);
if (!g_option_context_parse (optcontext, &argc, &argv, &error))
{
@@ -759,7 +759,7 @@ main (gint argc, gchar *argv[])
if (dbus == NULL)
goto OUT;
- data.client = tp_simple_handler_new (dbus, FALSE, FALSE, "TelepathySSHClient",
+ data.client = tp_simple_handler_new (dbus, FALSE, FALSE, "SSHContactClient",
TRUE, got_channel_cb, NULL, NULL);
tp_base_client_take_handler_filter (data.client, tp_asv_new (
diff --git a/src/common.h b/src/common.h
index 716001e..643ebf1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -23,7 +23,7 @@
#include <gio/gio.h>
-#define TUBE_SERVICE "reverse-ssh"
+#define TUBE_SERVICE "x-ssh-contact"
G_BEGIN_DECLS
diff --git a/src/org.freedesktop.Telepathy.Client.SSHContact.service.in b/src/org.freedesktop.Telepathy.Client.SSHContact.service.in
new file mode 100644
index 0000000..6b8bd31
--- /dev/null
+++ b/src/org.freedesktop.Telepathy.Client.SSHContact.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.SSHContact
+Exec=@bindir@/ssh-contact-service
diff --git a/src/org.freedesktop.Telepathy.Client.TelepathySSH.service.in b/src/org.freedesktop.Telepathy.Client.TelepathySSH.service.in
deleted file mode 100644
index 535ada4..0000000
--- a/src/org.freedesktop.Telepathy.Client.TelepathySSH.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.TelepathySSH
-Exec=@bindir@/telepathy-sshd
diff --git a/src/service.c b/src/service.c
index a17102d..2230e27 100644
--- a/src/service.c
+++ b/src/service.c
@@ -165,7 +165,7 @@ main (gint argc, gchar *argv[])
if (dbus == NULL)
goto OUT;
- client = tp_simple_handler_new (dbus, FALSE, FALSE, "TelepathySSH",
+ client = tp_simple_handler_new (dbus, FALSE, FALSE, "SSHContact",
FALSE, got_channel_cb, NULL, NULL);
tp_base_client_take_handler_filter (client, tp_asv_new (