From 901d8eb8b91d357b39f6bb0e4a8a366d9eb25509 Mon Sep 17 00:00:00 2001
From: Aaron Lipinski <kris.lipinski@gmail.com>
Date: Sun, 18 Aug 2013 02:05:32 +1200
Subject: [PATCH] remove callback introduced temporarily during refactoring

---
 prompt.c  | 8 +++-----
 prompt.h  | 4 +---
 windows.c | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/prompt.c b/prompt.c
index a37fdaa..0c1cf4b 100644
--- a/prompt.c
+++ b/prompt.c
@@ -19,7 +19,6 @@ extern int store_data(Messenger *m, char *path);
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests = 0; // XXX
 
-static friendAddedFn *on_friendadded_cb;
 static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
 
@@ -97,7 +96,7 @@ void cmd_accept(ToxWindow *self, Messenger *m, char **args)
         wprintw(self->window, "Failed to add friend.\n");
     else {
         wprintw(self->window, "Friend accepted as: %d.\n", num);
-        on_friendadded_cb(m, num);
+        on_friendadded(m, num);
     }
 }
 
@@ -174,7 +173,7 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
 
         default:
             wprintw(self->window, "Friend added as %d.\n", num);
-            on_friendadded_cb(m, num);
+            on_friendadded(m, num);
             break;
     }
 }
@@ -480,9 +479,8 @@ static void prompt_onInit(ToxWindow *self, Messenger *m)
     wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt(friendAddedFn *f)
+ToxWindow new_prompt()
 {
-    on_friendadded_cb = f;
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
     ret.onKey = &prompt_onKey;
diff --git a/prompt.h b/prompt.h
index 6c5320a..8e12a42 100644
--- a/prompt.h
+++ b/prompt.h
@@ -3,9 +3,7 @@
 
 #include "windows.h"
 
-typedef void (friendAddedFn)(Messenger *m, int friendnumber);
-
-ToxWindow new_prompt(friendAddedFn *f);
+ToxWindow new_prompt();
 int add_req(uint8_t *public_key);
 unsigned char *hex_string_to_bin(char hex_string[]);
 
diff --git a/windows.c b/windows.c
index 80d6428..a2c649d 100644
--- a/windows.c
+++ b/windows.c
@@ -154,7 +154,7 @@ void set_active_window(int index)
 
 ToxWindow *init_windows()
 {
-    int n_prompt = add_window(m, new_prompt(on_friendadded));
+    int n_prompt = add_window(m, new_prompt());
     
     if (n_prompt == -1
             || add_window(m, new_friendlist()) == -1