[metacity] theme: make meta_image_fill_type_from_string static
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: make meta_image_fill_type_from_string static
- Date: Thu, 28 Jan 2016 09:19:28 +0000 (UTC)
commit ecb1b134dfcecc38d1590e18807dc8da761885ab
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Jan 24 11:35:14 2016 +0200
theme: make meta_image_fill_type_from_string static
src/ui/theme-parser.c | 18 ++++++++++++++++++
src/ui/theme-private.h | 1 -
src/ui/theme.c | 18 ------------------
3 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 1bc0d7b..6e93b01 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -1643,6 +1643,24 @@ meta_gtk_arrow_from_string (const char *str)
return -1;
}
+/**
+ * Returns a fill_type from a string. The inverse of
+ * meta_image_fill_type_to_string().
+ *
+ * \param str a string representing a fill_type
+ * \result the fill_type, or -1 if it represents no fill_type.
+ */
+static MetaImageFillType
+meta_image_fill_type_from_string (const char *str)
+{
+ if (strcmp ("tile", str) == 0)
+ return META_IMAGE_FILL_TILE;
+ else if (strcmp ("scale", str) == 0)
+ return META_IMAGE_FILL_SCALE;
+ else
+ return -1;
+}
+
static void
parse_draw_op_element (GMarkupParseContext *context,
const gchar *element_name,
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index 7187c5b..0e3b953 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -875,7 +875,6 @@ gboolean meta_theme_lookup_color_constant (MetaTheme
char **value);
GtkStateFlags meta_gtk_state_from_string (const char *str);
-MetaImageFillType meta_image_fill_type_from_string (const char *str);
PangoFontDescription *meta_gtk_widget_get_font_desc (GtkWidget *widget,
double scale,
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 164c8ed..329ad80 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6762,24 +6762,6 @@ meta_gtk_state_from_string (const char *str)
}
/**
- * Returns a fill_type from a string. The inverse of
- * meta_image_fill_type_to_string().
- *
- * \param str a string representing a fill_type
- * \result the fill_type, or -1 if it represents no fill_type.
- */
-MetaImageFillType
-meta_image_fill_type_from_string (const char *str)
-{
- if (strcmp ("tile", str) == 0)
- return META_IMAGE_FILL_TILE;
- else if (strcmp ("scale", str) == 0)
- return META_IMAGE_FILL_SCALE;
- else
- return -1;
-}
-
-/**
* Takes a colour "a", scales the lightness and saturation by a certain amount,
* and sets "b" to the resulting colour.
* gtkstyle.c cut-and-pastage.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]