Build fix for IBM support when X is disabled.

[monky] / src / text_object.h

diff --git a/src/text_object.h b/src/text_object.h
index fec6eb8..52d19e7 100644 (file)
--- 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.
  *
@@ -67,8 +67,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 +94,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 +140,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,
@@ -196,6 +194,7 @@ enum text_object_type {
        OBJ_unseen_mails,
        OBJ_flagged_mails,
        OBJ_unflagged_mails,
+       OBJ_format_time,
        OBJ_forwarded_mails,
        OBJ_unforwarded_mails,
        OBJ_replied_mails,
@@ -206,8 +205,8 @@ enum text_object_type {
        OBJ_mem,
        OBJ_memeasyfree,
        OBJ_memfree,
-#ifdef X11
        OBJ_memgauge,
+#ifdef X11
        OBJ_memgraph,
 #endif /* X11 */
        OBJ_membar,
@@ -216,11 +215,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,
@@ -231,6 +228,7 @@ enum text_object_type {
 #endif /* X11 */
        OBJ_nameserver,
        OBJ_nodename,
+       OBJ_nodename_short,
        OBJ_nvidia,
        OBJ_pre_exec,
        OBJ_cmdline_to_pid,
@@ -240,8 +238,10 @@ enum text_object_type {
        OBJ_pid_environ,
        OBJ_pid_environ_list,
        OBJ_pid_exe,
+       OBJ_pid_nice,
        OBJ_pid_openfiles,
        OBJ_pid_parent,
+       OBJ_pid_priority,
        OBJ_pid_state,
        OBJ_pid_state_short,
        OBJ_pid_stderr,
@@ -249,6 +249,9 @@ enum text_object_type {
        OBJ_pid_stdout,
        OBJ_pid_threads,
        OBJ_pid_thread_list,
+       OBJ_pid_time_kernelmode,
+       OBJ_pid_time_usermode,
+       OBJ_pid_time,
        OBJ_pid_uid,
        OBJ_pid_euid,
        OBJ_pid_suid,
@@ -257,6 +260,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,
@@ -267,6 +271,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,
@@ -419,9 +424,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
@@ -453,9 +458,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,
@@ -467,6 +472,7 @@ enum text_object_type {
 struct text_object {
        struct text_object *next, *prev;        /* doubly linked list of text objects */
        struct text_object *sub;                /* for objects parsing text into objects */
+       struct text_object *ifblock_next;       /* jump target for ifblock objects */
        union {
                void *opaque;           /* new style generic per object data */
                char *s;                /* some string */