From 627ae5c6cada568578ed99160fc9ac9031eaa148 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 9 May 2000 17:26:07 +0000 Subject: Reenable editting. 2000-05-09 Christopher James Lahey * gui/minicard/e-minicard.c: Reenable editting. * gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion. svn path=/trunk/; revision=2954 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/minicard/e-minicard.c | 2 -- addressbook/gui/minicard/e-reflow-sorted.c | 7 ++++--- addressbook/gui/widgets/e-minicard.c | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c0564bbffc..37c2a1c09d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-05-09 Christopher James Lahey + + * gui/minicard/e-minicard.c: Reenable editting. + + * gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion. + 2000-05-09 Christopher James Lahey * gui/component/addressbook.c: Destroy the view object when diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c index 73eed600c4..7b7b1bcbe5 100644 --- a/addressbook/gui/minicard/e-minicard.c +++ b/addressbook/gui/minicard/e-minicard.c @@ -337,7 +337,6 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) NULL ); e_minicard->has_focus = TRUE; } else { -#if 0 EBook *book; e_card_simple_sync_card(e_minicard->simple); @@ -351,7 +350,6 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard->card, card_changed_cb, NULL); -#endif gnome_canvas_item_set( e_minicard->rect, "outline_color", NULL, diff --git a/addressbook/gui/minicard/e-reflow-sorted.c b/addressbook/gui/minicard/e-reflow-sorted.c index a261ad7172..415537825b 100644 --- a/addressbook/gui/minicard/e-reflow-sorted.c +++ b/addressbook/gui/minicard/e-reflow-sorted.c @@ -170,7 +170,7 @@ e_reflow_sorted_remove_item(EReflowSorted *e_reflow_sorted, const gchar *id) gtk_object_unref(GTK_OBJECT(item)); gtk_object_destroy(GTK_OBJECT(item)); if ( GTK_OBJECT_FLAGS( e_reflow_sorted ) & GNOME_CANVAS_ITEM_REALIZED ) { - e_canvas_item_request_reflow(item); + e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted)); } } } @@ -211,7 +211,7 @@ e_reflow_sorted_reorder_item(EReflowSorted *e_reflow_sorted, const gchar *id) gtk_object_unref(GTK_OBJECT(item)); g_list_free_1(list); e_reflow_sorted_add_item(reflow, item); - e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(reflow)); + e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted)); } } @@ -227,7 +227,8 @@ e_reflow_sorted_add_item(EReflow *reflow, GnomeCanvasItem *item) gnome_canvas_item_set(item, "width", (double) reflow->column_width, NULL); - e_canvas_item_request_reflow(item); + + e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_reflow_sorted)); } } } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 73eed600c4..7b7b1bcbe5 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -337,7 +337,6 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) NULL ); e_minicard->has_focus = TRUE; } else { -#if 0 EBook *book; e_card_simple_sync_card(e_minicard->simple); @@ -351,7 +350,6 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) e_minicard->card, card_changed_cb, NULL); -#endif gnome_canvas_item_set( e_minicard->rect, "outline_color", NULL, -- cgit v1.2.3