summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2008-09-12 13:19:26 +0000
committerCedric BAIL <cedric.bail@free.fr>2008-09-12 13:19:26 +0000
commit1fc6d866c2da36f15240fe25e75acc1de70f6ffe (patch)
tree5f3ce9548b2f0c52795aafd80937dd43f46f3f14 /legacy
parent665ee944ee2e0b63221c5c37177849014a171bca (diff)
Only set the struct one time (remove useless memset) and sync idler with animator.
SVN revision: 35966
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con_url.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
index 7527f58086..783d9304b4 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
@@ -493,6 +493,8 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
493 493
494 curl_easy_setopt(url_con->curl_easy, CURLOPT_HTTPHEADER, url_con->headers); 494 curl_easy_setopt(url_con->curl_easy, CURLOPT_HTTPHEADER, url_con->headers);
495 495
496 url_con->received = 0;
497
496 return _ecore_con_url_perform(url_con); 498 return _ecore_con_url_perform(url_con);
497#else 499#else
498 return 0; 500 return 0;
@@ -734,7 +736,7 @@ _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlnow, double u
734 736
735 url_con = clientp; 737 url_con = clientp;
736 738
737 e = calloc(1, sizeof(Ecore_Con_Event_Url_Progress)); 739 e = malloc(sizeof(Ecore_Con_Event_Url_Progress));
738 if (e) 740 if (e)
739 { 741 {
740 e->url_con = url_con; 742 e->url_con = url_con;
@@ -767,7 +769,6 @@ static int
767_ecore_con_url_perform(Ecore_Con_Url *url_con) 769_ecore_con_url_perform(Ecore_Con_Url *url_con)
768{ 770{
769 fd_set read_set, write_set, exc_set; 771 fd_set read_set, write_set, exc_set;
770 double start;
771 int fd_max; 772 int fd_max;
772 int fd; 773 int fd;
773 int flags; 774 int flags;
@@ -776,7 +777,6 @@ _ecore_con_url_perform(Ecore_Con_Url *url_con)
776 777
777 ecore_list_append(_url_con_list, url_con); 778 ecore_list_append(_url_con_list, url_con);
778 779
779 start = ecore_time_get();
780 url_con->active = 1; 780 url_con->active = 1;
781 curl_multi_add_handle(curlm, url_con->curl_easy); 781 curl_multi_add_handle(curlm, url_con->curl_easy);
782 /* This one can't be stopped, or the download never start. */ 782 /* This one can't be stopped, or the download never start. */
@@ -835,8 +835,8 @@ _ecore_con_url_idler_handler(void *data)
835 835
836 start = ecore_time_get(); 836 start = ecore_time_get();
837 while (curl_multi_perform(curlm, &still_running) == CURLM_CALL_MULTI_PERFORM) 837 while (curl_multi_perform(curlm, &still_running) == CURLM_CALL_MULTI_PERFORM)
838 /* make this 1/20th of a second to keep interactivity high */ 838 /* make this not more than a frametime to keep interactivity high */
839 if ((ecore_time_get() - start) > 0.2) 839 if ((ecore_time_get() - start) > ecore_animator_frametime_get())
840 { 840 {
841 done = 0; 841 done = 0;
842 break; 842 break;