Codebase list ssh-contact / upstream/0.5
Imported Upstream version 0.5 Laurent Bigonville 12 years ago
8 changed file(s) with 39 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all
+5
-0
NEWS less more
0 NEW in 0.5
1 ==========
2
3 - Fixes bug #33579 - allow user to pass options to the ssh client
4
05 NEW in 0.4
16 ==========
27
+2
-2
aclocal.m4 less more
10271027 Consider adjusting the PKG_CONFIG_PATH environment variable if you
10281028 installed software in a non-standard prefix.
10291029
1030 _PKG_TEXT])dnl
1030 _PKG_TEXT])[]dnl
10311031 ])
10321032 elif test $pkg_failed = untried; then
10331033 AC_MSG_RESULT([no])
10381038
10391039 _PKG_TEXT
10401040
1041 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
1041 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
10421042 ])
10431043 else
10441044 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+10
-10
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.67 for ssh-contact 0.4.
2 # Generated by GNU Autoconf 2.67 for ssh-contact 0.5.
33 #
44 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact>.
55 #
705705 # Identity of this package.
706706 PACKAGE_NAME='ssh-contact'
707707 PACKAGE_TARNAME='ssh-contact'
708 PACKAGE_VERSION='0.4'
709 PACKAGE_STRING='ssh-contact 0.4'
708 PACKAGE_VERSION='0.5'
709 PACKAGE_STRING='ssh-contact 0.5'
710710 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact'
711711 PACKAGE_URL=''
712712
15001500 # Omit some internal or obsolete options to make the list less imposing.
15011501 # This message is too long to be a string in the A/UX 3.1 sh.
15021502 cat <<_ACEOF
1503 \`configure' configures ssh-contact 0.4 to adapt to many kinds of systems.
1503 \`configure' configures ssh-contact 0.5 to adapt to many kinds of systems.
15041504
15051505 Usage: $0 [OPTION]... [VAR=VALUE]...
15061506
15741574
15751575 if test -n "$ac_init_help"; then
15761576 case $ac_init_help in
1577 short | recursive ) echo "Configuration of ssh-contact 0.4:";;
1577 short | recursive ) echo "Configuration of ssh-contact 0.5:";;
15781578 esac
15791579 cat <<\_ACEOF
15801580
16981698 test -n "$ac_init_help" && exit $ac_status
16991699 if $ac_init_version; then
17001700 cat <<\_ACEOF
1701 ssh-contact configure 0.4
1701 ssh-contact configure 0.5
17021702 generated by GNU Autoconf 2.67
17031703
17041704 Copyright (C) 2010 Free Software Foundation, Inc.
20712071 This file contains any messages produced by compilers while
20722072 running configure, to aid debugging if configure makes a mistake.
20732073
2074 It was created by ssh-contact $as_me 0.4, which was
2074 It was created by ssh-contact $as_me 0.5, which was
20752075 generated by GNU Autoconf 2.67. Invocation command line was
20762076
20772077 $ $0 $@
29182918
29192919 # Define the identity of the package.
29202920 PACKAGE='ssh-contact'
2921 VERSION='0.4'
2921 VERSION='0.5'
29222922
29232923
29242924 # Some tools Automake needs.
1474814748 # report actual input values of CONFIG_FILES etc. instead of their
1474914749 # values after options handling.
1475014750 ac_log="
14751 This file was extended by ssh-contact $as_me 0.4, which was
14751 This file was extended by ssh-contact $as_me 0.5, which was
1475214752 generated by GNU Autoconf 2.67. Invocation command line was
1475314753
1475414754 CONFIG_FILES = $CONFIG_FILES
1481414814 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1481514815 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1481614816 ac_cs_version="\\
14817 ssh-contact config.status 0.4
14817 ssh-contact config.status 0.5
1481814818 configured by $0, generated by GNU Autoconf 2.67,
1481914819 with options \\"\$ac_cs_config\\"
1482014820
+1
-1
configure.ac less more
00 m4_define(released, 1)
1 AC_INIT(ssh-contact, 0.4, https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact)
1 AC_INIT(ssh-contact, 0.5, https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact)
22 AC_PREREQ(2.59)
33 AC_COPYRIGHT([
44 Copyright (C) 2010 Collabora Ltd.
+11
-1
src/client-helpers.c less more
259259 GStrv
260260 _client_create_exec_args (GSocket *socket,
261261 const gchar *contact_id,
262 const gchar *username)
262 const gchar *username,
263 gchar **ssh_opts)
263264 {
264265 GPtrArray *args;
265266 GSocketAddress *socket_address;
267268 guint16 port;
268269 gchar *host;
269270 gchar *str;
271 gchar **opt;
270272
271273 /* Get the local host and port on which sshd is running */
272274 socket_address = g_socket_get_local_address (socket, NULL);
297299 g_ptr_array_add (args, g_strdup (username));
298300 }
299301
302 if (ssh_opts != NULL)
303 {
304 for (opt = ssh_opts; *opt != NULL; opt++)
305 {
306 g_ptr_array_add (args, g_strdup (*opt));
307 }
308 }
309
300310 g_ptr_array_add (args, NULL);
301311
302312 return (gchar **) g_ptr_array_free (args, FALSE);
+1
-1
src/client-helpers.h less more
3434 GSocket *_client_create_local_socket (GError **error);
3535
3636 GStrv _client_create_exec_args (GSocket *socket, const gchar *contact_id,
37 const gchar *username);
37 const gchar *username, gchar **ssh_opts);
3838
3939 gboolean _capabilities_has_stream_tube (TpCapabilities *caps);
4040
+8
-2
src/client.c less more
3737 gchar *account_path;
3838 gchar *contact_id;
3939 gchar *login;
40 gchar **ssh_opts;
4041
4142 GList *accounts;
4243 guint n_readying_connections;
175176 ssh_socket_connected_cb, context);
176177
177178 args = _client_create_exec_args (socket, context->contact_id,
178 context->login);
179 context->login, context->ssh_opts);
179180
180181 /* spawn ssh client */
181182 if (g_spawn_async (NULL, args, NULL,
538539 g_free (context->account_path);
539540 g_free (context->contact_id);
540541 g_free (context->login);
542 g_strfreev (context->ssh_opts);
541543
542544 g_list_foreach (context->accounts, (GFunc) g_object_unref, NULL);
543545 g_list_free (context->accounts);
568570 0, G_OPTION_ARG_STRING, &context.login,
569571 "Specifies the user to log in as on the remote machine",
570572 NULL },
573 { G_OPTION_REMAINING, 0,
574 0, G_OPTION_ARG_STRING_ARRAY, &context.ssh_opts,
575 NULL,
576 NULL },
571577 { NULL }
572578 };
573579
574580 g_type_init ();
575581
576 optcontext = g_option_context_new ("- ssh-contact");
582 optcontext = g_option_context_new ("-- [OPTIONS FOR SSH CLIENT]");
577583 g_option_context_add_main_entries (optcontext, options, NULL);
578584 if (!g_option_context_parse (optcontext, &argc, &argv, &error))
579585 {
+1
-1
src/vinagre/tab.c less more
216216 ssh_socket_connected_cb, self);
217217
218218 get_connection_info (self, NULL, &contact_id, &username);
219 args = _client_create_exec_args (socket, contact_id, username);
219 args = _client_create_exec_args (socket, contact_id, username, NULL);
220220 vte_terminal_fork_command (VTE_TERMINAL (self->priv->vte), "ssh", args,
221221 NULL, NULL, FALSE, FALSE, FALSE);
222222