qulogic/pidgin

propagate from branch 'im.pidgin.soc.2012.gg' (head 8f578bc9129bf06154dfba5c4dd6b867eda790f4)

2012-05-25, Tomasz Wasilczyk
f7a4bc500915
Parents de7298a1dbe88f578bc9129b
Children ddbeda158468
propagate from branch 'im.pidgin.soc.2012.gg' (head 8f578bc9129bf06154dfba5c4dd6b867eda790f4)
to branch 'im.pidgin.pidgin' (head de7298a1dbe8923a1d2d1435e3f613f02fa0eed8)
4 files changed, 19 insertions(+), 18 deletions(-)
  • +1 -1
    pidgin/gtkconv.c
  • +8 -0
    pidgin/gtklog.c
  • +6 -1
    pidgin/themes/Contents/Resources/main.css
  • +4 -16
    pidgin/themes/Template.html
    • --- a/pidgin/gtkconv.c Wed May 23 05:01:14 2012 +0000
    +++ b/pidgin/gtkconv.c Fri May 25 18:02:53 2012 +0000
    @@ -6412,7 +6412,7 @@
    }
    gtkconv->last_flags = flags;
    - smileyed = smiley_parse_markup(message, purple_account_get_protocol_id(account));
    + smileyed = smiley_parse_markup(displaying, purple_account_get_protocol_id(account));
    msg = replace_message_tokens(message_html, conv, name, alias, smileyed, flags, mtime);
    escape = gtk_webview_quote_js_string(msg ? msg : "");
    script = g_strdup_printf("%s(%s)", func, escape);
    --- a/pidgin/gtklog.c Wed May 23 05:01:14 2012 +0000
    +++ b/pidgin/gtklog.c Fri May 25 18:02:53 2012 +0000
    @@ -465,6 +465,14 @@
    webkit_web_view_open(WEBKIT_WEB_VIEW(viewer->web_view), "about:blank");
    purple_signal_emit(pidgin_log_get_handle(), "log-displaying", viewer, log);
    +
    + /* plaintext log (html one starts with <html> tag) */
    + if (read[0] != '<')
    + {
    + char *newRead = purple_strreplace(read, "\n", "<br>");
    + g_free(read);
    + read = newRead;
    + }
    webkit_web_view_load_html_string(WEBKIT_WEB_VIEW(viewer->web_view), read, "");
    g_free(read);
    --- a/pidgin/themes/Contents/Resources/main.css Wed May 23 05:01:14 2012 +0000
    +++ b/pidgin/themes/Contents/Resources/main.css Fri May 25 18:02:53 2012 +0000
    @@ -1,19 +1,24 @@
    body {
    word-wrap: break-word;
    word-break: break-word;
    +
    + font-size: 13px;
    + margin: 2px;
    + overflow-y: scroll;
    }
    .x-container,
    .x-status_container
    {
    line-height: 1.3em;
    - margin-bottom: 6px;
    + margin-bottom: 4px;
    }
    .x-container .x-time,
    .x-status_container .x-time
    {
    display: inline;
    + font-size: 12px;
    }
    .x-container .x-sender
    --- a/pidgin/themes/Template.html Wed May 23 05:01:14 2012 +0000
    +++ b/pidgin/themes/Template.html Fri May 25 18:02:53 2012 +0000
    @@ -286,22 +286,10 @@
    node.parentNode.replaceChild(a, node);
    }
    - //Align our chat to the bottom of the window. If true is passed, view will also be scrolled down
    + //If true is passed, view will be scrolled down
    function alignChat(shouldScroll) {
    - var windowHeight = window.innerHeight;
    -
    - if (windowHeight > 0) {
    - var contentElement = document.getElementById('Chat');
    - var heightDifference = (windowHeight - contentElement.offsetHeight);
    - if (heightDifference > 0) {
    - contentElement.style.position = 'relative';
    - contentElement.style.top = heightDifference + 'px';
    - } else {
    - contentElement.style.position = 'static';
    - }
    - }
    -
    - if (shouldScroll) scrollToBottom();
    + if (shouldScroll)
    + scrollToBottom();
    }
    window.onresize = function windowDidResize(){
    @@ -319,7 +307,7 @@
    .actionMessageUserName { display:none; }
    .actionMessageBody:before { content:"*"; }
    .actionMessageBody:after { content:"*"; }
    - * { word-wrap:break-word; text-rendering: optimizelegibility; }
    + * { word-wrap:break-word }
    img.scaledToFitImage { height: auto; max-width: 100%%; }
    </style>