[metacity] theme: move meta_theme_load from theme-parser.h to theme.h
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: move meta_theme_load from theme-parser.h to theme.h
- Date: Sun, 17 Jan 2016 18:19:29 +0000 (UTC)
commit 20591c6f7399d19e79ce9b9a7cae519526198ca4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Jan 17 15:56:50 2016 +0200
theme: move meta_theme_load from theme-parser.h to theme.h
src/Makefile.am | 3 ---
src/ui/theme-parser.c | 2 +-
src/ui/theme-parser.h | 30 ------------------------------
src/ui/theme-viewer.c | 1 -
src/ui/theme.c | 1 -
src/ui/theme.h | 3 +++
6 files changed, 4 insertions(+), 36 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 64efed9..fd8ed46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,7 +113,6 @@ metacity_SOURCES= \
ui/tile-preview.c \
include/tile-preview.h \
ui/theme-parser.c \
- ui/theme-parser.h \
ui/theme.c \
ui/theme.h \
ui/ui.c \
@@ -133,7 +132,6 @@ libmetacity_private_la_SOURCES = \
ui/preview-widget.c \
ui/preview-widget.h \
ui/theme-parser.c \
- ui/theme-parser.h \
ui/theme.c \
ui/theme.h \
$(NULL)
@@ -149,7 +147,6 @@ libmetacityinclude_HEADERS = \
include/util.h \
include/common.h \
ui/preview-widget.h \
- ui/theme-parser.h \
ui/theme.h
metacity_theme_viewer_SOURCES= \
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 8704269..3c461b0 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -20,7 +20,7 @@
*/
#include <config.h>
-#include "theme-parser.h"
+#include "theme.h"
#include "util.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index 80cbf03..7d4b5d4 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -22,7 +22,6 @@
#include <config.h>
#include "util.h"
#include "theme.h"
-#include "theme-parser.h"
#include "preview-widget.h"
#include <gtk/gtk.h>
#include <time.h>
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 1a6cf1a..8b6ece2 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -52,7 +52,6 @@
#include <config.h>
#include "theme.h"
-#include "theme-parser.h"
#include "util.h"
#include "gradient.h"
#include <gtk/gtk.h>
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 94a5b28..0992560 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -1004,6 +1004,9 @@ GdkPixbuf* meta_theme_load_image (MetaTheme *theme,
guint size_of_theme_icons,
GError **error);
+MetaTheme* meta_theme_load (const char *theme_name,
+ GError **err);
+
void meta_theme_set_composited (MetaTheme *theme,
gboolean composited);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]