[vidalia-svn] r3272: Backport r3271. (in vidalia/branches/vidalia-0.1: . src/vidalia/log)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-11-02 16:26:30 -0500 (Sun, 02 Nov 2008)
New Revision: 3272

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/log/logtreewidget.cpp
   vidalia/branches/vidalia-0.1/src/vidalia/log/messagelog.ui
Log:
Backport r3271.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2008-11-02 21:19:00 UTC (rev 3271)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2008-11-02 21:26:30 UTC (rev 3272)
@@ -1,4 +1,6 @@
 0.1.10  xx-Nov-2008
+  o Fix a crash bug that occurred when the user click 'Clear' in the message
+    log toolbar followed by 'Save All'. (Ticket #434)
   o Uncheck the Torbutton options by default in the Windows bundle installer
     if Firefox is not installed. (Ticket #421)
   o Add an Windows bundle installer page that warns the user that they should

Modified: vidalia/branches/vidalia-0.1/src/vidalia/log/logtreewidget.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/log/logtreewidget.cpp	2008-11-02 21:19:00 UTC (rev 3271)
+++ vidalia/branches/vidalia-0.1/src/vidalia/log/logtreewidget.cpp	2008-11-02 21:26:30 UTC (rev 3272)
@@ -101,6 +101,7 @@
 LogTreeWidget::clearMessages()
 {
   /* Clear the messages */
+  _itemHistory.clear();
   clear();
 }
 

Modified: vidalia/branches/vidalia-0.1/src/vidalia/log/messagelog.ui
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/log/messagelog.ui	2008-11-02 21:19:00 UTC (rev 3271)
+++ vidalia/branches/vidalia-0.1/src/vidalia/log/messagelog.ui	2008-11-02 21:26:30 UTC (rev 3272)
@@ -703,7 +703,7 @@
    <sender>actionClear</sender>
    <signal>triggered()</signal>
    <receiver>lstMessages</receiver>
-   <slot>clear()</slot>
+   <slot>clearMessages()</slot>
   </connection>
   <connection>
    <sender>chkEnableLogFile</sender>