Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/config.c

diff --cc obrender/font.c
Simple merge

diff --cc obrender/render.h
Simple merge

diff --cc obrender/theme.c
Simple merge

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/actions/resize.c
Simple merge

diff --cc openbox/client_menu.c
Simple merge

diff --cc openbox/config.c
index e5e9269b20b67470210ac3e218905f82d014b922,dad5d1bf95d36ee63a5b5fd4c91c13a3143f20af..8fd2dc09db0b194dc589fcb66f94f8634e1384cd
--- 1/openbox/config.c
--- 2/openbox/config.c
+++ b/openbox/config.c
@@@ -774,15 -773,6 +778,12 @@@ static void parse_theme(xmlNodePtr node
  
          *font = RrFontOpen(ob_rr_inst, name, size, weight, slant);
          g_free(name);
- 
-     next_font:
-         n = obt_xml_find_node(n->next, "font");
 +
 +        if ((fnode = obt_xml_find_node(n->children, "description"))) {
 +            gchar *s = obt_xml_node_string(fnode);
 +            RrFontDescriptionFromString(*font, s);
 +            g_free(s);
 +        }
      }
  }
  

diff --cc openbox/config.h
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/frame.h
Simple merge

diff --cc openbox/keyboard.c
Simple merge

diff --cc openbox/menu.h
Simple merge

diff --cc openbox/menuframe.c
Simple merge

diff --cc openbox/mouse.c
Simple merge

diff --cc openbox/openbox.c
index 06a13b408e7803fc7cdc4c22320e208353f89678,1671a0d39b69de2d1ef706125d2236ba89108180..7b0c60fda886852331188b4387e7b726efeb97e8
--- 1/openbox/openbox.c
--- 2/openbox/openbox.c
+++ b/openbox/openbox.c
@@@ -364,14 -327,13 +364,14 @@@ gint main(gint argc, gchar **argv
              mouse_startup(reconfigure);
              menu_frame_startup(reconfigure);
              menu_startup(reconfigure);
 +            edges_startup(reconfigure);
              prompt_startup(reconfigure);
  
-             /* do this after everything is started so no events will get
-                missed */
-             xqueue_listen();
- 
              if (!reconfigure) {
+                 /* do this after everything is started so no events will get
+                    missed */
+                 xqueue_listen();
+ 
                  guint32 xid;
                  ObWindow *w;