[label,entry] improve _strbuf_key_value_replace

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index b3e5170..497fd60 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1736,15 +1736,11 @@ _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int
              {
                replocater = curlocater + strlen(key) + 1;
 
-               while (*replocater && *replocater == ' ' || *replocater == '=')
+               while ((*replocater) && (*replocater != ' ') && (*replocater != '>'))
                  replocater++;
 
-                while (*replocater && *replocater != ' ' && *replocater != '>')
-                  replocater++;
-
                if (replocater-curlocater > strlen(key)+1)
                  {
-                   replocater--;
                    eina_strbuf_append_n(diffbuf, curlocater, replocater-curlocater+1);
                  }
                else

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index f91e9e7..289eaef 100644 (file)
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -262,15 +262,12 @@ _strbuf_key_value_replace(Eina_Strbuf *srcbuf, const char *key, const char *valu
              if (curlocater)
                {
                   replocater = curlocater + key_len + 1;
-                  while ((*replocater) && (*replocater != '='))
-                    replocater++;
 
-                  while (*replocater && *replocater != ' ' && *replocater != '>')
+                  while ((*replocater) && (*replocater != ' ') && (*replocater != '>'))
                     replocater++;
 
-                  if (replocater - curlocater > key_len + 1)
+                  if (replocater - curlocater > key_len)
                     {
-                       replocater--;
                        eina_strbuf_append_n(diffbuf, curlocater, 
                                             replocater-curlocater);
                     }