From 1f2ac8914917faa01dcce1de239c8324cebc4cc7 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Tue, 3 Nov 2009 22:00:24 -0800 Subject: [PATCH] fix build breaks and mangled history (not worth correctly rebasing at this point) --- src/milk-main-window.c | 188 ------------------------------------------------ src/milk-task-model.h | 2 +- 2 files changed, 1 insertion(+), 189 deletions(-) diff --git a/src/milk-main-window.c b/src/milk-main-window.c index be74c98..70d53a5 100644 --- a/src/milk-main-window.c +++ b/src/milk-main-window.c @@ -215,194 +215,6 @@ create_menu (gpointer user_data) return GTK_WIDGET (menu); } -static MenuItem menu_items_always_shown[] = { - {"New Task", "menu-item-new-task", new_task_clicked_cb}, -}; - -static MenuItem menu_items_selection_required[] = { - {"Edit", "menu-item-edit", edit_clicked_cb}, - {"Priority +", "menu-item-priority_plus", priority_plus_clicked_cb}, - {"Priority -", "menu-item-priority_minus", priority_minus_clicked_cb}, - {"Complete", "menu-item-complete", complete_clicked_cb}, - {"Delete", "menu-item-delete", delete_clicked_cb}, -}; - -static void -task_view_selection_changed_cb (HildonTouchSelector *view, - gint column, - MilkMainWindow *window) -{ - MilkMainWindowPrivate *priv; - GList *rows; - gboolean show = FALSE; - gint i; - - priv = MILK_MAIN_WINDOW_PRIVATE (window); - - rows = hildon_touch_selector_get_selected_rows (view, column); - show = (g_list_length (rows) > 0); - - for (i = 0; i < G_N_ELEMENTS (menu_items_selection_required); i++) { - GtkWidget *w; - - w = g_object_get_data ( - G_OBJECT (priv->app_menu), - menu_items_selection_required[i].id); - - if (show) - gtk_widget_show (w); - else - gtk_widget_hide (w); - } -} - -static GtkWidget* -create_menu (gpointer user_data) -{ - HildonAppMenu *menu; - MenuItem *menu_array; - gint i, length; - GtkWidget *w; - - menu = HILDON_APP_MENU (hildon_app_menu_new ()); - - menu_array = menu_items_always_shown; - length = G_N_ELEMENTS (menu_items_always_shown); - for (i = 0; i < length; i++) { - w = hildon_button_new_with_text ( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _(menu_array[i].display_name), ""); - g_signal_connect (w, "clicked", - G_CALLBACK (menu_array[i].callback), user_data); - g_object_set_data (G_OBJECT (menu), menu_array[i].id, w); - hildon_app_menu_append (menu, GTK_BUTTON (w)); - gtk_widget_show (w); - } - - menu_array = menu_items_selection_required; - length = G_N_ELEMENTS (menu_items_selection_required); - for (i = 0; i < length; i++) { - w = hildon_button_new_with_text ( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - menu_array[i].display_name, ""); - g_signal_connect (w, "clicked", - G_CALLBACK (menu_array[i].callback), user_data); - g_object_set_data (G_OBJECT (menu), menu_array[i].id, w); - hildon_app_menu_append (menu, GTK_BUTTON (w)); - gtk_widget_hide (w); - } - - gtk_widget_show (GTK_WIDGET (menu)); - - return GTK_WIDGET (menu); -} - -static void -contact_column_render_func (GtkCellLayout *cell_layout, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer user_data) -{ - MilkTask *task; - char *title; - - gtk_tree_model_get ( - model, iter, MILK_TASK_MODEL_COLUMN_TASK, &task, -1); - - g_object_get (task, "title", &title, NULL); - g_object_set (renderer, "text", title, NULL); - - g_free (title); - g_object_unref (task); -} - -static MenuItem menu_items_always_shown[] = { - {"New Task", "menu-item-new-task", new_task_clicked_cb}, -}; - -static MenuItem menu_items_selection_required[] = { - {"Edit", "menu-item-edit", edit_clicked_cb}, - {"Priority +", "menu-item-priority_plus", priority_plus_clicked_cb}, - {"Priority -", "menu-item-priority_minus", priority_minus_clicked_cb}, - {"Complete", "menu-item-complete", complete_clicked_cb}, - {"Delete", "menu-item-delete", delete_clicked_cb}, -}; - -static void -task_view_selection_changed_cb (HildonTouchSelector *view, - gint column, - MilkMainWindow *window) -{ - MilkMainWindowPrivate *priv; - GList *rows; - gboolean show = FALSE; - gint i; - - priv = MILK_MAIN_WINDOW_PRIVATE (window); - - rows = hildon_touch_selector_get_selected_rows (view, column); - show = (g_list_length (rows) > 0); - - for (i = 0; i < G_N_ELEMENTS (menu_items_selection_required); i++) { - GtkWidget *w; - - w = g_object_get_data ( - G_OBJECT (priv->app_menu), - menu_items_selection_required[i].id); - - if (show) - gtk_widget_show (w); - else - gtk_widget_hide (w); - } -} - -static GtkWidget* -create_menu (gpointer user_data) -{ - HildonAppMenu *menu; - MenuItem *menu_array; - gint i, length; - GtkWidget *w; - - menu = HILDON_APP_MENU (hildon_app_menu_new ()); - - menu_array = menu_items_always_shown; - length = G_N_ELEMENTS (menu_items_always_shown); - for (i = 0; i < length; i++) { - w = hildon_button_new_with_text ( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - _(menu_array[i].display_name), ""); - g_signal_connect (w, "clicked", - G_CALLBACK (menu_array[i].callback), user_data); - g_object_set_data (G_OBJECT (menu), menu_array[i].id, w); - hildon_app_menu_append (menu, GTK_BUTTON (w)); - gtk_widget_show (w); - } - - menu_array = menu_items_selection_required; - length = G_N_ELEMENTS (menu_items_selection_required); - for (i = 0; i < length; i++) { - w = hildon_button_new_with_text ( - HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, - HILDON_BUTTON_ARRANGEMENT_VERTICAL, - menu_array[i].display_name, ""); - g_signal_connect (w, "clicked", - G_CALLBACK (menu_array[i].callback), user_data); - g_object_set_data (G_OBJECT (menu), menu_array[i].id, w); - hildon_app_menu_append (menu, GTK_BUTTON (w)); - gtk_widget_hide (w); - } - - gtk_widget_show (GTK_WIDGET (menu)); - - return GTK_WIDGET (menu); -} - static void contact_column_render_func (GtkCellLayout *cell_layout, GtkCellRenderer *renderer, diff --git a/src/milk-task-model.h b/src/milk-task-model.h index f86c8de..1ce3a28 100644 --- a/src/milk-task-model.h +++ b/src/milk-task-model.h @@ -67,6 +67,6 @@ struct _MilkTaskModelClass GType milk_task_model_get_type (void); -MilkTaskModel* milk_task_model_new (); +MilkTaskModel* milk_task_model_new (void); #endif /* _MILK_TASK_MODEL_H */ -- 1.7.9.5