[Libreoffice-commits] core.git: libreofficekit/qa vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Sep 29 18:28:10 UTC 2018


 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |    8 ++++++++
 vcl/unx/gtk/gloactiongroup.cxx                              |    8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 618d474f059a75c2ac04df16c830d71a88690118
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Sep 29 13:18:49 2018 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Sep 29 20:27:49 2018 +0200

    band-aid: deprecated-declarations related to gtk
    
    Don't hesitate to revert this one but only if there's a patch to fix it.
    
    Change-Id: Ib15352e1a94d0542120f6710acfe19887494ed51
    Reviewed-on: https://gerrit.libreoffice.org/61142
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index d9c709604a28..5d6ecb01728d 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -135,9 +135,17 @@ static void initWindow(GtvApplicationWindow* window)
 {
     GtvApplicationWindowPrivate* priv = getPrivate(window);
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     GList *focusChain = nullptr;
     focusChain = g_list_append( focusChain, window->lokdocview );
+
     gtk_container_set_focus_chain ( GTK_CONTAINER (priv->container), focusChain );
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
     // TODO: Implement progressbar in statusbar
     LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(window->lokdocview));
diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
index b058417b821f..73a432769a08 100644
--- a/vcl/unx/gtk/gloactiongroup.cxx
+++ b/vcl/unx/gtk/gloactiongroup.cxx
@@ -327,8 +327,14 @@ g_lo_action_group_class_init (GLOActionGroupClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     object_class->finalize = g_lo_action_group_finalize;
-
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
     g_type_class_add_private (klass, sizeof (GLOActionGroupPrivate));
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 }
 
 static void


More information about the Libreoffice-commits mailing list