aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/minicard/e-minicard.c2
-rw-r--r--addressbook/gui/minicard/e-reflow-sorted.c7
-rw-r--r--addressbook/gui/widgets/e-minicard.c2
-rw-r--r--widgets/e-reflow/e-reflow-sorted.c7
5 files changed, 14 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c0564bbffc..37c2a1c09d 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2000-05-09 Christopher James Lahey <clahey@helixcode.com>
+ * gui/minicard/e-minicard.c: Reenable editting.
+
+ * gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
+
+2000-05-09 Christopher James Lahey <clahey@helixcode.com>
+
* gui/component/addressbook.c: Destroy the view object when
leaving the minicard view.
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,
diff --git a/widgets/e-reflow/e-reflow-sorted.c b/widgets/e-reflow/e-reflow-sorted.c
index a261ad7172..415537825b 100644
--- a/widgets/e-reflow/e-reflow-sorted.c
+++ b/widgets/e-reflow/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));
}
}
}