Permalink
Browse files

Remove timed_thread code as it is no longer used.

  • Loading branch information...
labath committed Mar 26, 2011
1 parent f3dfb21 commit 75e147fa254b3a59e6385bdd1a45459527cf829e
Showing with 3 additions and 397 deletions.
  1. +1 −1 COPYING
  2. +2 −3 doc/docs.xml
  3. +0 −4 src/CMakeLists.txt
  4. +0 −3 src/conky.cc
  5. +0 −1 src/mail.cc
  6. +0 −1 src/moc.cc
  7. +0 −1 src/mpd.cc
  8. +0 −262 src/timed-thread.cc
  9. +0 −121 src/timed-thread.h
View
@@ -2,7 +2,7 @@ Any original torsmo code is licensed under the BSD license (see LICENSE.BSD
for a copy)
All code written since the fork of torsmo is licensed under the GPL (see
LICENSE.GPL for a copy), except where noted differently (such as in portmon code, timed thread code, and audacious code which are LGPL, and prss which is an MIT-style license).
LICENSE.GPL for a copy), except where noted differently (such as in portmon and audacious code which are LGPL, and prss which is an MIT-style license).
Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
View
@@ -308,9 +308,8 @@
the BSD license (see LICENSE.BSD for a copy). All code
written since the fork of torsmo is licensed under the GPL
(see LICENSE.GPL for a copy), except where noted
differently (such as in portmon code, timed thread code,
and audacious code which are LGPL, and prss which is an
MIT-style license).</para>
differently (such as in portmon and audacious code which are LGPL, and
prss which is an MIT-style license).</para>
</refsect1>
<refsect1>
<title>Authors</title>
View
@@ -40,10 +40,6 @@ set(conky_sources c++wrap.cc colours.cc combine.cc common.cc conky.cc core.cc
temphelper.cc text_object.cc timeinfo.cc top.cc algebra.cc prioqueue.cc proc.cc
user.cc luamm.cc data-source.cc lua-config.cc setting.cc llua.cc update-cb.cc)
# add timed thread library
add_library(timed-thread timed-thread.cc)
set(conky_libs ${conky_libs} timed-thread)
# Platform specific sources
if(OS_LINUX)
set(linux linux.cc users.cc sony.cc i8k.cc)
View
@@ -32,7 +32,6 @@
#include "text_object.h"
#include "conky.h"
#include "common.h"
#include "timed-thread.h"
#include <iostream>
#include <algorithm>
#include <sstream>
@@ -2548,8 +2547,6 @@ void clean_up_without_threads(void *memtofree1, void* memtofree2)
free_and_zero(memtofree1);
free_and_zero(memtofree2);
timed_thread::destroy_registered_threads();
free_and_zero(info.cpu_usage);
#ifdef BUILD_X11
if(out_to_x.get(*state))
View
@@ -36,7 +36,6 @@
#include "common.h"
#include "logging.h"
#include "text_object.h"
#include "timed-thread.h"
#include <errno.h>
#include <stdio.h>
View
@@ -24,7 +24,6 @@
#include "conky.h"
#include "logging.h"
#include "text_object.h"
#include "timed-thread.h"
#include <stdio.h>
#include <stdlib.h>
View
@@ -31,7 +31,6 @@
#include <mutex>
#include "conky.h"
#include "logging.h"
#include "timed-thread.h"
#include "timeinfo.h"
#include "libmpdclient.h"
#include "mpd.h"
View

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 75e147f

Please sign in to comment.