diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-28 21:29:35 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-28 21:29:35 +0000 |
| commit | 1d926d1c2010fea85264f26c21e7c3be0c7fb5ab (patch) | |
| tree | 679551493226b49f8a8854dd7e0d7d53b2058ef0 /src | |
| parent | Filters. New Channel transparency and Cross blur custom predefined filters. (diff) | |
| download | inkscape-1d926d1c2010fea85264f26c21e7c3be0c7fb5ab.tar.gz inkscape-1d926d1c2010fea85264f26c21e7c3be0c7fb5ab.zip | |
fix for build error when not returning a value in libgdl & minor style edit.
(bzr r10510)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ege-select-one-action.cpp | 2 | ||||
| -rw-r--r-- | src/libgdl/gdl-dock-item-button-image.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp index e0130a68d..047a65868 100644 --- a/src/ege-select-one-action.cpp +++ b/src/ege-select-one-action.cpp @@ -758,7 +758,7 @@ GtkWidget* create_tool_item( GtkAction* action ) GtkWidget *normal = (act->private_data->selectionMode == SELECTION_OPEN) ? gtk_combo_box_entry_new_with_model( act->private_data->model, act->private_data->labelColumn ) : gtk_combo_box_new_with_model( act->private_data->model ); - if ((act->private_data->selectionMode == SELECTION_OPEN)) { + if (act->private_data->selectionMode == SELECTION_OPEN) { GtkWidget *child = gtk_bin_get_child( GTK_BIN(normal) ); if (GTK_IS_ENTRY(child)) { int maxUsed = scan_max_width( act->private_data->model, act->private_data->labelColumn ); diff --git a/src/libgdl/gdl-dock-item-button-image.c b/src/libgdl/gdl-dock-item-button-image.c index f115c652c..ce5c33ea6 100644 --- a/src/libgdl/gdl-dock-item-button-image.c +++ b/src/libgdl/gdl-dock-item-button-image.c @@ -49,7 +49,7 @@ gdl_dock_item_button_image_expose (GtkWidget *widget, cairo_set_line_width(cr, 1.0); style = gtk_widget_get_style (widget); - g_return_if_fail (style != NULL); + g_return_val_if_fail (style != NULL, 0); color = &style->fg[GTK_STATE_NORMAL]; cairo_set_source_rgba(cr, color->red / 65535.0, color->green / 65535.0, color->blue / 65535.0, 0.55); |