From dfedc15b9d77e5bf8a3117f01d621e7ad383de2b Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 6 Dec 2013 08:50:51 +0100
Subject: [PATCH] Installing the wireless browser by default

---
 Makefile                          | 1 +
 data/Makefile                     | 3 +++
 data/deforaos-wifibrowser.desktop | 8 ++++++++
 data/project.conf                 | 5 ++++-
 tools/Makefile                    | 3 +++
 tools/project.conf                | 1 +
 6 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 data/deforaos-wifibrowser.desktop

diff --git a/Makefile b/Makefile
index 8f20032..971440b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/data/Makefile \
 		$(PACKAGE)-$(VERSION)/data/Panel.pc.in \
 		$(PACKAGE)-$(VERSION)/data/deforaos-panel-settings.desktop \
+		$(PACKAGE)-$(VERSION)/data/deforaos-wifibrowser.desktop \
 		$(PACKAGE)-$(VERSION)/data/pkgconfig.sh \
 		$(PACKAGE)-$(VERSION)/data/project.conf \
 		$(PACKAGE)-$(VERSION)/data/16x16/Makefile \
diff --git a/data/Makefile b/data/Makefile
index 18b42ca..3a8f098 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -35,10 +35,13 @@ install: $(TARGETS)
 	./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Panel.pc"
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -m 0644 deforaos-panel-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL) -m 0644 deforaos-wifibrowser.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-wifibrowser.desktop
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
 	./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -u -- "Panel.pc"
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-wifibrowser.desktop
 
 .PHONY: all subdirs clean distclean install uninstall
diff --git a/data/deforaos-wifibrowser.desktop b/data/deforaos-wifibrowser.desktop
new file mode 100644
index 0000000..9f0e9bc
--- /dev/null
+++ b/data/deforaos-wifibrowser.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Wireless networks
+Comment=Connect to wireless networks
+TryExec=wifibrowser
+Exec=wifibrowser
+Icon=network-wireless
+Type=Application
+Categories=Settings;GTK;
diff --git a/data/project.conf b/data/project.conf
index ea73942..c9102b6 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,6 +1,6 @@
 subdirs=16x16,22x22,24x24,32x32,48x48,scalable
 targets=Panel.pc
-dist=Makefile,Panel.pc.in,deforaos-panel-settings.desktop,pkgconfig.sh
+dist=Makefile,Panel.pc.in,deforaos-panel-settings.desktop,deforaos-wifibrowser.desktop,pkgconfig.sh
 
 [Panel.pc]
 type=script
@@ -10,3 +10,6 @@ install=
 
 [deforaos-panel-settings.desktop]
 install=$(PREFIX)/share/applications
+
+[deforaos-wifibrowser.desktop]
+install=$(PREFIX)/share/applications
diff --git a/tools/Makefile b/tools/Makefile
index 5b901b4..5abe95a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -80,10 +80,13 @@ install: $(TARGETS)
 	$(INSTALL) -m 0755 panel-message $(DESTDIR)$(BINDIR)/panel-message
 	$(MKDIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 0755 panel-notify $(DESTDIR)$(BINDIR)/panel-notify
+	$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 0755 wifibrowser $(DESTDIR)$(BINDIR)/wifibrowser
 
 uninstall:
 	$(RM) -- $(DESTDIR)$(BINDIR)/panel-embed
 	$(RM) -- $(DESTDIR)$(BINDIR)/panel-message
 	$(RM) -- $(DESTDIR)$(BINDIR)/panel-notify
+	$(RM) -- $(DESTDIR)$(BINDIR)/wifibrowser
 
 .PHONY: all clean distclean install uninstall
diff --git a/tools/project.conf b/tools/project.conf
index 3fec78b..44ebb58 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -33,6 +33,7 @@ sources=test.c
 type=binary
 cppflags=-I ../include
 sources=wifibrowser.c
+install=$(BINDIR)
 
 [embed.c]
 depends=../include/Panel.h,../config.h