aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/table')
-rw-r--r--widgets/table/Makefile.am6
-rw-r--r--widgets/table/e-table-header-item.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 836a1dd570..c507770290 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -9,8 +9,9 @@ glade_DATA = \
e-table-field-chooser.glade
INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/widgets \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
+ $(E_UTIL_CFLAGS) \
$(E_WIDGETS_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
@@ -147,6 +148,7 @@ libetable_la_LIBADD = \
$(WIN32_BOOTSTRAP_LIBS) \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/a11y/libevolution-a11y.la \
+ $(E_UTIL_LIBS) \
$(E_WIDGETS_LIBS) \
$(GNOME_PLATFORM_LIBS)
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 7aa7a92351..6cbab3405e 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -913,7 +913,10 @@ ethi_unrealize (GnomeCanvasItem *item)
{
ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
- pango_font_description_free (ethi->font_desc);
+ if (ethi->font_desc != NULL) {
+ pango_font_description_free (ethi->font_desc);
+ ethi->font_desc = NULL;
+ }
g_signal_handler_disconnect (item->canvas, ethi->drag_motion_id);
g_signal_handler_disconnect (item->canvas, ethi->drag_leave_id);