Replace libglade with GtkBuilder

[catta] / avahi-python / avahi-discover / avahi-discover.in

diff --git a/avahi-python/avahi-discover/avahi-discover.in b/avahi-python/avahi-discover/avahi-discover.in
index 229c7bdb2a30fb7c26b4e809ff4d881f19215ee9..6c22f45568598a337df556dc51ca68e43b21f3f0 100755 (executable)
--- a/avahi-python/avahi-discover/avahi-discover.in
+++ b/avahi-python/avahi-discover/avahi-discover.in
@@ -22,8 +22,8 @@
 import os, sys
 
 try:
-    import avahi, gtk, gobject, dbus, avahi.ServiceTypeDatabase
-    from avahi_discover.SimpleGladeApp import SimpleGladeApp
+    import avahi, gettext, gtk, gobject, dbus, avahi.ServiceTypeDatabase
+    _ = gettext.gettext
 except ImportError, e:
     print "Sorry, to use this tool you need to install Avahi, pygtk and python-dbus.\n Error: %s" % e
     sys.exit(1)
@@ -49,19 +49,26 @@ def error_msg(msg):
     d.run()
     d.destroy()
 
-glade_dir = "@interfacesdir@"
+ui_dir = "@interfacesdir@"
 
 service_type_db = avahi.ServiceTypeDatabase.ServiceTypeDatabase()
 
-class Main_window(SimpleGladeApp):
-    def __init__(self, path="avahi-discover.glade", root="main_window", domain=None, **kwargs):
-        path = os.path.join(glade_dir, path)
+class Main_window:
+    def __init__(self, path="avahi-discover.ui", root="main_window", domain=None, **kwargs):
+        path = os.path.join(ui_dir, path)
         gtk.window_set_default_icon_name("network-wired")
-        SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
+        self.ui = gtk.Builder()
+        self.ui.add_from_file(path)
+        self.ui.connect_signals(self)
+        self.tree_view = self.ui.get_object("tree_view")
+        self.info_label = self.ui.get_object("info_label")
+        self.new()
 
     def on_tree_view_cursor_changed(self, widget, *args):
         (model, iter) = widget.get_selection().get_selected()
-        (name,interface,protocol,stype,domain) = self.treemodel.get(iter,1,2,3,4,5)
+        stype = None
+        if iter is not None:
+            (name,interface,protocol,stype,domain) = self.treemodel.get(iter,1,2,3,4,5)
         if stype == None:
             self.info_label.set_markup("<i>No service currently selected.</i>")
             return
@@ -259,11 +266,12 @@ class Main_window(SimpleGladeApp):
             # Just browse the domain the user wants us to browse
             self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, domain)
 
-        
+    def gtk_main_quit(self, *args):
+        gtk.main_quit()
+
 def main():
     main_window = Main_window()
-
-    main_window.run()
+    gtk.main()
     
 if __name__ == "__main__":
     main()