[Libreoffice-commits] online.git: gtk/mobile.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 26 07:51:50 UTC 2018
gtk/mobile.cpp | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 81f56d6d78aba37c019c3b8097260cb6ba4b67c3
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Oct 26 10:47:57 2018 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Oct 26 10:47:57 2018 +0300
SCNR: Avoid forward declarations, just move the functions before their use
diff --git a/gtk/mobile.cpp b/gtk/mobile.cpp
index 577897114..61d5d6c91 100644
--- a/gtk/mobile.cpp
+++ b/gtk/mobile.cpp
@@ -43,9 +43,6 @@
#include "Protocol.hpp"
#include "Util.hpp"
-static void destroyWindowCb(GtkWidget* widget, GtkWidget* window);
-static gboolean closeWebViewCb(WebKitWebView* webView, GtkWidget* window);
-
const int SHOW_JS_MAXLEN = 70;
int loolwsd_server_socket_fd = -1;
@@ -56,6 +53,17 @@ static int fakeClientFd;
static int closeNotificationPipeForForwardingThread[2];
static WebKitWebView *webView;
+static void destroyWindowCb(GtkWidget* widget, GtkWidget* window)
+{
+ gtk_main_quit();
+}
+
+static gboolean closeWebViewCb(WebKitWebView* webView, GtkWidget* window)
+{
+ gtk_widget_destroy(window);
+ return TRUE;
+}
+
static void send2JS_ready_callback(GObject *source_object,
GAsyncResult *res,
gpointer user_data)
@@ -342,14 +350,3 @@ int main(int argc, char* argv[])
return 0;
}
-
-static void destroyWindowCb(GtkWidget* widget, GtkWidget* window)
-{
- gtk_main_quit();
-}
-
-static gboolean closeWebViewCb(WebKitWebView* webView, GtkWidget* window)
-{
- gtk_widget_destroy(window);
- return TRUE;
-}
More information about the Libreoffice-commits
mailing list