[gnome-subtitles] Get the locale dir dynamically, so we don't have to set it using the build script
- From: Pedro Daniel da Rocha Melo e Castro <pcastro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-subtitles] Get the locale dir dynamically, so we don't have to set it using the build script
- Date: Sat, 20 Feb 2010 23:01:52 +0000 (UTC)
commit e783b2e6722ac4b9864add7023425c5cdf44b722
Author: Pedro Castro <mail>
Date: Sat Feb 20 22:12:07 2010 +0000
Get the locale dir dynamically, so we don't have to set it using the build script
configure.ac | 1 -
gnome-subtitles.mdp | 1 -
src/GnomeSubtitles/Core/Base.cs | 2 +-
.../Execution/ConfigureDefines.cs.in | 30 --------------------
src/GnomeSubtitles/Execution/Executable.cs | 1 +
src/GnomeSubtitles/Execution/ExecutionContext.cs | 5 +++
6 files changed, 7 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b6b6c2f..f6dc4a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,5 @@ data/gnome-subtitles.desktop
src/Makefile
src/GnomeSubtitles/Execution/AssemblyInfo.cs
src/GnomeSubtitles/Execution/gnome-subtitles
-src/GnomeSubtitles/Execution/ConfigureDefines.cs
help/Makefile
po/Makefile.in])
diff --git a/gnome-subtitles.mdp b/gnome-subtitles.mdp
index 97465c2..c502d07 100644
--- a/gnome-subtitles.mdp
+++ b/gnome-subtitles.mdp
@@ -130,7 +130,6 @@
<File name="src/External/GStreamerPlaybin/Events.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Ui/VideoPreview/Exceptions/PlayerEngineException.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Ui/VideoPreview/Exceptions/PlayerCouldNotInitiateEngineException.cs" subtype="Code" buildaction="Compile" />
- <File name="src/GnomeSubtitles/Execution/ConfigureDefines.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Ui/VideoPreview/SubtitleOverlay.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Core/SyncPoints.cs" subtype="Code" buildaction="Compile" />
<File name="src/GnomeSubtitles/Core/Command/SynchronizeTimingsCommand.cs" subtype="Code" buildaction="Compile" />
diff --git a/src/GnomeSubtitles/Core/Base.cs b/src/GnomeSubtitles/Core/Base.cs
index 0487483..0185e38 100644
--- a/src/GnomeSubtitles/Core/Base.cs
+++ b/src/GnomeSubtitles/Core/Base.cs
@@ -274,7 +274,7 @@ public class Base {
/* Initialize the GUI */
ui = new MainUi(handlers, out glade);
clipboards.WatchPrimaryChanges = true;
- Catalog.Init(ExecutionContext.TranslationDomain, ConfigureDefines.LocaleDir);
+ Catalog.Init(ExecutionContext.TranslationDomain, ExecutionContext.LocaleDir);
EmitInitFinishedEvent();
}
diff --git a/src/GnomeSubtitles/Execution/Executable.cs b/src/GnomeSubtitles/Execution/Executable.cs
index 05e771e..cbe92a5 100644
--- a/src/GnomeSubtitles/Execution/Executable.cs
+++ b/src/GnomeSubtitles/Execution/Executable.cs
@@ -70,6 +70,7 @@ public class Executable {
ExceptionManager.UnhandledException += OnUnhandledException;
ExecutionContext executionContext = new ExecutionContext(args);
+
SetProcessName(executionContext.ExecutableName);
Base.Run(executionContext);
}
diff --git a/src/GnomeSubtitles/Execution/ExecutionContext.cs b/src/GnomeSubtitles/Execution/ExecutionContext.cs
index ffaacc9..eeb2cd3 100644
--- a/src/GnomeSubtitles/Execution/ExecutionContext.cs
+++ b/src/GnomeSubtitles/Execution/ExecutionContext.cs
@@ -55,6 +55,11 @@ public class ExecutionContext {
public string ExecutableName {
get { return applicationID; }
}
+
+ //Unix only
+ public string LocaleDir {
+ get { return System.AppDomain.CurrentDomain.BaseDirectory + "../../share/locale"; }
+ }
public string Version {
get { return RemoveTrailingZeros(Assembly.GetExecutingAssembly().GetName().Version.ToString()); }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]