[EGIT] [apps/terminology] master 05/05: Merge remote-tracking branch 'mjtorn/login_shell'

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=2706eef099a8adba16403e637d5d999720f8701d

commit 2706eef099a8adba16403e637d5d999720f8701d
Merge: e3adfa2 044a7f9
Author: Boris Faure <bill...@gmail.com>
Date:   Wed Jan 15 22:03:26 2014 +0100

    Merge remote-tracking branch 'mjtorn/login_shell'
    
    Conflicts:
        src/bin/config.c

 src/bin/config.c           | 27 ++++++++++++++++-----------
 src/bin/config.h           |  1 +
 src/bin/main.c             | 14 +++++++++-----
 src/bin/options_behavior.c | 39 +++++++++++++++++++++++++++++----------
 4 files changed, 55 insertions(+), 26 deletions(-)

diff --cc src/bin/config.c
index 3d826b0,ea4fddc..f831fa4
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@@ -547,19 -507,14 +551,19 @@@ config_fork(Config *config
  
     config2 = calloc(1, sizeof(Config));
     if (!config2) return NULL;
- #define CPY(fld) config2->fld = config->fld;   
+ #define CPY(fld) config2->fld = config->fld;
  #define SCPY(fld) if (config->fld) config2->fld = 
eina_stringshare_add(config->fld)
 -
 +#define SLSTCPY(fld) \
 +   do { Eina_List *__l; const char *__s; \
 +     EINA_LIST_FOREACH(config->fld, __l, __s) \
 +       config2->fld = eina_list_append \
 +         (config2->fld, eina_stringshare_add(__s)); } while (0)
 +   
     CPY(version);
-    SCPY(font.name);   
+    SCPY(font.name);
     CPY(font.size);
     CPY(font.bitmap);
-    SCPY(helper.email);   
+    SCPY(helper.email);
     SCPY(helper.url.general);
     SCPY(helper.url.video);
     SCPY(helper.url.image);

--