Use config_GetDataDir() instead of DATA_PATH.
authorRémi Denis-Courmont <rem@videolan.org>
Sun, 10 Feb 2008 12:31:27 +0000 (12:31 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Sun, 10 Feb 2008 12:31:27 +0000 (12:31 +0000)
modules/control/http/http.c
modules/gui/skins2/x11/x11_factory.cpp
modules/misc/lua/vlc.c
modules/misc/notify/notify.c

index 661fb1f..6a0e593 100644 (file)
@@ -263,10 +263,14 @@ static int Open( vlc_object_t *p_this )
 
     if( ( psz_src == NULL ) || ( *psz_src == '\0' ) )
     {
-        static char const* ppsz_paths[] = {
+        const char *data_path = config_GetDataDir ();
+        char buf[strlen (data_path) + sizeof ("/http")];
+        snprintf (buf, sizeof (buf), "%s/http", data_path);
+
+        const char const* ppsz_paths[] = {
             "share/http",
             "../share/http",
-            DATA_PATH"/http",
+            buf,
             NULL
         };
         unsigned i;
index 442a10b..02fcc17 100644 (file)
@@ -74,7 +74,7 @@ bool X11Factory::init()
     m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_datadir +
                               + "/skins2" );
     m_resourcePath.push_back( (string)"share/skins2" );
-    m_resourcePath.push_back( (string)DATA_PATH + "/skins2" );
+    m_resourcePath.push_back( (string)config_GetDataDir () + "/skins2" );
 
     return true;
 }
index 6cd732b..7d2a356 100644 (file)
@@ -432,8 +432,8 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
             || !S_ISDIR( stat_info.st_mode ) )
         {
             free(ppsz_dir_list[1]);
-            if( asprintf( &ppsz_dir_list[1],
-                          DATA_PATH DIR_SEP "%s", luadirname ) < 0 )
+            if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s",
+                          config_GetDataDir (), luadirname ) < 0 )
                 return VLC_ENOMEM;
         }
     }
index 793cab8..27c2ba2 100644 (file)
@@ -219,7 +219,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
         free( psz_arturl );
     }
     else /* else we show state-of-the art logo */
-        pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error );
+    {
+        const char *data_path = config_GetDataDir ();
+        char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
+
+        snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
+        pix = gdk_pixbuf_new_from_file( buf, &p_error );
+    }
 
     /* we need to replace '&' with '&amp;' because '&' is a keyword of
      * notification-daemon parser */