[evolution] Correct mismatch of gtk_style_context_save() and gtk_style_context_restore()



commit 5bc33f0aa137b709669590bd6db67830bf1a92e4
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 8 15:15:07 2015 +0200

    Correct mismatch of gtk_style_context_save() and gtk_style_context_restore()

 e-util/e-table-header-utils.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/e-util/e-table-header-utils.c b/e-util/e-table-header-utils.c
index 371d173..1430db6 100644
--- a/e-util/e-table-header-utils.c
+++ b/e-util/e-table-header-utils.c
@@ -174,6 +174,7 @@ e_table_header_draw_button (cairo_t *cr,
                (padding.top + padding.bottom + 2 * HEADER_PADDING);
 
        if (inner_width < 1 || inner_height < 1) {
+               gtk_style_context_restore (context);
                return; /* nothing fits */
        }
 
@@ -195,8 +196,9 @@ e_table_header_draw_button (cairo_t *cr,
                        inner_width -= arrow_width + HEADER_PADDING;
                break;
        default:
-               cairo_restore (cr);
-               g_return_if_reached ();
+               gtk_style_context_restore (context);
+               g_warn_if_reached ();
+               return;
        }
 
        if (inner_width < 1) {
@@ -275,10 +277,9 @@ e_table_header_draw_button (cairo_t *cr,
                break;
        }
 
-       /* coverity[dead_error_begin] */
        default:
-               cairo_restore (cr);
-               g_return_if_reached ();
+               g_warn_if_reached ();
+               break;
        }
 
        g_object_unref (layout);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]