* modules/gui/macosx/info.m: keep the same panel open if track changes.

* modules/misc/httpd.c: removed an unused int.

diff --git a/modules/gui/macosx/info.m b/modules/gui/macosx/info.m
index 70ce18c61e4382039c9a5ec4d72338e8d509e925..9bbe217ed89a754f63ac97c5a9b90e8a0c085dad 100644 (file)
--- a/modules/gui/macosx/info.m
+++ b/modules/gui/macosx/info.m
@@ -2,7 +2,7 @@
  * info.m: MacOS X info panel
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: info.m,v 1.4 2003/03/14 01:23:06 hartman Exp $
+ * $Id: info.m,v 1.5 2003/03/18 02:28:53 hartman Exp $
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
  *
@@ -74,10 +74,14 @@
 
 - (void)updateInfo
 {
+    NSString *o_selectedPane;
+    
     if( ![o_window isVisible] )
     {
         return;
     }
+    
+    o_selectedPane = [[o_selector selectedItem] title];
 
     intf_thread_t * p_intf = [NSApp getIntf]; 
     playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
@@ -113,7 +117,12 @@
     vlc_mutex_unlock( &p_playlist->object_lock );
     vlc_object_release( p_playlist );
 
-    [o_selector selectItemAtIndex: 0];
+    int i_select = [o_selector indexOfItemWithTitle:o_selectedPane];
+    if ( i_select < 0 )
+    {
+        i_select = 0;
+    }
+    [o_selector selectItemAtIndex: i_select ];
     [self showCategory: o_selector];
 }
 

diff --git a/modules/misc/httpd.c b/modules/misc/httpd.c
index eaed824d445421a69db6f7c21897cea5c4341cf9..87ec8dfa960d9e0d10c806dab6c9637452813ffa 100644 (file)
--- a/modules/misc/httpd.c
+++ b/modules/misc/httpd.c
@@ -2,7 +2,7 @@
  * httpd.c
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.c,v 1.10 2003/03/17 23:48:26 fenrir Exp $
+ * $Id: httpd.c,v 1.11 2003/03/18 02:28:53 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -1179,7 +1179,6 @@ static int  httpd_page_admin_get( httpd_file_callback_args_t *p_args,
 {
     httpd_sys_t *p_httpt = (httpd_sys_t*)p_args;
     httpd_connection_t *p_con;
-    int i;
 
     if( i_request > 0)
     {