no-x11-fix.diff

--- src/conky-1.8.0/src/conky.c 2010-03-25 16:27:32.000000000 -0400
+++ src.fix/conky-1.8.0/src/conky.c 2010-04-02 01:59:06.000000000 -0400
@@ -2057,19 +2057,21 @@
            OBJ(xmms2_duration) {
                snprintf(p, p_max_size, "%02d:%02d",
                    cur->xmms2.duration / 60000,
                    (cur->xmms2.duration / 1000) % 60);
            }
            OBJ(xmms2_percent) {
                snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100);
            }
+#ifdef X11
            OBJ(xmms2_bar) {
                new_bar(obj, p, p_max_size, (int) (cur->xmms2.progress * 255.0f));
            }
+#endif /* X11 */
            OBJ(xmms2_playlist) {
                snprintf(p, p_max_size, "%s", cur->xmms2.playlist);
            }
            OBJ(xmms2_timesplayed) {
                snprintf(p, p_max_size, "%i", cur->xmms2.timesplayed);
            }
            OBJ(xmms2_smart) {
                if (strlen(cur->xmms2.title) < 2
@@ -2240,19 +2242,21 @@
                print_smapi_bat_perc(obj, p, p_max_size);
            }
            OBJ(smapi_bat_temp) {
                print_smapi_bat_temp(obj, p, p_max_size);
            }
            OBJ(smapi_bat_power) {
                print_smapi_bat_power(obj, p, p_max_size);
            }
+#ifdef X11
            OBJ(smapi_bat_bar) {
                print_smapi_bat_bar(obj, p, p_max_size);
            }
+#endif /* X11 */
 #endif /* IBM */
            OBJ(include) {
                if(obj->sub) {
                    char buf[max_user_text];

                    generate_text_internal(buf, max_user_text, *obj->sub, cur);
                    snprintf(p, p_max_size, "%s", buf);
                } else {
--- src/conky-1.8.0/src/core.c  2010-03-25 16:27:32.000000000 -0400
+++ src.fix/conky-1.8.0/src/core.c  2010-04-02 02:01:38.000000000 -0400
@@ -878,23 +878,25 @@
    END OBJ_IF_ARG(if_smapi_bat_installed, 0, "if_smapi_bat_installed needs an argument")
        obj->data.s = strndup(arg, text_buffer_size);
    END OBJ_ARG(smapi_bat_perc, 0, "smapi_bat_perc needs an argument")
        obj->data.s = strndup(arg, text_buffer_size);
    END OBJ_ARG(smapi_bat_temp, 0, "smapi_bat_temp needs an argument")
        obj->data.s = strndup(arg, text_buffer_size);
    END OBJ_ARG(smapi_bat_power, 0, "smapi_bat_power needs an argument")
        obj->data.s = strndup(arg, text_buffer_size);
+#ifdef X11
    END OBJ_ARG(smapi_bat_bar, 0, "smapi_bat_bar needs an argument")
        int cnt;
        if(sscanf(arg, "%i %n", &obj->data.i, &cnt) <= 0) {
            NORM_ERR("first argument to smapi_bat_bar must be an integer value");
            obj->data.i = -1;
        } else
            arg = scan_bar(obj, arg + cnt);
+#endif /* X11 */
 #endif /* IBM */
 #ifdef MPD
 #define mpd_set_maxlen(name) \
        if (arg) { \
            int i; \
            sscanf(arg, "%d", &i); \
            if (i > 0) \
                obj->data.i = i + 1; \
@@ -961,18 +963,20 @@
    END OBJ(xmms2_bitrate, &update_xmms2)
    END OBJ(xmms2_date, &update_xmms2)
    END OBJ(xmms2_id, &update_xmms2)
    END OBJ(xmms2_duration, &update_xmms2)
    END OBJ(xmms2_elapsed, &update_xmms2)
    END OBJ(xmms2_size, &update_xmms2)
    END OBJ(xmms2_status, &update_xmms2)
    END OBJ(xmms2_percent, &update_xmms2)
+#ifdef X11
    END OBJ(xmms2_bar, &update_xmms2)
        scan_bar(obj, arg);
+#endif /* X11 */
    END OBJ(xmms2_smart, &update_xmms2)
    END OBJ(xmms2_playlist, &update_xmms2)
    END OBJ(xmms2_timesplayed, &update_xmms2)
    END OBJ_IF(if_xmms2_connected, &update_xmms2)
 #endif
 #ifdef AUDACIOUS
    END OBJ(audacious_status, &update_audacious)
    END OBJ_ARG(audacious_title, &update_audacious, "audacious_title needs an argument")