Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / perl / ui / Themes.xs

diff --git a/apps/irssi/src/perl/ui/Themes.xs b/apps/irssi/src/perl/ui/Themes.xs
index 4afd437c4dc92f03c466715b7b08e6e3169deb40..ff025ee94d278c02e3713461e9b1edd0d748f19d 100644 (file)
--- a/apps/irssi/src/perl/ui/Themes.xs
+++ b/apps/irssi/src/perl/ui/Themes.xs
@@ -1,9 +1,8 @@
 #include "module.h"
 
-void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
+static void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
 {
-       THEME_REC *theme;
-       char *module, *str;
+       char *module;
        int formatnum;
 
        module = g_strdup(perl_get_package());
@@ -14,14 +13,7 @@ void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
                return;
        }
 
-       theme = dest->window->theme == NULL ? current_theme :
-               dest->window->theme;
-       signal_emit("print format", 5, theme, module,
-                   dest, GINT_TO_POINTER(formatnum), arglist);
-
-        str = format_get_text_theme_charargs(theme, module, dest, formatnum, arglist);
-       if (*str != '\0') printtext_dest(dest, "%s", str);
-       g_free(str);
+       printformat_module_dest_charargs(module, dest, formatnum, arglist);
        g_free(module);
 }
 
@@ -98,8 +90,12 @@ PREINIT:
 CODE:
 
         if (!SvROK(formats))
-               croak("formats is not a reference to list");
+               croak("formats is not a reference");
+
        av = (AV *) SvRV(formats);
+       if (SvTYPE(av) != SVt_PVAV)
+               croak("formats is not a reference to a list");
+
        len = av_len(av)+1;
        if (len == 0 || (len & 1) != 0)
                croak("formats list is invalid - not divisible by 2 (%d)", len);