formatting, add an assert

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 5184f835906570ada62ed73d1cd320fbdf1c1457..95168d4e7ea908af1d3f947c3ded8044d4719191 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menuframe.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
@@ -184,7 +184,7 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y)
 
 void menu_frame_move_on_screen(ObMenuFrame *self)
 {
-    Rect *a;
+    Rect *a = NULL;
     guint i;
     gint dx = 0, dy = 0;
     gint pos, half;
@@ -767,12 +767,8 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
 
         if (func)
             func(entry, state, data);
-        else {
-            GSList *it;
-
-            for (it = acts; it; it = g_slist_next(it))
-                action_run(it->data, client, state);
-        }
+        else
+            action_run(acts, client, state);
     }
 }