Actually xrandr.name can be a simple char *

3 files changed, 7 insertions, 11 deletions

diff --git a/src/data.h b/src/data.h
index f959ab9..ac87fea 100644
--- a/src/data.h
+++ b/src/data.h
@@ -163,7 +163,7 @@ struct xrandr_info {
   int output;
   int crtc;
   int primary;
-  struct sbuf* name;
+  char *name;
 };
 
 struct rp_screen
diff --git a/src/screen.c b/src/screen.c
index e759ea9..4566d7e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -531,7 +531,7 @@ screen_dump (rp_screen *screen)
 
   s = sbuf_new (0);
   if (rp_have_xrandr)
-    sbuf_printf(s, "%s ", sbuf_get (screen->xrandr.name));
+    sbuf_printf(s, "%s ", screen->xrandr.name);
 
   sbuf_printf_concat (s, "%d %d %d %d %d %d",
                       screen->number,
@@ -716,8 +716,7 @@ screen_free (rp_screen *s)
   XFreeGC (dpy, s->inverse_gc);
 
   free (s->display_string);
-
-  sbuf_free (s->xrandr.name);
+  free (s->xrandr.name);
 }
 
 void
diff --git a/src/xrandr.c b/src/xrandr.c
index c369dbc..5ddf082 100644
--- a/src/xrandr.c
+++ b/src/xrandr.c
@@ -140,9 +140,7 @@ xrandr_fill_screen (int rr_output, rp_screen *screen)
   else
     screen->xrandr.primary = 0;
 
-  screen->xrandr.name = sbuf_new (0);
-  sbuf_concat (screen->xrandr.name, outinfo->name);
-
+  screen->xrandr.name = xstrdup (outinfo->name);
   screen->xrandr.output  = rr_output;
   screen->xrandr.crtc    = outinfo->crtc;
 
@@ -174,11 +172,11 @@ xrandr_output_change (XRROutputChangeNotifyEvent *ev)
     screen = screen_add (ev->output);
     screen_sort ();
     PRINT_DEBUG (("%s: Added screen %s with crtc %lu\n", __func__,
-                  sbuf_get (screen->xrandr.name),
+                  screen->xrandr.name,
                   (unsigned long)outinfo->crtc));
   } else if (screen && !outinfo->crtc) {
     PRINT_DEBUG (("%s: Removing screen %s\n", __func__,
-                  sbuf_get (screen->xrandr.name)));
+                  screen->xrandr.name));
     screen_del (screen);
   }
 
@@ -296,8 +294,7 @@ xrandr_fill_screen (int rr_output, rp_screen *screen)
   memset(&screen->xrandr, 0, sizeof(screen->xrandr));
   screen->xrandr.primary = (rr_output == 0);
   screen->xrandr.output  = rr_output;
-  screen->xrandr.name = sbuf_new (0);
-  sbuf_concat (screen->xrandr.name, "N/A");
+  screen->xrandr.name = xstrdup ("N/A");
 }
 
 void