Remove unnecessary trigger

.gitlab-ci.yml

@@ -4,10 +4,6 @@ stages:
   - build
 
 before_script:
-  - apt-get -y update
-  - apt-get -y install wget gnupg2
-  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
-  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
   - apt-get -y update
   - apt-get -y build-dep .
 
@@ -16,6 +12,8 @@ build_meson:
   tags:
     - librem5
   script:
-    - meson . _build/ -Ddepdatadir=/usr/share
+    - mkdir -p ../build
-    - ninja -C _build install
+    - meson ../build/
+    - cd ../build
+    - ninja install
 

data/dbus/sm.puri.OSK0.xml

@@ -0,0 +1,20 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="sm.puri.OSK0">
+    <method name="SetVisible">
+      <arg name="visible" type="b" direction="in"/>
+      <doc:doc><doc:description>
+        Switch keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <method name="GetVisible">
+      <arg name="visible" type="b" direction="out"/>
+      <doc:doc><doc:description>
+        Get keyboard visibility
+      </doc:description></doc:doc>
+    </method>
+    <property name="Visible" type="b" access="read">
+    </property>
+  </interface>
+</node>

data/keyboards/geometry/compact.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <geometry version="0.90">
-  <bounds x="0.000000" y="0.000000" width="426.0000" height="296.5853"/>
+  <bounds x="0.000000" y="0.000000" width="410.0000" height="296.5853"/>
   <section angle="0">
     <bounds x="0" y="0" width="608.7804" height="201.3658"/>
     <row orientation="1">
@@ -106,7 +106,7 @@
       <key keycode="37" name="LCTL" oref="altline">
 	<bounds x="62.43902" y="162.3414" width="48.39024" height="37.46341"/>
       </key>
-      <key keycode="66" name="ALTGR" oref="altline">
+      <key keycode="64" name="LALT" oref="altline">
 	<bounds x="113.9512" y="162.3414" width="48.39024" height="37.46341"/>
       </key>
       <key keycode="65" name="SPCE" oref="spaceline">

data/keyboards/symbols/us.xml

@@ -102,52 +102,42 @@
   <key keycode="24" name="AD01">
     <keysym keyval="113">q</keysym>
     <keysym keyval="81">Q</keysym>
-    <keysym keyval="49">1</keysym>
   </key>
   <key keycode="25" name="AD02">
     <keysym keyval="119">w</keysym>
     <keysym keyval="87">W</keysym>
-    <keysym keyval="50">2</keysym>
   </key>
   <key keycode="26" name="AD03">
     <keysym keyval="101">e</keysym>
     <keysym keyval="69">E</keysym>
-    <keysym keyval="51">3</keysym>
   </key>
   <key keycode="27" name="AD04">
     <keysym keyval="114">r</keysym>
     <keysym keyval="82">R</keysym>
-    <keysym keyval="52">4</keysym>
   </key>
   <key keycode="28" name="AD05">
     <keysym keyval="116">t</keysym>
     <keysym keyval="84">T</keysym>
-    <keysym keyval="53">5</keysym>
   </key>
   <key keycode="29" name="AD06">
     <keysym keyval="121">y</keysym>
     <keysym keyval="89">Y</keysym>
-    <keysym keyval="54">6</keysym>
   </key>
   <key keycode="30" name="AD07">
     <keysym keyval="117">u</keysym>
     <keysym keyval="85">U</keysym>
-    <keysym keyval="55">7</keysym>
   </key>
   <key keycode="31" name="AD08">
     <keysym keyval="105">i</keysym>
     <keysym keyval="73">I</keysym>
-    <keysym keyval="56">8</keysym>
   </key>
   <key keycode="32" name="AD09">
     <keysym keyval="111">o</keysym>
     <keysym keyval="79">O</keysym>
-    <keysym keyval="57">9</keysym>
   </key>
   <key keycode="33" name="AD10">
     <keysym keyval="112">p</keysym>
     <keysym keyval="80">P</keysym>
-    <keysym keyval="48">0</keysym>
   </key>
   <key keycode="34" name="AD11">
     <keysym keyval="91">bracketleft</keysym>
@@ -161,53 +151,44 @@
     <keysym keyval="92">backslash</keysym>
     <keysym keyval="124">bar</keysym>
   </key>
-  <key keycode="66" name="ALTGR">
+  <key keycode="66" name="CAPS">
     <keysym keyval="65027">ISO_Level3_Shift</keysym>
   </key>
   <key keycode="38" name="AC01">
     <keysym keyval="97">a</keysym>
     <keysym keyval="65">A</keysym>
-    <keysym keyval="64">at</keysym>
   </key>
   <key keycode="39" name="AC02">
     <keysym keyval="115">s</keysym>
     <keysym keyval="83">S</keysym>
-    <keysym keyval="35">numbersign</keysym>
   </key>
   <key keycode="40" name="AC03">
     <keysym keyval="100">d</keysym>
     <keysym keyval="68">D</keysym>
-    <keysym keyval="36">dollar</keysym>
   </key>
   <key keycode="41" name="AC04">
     <keysym keyval="102">f</keysym>
     <keysym keyval="70">F</keysym>
-    <keysym keyval="37">percent</keysym>
   </key>
   <key keycode="42" name="AC05">
     <keysym keyval="103">g</keysym>
     <keysym keyval="71">G</keysym>
-    <keysym keyval="38">ampersand</keysym>
   </key>
   <key keycode="43" name="AC06">
     <keysym keyval="104">h</keysym>
     <keysym keyval="72">H</keysym>
-    <keysym keyval="45">minus</keysym>
   </key>
   <key keycode="44" name="AC07">
     <keysym keyval="106">j</keysym>
     <keysym keyval="74">J</keysym>
-    <keysym keyval="95">underscore</keysym>
   </key>
   <key keycode="45" name="AC08">
     <keysym keyval="107">k</keysym>
     <keysym keyval="75">K</keysym>
-    <keysym keyval="123">braceleft</keysym>
   </key>
   <key keycode="46" name="AC09">
     <keysym keyval="108">l</keysym>
     <keysym keyval="76">L</keysym>
-    <keysym keyval="125">braceright</keysym>
   </key>
   <key keycode="47" name="AC10">
     <keysym keyval="59">semicolon</keysym>
@@ -226,37 +207,30 @@
   <key keycode="52" name="AB01">
     <keysym keyval="122">z</keysym>
     <keysym keyval="90">Z</keysym>
-    <keysym keyval="43">plus</keysym>
   </key>
   <key keycode="53" name="AB02">
     <keysym keyval="120">x</keysym>
     <keysym keyval="88">X</keysym>
-    <keysym keyval="34">quotedbl</keysym>
   </key>
   <key keycode="54" name="AB03">
     <keysym keyval="99">c</keysym>
     <keysym keyval="67">C</keysym>
-    <keysym keyval="39">quoteright</keysym>
   </key>
   <key keycode="55" name="AB04">
     <keysym keyval="118">v</keysym>
     <keysym keyval="86">V</keysym>
-    <keysym keyval="58">colon</keysym>
   </key>
   <key keycode="56" name="AB05">
     <keysym keyval="98">b</keysym>
     <keysym keyval="66">B</keysym>
-    <keysym keyval="59">semicolon</keysym>
   </key>
   <key keycode="57" name="AB06">
     <keysym keyval="110">n</keysym>
     <keysym keyval="78">N</keysym>
-    <keysym keyval="33">exclam</keysym>
   </key>
   <key keycode="58" name="AB07">
     <keysym keyval="109">m</keysym>
     <keysym keyval="77">M</keysym>
-    <keysym keyval="63">question</keysym>
   </key>
   <key keycode="59" name="AB08">
     <keysym keyval="44">comma</keysym>

data/meson.build

@@ -14,6 +14,10 @@ install_data(
     install_dir: pkgdatadir + '/keyboards/geometry/',
 )
 
+install_data('dbus/sm.puri.OSK0.xml',
+    install_dir: dbusdir
+)
+
 symbols = [
     'ar.xml',
     'as-inscript.xml',

debian/changelog

@@ -1,9 +1,3 @@
-squeekboard (1.0.10) unstable; urgency=medium
-
-  * Use a shared DBus definition
-
- -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 02 Jul 2019 20:12:02 +0000
-
 squeekboard (1.0.9) unstable; urgency=medium
 
   * Initial release.

debian/control

@@ -11,7 +11,6 @@ Build-Depends:
  libcroco3-dev,
  libwayland-dev (>= 1.16),
  rustc,
- virtboard,
  wayland-protocols (>= 1.14)
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard

debian/rules

@@ -3,6 +3,6 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --builddirectory=_build --buildsystem=meson
+	dh $@ --builddirectory=_build
 
 override_dh_autoreconf:

debian/source/format

@@ -1 +0,0 @@
-3.0 (native)

eek/eek-container.c

@@ -40,19 +40,23 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-typedef struct _EekContainerPrivate
+G_DEFINE_ABSTRACT_TYPE (EekContainer, eek_container, EEK_TYPE_ELEMENT);
+
+#define EEK_CONTAINER_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_CONTAINER, EekContainerPrivate))
+
+
+struct _EekContainerPrivate
 {
     GList *head;
     GList *last;
-} EekContainerPrivate;
+};
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekContainer, eek_container, EEK_TYPE_ELEMENT)
 
 static void
 eek_container_real_add_child (EekContainer *self,
                               EekElement   *child)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
 
     g_return_if_fail (EEK_IS_ELEMENT(child));
     g_object_ref (child);
@@ -71,7 +75,7 @@ static void
 eek_container_real_remove_child (EekContainer *self,
                                  EekElement   *child)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
     GList *head;
 
     g_return_if_fail (EEK_IS_ELEMENT(child));
@@ -90,7 +94,7 @@ eek_container_real_foreach_child (EekContainer *self,
                                   EekCallback   callback,
                                   gpointer      user_data)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
     GList *head;
 
     for (head = priv->head; head; head = g_list_next (head))
@@ -102,7 +106,7 @@ eek_container_real_find (EekContainer *self,
                          EekCompareFunc func,
                          gpointer user_data)
 {
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(self);
     GList *head;
 
     head = g_list_find_custom (priv->head, user_data, (GCompareFunc)func);
@@ -114,8 +118,7 @@ eek_container_real_find (EekContainer *self,
 static void
 eek_container_dispose (GObject *object)
 {
-    EekContainer        *self = EEK_CONTAINER (object);
+    EekContainerPrivate *priv = EEK_CONTAINER_GET_PRIVATE(object);
-    EekContainerPrivate *priv = eek_container_get_instance_private (self);
     GList *head;
 
     for (head = priv->head; head; head = priv->head) {
@@ -131,6 +134,9 @@ eek_container_class_init (EekContainerClass *klass)
 {
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekContainerPrivate));
+
     klass->add_child = eek_container_real_add_child;
     klass->remove_child = eek_container_real_remove_child;
     klass->foreach_child = eek_container_real_foreach_child;
@@ -183,7 +189,7 @@ eek_container_class_init (EekContainerClass *klass)
 static void
 eek_container_init (EekContainer *self)
 {
-    /* void */
+    self->priv = EEK_CONTAINER_GET_PRIVATE(self);
 }
 
 /**

eek/eek-container.h

@@ -30,7 +30,14 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_CONTAINER (eek_container_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElement)
+#define EEK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_CONTAINER, EekContainer))
+#define EEK_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_CONTAINER, EekContainerClass))
+#define EEK_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_CONTAINER))
+#define EEK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_CONTAINER))
+#define EEK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_CONTAINER, EekContainerClass))
+
+typedef struct _EekContainerClass EekContainerClass;
+typedef struct _EekContainerPrivate EekContainerPrivate;
 
 /**
  * EekCallback:
@@ -43,6 +50,14 @@ G_DECLARE_DERIVABLE_TYPE (EekContainer, eek_container, EEK, CONTAINER, EekElemen
 typedef void (*EekCallback) (EekElement *element, gpointer user_data);
 typedef gint (*EekCompareFunc) (EekElement *element, gpointer user_data);
 
+struct _EekContainer
+{
+    /*< private >*/
+    EekElement parent;
+
+    EekContainerPrivate *priv;
+};
+
 /**
  * EekContainerClass:
  * @foreach_child: virtual function for iterating over the container's children

eek/eek-element.c

@@ -52,16 +52,20 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-typedef struct _EekElementPrivate
+G_DEFINE_ABSTRACT_TYPE (EekElement, eek_element, G_TYPE_OBJECT);
+
+#define EEK_ELEMENT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_ELEMENT, EekElementPrivate))
+
+
+struct _EekElementPrivate
 {
     gchar *name;
     EekBounds bounds;
     EekElement *parent;
     gint group;
     gint level;
-} EekElementPrivate;
+};
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (EekElement, eek_element, G_TYPE_OBJECT)
 
 static void
 eek_element_real_symbol_index_changed (EekElement *self,
@@ -74,8 +78,7 @@ eek_element_real_symbol_index_changed (EekElement *self,
 static void
 eek_element_finalize (GObject *object)
 {
-    EekElement        *self = EEK_ELEMENT (object);
+    EekElementPrivate *priv = EEK_ELEMENT_GET_PRIVATE(object);
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
 
     g_free (priv->name);
     G_OBJECT_CLASS (eek_element_parent_class)->finalize (object);
@@ -143,6 +146,9 @@ eek_element_class_init (EekElementClass *klass)
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekElementPrivate));
+
     /* signals */
     klass->symbol_index_changed = eek_element_real_symbol_index_changed;
 
@@ -232,8 +238,9 @@ eek_element_class_init (EekElementClass *klass)
 static void
 eek_element_init (EekElement *self)
 {
-    EekElementPrivate *priv = eek_element_get_instance_private (self);
+    EekElementPrivate *priv;
 
+    priv = self->priv = EEK_ELEMENT_GET_PRIVATE(self);
     priv->group = -1;
     priv->level = -1;
 }
@@ -252,12 +259,10 @@ eek_element_set_parent (EekElement *element,
     g_return_if_fail (EEK_IS_ELEMENT(element));
     g_return_if_fail (parent == NULL || EEK_IS_ELEMENT(parent));
 
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
+    if (element->priv->parent == parent)
-
-    if (priv->parent == parent)
         return;
 
-    if (priv->parent != NULL) {
+    if (element->priv->parent != NULL) {
         /* release self-reference acquired when setting parent */
         g_object_unref (element);
     }
@@ -266,7 +271,7 @@ eek_element_set_parent (EekElement *element,
         g_object_ref (element);
     }
 
-    priv->parent = parent;
+    element->priv->parent = parent;
 }
 
 /**
@@ -280,10 +285,7 @@ EekElement *
 eek_element_get_parent (EekElement *element)
 {
     g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
+    return element->priv->parent;
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->parent;
 }
 
 /**
@@ -298,11 +300,8 @@ eek_element_set_name (EekElement  *element,
                       const gchar *name)
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
-
+    g_free (element->priv->name);
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
+    element->priv->name = g_strdup (name);
-
-    g_free (priv->name);
-    priv->name = g_strdup (name);
 }
 
 /**
@@ -316,10 +315,7 @@ const gchar *
 eek_element_get_name (EekElement  *element)
 {
     g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
-
+    return element->priv->name;
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->name;
 }
 
 /**
@@ -336,10 +332,7 @@ eek_element_set_bounds (EekElement  *element,
                         EekBounds   *bounds)
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
-
+    memcpy (&element->priv->bounds, bounds, sizeof(EekBounds));
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (&priv->bounds, bounds, sizeof(EekBounds));
 }
 
 /**
@@ -357,10 +350,7 @@ eek_element_get_bounds (EekElement  *element,
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
     g_return_if_fail (bounds != NULL);
-
+    memcpy (bounds, &element->priv->bounds, sizeof(EekBounds));
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    memcpy (bounds, &priv->bounds, sizeof(EekBounds));
 }
 
 /**
@@ -496,14 +486,11 @@ eek_element_set_group (EekElement *element,
                        gint        group)
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
-
+    if (element->priv->group != group) {
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
+        element->priv->group = group;
-
-    if (priv->group != group) {
-        priv->group = group;
         g_object_notify (G_OBJECT(element), "group");
         g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       group, priv->level);
+                       group, element->priv->level);
     }
 }
 
@@ -522,14 +509,11 @@ eek_element_set_level (EekElement *element,
                        gint        level)
 {
     g_return_if_fail (EEK_IS_ELEMENT(element));
-
+    if (element->priv->level != level) {
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
+        element->priv->level = level;
-
-    if (priv->level != level) {
-        priv->level = level;
         g_object_notify (G_OBJECT(element), "level");
         g_signal_emit (element, signals[SYMBOL_INDEX_CHANGED], 0,
-                       priv->group, level);
+                       element->priv->group, level);
     }
 }
 
@@ -546,10 +530,7 @@ gint
 eek_element_get_group (EekElement *element)
 {
     g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
+    return element->priv->group;
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->group;
 }
 
 /**
@@ -565,8 +546,5 @@ gint
 eek_element_get_level (EekElement *element)
 {
     g_return_val_if_fail (EEK_IS_ELEMENT(element), -1);
-
+    return element->priv->level;
-    EekElementPrivate *priv = eek_element_get_instance_private (element);
-
-    return priv->level;
 }

eek/eek-element.h

@@ -30,7 +30,22 @@
 
 G_BEGIN_DECLS
 #define EEK_TYPE_ELEMENT (eek_element_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekElement, eek_element, EEK, ELEMENT, GObject)
+#define EEK_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_ELEMENT, EekElement))
+#define EEK_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_ELEMENT, EekElementClass))
+#define EEK_IS_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_ELEMENT))
+#define EEK_IS_ELEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_ELEMENT))
+#define EEK_ELEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_ELEMENT, EekElementClass))
+
+typedef struct _EekElementClass   EekElementClass;
+typedef struct _EekElementPrivate EekElementPrivate;
+
+struct _EekElement
+{
+    /*< private >*/
+    GObject parent;
+
+    EekElementPrivate *priv;
+};
 
 struct _EekElementClass
 {

eek/eek-gtk-keyboard.c

@@ -46,13 +46,18 @@ enum {
     PROP_LAST
 };
 
+G_DEFINE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA);
+
+#define EEK_GTK_KEYBOARD_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardPrivate))
+
 /* since 2.91.5 GDK_DRAWABLE was removed and gdk_cairo_create takes
    GdkWindow as the argument */
 #ifndef GDK_DRAWABLE
 #define GDK_DRAWABLE(x) (x)
 #endif
 
-typedef struct _EekGtkKeyboardPrivate
+struct _EekGtkKeyboardPrivate
 {
     EekRenderer *renderer;
     EekKeyboard *keyboard;
@@ -60,11 +65,7 @@ typedef struct _EekGtkKeyboardPrivate
     gulong key_unlocked_handler;
     gulong symbol_index_changed_handler;
     EekTheme *theme;
-
+};
-    GdkEventSequence *sequence; // unowned reference
-} EekGtkKeyboardPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekGtkKeyboard, eek_gtk_keyboard, GTK_TYPE_DRAWING_AREA)
 
 static void       on_key_pressed          (EekKey      *key,
                                            EekGtkKeyboard *self);
@@ -105,8 +106,7 @@ static gboolean
 eek_gtk_keyboard_real_draw (GtkWidget *self,
                             cairo_t   *cr)
 {
-    EekGtkKeyboardPrivate *priv =
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
     GtkAllocation allocation;
     GList *list, *head;
 
@@ -148,8 +148,7 @@ static void
 eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
                                      GtkAllocation *allocation)
 {
-    EekGtkKeyboardPrivate *priv =
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
 
     if (priv->renderer)
         eek_renderer_set_allocation_size (priv->renderer,
@@ -162,7 +161,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget     *self,
 
 static void depress(EekGtkKeyboard *self,
                     gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
     EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
     if (key) {
         eek_keyboard_press_key(priv->keyboard, key, time);
@@ -172,7 +171,7 @@ static void depress(EekGtkKeyboard *self,
 
 static void drag(EekGtkKeyboard *self,
                  gdouble x, gdouble y, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
     EekKey *key = eek_renderer_find_key_by_position (priv->renderer, x, y);
 
     if (key) {
@@ -198,7 +197,7 @@ static void drag(EekGtkKeyboard *self,
 }
 
 static void release(EekGtkKeyboard *self, guint32 time) {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
 
     GList *list = eek_keyboard_get_pressed_keys (priv->keyboard);
     for (GList *head = list; head; head = g_list_next (head)) {
@@ -243,23 +242,20 @@ eek_gtk_keyboard_real_motion_notify_event (GtkWidget      *self,
 
 // Only one touch stream at a time allowed. Others will be completely ignored.
 static gboolean
-handle_touch_event (GtkWidget     *widget,
+handle_touch_event (GtkWidget      *widget,
-                    GdkEventTouch *event)
+                    GdkEventTouch *event) {
-{
+    EekGtkKeyboard *self = EEK_GTK_KEYBOARD(widget);
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
     if (event->type == GDK_TOUCH_BEGIN) {
-        if (priv->sequence) {
+        if (self->sequence) {
             // Ignore second and following touch points
             return FALSE;
         }
-        priv->sequence = event->sequence;
+        self->sequence = event->sequence;
         depress(self, event->x, event->y, event->time);
         return TRUE;
     }
 
-    if (priv->sequence != event->sequence) {
+    if (self->sequence != event->sequence) {
         return FALSE;
     }
 
@@ -269,16 +265,16 @@ handle_touch_event (GtkWidget     *widget,
     if (event->type == GDK_TOUCH_END || event->type == GDK_TOUCH_CANCEL) {
         // TODO: can the event have different coords than the previous update event?
         release(self, event->time);
-        priv->sequence = NULL;
+        self->sequence = NULL;
     }
     return TRUE;
 }
 
+
 static void
 eek_gtk_keyboard_real_unmap (GtkWidget *self)
 {
-    EekGtkKeyboardPrivate *priv =
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
-	    eek_gtk_keyboard_get_instance_private (EEK_GTK_KEYBOARD (self));
 
     if (priv->keyboard) {
         GList *list, *head;
@@ -305,9 +301,7 @@ eek_gtk_keyboard_real_query_tooltip (GtkWidget  *widget,
                                      gboolean    keyboard_tooltip,
                                      GtkTooltip *tooltip)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
-
     EekKey *key;
 
     key = eek_renderer_find_key_by_position (priv->renderer,
@@ -328,7 +322,7 @@ static void
 eek_gtk_keyboard_set_keyboard (EekGtkKeyboard *self,
                                EekKeyboard    *keyboard)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
     priv->keyboard = g_object_ref (keyboard);
 
     priv->key_locked_handler =
@@ -364,8 +358,7 @@ eek_gtk_keyboard_set_property (GObject      *object,
 static void
 eek_gtk_keyboard_dispose (GObject *object)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (object);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(object);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
 
     if (priv->renderer) {
         g_object_unref (priv->renderer);
@@ -414,6 +407,9 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekGtkKeyboardPrivate));
+
     widget_class->realize = eek_gtk_keyboard_real_realize;
     widget_class->unmap = eek_gtk_keyboard_real_unmap;
     widget_class->draw = eek_gtk_keyboard_real_draw;
@@ -444,7 +440,7 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
 static void
 eek_gtk_keyboard_init (EekGtkKeyboard *self)
 {
-    /* void */
+    self->priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
 }
 
 /**
@@ -487,8 +483,7 @@ static void
 render_pressed_key (GtkWidget *widget,
                     EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
     EekBounds bounds, large_bounds;
 
     eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
@@ -519,41 +514,31 @@ static void
 render_locked_key (GtkWidget *widget,
                    EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
     EekBounds bounds;
+    cairo_t *cr;
 
-    GdkWindow         *window  = gtk_widget_get_window (widget);
+    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
 
     eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
-
     cairo_translate (cr, bounds.x, bounds.y);
     eek_renderer_render_key (priv->renderer, cr, key, 1.0, TRUE);
 
-    gdk_window_end_draw_frame (window, context);
+    cairo_destroy (cr);
-
-    cairo_region_destroy(region);
 }
 
 static void
 render_released_key (GtkWidget *widget,
                      EekKey    *key)
 {
-    EekGtkKeyboard        *self = EEK_GTK_KEYBOARD (widget);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
     EekBounds bounds, large_bounds;
+    cairo_t *cr;
 
-    GdkWindow         *window  = gtk_widget_get_window (widget);
+    cr = gdk_cairo_create (GDK_DRAWABLE (gtk_widget_get_window (widget)));
-    cairo_region_t    *region  = gdk_window_get_clip_region (window);
-    GdkDrawingContext *context = gdk_window_begin_draw_frame (window, region);
-    cairo_t           *cr      = gdk_drawing_context_get_cairo_context (context);
 
     eek_renderer_get_key_bounds (priv->renderer, key, &bounds, TRUE);
     magnify_bounds (widget, &bounds, &large_bounds, 2.0);
-
     cairo_rectangle (cr,
                      large_bounds.x,
                      large_bounds.y,
@@ -567,17 +552,14 @@ render_released_key (GtkWidget *widget,
     cairo_clip (cr);
 
     eek_renderer_render_keyboard (priv->renderer, cr);
-
+    cairo_destroy (cr);
-    gdk_window_end_draw_frame (window, context);
-
-    cairo_region_destroy(region);
 }
 
 static void
 on_key_pressed (EekKey      *key,
                 EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
@@ -598,7 +580,7 @@ static void
 on_key_released (EekKey      *key,
                  EekGtkKeyboard *self)
 {
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(self);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
@@ -621,7 +603,7 @@ on_key_locked (EekKeyboard *keyboard,
                gpointer     user_data)
 {
     GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
@@ -636,7 +618,7 @@ on_key_unlocked (EekKeyboard *keyboard,
                  gpointer     user_data)
 {
     GtkWidget *widget = user_data;
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (user_data);
+    EekGtkKeyboardPrivate *priv = EEK_GTK_KEYBOARD_GET_PRIVATE(widget);
 
     /* renderer may have not been set yet if the widget is a popup */
     if (!priv->renderer)
@@ -660,9 +642,11 @@ void
 eek_gtk_keyboard_set_theme (EekGtkKeyboard *keyboard,
                             EekTheme       *theme)
 {
+    EekGtkKeyboardPrivate *priv;
+
     g_return_if_fail (EEK_IS_GTK_KEYBOARD(keyboard));
     g_return_if_fail (EEK_IS_THEME(theme));
 
-    EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (keyboard);
+    priv = EEK_GTK_KEYBOARD_GET_PRIVATE(keyboard);
     priv->theme = g_object_ref (theme);
 }

eek/eek-gtk-keyboard.h

@@ -32,7 +32,25 @@
 
 G_BEGIN_DECLS
 #define EEK_TYPE_GTK_KEYBOARD (eek_gtk_keyboard_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekGtkKeyboard, eek_gtk_keyboard, EEK, GTK_KEYBOARD, GtkDrawingArea)
+#define EEK_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboard))
+#define EEK_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
+#define EEK_IS_GTK_KEYBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_GTK_KEYBOARD))
+#define EEK_IS_GTK_KEYBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_GTK_KEYBOARD))
+#define EEK_GTK_KEYBOARD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_GTK_KEYBOARD, EekGtkKeyboardClass))
+
+typedef struct _EekGtkKeyboard EekGtkKeyboard;
+typedef struct _EekGtkKeyboardClass EekGtkKeyboardClass;
+typedef struct _EekGtkKeyboardPrivate EekGtkKeyboardPrivate;
+
+struct _EekGtkKeyboard
+{
+    /*< private >*/
+    GtkDrawingArea parent;
+
+    GdkEventSequence *sequence; // unowned reference
+
+    EekGtkKeyboardPrivate *priv;
+};
 
 struct _EekGtkKeyboardClass
 {

eek/eek-key.c

@@ -54,7 +54,13 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-typedef struct _EekKeyPrivate
+G_DEFINE_TYPE (EekKey, eek_key, EEK_TYPE_ELEMENT);
+
+#define EEK_KEY_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEY, EekKeyPrivate))
+
+
+struct _EekKeyPrivate
 {
     guint keycode;
     EekSymbolMatrix *symbol_matrix;
@@ -63,14 +69,12 @@ typedef struct _EekKeyPrivate
     gulong oref; // UI outline reference
     gboolean is_pressed;
     gboolean is_locked;
-} EekKeyPrivate;
+};
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekKey, eek_key, EEK_TYPE_ELEMENT)
 
 static void
 eek_key_real_locked (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
 
     priv->is_locked = TRUE;
 #if DEBUG
@@ -81,7 +85,7 @@ eek_key_real_locked (EekKey *self)
 static void
 eek_key_real_unlocked (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(self);
 
     priv->is_locked = FALSE;
 #if DEBUG
@@ -92,11 +96,8 @@ eek_key_real_unlocked (EekKey *self)
 static void
 eek_key_finalize (GObject *object)
 {
-    EekKey        *self = EEK_KEY (object);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(object);
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
-
     eek_symbol_matrix_free (priv->symbol_matrix);
-
     G_OBJECT_CLASS (eek_key_parent_class)->finalize (object);
 }
 
@@ -173,6 +174,9 @@ eek_key_class_init (EekKeyClass *klass)
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekKeyPrivate));
+
     gobject_class->set_property = eek_key_set_property;
     gobject_class->get_property = eek_key_get_property;
     gobject_class->finalize     = eek_key_finalize;
@@ -281,7 +285,9 @@ eek_key_class_init (EekKeyClass *klass)
 static void
 eek_key_init (EekKey *self)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (self);
+    EekKeyPrivate *priv;
+
+    priv = self->priv = EEK_KEY_GET_PRIVATE(self);
     priv->symbol_matrix = eek_symbol_matrix_new (0, 0);
 }
 
@@ -301,10 +307,7 @@ eek_key_set_keycode (EekKey *key,
                      guint   keycode)
 {
     g_return_if_fail (EEK_IS_KEY (key));
-
+    key->priv->keycode = keycode;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    priv->keycode = keycode;
 }
 
 /**
@@ -318,10 +321,7 @@ guint
 eek_key_get_keycode (EekKey *key)
 {
     g_return_val_if_fail (EEK_IS_KEY (key), EEK_INVALID_KEYCODE);
-
+    return key->priv->keycode;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->keycode;
 }
 
 /**
@@ -337,10 +337,8 @@ eek_key_set_symbol_matrix (EekKey          *key,
 {
     g_return_if_fail (EEK_IS_KEY(key));
 
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
+    eek_symbol_matrix_free (key->priv->symbol_matrix);
-
+    key->priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
-    eek_symbol_matrix_free (priv->symbol_matrix);
-    priv->symbol_matrix = eek_symbol_matrix_copy (matrix);
 }
 
 /**
@@ -354,10 +352,7 @@ EekSymbolMatrix *
 eek_key_get_symbol_matrix (EekKey *key)
 {
     g_return_val_if_fail (EEK_IS_KEY(key), NULL);
-
+    return key->priv->symbol_matrix;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->symbol_matrix;
 }
 
 /**
@@ -445,7 +440,7 @@ eek_key_get_symbol_at_index (EekKey *key,
                              gint    fallback_group,
                              gint    fallback_level)
 {
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
+    EekKeyPrivate *priv = EEK_KEY_GET_PRIVATE(key);
     gint num_symbols;
 
     g_return_val_if_fail (fallback_group >= 0, NULL);
@@ -497,14 +492,12 @@ eek_key_set_index (EekKey *key,
     g_return_if_fail (0 <= column);
     g_return_if_fail (0 <= row);
 
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
+    if (key->priv->column != column) {
-
+        key->priv->column = column;
-    if (priv->column != column) {
-        priv->column = column;
         g_object_notify (G_OBJECT(key), "column");
     }
-    if (priv->row != row) {
+    if (key->priv->row != row) {
-        priv->row = row;
+        key->priv->row = row;
         g_object_notify (G_OBJECT(key), "row");
     }
 }
@@ -525,12 +518,10 @@ eek_key_get_index (EekKey *key,
     g_return_if_fail (EEK_IS_KEY(key));
     g_return_if_fail (column != NULL || row != NULL);
 
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
     if (column != NULL)
-        *column = priv->column;
+        *column = key->priv->column;
     if (row != NULL)
-        *row = priv->row;
+        *row = key->priv->row;
 }
 
 /**
@@ -545,11 +536,8 @@ eek_key_set_oref (EekKey *key,
                   guint   oref)
 {
     g_return_if_fail (EEK_IS_KEY(key));
-
+    if (key->priv->oref != oref) {
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
+        key->priv->oref = oref;
-
-    if (priv->oref != oref) {
-        priv->oref = oref;
         g_object_notify (G_OBJECT(key), "oref");
     }
 }
@@ -565,10 +553,7 @@ guint
 eek_key_get_oref (EekKey *key)
 {
     g_return_val_if_fail (EEK_IS_KEY (key), 0);
-
+    return key->priv->oref;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->oref;
 }
 
 /**
@@ -581,10 +566,7 @@ gboolean
 eek_key_is_pressed (EekKey *key)
 {
     g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
-
+    return key->priv->is_pressed;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->is_pressed;
 }
 
 /**
@@ -597,17 +579,11 @@ gboolean
 eek_key_is_locked (EekKey *key)
 {
     g_return_val_if_fail (EEK_IS_KEY(key), FALSE);
-
+    return key->priv->is_locked;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    return priv->is_locked;
 }
 
 void eek_key_set_pressed(EekKey *key, gboolean value)
 {
     g_return_if_fail (EEK_IS_KEY(key));
-
+    key->priv->is_pressed = value;
-    EekKeyPrivate *priv = eek_key_get_instance_private (key);
-
-    priv->is_pressed = value;
 }

eek/eek-key.h

@@ -31,7 +31,31 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_KEY (eek_key_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekKey, eek_key, EEK, KEY, EekElement)
+#define EEK_KEY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEY, EekKey))
+#define EEK_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEY, EekKeyClass))
+#define EEK_IS_KEY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEY))
+#define EEK_IS_KEY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEY))
+#define EEK_KEY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEY, EekKeyClass))
+
+typedef struct _EekKeyClass EekKeyClass;
+typedef struct _EekKeyPrivate EekKeyPrivate;
+
+/**
+ * EekKey:
+ *
+ * Contains information about the state of a key.
+ * TODO: rewrite as a plain struct
+ *
+ * The #EekKey structure contains only private data and should only be
+ * accessed using the provided API.
+ */
+struct _EekKey
+{
+    /*< private >*/
+    EekElement parent;
+
+    EekKeyPrivate *priv;
+};
 
 /**
  * EekKeyClass:

eek/eek-keysym.c

@@ -50,10 +50,9 @@
 #define EEK_KEYSYM_Hyper_L 0xffed
 #define EEK_KEYSYM_Hyper_R 0xffee
 
-typedef struct _EekKeysymPrivate
+struct _EekKeysymPrivate {
-{
     guint xkeysym;
-} EekKeysymPrivate;
+};
 
 struct _EekKeysymEntry {
     guint xkeysym;
@@ -69,11 +68,12 @@ typedef struct _EekKeysymEntry EekKeysymEntry;
 
 static void eek_serializable_iface_init (EekSerializableIface *iface);
 
-G_DEFINE_TYPE_EXTENDED (EekKeysym, eek_keysym, EEK_TYPE_SYMBOL,
+G_DEFINE_TYPE_WITH_CODE (EekKeysym, eek_keysym, EEK_TYPE_SYMBOL,
-			0, /* GTypeFlags */
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-			G_ADD_PRIVATE (EekKeysym)
+                                                eek_serializable_iface_init));
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+
-                                               eek_serializable_iface_init))
+#define EEK_KEYSYM_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_KEYSYM, EekKeysymPrivate))
 
 static EekSerializableIface *eek_keysym_parent_serializable_iface;
 
@@ -81,8 +81,7 @@ static void
 eek_keysym_real_serialize (EekSerializable *self,
                            GVariantBuilder *builder)
 {
-    EekKeysymPrivate *priv = eek_keysym_get_instance_private (
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);
-		    EEK_KEYSYM(self));
 
     eek_keysym_parent_serializable_iface->serialize (self, builder);
 
@@ -94,8 +93,7 @@ eek_keysym_real_deserialize (EekSerializable *self,
                              GVariant        *variant,
                              gsize            index)
 {
-    EekKeysymPrivate *priv = eek_keysym_get_instance_private (
+    EekKeysymPrivate *priv = EEK_KEYSYM_GET_PRIVATE(self);
-		    EEK_KEYSYM(self));
 
     index = eek_keysym_parent_serializable_iface->deserialize (self,
                                                                variant,
@@ -179,7 +177,7 @@ get_modifier_mask (guint xkeysym)
     case EEK_KEYSYM_Shift_Lock:
         return EEK_SHIFT_MASK;
     case EEK_KEYSYM_ISO_Level3_Shift:
-        return EEK_BUTTON1_MASK;
+        return EEK_MOD5_MASK;
     case EEK_KEYSYM_Control_L:
     case EEK_KEYSYM_Control_R:
         return EEK_CONTROL_MASK;
@@ -202,13 +200,15 @@ get_modifier_mask (guint xkeysym)
 static void
 eek_keysym_class_init (EekKeysymClass *klass)
 {
-    /* void */
+    GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+    g_type_class_add_private (gobject_class, sizeof (EekKeysymPrivate));
 }
 
 static void
 eek_keysym_init (EekKeysym *self)
 {
-    /* void */
+    self->priv = EEK_KEYSYM_GET_PRIVATE(self);
 }
 
 /**
@@ -291,7 +291,7 @@ eek_keysym_new_with_modifier (guint           xkeysym,
         g_slice_free (EekKeysymEntry, unichar_entry);
     }
 
-    priv = eek_keysym_get_instance_private (keysym);
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
     priv->xkeysym = xkeysym;
 
     return keysym;
@@ -345,6 +345,6 @@ eek_keysym_get_xkeysym (EekKeysym *keysym)
     EekKeysymPrivate *priv;
 
     g_assert (EEK_IS_KEYSYM(keysym));
-    priv = eek_keysym_get_instance_private (keysym);
+    priv = EEK_KEYSYM_GET_PRIVATE(keysym);
     return priv->xkeysym;
 }

eek/eek-keysym.h

@@ -38,7 +38,27 @@ G_BEGIN_DECLS
 #define EEK_INVALID_KEYSYM (0)
 
 #define EEK_TYPE_KEYSYM (eek_keysym_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekKeysym, eek_keysym, EEK, KEYSYM, EekSymbol)
+#define EEK_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_KEYSYM, EekKeysym))
+#define EEK_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_KEYSYM, EekKeysymClass))
+#define EEK_IS_KEYSYM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_KEYSYM))
+#define EEK_IS_KEYSYM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_KEYSYM))
+#define EEK_KEYSYM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_KEYSYM, EekKeysymClass))
+
+typedef struct _EekKeysymClass EekKeysymClass;
+typedef struct _EekKeysymPrivate EekKeysymPrivate;
+
+/**
+ * EekKeysym:
+ *
+ * The #EekKeysym structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekKeysym {
+    /*< private >*/
+    EekSymbol parent;
+
+    EekKeysymPrivate *priv;
+};
 
 struct _EekKeysymClass {
     /*< private >*/

eek/eek-layout.c

@@ -34,7 +34,7 @@
 #include "eek-keyboard.h"
 #include "eekboard/eekboard-context-service.h"
 
-G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT);
 
 static void
 eek_layout_class_init (EekLayoutClass *klass)

eek/eek-layout.h

@@ -31,7 +31,20 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_LAYOUT (eek_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject)
+#define EEK_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_LAYOUT, EekLayout))
+#define EEK_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_LAYOUT, EekLayoutClass))
+#define EEK_IS_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_LAYOUT))
+#define EEK_IS_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_LAYOUT))
+#define EEK_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_LAYOUT, EekLayoutClass))
+
+typedef struct _EekLayoutClass EekLayoutClass;
+typedef struct _EekLayout EekLayout;
+
+struct _EekLayout
+{
+    /*< private >*/
+    GObject parent;
+};
 
 /**
  * EekLayoutClass:

eek/eek-renderer.c

@@ -36,7 +36,12 @@ enum {
     PROP_LAST
 };
 
-typedef struct _EekRendererPrivate
+G_DEFINE_TYPE (EekRenderer, eek_renderer, G_TYPE_OBJECT);
+
+#define EEK_RENDERER_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_RENDERER, EekRendererPrivate))
+
+struct _EekRendererPrivate
 {
     EekKeyboard *keyboard;
     PangoContext *pcontext;
@@ -57,9 +62,7 @@ typedef struct _EekRendererPrivate
     gulong symbol_index_changed_handler;
 
     EekTheme *theme;
-} EekRendererPrivate;
+};
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekRenderer, eek_renderer, G_TYPE_OBJECT)
 
 static const EekColor DEFAULT_FOREGROUND_COLOR = {0.3, 0.3, 0.3, 1.0};
 static const EekColor DEFAULT_BACKGROUND_COLOR = {1.0, 1.0, 1.0, 1.0};
@@ -103,7 +106,7 @@ create_keyboard_surface_key_callback (EekElement *element,
                                       gpointer    user_data)
 {
     CreateKeyboardSurfaceCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
     EekBounds bounds;
 
     cairo_save (data->cr);
@@ -126,7 +129,7 @@ create_keyboard_surface_section_callback (EekElement *element,
                                           gpointer    user_data)
 {
     CreateKeyboardSurfaceCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
     EekBounds bounds;
     gint angle;
 
@@ -148,7 +151,7 @@ create_keyboard_surface_section_callback (EekElement *element,
 static cairo_surface_t *
 create_keyboard_surface (EekRenderer *renderer)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
     EekBounds bounds;
     cairo_surface_t *keyboard_surface;
     CreateKeyboardSurfaceCallbackData data;
@@ -199,7 +202,7 @@ render_key_outline (EekRenderer *renderer,
                     EekKey      *key,
                     gboolean     active)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
     EekOutline *outline;
     EekBounds bounds;
     guint oref;
@@ -348,7 +351,7 @@ static void
 calculate_font_size_key_callback (EekElement *element, gpointer user_data)
 {
     CalculateFontSizeCallbackData *data = user_data;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
     gdouble sx, sy;
     PangoFontDescription *font;
     PangoRectangle extents = { 0, };
@@ -408,7 +411,7 @@ calculate_font_size (EekRenderer                *renderer,
                      const PangoFontDescription *base_font,
                      gboolean                    ascii)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
     CalculateFontSizeCallbackData data;
 
     data.size = G_MAXDOUBLE;
@@ -427,7 +430,7 @@ render_key (EekRenderer *self,
             EekKey      *key,
             gboolean     active)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
     EekOutline *outline;
     cairo_surface_t *outline_surface;
     EekBounds bounds;
@@ -600,7 +603,7 @@ eek_renderer_real_render_key_label (EekRenderer *self,
                                     PangoLayout *layout,
                                     EekKey      *key)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
     EekSymbol *symbol;
     EekSymbolCategory category;
     const gchar *label;
@@ -693,7 +696,7 @@ static void
 eek_renderer_real_render_keyboard (EekRenderer *self,
                                    cairo_t     *cr)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(self);
     cairo_pattern_t *source;
 
     g_return_if_fail (priv->keyboard);
@@ -715,8 +718,7 @@ eek_renderer_set_property (GObject      *object,
                            const GValue *value,
                            GParamSpec   *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
-		    EEK_RENDERER(object));
 
     switch (prop_id) {
     case PROP_KEYBOARD:
@@ -744,8 +746,7 @@ eek_renderer_get_property (GObject    *object,
                            GValue     *value,
                            GParamSpec *pspec)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
-		    EEK_RENDERER(object));
 
     switch (prop_id) {
     case PROP_KEYBOARD:
@@ -760,8 +761,7 @@ eek_renderer_get_property (GObject    *object,
 static void
 eek_renderer_dispose (GObject *object)
 {
-    EekRenderer        *self = EEK_RENDERER (object);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
 
     if (priv->keyboard) {
         if (g_signal_handler_is_connected (priv->keyboard,
@@ -785,9 +785,7 @@ eek_renderer_dispose (GObject *object)
 static void
 eek_renderer_finalize (GObject *object)
 {
-    EekRenderer        *self = EEK_RENDERER(object);
+    EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(object);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
-
     g_hash_table_destroy (priv->outline_surface_cache);
     g_hash_table_destroy (priv->active_outline_surface_cache);
     pango_font_description_free (priv->ascii_font);
@@ -801,6 +799,9 @@ eek_renderer_class_init (EekRendererClass *klass)
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekRendererPrivate));
+
     klass->render_key_label = eek_renderer_real_render_key_label;
     klass->render_key_outline = eek_renderer_real_render_key_outline;
     klass->render_key = eek_renderer_real_render_key;
@@ -833,8 +834,9 @@ eek_renderer_class_init (EekRendererClass *klass)
 static void
 eek_renderer_init (EekRenderer *self)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (self);
+    EekRendererPrivate *priv;
 
+    priv = self->priv = EEK_RENDERER_GET_PRIVATE(self);
     priv->keyboard = NULL;
     priv->pcontext = NULL;
     priv->default_foreground_color = DEFAULT_FOREGROUND_COLOR;
@@ -861,17 +863,15 @@ eek_renderer_init (EekRenderer *self)
 static void
 invalidate (EekRenderer *renderer)
 {
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    if (renderer->priv->outline_surface_cache)
+        g_hash_table_remove_all (renderer->priv->outline_surface_cache);
 
-    if (priv->outline_surface_cache)
+    if (renderer->priv->active_outline_surface_cache)
-        g_hash_table_remove_all (priv->outline_surface_cache);
+        g_hash_table_remove_all (renderer->priv->active_outline_surface_cache);
 
-    if (priv->active_outline_surface_cache)
+    if (renderer->priv->keyboard_surface) {
-        g_hash_table_remove_all (priv->active_outline_surface_cache);
+        cairo_surface_destroy (renderer->priv->keyboard_surface);
-
+        renderer->priv->keyboard_surface = NULL;
-    if (priv->keyboard_surface) {
-        cairo_surface_destroy (priv->keyboard_surface);
-        priv->keyboard_surface = NULL;
     }
 }
 
@@ -906,12 +906,10 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (width > 0.0 && height > 0.0);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    renderer->priv->allocation_width = width;
+    renderer->priv->allocation_height = height;
 
-    priv->allocation_width = width;
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);
-    priv->allocation_height = height;
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
 
     if (bounds.height * width / bounds.width <= height)
         scale = width / bounds.width;
@@ -924,8 +922,8 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
             scale = bounds.height / height;
     }
 
-    if (scale != priv->scale) {
+    if (scale != renderer->priv->scale) {
-        priv->scale = scale;
+        renderer->priv->scale = scale;
         invalidate (renderer);
     }
 }
@@ -939,13 +937,11 @@ eek_renderer_get_size (EekRenderer *renderer,
 
     g_return_if_fail (EEK_IS_RENDERER(renderer));
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);
-
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
     if (width)
-        *width = bounds.width * priv->scale;
+        *width = bounds.width * renderer->priv->scale;
     if (height)
-        *height = bounds.height * priv->scale;
+        *height = bounds.height * renderer->priv->scale;
 }
 
 void
@@ -964,22 +960,20 @@ eek_renderer_get_key_bounds (EekRenderer *renderer,
     g_return_if_fail (EEK_IS_KEY(key));
     g_return_if_fail (bounds != NULL);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
     section = eek_element_get_parent (EEK_ELEMENT(key));
 
     eek_element_get_bounds (EEK_ELEMENT(key), bounds);
     eek_element_get_bounds (section, &section_bounds);
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard),
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard),
                             &keyboard_bounds);
 
     if (!rotate) {
         bounds->x += keyboard_bounds.x + section_bounds.x;
         bounds->y += keyboard_bounds.y + section_bounds.y;
-        bounds->x *= priv->scale;
+        bounds->x *= renderer->priv->scale;
-        bounds->y *= priv->scale;
+        bounds->y *= renderer->priv->scale;
-        bounds->width *= priv->scale;
+        bounds->width *= renderer->priv->scale;
-        bounds->height *= priv->scale;
+        bounds->height *= renderer->priv->scale;
         return;
     }
     points[0].x = bounds->x;
@@ -1011,30 +1005,24 @@ eek_renderer_get_key_bounds (EekRenderer *renderer,
     bounds->y = keyboard_bounds.y + section_bounds.y + min.y;
     bounds->width = (max.x - min.x);
     bounds->height = (max.y - min.y);
-    bounds->x *= priv->scale;
+    bounds->x *= renderer->priv->scale;
-    bounds->y *= priv->scale;
+    bounds->y *= renderer->priv->scale;
-    bounds->width *= priv->scale;
+    bounds->width *= renderer->priv->scale;
-    bounds->height *= priv->scale;
+    bounds->height *= renderer->priv->scale;
 }
 
 gdouble
 eek_renderer_get_scale (EekRenderer *renderer)
 {
     g_return_val_if_fail (EEK_IS_RENDERER(renderer), 0);
-
+    return renderer->priv->scale;
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return priv->scale;
 }
 
 PangoLayout *
 eek_renderer_create_pango_layout (EekRenderer  *renderer)
 {
     g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
-
+    return pango_layout_new (renderer->priv->pcontext);
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
-    return pango_layout_new (priv->pcontext);
 }
 
 void
@@ -1112,9 +1100,7 @@ eek_renderer_set_default_foreground_color (EekRenderer    *renderer,
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (color);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    memcpy (&renderer->priv->default_foreground_color, color, sizeof(EekColor));
-
-    memcpy (&priv->default_foreground_color, color, sizeof(EekColor));
 }
 
 void
@@ -1124,9 +1110,7 @@ eek_renderer_set_default_background_color (EekRenderer    *renderer,
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (color);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    memcpy (&renderer->priv->default_background_color, color, sizeof(EekColor));
-
-    memcpy (&priv->default_background_color, color, sizeof(EekColor));
 }
 
 void
@@ -1139,13 +1123,11 @@ eek_renderer_get_foreground_color (EekRenderer *renderer,
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (color);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
     theme_node = g_object_get_data (G_OBJECT(element), "theme-node");
     if (theme_node)
         eek_theme_node_get_foreground_color (theme_node, color);
     else
-        memcpy (color, &priv->default_foreground_color,
+        memcpy (color, &renderer->priv->default_foreground_color,
                 sizeof(EekColor));
 }
 
@@ -1159,13 +1141,11 @@ eek_renderer_get_background_color (EekRenderer *renderer,
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (color);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
-
     theme_node = g_object_get_data (G_OBJECT(element), "theme-node");
     if (theme_node)
         eek_theme_node_get_background_color (theme_node, color);
     else
-        memcpy (color, &priv->default_background_color,
+        memcpy (color, &renderer->priv->default_background_color,
                 sizeof(EekColor));
 }
 
@@ -1228,14 +1208,12 @@ find_key_by_position_key_callback (EekElement *element,
     points[3].x = points[0].x;
     points[3].y = points[2].y;
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
     for (i = 0; i < G_N_ELEMENTS(points); i++) {
         eek_point_rotate (&points[i], data->angle);
         points[i].x += data->origin.x;
         points[i].y += data->origin.y;
-        points[i].x *= priv->scale;
+        points[i].x *= data->renderer->priv->scale;
-        points[i].y *= priv->scale;
+        points[i].y *= data->renderer->priv->scale;
     }
 
     b1 = sign (&data->point, &points[0], &points[1]) < 0.0;
@@ -1290,14 +1268,12 @@ eek_renderer_find_key_by_position (EekRenderer *renderer,
 
     g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    eek_element_get_bounds (EEK_ELEMENT(renderer->priv->keyboard), &bounds);
 
-    eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
+    if (x < bounds.x * renderer->priv->scale ||
-
+        y < bounds.y * renderer->priv->scale ||
-    if (x < bounds.x * priv->scale ||
+        x > bounds.width * renderer->priv->scale ||
-        y < bounds.y * priv->scale ||
+        y > bounds.height * renderer->priv->scale)
-        x > bounds.width * priv->scale ||
-        y > bounds.height * priv->scale)
         return NULL;
 
     data.point.x = x;
@@ -1307,7 +1283,7 @@ eek_renderer_find_key_by_position (EekRenderer *renderer,
     data.key = NULL;
     data.renderer = renderer;
 
-    eek_container_find (EEK_CONTAINER(priv->keyboard),
+    eek_container_find (EEK_CONTAINER(renderer->priv->keyboard),
                         find_key_by_position_section_callback,
                         &data);
     return data.key;
@@ -1327,11 +1303,9 @@ create_theme_node_key_callback (EekElement *element,
     CreateThemeNodeData *data = user_data;
     EekThemeNode *theme_node;
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
     theme_node = eek_theme_node_new (data->context,
                                      data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                      EEK_TYPE_KEY,
                                      eek_element_get_name (element),
                                      "key",
@@ -1344,7 +1318,7 @@ create_theme_node_key_callback (EekElement *element,
 
     theme_node = eek_theme_node_new (data->context,
                                      data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                      EEK_TYPE_KEY,
                                      eek_element_get_name (element),
                                      "key",
@@ -1363,11 +1337,9 @@ create_theme_node_section_callback (EekElement *element,
     CreateThemeNodeData *data = user_data;
     EekThemeNode *theme_node, *parent;
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (data->renderer);
-
     theme_node = eek_theme_node_new (data->context,
                                      data->parent,
-                                     priv->theme,
+                                     data->renderer->priv->theme,
                                      EEK_TYPE_SECTION,
                                      eek_element_get_name (element),
                                      "section",
@@ -1396,25 +1368,22 @@ eek_renderer_set_theme (EekRenderer *renderer,
 
     g_return_if_fail (EEK_IS_RENDERER(renderer));
     g_return_if_fail (EEK_IS_THEME(theme));
+    g_return_if_fail (renderer->priv->keyboard);
 
-    EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
+    if (renderer->priv->theme)
-
+        g_object_unref (renderer->priv->theme);
-    g_return_if_fail (priv->keyboard);
+    renderer->priv->theme = g_object_ref (theme);
-
-    if (priv->theme)
-        g_object_unref (priv->theme);
-    priv->theme = g_object_ref (theme);
 
     theme_context = eek_theme_context_new ();
     theme_node = eek_theme_node_new (theme_context,
                                      NULL,
-                                     priv->theme,
+                                     renderer->priv->theme,
                                      EEK_TYPE_KEYBOARD,
                                      "keyboard",
                                      "keyboard",
                                      NULL,
                                      NULL);
-    g_object_set_data_full (G_OBJECT(priv->keyboard),
+    g_object_set_data_full (G_OBJECT(renderer->priv->keyboard),
                             "theme-node",
                             theme_node,
                             (GDestroyNotify)g_object_unref);
@@ -1422,7 +1391,7 @@ eek_renderer_set_theme (EekRenderer *renderer,
     data.context = theme_context;
     data.parent = theme_node;
     data.renderer = renderer;
-    eek_container_foreach_child (EEK_CONTAINER(priv->keyboard),
+    eek_container_foreach_child (EEK_CONTAINER(renderer->priv->keyboard),
                                  create_theme_node_section_callback,
                                  &data);
 }

eek/eek-renderer.h

@@ -31,7 +31,21 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_RENDERER (eek_renderer_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekRenderer, eek_renderer, EEK, RENDERER, GObject)
+#define EEK_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_RENDERER, EekRenderer))
+#define EEK_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_RENDERER, EekRendererClass))
+#define EEK_IS_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_RENDERER))
+#define EEK_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_RENDERER))
+#define EEK_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_RENDERER, EekRendererClass))
+
+typedef struct _EekRenderer EekRenderer;
+typedef struct _EekRendererClass EekRendererClass;
+typedef struct _EekRendererPrivate EekRendererPrivate;
+
+struct _EekRenderer {
+    GObject parent;
+
+    EekRendererPrivate *priv;
+};
 
 struct _EekRendererClass
 {

eek/eek-section.c

@@ -52,6 +52,11 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
+G_DEFINE_TYPE (EekSection, eek_section, EEK_TYPE_CONTAINER);
+
+#define EEK_SECTION_GET_PRIVATE(obj)                           \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SECTION, EekSectionPrivate))
+
 struct _EekRow
 {
     gint num_columns;
@@ -60,19 +65,17 @@ struct _EekRow
 
 typedef struct _EekRow EekRow;
 
-typedef struct _EekSectionPrivate
+struct _EekSectionPrivate
 {
     gint angle;
     GSList *rows;
     EekModifierType modifiers;
-} EekSectionPrivate;
+};
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekSection, eek_section, EEK_TYPE_CONTAINER)
 
 static gint
 eek_section_real_get_n_rows (EekSection *self)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
 
     return g_slist_length (priv->rows);
 }
@@ -82,7 +85,7 @@ eek_section_real_add_row (EekSection    *self,
                           gint           num_columns,
                           EekOrientation orientation)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
     EekRow *row;
 
     row = g_slice_new (EekRow);
@@ -97,7 +100,7 @@ eek_section_real_get_row (EekSection     *self,
                           gint           *num_columns,
                           EekOrientation *orientation)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
     EekRow *row;
 
     row = g_slist_nth_data (priv->rows, index);
@@ -135,9 +138,7 @@ eek_section_real_create_key (EekSection *self,
     num_rows = eek_section_get_n_rows (self);
     g_return_val_if_fail (0 <= row_index && row_index < num_rows, NULL);
 
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    row = g_slist_nth_data (self->priv->rows, row_index);
-
-    row = g_slist_nth_data (priv->rows, row_index);
     if (row->num_columns < column_index + 1)
         row->num_columns = column_index + 1;
 
@@ -157,7 +158,7 @@ eek_section_real_create_key (EekSection *self,
 static void
 set_level_from_modifiers (EekSection *self)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
     EekKeyboard *keyboard;
     EekModifierType num_lock_mask;
     gint level = -1;
@@ -172,7 +173,7 @@ set_level_from_modifiers (EekSection *self)
 static void
 eek_section_real_key_pressed (EekSection *self, EekKey *key)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
     EekSymbol *symbol;
     EekKeyboard *keyboard;
     EekModifierBehavior behavior;
@@ -194,7 +195,7 @@ eek_section_real_key_pressed (EekSection *self, EekKey *key)
 static void
 eek_section_real_key_released (EekSection *self, EekKey *key)
 {
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(self);
     EekSymbol *symbol;
     EekKeyboard *keyboard;
     EekModifierBehavior behavior;
@@ -224,8 +225,7 @@ eek_section_real_key_released (EekSection *self, EekKey *key)
 static void
 eek_section_finalize (GObject *object)
 {
-    EekSection        *self = EEK_SECTION (object);
+    EekSectionPrivate *priv = EEK_SECTION_GET_PRIVATE(object);
-    EekSectionPrivate *priv = eek_section_get_instance_private (self);
     GSList *head;
 
     for (head = priv->rows; head; head = g_slist_next (head))
@@ -291,6 +291,8 @@ eek_section_class_init (EekSectionClass *klass)
     GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekSectionPrivate));
+
     klass->get_n_rows = eek_section_real_get_n_rows;
     klass->add_row = eek_section_real_add_row;
     klass->get_row = eek_section_real_get_row;
@@ -365,7 +367,7 @@ eek_section_class_init (EekSectionClass *klass)
 static void
 eek_section_init (EekSection *self)
 {
-    /* void */
+    self->priv = EEK_SECTION_GET_PRIVATE (self);
 }
 
 /**
@@ -380,11 +382,8 @@ eek_section_set_angle (EekSection  *section,
                        gint         angle)
 {
     g_return_if_fail (EEK_IS_SECTION(section));
-
+    if (section->priv->angle != angle) {
-    EekSectionPrivate *priv = eek_section_get_instance_private (section);
+        section->priv->angle = angle;
-
-    if (priv->angle != angle) {
-        priv->angle = angle;
         g_object_notify (G_OBJECT(section), "angle");
     }
 }
@@ -399,10 +398,7 @@ gint
 eek_section_get_angle (EekSection *section)
 {
     g_return_val_if_fail (EEK_IS_SECTION(section), -1);
-
+    return section->priv->angle;
-    EekSectionPrivate *priv = eek_section_get_instance_private (section);
-
-    return priv->angle;
 }
 
 /**
@@ -533,7 +529,7 @@ static void keycounter (EekElement *element, gpointer user_data) {
     }
 }
 
-const double keyspacing = 4.0;
+const double keyspacing = 3.0;
 
 static void keyplacer(EekElement *element, gpointer user_data) {
     double *current_offset = user_data;

eek/eek-section.h

@@ -32,7 +32,28 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_SECTION (eek_section_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekSection, eek_section, EEK, SECTION, EekContainer)
+#define EEK_SECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SECTION, EekSection))
+#define EEK_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SECTION, EekSectionClass))
+#define EEK_IS_SECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SECTION))
+#define EEK_IS_SECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SECTION))
+#define EEK_SECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SECTION, EekSectionClass))
+
+typedef struct _EekSectionClass EekSectionClass;
+typedef struct _EekSectionPrivate EekSectionPrivate;
+
+/**
+ * EekSection:
+ *
+ * The #EekSection structure contains only private data and should
+ * only be accessed using the provided API.
+ */
+struct _EekSection
+{
+    /*< private >*/
+    EekContainer parent;
+
+    EekSectionPrivate *priv;
+};
 
 /**
  * EekSectionClass:

eek/eek-symbol.c

@@ -44,31 +44,29 @@ enum {
     PROP_LAST
 };
 
-typedef struct _EekSymbolPrivate
+struct _EekSymbolPrivate {
-{
     gchar *name;
     gchar *label;
     EekSymbolCategory category;
     EekModifierType modifier_mask;
     gchar *icon_name;
     gchar *tooltip;
-} EekSymbolPrivate;
+};
 
 static void eek_serializable_iface_init (EekSerializableIface *iface);
 
-G_DEFINE_TYPE_EXTENDED (EekSymbol,
+G_DEFINE_TYPE_WITH_CODE (EekSymbol, eek_symbol, G_TYPE_OBJECT,
-			eek_symbol,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-			G_TYPE_OBJECT,
+                                                eek_serializable_iface_init));
-			0, /* GTypeFlags */
+
-			G_ADD_PRIVATE (EekSymbol)
+#define EEK_SYMBOL_GET_PRIVATE(obj)                                  \
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_SYMBOL, EekSymbolPrivate))
-                                               eek_serializable_iface_init))
 
 static void
 eek_symbol_real_serialize (EekSerializable *self,
                            GVariantBuilder *builder)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (EEK_SYMBOL (self));
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);
 #define NOTNULL(s) ((s) != NULL ? (s) : "")
     g_variant_builder_add (builder, "s", NOTNULL(priv->name));
     g_variant_builder_add (builder, "s", NOTNULL(priv->label));
@@ -84,7 +82,7 @@ eek_symbol_real_deserialize (EekSerializable *self,
                              GVariant        *variant,
                              gsize            index)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (EEK_SYMBOL (self));
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(self);
 
     g_variant_get_child (variant, index++, "s", &priv->name);
     g_variant_get_child (variant, index++, "s", &priv->label);
@@ -174,8 +172,7 @@ eek_symbol_get_property (GObject    *object,
 static void
 eek_symbol_finalize (GObject *object)
 {
-    EekSymbol        *self = EEK_SYMBOL (object);
+    EekSymbolPrivate *priv = EEK_SYMBOL_GET_PRIVATE(object);
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (self);
 
     g_free (priv->name);
     g_free (priv->label);
@@ -190,6 +187,8 @@ eek_symbol_class_init (EekSymbolClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekSymbolPrivate));
+
     gobject_class->set_property = eek_symbol_set_property;
     gobject_class->get_property = eek_symbol_get_property;
     gobject_class->finalize = eek_symbol_finalize;
@@ -242,8 +241,9 @@ eek_symbol_class_init (EekSymbolClass *klass)
 static void
 eek_symbol_init (EekSymbol *self)
 {
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (self);
+    EekSymbolPrivate *priv;
 
+    priv = self->priv = EEK_SYMBOL_GET_PRIVATE(self);
     priv->category = EEK_SYMBOL_CATEGORY_UNKNOWN;
 }
 
@@ -270,10 +270,11 @@ void
 eek_symbol_set_name (EekSymbol   *symbol,
                      const gchar *name)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     g_free (priv->name);
     priv->name = g_strdup (name);
 }
@@ -287,10 +288,11 @@ eek_symbol_set_name (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_name (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     if (priv->name == NULL || *priv->name == '\0')
         return NULL;
     return priv->name;
@@ -307,10 +309,11 @@ void
 eek_symbol_set_label (EekSymbol   *symbol,
                       const gchar *label)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     g_free (priv->label);
     priv->label = g_strdup (label);
 }
@@ -324,10 +327,11 @@ eek_symbol_set_label (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_label (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     if (priv->label == NULL || *priv->label == '\0')
         return NULL;
     return priv->label;
@@ -344,10 +348,11 @@ void
 eek_symbol_set_category (EekSymbol        *symbol,
                          EekSymbolCategory category)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     priv->category = category;
 }
 
@@ -360,10 +365,11 @@ eek_symbol_set_category (EekSymbol        *symbol,
 EekSymbolCategory
 eek_symbol_get_category (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), EEK_SYMBOL_CATEGORY_UNKNOWN);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     return priv->category;
 }
 
@@ -378,10 +384,11 @@ void
 eek_symbol_set_modifier_mask (EekSymbol      *symbol,
                               EekModifierType mask)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     priv->modifier_mask = mask;
 }
 
@@ -394,10 +401,11 @@ eek_symbol_set_modifier_mask (EekSymbol      *symbol,
 EekModifierType
 eek_symbol_get_modifier_mask (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), 0);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     return priv->modifier_mask;
 }
 
@@ -425,10 +433,11 @@ void
 eek_symbol_set_icon_name (EekSymbol   *symbol,
                           const gchar *icon_name)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     g_free (priv->icon_name);
     priv->icon_name = g_strdup (icon_name);
 }
@@ -442,10 +451,11 @@ eek_symbol_set_icon_name (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_icon_name (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     if (priv->icon_name == NULL || *priv->icon_name == '\0')
         return NULL;
     return priv->icon_name;
@@ -462,10 +472,11 @@ void
 eek_symbol_set_tooltip (EekSymbol   *symbol,
                         const gchar *tooltip)
 {
+    EekSymbolPrivate *priv;
+
     g_return_if_fail (EEK_IS_SYMBOL(symbol));
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     g_free (priv->tooltip);
     priv->tooltip = g_strdup (tooltip);
 }
@@ -479,10 +490,11 @@ eek_symbol_set_tooltip (EekSymbol   *symbol,
 const gchar *
 eek_symbol_get_tooltip (EekSymbol *symbol)
 {
+    EekSymbolPrivate *priv;
+
     g_return_val_if_fail (EEK_IS_SYMBOL(symbol), NULL);
 
-    EekSymbolPrivate *priv = eek_symbol_get_instance_private (symbol);
+    priv = EEK_SYMBOL_GET_PRIVATE(symbol);
-
     if (priv->tooltip == NULL || *priv->tooltip == '\0')
         return NULL;
     return priv->tooltip;

eek/eek-symbol.h

@@ -59,7 +59,27 @@ typedef enum {
 } EekSymbolCategory;
 
 #define EEK_TYPE_SYMBOL (eek_symbol_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekSymbol, eek_symbol, EEK, SYMBOL, GObject)
+#define EEK_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_SYMBOL, EekSymbol))
+#define EEK_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_SYMBOL, EekSymbolClass))
+#define EEK_IS_SYMBOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_SYMBOL))
+#define EEK_IS_SYMBOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_SYMBOL))
+#define EEK_SYMBOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_SYMBOL, EekSymbolClass))
+
+typedef struct _EekSymbolClass EekSymbolClass;
+typedef struct _EekSymbolPrivate EekSymbolPrivate;
+
+/**
+ * EekSymbol:
+ *
+ * The #EekSymbol structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekSymbol {
+    /*< private >*/
+    GObject parent;
+
+    EekSymbolPrivate *priv;
+};
 
 /**
  * EekSymbolClass:

eek/eek-text.c

@@ -36,20 +36,18 @@ enum {
     PROP_LAST
 };
 
-typedef struct _EekTextPrivate
+struct _EekTextPrivate {
-{
     gchar *text;
-} EekTextPrivate;
+};
 
 static void eek_serializable_iface_init (EekSerializableIface *iface);
 
-G_DEFINE_TYPE_EXTENDED (EekText,
+G_DEFINE_TYPE_WITH_CODE (EekText, eek_text, EEK_TYPE_SYMBOL,
-			eek_text,
+                         G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
-			EEK_TYPE_SYMBOL,
+                                                eek_serializable_iface_init));
-			0, /* GTypeFlags */
+
-			G_ADD_PRIVATE (EekText)
+#define EEK_TEXT_GET_PRIVATE(obj)                                  \
-                        G_IMPLEMENT_INTERFACE (EEK_TYPE_SERIALIZABLE,
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_TEXT, EekTextPrivate))
-                                               eek_serializable_iface_init))
 
 static EekSerializableIface *eek_text_parent_serializable_iface;
 
@@ -57,7 +55,7 @@ static void
 eek_text_real_serialize (EekSerializable *self,
                          GVariantBuilder *builder)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (EEK_TEXT (self));
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);
 
     eek_text_parent_serializable_iface->serialize (self, builder);
 
@@ -69,7 +67,7 @@ eek_text_real_deserialize (EekSerializable *self,
                            GVariant        *variant,
                            gsize            index)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (EEK_TEXT (self));
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);
 
     index = eek_text_parent_serializable_iface->deserialize (self,
                                                              variant,
@@ -95,9 +93,7 @@ eek_text_set_property (GObject      *object,
                        const GValue *value,
                        GParamSpec   *pspec)
 {
-    EekText        *self = EEK_TEXT (object);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
-
     switch (prop_id) {
     case PROP_TEXT:
         g_free (priv->text);
@@ -111,13 +107,11 @@ eek_text_set_property (GObject      *object,
 
 static void
 eek_text_get_property (GObject    *object,
-                       guint       prop_id,
+                         guint       prop_id,
-                       GValue     *value,
+                         GValue     *value,
-                       GParamSpec *pspec)
+                         GParamSpec *pspec)
 {
-    EekText        *self = EEK_TEXT (object);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
-
     switch (prop_id) {
     case PROP_TEXT:
         g_value_set_string (value, priv->text);
@@ -131,8 +125,7 @@ eek_text_get_property (GObject    *object,
 static void
 eek_text_finalize (GObject *object)
 {
-    EekText        *self = EEK_TEXT (object);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(object);
-    EekTextPrivate *priv = eek_text_get_instance_private (self);
 
     g_free (priv->text);
     G_OBJECT_CLASS (eek_text_parent_class)->finalize (object);
@@ -144,6 +137,8 @@ eek_text_class_init (EekTextClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekTextPrivate));
+
     gobject_class->set_property = eek_text_set_property;
     gobject_class->get_property = eek_text_get_property;
     gobject_class->finalize = eek_text_finalize;
@@ -159,7 +154,7 @@ eek_text_class_init (EekTextClass *klass)
 static void
 eek_text_init (EekText *self)
 {
-    /* void */
+    self->priv = EEK_TEXT_GET_PRIVATE(self);
 }
 
 EekText *
@@ -181,7 +176,7 @@ eek_text_new (const gchar *text)
 const gchar *
 eek_text_get_text (EekText *text)
 {
-    EekTextPrivate *priv = eek_text_get_instance_private (text);
+    EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(text);
 
     return priv->text;
 }

eek/eek-text.h

@@ -30,7 +30,27 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_TEXT (eek_text_get_type())
-G_DECLARE_DERIVABLE_TYPE(EekText, eek_text, EEK, TEXT, EekSymbol)
+#define EEK_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_TEXT, EekText))
+#define EEK_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_TEXT, EekTextClass))
+#define EEK_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_TEXT))
+#define EEK_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_TEXT))
+#define EEK_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_TEXT, EekTextClass))
+
+typedef struct _EekTextClass EekTextClass;
+typedef struct _EekTextPrivate EekTextPrivate;
+
+/**
+ * EekText:
+ *
+ * The #EekText structure contains only private data and should only
+ * be accessed using the provided API.
+ */
+struct _EekText {
+    /*< private >*/
+    EekSymbol parent;
+
+    EekTextPrivate *priv;
+};
 
 struct _EekTextClass {
     /*< private >*/

eek/eek-xkb-layout.c

@@ -52,13 +52,20 @@
 
 static void initable_iface_init (GInitableIface *initable_iface);
 
+G_DEFINE_TYPE_WITH_CODE (EekXkbLayout, eek_xkb_layout, EEK_TYPE_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XKB_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutPrivate))
+
 enum {
     PROP_0,
     PROP_DISPLAY,
     PROP_LAST
 };
 
-typedef struct _EekXkbLayoutPrivate
+struct _EekXkbLayoutPrivate
 {
     /* Configuration names that should synch'ed to the symbolic names
        in priv->xkb->names.  Since we use GLib's memory allocator,
@@ -75,13 +82,7 @@ typedef struct _EekXkbLayoutPrivate
 
     gint scale_numerator;
     gint scale_denominator;
-} EekXkbLayoutPrivate;
+};
-
-G_DEFINE_TYPE_EXTENDED (EekXkbLayout, eek_xkb_layout, EEK_TYPE_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE(EekXkbLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
 
 static guint    find_keycode             (EekXkbLayout *layout,
                                           gchar        *key_name);
@@ -100,7 +101,7 @@ G_INLINE_FUNC gint
 xkb_to_pixmap_coord (EekXkbLayout *layout,
                      gint          n)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
     return n * priv->scale_numerator / priv->scale_denominator;
 }
 
@@ -108,7 +109,7 @@ G_INLINE_FUNC gdouble
 xkb_to_pixmap_double (EekXkbLayout *layout,
                      gdouble       d)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
     return d * priv->scale_numerator / priv->scale_denominator;
 }
 
@@ -126,7 +127,7 @@ create_key (EekXkbLayout *layout,
     XkbBoundsRec *xkbbounds;
     XkbShapeRec *xkbshape;
     XkbOutlineRec *xkboutline;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
     EekKey *key;
     EekBounds bounds;
     EekSymbolMatrix *matrix = NULL;
@@ -236,7 +237,7 @@ create_section (EekXkbLayout  *layout,
                 XkbSectionRec *xkbsection)
 {
     XkbGeometryRec *xkbgeometry;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv;
     EekSection *section;
     EekBounds bounds;
     gchar *name;
@@ -248,6 +249,7 @@ create_section (EekXkbLayout  *layout,
     bounds.width = xkb_to_pixmap_coord(layout, xkbsection->width);
     bounds.height = xkb_to_pixmap_coord(layout, xkbsection->height);
 
+    priv = layout->priv;
     xkbgeometry = priv->xkb->geom;
     section = eek_keyboard_create_section (keyboard);
     name = XGetAtomName (priv->display, xkbsection->name);
@@ -291,7 +293,7 @@ create_section (EekXkbLayout  *layout,
 static void
 create_keyboard (EekXkbLayout *layout, EekKeyboard *keyboard)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
     XkbGeometryRec *xkbgeometry;
     EekBounds bounds;
     gint i;
@@ -335,8 +337,7 @@ eek_xkb_layout_real_create_keyboard (EekboardContextService *manager,
     eek_element_set_bounds (EEK_ELEMENT(keyboard), &bounds);
 
     /* resolve modifiers dynamically assigned at run time */
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (
+    EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (self);
-		    EEK_XKB_LAYOUT(self));
     eek_keyboard_set_num_lock_mask (keyboard,
                                     XkbKeysymToModifiers (priv->display,
                                                           XK_Num_Lock));
@@ -357,8 +358,7 @@ eek_xkb_layout_real_create_keyboard (EekboardContextService *manager,
 static void
 eek_xkb_layout_finalize (GObject *object)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (
+    EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (object);
-		    EEK_XKB_LAYOUT (object));
 
     g_free (priv->names.keycodes);
     g_free (priv->names.geometry);
@@ -374,11 +374,10 @@ eek_xkb_layout_set_property (GObject      *object,
                              GParamSpec   *pspec)
 {
     EekXkbLayout *layout = EEK_XKB_LAYOUT (object);
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
 
     switch (prop_id) {
     case PROP_DISPLAY:
-        priv->display = g_value_get_pointer (value);
+        layout->priv->display = g_value_get_pointer (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -393,11 +392,10 @@ eek_xkb_layout_get_property (GObject    *object,
                              GParamSpec *pspec)
 {
     EekXkbLayout *layout = EEK_XKB_LAYOUT (object);
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
 
     switch (prop_id) {
     case PROP_DISPLAY:
-        g_value_set_pointer (value, priv->display);
+        g_value_set_pointer (value, layout->priv->display);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -412,6 +410,8 @@ eek_xkb_layout_class_init (EekXkbLayoutClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekXkbLayoutPrivate));
+
     layout_class->create_keyboard = eek_xkb_layout_real_create_keyboard;
 
     gobject_class->finalize = eek_xkb_layout_finalize;
@@ -429,14 +429,14 @@ eek_xkb_layout_class_init (EekXkbLayoutClass *klass)
 static void
 eek_xkb_layout_init (EekXkbLayout *self)
 {
-    /* void */
+    self->priv = EEK_XKB_LAYOUT_GET_PRIVATE (self);
 }
 
 static gboolean
 get_names_from_server (EekXkbLayout *layout,
                        GError      **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
     gchar *name;
 
     XkbGetNames (priv->display, XkbAllNamesMask, priv->xkb);
@@ -516,21 +516,19 @@ eek_xkb_layout_set_names (EekXkbLayout         *layout,
                           XkbComponentNamesRec *names,
                           GError              **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    if (g_strcmp0 (names->keycodes, layout->priv->names.keycodes)) {
-
+        g_free (layout->priv->names.keycodes);
-    if (g_strcmp0 (names->keycodes, priv->names.keycodes)) {
+        layout->priv->names.keycodes = g_strdup (names->keycodes);
-        g_free (priv->names.keycodes);
-        priv->names.keycodes = g_strdup (names->keycodes);
     }
 
-    if (g_strcmp0 (names->geometry, priv->names.geometry)) {
+    if (g_strcmp0 (names->geometry, layout->priv->names.geometry)) {
-        g_free (priv->names.geometry);
+        g_free (layout->priv->names.geometry);
-        priv->names.geometry = g_strdup (names->geometry);
+        layout->priv->names.geometry = g_strdup (names->geometry);
     }
 
-    if (g_strcmp0 (names->symbols, priv->names.symbols)) {
+    if (g_strcmp0 (names->symbols, layout->priv->names.symbols)) {
-        g_free (priv->names.symbols);
+        g_free (layout->priv->names.symbols);
-        priv->names.symbols = g_strdup (names->symbols);
+        layout->priv->names.symbols = g_strdup (names->symbols);
     }
 
     return get_keyboard_from_server (layout, error);
@@ -540,7 +538,7 @@ static gboolean
 get_keyboard_from_server (EekXkbLayout *layout,
                           GError      **error)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
 
     if (priv->xkb) {
         XkbFreeKeyboard (priv->xkb, 0, True);
@@ -591,7 +589,7 @@ find_keycode (EekXkbLayout *layout, gchar *key_name)
     XkbKeyAliasPtr palias;
     guint is_name_matched;
     gchar *src, *dst;
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
 
     if (!priv->xkb)
         return EEK_INVALID_KEYCODE;
@@ -644,7 +642,7 @@ setup_scaling (EekXkbLayout *layout,
                gdouble       width,
                gdouble       height)
 {
-    EekXkbLayoutPrivate *priv = eek_xkb_layout_get_instance_private (layout);
+    EekXkbLayoutPrivate *priv = layout->priv;
 
     g_return_if_fail (priv->xkb);
 

eek/eek-xkb-layout.h

@@ -31,7 +31,23 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_XKB_LAYOUT (eek_xkb_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXkbLayout, eek_xkb_layout, EEK, XKB_LAYOUT, EekLayout)
+#define EEK_XKB_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayout))
+#define EEK_XKB_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutClass))
+#define EEK_IS_XKB_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XKB_LAYOUT))
+#define EEK_IS_XKB_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XKB_LAYOUT))
+#define EEK_XKB_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XKB_LAYOUT, EekXkbLayoutClass))
+
+typedef struct _EekXkbLayout        EekXkbLayout;
+typedef struct _EekXkbLayoutClass   EekXkbLayoutClass;
+typedef struct _EekXkbLayoutPrivate EekXkbLayoutPrivate;
+
+struct _EekXkbLayout
+{
+    /*< private >*/
+    EekLayout parent;
+
+    EekXkbLayoutPrivate *priv;
+};
 
 struct _EekXkbLayoutClass
 {

eek/eek-xkl-layout.c

@@ -42,6 +42,13 @@ static GInitableIface *parent_initable_iface;
 
 static void initable_iface_init (GInitableIface *initable_iface);
 
+G_DEFINE_TYPE_WITH_CODE (EekXklLayout, eek_xkl_layout, EEK_TYPE_XKB_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XKL_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayoutPrivate))
+
 enum {
     PROP_0,
     PROP_MODEL,
@@ -51,17 +58,11 @@ enum {
     PROP_LAST
 };
 
-typedef struct _EekXklLayoutPrivate
+struct _EekXklLayoutPrivate
 {
     XklEngine *engine;
     XklConfigRec *config;
-} EekXklLayoutPrivate;
+};
-
-G_DEFINE_TYPE_EXTENDED (EekXklLayout, eek_xkl_layout, EEK_TYPE_XKB_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE (EekXklLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
 
 /* from gnome-keyboard-properties-xkbpv.c:
  *  BAD STYLE: Taken from xklavier_private_xkb.h
@@ -82,8 +83,7 @@ static gboolean set_xkb_component_names (EekXklLayout *layout,
 static void
 eek_xkl_layout_dispose (GObject *object)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (object);
-		    EEK_XKL_LAYOUT (object));
 
     if (priv->config) {
         g_object_unref (priv->config);
@@ -157,6 +157,8 @@ eek_xkl_layout_class_init (EekXklLayoutClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekXklLayoutPrivate));
+
     gobject_class->dispose = eek_xkl_layout_dispose;
     gobject_class->set_property = eek_xkl_layout_set_property;
     gobject_class->get_property = eek_xkl_layout_get_property;
@@ -213,7 +215,7 @@ eek_xkl_layout_class_init (EekXklLayoutClass *klass)
 static void
 eek_xkl_layout_init (EekXklLayout *self)
 {
-    /* void */
+    self->priv = EEK_XKL_LAYOUT_GET_PRIVATE (self);
 }
 
 /**
@@ -264,7 +266,7 @@ gboolean
 eek_xkl_layout_set_config (EekXklLayout *layout,
                            XklConfigRec *config)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
     XklConfigRec *c;
     gboolean retval;
 
@@ -327,7 +329,7 @@ gboolean
 eek_xkl_layout_set_model (EekXklLayout *layout,
                           const gchar  *model)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
     XklConfigRec *config;
     gboolean retval;
     
@@ -355,7 +357,7 @@ gboolean
 eek_xkl_layout_set_layouts (EekXklLayout *layout,
                             gchar       **layouts)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
     XklConfigRec *config;
     gboolean retval;
 
@@ -383,7 +385,7 @@ gboolean
 eek_xkl_layout_set_variants (EekXklLayout *layout,
                              gchar       **variants)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
     XklConfigRec *config;
     gboolean retval;
 
@@ -411,7 +413,7 @@ gboolean
 eek_xkl_layout_set_options (EekXklLayout *layout,
                             gchar       **options)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
     XklConfigRec *config;
     gboolean retval;
 
@@ -495,7 +497,7 @@ eek_xkl_layout_disable_option (EekXklLayout *layout,
 gchar *
 eek_xkl_layout_get_model (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
 
     g_return_val_if_fail (priv, NULL);
     return g_strdup (priv->config->model);
@@ -511,7 +513,7 @@ eek_xkl_layout_get_model (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_layouts (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
 
     g_return_val_if_fail (priv, NULL);
     return g_strdupv (priv->config->layouts);
@@ -527,7 +529,7 @@ eek_xkl_layout_get_layouts (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_variants (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
 
     g_return_val_if_fail (priv, NULL);
     return g_strdupv (priv->config->variants);
@@ -543,7 +545,7 @@ eek_xkl_layout_get_variants (EekXklLayout *layout)
 gchar **
 eek_xkl_layout_get_options (EekXklLayout *layout)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = EEK_XKL_LAYOUT_GET_PRIVATE (layout);
 
     g_return_val_if_fail (priv, NULL);
     return g_strdupv (priv->config->options);
@@ -552,7 +554,7 @@ eek_xkl_layout_get_options (EekXklLayout *layout)
 static gboolean
 set_xkb_component_names (EekXklLayout *layout, XklConfigRec *config)
 {
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
+    EekXklLayoutPrivate *priv = layout->priv;
     XkbComponentNamesRec names;
     gboolean retval = FALSE;
 
@@ -626,22 +628,21 @@ initable_init (GInitable    *initable,
                GError      **error)
 {
     EekXklLayout *layout = EEK_XKL_LAYOUT (initable);
-    EekXklLayoutPrivate *priv = eek_xkl_layout_get_instance_private (layout);
     Display *display;
 
     if (!parent_initable_iface->init (initable, cancellable, error))
         return FALSE;
 
-    priv->config = xkl_config_rec_new ();
+    layout->priv->config = xkl_config_rec_new ();
 
     g_object_get (G_OBJECT (initable),
                   "display", &display,
                   NULL);
 
-    priv->engine = xkl_engine_get_instance (display);
+    layout->priv->engine = xkl_engine_get_instance (display);
 
-    if (!xkl_config_rec_get_from_server (priv->config,
+    if (!xkl_config_rec_get_from_server (layout->priv->config,
-                                         priv->engine)) {
+                                         layout->priv->engine)) {
         g_set_error (error,
                      EEK_ERROR,
                      EEK_ERROR_LAYOUT_ERROR,
@@ -649,7 +650,7 @@ initable_init (GInitable    *initable,
         return FALSE;
     }
 
-    set_xkb_component_names (layout, priv->config);
+    set_xkb_component_names (layout, layout->priv->config);
     return TRUE;
 }
 

eek/eek-xkl-layout.h

@@ -31,7 +31,23 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_XKL_LAYOUT (eek_xkl_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXklLayout, eek_xkl_layout, EEK, XKL_LAYOUT, EekLayout)
+#define EEK_XKL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayout))
+#define EEK_XKL_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XKL_LAYOUT, EekXklLayoutClass))
+#define EEK_IS_XKL_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XKL_LAYOUT))
+#define EEK_IS_XKL_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XKL_LAYOUT))
+#define EEK_XKL_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XKL_LAYOUT, EekXklLayoutClass))
+
+typedef struct _EekXklLayout        EekXklLayout;
+typedef struct _EekXklLayoutClass   EekXklLayoutClass;
+typedef struct _EekXklLayoutPrivate EekXklLayoutPrivate;
+
+struct _EekXklLayout
+{
+    /*< private >*/
+    EekXkbLayout parent;
+
+    EekXklLayoutPrivate *priv;
+};
 
 struct _EekXklLayoutClass
 {

eek/eek-xml-layout.c

@@ -43,18 +43,19 @@ enum {
 
 static void initable_iface_init (GInitableIface *initable_iface);
 
-typedef struct _EekXmlLayoutPrivate
+G_DEFINE_TYPE_WITH_CODE (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init));
+
+#define EEK_XML_LAYOUT_GET_PRIVATE(obj)                                  \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayoutPrivate))
+
+struct _EekXmlLayoutPrivate
 {
     gchar *id;
     gchar *keyboards_dir;
     EekXmlKeyboardDesc *desc;
-} EekXmlLayoutPrivate;
+};
-
-G_DEFINE_TYPE_EXTENDED (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
-			0, /* GTypeFlags */
-			G_ADD_PRIVATE(EekXmlLayout)
-                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                               initable_iface_init))
 
 G_DEFINE_BOXED_TYPE(EekXmlKeyboardDesc, eek_xml_keyboard_desc, eek_xml_keyboard_desc_copy, eek_xml_keyboard_desc_free);
 
@@ -902,7 +903,6 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
                                      gdouble    initial_height)
 {
     EekXmlLayout *layout = EEK_XML_LAYOUT (self);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
     gboolean retval;
 
     /* Create an empty keyboard to which geometry and symbols
@@ -911,8 +911,8 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
     keyboard->manager = manager;
 
     /* Read geometry information. */
-    gchar *filename = g_strdup_printf ("%s.xml", priv->desc->geometry);
+    gchar *filename = g_strdup_printf ("%s.xml", layout->priv->desc->geometry);
-    gchar *path = g_build_filename (priv->keyboards_dir, "geometry", filename, NULL);
+    gchar *path = g_build_filename (layout->priv->keyboards_dir, "geometry", filename, NULL);
     g_free (filename);
 
     GError *error = NULL;
@@ -921,7 +921,7 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
     if (!retval) {
         g_object_unref (keyboard);
         g_warning ("can't parse geometry file %s: %s",
-                   priv->desc->geometry,
+                   layout->priv->desc->geometry,
                    error->message);
         g_error_free (error);
         return NULL;
@@ -929,8 +929,8 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
 
     /* Read symbols information. */
     GList *loaded = NULL;
-    retval = parse_symbols_with_prerequisites (priv->keyboards_dir,
+    retval = parse_symbols_with_prerequisites (layout->priv->keyboards_dir,
-                                               priv->desc->symbols,
+                                               layout->priv->desc->symbols,
                                                keyboard,
                                                &loaded,
                                                &error);
@@ -938,7 +938,7 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
     if (!retval) {
         g_object_unref (keyboard);
         g_warning ("can't parse symbols file %s: %s",
-                   priv->desc->symbols,
+                   layout->priv->desc->symbols,
                    error->message);
         g_error_free (error);
         return NULL;
@@ -949,7 +949,7 @@ eek_xml_layout_real_create_keyboard (EekboardContextService *manager,
 
     /* Use pre-defined modifier mask here. */
     eek_keyboard_set_num_lock_mask (keyboard, EEK_MOD2_MASK);
-    eek_keyboard_set_alt_gr_mask (keyboard, EEK_BUTTON1_MASK);
+    eek_keyboard_set_alt_gr_mask (keyboard, EEK_MOD5_MASK);
 
     return keyboard;
 }
@@ -961,12 +961,10 @@ eek_xml_layout_set_property (GObject      *object,
                              GParamSpec   *pspec)
 {
     EekXmlLayout *layout = EEK_XML_LAYOUT (object);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
-
     switch (prop_id) {
     case PROP_ID:
-        g_free (priv->id);
+        g_free (layout->priv->id);
-        priv->id = g_value_dup_string (value);
+        layout->priv->id = g_value_dup_string (value);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -981,11 +979,9 @@ eek_xml_layout_get_property (GObject    *object,
                              GParamSpec *pspec)
 {
     EekXmlLayout *layout = EEK_XML_LAYOUT (object);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
-
     switch (prop_id) {
     case PROP_ID:
-        g_value_set_string (value, priv->id);
+        g_value_set_string (value, layout->priv->id);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -996,8 +992,7 @@ eek_xml_layout_get_property (GObject    *object,
 static void
 eek_xml_layout_finalize (GObject *object)
 {
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (
+    EekXmlLayoutPrivate *priv = EEK_XML_LAYOUT_GET_PRIVATE (object);
-		    EEK_XML_LAYOUT (object));
 
     g_free (priv->id);
 
@@ -1016,6 +1011,8 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class, sizeof (EekXmlLayoutPrivate));
+
     layout_class->create_keyboard = eek_xml_layout_real_create_keyboard;
 
     gobject_class->set_property = eek_xml_layout_set_property;
@@ -1034,7 +1031,7 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
 static void
 eek_xml_layout_init (EekXmlLayout *self)
 {
-    /* void */
+    self->priv = EEK_XML_LAYOUT_GET_PRIVATE (self);
 }
 
 EekLayout *
@@ -1053,17 +1050,16 @@ initable_init (GInitable    *initable,
                GError      **error)
 {
     EekXmlLayout *layout = EEK_XML_LAYOUT (initable);
-    EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (layout);
     GList *keyboards, *p;
     gchar *path;
     EekXmlKeyboardDesc *desc;
 
-    priv->keyboards_dir = (gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR");
+    layout->priv->keyboards_dir = (gchar *) g_getenv ("EEKBOARD_KEYBOARDSDIR");
-    if (priv->keyboards_dir == NULL)
+    if (layout->priv->keyboards_dir == NULL)
-        priv->keyboards_dir = KEYBOARDSDIR;
+        layout->priv->keyboards_dir = KEYBOARDSDIR;
-    priv->keyboards_dir = g_strdup (priv->keyboards_dir);
+    layout->priv->keyboards_dir = g_strdup (layout->priv->keyboards_dir);
 
-    path = g_build_filename (priv->keyboards_dir, "keyboards.xml", NULL);
+    path = g_build_filename (layout->priv->keyboards_dir, "keyboards.xml", NULL);
     keyboards = parse_keyboards (path, error);
     g_free (path);
     if (error && *error)
@@ -1071,7 +1067,7 @@ initable_init (GInitable    *initable,
 
     for (p = keyboards; p; p = p->next) {
         desc = p->data;
-        if (g_strcmp0 (desc->id, priv->id) == 0)
+        if (g_strcmp0 (desc->id, layout->priv->id) == 0)
             break;
     }
     if (p == NULL) {
@@ -1079,12 +1075,12 @@ initable_init (GInitable    *initable,
                      EEK_ERROR,
                      EEK_ERROR_LAYOUT_ERROR,
                      "no such keyboard %s",
-                     priv->id);
+                     layout->priv->id);
         return FALSE;
     }
 
     keyboards = g_list_remove_link (keyboards, p);
-    priv->desc = p->data;
+    layout->priv->desc = p->data;
     g_list_free_1 (p);
     g_list_free_full (keyboards, (GDestroyNotify) keyboard_desc_free);
 

eek/eek-xml-layout.h

@@ -29,7 +29,29 @@
 G_BEGIN_DECLS
 
 #define EEK_TYPE_XML_LAYOUT (eek_xml_layout_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekXmlLayout, eek_xml_layout, EEK, XML_LAYOUT, EekLayout)
+#define EEK_XML_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayout))
+#define EEK_XML_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEK_TYPE_XML_LAYOUT, EekXmlLayoutClass))
+#define EEK_IS_XML_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEK_TYPE_XML_LAYOUT))
+#define EEK_IS_XML_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEK_TYPE_XML_LAYOUT))
+#define EEK_XML_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEK_TYPE_XML_LAYOUT, EekXmlLayoutClass))
+
+typedef struct _EekXmlLayout        EekXmlLayout;
+typedef struct _EekXmlLayoutClass   EekXmlLayoutClass;
+typedef struct _EekXmlLayoutPrivate EekXmlLayoutPrivate;
+
+/**
+ * EekXmlLayout:
+ *
+ * The #EekXmlLayout structure contains only private data and should
+ * only be accessed using the provided API.
+ */
+struct _EekXmlLayout
+{
+    /*< private >*/
+    EekLayout parent;
+
+    EekXmlLayoutPrivate *priv;
+};
 
 /**
  * EekXmlLayoutClass:

eek/eek.c

@@ -38,5 +38,9 @@
 void
 eek_init (void)
 {
-    /* void */
+    g_type_init ();
+
+    g_type_class_ref (EEK_TYPE_SYMBOL);
+    g_type_class_ref (EEK_TYPE_KEYSYM);
+    g_type_class_ref (EEK_TYPE_TEXT);
 }

eek/special-keysym-entries.txt

@@ -30,7 +30,7 @@
 0xFF9E "Ins" EEK_SYMBOL_CATEGORY_FUNCTION
 0xFF9F "Del" EEK_SYMBOL_CATEGORY_FUNCTION
 # aliases
-0xFE03 "123" EEK_SYMBOL_CATEGORY_KEYNAME
+0xFE03 "⇮" EEK_SYMBOL_CATEGORY_KEYNAME
 0xFE04 "⇮" EEK_SYMBOL_CATEGORY_KEYNAME
 0xFE05 "⇮" EEK_SYMBOL_CATEGORY_KEYNAME
 0xFE08 "Next" EEK_SYMBOL_CATEGORY_KEYNAME

eekboard/eekboard-client.c

@@ -36,12 +36,15 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-typedef struct _EekboardClientPrivate
+G_DEFINE_TYPE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY);
+
+#define EEKBOARD_CLIENT_GET_PRIVATE(obj)                                \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientPrivate))
+
+struct _EekboardClientPrivate
 {
     GHashTable *context_hash;
-} EekboardClientPrivate;
+};
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY)
 
 static void send_destroy_context (EekboardClient  *client,
                                   EekboardContext *context,
@@ -50,7 +53,7 @@ static void send_destroy_context (EekboardClient  *client,
 static void
 eekboard_client_real_destroyed (EekboardClient *self)
 {
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (self);
+    EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(self);
 
     // g_debug ("eekboard_client_real_destroyed");
     g_hash_table_remove_all (priv->context_hash);
@@ -60,7 +63,7 @@ static void
 eekboard_client_dispose (GObject *object)
 {
     EekboardClient *client = EEKBOARD_CLIENT(object);
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
+    EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(client);
 
     if (priv->context_hash) {
         GHashTableIter iter;
@@ -83,6 +86,9 @@ eekboard_client_class_init (EekboardClientClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardClientPrivate));
+
     klass->destroyed = eekboard_client_real_destroyed;
 
     gobject_class->dispose = eekboard_client_dispose;
@@ -109,9 +115,8 @@ eekboard_client_class_init (EekboardClientClass *klass)
 static void
 eekboard_client_init (EekboardClient *self)
 {
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (self);
+    self->priv = EEKBOARD_CLIENT_GET_PRIVATE(self);
-
+    self->priv->context_hash =
-    priv->context_hash =
         g_hash_table_new_full (g_str_hash,
                                g_str_equal,
                                (GDestroyNotify)g_free,
@@ -184,9 +189,7 @@ on_context_destroyed (EekboardContext *context,
                       gpointer         user_data)
 {
     EekboardClient *client = user_data;
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
+    g_hash_table_remove (client->priv->context_hash,
-
-    g_hash_table_remove (priv->context_hash,
                          g_dbus_proxy_get_object_path (G_DBUS_PROXY(context)));
 }
 
@@ -236,9 +239,7 @@ eekboard_client_create_context (EekboardClient *client,
         return NULL;
     }
 
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
+    g_hash_table_insert (client->priv->context_hash,
-
-    g_hash_table_insert (priv->context_hash,
                          g_strdup (object_path),
                          g_object_ref (context));
     g_signal_connect (context, "destroyed",
@@ -283,11 +284,9 @@ eekboard_client_push_context (EekboardClient  *client,
     g_return_if_fail (EEKBOARD_IS_CLIENT(client));
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
     object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));
 
-    context = g_hash_table_lookup (priv->context_hash,
+    context = g_hash_table_lookup (client->priv->context_hash,
                                    object_path);
     if (!context)
         return;
@@ -395,10 +394,8 @@ eekboard_client_destroy_context (EekboardClient  *client,
     g_return_if_fail (EEKBOARD_IS_CLIENT(client));
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardClientPrivate *priv = eekboard_client_get_instance_private (client);
-
     object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));
-    g_hash_table_remove (priv->context_hash, object_path);
+    g_hash_table_remove (client->priv->context_hash, object_path);
 
     send_destroy_context (client, context, cancellable);
 }

eekboard/eekboard-client.h

@@ -26,7 +26,22 @@
 G_BEGIN_DECLS
 
 #define EEKBOARD_TYPE_CLIENT (eekboard_client_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardClient, eekboard_client, EEKBOARD, CLIENT, GDBusProxy)
+#define EEKBOARD_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CLIENT, EekboardClient))
+#define EEKBOARD_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
+#define EEKBOARD_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CLIENT))
+#define EEKBOARD_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CLIENT))
+#define EEKBOARD_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
+
+typedef struct _EekboardClient EekboardClient;
+typedef struct _EekboardClientClass EekboardClientClass;
+typedef struct _EekboardClientPrivate EekboardClientPrivate;
+
+struct _EekboardClient {
+    /*< private >*/
+    GDBusProxy parent;
+
+    EekboardClientPrivate *priv;
+};
 
 struct _EekboardClientClass {
     /*< private >*/

eekboard/eekboard-context.c

@@ -49,15 +49,18 @@ enum {
     PROP_LAST
 };
 
-typedef struct _EekboardContextPrivate
+G_DEFINE_TYPE (EekboardContext, eekboard_context, G_TYPE_DBUS_PROXY);
+
+#define EEKBOARD_CONTEXT_GET_PRIVATE(obj)                               \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContextPrivate))
+
+struct _EekboardContextPrivate
 {
     gboolean visible;
     gboolean enabled;
     gboolean fullscreen;
     gint group;
-} EekboardContextPrivate;
+};
-
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardContext, eekboard_context, G_TYPE_DBUS_PROXY)
 
 static void
 eekboard_context_real_g_signal (GDBusProxy  *self,
@@ -66,7 +69,6 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
                                 GVariant    *parameters)
 {
     EekboardContext *context = EEKBOARD_CONTEXT (self);
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
 
     if (g_strcmp0 (signal_name, "Enabled") == 0) {
         g_signal_emit (context, signals[ENABLED], 0);
@@ -109,8 +111,8 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
         gboolean visible = FALSE;
 
         g_variant_get (parameters, "(b)", &visible);
-        if (visible != priv->visible) {
+        if (visible != context->priv->visible) {
-            priv->visible = visible;
+            context->priv->visible = visible;
             g_object_notify (G_OBJECT(context), "visible");
         }
         return;
@@ -120,8 +122,8 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
         gint group = 0;
 
         g_variant_get (parameters, "(i)", &group);
-        if (group != priv->group) {
+        if (group != context->priv->group) {
-            priv->group = group;
+            context->priv->group = group;
             /* g_object_notify (G_OBJECT(context), "group"); */
         }
         return;
@@ -133,17 +135,13 @@ eekboard_context_real_g_signal (GDBusProxy  *self,
 static void
 eekboard_context_real_enabled (EekboardContext *self)
 {
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (self);
+    self->priv->enabled = TRUE;
-
-    priv->enabled = TRUE;
 }
 
 static void
 eekboard_context_real_disabled (EekboardContext *self)
 {
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (self);
+    self->priv->enabled = FALSE;
-
-    priv->enabled = FALSE;
 }
 
 static void
@@ -166,11 +164,9 @@ eekboard_context_get_property (GObject    *object,
                                GParamSpec *pspec)
 {
     EekboardContext *context = EEKBOARD_CONTEXT(object);
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
     switch (prop_id) {
     case PROP_VISIBLE:
-        g_value_set_boolean (value, priv->visible);
+        g_value_set_boolean (value, context->priv->visible);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -185,6 +181,9 @@ eekboard_context_class_init (EekboardContextClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec        *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardContextPrivate));
+
     klass->enabled = eekboard_context_real_enabled;
     klass->disabled = eekboard_context_real_disabled;
     klass->destroyed = eekboard_context_real_destroyed;
@@ -289,7 +288,7 @@ eekboard_context_class_init (EekboardContextClass *klass)
 static void
 eekboard_context_init (EekboardContext *self)
 {
-    /* void */
+    self->priv = EEKBOARD_CONTEXT_GET_PRIVATE(self);
 }
 
 static void
@@ -486,9 +485,7 @@ eekboard_context_set_group (EekboardContext *context,
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
+    if (context->priv->group != group) {
-
-    if (priv->group != group) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "SetGroup",
                            g_variant_new ("(i)", group),
@@ -512,10 +509,7 @@ eekboard_context_get_group (EekboardContext *context,
                             GCancellable    *cancellable)
 {
     g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), 0);
-
+    return context->priv->group;
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->group;
 }
 
 /**
@@ -532,9 +526,7 @@ eekboard_context_show_keyboard (EekboardContext *context,
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
+    if (context->priv->enabled) {
-
-    if (priv->enabled) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "ShowKeyboard",
                            NULL,
@@ -559,9 +551,7 @@ eekboard_context_hide_keyboard (EekboardContext *context,
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
+    if (context->priv->enabled) {
-
-    if (priv->enabled) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "HideKeyboard",
                            NULL,
@@ -588,9 +578,7 @@ eekboard_context_press_keycode (EekboardContext *context,
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
+    if (context->priv->enabled) {
-
-    if (priv->enabled) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "PressKeycode",
                            g_variant_new ("(u)", keycode),
@@ -617,9 +605,7 @@ eekboard_context_release_keycode (EekboardContext *context,
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
 
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
+    if (context->priv->enabled) {
-
-    if (priv->enabled) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "ReleaseKeycode",
                            g_variant_new ("(u)", keycode),
@@ -641,10 +627,7 @@ gboolean
 eekboard_context_is_visible (EekboardContext *context)
 {
     g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), FALSE);
-
+    return context->priv->enabled && context->priv->visible;
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->enabled && priv->visible;
 }
 
 /**
@@ -661,10 +644,7 @@ eekboard_context_set_enabled (EekboardContext *context,
                               gboolean         enabled)
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
-
+    context->priv->enabled = enabled;
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    priv->enabled = enabled;
 }
 
 /**
@@ -677,10 +657,7 @@ gboolean
 eekboard_context_is_enabled (EekboardContext *context)
 {
     g_return_val_if_fail (EEKBOARD_IS_CONTEXT(context), FALSE);
-
+    return context->priv->enabled;
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    return priv->enabled;
 }
 
 /**
@@ -697,10 +674,7 @@ eekboard_context_set_fullscreen (EekboardContext *context,
                                  GCancellable    *cancellable)
 {
     g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
-
+    if (context->priv->fullscreen != fullscreen) {
-    EekboardContextPrivate *priv = eekboard_context_get_instance_private (context);
-
-    if (priv->fullscreen != fullscreen) {
         g_dbus_proxy_call (G_DBUS_PROXY(context),
                            "SetFullscreen",
                            g_variant_new ("(b)", fullscreen),

eekboard/eekboard-context.h

@@ -28,7 +28,28 @@
 G_BEGIN_DECLS
 
 #define EEKBOARD_TYPE_CONTEXT (eekboard_context_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardContext, eekboard_context, EEKBOARD, CONTEXT, GDBusProxy)
+#define EEKBOARD_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContext))
+#define EEKBOARD_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CONTEXT, EekboardContextClass))
+#define EEKBOARD_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CONTEXT))
+#define EEKBOARD_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CONTEXT))
+#define EEKBOARD_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CONTEXT, EekboardContextClass))
+
+typedef struct _EekboardContext EekboardContext;
+typedef struct _EekboardContextClass EekboardContextClass;
+typedef struct _EekboardContextPrivate EekboardContextPrivate;
+
+/**
+ * EekboardContext:
+ *
+ * The #EekboardContext structure contains only private data and
+ * should only be accessed using the provided API.
+ */
+struct _EekboardContext {
+    /*< private >*/
+    GDBusProxy parent;
+
+    EekboardContextPrivate *priv;
+};
 
 /**
  * EekboardContextClass:

eekboard/eekboard-service.c

@@ -50,8 +50,10 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-typedef struct _EekboardServicePrivate
+#define EEKBOARD_SERVICE_GET_PRIVATE(obj)                               \
-{
+    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_SERVICE, EekboardServicePrivate))
+
+struct _EekboardServicePrivate {
     GDBusConnection *connection;
     SmPuriOSK0 *dbus_interface;
     GDBusNodeInfo *introspection_data;
@@ -59,9 +61,9 @@ typedef struct _EekboardServicePrivate
     char *object_path;
 
     EekboardContextService *context; // unowned reference
-} EekboardServicePrivate;
+};
 
-G_DEFINE_TYPE_WITH_PRIVATE (EekboardService, eekboard_service, G_TYPE_OBJECT)
+G_DEFINE_TYPE (EekboardService, eekboard_service, G_TYPE_OBJECT);
 
 static void
 eekboard_service_set_property (GObject      *object,
@@ -70,20 +72,19 @@ eekboard_service_set_property (GObject      *object,
                                GParamSpec   *pspec)
 {
     EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
     GDBusConnection *connection;
 
     switch (prop_id) {
     case PROP_OBJECT_PATH:
-        if (priv->object_path)
+        if (service->priv->object_path)
-            g_free (priv->object_path);
+            g_free (service->priv->object_path);
-        priv->object_path = g_value_dup_string (value);
+        service->priv->object_path = g_value_dup_string (value);
         break;
     case PROP_CONNECTION:
         connection = g_value_get_object (value);
-        if (priv->connection)
+        if (service->priv->connection)
-            g_object_unref (priv->connection);
+            g_object_unref (service->priv->connection);
-        priv->connection = g_object_ref (connection);
+        service->priv->connection = g_object_ref (connection);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -98,14 +99,13 @@ eekboard_service_get_property (GObject    *object,
                                GParamSpec *pspec)
 {
     EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
 
     switch (prop_id) {
     case PROP_OBJECT_PATH:
-        g_value_set_string (value, priv->object_path);
+        g_value_set_string (value, service->priv->object_path);
         break;
     case PROP_CONNECTION:
-        g_value_set_object (value, priv->connection);
+        g_value_set_object (value, service->priv->connection);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -117,22 +117,20 @@ static void
 eekboard_service_dispose (GObject *object)
 {
     EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
+    if (service->priv->connection) {
-
+        if (service->priv->registration_id > 0) {
-    if (priv->connection) {
+            g_dbus_connection_unregister_object (service->priv->connection,
-        if (priv->registration_id > 0) {
+                                                 service->priv->registration_id);
-            g_dbus_connection_unregister_object (priv->connection,
+            service->priv->registration_id = 0;
-                                                 priv->registration_id);
-            priv->registration_id = 0;
         }
 
-        g_object_unref (priv->connection);
+        g_object_unref (service->priv->connection);
-        priv->connection = NULL;
+        service->priv->connection = NULL;
     }
 
-    if (priv->introspection_data) {
+    if (service->priv->introspection_data) {
-        g_dbus_node_info_unref (priv->introspection_data);
+        g_dbus_node_info_unref (service->priv->introspection_data);
-        priv->introspection_data = NULL;
+        service->priv->introspection_data = NULL;
     }
 
     G_OBJECT_CLASS (eekboard_service_parent_class)->dispose (object);
@@ -142,9 +140,8 @@ static void
 eekboard_service_finalize (GObject *object)
 {
     EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
 
-    g_free (priv->object_path);
+    g_free (service->priv->object_path);
 
     G_OBJECT_CLASS (eekboard_service_parent_class)->finalize (object);
 }
@@ -153,13 +150,11 @@ static gboolean
 handle_set_visible(SmPuriOSK0 *object, GDBusMethodInvocation *invocation,
                    gboolean arg_visible, gpointer user_data) {
     EekboardService *service = user_data;
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
+    if (service->priv->context) {
-
-    if (priv->context) {
         if (arg_visible) {
-            eekboard_context_service_show_keyboard (priv->context);
+            eekboard_context_service_show_keyboard (service->priv->context);
         } else {
-            eekboard_context_service_hide_keyboard (priv->context);
+            eekboard_context_service_hide_keyboard (service->priv->context);
         }
     }
     sm_puri_osk0_complete_set_visible(object, invocation);
@@ -170,19 +165,18 @@ static void
 eekboard_service_constructed (GObject *object)
 {
     EekboardService *service = EEKBOARD_SERVICE(object);
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
 
-    priv->dbus_interface = sm_puri_osk0_skeleton_new();
+    service->priv->dbus_interface = sm_puri_osk0_skeleton_new();
-    sm_puri_osk0_set_visible(priv->dbus_interface, FALSE); // TODO: use actual value
+    sm_puri_osk0_set_visible(service->priv->dbus_interface, FALSE); // TODO: use actual value
-    g_signal_connect(priv->dbus_interface, "handle-set-visible",
+    g_signal_connect(service->priv->dbus_interface, "handle-set-visible",
                      G_CALLBACK(handle_set_visible), service);
 
-    if (priv->connection && priv->object_path) {
+    if (service->priv->connection && service->priv->object_path) {
         GError *error = NULL;
 
-        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(priv->dbus_interface),
+        if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(service->priv->dbus_interface),
-                                              priv->connection,
+                                              service->priv->connection,
-                                              priv->object_path,
+                                              service->priv->object_path,
                                               &error)) {
             g_warning("Error registering dbus object: %s\n", error->message);
             g_clear_error(&error);
@@ -196,6 +190,9 @@ eekboard_service_class_init (EekboardServiceClass *klass)
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
     GParamSpec *pspec;
 
+    g_type_class_add_private (gobject_class,
+                              sizeof (EekboardServicePrivate));
+
     klass->create_context = NULL;
 
     gobject_class->constructed = eekboard_service_constructed;
@@ -253,9 +250,8 @@ eekboard_service_class_init (EekboardServiceClass *klass)
 static void
 eekboard_service_init (EekboardService *self)
 {
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (self);
+    self->priv = EEKBOARD_SERVICE_GET_PRIVATE(self);
-
+    self->priv->context = NULL;
-    priv->context = NULL;
 }
 
 /**
@@ -275,9 +271,7 @@ eekboard_service_new (GDBusConnection *connection,
 
 void
 eekboard_service_set_context(EekboardService *service,
-                             EekboardContextService *context)
-{
-    EekboardServicePrivate *priv = eekboard_service_get_instance_private (service);
 
-    priv->context = context;
+                             EekboardContextService *context) {
+    service->priv->context = context;
 }

eekboard/eekboard-service.h

@@ -28,7 +28,30 @@ G_BEGIN_DECLS
 #define EEKBOARD_SERVICE_INTERFACE "sm.puri.OSK0"
 
 #define EEKBOARD_TYPE_SERVICE (eekboard_service_get_type())
-G_DECLARE_DERIVABLE_TYPE (EekboardService, eekboard_service, EEKBOARD, SERVICE, GObject)
+#define EEKBOARD_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_SERVICE, EekboardService))
+#define EEKBOARD_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_SERVICE, EekboardServiceClass))
+#define EEKBOARD_IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_SERVICE))
+#define EEKBOARD_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_SERVICE))
+#define EEKBOARD_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_SERVICE, EekboardServiceClass))
+
+typedef struct _EekboardService EekboardService;
+typedef struct _EekboardServiceClass EekboardServiceClass;
+typedef struct _EekboardServicePrivate EekboardServicePrivate;
+
+/**
+ * EekboardService:
+ *
+ * Manages DBus interaction.
+ *
+ * The #EekboardService structure contains only private data and
+ * should only be accessed using the provided API.
+ */
+struct _EekboardService {
+    /*< private >*/
+    GObject parent;
+
+    EekboardServicePrivate *priv;
+};
 
 /**
  * EekboardServiceClass:

meson.build

@@ -1,7 +1,7 @@
 project(
     'squeekboard',
     'c', 'rust',
-    version: '1.0.10',
+    version: '1.0.9',
     license: 'GPLv3',
     meson_version: '>=0.43.0',
     default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
@@ -19,12 +19,7 @@ endif
 prefix = get_option('prefix')
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
-if get_option('depdatadir') == ''
+dbusdir = join_paths(datadir, 'dbus-1/interfaces')
-  depdatadir = datadir
-else
-  depdatadir = get_option('depdatadir')
-endif
-dbusdir = join_paths(depdatadir, 'dbus-1/interfaces')
 
 subdir('data')
 subdir('protocols')

meson_options.txt

@@ -1 +0,0 @@
-option('depdatadir', type : 'string', value : '', description : 'System data path. Will be searched for definitions instead of datadir when provided')

src/meson.build

@@ -1,7 +1,7 @@
 gnome = import('gnome')
 dbus_src = gnome.gdbus_codegen(
     'sm.puri.OSK0',
-    join_paths(dbusdir, 'sm.puri.OSK0.xml')
+    '../data/dbus/sm.puri.OSK0.xml'
 )
 
 sources = [
@@ -56,16 +56,14 @@ deps = [
   dependency('xkbcommon'),
   cc.find_library('m'),
   cc.find_library('rt'),
-  cc.find_library('dl'),
-  cc.find_library('pthread'),
 #  dependency('libxklavier'), # FIXME remove
 ]
 
 # Replacement for eekboard-server
-rslib = static_library(
+rslib = library(
   'rslib',
-  sources: ['imservice.rs'],
+  sources:['imservice.rs'],
-  rust_crate_type: 'staticlib'
+  install: true
 )
 
 squeekboard = executable('squeekboard',

src/server-context-service.c

@@ -217,18 +217,16 @@ static void
 set_geometry (ServerContextService *context)
 {
     GdkScreen *screen;
-    GdkDisplay *display;
     GdkWindow *root;
-    GdkMonitor *monitor;
+    gint monitor;
     GdkRectangle rect;
     const EekKeyboard *keyboard;
     EekBounds bounds;
 
     screen = gdk_screen_get_default ();
-    root = gdk_screen_get_root_window (screen);
+    root = gtk_widget_get_root_window (context->window);
-    display = gdk_display_get_default();
+    monitor = gdk_screen_get_monitor_at_window (screen, root);
-    monitor = gdk_display_get_monitor_at_window (display, root);
+    gdk_screen_get_monitor_geometry (screen, monitor, &rect);
-    gdk_monitor_get_geometry (monitor, &rect);
     keyboard = eekboard_context_service_get_keyboard (EEKBOARD_CONTEXT_SERVICE(context));
     eek_element_get_bounds (EEK_ELEMENT(keyboard), &bounds);
 

src/server-main.c

@@ -143,40 +143,6 @@ static const struct wl_registry_listener registry_listener = {
   registry_handle_global_remove
 };
 
-#define SESSION_NAME "sm.puri.OSK0"
-
-GDBusProxy *_proxy = NULL;
-
-static void
-session_register(void) {
-    char *autostart_id = getenv("DESKTOP_AUTOSTART_ID");
-    if (!autostart_id) {
-        g_debug("No autostart id");
-        autostart_id = "";
-    }
-    GError *error = NULL;
-    _proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION,
-        G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL,
-        "org.gnome.SessionManager", "/org/gnome/SessionManager",
-        "org.gnome.SessionManager", NULL, &error);
-    if (error) {
-        g_warning("Could not connect to session manager: %s\n",
-                error->message);
-        g_clear_error(&error);
-        return;
-    }
-
-    g_dbus_proxy_call_sync(_proxy, "RegisterClient",
-        g_variant_new("(ss)", SESSION_NAME, autostart_id),
-        G_DBUS_CALL_FLAGS_NONE, 1000, NULL, &error);
-    if (error) {
-        g_warning("Could not register to session manager: %s\n",
-                error->message);
-        g_clear_error(&error);
-        return;
-    }
-}
-
 int
 main (int argc, char **argv)
 {
@@ -295,8 +261,6 @@ main (int argc, char **argv)
         }
     }
 
-    session_register();
-
     GMainLoop *loop = g_main_loop_new (NULL, FALSE);
 
     g_signal_connect (service, "destroyed", G_CALLBACK(on_destroyed), loop);