use GtkStyles everywhere instead of explicit colors. faster.

[disorder] / disobedience / disobedience.c

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 2d7ab3e03aa753b5ee18362ffd946c11fa096eaa..eb8135f1e05baec3d4b14c132f55ea5239fae2a8 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -138,10 +138,7 @@ static GtkWidget *notebook(void) {
   tabs = gtk_notebook_new();
   /* The current tab is _NORMAL, the rest are _ACTIVE, which is bizarre but
    * produces not too dreadful appearance */
-  gtk_widget_modify_bg(tabs, GTK_STATE_NORMAL, &tool_bg);
-  gtk_widget_modify_bg(tabs, GTK_STATE_ACTIVE, &tool_active);
-  gtk_widget_modify_fg(tabs, GTK_STATE_NORMAL, &tool_fg);
-  gtk_widget_modify_fg(tabs, GTK_STATE_ACTIVE, &tool_fg);
+  gtk_widget_set_style(tabs, tool_style);
   g_signal_connect(tabs, "switch-page", G_CALLBACK(tab_switched), 0);
   gtk_notebook_append_page(GTK_NOTEBOOK(tabs), queue_widget(),
                            gtk_label_new("Queue"));
@@ -186,7 +183,7 @@ static void make_toplevel_window(void) {
                    FALSE,             /* expand */
                    FALSE,             /* fill */
                    0);
-  gtk_widget_modify_bg(toplevel, GTK_STATE_NORMAL, &tool_bg);
+  gtk_widget_set_style(toplevel, tool_style);
 }
 
 #if MDEBUG
@@ -453,6 +450,7 @@ int main(int argc, char **argv) {
   }
   signal(SIGPIPE, SIG_IGN);
   load_settings();
+  init_styles();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);