ui: We now always have a theme

This commit is contained in:
Jasper St. Pierre 2014-12-31 21:33:54 -08:00
parent af7f51b992
commit b47afe89d3
2 changed files with 20 additions and 35 deletions

View File

@ -531,8 +531,6 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
const PangoFontDescription *font_desc; const PangoFontDescription *font_desc;
PangoFontDescription *free_font_desc = NULL; PangoFontDescription *free_font_desc = NULL;
if (meta_ui_have_a_theme ())
{
GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay); GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay);
GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen)); GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen));
@ -555,22 +553,11 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
if (free_font_desc) if (free_font_desc)
pango_font_description_free (free_font_desc); pango_font_description_free (free_font_desc);
}
else
{
meta_frame_borders_clear (borders);
}
if (style_info != NULL) if (style_info != NULL)
meta_style_info_unref (style_info); meta_style_info_unref (style_info);
} }
gboolean
meta_ui_have_a_theme (void)
{
return meta_theme_get_default () != NULL;
}
gboolean gboolean
meta_ui_window_is_widget (MetaUI *ui, meta_ui_window_is_widget (MetaUI *ui,
Window xwindow) Window xwindow)

View File

@ -104,8 +104,6 @@ void meta_ui_repaint_frame (MetaUI *ui,
gboolean meta_ui_window_should_not_cause_focus (Display *xdisplay, gboolean meta_ui_window_should_not_cause_focus (Display *xdisplay,
Window xwindow); Window xwindow);
gboolean meta_ui_have_a_theme (void);
gboolean meta_ui_window_is_widget (MetaUI *ui, gboolean meta_ui_window_is_widget (MetaUI *ui,
Window xwindow); Window xwindow);
gboolean meta_ui_window_is_dummy (MetaUI *ui, gboolean meta_ui_window_is_dummy (MetaUI *ui,