E SVN: davemds trunk/edje/src/lib

[Enlightenment S. <no-...@en...>]

Log:
   * Do not use the 'Font' struct from edje_cc.h
Author:       davemds
Date:         2009-08-17 07:26:31 -0700 (Mon, 17 Aug 2009)
New Revision: 41842

Modified:
  trunk/edje/src/lib/edje_edit.c 

Modified: trunk/edje/src/lib/edje_edit.c
===================================================================
--- trunk/edje/src/lib/edje_edit.c	2009-08-17 14:13:26 UTC (rev 41841)
+++ trunk/edje/src/lib/edje_edit.c	2009-08-17 14:26:31 UTC (rev 41842)
@@ -3235,7 +3235,6 @@
 edje_edit_font_add(Evas_Object *obj, const char* path)
 {
    char buf[PATH_MAX];
-   Font *fn;
    Edje_Font_Directory_Entry *fnt;
    Eet_File *eetf;
    struct stat st;
@@ -3261,33 +3260,9 @@
      if (!ed->file->font_dir) return 0;
    }
 
-   /* Create Font */
-   fn = _alloc(sizeof(Font));
-   if (!fn) return 0;
-
    if ((name = strrchr(path, '/'))) name ++;
    else name = (char *)path;
 
-   fn->file = _strdup(name);
-   fn->name = _strdup(name);
-
-   /*{
-      Eina_List *l;
-      Font *lfn;
-
-      EINA_LIST_FOREACH(fonts, l, lfn)
-      {
-         if (!strcmp(lfn->name, fn->name))
-         {
-            free(fn->file);
-            free(fn->name);
-            free(fn);
-            return;
-         }
-      }
-   }
-   */
-
    /* Read font data from file */
    f = fopen(path, "rb");
    if (f)
@@ -3311,7 +3286,7 @@
 	fclose(f);
      }
    /* Write font to edje file */
-   snprintf(buf, sizeof(buf), "fonts/%s", fn->name);
+   snprintf(buf, sizeof(buf), "fonts/%s", name);
 
    if (fdata)
      {
@@ -3343,7 +3318,7 @@
      {
 	fnt = _alloc(sizeof(Edje_Font_Directory_Entry));
 	if (!fnt) return 0;
-	fnt->entry = _strdup(fn->name);
+	fnt->entry = _strdup(name);
 	fnt->path = _strdup(buf);
 
 	ed->file->font_dir->entries = eina_list_append(ed->file->font_dir->entries, fnt);