-Forgot a bug for audio/spu change in the interface

diff --git a/plugins/gtk/gnome_interface.c b/plugins/gtk/gnome_interface.c
index 8b2dfd7a16b1ae891c7d27f5b27e513d848c8291..f0306fe167b9a293118b4f6e74dd2861fb98d9dd 100644 (file)
--- a/plugins/gtk/gnome_interface.c
+++ b/plugins/gtk/gnome_interface.c
@@ -561,6 +561,7 @@ create_intf_window (void)
   gtk_widget_show (button_title_prev);
   gtk_box_pack_start (GTK_BOX (title_chapter_box), button_title_prev, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, button_title_prev, _("Select previous title"), NULL);
+  gtk_button_set_relief (GTK_BUTTON (button_title_prev), GTK_RELIEF_NONE);
 
   button_title_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
   gtk_widget_ref (button_title_next);
@@ -568,6 +569,7 @@ create_intf_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (button_title_next);
   gtk_box_pack_start (GTK_BOX (title_chapter_box), button_title_next, FALSE, FALSE, 0);
+  gtk_button_set_relief (GTK_BUTTON (button_title_next), GTK_RELIEF_NONE);
 
   vseparator1 = gtk_vseparator_new ();
   gtk_widget_ref (vseparator1);
@@ -604,6 +606,7 @@ create_intf_window (void)
   gtk_widget_show (button_chapter_prev);
   gtk_box_pack_start (GTK_BOX (dvd_chapter_box), button_chapter_prev, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, button_chapter_prev, _("Select previous chapter"), NULL);
+  gtk_button_set_relief (GTK_BUTTON (button_chapter_prev), GTK_RELIEF_NONE);
 
   button_chapter_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
   gtk_widget_ref (button_chapter_next);
@@ -612,6 +615,7 @@ create_intf_window (void)
   gtk_widget_show (button_chapter_next);
   gtk_box_pack_start (GTK_BOX (dvd_chapter_box), button_chapter_next, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, button_chapter_next, _("Select next chapter"), NULL);
+  gtk_button_set_relief (GTK_BUTTON (button_chapter_next), GTK_RELIEF_NONE);
 
   network_box = gtk_hbox_new (TRUE, 0);
   gtk_widget_ref (network_box);

diff --git a/plugins/gtk/gtk_menu.c b/plugins/gtk/gtk_menu.c
index 18a3271e348efd3598363b87bbb41ef8923848b6..40d77748138c108173150089e5f1c7cedb736ecd 100644 (file)
--- a/plugins/gtk/gtk_menu.c
+++ b/plugins/gtk/gtk_menu.c
@@ -2,7 +2,7 @@
  * gtk_menu.c : functions to handle menu items.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_menu.c,v 1.4 2001/05/23 23:08:20 stef Exp $
+ * $Id: gtk_menu.c,v 1.5 2001/05/24 01:24:47 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -84,7 +84,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
  * user_data to transmit intf_* and we need to refresh the other menu.
  ****************************************************************************/
 
-#define GtkLangToggle( intf, menu, type, callback, b_update )           \
+#define GtkLangToggle( intf, window, menu, type, callback, b_update )   \
     intf_thread_t *         p_intf;                                     \
     GtkWidget *             p_menu;                                     \
     es_descriptor_t *       p_es;                                       \
@@ -94,7 +94,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
     if( !p_intf->p_sys->b_update )                                      \
     {                                                                   \
         p_menu = GTK_WIDGET( gtk_object_get_data(                       \
-                   GTK_OBJECT( p_intf->p_sys->p_popup ), (menu) ) );    \
+                   GTK_OBJECT( p_intf->p_sys->window ), (menu) ) );     \
         p_es = (es_descriptor_t*)user_data;                             \
                                                                         \
         input_ToggleES( p_intf->p_input, p_es, menuitem->active );      \
@@ -115,13 +115,13 @@ gint GtkSetupMenus( intf_thread_t * p_intf );
 
 void GtkMenubarAudioToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 {
-    GtkLangToggle( "intf_window", "popup_audio", AUDIO_ES,
+    GtkLangToggle( "intf_window", p_popup, "popup_audio", AUDIO_ES,
                    GtkPopupAudioToggle, b_audio_update );
 }
 
 void GtkPopupAudioToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 {
-    GtkLangToggle( "intf_popup", "menubar_audio", AUDIO_ES,
+    GtkLangToggle( "intf_popup", p_window, "menubar_audio", AUDIO_ES,
                    GtkMenubarAudioToggle, b_audio_update );
 }
 
@@ -131,13 +131,13 @@ void GtkPopupAudioToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 
 void GtkMenubarSubtitleToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 {
-    GtkLangToggle( "intf_window", "popup_subpictures", SPU_ES,
+    GtkLangToggle( "intf_window", p_popup, "popup_subpictures", SPU_ES,
                    GtkPopupSubtitleToggle, b_spu_update );
 }
 
 void GtkPopupSubtitleToggle( GtkCheckMenuItem * menuitem, gpointer user_data )
 {
-    GtkLangToggle( "intf_popup", "menubar_subpictures", SPU_ES,
+    GtkLangToggle( "intf_popup", p_window, "menubar_subpictures", SPU_ES,
                    GtkMenubarSubtitleToggle, b_spu_update );
 }
 

diff --git a/plugins/gtk/intf_gnome.glade b/plugins/gtk/intf_gnome.glade
index e2b85d252700a5612b2da821eefbf71d6418ea23..561567d4097ee26d2eb62b4ee42c8bb0716b4571 100644 (file)
--- a/plugins/gtk/intf_gnome.glade
+++ b/plugins/gtk/intf_gnome.glade
@@ -712,7 +712,7 @@
              <last_modification_time>Sat, 19 May 2001 03:13:28 GMT</last_modification_time>
            </signal>
            <stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
-           <relief>GTK_RELIEF_NORMAL</relief>
+           <relief>GTK_RELIEF_NONE</relief>
            <child>
              <padding>0</padding>
              <expand>False</expand>
@@ -731,7 +731,7 @@
              <last_modification_time>Sat, 19 May 2001 03:13:23 GMT</last_modification_time>
            </signal>
            <stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
-           <relief>GTK_RELIEF_NORMAL</relief>
+           <relief>GTK_RELIEF_NONE</relief>
            <child>
              <padding>0</padding>
              <expand>False</expand>
@@ -806,7 +806,7 @@
              <last_modification_time>Sat, 19 May 2001 02:46:07 GMT</last_modification_time>
            </signal>
            <stock_button>GNOME_STOCK_BUTTON_PREV</stock_button>
-           <relief>GTK_RELIEF_NORMAL</relief>
+           <relief>GTK_RELIEF_NONE</relief>
            <child>
              <padding>0</padding>
              <expand>False</expand>
@@ -826,7 +826,7 @@
              <last_modification_time>Sat, 19 May 2001 03:13:08 GMT</last_modification_time>
            </signal>
            <stock_button>GNOME_STOCK_BUTTON_NEXT</stock_button>
-           <relief>GTK_RELIEF_NORMAL</relief>
+           <relief>GTK_RELIEF_NONE</relief>
            <child>
              <padding>0</padding>
              <expand>False</expand>