configure: Set the proper werror variable when creating vlc-config.in

[vlc] / modules / misc / gtk_main.c

diff --git a/modules/misc/gtk_main.c b/modules/misc/gtk_main.c
index cfbfa4d1f205dd00384180ccd23ea4cf326e41f6..037db206e88795756b985bdd36bcebd3cdb0feaf 100644 (file)
--- a/modules/misc/gtk_main.c
+++ b/modules/misc/gtk_main.c
@@ -59,28 +59,28 @@ static vlc_object_t * p_gtk_main = NULL;
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
+vlc_module_begin ()
     int i_cap;
-    set_description( N_("Gtk+ GUI helper") );
+    set_description( N_("Gtk+ GUI helper") )
 #if defined(MODULE_NAME_IS_gtk_main)
     i_cap = 90;
-    add_shortcut( "gtk" );
+    add_shortcut( "gtk" )
 #elif defined(MODULE_NAME_IS_gnome_main)
     i_cap = 100;
-    add_shortcut( "gtk" );
-    add_shortcut( "gnome" );
+    add_shortcut( "gtk" )
+    add_shortcut( "gnome" )
 #elif defined(MODULE_NAME_IS_gtk2_main)
     i_cap = 95;
-    add_shortcut( "gtk2" );
+    add_shortcut( "gtk2" )
 #elif defined(MODULE_NAME_IS_gnome2_main)
     i_cap = 105;
-    add_shortcut( "gtk2" );
-    add_shortcut( "gnome2" );
+    add_shortcut( "gtk2" )
+    add_shortcut( "gnome2" )
 #endif
-    set_capability( "gui-helper", i_cap );
-    set_callbacks( Open, Close );
-    linked_with_a_crap_library_which_uses_atexit();
-vlc_module_end();
+    set_capability( "gui-helper", i_cap )
+    set_callbacks( Open, Close )
+    linked_with_a_crap_library_which_uses_atexit ()
+vlc_module_end ()
 
 static vlc_mutex_t gtk_lock = VLC_STATIC_MUTEX;
 
@@ -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,