5 files changed, 11 insertions, 6 deletions
diff --git a/avahi-ui/.gitignore b/avahi-ui/.gitignore
index 9d9493a..b942010 100644
--- a/avahi-ui/.gitignore
+++ b/avahi-ui/.gitignore
@@ -2,6 +2,8 @@ bssh
 bvnc
 bssh.desktop
 bvnc.desktop
+bssh.desktop.in
+bvnc.desktop.in
 *.o
 *.lo
 *.la
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 2d687ed..910dc6b 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -24,8 +24,10 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 desktopdir = $(datadir)/applications
 desktop_DATA = 
+desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
+desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in
 
-EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
+EXTRA_DIST = $(desktop_DATA_in_in)
 
 
 if HAVE_GTK
@@ -70,14 +72,16 @@ install-exec-local:
 		$(LN_S) bssh bvnc && \
 		$(LN_S) bssh bshell
 
-bssh.desktop: bssh.desktop.in
+bssh.desktop.in: bssh.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-bvnc.desktop: bvnc.desktop.in
+bvnc.desktop.in: bvnc.desktop.in.in
 	sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
 endif # HAVE_GLIB
 endif
 endif
 
-CLEANFILES = $(desktop_DATA)
+@INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
diff --git a/avahi-ui/avahi-ui.h b/avahi-ui/avahi-ui.h
index eee0b34..d780f83 100644
--- a/avahi-ui/avahi-ui.h
+++ b/avahi-ui/avahi-ui.h
@@ -22,8 +22,7 @@
   USA.
 ***/
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <avahi-client/client.h>
 
diff --git a/avahi-ui/bssh.desktop.in b/avahi-ui/bssh.desktop.in.in
index 69f56b6..69f56b6 100644
--- a/avahi-ui/bssh.desktop.in
+++ b/avahi-ui/bssh.desktop.in.in
diff --git a/avahi-ui/bvnc.desktop.in b/avahi-ui/bvnc.desktop.in.in
index 799c7d2..799c7d2 100644
--- a/avahi-ui/bvnc.desktop.in
+++ b/avahi-ui/bvnc.desktop.in.in