From: Mikael Magnusson <mikachu@gmail.com>
Date: Thu, 6 Nov 2014 03:51:26 +0000 (+0100)
Subject: Merge branch 'work' into wip/mikabox
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e72aa3e6865776c131eab2e77c8c4d7269bbdef2;p=mikachu%2Fopenbox.git

Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/config.c
---

e72aa3e6865776c131eab2e77c8c4d7269bbdef2
diff --cc openbox/config.c
index e5e9269b,dad5d1bf..8fd2dc09
--- a/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);
 +
 +        if ((fnode = obt_xml_find_node(n->children, "description"))) {
 +            gchar *s = obt_xml_node_string(fnode);
 +            RrFontDescriptionFromString(*font, s);
 +            g_free(s);
 +        }
- 
-     next_font:
-         n = obt_xml_find_node(n->next, "font");
      }
  }
  
diff --cc openbox/openbox.c
index 06a13b40,1671a0d3..7b0c60fd
--- a/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;