diff --git a/README.md b/README.md index 961478b5..ca6307a4 100755 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ A complete, efficient and easy-to-use manager. Create and edit connections, grou ## Developing and Building -If you want to hack on and build Palette yourself, you'll need the following dependencies: +If you want to hack on and build EasySSH yourself, you'll need the following dependencies: * libgee-0.8-dev * libgtk-3-dev diff --git a/meson.build b/meson.build index 443b76e3..2a415742 100755 --- a/meson.build +++ b/meson.build @@ -55,7 +55,7 @@ executable( dependency('gtk+-3.0'), dependency('granite'), dependency('json-glib-1.0'), - dependency('vte-2.91'), + dependency('vte-2.91', version: '>0.52'), dependency('gee-0.8'), meson.get_compiler('c').find_library('m', required : false) ], diff --git a/snapcraft.yaml b/snapcraft.yaml index c551ab9e..4e49a3b8 100755 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -27,35 +27,30 @@ apps: parts: - valac: - plugin: autotools - source: http://download.gnome.org/sources/vala/0.38/vala-0.38.8.tar.xz - build-packages: - - flex - - bison - - build-essential - - libglib2.0-dev - - libgraphviz-dev - granite: + elementary: + plugin: nil + override-build: | + add-apt-repository -y ppa:elementary-os/stable + add-apt-repository -y ppa:elementary-os/os-patches + echo "Package: *" > /etc/apt/preferences.d/elementary-stable + echo "Pin: release o=LP-PPA-elementary-os-stable" >> /etc/apt/preferences.d/elementary-stable + echo "Pin-Priority: 1000" >> /etc/apt/preferences.d/elementary-stable + echo "Package: *" > /etc/apt/preferences.d/elementary-patches + echo "Pin: release o=LP-PPA-elementary-os-os-patches" >> /etc/apt/preferences.d/elementary-patches + echo "Pin-Priority: 1000" >> /etc/apt/preferences.d/elementary-patches + apt update + apt dist-upgrade -y + openssh: plugin: cmake - source: https://github.com/elementary/granite/archive/0.5.tar.gz source-type: tar - configflags: [-DCMAKE_BUILD_TYPE=Release, -DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_INSTALL_LIBDIR=/usr/lib] - build-packages: - - build-essential - - libgee-0.8-dev - - libgirepository1.0-dev - - libgtk-3-dev - - cmake - - gobject-introspection - + source: https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.6p1.tar.gz easyssh: plugin: meson meson-parameters: - --prefix=/usr source: https://github.com/muriloventuroso/easyssh.git source-type: git - after: [valac, granite] + after: [elementary, desktop-gnome-platform, openssh] build-packages: - build-essential - intltool diff --git a/src/Widgets/TerminalBox.vala b/src/Widgets/TerminalBox.vala index 17f8015b..cdde50d9 100755 --- a/src/Widgets/TerminalBox.vala +++ b/src/Widgets/TerminalBox.vala @@ -65,7 +65,7 @@ namespace EasySSH { } builder.append("\n"); var cmd = builder.str; - term.feed_child(cmd, cmd.length + 1); + term.feed_child(cmd.to_utf8 ()); } public void on_change_terminal (Vte.Terminal terminal) { @@ -133,11 +133,13 @@ namespace EasySSH { } private void term_send_password() { - term.feed_child(dataHost.password + "\n", dataHost.password.length + 1); + var cmd = dataHost.password + "\n"; + term.feed_child(cmd.to_utf8 ()); } private void term_send(string cmd) { - term.feed_child(cmd + "\n", cmd.length + 1); + var n_cmd = cmd + "\n"; + term.feed_child(n_cmd.to_utf8 ()); } private void remove_tab(Granite.Widgets.Tab tab) {