X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Finput.c;h=c54fe8bf68f4ba1802687d5c3fc0c6a0aedc3f1f;hb=e4a75256e901a89729c48fcc2f9229cd0cfe9124;hp=3a4babf2dedf24e5f63f1e7254bb3bf5b57a9c3b;hpb=81becb22fdc69e406c685c65b9f55fd514df142b;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/input.c b/libchimara/input.c
index 3a4babf..c54fe8b 100644
--- a/libchimara/input.c
+++ b/libchimara/input.c
@@ -143,10 +143,7 @@ text_grid_request_line_event_common(winid_t win, glui32 maxlen, gboolean insert,
 	gtk_entry_set_has_frame(GTK_ENTRY(win->input_entry), FALSE);
 	GtkBorder border = { 0, 0, 0, 0 };
 
-	/* COMPAT: */
-#if GTK_CHECK_VERSION(2,10,0)
 	gtk_entry_set_inner_border(GTK_ENTRY(win->input_entry), &border);
-#endif
     gtk_entry_set_max_length(GTK_ENTRY(win->input_entry), win->input_length);
     gtk_entry_set_width_chars(GTK_ENTRY(win->input_entry), win->input_length);
 
@@ -444,10 +441,10 @@ on_shutdown_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win)
 		g_node_traverse(priv->root_window, G_IN_ORDER, G_TRAVERSE_LEAVES, -1, (GNodeTraverseFunc)turn_off_handler, NULL);
 	
 	/* Signal the Glk library that it can shut everything down now */
-	g_mutex_lock(priv->shutdown_lock);
-	g_cond_signal(priv->shutdown_key_pressed);
-	g_mutex_unlock(priv->shutdown_lock);
-	
+	g_mutex_lock(&priv->shutdown_lock);
+	g_cond_signal(&priv->shutdown_key_pressed);
+	g_mutex_unlock(&priv->shutdown_lock);
+
 	return TRUE; /* block the event */
 }