Mercurial > pidgin.yaz
changeset 32670:e51f656d74e5
Fix fallback of Status.html to Content.html.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 23 Sep 2011 02:19:47 +0000 |
| parents | fe64a59f3b73 |
| children | 73d04f4b18ee |
| files | pidgin/gtkconv-theme.c |
| diffstat | 1 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv-theme.c Fri Sep 23 01:56:00 2011 +0000 +++ b/pidgin/gtkconv-theme.c Fri Sep 23 02:19:47 2011 +0000 @@ -319,24 +319,6 @@ } static const char * -get_status_html(PidginConvThemePrivate *priv, const char *dir) -{ - char *file; - - if (priv->status_html) - return priv->status_html; - - file = g_build_filename(dir, "Contents", "Resources", "Status.html", NULL); - if (!g_file_get_contents(file, &priv->status_html, NULL, NULL)) { - purple_debug_info("webkit", "%s could not find Resources/Status.html\n", dir); - priv->status_html = g_strdup(""); - } - g_free(file); - - return priv->status_html; -} - -static const char * get_content_html(PidginConvThemePrivate *priv, const char *dir) { char *file; @@ -355,6 +337,24 @@ } static const char * +get_status_html(PidginConvThemePrivate *priv, const char *dir) +{ + char *file; + + if (priv->status_html) + return priv->status_html; + + file = g_build_filename(dir, "Contents", "Resources", "Status.html", NULL); + if (!g_file_get_contents(file, &priv->status_html, NULL, NULL)) { + purple_debug_info("webkit", "%s could not find Resources/Status.html\n", dir); + priv->status_html = g_strdup(get_content_html(priv, dir)); + } + g_free(file); + + return priv->status_html; +} + +static const char * get_incoming_content_html(PidginConvThemePrivate *priv, const char *dir) { char *file;