From: James Willcox Date: Thu, 10 May 2007 20:06:09 +0000 (+0000) Subject: s/zssh.exe/bssh.exe/ X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=ed07152bd1d6f28d05167dd915711098ea241609;p=catta s/zssh.exe/bssh.exe/ git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1481 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- diff --git a/avahi-ui-sharp/Makefile.am b/avahi-ui-sharp/Makefile.am index 33795cd..c5c14ee 100644 --- a/avahi-ui-sharp/Makefile.am +++ b/avahi-ui-sharp/Makefile.am @@ -19,7 +19,7 @@ ASSEMBLY = avahi-ui-sharp.dll -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config zssh.exe +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config bssh.exe AVAHISOURCES = \ $(srcdir)/ServiceDialog.cs @@ -31,7 +31,7 @@ EXTRA_DIST = \ $(srcdir)/en/*/*.xml \ $(srcdir)/gencfg.sh \ $(srcdir)/$(ASSEMBLY).config.in \ - $(srcdir)/zssh.cs + $(srcdir)/bssh.cs $(ASSEMBLY): $(AVAHISOURCES) mcs -keyfile:$(top_srcdir)/avahi-sharp/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -pkg:gtk-sharp-2.0 -r:$(top_builddir)/avahi-sharp/avahi-sharp.dll -r:Mono.Posix @@ -39,12 +39,12 @@ $(ASSEMBLY): $(AVAHISOURCES) $(ASSEMBLY).config: $(ASSEMBLY).config.in $(srcdir)/gencfg.sh $(top_builddir)/avahi-common/libavahi-common.la < $< > $@ -zssh.exe: $(srcdir)/zssh.cs $(ASSEMBLY) - mcs -out:$@ $(srcdir)/zssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix +bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY) + mcs -out:$@ $(srcdir)/bssh.cs -r:./avahi-ui-sharp.dll -r:../avahi-sharp/avahi-sharp.dll -pkg:gtk-sharp-2.0 -r:Mono.Posix if HAVE_MONO if HAVE_DBUS -all: $(ASSEMBLY) $(ASSEMBLY).config zssh.exe +all: $(ASSEMBLY) $(ASSEMBLY).config bssh.exe if HAVE_MONODOC update-docs: $(ASSEMBLY) diff --git a/avahi-ui-sharp/bssh.cs b/avahi-ui-sharp/bssh.cs new file mode 100644 index 0000000..003a3a6 --- /dev/null +++ b/avahi-ui-sharp/bssh.cs @@ -0,0 +1,39 @@ +using System; +using System.Diagnostics; +using Gtk; +using Avahi.UI; + +public class EntryPoint { + public static void Main () { + Application.Init (); + + ServiceDialog dialog = new ServiceDialog ("Choose SSH Server", null, + Stock.Cancel, ResponseType.Cancel, + Stock.Connect, ResponseType.Accept); + dialog.BrowseServiceTypes = new string[] { "_ssh._tcp" }; + dialog.ResolveServiceEnabled = true; + + if (dialog.Run () == (int) ResponseType.Accept) { + Console.WriteLine ("Connecting to {0}:{1}", dialog.Address, dialog.Port); + + string user = Environment.UserName; + + foreach (byte[] txtBytes in dialog.TxtData) { + string txt = System.Text.Encoding.UTF8.GetString (txtBytes); + string[] splitTxt = txt.Split(new char[] { '=' }, 2); + + if (splitTxt.Length != 2) + continue; + + if (splitTxt[0] == "u") { + user = splitTxt[1]; + } + + string args = String.Format ("gnome-terminal -t {0} -x ssh -p {1} -l {2} {3}", + dialog.HostName, dialog.Port, user, dialog.Address.ToString ()); + Console.WriteLine ("Launching: " + args); + Process.Start (args); + } + } + } +} diff --git a/avahi-ui-sharp/zssh.cs b/avahi-ui-sharp/zssh.cs deleted file mode 100644 index 003a3a6..0000000 --- a/avahi-ui-sharp/zssh.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Diagnostics; -using Gtk; -using Avahi.UI; - -public class EntryPoint { - public static void Main () { - Application.Init (); - - ServiceDialog dialog = new ServiceDialog ("Choose SSH Server", null, - Stock.Cancel, ResponseType.Cancel, - Stock.Connect, ResponseType.Accept); - dialog.BrowseServiceTypes = new string[] { "_ssh._tcp" }; - dialog.ResolveServiceEnabled = true; - - if (dialog.Run () == (int) ResponseType.Accept) { - Console.WriteLine ("Connecting to {0}:{1}", dialog.Address, dialog.Port); - - string user = Environment.UserName; - - foreach (byte[] txtBytes in dialog.TxtData) { - string txt = System.Text.Encoding.UTF8.GetString (txtBytes); - string[] splitTxt = txt.Split(new char[] { '=' }, 2); - - if (splitTxt.Length != 2) - continue; - - if (splitTxt[0] == "u") { - user = splitTxt[1]; - } - - string args = String.Format ("gnome-terminal -t {0} -x ssh -p {1} -l {2} {3}", - dialog.HostName, dialog.Port, user, dialog.Address.ToString ()); - Console.WriteLine ("Launching: " + args); - Process.Start (args); - } - } - } -}