diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-01-12 01:36:52 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-01-12 01:36:52 -0500 |
| commit | 146b8bc6e2acd34fec8f98a3946f1b1e9e316a21 (patch) | |
| tree | 9864c3811aec2d55166725b97e6e7dc43fb2cdb1 | |
| parent | 8ab0bb6d55824b7a7728d7e5d4dd782785b21540 (diff) | |
[draw] Cleanup ->started counting
| -rw-r--r-- | src/vtedraw.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/vtedraw.c b/src/vtedraw.c index f796b3c..7f085bd 100644 --- a/src/vtedraw.c +++ b/src/vtedraw.c @@ -839,10 +839,10 @@ _vte_draw_start (struct _vte_draw *draw) _vte_debug_print (VTE_DEBUG_DRAW, "draw_start\n"); - g_object_ref (draw->widget->window); - - if (draw->started == 0) + if (draw->started == 0) { + g_object_ref (draw->widget->window); draw->cr = gdk_cairo_create (draw->widget->window); + } draw->started++; } @@ -850,17 +850,15 @@ _vte_draw_start (struct _vte_draw *draw) void _vte_draw_end (struct _vte_draw *draw) { - g_return_if_fail (draw->started == TRUE); - g_assert (draw->started > 0); + g_return_if_fail (draw->started); draw->started--; if (draw->started == 0) { cairo_destroy (draw->cr); draw->cr = NULL; + g_object_unref (draw->widget->window); } - g_object_unref (draw->widget->window); - _vte_debug_print (VTE_DEBUG_DRAW, "draw_end\n"); } @@ -1114,7 +1112,7 @@ _vte_draw_text (struct _vte_draw *draw, struct _vte_draw_text_request *requests, gsize n_requests, GdkColor *color, guchar alpha, gboolean bold) { - g_return_if_fail (draw->started == TRUE); + g_return_if_fail (draw->started); if (_vte_debug_on (VTE_DEBUG_DRAW)) { GString *string = g_string_new (""); @@ -1189,7 +1187,7 @@ _vte_draw_draw_rectangle (struct _vte_draw *draw, gint x, gint y, gint width, gint height, GdkColor *color, guchar alpha) { - g_return_if_fail (draw->started == TRUE); + g_return_if_fail (draw->started); _vte_debug_print (VTE_DEBUG_DRAW, "draw_rectangle (%d, %d, %d, %d, color=(%d,%d,%d,%d))\n", @@ -1209,7 +1207,7 @@ _vte_draw_fill_rectangle (struct _vte_draw *draw, gint x, gint y, gint width, gint height, GdkColor *color, guchar alpha) { - g_return_if_fail (draw->started == TRUE); + g_return_if_fail (draw->started); _vte_debug_print (VTE_DEBUG_DRAW, "draw_fill_rectangle (%d, %d, %d, %d, color=(%d,%d,%d,%d))\n", |