From 8e1c4c95e37a1be92452b9fdbca4929ea37cc068 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 4 Nov 2024 11:09:53 -0500
Subject: [PATCH] bin: update date, rename to Jami Core
Change-Id: I71bf279701b90fed0ac36b18b05d7a482a0f04eb
---
bin/dbus/main.cpp | 30 +++++++++++-------------------
bin/osxmain.cpp | 27 +++++++++++----------------
bin/winmain.cpp | 26 +++++++++++---------------
3 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
index f6e99d11c0..5c5d1efd80 100644
--- a/bin/dbus/main.cpp
+++ b/bin/dbus/main.cpp
@@ -1,27 +1,19 @@
/*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc.
*
- * Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- * Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- * Author: Vladimir Stoiakin <vstoiakin@lavabit.com>
- *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -49,14 +41,14 @@
bool persistent = false;
std::unique_ptr<sdbus::IConnection> connection;
-static int ringFlags = 0;
+static int initFlags = 0;
static void
print_title()
{
std::cout
- << "Jami Daemon " << libjami::version()
- << ", by Savoir-faire Linux Inc. 2004-2023" << std::endl
+ << "Jami Core " << libjami::version()
+ << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl
@@ -149,13 +141,13 @@ parse_args(int argc, char *argv[])
}
if (consoleFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
+ initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_DEBUG;
+ initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer)
- ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
+ initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false;
}
@@ -182,7 +174,7 @@ main(int argc, char *argv [])
if (parse_args(argc, argv))
return 0;
- if (!libjami::init(static_cast<libjami::InitFlag>(ringFlags))) {
+ if (!libjami::init(static_cast<libjami::InitFlag>(initFlags))) {
std::cerr << "libjami::init() failed" << std::endl;
return 1;
}
diff --git a/bin/osxmain.cpp b/bin/osxmain.cpp
index 772245de47..8945b1c4f8 100644
--- a/bin/osxmain.cpp
+++ b/bin/osxmain.cpp
@@ -1,23 +1,18 @@
/*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc.
*
- * Author: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <iostream>
#include <thread>
@@ -37,14 +32,14 @@
#endif
#include "fileutils.h"
-static int ringFlags = 0;
+static int initFlags = 0;
static void
print_title()
{
std::cout
- << "Jami Daemon " << libjami::version()
- << ", by Savoir-faire Linux Inc. 2004-2023" << std::endl
+ << "Jami Core " << libjami::version()
+ << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl
@@ -137,13 +132,13 @@ parse_args(int argc, char *argv[], bool& persistent)
}
if (consoleFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
+ initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_DEBUG;
+ initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer)
- ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
+ initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false;
}
@@ -153,7 +148,7 @@ osxTests()
{
using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>;
- libjami::init(static_cast<libjami::InitFlag>(ringFlags));
+ libjami::init(static_cast<libjami::InitFlag>(initFlags));
registerSignalHandlers(std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>>());
diff --git a/bin/winmain.cpp b/bin/winmain.cpp
index 106cc9afdd..6c761cb621 100644
--- a/bin/winmain.cpp
+++ b/bin/winmain.cpp
@@ -1,23 +1,19 @@
/*
* Copyright (C) 2004-2024 Savoir-faire Linux Inc.
*
- * Author: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-
#include <iostream>
#include <thread>
#include <cstring>
@@ -40,15 +36,15 @@
using namespace std::placeholders;
bool isActive = false;
-static int ringFlags = 0;
+static int initFlags = 0;
bool loop = true;
static void
print_title()
{
std::cout
- << "Jami Daemon " << libjami::version()
- << ", by Savoir-faire Linux Inc. 2004-2023" << std::endl
+ << "Jami Core " << libjami::version()
+ << ", by Savoir-faire Linux Inc. Copyright (C) 2004-2024" << std::endl
<< "https://jami.net/" << std::endl
#ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl
@@ -141,13 +137,13 @@ parse_args(int argc, char *argv[], bool& persistent)
}
if (consoleFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
+ initFlags |= libjami::LIBJAMI_FLAG_CONSOLE_LOG;
if (debugFlag)
- ringFlags |= libjami::LIBJAMI_FLAG_DEBUG;
+ initFlags |= libjami::LIBJAMI_FLAG_DEBUG;
if (autoAnswer)
- ringFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
+ initFlags |= libjami::LIBJAMI_FLAG_AUTOANSWER;
return false;
}
@@ -170,7 +166,7 @@ run()
{
using SharedCallback = std::shared_ptr<libjami::CallbackWrapperBase>;
- libjami::init(static_cast<libjami::InitFlag>(ringFlags));
+ libjami::init(static_cast<libjami::InitFlag>(initFlags));
std::map<std::string, SharedCallback> callHandlers;
callHandlers.insert(libjami::exportable_callback<libjami::CallSignal::IncomingCall>
--
GitLab