remove redundant color

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 37bdda41cd7ebd96db19053d4ddf5f0e8fbd0aa8..dbc6882e039c4141b073673cff3eb70017800cdf 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -111,6 +111,9 @@ extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
 extern int choosealpha;                 /* break up choose by letter */
 extern GtkTooltips *tips;
+extern int rtp_supported;
+extern int rtp_is_running;
+extern GtkItemFactory *mainmenufactory;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
@@ -130,17 +133,17 @@ void properties(int ntracks, const char **tracks);
 
 void properties_reset(void);
 
-GtkWidget *scroll_widget(GtkWidget *child, const char *name);
+GtkWidget *scroll_widget(GtkWidget *child);
 /* Wrap a widget up for scrolling */
 
 GdkPixbuf *find_image(const char *name);
 /* Get the pixbuf for an image.  Returns a null pointer if it cannot be
  * found. */
 
-void popup_error(const char *msg);
-/* Pop up an error message */
+void popup_msg(GtkMessageType mt, const char *msg);
+/* Pop up a message */
 
-void fpopup_error(const char *fmt, ...);
+void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
 
 struct progress_window *progress_window_new(const char *title);
 /* Pop up a progress window */
@@ -189,6 +192,8 @@ GtkWidget *control_widget(void);
 void volume_update(void);
 /* Called whenever we think the volume control has changed */
 
+void control_monitor(void *u);
+
 /* Queue/Recent/Added */
 
 GtkWidget *queue_widget(void);
@@ -226,8 +231,31 @@ GtkWidget *choose_widget(void);
 void choose_update(void);
 /* Called when we think the choose tree might need updating */
 
+/* Login details */
+
 void login_box(void);
 
+/* Help */
+
+void popup_help(void);
+
+/* RTP */
+
+int rtp_running(void);
+void start_rtp(void);
+void stop_rtp(void);
+
+/* Appearance */
+
+extern GdkColor tool_bg, tool_fg, layout_bg, even_bg, odd_bg;
+extern GdkColor active_bg, selected_bg, selected_fg, search_bg;
+extern GdkColor title_bg, title_fg, item_fg, drag_target, tool_active;
+
+void save_appearance(void);
+void load_appearance(void);
+void set_tool_colors(GtkWidget *w);
+void set_slider_colors(GtkWidget *w);
+
 /* Widget leakage debugging rubbish ---------------------------------------- */
 
 #if MDEBUG