From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 30 Mar 2010 11:09:00 +0000 (+0200)
Subject: resolve merge conflict
X-Git-Tag: 3.e~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=66d862474e70f116f6f777ac25d97fc3a62f0c01;p=i3%2Fi3

resolve merge conflict
---

diff --git a/src/workspace.c b/src/workspace.c
index 6da6034b..c950df8f 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -475,31 +475,3 @@ int workspace_height(Workspace *ws) {
 
         return height;
 }
-
-/*
- * Returns the width of the workspace.
- *
- */
-int workspace_width(Workspace *ws) {
-        return ws->rect.width;
-}
-
-/*
- * Returns the effective height of the workspace (without the internal bar and
- * without dock clients).
- *
- */
-int workspace_height(Workspace *ws) {
-        int height = ws->rect.height;
-        i3Font *font = load_font(global_conn, config.font);
-
-        /* Reserve space for dock clients */
-        Client *client;
-        SLIST_FOREACH(client, &(ws->screen->dock_clients), dock_clients)
-                height -= client->desired_height;
-
-        /* Space for the internal bar */
-        height -= (font->height + 6);
-
-        return height;
-}