[california/wip/736161-black] more work

[Jim Nelson <jnelson src gnome org>]

commit f9069ab360f398d47067d1d300642da5eba178ea
Author: Jim Nelson <jim yorba org>
Date:   Tue Sep 9 18:02:13 2014 -0700

    more work

 src/toolkit/toolkit-deck-popover.vala |   13 -------------
 src/toolkit/toolkit-deck-window.vala  |   13 -------------
 src/toolkit/toolkit-deck.vala         |   13 +++++++++++++
 3 files changed, 13 insertions(+), 26 deletions(-)
---
diff --git a/src/toolkit/toolkit-deck-popover.vala b/src/toolkit/toolkit-deck-popover.vala
index a893be4..8775a86 100644
--- a/src/toolkit/toolkit-deck-popover.vala
+++ b/src/toolkit/toolkit-deck-popover.vala
@@ -73,19 +73,6 @@ public class DeckPopover : Gtk.Popover {
         deck.dismiss.disconnect(on_deck_dismissed);
     }
     
-#if ENABLE_UNITY
-    // When description_text_window is visible, the entire GtkGrid's background color goes black
-    // in the GtkPopover; this overrides the color and uses GtkPopover's background color for the
-    // GtkGrid.  See:
-    // https://bugzilla.gnome.org/show_bug.cgi?id=735421
-    public override void realize() {
-        base.realize();
-        
-        Gdk.RGBA bg = get_toplevel().get_style_context().get_background_color(Gtk.StateFlags.NORMAL);
-        override_background_color(Gtk.StateFlags.NORMAL, bg);
-    }
-#endif
-    
     // if the modal value changes, preserve it (unless it's changing because we're forcing it to
     // go modal/modeless during transitions we're attempting to work around)
     private void on_modal_changed() {
diff --git a/src/toolkit/toolkit-deck-window.vala b/src/toolkit/toolkit-deck-window.vala
index e330474..fa81775 100644
--- a/src/toolkit/toolkit-deck-window.vala
+++ b/src/toolkit/toolkit-deck-window.vala
@@ -43,19 +43,6 @@ public class DeckWindow : Gtk.Dialog {
         deck.failure.disconnect(on_deck_failure);
     }
     
-#if ENABLE_UNITY
-    // When description_text_window is visible, the entire GtkGrid's background color goes black
-    // in the GtkPopover; this overrides the color and uses GtkPopover's background color for the
-    // GtkGrid.  See:
-    // https://bugzilla.gnome.org/show_bug.cgi?id=735421
-    public override void realize() {
-        base.realize();
-        
-        Gdk.RGBA bg = get_toplevel().get_style_context().get_background_color(Gtk.StateFlags.NORMAL);
-        override_background_color(Gtk.StateFlags.NORMAL, bg);
-    }
-#endif
-    
     private void on_deck_dismissed(bool user_request, bool final) {
         if (final)
             response(Gtk.ResponseType.CLOSE);
diff --git a/src/toolkit/toolkit-deck.vala b/src/toolkit/toolkit-deck.vala
index 3196643..5f2ce5a 100644
--- a/src/toolkit/toolkit-deck.vala
+++ b/src/toolkit/toolkit-deck.vala
@@ -87,6 +87,19 @@ public class Deck : Gtk.Stack {
             card.map.disconnect(on_card_mapped);
     }
     
+#if ENABLE_UNITY
+    // When description_text_window is visible, the entire GtkGrid's background color goes black
+    // in the GtkPopover; this overrides the color and uses GtkPopover's background color for the
+    // GtkGrid.  See:
+    // https://bugzilla.gnome.org/show_bug.cgi?id=735421
+    public override void realize() {
+        base.realize();
+        
+        Gdk.RGBA bg = get_toplevel().get_style_context().get_background_color(Gtk.StateFlags.NORMAL);
+        override_background_color(Gtk.StateFlags.NORMAL, bg);
+    }
+#endif
+    
     private void on_child_to_top() {
         // disconnect from previous top card and push onto nav stack
         if (top != null) {