Merge remote-tracking branch 'Dav1d23/master'

Conflicts: Makefile.am install-all.sh
2016-04-11 00:23:36 +01:00
parent 5ddde3e59a b300fa5baf
commit 697db019d5
10 changed files with 285 additions and 9 deletions
--- a/src/main.c
+++ b/src/main.c
@@ -136,6 +136,12 @@ main(int argc, char **argv)
        g_print("Python plugins: Disabled\n");
 #endif

+#ifdef HAVE_GTK
+        g_print("GTK icons: Enabled\n");
+#else
+        g_print("GTK icons: Disabled\n");
+#endif
+
        return 0;
    }