* modules/demux/ts.c: Fixed erroneous warning messages (reported by

[vlc] / modules / misc / gtk_main.c

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index 46ec94e6019761641dc41f93dd9524727a1235c7..517202ece0241e4cff7d67f2f24316e8ae9f0cb6 100644 (file)
--- a/modules/misc/gtk_main.c
+++ b/modules/misc/gtk_main.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * gtk_main.c : Gtk+ wrapper for gtk_main
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -86,9 +86,9 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t lockval;
 
     /* FIXME: put this in the module (de)initialization ASAP */
-    var_Create( p_this->p_libvlc, "gtk", VLC_VAR_MUTEX );
+    var_Create( p_this->p_libvlc_global, "gtk", VLC_VAR_MUTEX );
 
-    var_Get( p_this->p_libvlc, "gtk", &lockval );
+    var_Get( p_this->p_libvlc_global, "gtk", &lockval );
     vlc_mutex_lock( lockval.p_address );
 
     if( i_refcount > 0 )
@@ -115,7 +115,7 @@ static int Open( vlc_object_t *p_this )
         vlc_object_destroy( p_gtk_main );
         i_refcount--;
         vlc_mutex_unlock( lockval.p_address );
-        var_Destroy( p_this->p_libvlc, "gtk" );
+        var_Destroy( p_this->p_libvlc_global, "gtk" );
         return VLC_ETHREAD;
     }
 
@@ -132,7 +132,7 @@ static void Close( vlc_object_t *p_this )
 {
     vlc_value_t lockval;
 
-    var_Get( p_this->p_libvlc, "gtk", &lockval );
+    var_Get( p_this->p_libvlc_global, "gtk", &lockval );
     vlc_mutex_lock( lockval.p_address );
 
     i_refcount--;
@@ -140,7 +140,7 @@ static void Close( vlc_object_t *p_this )
     if( i_refcount > 0 )
     {
         vlc_mutex_unlock( lockval.p_address );
-        var_Destroy( p_this->p_libvlc, "gtk" );
+        var_Destroy( p_this->p_libvlc_global, "gtk" );
         return;
     }
 
@@ -151,7 +151,7 @@ static void Close( vlc_object_t *p_this )
     p_gtk_main = NULL;
 
     vlc_mutex_unlock( lockval.p_address );
-    var_Destroy( p_this->p_libvlc, "gtk" );
+    var_Destroy( p_this->p_libvlc_global, "gtk" );
 }
 
 static gint foo( gpointer bar ) { return TRUE; }
@@ -178,7 +178,7 @@ static void GtkMain( vlc_object_t *p_this )
 #endif
 
 #if defined(MODULE_NAME_IS_gnome_main)
-    gnome_init( p_this->p_vlc->psz_object_name, VERSION, i_args, p_args );
+    gnome_init( p_this->p_libvlc->psz_object_name, VERSION, i_args, p_args );
 #elif defined(MODULE_NAME_IS_gnome2_main)
     gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE,
                         i_args, p_args,