From: Axel Wagner <mail@merovius.de>
Date: Sat, 7 Aug 2010 00:22:20 +0000 (+0200)
Subject: Move font-height-calculation to the end of init_xcb()
X-Git-Tag: 4.0.1~7^2~83
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dcbf0c71d274e890fbc1ee8d9376eaf9b1d4e677;p=i3%2Fi3

Move font-height-calculation to the end of init_xcb()
---

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 055775fb..bdb1b5f5 100644
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -222,15 +222,6 @@ void init_xcb(char *fontname) {
                                       1,
                                       strlen(fontname),
                                       fontname);
-    /* FIXME: push this to the end of init_xcb() */
-    xcb_list_fonts_with_info_reply_t *reply;
-    reply = xcb_list_fonts_with_info_reply(xcb_connection,
-                                           cookie,
-                                           NULL);
-    font_height = reply->font_ascent + reply->font_descent;
-    FREE(reply);
-
-    printf("Calculated Font-height: %d\n", font_height);
 
     /* The varios Watchers to communicate with xcb */
     xcb_io = malloc(sizeof(ev_io));
@@ -247,6 +238,16 @@ void init_xcb(char *fontname) {
 
     /* Now we get the atoms and save them in a nice data-structure */
     get_atoms();
+
+    /* Now we calculate the font-height */
+    xcb_list_fonts_with_info_reply_t *reply;
+    reply = xcb_list_fonts_with_info_reply(xcb_connection,
+                                           cookie,
+                                           NULL);
+    font_height = reply->font_ascent + reply->font_descent;
+    FREE(reply);
+
+    printf("Calculated Font-height: %d\n", font_height);
 }
 
 /*