[metacity] theme: make meta_frame_state_from_string static
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] theme: make meta_frame_state_from_string static
- Date: Thu, 28 Jan 2016 09:18:37 +0000 (UTC)
commit d100b61970dcdd4a0a87225e485b19c1309cad9d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Jan 24 01:28:48 2016 +0200
theme: make meta_frame_state_from_string static
src/ui/theme-parser.c | 23 +++++++++++++++++++++++
src/ui/theme-private.h | 1 -
src/ui/theme.c | 23 -----------------------
3 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 3eb9461..fd7b723 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -2867,6 +2867,29 @@ parse_style_element (GMarkupParseContext *context,
}
}
+static MetaFrameState
+meta_frame_state_from_string (const char *str)
+{
+ if (strcmp ("normal", str) == 0)
+ return META_FRAME_STATE_NORMAL;
+ else if (strcmp ("maximized", str) == 0)
+ return META_FRAME_STATE_MAXIMIZED;
+ else if (strcmp ("tiled_left", str) == 0)
+ return META_FRAME_STATE_TILED_LEFT;
+ else if (strcmp ("tiled_right", str) == 0)
+ return META_FRAME_STATE_TILED_RIGHT;
+ else if (strcmp ("shaded", str) == 0)
+ return META_FRAME_STATE_SHADED;
+ else if (strcmp ("maximized_and_shaded", str) == 0)
+ return META_FRAME_STATE_MAXIMIZED_AND_SHADED;
+ else if (strcmp ("tiled_left_and_shaded", str) == 0)
+ return META_FRAME_STATE_TILED_LEFT_AND_SHADED;
+ else if (strcmp ("tiled_right_and_shaded", str) == 0)
+ return META_FRAME_STATE_TILED_RIGHT_AND_SHADED;
+ else
+ return META_FRAME_STATE_LAST;
+}
+
static void
parse_style_set_element (GMarkupParseContext *context,
const gchar *element_name,
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index 6b3829c..32e1932 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);
-MetaFrameState meta_frame_state_from_string (const char *str);
const char *meta_frame_state_to_string (MetaFrameState state);
MetaFrameResize meta_frame_resize_from_string (const char *str);
const char *meta_frame_resize_to_string (MetaFrameResize resize);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index e59fb52..ee968e2 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6619,29 +6619,6 @@ meta_pango_font_desc_get_text_height (const PangoFontDescription *font_desc,
return retval;
}
-MetaFrameState
-meta_frame_state_from_string (const char *str)
-{
- if (strcmp ("normal", str) == 0)
- return META_FRAME_STATE_NORMAL;
- else if (strcmp ("maximized", str) == 0)
- return META_FRAME_STATE_MAXIMIZED;
- else if (strcmp ("tiled_left", str) == 0)
- return META_FRAME_STATE_TILED_LEFT;
- else if (strcmp ("tiled_right", str) == 0)
- return META_FRAME_STATE_TILED_RIGHT;
- else if (strcmp ("shaded", str) == 0)
- return META_FRAME_STATE_SHADED;
- else if (strcmp ("maximized_and_shaded", str) == 0)
- return META_FRAME_STATE_MAXIMIZED_AND_SHADED;
- else if (strcmp ("tiled_left_and_shaded", str) == 0)
- return META_FRAME_STATE_TILED_LEFT_AND_SHADED;
- else if (strcmp ("tiled_right_and_shaded", str) == 0)
- return META_FRAME_STATE_TILED_RIGHT_AND_SHADED;
- else
- return META_FRAME_STATE_LAST;
-}
-
const char*
meta_frame_state_to_string (MetaFrameState state)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]