[goffice] Graphs: minor code cleanup and debug enhancement.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Graphs: minor code cleanup and debug enhancement.
- Date: Sun, 13 Apr 2014 21:26:56 +0000 (UTC)
commit 87bfe0f502447a6f9334d72a252b0fbe0e1d7614
Author: Morten Welinder <terra gnome org>
Date: Sun Apr 13 17:25:46 2014 -0400
Graphs: minor code cleanup and debug enhancement.
ChangeLog | 5 +++++
goffice/graph/gog-object.c | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index aa44acc..abf0d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-13 Morten Welinder <terra gnome org>
+
+ * goffice/graph/gog-object.c (cb_manual_size_changed): Use a
+ canonical gboolean as argument to gtk_widget_set_visible.
+
2014-04-13 Morten Welinder <terra gnome org>
* configure.ac: Post-release bump.
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index be0d188..0a22ffd 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -578,11 +578,11 @@ cb_manual_size_changed (GtkComboBox *combo, ObjectPrefState *state)
break;
}
gog_object_set_position_flags (state->gobj, pos, GOG_POSITION_ANY_MANUAL_SIZE);
- visible = pos & GOG_POSITION_MANUAL_W;
+ visible = (pos & GOG_POSITION_MANUAL_W) != 0;
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "width_label"), visible);
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "width_spin"), visible);
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "width-pc-lbl"), visible);
- visible = pos & GOG_POSITION_MANUAL_H;
+ visible = (pos & GOG_POSITION_MANUAL_H) != 0;
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "height_label"), visible);
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "height_spin"), visible);
gtk_widget_set_visible (go_gtk_builder_get_widget (state->gui, "height-pc-lbl"), visible);
@@ -1868,8 +1868,9 @@ gog_object_set_position_flags (GogObject *obj, GogObjectPosition flags, GogObjec
if ((flags & obj->role->allowable_positions) !=
(flags & (GOG_POSITION_COMPASS | GOG_POSITION_ANY_MANUAL |
GOG_POSITION_ANY_MANUAL_SIZE))) {
- g_warning ("[GogObject::set_position_flags] Invalid flags (%s)",
- gog_object_get_name (obj));
+ g_warning ("[GogObject::set_position_flags] Invalid flags (%s) flags=0x%x allowable=0x%x",
+ gog_object_get_name (obj),
+ flags, obj->role->allowable_positions);
return FALSE;
}
obj->position = (obj->position & ~mask) | (flags & mask);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]