Prefix ivars with an underscore

[jubjub.git] / src / gui / gtk / JubGtkRosterUI.h

diff --git a/src/gui/gtk/JubGtkRosterUI.h b/src/gui/gtk/JubGtkRosterUI.h
index 9bb08784326138f11a40f9c02b02134bc32d6852..40214f76797598d70321cffe7286b8ca46c3a8e5 100644 (file)
--- a/src/gui/gtk/JubGtkRosterUI.h
+++ b/src/gui/gtk/JubGtkRosterUI.h
@@ -2,15 +2,23 @@
 #import <ObjXMPP/ObjXMPP.h>
 #include <gtk/gtk.h>
 
-@interface JubGtkRosterUI: OFObject <XMPPRosterDelegate, XMPPConnectionDelegate>
+#import "JubChatClient.h"
+
+@class JubGtkChatUI;
+
+@interface JubGtkRosterUI: OFObject <XMPPContactManagerDelegate>
 {
-       GtkTreeStore *roster_model;
-       GtkTreeModelFilter *roster_filter;
-       OFMapTable *groupMap;
-       OFMutableDictionary *contactMap;
-       OFMutableDictionary *chatMap;
-       OFCountedSet *presences;
-       GtkBuilder *builder;
+       GtkWidget *_roster_window;
+       GtkTreeStore *_roster_model;
+       GtkTreeModelFilter *_roster_filter;
+       GtkComboBox *_presence_combo;
+       gulong _presence_combo_changed_handler_id;
+       OFMapTable *_groupMap;
+       OFMutableDictionary *_contactMap;
+       JubChatClient *_client;
 }
-- initWithBuilder: (GtkBuilder*)builder;
+
+- initWithClient: (JubChatClient*)client;
+-      (void)client: (JubChatClient*)client
+  didChangePresence: (XMPPPresence*)presence;
 @end