Permalink
Browse files

linux: Fix build. Closes #886

  • Loading branch information...
1 parent 99f3d6c commit 93bdac134e427ef4c3b79f2bc44ded027339bd7f @hbons committed Aug 3, 2012
View
@@ -12,49 +12,34 @@
*.sln.cache
*.user
*.resources
-po/POTFILES
Makefile.in
Makefile
-POTFILES
-SparkleLib/windows/GlobalAssemblyInfoGit.cs
intltool-*
-SparkleShare/data
configure
config.guess
config.h
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
@@ -32,7 +32,7 @@ public SparkleController () : base ()
public override string PluginsPath {
get {
- return SparkleHelpers.CombineMore (Defines.INSTALL_DIR, "plugins");
+ return new string [] { Defines.INSTALL_DIR, "plugins" }.Combine ();
}
}
@@ -69,12 +69,12 @@ public SparkleSetup () : base ()
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
};
@@ -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 @@ public SparkleUI ()
{
Application.Init ();
- // Use translations
- Catalog.Init (Defines.GETTEXT_PACKAGE, Defines.LOCALE_DIR);
-
Setup = new SparkleSetup ();
EventLog = new SparkleEventLog ();
About = new SparkleAbout ();
View
@@ -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)

0 comments on commit 93bdac1

Please sign in to comment.