* legacy changes that might be useful if the gtk plugin is ever revived,

    and are just to be utterly ignored otherwise.

diff --git a/modules/gui/gtk/gnome.c b/modules/gui/gtk/gnome.c
index db9cfc3d3c7158ff4f322287a8e2c15ff0309afb..93e410fb4e17b794b76d0c5aabd394be1cfa834f 100644 (file)
--- a/modules/gui/gtk/gnome.c
+++ b/modules/gui/gtk/gnome.c
@@ -344,7 +344,7 @@ static void Manage( intf_thread_t *p_intf )
         }
 
         gnome_popup_menu_do_popup( p_intf->p_sys->p_popup,
-                                   NULL, NULL, NULL, NULL );
+                                   NULL, NULL, NULL, NULL, NULL );
         p_intf->b_menu_change = 0;
     }
 

diff --git a/modules/gui/gtk/gnome_interface.c b/modules/gui/gtk/gnome_interface.c
index cb9261365f8fc98009e5f72dd17cd3598bdb52bb..290f252869122fde8ffcf3b7b6610ddd7777f2e5 100644 (file)
--- a/modules/gui/gtk/gnome_interface.c
+++ b/modules/gui/gtk/gnome_interface.c
@@ -484,61 +484,61 @@ create_intf_window (void)
                             menubar_help_menu_uiinfo[0].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+  toolbar = gtk_toolbar_new ();
   gtk_widget_ref (toolbar);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar", toolbar,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar);
   gnome_app_add_toolbar (GNOME_APP (intf_window), GTK_TOOLBAR (toolbar), "toolbar",
-                                GNOME_DOCK_ITEM_BEH_EXCLUSIVE,
-                                GNOME_DOCK_TOP, 1, 0, 2);
-  gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
-  gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
-  gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
+                                BONOBO_DOCK_ITEM_BEH_EXCLUSIVE,
+                                BONOBO_DOCK_TOP, 1, 0, 2);
+  //gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
+  //gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
+  //gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_OPEN);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_OPEN);
   toolbar_file = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("File"),
                                 _("Open a file"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_file);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_file", toolbar_file,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_file);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_CDROM);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_CDROM);
   toolbar_disc = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Disc"),
                                 _("Open disc"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_disc);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_disc", toolbar_disc,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_disc);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_REFRESH);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_REFRESH);
   toolbar_network = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Net"),
                                 _("Select a network stream"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_network);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_network", toolbar_network,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_network);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_MIC);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_MIC);
   toolbar_sat = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Sat"),
                                 _("Open a satellite card"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_sat);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_sat", toolbar_sat,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -546,62 +546,62 @@ create_intf_window (void)
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_BACK);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_BACK);
   toolbar_back = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Back"),
                                 _("Go backward"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_back);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_back", toolbar_back,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_back);
   gtk_widget_set_sensitive (toolbar_back, FALSE);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_STOP);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_STOP);
   toolbar_stop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Stop"),
                                 _("Stop stream"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_stop);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_stop", toolbar_stop,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_stop);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TOP);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TOP);
   toolbar_eject = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Eject"),
                                 _("Eject disc"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_eject);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_eject", toolbar_eject,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_eject);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_FORWARD);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_FORWARD);
   toolbar_play = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Play"),
                                 _("Play stream"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_play);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_play", toolbar_play,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_play);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_BOTTOM);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_BOTTOM);
   toolbar_pause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Pause"),
                                 _("Pause stream"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_pause);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_pause", toolbar_pause,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -610,63 +610,63 @@ create_intf_window (void)
 
   gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TIMER_STOP);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TIMER_STOP);
   toolbar_slow = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Slow"),
                                 _("Play slower"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_slow);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_slow", toolbar_slow,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_slow);
   gtk_widget_set_sensitive (toolbar_slow, FALSE);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TIMER);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_TIMER);
   toolbar_fast = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Fast"),
                                 _("Play faster"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_fast);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_fast", toolbar_fast,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_fast);
   gtk_widget_set_sensitive (toolbar_fast, FALSE);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_INDEX);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_INDEX);
   toolbar_playlist = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Playlist"),
                                 _("Open playlist"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_playlist);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_playlist", toolbar_playlist,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_playlist);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_FIRST);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_FIRST);
   toolbar_prev = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Prev"),
                                 _("Previous file"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_prev);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_prev", toolbar_prev,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar_prev);
 
-  tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_LAST);
+  //tmp_toolbar_icon = gnome_stock_pixmap_widget (intf_window, GNOME_STOCK_PIXMAP_LAST);
   toolbar_next = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
                                 NULL,
                                 _("Next"),
                                 _("Next file"), NULL,
-                                tmp_toolbar_icon, NULL, NULL);
+                                NULL, NULL, NULL);
   gtk_widget_ref (toolbar_next);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_next", toolbar_next,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -743,7 +743,7 @@ create_intf_window (void)
   gtk_widget_show (title_label);
   gtk_box_pack_start (GTK_BOX (title_chapter_box), title_label, FALSE, FALSE, 0);
 
-  button_title_prev = gnome_stock_button (GNOME_STOCK_BUTTON_PREV);
+  button_title_prev = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_PREV);
   gtk_widget_ref (button_title_prev);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_title_prev", button_title_prev,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -751,7 +751,7 @@ create_intf_window (void)
   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);
 
-  button_title_next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);
+  button_title_next = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_NEXT);
   gtk_widget_ref (button_title_next);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_title_next", button_title_next,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -786,7 +786,7 @@ create_intf_window (void)
   gtk_widget_show (chapter_label);
   gtk_box_pack_start (GTK_BOX (dvd_chapter_box), chapter_label, FALSE, FALSE, 0);
 
-  button_chapter_prev = gnome_stock_button (GNOME_STOCK_BUTTON_DOWN);
+  button_chapter_prev = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_DOWN);
   gtk_widget_ref (button_chapter_prev);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_chapter_prev", button_chapter_prev,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -794,7 +794,7 @@ create_intf_window (void)
   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);
 
-  button_chapter_next = gnome_stock_button (GNOME_STOCK_BUTTON_UP);
+  button_chapter_next = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_UP);
   gtk_widget_ref (button_chapter_next);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "button_chapter_next", button_chapter_next,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -1359,8 +1359,10 @@ create_intf_about (void)
 
   intf_about = gnome_about_new ("VLC media player", VERSION,
                         _("(c) 1996-2004 the VideoLAN team"),
-                        authors,
                         _("This is the VLC media player, a DVD, MPEG and DivX player. It can play MPEG and MPEG2 files from a file or from a network source."),
+                        authors,
+                        NULL,
+                        NULL,
                         NULL);
   gtk_object_set_data (GTK_OBJECT (intf_about), "intf_about", intf_about);
 

diff --git a/modules/gui/gtk/gnome_support.c b/modules/gui/gtk/gnome_support.c
index d59198cd7bb2542a109ad3bd02a4bb392d34a34d..1a4374daa9ea9a0d81585d8f6759c3bbdc3b890d 100644 (file)
--- a/modules/gui/gtk/gnome_support.c
+++ b/modules/gui/gtk/gnome_support.c
@@ -126,6 +126,7 @@ create_pixmap                          (GtkWidget       *widget,
 }
 
 /* This is an internally used function to create imlib images. */
+#if 0
 GdkImlibImage*
 create_image                           (const gchar     *filename)
 {
@@ -143,4 +144,5 @@ create_image                           (const gchar     *filename)
   g_free (pathname);
   return image;
 }
+#endif
 

diff --git a/modules/gui/gtk/gnome_support.h b/modules/gui/gtk/gnome_support.h
index d9bb0728a74a914108154ea99a5a26854527b84c..873e1813330ece412b0850f5e3593088363b5153 100644 (file)
--- a/modules/gui/gtk/gnome_support.h
+++ b/modules/gui/gtk/gnome_support.h
@@ -30,5 +30,5 @@ GtkWidget*  create_pixmap              (GtkWidget       *widget,
                                         const gchar     *filename,
                                         gboolean         gnome_pixmap);
 
-GdkImlibImage* create_image            (const gchar     *filename);
+//GdkImlibImage* create_image            (const gchar     *filename);
 

diff --git a/modules/gui/gtk/gtk.c b/modules/gui/gtk/gtk.c
index 308cea286256018caf22d34c20086b099c58901d..d3fb015dc9a00c607f0901b83a27cbd962c2e893 100644 (file)
--- a/modules/gui/gtk/gtk.c
+++ b/modules/gui/gtk/gtk.c
@@ -440,7 +440,7 @@ static int Manage( intf_thread_t *p_intf )
         vout_thread_t   *p_vout  = NULL;
         vlc_bool_t      b_need_menus = VLC_FALSE;
 
-        vlc_mutex_lock( &p_input->stream.stream_lock );
+        //vlc_mutex_lock( &p_input->stream.stream_lock );
 
         if( !p_input->b_die )
         {
@@ -481,9 +481,9 @@ static int Manage( intf_thread_t *p_intf )
                         double f_fpos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
-                        vlc_mutex_unlock( &p_input->stream.stream_lock );
+                        //vlc_mutex_unlock( &p_input->stream.stream_lock );
                         var_SetFloat( p_input, "position", f_fpos );
-                        vlc_mutex_lock( &p_input->stream.stream_lock );
+                        //vlc_mutex_lock( &p_input->stream.stream_lock );
                     }
 
                     /* Update the old value */
@@ -536,7 +536,7 @@ static int Manage( intf_thread_t *p_intf )
             }
         }
 
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
+        //vlc_mutex_unlock( &p_input->stream.stream_lock );
     }
     else if( p_intf->p_sys->b_playing && !p_intf->b_die )
     {

diff --git a/modules/gui/gtk/gtk_interface.c b/modules/gui/gtk/gtk_interface.c
index 98ec280c30946898d31e49c6e10127a10dc0be83..5ddf62c8a39a5a0ca030acf427068d8488e89b22 100644 (file)
--- a/modules/gui/gtk/gtk_interface.c
+++ b/modules/gui/gtk/gtk_interface.c
@@ -158,7 +158,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_file_menu", menubar_file_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_file), menubar_file_menu);
-  menubar_file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_file_menu));
+  menubar_file_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_file_menu));
 
   menubar_open = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_open)->child),
@@ -279,7 +279,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_view_menu", menubar_view_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_view), menubar_view_menu);
-  menubar_view_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_view_menu));
+  menubar_view_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_view_menu));
 
   menubar_interface_hide = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_interface_hide)->child),
@@ -396,7 +396,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_settings_menu", menubar_settings_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_settings), menubar_settings_menu);
-  menubar_settings_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_settings_menu));
+  menubar_settings_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_settings_menu));
 
   menubar_preferences = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_preferences)->child),
@@ -426,7 +426,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_config_audio_menu", menubar_config_audio_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_audio), menubar_config_audio_menu);
-  menubar_config_audio_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_audio_menu));
+  menubar_config_audio_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_config_audio_menu));
 
   menubar_audio = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_audio)->child),
@@ -508,7 +508,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_config_video_menu", menubar_config_video_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_video), menubar_config_video_menu);
-  menubar_config_video_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_video_menu));
+  menubar_config_video_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_config_video_menu));
 
   menubar_subpictures = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_subpictures)->child),
@@ -580,7 +580,7 @@ create_intf_window (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_help_menu", menubar_help_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_help), menubar_help_menu);
-  menubar_help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_help_menu));
+  menubar_help_menu_accels = gtk_menu_get_accel_group (GTK_MENU (menubar_help_menu));
 
   menubar_about = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_about)->child),
@@ -601,16 +601,16 @@ create_intf_window (void)
   gtk_widget_show (toolbar_handlebox);
   gtk_box_pack_start (GTK_BOX (window_vbox), toolbar_handlebox, FALSE, TRUE, 0);
 
-  toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+  toolbar = gtk_toolbar_new ();
   gtk_widget_ref (toolbar);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar", toolbar,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (toolbar);
   gtk_container_add (GTK_CONTAINER (toolbar_handlebox), toolbar);
   gtk_container_set_border_width (GTK_CONTAINER (toolbar), 1);
-  gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
-  gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
-  gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
+  //gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar), 16);
+  //gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
+  //gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
 
   toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
                                 GTK_TOOLBAR_CHILD_BUTTON,
@@ -1103,7 +1103,7 @@ create_intf_popup (void)
 
   intf_popup = gtk_menu_new ();
   gtk_object_set_data (GTK_OBJECT (intf_popup), "intf_popup", intf_popup);
-  intf_popup_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (intf_popup));
+  intf_popup_accels = gtk_menu_get_accel_group (GTK_MENU (intf_popup));
 
   popup_play = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_play)->child),
@@ -1228,7 +1228,7 @@ create_intf_popup (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_menu", popup_audio_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_audio), popup_audio_menu);
-  popup_audio_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_audio_menu));
+  popup_audio_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_audio_menu));
 
   popup_language = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_language)->child),
@@ -1305,7 +1305,7 @@ create_intf_popup (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_menu", popup_video_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_video), popup_video_menu);
-  popup_video_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_video_menu));
+  popup_video_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_video_menu));
 
   popup_subpictures = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_subpictures)->child),
@@ -1384,7 +1384,7 @@ create_intf_popup (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_open_menu", popup_open_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (popup_open), popup_open_menu);
-  popup_open_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (popup_open_menu));
+  popup_open_menu_accels = gtk_menu_get_accel_group (GTK_MENU (popup_open_menu));
 
   popup_file = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_file)->child),
@@ -2733,7 +2733,7 @@ create_intf_playlist (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_add_menu", playlist_add_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_add), playlist_add_menu);
-  playlist_add_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_add_menu));
+  playlist_add_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_add_menu));
 
   playlist_add_disc = gtk_menu_item_new_with_label (_("Disc"));
   gtk_widget_ref (playlist_add_disc);
@@ -2775,7 +2775,7 @@ create_intf_playlist (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_delete_menu", playlist_delete_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_delete), playlist_delete_menu);
-  playlist_delete_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_delete_menu));
+  playlist_delete_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_delete_menu));
 
   playlist_delete_all = gtk_menu_item_new_with_label (_("All"));
   gtk_widget_ref (playlist_delete_all);
@@ -2803,7 +2803,7 @@ create_intf_playlist (void)
   gtk_object_set_data_full (GTK_OBJECT (intf_playlist), "playlist_selection_menu", playlist_selection_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (playlist_selection), playlist_selection_menu);
-  playlist_selection_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (playlist_selection_menu));
+  playlist_selection_menu_accels = gtk_menu_get_accel_group (GTK_MENU (playlist_selection_menu));
 
   playlist_selection_crop = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (playlist_selection_crop)->child),