e_config: NOT install profile.cfg and Ignore line feed when it gets profile name 78/32078/2
authorMinJeong Kim <minjjj.kim@samsung.com>
Mon, 15 Dec 2014 11:55:37 +0000 (20:55 +0900)
committerMinJeong Kim <minjjj.kim@samsung.com>
Mon, 15 Dec 2014 12:06:42 +0000 (21:06 +0900)
Change-Id: Ia0d64070647a1cf14547773b9c186d274b6fdfdc
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
packaging/enlightenment.spec
src/bin/e_config.c

index 60b32def23fa759045d645af0c62edce9e8d9f10..c9e04c8cbdee73d0b858800de145b14e8c0f0e07 100644 (file)
@@ -91,6 +91,7 @@ make %{?_smp_mflags}
 %{_sysconfdir}/xdg/menus/e-applications.menu
 %{_datadir}/applications/enlightenment_filemanager.desktop
 /usr/lib/systemd/user/enlightenment.service
+%exclude /usr/share/enlightenment/data/config/profile.cfg
 
 %files devel
 %manifest %{name}.manifest
index 18dcdd9a9eaa1a4d1ce1292bf8bdb7039e23dc82..de632f775d9b5011429f929b9ec039b9b7b23e1c 100644 (file)
@@ -79,6 +79,13 @@ _e_config_profile_name_get(Eet_File *ef)
 
         for (s = data; s < (data + data_len); s++)
           {
+             // eet can read line feed,
+             // but it has to be ignored
+             if (*s == '\n')
+               {
+                  data_len--;
+                  break;
+               }
              // if profile is not all ascii (valid printable ascii - no
              // control codes etc.) or it contains a '/' (invalid as its a
              // directory delimiter) - then it's invalid