X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ftext_object.h;h=53a71fbe239490c7b3085b581b9850fc549a3abb;hb=bd8c0fc134e004eebb40d6b0e74c2c860c24fb91;hp=5ca7688bbd9457ef6d9aa3173922c779701aa6f4;hpb=0215298c27d6274934a6c659025a0a1f58d1026e;p=monky

diff --git a/src/text_object.h b/src/text_object.h
index 5ca7688..53a71fb 100644
--- a/src/text_object.h
+++ b/src/text_object.h
@@ -9,7 +9,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.
  *
@@ -44,9 +44,13 @@ enum text_object_type {
 	OBJ_acpitemp,
 	OBJ_battery,
 	OBJ_battery_time,
+	OBJ_battery_temp,
+	OBJ_battery_volts,
 	OBJ_battery_percent,
 	OBJ_battery_bar,
 	OBJ_battery_short,
+	OBJ_cell_radio_dbm,
+	OBJ_cell_radio_percent,
 #endif /* !__OpenBSD__ */
 	OBJ_buffers,
 	OBJ_cached,
@@ -67,8 +71,8 @@ enum text_object_type {
 	OBJ_font,
 	OBJ_cpu,
 	OBJ_cpubar,
-#ifdef X11
 	OBJ_cpugauge,
+#ifdef X11
 	OBJ_cpugraph,
 	OBJ_loadgraph,
 #endif /* X11 */
@@ -94,11 +98,11 @@ enum text_object_type {
 	OBJ_texeci,
 	OBJ_execbar,
 	OBJ_execibar,
-#ifdef X11
 	OBJ_execgauge,
+	OBJ_execigauge,
+#ifdef X11
 	OBJ_execgraph,
 	OBJ_execigraph,
-	OBJ_execigauge,
 #endif /* X11 */
 	OBJ_execp,
 	OBJ_execpi,
@@ -140,9 +144,7 @@ enum text_object_type {
 	OBJ_ibm_volume,
 	OBJ_ibm_brightness,
 	OBJ_smapi,
-#ifdef X11
 	OBJ_smapi_bat_bar,
-#endif /* X11 */
 	OBJ_smapi_bat_perc,
 	OBJ_smapi_bat_temp,
 	OBJ_smapi_bat_power,
@@ -207,8 +209,8 @@ enum text_object_type {
 	OBJ_mem,
 	OBJ_memeasyfree,
 	OBJ_memfree,
-#ifdef X11
 	OBJ_memgauge,
+#ifdef X11
 	OBJ_memgraph,
 #endif /* X11 */
 	OBJ_membar,
@@ -217,11 +219,9 @@ enum text_object_type {
 	OBJ_mixer,
 	OBJ_mixerl,
 	OBJ_mixerr,
-#ifdef X11
 	OBJ_mixerbar,
 	OBJ_mixerlbar,
 	OBJ_mixerrbar,
-#endif /* X11 */
 	OBJ_if_mixer_mute,
 #ifdef X11
 	OBJ_monitor,
@@ -232,6 +232,7 @@ enum text_object_type {
 #endif /* X11 */
 	OBJ_nameserver,
 	OBJ_nodename,
+	OBJ_nodename_short,
 	OBJ_nvidia,
 	OBJ_pre_exec,
 	OBJ_cmdline_to_pid,
@@ -263,6 +264,7 @@ enum text_object_type {
 	OBJ_pid_egid,
 	OBJ_pid_sgid,
 	OBJ_pid_fsgid,
+	OBJ_pid_read,
 	OBJ_pid_vmpeak,
 	OBJ_pid_vmsize,
 	OBJ_pid_vmlck,
@@ -273,6 +275,7 @@ enum text_object_type {
 	OBJ_pid_vmexe,
 	OBJ_pid_vmlib,
 	OBJ_pid_vmpte,
+	OBJ_pid_write,
 	OBJ_gid_name,
 	OBJ_uid_name,
 	OBJ_processes,
@@ -425,9 +428,9 @@ enum text_object_type {
 	OBJ_lua,
 	OBJ_lua_parse,
 	OBJ_lua_bar,
+	OBJ_lua_gauge,
 #ifdef X11
 	OBJ_lua_graph,
-	OBJ_lua_gauge,
 #endif /* X11 */
 #endif /* HAVE_LUA */
 #ifdef TCP_PORT_MONITOR
@@ -459,9 +462,9 @@ enum text_object_type {
 	OBJ_apcupsd_linev,
 	OBJ_apcupsd_load,
 	OBJ_apcupsd_loadbar,
+	OBJ_apcupsd_loadgauge,
 #ifdef X11
 	OBJ_apcupsd_loadgraph,
-	OBJ_apcupsd_loadgauge,
 #endif /* X11 */
 	OBJ_apcupsd_charge,
 	OBJ_apcupsd_timeleft,