[Libreoffice-commits] .: Branch 'feature/tubes' - tubes/inc tubes/source

[Will Thompson]

 tubes/inc/tubes/constants.h   |   52 ++++++++++++++++++++++++++++++++++++++++++
 tubes/source/contact-list.cxx |   12 ---------
 2 files changed, 53 insertions(+), 11 deletions(-)

New commits:
commit 042c53a42cc0a94288370392b5697c5bb9abfb09
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Wed Mar 21 12:15:35 2012 +0000

    Move tube service name definition to a header.

diff --git a/tubes/inc/tubes/constants.h b/tubes/inc/tubes/constants.h
new file mode 100644
index 0000000..6087115
--- /dev/null
+++ b/tubes/inc/tubes/constants.h
@@ -0,0 +1,52 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_TUBES_CONSTANTS_H
+#define INCLUDED_TUBES_CONSTANTS_H
+
+/* DBusTube.ServiceName.
+ *
+ * FIXME: Should be something like
+ *
+ *   org.libreoffice.calc
+ *   org.libreoffice.writer
+ *
+ * etc. This does not need to include the org.freedesktop.Telepathy.Client
+ * stuff.
+ */
+#define LIBO_DTUBE_SERVICE \
+    TP_CLIENT_BUS_NAME_BASE "LibreOfficeTeleTest"
+
+/* Client name suffix, for passing as 'name' to
+ * tp_simple_handler_new_with_am(). */
+#define LIBO_CLIENT_SUFFIX \
+    "LibreOffice"
+
+#endif // INCLUDED_TUBES_CONSTANTS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tubes/source/contact-list.cxx b/tubes/source/contact-list.cxx
index 7f707af..c342115 100644
--- a/tubes/source/contact-list.cxx
+++ b/tubes/source/contact-list.cxx
@@ -30,6 +30,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
+#include <tubes/constants.h>
 #include <tubes/contact-list.hxx>
 
 ContactList::ContactList()
@@ -66,17 +67,6 @@ ContactList::~ContactList()
     mpAccountManager = NULL;
 }
 
-/* FIXME: Should be something like
- *
- *   org.libreoffice.calc
- *   org.libreoffice.writer
- *
- * etc. This does not need to include the org.freedesktop.Telepathy.Client
- * stuff.
- */
-#define LIBO_DTUBE_SERVICE \
-    TP_CLIENT_BUS_NAME_BASE "LibreOfficeTeleTest"
-
 static gboolean
 contact_supports_libo_dtube (TpContact *contact)
 {