X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu_render.c;h=60f02976e1350c9f41115bb126563a03eb98fc96;hb=4cd886e5188549ab48a11b70cb40b65efe916b6c;hp=d5342534bc8b339e8b87d9021b7c602743d346f7;hpb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;p=chaz%2Fopenbox

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index d5342534..60f02976 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -1,20 +1,11 @@
 /* Functions for default rendering of menus. Might become pluginnable */
 
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "render/theme.h"
 
-void menu_render_full(ObMenu *self);
-
 void menu_render(ObMenu *self) {
-    if (self->update) {
-        self->update(self);
-    } else if (self->invalid) {
-        menu_render_full(self);
-    }
-}
-
-void menu_render_full(ObMenu *self) {
     GList *it;
     int items_h = 0;
     int nitems = 0; /* each item, only one is used */
@@ -125,15 +116,10 @@ void menu_entry_render(ObMenuEntry *self)
 	break;
 
     default:
-	g_message("unhandled render_type");
-	a = !self->enabled ? self->a_disabled :
-        (self->hilite && 
-         (self->action ||
-          self->render_type == OB_MENU_ENTRY_RENDER_TYPE_SUBMENU) ? 
-         self->a_hilite : self->a_item);
+	g_assert_not_reached(); /* unhandled rendering type */
 	break;
     }
-    g_message ("%s %d", self->label, self->hilite);
+    ob_debug("%s %d\n", self->label, self->hilite);
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);