# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1183012969 18000
# Node ID 21b27e97bfb9aa55ef612bea7f0ad49f7c3d973e
# Parent  68f3b7ff43338ccc60852bc55858190e194f6e4a
Remove pointless starting_up variable.
With transition to UIManager actions, the codepaths it was blocking will no longer be
executed at startup.

diff -r 68f3b7ff4333 -r 21b27e97bfb9 src/audacious/main.c
--- a/src/audacious/main.c	Thu Jun 28 01:41:03 2007 -0500
+++ b/src/audacious/main.c	Thu Jun 28 01:42:49 2007 -0500
@@ -391,8 +391,6 @@
 
 GList *dock_window_list = NULL;
 
-gboolean starting_up = TRUE;
-
 /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */
 static gchar *pl_candidates[] = {
     PLUGIN_FILENAME("ALSA"),
@@ -1263,8 +1261,6 @@
         playlist_start_get_info_thread();
         mainwin_attach_idle_func();
 
-
-        starting_up = FALSE;
         has_x11_connection = TRUE;
 
         if (cfg.resume_playback_on_startup)
@@ -1309,8 +1305,6 @@
         mainwin_set_info_text();
         playlist_start_get_info_thread();
 
-        starting_up = FALSE;
-
         loop = g_main_loop_new(NULL, TRUE);
         g_timeout_add(10, aud_headless_iteration, NULL);
         g_main_loop_run(loop);
diff -r 68f3b7ff4333 -r 21b27e97bfb9 src/audacious/main.h
--- a/src/audacious/main.h	Thu Jun 28 01:41:03 2007 -0500
+++ b/src/audacious/main.h	Thu Jun 28 01:42:49 2007 -0500
@@ -162,8 +162,6 @@
 
 extern GList *dock_window_list;
 
-extern gboolean starting_up;
-
 extern gboolean has_x11_connection;
 
 void bmp_config_save(void);
diff -r 68f3b7ff4333 -r 21b27e97bfb9 src/audacious/ui_main.c
--- a/src/audacious/ui_main.c	Thu Jun 28 01:41:03 2007 -0500
+++ b/src/audacious/ui_main.c	Thu Jun 28 01:42:49 2007 -0500
@@ -3277,9 +3277,7 @@
   mainwin_menurow->mr_always_selected = gtk_toggle_action_get_active( action );
   cfg.always_on_top = mainwin_menurow->mr_always_selected;
   widget_draw(WIDGET(mainwin_menurow));
-
-  if (starting_up == FALSE)
-    hint_set_always(cfg.always_on_top);
+  hint_set_always(cfg.always_on_top);
 }
 
 void