jeyzu pushed a commit to branch master.

http://git.enlightenment.org/tools/skeleton.git/commit/?id=93e6106e67f3c337951b32486413b14e4acb4542

commit 93e6106e67f3c337951b32486413b14e4acb4542
Author: Jérémy Zurcher <jer...@asynk.ch>
Date:   Fri Feb 7 16:35:07 2014 +0100

    replace data/images with data/desktop
---
 configure.ac                                   |   2 ++
 data/Makefile.am                               |   2 +-
 data/desktop/Makefile.am                       |   9 +++++++++
 data/desktop/skeleton.desktop.in               |  12 ++++++++++++
 data/{images/logo.png => desktop/skeleton.png} | Bin
 src/bin/skeleton_main.c                        |   2 +-
 6 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 474fee8..79f72e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,8 @@ AM_GNU_GETTEXT([external])
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/desktop/Makefile
+data/desktop/skeleton.desktop
 data/themes/Makefile
 data/themes/default/Makefile
 doc/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7d904a4..2d4e6c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = themes
+SUBDIRS = themes desktop
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
new file mode 100644
index 0000000..aca6b9b
--- /dev/null
+++ b/data/desktop/Makefile.am
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+desktopdir = $(datadir)/applications
+desktop_DATA = skeleton.desktop
+
+icondir = $(datadir)/icons
+icon_DATA = skeleton.png
+
+EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
diff --git a/data/desktop/skeleton.desktop.in b/data/desktop/skeleton.desktop.in
new file mode 100644
index 0000000..ac2c5a6
--- /dev/null
+++ b/data/desktop/skeleton.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=@VERSION@
+Type=Application
+Name=@PACKAGE_NAME@
+Name[fr]=@PACKAGE_NAME@
+GenericName=Efl Application Skeletion
+Comment=Efl Application Skeleton
+Icon=@PACKAGE_NAME@
+TryExec=@PACKAGE_NAME@
+Exec=@PACKAGE_NAME@
+Categories=Development;Utility;
diff --git a/data/images/logo.png b/data/desktop/skeleton.png
similarity index 100%
rename from data/images/logo.png
rename to data/desktop/skeleton.png
diff --git a/src/bin/skeleton_main.c b/src/bin/skeleton_main.c
index 412c358..287562c 100644
--- a/src/bin/skeleton_main.c
+++ b/src/bin/skeleton_main.c
@@ -100,7 +100,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
        goto end;
      }
 
-   elm_app_info_set(elm_main, "skeleton", "images/logo.png");
+   elm_app_info_set(elm_main, "skeleton", "images/skeleton.png");
 
    if (!(win = skeleton_win_setup()))
      goto end;

-- 


Reply via email to