Re-enable the used glyphs message now that it doesn't crash or leak
authorsachiel <sachiel@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 25 Jun 2012 17:42:58 +0000 (17:42 +0000)
committersachiel <sachiel@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 25 Jun 2012 17:42:58 +0000 (17:42 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@72819 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/bin/evas_cserve2_cache.c
src/bin/evas_cserve2_main.c

index a78a07c..dcf43d8 100644 (file)
@@ -2508,7 +2508,7 @@ cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int
         return 0;
      }
 
-   _glyphs_load_request_prepare(req);
+   _glyphs_request_check(req);
    groups = _glyphs_group_create(req);
 
    // Promote SHMs which are still cached and in use
@@ -2518,6 +2518,7 @@ cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int
      {
         _font_shm_promote(gg->fc);
         eina_list_free(gg->glyphs);
+        free(gg);
      }
 
    _glyphs_request_free(req);
index a0c909a..da9d7ea 100644 (file)
@@ -316,13 +316,11 @@ _cserve2_client_font_glyphs_request(Client *client)
      {
         INF("Received CSERVE2_FONT_GLYPHS_USED command: RID=%d",
             msg->base.rid);
-        /*
         cserve2_cache_font_glyphs_used(client, source, msg->sourcelen,
                                        fontpath, msg->pathlen,
                                        msg->hint, msg->rend_flags, msg->size,
                                        msg->dpi, glyphs, msg->nglyphs,
                                        msg->base.rid);
-                                       */
      }
 }