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

linux: Fix build. Closes #886

Browse source
This commit is contained in:
Hylke Bons 2012-08-03 12:22:07 +02:00
parent b1ef8f72d0
commit 6dfc3420ed
5 changed files with 4 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitignore vendored
View file

@ -12,13 +12,9 @@
*.sln.cache
*.user
*.resources
po/POTFILES
Makefile.in
Makefile
POTFILES
SparkleLib/windows/GlobalAssemblyInfoGit.cs
intltool-*
SparkleShare/data
configure
config.guess
config.h
@ -26,35 +22,24 @@ config.h.in
config.log
config.status
config.sub
INSTALL
aclocal.m4
autom4te.cache/
bin/
obj/
/bin/
SparkleShare/Mac/bin
install-sh
libtool
ltmain.sh
missing
po/.intltool-merge-cache
po/Makefile.in.in
po/stamp-it
SparkleLib/AssemblyInfo.cs
build/m4/shave/shave
build/m4/*.m4
build/m4/shave/shave-libtool
SparkleLib/Defines.cs
SparkleLib/windows/Defines.cs
SparkleLib/windows/GlobalAssemblyInfo.cs
SparkleShare/Linux/sparkleshare
SparkleShare/Mac/git
po/sparkleshare.pot
SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py
SparkleShare/Linux/Nautilus/sparkleshare-nautilus3-extension.py
gnome-doc-utils.make
/sparkleshare-*
data/plugins/*.xml
desktop.ini
_ReSharper.*
*.msi

2
SparkleShare/Linux/SparkleController.cs
View file

@ -32,7 +32,7 @@ namespace SparkleShare {
public override string PluginsPath {
get {
return SparkleHelpers.CombineMore (Defines.INSTALL_DIR, "plugins");
return new string [] { Defines.INSTALL_DIR, "plugins" }.Combine ();
}
}

4
SparkleShare/Linux/SparkleSetup.cs
View file

@ -69,12 +69,12 @@ namespace SparkleShare {
Xalign = 1
};
Entry name_entry = new Entry (Controller.GuessedUserName) {
Entry name_entry = new Entry (UnixUserInfo.GetRealUser ().RealName) {
Xalign = 0,
ActivatesDefault = true
};
Entry email_entry = new Entry (Controller.GuessedUserEmail) {
Entry email_entry = new Entry () {
Xalign = 0,
ActivatesDefault = true
};

11
SparkleShare/Linux/SparkleUI.cs
View file

@ -16,16 +16,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using Gtk;
using Mono.Unix;
using Mono.Unix.Native;
using SparkleLib;
namespace SparkleShare {
@ -46,9 +38,6 @@ namespace SparkleShare {
{
Application.Init ();
// Use translations
Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR);
Setup = new SparkleSetup ();
EventLog = new SparkleEventLog ();
About = new SparkleAbout ();

8
build/build.rules.mk
View file

@ -3,14 +3,8 @@ BUILD_DATA_DIR = $(top_builddir)/bin/share/$(PACKAGE)
# Since all other attempts failed, we currently go this way:
# This code adds the file specified in ASSEMBLY_INFO_SOURCE to SOURCES_BUILD.
# If no such file is specified, the default AssemblyInfo.cs is used.
ASSEMBLY_INFO_SOURCE_REAL = \
$(shell if [ "$(ASSEMBLY_INFO_SOURCE)" ]; \
then \
echo "$(addprefix $(srcdir)/, $(ASSEMBLY_INFO_SOURCE))"; \
else \
echo "$(top_srcdir)/SparkleLib/AssemblyInfo.cs"; \
fi)
$(addprefix $(srcdir)/, $(ASSEMBLY_INFO_SOURCE))
SOURCES_BUILD = $(addprefix $(srcdir)/, $(SOURCES))
SOURCES_BUILD += $(ASSEMBLY_INFO_SOURCE_REAL)