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
=== modified file 'Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs'
--- Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs 2009-06-29 08:51:18 +0000
+++ Do.Platform.Linux/src/Do.Widgets/PluginAvailableDialog.cs 2014-05-31 23:38:52 +0000
@@ -29,7 +29,7 @@
29 29
30 public partial class PluginAvailableDialog : Gtk.Dialog30 public partial class PluginAvailableDialog : Gtk.Dialog
31 { 31 {
32 const string WhatIsDoUrl = "http://do.davebsd.com/wiki/index.php?title=Main_Page#What_is_GNOME_Do.3F";32 const string WhatIsDoUrl = "http://do.cooperteam.net/";
33 33
34 Addin addin;34 Addin addin;
35 35
@@ -75,4 +75,4 @@
75 prefs.Set (AbstractPackageManagerService.PluginAvailableKey, ask_chk.Active);75 prefs.Set (AbstractPackageManagerService.PluginAvailableKey, ask_chk.Active);
76 } 76 }
77 }77 }
78}
79\ No newline at end of file78\ No newline at end of file
79}
8080
=== modified file 'Do/src/Do.Core/Controller.cs'
--- Do/src/Do.Core/Controller.cs 2013-12-27 05:53:25 +0000
+++ Do/src/Do.Core/Controller.cs 2014-05-31 23:38:52 +0000
@@ -1011,11 +1011,11 @@
1011 logo = "gnome-do.svg";1011 logo = "gnome-do.svg";
10121012
1013 AboutDialog.Logo = IconProvider.PixbufFromIconName (logo, 140);1013 AboutDialog.Logo = IconProvider.PixbufFromIconName (logo, 140);
1014 AboutDialog.Copyright = Catalog.GetString ("Copyright \xa9 2009 GNOME Do Developers");1014 AboutDialog.Copyright = Catalog.GetString ("Copyright \xa9 2014 GNOME Do Developers");
1015 AboutDialog.Comments = Catalog.GetString ("Do things as quickly as possible\n" +1015 AboutDialog.Comments = Catalog.GetString ("Do things as quickly as possible\n" +
1016 "(but no quicker) with your files, bookmarks,\n" +1016 "(but no quicker) with your files, bookmarks,\n" +
1017 "applications, music, contacts, and more!");1017 "applications, music, contacts, and more!");
1018 AboutDialog.Website = "http://do.davebsd.com/";1018 AboutDialog.Website = "http://do.cooperteam.net/";
1019 AboutDialog.WebsiteLabel = Catalog.GetString ("Visit Homepage");1019 AboutDialog.WebsiteLabel = Catalog.GetString ("Visit Homepage");
1020 Gtk.AboutDialog.SetUrlHook((dialog, link) => Services.Environment.OpenUrl (link));1020 Gtk.AboutDialog.SetUrlHook((dialog, link) => Services.Environment.OpenUrl (link));
1021 AboutDialog.IconName = "gnome-do";1021 AboutDialog.IconName = "gnome-do";
10221022
=== modified file 'Do/src/Do.UI/ManagePluginsPreferencesWidget.cs'
--- Do/src/Do.UI/ManagePluginsPreferencesWidget.cs 2011-05-21 11:48:50 +0000
+++ Do/src/Do.UI/ManagePluginsPreferencesWidget.cs 2014-05-31 23:38:52 +0000
@@ -43,9 +43,6 @@
43 public partial class ManagePluginsPreferencesWidget : Bin, IConfigurable43 public partial class ManagePluginsPreferencesWidget : Bin, IConfigurable
44 {44 {
4545
46 const string WikiPage = "http://do.davebsd.com/wiki/{0}{1}";
47 const string PluginWikiPageFormat = "_Plugin";
48
49 PluginNodeView nview;46 PluginNodeView nview;
50 SearchEntry search_entry;47 SearchEntry search_entry;
5148
@@ -200,10 +197,10 @@
200 // plugin manifest files support a Url attribute, if this attribute is set we should197 // plugin manifest files support a Url attribute, if this attribute is set we should
201 // use it instead of trying to guess the wiki page.198 // use it instead of trying to guess the wiki page.
202 if (!string.IsNullOrEmpty (a.Description.Url))199 if (!string.IsNullOrEmpty (a.Description.Url))
200 {
203 url = a.Description.Url;201 url = a.Description.Url;
204 url = string.Format (WikiPage, name, PluginWikiPageFormat);202 Services.Environment.OpenUrl (url);
205 203 }
206 Services.Environment.OpenUrl (url);
207 } catch (Exception e) {204 } catch (Exception e) {
208 Log.Debug (e.Message);205 Log.Debug (e.Message);
209 Log.Debug (e.StackTrace);206 Log.Debug (e.StackTrace);
210207
=== modified file 'Do/src/Do.UI/PreferencesWindow.cs'
--- Do/src/Do.UI/PreferencesWindow.cs 2009-06-28 05:25:57 +0000
+++ Do/src/Do.UI/PreferencesWindow.cs 2014-05-31 23:38:52 +0000
@@ -35,7 +35,7 @@
35 {35 {
3636
37 const int ManagePreferencesPreferencesPageIndex = 2;37 const int ManagePreferencesPreferencesPageIndex = 2;
38 const string HelpUrl = "http://do.davebsd.com/wiki/index.php?title=Using_Do";38 const string HelpUrl = "https://answers.launchpad.net/do";
3939
40 readonly IEnumerable<IConfigurable> Pages = new IConfigurable [] {40 readonly IEnumerable<IConfigurable> Pages = new IConfigurable [] {
41 new GeneralPreferencesWidget (),41 new GeneralPreferencesWidget (),
4242
=== modified file 'HACKING'
--- HACKING 2009-01-20 18:43:51 +0000
+++ HACKING 2014-05-31 23:38:52 +0000
@@ -1,2 +1,2 @@
1For information on hacking on GNOME Do, see:1For information on hacking on GNOME Do, see:
2 http://do.davebsd.com/development.shtml2 http://do.cooperteam.net/development.shtml