[caribou: 2/23] Change caribou-gtk-modules to caribou-gtk-module

[Eitan Isaacson <eitani src gnome org>]

commit 7a368efc56c6f6a9d901c6a2727d184b786fc73a
Author: Nohemi Fernandez <nf68 cornell edu>
Date:   Thu Aug 4 12:52:38 2011 -0500

    Change caribou-gtk-modules to caribou-gtk-module

 modules/gtk2/Makefile.am                           |    4 ++--
 modules/gtk2/caribou-gtk-module.vala               |    1 +
 modules/gtk2/caribou-gtk-modules.vala              |    1 -
 modules/gtk3/Makefile.am                           |    4 ++--
 ...ou-gtk-modules.vala => caribou-gtk-module.vala} |    4 ++--
 modules/gtk3/caribou-module.c                      |    6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/modules/gtk2/Makefile.am b/modules/gtk2/Makefile.am
index cff49fd..d47a6a4 100644
--- a/modules/gtk2/Makefile.am
+++ b/modules/gtk2/Makefile.am
@@ -2,12 +2,12 @@ gtk_modulesdir = @GTK2_MODULES_DIR@
 gtk_modules_LTLIBRARIES = libcaribou.la
 
 libcaribou_la_SOURCES = \
-	caribou-gtk-modules.vala \
+	caribou-gtk-module.vala \
 	caribou-module.c \
 	$(NULL)
 
 libcaribou_la_VALAFLAGS = \
-	-h caribou-gtk-modules.h \
+	-h caribou-gtk-module.h \
     --vapidir=. \
 	--pkg vapi-fixes \
 	--pkg gtk+-2.0 \
diff --git a/modules/gtk2/caribou-gtk-module.vala b/modules/gtk2/caribou-gtk-module.vala
new file mode 120000
index 0000000..c3d7913
--- /dev/null
+++ b/modules/gtk2/caribou-gtk-module.vala
@@ -0,0 +1 @@
+../gtk3/caribou-gtk-module.vala
\ No newline at end of file
diff --git a/modules/gtk3/Makefile.am b/modules/gtk3/Makefile.am
index 54ef4cc..6d95287 100644
--- a/modules/gtk3/Makefile.am
+++ b/modules/gtk3/Makefile.am
@@ -2,12 +2,12 @@ gtk_modulesdir = @GTK3_MODULES_DIR@
 gtk_modules_LTLIBRARIES = libcaribou.la
 
 libcaribou_la_SOURCES = \
-	caribou-gtk-modules.vala \
+	caribou-gtk-module.vala \
 	caribou-module.c \
 	$(NULL)
 
 libcaribou_la_VALAFLAGS = \
-	-h caribou-gtk-modules.h \
+	-h caribou-gtk-module.h \
     --vapidir=. \
 	--pkg vapi-fixes \
 	--pkg gtk+-3.0 \
diff --git a/modules/gtk3/caribou-gtk-modules.vala b/modules/gtk3/caribou-gtk-module.vala
similarity index 98%
rename from modules/gtk3/caribou-gtk-modules.vala
rename to modules/gtk3/caribou-gtk-module.vala
index bc87737..540e8fc 100644
--- a/modules/gtk3/caribou-gtk-modules.vala
+++ b/modules/gtk3/caribou-gtk-module.vala
@@ -9,11 +9,11 @@ namespace Caribou {
         public abstract void hide (uint32 timestamp) throws IOError;
     }
 
-    class GtkModules {
+    class GtkModule {
         private GLib.List<Gtk.Window> windows;
         private Keyboard keyboard;
 
-        public GtkModules () {
+        public GtkModule () {
             windows = new GLib.List<Gtk.Window>();
             try {
                 keyboard = Bus.get_proxy_sync (BusType.SESSION,
diff --git a/modules/gtk3/caribou-module.c b/modules/gtk3/caribou-module.c
index 228383f..ab3382e 100644
--- a/modules/gtk3/caribou-module.c
+++ b/modules/gtk3/caribou-module.c
@@ -1,13 +1,13 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkimmodule.h>
-#include "caribou-gtk-modules.h"
+#include "caribou-gtk-module.h"
 #include <stdio.h>
 
 #define CARIBOU_LOCALDIR ""
 
-G_MODULE_EXPORT CaribouGtkModules *
+G_MODULE_EXPORT CaribouGtkModule *
 gtk_module_init (gint *argc, gchar ***argv[]) {
-    CaribouGtkModules *context = caribou_gtk_modules_new ();
+    CaribouGtkModule *context = caribou_gtk_module_new ();
         return context;
 }