summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/theme-parser.c40
-rw-r--r--src/ui/theme.h2
-rw-r--r--src/ui/ui.c13
3 files changed, 4 insertions, 51 deletions
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 7cafae0..71559f1 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -72,9 +72,8 @@ typedef enum
STATE_FRAME,
/* assigning style sets to windows */
STATE_WINDOW,
- /* and menu icons */
+ /* things we don't use any more but we can still parse: */
STATE_MENU_ICON,
- /* fallback icons */
STATE_FALLBACK
} ParseState;
@@ -1218,40 +1217,9 @@ parse_toplevel_element (GMarkupParseContext *context,
}
else if (ELEMENT_IS ("fallback"))
{
- const char *icon = NULL;
- const char *mini_icon = NULL;
-
- if (!locate_attributes (context, element_name, attribute_names, attribute_values,
- error,
- "icon", &icon,
- "mini_icon", &mini_icon,
- NULL))
- return;
-
- if (icon)
- {
- if (info->theme->fallback_icon != NULL)
- {
- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Theme already has a fallback icon"));
- return;
- }
-
- info->theme->fallback_icon = meta_theme_load_image(info->theme, icon, 64, error);
- }
-
- if (mini_icon)
- {
- if (info->theme->fallback_mini_icon != NULL)
- {
- set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
- _("Theme already has a fallback mini_icon"));
- return;
- }
-
- info->theme->fallback_mini_icon = meta_theme_load_image(info->theme, mini_icon, 16, error);
- }
-
+ /* Not supported any more, but we have to parse it if they include it,
+ * for backwards compatibility.
+ */
push_state (info, STATE_FALLBACK);
}
else
diff --git a/src/ui/theme.h b/src/ui/theme.h
index be6114f..2d48b08 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -805,8 +805,6 @@ struct _MetaTheme
GHashTable *style_sets_by_name;
MetaFrameStyleSet *style_sets_by_type[META_FRAME_TYPE_LAST];
- GdkPixbuf *fallback_icon, *fallback_mini_icon;
-
GQuark quark_width;
GQuark quark_height;
GQuark quark_object_width;
diff --git a/src/ui/ui.c b/src/ui/ui.c
index ca0affc..b72f114 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -997,16 +997,3 @@ meta_ui_get_pixbuf_from_pixmap (Pixmap pmap)
return pixbuf;
}
-
-void
-meta_ui_get_fallback_icons (GdkPixbuf **fallback_icon_p,
- GdkPixbuf **fallback_mini_icon_p)
-{
- MetaTheme *theme = meta_theme_get_current ();
-
- if (fallback_icon_p)
- *fallback_icon_p = theme->fallback_icon;
-
- if (fallback_mini_icon_p)
- *fallback_mini_icon_p = theme->fallback_mini_icon;
-}