remove libmetacity-private

7 files changed, 4 insertions, 95 deletions

diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 365f50be..ff7ed1c4 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -26,9 +26,9 @@
 #include "config.h"
 
 #include <libmetacity/meta-color.h>
+#include <libmetacity/meta-theme.h>
 
 #include "draw-workspace.h"
-#include "theme.h"
 
 static void
 get_window_rect (const WnckWindowDisplayInfo *win,
diff --git a/src/ui/frames.h b/src/ui/frames.h
index 77adb609..2396b02b 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <libmetacity/meta-theme.h>
 #include "common.h"
-#include "theme.h"
 
 typedef enum
 {
diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h
index b59e231b..c81aee76 100644
--- a/src/ui/preview-widget.h
+++ b/src/ui/preview-widget.h
@@ -19,8 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "theme.h"
 #include <gtk/gtk.h>
+#include <libmetacity/meta-theme.h>
 
 #ifndef META_PREVIEW_WIDGET_H
 #define META_PREVIEW_WIDGET_H
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 6ad67410..8db9aef5 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "util.h"
-#include "theme.h"
 #include "preview-widget.h"
 #include <gtk/gtk.h>
 #include <time.h>
diff --git a/src/ui/theme.c b/src/ui/theme.c
deleted file mode 100644
index f59a263b..00000000
--- a/src/ui/theme.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity Theme Rendering */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- *
- * 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/>.
- */
-
-/**
- * \file theme.c    Making Metacity look pretty
- *
- * The window decorations drawn by Metacity are described by files on disk
- * known internally as "themes" (externally as "window border themes" on
- * http://art.gnome.org/themes/metacity/ or "Metacity themes"). This file
- * contains most of the code necessary to support themes; it does not
- * contain the XML parser, which is in theme-parser.c.
- *
- * \bug This is a big file with lots of different subsystems, which might
- * be better split out into separate files.
- */
-
-/**
- * \defgroup tokenizer   The theme expression tokenizer
- *
- * Themes can use a simple expression language to represent the values of
- * things. This is the tokeniser used for that language.
- *
- * \bug We could remove almost all this code by using GScanner instead,
- * but we would also have to find every expression in every existing theme
- * we could and make sure the parse trees were the same.
- */
-
-/**
- * \defgroup parser  The theme expression parser
- *
- * Themes can use a simple expression language to represent the values of
- * things. This is the parser used for that language.
- */
-
-#include <config.h>
-#include "theme.h"
-#include "util.h"
-#include <gtk/gtk.h>
-#include <libmetacity/meta-color.h>
-#include <string.h>
-#include <stdlib.h>
-#define __USE_XOPEN
-#include <stdarg.h>
-#include <math.h>
diff --git a/src/ui/theme.h b/src/ui/theme.h
deleted file mode 100644
index 97c97af3..00000000
--- a/src/ui/theme.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity Theme Rendering */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- *
- * 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/>.
- */
-
-#ifndef THEME_H
-#define THEME_H
-
-#include <gtk/gtk.h>
-#include <libmetacity/meta-theme.h>
-
-#endif
diff --git a/src/ui/ui.c b/src/ui/ui.c
index eb25cb9f..feb91d60 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -25,11 +25,11 @@
 #include "util.h"
 #include "menu.h"
 #include "core.h"
-#include "theme.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <cairo-xlib.h>
+#include <libmetacity/meta-theme.h>
 
 static void meta_ui_accelerator_parse (const char      *accel,
                                        guint           *keysym,