Merge branch 'master' into plist

Conflicts:

	src/AFC.c
	src/lockdown.c
	src/lockdown.h
	src/plist.c
	src/plist.h

1 files changed, 2 insertions, 2 deletions

diff --git a/src/initconf.c b/src/initconf.c
index 00d78e2..538f344 100644
--- a/src/initconf.c
+++ b/src/initconf.c
@@ -35,7 +35,7 @@
  *
  * @param key The pointer to the desired location of the new key.
  */
-void generate_key(gpointer key)
+static void generate_key(gpointer key)
 {
         gnutls_x509_privkey_generate(*((gnutls_x509_privkey_t *) key), GNUTLS_PK_RSA, 2048, 0);
         g_thread_exit(0);
@@ -43,7 +43,7 @@ void generate_key(gpointer key)
 
 /** Simple function that generates a spinner until the mutex is released.
  */
-void progress_bar(gpointer mutex)
+static void progress_bar(gpointer mutex)
 {
         const char *spinner = "|/-\\|/-\\";
         int i = 0;