[metacity] theme: make meta_button_state_from_string static
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: make meta_button_state_from_string static
- Date: Thu, 28 Jan 2016 09:18:12 +0000 (UTC)
commit 1915ea36de1a09ce3bfeaeba4064fdd2ea02c7d0
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Jan 24 01:22:05 2016 +0200
theme: make meta_button_state_from_string static
src/ui/theme-parser.c | 13 +++++++++++++
src/ui/theme-private.h | 1 -
src/ui/theme.c | 13 -------------
3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index f653538..0625b91 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -2624,6 +2624,19 @@ parse_gradient_element (GMarkupParseContext *context,
}
}
+static MetaButtonState
+meta_button_state_from_string (const char *str)
+{
+ if (strcmp ("normal", str) == 0)
+ return META_BUTTON_STATE_NORMAL;
+ else if (strcmp ("pressed", str) == 0)
+ return META_BUTTON_STATE_PRESSED;
+ else if (strcmp ("prelight", str) == 0)
+ return META_BUTTON_STATE_PRELIGHT;
+ else
+ return META_BUTTON_STATE_LAST;
+}
+
static void
parse_style_element (GMarkupParseContext *context,
const gchar *element_name,
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index 878051a..a7dfa25 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -874,7 +874,6 @@ gboolean meta_theme_lookup_color_constant (MetaTheme
const char *name,
char **value);
-MetaButtonState meta_button_state_from_string (const char *str);
const char *meta_button_state_to_string (MetaButtonState state);
MetaButtonType meta_button_type_from_string (const char *str,
MetaTheme *theme);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 067c2bd..68cc607 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6547,19 +6547,6 @@ meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
return retval;
}
-MetaButtonState
-meta_button_state_from_string (const char *str)
-{
- if (strcmp ("normal", str) == 0)
- return META_BUTTON_STATE_NORMAL;
- else if (strcmp ("pressed", str) == 0)
- return META_BUTTON_STATE_PRESSED;
- else if (strcmp ("prelight", str) == 0)
- return META_BUTTON_STATE_PRELIGHT;
- else
- return META_BUTTON_STATE_LAST;
-}
-
const char*
meta_button_state_to_string (MetaButtonState state)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]