From 9ed571f9de3e7f49e068071affb4c9204ba0527d Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 17 Dec 2001 19:41:25 +0000 Subject: Merging changes: 2001-11-28 Christopher James Lahey * gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_realize): Use an #ECanvasBackground here instead of a #GnomeCanvasRect. svn path=/trunk/; revision=15130 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/widgets/e-minicard-view-widget.c | 24 +++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 7baceea223..8a0c4a9732 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2001-11-28 Christopher James Lahey + + * gui/widgets/e-minicard-view-widget.c + (e_minicard_view_widget_realize): Use an #ECanvasBackground here + instead of a #GnomeCanvasRect. + 2001-12-16 Jon Trowbridge * gui/component/select-names/e-select-names-completion.c: Added diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 5dd8393ca0..145c5cecce 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "e-minicard-view-widget.h" @@ -124,7 +124,6 @@ static void e_minicard_view_widget_init (EMinicardViewWidget *view) { view->emv = NULL; - view->rect = NULL; view->book = NULL; view->query = NULL; @@ -223,15 +222,10 @@ e_minicard_view_widget_realize (GtkWidget *widget) { EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget); - view->rect = gnome_canvas_item_new( - gnome_canvas_root( GNOME_CANVAS(view) ), - gnome_canvas_rect_get_type(), - "x1", (double) 0, - "y1", (double) 0, - "x2", (double) 100, - "y2", (double) 100, - "fill_color", "white", - NULL ); + gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS(view) ), + e_canvas_background_get_type(), + "fill_color", "white", + NULL ); view->emv = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS(view) ), @@ -273,10 +267,6 @@ e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocatio NULL); width = MAX(width, allocation->width); gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1); - gnome_canvas_item_set( view->rect, - "x2", (double) width, - "y2", (double) allocation->height, - NULL ); } } @@ -294,10 +284,6 @@ e_minicard_view_widget_reflow(ECanvas *canvas) NULL); width = MAX(width, GTK_WIDGET(canvas)->allocation.width); gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1); - gnome_canvas_item_set( view->rect, - "x2", (double) width, - "y2", (double) GTK_WIDGET(canvas)->allocation.height, - NULL ); } static void -- cgit v1.2.3