summaryrefslogtreecommitdiffstats
path: root/x11vnc/solid.c
diff options
context:
space:
mode:
authorrunge <runge>2006-12-28 20:00:08 +0000
committerrunge <runge>2006-12-28 20:00:08 +0000
commit5c9ba4bb035255956dd176b285df3a81bafa02e3 (patch)
tree29bfb0544fca31db024619a612d09b3a5e0132c2 /x11vnc/solid.c
parentf9baaf1ee49e7889808b1f058a5f348a9cd5f027 (diff)
downloadlibtdevnc-5c9ba4bb035255956dd176b285df3a81bafa02e3.tar.gz
libtdevnc-5c9ba4bb035255956dd176b285df3a81bafa02e3.zip
still more compiler warnings; ssvnc 1.0.9 sync.
Diffstat (limited to 'x11vnc/solid.c')
-rw-r--r--x11vnc/solid.c39
1 files changed, 24 insertions, 15 deletions
diff --git a/x11vnc/solid.c b/x11vnc/solid.c
index a2bb3cf..be00264 100644
--- a/x11vnc/solid.c
+++ b/x11vnc/solid.c
@@ -114,6 +114,11 @@ static char *cmd_output(char *cmd) {
}
static void solid_root(char *color) {
+#if NO_X11
+ RAWFB_RET_VOID
+ if (!color) {}
+ return;
+#else
Window expose;
static XImage *image = NULL;
Pixmap pixmap;
@@ -126,9 +131,6 @@ static void solid_root(char *color) {
Colormap cmap;
RAWFB_RET_VOID
-#if NO_X11
- return;
-#else
if (subwin || window != rootwin) {
rfbLog("cannot set subwin to solid color, must be rootwin\n");
@@ -226,6 +228,11 @@ static void solid_root(char *color) {
}
static void solid_cde(char *color) {
+#if NO_X11
+ RAWFB_RET_VOID
+ if (!color) {}
+ return;
+#else
int wsmax = 16;
static XImage *image[16];
static Window ws_wins[16];
@@ -243,9 +250,6 @@ static void solid_cde(char *color) {
int n;
RAWFB_RET_VOID
-#if NO_X11
- return;
-#else
if (subwin || window != rootwin) {
rfbLog("cannot set subwin to solid color, must be rootwin\n");
@@ -490,6 +494,11 @@ static void solid_cde(char *color) {
}
static void solid_gnome(char *color) {
+#if NO_X11
+ RAWFB_RET_VOID
+ if (!color) {}
+ return;
+#else
char get_color[] = "gconftool-2 --get "
"/desktop/gnome/background/primary_color";
char set_color[] = "gconftool-2 --set "
@@ -503,9 +512,6 @@ static void solid_gnome(char *color) {
char *cmd;
RAWFB_RET_VOID
-#if NO_X11
- return;
-#else
if (! color) {
if (! orig_color) {
@@ -580,6 +586,11 @@ static void solid_gnome(char *color) {
}
static void solid_kde(char *color) {
+#if NO_X11
+ RAWFB_RET_VOID
+ if (!color) {}
+ return;
+#else
char set_color[] =
"dcop --user '%s' kdesktop KBackgroundIface setColor '%s' 1";
char bg_off[] =
@@ -590,9 +601,6 @@ static void solid_kde(char *color) {
int len;
RAWFB_RET_VOID
-#if NO_X11
- return;
-#else
user = get_user_name();
if (strstr(user, "'") != NULL) {
@@ -633,12 +641,13 @@ static void solid_kde(char *color) {
}
char *guess_desktop(void) {
- Atom prop;
-
- RAWFB_RET("root")
#if NO_X11
+ RAWFB_RET("root")
return "root";
#else
+ Atom prop;
+
+ RAWFB_RET("root")
if (wmdt_str && *wmdt_str != '\0') {
char *s = wmdt_str;