/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virt-manager.desktop.in.in virt-manager-0.6.1/src/virt-manager.desktop.in.in

--- virt-manager-0.6.1.old/src/virt-manager.desktop.in.in	2009-03-27 16:03:44.969241826 +0000

+++ virt-manager-0.6.1/src/virt-manager.desktop.in.in	2009-03-27 16:08:48.004405926 +0000

@@ -2,7 +2,7 @@

 _Name=Virtual Machine Manager

 _Comment=Manage virtual machines

 Icon=::ICONDIR::/::PACKAGE::-icon.svg

-Exec=::PACKAGE::

+Exec=gksu ::PACKAGE::

 Type=Application

 Terminal=false

 Encoding=UTF-8

/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virt-manager.py.in virt-manager-0.6.1/src/virt-manager.py.in

--- virt-manager-0.6.1.old/src/virt-manager.py.in	2009-01-26 19:33:33.000000000 +0000

+++ virt-manager-0.6.1/src/virt-manager.py.in	2009-04-21 12:10:17.353381417 +0100

@@ -48,10 +48,10 @@ pylib_dir = "::PYLIBDIR::"

 pyarchlib_dir = "::PYARCHLIBDIR::"

 data_dir = "::DATADIR::"

-def _show_startup_error(msg, details):

+def _show_startup_error(msg, details=None):

     import gtk

     from virtManager.error import vmmErrorDialog

-    err = vmmErrorDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "", "")

+    err = vmmErrorDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "", details)

     title = _("Error starting Virtual Machine Manager")

     err.show_err(title + ": " +  msg, details, title, async=False)

@@ -267,6 +267,10 @@ def main():

     setup_i18n()

     setup_pypath()

+    if os.getuid() != 0:

+        _show_startup_error("Could not run virt-manager, not root")

+        os._exit(1)

+

     (options, ignore) = parse_commandline()

     setup_logging(options.debug)

/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/error.py virt-manager-0.6.1/src/virtManager/error.py

--- virt-manager-0.6.1.old/src/virtManager/error.py	2009-01-26 19:33:33.000000000 +0000

+++ virt-manager-0.6.1/src/virtManager/error.py	2009-04-21 12:09:24.633344593 +0100

@@ -72,7 +72,8 @@ class vmmErrorDialog (gtk.MessageDialog)

             title = self.default_title

         self.set_title(title)

         self.set_property("text", summary)

-        self.buffer.set_text(details)

+        if details != None:

+            self.buffer.set_text(details)

         logging.debug("Uncaught Error: %s : %s" % (summary, details))

         if async: