From 8d113709ecf09bfccf80572f863b196957d1b481 Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Tue, 21 May 2019 14:46:52 -0400
Subject: remove common.c

upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/96d7a662
---
 src/Makefile.am   |  1 -
 src/core/common.c | 34 ----------------------------------
 src/core/frame.c  |  9 +++++++++
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 src/core/common.c

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 455e846a..5da756a6 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
@@ -298,6 +298,15 @@ meta_frame_get_flags (MetaFrame *frame)
   return flags;
 }
 
+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)
-- 
cgit v1.2.1