unrelated patches

[Chris Lumens]

Here's two for UI problems.  The first doesn't have appropriate blockerness,
really ought to be fixed on f19-branch.  The second is already approved, I
believe.

- Chris

[PATCH 1/2] Destroy the modify volume group dialog on escape, too (#965755).

[Chris Lumens]

---
 pyanaconda/ui/gui/spokes/custom.glade | 1 -
 pyanaconda/ui/gui/spokes/custom.py    | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 8bf1a74..0212ac4 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -346,7 +346,6 @@ use.  Try something else?</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_cancel_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 5d318a6..d457f7b 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -446,9 +446,6 @@ class ContainerDialog(GUIObject):
             fancy_set_sensitive(self.sizeCombo, False)
             self.sizeEntry.set_sensitive(False)

-    def on_cancel_clicked(self, button):
-        self.window.destroy()
-
     def _get_disk_by_id(self, disk_id):
         for disk in self._disks:
             if disk.id == disk_id:
@@ -2229,6 +2226,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):

with enlightbox(self.window, dialog.window):
             rc = dialog.run()
+            dialog.window.destroy()

if rc == 0:
             return

[PATCH 2/2] Be explicit about which icon theme we want to use (#965365).

[Chris Lumens]

---
 pyanaconda/ui/gui/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index 70093de..9b4b16d 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -370,9 +370,10 @@ class GraphicalUserInterface(UserInterface):
         self._currentAction.window.set_beta(not self._isFinal)
         self._currentAction.window.set_property("distribution", self._distributionText().upper())

-        # Set fonts app-wide, where possible
+        # Set some program-wide settings.
         settings = Gtk.Settings.get_default()
         settings.set_property("gtk-font-name", "Cantarell")
+        settings.set_property("gtk-icon-theme-name", "gnome")

self._currentAction.window.show_all()

[Brian C. Lane]

On Fri, May 24, 2013 at 10:36:48AM -0400, Chris Lumens wrote:
> Here's two for UI problems.  The first doesn't have appropriate blockerness,
> really ought to be fixed on f19-branch.  The second is already approved, I
> believe.

Ack