summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2021-11-18 13:08:14 +0100
committerAndras Timar <andras.timar@collabora.com>2021-11-18 14:14:11 +0100
commitf07ff8c7e0754babe9819163fb0edeacac326caf (patch)
tree2e24c52eb95edf971399e33580d26b691528b211 /gtk
parentNotebookbarBuilder.js: Set role of Menubar. (diff)
downloadonline-f07ff8c7e0754babe9819163fb0edeacac326caf.tar.gz
online-f07ff8c7e0754babe9819163fb0edeacac326caf.zip
rename: remaining lool->cool changes
Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: Ib7d4e804bebe52dead8d53b0e0bbaed0f08bf3d0
Diffstat (limited to 'gtk')
-rw-r--r--gtk/Makefile.am6
-rw-r--r--gtk/gtk.hpp2
-rw-r--r--gtk/mobile.cpp28
3 files changed, 18 insertions, 18 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c0bbcbb3b4..df7a59360e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -6,8 +6,8 @@ warning_flags = -Wall -Werror -Wno-parentheses -Wno-sign-compare -Wno-unused-var
define_flags = -DMOBILEAPP=1
AM_CPPFLAGS = -pthread \
- -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' \
- -DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' \
+ -DCOOLWSD_DATADIR='"@COOLWSD_DATADIR@"' \
+ -DCOOLWSD_CONFIGDIR='"@COOLWSD_CONFIGDIR@"' \
-DTOPSRCDIR='"'$(realpath ${top_srcdir})'"' \
-DGTKAPP \
${define_flags} \
@@ -38,7 +38,7 @@ net_sources = ../net/FakeSocket.cpp \
wsd_sources = ../wsd/ClientSession.cpp \
../wsd/DocumentBroker.cpp \
- ../wsd/LOOLWSD.cpp \
+ ../wsd/COOLWSD.cpp \
../wsd/RequestDetails.cpp \
../wsd/Storage.cpp \
../wsd/TileCache.cpp
diff --git a/gtk/gtk.hpp b/gtk/gtk.hpp
index 52c4b12549..1875115aa1 100644
--- a/gtk/gtk.hpp
+++ b/gtk/gtk.hpp
@@ -5,6 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-extern int loolwsd_server_socket_fd;
+extern int coolwsd_server_socket_fd;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/gtk/mobile.cpp b/gtk/mobile.cpp
index 2802fa9d87..538bd5b731 100644
--- a/gtk/mobile.cpp
+++ b/gtk/mobile.cpp
@@ -21,16 +21,16 @@
#include "FakeSocket.hpp"
#include "Log.hpp"
-#include "LOOLWSD.hpp"
+#include "COOLWSD.hpp"
#include "Protocol.hpp"
#include "Util.hpp"
const int SHOW_JS_MAXLEN = 70;
-int loolwsd_server_socket_fd = -1;
+int coolwsd_server_socket_fd = -1;
static std::string fileURL;
-static LOOLWSD *loolwsd = nullptr;
+static COOLWSD *coolwsd = nullptr;
static int fakeClientFd;
static int closeNotificationPipeForForwardingThread[2];
static WebKitWebView *webView;
@@ -44,7 +44,7 @@ static void send2JS_ready_callback(GObject *source_object,
static void send2JS(const std::vector<char>& buffer)
{
- LOG_TRC_NOFILE("Send to JS: " << LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
+ LOG_TRC_NOFILE("Send to JS: " << COOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
std::string js;
@@ -145,7 +145,7 @@ static void handle_message(const char * type, WebKitJavascriptResult *js_result)
g_free(string_value);
}
-static void handle_lool_message(WebKitUserContentManager *manager,
+static void handle_cool_message(WebKitUserContentManager *manager,
WebKitJavascriptResult *js_result,
gpointer user_data)
{
@@ -159,10 +159,10 @@ static void handle_lool_message(WebKitUserContentManager *manager,
{
// Now we know that the JS has started completely
- // Contact the permanently (during app lifetime) listening LOOLWSD server
+ // Contact the permanently (during app lifetime) listening COOLWSD server
// "public" socket
- assert(loolwsd_server_socket_fd != -1);
- int rc = fakeSocketConnect(fakeClientFd, loolwsd_server_socket_fd);
+ assert(coolwsd_server_socket_fd != -1);
+ int rc = fakeSocketConnect(fakeClientFd, coolwsd_server_socket_fd);
assert(rc != -1);
// Create a socket pair to notify the below thread when the document has been closed
@@ -288,17 +288,17 @@ int main(int argc, char* argv[])
std::thread([]
{
- assert(loolwsd == nullptr);
+ assert(coolwsd == nullptr);
char *argv[2];
argv[0] = strdup("mobile");
argv[1] = nullptr;
Util::setThreadName("app");
while (true)
{
- loolwsd = new LOOLWSD();
- loolwsd->run(1, argv);
- delete loolwsd;
- LOG_TRC("One run of LOOLWSD completed");
+ coolwsd = new COOLWSD();
+ coolwsd->run(1, argv);
+ delete coolwsd;
+ LOG_TRC("One run of COOLWSD completed");
}
}).detach();
@@ -313,7 +313,7 @@ int main(int argc, char* argv[])
WebKitUserContentManager *userContentManager = WEBKIT_USER_CONTENT_MANAGER(webkit_user_content_manager_new());
g_signal_connect(userContentManager, "script-message-received::debug", G_CALLBACK(handle_debug_message), nullptr);
- g_signal_connect(userContentManager, "script-message-received::cool", G_CALLBACK(handle_lool_message), nullptr);
+ g_signal_connect(userContentManager, "script-message-received::cool", G_CALLBACK(handle_cool_message), nullptr);
g_signal_connect(userContentManager, "script-message-received::error", G_CALLBACK(handle_error_message), nullptr);
webkit_user_content_manager_register_script_message_handler(userContentManager, "debug");