Move the "locker" plug-in to the Integration project

Makefile

@@ -144,7 +144,6 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/plugins/engineering.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/gprs.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/gps.c \
-		$(PACKAGE)-$(VERSION)/src/plugins/locker.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/n900.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/openmoko.c \
 		$(PACKAGE)-$(VERSION)/src/plugins/oss.c \

src/plugins/Makefile

@@ -1,5 +1,5 @@
 SUBDIRS	= 16x16 24x24 32x32 48x48
-TARGETS	= $(OBJDIR)blacklist.so $(OBJDIR)debug.so $(OBJDIR)engineering.so $(OBJDIR)gprs.so $(OBJDIR)gps.so $(OBJDIR)locker.so $(OBJDIR)n900.so $(OBJDIR)openmoko.so $(OBJDIR)oss.so $(OBJDIR)panel.so $(OBJDIR)password.so $(OBJDIR)profiles.so $(OBJDIR)smscrypt.so $(OBJDIR)systray.so $(OBJDIR)template.so $(OBJDIR)ussd.so $(OBJDIR)video.so
+TARGETS	= $(OBJDIR)blacklist.so $(OBJDIR)debug.so $(OBJDIR)engineering.so $(OBJDIR)gprs.so $(OBJDIR)gps.so $(OBJDIR)n900.so $(OBJDIR)openmoko.so $(OBJDIR)oss.so $(OBJDIR)panel.so $(OBJDIR)password.so $(OBJDIR)profiles.so $(OBJDIR)smscrypt.so $(OBJDIR)systray.so $(OBJDIR)template.so $(OBJDIR)ussd.so $(OBJDIR)video.so
 OBJDIR	=
 PREFIX	= /usr/local
 DESTDIR	=
@@ -63,13 +63,6 @@ gps_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 $(OBJDIR)gps.so: $(gps_OBJS)
 	$(CCSHARED) -o $(OBJDIR)gps.so $(gps_OBJS) $(gps_LDFLAGS)
 
-locker_OBJS = $(OBJDIR)locker.o
-locker_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
-
-$(OBJDIR)locker.so: $(locker_OBJS)
-	$(CCSHARED) -o $(OBJDIR)locker.so $(locker_OBJS) $(locker_LDFLAGS)
-
 n900_OBJS = $(OBJDIR)n900.o
 n900_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
 n900_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
@@ -162,9 +155,6 @@ $(OBJDIR)gprs.o: gprs.c ../../include/Phone.h ../../config.h
 $(OBJDIR)gps.o: gps.c ../../include/Phone.h
 	$(CC) $(gps_CFLAGS) -o $(OBJDIR)gps.o -c gps.c
 
-$(OBJDIR)locker.o: locker.c ../../include/Phone.h
-	$(CC) $(locker_CFLAGS) -o $(OBJDIR)locker.o -c locker.c
-
 $(OBJDIR)n900.o: n900.c ../../include/Phone.h
 	$(CC) $(n900_CFLAGS) -o $(OBJDIR)n900.o -c n900.c
 
@@ -200,11 +190,11 @@ $(OBJDIR)video.o: video.c ../../include/Phone.h
 
 clean:
 	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
-	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(gps_OBJS) $(locker_OBJS) $(n900_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(password_OBJS) $(profiles_OBJS) $(smscrypt_OBJS) $(systray_OBJS) $(template_OBJS) $(ussd_OBJS) $(video_OBJS)
+	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(gps_OBJS) $(n900_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(password_OBJS) $(profiles_OBJS) $(smscrypt_OBJS) $(systray_OBJS) $(template_OBJS) $(ussd_OBJS) $(video_OBJS)
 
 distclean:
 	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
-	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(gps_OBJS) $(locker_OBJS) $(n900_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(password_OBJS) $(profiles_OBJS) $(smscrypt_OBJS) $(systray_OBJS) $(template_OBJS) $(ussd_OBJS) $(video_OBJS)
+	$(RM) -- $(blacklist_OBJS) $(debug_OBJS) $(engineering_OBJS) $(gprs_OBJS) $(gps_OBJS) $(n900_OBJS) $(openmoko_OBJS) $(oss_OBJS) $(panel_OBJS) $(password_OBJS) $(profiles_OBJS) $(smscrypt_OBJS) $(systray_OBJS) $(template_OBJS) $(ussd_OBJS) $(video_OBJS)
 	$(RM) -- $(TARGETS)
 
 install: $(TARGETS)
@@ -220,8 +210,6 @@ install: $(TARGETS)
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
 	$(INSTALL) -m 0755 $(OBJDIR)gps.so $(DESTDIR)$(LIBDIR)/Phone/plugins/gps.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
-	$(INSTALL) -m 0755 $(OBJDIR)locker.so $(DESTDIR)$(LIBDIR)/Phone/plugins/locker.so
-	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
 	$(INSTALL) -m 0755 $(OBJDIR)n900.so $(DESTDIR)$(LIBDIR)/Phone/plugins/n900.so
 	$(MKDIR) $(DESTDIR)$(LIBDIR)/Phone/plugins
 	$(INSTALL) -m 0755 $(OBJDIR)openmoko.so $(DESTDIR)$(LIBDIR)/Phone/plugins/openmoko.so
@@ -247,7 +235,6 @@ uninstall:
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/engineering.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/gprs.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/gps.so
-	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/locker.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/n900.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/openmoko.so
 	$(RM) -- $(DESTDIR)$(LIBDIR)/Phone/plugins/oss.so

src/plugins/locker.c

@@ -1,117 +0,0 @@
-/* $Id$ */
-/* Copyright (c) 2011-2015 Pierre Pronchery <khorben@defora.org> */
-/* This file is part of DeforaOS Desktop Phone */
-/* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-
-
-#include <string.h>
-#include <System.h>
-#include <Desktop.h>
-#include <Desktop/Locker.h>
-#include "Phone.h"
-
-
-/* Locker */
-/* private */
-/* types */
-typedef struct _PhonePlugin
-{
-	PhonePluginHelper * helper;
-} LockerPhonePlugin;
-
-
-/* prototypes */
-/* plug-in */
-static LockerPhonePlugin * _locker_init(PhonePluginHelper * helper);
-static void _locker_destroy(LockerPhonePlugin * locker);
-static int _locker_event(LockerPhonePlugin * locker, PhoneEvent * event);
-
-/* useful */
-static int _locker_action(LockerAction action);
-
-
-/* public */
-/* variables */
-PhonePluginDefinition plugin =
-{
-	"Locker",
-	"gnome-lockscreen",
-	NULL,
-	_locker_init,
-	_locker_destroy,
-	_locker_event,
-	NULL
-};
-
-
-/* private */
-/* functions */
-/* locker_init */
-static LockerPhonePlugin * _locker_init(PhonePluginHelper * helper)
-{
-	LockerPhonePlugin * locker;
-
-	if((locker = object_new(sizeof(*locker))) == NULL)
-		return NULL;
-	locker->helper = helper;
-	return locker;
-}
-
-
-/* locker_destroy */
-static void _locker_destroy(LockerPhonePlugin * locker)
-{
-	object_delete(locker);
-}
-
-
-/* locker_event */
-static int _event_modem(ModemEvent * event);
-
-static int _locker_event(LockerPhonePlugin * locker, PhoneEvent * event)
-{
-	switch(event->type)
-	{
-		case PHONE_EVENT_TYPE_MODEM_EVENT:
-			return _event_modem(event->modem_event.event);
-		case PHONE_EVENT_TYPE_SUSPEND:
-			return _locker_action(LOCKER_ACTION_LOCK);
-		default: /* not relevant */
-			break;
-	}
-	return 0;
-}
-
-static int _event_modem(ModemEvent * event)
-{
-	switch(event->call.direction)
-	{
-		case MODEM_CALL_DIRECTION_INCOMING:
-			/* FIXME this is a security issue */
-			return _locker_action(LOCKER_ACTION_UNLOCK);
-		default: /* not relevant */
-			break;
-	}
-	return 0;
-}
-
-
-/* useful */
-/* locker_action */
-static int _locker_action(LockerAction action)
-{
-	desktop_message_send(LOCKER_CLIENT_MESSAGE, LOCKER_MESSAGE_ACTION,
-			action, TRUE);
-	return 0;
-}

src/plugins/project.conf

@@ -1,5 +1,5 @@
 subdirs=16x16,24x24,32x32,48x48
-targets=blacklist,debug,engineering,gprs,gps,locker,n900,openmoko,oss,panel,password,profiles,smscrypt,systray,template,ussd,video
+targets=blacklist,debug,engineering,gprs,gps,n900,openmoko,oss,panel,password,profiles,smscrypt,systray,template,ussd,video
 cppflags_force=-I ../../include
 cppflags=
 cflags_force=-W `pkg-config --cflags libSystem gtk+-2.0`
@@ -51,14 +51,6 @@ install=$(LIBDIR)/Phone/plugins
 [gps.c]
 depends=../../include/Phone.h
 
-[locker]
-type=plugin
-sources=locker.c
-install=$(LIBDIR)/Phone/plugins
-
-[locker.c]
-depends=../../include/Phone.h
-
 [n900]
 type=plugin
 sources=n900.c