]> git.sesse.net Git - vlc/blobdiff - modules/misc/gtk_main.c
configure: Set the proper werror variable when creating vlc-config.in
[vlc] / modules / misc / gtk_main.c
index 4941138831dea7bc34b8d347fffccb8bc36b2c0c..037db206e88795756b985bdd36bcebd3cdb0feaf 100644 (file)
@@ -94,7 +94,7 @@ static int Open( vlc_object_t *p_this )
     if( i_refcount > 0 )
     {
         i_refcount++;
-        vlc_mutex_unlock( lock );
+        vlc_mutex_unlock( &gtk_lock );
 
         return VLC_SUCCESS;
     }
@@ -110,12 +110,12 @@ static int Open( vlc_object_t *p_this )
     /* Launch the gtk_main() thread. It will not return until it has
      * called gdk_threads_enter(), which ensures us thread safety. */
     if( vlc_thread_create( p_gtk_main, "gtk_main", GtkMain,
-                           VLC_THREAD_PRIORITY_LOW, true ) )
+                           VLC_THREAD_PRIORITY_LOW ) )
     {
         vlc_object_release( p_gtk_main );
         i_refcount--;
-        vlc_mutex_unlock( lock );
-        return VLC_ETHREAD;
+        vlc_mutex_unlock( &gtk_lock );
+        return VLC_ENOMEM;
     }
 
     i_refcount++;
@@ -169,7 +169,7 @@ static void* GtkMain( vlc_object_t *p_this )
 #endif
 
 #if defined(MODULE_NAME_IS_gnome_main)
-    gnome_init( p_this->p_libvlc->psz_object_name, VERSION, i_args, p_args );
+    gnome_init( PACKAGE, VERSION, i_args, p_args );
 #elif defined(MODULE_NAME_IS_gnome2_main)
     gnome_program_init( PACKAGE, VERSION, LIBGNOMEUI_MODULE,
                         i_args, p_args,