summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-06-07 14:56:39 +0300
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-06-07 14:56:39 +0300
commit5f52959349ff23fd807a16ba79a7187decfee962 (patch)
tree3f7b398bf6c59c39062ebb64a5ef442bfd6e2040
parentd274c718b965a978c33a171092577d1bc4250ec2 (diff)
downloadmetacity-5f52959349ff23fd807a16ba79a7187decfee962.tar.gz
libmetacity: don't expose meta_frame_type_from_string
-rw-r--r--libmetacity/meta-theme-metacity.c21
-rw-r--r--libmetacity/meta-theme.c21
-rw-r--r--libmetacity/meta-theme.h2
3 files changed, 21 insertions, 23 deletions
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index f91ace12..06aadc0f 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -908,6 +908,27 @@ meta_theme_metacity_insert_style_set (MetaThemeMetacity *metacity,
g_hash_table_replace (metacity->style_sets, g_strdup (name), style_set);
}
+static MetaFrameType
+meta_frame_type_from_string (const gchar *str)
+{
+ if (strcmp ("normal", str) == 0)
+ return META_FRAME_TYPE_NORMAL;
+ else if (strcmp ("dialog", str) == 0)
+ return META_FRAME_TYPE_DIALOG;
+ else if (strcmp ("modal_dialog", str) == 0)
+ return META_FRAME_TYPE_MODAL_DIALOG;
+ else if (strcmp ("utility", str) == 0)
+ return META_FRAME_TYPE_UTILITY;
+ else if (strcmp ("menu", str) == 0)
+ return META_FRAME_TYPE_MENU;
+ else if (strcmp ("border", str) == 0)
+ return META_FRAME_TYPE_BORDER;
+ else if (strcmp ("attached", str) == 0)
+ return META_FRAME_TYPE_ATTACHED;
+ else
+ return META_FRAME_TYPE_LAST;
+}
+
static void
parse_toplevel_element (GMarkupParseContext *context,
const gchar *element_name,
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index 57ea2816..69c37d15 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -542,27 +542,6 @@ meta_theme_set_titlebar_font (MetaTheme *theme,
g_hash_table_remove_all (theme->title_heights);
}
-MetaFrameType
-meta_frame_type_from_string (const gchar *str)
-{
- if (strcmp ("normal", str) == 0)
- return META_FRAME_TYPE_NORMAL;
- else if (strcmp ("dialog", str) == 0)
- return META_FRAME_TYPE_DIALOG;
- else if (strcmp ("modal_dialog", str) == 0)
- return META_FRAME_TYPE_MODAL_DIALOG;
- else if (strcmp ("utility", str) == 0)
- return META_FRAME_TYPE_UTILITY;
- else if (strcmp ("menu", str) == 0)
- return META_FRAME_TYPE_MENU;
- else if (strcmp ("border", str) == 0)
- return META_FRAME_TYPE_BORDER;
- else if (strcmp ("attached", str) == 0)
- return META_FRAME_TYPE_ATTACHED;
- else
- return META_FRAME_TYPE_LAST;
-}
-
void
meta_theme_get_frame_borders (MetaTheme *theme,
const gchar *variant,
diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h
index b06370db..9074db41 100644
--- a/libmetacity/meta-theme.h
+++ b/libmetacity/meta-theme.h
@@ -160,8 +160,6 @@ void meta_theme_set_composited (MetaTheme *theme,
void meta_theme_set_titlebar_font (MetaTheme *theme,
const PangoFontDescription *titlebar_font);
-MetaFrameType meta_frame_type_from_string (const gchar *str);
-
void meta_theme_get_frame_borders (MetaTheme *theme,
const gchar *variant,
MetaFrameType type,