diff options
29 files changed, 297 insertions, 313 deletions
diff --git a/Makefile.in b/Makefile.in index 40fdcd6..caff2bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,7 +39,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ AUTHORS NEWS config.guess config.sub install-sh ltmain.sh \ missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -129,8 +130,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -150,7 +149,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -164,7 +162,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -188,7 +185,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -1,3 +1,7 @@ +0.4.2 for Linux and Mac (Fri Dec 2 2011): + Hylke: Fix crash trying to add a project + + 0.4.1 for Linux and Mac (Tue Nov 29 2011): Hylke: Just some small tweaks and fixes: diff --git a/SparkleLib/AssemblyInfo.cs b/SparkleLib/AssemblyInfo.cs index 2f4b094..73ec2ee 100644 --- a/SparkleLib/AssemblyInfo.cs +++ b/SparkleLib/AssemblyInfo.cs @@ -7,5 +7,5 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("0.4.1")] +[assembly: AssemblyVersion("0.4.2")] [assembly: AssemblyTitle ("SparkleShare")] diff --git a/SparkleLib/Defines.cs b/SparkleLib/Defines.cs index a06a8ee..080de40 100644 --- a/SparkleLib/Defines.cs +++ b/SparkleLib/Defines.cs @@ -20,7 +20,7 @@ namespace SparkleLib { public class Defines { - public const string VERSION = "0.4.1"; + public const string VERSION = "0.4.2"; public const string LOCALE_DIR = "/usr/local/share/locale"; public const string DATAROOTDIR = "/usr/local/share"; public const string GETTEXT_PACKAGE = "sparkleshare"; diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs index f9f7803..79ad2a8 100755 --- a/SparkleLib/Git/SparkleFetcherGit.cs +++ b/SparkleLib/Git/SparkleFetcherGit.cs @@ -203,9 +203,10 @@ namespace SparkleLib { // Add a .gitignore file to the repo private void InstallExcludeRules () { - string exlude_rules_file_path = SparkleHelpers.CombineMore ( - this.target_folder, ".git", "info", "exclude"); + DirectoryInfo info = Directory.CreateDirectory (SparkleHelpers.CombineMore ( + this.target_folder, ".git", "info")); + string exlude_rules_file_path = Path.Combine (info.FullName, "exclude"); TextWriter writer = new StreamWriter (exlude_rules_file_path); // gedit and emacs @@ -238,7 +239,7 @@ namespace SparkleLib { writer.WriteLine ("Thumbs.db"); writer.WriteLine ("Desktop.ini"); - // MS Office + // MS Office writer.WriteLine ("~*.tmp"); writer.WriteLine ("~*.TMP"); writer.WriteLine ("*~*.tmp"); diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 2bba8c0..dd90378 100755 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -533,8 +533,12 @@ namespace SparkleLib { FillEmptyDirectories (child_path); } - if (Directory.GetFiles (path).Length == 0 && !path.Equals (LocalPath)) + if (Directory.GetFiles (path).Length == 0 && + Directory.GetDirectories (path).Length == 0 && + !path.Equals (LocalPath)) { + File.Create (Path.Combine (path, ".empty")).Close (); + } } diff --git a/SparkleLib/Makefile.in b/SparkleLib/Makefile.in index 20f7e66..f3c2078 100644 --- a/SparkleLib/Makefile.in +++ b/SparkleLib/Makefile.in @@ -39,7 +39,8 @@ DIST_COMMON = $(srcdir)/AssemblyInfo.cs.in $(srcdir)/Defines.cs.in \ $(top_srcdir)/build/build.rules.mk subdir = SparkleLib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -100,8 +101,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -121,7 +120,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -135,7 +133,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -159,7 +156,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/SparkleShare/Mac/Makefile.in b/SparkleShare/Mac/Makefile.in index a6e2e2b..877d04e 100644 --- a/SparkleShare/Mac/Makefile.in +++ b/SparkleShare/Mac/Makefile.in @@ -34,7 +34,8 @@ POST_UNINSTALL = : subdir = SparkleShare/Mac DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -73,8 +74,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -94,7 +93,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -108,7 +106,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -132,7 +129,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs index c48c26b..863031c 100755 --- a/SparkleShare/Mac/SparkleSetup.cs +++ b/SparkleShare/Mac/SparkleSetup.cs @@ -347,6 +347,13 @@ namespace SparkleShare { Buttons.Add (CancelButton); + Controller.CheckAddPage ( + AddressTextField.StringValue, + PathTextField.StringValue, + TableView.SelectedRow + ); + + break; } diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj index 01b81bd..8f909d7 100755 --- a/SparkleShare/Mac/SparkleShare.csproj +++ b/SparkleShare/Mac/SparkleShare.csproj @@ -11,7 +11,7 @@ <RootNamespace>SparkleShare</RootNamespace> <AssemblyName>SparkleShare</AssemblyName> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <ReleaseVersion>0.4.1</ReleaseVersion> + <ReleaseVersion>0.4.2</ReleaseVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -112,6 +112,9 @@ <Link>SparkleOptions.cs</Link> </Compile> <Compile Include="SparkleAbout.cs" /> + <Compile Include="..\SparkleInvite.cs"> + <Link>SparkleInvite.cs</Link> + </Compile> </ItemGroup> <ItemGroup> <Page Include="MainMenu.xib" /> diff --git a/SparkleShare/Mac/SparkleShare.sln b/SparkleShare/Mac/SparkleShare.sln index d3a2c77..0ddce70 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.4.1
+ version = 0.4.2
EndGlobalSection
EndGlobal
diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index 142f547..f4a4330 100755 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -24,6 +24,7 @@ SOURCES = \ SparkleEventLogController.cs \ SparkleExtensions.cs \ SparkleOptions.cs \ + SparkleInvite.cs \ SparklePlugin.cs \ SparkleSetup.cs \ SparkleSetupController.cs \ diff --git a/SparkleShare/Makefile.in b/SparkleShare/Makefile.in index b5a444f..7cfc728 100644 --- a/SparkleShare/Makefile.in +++ b/SparkleShare/Makefile.in @@ -41,7 +41,8 @@ DIST_COMMON = $(dist_Applications_DATA) $(dist_man_MANS) \ $(top_srcdir)/build/build.rules.mk subdir = SparkleShare ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -147,8 +148,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -168,7 +167,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -182,7 +180,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -206,7 +203,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -297,6 +293,7 @@ SOURCES = \ SparkleEventLogController.cs \ SparkleExtensions.cs \ SparkleOptions.cs \ + SparkleInvite.cs \ SparklePlugin.cs \ SparkleSetup.cs \ SparkleSetupController.cs \ diff --git a/SparkleShare/Nautilus/Makefile.in b/SparkleShare/Nautilus/Makefile.in index f368438..b11dca2 100644 --- a/SparkleShare/Nautilus/Makefile.in +++ b/SparkleShare/Nautilus/Makefile.in @@ -37,7 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/sparkleshare-nautilus-extension.py.in \ $(srcdir)/sparkleshare-nautilus3-extension.py.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -99,8 +100,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -120,7 +119,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -134,7 +132,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -158,7 +155,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index f6032da..1552d5c 100755 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -38,41 +38,41 @@ namespace SparkleShare { public string FolderSize; public readonly string SparklePath = SparkleConfig.DefaultConfig.FoldersPath; - public event OnQuitWhileSyncingEventHandler OnQuitWhileSyncing; - public delegate void OnQuitWhileSyncingEventHandler (); + public event OnQuitWhileSyncingHandler OnQuitWhileSyncing; + public delegate void OnQuitWhileSyncingHandler (); public event FolderFetchedEventHandler FolderFetched; public delegate void FolderFetchedEventHandler (string [] warnings); - public event FolderFetchErrorEventHandler FolderFetchError; - public delegate void FolderFetchErrorEventHandler (string remote_url); + public event FolderFetchErrorHandler FolderFetchError; + public delegate void FolderFetchErrorHandler (string remote_url); - public event FolderFetchingEventHandler FolderFetching; - public delegate void FolderFetchingEventHandler (double percentage); + public event FolderFetchingHandler FolderFetching; + public delegate void FolderFetchingHandler (double percentage); - public event FolderListChangedEventHandler FolderListChanged; - public delegate void FolderListChangedEventHandler (); + public event FolderListChangedHandler FolderListChanged; + public delegate void FolderListChangedHandler (); - public event FolderSizeChangedEventHandler FolderSizeChanged; - public delegate void FolderSizeChangedEventHandler (string folder_size); + public event FolderSizeChangedHandler FolderSizeChanged; + public delegate void FolderSizeChangedHandler (string folder_size); - public event AvatarFetchedEventHandler AvatarFetched; - public delegate void AvatarFetchedEventHandler (); + public event AvatarFetchedHandler AvatarFetched; + public delegate void AvatarFetchedHandler (); - public event OnIdleEventHandler OnIdle; - public delegate void OnIdleEventHandler (); + public event OnIdleHandler OnIdle; + public delegate void OnIdleHandler (); - public event OnSyncingEventHandler OnSyncing; - public delegate void OnSyncingEventHandler (); + public event OnSyncingHandler OnSyncing; + public delegate void OnSyncingHandler (); - public event OnErrorEventHandler OnError; - public delegate void OnErrorEventHandler (); + public event OnErrorHandler OnError; + public delegate void OnErrorHandler (); - public event OnInvitationEventHandler OnInvitation; - public delegate void OnInvitationEventHandler (string server, string folder, string token); + public event OnInviteHandler OnInvite; + public delegate void OnInviteHandler (SparkleInvite invite); - public event ConflictNotificationRaisedEventHandler ConflictNotificationRaised; - public delegate void ConflictNotificationRaisedEventHandler (); + public event ConflictNotificationRaisedHandler ConflictNotificationRaised; + public delegate void ConflictNotificationRaisedHandler (); public event NotificationRaisedEventHandler NotificationRaised; public delegate void NotificationRaisedEventHandler (SparkleChangeSet change_set); @@ -136,24 +136,16 @@ namespace SparkleShare { }; - watcher.Created += delegate (object o, FileSystemEventArgs args) { + SparkleInviteListener invite_listener = new SparkleInviteListener (1986); - // Handle invitations when the user saves an - // invitation into the SparkleShare folder - if (args.Name.EndsWith (".sparkle") && !FirstRun) { - XmlDocument xml_doc = new XmlDocument (); - xml_doc.Load (args.Name); + invite_listener.InviteReceived += delegate (SparkleInvite invite) { - string server = xml_doc.GetElementsByTagName ("server") [0].InnerText; - string folder = xml_doc.GetElementsByTagName ("folder") [0].InnerText; - string token = xml_doc.GetElementsByTagName ("token") [0].InnerText; - - // FIXME: this is broken :\ - if (OnInvitation != null) - OnInvitation (server, folder, token); - } + if (OnInvite != null && !FirstRun) + OnInvite (invite); }; + invite_listener.Start (); + new Thread (new ThreadStart (PopulateRepositories)).Start (); } diff --git a/SparkleShare/SparkleInvite.cs b/SparkleShare/SparkleInvite.cs new file mode 100644 index 0000000..40b36a9 --- /dev/null +++ b/SparkleShare/SparkleInvite.cs @@ -0,0 +1,199 @@ +// SparkleShare, a collaboration and sharing tool. +// Copyright (C) 2010 Hylke Bons (hylkebons@gmail.com) +// +// 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 (http://www.gnu.org/licenses/). + + +using System; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Text; +using System.Xml; +using System.Threading; + +using SparkleLib; + +namespace SparkleShare { + + public class SparkleInvite { + + public readonly Uri FullAddress; + public readonly string Token; + + public string Host { + get { + return FullAddress.Host; + } + } + + public string Path { + get { + return FullAddress.AbsolutePath; + } + } + + + public SparkleInvite (string host, string path, string token) + { + if (path.StartsWith ("/")) + path = path.Substring (1); + + if (!host.EndsWith ("/")) + host = host + "/"; + + FullAddress = new Uri ("ssh://" + host + path); + Token = token; + } + + + public SparkleInvite (string xml_file_path) + { + // TODO + } + } + + + public class SparkleInviteListener { + + public event InviteReceivedHandler InviteReceived; + public delegate void InviteReceivedHandler (SparkleInvite invite); + + private Thread thread; + private TcpListener tcp_listener; + + + public SparkleInviteListener (int port) + { + this.tcp_listener = new TcpListener (IPAddress.Loopback, port); + this.thread = new Thread(new ThreadStart (Listen)); + } + + + public void Start () + { + this.thread.Start (); + } + + + private void Listen () + { + this.tcp_listener.Start (); + + while (true) + { + // Blocks until a client connects + TcpClient client = this.tcp_listener.AcceptTcpClient (); + + // Create a thread to handle communications + Thread client_thread = new Thread (HandleClient); + client_thread.Start (client); + } + } + + + private void HandleClient (object client) + { + TcpClient tcp_client = (TcpClient) client; + NetworkStream client_stream = tcp_client.GetStream (); + + byte [] message = new byte [4096]; + int bytes_read; + + while (true) + { + bytes_read = 0; + + try { + // Blocks until the client sends a message + bytes_read = client_stream.Read (message, 0, 4096); + + } catch { + Console.WriteLine ("Socket error..."); + } + + // The client has disconnected + if (bytes_read == 0) + break; + + ASCIIEncoding encoding = new ASCIIEncoding (); + string received_message = encoding.GetString (message, 0, bytes_read); + string invite_xml = ""; + + if (received_message.StartsWith (Uri.UriSchemeHttp) || + received_message.StartsWith (Uri.UriSchemeHttps)) { + + WebClient web_client = new WebClient (); + + try { + // Fetch the invite file + byte [] buffer = web_client.DownloadData (received_message); + SparkleHelpers.DebugInfo ("Invite", "Received: " + received_message); + + invite_xml = ASCIIEncoding.ASCII.GetString (buffer); + + } catch (WebException e) { + SparkleHelpers.DebugInfo ("Invite", "Failed downloading: " + + received_message + " " + e.Message); + continue; + } + + } else if (received_message.StartsWith (Uri.UriSchemeFile)) { + try { + received_message = received_message.Replace (Uri.UriSchemeFile + "://", ""); + invite_xml = File.ReadAllText (received_message); + + } catch { + SparkleHelpers.DebugInfo ("Invite", "Failed opening: " + received_message); + continue; + } + + } else { + SparkleHelpers.DebugInfo ("Invite", + "Path to invite must use either the file:// or http(s):// scheme"); + + continue; + } + + XmlDocument xml_document = new XmlDocument (); + XmlNode node; + string host = ""; + string path = ""; + string token = ""; + + try { + xml_document.LoadXml (invite_xml); + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/host/text()"); + if (node != null) { host = node.Value; } + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/path/text()"); + if (node != null) { path = node.Value; } + + node = xml_document.SelectSingleNode ("/sparkleshare/invite/token/text()"); + if (node != null) { token = node.Value; } + + } catch (XmlException e) { + SparkleHelpers.DebugInfo ("Invite", "Not valid XML: " + received_message + " " + e.Message); + return; + } + + if (InviteReceived != null) + InviteReceived (new SparkleInvite (host, path, token)); + } + + tcp_client.Close (); + } + } +} diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs index e5bbb9b..49654f5 100755 --- a/SparkleShare/SparkleSetup.cs +++ b/SparkleShare/SparkleSetup.cs @@ -214,7 +214,6 @@ namespace SparkleShare { // Update the address field text when the selection changes tree.CursorChanged += delegate (object sender, EventArgs e) { Controller.SelectedPluginChanged (tree.SelectedRow); - // TODO: Scroll to selected row when using arrow keys }; @@ -19,63 +19,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - -if test "$gdu_cv_have_gdu" = "yes"; then - AC_MSG_RESULT([yes]) - ifelse([$2],,[:],[$2]) -else - AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi - -GNOME_DOC_DEFINES -]) - dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 40 IT_PROG_INTLTOOL @@ -1448,6 +1391,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([build/m4/gnome-doc-utils.m4]) m4_include([build/m4/shave/shave.m4]) m4_include([build/m4/shamrock/expansions.m4]) m4_include([build/m4/shamrock/gnome-doc.m4]) diff --git a/build/Makefile.in b/build/Makefile.in index 1a9228f..25166a0 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -34,7 +34,8 @@ POST_UNINSTALL = : subdir = build DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -113,8 +114,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -134,7 +133,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -148,7 +146,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -172,7 +169,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/build/m4/Makefile.in b/build/m4/Makefile.in index 9b7e665..aabd0df 100644 --- a/build/m4/Makefile.in +++ b/build/m4/Makefile.in @@ -34,7 +34,8 @@ POST_UNINSTALL = : subdir = build/m4 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -73,8 +74,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -94,7 +93,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -108,7 +106,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -132,7 +129,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/build/m4/gnome-doc-utils.m4 b/build/m4/gnome-doc-utils.m4 new file mode 100644 index 0000000..3fc25ec --- /dev/null +++ b/build/m4/gnome-doc-utils.m4 @@ -0,0 +1 @@ +AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])]) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for SparkleShare 0.4.1. +# Generated by GNU Autoconf 2.68 for SparkleShare 0.4.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -556,8 +556,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='SparkleShare' PACKAGE_TARNAME='sparkleshare' -PACKAGE_VERSION='0.4.1' -PACKAGE_STRING='SparkleShare 0.4.1' +PACKAGE_VERSION='0.4.2' +PACKAGE_STRING='SparkleShare 0.4.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -625,11 +625,6 @@ MONO_MODULE_LIBS MONO_MODULE_CFLAGS HAVE_GNOME_DOC_UTILS_FALSE HAVE_GNOME_DOC_UTILS_TRUE -DISTCHECK_CONFIGURE_FLAGS -DOC_USER_FORMATS -OMF_DIR -HELP_DIR -LN_S ENABLE_SK_FALSE ENABLE_SK_TRUE GNOME_DOC_UTILS_LIBS @@ -760,10 +755,6 @@ enable_maintainer_mode enable_nls enable_dependency_tracking enable_user_help -with_help_dir -with_omf_dir -with_help_formats -enable_scrollkeeper enable_debug enable_release enable_gtkui @@ -1354,7 +1345,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SparkleShare 0.4.1 to adapt to many kinds of systems. +\`configure' configures SparkleShare 0.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1411,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SparkleShare 0.4.1:";; + short | recursive ) echo "Configuration of SparkleShare 0.4.2:";; esac cat <<\_ACEOF @@ -1434,7 +1425,6 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-user-help Enable building the user-help [[default=auto]] - --disable-scrollkeeper do not make updates to the scrollkeeper database --enable-debug Use 'DEBUG' Configuration [default=YES] --enable-release Use 'RELEASE' Configuration [default=NO] --disable-gtkui Do not build the Gtk+ user interface @@ -1445,14 +1435,6 @@ Optional Features: Do not install the Nautilus plugin --enable-shave use shave to make the build pretty [[default=yes]] -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-help-dir=DIR path to help docs - --with-omf-dir=DIR path to OMF files - --with-help-formats=FORMATS - list of formats - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1580,7 +1562,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SparkleShare configure 0.4.1 +SparkleShare configure 0.4.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1748,7 +1730,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SparkleShare $as_me 0.4.1, which was +It was created by SparkleShare $as_me 0.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2563,7 +2545,7 @@ fi # Define the identity of the package. PACKAGE='sparkleshare' - VERSION='0.4.1' + VERSION='0.4.2' cat >>confdefs.h <<_ACEOF @@ -2708,7 +2690,7 @@ fi -ASM_VERSION=0.4.1 +ASM_VERSION=0.4.2 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -4469,17 +4451,6 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - # Check whether --enable-user-help was given. if test "${enable_user_help+set}" = set; then : @@ -4662,95 +4633,8 @@ else fi if test "x$enable_user_help" = "xyes"; then - -gdu_cv_version_required=0.17.3 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 -$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - gdu_cv_have_gdu=yes -else - gdu_cv_have_gdu=no -fi - -if test "$gdu_cv_have_gdu" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_user_help=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_user_help=no -fi - - - -# Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then : - withval=$with_help_dir; -else - with_help_dir='${datadir}/gnome/help' -fi - -HELP_DIR="$with_help_dir" - - - -# Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then : - withval=$with_omf_dir; -else - with_omf_dir='${datadir}/omf' -fi - -OMF_DIR="$with_omf_dir" - - - -# Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then : - withval=$with_help_formats; -else - with_help_formats='' -fi - -DOC_USER_FORMATS="$with_help_formats" - - -# Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then : - enableval=$enable_scrollkeeper; -else - enable_scrollkeeper=yes -fi - - if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then - ENABLE_SK_TRUE= - ENABLE_SK_FALSE='#' -else - ENABLE_SK_TRUE='#' - ENABLE_SK_FALSE= -fi - - -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" - - - if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' -else - HAVE_GNOME_DOC_UTILS_TRUE='#' - HAVE_GNOME_DOC_UTILS_FALSE= -fi - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} fi if test "x$enable_user_help" = "xyes"; then @@ -6542,14 +6426,6 @@ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then as_fn_error $? "conditional \"ENABLE_SK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -7035,7 +6911,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SparkleShare $as_me 0.4.1, which was +This file was extended by SparkleShare $as_me 0.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7092,7 +6968,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -SparkleShare config.status 0.4.1 +SparkleShare config.status 0.4.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9b18cfd..b4f4995 100755 --- 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.4.1]) + [0.4.2]) m4_define([sparkleshare_asm_version], - [0.4.1]) + [0.4.2]) AC_PREREQ([2.54]) AC_INIT([SparkleShare], sparkleshare_version) diff --git a/data/._about.png b/data/._about.png Binary files differdeleted file mode 100755 index f6f3cfd..0000000 --- a/data/._about.png +++ /dev/null diff --git a/data/Makefile.in b/data/Makefile.in index 71497d7..0d6c205 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -36,7 +36,8 @@ subdir = data DIST_COMMON = $(dist_pixmaps_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -138,8 +139,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -159,7 +158,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -173,7 +171,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -197,7 +194,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/data/html/Makefile.in b/data/html/Makefile.in index c1799ee..b7fdd41 100644 --- a/data/html/Makefile.in +++ b/data/html/Makefile.in @@ -36,7 +36,8 @@ subdir = data/html DIST_COMMON = $(dist_html_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -98,8 +99,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -119,7 +118,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,7 +131,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -157,7 +154,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index 804890a..59a096b 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -34,7 +34,8 @@ POST_UNINSTALL = : subdir = data/icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -73,8 +74,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -94,7 +93,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -108,7 +106,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -132,7 +129,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/data/plugins/Makefile.in b/data/plugins/Makefile.in index 3c2314e..553a7bc 100644 --- a/data/plugins/Makefile.in +++ b/data/plugins/Makefile.in @@ -36,7 +36,8 @@ subdir = data/plugins DIST_COMMON = $(dist_plugins_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -98,8 +99,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -119,7 +118,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,7 +131,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -157,7 +154,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ diff --git a/help/Makefile.in b/help/Makefile.in index c2740d0..fc8f3c2 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -59,7 +59,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/gnome-doc-utils.make subdir = help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/build/m4/shave/shave.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/build/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/build/m4/shave/shave.m4 \ $(top_srcdir)/build/m4/shamrock/expansions.m4 \ $(top_srcdir)/build/m4/shamrock/gnome-doc.m4 \ $(top_srcdir)/build/m4/shamrock/mono.m4 \ @@ -98,8 +99,6 @@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -119,7 +118,6 @@ GTKSHARP_A11Y_LIBS = @GTKSHARP_A11Y_LIBS@ GTKSHARP_CFLAGS = @GTKSHARP_CFLAGS@ GTKSHARP_LIBS = @GTKSHARP_LIBS@ GUISUBDIRS = @GUISUBDIRS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -133,7 +131,6 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEFLAGS = @MAKEFLAGS@ @@ -157,7 +154,6 @@ NUNIT_CFLAGS = @NUNIT_CFLAGS@ NUNIT_LIBS = @NUNIT_LIBS@ OBJC = @OBJC@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ |
