diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-07-24 04:34:03 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-07-24 04:34:03 +0800 |
| commit | 6095a951335a4edc3d9ed8f9e31913f8413decfa (patch) | |
| tree | 3738aa0f2f9b4263d56e158480195c224ef38eee | |
| parent | a8a443d6d467916af929c51e0f991b423bc8c07f (diff) | |
| download | gsoc2013-evolution-6095a951335a4edc3d9ed8f9e31913f8413decfa.tar.gz gsoc2013-evolution-6095a951335a4edc3d9ed8f9e31913f8413decfa.tar.zst gsoc2013-evolution-6095a951335a4edc3d9ed8f9e31913f8413decfa.zip | |
Remove the idle handler when we're destroyed.
2000-07-23 Christopher James Lahey <clahey@helixcode.com>
* backend/ebook/e-book-view-listener.c: Remove the idle handler
when we're destroyed.
* printing/e-contact-print.c: Fixed the spacing on the card
header.
svn path=/trunk/; revision=4287
| -rw-r--r-- | addressbook/ChangeLog | 13 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-book-view-listener.c | 3 | ||||
| -rw-r--r-- | addressbook/printing/e-contact-print.c | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d141032bad..65abc05580 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,9 +1,18 @@ +2000-07-23 Christopher James Lahey <clahey@helixcode.com> + + * backend/ebook/e-book-view-listener.c: Remove the idle handler + when we're destroyed. + + * printing/e-contact-print.c: Fixed the spacing on the card + header. + 2000-07-20 Christopher James Lahey <clahey@helixcode.com> * gui/component/addressbook.oafinfo: Fixed the oaf info. - * gui/minicard/.cvsignore, gui/minicard/Makefile.am: Added a test - for the minicard widget. + * gui/minicard/.cvsignore, gui/minicard/Makefile.am, + gui/minicard/e-minicard-widget-test.c: Added a test for the + minicard widget. * gui/minicard/e-minicard-control.c: Fixed the mime type. diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c index 71f942798a..be871d65d7 100644 --- a/addressbook/backend/ebook/e-book-view-listener.c +++ b/addressbook/backend/ebook/e-book-view-listener.c @@ -283,6 +283,9 @@ e_book_view_listener_destroy (GtkObject *object) EBookViewListener *listener = E_BOOK_VIEW_LISTENER (object); GList *l; + if (listener->priv->idle_id) + g_source_remove(listener->priv->idle_id); + for (l = listener->priv->response_queue; l != NULL; l = l->next) { EBookViewListenerResponse *resp = l->data; if (resp->id) diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 55a72e0e11..00a32f0d57 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -270,7 +270,7 @@ e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gcha { int line_count = e_contact_divide_text(pc, font, width, text, NULL); return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) + - line_count * .2 * font->size; + (line_count - 1) * .2 * font->size; } #if 0 @@ -454,7 +454,7 @@ e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt) "file_as", &file_as, NULL); if (ctxt->style->print_using_grey) - e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + ctxt->style->headings_font->size * .2, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - ctxt->style->headings_font->size * .2, .85, .85, .85); + e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + ctxt->style->headings_font->size * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - ctxt->style->headings_font->size * .3, .85, .85, .85); e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as); ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as); ctxt->y -= ctxt->style->headings_font->size * .2; |