summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-21 14:46:52 -0400
committerraveit65 <[email protected]>2019-06-16 18:12:44 +0200
commit687423bb3ed807ff1bd638e9dd71fb3a7045ebd1 (patch)
treeaf6f963ccef4c41834445cea44bcdb763d70890e
parent394526ea77d79c7092dbb4050d168a87d73ef94c (diff)
downloadmarco-687423bb3ed807ff1bd638e9dd71fb3a7045ebd1.tar.bz2
marco-687423bb3ed807ff1bd638e9dd71fb3a7045ebd1.tar.xz
remove common.c
upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/96d7a662
-rw-r--r--src/Makefile.am1
-rw-r--r--src/core/common.c34
-rw-r--r--src/core/frame.c9
3 files changed, 9 insertions, 35 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e664187..f829456b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,6 @@ libmarco_private_la_SOURCES= \
core/workspace.h \
core/xprops.c \
include/xprops.h \
- core/common.c \
include/common.h \
include/core.h \
include/ui.h \
diff --git a/src/core/common.c b/src/core/common.c
deleted file mode 100644
index c7fe1012..00000000
--- a/src/core/common.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity X window decorations */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- * Copyright (C) 2003, 2004 Red Hat, Inc.
- * Copyright (C) 2005 Elijah Newren
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include "common.h"
-
-void
-meta_frame_borders_clear (MetaFrameBorders *self)
-{
- self->visible.top = 0;
- self->visible.bottom = 0;
- self->visible.left = 0;
- self->visible.right = 0;
-}
diff --git a/src/core/frame.c b/src/core/frame.c
index 070fee79..25f83ceb 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -299,6 +299,15 @@ meta_frame_get_flags (MetaFrame *frame)
}
void
+meta_frame_borders_clear (MetaFrameBorders *self)
+{
+ self->visible.top = 0;
+ self->visible.bottom = 0;
+ self->visible.left = 0;
+ self->visible.right = 0;
+}
+
+void
meta_frame_calc_borders (MetaFrame *frame,
MetaFrameBorders *borders)
{