Add a minimal JubChatClient class and refactor other code to use it

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

diff --git a/src/gui/gtk/JubGtkRosterUI.m b/src/gui/gtk/JubGtkRosterUI.m
index 66a050ef4002b152a0fc7362542a4999da765e8a..c27142f2f68fa0bf4b697ae8c121fae2cbd3e704 100644 (file)
--- a/src/gui/gtk/JubGtkRosterUI.m
+++ b/src/gui/gtk/JubGtkRosterUI.m
@@ -80,14 +80,14 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
 }
 
 @implementation JubGtkRosterUI
-- initWithBuilder: (GtkBuilder*)builder_
-       connection: (XMPPConnection*)connection_
+- initWithClient: (JubChatClient*)client;
 {
        self = [super init];
 
        @try {
                GtkTreeView *roster_view;
                GtkComboBox *presence_combo;
+               GtkBuilder *builder;
 
                groupMap = [[OFMapTable alloc]
                    initWithKeyFunctions: keyFunctions
@@ -95,9 +95,19 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
                contactMap = [[OFMutableDictionary alloc] init];
                chatMap = [[OFMutableDictionary alloc] init];
                presences = [[OFCountedSet alloc] init];
-               connection = [connection_ retain];
+               connection = [client.connection retain];
 
-               builder = g_object_ref(builder_);
+               [connection addDelegate: self];
+               [client.roster addDelegate: self];
+
+               builder = gtk_builder_new();
+               gtk_builder_add_from_file(builder, "data/gtk/roster.ui", NULL);
+               gtk_builder_connect_signals(builder, NULL);
+
+               roster_window =
+                   GTK_WIDGET(gtk_builder_get_object(builder, "RosterWindow"));
+
+               gtk_widget_show(roster_window);
 
                roster_model = GTK_TREE_STORE(gtk_builder_get_object(builder,
                    "RosterTreeStore"));
@@ -119,6 +129,8 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
 
                g_signal_connect(presence_combo, "changed",
                    G_CALLBACK(presence_changed), connection);
+
+               g_object_unref(G_OBJECT(builder));
        } @catch (id e) {
                [self release];
                @throw e;
@@ -131,16 +143,11 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
 {
        [groupMap release];
        [contactMap release];
+       [chatMap release];
        [presences release];
        [connection release];
 
-       if (roster_model)
-               g_object_unref(roster_model);
-
-       if (roster_filter)
-               g_object_unref(roster_filter);
-
-       g_object_unref(builder);
+       gtk_widget_destroy(roster_window);
 
        [super dealloc];
 }