Removes trailing spaces. Removes tabs.

[vlc] / modules / services_discovery / hal.c

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index 7d0166f9d9e0c70d9dd856d535ab89ba2b1399df..5b84eeced6ebf02a60f2ba62599e5b6ea8680fc8 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -24,11 +24,9 @@
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
 
-#include <vlc/input.h>
-
-#include "network.h"
+#include <vlc_network.h>
 
 #include <errno.h>                                                 /* ENOMEM */
 
@@ -196,6 +194,8 @@ static void Close( vlc_object_t *p_this )
     }
     free( p_sys );
 #ifdef HAVE_HAL_1
+    dbus_connection_unref( p_sys->p_connection );
+
     struct udi_input_id_t *p_udi_entry;
 
     while( p_sys->i_devices_number > 0 )
@@ -226,10 +226,12 @@ static void AddItem( services_discovery_t *p_sd, input_item_t * p_input
         return;
     }
     p_item_cat = playlist_NodeAddInput( p_playlist,
-            p_input,p_sd->p_sys->p_node_cat, PLAYLIST_APPEND, PLAYLIST_END );
+            p_input,p_sd->p_sys->p_node_cat, PLAYLIST_APPEND, PLAYLIST_END,
+            VLC_FALSE );
     p_item_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
     p_item_one = playlist_NodeAddInput( p_playlist,
-            p_input,p_sd->p_sys->p_node_one, PLAYLIST_APPEND, PLAYLIST_END );
+            p_input,p_sd->p_sys->p_node_one, PLAYLIST_APPEND, PLAYLIST_END,
+            VLC_FALSE );
     p_item_one->i_flags &= ~PLAYLIST_SKIP_FLAG;
 
     vlc_object_release( p_playlist );
@@ -310,7 +312,7 @@ static void DelItem( services_discovery_t *p_sd, char* psz_udi )
                 }
                 /* delete parent item */
 
-                /* HACK: if i_children == 0 the item won't be deleted 
+                /* HACK: if i_children == 0 the item won't be deleted
                  * That means that it _had_ children but they were deleted */
                 if( p_pl_item->i_children == 0 )
                     p_pl_item->i_children = -1;