Prefix ivars with an underscore

[jubjub.git] / src / gui / gtk / JubGtkUI.m

diff --git a/src/gui/gtk/JubGtkUI.m b/src/gui/gtk/JubGtkUI.m
index 000b483122d49402ab65fee6b73937354418c32b..52e31e73f235e2105606a4432b7c248c1dbdc22f 100644 (file)
--- a/src/gui/gtk/JubGtkUI.m
+++ b/src/gui/gtk/JubGtkUI.m
@@ -2,6 +2,7 @@
 #include <gtk/gtk.h>
 
 #import "JubGtkUI.h"
+#import "JubGtkChatUI.h"
 #import "JubGtkRosterUI.h"
 
 void on_roster_window_destroy(GObject *object, gpointer user_data)
@@ -10,7 +11,7 @@ void on_roster_window_destroy(GObject *object, gpointer user_data)
 }
 
 @implementation JubGtkUI
-- init
+- initWithClient: (JubChatClient*)client;
 {
        self = [super init];
 
@@ -23,10 +24,8 @@ void on_roster_window_destroy(GObject *object, gpointer user_data)
 
                gtk_init(argc, argv);
 
-               builder = gtk_builder_new();
-               gtk_builder_add_from_file(builder, "data/gtk/roster.ui", NULL);
-
-               rosterUI = [[JubGtkRosterUI alloc] initWithBuilder: builder];
+               _rosterUI = [[JubGtkRosterUI alloc]
+                   initWithClient: client];
        } @catch (id e) {
                [self release];
                @throw e;
@@ -37,23 +36,13 @@ void on_roster_window_destroy(GObject *object, gpointer user_data)
 
 - (void)dealloc
 {
-       [rosterUI release];
-       g_object_unref(G_OBJECT(builder));
+       [_rosterUI release];
 
        [super dealloc];
 }
 
 - (void)startUIThread
 {
-       GtkWidget *roster_window;
-
-       roster_window =
-           GTK_WIDGET(gtk_builder_get_object(builder, "RosterWindow"));
-
-       gtk_builder_connect_signals(builder, NULL);
-
-       gtk_widget_show(roster_window);
-
        [[OFThread threadWithBlock: ^(void){
                gtk_main();
                [OFApplication terminate];
@@ -62,8 +51,15 @@ void on_roster_window_destroy(GObject *object, gpointer user_data)
        }] start];
 }
 
-- (id<XMPPRosterDelegate>)rosterDelegate
+- (Class)chatUIClass
+{
+       return [JubGtkChatUI class];
+}
+
+-      (void)client: (JubChatClient*)client
+  didChangePresence: (XMPPPresence*)presence
 {
-       return rosterUI;
+       [_rosterUI   client: client
+         didChangePresence: presence];
 }
 @end