[EGIT] [core/efl] master 02/03: ecore_file: improved Ecore_File_Download test.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=398378bf9009e1c479407f18e683f888d7c3
commit 398378bf9009e1c479407f18e683f888d7c3
Author: kabeer khan kabeer.k...@samsung.com
Date: Wed Apr 15 14:15:38 2015 +0200
ecore_file: improved Ecore_File_Download test.
Summary: Signed-off-by: kabeer khan kabeer.k...@samsung.com
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2338
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/tests/ecore/ecore_test_ecore_file.c | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/tests/ecore/ecore_test_ecore_file.c
b/src/tests/ecore/ecore_test_ecore_file.c
index a340baa..81e105a 100644
--- a/src/tests/ecore/ecore_test_ecore_file.c
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -96,6 +96,13 @@ completion_cb(void *data EINA_UNUSED, const char *file
EINA_UNUSED, int status)
ecore_main_loop_quit();
}
+void
+err_completion_cb(void *data EINA_UNUSED, const char *file EINA_UNUSED, int
status)
+{
+ fail_if(status != 1);
+ ecore_main_loop_quit();
+}
+
int
progress_cb(void *data EINA_UNUSED, const char *file EINA_UNUSED,
long int dltotal, long int dlnow,
@@ -357,6 +364,7 @@ START_TEST(ecore_test_ecore_file_download)
char dest_name[MAXSIZE] = {'\0'};
Eina_Bool res;
Eina_Hash *headers;
+ Ecore_File_Download_Job *job = NULL;
int ret;
ret = ecore_file_init();
@@ -366,12 +374,14 @@ START_TEST(ecore_test_ecore_file_download)
fail_if(!download_dir);
download_file = ecore_file_file_get(download_url);
fail_if(!download_file);
+ fail_if(!ecore_file_download_protocol_available(http://;));
strcat(dest_name, download_dir);
strcat(dest_name, /);
strcat(dest_name, download_file);
res = ecore_file_download(download_url, dest_name, completion_cb,
- progress_cb, NULL, NULL);
+ progress_cb, NULL, job);
fail_if(res != EINA_TRUE);
+ fail_if(!job);
ecore_main_loop_begin();
fprintf(stderr, Downloaded %lld bytes\n, ecore_file_size(dest_name));
res = ecore_file_exists(dest_name);
@@ -379,6 +389,19 @@ START_TEST(ecore_test_ecore_file_download)
res = ecore_file_unlink(dest_name);
fail_if(res != EINA_TRUE);
+ res = ecore_file_download(xxyyzz, dest_name, completion_cb,
+ progress_cb, job, NULL);
+ fail_if(res != EINA_FALSE);
+
+ res = ecore_file_download(download_url, dest_name, err_completion_cb,
+ progress_cb, job, NULL);
+ fail_if(res != EINA_TRUE);
+ fail_if(!job);
+ ecore_file_download_abort(job);
+ ecore_main_loop_begin();
+ res = ecore_file_remove(dest_name);
+ fail_if(res != EINA_TRUE);
+
headers = eina_hash_string_small_new(NULL);
eina_hash_add(headers, Content-type, text/xml);
--
[EGIT] [apps/epour] master 01/03: Fix error on torrent removal
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=9d83e78579971827bf5081715b83a3b821ae78af
commit 9d83e78579971827bf5081715b83a3b821ae78af
Author: Kai Huuhko kai.huu...@gmail.com
Date: Wed Apr 15 14:25:47 2015 +0300
Fix error on torrent removal
---
epour/session.py | 72
1 file changed, 31 insertions(+), 41 deletions(-)
diff --git a/epour/session.py b/epour/session.py
index 3fe99f1..8164777 100644
--- a/epour/session.py
+++ b/epour/session.py
@@ -42,13 +42,6 @@ from efl.ecore import Timer
from xdg.BaseDirectory import save_data_path, load_data_paths
-def torrent_path_get(ihash):
-for p in load_data_paths(epour):
-path = os.path.join(p, {0}.torrent.format(ihash))
-if os.path.isfile(path):
-return path
-
-
class Session(lt.session):
def __init__(self, conf):
self.conf = conf
@@ -121,7 +114,6 @@ class Session(lt.session):
h = a.handle
ihash = str(h.info_hash())
self.log.debug(Metadata received.)
-#self.write_torrent(h)
t_info = h.get_torrent_info()
t = {}
t[info] = lt.bdecode(t_info.metadata())
@@ -255,36 +247,28 @@ class Session(lt.session):
self.log.debug(List of torrents saved.)
-# Save fast resume data
-# for h in self.get_torrents():
-# if not h.is_valid() or not h.has_metadata():
-# continue
-# data = lt.bencode(h.write_resume_data())
-# with open(os.path.join(
-# data_dir, str(h.info_hash()) + .fastresume
-# ), 'wb') as f:
-# f.write(data)
-
-# self.log.debug(Fast resume data saved.)
-
-def write_torrent(self, h):
-if h is None:
-self.log.debug(Tried to write torrent while handle was empty.)
-return
+# def write_torrent(self, h):
+# if h is None:
+# self.log.debug(Tried to write torrent while handle was empty.)
+# return
-t_info = h.get_torrent_info()
-ihash = str(h.info_hash())
+# t_info = h.get_torrent_info()
+# ihash = str(h.info_hash())
-self.log.debug(Writing torrent file {}.format(ihash))
+# self.log.debug(Writing torrent file {}.format(ihash))
-md = lt.bdecode(t_info.metadata())
-t = {}
-t[info] = md
-t_path = torrent_path_get(ihash)
-with open(t_path, wb) as f:
-f.write(lt.bencode(t))
+# md = lt.bdecode(t_info.metadata())
+# t = {}
+# t[info] = md
+
+# p = save_data_path(epour)
+# t_path = os.path.join(p, {0}.torrent.format(ihash))
-return t_path
+# if t_path:
+# with open(t_path, wb) as f:
+# f.write(lt.bencode(t))
+
+# return t_path
def remove_torrent(self, h, with_data=False):
ihash = str(h.info_hash())
@@ -307,13 +291,19 @@ class Session(lt.session):
else:
os.remove(fr_path)
-try:
-with open(torrent_path_get(ihash)):
-pass
-except IOError:
-self.log.debug(Could not remove torrent file.)
-else:
-os.remove(torrent_path_get(ihash))
+t_path = None
+for p in load_data_paths(epour):
+t_path = os.path.join(p, {0}.torrent.format(ihash))
+break
+
+if t_path:
+try:
+with open(t_path):
+pass
+except IOError:
+self.log.debug(Could not remove torrent file.)
+else:
+os.remove(t_path)
if not hasattr(lt, torrent_removed_alert):
class torrent_removed_alert(object):
--
[EGIT] [apps/epour] master 02/03: Use pop_alerts() instead of looping with pop_alert
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=18299f202cf4105c18070673243c0015fb0302ed
commit 18299f202cf4105c18070673243c0015fb0302ed
Author: Kai Huuhko kai.huu...@gmail.com
Date: Wed Apr 15 14:44:03 2015 +0300
Use pop_alerts() instead of looping with pop_alert
This saves CPU cycles on a busy session.
---
epour/session.py | 13 -
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/epour/session.py b/epour/session.py
index 8164777..52471c7 100644
--- a/epour/session.py
+++ b/epour/session.py
@@ -1,7 +1,7 @@
#
# Epour - A bittorrent client using EFL and libtorrent
#
-# Copyright 2012-2014 Kai Huuhko kai.huu...@gmail.com
+# Copyright 2012-2015 Kai Huuhko kai.huu...@gmail.com
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -393,7 +393,7 @@ class AlertManager(object):
self.timer = Timer(self.update_interval, self.update)
def callback_add(self, alert_type, cb, *args, **kwargs):
-if not alert_type in self.alerts:
+if alert_type not in self.alerts:
self.alerts[alert_type] = []
self.alerts[alert_type].append((cb, args, kwargs))
@@ -405,7 +405,7 @@ class AlertManager(object):
def signal(self, a):
a_name = type(a).__name__
-if not a_name in self.alerts:
+if a_name not in self.alerts:
self.log.debug(No handler: {} | {}.format(a_name, a))
return
@@ -416,13 +416,8 @@ class AlertManager(object):
self.log.exception(Exception while handling alerts)
def update(self):
-# TODO: Use pop_alerts()
#self.log.debug(Alerts TICK)
-while 1:
-a = self.session.pop_alert()
-if not a:
-break
-
+for a in self.session.pop_alerts():
self.signal(a)
return True
--
[EGIT] [website/www-content] master 01/01: Wiki page contact changed with summary [Add e.py to the list of IRC channels] by Davide Andreoli
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=619431e4de572f1a057c6f95793cfec3a4259493 commit 619431e4de572f1a057c6f95793cfec3a4259493 Author: Davide Andreoli d...@gurumeditation.it Date: Wed Apr 15 12:57:27 2015 -0700 Wiki page contact changed with summary [Add e.py to the list of IRC channels] by Davide Andreoli --- pages/contact.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/contact.txt b/pages/contact.txt index 625cdd9..cde4797 100644 --- a/pages/contact.txt +++ b/pages/contact.txt @@ -1,8 +1,9 @@ ~~Title: Contact Us~~ IRC -^IRC Server ^Port ^Channel ^ -|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e | +^IRC Server ^Port ^Channel ^ Topic^ +|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e | General | +|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.py | Python related | Many of the core developers involved in Enlightenment as well as a lot of users are on IRC. They use IRC often and will discuss many --
[EGIT] [website/www-content] master 02/02: exmaple page - show off new plugins
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=8d6ab2f06d6c65e2533eadd9c64ddcdf6ff91e03
commit 8d6ab2f06d6c65e2533eadd9c64ddcdf6ff91e03
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Apr 16 13:48:09 2015 +0900
exmaple page - show off new plugins
---
pages/example.txt | 77 +++
1 file changed, 77 insertions(+)
diff --git a/pages/example.txt b/pages/example.txt
index f66a76f..1680ca0 100644
--- a/pages/example.txt
+++ b/pages/example.txt
@@ -93,5 +93,82 @@ Some text
Yet another level
+itemtable header=test;c=column_a;c=column_b,column_c;c=column_d;fdelim=:
+
+_line_a
+column_a:text_a1
+column_b:tablecelltext_a2 \\ This is an example
+how to fill a cell over several lines/tablecell
+
+_line_b
+column_a:tablecelltext_b1 \\ \\ As you can see, local DokuWiki CRLF sequences
+can be added to force a linebreak in the cell. Other formatting
+elements could be used as well.
+/tablecell
+column_c:text_b2
+
+/itemtable
+
+{|
+|+//Extended Table Example//
+! style=width: 12em;|
+A1 Header
+! style=width: 10em;|
+B1 Header
+|- style=background-color: #223344;
+|
+{{ icon-enlightenment.png?50nolink}}
+Lorem ipsum dolor sit amet,
+consetetur sadipscing elitr,
+sed diam nonumy eirmod tempor invidunt
+ut labore et dolore magna aliquyam erat,
+sed diam voluptua.
+|
+B2 Data
+ * //italic//
+ * ''monospace''
+ * [[:start|page link]]
+
+**ATTENTION:**\\
+Needs an extra empty line
+after the end of whole table!
+|}
+
+ - Ordered list item 1
+ - Ordered list item 2
+ -- Ordered list item 3...
+ .. ... in multiple paragraphs
+ - Ordered list item 4
+
+ * Unordered list item
+ ** Unordered list item...
+ .. ... in multiple paragraphs
+
+ - Ordered list, first level
+- Second level
+ - Third level
+- Fourth level
+-- Back to second level
+ - //Second?! What happened to third?//
+.. //Quiet, you.//
+ - Back to first level
+ - Still at first level
+
+ ? Definition list
+ : Definition lists vary only slightly from other types of lists in that list
items consist of two parts: a term and a description. The term is given by the
DT element and is restricted to inline content. The description is given with a
DD element that contains block-level content. [Source: W3C]
+ ? Definition list w/ multiple paragraphs
+ :: The style sheet provided with this plugin will render these paragraphs...
+ .. ... to the left of the term being defined.
+? Definition list w/ multiple paragraphs
+: Another way to separate blocks of text in a definition...
+: ... is to simply have multiple definitions for a term (or group of
terms).
+
+ : This definition list has DD tags without any preceding DT tags.
+ : Hey, it's legal XHTML.
+ ? Just like DT tags without following DD tags.
+ ?? But DT tags can't contain paragraphs. That would __not__ be legal XHTML.
+ .. If you try, the result will be rendered oddly.
+
+
~~DISCUSSIONS~~
--
[EGIT] [website/www] master 02/02: www plugin - remove svgpureinsert - not needed if we just add mime
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=75d9a74cf5a8a8c0ac1ebde02bca1630f6fb4f81 commit 75d9a74cf5a8a8c0ac1ebde02bca1630f6fb4f81 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Apr 16 13:43:51 2015 +0900 www plugin - remove svgpureinsert - not needed if we just add mime what we really wanted is just adding svg to mimetypes allowed for images --- public_html/lib/plugins/svgpureinsert/.gitignore | 0 public_html/lib/plugins/svgpureinsert/.travis.yml | 13 - public_html/lib/plugins/svgpureinsert/README | 29 -- .../lib/plugins/svgpureinsert/_test/dokuwiki.svg | 541 - .../plugins/svgpureinsert/_test/general.test.php | 33 -- .../lib/plugins/svgpureinsert/_test/svglogo.svg| 50 -- .../plugins/svgpureinsert/_test/syntax.test.php| 52 -- public_html/lib/plugins/svgpureinsert/action.php | 32 -- .../lib/plugins/svgpureinsert/cache/.gitignore | 0 public_html/lib/plugins/svgpureinsert/helper.php | 149 -- .../lib/plugins/svgpureinsert/plugin.info.txt | 7 - public_html/lib/plugins/svgpureinsert/syntax.php | 124 - 12 files changed, 1030 deletions(-) diff --git a/public_html/lib/plugins/svgpureinsert/.gitignore b/public_html/lib/plugins/svgpureinsert/.gitignore deleted file mode 100644 index e69de29..000 diff --git a/public_html/lib/plugins/svgpureinsert/.travis.yml b/public_html/lib/plugins/svgpureinsert/.travis.yml deleted file mode 100644 index caf4cca..000 --- a/public_html/lib/plugins/svgpureinsert/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Config file for travis-ci.org - -language: php -php: - - 5.5 - - 5.4 - - 5.3 -env: - - DOKUWIKI=master - - DOKUWIKI=stable -before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh -install: sh travis.sh -script: cd _test phpunit --stderr --group plugin_svgpureinsert \ No newline at end of file diff --git a/public_html/lib/plugins/svgpureinsert/README b/public_html/lib/plugins/svgpureinsert/README deleted file mode 100644 index 89320e1..000 --- a/public_html/lib/plugins/svgpureinsert/README +++ /dev/null @@ -1,29 +0,0 @@ -svgpureinsert Plugin for DokuWiki - -Inserts an SVG image as-is into a DokuWiki page to be rendered by -compatible browsers. - -All documentation for this plugin can be found at -https://www.dokuwiki.org/plugin:svgpureinsert - -If you install this plugin manually, make sure it is installed in -lib/plugins/svgpureinsert/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - - -Copyright (C) Leszek Piątek lpia...@gmail.com, - Andreas Gohr g...@cosmocode.de - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg b/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg deleted file mode 100644 index eb4bbe9..000 --- a/public_html/lib/plugins/svgpureinsert/_test/dokuwiki.svg +++ /dev/null @@ -1,541 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -!-- Created with Inkscape (http://www.inkscape.org/) -- -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://web.resource.org/cc/; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; - xmlns:sodipodi=http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=744.09448819 - height=1052.3622047 - id=svg2 - sodipodi:version=0.32 - inkscape:version=0.43 - sodipodi:docbase=/home/andi - sodipodi:docname=dokuwiki.svg - defs - id=defs4 -linearGradient - id=linearGradient2624 - stop - style=stop-color:#3a9030;stop-opacity:0.83673471; - offset=0 - id=stop2626 / - stop - style=stop-color:#3d9c32;stop-opacity:0.79591835; - offset=1 - id=stop2628 / -/linearGradient -linearGradient - id=linearGradient2612 - stop - style=stop-color:#25901b;stop-opacity:0.83673471; - offset=0 - id=stop2614 / - stop - style=stop-color:#25901b;stop-opacity:0.37755102; - offset=1 - id=stop2616 / -/linearGradient -linearGradient - id=linearGradient2600 - stop -
[EGIT] [website/www-content] master 01/01: efl www - simplify doc dir tree a bit
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=b78bbbe69a0ddf5043e8aec8cdd26d73c50018ea
commit b78bbbe69a0ddf5043e8aec8cdd26d73c50018ea
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Apr 16 14:14:51 2015 +0900
efl www - simplify doc dir tree a bit
---
media/docs/{lib = }/efl/mainloop.png | Bin
media/docs/{lib = }/efl/mainloop.svg | 0
pages/docs.txt | 2 +-
.../{ref/lib/efl/gen = efl/ref}/c/key/evas_object_del.txt | 0
.../{ref/lib/efl/gen = efl/ref}/c/key/evas_object_ref.txt | 0
pages/docs/efl/ref/c/keyword-link.txt | 1 +
pages/docs/{ref/lib/efl/gen = efl/ref}/c/keyword-list.txt | 0
pages/docs/{lib = }/efl/start.txt | 3 ++-
pages/docs/ref/lib/efl/gen/c/keyword-link.txt | 1 -
9 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/media/docs/lib/efl/mainloop.png b/media/docs/efl/mainloop.png
similarity index 100%
rename from media/docs/lib/efl/mainloop.png
rename to media/docs/efl/mainloop.png
diff --git a/media/docs/lib/efl/mainloop.svg b/media/docs/efl/mainloop.svg
similarity index 100%
rename from media/docs/lib/efl/mainloop.svg
rename to media/docs/efl/mainloop.svg
diff --git a/pages/docs.txt b/pages/docs.txt
index c0bf090..e4506c1 100644
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -9,7 +9,7 @@ continually. This is also the case if you want to contribute. Of
course you can use stable packages for your distribution as well.
* [[docs-efl-start|Get EFL installed]]
- * [[docs/lib/efl/start|Get started with EFL]]
+ * [[docs/efl/start|Get started with EFL]]
diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt
b/pages/docs/efl/ref/c/key/evas_object_del.txt
similarity index 100%
rename from pages/docs/ref/lib/efl/gen/c/key/evas_object_del.txt
rename to pages/docs/efl/ref/c/key/evas_object_del.txt
diff --git a/pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt
b/pages/docs/efl/ref/c/key/evas_object_ref.txt
similarity index 100%
rename from pages/docs/ref/lib/efl/gen/c/key/evas_object_ref.txt
rename to pages/docs/efl/ref/c/key/evas_object_ref.txt
diff --git a/pages/docs/efl/ref/c/keyword-link.txt
b/pages/docs/efl/ref/c/keyword-link.txt
new file mode 100644
index 000..a030b1a
--- /dev/null
+++ b/pages/docs/efl/ref/c/keyword-link.txt
@@ -0,0 +1 @@
+/docs/efl/ref/c/key/{FNAMEL}
diff --git a/pages/docs/ref/lib/efl/gen/c/keyword-list.txt
b/pages/docs/efl/ref/c/keyword-list.txt
similarity index 100%
rename from pages/docs/ref/lib/efl/gen/c/keyword-list.txt
rename to pages/docs/efl/ref/c/keyword-list.txt
diff --git a/pages/docs/lib/efl/start.txt b/pages/docs/efl/start.txt
similarity index 99%
rename from pages/docs/lib/efl/start.txt
rename to pages/docs/efl/start.txt
index 41cbb8b..f5f05ef 100644
--- a/pages/docs/lib/efl/start.txt
+++ b/pages/docs/efl/start.txt
@@ -1,4 +1,5 @@
~~Title: EFL~~
+
EFL
EFL is a range of libraries that cover APIs to solve every day
@@ -55,7 +56,7 @@ struggling against EFL and what it is pushing you to use.
This does
not mean we do not support threads, we just push you into a specific
design pattern.
-{{ :docs:lib:efl:mainloop.svg?nolink |Application Mainloop}}
+{{ :docs:efl:mainloop.svg?nolink |Application Mainloop}}
An application would spend almost it's entire life inside the
__Mainloop__ sleeping, processing events and then updating it's UI,
diff --git a/pages/docs/ref/lib/efl/gen/c/keyword-link.txt
b/pages/docs/ref/lib/efl/gen/c/keyword-link.txt
deleted file mode 100644
index 4d6db0f..000
--- a/pages/docs/ref/lib/efl/gen/c/keyword-link.txt
+++ /dev/null
@@ -1 +0,0 @@
-/docs/ref/lib/efl/gen/c/key/{FNAMEL}
--
[EGIT] [apps/empc] master 02/02: fix apm to add all new/updated albums, not just first album
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=764297867cc67275175a3e5b868fcb77b7688e67
commit 764297867cc67275175a3e5b868fcb77b7688e67
Author: zmike michael.blumenkra...@gmail.com
Date: Wed Apr 15 22:20:26 2015 -0400
fix apm to add all new/updated albums, not just first album
---
src/modules/auto_playlist_manager.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/auto_playlist_manager.c
b/src/modules/auto_playlist_manager.c
index 5f8cc2e..5be64e3 100644
--- a/src/modules/auto_playlist_manager.c
+++ b/src/modules/auto_playlist_manager.c
@@ -19,6 +19,7 @@ static Ecore_Timer *update_timer;
static Eina_List *adds;
static unsigned int wait_count;
+static unsigned int last_queue_length;
static void auto_playlist_manager_shutdown(void);
@@ -187,6 +188,7 @@ run_adds(void)
char *file;
Eina_List *l, *ll;
+ last_queue_length = empd_queue_length;
EINA_LIST_FOREACH_SAFE(adds, l, ll, file)
{
const char *a, *b = NULL;
@@ -287,7 +289,7 @@ static Eina_Bool
queue_update()
{
- if (adds wait_count) wait_count--;
+ if (wait_count) wait_count -= (empd_queue_length - last_queue_length);
if (adds (!wait_count))
run_adds();
return ECORE_CALLBACK_RENEW;
--
[EGIT] [apps/empc] master 01/02: export empd_queue_length for use in modules
discomfitor pushed a commit to branch master. http://git.enlightenment.org/apps/empc.git/commit/?id=b5f571087e8cacfd74272d0e5dcddf30fee0b4df commit b5f571087e8cacfd74272d0e5dcddf30fee0b4df Author: zmike michael.blumenkra...@gmail.com Date: Wed Apr 15 22:12:55 2015 -0400 export empd_queue_length for use in modules --- src/bin/empc.c | 2 +- src/bin/empc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/empc.c b/src/bin/empc.c index 866a1ee..9fa6c5e 100644 --- a/src/bin/empc.c +++ b/src/bin/empc.c @@ -95,7 +95,7 @@ static Eina_Stringshare *empd_song_album = NULL; static Elm_Object_Item *empd_song_item = NULL; static unsigned int empd_song_length = 0; static unsigned int empd_song_elapsed = 0; -static unsigned int empd_queue_length = 0; +EAPI unsigned int empd_queue_length = 0; static unsigned char background_num = 0; diff --git a/src/bin/empc.h b/src/bin/empc.h index 76e3d5b..75bd398 100644 --- a/src/bin/empc.h +++ b/src/bin/empc.h @@ -76,6 +76,7 @@ void empc_metadata_image_download(Empc_Fetch_Request *req, const char *url); void empc_metadata_image_download_queue(Empc_Fetch_Request *req, const char *url); #endif extern Eina_Stringshare *empd_music_directory; +extern unsigned int empd_queue_length; extern Eina_Bool master; EAPI extern void *empd_proxy; --
[EGIT] [core/elementary] master 01/01: build: Make sure we remove check-results.xml during cleanup
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=297338991f7ed70fa464f2fc04a0ec4a556d1224 commit 297338991f7ed70fa464f2fc04a0ec4a556d1224 Author: Stefan Schmidt s.schm...@samsung.com Date: Wed Apr 15 11:35:27 2015 +0200 build: Make sure we remove check-results.xml during cleanup This file gets created durign a make check run. We need to remove it manually as it is not tracked otherwise. --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 30de680..619f0ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -152,4 +152,7 @@ endif if ELEMENTARY_ENABLE_COVERAGE @$(MAKE) $(AM_MAKEFLAGS) lcov-report endif + +clean-local: + rm src/tests/check-results.xml endif --
[EGIT] [website/www] master 01/01: www - dt - remove line at bottom in css
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=fc684881053801a7dafecabe5f71c00dd4e5bad1
commit fc684881053801a7dafecabe5f71c00dd4e5bad1
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Wed Apr 15 18:16:45 2015 +0900
www - dt - remove line at bottom in css
---
public_html/lib/tpl/e/css/modifications.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/css/modifications.css
b/public_html/lib/tpl/e/css/modifications.css
index c77c8f2..c42dd65 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -288,7 +288,7 @@ padding: 10px;
dt {
padding-top: 10px;
- border-bottom: 1px solid #606060;
+ border-bottom: 0px;
}
dd {
--
