# HG changeset patch
# User giacomo
# Date 1167911938 28800
# Node ID af716dc0cdb9995e0c3be3582ea7eb25f1629ced
# Parent  b09db7afa2effeb3da283964017e79222d2aeaea
[svn] - do not create GtkAccelGroup anymore; use ui_manager_get_accel_group to get accelerator groups from ui_manager

diff -r b09db7afa2ef -r af716dc0cdb9 ChangeLog
--- a/ChangeLog	Thu Jan 04 01:25:00 2007 -0800
+++ b/ChangeLog	Thu Jan 04 03:58:58 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-04 09:25:00 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3517]
+  - somehow playlist_container.h got expunged from the SDK distribution.
+  
+  trunk/audacious/Makefile |    1 +
+  1 file changed, 1 insertion(+)
+
+
 2007-01-03 23:02:53 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
   revision [3515]
   Update libaudacious copyright notices
diff -r b09db7afa2ef -r af716dc0cdb9 audacious/ui_main.c
--- a/audacious/ui_main.c	Thu Jan 04 01:25:00 2007 -0800
+++ b/audacious/ui_main.c	Thu Jan 04 03:58:58 2007 -0800
@@ -123,8 +123,6 @@
 GdkGC *mainwin_gc;
 static GdkPixmap *mainwin_bg = NULL, *mainwin_bg_x2 = NULL;
 
-GtkAccelGroup *mainwin_accel = NULL;
-
 static PButton *mainwin_menubtn;
 static PButton *mainwin_minimize, *mainwin_shade, *mainwin_close;
 
@@ -3480,7 +3478,6 @@
 {
     mainwin_create_window();
 
-    mainwin_accel = gtk_accel_group_new();
     gtk_window_add_accel_group( GTK_WINDOW(mainwin) , ui_manager_get_accel_group() );
 
     mainwin_gc = gdk_gc_new(mainwin->window);
diff -r b09db7afa2ef -r af716dc0cdb9 audacious/ui_playlist.c
--- a/audacious/ui_playlist.c	Thu Jan 04 01:25:00 2007 -0800
+++ b/audacious/ui_playlist.c	Thu Jan 04 03:58:58 2007 -0800
@@ -66,8 +66,6 @@
 static GdkBitmap *playlistwin_mask = NULL;
 static GdkGC *playlistwin_gc;
 
-static GtkAccelGroup *playlistwin_accel;
-
 static gboolean playlistwin_hint_flag = FALSE;
 
 static PlaylistSlider *playlistwin_slider = NULL;
@@ -1789,7 +1787,7 @@
     playlistwin_create_widgets();
     playlistwin_update_info(playlist_get_active());
 
-    gtk_window_add_accel_group(GTK_WINDOW(playlistwin), mainwin_accel);
+    gtk_window_add_accel_group(GTK_WINDOW(playlistwin), ui_manager_get_accel_group());
 }