summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2011-07-28 20:28:57 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2011-07-28 20:28:57 -0400
commit6c39b8b1adb8da803ff85cfd492129173340abbc (patch)
tree7f0fababeb114196e3c4619577d884d38a197bd4
parenta2b50d45165e49ae500720b9006bbd7a1396126c (diff)
Drop private field from buffer structure.
-rw-r--r--src/buffer.h1
-rw-r--r--src/display.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/buffer.h b/src/buffer.h
index 24a4604..0c60d0b 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -37,7 +37,6 @@ struct buffer {
DFBSurfaceDescription desc; /* surface parameters */
int xoff, yoff; /* buffer screen offset */
IDirectFBSurface *bsurface; /* buffer surface */
- void *private; /* display subsystem private data */
};
LIST_HEAD(buf_list, buffer);
diff --git a/src/display.c b/src/display.c
index 47b1b08..1623561 100644
--- a/src/display.c
+++ b/src/display.c
@@ -394,7 +394,7 @@ display_view_remove(struct view *v)
struct display *d;
if (v->flags & VIEW_FLAGS_BACKGROUND)
- d = v->buffer->private;
+ d = v->display;
else
d = desktop_display;
@@ -438,7 +438,6 @@ display_buffer_new(struct buffer *b)
display_view_insert(b->bg_view, d);
b->bg_view->display = d;
- b->private = d;
if (is_switcher)
show_switcher();
@@ -451,7 +450,7 @@ display_buffer_new(struct buffer *b)
void
display_buffer_remove(struct buffer *b)
{
- struct display *d = b->private;
+ struct display *d = b->bg_view->display;
if (b->flags)
return;