Commit 19da2519 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

dbus: remove evil intractable macro, fix memory leak

parent b54f2c63
...@@ -446,17 +446,6 @@ handle_root ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this ) ...@@ -446,17 +446,6 @@ handle_root ( DBusConnection *p_conn, DBusMessage *p_from, void *p_this )
* PropertiesChangedSignal() synthetizes and sends the * PropertiesChangedSignal() synthetizes and sends the
* org.freedesktop.DBus.Properties.PropertiesChanged signal * org.freedesktop.DBus.Properties.PropertiesChanged signal
*/ */
#define PROPERTY_MAPPING_BEGIN if( 0 ) {}
#define PROPERTY_ENTRY( prop, signature ) \
else if( !strcmp( ppsz_properties[i], #prop ) ) \
{ \
if( VLC_SUCCESS != AddProperty( (intf_thread_t*) p_intf, \
&changed_properties, #prop, signature, Marshal##prop ) ) \
return DBUS_HANDLER_RESULT_NEED_MEMORY; \
}
#define PROPERTY_MAPPING_END else { return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; }
static DBusHandlerResult static DBusHandlerResult
PropertiesChangedSignal( intf_thread_t *p_intf, PropertiesChangedSignal( intf_thread_t *p_intf,
vlc_dictionary_t *p_changed_properties ) vlc_dictionary_t *p_changed_properties )
...@@ -489,10 +478,9 @@ PropertiesChangedSignal( intf_thread_t *p_intf, ...@@ -489,10 +478,9 @@ PropertiesChangedSignal( intf_thread_t *p_intf,
for( int i = 0; i < i_properties; i++ ) for( int i = 0; i < i_properties; i++ )
{ {
PROPERTY_MAPPING_BEGIN if( !strcmp( ppsz_properties[i], "Fullscreen" ) )
PROPERTY_ENTRY( Fullscreen, "b" ) AddProperty( p_intf, &changed_properties, "Fullscreen", "b",
PROPERTY_MAPPING_END MarshalFullscreen );
free( ppsz_properties[i] ); free( ppsz_properties[i] );
} }
free( ppsz_properties ); free( ppsz_properties );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment