From f2151eb82742581cb30ce00398a60377e9fb92c8 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 31 Oct 2012 04:42:48 +0900
Subject: Port from libgee 0.6 to 0.8

https://bugzilla.gnome.org/show_bug.cgi?id=687166
---
 configure.ac                   | 2 +-
 libcaribou/Makefile.am         | 2 +-
 libcaribou/group-model.vala    | 2 +-
 libcaribou/keyboard-model.vala | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9509c85..c842091 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ PKG_CHECK_MODULES(LIBCARIBOU, [
   x11,
   libxklavier,
   libxml-2.0,
-  gee-1.0,
+  gee-0.8,
   gio-2.0
   ])
 AC_SUBST(LIBCARIBOU_CFLAGS)
diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
index d7053e1..f6d9ce0 100644
--- a/libcaribou/Makefile.am
+++ b/libcaribou/Makefile.am
@@ -9,7 +9,7 @@ libcaribou_la_VALAFLAGS = \
 	-H caribou.h --vapi caribou-1.0.vapi \
 	-h caribou-internals.h \
 	--vapidir=. \
-	--pkg x11 --pkg xtst --pkg gdk-3.0 --pkg gio-2.0 --pkg gee-1.0 \
+	--pkg x11 --pkg xtst --pkg gdk-3.0 --pkg gio-2.0 --pkg gee-0.8 \
 	--pkg libxklavier --pkg external-libs --pkg gdk-x11-3.0 --pkg libxml-2.0 \
 	--internal-vapi caribou-internals-1.0.vapi \
 	--library caribou-1.0 --gir _Caribou-1.0.gir \
diff --git a/libcaribou/group-model.vala b/libcaribou/group-model.vala
index 479ed52..0721189 100644
--- a/libcaribou/group-model.vala
+++ b/libcaribou/group-model.vala
@@ -12,7 +12,7 @@ namespace Caribou {
         public GroupModel (string group, string variant) {
             this.group = group;
             this.variant = variant;
-            levels = new Gee.HashMap<string, LevelModel> (str_hash, str_equal);
+            levels = new Gee.HashMap<string, LevelModel> ();
             active_level = default_level;
         }
 
diff --git a/libcaribou/keyboard-model.vala b/libcaribou/keyboard-model.vala
index ef31235..e7370ac 100644
--- a/libcaribou/keyboard-model.vala
+++ b/libcaribou/keyboard-model.vala
@@ -23,7 +23,7 @@ namespace Caribou {
 
             xadapter.get_groups (out grps, out variants);
 
-            groups = new Gee.HashMap<string, GroupModel> (str_hash, str_equal);
+            groups = new Gee.HashMap<string, GroupModel> ();
 
             for (i=0;i<grps.length;i++)
                 populate_group (grps[i], variants[i]);
-- 
cgit v1.2.1