Added simple mock test, refactored roster

9 files changed, 25 insertions, 43 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index 822da420..00e891db 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -31,9 +31,9 @@
 
 #include "command/command.h"
 #include "common.h"
+#include "roster_list.h"
 #include "config/preferences.h"
 #include "config/theme.h"
-#include "ui/notifier.h"
 #include "ui/window.h"
 #include "ui/windows.h"
 #include "ui/ui.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index c5cfe284..507cfb02 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -44,10 +44,10 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "contact.h"
+#include "roster_list.h"
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "ui/notifier.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "ui/windows.h"
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index d5b882d7..3306a246 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -40,6 +40,7 @@
 #include "config/theme.h"
 #include "log.h"
 #include "profanity.h"
+#include "roster_list.h"
 #include "ui/ui.h"
 #include "ui/windows.h"
 #include "xmpp/xmpp.h"
diff --git a/src/ui/muc_window.h b/src/ui/muc_window.h
index e67954a7..0b1f13ab 100644
--- a/src/ui/muc_window.h
+++ b/src/ui/muc_window.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef MUC_WINDOW_H
-#define MUC_WINDOW_H
+#ifndef UI_MUC_WINDOW_H
+#define UI_MUC_WINDOW_H
 
 #include <glib.h>
 
diff --git a/src/ui/notifier.h b/src/ui/notifier.h
deleted file mode 100644
index 9db789e8..00000000
--- a/src/ui/notifier.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * notifier.h
- *
- * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
- *
- * This file is part of Profanity.
- *
- * Profanity is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-void notifier_init(void);
-void notifier_uninit(void);
-
-void notify_typing(const char * const handle);
-void notify_message(const char * const handle, int win);
-void notify_room_message(const char * const handle, const char * const room,
-    int win);
-void notify_remind(void);
-void notify_invite(const char * const from, const char * const room,
-    const char * const reason);
-void notify_subscription(const char * const from);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 13e96f27..5ec4debd 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef UI_H
-#define UI_H
+#ifndef UI_UI_H
+#define UI_UI_H
 
 #include "config.h"
 
@@ -242,4 +242,17 @@ void inp_block(void);
 void inp_get_password(char *passwd);
 void inp_replace_input(char *input, const char * const new_input, int *size);
 
+// desktop notifier actions
+void notifier_init(void);
+void notifier_uninit(void);
+
+void notify_typing(const char * const handle);
+void notify_message(const char * const handle, int win);
+void notify_room_message(const char * const handle, const char * const room,
+    int win);
+void notify_remind(void);
+void notify_invite(const char * const from, const char * const room,
+    const char * const reason);
+void notify_subscription(const char * const from);
+
 #endif
diff --git a/src/ui/window.h b/src/ui/window.h
index dea6214d..69e446fa 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef UI_WINDOW_H
+#define UI_WINDOW_H
 
 #include "config.h"
 
diff --git a/src/ui/windows.c b/src/ui/windows.c
index 88c811e5..001f1bfc 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "common.h"
+#include "roster_list.h"
 #include "config/theme.h"
 #include "ui/ui.h"
 #include "ui/window.h"
diff --git a/src/ui/windows.h b/src/ui/windows.h
index 3cf593e8..4467e507 100644
--- a/src/ui/windows.h
+++ b/src/ui/windows.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef WINDOWS_H
-#define WINDOWS_H
+#ifndef UI_WINDOWS_H
+#define UI_WINDOWS_H
 
 void wins_init(void);
 ProfWin * wins_get_console(void);