mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Merge branch 'master' into python-renderer

Browse Source
This commit is contained in:
Mario Hüttel 2020-04-03 20:55:46 +02:00
commit 921b55b962
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cell-selector/lib-cell-renderer.c
View File

@ -88,11 +88,13 @@ static void lib_cell_renderer_set_property(GObject *object,
g_value_init(&val, G_TYPE_STRING); g_value_init(&val, G_TYPE_STRING);
g_value_set_string(&val, ((struct gds_library *)g_value_get_pointer(value))->name); g_value_set_string(&val, ((struct gds_library *)g_value_get_pointer(value))->name);
g_object_set_property(object, "text", &val); g_object_set_property(object, "text", &val);
g_value_unset(&val);
break; break;
case PROP_CELL: case PROP_CELL:
g_value_init(&val, G_TYPE_STRING); g_value_init(&val, G_TYPE_STRING);
g_value_set_string(&val, ((struct gds_cell *)g_value_get_pointer(value))->name); g_value_set_string(&val, ((struct gds_cell *)g_value_get_pointer(value))->name);
g_object_set_property(object, "text", &val); g_object_set_property(object, "text", &val);
g_value_unset(&val);
break; break;
case PROP_ERROR_LEVEL: case PROP_ERROR_LEVEL:
/* Set cell color according to error level */ /* Set cell color according to error level */
@ -100,6 +102,7 @@ static void lib_cell_renderer_set_property(GObject *object,
convert_error_level_to_color(&color, g_value_get_uint(value)); convert_error_level_to_color(&color, g_value_get_uint(value));
g_value_set_boxed(&val, &color); g_value_set_boxed(&val, &color);
g_object_set_property(object, "foreground-rgba", &val); g_object_set_property(object, "foreground-rgba", &val);
g_value_unset(&val);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec);

5
output-renderers/gds-output-renderer.c
View File

@ -100,6 +100,11 @@ static void gds_output_renderer_dispose(GObject *self_obj)
if (priv->output_file) if (priv->output_file)
g_free(priv->output_file); g_free(priv->output_file);
if (priv->idle_function_parameters.status_message) {
g_free(priv->idle_function_parameters.status_message);
priv->idle_function_parameters.status_message = NULL;
}
g_clear_object(&priv->layer_settings); g_clear_object(&priv->layer_settings);
/* Chain up to parent class */ /* Chain up to parent class */