Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: GitHub noreply@github.com Date: Sat, 10 Mar 2018 05:36:03 UTC Commit: 0b8ae813e8286e1a9b92cc7661b8587c976aa53c https://github.com/geany/geany-plugins/commit/0b8ae813e8286e1a9b92cc7661b858...

Log Message: ----------- Merge pull request #720 from LarsGit223/tb-no-gio-check

treebrowser: removed HAVE_GIO checks

Modified Paths: -------------- build/treebrowser.m4 treebrowser/src/treebrowser.c

Modified: build/treebrowser.m4 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -15,14 +15,8 @@ AC_DEFUN([GP_CHECK_TREEBROWSER], ]) fi

- PKG_CHECK_MODULES([GIO], [gio-2.0], - [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO]) - have_gio=yes], - [have_gio=no]) - AM_CONDITIONAL(ENABLE_TREEBROWSER, test "x$enable_treebrowser" = "xyes") GP_COMMIT_PLUGIN_STATUS([TreeBrowser]) - GP_STATUS_FEATURE_ADD([TreeBrowser GIO support], [$have_gio])

AC_CONFIG_FILES([ treebrowser/Makefile

Modified: treebrowser/src/treebrowser.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -19,9 +19,7 @@ #include "geany.h" #include "geanyplugin.h"

-#ifdef HAVE_GIO -# include <gio/gio.h> -#endif +#include <gio/gio.h>

#ifdef G_OS_WIN32 # include <windows.h> @@ -208,7 +206,7 @@ utils_pixbuf_from_stock(const gchar *stock_id) static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if defined(HAVE_GIO) && GTK_CHECK_VERSION(2, 14, 0) +#if GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info;

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).