diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/configure.ac vinagre-2.30.1/configure.ac --- vinagre-2.30.0/configure.ac 2010-03-29 14:48:30.000000000 +0200 +++ vinagre-2.30.1/configure.ac 2010-05-04 15:10:03.000000000 +0200 @@ -1,7 +1,7 @@ # Vinagre autoconf AC_PREREQ([2.64]) -AC_INIT([vinagre],[2.30.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre],[vinagre],[http://projects.gnome.org/vinagre/]) +AC_INIT([vinagre],[2.30.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre],[vinagre],[http://projects.gnome.org/vinagre/]) AC_CONFIG_SRCDIR([vinagre/vinagre-main.c]) AC_CONFIG_HEADERS([config.h]) @@ -80,7 +80,7 @@ GTK_VNC_REQUIRED=0.3.10 AVAHI_REQUIRED=0.6.22 PANEL_REQUIRED_VERSION=2.0.0 -TELEPATHY_GLIB_REQUIRED=0.7.31 +TELEPATHY_GLIB_REQUIRED=0.9.0 XML_REQUIRED=2.6.31 VTE_REQUIRED=0.20 @@ -226,6 +226,10 @@ dnl **************************** AC_CHECK_HEADER(ifaddrs.h) AM_CONDITIONAL(SELF_IFADDRS, test "x$ac_cv_header_ifaddrs_h" != "xyes") +if test "x$ac_cv_header_ifaddrs_h" = "xyes"; then + AC_DEFINE(HAVE_IFADDRS_H, [1], [Define if we have system ifaddrs.h]) +fi + dnl active plugins for vinagre.schemas ACTIVE_PLUGINS="vnc" diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/data/vinagre.desktop.in vinagre-2.30.1/data/vinagre.desktop.in --- vinagre-2.30.0/data/vinagre.desktop.in 2010-03-29 14:59:17.000000000 +0200 +++ vinagre-2.30.1/data/vinagre.desktop.in 2010-05-04 15:18:42.000000000 +0200 @@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.30.0 +X-GNOME-Bugzilla-Version=2.30.1 diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/data/vinagre-file.desktop.in vinagre-2.30.1/data/vinagre-file.desktop.in --- vinagre-2.30.0/data/vinagre-file.desktop.in 2010-03-29 14:59:17.000000000 +0200 +++ vinagre-2.30.1/data/vinagre-file.desktop.in 2010-05-04 15:18:42.000000000 +0200 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.30.0 +X-GNOME-Bugzilla-Version=2.30.1 diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/data/vinagre.ui vinagre-2.30.1/data/vinagre.ui --- vinagre-2.30.0/data/vinagre.ui 2010-01-27 14:22:05.000000000 +0100 +++ vinagre-2.30.1/data/vinagre.ui 2010-04-28 01:55:07.000000000 +0200 @@ -582,7 +582,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - _Name: + _Name: True edit_bookmark_name_entry diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/debian/changelog vinagre-2.30.1/debian/changelog --- vinagre-2.30.0/debian/changelog 2010-05-18 13:24:24.000000000 +0200 +++ vinagre-2.30.1/debian/changelog 2010-05-18 13:24:24.000000000 +0200 @@ -1,3 +1,20 @@ +vinagre (2.30.1-0ubuntu1) lucid-proposed; urgency=low + + * New upstream version: + Fixes + - Fix a crash when using SSH tunneling due to a not exported symbol + - Added various comments for translators + - Bump telepathy minimum version to 0.9.0 + - Fix SSH username saving in bookmarks (lp: #545538) + - Make sure we use system ifaddrs.h thus showing the correct IP address in + the Reverse Connections dialog + * debian/control.in: + - updated telepathy-glib requirement + * debian/patches/90_workaround_undefined_symbol.patch: + - the change is in the new version + + -- Sebastien Bacher Tue, 18 May 2010 13:12:26 +0200 + vinagre (2.30.0-0ubuntu2) lucid; urgency=low * debian/patches/90_workaround_undefined_symbol.patch: diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/debian/control vinagre-2.30.1/debian/control --- vinagre-2.30.0/debian/control 2010-05-18 13:24:24.000000000 +0200 +++ vinagre-2.30.1/debian/control 2010-05-18 13:24:24.000000000 +0200 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Emilio Pozuelo Monfort -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Andrea Veri +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Andrea Veri Build-Depends: cdbs (>= 0.4.52), debhelper (>= 5.0.51~), gnome-doc-utils (>= 0.3.2), @@ -25,7 +25,7 @@ libvte-dev (>= 0.20), libxml2-dev (>= 2.6.31), libx11-dev, - libtelepathy-glib-dev (>= 0.7.31), + libtelepathy-glib-dev (>= 0.9), libdbus-glib-1-dev, gconf2, docbook-xml, diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/debian/control.in vinagre-2.30.1/debian/control.in --- vinagre-2.30.0/debian/control.in 2010-05-18 13:24:24.000000000 +0200 +++ vinagre-2.30.1/debian/control.in 2010-05-18 13:24:24.000000000 +0200 @@ -20,7 +20,7 @@ libvte-dev (>= 0.20), libxml2-dev (>= 2.6.31), libx11-dev, - libtelepathy-glib-dev (>= 0.7.31), + libtelepathy-glib-dev (>= 0.9), libdbus-glib-1-dev, gconf2, docbook-xml, diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/m4/libtool.m4 vinagre-2.30.1/m4/libtool.m4 --- vinagre-2.30.0/m4/libtool.m4 2010-03-29 14:58:39.000000000 +0200 +++ vinagre-2.30.1/m4/libtool.m4 2010-05-04 15:18:15.000000000 +0200 @@ -2445,7 +2445,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -3084,7 +3084,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3705,7 +3705,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3989,7 +3989,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4285,6 +4285,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4376,7 +4377,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -5860,7 +5861,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/m4/ltversion.m4 vinagre-2.30.1/m4/ltversion.m4 --- vinagre-2.30.0/m4/ltversion.m4 2010-03-29 14:58:39.000000000 +0200 +++ vinagre-2.30.1/m4/ltversion.m4 2010-05-04 15:18:15.000000000 +0200 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/NEWS vinagre-2.30.1/NEWS --- vinagre-2.30.0/NEWS 2010-03-29 14:49:49.000000000 +0200 +++ vinagre-2.30.1/NEWS 2010-05-04 15:17:03.000000000 +0200 @@ -1,3 +1,26 @@ +Vinagre 2.30.1 +=============== + + Fixes + + + Fix a crash when using SSH tunneling due to a not exported symbol + + Added various comments for translators + + Bump telepathy minimum version to 0.9.0 + + Fix SSH username saving in bookmarks + + Make sure we use system ifaddrs.h thus showing the correct IP address in + the Reverse Connections dialog + + UI translations + + + Andika Triwidada (id) + + Carles Ferrando (ca@valencia) + + Jordi Serratosa (ca) + + Kjartan Maraas (nb) + + Roman Mátyus (sk) + + Theppitak Karoonboonyanan (th) + + Xandru Armesto (ast) + + Žygimantas Beručka (lt) + Vinagre 2.30.0 =============== diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/getifaddrs.c vinagre-2.30.1/plugins/vnc/getifaddrs.c --- vinagre-2.30.0/plugins/vnc/getifaddrs.c 2010-01-27 13:22:36.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/getifaddrs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2006 WIDE Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include "ifaddrs.h" - -static int -get_lifreq(int fd, struct lifreq **ifr_ret) -{ - struct lifnum lifn; - struct lifconf lifc; - struct lifreq *lifrp; - - lifn.lifn_family = AF_UNSPEC; - lifn.lifn_flags = 0; - if (ioctl(fd, SIOCGLIFNUM, &lifn) == -1) - lifn.lifn_count = 16; - else - lifn.lifn_count += 16; - - for (;;) { - lifc.lifc_len = lifn.lifn_count * sizeof (*lifrp); - lifrp = malloc(lifc.lifc_len); - if (lifrp == NULL) - return (-1); - - lifc.lifc_family = AF_UNSPEC; - lifc.lifc_flags = 0; - lifc.lifc_buf = (char *)lifrp; - if (ioctl(fd, SIOCGLIFCONF, &lifc) == -1) { - free(lifrp); - if (errno == EINVAL) { - lifn.lifn_count <<= 1; - continue; - } - (void) close(fd); - return (-1); - } - if (lifc.lifc_len < (lifn.lifn_count - 1) * sizeof (*lifrp)) - break; - free(lifrp); - lifn.lifn_count <<= 1; - } - - *ifr_ret = lifrp; - - return (lifc.lifc_len / sizeof (*lifrp)); -} - -static size_t -nbytes(const struct lifreq *lifrp, int nlif, size_t socklen) -{ - size_t len = 0; - size_t slen; - - while (nlif > 0) { - slen = strlen(lifrp->lifr_name) + 1; - len += sizeof (struct ifaddrs) + ((slen + 3) & ~3); - len += 3 * socklen; - lifrp++; - nlif--; - } - return (len); -} - -static struct sockaddr * -addrcpy(struct sockaddr_storage *addr, char **bufp) -{ - char *buf = *bufp; - size_t len; - - len = addr->ss_family == AF_INET ? sizeof (struct sockaddr_in) : - sizeof (struct sockaddr_in6); - (void) memcpy(buf, addr, len); - *bufp = buf + len; - return ((struct sockaddr *)buf); -} - -static int -populate(struct ifaddrs *ifa, int fd, struct lifreq *lifrp, int nlif, int af, - char **bufp) -{ - char *buf = *bufp; - size_t slen; - - while (nlif > 0) { - ifa->ifa_next = (nlif > 1) ? ifa + 1 : NULL; - (void) strcpy(ifa->ifa_name = buf, lifrp->lifr_name); - slen = strlen(lifrp->lifr_name) + 1; - buf += (slen + 3) & ~3; - if (ioctl(fd, SIOCGLIFFLAGS, lifrp) == -1) - ifa->ifa_flags = 0; - else - ifa->ifa_flags = lifrp->lifr_flags; - if (ioctl(fd, SIOCGLIFADDR, lifrp) == -1) - ifa->ifa_addr = NULL; - else - ifa->ifa_addr = addrcpy(&lifrp->lifr_addr, &buf); - if (ioctl(fd, SIOCGLIFNETMASK, lifrp) == -1) - ifa->ifa_netmask = NULL; - else - ifa->ifa_netmask = addrcpy(&lifrp->lifr_addr, &buf); - if (ifa->ifa_flags & IFF_POINTOPOINT) { - if (ioctl(fd, SIOCGLIFDSTADDR, lifrp) == -1) - ifa->ifa_dstaddr = NULL; - else - ifa->ifa_dstaddr = - addrcpy(&lifrp->lifr_dstaddr, &buf); - } else if (ifa->ifa_flags & IFF_BROADCAST) { - if (ioctl(fd, SIOCGLIFBRDADDR, lifrp) == -1) - ifa->ifa_broadaddr = NULL; - else - ifa->ifa_broadaddr = - addrcpy(&lifrp->lifr_broadaddr, &buf); - } else { - ifa->ifa_dstaddr = NULL; - } - - ifa++; - nlif--; - lifrp++; - } - *bufp = buf; - return (0); -} - -int -getifaddrs(struct ifaddrs **ifap) -{ - int fd4, fd6; - int nif4, nif6 = 0; - struct lifreq *ifr4 = NULL; - struct lifreq *ifr6 = NULL; - struct ifaddrs *ifa = NULL; - char *buf; - - if ((fd4 = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - return (-1); - if ((fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) == -1 && - errno != EAFNOSUPPORT) { - (void) close(fd4); - return (-1); - } - - if ((nif4 = get_lifreq(fd4, &ifr4)) == -1 || - (fd6 != -1 && (nif6 = get_lifreq(fd6, &ifr6)) == -1)) - goto failure; - - if (nif4 == 0 && nif6 == 0) { - *ifap = NULL; - return (0); - } - - ifa = malloc(nbytes(ifr4, nif4, sizeof (struct sockaddr_in)) + - nbytes(ifr6, nif6, sizeof (struct sockaddr_in6))); - if (ifa == NULL) - goto failure; - - buf = (char *)(ifa + nif4 + nif6); - - if (populate(ifa, fd4, ifr4, nif4, AF_INET, &buf) == -1) - goto failure; - if (nif4 > 0 && nif6 > 0) - ifa[nif4 - 1].ifa_next = ifa + nif4; - if (populate(ifa + nif4, fd6, ifr6, nif6, AF_INET6, &buf) == -1) - goto failure; - - *ifap = ifa; - return (0); - -failure: - free(ifa); - (void) close(fd4); - if (fd6 != -1) - (void) close(fd6); - free(ifr4); - free(ifr6); - return (-1); -} - -void -freeifaddrs(struct ifaddrs *ifa) -{ - free(ifa); -} diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/if/getifaddrs.c vinagre-2.30.1/plugins/vnc/if/getifaddrs.c --- vinagre-2.30.0/plugins/vnc/if/getifaddrs.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/if/getifaddrs.c 2010-04-09 03:00:45.000000000 +0200 @@ -0,0 +1,217 @@ +/* + * Copyright (c) 2006 WIDE Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "ifaddrs.h" + +static int +get_lifreq(int fd, struct lifreq **ifr_ret) +{ + struct lifnum lifn; + struct lifconf lifc; + struct lifreq *lifrp; + + lifn.lifn_family = AF_UNSPEC; + lifn.lifn_flags = 0; + if (ioctl(fd, SIOCGLIFNUM, &lifn) == -1) + lifn.lifn_count = 16; + else + lifn.lifn_count += 16; + + for (;;) { + lifc.lifc_len = lifn.lifn_count * sizeof (*lifrp); + lifrp = malloc(lifc.lifc_len); + if (lifrp == NULL) + return (-1); + + lifc.lifc_family = AF_UNSPEC; + lifc.lifc_flags = 0; + lifc.lifc_buf = (char *)lifrp; + if (ioctl(fd, SIOCGLIFCONF, &lifc) == -1) { + free(lifrp); + if (errno == EINVAL) { + lifn.lifn_count <<= 1; + continue; + } + (void) close(fd); + return (-1); + } + if (lifc.lifc_len < (lifn.lifn_count - 1) * sizeof (*lifrp)) + break; + free(lifrp); + lifn.lifn_count <<= 1; + } + + *ifr_ret = lifrp; + + return (lifc.lifc_len / sizeof (*lifrp)); +} + +static size_t +nbytes(const struct lifreq *lifrp, int nlif, size_t socklen) +{ + size_t len = 0; + size_t slen; + + while (nlif > 0) { + slen = strlen(lifrp->lifr_name) + 1; + len += sizeof (struct ifaddrs) + ((slen + 3) & ~3); + len += 3 * socklen; + lifrp++; + nlif--; + } + return (len); +} + +static struct sockaddr * +addrcpy(struct sockaddr_storage *addr, char **bufp) +{ + char *buf = *bufp; + size_t len; + + len = addr->ss_family == AF_INET ? sizeof (struct sockaddr_in) : + sizeof (struct sockaddr_in6); + (void) memcpy(buf, addr, len); + *bufp = buf + len; + return ((struct sockaddr *)buf); +} + +static int +populate(struct ifaddrs *ifa, int fd, struct lifreq *lifrp, int nlif, int af, + char **bufp) +{ + char *buf = *bufp; + size_t slen; + + while (nlif > 0) { + ifa->ifa_next = (nlif > 1) ? ifa + 1 : NULL; + (void) strcpy(ifa->ifa_name = buf, lifrp->lifr_name); + slen = strlen(lifrp->lifr_name) + 1; + buf += (slen + 3) & ~3; + if (ioctl(fd, SIOCGLIFFLAGS, lifrp) == -1) + ifa->ifa_flags = 0; + else + ifa->ifa_flags = lifrp->lifr_flags; + if (ioctl(fd, SIOCGLIFADDR, lifrp) == -1) + ifa->ifa_addr = NULL; + else + ifa->ifa_addr = addrcpy(&lifrp->lifr_addr, &buf); + if (ioctl(fd, SIOCGLIFNETMASK, lifrp) == -1) + ifa->ifa_netmask = NULL; + else + ifa->ifa_netmask = addrcpy(&lifrp->lifr_addr, &buf); + if (ifa->ifa_flags & IFF_POINTOPOINT) { + if (ioctl(fd, SIOCGLIFDSTADDR, lifrp) == -1) + ifa->ifa_dstaddr = NULL; + else + ifa->ifa_dstaddr = + addrcpy(&lifrp->lifr_dstaddr, &buf); + } else if (ifa->ifa_flags & IFF_BROADCAST) { + if (ioctl(fd, SIOCGLIFBRDADDR, lifrp) == -1) + ifa->ifa_broadaddr = NULL; + else + ifa->ifa_broadaddr = + addrcpy(&lifrp->lifr_broadaddr, &buf); + } else { + ifa->ifa_dstaddr = NULL; + } + + ifa++; + nlif--; + lifrp++; + } + *bufp = buf; + return (0); +} + +int +getifaddrs(struct ifaddrs **ifap) +{ + int fd4, fd6; + int nif4, nif6 = 0; + struct lifreq *ifr4 = NULL; + struct lifreq *ifr6 = NULL; + struct ifaddrs *ifa = NULL; + char *buf; + + if ((fd4 = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + return (-1); + if ((fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) == -1 && + errno != EAFNOSUPPORT) { + (void) close(fd4); + return (-1); + } + + if ((nif4 = get_lifreq(fd4, &ifr4)) == -1 || + (fd6 != -1 && (nif6 = get_lifreq(fd6, &ifr6)) == -1)) + goto failure; + + if (nif4 == 0 && nif6 == 0) { + *ifap = NULL; + return (0); + } + + ifa = malloc(nbytes(ifr4, nif4, sizeof (struct sockaddr_in)) + + nbytes(ifr6, nif6, sizeof (struct sockaddr_in6))); + if (ifa == NULL) + goto failure; + + buf = (char *)(ifa + nif4 + nif6); + + if (populate(ifa, fd4, ifr4, nif4, AF_INET, &buf) == -1) + goto failure; + if (nif4 > 0 && nif6 > 0) + ifa[nif4 - 1].ifa_next = ifa + nif4; + if (populate(ifa + nif4, fd6, ifr6, nif6, AF_INET6, &buf) == -1) + goto failure; + + *ifap = ifa; + return (0); + +failure: + free(ifa); + (void) close(fd4); + if (fd6 != -1) + (void) close(fd6); + free(ifr4); + free(ifr6); + return (-1); +} + +void +freeifaddrs(struct ifaddrs *ifa) +{ + free(ifa); +} diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/if/ifaddrs.h vinagre-2.30.1/plugins/vnc/if/ifaddrs.h --- vinagre-2.30.0/plugins/vnc/if/ifaddrs.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/if/ifaddrs.h 2010-04-09 03:00:45.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2006 WIDE Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __IFADDRS_H +#define __IFADDRS_H + +#include + +#undef ifa_broadaddr +#undef ifa_dstaddr +struct ifaddrs { + struct ifaddrs *ifa_next; /* Pointer to next struct */ + char *ifa_name; /* Interface name */ + uint64_t ifa_flags; /* Interface flags */ + struct sockaddr *ifa_addr; /* Interface address */ + struct sockaddr *ifa_netmask; /* Interface netmask */ + struct sockaddr *ifa_dstaddr; /* P2P interface destination */ +}; +#define ifa_broadaddr ifa_dstaddr + +extern int getifaddrs(struct ifaddrs **); +extern void freeifaddrs(struct ifaddrs *); +#endif diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/ifaddrs.h vinagre-2.30.1/plugins/vnc/ifaddrs.h --- vinagre-2.30.0/plugins/vnc/ifaddrs.h 2010-01-27 13:22:36.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/ifaddrs.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2006 WIDE Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef __IFADDRS_H -#define __IFADDRS_H - -#include - -#undef ifa_broadaddr -#undef ifa_dstaddr -struct ifaddrs { - struct ifaddrs *ifa_next; /* Pointer to next struct */ - char *ifa_name; /* Interface name */ - uint64_t ifa_flags; /* Interface flags */ - struct sockaddr *ifa_addr; /* Interface address */ - struct sockaddr *ifa_netmask; /* Interface netmask */ - struct sockaddr *ifa_dstaddr; /* P2P interface destination */ -}; -#define ifa_broadaddr ifa_dstaddr - -extern int getifaddrs(struct ifaddrs **); -extern void freeifaddrs(struct ifaddrs *); -#endif diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/Makefile.am vinagre-2.30.1/plugins/vnc/Makefile.am --- vinagre-2.30.0/plugins/vnc/Makefile.am 2010-01-27 13:22:36.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/Makefile.am 2010-04-29 16:11:36.000000000 +0200 @@ -18,7 +18,7 @@ vinagre-vnc-tunnel.h vinagre-vnc-tunnel.c if SELF_IFADDRS -libvnc_la_SOURCES += ifaddrs.h getifaddrs.c +libvnc_la_SOURCES += if/ifaddrs.h if/getifaddrs.c endif libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/vinagre-vnc-listener-dialog.c vinagre-2.30.1/plugins/vnc/vinagre-vnc-listener-dialog.c --- vinagre-2.30.0/plugins/vnc/vinagre-vnc-listener-dialog.c 2010-01-27 13:22:36.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/vinagre-vnc-listener-dialog.c 2010-04-29 16:11:43.000000000 +0200 @@ -18,14 +18,18 @@ * along with this program. If not, see . */ +#include + #include #include #include + #ifdef HAVE_IFADDRS_H #include #else -#include "ifaddrs.h" +#include "if/ifaddrs.h" #endif + #include #include diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/vinagre-vnc-plugin.c vinagre-2.30.1/plugins/vnc/vinagre-vnc-plugin.c --- vinagre-2.30.0/plugins/vnc/vinagre-vnc-plugin.c 2010-03-20 17:39:15.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/vinagre-vnc-plugin.c 2010-04-28 02:21:04.000000000 +0200 @@ -81,6 +81,7 @@ { { "VNCListener", NULL, + /* Translators: "Reverse" here is an adjective, not a verb. */ N_("_Reverse Connections..."), NULL, N_("Configure incoming VNC connections"), @@ -274,12 +275,14 @@ if (!g_key_file_has_group (file, "connection")) { + /* Translators: Do not translate "connection". It's the name of a group in the .vnc (.ini like) file. */ *error_msg = g_strdup (_("The file is not a VNC one: Missing the group \"connection\".")); goto the_end; } if (!g_key_file_has_key (file, "connection", "host", NULL)) { + /* Translators: Do not translate "host". It's the name of a key in the .vnc (.ini like) file. */ *error_msg = g_strdup (_("The file is not a VNC one: Missing the key \"host\".")); goto the_end; } diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/plugins/vnc/vinagre-vnc-tab.c vinagre-2.30.1/plugins/vnc/vinagre-vnc-tab.c --- vinagre-2.30.0/plugins/vnc/vinagre-vnc-tab.c 2010-02-02 15:37:07.000000000 +0100 +++ vinagre-2.30.1/plugins/vnc/vinagre-vnc-tab.c 2010-04-28 02:11:11.000000000 +0200 @@ -356,7 +356,7 @@ name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); emphasis = g_strdup_printf ("%s", name); - /* Translators: %s is a host name or IP address; %u is a code error (number). */ + /* Translators: %s is a host name or IP address; %u is a code error (number). Also, the right sentence would be ... method for host... */ g_string_printf (message, _("Authentication method to host %s is unsupported. (%u)"), emphasis, auth_type); diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/README vinagre-2.30.1/README --- vinagre-2.30.0/README 2010-03-29 14:48:40.000000000 +0200 +++ vinagre-2.30.1/README 2010-05-04 15:10:34.000000000 +0200 @@ -1,4 +1,4 @@ -Vinagre 2.30.0 +Vinagre 2.30.1 =============== This is vinagre, a remote desktop viewer for the GNOME Desktop. diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-connect.c vinagre-2.30.1/vinagre/vinagre-connect.c --- vinagre-2.30.0/vinagre/vinagre-connect.c 2010-02-02 01:23:54.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-connect.c 2010-04-28 02:27:27.000000000 +0200 @@ -84,6 +84,7 @@ if (!gtk_combo_box_get_active_iter (combo, &tree_iter)) { + /* Translators: Please consider the word "from" instead of "in". I'll fix this phrase for 2.31 (or 3.0) */ g_warning (_("Could not get the active protocol in the protocol list.")); return; } diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-connection.c vinagre-2.30.1/vinagre/vinagre-connection.c --- vinagre-2.30.0/vinagre/vinagre-connection.c 2010-02-01 21:50:57.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-connection.c 2010-04-29 14:29:13.000000000 +0200 @@ -186,6 +186,7 @@ xmlTextWriterWriteElement (writer, "protocol", conn->priv->protocol); xmlTextWriterWriteElement (writer, "name", conn->priv->name); xmlTextWriterWriteElement (writer, "host", conn->priv->host); + xmlTextWriterWriteElement (writer, "username", conn->priv->username ? conn->priv->username : ""); xmlTextWriterWriteFormatElement (writer, "port", "%d", conn->priv->port); xmlTextWriterWriteFormatElement (writer, "fullscreen", "%d", conn->priv->fullscreen); } @@ -204,6 +205,8 @@ vinagre_connection_set_host (conn, s_value); else if (!xmlStrcmp(curr->name, (const xmlChar *)"name")) vinagre_connection_set_name (conn, s_value); + else if (!xmlStrcmp(curr->name, (const xmlChar *)"username")) + vinagre_connection_set_username (conn, s_value); else if (!xmlStrcmp(curr->name, (const xmlChar *)"port")) vinagre_connection_set_port (conn, atoi (s_value)); else if (!xmlStrcmp(curr->name, (const xmlChar *)"fullscreen")) @@ -401,7 +404,7 @@ void vinagre_connection_set_username (VinagreConnection *conn, - const gchar *username) + const gchar *username) { g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-main.c vinagre-2.30.1/vinagre/vinagre-main.c --- vinagre-2.30.0/vinagre/vinagre-main.c 2010-01-29 15:30:23.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-main.c 2010-04-14 14:36:43.000000000 +0200 @@ -40,6 +40,7 @@ #include "vinagre-plugin-info.h" #include "vinagre-plugin-info-priv.h" #include "vinagre-debug.h" +#include "vinagre-ssh.h" #ifdef HAVE_TELEPATHY #include "vinagre-tubes-manager.h" @@ -223,6 +224,9 @@ vinagre_tubes_manager = vinagre_tubes_manager_new (window); #endif + /* fake call, just to ensure this symbol will be present at vinagre.so */ + vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL); + gtk_main (); #ifdef HAVE_TELEPATHY diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-mdns.c vinagre-2.30.1/vinagre/vinagre-mdns.c --- vinagre-2.30.0/vinagre/vinagre-mdns.c 2010-02-02 01:23:54.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-mdns.c 2010-04-28 02:34:58.000000000 +0200 @@ -239,6 +239,7 @@ mdns->priv->client, &error)) { + /* Translators: "Browse for hosts" means the ability to find/locate some machines [with the VNC service enabled] in the local network */ g_warning (_("Failed to browse for hosts: %s\n"), error->message); g_error_free (error); return; diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-plugin-manager.c vinagre-2.30.1/vinagre/vinagre-plugin-manager.c --- vinagre-2.30.0/vinagre/vinagre-plugin-manager.c 2009-07-27 13:59:32.000000000 +0200 +++ vinagre-2.30.1/vinagre/vinagre-plugin-manager.c 2010-04-28 02:43:16.000000000 +0200 @@ -43,6 +43,7 @@ }; #define PLUGIN_MANAGER_NAME_TITLE _("Plugin") +/* Translators: "Enabled" is the title of a column in the plugins treeview. This column shows a checkbox, where the plugin can be [de]activated. If it's activated, its status is "enabled" and the checkbox is checked. */ #define PLUGIN_MANAGER_ACTIVE_TITLE _("Enabled") #define VINAGRE_PLUGIN_MANAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_PLUGIN_MANAGER, VinagrePluginManagerPrivate)) diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-ssh.c vinagre-2.30.1/vinagre/vinagre-ssh.c --- vinagre-2.30.0/vinagre/vinagre-ssh.c 2010-02-08 21:24:20.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-ssh.c 2010-04-14 14:32:26.000000000 +0200 @@ -664,7 +664,8 @@ GInputStream *is; GDataInputStream *error_stream; - g_return_val_if_fail (hostname != NULL, FALSE); + if (!hostname) + return FALSE; if (vendor == SSH_VENDOR_INVALID) vendor = get_ssh_client_vendor (); diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-tab.c vinagre-2.30.1/vinagre/vinagre-tab.c --- vinagre-2.30.0/vinagre/vinagre-tab.c 2010-01-29 18:57:32.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-tab.c 2010-04-28 02:49:26.000000000 +0200 @@ -831,6 +831,7 @@ name = vinagre_connection_get_best_name (tab->priv->conn); suggested_filename = g_string_new (NULL); + /* Translators: This is the suggested filename (in save dialog) when taking a screenshot of the connection. %s will be replaced by the friendly name of the connection, for instance: Screenshot of wendell@wendell-laptop, or Screenshot of 200.100.100.123 */ g_string_printf (suggested_filename, _("Screenshot of %s"), name); g_string_append (suggested_filename, ".png"); g_free (name); diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-tube-handler.c vinagre-2.30.1/vinagre/vinagre-tube-handler.c --- vinagre-2.30.0/vinagre/vinagre-tube-handler.c 2010-01-25 18:22:52.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-tube-handler.c 2010-04-28 02:53:44.000000000 +0200 @@ -459,10 +459,12 @@ if (error != NULL) { - error_msg = g_strdup_printf - (_("Impossible to get the contact name: %s"), error->message); - vinagre_utils_show_error (NULL, (const gchar *) error_msg, - GTK_WINDOW (priv->window)); + /* Translators: this is an error message when we fail to get the name of an empathy/telepathy buddy. %s will be replaced by the actual error message. */ + error_msg = g_strdup_printf (_("Impossible to get the contact name: %s"), + error->message); + vinagre_utils_show_error (NULL, + (const gchar *) error_msg, + GTK_WINDOW (priv->window)); g_free (error_msg); g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); return; diff -Nru --exclude 'config.*' --exclude configure --exclude Makefile.in --exclude po --exclude gnome-doc-utils.make --exclude 'aclocal*' --exclude ltmain.sh --exclude compile --exclude 90_workaround_undefined_symbol.patch vinagre-2.30.0/vinagre/vinagre-utils.c vinagre-2.30.1/vinagre/vinagre-utils.c --- vinagre-2.30.0/vinagre/vinagre-utils.c 2010-01-29 14:29:34.000000000 +0100 +++ vinagre-2.30.1/vinagre/vinagre-utils.c 2010-04-14 14:34:24.000000000 +0200 @@ -607,13 +607,6 @@ return TRUE; } -#include "vinagre-ssh.h" -static void -shit (void) -{ - vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL); -} - typedef struct { GtkWidget *uname, *pw, *button; } ControlOKButton;