set the im_context on the field's EText. (e_minicard_label_event): remove

2003-04-03  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): set
	the im_context on the field's EText.
	(e_minicard_label_event): remove a huge swath of #if 0'd code.

svn path=/trunk/; revision=20663

2 files changed, 7 insertions, 46 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2cda395415..65d504ecc1 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
 2003-04-03  Chris Toshok  <toshok@ximian.com>
 
+	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): set
+	the im_context on the field's EText.
+	(e_minicard_label_event): remove a huge swath of #if 0'd code.
+
+2003-04-03  Chris Toshok  <toshok@ximian.com>
+
 	[ fixes bug #40715 ]
 	* gui/merging/e-card-merging.c (final_id_cb): add this callback,
 	to unref the book/free the closure after calling the user's
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 21ace85c60..93dfd68e55 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -308,6 +308,7 @@ e_minicard_label_construct (GnomeCanvasItem *item)
 				 "fill_color", "black",
 				 "editable", e_minicard_label->editable,
 				 "draw_background", FALSE,
+				 "im_context", E_CANVAS (item->canvas)->im_context,
 				 NULL );
 	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
 
@@ -376,52 +377,6 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY: {
 	    gboolean return_val;
-#if 0
-	    GnomeCanvasItem *field;
-	    ArtPoint p;
-	    double inv[6], affine[6];
-	    
-	    field = e_minicard_label->field;
-	    art_affine_identity (affine);
-	    
-	    if (field->xform != NULL) {
-		    if (field->object.flags & GNOME_CANVAS_ITEM_AFFINE_FULL) {
-			    art_affine_multiply (affine, affine, field->xform);
-		    } else {
-			    affine[4] += field->xform[0];
-			    affine[5] += field->xform[1];
-		    }
-	    }
-	    
-	    art_affine_invert (inv, affine);
-	    switch(event->type) {
-	    case GDK_MOTION_NOTIFY:
-		    p.x = event->motion.x;
-		    p.y = event->motion.y;
-		    art_affine_point (&p, &p, inv);
-		    event->motion.x = p.x;
-		    event->motion.y = p.y;
-		    break;
-	    case GDK_BUTTON_PRESS:
-	    case GDK_BUTTON_RELEASE:
-		    p.x = event->button.x;
-		    p.y = event->button.y;
-		    art_affine_point (&p, &p, inv);
-		    event->button.x = p.x;
-		    event->button.y = p.y;
-		    break;
-	    case GDK_ENTER_NOTIFY:
-	    case GDK_LEAVE_NOTIFY:
-		    p.x = event->crossing.x;
-		    p.y = event->crossing.y;
-		    art_affine_point (&p, &p, inv);
-		    event->crossing.x = p.x;
-		    event->crossing.y = p.y;
-		    break;
-	    default:
-		    break;
-	    }
-#endif	    
 	    g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
 	    return return_val;
 	    break;