aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/widgets/e-minicard.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 80d5610387..7244a91562 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-05 Christopher James Lahey <clahey@ximian.com>
+
+ * gui/widgets/e-minicard.c (e_minicard_event): Call
+ e_minicard_selected in the GDK_BUTTON_RELEASE case here.
+ (e_minicard_drag_begin): Set E_REFLOW (parent)->maybe_in_drag =
+ FALSE if it's an EReflow.
+
2002-06-04 Christopher James Lahey <clahey@ximian.com>
* gui/component/select-names/e-select-names-completion.c
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index d8e34577b2..76761f9515 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -564,6 +564,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
break;
}
case GDK_BUTTON_RELEASE:
+ e_minicard_selected(e_minicard, event);
if (e_minicard->drag_button == event->button.button) {
e_minicard->drag_button = 0;
e_minicard->drag_button_down = FALSE;
@@ -989,8 +990,14 @@ static gint
e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)
{
gint ret_val = 0;
+ GnomeCanvasItem *parent;
gtk_signal_emit (GTK_OBJECT(minicard),
e_minicard_signals[DRAG_BEGIN],
event, &ret_val);
+
+ parent = GNOME_CANVAS_ITEM (minicard)->parent;
+ if (parent && E_IS_REFLOW (parent)) {
+ E_REFLOW (parent)->maybe_in_drag = FALSE;
+ }
return ret_val;
}