projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc51b8c
)
text: Add a NULL preedit string check
author
Emmanuele Bassi
<ebassi@linux.intel.com>
Mon, 9 Nov 2009 11:07:27 +0000
(11:07 +0000)
committer
Emmanuele Bassi
<ebassi@linux.intel.com>
Mon, 9 Nov 2009 11:07:27 +0000
(11:07 +0000)
This commit avoids a critical warning introduced by commit
bc51b8ca47ac90e52ab6a27ff791ea97d53f4648
clutter/clutter-text.c
patch
|
blob
|
history
diff --git
a/clutter/clutter-text.c
b/clutter/clutter-text.c
index
c95a4cf
..
04f24d5
100644
(file)
--- a/
clutter/clutter-text.c
+++ b/
clutter/clutter-text.c
@@
-594,7
+594,9
@@
clutter_text_position_to_coords (ClutterText *self,
gint cursor_index;
cursor_index = offset_to_bytes (text, priv->position);
- g_string_insert (tmp, cursor_index, priv->preedit_str);
+
+ if (priv->preedit_str != NULL)
+ g_string_insert (tmp, cursor_index, priv->preedit_str);
if (priv->password_char == 0)
index_ = offset_to_bytes (tmp->str, position);