Hello community, here is the log from the commit of package syncthing-gtk for openSUSE:Factory checked in at 2018-11-19 23:31:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old) and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syncthing-gtk" Mon Nov 19 23:31:36 2018 rev:28 rq:649917 version:0.9.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes 2018-10-01 08:17:32.601963037 +0200 +++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes 2018-11-19 23:31:56.027194733 +0100 @@ -1,0 +2,6 @@ +Sat Nov 17 14:12:12 UTC 2018 - [email protected] + +- Update to version 0.9.4.3: + * Fix support for write-only directory. + +------------------------------------------------------------------- Old: ---- syncthing-gtk-0.9.4.2.tar.gz New: ---- syncthing-gtk-0.9.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syncthing-gtk.spec ++++++ --- /var/tmp/diff_new_pack.Kc1U2h/_old 2018-11-19 23:31:58.075192370 +0100 +++ /var/tmp/diff_new_pack.Kc1U2h/_new 2018-11-19 23:31:58.079192366 +0100 @@ -19,7 +19,7 @@ %global __requires_exclude typelib\\((Caja|Nautilus|Nemo)\\) %define _name syncthing_gtk Name: syncthing-gtk -Version: 0.9.4.2 +Version: 0.9.4.3 Release: 0 Summary: Syncthing Gtk-based graphical interface License: GPL-2.0-or-later @@ -114,11 +114,7 @@ %endif %files -%if 0%{?suse_version} >= 1500 %license LICENSE -%else -%doc LICENSE -%endif %doc README.md %{_bindir}/%{name} %{_datadir}/%{name}/ ++++++ syncthing-gtk-0.9.4.2.tar.gz -> syncthing-gtk-0.9.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/glade/folder-edit.glade new/syncthing-gtk-0.9.4.3/glade/folder-edit.glade --- old/syncthing-gtk-0.9.4.2/glade/folder-edit.glade 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/glade/folder-edit.glade 2018-11-13 19:31:33.000000000 +0100 @@ -450,7 +450,7 @@ <object class="GtkLabel" id="label31"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Recieve Only Folder</property> + <property name="label" translatable="yes">_Receive Only Folder</property> <property name="use_underline">True</property> <property name="mnemonic_widget">vreadOnly</property> <attributes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/app.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/app.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/app.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/app.py 2018-11-13 19:31:33.000000000 +0100 @@ -39,7 +39,7 @@ log = logging.getLogger("App") # Internal version used by updater (if enabled) -INTERNAL_VERSION = "v0.9.4.2" +INTERNAL_VERSION = "v0.9.4.3" # Minimal Syncthing version supported by App MIN_ST_VERSION = "0.14.50" @@ -1046,7 +1046,7 @@ def cb_syncthing_folder_added(self, daemon, rid, r): self.show_folder( rid, r["label"], r["path"], - r["type"] in ["readonly", "sendonly"], + r["type"], r["ignorePerms"], r["rescanIntervalS"], r["fsWatcherEnabled"], @@ -1065,7 +1065,7 @@ folder["global"] = "%s %s, %s" % (global_files, _("Files"), sizeof_fmt(data["globalBytes"])) folder["local"] = "%s %s, %s" % (local_files, _("Files"), sizeof_fmt(data["localBytes"])) folder["oos"] = "%s %s, %s" % (need_files, _("Files"), sizeof_fmt(data["needBytes"])) - if folder["b_master"]: + if folder["folder_type"] == "sendonly": can_override = (need_files > 0) if can_override != folder["can_override"]: folder["can_override"] = can_override @@ -1404,7 +1404,7 @@ box.add_value("rescan", "rescan.svg", _("Rescan Interval")) box.add_value("shared", "shared.svg", _("Shared With")) # Add hidden stuff - box.add_hidden_value("b_master", folder_type) + box.add_hidden_value("folder_type", folder_type) box.add_hidden_value("can_override", False) box.add_hidden_value("devices", shared) box.add_hidden_value("norm_path", os.path.abspath(os.path.expanduser(path))) @@ -1427,11 +1427,10 @@ # Set values box.set_value("id", id) box.set_value("path", display_path) - box.add_hidden_value("b_master", False) + assert type(folder_type) != bool if folder_type == "receiveonly": box.set_value("folder_type", _("Receive Only")) elif folder_type == "sendonly": - box.set_value("b_master", True) box.set_value("folder_type", _("Send Only")) else: box.set_value("folder_type", _("Send & Receive")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/daemon.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/daemon.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/daemon.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/daemon.py 2018-11-13 19:31:33.000000000 +0100 @@ -619,7 +619,7 @@ def _syncthing_cb_version_known(self, version): """ - Called when version is recieved from daemon, either by + Called when version is received from daemon, either by calling /rest/version or from X-Syncthing-Version header. """ if not compare_version(version, MIN_VERSION): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/editordialog.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/editordialog.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/editordialog.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/editordialog.py 2018-11-13 19:31:33.000000000 +0100 @@ -366,7 +366,7 @@ def store_values(self, values): """ - 'values' parameter should be same as display_values recieved. + 'values' parameter should be same as display_values received. Iterates over values configuration values and puts stuff from UI back to self.values dict Returns True. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/foldereditor.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/foldereditor.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/foldereditor.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/foldereditor.py 2018-11-13 19:31:33.000000000 +0100 @@ -113,10 +113,13 @@ # Create structure if needed self.create_dicts(self.values, ("versioning", "params", "versionsPath")) self.values["versioning"]["params"]["versionsPath"] = value - elif key == "readOnly": - self.values["type"] = "sendonly" if value else "sendreceive" - elif key == "receiveOnly": - self.values["type"] = "receiveonly" + elif key in ("readOnly", "receiveonly"): + if self["vreadOnly"].get_active(): + self.values["type"] = "sendonly" + elif self["vreceiveOnly"].get_active(): + self.values["type"] = "receiveonly" + else: + self.values["type"] = "sendreceive" else: EditorDialog.set_value(self, key, value) @@ -229,6 +232,8 @@ key=lambda x : x.get_title().lower() )) box.set_color_hex(COLOR_NEW) + else: + self.app.daemon.reload_config() #@Overrides def ui_value_changed(self, w, *a): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/notifications.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/notifications.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/notifications.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/notifications.py 2018-11-13 19:31:33.000000000 +0100 @@ -7,13 +7,11 @@ """ from __future__ import unicode_literals -from syncthing_gtk.tools import IS_WINDOWS +from syncthing_gtk.tools import IS_WINDOWS, IS_GNOME DELAY = 5 # Display notification only after no file is downloaded for <DELAY> seconds ICON_DEF = "syncthing-gtk" ICON_ERR = "syncthing-gtk-error" -SERVER_CAPS = [] - HAS_DESKTOP_NOTIFY = False Notifications = None @@ -65,10 +63,10 @@ self.clean() def supports(self, caps, supported=True, unsupported=False): - if caps in SERVER_CAPS: - return supported - else: + if IS_GNOME: return unsupported + else: + return supported def addactions(self, n, actions=[], clear=True): if not self.supports("actions"): return @@ -278,9 +276,6 @@ """ Watches for filesystem changes and reports them to daemon """ def __init__(self, app, daemon): Notify.init("Syncthing GTK") - # Cache the server capabilities, as get_server_caps() always queries DBus - global SERVER_CAPS - SERVER_CAPS = Notify.get_server_caps() # Prepare stuff self.app = app self.daemon = daemon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.4.2/syncthing_gtk/tools.py new/syncthing-gtk-0.9.4.3/syncthing_gtk/tools.py --- old/syncthing-gtk-0.9.4.2/syncthing_gtk/tools.py 2018-09-23 08:57:46.000000000 +0200 +++ new/syncthing-gtk-0.9.4.3/syncthing_gtk/tools.py 2018-11-13 19:31:33.000000000 +0100 @@ -156,7 +156,7 @@ return timedelta(0) def parsetime(m): - """ Parses time recieved from Syncthing daemon """ + """ Parses time received from Syncthing daemon """ try: return parser.parse(m) except ValueError:
