Check tooltip is valid utf8 before showing it

2005-09-27  Marco Pesenti Gritti  <mpg@redhat.com>

        * shell/ev-view.c: (handle_link_over_xy):

        Check tooltip is valid utf8 before showing it

diff --git a/ChangeLog b/ChangeLog
index 47a6dcc9ead9232bc22cc82aed3b06dd1304e445..7577d805789a72d9f5e2097537466949e58b67f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-27  Marco Pesenti Gritti  <mpg@redhat.com>
+
+       * shell/ev-view.c: (handle_link_over_xy):
+
+       Check tooltip is valid utf8 before showing it
+
 2005-09-27  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-view.c: Allow drag and drop of text. Fixes #316772

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 7f77726447603d574f5a6504755b4b40a8661e7f..fe84912335a05511b5593967275f7f84c97a6695 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -1363,9 +1363,13 @@ handle_link_over_xy (EvView *view, gint x, gint y)
         if (link) {
                char *msg = tip_from_link (view, link);
 
-               ev_tooltip_set_position (EV_TOOLTIP (view->link_tooltip), x, y);
-               ev_tooltip_set_text (EV_TOOLTIP (view->link_tooltip), msg);
-               ev_tooltip_activate (EV_TOOLTIP (view->link_tooltip));
+               if (msg && g_utf8_validate (msg, -1, NULL)) {
+                       EvTooltip *tooltip = EV_TOOLTIP (view->link_tooltip);
+
+                       ev_tooltip_set_position (tooltip, x, y);
+                       ev_tooltip_set_text (tooltip, msg);
+                       ev_tooltip_activate (tooltip);
+               }
                g_free (msg);
 
                ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);