From 6a0a77d6de264599797cd290d70415a5fe453093 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 6 Jun 2011 02:21:07 +0100 Subject: [PATCH 01/10] translations: ignore options file --- po/POTFILES.skip | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index d94ca941..da3e04da 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1,2 @@ SparkleShare/Nautilus/sparkleshare-nautilus-extension.py +SparkleLib/SparkleOptions.cs From 2a2916c1df6f7d783425edb08b44b203c3e8372a Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 14:40:06 +0100 Subject: [PATCH 02/10] build: add LICENSE to distcheck and ignore made tarballs --- .gitignore | 1 + Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 548e5639..9375b1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ SparkleShare/sparkleshare po/sparkleshare.pot SparkleShare/Nautilus/sparkleshare-nautilus-extension.py gnome-doc-utils.make +sparkleshare-* diff --git a/Makefile.am b/Makefile.am index b78adc24..6f2ce205 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,8 @@ SUBDIRS = \ data \ po -EXTRA_DIST = gnome-doc-utils.make +EXTRA_DIST = gnome-doc-utils.make \ + LICENSE DISTCLEANFILES = \ intltool-extract \ From 6d1e9b1f9d3e85ecdda8c8f725956a0ab09fd65a Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 14:43:18 +0100 Subject: [PATCH 03/10] translations: fix warning in ja.po --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 9ec158ec..74784962 100644 --- a/po/ja.po +++ b/po/ja.po @@ -289,7 +289,7 @@ msgstr "フォルダ'{0}'の同期中..." #: ../SparkleShare/SparkleIntro.cs:568 msgid "This may take a while.\n" -msgstr "しばらくお待ちください。" +msgstr "しばらくお待ちください。\n" #: ../SparkleShare/SparkleIntro.cs:569 msgid "Are you sure it’s not coffee o'clock?" From 3c7b1b0e34db86e06e024d741d5306a4ef82522c Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 15:06:30 +0100 Subject: [PATCH 04/10] Bump version to 0.2.1 --- SparkleShare/Mac/SparkleShare.csproj | 2 +- SparkleShare/Mac/SparkleShare.sln | 2 +- configure.ac | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index d261233e..89c1e10f 100644 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -11,7 +11,7 @@ SparkleShare SparkleShare v4.0 - 0.2 + 0.2.1 true diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln index a3404e29..5789b445 100644 --- a/SparkleShare/Mac/SparkleShare.sln +++ b/SparkleShare/Mac/SparkleShare.sln @@ -16,6 +16,6 @@ Global EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = SparkleShare.csproj - version = 0.2 + version = 0.2.1 EndGlobalSection EndGlobal diff --git a/configure.ac b/configure.ac index cd62f201..f4ad55be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. m4_define([sparkleshare_version], - [0.2]) + [0.2.1]) m4_define([sparkleshare_asm_version], - [0.2]) + [0.2.1]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) From 912de2fca284ba7a4fc34588d6ed594abf779e67 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 15:10:16 +0100 Subject: [PATCH 05/10] update NEWS --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index fb25d019..763aac1c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +0.2.1 for Linux and Mac (Wed Jun 8, 2011): + + Hylke: Fix bug where host names with a "-" in them weren't accepted. Fix + crash that happens when the user doesn't have their "Real Name" set in the + OS and a race condition connecting to the announcements server. + + 0.2 for Linux and Mac (Mon Jun 6, 2011): Hylke: Removed the dependancy on GitSharp. File rename detection support From e08ca676e844aad11d2e9745a20fcd9e318b87ad Mon Sep 17 00:00:00 2001 From: Alex Hudson Date: Wed, 8 Jun 2011 20:31:28 +0100 Subject: [PATCH 06/10] Allow Sparkle to link against a system SmartIrc4Net library --- Makefile.am | 2 +- build/build.environment.mk | 5 +++-- configure.ac | 11 ++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b78adc24..92fedd59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = \ build \ help \ - SmartIrc4net \ + ${SPARKLE_SMARTIRC4NETDIR} \ SparkleLib \ SparkleShare \ data \ diff --git a/build/build.environment.mk b/build/build.environment.mk index 277a5c5a..59717142 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -15,7 +15,8 @@ LINK_GTK = $(GTKSHARP_LIBS) LINK_GNOME = $(GNOME_SHARP_LIBS) LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS) LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS) -LINK_SMARTIRC4NET = -r:$(top_builddir)/$(SMARTIRC4NET_ASSEMBLY) +LINK_SMARTIRC4NET = $(SMARTIRC4NET_LIBS) +LINK_SMARTIRC4NET_LOCAL = -r:$(abs_top_builddir)/$(SMARTIRC4NET_ASSEMBLY) REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll @@ -25,7 +26,7 @@ REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX) LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE) -REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) +REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) $(LINK_SMARTIRC4NET_LOCAL) LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) diff --git a/configure.ac b/configure.ac index cd62f201..eaeb9f28 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,16 @@ dnl package checks, common for all configs SPARKLESHARE_CHECK_GTK_SHARP -SPARKLESHARE_SMARTIRC4NET + +PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net], + SPARKLE_SMARTIRC4NETDIR="" + , + SPARKLESHARE_SMARTIRC4NET + SMARTIRC4NET_LIBS="" + AC_SUBST(SMARTIRC4NET_LIBS) + SPARKLE_SMARTIRC4NETDIR="SmartIrc4net" + AC_SUBST(SPARKLE_SMARTIRC4NETDIR) +) dnl check for webkit-sharp PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no) From 1319a566f9b18ee604d91ca7e6f29ebf5bbcdd77 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 21:39:39 +0100 Subject: [PATCH 07/10] config: Only trim user name if it isn't null --- SparkleLib/SparkleConfig.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SparkleLib/SparkleConfig.cs b/SparkleLib/SparkleConfig.cs index e9603269..9995316c 100644 --- a/SparkleLib/SparkleConfig.cs +++ b/SparkleLib/SparkleConfig.cs @@ -62,12 +62,12 @@ namespace SparkleLib { SparkleBackend.Platform == PlatformID.MacOSX) { user_name = new UnixUserInfo (UnixEnvironment.UserName).RealName; - user_name = user_name.TrimEnd (",".ToCharArray()); - } if (string.IsNullOrEmpty (user_name)) user_name = Environment.UserName; + else + user_name = user_name.TrimEnd (",".ToCharArray()); TextWriter writer = new StreamWriter (Path); string n = Environment.NewLine; From 169b5dfd7a45ebf080c592fbafb290756a08657e Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 8 Jun 2011 22:37:29 +0100 Subject: [PATCH 08/10] about: remove references to SparkleLib --- SparkleLib/SparkleBackend.cs | 7 +++++++ SparkleLib/SparklePlatform.cs | 29 ----------------------------- SparkleShare/Mac/SparkleAbout.cs | 3 +-- SparkleShare/SparkleAbout.cs | 3 +-- SparkleShare/SparkleController.cs | 7 +++++++ 5 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 SparkleLib/SparklePlatform.cs diff --git a/SparkleLib/SparkleBackend.cs b/SparkleLib/SparkleBackend.cs index 7b5898b9..248cd3f6 100644 --- a/SparkleLib/SparkleBackend.cs +++ b/SparkleLib/SparkleBackend.cs @@ -55,6 +55,13 @@ namespace SparkleLib { } + public static string Version { + get { + return Defines.VERSION; + } + } + + // Strange magic needed by Platform () [DllImport ("libc")] static extern int uname (IntPtr buf); diff --git a/SparkleLib/SparklePlatform.cs b/SparkleLib/SparklePlatform.cs deleted file mode 100644 index 0601a7d0..00000000 --- a/SparkleLib/SparklePlatform.cs +++ /dev/null @@ -1,29 +0,0 @@ -// SparkleShare, a collaboration and sharing tool. -// Copyright (C) 2010 Hylke Bons -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - - -using System; -using System.IO; -using System.Collections.Generic; -using System.Xml; - -using Mono.Unix; - -namespace SparkleLib { - - - -} diff --git a/SparkleShare/Mac/SparkleAbout.cs b/SparkleShare/Mac/SparkleAbout.cs index 1f61f14b..8177789e 100644 --- a/SparkleShare/Mac/SparkleAbout.cs +++ b/SparkleShare/Mac/SparkleAbout.cs @@ -23,7 +23,6 @@ using MonoMac.Foundation; using MonoMac.AppKit; using MonoMac.ObjCRuntime; using MonoMac.WebKit; -using SparkleLib; namespace SparkleShare { @@ -101,7 +100,7 @@ namespace SparkleShare { }; VersionTextField = new NSTextField () { - StringValue = Defines.VERSION, + StringValue = SparkleShare.Controller.Version, Frame = new RectangleF (22, Frame.Height - 94, 318, 22), BackgroundColor = NSColor.White, Bordered = false, diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 5484c99b..19ee9c8d 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -21,7 +21,6 @@ using System.IO; using System.Net; using Gtk; -using SparkleLib; using Mono.Unix; namespace SparkleShare { @@ -76,7 +75,7 @@ namespace SparkleShare { box.ModifyBg (StateType.Normal, new TreeView ().Style.Base (StateType.Normal)); Label header = new Label () { - Markup = "SparkleShare\n" + Defines.VERSION + "", + Markup = "SparkleShare\n" + SparkleShare.SparkleController.Version + "", Xalign = 0, Xpad = 18, Ypad = 18 diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 5b8c8e5b..739f146e 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -985,6 +985,13 @@ namespace SparkleShare { } + public string Version { + get { + return SparkleBackend.Version; + } + } + + public void CheckForNewVersion () { WebClient web_client = new WebClient (); From 5be306ce9344bcac5ae3c53f36ab0a5be79b3fae Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 9 Jun 2011 02:10:50 +0100 Subject: [PATCH 09/10] controller: prevent nullreference exceptions for checking the version --- SparkleShare/SparkleController.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 739f146e..e6be1fc5 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -998,9 +998,12 @@ namespace SparkleShare { Uri uri = new Uri ("http://www.sparkleshare.org/version"); web_client.DownloadStringCompleted += delegate (object o, DownloadStringCompletedEventArgs args) { + if (args.Error != null) + return; + string new_version = args.Result.Trim (); - if (Defines.VERSION.Equals (new_version)) { + if (Version.Equals (new_version)) { if (VersionUpToDate != null) VersionUpToDate (); From cc8a1d68603e45f76435c0a755810209d95738bf Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Thu, 9 Jun 2011 13:17:46 +0100 Subject: [PATCH 10/10] about: fix compile error --- SparkleShare/SparkleAbout.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SparkleShare/SparkleAbout.cs b/SparkleShare/SparkleAbout.cs index 19ee9c8d..5e738371 100644 --- a/SparkleShare/SparkleAbout.cs +++ b/SparkleShare/SparkleAbout.cs @@ -75,7 +75,7 @@ namespace SparkleShare { box.ModifyBg (StateType.Normal, new TreeView ().Style.Base (StateType.Normal)); Label header = new Label () { - Markup = "SparkleShare\n" + SparkleShare.SparkleController.Version + "", + Markup = "SparkleShare\n" + SparkleShare.Controller.Version + "", Xalign = 0, Xpad = 18, Ypad = 18