From fac1d6839f95ee90b3b2ba9b56c2be3b9ceaef82 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 5 Nov 2013 15:23:14 +0000 Subject: [PATCH 1/2] Fix some leftover references to mc-wait-for-name --- server/im.telepathy1.MissionControl6.service.in | 2 +- util/wait-for-name.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/im.telepathy1.MissionControl6.service.in b/server/im.telepathy1.MissionControl6.service.in index 61acc25..732c5e2 100644 --- a/server/im.telepathy1.MissionControl6.service.in +++ b/server/im.telepathy1.MissionControl6.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=im.telepathy1.MissionControl6 -Exec=@bindir@/mc-wait-for-name --activate im.telepathy1.AccountManager im.telepathy1.MissionControl6 +Exec=@bindir@/mc6-wait-for-name --activate im.telepathy1.AccountManager im.telepathy1.MissionControl6 diff --git a/util/wait-for-name.c b/util/wait-for-name.c index f9abaa2..bce176a 100644 --- a/util/wait-for-name.c +++ b/util/wait-for-name.c @@ -8,7 +8,7 @@ * * [D-BUS Service] * Name=....Client.Something - * Exec=/usr/lib/telepathy/mc-wait-for-name ....Client.Something + * Exec=/usr/lib/telepathy/mc6-wait-for-name ....Client.Something * * Alternatively, it can be used to activate something via an alternative * name, e.g. in @@ -16,7 +16,7 @@ * * [D-BUS Service] * Name=....AccountManager - * Exec=/usr/lib/telepathy/mc-wait-for-name --activate ....MissionControl6 ....AccountManager + * Exec=/usr/lib/telepathy/mc6-wait-for-name --activate ....MissionControl6 ....AccountManager * * Copyright (C) 2009 Nokia Corporation * Copyright (C) 2009, 2012 Collabora Ltd. @@ -148,7 +148,7 @@ main (int argc, GError *error = NULL; GOptionContext *context; - g_set_prgname ("mc-wait-for-name"); + g_set_prgname ("mc6-wait-for-name"); context = g_option_context_new ("- wait for a bus name"); g_option_context_add_main_entries (context, entries, NULL); @@ -172,7 +172,7 @@ main (int argc, !tp_dbus_check_valid_bus_name (argv[1], TP_DBUS_NAME_TYPE_WELL_KNOWN, NULL)) { - g_message ("Usage: mc-wait-for-name [OPTIONS] com.example.SomeBusName"); + g_message ("Usage: mc6-wait-for-name [OPTIONS] com.example.SomeBusName"); return EX_USAGE; } -- 1.8.4.2