diff options
Diffstat (limited to 'widgets/text')
-rw-r--r-- | widgets/text/Makefile.am | 7 | ||||
-rw-r--r-- | widgets/text/e-reflow.c | 4 | ||||
-rw-r--r-- | widgets/text/e-text.c | 11 |
3 files changed, 15 insertions, 7 deletions
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index 2577c6fe14..d7c62af74e 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -4,7 +4,7 @@ libetext_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ -DG_LOG_DOMAIN=\"e-text\" @@ -35,8 +35,9 @@ libetext_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(REGEX_LIBS) + $(REGEX_LIBS) \ + $(MATH_LIB) -include $(top_srcdir)/git.mk diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 02535d7b34..296d732590 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -746,8 +746,6 @@ column_width_changed (EReflow *reflow) g_signal_emit (reflow, signals[COLUMN_WIDTH_CHANGED], 0, reflow->column_width); } - - /* Virtual functions */ static void e_reflow_set_property (GObject *object, @@ -1400,7 +1398,7 @@ e_reflow_point (GnomeCanvasItem *item, gint cx, gint cy) { - GnomeCanvasItem *child; + GnomeCanvasItem *child = NULL; if (GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point) child = GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point (item, x, y, cx, cy); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index b57cec835d..d7afd1df5d 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -174,7 +174,16 @@ static gboolean e_text_delete_surrounding_cb (GtkIMContext *context, static GdkAtom clipboard_atom = GDK_NONE; - +static void +disconnect_im_context (EText *text) +{ + if (!text || !text->im_context) + return; + + g_signal_handlers_disconnect_matched ( + text->im_context, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, text); + text->im_context_signals_registered = FALSE; +} static void disconnect_im_context (EText *text) |