From bbb885a11629ced993c43daca24d5be87934e685 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 27 Nov 2002 06:32:23 +0000 Subject: add include for gtkstock.h. 2002-11-26 Chris Toshok * gui/contact-editor/e-contact-quick-add.c: add include for gtkstock.h. * gui/contact-list-editor/e-contact-list-model.c (e_contact_list_model_add_destination): add pre_change call. (e_contact_list_model_remove_row): same. (e_contact_list_model_remove_all): same. * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_new): ref/sink the contact list editor so we don't get the floating unref warning from gtk. * gui/contact-editor/e-contact-editor.c (e_contact_editor_new): ref/sink the contact editor so we don't get the floating unref warning from gtk. (e_contact_editor_init): use g_build_filename instead of g_concat_dir_and_file. * gui/widgets/e-minicard-label.c (e_minicard_label_resize_children): use MAX (value, 0) to make sure we aren't passing negative values for clip-widths. * gui/widgets/e-minicard.c (e_minicard_realize): use MAX (value, 0) to make sure we aren't passing negative values for widths. * gui/contact-editor/e-contact-editor.c (e_contact_editor_init): use g_build_filename. svn path=/trunk/; revision=18946 --- addressbook/gui/widgets/e-minicard-label.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 7fef48a63b..241293bfe9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -451,10 +451,10 @@ e_minicard_label_resize_children(EMinicardLabel *e_minicard_label) left_width = e_minicard_label->width / 2 - 4; gnome_canvas_item_set( e_minicard_label->fieldname, - "clip_width", (double) ( left_width ), + "clip_width", (double) MAX ( left_width, 0 ), NULL ); gnome_canvas_item_set( e_minicard_label->field, - "clip_width", (double) ( e_minicard_label->width - 8 - left_width ), + "clip_width", (double) MAX ( e_minicard_label->width - 8 - left_width, 0 ), NULL ); } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 7f21f88f31..4cd5bd67f9 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -446,8 +446,8 @@ e_minicard_realize (GnomeCanvasItem *item) gnome_canvas_rect_get_type(), "x1", (double) 0, "y1", (double) 0, - "x2", (double) e_minicard->width - 1, - "y2", (double) e_minicard->height - 1, + "x2", (double) MAX (e_minicard->width - 1, 0), + "y2", (double) MAX (e_minicard->height - 1, 0), "outline_color", NULL, NULL ); @@ -456,8 +456,8 @@ e_minicard_realize (GnomeCanvasItem *item) gnome_canvas_rect_get_type(), "x1", (double) 2, "y1", (double) 2, - "x2", (double) e_minicard->width - 3, - "y2", (double) e_minicard->height - 3, + "x2", (double) MAX (e_minicard->width - 3, 0), + "y2", (double) MAX (e_minicard->height - 3, 0), "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL], NULL ); @@ -465,7 +465,7 @@ e_minicard_realize (GnomeCanvasItem *item) gnome_canvas_item_new( group, e_text_get_type(), "anchor", GTK_ANCHOR_NW, - "width", (double) ( e_minicard->width - 12 ), + "width", (double) MAX( e_minicard->width - 12, 0 ), "clip", TRUE, "use_ellipsis", TRUE, #if 0 -- cgit