[shotwell] Fix URLs pointing to yorba.org and Redmine: Closes bug #730575



commit 4df1d2c3bbf27f8ef271c37c812ee96b77e7a19d
Author: Jim Nelson <jim yorba org>
Date:   Tue May 27 12:50:15 2014 -0700

    Fix URLs pointing to yorba.org and Redmine: Closes bug #730575

 plugins/common/Resources.vala   |    4 ++--
 src/AppWindow.vala              |    2 +-
 src/Resources.vala              |    8 +++-----
 src/main.vala                   |    2 +-
 src/plugins/SpitInterfaces.vala |    2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/plugins/common/Resources.vala b/plugins/common/Resources.vala
index 6db409a..79d4818 100644
--- a/plugins/common/Resources.vala
+++ b/plugins/common/Resources.vala
@@ -6,8 +6,8 @@
 
 namespace Resources {
 
-public const string WEBSITE_NAME = _("Visit the Yorba web site");
-public const string WEBSITE_URL = "http://www.yorba.org";;
+public const string WEBSITE_NAME = _("Visit the Shotwell home page");
+public const string WEBSITE_URL = "https://wiki.gnome.org/Apps/Shotwell";;
 
 public const string LICENSE = """
 Shotwell is free software; you can redistribute it and/or modify it under the 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index f628383..9c1f2b4 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -683,7 +683,7 @@ public abstract class AppWindow : PageWindow {
             "version", Resources.APP_VERSION,
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
-            "website", Resources.YORBA_URL,
+            "website", Resources.HOME_URL,
             "license", Resources.LICENSE,
             "website-label", _("Visit the Yorba web site"),
             "authors", Resources.AUTHORS,
diff --git a/src/Resources.vala b/src/Resources.vala
index 9820a72..c8f02c4 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -27,16 +27,14 @@ namespace Resources {
     public const string COPYRIGHT = _("Copyright 2009-2014 Yorba Foundation");
     public const string APP_GETTEXT_PACKAGE = GETTEXT_PACKAGE;
     
-    public const string YORBA_URL = "http://www.yorba.org";;
-    public const string WIKI_URL = "http://redmine.yorba.org/projects/shotwell/wiki/Shotwell";;
-    public const string FAQ_URL = "http://redmine.yorba.org/projects/shotwell/wiki/ShotwellFAQ";;
-    public const string BUG_DB_URL = "http://redmine.yorba.org/projects/shotwell/wiki/ReportingABug";;
+    public const string HOME_URL = "https://wiki.gnome.org/Apps/Shotwell";;
+    public const string FAQ_URL = "https://wiki.gnome.org/Apps/Shotwell/FAQ";;
+    public const string BUG_DB_URL = "https://wiki.gnome.org/Apps/Shotwell/ReportingABug";;
     public const string DIR_PATTERN_URI_SYSWIDE = "ghelp:shotwell?other-files";
 
     private const string LIB = _LIB;
     private const string LIBEXECDIR = _LIBEXECDIR;
 
-
     public const string PREFIX = _PREFIX;
 
     public const double TRANSIENT_WINDOW_OPACITY = 0.90;
diff --git a/src/main.vala b/src/main.vala
index 33b0dba..8c045fd 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -58,7 +58,7 @@ void library_exec(string[] mounts) {
         case Db.VerifyResult.UPGRADE_ERROR:
             errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to 
%s (schema %d).  For more information please check the Shotwell Wiki at %s").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
-                Resources.WIKI_URL);
+                Resources.HOME_URL);
         break;
         
         case Db.VerifyResult.NO_UPGRADE_AVAILABLE:
diff --git a/src/plugins/SpitInterfaces.vala b/src/plugins/SpitInterfaces.vala
index 2ae0ff6..f2fce6f 100644
--- a/src/plugins/SpitInterfaces.vala
+++ b/src/plugins/SpitInterfaces.vala
@@ -15,7 +15,7 @@
  * The Spit namespace is used for all interfaces and code that are made available to plugins or
  * are exposed by plugins.
  *
- * More information can be found at [[http://trac.yorba.org/wiki/ShotwellArchWritingPlugins]]
+ * More information can be found at [[https://wiki.gnome.org/Apps/Shotwell/Architecture/WritingPlugins]]
  */
 namespace Spit {
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]