mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-27 01:55:20 +03:00
Merge heads
This commit is contained in:
commit
d5f5b90941
@ -102,12 +102,15 @@ class vmmConnect(gobject.GObject):
|
||||
readOnly = True
|
||||
else:
|
||||
if os.getuid() == 0:
|
||||
uri = "qemu///system"
|
||||
# Disabled for now, since the systemwide instance
|
||||
# has no init script just yet
|
||||
#uri = "qemu///system"
|
||||
uri = "qemu:///session"
|
||||
else:
|
||||
uri = "qemu:///session"
|
||||
elif remote.get_active():
|
||||
if type.get_active() == 0:
|
||||
# XXX fixme
|
||||
# XXX fixme these URIs should switch to the secure libvirtd when its finally written
|
||||
uri = "http://" + self.window.get_widget("remote-host").get_text() + ":" + self.window.get_widget("remote-port").get_text()
|
||||
else:
|
||||
uri = "qemu://" + self.window.get_widget("remote-host").get_text() + ":" + self.window.get_widget("remote-port").get_text() + "/system"
|
||||
|
@ -165,6 +165,10 @@ class GRFBNetworkClient(rfb.RFBNetworkClient, gobject.GObject):
|
||||
self.send(pack('>BBHI', 4, down, 0, key))
|
||||
|
||||
def update_pointer(self, mask, x, y):
|
||||
if x < 0:
|
||||
x = 0
|
||||
if y < 0:
|
||||
y = 0
|
||||
self.send(pack('>BBHH', 5, mask, x, y))
|
||||
gobject.type_register(GRFBNetworkClient)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user