Cut unnecessary MilkTask class.

[milk] / src / milk-main-window.c

diff --git a/src/milk-main-window.c b/src/milk-main-window.c
index 70d53a5..89104f7 100644 (file)
--- a/src/milk-main-window.c
+++ b/src/milk-main-window.c
@@ -23,9 +23,10 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <hildon/hildon.h>
+#include <rtm-glib/rtm-glib.h>
 
 #include "milk-main-window.h"
-#include "milk-task.h"
+#include "milk-auth.h"
 #include "milk-task-model.h"
 
 G_DEFINE_TYPE (MilkMainWindow, milk_main_window, HILDON_TYPE_WINDOW)
@@ -33,8 +34,12 @@ G_DEFINE_TYPE (MilkMainWindow, milk_main_window, HILDON_TYPE_WINDOW)
 /* less expensive than G_TYPE_INSTANCE_GET_PRIVATE */
 #define MILK_MAIN_WINDOW_PRIVATE(o) ((MILK_MAIN_WINDOW ((o)))->priv)
 
+static GtkWidget *default_window = NULL;
+
 struct _MilkMainWindowPrivate
 {
+        MilkAuth *auth;
+
         GtkWidget *app_menu;
 
         GtkWidget *main_vbox;
@@ -222,19 +227,29 @@ contact_column_render_func (GtkCellLayout   *cell_layout,
                             GtkTreeIter     *iter,
                             gpointer         user_data)
 {
-        MilkTask *task;
-        char *title;
+        RtmTask *task;
 
         gtk_tree_model_get (
                         model, iter, MILK_TASK_MODEL_COLUMN_TASK, &task, -1);
+        g_object_set (renderer, "text", rtm_task_get_name (task), NULL);
 
-        g_object_get (task, "title", &title, NULL);
-        g_object_set (renderer, "text", title, NULL);
-
-        g_free (title);
         g_object_unref (task);
 }
 
+static gboolean
+begin_auth_idle (MilkMainWindow *window)
+{
+        MilkMainWindowPrivate *priv;
+
+        priv = MILK_MAIN_WINDOW_PRIVATE (window);
+
+        /* FIXME: cut this */
+        g_debug ("trying to run the milk auth demo");
+        milk_auth_log_in (priv->auth);
+
+        return FALSE;
+}
+
 static void
 milk_main_window_constructed (GObject* object)
 {
@@ -264,7 +279,8 @@ milk_main_window_constructed (GObject* object)
         /*
          * Task List
          */
-        model = GTK_TREE_MODEL (milk_task_model_new ());
+        priv->auth = milk_auth_get_default ();
+        model = GTK_TREE_MODEL (milk_task_model_new (priv->auth));
         w = hildon_touch_selector_new ();
 
 
@@ -278,8 +294,8 @@ milk_main_window_constructed (GObject* object)
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (col), renderer, TRUE);
         gtk_cell_layout_set_cell_data_func (
                         GTK_CELL_LAYOUT (col), renderer,
-                        (GtkTreeCellDataFunc) contact_column_render_func, self,
-                        NULL);
+                        (GtkCellLayoutDataFunc) contact_column_render_func,
+                        self, NULL);
         g_object_unref (model);
 
         hildon_touch_selector_set_column_selection_mode (
@@ -302,6 +318,10 @@ milk_main_window_constructed (GObject* object)
         priv->app_menu = create_menu (self);
         hildon_window_set_app_menu (
                         HILDON_WINDOW (self), HILDON_APP_MENU (priv->app_menu));
+
+        /* break a cyclical dependency by doing this after the window is
+         * constructed */
+        g_idle_add ((GSourceFunc) begin_auth_idle, self);
 }
 
 static void
@@ -325,8 +345,11 @@ milk_main_window_init (MilkMainWindow *self)
 }
 
 GtkWidget*
-milk_main_window_new ()
+milk_main_window_get_default ()
 {
-        return g_object_new (MILK_TYPE_MAIN_WINDOW,
-                             NULL);
+        if (!default_window) {
+                default_window = g_object_new (MILK_TYPE_MAIN_WINDOW, NULL);
+        }
+
+        return default_window;
 }