diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
| commit | a55021bcef7eb082b48e56aac361bd35a3a77b64 (patch) | |
| tree | 9bcf1c1bbf522c87beac5d199b258f8aa24c7d7e /addressbook | |
| parent | ead63f16b2269325c1e4080b3dce8818bbafe189 (diff) | |
| download | gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.gz gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.zst gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.zip | |
Revert "Fix all remaining GTK3 issues."
This reverts commit fd8b55edaa88906b588aa07d9eadcacd34a7a774.
Something in this commit seriously hosed ETable, making Evolution pretty
much unusable. Reverting this until I can track down the problem.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/widgets/e-minicard-label.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-minicard.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 5c1eba1f43..0eb166bcf3 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -414,9 +414,7 @@ e_minicard_label_resize_children(EMinicardLabel *e_minicard_label) static void set_colors (EMinicardLabel *label) { - GnomeCanvasItem *item = GNOME_CANVAS_ITEM (label); - - if ((item->flags & GNOME_CANVAS_ITEM_REALIZED)) { + if ((GTK_OBJECT_FLAGS (label) & GNOME_CANVAS_ITEM_REALIZED)) { GnomeCanvas *canvas; GtkStyle *style; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 92a415b88f..213d600746 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -321,7 +321,7 @@ e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, G if (e_minicard->width != g_value_get_double (value)) { e_minicard->width = g_value_get_double (value); e_minicard_resize_children(e_minicard); - if (item->flags & GNOME_CANVAS_ITEM_REALIZED) + if (GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) e_canvas_item_request_reflow(item); } break; @@ -467,9 +467,7 @@ e_minicard_finalize (GObject *object) static void e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style) { - GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard); - - if ((item->flags & GNOME_CANVAS_ITEM_REALIZED)) + if ((GTK_OBJECT_FLAGS( minicard ) & GNOME_CANVAS_ITEM_REALIZED)) set_selected (minicard, minicard->selected); } @@ -912,12 +910,9 @@ get_left_width (EMinicard *e_minicard, gboolean is_list) static void remodel( EMinicard *e_minicard ) { - GnomeCanvasItem *item = GNOME_CANVAS_ITEM (e_minicard); gint count = 0; - - if (!(item->flags & GNOME_CANVAS_ITEM_REALIZED)) + if (!(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED)) return; - if (e_minicard->contact) { EContactField field; GList *list; @@ -1017,8 +1012,7 @@ static void e_minicard_reflow(GnomeCanvasItem *item, gint flags) { EMinicard *e_minicard = E_MINICARD(item); - - if (item->flags & GNOME_CANVAS_ITEM_REALIZED) { + if (GTK_OBJECT_FLAGS (e_minicard) & GNOME_CANVAS_ITEM_REALIZED) { GList *list; gdouble text_height; gint old_height; |