Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / fe-text / mainwindow-activity.c

diff --git a/apps/irssi/src/fe-text/mainwindow-activity.c b/apps/irssi/src/fe-text/mainwindow-activity.c
index 4301d98196807bf6550710d4d3e0991650bac78a..3a084110e66f6ca08137ca3839738cc11defe9c5 100644 (file)
--- a/apps/irssi/src/fe-text/mainwindow-activity.c
+++ b/apps/irssi/src/fe-text/mainwindow-activity.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "module.h"
@@ -33,13 +33,13 @@ static void sig_activity(WINDOW_REC *window)
                return;
 
        window->data_level = 0;
-        window->hilight_color = 0;
+       g_free_and_null(window->hilight_color);
 
        for (tmp = window->items; tmp != NULL; tmp = tmp->next) {
                WI_ITEM_REC *item = tmp->data;
 
                item->data_level = 0;
-               item->hilight_color = 0;
+               g_free_and_null(item->hilight_color);
        }
        signal_stop();
 }