* update diagram

[catta] / avahi-discover / main.c

diff --git a/avahi-discover/main.c b/avahi-discover/main.c
index de15a444e7b32953fea05bf983ab304c7d1ab988..05ad9674714621dc0a4f750b33e74a348be2c6b1 100644 (file)
--- a/avahi-discover/main.c
+++ b/avahi-discover/main.c
@@ -1,9 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <avahi-core/core.h>
-#include <avahi-core/strlst.h>
+#include <avahi-common/strlst.h>
 
 struct ServiceType;
 
@@ -217,7 +221,7 @@ static void service_resolver_callback(AvahiServiceResolver *r, gint interface, g
     }
 
     if (event == AVAHI_RESOLVER_TIMEOUT)
-        gtk_label_set_text(info_label, "<i>Failed to resolve.</i>");
+        gtk_label_set_markup(info_label, "<i>Failed to resolve.</i>");
     else 
         update_label(s, host_name, a, port, txt);
 }
@@ -249,7 +253,7 @@ int main(int argc, char *argv[]) {
     gtk_init(&argc, &argv);
     glade_init();
 
-    xml = glade_xml_new("avahi-discover.glade", NULL, NULL);
+    xml = glade_xml_new(INTERFACES_DIR"avahi-discover.glade", NULL, NULL);
     main_window = glade_xml_get_widget(xml, "main_window");
     g_signal_connect(main_window, "delete-event", (GCallback) main_window_on_delete_event, NULL);
     
@@ -270,7 +274,7 @@ int main(int argc, char *argv[]) {
     service_type_hash_table = g_hash_table_new((GHashFunc) avahi_domain_hash, (GEqualFunc) avahi_domain_equal);
     
     avahi_server_config_init(&config);
-    config.register_hinfo = config.register_addresses = config.announce_domain = config.register_workstation = FALSE;
+    config.publish_hinfo = config.publish_addresses = config.publish_domain = config.publish_workstation = FALSE;
     server = avahi_server_new(NULL, &config, NULL, NULL);
     avahi_server_config_free(&config);