From: Dana Jansens Date: Sun, 3 Jun 2007 22:58:33 +0000 (+0000) Subject: missed merge X-Git-Tag: release-3.4.3~120 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c4662965ab62c5ee95d9cb1676ad835e51082290;p=dana%2Fopenbox.git missed merge --- diff --git a/render/theme.c b/render/theme.c index 6f167f2c..c22c1445 100644 --- a/render/theme.c +++ b/render/theme.c @@ -46,7 +46,7 @@ static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); -RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, +RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font, diff --git a/render/theme.h b/render/theme.h index 97f2adfc..e02a69e2 100644 --- a/render/theme.h +++ b/render/theme.h @@ -237,7 +237,7 @@ struct _RrTheme { /*! The font values are all optional. If a NULL is used for any of them, then the default font will be used. */ -RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme, +RrTheme* RrThemeNew(const RrInstance *inst, const gchar *theme, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, RrFont *menu_title_font, RrFont *menu_item_font,