From ede7c8cea9e0484805fce5aad890804b8ac41aea Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 7 Aug 2010 03:33:25 +0000
Subject: [PATCH] - web: right-align bbcode images - API: warning fix

svn path=/trunk/boinc/; revision=22160
---
 api/boinc_api.cpp           | 3 +--
 checkin_notes               | 9 +++++++++
 html/inc/text_transform.inc | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index 3931c3f92d..b895c9f002 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -1083,7 +1083,6 @@ static void worker_signal_handler(int) {
 // Called from the worker thread; create the timer thread
 //
 int start_timer_thread() {
-    int retval=0;
     char buf[256];
 
 #ifdef _WIN32
@@ -1119,7 +1118,7 @@ int start_timer_thread() {
     pthread_attr_t thread_attrs;
     pthread_attr_init(&thread_attrs);
     pthread_attr_setstacksize(&thread_attrs, 16384);
-    retval = pthread_create(&timer_thread_handle, &thread_attrs, timer_thread, NULL);
+    int retval = pthread_create(&timer_thread_handle, &thread_attrs, timer_thread, NULL);
     if (retval) {
         fprintf(stderr,
             "%s start_timer_thread(): pthread_create(): %d",
diff --git a/checkin_notes b/checkin_notes
index 928ebda3d8..ba578e5f33 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5824,3 +5824,12 @@ Charlie 5 Aug 2010
         BOINCClientManager.h
         BOINCTaskBar.cpp
         MainDocument.cpp
+
+David  6 Aug 2010
+    - web: right-align bbcode images
+    - API: warning fix
+
+    html/inc/
+        text_transform.inc
+    api/
+        boinc_api.cpp
diff --git a/html/inc/text_transform.inc b/html/inc/text_transform.inc
index 93017f12e0..00b2eecf90 100644
--- a/html/inc/text_transform.inc
+++ b/html/inc/text_transform.inc
@@ -156,7 +156,7 @@ function bb2html($text, $export=false) {
             "<blockquote>\\1</blockquote>",
             "<ul>\\1</ul><p>",
             "<ol>\\1</ol><p>",
-            "<img src=\"http://\\2\">",
+            "<img align=bottom src=\"http://\\2\">",
             "<font color=\"\\1\">\\2</font>",
             "\\1<li>\\2\n\\3",
             "<span style=\"font-size: \\1px;\">\\2</span>",
@@ -183,7 +183,7 @@ function bb2html($text, $export=false) {
             "<blockquote class='postbody'>\\1</blockquote>",
             "<ul>\\1</ul><p>",
             "<ol>\\1</ol><p>",
-            "<img src=\"http://\\2\">",
+            "<img hspace=8 align=right src=\"http://\\2\">",
             "<font color=\"\\1\">\\2</font>",
             "\\1<li>\\2\n\\3",
             "<span style=\"font-size: \\1px;\">\\2</span>",