Merge branch 'backport' into work

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index cf1bc55f33c430b345f9797205e12277b4fd08a9..ade18d04c6d52a8e72735155e36c811753dff233 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -89,7 +89,7 @@ static void set_curpos(KeyBindingTree *newpos)
             g_free(oldtext);
         }
 
-        a = screen_physical_area_active();
+        a = screen_physical_area_primary();
         popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10);
         /* 1 second delay for the popup to show */
         popup_delay_show(popup, G_USEC_PER_SEC, text);
@@ -277,7 +277,6 @@ static void node_rebind(KeyBindingTree *node)
     }
     else {
         /* for leaf nodes, rebind each action assigned to it */
-        GSList *it;
         while (node->actions) {
             /* add each action, and remove them from the original tree so
                they don't get free'd on us */
@@ -323,4 +322,3 @@ void keyboard_shutdown(gboolean reconfig)
     popup_free(popup);
     popup = NULL;
 }
-