X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fcore.h;h=6042545d3c8bd4ffed990b1a03aa8ddf715c866d;hb=04fd11b631494e3985d6911dd5876c1860948ba3;hp=a5038eee02e5e25a1e4f94b0360f7e0f2c7a7565;hpb=043cf686c65e9646ebe1381e38e31ec33cd04e6c;p=monky

diff --git a/src/core.h b/src/core.h
index a5038ee..6042545 100644
--- a/src/core.h
+++ b/src/core.h
@@ -1,4 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
  * Conky, a system monitor, based on torsmo
  *
@@ -9,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -25,8 +26,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * vim: ts=4 sw=4 noet ai cindent syntax=c
- *
  */
 
 #ifndef _CONKY_CORE_H_
@@ -43,14 +42,6 @@ int extract_variable_text_internal(struct text_object *retval, const char *const
 
 void free_text_objects(struct text_object *root, int internal);
 
-#ifdef X11
-void scan_mixer_bar(const char *arg, int *a, int *w, int *h);
-#endif /* X11 */
-
-#ifdef HAVE_ICONV
-void set_iconv_converting(char i);
-void set_iconv_selected(long i);
-void iconv_convert(size_t a, char *buff_in, char *p, size_t p_max_size);
-#endif /* HAVE_ICONV */
+const char *dev_name(const char *);
 
 #endif /* _CONKY_CORE_H_ */