aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-14 01:50:49 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-06-15 00:55:49 +0800
commitfd8b55edaa88906b588aa07d9eadcacd34a7a774 (patch)
tree14fe95f503fefe738465ff4a734671afec0efb57 /widgets/text
parente8a1662875e3e957d96d4f60cb8b5664ee4f74b3 (diff)
downloadgsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.gz
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.bz2
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.lz
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.xz
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.zst
gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.zip
Fix all remaining GTK3 issues.
Work around the issue of GnomeCanvasItem amending its own flags to GtkObject::flags (which is sealed) by giving it its own flags field. This breaks libgnomecanvas ABI and API, but I see no other way.
Diffstat (limited to 'widgets/text')
-rw-r--r--widgets/text/e-reflow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 4e3f36fd19..b35856808c 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -730,14 +730,14 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar
break;
case PROP_MINIMUM_WIDTH:
reflow->minimum_width = g_value_get_double (value);
- if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(object))
+ if (item->flags & GNOME_CANVAS_ITEM_REALIZED)
set_empty(reflow);
e_canvas_item_request_reflow(item);
break;
case PROP_EMPTY_MESSAGE:
g_free(reflow->empty_message);
reflow->empty_message = g_strdup(g_value_get_string (value));
- if (GNOME_CANVAS_ITEM_REALIZED & GTK_OBJECT_FLAGS(object))
+ if (item->flags & GNOME_CANVAS_ITEM_REALIZED)
set_empty(reflow);
break;
case PROP_MODEL:
@@ -1382,7 +1382,7 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags )
gint next_column;
gint i;
- if (!(GTK_OBJECT_FLAGS (reflow) & GNOME_CANVAS_ITEM_REALIZED))
+ if (!(item->flags & GNOME_CANVAS_ITEM_REALIZED))
return;
if (reflow->need_reflow_columns) {