projects
/
pwnitter
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
770ddf9
)
Made the GTK frontend capable of playing PCap files with the backend
author
Tobias Mueller
<tobiasmue@gnome.org>
Thu, 13 Jan 2011 18:25:09 +0000
(19:25 +0100)
committer
Tobias Mueller
<tobiasmue@gnome.org>
Thu, 13 Jan 2011 18:25:09 +0000
(19:25 +0100)
pwnitter-gtk
patch
|
blob
|
history
diff --git
a/pwnitter-gtk
b/pwnitter-gtk
index
f888ee8
..
5bd0817
100755
(executable)
--- a/
pwnitter-gtk
+++ b/
pwnitter-gtk
@@
-5,15
+5,26
@@
import dbus.mainloop.glib
import gobject
import gtk
import hildon
import gobject
import gtk
import hildon
-
+import sys
def callback(name):
print "called back"
counter = int(button.get_label())
button.set_label(str(counter+1))
def callback(name):
print "called back"
counter = int(button.get_label())
button.set_label(str(counter+1))
+
+
+if len(sys.argv) > 1:
+ from_file = sys.argv[1]
+else:
+ from_file = None
+
+
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-bus = dbus.SystemBus()
+if from_file:
+ bus = dbus.SessionBus()
+else:
+ bus = dbus.SystemBus()
NAME = 'de.cryptobitch.muelli.Pwnitter'
IFACE_NAME = 'de.cryptobitch.muelli.Pwnitter'
pwnitter = dbus.Interface(bus.get_object(NAME, '/Pwnitter'), IFACE_NAME)
NAME = 'de.cryptobitch.muelli.Pwnitter'
IFACE_NAME = 'de.cryptobitch.muelli.Pwnitter'
pwnitter = dbus.Interface(bus.get_object(NAME, '/Pwnitter'), IFACE_NAME)
@@
-23,8
+34,11
@@
def quit(window, *args):
pwnitter.Stop()
gtk.main_quit()
pwnitter.Stop()
gtk.main_quit()
-def start():
- pwnitter.Start()
+def start(from_file=None):
+ if from_file:
+ pwnitter.StartFromFile(from_file)
+ else:
+ pwnitter.Start()
window = hildon.Window ()
window.set_title ("pwnitter")
window = hildon.Window ()
window.set_title ("pwnitter")
@@
-35,6
+49,6
@@
window.add (button)
window.show_all()
window.show_all()
-gobject.idle_add(start)
+gobject.idle_add(start, from_file)
gtk.main()
gtk.main()