Hello community, here is the log from the commit of package syncthing-gtk for openSUSE:Factory checked in at 2015-06-12 20:31:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old) and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syncthing-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes 2015-06-11 08:23:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes 2015-06-12 20:32:12.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 11 21:32:11 UTC 2015 - sor.ale...@meowr.ru + +- Update to 0.7.3: + * Fix IPv6 address cut out in 'Add new device' dialog. + * Fix broken filesystem watcher. + +------------------------------------------------------------------- Old: ---- syncthing-gtk-0.7.2.tar.gz New: ---- syncthing-gtk-0.7.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncthing-gtk.spec ++++++ --- /var/tmp/diff_new_pack.nOmgME/_old 2015-06-12 20:32:13.000000000 +0200 +++ /var/tmp/diff_new_pack.nOmgME/_new 2015-06-12 20:32:13.000000000 +0200 @@ -19,7 +19,7 @@ %global __requires_exclude typelib\\(Caja\\)|typelib\\(Nautilus\\)|typelib\\(Nemo\\) %define _name syncthing_gtk Name: syncthing-gtk -Version: 0.7.2 +Version: 0.7.3 Release: 0 Summary: Syncthing Gtk-based graphical interface License: GPL-2.0+ @@ -28,10 +28,10 @@ Source: https://github.com/syncthing/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gobject-introspection-1.0) Requires: psmisc Requires: python-dateutil Requires: python-gobject ++++++ syncthing-gtk-0.7.2.tar.gz -> syncthing-gtk-0.7.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.7.2/app.glade new/syncthing-gtk-0.7.3/app.glade --- old/syncthing-gtk-0.7.2/app.glade 2015-06-01 11:53:33.000000000 +0200 +++ new/syncthing-gtk-0.7.3/app.glade 2015-06-10 17:44:51.000000000 +0200 @@ -463,7 +463,7 @@ <object class="GtkImageMenuItem" id="menu-popup-override"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Override Changes</property> + <property name="label" translatable="yes">Override Remote Changes</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="always_show_image">True</property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.7.2/scripts/syncthing-gtk-exe.py new/syncthing-gtk-0.7.3/scripts/syncthing-gtk-exe.py --- old/syncthing-gtk-0.7.2/scripts/syncthing-gtk-exe.py 2015-06-01 11:53:33.000000000 +0200 +++ new/syncthing-gtk-0.7.3/scripts/syncthing-gtk-exe.py 2015-06-10 17:44:51.000000000 +0200 @@ -8,6 +8,7 @@ # Usually from syncthing_gtk.tools import get_install_path path = get_install_path() + os.chdir(path) # Tell cx_Freeze that I really need this library gi.require_foreign('cairo') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.7.2/syncthing_gtk/app.py new/syncthing-gtk-0.7.3/syncthing_gtk/app.py --- old/syncthing-gtk-0.7.2/syncthing_gtk/app.py 2015-06-01 11:53:33.000000000 +0200 +++ new/syncthing-gtk-0.7.3/syncthing_gtk/app.py 2015-06-10 17:44:51.000000000 +0200 @@ -761,12 +761,18 @@ self.show_error_box(r, {"nid" : nid, "rid" : rid} ) def cb_syncthing_device_rejected(self, daemon, nid, address): - address = address.split(":")[0] # Remove port from address, it's random by default anyway + # Remove port from address, it's random by default anyway + if "[" in address: + # IPv6 address + address = address.split("]:")[0] + "]" + else: + # IPv4 + address = address.split(":")[0] if (nid, address) in self.error_messages: # Store as error message and don't display twice return self.error_messages.add((nid, address)) - markup = _('Device "<b>%s</b>" at IP "<b>%s</b> wants to connect. Add new device?"') % (nid, address) + markup = _('Device "<b>%s</b>" at IP "<b>%s</b>" wants to connect. Add new device?') % (nid, address) r = RIBar("", Gtk.MessageType.WARNING,) r.get_label().set_markup(markup) r.add_button(RIBar.build_button(_("_Add")), RESPONSE_FIX_NEW_DEVICE) @@ -891,7 +897,6 @@ device.set_status(_("Up to Date")) def cb_syncthing_folder_added(self, daemon, rid, r): - print "cb_syncthing_folder_added", rid box = self.show_folder( rid, r["path"], r["path"], r["readOnly"], r["ignorePerms"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.7.2/syncthing_gtk/daemonsettings.py new/syncthing-gtk-0.7.3/syncthing_gtk/daemonsettings.py --- old/syncthing-gtk-0.7.2/syncthing_gtk/daemonsettings.py 2015-06-01 11:53:33.000000000 +0200 +++ new/syncthing-gtk-0.7.3/syncthing_gtk/daemonsettings.py 2015-06-10 17:44:51.000000000 +0200 @@ -41,9 +41,9 @@ #@Overrides def set_value(self, key, value): if key == "listenAddress": - self.values[key] = [ strip_v(x) for x in value.split(",") ] + self.values[key] = [ x.strip(" \t") for x in value.split(",") ] elif key == "globalAnnounceServers": - self.values[key] = [ strip_v(x) for x in value.split(",") ] + self.values[key] = [ x.strip(" \t") for x in value.split(",") ] elif key == "urAccepted": self.values[key] = 1 if value else -1 elif key == "maxSendKbpsEnabled": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.7.2/syncthing_gtk/watcher.py new/syncthing-gtk-0.7.3/syncthing_gtk/watcher.py --- old/syncthing-gtk-0.7.2/syncthing_gtk/watcher.py 2015-06-01 11:53:33.000000000 +0200 +++ new/syncthing-gtk-0.7.3/syncthing_gtk/watcher.py 2015-06-10 17:44:51.000000000 +0200 @@ -82,7 +82,7 @@ if event.mask & pyinotify.IN_ISDIR != 0: if event.mask & pyinotify.IN_CREATE != 0: # New dir - Add watch to created dir as well - self.watch(event.pathname.decode("utf-8")) + self.watch(None, event.pathname.decode("utf-8")) self._report_created(event.pathname) elif event.mask & pyinotify.IN_DELETE != 0: # Deleted dir - Remove watch to deleted dir @@ -114,7 +114,7 @@ return True # Repeat until killed def _report_created(self, path): - if not enabled: return + if not self.enabled: return path = path.decode("utf-8") folder_id, relpath = self.app.get_folder_n_path(path) log.debug("File Created %s %s > %s", folder_id, path, relpath) @@ -122,7 +122,7 @@ self.daemon.rescan(folder_id, relpath) def _report_changed(self, path): - if not enabled: return + if not self.enabled: return path = path.decode("utf-8") folder_id, relpath = self.app.get_folder_n_path(path) log.debug("File Changed %s %s > %s", folder_id, path, relpath) @@ -130,7 +130,7 @@ self.daemon.rescan(folder_id, relpath) def _report_deleted(self, path): - if not enabled: return + if not self.enabled: return path = path.decode("utf-8") folder_id, relpath = self.app.get_folder_n_path(path) log.debug("File Deleted %s %s > %s", folder_id, path, relpath)
