[sawfish/edge-actions] rename sawfish.wm.edge.flippers to sawfish.wm.edge.subrs

[Christopher Bratusek <chrisb src gnome org>]

commit 6860d06eb5f7253b2673562a893abbf1809b1956
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sat Nov 6 07:46:15 2010 +0100

    rename sawfish.wm.edge.flippers to sawfish.wm.edge.subrs

 ChangeLog.EA                 |    7 +++++++
 lisp/sawfish/wm/edge/util.jl |   10 ++++++----
 src/Makefile.in              |   14 ++++----------
 src/fake-libexec             |    1 -
 src/flippers.c               |   14 ++++++++++----
 src/main.c                   |    2 ++
 6 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog.EA b/ChangeLog.EA
index 09b0b79..ec02d78 100644
--- a/ChangeLog.EA
+++ b/ChangeLog.EA
@@ -1,3 +1,10 @@
+2010-11-06  Christopher Bratusek <zanghar freenet de>
+	* src/flippers.c: build into sawfish and rename module to sawfish.wm.edge.subrs
+
+	* src/main.c
+	* src/Makefile.in
+	* lisp/sawfish/wm/edge/util.jl: updated
+
 2010-11-04  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/edge/infinite-desktop
 	* lisp/sawfish/wm/edge/viewport-drag.jl: renamed module (and remaining functions)
diff --git a/lisp/sawfish/wm/edge/util.jl b/lisp/sawfish/wm/edge/util.jl
index 8996baa..43d60e8 100644
--- a/lisp/sawfish/wm/edge/util.jl
+++ b/lisp/sawfish/wm/edge/util.jl
@@ -20,16 +20,18 @@
 
 (define-structure sawfish.wm.edge.util
 
-    (export flippers-activate
-	    get-active-corner
-	    get-active-edge)
+    (compound-interface
+      (structure-interface sawfish.wm.edge.subrs)
+      (export flippers-activate
+	      get-active-corner
+	      get-active-edge))
 
     (open rep
 	  rep.system
 	  sawfish.wm.misc
 	  sawfish.wm.events
 	  sawfish.wm.custom
-	  sawfish.wm.edge.flippers)
+	  sawfish.wm.edge.subrs)
 
   (define-structure-alias edge-util sawfish.wm.edge.util)
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 42f1c4b..9ce9ead 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -26,7 +26,7 @@ top_srcdir= top_srcdir@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-SRCS :=	colors.c cursors.c display.c events.c fonts.c frames.c \
+SRCS :=	colors.c cursors.c display.c events.c fonts.c frames.c flippers.c \
 	functions.c images.c keys.c main.c multihead.c pixmap-cache.c \
 	property-cache.c server.c session.c stacking-list.c windows.c
 OBJS := $(SRCS:.c=.o)
@@ -36,16 +36,11 @@ DL_OBJS := $(DL_SRCS:%.c=%.la) client.la
 DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/x.la sawfish/wm/util/selection.la
 DL_DIRS = sawfish/wm/util
 
-FLIPPER_DL_SRC := flippers.c
-FLIPPER_DL_OBJS := flippers.la
-FLIPPER_DL_DSTS = sawfish/wm/edge/flippers.la
-FLIPPER_DL_DIRS = sawfish/wm/edge
-
 INSTALL_HDRS = sawfish.h sawfish_subrs.h libclient.h server.h keys.h build.h
 
 override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(PANGO_CFLAGS) 
 
-all : sawfish libclient.o $(DL_OBJS) $(FLIPPER_DL_OBJS) .libexec gtk-style
+all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style
 
 sawfish : $(OBJS) $(LIBOBJS)
 	$(rep_LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(LDFLAGS) \
@@ -69,7 +64,7 @@ install : all installdirs
 	  $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)${bindir}; \
 	done
 	$(rep_DL_INSTALL) gtk-style $(DESTDIR)${sawfishexecdir}
-	$(foreach x,$(DL_DSTS) $(FLIPPER_DL_DSTS),\
+	$(foreach x,$(DL_DSTS),\
 	  $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
 	  $(notdir $(x)) $(DESTDIR)$(sawfishexecdir)/$(dir $(x));)
 	$(rep_INSTALL_ALIASES) -c $(srcdir) $(DESTDIR)$(sawfishexecdir)
@@ -94,10 +89,9 @@ uninstall :
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
 	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x)) \
-	  $(DESTDIR)$(sawfishexecdir)/$(FLIPPER_DL_DIRS) \
 	  $(DESTDIR)$(includedir)/sawfish/
 
-.libexec : $(DL_OBJS) $(FLIPPER_DL_OBJS)
+.libexec : $(DL_OBJS)
 	$(SHELL) $(srcdir)/fake-libexec
 
 clean :
diff --git a/src/fake-libexec b/src/fake-libexec
index 14bad23..2bdbebd 100755
--- a/src/fake-libexec
+++ b/src/fake-libexec
@@ -7,7 +7,6 @@ libexecdir="./.libexec"
 
 libs="\
  sawfish.client\
- sawfish.wm.edge.flippers\
  sawfish.wm.util.gradient\
  sawfish.wm.util.play-sample\
  sawfish.wm.util.selection\
diff --git a/src/flippers.c b/src/flippers.c
index 7cdf68d..80292d3 100644
--- a/src/flippers.c
+++ b/src/flippers.c
@@ -155,10 +155,10 @@ DEFUN("recreate-flippers", Frecreate_flippers,
 	return Qt;
 }
 
-repv
-rep_dl_init (void)
+void
+flippers_init (void)
 {
-    repv tem = rep_push_structure ("sawfish.wm.edge.flippers");
+    repv tem = rep_push_structure ("sawfish.wm.edge.subrs");
 
     rep_ADD_SUBR(Senable_flippers);
     rep_ADD_SUBR(Sdisable_flippers);
@@ -166,6 +166,8 @@ rep_dl_init (void)
     rep_ADD_SUBR(Screate_flippers);
     rep_ADD_SUBR(Srecreate_flippers);
 
+    rep_pop_structure (tem);
+
     rep_INTERN (left);
     rep_INTERN (right);
     rep_INTERN (top);
@@ -173,5 +175,9 @@ rep_dl_init (void)
     rep_INTERN_SPECIAL (enter_flipper_hook);
     rep_INTERN_SPECIAL (leave_flipper_hook);
 
-    return rep_pop_structure (tem);
 }
+
+void
+flippers_kill(void)
+{
+};
diff --git a/src/main.c b/src/main.c
index c439e3d..379d36a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -509,6 +509,7 @@ where OPTIONS are any of:\n\
 	fonts_init ();
 	cursors_init ();
 	frames_init ();
+	flippers_init ();
 	windows_init ();
 	keys_init ();
 	functions_init ();
@@ -522,6 +523,7 @@ where OPTIONS are any of:\n\
 	functions_kill ();
 	windows_kill ();
 	frames_kill ();
+	flippers_kill ();
 	cursors_kill ();
 	fonts_kill ();
 	colors_kill ();