epsilon-update.patch

   1 --- epsilon-0.3.0.013-20080813/src/bin/epsilon_thumbd.c.orig    2008-05-22 05:36:25.000000000 +0200
   2 +++ epsilon-0.3.0.013-20080813/src/bin/epsilon_thumbd.c 2012-01-22 14:01:15.587000345 +0100
   3 @@ -1,7 +1,7 @@
   4  #include "epsilon_private.h"
   5  #include <Ecore.h>
   6 -#include <Ecore_Data.h>
   7  #include <Ecore_Ipc.h>
   8 +#include <Eina.h>
   9
  10  #include <stdio.h>
  11  #include <stdlib.h>
  12 @@ -36,7 +36,7 @@ struct _Epsilon_Client
  13  {
  14         unsigned int        id;
  15         Ecore_Ipc_Client    *client;
  16 -       Ecore_List          *thumbs;
  17 +       Eina_List           *thumbs;
  18
  19         Epsilon_Ipc_End  ipcend;
  20  };
  21 @@ -60,7 +60,7 @@ struct _Epsilon_Entry
  22  typedef struct _Epsilon_Worker Epsilon_Worker;
  23  struct _Epsilon_Worker
  24  {
  25 -       Ecore_List *thumbs;
  26 +       Eina_List *thumbs;
  27         pid_t child;
  28         double runtime;
  29         Ecore_Ipc_Server *server;
  30 @@ -92,13 +92,13 @@ static Ecore_Event_Handler *worker_add =
  31  static Ecore_Event_Handler *worker_del = NULL;
  32  static Ecore_Event_Handler *worker_data = NULL;
  33
  34 -static Ecore_List *queued_workers;
  35 -static Ecore_List *gworkers = NULL;
  36 +static Eina_List *queued_workers;
  37 +static Eina_List *gworkers = NULL;
  38
  39  static Ecore_Ipc_Server *thumb_server = NULL;
  40  static Ecore_Ipc_Server *thumbd_server = NULL;
  41
  42 -static Ecore_List *response_queue = NULL;
  43 +static Eina_List *response_queue = NULL;
  44
  45  static char *epsilond_socket_path(char *name);
  46  /* static int epsilond_entry_free(Epsilon_Entry *thumb); */
  47 @@ -109,7 +109,7 @@ int epsilond_cb_worker_add(void *data, i
  48  int epsilond_cb_worker_del(void *data, int type, void *event);
  49  int epsilond_cb_worker_data(void *data, int type, void *event);
  50
  51 -void epsilond_init_thumbd_server(Ecore_List* workers)
  52 +void epsilond_init_thumbd_server(Eina_List* workers)
  53  {
  54         char* buf;
  55
  56 @@ -162,7 +162,7 @@ epsilond_cb_client_add(void *data, int t
  57  {
  58         Epsilon_Client *cl;
  59         Ecore_Ipc_Event_Client_Add *e;
  60 -       Ecore_List *clients = data;
  61 +       Eina_List *clients = data;
  62
  63         e = event;
  64         type = 0;
  65 @@ -178,7 +178,7 @@ epsilond_cb_client_add(void *data, int t
  66          */
  67         cl->id = client_id++;
  68         cl->client = e->client;
  69 -       ecore_list_append(clients, cl);
  70 +       clients = eina_list_append(clients, cl);
  71
  72         if (debug) printf("Added client %d\n", cl->id);
  73
  74 @@ -193,7 +193,7 @@ epsilond_cb_worker_add(void *data, int t
  75  {
  76         Epsilon_Client *cl;
  77         Ecore_Ipc_Event_Client_Add *e;
  78 -       Ecore_List *workers = data;
  79 +       Eina_List *workers = data;
  80
  81         e = event;
  82         data = NULL;
  83 @@ -210,7 +210,7 @@ epsilond_cb_worker_add(void *data, int t
  84          */
  85         cl->id = client_id++;
  86         cl->client = e->client;
  87 -       ecore_list_append(workers, cl);
  88 +       workers = eina_list_append(workers, cl);
  89
  90         if (debug) printf("Added worker client %d\n", cl->id);
  91
  92 @@ -222,7 +222,7 @@ epsilond_cb_client_del(void *data, int t
  93  {
  94         Ecore_Ipc_Event_Client_Del *e;
  95         Epsilon_Client *cl;
  96 -       Ecore_List *clients = data;
  97 +       Eina_List *clients = data, *le;
  98
  99         e = event;
 100         type = 0;
 101 @@ -234,10 +234,11 @@ epsilond_cb_client_del(void *data, int t
 102         /*
 103          * Search for the disconnecting client
 104          */
 105 -       ecore_list_first_goto(clients);
 106 -       while ((cl = ecore_list_current(clients))) {
 107 +       le = clients;
 108 +       while (le) {
 109 +               cl = le->data;
 110                 if (cl->client == e->client) {
 111 -                       ecore_list_remove(clients);
 112 +                       clients = eina_list_remove_list(clients, le);
 113
 114                         /*
 115                          *  Free thumbnail data associated with this client.
 116 @@ -247,7 +248,7 @@ epsilond_cb_client_del(void *data, int t
 117
 118                         break;
 119                 }
 120 -               ecore_list_next(clients);
 121 +               le = eina_list_next(le);
 122         }
 123
 124         ecore_ipc_client_del(e->client);
 125 @@ -260,7 +261,7 @@ epsilond_cb_worker_del(void *data, int t
 126  {
 127         Ecore_Ipc_Event_Client_Del *e;
 128         Epsilon_Client *cl;
 129 -       Ecore_List *workers = data;
 130 +       Eina_List *workers = data, *le;
 131
 132         e = event;
 133         type = 0;
 134 @@ -272,10 +273,11 @@ epsilond_cb_worker_del(void *data, int t
 135         /*
 136          * Search for the disconnecting client
 137          */
 138 -       ecore_list_first_goto(workers);
 139 -       while ((cl = ecore_list_current(workers))) {
 140 +       le = workers;
 141 +       while (le) {
 142 +               cl = le->data;
 143                 if (cl->client == e->client) {
 144 -                       ecore_list_remove(workers);
 145 +                       workers = eina_list_remove_list(workers, le);
 146
 147                         /*
 148                          *  Free thumbnail data associated with this client.
 149 @@ -285,7 +287,7 @@ epsilond_cb_worker_del(void *data, int t
 150
 151                         break;
 152                 }
 153 -               ecore_list_next(workers);
 154 +               le = eina_list_next(le);
 155         }
 156
 157         ecore_ipc_client_del(e->client);
 158 @@ -306,10 +308,8 @@ epsilon_client_thumb_add(Epsilon_Client
 159                 thumb->path = strdup(path);
 160                 thumb->size = strlen(path) + 1;
 161
 162 -               if (!cl->thumbs)
 163 -                       cl->thumbs = ecore_list_new();
 164                 if (debug) printf("Queueing %s\n", thumb->path);
 165 -               ecore_list_append(cl->thumbs, thumb);
 166 +               cl->thumbs = eina_list_append(cl->thumbs, thumb);
 167         }
 168
 169         return 1;
 170 @@ -321,7 +321,7 @@ epsilond_cb_client_data(void *data, int
 171  {
 172         Ecore_Ipc_Event_Client_Data *e;
 173         Epsilon_Client *cl;
 174 -       Ecore_List *clients = data;
 175 +       Eina_List *clients = data, *le;
 176
 177         e = event;
 178         type = 0;
 179 @@ -335,8 +335,9 @@ epsilond_cb_client_data(void *data, int
 180         /*
 181          * Match the client sending the data.
 182          */
 183 -       ecore_list_first_goto(clients);
 184 -       while ((cl = ecore_list_next(clients))) {
 185 +       le = clients;
 186 +       while (le) {
 187 +               cl = le->data;
 188                 if (cl->client == e->client)
 189                         break;
 190         }
 191 @@ -354,10 +355,8 @@ epsilond_cb_client_data(void *data, int
 192                 memcpy(msg2,msg,sizeof(Epsilon_Message)+msg->bufsize);
 193
 194                 if (debug) printf("** Received %d : %s **\n",msg->mid,  ((char *)msg + sizeof(Epsilon_Message)));
 195 -               if (!cl->thumbs)
 196 -                       cl->thumbs = ecore_list_new();
 197                 msg2->nid = cl->id;
 198 -               ecore_list_append(cl->thumbs, msg2);
 199 +               cl->thumbs = eina_list_append(cl->thumbs, msg2);
 200         }
 201         else {
 202                 if (debug) printf("ERROR: No matching client for data\n");
 203 @@ -371,7 +370,7 @@ epsilond_cb_worker_data(void *data, int
 204  {
 205         Ecore_Ipc_Event_Client_Data *e;
 206         Epsilon_Client *cl;
 207 -       Ecore_List *workers;
 208 +       Eina_List *workers, *le;
 209
 210         e = event;
 211         workers = data;
 212 @@ -384,8 +383,9 @@ epsilond_cb_worker_data(void *data, int
 213         /*
 214          * Match the client data.
 215          */
 216 -       ecore_list_first_goto(workers);
 217 -       while ((cl = ecore_list_next(workers))) {
 218 +       le = workers;
 219 +       while (le = eina_list_next(le)) {
 220 +               cl = le->data;
 221                 if (cl->client == e->client)
 222                         break;
 223         }
 224 @@ -406,7 +406,7 @@ epsilond_cb_worker_data(void *data, int
 225                         response->client = cl;
 226                         response->msg = calloc(1,sizeof(Epsilon_Message)+msg->bufsize);
 227                         memcpy(response->msg, msg, sizeof(Epsilon_Message)+msg->bufsize);
 228 -                       ecore_list_append(response_queue, response);
 229 +                       response_queue = eina_list_append(response_queue, response);
 230                 }
 231         }
 232         else {
 233 @@ -425,33 +425,35 @@ epsilond_client_dispatch(Epsilon_Client
 234         /*
 235          * Iterate over the thumbnails splitting them between threads.
 236          */
 237 -       while (ecore_list_count(cl->thumbs) > 0) {
 238 -               available = ecore_list_count(queued_workers);
 239 -
 240 -               while ((worker = ecore_list_current(queued_workers))) {
 241 +       while (eina_list_count(cl->thumbs) > 0) {
 242 +               available = eina_list_count(queued_workers);
 243
 244 +               Eina_List *le = queued_workers;
 245 +               while (le) {
 246 +                       worker = le->data;
 247                         /*
 248                          * Don't dispatch work to active workers.
 249                          */
 250 -                       if (!worker->child && !ecore_list_count(worker->thumbs)) {
 251 +                       if (!worker->child && !eina_list_count(worker->thumbs)) {
 252                                 Epsilon_Message *msg;
 253
 254                                 /*
 255                                  * Get the next message on the queue and break
 256                                  * out of the inner loop if NULL.
 257                                  */
 258 -                               msg = ecore_list_first_remove(cl->thumbs);
 259 +                               msg = cl->thumbs->data;
 260 +                               cl->thumbs = eina_list_remove_list(cl->thumbs, cl->thumbs);
 261                                 if (!msg)
 262                                         break;
 263
 264                                 if (debug) printf("Dispatching message %d\n", msg->mid);
 265 -                               ecore_list_append(worker->thumbs, msg);
 266 +                               worker->thumbs = eina_list_append(worker->thumbs, msg);
 267
 268                                 if (debug) printf("Assigning %s to worker %p\n",
 269                                                 ((char *)msg + sizeof(Epsilon_Message)), worker);
 270                                 if (debug) printf("Dispatched message %d\n", msg->mid);
 271
 272 -                               ecore_list_next(queued_workers);
 273 +                               le = eina_list_next(le);
 274                         }
 275                         else {
 276                                 available--;
 277 @@ -465,7 +467,7 @@ epsilond_client_dispatch(Epsilon_Client
 278                  * Only start over in the list if we reached the end.
 279                  */
 280                 if (!worker)
 281 -                       ecore_list_first_goto(queued_workers);
 282 +                       le = queued_workers;
 283
 284                 if (!available)
 285                         break;
 286 @@ -478,18 +480,22 @@ static int
 287  epsilond_worker_run(void *data)
 288  {
 289         Epsilon_Worker *worker;
 290 -       Epsilon_Message *msg;
 291 +       Epsilon_Message *msg = NULL;
 292
 293         worker = data;
 294         if (debug) printf("Running worker thread %p for %d thumbnails\n", worker,
 295 -                       ecore_list_count(worker->thumbs));
 296 +                       eina_list_count(worker->thumbs));
 297
 298         /* FIXME: Do we want the fast exit point here?
 299 -       if (!ecore_list_count(worker->thumbs))
 300 +       if (!eina_list_count(worker->thumbs))
 301                 exit(0);
 302                 */
 303
 304 -       while ((msg = ecore_list_first_remove(worker->thumbs))) {
 305 +       if(worker->thumbs != NULL) {
 306 +               msg = worker->thumbs->data;
 307 +               worker->thumbs = eina_list_remove_list(worker->thumbs, worker->thumbs);
 308 +       }
 309 +       while (msg) {
 310                 int status = 0;
 311                 char *path;
 312                 Epsilon *ep;
 313 @@ -538,6 +544,11 @@ epsilond_worker_run(void *data)
 314                 ecore_ipc_server_flush(worker->server);
 315
 316                 free(msg);
 317 +               if(worker->thumbs != NULL) {
 318 +                       msg = worker->thumbs->data;
 319 +                       worker->thumbs = eina_list_remove_list(worker->thumbs, worker->thumbs);
 320 +               } else
 321 +                       msg = NULL;
 322         }
 323         ecore_ipc_server_flush(worker->server);
 324         ecore_main_loop_quit();
 325 @@ -553,7 +564,6 @@ epsilond_worker_fork(Epsilon_Worker *wor
 326         /*
 327          * Begin iteration of the thumb list.
 328          */
 329 -       ecore_list_first_goto(worker->thumbs);
 330
 331         worker->runtime = ecore_time_get();
 332         worker->child = fork();
 333 @@ -611,9 +621,9 @@ epsilond_idle_enterer(void *data)
 334  {
 335         int idle=0;
 336         Epsilon_Client *cl;
 337 -       Epsilon_Response *response;
 338 +       Epsilon_Response *response = NULL;
 339         Epsilon_Worker *worker;
 340 -       Ecore_List *clients = data;
 341 +       Eina_List *clients = data, *cle, *wle;
 342
 343         if (debug) printf("Idle state entered\n");
 344
 345 @@ -621,12 +631,16 @@ epsilond_idle_enterer(void *data)
 346          * Send responses for completed thumbnails
 347          */
 348         if (debug) printf("Preparing %d responses\n",
 349 -                       ecore_list_count(response_queue));
 350 -       while ((response = ecore_list_first_remove(response_queue))) {
 351 +                       eina_list_count(response_queue));
 352 +       if(response_queue != NULL) {
 353 +               response = response_queue->data;
 354 +               response_queue = eina_list_remove_list(response_queue, response_queue);
 355 +       }
 356 +       while (response) {
 357                 Epsilon_Message *msg = response->msg;
 358
 359 -               ecore_list_first_goto(clients);
 360 -               while ((cl = ecore_list_next(clients))) {
 361 +               cle = clients;
 362 +               while (cle = eina_list_next(cle)) {
 363                         if (cl->id == msg->nid)
 364                                 break;
 365                 }
 366 @@ -643,14 +657,20 @@ epsilond_idle_enterer(void *data)
 367                         if (debug) printf("Client: %p, Msg: %p\n",cl,msg);
 368                 }
 369                 free(response);
 370 +               if(response_queue != NULL) {
 371 +                       response = response_queue->data;
 372 +                       response_queue = eina_list_remove_list(response_queue, response_queue);
 373 +               } else
 374 +                       response = NULL;
 375         }
 376         if (debug) printf("Finished responses\n");
 377
 378         /*
 379          * Collect completed worker threads.
 380          */
 381 -       ecore_list_first_goto(queued_workers);
 382 -       while ((worker = ecore_list_next(queued_workers))) {
 383 +       wle = queued_workers;
 384 +       while (wle = eina_list_next(wle)) {
 385 +               worker = wle->data;
 386                 int status = 0;
 387
 388                 if (worker->child) {
 389 @@ -675,7 +695,7 @@ epsilond_idle_enterer(void *data)
 390
 391                         if (debug) printf("Worker %d runtime: %f\n", worker->child, ecore_time_get() - worker->runtime);
 392                 } else {
 393 -                       if (debug) printf("Worker child pid not set, thumbs is: %d\n", ecore_list_count(worker->thumbs));
 394 +                       if (debug) printf("Worker child pid not set, thumbs is: %d\n", eina_list_count(worker->thumbs));
 395                 }
 396         }
 397
 398 @@ -684,11 +704,12 @@ epsilond_idle_enterer(void *data)
 399          * hope of spreading the workload evenly and avoid stalling any one
 400          * particular client longer than others.
 401          */
 402 -       ecore_list_first_goto(clients);
 403 -       while ((cl = ecore_list_next(clients))) {
 404 -               int available = ecore_list_count(queued_workers);
 405 +       cle = clients;
 406 +       while (cle = eina_list_next(cle)) {
 407 +               cl = cle->data;
 408 +               int available = eina_list_count(queued_workers);
 409
 410 -               if (cl->thumbs && ecore_list_count(cl->thumbs)) {
 411 +               if (cl->thumbs && eina_list_count(cl->thumbs)) {
 412                         available = epsilond_client_dispatch(cl);
 413                 }
 414
 415 @@ -702,17 +723,18 @@ epsilond_idle_enterer(void *data)
 416
 417         }
 418
 419 -       idle = ecore_list_count(queued_workers);
 420 +       idle = eina_list_count(queued_workers);
 421
 422         if (debug) printf("Idle: %d\n", idle);
 423
 424         /*
 425          * Fork off worker threads to begin thumbnailing.
 426          */
 427 -       ecore_list_first_goto(queued_workers);
 428 -       while ((worker = ecore_list_next(queued_workers))) {
 429 +       wle = queued_workers;
 430 +       while (wle = eina_list_next(wle)) {
 431 +               worker = wle->data;
 432                 if (!worker->child) {
 433 -                       if (ecore_list_count(worker->thumbs)) {
 434 +                       if (eina_list_count(worker->thumbs)) {
 435                                 idle--;
 436
 437                                 running_workers++;
 438 @@ -733,7 +755,7 @@ epsilond_idle_enterer(void *data)
 439         /*
 440          * FIXME: Detect idle time and exit after a specified interval
 441          */
 442 -       if (idle == ecore_list_count(queued_workers)) {
 443 +       if (idle == eina_list_count(queued_workers)) {
 444                 double now = ecore_time_get();
 445                 if (!idle_time)
 446                         idle_time = now;
 447 @@ -751,17 +773,17 @@ epsilond_init()
 448  {
 449         int wi;
 450         char *buf;
 451 -       Ecore_List *clients = NULL;
 452 +       Eina_List *clients = NULL;
 453
 454         epsilon_init();
 455
 456         /*
 457          * Create the accounting data for the clients and thumbnail queue.
 458          */
 459 -       clients = ecore_list_new();
 460 -       gworkers = ecore_list_new();
 461 -       response_queue = ecore_list_new();
 462 -       queued_workers = ecore_list_new();
 463 +       clients = NULL;
 464 +       gworkers = NULL;
 465 +       response_queue = NULL;
 466 +       queued_workers = NULL;
 467
 468         /*
 469          * Retrieve the safe socket name for the clients.
 470 @@ -794,8 +816,8 @@ epsilond_init()
 471                 Epsilon_Worker *worker;
 472
 473                 worker = calloc(1, sizeof(Epsilon_Worker));
 474 -               worker->thumbs = ecore_list_new();
 475 -               ecore_list_append(queued_workers, worker);
 476 +               worker->thumbs = NULL;
 477 +               queued_workers = eina_list_append(queued_workers, worker);
 478         }
 479
 480         ecore_idle_enterer_add(epsilond_idle_enterer, clients);
 481 @@ -838,10 +860,8 @@ epsilond_client_clean(Epsilon_Client *cl
 482         if (cl->thumbs) {
 483                 Epsilon_Message *msg;
 484
 485 -               while ((msg = ecore_list_first_remove(cl->thumbs))) {
 486 +               EINA_LIST_FREE(cl->thumbs, msg)
 487                         free(msg);
 488 -               }
 489 -               ecore_list_destroy(cl->thumbs);
 490                 cl->thumbs = NULL;
 491         }
 492
 493 @@ -853,7 +873,7 @@ epsilond_worker_clean(Epsilon_Worker *wo
 494  {
 495         Epsilon_Message *msg;
 496         worker->child = 0;
 497 -       while ((msg = ecore_list_first_remove(worker->thumbs)))
 498 +       EINA_LIST_FREE(worker->thumbs, msg)
 499                 free(msg);
 500         return 1;
 501  }
 502 --- epsilon-0.3.0.013-20080813/src/bin/epsilon_thumb_test.c.orig        2007-11-02 09:03:45.000000000 +0100
 503 +++ epsilon-0.3.0.013-20080813/src/bin/epsilon_thumb_test.c     2012-01-22 14:07:09.703678869 +0100
 504 @@ -1,6 +1,6 @@
 505  #include <Ecore.h>
 506 -#include <Ecore_Data.h>
 507  #include <Ecore_File.h>
 508 +#include <Eina.h>
 509  #include "Epsilon_Request.h"
 510  #include <stdio.h>
 511  #include <stdlib.h>
 512 @@ -34,7 +34,7 @@ int thumb_complete_cb(void *data, int ty
 513  int main(int argc, char** argv)
 514  {
 515         char *file;
 516 -       Ecore_List *files;
 517 +       Eina_List *files, *le;
 518         double start, end;
 519
 520         if (argc < 2) {
 521 @@ -55,8 +55,9 @@ int main(int argc, char** argv)
 522
 523         start = ecore_time_get();
 524
 525 -       ecore_list_first_goto(files);
 526 -       while ((file = ecore_list_next(files))) {
 527 +       le = files;
 528 +       while (le = eina_list_next(le)) {
 529 +               file = le->data;
 530                 char *realpath;
 531                 char fullpath[PATH_MAX];
 532
 533 @@ -68,7 +69,7 @@ int main(int argc, char** argv)
 534                 }
 535                 free(realpath);
 536         }
 537 -       ecore_list_destroy(files);
 538 +       files = eina_list_free(files);
 539
 540         ecore_main_loop_begin();
 541
 542 --- epsilon-0.3.0.013-20080813/src/lib/epsilon_thumb.c.orig     2008-05-10 06:56:12.000000000 +0200
 543 +++ epsilon-0.3.0.013-20080813/src/lib/epsilon_thumb.c  2012-01-22 13:35:47.680282519 +0100
 544 @@ -3,9 +3,9 @@
 545  #endif
 546
 547  #include <Ecore.h>
 548 -#include <Ecore_Data.h>
 549  #include <Ecore_Ipc.h>
 550  #include <Ecore_File.h>
 551 +#include <Eina.h>
 552
 553  #include "Epsilon_Request.h"
 554  #include "epsilon_private.h"
 555 @@ -20,7 +20,7 @@ static int debug = 0;
 556  static int epsilon_init_count = 0;
 557  static unsigned long epsilon_mid = 0;
 558
 559 -static Ecore_DList *epsilon_request_queue = NULL;
 560 +static Eina_List *epsilon_request_queue = NULL;
 561
 562  static Ecore_Ipc_Server *epsilon_server = NULL;
 563
 564 @@ -51,7 +51,7 @@ epsilon_request_init(void)
 565          * Allocate a list for queueing requests.
 566          */
 567         if (!epsilon_init_count) {
 568 -               epsilon_request_queue = ecore_dlist_new();
 569 +               epsilon_request_queue = NULL;
 570                 if (!epsilon_request_queue) goto queue_error;
 571
 572                 /*
 573 @@ -91,7 +91,7 @@ handler_data_error:
 574  handler_del_error:
 575         ecore_event_handler_del(epsilon_server_add);
 576  handler_add_error:
 577 -       ecore_dlist_destroy(epsilon_request_queue);
 578 +       epsilon_request_queue = eina_list_free(epsilon_request_queue);
 579  queue_error:
 580         ecore_ipc_shutdown();
 581  con_init_error:
 582 @@ -110,7 +110,7 @@ epsilon_request_shutdown(void)
 583                 ecore_event_handler_del(epsilon_server_data);
 584                 ecore_event_handler_del(epsilon_server_del);
 585                 ecore_event_handler_del(epsilon_server_add);
 586 -               ecore_dlist_destroy(epsilon_request_queue);
 587 +               epsilon_request_queue = eina_list_free(epsilon_request_queue);
 588         }
 589
 590         ecore_ipc_shutdown();
 591 @@ -230,15 +230,16 @@ epsilon_cb_server_data(void *data, int t
 592          * Find the thumbnail request matching this message response.
 593          */
 594
 595 -       ecore_dlist_first_goto(epsilon_request_queue);
 596 -       while ((thumb = ecore_dlist_current(epsilon_request_queue))) {
 597 +       Eina_List *rl = epsilon_request_queue;
 598 +       while (rl) {
 599 +               thumb = rl->data;
 600                 if (thumb->id == msg->mid) {
 601                         if (debug) printf("Removing %d from queue\n", thumb->id);
 602                         thumb->status = msg->status;
 603 -                       ecore_dlist_remove(epsilon_request_queue);
 604 +                       epsilon_request_queue = eina_list_remove_list(epsilon_request_queue, rl);
 605                         break;
 606                 }
 607 -               ecore_dlist_next(epsilon_request_queue);
 608 +               rl = eina_list_next(rl);
 609                 if (debug) printf("Cycling %d times looking for %d, current is %d\n", i++, msg->mid, thumb->id);
 610         }
 611
 612 @@ -345,7 +346,7 @@ epsilon_request_add(const char *path, Ep
 613                         if (debug) printf("!! requesting thumbnail for %s (request %d)!!, %d\n", path, msg->mid, sizeof(Epsilon_Message)+msg->bufsize);
 614                         if (ecore_ipc_server_send(epsilon_server, 1,1,1,1,1,msg,sizeof(Epsilon_Message)+msg->bufsize)) {
 615                                 thumb->id = msg->mid;
 616 -                               ecore_dlist_append(epsilon_request_queue, thumb);
 617 +                               epsilon_request_queue = eina_list_append(epsilon_request_queue, thumb);
 618                         }
 619                         free(msg);
 620                 } else {
 621 @@ -376,13 +377,14 @@ epsilon_request_del(Epsilon_Request *thu
 622                  * remove it, at this point we don't bother cancelling the outstanding
 623                  * request to the daemon.
 624                  */
 625 -               ecore_dlist_first_goto(epsilon_request_queue);
 626 -               while ((temp = ecore_dlist_current(epsilon_request_queue))) {
 627 +               Eina_List *rl = epsilon_request_queue;
 628 +               while (rl) {
 629 +                       temp = rl->data;
 630                         if (temp->id == thumb->id) {
 631 -                               ecore_dlist_remove(epsilon_request_queue);
 632 +                               epsilon_request_queue = eina_list_remove_list(epsilon_request_queue, rl);
 633                                 break;
 634                         }
 635 -                       ecore_dlist_next(epsilon_request_queue);
 636 +                       rl = eina_list_next(rl);
 637                 }
 638         }
 639
 640 --- epsilon-0.3.0.013-20080813/src/lib/Epsilon_Plugin.h.orig    2008-05-22 05:36:25.000000000 +0200
 641 +++ epsilon-0.3.0.013-20080813/src/lib/Epsilon_Plugin.h 2012-01-22 12:06:12.980102554 +0100
 642 @@ -1,7 +1,7 @@
 643  #ifndef _EPSILON_PLUGIN_H_
 644  #define _EPSILON_PLUGIN_H_
 645
 646 -#include "Ecore_Data.h"
 647 +#include <Eina.h>
 648
 649  typedef struct _Epsilon_Image Epsilon_Image;
 650  typedef struct _Epsilon_Plugin Epsilon_Plugin;
 651 @@ -15,7 +15,7 @@ struct _Epsilon_Image
 652
 653  struct _Epsilon_Plugin
 654  {
 655 -  Ecore_List* mime_types;
 656 +  Eina_List* mime_types;
 657    Epsilon_Image *(*epsilon_generate_thumb)(Epsilon*);
 658  };
 659
 660 --- epsilon-0.3.0.013-20080813/src/lib/Epsilon.c.orig   2008-07-26 14:16:41.000000000 +0200
 661 +++ epsilon-0.3.0.013-20080813/src/lib/Epsilon.c        2012-01-22 13:07:05.106891508 +0100
 662 @@ -30,6 +30,7 @@
 663  #include "exiftags/exif.h"
 664
 665  #include <Ecore.h>
 666 +#include <Eina.h>
 667
 668  #include <Evas.h>
 669  #include <Ecore_Evas.h>
 670 @@ -47,7 +48,7 @@ static unsigned LEN_DIR_CUSTOM = 0;
 671  static unsigned LEN_DIR_FAIL = 0;
 672
 673
 674 -static Ecore_Hash* plugins_mime;
 675 +static Eina_Hash* plugins_mime;
 676
 677  extern int epsilon_info_exif_props_as_int_get (Epsilon_Info * ei, unsigned
 678                                                short lvl, long prop);
 679 @@ -137,7 +138,7 @@ epsilon_init (void)
 680    int base_len;
 681    char *home;
 682    struct dirent *de;
 683 -  char* type;
 684 +  Eina_List *tl;
 685    DIR *dir;
 686    Epsilon_Plugin *plugin;
 687    char plugin_path[PATH_MAX];
 688 @@ -166,7 +167,7 @@ epsilon_init (void)
 689    ecore_file_mkpath(PATH_DIR_NORMAL);
 690    ecore_file_mkpath(PATH_DIR_FAIL);
 691
 692 -  plugins_mime = ecore_hash_new(ecore_str_hash, ecore_str_compare);
 693 +  plugins_mime = eina_hash_string_superfast_new(NULL);
 694
 695    /*Initialise plugins*/
 696    dir = opendir(PACKAGE_LIB_DIR "/epsilon/plugins/");
 697 @@ -178,9 +179,9 @@ epsilon_init (void)
 698
 699                            if ((plugin = epsilon_plugin_load(plugin_path))) {
 700                                    /*Append the mime types for this plugin*/
 701 -                                  ecore_list_first_goto(plugin->mime_types);
 702 -                                  while ( (type = ecore_list_next(plugin->mime_types))) {
 703 -                                       ecore_hash_set(plugins_mime, type, plugin);
 704 +                                  tl = plugin->mime_types;
 705 +                                  while ( (tl = eina_list_next(tl))) {
 706 +                                       eina_hash_set(plugins_mime, tl->data, plugin);
 707                                    }
 708                            }
 709
 710 @@ -593,7 +594,7 @@ epsilon_generate (Epsilon * e)
 711     if (ext)
 712       {
 713         mime = epsilon_mime_for_extension_get(ext + 1);
 714 -       if ((plugin = ecore_hash_get(plugins_mime, mime)))
 715 +       if ((plugin = eina_hash_find(plugins_mime, mime)))
 716           img_thm = (plugin->epsilon_generate_thumb)(e);
 717       }
 718
 719 @@ -836,7 +837,7 @@ _epsilon_png_write (const char *file, un
 720           png_destroy_write_struct (&png_ptr, (png_infopp) NULL);
 721           ret = 1;
 722         }
 723 -      if (setjmp (png_ptr->jmpbuf))
 724 +      if (setjmp (png_jmpbuf(png_ptr)))
 725         {
 726           png_destroy_write_struct (&png_ptr, &info_ptr);
 727           ret = 1;