yoz pushed a commit to branch master.
commit 5797cf9bf95e2d2f1c42087300f9a8f4eddf8b40
Merge: e77091d 11e78e1
Author: Michael Bouchaud <[email protected]>
Date: Wed Sep 4 21:33:26 2013 +0200
Merge branch 'master' of git+ssh://git.enlightenment.org/misc/entrance
.gitignore | 2 ++
configure.ac | 17 ++++++++---------
data/entrance | 11 +++++++----
data/entrance.conf | 2 +-
data/themes/default/default.edc | 1 +
data/themes/default/images/entrance_background.jpg | Bin 0 -> 808876 bytes
src/daemon/Makefile.am | 1 +
src/daemon/entrance.c | 5 +++--
src/daemon/entrance_history.c | 3 ++-
src/daemon/entrance_wait.c | 2 +-
src/event/entrance_event.c | 4 ++--
src/event/entrance_event.h | 4 ++--
12 files changed, 30 insertions(+), 22 deletions(-)
diff --cc src/daemon/entrance_history.c
index fbfc13c,df65675..9a0a050
--- a/src/daemon/entrance_history.c
+++ b/src/daemon/entrance_history.c
@@@ -125,10 -125,11 +125,11 @@@ entrance_history_push(const char *login
}
if (!el)
{
- if (el = calloc(1, sizeof(Entrance_Login)))
+ if ((el = calloc(1, sizeof(Entrance_Login))))
{
el->login = eina_stringshare_add(login);
- el->session = eina_stringshare_add(session);
+ if (session) el->session = eina_stringshare_add(session);
+ else el->session = NULL;
_entrance_history->history =
eina_list_append(_entrance_history->history, el);
_history_update = EINA_TRUE;
--
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
