[ekiga] Bitext renderer: Fixed UTF-8 garbage.

[Damien Sandras <dsandras src gnome org>]

commit d5a71ed7ed94b45e74b63c25d782914747d0a688
Author: Damien Sandras <dsandras beip be>
Date:   Sat Oct 6 18:52:27 2012 +0200

    Bitext renderer: Fixed UTF-8 garbage.
    
    The problem was that the PangoAttributes work in bytes, not in UTF-8
    string length. Hard to find and fix!

 lib/gui/gm-cell-renderer-bitext.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/lib/gui/gm-cell-renderer-bitext.c b/lib/gui/gm-cell-renderer-bitext.c
index 96aac5f..b17dfff 100644
--- a/lib/gui/gm-cell-renderer-bitext.c
+++ b/lib/gui/gm-cell-renderer-bitext.c
@@ -38,6 +38,8 @@
  *
  */
 
+#include <string.h>
+
 #include "gm-cell-renderer-bitext.h"
 
 struct _GmCellRendererBitextPrivate
@@ -70,7 +72,6 @@ gm_cell_renderer_bitext_update_text (GmCellRendererBitext *renderer,
   PangoAttrList *attr_list = NULL;
   GdkColor color;
   PangoAttribute *attr_color = NULL;
-  PangoAttribute *attr_style = NULL;
   PangoAttribute *attr_size = NULL;
   gchar *str = NULL;
 
@@ -80,26 +81,19 @@ gm_cell_renderer_bitext_update_text (GmCellRendererBitext *renderer,
   style = gtk_widget_get_style (widget);
 
   attr_list = pango_attr_list_new ();
-
-  /* secondary text will be in italic */
-  attr_style = pango_attr_style_new (PANGO_STYLE_NORMAL);
-  attr_style->start_index = g_utf8_strlen (renderer->priv->primary_text, -1) + 1;
-  attr_style->end_index = (guint) - 1;
-  pango_attr_list_insert (attr_list, attr_style);
-
   if (!is_selected) {
 
     color = style->text_aa[GTK_STATE_NORMAL];
 
-    attr_color = pango_attr_foreground_new (color.red,
-					    color.green, color.blue);
-    attr_color->start_index = attr_style->start_index;
+    attr_color = pango_attr_foreground_new (color.red, color.green, color.blue);
+    attr_color->start_index = strlen (renderer->priv->primary_text) + 1;
     attr_color->end_index = (guint) - 1;
     pango_attr_list_insert (attr_list, attr_color);
   }
 
-  attr_size = pango_attr_size_new ((int) (pango_font_description_get_size (style->font_desc) * 0.8));	/* we want the secondary text smaller */
-  attr_size->start_index = attr_style->start_index;
+  /* we want the secondary text smaller */
+  attr_size = pango_attr_size_new ((int) (pango_font_description_get_size (style->font_desc) * 0.8));
+  attr_size->start_index = attr_color->start_index;
   attr_size->end_index = (guint) - 1;
   pango_attr_list_insert (attr_list, attr_size);