diff options
| author | Jon Trowbridge <trow@ximian.com> | 2001-07-25 15:27:04 +0800 |
|---|---|---|
| committer | Jon Trowbridge <trow@src.gnome.org> | 2001-07-25 15:27:04 +0800 |
| commit | 109c8d5aa6bece62bf80c281111975bf70784f02 (patch) | |
| tree | 0ac6202663b4205fb68978e158b4d84f5b2ce57d | |
| parent | fc49986ee1e24c28eced9cdff1813ea34ee68755 (diff) | |
| download | gsoc2013-evolution-109c8d5aa6bece62bf80c281111975bf70784f02.tar.gz gsoc2013-evolution-109c8d5aa6bece62bf80c281111975bf70784f02.tar.zst gsoc2013-evolution-109c8d5aa6bece62bf80c281111975bf70784f02.zip | |
Properly ref the font we pass in as an ARG_FONT_E. (_do_tooltip): Removed
2001-07-25 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-text.c (e_text_set_arg): Properly ref the font we
pass in as an ARG_FONT_E.
(_do_tooltip): Removed some crack. We no longer have to manually
ref the font. The ref-counting now happens inside the set_arg
function, as it should.
(e_text_destroy): Set text->font to NULL after unrefing it.
2001-07-25 Jon Trowbridge <trow@ximian.com>
* e-cell-text.c (ect_unrealize): Set text_view->font to NULL
after we unref it.
svn path=/trunk/; revision=11393
| -rw-r--r-- | widgets/table/e-cell-text.c | 1 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 8fcfd35173..ded6e93c0d 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -394,6 +394,7 @@ ect_unrealize (ECellView *ecv) if (text_view->font) e_font_unref (text_view->font); + text_view->font = NULL; if (text_view->stipple) gdk_bitmap_unref (text_view->stipple); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index f56e9fea55..b0dd3261e7 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -476,6 +476,7 @@ e_text_destroy (GtkObject *object) if (text->font) e_font_unref (text->font); + text->font = NULL; #if 0 if (text->suckfont) @@ -1265,6 +1266,7 @@ e_text_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) e_font_unref (text->font); text->font = GTK_VALUE_POINTER (*arg); + e_font_ref (text->font); calc_ellipsis (text); if (text->line_wrap) @@ -2797,9 +2799,6 @@ _do_tooltip (gpointer data) "fill_color", "light gray", NULL); - /* Ref the font so that it is not destroyed - when the tooltip text is destroyed */ - e_font_ref (text->font); tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)), e_text_get_type (), "anchor", GTK_ANCHOR_NW, |