# https://github.com/geany/geany-plugins/pull/1389
--- a/git-changebar/src/gcb-plugin.c
+++ b/git-changebar/src/gcb-plugin.c
@@ -1410,9 +1410,9 @@ read_setting_boolean (GKeyFile     *kf,
                       const gchar  *key,
                       gpointer      value)
 {
-  gboolean *bool = value;
+  gboolean *boolean = value;
   
-  *bool = utils_get_setting_boolean (kf, group, key, *bool);
+  *boolean = utils_get_setting_boolean (kf, group, key, *boolean);
 }
 
 static void
@@ -1421,9 +1421,9 @@ write_setting_boolean (GKeyFile      *kf,
                        const gchar   *key,
                        gconstpointer  value)
 {
-  const gboolean *bool = value;
+  const gboolean *boolean = value;
   
-  g_key_file_set_boolean (kf, group, key, *bool);
+  g_key_file_set_boolean (kf, group, key, *boolean);
 }
 
 /* loads @filename in @kf and return %FALSE if failed, emitting a warning
# https://github.com/geany/geany-plugins/commit/109ad6e6a2cfa31deb33ebfcef838ba337ff208f
--- a/geanyprj/src/unittests.c
+++ b/geanyprj/src/unittests.c
@@ -25,12 +25,6 @@ file_teardown(void)
 	system("rm -rf test_list_dir");
 }
 
-gboolean
-true(G_GNUC_UNUSED const gchar * arg)
-{
-	return TRUE;
-}
-
 START_TEST(test_get_file_list)
 {
 	GSList *files = get_file_list("test_list_dir", NULL, NULL, NULL);