ply-utils: rename ply_utf8_string_iterator_init to ply_utf8_string_iterator_initialize

diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
index ae50213b8ff50a83fffb0c7adb0478e72b2512b5..cebeacc66b182fad6b8aa15d0226bcd125cacafb 100644 (file)
--- a/src/libply/ply-utils.c
+++ b/src/libply/ply-utils.c
@@ -790,10 +790,10 @@ ply_utf8_string_get_byte_offset_from_character_offset (const char *string,
 }
 
 void
-ply_utf8_string_iterator_init (ply_utf8_string_iterator_t *iterator,
-                               const char                 *string,
-                               ssize_t                     starting_offset,
-                               ssize_t                     range)
+ply_utf8_string_iterator_initialize (ply_utf8_string_iterator_t *iterator,
+                                     const char                 *string,
+                                     ssize_t                     starting_offset,
+                                     ssize_t                     range)
 {
         size_t byte_offset;
 

diff --git a/src/libply/ply-utils.h b/src/libply/ply-utils.h
index 289d3a3ffeabaeac2fedb9eb24454031efba1d95..3e487b4e4516af73137e11dfe55ea28978b124e9 100644 (file)
--- a/src/libply/ply-utils.h
+++ b/src/libply/ply-utils.h
@@ -127,10 +127,10 @@ int ply_utf8_string_get_length (const char *string,
 
 size_t ply_utf8_string_get_byte_offset_from_character_offset (const char *string,
                                                               size_t      character_offset);
-void ply_utf8_string_iterator_init (ply_utf8_string_iterator_t *iterator,
-                                    const char                 *string,
-                                    ssize_t                     starting_offset,
-                                    ssize_t                     range);
+void ply_utf8_string_iterator_initialize (ply_utf8_string_iterator_t *iterator,
+                                          const char                 *string,
+                                          ssize_t                     starting_offset,
+                                          ssize_t                     range);
 bool ply_utf8_string_iterator_next (ply_utf8_string_iterator_t *iterator,
                                     const char                **character,
                                     size_t                     *size);

diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
index 487abcd3e54c8b47296d8420b4e4cc21b85ceee0..7cf9ce7394db6d3cd0b50eb62cf48ad4afab3bcd 100644 (file)
--- a/src/plugins/controls/label-freetype/plugin.c
+++ b/src/plugins/controls/label-freetype/plugin.c
@@ -246,10 +246,10 @@ size_control (ply_label_plugin_control_t *label)
                                                    label->rich_text,
                                                    &label->span);
         } else {
-                ply_utf8_string_iterator_init (&utf8_string_iterator,
-                                               label->text,
-                                               0,
-                                               ply_utf8_string_get_length (label->text, strlen (label->text)));
+                ply_utf8_string_iterator_initialize (&utf8_string_iterator,
+                                                     label->text,
+                                                     0,
+                                                     ply_utf8_string_get_length (label->text, strlen (label->text)));
         }
         label->area.width = 0;
         label->area.height = 0;
@@ -454,10 +454,10 @@ draw_control (ply_label_plugin_control_t *label,
                                                    label->rich_text,
                                                    &label->span);
         } else {
-                ply_utf8_string_iterator_init (&utf8_string_iterator,
-                                               label->text,
-                                               0,
-                                               ply_utf8_string_get_length (label->text, strlen (label->text)));
+                ply_utf8_string_iterator_initialize (&utf8_string_iterator,
+                                                     label->text,
+                                                     0,
+                                                     ply_utf8_string_get_length (label->text, strlen (label->text)));
         }
 
         target = ply_pixel_buffer_get_argb32_data (pixel_buffer);