Do

Merge lp:~h-finucane/do/linkfix into lp:do

  1. linkfix
  2. Merge into trunk
Proposed by Henry Finucane
Status: Merged
Approved by: Chris Halse Rogers
Approved revision: 1404
Merged at revision: 1405
Proposed branch: lp:~h-finucane/do/linkfix
Merge into: lp:do
Diff against target: 86 lines (+9/-12)
5 files modified
Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs (+2/-2)
Do/src/Do.Core/Controller.cs (+2/-2)
Do/src/Do.UI/ManagePluginsPreferencesWidget.cs (+3/-6)
Do/src/Do.UI/PreferencesWindow.cs (+1/-1)
HACKING (+1/-1)
To merge this branch: bzr merge lp:~h-finucane/do/linkfix
Reviewer Review Type Date Requested Status
Do Core Team Pending
Review via email: mp+221625@code.launchpad.net

Description of the change

The help links all lead to davebsd.com, which is 100% spam, which looks bad. The only thing here that is potentially objectionable is that the help link for plugins that don't have a help link will now do nothing instead of going to the the wiki-that-no-longer-exists at davebsd.

To post a comment you must log in.
Revision history for this message
Chris Halse Rogers (raof) wrote :

Thanks for the contribution!

Time for me to finish the help-in-Mallard plugins branch :)

Revision history for this message
Henry Finucane (h-finucane) wrote :

Awesome! My very first lines of C# code :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs'
2--- Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs 2009-06-29 08:51:18 +0000
3+++ Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs 2014-05-31 23:38:52 +0000
4@@ -29,7 +29,7 @@
5
6 public partial class PluginAvailableDialog : Gtk.Dialog
7 {
8- const string WhatIsDoUrl = "http://do.davebsd.com/wiki/index.php?title=Main_Page#What_is_GNOME_Do.3F";
9+ const string WhatIsDoUrl = "http://do.cooperteam.net/";
10
11 Addin addin;
12
13@@ -75,4 +75,4 @@
14 prefs.Set (AbstractPackageManagerService.PluginAvailableKey, ask_chk.Active);
15 }
16 }
17-}
18\ No newline at end of file
19+}
20
21=== modified file 'Do/src/Do.Core/Controller.cs'
22--- Do/src/Do.Core/Controller.cs 2013-12-27 05:53:25 +0000
23+++ Do/src/Do.Core/Controller.cs 2014-05-31 23:38:52 +0000
24@@ -1011,11 +1011,11 @@
25 logo = "gnome-do.svg";
26
27 AboutDialog.Logo = IconProvider.PixbufFromIconName (logo, 140);
28- AboutDialog.Copyright = Catalog.GetString ("Copyright \xa9 2009 GNOME Do Developers");
29+ AboutDialog.Copyright = Catalog.GetString ("Copyright \xa9 2014 GNOME Do Developers");
30 AboutDialog.Comments = Catalog.GetString ("Do things as quickly as possible\n" +
31 "(but no quicker) with your files, bookmarks,\n" +
32 "applications, music, contacts, and more!");
33- AboutDialog.Website = "http://do.davebsd.com/";
34+ AboutDialog.Website = "http://do.cooperteam.net/";
35 AboutDialog.WebsiteLabel = Catalog.GetString ("Visit Homepage");
36 Gtk.AboutDialog.SetUrlHook((dialog, link) => Services.Environment.OpenUrl (link));
37 AboutDialog.IconName = "gnome-do";
38
39=== modified file 'Do/src/Do.UI/ManagePluginsPreferencesWidget.cs'
40--- Do/src/Do.UI/ManagePluginsPreferencesWidget.cs 2011-05-21 11:48:50 +0000
41+++ Do/src/Do.UI/ManagePluginsPreferencesWidget.cs 2014-05-31 23:38:52 +0000
42@@ -43,9 +43,6 @@
43 public partial class ManagePluginsPreferencesWidget : Bin, IConfigurable
44 {
45
46- const string WikiPage = "http://do.davebsd.com/wiki/{0}{1}";
47- const string PluginWikiPageFormat = "_Plugin";
48-
49 PluginNodeView nview;
50 SearchEntry search_entry;
51
52@@ -200,10 +197,10 @@
53 // plugin manifest files support a Url attribute, if this attribute is set we should
54 // use it instead of trying to guess the wiki page.
55 if (!string.IsNullOrEmpty (a.Description.Url))
56+ {
57 url = a.Description.Url;
58- url = string.Format (WikiPage, name, PluginWikiPageFormat);
59-
60- Services.Environment.OpenUrl (url);
61+ Services.Environment.OpenUrl (url);
62+ }
63 } catch (Exception e) {
64 Log.Debug (e.Message);
65 Log.Debug (e.StackTrace);
66
67=== modified file 'Do/src/Do.UI/PreferencesWindow.cs'
68--- Do/src/Do.UI/PreferencesWindow.cs 2009-06-28 05:25:57 +0000
69+++ Do/src/Do.UI/PreferencesWindow.cs 2014-05-31 23:38:52 +0000
70@@ -35,7 +35,7 @@
71 {
72
73 const int ManagePreferencesPreferencesPageIndex = 2;
74- const string HelpUrl = "http://do.davebsd.com/wiki/index.php?title=Using_Do";
75+ const string HelpUrl = "https://answers.launchpad.net/do";
76
77 readonly IEnumerable<IConfigurable> Pages = new IConfigurable [] {
78 new GeneralPreferencesWidget (),
79
80=== modified file 'HACKING'
81--- HACKING 2009-01-20 18:43:51 +0000
82+++ HACKING 2014-05-31 23:38:52 +0000
83@@ -1,2 +1,2 @@
84 For information on hacking on GNOME Do, see:
85- http://do.davebsd.com/development.shtml
86+ http://do.cooperteam.net/development.shtml