make the obt library branch compile again with all the changes merged in from backport

4 files changed, 9 insertions, 9 deletions

diff --git a/obt/keyboard.c b/obt/keyboard.c
index 397504fb..a93c07d0 100644
--- a/obt/keyboard.c
+++ b/obt/keyboard.c
@@ -197,7 +197,7 @@ KeyCode obt_keyboard_keysym_to_keycode(KeySym sym)
     return 0;
 }
 
-const gchar *obt_keyboard_keycode_to_string(guint keycode)
+gchar *obt_keyboard_keycode_to_string(guint keycode)
 {
     KeySym sym;
     const gchar *ret = NULL;
@@ -211,7 +211,7 @@ gunichar obt_keyboard_keycode_to_unichar(guint keycode)
 {
     gunichar unikey = 0;
 
-    const char *key;
+    char *key;
     if ((key = obt_keyboard_keycode_to_string(keycode)) != NULL &&
         /* don't accept keys that aren't a single letter, like "space" */
         key[1] == '\0')
diff --git a/obt/keyboard.h b/obt/keyboard.h
index bfe0e925..a9029df3 100644
--- a/obt/keyboard.h
+++ b/obt/keyboard.h
@@ -59,7 +59,7 @@ guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key);
 KeyCode obt_keyboard_keysym_to_keycode(KeySym sym);
 
 /*! Give the string form of a KeyCode */
-const gchar *obt_keyboard_keycode_to_string(guint keycode);
+gchar *obt_keyboard_keycode_to_string(guint keycode);
 
 /*! Translate a KeyCode to the unicode character it represents */
 gunichar obt_keyboard_keycode_to_unichar(guint keycode);
diff --git a/obt/mainloop.c b/obt/mainloop.c
index f6f2fa07..64972dd7 100644
--- a/obt/mainloop.c
+++ b/obt/mainloop.c
@@ -536,7 +536,7 @@ static void insert_timer(ObtMainLoop *loop, ObtMainLoopTimer *ins)
 {
     GSList *it;
     for (it = loop->timers; it; it = g_slist_next(it)) {
-        ObMainLoopTimer *t = it->data;
+        ObtMainLoopTimer *t = it->data;
         if (timecompare(&ins->timeout, &t->timeout) <= 0) {
             loop->timers = g_slist_insert_before(loop->timers, it, ins);
             break;
@@ -553,7 +553,7 @@ void obt_main_loop_timeout_add(ObtMainLoop *loop,
                                GEqualFunc cmp,
                                GDestroyNotify notify)
 {
-    ObMainLoopTimer *t = g_new(ObMainLoopTimer, 1);
+    ObtMainLoopTimer *t = g_new(ObtMainLoopTimer, 1);
 
     g_assert(microseconds > 0); /* if it's 0 it'll cause an infinite loop */
 
diff --git a/obt/prop.h b/obt/prop.h
index 55a36793..4de3111d 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -267,10 +267,10 @@ void obt_prop_message_to(Window to, Window about, Atom messagetype,
                       data0, data1, data2, data3, data4, \
                       SubstructureNotifyMask | SubstructureRedirectMask))
 
-#define OBT_PROP_MSG(to, about, msgtype, data0, data1, data2, data3, \
-                     data4, mask) \
-    (obt_prop_message_to(to, OBT_PROP_ATOM(msgtype), \
-                      data0, data1, data2, data3, data4, mask))
+#define OBT_PROP_MSG_TO(to, about, msgtype, data0, data1, data2, data3, \
+                        data4, mask) \
+    (obt_prop_message_to(to, about, OBT_PROP_ATOM(msgtype), \
+                         data0, data1, data2, data3, data4, mask))
 
 G_END_DECLS