135360
From 98252b0c534e71b65f720af9d97a6a358268076d Mon Sep 17 00:00:00 2001
135360
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
135360
Date: Mon, 12 Oct 2015 22:13:37 +0200
135360
Subject: [PATCH 205/398] Bump gtk+ version to 2.18
135360
MIME-Version: 1.0
135360
Content-Type: text/plain; charset=UTF-8
135360
Content-Transfer-Encoding: 8bit
135360
135360
2.18 is the version available in RHEL 6 released in 2010.
135360
135360
Change-Id: I4cd4fc89f6b51e6f58ca72b8182f80316b1f4f88
135360
Reviewed-on: https://gerrit.libreoffice.org/19330
135360
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
135360
Tested-by: Caolán McNamara <caolanm@redhat.com>
135360
(cherry picked from commit 068c04fb06806a9345c0059545d19a416d7e60b7)
135360
---
135360
 configure.ac                                       |  4 +--
135360
 .../qa/gtktiledviewer/gtktiledviewer.cxx           |  2 --
135360
 sfx2/source/appl/shutdowniconunx.cxx               |  6 ++---
135360
 vcl/unx/gtk/app/gtkdata.cxx                        |  5 ++--
135360
 vcl/unx/gtk/app/gtkinst.cxx                        |  4 +--
135360
 vcl/unx/gtk/app/gtksys.cxx                         |  4 ---
135360
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx           | 31 +++++++++-------------
135360
 vcl/unx/gtk/gdi/salprn-gtk.cxx                     | 14 ----------
135360
 vcl/unx/gtk/inc/gtkprintwrapper.hxx                |  6 -----
135360
 9 files changed, 20 insertions(+), 56 deletions(-)
135360
135360
diff --git a/configure.ac b/configure.ac
135360
index b1ec23a5afa3..12983e074c7d 100644
135360
--- a/configure.ac
135360
+++ b/configure.ac
135360
@@ -10126,7 +10126,7 @@ ENABLE_SYSTRAY_GTK=""
135360
 if test  "$test_gtk" = "yes"; then
135360
 
135360
     if test "$ENABLE_GTK" = "TRUE"; then
135360
-        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
135360
+        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
135360
         GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
135360
         PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
135360
         BUILD_TYPE="$BUILD_TYPE GTK"
135360
@@ -10185,7 +10185,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes";
135360
     ENABLE_TELEPATHY="TRUE"
135360
     AC_DEFINE(ENABLE_TELEPATHY)
135360
     AC_MSG_RESULT([yes])
135360
-    PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.10 )
135360
+    PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 gtk+-2.0 >= 2.18.0 )
135360
     TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
135360
 else
135360
     AC_MSG_RESULT([no])
135360
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
index 3b5d456586e6..e7e276dfce17 100644
135360
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
@@ -102,7 +102,6 @@ const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
135360
 /// Get the visible area of the scrolled window
135360
 static void getVisibleAreaTwips(GtkWidget* pDocView, GdkRectangle* pArea)
135360
 {
135360
-#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
135360
     TiledWindow& rWindow = lcl_getTiledWindow(pDocView);
135360
 
135360
     GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow));
135360
@@ -116,7 +115,6 @@ static void getVisibleAreaTwips(GtkWidget* pDocView, GdkRectangle* pArea)
135360
                                                gtk_adjustment_get_page_size(pHAdjustment));
135360
     pArea->height = lok_doc_view_pixel_to_twip(LOK_DOC_VIEW(pDocView),
135360
                                                gtk_adjustment_get_page_size(pVAdjustment));
135360
-#endif
135360
 }
135360
 
135360
 static void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
135360
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
135360
index 90349f7261b0..2de5654fe28a 100644
135360
--- a/sfx2/source/appl/shutdowniconunx.cxx
135360
+++ b/sfx2/source/appl/shutdowniconunx.cxx
135360
@@ -370,10 +370,8 @@ void plugin_init_sys_tray()
135360
 {
135360
     ::SolarMutexGuard aGuard;
135360
 
135360
-    if( /* need gtk_status to resolve */
135360
-        (gtk_check_version( 2, 10, 0 ) != NULL) ||
135360
-        /* we need the vcl plugin and mainloop initialized */
135360
-        !g_type_from_name( "GdkDisplay" ) )
135360
+    /* we need the vcl plugin and mainloop initialized */
135360
+    if (!g_type_from_name( "GdkDisplay" ))
135360
         return;
135360
 
135360
     OString aLabel;
135360
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
135360
index 445ae0a61772..ec2886fa4172 100644
135360
--- a/vcl/unx/gtk/app/gtkdata.cxx
135360
+++ b/vcl/unx/gtk/app/gtkdata.cxx
135360
@@ -750,9 +750,8 @@ void GtkData::Init()
135360
             pDisplay->monitorsChanged( pScreen );
135360
             g_signal_connect( G_OBJECT(pScreen), "size-changed",
135360
                               G_CALLBACK(signalScreenSizeChanged), pDisplay );
135360
-            if( ! gtk_check_version( 2, 14, 0 ) ) // monitors-changed came in with 2.14, avoid an assertion
135360
-                g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
135360
-                                  G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
135360
+            g_signal_connect( G_OBJECT(pScreen), "monitors-changed",
135360
+                              G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() );
135360
         }
135360
     }
135360
 }
135360
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
135360
index 601fd2152d1d..636049702280 100644
135360
--- a/vcl/unx/gtk/app/gtkinst.cxx
135360
+++ b/vcl/unx/gtk/app/gtkinst.cxx
135360
@@ -89,14 +89,12 @@ extern "C"
135360
         }
135360
 
135360
         const gchar* pVersion = gtk_check_version( 3, 2, 0 );
135360
-#else
135360
-        const gchar* pVersion = gtk_check_version( 2, 2, 0 );
135360
-#endif
135360
         if( pVersion )
135360
         {
135360
             SAL_WARN("vcl.gtk", "gtk version conflict: " << pVersion);
135360
             return NULL;
135360
         }
135360
+#endif
135360
 
135360
         GtkYieldMutex *pYieldMutex;
135360
 
135360
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
135360
index 7d687b23943f..42d848ceb686 100644
135360
--- a/vcl/unx/gtk/app/gtksys.cxx
135360
+++ b/vcl/unx/gtk/app/gtksys.cxx
135360
@@ -195,7 +195,6 @@ bool GtkSalSystem::IsUnifiedDisplay()
135360
 }
135360
 
135360
 namespace {
135360
-#if GTK_CHECK_VERSION(2,14,0)
135360
 static int _fallback_get_primary_monitor (GdkScreen *pScreen)
135360
 {
135360
     // Use monitor name as primacy heuristic
135360
@@ -210,7 +209,6 @@ static int _fallback_get_primary_monitor (GdkScreen *pScreen)
135360
     }
135360
     return 0;
135360
 }
135360
-#endif
135360
 
135360
 static int _get_primary_monitor (GdkScreen *pScreen)
135360
 {
135360
@@ -224,10 +222,8 @@ static int _get_primary_monitor (GdkScreen *pScreen)
135360
         get_fn = reinterpret_cast<int(*)(GdkScreen*)>(osl_getAsciiFunctionSymbol(NULL,
135360
             "gdk_screen_get_primary_monitor"));
135360
     }
135360
-#if GTK_CHECK_VERSION(2,14,0)
135360
     if (!get_fn)
135360
         get_fn = _fallback_get_primary_monitor;
135360
-#endif
135360
     if (get_fn)
135360
         return get_fn (pScreen);
135360
     else
135360
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
135360
index 122059656f89..6512803bfaa0 100644
135360
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
135360
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
135360
@@ -3163,7 +3163,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
135360
             {
135360
                 const double shim = 0.2;
135360
 
135360
-#if GTK_CHECK_VERSION(2,10,0)
135360
                 gint separator_height, separator_width, wide_separators = 0;
135360
 
135360
                 gtk_widget_style_get (gWidgetData[m_nXScreen].gSeparator,
135360
@@ -3188,7 +3187,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
135360
                                        w * (1 - 2*shim), separator_width);
135360
                 }
135360
                 else
135360
-#endif
135360
                 {
135360
                     if (nPart == PART_SEPARATOR_VERT)
135360
                         gtk_paint_vline (gWidgetData[m_nXScreen].gSeparator->style, gdkDrawable,
135360
@@ -4017,23 +4015,20 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
135360
     aStyleSet.SetHighlightColor( aHighlightColor );
135360
     aStyleSet.SetHighlightTextColor( aHighlightTextColor );
135360
 
135360
-    if( ! gtk_check_version( 2, 10, 0 ) ) // link colors came in with 2.10, avoid an assertion
135360
+    // hyperlink colors
135360
+    GdkColor *link_color = NULL;
135360
+    gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
135360
+    if (link_color)
135360
     {
135360
-        // hyperlink colors
135360
-        GdkColor *link_color = NULL;
135360
-        gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
135360
-        if (link_color)
135360
-        {
135360
-            aStyleSet.SetLinkColor(getColor(*link_color));
135360
-            gdk_color_free (link_color);
135360
-            link_color = NULL;
135360
-        }
135360
-        gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
135360
-        if (link_color)
135360
-        {
135360
-            aStyleSet.SetVisitedLinkColor(getColor(*link_color));
135360
-            gdk_color_free (link_color);
135360
-        }
135360
+        aStyleSet.SetLinkColor(getColor(*link_color));
135360
+        gdk_color_free (link_color);
135360
+        link_color = NULL;
135360
+    }
135360
+    gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
135360
+    if (link_color)
135360
+    {
135360
+        aStyleSet.SetVisitedLinkColor(getColor(*link_color));
135360
+        gdk_color_free (link_color);
135360
     }
135360
 
135360
     // Tab colors
135360
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
135360
index 650276c3a1f4..1ae010e886c9 100644
135360
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
135360
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
135360
@@ -318,15 +318,9 @@ lcl_setHelpText(
135360
         const uno::Sequence<OUString>& i_rHelpTexts,
135360
         const sal_Int32 i_nIndex)
135360
 {
135360
-#if GTK_CHECK_VERSION(2,12,0)
135360
     if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength())
135360
         gtk_widget_set_tooltip_text(io_pWidget,
135360
             OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr());
135360
-#else
135360
-    (void)io_pWidget;
135360
-    (void)i_rHelpTexts;
135360
-    (void)i_nIndex;
135360
-#endif
135360
 }
135360
 
135360
 static GtkWidget*
135360
@@ -429,12 +423,8 @@ GtkPrintDialog::impl_initDialog()
135360
             | GTK_PRINT_CAPABILITY_COLLATE
135360
             | GTK_PRINT_CAPABILITY_REVERSE
135360
             | GTK_PRINT_CAPABILITY_GENERATE_PS
135360
-#if GTK_CHECK_VERSION(2,12,0)
135360
             | GTK_PRINT_CAPABILITY_NUMBER_UP
135360
-#endif
135360
-#if GTK_CHECK_VERSION(2,14,0)
135360
             | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT
135360
-#endif
135360
        ));
135360
 }
135360
 
135360
@@ -787,11 +777,9 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
135360
                 ePrintPages = GTK_PRINT_PAGES_RANGES;
135360
                 break;
135360
             case 2:
135360
-#if GTK_CHECK_VERSION(2,14,0)
135360
                 if (m_xWrapper->supportsPrintSelection())
135360
                     ePrintPages = GTK_PRINT_PAGES_SELECTION;
135360
                 else
135360
-#endif
135360
                     SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it");
135360
                 break;
135360
             default:
135360
@@ -999,7 +987,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
135360
             }
135360
             catch (...) {}
135360
         }
135360
-#if GTK_CHECK_VERSION(2,17,5)
135360
         if (gtk_print_unix_dialog_get_has_selection(GTK_PRINT_UNIX_DIALOG(m_pDialog)))
135360
         {
135360
             uno::Any aSelection;
135360
@@ -1022,7 +1009,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
135360
                 aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
135360
             }
135360
         }
135360
-#endif
135360
         uno::Sequence<beans::PropertyValue> aArgs(2);
135360
         aArgs[0].Name = "FilterData";
135360
         aArgs[0].Value <<= aFilterData;
135360
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
135360
index 009903254606..99d435cd7f8e 100644
135360
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
135360
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
135360
@@ -13,13 +13,7 @@
135360
 #include <gtk/gtk.h>
135360
 
135360
 #if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
135360
-#if GTK_CHECK_VERSION(2,14,0)
135360
 #include <gtk/gtkunixprint.h>
135360
-#else
135360
-#include <gtk/gtkprintjob.h>
135360
-#include <gtk/gtkpagesetupunixdialog.h>
135360
-#include <gtk/gtkprintunixdialog.h>
135360
-#endif
135360
 
135360
 #include <osl/module.hxx>
135360
 #include <sal/types.h>
135360
-- 
135360
2.12.0
135360