[Libreoffice-commits] core.git: configure.ac vcl/unx

[Riccardo Magliocchetti]

 configure.ac                             |   12 +++---------
 vcl/unx/gtk/app/gtkinst.cxx              |   12 ------------
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   10 ----------
 vcl/unx/gtk/window/gtksalframe.cxx       |    7 -------
 4 files changed, 3 insertions(+), 38 deletions(-)

New commits:
commit fe95c62b39dae4cb907addfba5c73bb847f1301d
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Sun Dec 7 21:33:08 2014 +0100

    Bump minimum gtk version to 2.10
    
    That is the version available in RHEL 5. The configure change for
    telepathy has been changed for consistency only.
    
    Change-Id: I664901dd2bbcc75f6f6fb84940f3fa85d69f57dd
    Reviewed-on: https://gerrit.libreoffice.org/13369
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index 7964508..0fcfbc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10051,20 +10051,14 @@ ENABLE_SYSTRAY_GTK=""
 if test  "$test_gtk" = "yes"; then
 
     if test "$ENABLE_GTK" = "TRUE"; then
-        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+        PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
         GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
         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]))
         BUILD_TYPE="$BUILD_TYPE GTK"
         GTHREAD_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 
-        AC_MSG_CHECKING([whether to enable the systray quickstarter])
         if test "x$enable_systray" = "xyes"; then
-            AC_MSG_RESULT([yes])
-            PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
-                            [ ENABLE_SYSTRAY_GTK="TRUE" ],
-                            [ ENABLE_SYSTRAY_GTK="" ])
-        else
-            AC_MSG_RESULT([no])
+            ENABLE_SYSTRAY_GTK="TRUE"
         fi
 
         AC_MSG_CHECKING([whether to enable Gtk print dialog support])
@@ -10116,7 +10110,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes";
     ENABLE_TELEPATHY="TRUE"
     AC_DEFINE(ENABLE_TELEPATHY)
     AC_MSG_RESULT([yes])
-    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.4 )
+    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 )
     TELEPATHY_CFLAGS=$(printf '%s' "$TELEPATHY_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
 else
     AC_MSG_RESULT([no])
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index c2f56aa..2165a1e 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -244,22 +244,10 @@ void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri
         sGtkURL = OString(g_uri);
         g_free(g_uri);
     }
-#if GTK_CHECK_VERSION(2,10,0)
     GtkRecentManager *manager = gtk_recent_manager_get_default ();
     gtk_recent_manager_add_item (manager, sGtkURL.getStr());
     (void)rMimeType;
     (void)rDocumentService;
-#else
-    static getDefaultFnc sym_gtk_recent_manager_get_default =
-        (getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" );
-
-    static addItemFnc sym_gtk_recent_manager_add_item =
-        (addItemFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_add_item");
-    if (sym_gtk_recent_manager_get_default && sym_gtk_recent_manager_add_item)
-        sym_gtk_recent_manager_add_item(sym_gtk_recent_manager_get_default(), sGtkURL.getStr());
-    else
-        X11SalInstance::AddToRecentDocumentList(rFileUrl, rMimeType, rDocumentService);
-#endif
 }
 
 SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 3fad10e..598005d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -4206,18 +4206,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
 
     aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 
-#if !GTK_CHECK_VERSION(2,9,0)
-    static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) =
-        (cairo_font_options_t*(*)(GdkScreen*))osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gdk_screen_get_font_options" );
-    if( gdk_screen_get_font_options != NULL )
-    {
-        const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen );
-        aStyleSet.SetCairoFontOptions( pNewOptions );
-    }
-#else
     const cairo_font_options_t* pNewOptions = gdk_screen_get_font_options( pScreen );
     aStyleSet.SetCairoFontOptions( pNewOptions );
-#endif
 
     // finally update the collected settings
     rSettings.SetStyleSettings( aStyleSet );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 6f36883..f1065be 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -97,13 +97,6 @@
 
 #include <config_folders.h>
 
-// make compile on gtk older than 2.10
-#if GTK_MINOR_VERSION < 10
-#define GDK_SUPER_MASK      (1 << 26)
-#define GDK_HYPER_MASK      (1 << 27)
-#define GDK_META_MASK       (1 << 28)
-#endif
-
 #if GTK_CHECK_VERSION(3,0,0)
 #define IS_WIDGET_REALIZED gtk_widget_get_realized
 #define IS_WIDGET_MAPPED   gtk_widget_get_mapped