summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-02-07 16:35:07 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-02-07 16:35:07 +0100
commit93e6106e67f3c337951b32486413b14e4acb4542 (patch)
tree89fc49997d4221b44ee9fba85970ede1a2ce62e5
parent16e9693d6304b46d3c3deff80e2c86d3b7d42263 (diff)
replace data/images with data/desktop
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am2
-rw-r--r--data/desktop/Makefile.am9
-rw-r--r--data/desktop/skeleton.desktop.in12
-rw-r--r--data/desktop/skeleton.png (renamed from data/images/logo.png)bin82822 -> 82822 bytes
-rw-r--r--src/bin/skeleton_main.c2
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])
62AC_CONFIG_FILES([ 62AC_CONFIG_FILES([
63Makefile 63Makefile
64data/Makefile 64data/Makefile
65data/desktop/Makefile
66data/desktop/skeleton.desktop
65data/themes/Makefile 67data/themes/Makefile
66data/themes/default/Makefile 68data/themes/default/Makefile
67doc/Makefile 69doc/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 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = themes 3SUBDIRS = 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 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3desktopdir = $(datadir)/applications
4desktop_DATA = skeleton.desktop
5
6icondir = $(datadir)/icons
7icon_DATA = skeleton.png
8
9EXTRA_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 @@
1[Desktop Entry]
2Encoding=UTF-8
3Version=@VERSION@
4Type=Application
5Name=@PACKAGE_NAME@
6Name[fr]=@PACKAGE_NAME@
7GenericName=Efl Application Skeletion
8Comment=Efl Application Skeleton
9Icon=@PACKAGE_NAME@
10TryExec=@PACKAGE_NAME@
11Exec=@PACKAGE_NAME@
12Categories=Development;Utility;
diff --git a/data/images/logo.png b/data/desktop/skeleton.png
index 9037bea..9037bea 100644
--- a/data/images/logo.png
+++ b/data/desktop/skeleton.png
Binary files differ
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)
100 goto end; 100 goto end;
101 } 101 }
102 102
103 elm_app_info_set(elm_main, "skeleton", "images/logo.png"); 103 elm_app_info_set(elm_main, "skeleton", "images/skeleton.png");
104 104
105 if (!(win = skeleton_win_setup())) 105 if (!(win = skeleton_win_setup()))
106 goto end; 106 goto end;