Never rename an object post attach & un-deprecated find_name

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 804fc2010fa30c480d13e582673fc4ce29b24509..e2fda545a74b1e2f687b8e5728e28c239950f7a4 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -75,9 +75,6 @@ VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
 __attribute__((deprecated))
 #endif
 VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
 VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
 VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );

diff --git a/src/libvlc.c b/src/libvlc.c
index 7e1613d25aad442b4a9b7ebac188cbdb97378b83..9860d54527f44163524809bb26ed993ea62c6c2c 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -263,8 +263,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
     priv->p_playlist = NULL;
     priv->p_dialog_provider = NULL;
     priv->p_vlm = NULL;
-    /* Avoid being called "memcpy":*/
-    vlc_internals(p_libvlc)->psz_object_name = strdup( "libvlc" );
 
     /* Initialize message queue */
     msg_Create( p_libvlc );

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 6a0aa47611c9673197a47b753f259c85fcdf2689..5e4a0bf30c17788b8adc2941df202e75a4f1e53f 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -607,14 +607,6 @@ found_shortcut:
     {
         msg_Dbg( p_this, "using %s module \"%s\"",
                  psz_capability, p_module->psz_object_name );
-        if( !vlc_internals(p_this)->psz_object_name )
-        {
-            /* This assumes that p_this is the object which will be using the
-             * module. That's not always the case ... but it is in most cases.
-             */
-            vlc_internals(p_this)->psz_object_name =
-                strdup( psz_alias ? psz_alias : p_module->psz_object_name );
-        }
     }
     else if( count == 0 )
     {