Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / services_discovery / xcb_apps.c

diff --git a/modules/services_discovery/xcb_apps.c b/modules/services_discovery/xcb_apps.c
index 6e35f93b09b052c539c54391c7ff3c2fc84114cb..88927c3fe9289958f287b84f757352a3aa74efde 100644 (file)
--- a/modules/services_discovery/xcb_apps.c
+++ b/modules/services_discovery/xcb_apps.c
@@ -74,7 +74,7 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
 {
     vlc_probe_t *probe = (vlc_probe_t *)obj;
 
-    char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+    char *display = var_InheritString (obj, "x11-display");
     xcb_connection_t *conn = xcb_connect (display, NULL);
     free (display);
     if (xcb_connection_has_error (conn))
@@ -97,7 +97,7 @@ static int Open (vlc_object_t *obj)
     sd->p_sys = p_sys;
 
     /* Connect to X server */
-    char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+    char *display = var_InheritString (obj, "x11-display");
     int snum;
     xcb_connection_t *conn = xcb_connect (display, &snum);
     free (display);