diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index 606a31d6ba..d988f0da22 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -589,7 +589,10 @@ gdk_frame_clock_paint_idle (void *data) { if (priv->phase != GDK_FRAME_CLOCK_PHASE_LAYOUT && (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)) - timings->layout_start_time = g_get_monotonic_time (); + { + if (timings) + timings->layout_start_time = g_get_monotonic_time (); + } } priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT; @@ -618,7 +621,10 @@ gdk_frame_clock_paint_idle (void *data) { if (priv->phase != GDK_FRAME_CLOCK_PHASE_PAINT && (priv->requested & GDK_FRAME_CLOCK_PHASE_PAINT)) - timings->paint_start_time = g_get_monotonic_time (); + { + if (timings) + timings->paint_start_time = g_get_monotonic_time (); + } } priv->phase = GDK_FRAME_CLOCK_PHASE_PAINT; diff --git a/gsk/gskpathbuilder.c b/gsk/gskpathbuilder.c index ebb5a9dcf7..9dafa15cb2 100644 --- a/gsk/gskpathbuilder.c +++ b/gsk/gskpathbuilder.c @@ -1414,7 +1414,6 @@ gsk_path_builder_svg_arc_to (GskPathBuilder *self, n_segs = ceil (fabs (delta_theta / (M_PI_2 + 0.001))); d_theta = delta_theta / n_segs; - theta = theta1; _sincos (theta1, &sin_th1, &cos_th1); th_half = d_theta / 2; diff --git a/tests/testlistview.c b/tests/testlistview.c index d29ad88a06..cab7bc9a7e 100644 --- a/tests/testlistview.c +++ b/tests/testlistview.c @@ -553,7 +553,6 @@ update_statusbar (GtkStatusbar *statusbar) g_string_append_printf (string, " (%u directories remaining)", active + g_slist_length (pending)); result = G_SOURCE_CONTINUE; } - result = G_SOURCE_CONTINUE; gtk_statusbar_push (statusbar, 0, string->str); g_free (string->str); diff --git a/testsuite/gsk/replay-node.c b/testsuite/gsk/replay-node.c index ae03794d39..b676e8d13f 100644 --- a/testsuite/gsk/replay-node.c +++ b/testsuite/gsk/replay-node.c @@ -38,7 +38,7 @@ replay_linear_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot) graphene_rect_t bounds; const graphene_point_t *start_point, *end_point; const GskColorStop *stops; - gsize n_stops; + gsize n_stops = 0; gsk_render_node_get_bounds (node, &bounds); start_point = gsk_linear_gradient_node_get_start (node); @@ -65,7 +65,7 @@ replay_radial_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot) float vradius = gsk_radial_gradient_node_get_vradius (node); float start = gsk_radial_gradient_node_get_start (node); float end = gsk_radial_gradient_node_get_end (node); - gsize n_stops; + gsize n_stops = 0; const GskColorStop *stops = gsk_radial_gradient_node_get_color_stops (node, &n_stops); @@ -86,7 +86,7 @@ replay_conic_gradient_node (GskRenderNode *node, GtkSnapshot *snapshot) gsk_render_node_get_bounds (node, &bounds); const graphene_point_t *center = gsk_conic_gradient_node_get_center (node); float rotation = gsk_conic_gradient_node_get_rotation (node); - gsize n_stops; + gsize n_stops = 0; const GskColorStop *stops = gsk_conic_gradient_node_get_color_stops (node, &n_stops); diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index f3a7007337..2a9895b203 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -2000,7 +2000,6 @@ test_pango_attributes (void) /* Test errors are set */ builder = gtk_builder_new (); gtk_builder_add_from_string (builder, err_buffer1, -1, &error); - label = gtk_builder_get_object (builder, "label1"); g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_MISSING_ATTRIBUTE); g_object_unref (builder); g_error_free (error); @@ -2008,8 +2007,6 @@ test_pango_attributes (void) builder = gtk_builder_new (); gtk_builder_add_from_string (builder, err_buffer2, -1, &error); - label = gtk_builder_get_object (builder, "label1"); - g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE); g_object_unref (builder); g_error_free (error); diff --git a/testsuite/gtk/label.c b/testsuite/gtk/label.c index fa0687cf49..5ff621c490 100644 --- a/testsuite/gtk/label.c +++ b/testsuite/gtk/label.c @@ -46,7 +46,10 @@ print_attribute (PangoAttribute *attr, GString *string) g_free (text); } else if ((shape = pango_attribute_as_shape (attr)) != NULL) - g_string_append_printf (string, "shape"); + { + g_assert_true (shape != NULL); + g_string_append_printf (string, "shape"); + } else g_assert_not_reached (); }