beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/hbons/SparkleShare into fixes

Browse source 
Conflicts:
	SparkleLib/SparkleConfig.cs
This commit is contained in:
Travis Glenn Hansen 2011-06-09 10:20:15 -06:00
parent 1704d86b2f cc8a1d6860
commit e937aa168f
14 changed files with 53 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -38,3 +38,4 @@ SparkleShare/sparkleshare
po/sparkleshare.pot
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
gnome-doc-utils.make
sparkleshare-*

5
Makefile.am
View file

@ -1,13 +1,14 @@
SUBDIRS = \
build \
help \
SmartIrc4net \
${SPARKLE_SMARTIRC4NETDIR} \
SparkleLib \
SparkleShare \
data \
po
EXTRA_DIST = gnome-doc-utils.make
EXTRA_DIST = gnome-doc-utils.make \
LICENSE
DISTCLEANFILES = \
intltool-extract \

7
NEWS
View file

@ -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

7
SparkleLib/SparkleBackend.cs
View file

@ -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);

6
SparkleLib/SparkleConfig.cs
View file

@ -56,7 +56,7 @@ namespace SparkleLib {
private void CreateInitialConfig ()
{
string user_name = Environment.UserName;
string user_name = "Unknown";
if (SparkleBackend.Platform == PlatformID.Unix ||
SparkleBackend.Platform == PlatformID.MacOSX) {
@ -68,10 +68,12 @@ namespace SparkleLib {
user_name = user_name.TrimEnd (",".ToCharArray());
}
} else {
user_name = Environment.UserName;
}
if (string.IsNullOrEmpty (user_name))
user_name = Environment.UserName;
user_name = "Unknown";
TextWriter writer = new StreamWriter (Path);
string n = Environment.NewLine;

29
SparkleLib/SparklePlatform.cs
View file

@ -1,29 +0,0 @@
// 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.Collections.Generic;
using System.Xml;
using Mono.Unix;
namespace SparkleLib {
}

3
SparkleShare/Mac/SparkleAbout.cs
View file

@ -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,

2
SparkleShare/Mac/SparkleShare.csproj
View file

@ -11,7 +11,7 @@
<RootNamespace>SparkleShare</RootNamespace>
<AssemblyName>SparkleShare</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<ReleaseVersion>0.2</ReleaseVersion>
<ReleaseVersion>0.2.1</ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

2
SparkleShare/Mac/SparkleShare.sln
View file

@ -16,6 +16,6 @@ Global
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = SparkleShare.csproj
version = 0.2
version = 0.2.1
EndGlobalSection
EndGlobal

3
SparkleShare/SparkleAbout.cs
View file

@ -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 = "<span font_size='xx-large'>SparkleShare</span>\n<span fgcolor='" + secondary_text_color + "'><small>" + Defines.VERSION + "</small></span>",
Markup = "<span font_size='xx-large'>SparkleShare</span>\n<span fgcolor='" + secondary_text_color + "'><small>" + SparkleShare.Controller.Version + "</small></span>",
Xalign = 0,
Xpad = 18,
Ypad = 18

12
SparkleShare/SparkleController.cs
View file

@ -985,15 +985,25 @@ namespace SparkleShare {
}
public string Version {
get {
return SparkleBackend.Version;
}
}
public void CheckForNewVersion ()
{
WebClient web_client = new WebClient ();
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 ();

5
build/build.environment.mk
View file

@ -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)

15
configure.ac
View file

@ -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)
@ -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)

1
po/POTFILES.skip
View file

@ -1 +1,2 @@
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
SparkleLib/SparkleOptions.cs