Merge equivalent VIEW_FLAGS_SERVER into VIEW_FLAGS_THUMBNAIL.

4 files changed, 10 insertions, 11 deletions

diff --git a/src/comm.c b/src/comm.c
index a57e8d4..2ae22d2 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -128,7 +128,7 @@ comm_destroy_all(struct client *c, struct buffer *b)
 
 top:
     TAILQ_FOREACH(v, &b->views, buffer_next) {
-	if (v->flags & VIEW_FLAGS_SERVER)
+	if (v->flags & VIEW_FLAGS_THUMBNAIL)
 	    continue;
 	if (v->flags & VIEW_FLAGS_BACKGROUND)
 	    continue;
diff --git a/src/display.c b/src/display.c
index 3542ad1..100c7a4 100644
--- a/src/display.c
+++ b/src/display.c
@@ -313,7 +313,7 @@ display_view_new(struct view *v)
     struct view *t;
 
     /* Set up thumbnail */
-    t = view_new(server_display->client, v->buffer, 0, v->flags | VIEW_FLAGS_SERVER | VIEW_FLAGS_THUMBNAIL);
+    t = view_new(server_display->client, v->buffer, 0, v->flags | VIEW_FLAGS_THUMBNAIL);
     if (!t)
 	return -1;
 
diff --git a/src/view.c b/src/view.c
index 6e80d4a..029bf33 100644
--- a/src/view.c
+++ b/src/view.c
@@ -141,7 +141,7 @@ view_refresh(struct view *v)
 		break;
 
 	case BORDER_OVERLAY:
-		if (!(v->flags & (VIEW_FLAGS_SERVER|VIEW_FLAGS_BACKGROUND)))
+		if (!(v->flags & (VIEW_FLAGS_THUMBNAIL|VIEW_FLAGS_BACKGROUND)))
 			display_draw_label(v);
 		break;
 
@@ -225,7 +225,7 @@ view_new(struct client *c, struct buffer *b, int id, unsigned int flags)
 
 	TAILQ_INSERT_HEAD(&all_views, v, view_next);
 
-	if (flags & VIEW_FLAGS_SERVER) {
+	if (flags & VIEW_FLAGS_THUMBNAIL) {
 		TAILQ_INSERT_TAIL(&c->views, v, client_next);
 		TAILQ_INSERT_TAIL(&b->views, v, buffer_next);
 	} else {
@@ -246,7 +246,7 @@ void
 view_remove(struct view *v)
 {
 	/* call display hook */
-	if (!(v->flags & VIEW_FLAGS_SERVER))
+	if (!(v->flags & VIEW_FLAGS_THUMBNAIL))
 		display_view_remove(v);
 
 	/* free view resources */
@@ -266,7 +266,7 @@ view_show(struct view *v)
 	if (memcmp(&v->bpos, &zero, sizeof(zero)) == 0)
 		val = 0;
 
-	if (!(v->flags & VIEW_FLAGS_SERVER))
+	if (!(v->flags & VIEW_FLAGS_THUMBNAIL))
 		display_view_show(v);
 
 	if (val != v->opacity) {
@@ -317,7 +317,7 @@ view_set_viewport(struct view *v,
 		memcpy(&v->spos, sp, sizeof(DFBRectangle));
 
 		/* Notify display subsystem */
-		if (!(v->flags & VIEW_FLAGS_SERVER))
+		if (!(v->flags & VIEW_FLAGS_THUMBNAIL))
 			display_view_resize(v);
 	}
 
@@ -336,7 +336,7 @@ view_set_position(struct view *v, int x, int y)
 		v->spos.y = y;
 
 		/* Notify display subsystem */
-		if (!(v->flags & VIEW_FLAGS_SERVER))
+		if (!(v->flags & VIEW_FLAGS_THUMBNAIL))
 			display_view_move(v);
 	}
 
@@ -352,7 +352,7 @@ view_translate(struct view *v, int dx, int dy)
 		v->spos.y += dy;
 
 		/* Notify display subsystem */
-		if (!(v->flags & VIEW_FLAGS_SERVER))
+		if (!(v->flags & VIEW_FLAGS_THUMBNAIL))
 			display_view_move(v);
 	}
 
diff --git a/src/view.h b/src/view.h
index cdfd7a9..a8f10e1 100644
--- a/src/view.h
+++ b/src/view.h
@@ -36,8 +36,7 @@
 
 #include "sys-queue.h"
 
-#define VIEW_FLAGS_BACKGROUND  0x1   /* view is a background view     */
-#define VIEW_FLAGS_SERVER      0x2   /* view is server-owned          */
+#define VIEW_FLAGS_BACKGROUND  0x2   /* view is a background view     */
 #define VIEW_FLAGS_THUMBNAIL   0x4   /* view is a thumbnail view      */
 
 #define VIEW_STACK_TOP         0x1    /* top-most */