diff --git a/midori/compat.c b/midori/compat.c index b3be7e89..6e858f55 100644 --- a/midori/compat.c +++ b/midori/compat.c @@ -13,24 +13,6 @@ #include -#if !GLIB_CHECK_VERSION(2, 16, 0) - -/* Glib string function - Copyright (C) 2008 Tim Janik - Copied from Glib 2.16, coding style adjusted */ -gint -g_strcmp0 (const gchar* string1, - const gchar* string2) -{ - if (!string1) - return -(string1 != string2); - if (!string2) - return string1 != string2; - return strcmp (string1, string2); -} - -#endif - #if !GTK_CHECK_VERSION (2, 14, 0) gboolean @@ -80,34 +62,3 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, } #endif - -#ifndef WEBKIT_CHECK_VERSION - -gfloat -webkit_web_view_get_zoom_level (WebKitWebView* web_view) -{ - g_return_val_if_fail (WEBKIT_IS_WEB_VIEW (web_view), 1.0); - - return 1.0f; -} - -void -webkit_web_view_set_zoom_level (WebKitWebView* web_view, - gfloat zoom_level) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -void -webkit_web_view_zoom_in (WebKitWebView* web_view) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -void -webkit_web_view_zoom_out (WebKitWebView* web_view) -{ - g_return_if_fail (WEBKIT_IS_WEB_VIEW (web_view)); -} - -#endif diff --git a/midori/compat.h b/midori/compat.h index 2cd58882..b7df7047 100644 --- a/midori/compat.h +++ b/midori/compat.h @@ -25,14 +25,6 @@ G_BEGIN_DECLS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB) #endif -#if !GLIB_CHECK_VERSION (2, 16, 0) - -gint -g_strcmp0 (const gchar* string1, - const gchar* string2); - -#endif - #if !GTK_CHECK_VERSION (2, 14, 0) gboolean @@ -59,29 +51,6 @@ gtk_tool_item_set_tooltip_text (GtkToolItem* toolitem, #endif -#ifndef WEBKIT_CHECK_VERSION - -#define WEBKIT_CHECK_VERSION(a,b,c) 0 - -gfloat -webkit_web_view_get_zoom_level (WebKitWebView* web_view); - -void -webkit_web_view_set_zoom_level (WebKitWebView* web_view, - gfloat zoom_level); - -void -webkit_web_view_zoom_in (WebKitWebView* web_view); - -void -webkit_web_view_zoom_out (WebKitWebView* web_view); - -#endif - -#if !WEBKIT_CHECK_VERSION (1, 1, 1) - #define webkit_web_view_reload_bypass_cache webkit_web_view_reload -#endif - G_END_DECLS #endif /* __COMPAT_H__ */