Merge lp:~cszikszoy/do-plugins/MA-Config-Extension into lp:do-plugins

[Chris S.]

[lp:~cszikszoy/do-plugins/MA-Config-Extension]

635. By Chris S. on 2009-06-23

change extension name to Configuration

Unmerged revisions

635. By Chris S. on 2009-06-23

change extension name to Configuration

634. By Chris S. on 2009-06-20

remove stupid stuff

633. By Chris S. on 2009-06-20

finalize confluence fix

632. By Chris S. on 2009-06-20

merge confluence fix

631. By Chris S. on 2009-06-20

more plugin fixes

630. By Chris S. on 2009-06-19

remove unnecessary file

629. By Chris S. on 2009-06-19

fix JIRA mess

628. By Chris S. on 2009-06-19

update plugins to use /Do/Config MA extension for configuration pages

=== modified file 'Bibtex/Bibtex.mdp'
--- Bibtex/Bibtex.mdp	2009-02-28 16:16:48 +0000
+++ Bibtex/Bibtex.mdp	2009-06-20 02:11:31 +0000
@@ -35,5 +35,6 @@
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
 </Project>
\ No newline at end of file

=== modified file 'Bibtex/Resources/Bibtex.addin.xml'
--- Bibtex/Resources/Bibtex.addin.xml	2009-03-31 23:19:25 +0000
+++ Bibtex/Resources/Bibtex.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path = "/Do/Action">
@@ -23,4 +24,7 @@
 	<Extension path = "/Do/ItemSource">
 		<ItemSource type="Bibtex.BibtexItemSource" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Bibtex.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'Bibtex/gtk-gui/gui.stetic'
--- Bibtex/gtk-gui/gui.stetic	2009-01-22 12:54:17 +0000
+++ Bibtex/gtk-gui/gui.stetic	2009-06-20 02:11:31 +0000
@@ -2,8 +2,11 @@
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12.1</target-gtk-version>
+    <target-gtk-version>2.12</target-gtk-version>
   </configuration>
+  <import>
+    <widget-library name="../bin/Debug/Bibtex.dll" internal="true" />
+  </import>
   <widget class="Gtk.Bin" id="Bibtex.Configuration" design-size="375 300">
     <property name="MemberName" />
     <child>
@@ -97,4 +100,4 @@
       </widget>
     </child>
   </widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file

=== modified file 'Bibtex/gtk-gui/objects.xml'
--- Bibtex/gtk-gui/objects.xml	2008-12-29 18:23:07 +0000
+++ Bibtex/gtk-gui/objects.xml	2009-06-20 02:30:06 +0000
@@ -1,5 +1,5 @@
 <objects attr-sync="on">
-  <object type="Do.Addins.Bibtex.Configuration" palette-category="Bibtex" allow-children="false" base-type="Gtk.Bin">
+  <object type="Bibtex.Configuration" palette-category="Bibtex" allow-children="false" base-type="Gtk.Bin">
     <itemgroups>
       <itemgroup label="Configuration Properties">
         <property name="BibtexFilePath" />

=== modified file 'Bibtex/src/BibtexItemSource.cs'
--- Bibtex/src/BibtexItemSource.cs	2009-05-29 09:39:41 +0000
+++ Bibtex/src/BibtexItemSource.cs	2009-06-19 19:14:09 +0000
@@ -25,9 +25,11 @@
 using Do.Platform.Linux;
 
 
-namespace Bibtex {
+namespace Bibtex
+{
 
-	public class BibtexItemSource : ItemSource, IConfigurable {
+	public class BibtexItemSource : ItemSource
+	{
 		
 		Regex fileRegex = new Regex (@"file\s=\s\{(.*?)\}",
 		                             RegexOptions.IgnoreCase

=== modified file 'Bibtex/src/Configuration.cs'
--- Bibtex/src/Configuration.cs	2009-01-22 12:54:17 +0000
+++ Bibtex/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -19,13 +19,15 @@
  */
 using System;
 using Do.Platform;
+using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace Bibtex
 {
 
 	[System.ComponentModel.Category("Bibtex")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
         private static IPreferences prefs;
 		
@@ -41,6 +43,15 @@
 			prefs = Do.Platform.Services.Preferences.Get<Bibtex.Configuration>();
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("Bibtex"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
         public static string BibtexFilePath {
 			get { return prefs.Get<string>("bibtexfilepath", System.IO.Path.Combine (System.Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), "bibtex.bib")); }
 			set { prefs.Set <string> ("bibtexfilepath", value); }

=== modified file 'Confluence/Confluence.mdp'
--- Confluence/Confluence.mdp	2009-02-28 16:16:48 +0000
+++ Confluence/Confluence.mdp	2009-06-20 02:16:49 +0000
@@ -1,9 +1,10 @@
-<Project name="Confluence" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="2.0" ctype="DotNetProject">
+<Project name="Confluence" fileversion="2.0" language="C#" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Debug" assembly="Confluence" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
+      <EnvironmentVariables />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
@@ -22,7 +23,6 @@
     <File name="gtk-gui/Confluence.ConfluenceConfigWidget.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="src/ConfluenceConfigWidget.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/ConfluenceConfiguration.cs" subtype="Code" buildaction="Compile" />
     <File name="Resources/Confluence.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="Resources/icons/confluence.png" subtype="Code" buildaction="Nothing" />
   </Contents>
@@ -31,7 +31,6 @@
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

=== modified file 'Confluence/Makefile.am'
--- Confluence/Makefile.am	2009-01-09 07:45:01 +0000
+++ Confluence/Makefile.am	2009-06-20 02:11:31 +0000
@@ -5,7 +5,6 @@
 FILES = \
 	gtk-gui/Confluence.ConfluenceConfigWidget.cs \
 	gtk-gui/generated.cs \
-	src/ConfluenceConfiguration.cs \
 	src/ConfluenceConfigWidget.cs \
 	src/ConfluenceSearchAction.cs \
 	src/Remote/ConfluenceSoapServiceService.cs
@@ -24,5 +23,4 @@
 	System.Web.Services \
 	System.Xml \
 	$(GTK_SHARP_20_LIBS) \
-	$(GCONF_SHARP_20_LIBS) \
 	$(DO_PLATFORM_LINUX_LIBS)

=== modified file 'Confluence/Resources/Confluence.addin.xml'
--- Confluence/Resources/Confluence.addin.xml	2009-03-31 23:19:25 +0000
+++ Confluence/Resources/Confluence.addin.xml	2009-06-20 02:39:35 +0000
@@ -15,10 +15,13 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />	
 	</Dependencies>
 
 	<Extension path = "/Do/Action">
 		<Action type="Confluence.ConfluenceSearchAction" />
 	</Extension>
-
+	<Extension path= "/Do/Config">
+		<Config type="Confluence.ConfluenceConfigWidget" />
+	</Extension>
 </Addin>

=== modified file 'Confluence/gtk-gui/objects.xml'
--- Confluence/gtk-gui/objects.xml	2008-12-29 18:23:07 +0000
+++ Confluence/gtk-gui/objects.xml	2009-06-20 02:11:31 +0000
@@ -1,6 +1,13 @@
 <objects attr-sync="on">
   <object type="Confluence.ConfluenceConfigWidget" palette-category="Confluence" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
+    <itemgroups>
+      <itemgroup label="ConfluenceConfigWidget Properties">
+        <property name="BaseURL" />
+        <property name="UserName" />
+        <property name="Password" />
+        <property name="MaxResults" />
+      </itemgroup>
+    </itemgroups>
     <signals />
   </object>
 </objects>
\ No newline at end of file

=== modified file 'Confluence/src/ConfluenceConfigWidget.cs'
--- Confluence/src/ConfluenceConfigWidget.cs	2008-12-24 04:37:17 +0000
+++ Confluence/src/ConfluenceConfigWidget.cs	2009-06-20 02:39:35 +0000
@@ -16,59 +16,101 @@
 
 using System;
 
+using Do.Platform;
+using Do.Platform.Linux;
+using Mono.Unix;
+
 namespace Confluence
 {
 	[System.ComponentModel.Category("Confluence")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class ConfluenceConfigWidget : Gtk.Bin
-	{
-		private ConfluenceSearchAction _confluenceSearch;
-		
-		public ConfluenceConfigWidget(ConfluenceSearchAction confluenceSearch)
-		{
-			this.Build();
-			_confluenceSearch = confluenceSearch;
-			SetFieldsFromConfig( _confluenceSearch.Config );
+	public partial class ConfluenceConfigWidget : Gtk.Bin, IConfigurable
+	{		
+		private readonly int DefaultMaxResults = 20;
+		static IPreferences Prefs;
+		
+		public ConfluenceConfigWidget ()
+		{
+			this.Build ();
+			SetFieldsFromConfig ();
+		}
+		
+		static ConfluenceConfigWidget ()
+		{
+			Prefs = Services.Preferences.Get<Confluence.ConfluenceConfigWidget> ();
+		}
+
+		public string Title {
+			get { return Catalog.GetString ("Confluence"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
 		}
 		
 		protected virtual void OnSaveButtonReleased (object sender, System.EventArgs e)
 		{
-			_confluenceSearch.Log( "Re-init Confluence Plugin with new settings..." );
-
-			_confluenceSearch.Config = GetConfigFromFields();
+			GetConfigFromFields ();
 			
 			// Write the config back out to the fields to reflect how we saved it
-			SetFieldsFromConfig( _confluenceSearch.Config );
+			SetFieldsFromConfig ();
 		}
 
 		// Bindings...
 		
-		private void SetFieldsFromConfig( IConfluenceConfiguration config )
-		{
-			_entryBaseUrl.Text = config.BaseUrl;
-			_entryUsername.Text = config.Username;
-			_entryPassword.Text = config.Password;
-			_entryMaxSearchResults.Text = Convert.ToString(config.MaxSearchResults);
-		}
-		
-		private IConfluenceConfiguration GetConfigFromFields()
-		{
-			ConfluenceConfiguration config = new ConfluenceConfiguration();
-			config.BaseUrl = _entryBaseUrl.Text;
-			config.Username = _entryUsername.Text;
-			config.Password = _entryPassword.Text;
-			
-			try 
-			{
-				config.MaxSearchResults = Convert.ToInt32(_entryMaxSearchResults.Text);
-			} 
-			catch (FormatException) 
-			{
-				_confluenceSearch.Log( "Invalid max search results specified.  Setting to default value." );
-				config.MaxSearchResults = config.DefaultMaxSearchResults;
-			}
-			
-			return config;
-		}
+		private void SetFieldsFromConfig ()
+		{
+			_entryBaseUrl.Text = BaseURL;
+			_entryUsername.Text = UserName;
+			_entryPassword.Text = Password;
+			_entryMaxSearchResults.Text = MaxResults.ToString ();
+		}
+		
+		private void GetConfigFromFields ()
+		{
+			BaseURL = _entryBaseUrl.Text;
+			UserName = _entryUsername.Text;
+			Password = _entryPassword.Text;
+			
+			try {
+				MaxResults = Convert.ToInt32(_entryMaxSearchResults.Text);
+			} catch (FormatException) {
+				Log<ConfluenceConfigWidget>.Debug ("Invalid max search results specified.  Setting to default value.");
+				MaxResults = DefaultMaxResults;
+			}
+		}
+		
+		public static string BaseURL
+		{
+			get { 
+				return Prefs.Get<string> ("BaseURL", ""); 
+			}
+			set { Prefs.Set<string> ("BaseURL", value); }
+		}
+
+		public static string UserName
+		{
+			get { 
+				return Prefs.Get<string> ("UserName", ""); 
+			}
+			set { Prefs.Set<string> ("UserName", value); }
+		}
+
+		public static string Password
+		{
+			get { 
+				return Prefs.GetSecure<string> ("Password", ""); 
+			}
+			set { Prefs.SetSecure<string> ("Password", value); }
+		}
+		
+		public static int MaxResults
+		{
+			get { 
+				return Prefs.Get<int> ("MaxResults", 20); 
+			}
+			set { Prefs.Set<int> ("MaxResults", value); }
+		}	
 	}
 }

=== removed file 'Confluence/src/ConfluenceConfiguration.cs'
--- Confluence/src/ConfluenceConfiguration.cs	2008-12-24 04:37:17 +0000
+++ Confluence/src/ConfluenceConfiguration.cs	1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-
-using System;
-
-
-namespace Confluence
-{
-	public interface IConfluenceConfiguration
-	{
-		string BaseUrl 
-		{
-			get;
-		}
-		
-		string Username
-		{
-			get;
-		}
-		
-		string Password 
-		{
-			get;
-		}
-		
-		int MaxSearchResults
-		{
-			get;
-		}
-		
-		/// <value>
-		/// To be valid, all required fields must be filled out
-		/// </value>
-		bool IsValid();
-	}	
-	
-	/// <summary>
-	/// Configuration that uses gconf to do the magic
-	/// </summary>
-	public class ConfluenceConfiguration : IConfluenceConfiguration
-	{
-		/// <summary>
-		/// The gnome conf key that contains the base url for our Confluence installation.
-		/// ie. http://opensource.atlassian.com/confluence/spring
-		/// </summary>
-		private const string _sGCONF_KEY= "/apps/gnome-do/plugins/Confluence";
-		
-		private GConf.Client _gconf;
-		
-		public ConfluenceConfiguration()
-		{
-			_gconf= new GConf.Client();
-			
-			// Set defaults
-			MaxSearchResults = DefaultMaxSearchResults;
-		}
-		
-		private void SetConfValue( string key, string val )
-		{
-			_gconf.Set( _sGCONF_KEY + "/" + key, val );
-		}
-		
-		private string GetConfValue( string key, string fallback )
-		{
-			try
-			{
-				return _gconf.Get( _sGCONF_KEY + "/" + key ) as String;
-			}
-			catch( GConf.NoSuchKeyException ) 
-			{
-				return fallback;
-			}
-		}
-		
-		public string BaseUrl
-		{
-			get { return GetConfValue( "baseUrl", "" ); }
-			set 
-			{
-				value = value.Trim();
-				if (value.EndsWith("/"))
-				{
-					char[] trimChars = { '/' };
-					value = value.TrimEnd(trimChars);
-				}
-					
-				SetConfValue( "baseUrl", value ); 
-			}
-		}
-		
-		public string Username
-		{
-			get { return GetConfValue( "username", "" ); }
-			set { SetConfValue( "username", value ); }
-		}
-		
-		public string Password 
-		{
-			get { return GetConfValue( "password", "" ); }
-			set { SetConfValue( "password", value ); }
-		}
-		
-		public int MaxSearchResults
-		{
-			get 
-			{
-				try 
-				{
-					return Convert.ToInt32(GetConfValue( "maxSearchResults", "" ));
-				} 
-				catch (FormatException) 
-				{
-					return DefaultMaxSearchResults;
-				}
-			}
-			
-			set { SetConfValue( "maxSearchResults", Convert.ToString( value )); }
-		}
-		
-		public int DefaultMaxSearchResults
-		{
-			get 
-			{ 
-				return 20; 
-			}
-		}
-		
-		/// <value>
-		/// To be valid, all required fields must be filled out
-		/// </value>
-		public bool IsValid()
-		{
-			return BaseUrl.Length>0;
-		}
-	}
-}

=== modified file 'Confluence/src/ConfluenceSearchAction.cs'
--- Confluence/src/ConfluenceSearchAction.cs	2008-12-24 04:37:17 +0000
+++ Confluence/src/ConfluenceSearchAction.cs	2009-06-20 02:39:35 +0000
@@ -20,123 +20,56 @@
 using System.Linq;
 using System.Collections.Generic;
 using Do.Universe;
+using Do.Universe.Common;
+using Do.Platform;
 using Do.Platform.Linux;
 using Mono.Unix;
 
-
 /// <summary>
 /// Do plug-in that returns search results from a Confluence wiki back to 
 /// gnome-do for display and selection by the user
 /// </summary>
 namespace Confluence
 {	
-	
-	// No longer in Do, have to subclass 
-	public class BookmarkItem : Item, IBookmarkItem 
+	public class ConfluenceSearchAction : Act
 	{
-		protected string name, url;
-		public BookmarkItem (string name, string url)
-		{
-			this.name = name;
-			this.url = url;
-		}
-		
-		public override string Name
-		{
-			get { return name; }
-		}
-		
-		public override string Description
-		{
-			get { return url; }
-		}
-		
-		public override string Icon
-		{
-			get { return "www"; }
-		}
-		
-		public string Url
-		{
-			get { return url; }
-		}
-	}
-
-	public class ConfluenceSearchAction : Act, IConfigurable
-	{	
-		/// <summary>
-		/// Our configuration for Confluence properties
-		/// </summary>
-		private IConfluenceConfiguration _config;
-
-		/// <summary>
-		/// Initializes ConfluenceSearchAction
-		/// </summary>
-		public ConfluenceSearchAction() 
-		{
-			_config = new ConfluenceConfiguration();
-		}
-		
 		/// <value>
 		/// The name of the plugin
 		/// </value>
-		public override string Name 
-		{
+		public override string Name {
 			get { return Catalog.GetString ("Search Confluence"); }
 		}
 		
 		/// <value>
 		/// A description of the plugin
 		/// </value>
-		public override string Description 
-		{
+		public override string Description {
 			get { return Catalog.GetString ("Searches Confluence and returns results to Do"); }
 		}
 		
 		/// <value>
 		/// Confluence icon
 		/// </value>
-		public override string Icon 
-		{
-			get { return "confluence.png@"+GetType().Assembly.FullName; }
+		public override string Icon {
+			get { return "confluence.png@"+GetType ().Assembly.FullName; }
 		}
 		
 		/// <value>
 		/// ITextItem
 		/// </value>
-		public override IEnumerable<Type> SupportedItemTypes 
-		{
-			get 
-			{
-				return new Type[] { typeof (ITextItem) };
+		public override IEnumerable<Type> SupportedItemTypes {
+			get  {
+				yield return typeof (ITextItem);
 			}
 		}
 		
 		/// <value>
 		/// false
 		/// </value>
-		public override bool ModifierItemsOptional 
-		{
+		public override bool ModifierItemsOptional 	{
 			get { return false; }
 		}
 		
-		/// <value>
-		/// The config class
-		/// </value>
-		public IConfluenceConfiguration Config
-		{
-			get { return _config; }
-			set { _config= value; }
-		}
-		
-		/// <summary>
-		/// Create the configuration dialog
-		/// </summary>
-		public Gtk.Bin GetConfiguration()
-		{
-			return new ConfluenceConfigWidget( this );
-		}
-		
 		/// <summary>
 		/// Actual code performed when action is executed in Do
 		/// </summary>
@@ -149,51 +82,34 @@
 		/// <returns>
 		/// Array of Bookmark Items. URLs to search results <see cref="IItem"/>
 		/// </returns>
-		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems) {
-			
-			try 
-			{
-				ConfluenceSoapServiceService soapService = new ConfluenceSoapServiceService(_config.BaseUrl);
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
+		{
+			List<BookmarkItem> results = new List<BookmarkItem> ();
+			try {
+				ConfluenceSoapServiceService soapService = new ConfluenceSoapServiceService (ConfluenceConfigWidget.BaseURL);
 				
 				// Only login if username AND password were provided in the config.
 				// Otherwise, use anonymous access with a null token.
 				String token = null;
-				if (_config.Username != null && _config.Username.Trim().Length != 0 && 
-				      _config.Password != null && _config.Password.Trim().Length != 0) 
-				{
-					token = soapService.login(_config.Username, _config.Password);
+				if (!string.IsNullOrEmpty (ConfluenceConfigWidget.UserName) && 
+				      !string.IsNullOrEmpty (ConfluenceConfigWidget.Password))	{
+					token = soapService.login (ConfluenceConfigWidget.UserName, ConfluenceConfigWidget.Password);
 				}
 				
 				string query = (items.First () as ITextItem).Text;
-				RemoteSearchResult[] results = soapService.search(token, query, _config.MaxSearchResults);
 				
-				List<Item> retItems = new List<Item> ();
-				foreach (RemoteSearchResult result in results) 
-				{
-					retItems.Add(new BookmarkItem(result.title, result.url));
+				foreach (RemoteSearchResult result in soapService.search (token, query, ConfluenceConfigWidget.MaxResults)) {
+					results.Add (new BookmarkItem (result.title, result.url));
 				}
-				
-				return retItems.ToArray();
-			}
-			catch( Exception e ) 
-			{
-				Log( "Unable to search Confluence: {0}", e );
-				return null;
-			}
-		}
-		
-		/// <summary>
-		/// Temporary logging method until it's provided to plugins
-		/// </summary>
-		public void Log( string message, params object[] args )
-		{
-			string prefix= string.Format( "[Info {0:00}:{1:00}:{2:00}.{3:000}] [Confluence] ",
-			                           DateTime.Now.Hour, 
-			                           DateTime.Now.Minute, 
-			                           DateTime.Now.Second,
-			                           DateTime.Now.Millisecond ); 	
-			
-			Console.WriteLine( prefix + string.Format( message, args ) );
+			} catch (Exception e) {
+				Log<ConfluenceSearchAction>.Error ("Unable to search Confluence: {0}", e.Message);
+				Log<ConfluenceSearchAction>.Debug (e.StackTrace);
+			}
+			
+			foreach (BookmarkItem result in results)
+				yield return result;
+			
+			yield break;
 		}
 	}
 }

=== modified file 'Del.icio.us/Resources/delicious.addin.xml'
--- Del.icio.us/Resources/delicious.addin.xml	2009-03-31 23:19:25 +0000
+++ Del.icio.us/Resources/delicious.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<!-- Extensions included in this assembly -->
@@ -26,4 +27,7 @@
 		<ItemSource type="Delicious.BookmarksItemSource" />
 		<ItemSource type="Delicious.TagsItemSource" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Delicious.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'Del.icio.us/src/BookmarksItemSource.cs'
--- Del.icio.us/src/BookmarksItemSource.cs	2009-05-29 09:39:41 +0000
+++ Del.icio.us/src/BookmarksItemSource.cs	2009-06-19 08:23:32 +0000
@@ -31,7 +31,7 @@
 
 namespace Delicious
 {	
-	public class BookmarksItemSource : ItemSource, IConfigurable
+	public class BookmarksItemSource : ItemSource
 	{
 		public override string Name  {
 			get { return Catalog.GetString ("Del.icio.us bookmarks"); }
@@ -68,10 +68,5 @@
 			updateBookmarks.IsBackground = true;
 			updateBookmarks.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'Del.icio.us/src/Configuration.cs'
--- Del.icio.us/src/Configuration.cs	2009-01-16 01:25:56 +0000
+++ Del.icio.us/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -21,10 +21,11 @@
 
 using System;
 using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace Delicious
 {	
-	public class Configuration : AbstractLoginWidget
+	public class Configuration : AbstractLoginWidget, IConfigurable
 	{
 		public Configuration () : base ("del.icio.us", "https://secure.delicious.com/register")
 		{
@@ -32,6 +33,15 @@
 			Password = Delicious.Preferences.Password;
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("del.icio.us"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected override void SaveAccountData(string username, string password)
 		{
 			Delicious.Preferences.Username = username;

=== modified file 'Dropbox/Resources/Dropbox.addin.xml'
--- Dropbox/Resources/Dropbox.addin.xml	2009-05-10 17:04:26 +0000
+++ Dropbox/Resources/Dropbox.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<Extension path="/Do/Action">
@@ -27,5 +28,7 @@
 		<Action type="Dropbox.DropboxRevisionsAction" />
 		<Action type="Dropbox.DropboxWebInterfaceAction" />		
 	</Extension>
-
+	<Extension path= "/Do/Config">
+		<Config type="Dropbox.DropboxConfig" />
+	</Extension>
 </Addin>

=== modified file 'Dropbox/src/Config/DropboxConfig.cs'
--- Dropbox/src/Config/DropboxConfig.cs	2009-06-06 16:40:38 +0000
+++ Dropbox/src/Config/DropboxConfig.cs	2009-06-19 08:23:32 +0000
@@ -27,13 +27,14 @@
 using Gtk;
 
 using Do.Platform;
+using Do.Platform.Linux;
 
 namespace Dropbox
 {
 	
 	[System.ComponentModel.Category("File")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class DropboxConfig : Gtk.Bin
+	public partial class DropboxConfig : Gtk.Bin, IConfigurable
 	{
 		private static string home_path = Environment.GetFolderPath (Environment.SpecialFolder.Personal); 
 		private static string base_path = System.IO.Path.Combine (home_path, "Dropbox");
@@ -45,6 +46,15 @@
 			Build ();
 			RefreshView ();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Dropbox"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		private void RefreshView ()
 		{

=== modified file 'Dropbox/src/DropboxStartAction.cs'
--- Dropbox/src/DropboxStartAction.cs	2009-06-14 15:24:47 +0000
+++ Dropbox/src/DropboxStartAction.cs	2009-06-19 08:23:32 +0000
@@ -34,7 +34,7 @@
 {
 	
 	
-	public class DropboxStartAction : Act, IConfigurable
+	public class DropboxStartAction : Act
 	{
 		
 		public override string Name {
@@ -64,11 +64,5 @@
 			
 			yield break;
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new DropboxConfig();
-		}
-
 	}
 }

=== modified file 'File/Resources/File.addin.xml'
--- File/Resources/File.addin.xml	2009-03-31 23:19:25 +0000
+++ File/Resources/File.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/ItemSource">
@@ -30,4 +31,7 @@
 		<Action type="Do.FilesAndFolders.RenameAction" />
 		<Action type="Do.FilesAndFolders.MoveToTrashAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Do.FilesAndFolders.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'File/src/Do/Do.FilesAndFolders/Configuration.cs'
--- File/src/Do/Do.FilesAndFolders/Configuration.cs	2009-03-05 01:12:21 +0000
+++ File/src/Do/Do.FilesAndFolders/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -24,11 +24,13 @@
 using Gtk;
 using Mono.Unix;
 
+using Do.Platform.Linux;
+
 namespace Do.FilesAndFolders
 {	
 	[System.ComponentModel.Category("File")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
 		PathNodeView[] nodeViews = new PathNodeView[2];
 		
@@ -56,6 +58,15 @@
 			notebook1.Page = 0;
 			
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Files and Folders"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		private PathNodeView GetCurrentView ()
 		{

=== modified file 'File/src/Do/Do.FilesAndFolders/FileItemSource.cs'
--- File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2009-06-17 01:07:23 +0000
+++ File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2009-06-19 19:14:09 +0000
@@ -33,7 +33,7 @@
 	/// <summary>
 	/// Indexes files recursively starting in a specific directory.
 	/// </summary>
-	public class FileItemSource : ItemSource, IConfigurable {
+	public class FileItemSource : ItemSource {
 
 		IEnumerable<Item> items;
 		bool maximum_files_warned;
@@ -60,11 +60,6 @@
 		public override IEnumerable<Item> Items {
 			get { return items; }
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 
 		public override IEnumerable<Type> SupportedItemTypes {
 			get {

=== modified file 'Flickr/Flickr.mdp'
--- Flickr/Flickr.mdp	2009-04-30 01:03:44 +0000
+++ Flickr/Flickr.mdp	2009-06-19 08:23:32 +0000
@@ -21,7 +21,6 @@
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
     <File name="src/AccountConfig.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="src/FlickrItemSource.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/Flickr.UploadConfig.cs" subtype="Code" buildaction="Compile" />
     <File name="src/UploadConfig.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/Flickr.AccountConfig.cs" subtype="Code" buildaction="Compile" />

=== modified file 'Flickr/Makefile.am'
--- Flickr/Makefile.am	2009-05-07 16:03:28 +0000
+++ Flickr/Makefile.am	2009-06-19 08:23:32 +0000
@@ -10,7 +10,6 @@
 	gtk-gui/Flickr.UploadDialog.cs \
 	gtk-gui/generated.cs \
 	src/AccountConfig.cs \
-	src/FlickrItemSource.cs \
 	src/UploadAction.cs \
 	src/UploadPool.cs \
 	src/UploadDialog.cs \

=== modified file 'Flickr/Resources/Flickr.addin.xml'
--- Flickr/Resources/Flickr.addin.xml	2009-03-31 23:19:25 +0000
+++ Flickr/Resources/Flickr.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,12 +15,14 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<Extension path= "/Do/Action">
 		<Action type="Flickr.UploadAction"/>
 	</Extension>
-	<Extension path = "/Do/ItemSource">
-		<ItemSource type="Flickr.FlickrItemSource" />
+	<Extension path= "/Do/Config">
+		<Config type="Flickr.AccountConfig" />
+		<Config type="Flickr.UploadConfig" />
 	</Extension>
 </Addin>

=== modified file 'Flickr/src/AccountConfig.cs'
--- Flickr/src/AccountConfig.cs	2008-12-24 03:48:49 +0000
+++ Flickr/src/AccountConfig.cs	2009-06-19 08:23:32 +0000
@@ -25,10 +25,11 @@
 using FlickrNet;
 
 using Do.Platform;
+using Do.Platform.Linux;
 
 namespace Flickr
 {	
-	public partial class AccountConfig : Gtk.Bin
+	public partial class AccountConfig : Gtk.Bin, IConfigurable
 	{	
 		private FlickrNet.Flickr flickr;
 		private static IPreferences prefs;
@@ -46,6 +47,15 @@
 			} else
 				flickr = new FlickrNet.Flickr (ApiKey, ApiSecret);
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Account"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		static AccountConfig ()
 		{
@@ -115,10 +125,5 @@
 		  	auth_btn.Clicked -= new EventHandler (OnCompleteBtnClicked);
 		  	auth_btn.Clicked += new EventHandler (OnAuthBtnClicked);
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return this;
-		}
 	}
-}
\ No newline at end of file
+}

=== removed file 'Flickr/src/FlickrItemSource.cs'
--- Flickr/src/FlickrItemSource.cs	2008-12-24 03:48:49 +0000
+++ Flickr/src/FlickrItemSource.cs	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/* FlickrItemSource.cs
- *
- * GNOME Do is the legal property of its developers. Please refer to the
- * COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-using System;
-using System.Collections.Generic;
-using Mono.Unix;
-
-using Do.Universe;
-using Do.Platform.Linux;
-
-namespace Flickr
-{	
-	public class FlickrItemSource : ItemSource, IConfigurable
-	{	
-		public override string Name {
-			get { return Catalog.GetString ("Account"); }
-		}
-		
-		public override string Description {
-			get { return ""; }
-		}
-		
-		public override string Icon {
-			get { return "flickr.png@" + GetType ().Assembly.FullName; }
-		}
-		
-		public override IEnumerable<Type> SupportedItemTypes {
-			get { yield break; }
-		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new AccountConfig ();
-		}
-	}
-}

=== modified file 'Flickr/src/UploadAction.cs'
--- Flickr/src/UploadAction.cs	2009-04-19 02:03:26 +0000
+++ Flickr/src/UploadAction.cs	2009-06-19 08:23:32 +0000
@@ -32,7 +32,7 @@
 
 namespace Flickr
 {	
-	public class UploadAction : Act, IConfigurable
+	public class UploadAction : Act
 	{			
 		const string ImageExtensions = ".jpg .jpeg .gif .png .tiff";
 	
@@ -120,11 +120,6 @@
 			yield break;
 		}
 		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new UploadConfig ();
-		}
-		
 		bool FileIsPicture (IFileItem item)
 		{
 			return FileIsPicture (item.Path);

=== modified file 'Flickr/src/UploadConfig.cs'
--- Flickr/src/UploadConfig.cs	2008-10-31 17:53:44 +0000
+++ Flickr/src/UploadConfig.cs	2009-06-19 08:23:32 +0000
@@ -21,12 +21,14 @@
 
 using System;
 using Gtk;
+using Mono.Unix;
+using Do.Platform.Linux;
 
 namespace Flickr
 {
 	[System.ComponentModel.Category("Flickr")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class UploadConfig : Gtk.Bin
+	public partial class UploadConfig : Gtk.Bin, IConfigurable
 	{		
 		public UploadConfig()
 		{
@@ -41,6 +43,16 @@
 				friends_chk.Active = AccountConfig.FriendsAllowed;
 				family_chk.Active = AccountConfig.FamilyAllowed;
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Uploading"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected void OnTagsEdited (object sender, EventArgs args)
 		{
 			AccountConfig.Tags = tags_text.Buffer.Text;
@@ -70,4 +82,4 @@
 			AccountConfig.FamilyAllowed = family_chk.Active;
 		}
 	}
-}
\ No newline at end of file
+}

=== modified file 'GoogleCalendar/Resources/GoogleCalendar.addin.xml'
--- GoogleCalendar/Resources/GoogleCalendar.addin.xml	2009-05-07 19:49:44 +0000
+++ GoogleCalendar/Resources/GoogleCalendar.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/ItemSource">
@@ -27,4 +28,7 @@
 		<Action type="GCalendar.ViewCalendarAction" />
 		<Action type="GCalendar.ViewEventAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="GCalendar.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'GoogleCalendar/src/Configuration.cs'
--- GoogleCalendar/src/Configuration.cs	2009-01-01 01:25:16 +0000
+++ GoogleCalendar/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -29,7 +29,7 @@
 
 namespace GCalendar
 {
-	public class Configuration : AbstractLoginWidget
+	public class Configuration : AbstractLoginWidget, IConfigurable
 	{
 		const string EmailPattern = @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\."
             + @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*"
@@ -43,6 +43,15 @@
 			Username = GCal.Preferences.Username;
 			Password = GCal.Preferences.Password;
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Google Calendar"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		protected override bool Validate (string username, string password)
 		{
@@ -63,4 +72,4 @@
 			return new Regex (EmailPattern, RegexOptions.Compiled).IsMatch (username);
 		}
 	}
-}
\ No newline at end of file
+}

=== modified file 'GoogleCalendar/src/GCalendarItemSource.cs'
--- GoogleCalendar/src/GCalendarItemSource.cs	2008-12-31 21:16:30 +0000
+++ GoogleCalendar/src/GCalendarItemSource.cs	2009-06-19 19:14:09 +0000
@@ -30,7 +30,7 @@
 
 namespace GCalendar
 {	
-	public sealed class GCalendarItemSource : ItemSource, IConfigurable
+	public sealed class GCalendarItemSource : ItemSource
 	{
 		public GCalendarItemSource ()
 		{
@@ -69,10 +69,5 @@
 			thread.IsBackground = true;
 			thread.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'GoogleContacts/Resources/GoogleContacts.addin.xml'
--- GoogleContacts/Resources/GoogleContacts.addin.xml	2009-05-17 08:43:00 +0000
+++ GoogleContacts/Resources/GoogleContacts.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path = "/Do/ItemSource">
@@ -23,4 +24,7 @@
 	<Extension path= "/Do/Action">
 		<Action type="GMail.RecentConversationsActions" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="GMail.GMailConfig" />
+	</Extension>
 </Addin>

=== modified file 'GoogleContacts/src/GMailConfig.cs'
--- GoogleContacts/src/GMailConfig.cs	2008-12-24 05:37:47 +0000
+++ GoogleContacts/src/GMailConfig.cs	2009-06-19 08:23:32 +0000
@@ -25,10 +25,11 @@
 using Gtk;
 
 using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace GMail
 {	
-	public class GMailConfig : AbstractLoginWidget   
+	public class GMailConfig : AbstractLoginWidget, IConfigurable 
 	{
 		const string EmailPattern = @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\."
             + @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*"
@@ -42,6 +43,15 @@
 			Password = GMail.Preferences.Password;
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("GMail"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected override void SaveAccountData(string username, string password)
 		{
 			GMail.Preferences.Username = username;

=== modified file 'GoogleContacts/src/GMailContactItemSource.cs'
--- GoogleContacts/src/GMailContactItemSource.cs	2008-12-24 04:42:14 +0000
+++ GoogleContacts/src/GMailContactItemSource.cs	2009-06-19 08:23:32 +0000
@@ -29,7 +29,7 @@
 
 namespace GMail
 {	
-	public sealed class GMailItemSource : ItemSource, IConfigurable
+	public sealed class GMailItemSource : ItemSource
 	{
 		public GMailItemSource() 
 		{
@@ -70,10 +70,5 @@
 			thread.IsBackground = true;
 			thread.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new GMailConfig ();
-		}
 	}
 }

=== modified file 'GoogleDocs/Resources/GoogleDocs.addin.xml'
--- GoogleDocs/Resources/GoogleDocs.addin.xml	2009-06-17 20:40:03 +0000
+++ GoogleDocs/Resources/GoogleDocs.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/ItemSource">
@@ -25,4 +26,7 @@
 		<Action type="GDocs.GDocsUploadDocument" />
 		<Action type="GDocs.GDocsTrashDocument" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="GDocs.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'GoogleDocs/src/Configuration.cs'
--- GoogleDocs/src/Configuration.cs	2009-06-09 22:50:11 +0000
+++ GoogleDocs/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -26,7 +26,7 @@
 
 namespace GDocs
 {
-	public class Configuration : AbstractLoginWidget
+	public class Configuration : AbstractLoginWidget, IConfigurable
 	{
 		const string EmailPattern = @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\."
 			+ @"[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*"
@@ -40,6 +40,15 @@
 			Password = GDocs.Preferences.Password;
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("Google Docs"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected override bool Validate (string username, string password)
 		{
 			return ValidateUsername (username) &&

=== modified file 'GoogleDocs/src/GDocsItemSource.cs'
--- GoogleDocs/src/GDocsItemSource.cs	2009-06-09 22:50:11 +0000
+++ GoogleDocs/src/GDocsItemSource.cs	2009-06-19 08:23:32 +0000
@@ -27,7 +27,7 @@
 
 namespace GDocs
 {
-	public sealed class GDocsItemSource : ItemSource, IConfigurable
+	public sealed class GDocsItemSource : ItemSource
     {
 		public override string Name {
 			get { return Catalog.GetString ("Google Docs"); }
@@ -60,10 +60,5 @@
 			updateDocs.IsBackground = true;
 			updateDocs.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'GoogleSearch/Resources/GoogleSearch.addin.xml'
--- GoogleSearch/Resources/GoogleSearch.addin.xml	2009-03-31 23:19:25 +0000
+++ GoogleSearch/Resources/GoogleSearch.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<!-- Extensions included in this assembly -->
@@ -23,4 +24,7 @@
 		<Action type="InlineGoogleSearch.InlineGoogleSearch" />
 		<Action type="InlineGoogleSearch.ImFeelingLucky" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="InlineGoogleSearch.InlineGoogleSearchConfig" />
+	</Extension>
 </Addin>

=== modified file 'GoogleSearch/src/InlineGoogleSearch.cs'
--- GoogleSearch/src/InlineGoogleSearch.cs	2009-02-11 19:17:18 +0000
+++ GoogleSearch/src/InlineGoogleSearch.cs	2009-06-19 08:23:32 +0000
@@ -71,7 +71,7 @@
 	/// <summary>
 	/// Class Definition
 	/// </summary>
-	public class InlineGoogleSearch : Act, IConfigurable {	
+	public class InlineGoogleSearch : Act {	
 		
 		/// <value>
 		/// Search Google
@@ -81,7 +81,7 @@
 				return Catalog.GetString ("Search Google"); 
 			}
 		}
-		
+
 		/// <value>
 		/// Searches google and returns results to Do
 		/// </value>
@@ -162,16 +162,5 @@
 		public InlineGoogleSearch () 
 		{
 		}
-		
-		/// <summary>
-		/// Calls config dialog
-		/// </summary>
-		/// <returns>
-		/// InlineGoogleSearchConfig Widget <see cref="Gtk.Bin"/>
-		/// </returns>
-		public Gtk.Bin GetConfiguration () 
-		{
-			return new InlineGoogleSearchConfig ();
-		}
 	}
 }

=== modified file 'GoogleSearch/src/InlineGoogleSearchConfig.cs'
--- GoogleSearch/src/InlineGoogleSearchConfig.cs	2009-01-10 23:05:04 +0000
+++ GoogleSearch/src/InlineGoogleSearchConfig.cs	2009-06-19 08:23:32 +0000
@@ -20,6 +20,9 @@
 using System;
 
 using Do.Platform;
+using Do.Platform.Linux;
+
+using Mono.Unix;
 
 /// <summary>
 /// Do plug-in that returns search results from google back to gnome-do for 
@@ -30,7 +33,7 @@
 	/// <summary>
 	/// Config Dialog for InlineGoogleSearch
 	/// </summary>
-	public partial class InlineGoogleSearchConfig : Gtk.Bin {
+	public partial class InlineGoogleSearchConfig : Gtk.Bin, IConfigurable {
 		/// <summary>
 		/// Do.Addins.Util Preferences
 		/// </summary>
@@ -72,6 +75,15 @@
 		{
 			prefs = Services.Preferences.Get<InlineGoogleSearchConfig>();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Google Search"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		/// <value>
 		/// Default Value: "moderate"

=== modified file 'ImageShack/Resources/ImageShack.addin.xml'
--- ImageShack/Resources/ImageShack.addin.xml	2009-03-31 23:19:25 +0000
+++ ImageShack/Resources/ImageShack.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,9 +15,13 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<Extension path= "/Do/Action">
 		<Action type="ImageShack.ImageShackAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="ImageShack.ImageShackConfig" />
+	</Extension>
 </Addin>

=== modified file 'ImageShack/src/ImageShackAction.cs'
--- ImageShack/src/ImageShackAction.cs	2009-03-04 05:10:41 +0000
+++ ImageShack/src/ImageShackAction.cs	2009-06-19 08:23:32 +0000
@@ -36,7 +36,7 @@
 
 namespace ImageShack
 {
-	public class ImageShackAction : Act, IConfigurable
+	public class ImageShackAction : Act
 	{
 		static readonly Dictionary<string, string> image_mime_type_mapping = new Dictionary<string,string>
 		{
@@ -195,4 +195,4 @@
 			return image_mime_type_mapping.ContainsKey (Path.GetExtension (file.Path));
 		}
 	}
-}
\ No newline at end of file
+}

=== modified file 'ImageShack/src/ImageShackConfig.cs'
--- ImageShack/src/ImageShackConfig.cs	2008-12-24 04:44:00 +0000
+++ ImageShack/src/ImageShackConfig.cs	2009-06-19 08:23:32 +0000
@@ -21,10 +21,12 @@
 using System.Text.RegularExpressions;
 
 using Do.Platform;
+using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace ImageShack
 {
-	public partial class ImageShackConfig : Gtk.Bin
+	public partial class ImageShackConfig : Gtk.Bin, IConfigurable
 	{
 		private static IPreferences prefs;
 		private readonly static string RegistrationUrl = "http://profile.imageshack.us/registration/";
@@ -41,6 +43,15 @@
 		{
 			prefs = Services.Preferences.Get<ImageShackConfig> ();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Imageshack"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		public static string RegistrationCode {
 			get { return prefs.Get<string> ("RegistrationCode",""); }

=== modified file 'JIRA/JIRA.mdp'
--- JIRA/JIRA.mdp	2009-01-09 08:10:40 +0000
+++ JIRA/JIRA.mdp	2009-06-20 02:30:06 +0000
@@ -17,10 +17,8 @@
     <File name="src/JIRAIssueSource.cs" subtype="Code" buildaction="Compile" />
     <File name="src/JIRAIssueItem.cs" subtype="Code" buildaction="Compile" />
     <File name="src/JIRAIssueAction.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/JIRAConfiguration.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/gui.stetic" subtype="Code" buildaction="EmbedAsResource" />
     <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
-    <File name="gtk-gui/JIRA.ConfigWidget.cs" subtype="Code" buildaction="Compile" />
     <File name="gtk-gui/objects.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="src/ConfigWidget.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Remote" subtype="Directory" buildaction="Compile" />
@@ -30,6 +28,7 @@
     <File name="src/Remote/JIRAServerFacade.cs" subtype="Code" buildaction="Compile" />
     <File name="Resources/JIRA.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
     <File name="Resources/icons/jira.png" subtype="Code" buildaction="EmbedAsResource" />
+    <File name="gtk-gui/JIRA.ConfigWidget.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -38,7 +37,6 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />

=== modified file 'JIRA/Makefile.am'
--- JIRA/Makefile.am	2009-01-09 07:45:01 +0000
+++ JIRA/Makefile.am	2009-06-19 19:14:09 +0000
@@ -12,7 +12,6 @@
 	src/Remote/JIRARssClient.cs \
 	src/Remote/JIRAServerFacade.cs \
 	src/Remote/AtlassianJiraSoapService.cs \
-	src/JIRAConfiguration.cs \
 	src/JIRAIssueSource.cs
 
 RESOURCES = \
@@ -28,5 +27,4 @@
 	$(DO_PLATFORM_LIBS) \
 	$(DO_PLATFORM_LINUX_LIBS) \
 	$(DO_UNIVERSE_LIBS) \
-	$(GTK_SHARP_20_LIBS) \
-	$(GCONF_SHARP_20_LIBS) 
+	$(GTK_SHARP_20_LIBS)

=== modified file 'JIRA/Resources/JIRA.addin.xml'
--- JIRA/Resources/JIRA.addin.xml	2009-03-31 23:19:25 +0000
+++ JIRA/Resources/JIRA.addin.xml	2009-06-19 19:14:09 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />	
 	</Dependencies>
 
 	<Extension path="/Do/Action">
@@ -23,6 +24,7 @@
 	<Extension path = "/Do/ItemSource">
 		<ItemSource type="JIRA.JIRAIssueSource" />
 	</Extension>
-
-
+	<Extension path= "/Do/Config">
+		<Config type="JIRA.ConfigWidget" />
+	</Extension>
 </Addin>

=== modified file 'JIRA/gtk-gui/gui.stetic'
--- JIRA/gtk-gui/gui.stetic	2009-01-09 07:25:58 +0000
+++ JIRA/gtk-gui/gui.stetic	2009-06-20 02:39:35 +0000
@@ -217,4 +217,214 @@
       </widget>
     </child>
   </widget>
+  <widget class="Gtk.Bin" id="JIRA.ConfigWidget" design-size="300 161">
+    <property name="MemberName" />
+    <child>
+      <widget class="Gtk.Table" id="table2">
+        <property name="MemberName" />
+        <property name="NRows">5</property>
+        <property name="NColumns">2</property>
+        <property name="RowSpacing">6</property>
+        <property name="ColumnSpacing">6</property>
+        <child>
+          <placeholder />
+        </child>
+        <child>
+          <widget class="Gtk.Entry" id="_entryBaseUrl">
+            <property name="MemberName" />
+            <property name="Tooltip" translatable="yes">The base url location to your JIRA install. ie. http://issues.apache.org/jira</property>
+            <property name="CanFocus">True</property>
+            <property name="Text" translatable="yes">http://issues.apache.org/issues</property>
+            <property name="IsEditable">True</property>
+            <property name="InvisibleChar">●</property>
+          </widget>
+          <packing>
+            <property name="LeftAttach">1</property>
+            <property name="RightAttach">2</property>
+            <property name="AutoSize">False</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">True</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Entry" id="_entryPassword">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="IsEditable">True</property>
+            <property name="Visibility">False</property>
+            <property name="InvisibleChar">●</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">2</property>
+            <property name="BottomAttach">3</property>
+            <property name="LeftAttach">1</property>
+            <property name="RightAttach">2</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Entry" id="_entryProjects">
+            <property name="MemberName" />
+            <property name="Tooltip" translatable="yes">Comma separated list of projects</property>
+            <property name="CanFocus">True</property>
+            <property name="Text" translatable="yes">VFS,NET</property>
+            <property name="IsEditable">True</property>
+            <property name="InvisibleChar">●</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">3</property>
+            <property name="BottomAttach">4</property>
+            <property name="LeftAttach">1</property>
+            <property name="RightAttach">2</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Entry" id="_entryUsername">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="Text" translatable="yes">username1</property>
+            <property name="IsEditable">True</property>
+            <property name="InvisibleChar">●</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">1</property>
+            <property name="BottomAttach">2</property>
+            <property name="LeftAttach">1</property>
+            <property name="RightAttach">2</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Label" id="_labelBaseUrl">
+            <property name="MemberName" />
+            <property name="LabelProp">Base Url</property>
+          </widget>
+          <packing>
+            <property name="AutoSize">False</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Label" id="_labelPassword">
+            <property name="MemberName" />
+            <property name="LabelProp">Password</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">2</property>
+            <property name="BottomAttach">3</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Label" id="_labelProjects">
+            <property name="MemberName" />
+            <property name="LabelProp">Projects</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">3</property>
+            <property name="BottomAttach">4</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Label" id="_labelUsername">
+            <property name="MemberName" />
+            <property name="LabelProp">Username</property>
+          </widget>
+          <packing>
+            <property name="TopAttach">1</property>
+            <property name="BottomAttach">2</property>
+            <property name="AutoSize">True</property>
+            <property name="XOptions">Fill</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">True</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Button" id="_saveButton">
+            <property name="MemberName" />
+            <property name="CanFocus">True</property>
+            <property name="Type">TextOnly</property>
+            <property name="Label">Save</property>
+            <property name="UseUnderline">True</property>
+            <property name="Xalign">0</property>
+            <signal name="Released" handler="OnSaveButtonReleased" />
+          </widget>
+          <packing>
+            <property name="TopAttach">4</property>
+            <property name="BottomAttach">5</property>
+            <property name="LeftAttach">1</property>
+            <property name="RightAttach">2</property>
+            <property name="AutoSize">False</property>
+            <property name="XOptions">0</property>
+            <property name="YOptions">Fill</property>
+            <property name="XExpand">False</property>
+            <property name="XFill">False</property>
+            <property name="XShrink">False</property>
+            <property name="YExpand">False</property>
+            <property name="YFill">True</property>
+            <property name="YShrink">False</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </stetic-interface>
\ No newline at end of file

=== modified file 'JIRA/gtk-gui/objects.xml'
--- JIRA/gtk-gui/objects.xml	2008-12-24 04:37:17 +0000
+++ JIRA/gtk-gui/objects.xml	2009-06-19 19:14:09 +0000
@@ -1,6 +1,13 @@
 <objects attr-sync="on">
   <object type="JIRA.ConfigWidget" palette-category="JIRA" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
+    <itemgroups>
+      <itemgroup label="ConfigWidget Properties">
+        <property name="ProjectsString" />
+        <property name="BaseURL" />
+        <property name="UserName" />
+        <property name="Password" />
+      </itemgroup>
+    </itemgroups>
     <signals />
   </object>
 </objects>
\ No newline at end of file

=== modified file 'JIRA/src/ConfigWidget.cs'
--- JIRA/src/ConfigWidget.cs	2008-12-24 04:37:17 +0000
+++ JIRA/src/ConfigWidget.cs	2009-06-20 02:26:06 +0000
@@ -16,67 +16,113 @@
 using System;
 using System.Collections.Generic;
 
+using Do.Platform;
+using Do.Platform.Linux;
+
+using Mono.Unix;
+
 namespace JIRA
 {
 	[System.ComponentModel.Category("JIRA")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class ConfigWidget : Gtk.Bin
-	{	
-		private JIRAIssueSource _issueSource;
+	public partial class ConfigWidget : Gtk.Bin, IConfigurable
+	{
+		static private IPreferences prefs;
 		
-		public ConfigWidget( JIRAIssueSource issueSource )
+		public ConfigWidget ()
 		{			
-			this.Build();
-		
-			_issueSource= issueSource;
+			this.Build ();
 			
-			SetFieldsFromConfig( _issueSource.Config );
+			SetFieldsFromConfig ();
+		}
+		
+		static ConfigWidget ()
+		{
+			prefs = Do.Platform.Services.Preferences.Get<JIRA.ConfigWidget> ();
+		}
+		
+		public string Title {
+			get { return Catalog.GetString ("JIRA"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
 		}
 		
 		protected virtual void OnSaveButtonReleased (object sender, System.EventArgs e)
 		{
-			_issueSource.Log( "Re-init JIRA Plugin with new settings..." );			
-
-			_issueSource.Config= GetConfigFromFields();
-			_issueSource.Config.Persist();
-			
+			GetConfigFromFields ();
 			// Write the config back out to the fields to reflect how we saved it
-			SetFieldsFromConfig( _issueSource.Config );
+			SetFieldsFromConfig ();
 		}
 
 		// Bindings...
 		
-		private void SetFieldsFromConfig( IJIRAConfiguration config )
-		{
-			config.Load();
-			
-			_entryBaseUrl.Text= config.BaseUrl;
-			_entryUsername.Text= config.Username;
-			_entryPassword.Text= config.Password;
-			_entryProjects.Text= string.Join( ",", config.Projects );
-		}
-		
-		private IJIRAConfiguration GetConfigFromFields()
-		{
-			JIRAConfiguration config= new JIRAConfiguration();
-			config.BaseUrl= _entryBaseUrl.Text;
-			config.Username= _entryUsername.Text;
-			config.Password= _entryPassword.Text;
-			
-			// Split up the projects, and make sure they're correct
-			List<string> projects= new List<string>();
-			foreach( string str in _entryProjects.Text.Split( new char[] { ',', ';', ':', ' ' } ) )
-			{
-				string project= str.Trim();
-				
-				if( project.Length> 0 )
-				{
-					projects.Add( project );
+		private void SetFieldsFromConfig ()
+		{
+			_entryBaseUrl.Text = BaseURL;
+			_entryUsername.Text = UserName;
+			_entryPassword.Text = Password;
+			_entryProjects.Text = ProjectsString;
+		}
+		
+		private void GetConfigFromFields ()
+		{
+			BaseURL = _entryBaseUrl.Text;
+			UserName = _entryUsername.Text;
+			Password = _entryPassword.Text;
+			ProjectsString = _entryProjects.Text;
+		}
+		
+		public static List<string> Projects {
+			get {
+				List<string> projects = new List<string> ();
+				foreach (string str in ProjectsString.Split (new char[] { ',', ';', ':', ' ' })) {
+					string project = str.Trim ();
+					
+					if (project.Length > 0)	{
+						projects.Add (project);
+					}
 				}
-			}
-			
-			config.Projects= projects.ToArray();
-			return config;
+				return projects;
+			}
+		}
+		
+		public static string ProjectsString {
+			get {
+				return prefs.Get<string> ("Projects", "");
+			}
+			set {
+				prefs.Set<string> ("Projects", value);
+			}
+		}
+		
+		public static string BaseURL {
+			get {
+				return prefs.Get<string> ("BaseURL", "");
+			}
+			set {
+				prefs.Set<string> ("BaseURL", value);
+			}
+		}
+		
+		public static string UserName {
+			get {
+				return prefs.Get<string> ("UserName", "");
+			}
+			set {
+				prefs.Set<string> ("UserName", value);
+			}
+		}
+		
+		public static string Password {
+			get {
+				return prefs.GetSecure<string> ("Password", "");
+			}
+			set {
+				prefs.SetSecure<string> ("Password", value);
+			}
 		}
 	}
 }

=== removed file 'JIRA/src/JIRAConfiguration.cs'
--- JIRA/src/JIRAConfiguration.cs	2008-12-24 04:37:17 +0000
+++ JIRA/src/JIRAConfiguration.cs	1970-01-01 00:00:00 +0000
@@ -1,189 +0,0 @@
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-using System;
-using Do.Platform;
-using Do.Universe;
-
-
-
-namespace JIRA
-{
-
-	
-	
-	public interface IJIRAConfiguration
-	{
-		string BaseUrl
-		{
-			get;
-		}
-		
-		string Username
-		{
-			get;
-		}
-		
-		string Password 
-		{
-			get;
-		}
-		
-		string[] Projects 
-		{ 
-			get;
-		}
-		
-		/// <value>
-		/// To be valid, all fields must be filled out
-		/// </value>
-		bool IsValid();
-		
-		/// <summary>
-		/// Persist the properties of this configuration bean to an underlying store
-		/// </summary>
-		void Persist();
-		
-		/// <summary>
-		/// Pre-fill the properties of this bean from the underlying store
-		/// </summary>
-		void Load();
-	}	
-	
-	/// <summary>
-	/// Configuration that uses gconf to do the magic
-	/// </summary>
-	public class JIRAConfiguration : IJIRAConfiguration
-	{
-		private string _baseUrl;
-		private string _username;
-		private string _password;
-		private string[] _projects;
-
-		static private IPreferences prefs;
-		
-		/// <summary>
-		/// The gnome conf key that contains the base url for our JIRA installation.
-		/// ie. http://issues.apache.org/jira
-		/// </summary>
-		private const string _sGCONF_KEY= "/apps/gnome-do/plugins/JIRA";
-	
-		private GConf.Client _gconf;		
-		
-		public JIRAConfiguration()
-		{
-			_gconf= new GConf.Client();
-		}
-		
-		static JIRAConfiguration() 
-		{
-			prefs = Do.Platform.Services.Preferences.Get<JIRA.JIRAConfiguration>();
-		}			
-		
-		private void SetConfValue( string key, string val )
-		{
-			_gconf.Set( _sGCONF_KEY +"/"+key, val );
-		}
-		
-		private string GetConfValue( string key, string fallback )
-		{
-			try
-			{
-				return _gconf.Get( _sGCONF_KEY+"/"+key ) as String;
-			}
-			catch( GConf.NoSuchKeyException ) 
-			{
-				return fallback;
-			}
-		}
-		
-		public string BaseUrl
-		{
-			get { return _baseUrl ?? ""; }
-			set { _baseUrl= value; }
-		}
-		public string Username
-		{
-			get { return _username ?? "";	}
-			set { _username= value; }
-		}
-		
-		public string Password 
-		{
-			get { return _password ?? ""; }
-			set { _password= value; }
-		}
-		public string[] Projects 
-		{ 
-			get { return _projects ?? new string[ 0 ]; }
-			set { _projects= value; }
-		}
-		
-		/// <value>
-		/// To be valid, all fields must be filled out
-		/// </value>
-		public bool IsValid()
-		{
-			return _baseUrl!=null
-				&& _username!=null
-				&& _password!=null
-				&& _projects!=null; 
-		}
-		
-		public void Load()
-		{
-			_baseUrl= GetConfValue( "baseUrl", null );
-			
-			string projStr= GetConfValue( "projects", "" );
-			_projects= projStr.Length>0 ? projStr.Split( ',' ) : null;
-
-			// Use the gnome-do framework for retrieving from the keychain
-			_username = prefs.GetSecure("username", "");
-			_password = prefs.GetSecure("password", "");
-		}
-		
-		public void Persist()
-		{
-			prefs.Set("baseUrl", _baseUrl );
-			prefs.Set("projects", string.Join(",", _projects));
-			prefs.SetSecure("username", _username );
-			prefs.GetSecure("password", _password );
-		}
-		
-		
-		/// <summary>
-		/// Do a migration to the gnome keyring and return true if we do a migrate, false if
-		/// we've done it previously
-		/// </summary>
-		/// <returns>
-		/// A <see cref="System.Boolean"/>
-		/// </returns>
-		public bool DoMigrate()
-		{
-			// Because we used to write the username/password to gconf, provide a migration
-			// strategy that will haul the values into the keyring and clear them out of
-			// gconf
-			if( "".Equals( GetConfValue( "password", "" ) ) ) return false;
-
-			prefs.SetSecure("username", GetConfValue("username", null));
-			prefs.SetSecure("password", GetConfValue("password", null));
-			
-			SetConfValue( "username", "" );
-			SetConfValue( "password", "" );
-			
-			return true;
-		}
-	}
-}

=== modified file 'JIRA/src/JIRAIssueAction.cs'
--- JIRA/src/JIRAIssueAction.cs	2008-12-24 04:37:17 +0000
+++ JIRA/src/JIRAIssueAction.cs	2009-06-20 02:26:06 +0000
@@ -18,7 +18,7 @@
 using System.Text.RegularExpressions;
 using Do.Universe.Common;
 using Do.Universe;
-using GConf;
+using Mono.Unix;
 
 namespace JIRA
 {		
@@ -26,12 +26,12 @@
 	{
 		public override string Name 
 		{
-			get { return "View JIRA Issue"; }
+			get { return Catalog.GetString ("View JIRA Issue"); }
 		}
 
 		public override string Description 
 		{
-			get { return "Views the specified JIRA Issue"; }
+			get { return Catalog.GetString ("Views the specified JIRA Issue"); }
 		}
 
 		public override string Icon 
@@ -44,24 +44,25 @@
 		/// </value>
 		public override IEnumerable<Type> SupportedItemTypes
 		{
-			get { return new Type[] { typeof (JIRAIssueItem) }; }
+			get { 
+				yield return typeof (JIRAIssueItem);
+			}
         }
 
 		
 		/// <summary>
 		/// Which the matching code, return JIRA link
 		/// </returns>
-		public override IEnumerable<Item> Perform( IEnumerable<Item> items, IEnumerable<Item> modItems )
+		public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
 		{
-			List<Item> urls= new List<Item>();
+			List<Item> urls= new List<Item> ();
 			
 			// Build up full urls from the issue codes
-			foreach( Item item in items )
-			{
-				urls.Add( new TextItem( ( item as JIRAIssueItem ).Url ) );
+			foreach (Item item in items) {
+				urls.Add (new TextItem ((item as JIRAIssueItem).Url));
 			}	
 			
-			return base.Perform( urls.ToArray(), modItems );
+			return base.Perform (urls.ToArray(), modItems);
 		}
 	}
 }
\ No newline at end of file

=== modified file 'JIRA/src/JIRAIssueSource.cs'
--- JIRA/src/JIRAIssueSource.cs	2009-05-29 09:39:41 +0000
+++ JIRA/src/JIRAIssueSource.cs	2009-06-19 19:14:09 +0000
@@ -16,26 +16,25 @@
 using System;
 using System.Text;
 using System.Threading;
+using System.Collections;
 using System.Collections.Generic;
-using System.Collections;
+
 using Do.Universe;
+using Do.Platform;
 using Do.Platform.Linux;
 using Atlassian;
 using JIRA.Remote;
 
+using Mono.Unix;
+
 
 namespace JIRA
 {
 	/// <summary>
 	/// Provider of issues that meet our requirements (ie. certain projects, open criteria)
 	/// </summary>
-	public class JIRAIssueSource : ItemSource, IConfigurable
-	{
-		/// <summary>
-		/// Our configuration for JIRA properties
-		/// </summary>
-		private IJIRAConfiguration _config;
-		
+	public class JIRAIssueSource : ItemSource
+	{		
 		/// <summary>
 		/// Server facade for handling issue download
 		/// </summary>
@@ -44,164 +43,131 @@
 		/// <summary>
 		/// True when the plugin has init and updates of items should occur
 		/// </summary>
-		private bool _hasInit= false;
+		private bool _hasInit = false;
 		
 		/// <summary>
 		/// Current list of outstanding issues
 		/// </summary>
-		private readonly List<Item> _items= new List<Item>();
+		private readonly List<Item> _items = new List<Item> ();
 		
 		/// <summary>
 		/// ProjectIds we're watching
 		/// </summary>
-		private readonly List<long> _projectIds= new List<long>();
+		private readonly List<long> _projectIds = new List<long> ();
 		
 		/// <summary>
 		/// Statuses that are available within this JIRA installation
 		/// </summary>
-		private readonly List<int> _projectStatuses= new List<int>();
+		private readonly List<int> _projectStatuses = new List<int> ();
 		
 		/// <summary>
 		/// Lock object for query thread safety, locks should always be taken in the order 
 		/// of query lock, then item lock
 		/// </summary>		
-		private readonly object _lock= new object();
+		private readonly object _lock = new object ();
 		
 		
 		/// <summary>
 		/// Constructor (preloads config)
 		/// </summary>
-		public JIRAIssueSource()
-		{			
-			_config= new JIRAConfiguration();
-			
-			// Do the migration if need be
-			if( ( (JIRAConfiguration) _config ).DoMigrate() )
-			{
-				Log( "Migrated credentials to gnome keyring" );
-			}
-			
+		public JIRAIssueSource ()
+		{				
 			// Run the initial query						
-			UpdateItems();
-		}
-		
-		public override string Name { get { return "JIRA Issues"; } }
-		public override string Description { get { return "Indexes JIRA Issues from a given repository"; } }
-		public override string Icon { get { return "jira.png@"+GetType().Assembly.FullName; } }
-		
-		public IJIRAConfiguration Config
-		{
-			get { return _config; }
-			set
-			{
-				_config= value;
-				_hasInit= false;
-			}
-		}
-		
-		/// <summary>
-		/// Create the configuration dialog
-		/// </summary>
-		public Gtk.Bin GetConfiguration()
-		{
-			return new ConfigWidget( this );
+			UpdateItems ();
+		}
+		
+		public override string Name { 
+			get { 
+				return Catalog.GetString ("JIRA Issues"); 
+			}
+		}
+		
+		public override string Description { 
+			get { 
+				return Catalog.GetString ("Indexes JIRA Issues from a given repository");
+			}
+		}
+		
+		public override string Icon {
+			get {
+				return "jira.png@"+GetType ().Assembly.FullName;
+			}
 		}
 		
 		public override IEnumerable<Type> SupportedItemTypes
 		{
-			get
-			{
-				return new Type[] { typeof( JIRAIssueItem ) };
+			get {
+				yield return typeof (JIRAIssueItem);
 			}
 		}
 		
 		public override IEnumerable<Item> Items
 		{
-			get 
-			{
-				lock( _items )
-				{
+			get  {
+				lock (_items) {
 					return _items;
 				}
 			}
 		}
-
-		/// <summary>
-		/// Not Supported
-		/// </summary>
-		public override IEnumerable<Item> ChildrenOfItem( Item parent )
-		{
-			yield break;
-		}
 		
 		/// <summary>
 		/// Called semi-regularly such that we can poll the JIRA web service to see
 		/// if there are any new issues matching our projects request list. This is called
 		/// by gnome-do, and we don't want to block too long!
 		/// </summary>
-		public override void UpdateItems()
+		public override void UpdateItems ()
 		{				
 			// We do all our updates on another thread...
-			new Thread( DoUpdateItems ).Start();
+			Services.Application.RunOnThread (() => { DoUpdateItems (); });
 		}
 
 		
-		private void DoUpdateItems()
+		private void DoUpdateItems ()
 		{
 			// If we didn't aquire the lock, we won't call update items now 
-			if( !Monitor.TryEnter( _lock ) ) return;
+			if (!Monitor.TryEnter(_lock)) return;
 			
-			try
-			{
+			try {
 				// We aquired the lock, but make sure we inited correctly
-				if( !_hasInit )
-				{
+				if (!_hasInit) {
 					// Do the init role
-					DoInit();
+					DoInit ();
 					return;
 				}				
 				
 				// We've previous init, so we're just looking for deltas
-				List<JIRAIssueItem> changedIssues= ConvertFromRemoteIssues( _service.GetRecentlyUpdatedIssues( _projectIds ) );
+				List<JIRAIssueItem> changedIssues = ConvertFromRemoteIssues (_service.GetRecentlyUpdatedIssues (_projectIds));
 				
 				// Find Issues that have become closed... and purge them
-				List<string> closedIssues= changedIssues
-					.FindAll( delegate( JIRAIssueItem item ) { return item.IsClosed; } )
-					.ConvertAll<string>( delegate( JIRAIssueItem item ) { return item.Name; } );
+				List<string> closedIssues = changedIssues
+					.FindAll( delegate (JIRAIssueItem item) { return item.IsClosed; } )
+					.ConvertAll<string> (delegate( JIRAIssueItem item) { return item.Name; } );
 
 				// Do a quick lock while we remove the items that are now closed
-				lock( _items )
-				{
-					int removedItems= _items.RemoveAll( delegate( Item item ) { return closedIssues.Contains( item.Name ); } );
+				lock (_items) {
+					int removedItems = _items.RemoveAll (delegate (Item item) { return closedIssues.Contains (item.Name ); } );
 					
-					if( removedItems>0 )
-					{
-						Log( "Removed: {0} resolved/closed issues", removedItems );
+					if (removedItems > 0) {
+						Log.Debug ("Removed: {0} resolved/closed issues", removedItems);
 					}
 				}
 				
 				// Find and add the issues that aren't closed, but are new!
-				List<string> currentIssues= _items.ConvertAll<string>( delegate( Item item ) { return item.Name; } );
-				List<JIRAIssueItem> newIssues= changedIssues.FindAll( delegate( JIRAIssueItem item ) { return !item.IsClosed && !currentIssues.Contains( item.Name ); } );
+				List<string> currentIssues = _items.ConvertAll<string>( delegate (Item item) { return item.Name; } );
+				List<JIRAIssueItem> newIssues = changedIssues.FindAll( delegate (JIRAIssueItem item) { return !item.IsClosed && !currentIssues.Contains (item.Name); } );
 				
-				lock( _items )
-				{
-					_items.AddRange( newIssues.ToArray() );
+				lock (_items) {
+					_items.AddRange (newIssues.ToArray());
 				}
 				
 				// Notify what's changed
-				if( newIssues.Count>0 )
-				{
-					Log( "Added: {0} new issues", newIssues.Count );
+				if (newIssues.Count > 0) {
+					Log.Debug ("Added: {0} new issues", newIssues.Count);
 				}
-			}
-			catch( Exception e ) 
-			{
-				Log( "Unable to update JIRA items: {0}", e );
-			}
-			finally
-			{
-				Monitor.Exit( _lock );
+			} catch (Exception e) {
+				Log.Error ("Unable to update JIRA items: {0}", e);
+			} finally {
+				Monitor.Exit (_lock);
 			}
 		}
 		
@@ -209,117 +175,82 @@
 		/// Determine the project ids of the given project codes by contacting the JIRA soap service.
 		/// Then do an initial query for issues with these given ids
 		/// </summary>
-		private void DoInit()
+		private void DoInit ()
 		{
-			try
-			{
-				Monitor.Enter( _lock );
+			try	{
+				Monitor.Enter (_lock);
 				
 				// Pre cleaning...
 				_hasInit= true; // by the time this is done, we will have init...
-				_projectStatuses.Clear();
-				_projectIds.Clear();
-				
-				lock( _items )
-				{
-					_items.Clear();
-				}
-				
-				// Check to make sure the config is valid...
-				_config.Load();
-				
-				if( !_config.IsValid() )
-				{
-					Log( "Configuration for JIRA is not valid, see the plugin settings page" );
-
-					// we failed to init
-					_hasInit= false;
-					return;
-				}
-				
-				Log( "Initializing repository: "+_config.BaseUrl );				
+				_projectStatuses.Clear ();
+				_projectIds.Clear ();
+				
+				lock (_items) {
+					_items.Clear ();
+				}
+				
+				Log.Debug ("Initializing repository: " + ConfigWidget.BaseURL);
 				
 				// init the service connection
-				_service= new JIRAServerFacade( _config.BaseUrl, _config.Username, _config.Password );
+				_service= new JIRAServerFacade (ConfigWidget.BaseURL, ConfigWidget.UserName, ConfigWidget.Password);
 				
 				// Identify the available resolutions for an issue
-				foreach( RemoteStatus status in _service.getStatuses() )
-				{
+				foreach (RemoteStatus status in _service.getStatuses()) {
 					_projectStatuses.Add( int.Parse( status.id ) );
 
-					Log( "Init Status: {0} => {1}", status.name, status.id );
+					Log.Debug ("Init Status: {0} => {1}", status.name, status.id);
 				}
 				
 				// We want all issues that have a status that isn't 5 or 6 (resolved/closed)
 				// we need to do it this way because JIRA doesn't support logical operators
 				// for exclusion: see JRA-1560
-				List<int> reqStatuses= new List<int>( _projectStatuses );
-				reqStatuses.Remove( JIRAIssueItem.STATUS_RESOLVED );
-				reqStatuses.Remove( JIRAIssueItem.STATUS_CLOSED );
+				List<int> reqStatuses = new List<int> (_projectStatuses);
+				reqStatuses.Remove (JIRAIssueItem.STATUS_RESOLVED);
+				reqStatuses.Remove (JIRAIssueItem.STATUS_CLOSED);
 				
 				// Identify the project id's that we're interested in
-				foreach( string projectKey in _config.Projects )
-				{
-					RemoteProject project= _service.getProjectByKey( projectKey );
-					long projectId= long.Parse( project.id );
+				foreach (string projectKey in ConfigWidget.Projects)	{
+					RemoteProject project = _service.getProjectByKey (projectKey);
+					long projectId = long.Parse (project.id);
 					
 					// Use the rss client to discover the issues for this project that are open
-					List<JIRAIssueItem> issues= ConvertFromRemoteIssues( 
-										_service.GetAllIssuesWithStatus( 
-															new List<long>( new long[]{ projectId } ), 
-															reqStatuses ) );
+					List<JIRAIssueItem> issues = ConvertFromRemoteIssues ( 
+										_service.GetAllIssuesWithStatus ( 
+															new List<long> (new long[] {projectId}), 
+															reqStatuses));
 
 					// Store this project and it's issues
-					_projectIds.Add( projectId );
+					_projectIds.Add (projectId);
 					
-					lock( _items )
-					{
-						_items.AddRange( issues.ToArray() );
+					lock (_items) {
+						_items.AddRange (issues.ToArray());
 					}
 					
-					Log( "Init Project: {0} [{1}=>{2}] with: {3} issues.",
-					    project.name, project.key, project.id, issues.Count );
+					Log.Debug ("Init Project: {0} [{1}=>{2}] with: {3} issues.",
+					    project.name, project.key, project.id, issues.Count);
 				}
 
-			}
-			catch( System.Web.Services.Protocols.SoapException e )
-			{
-				Log( "Failure (re-)initializating JIRA plugin...\n{0}", e );	
-			}			
-			finally
-			{
-				Monitor.Exit( _lock );
+			} catch (System.Web.Services.Protocols.SoapException e) {
+				Log.Error ("Failure (re-)initializating JIRA plugin...\n{0}", e);
+				Log.Debug (e.StackTrace);
+			} finally {
+				Monitor.Exit (_lock);
 			}
 		}
 		
 		
-		private List<JIRAIssueItem> ConvertFromRemoteIssues( IList<RemoteIssue> issues )
+		private List<JIRAIssueItem> ConvertFromRemoteIssues (IList<RemoteIssue> issues)
 		{
-			List<JIRAIssueItem> result= new List<JIRAIssueItem>();
+			List<JIRAIssueItem> result = new List<JIRAIssueItem> ();
 			
-			foreach( RemoteIssue inIssue in issues )
-			{
-				JIRAIssueItem outIssue= new JIRAIssueItem( inIssue.key, _config.BaseUrl );
-				outIssue.setDescription(inIssue.summary);
-				outIssue.Status= int.Parse( inIssue.status );
+			foreach (RemoteIssue inIssue in issues)	{
+				JIRAIssueItem outIssue = new JIRAIssueItem (inIssue.key, ConfigWidget.BaseURL);
+				outIssue.setDescription (inIssue.summary);
+				outIssue.Status = int.Parse (inIssue.status);
 				
-				result.Add( outIssue );
+				result.Add (outIssue);
 			}
 			return result;			                                        
 		}
-		
-		/// <summary>
-		/// Temporary logging method until it's provided to plugins
-		/// </summary>
-		public void Log( string message, params object[] args )
-		{
-			string prefix= string.Format( "[Info {0:00}:{1:00}:{2:00}.{3:000}] [JIRA] ",
-			                           DateTime.Now.Hour, 
-			                           DateTime.Now.Minute, 
-			                           DateTime.Now.Second,
-			                           DateTime.Now.Millisecond ); 			
-			
-			Console.WriteLine( prefix + string.Format( message, args ) );			
-		}
 	}
-}
+}
\ No newline at end of file

=== modified file 'Microblogging/Resources/Microblogging.addin.xml'
--- Microblogging/Resources/Microblogging.addin.xml	2009-05-18 06:07:24 +0000
+++ Microblogging/Resources/Microblogging.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/Action">
@@ -24,4 +25,8 @@
 	<Extension path="/Do/ItemSource">
 		<ItemSource type="Microblogging.FriendSource" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Microblogging.Configuration" />
+		<Config type="Microblogging.GenConfig" />
+	</Extension>
 </Addin>

=== modified file 'Microblogging/src/Configuration.cs'
--- Microblogging/src/Configuration.cs	2009-06-12 11:16:20 +0000
+++ Microblogging/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -25,11 +25,12 @@
 
 using Twitterizer.Framework;
 
+using Mono.Unix;
 using Do.Platform.Linux;
 
 namespace Microblogging
 {
-	public class Configuration : AbstractLoginWidget
+	public class Configuration : AbstractLoginWidget, IConfigurable
 	{
 		static Dictionary<Service, string> register_links;
 		public static event EventHandler ServiceChanged;
@@ -41,6 +42,15 @@
 			register_links = new Dictionary<Service, string> ();
 			SetupServiceLinks ();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Login"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		public Configuration () : 
 			base (Microblog.Preferences.MicroblogService, register_links[Microblog.Preferences.ActiveService])

=== modified file 'Microblogging/src/FriendSource.cs'
--- Microblogging/src/FriendSource.cs	2009-02-28 19:17:08 +0000
+++ Microblogging/src/FriendSource.cs	2009-06-20 02:49:57 +0000
@@ -35,7 +35,7 @@
 	/// This is a dummy class, all it does is set up the Miroblog class on Do load
 	/// and return a configuration page.
 	/// </summary>
-	public sealed class FriendSource : ItemSource, IConfigurable
+	public sealed class FriendSource : ItemSource
 	{
 		public FriendSource()
 		{
@@ -45,7 +45,7 @@
 		public override string Name {
 			get { return Catalog.GetString ("Microblog friends"); }
 		}
-		
+
 		public override string Description {
 			get { return Catalog.GetString ("Indexes your microblog friends"); }
 		}
@@ -66,10 +66,5 @@
 		{
 			return (item as FriendItem).Statuses.Where (status => status.Id > 0).OfType<Item> ();
 		}
-
-		public Gtk.Bin GetConfiguration () 
-		{
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'Microblogging/src/GenConfig.cs'
--- Microblogging/src/GenConfig.cs	2009-02-28 02:17:00 +0000
+++ Microblogging/src/GenConfig.cs	2009-06-19 08:23:32 +0000
@@ -23,9 +23,12 @@
 
 using Gtk;
 
+using Mono.Unix;
+using Do.Platform.Linux;
+
 namespace Microblogging
 {
-	public partial class GenConfig : Gtk.Bin
+	public partial class GenConfig : Gtk.Bin, IConfigurable
 	{
 
 		public GenConfig ()
@@ -34,6 +37,15 @@
 			show_updates_chk.Active = Microblog.Preferences.ShowNotifications;
 			show_dms_chk.Active = Microblog.Preferences.ShowDirectMessages;
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Updates"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		protected virtual void OnShowUpdatesChkClicked (object sender, EventArgs e)
 		{

=== modified file 'Microblogging/src/PostAction.cs'
--- Microblogging/src/PostAction.cs	2009-02-28 19:17:08 +0000
+++ Microblogging/src/PostAction.cs	2009-06-19 08:23:32 +0000
@@ -32,7 +32,7 @@
 
 namespace Microblogging
 {		
-	public sealed class PostAction : Act, IConfigurable
+	public sealed class PostAction : Act
 	{
 		const int MaxMessageLength = 140;
 		
@@ -112,11 +112,6 @@
 			
 			return null;
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new GenConfig ();
-		}
 
 		string BuildTweet(string status, IEnumerable<Item> modItems)
 		{

=== modified file 'Pastebin/Resources/Pastebin.addin.xml'
--- Pastebin/Resources/Pastebin.addin.xml	2009-03-31 23:19:25 +0000
+++ Pastebin/Resources/Pastebin.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<!-- Extensions included in this assembly -->
@@ -22,4 +23,7 @@
 	<Extension path= "/Do/Action">
 		<Action type="Pastebin.PastebinAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Pastebin.PastebinConfig" />
+	</Extension>
 </Addin>

=== modified file 'Pastebin/gtk-gui/gui.stetic'
--- Pastebin/gtk-gui/gui.stetic	2009-01-22 04:43:21 +0000
+++ Pastebin/gtk-gui/gui.stetic	2009-06-19 08:23:32 +0000
@@ -2,8 +2,11 @@
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12.1</target-gtk-version>
+    <target-gtk-version>2.12</target-gtk-version>
   </configuration>
+  <import>
+    <widget-library name="../bin/Debug/Pastebin.dll" internal="true" />
+  </import>
   <widget class="Gtk.Bin" id="Pastebin.PastebinConfig" design-size="300 300">
     <property name="MemberName" />
     <child>

=== modified file 'Pastebin/src/Config/PastebinConfig.cs'
--- Pastebin/src/Config/PastebinConfig.cs	2009-01-22 04:43:21 +0000
+++ Pastebin/src/Config/PastebinConfig.cs	2009-06-19 08:23:32 +0000
@@ -22,10 +22,12 @@
 using System.Linq;
 using System.Reflection;
 using Do.Platform;
+using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace Pastebin
 {	
-	public partial class PastebinConfig : Gtk.Bin
+	public partial class PastebinConfig : Gtk.Bin, IConfigurable
 	{	
 		static IPreferences prefs;
 		
@@ -34,7 +36,16 @@
 			this.Build();
 			SetupColumns();
 			FillProviders();
-		}	
+		}
+
+		public string Title {
+			get { return Catalog.GetString ("Pastebin"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		private void SetupColumns()
 		{		

=== modified file 'Pastebin/src/PastebinAction.cs'
--- Pastebin/src/PastebinAction.cs	2009-04-11 21:18:05 +0000
+++ Pastebin/src/PastebinAction.cs	2009-06-19 08:23:32 +0000
@@ -34,7 +34,7 @@
 
 namespace Pastebin
 {
-	public class PastebinAction : Act, IConfigurable
+	public class PastebinAction : Act
 	{
 		public override string Name {
 			get { return Catalog.GetString ("Send to Pastebin"); }
@@ -115,13 +115,6 @@
 			
 			if (!string.IsNullOrEmpty (url))
 				yield return new TextItem (url);
-		}
-				
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new PastebinConfig();
-		}				
+		}			
 	}
 }
-
-

=== modified file 'PingFM/Resources/PingFM.addin.xml'
--- PingFM/Resources/PingFM.addin.xml	2009-03-31 23:19:25 +0000
+++ PingFM/Resources/PingFM.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/ItemSource">
@@ -24,4 +25,7 @@
 	<Extension path="/Do/Action">
 		<Action type="PingFM.PingFMPost" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="PingFM.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'PingFM/src/Configuration.cs'
--- PingFM/src/Configuration.cs	2009-01-12 04:00:07 +0000
+++ PingFM/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -25,9 +25,12 @@
 using Gtk;
 using Gdk;
 
+using Do.Platform.Linux;
+using Mono.Unix;
+
 namespace PingFM
 {
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
 		
 		public Configuration()
@@ -36,6 +39,15 @@
 			appkey_entry.Text = PingFM.Preferences.AppKey;
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("Ping.FM"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected virtual void OnApplyBtnClicked (object sender, System.EventArgs e)
 		{
 			validate_lbl.Markup = "<i>Validating...</i>";

=== modified file 'PingFM/src/PingFMServiceItemSource.cs'
--- PingFM/src/PingFMServiceItemSource.cs	2009-01-02 21:57:13 +0000
+++ PingFM/src/PingFMServiceItemSource.cs	2009-06-19 08:23:32 +0000
@@ -29,7 +29,7 @@
 namespace PingFM
 {
 	
-	public sealed class PingFMServiceItemSource : ItemSource, IConfigurable
+	public sealed class PingFMServiceItemSource : ItemSource
 	{
 		public override string Name {
 			get { return Catalog.GetString ("Ping.FM Services");}
@@ -61,10 +61,5 @@
 			updateServices.IsBackground = true;
 			updateServices.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 	}
-}
\ No newline at end of file
+}

=== modified file 'RSS/Resources/RSS.addin.xml'
--- RSS/Resources/RSS.addin.xml	2009-03-31 23:19:25 +0000
+++ RSS/Resources/RSS.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path = "/Do/ItemSource">
@@ -24,4 +25,7 @@
 	<Extension path= "/Do/Action">
 		<Action type="Do.Plugins.Rss.RssFeedAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Do.Plugins.Rss.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'RSS/src/Configuration.cs'
--- RSS/src/Configuration.cs	2009-01-22 03:46:13 +0000
+++ RSS/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -22,10 +22,12 @@
 using System;
 using System.IO;
 using System.Reflection;
+using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace Do.Plugins.Rss
 {
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
 		public Configuration ()
 		{
@@ -35,6 +37,15 @@
 			OpmlChooser.SetUri (RssItemSource.OpmlFile);
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("RSS"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected virtual void OnTimeoutValueChanged (object o, EventArgs e)
 		{
 			RssItemSource.Timeout = Timeout.ValueAsInt;

=== modified file 'RSS/src/RssItemSource.cs'
--- RSS/src/RssItemSource.cs	2009-01-22 03:46:13 +0000
+++ RSS/src/RssItemSource.cs	2009-06-19 08:23:32 +0000
@@ -28,7 +28,7 @@
 
 namespace Do.Plugins.Rss
 {
-	public class RssItemSource : ItemSource, IConfigurable
+	public class RssItemSource : ItemSource
 	{
 		private static List<Item> items;        
 		private static IPreferences prefs;
@@ -131,9 +131,5 @@
 				Log.Error("Could not read OPML file {0}: {1}", opmlFile, e.Message);
 			}
 		}
-
-		public Gtk.Bin GetConfiguration () {
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'RememberTheMilk/Resources/RTM.addin.xml'
--- RememberTheMilk/Resources/RTM.addin.xml	2009-04-22 03:29:31 +0000
+++ RememberTheMilk/Resources/RTM.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<!-- Extensions included in this assembly -->
@@ -35,4 +36,7 @@
 		<Action type="RememberTheMilk.RTMSetRecurrence" />
 		<Action type="RememberTheMilk.RTMUncompleteTask" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="RememberTheMilk.Configuration" />
+	</Extension>
 </Addin>

=== modified file 'RememberTheMilk/src/Configuration.cs'
--- RememberTheMilk/src/Configuration.cs	2009-01-29 16:58:01 +0000
+++ RememberTheMilk/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -21,13 +21,14 @@
 using Mono.Unix;
 using RtmNet;
 using Do.Platform;
+using Do.Platform.Linux;
 
 using Gtk;
 
 
 namespace RememberTheMilk
 {
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
 		//private static IPreferences prefs;
 		private LinkButton rtm_ref_btn;
@@ -52,6 +53,15 @@
 		{
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("Remember The Milk"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		protected virtual void OnConfirmChkbtnClicked (object sender, System.EventArgs e)
 		{
 			RTM.Preferences.ActionNotification = confirm_chkbtn.Active;

=== modified file 'RememberTheMilk/src/RTMListItemSource.cs'
--- RememberTheMilk/src/RTMListItemSource.cs	2009-01-08 03:33:27 +0000
+++ RememberTheMilk/src/RTMListItemSource.cs	2009-06-19 08:23:32 +0000
@@ -26,7 +26,7 @@
 
 namespace RememberTheMilk
 {	
-	public class RTMListItemSource : ItemSource, IConfigurable
+	public class RTMListItemSource : ItemSource
 	{		
 		public override string Name {
 			get { return "Remember The Milk Task Lists"; }
@@ -69,10 +69,5 @@
 			updateTasks.IsBackground = true;
 			updateTasks.Start ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new Configuration ();
-		}
 	}
 }

=== modified file 'RequestTracker/Resources/RequestTracker.addin.xml'
--- RequestTracker/Resources/RequestTracker.addin.xml	2009-03-31 23:19:25 +0000
+++ RequestTracker/Resources/RequestTracker.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,11 +15,14 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<!-- Extensions included in this assembly -->
 	<Extension path="/Do/Action">
 		<Action type="RequestTracker.RTAction" />
 	</Extension>
-
+	<Extension path= "/Do/Config">
+		<Config type="RequestTracker.RTPrefs" />
+	</Extension>
 </Addin>

=== modified file 'RequestTracker/src/Configuration.cs'
--- RequestTracker/src/Configuration.cs	2009-03-09 10:31:13 +0000
+++ RequestTracker/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -11,11 +11,20 @@
 {
 	
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class RTPrefs : Gtk.Bin
+	public partial class RTPrefs : Gtk.Bin, IConfigurable
 	{
 		Gtk.ListStore rtListStore;
 		Gtk.TreeViewColumn nameColumn;
 		Gtk.TreeViewColumn urlColumn;
+
+		public string Title {
+			get { return Catalog.GetString ("Request Tracker"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		protected virtual void OnRemoveBtnClicked (object sender, System.EventArgs e)
 		{

=== modified file 'RequestTracker/src/RequestTrackerAction.cs'
--- RequestTracker/src/RequestTrackerAction.cs	2009-03-11 10:52:55 +0000
+++ RequestTracker/src/RequestTrackerAction.cs	2009-06-19 08:23:32 +0000
@@ -39,7 +39,7 @@
 	/// Given an ITextItem, RequestTrackerAction will construct a URL
 	///  and feed it to a web browser
 	/// </summary>
-	class RTAction : Act, IConfigurable
+	class RTAction : Act
 	{
 		
 		public override string Name {
@@ -109,12 +109,5 @@
 		{
 			return string.Format (url, ticket);
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new RTPrefs ();
-		}
-		
 	}
-	
 }

=== modified file 'SqueezeCenter/Resources/SqueezeCenter.addin.xml'
--- SqueezeCenter/Resources/SqueezeCenter.addin.xml	2009-03-31 23:19:25 +0000
+++ SqueezeCenter/Resources/SqueezeCenter.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<!-- Extensions included in this assembly -->
@@ -33,5 +34,8 @@
 	<Extension path="/Do/ItemSource">
 		<ItemSource type="SqueezeCenter.ItemSource" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="SqueezeCenter.Configuration" />
+	</Extension>
 
 </Addin>

=== modified file 'SqueezeCenter/src/Configuration.cs'
--- SqueezeCenter/src/Configuration.cs	2008-12-24 04:37:17 +0000
+++ SqueezeCenter/src/Configuration.cs	2009-06-19 08:23:32 +0000
@@ -12,11 +12,13 @@
 ////  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace SqueezeCenter
 {
 	
-	public partial class Configuration : Gtk.Bin
+	public partial class Configuration : Gtk.Bin, IConfigurable
 	{
 		
 		public Configuration()
@@ -24,6 +26,15 @@
 			this.Build();
 			this.LoadSettingsFromFile ();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Squeezecenter"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
 		
 		void LoadSettingsFromFile ()
 		{

=== modified file 'SqueezeCenter/src/ItemSource.cs'
--- SqueezeCenter/src/ItemSource.cs	2009-01-15 06:17:08 +0000
+++ SqueezeCenter/src/ItemSource.cs	2009-06-19 08:23:32 +0000
@@ -16,14 +16,13 @@
 using System.Collections.Generic;
 using System.Threading;
 
-
 using Do.Universe;
 using Do.Platform.Linux;
 
 namespace SqueezeCenter
 {
 	
-	public class ItemSource : Do.Universe.ItemSource,  IConfigurable
+	public class ItemSource : Do.Universe.ItemSource
 	{
 		List<Item> items;		
 		List<AlbumMusicItem> albums;
@@ -36,11 +35,6 @@
 			artists = new List<ArtistMusicItem>();
 			UpdateItems ();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{			
-			return new Configuration ();
-		}
 
 		public override string Name { get { return "SqueezeCenter"; } }
 		public override string Description { get { return "Artists, albums and radio."; } }

=== modified file 'SystemServices/Resources/SystemServices.addin.xml'
--- SystemServices/Resources/SystemServices.addin.xml	2009-03-31 23:19:25 +0000
+++ SystemServices/Resources/SystemServices.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path = "/Do/ItemSource">
@@ -25,4 +26,8 @@
 		<Action type="SystemServices.ServiceStopAction" />
 		<Action type="SystemServices.ServiceStartAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="SystemServices.SystemServicesConfig" />
+	</Extension>
+
 </Addin>

=== modified file 'SystemServices/src/ServiceItemSource.cs'
--- SystemServices/src/ServiceItemSource.cs	2008-12-31 20:57:41 +0000
+++ SystemServices/src/ServiceItemSource.cs	2009-06-20 02:49:57 +0000
@@ -31,7 +31,7 @@
 	/// <summary>
 	/// Source for services.
 	/// </summary>
-	public class ServiceItemSource: ItemSource, IConfigurable {
+	public class ServiceItemSource: ItemSource {
 	
 		List<Item> items;
 		
@@ -63,11 +63,6 @@
 		public override void UpdateItems ()
 		{
 			items = SystemServices.LoadServices ();
-		}		
-
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new SystemServicesConfig ();
 		}
 	}
 }

=== modified file 'SystemServices/src/SystemServicesConfig.cs'
--- SystemServices/src/SystemServicesConfig.cs	2008-12-31 20:57:41 +0000
+++ SystemServices/src/SystemServicesConfig.cs	2009-06-19 08:23:32 +0000
@@ -20,12 +20,13 @@
 using System.Collections.Generic;
 using Gtk;
 using Mono.Unix;
+using Do.Platform.Linux;
 
 namespace SystemServices {
 	
 	[System.ComponentModel.Category("SystemServices")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class SystemServicesConfig : Gtk.Bin
+	public partial class SystemServicesConfig : Gtk.Bin, IConfigurable
 	{
 		public SystemServicesConfig () {
 			this.Build ();
@@ -43,6 +44,15 @@
 			this.eCommand.Text = SystemServices.SudoCommand;
 		}
 
+		public string Title {
+			get { return Catalog.GetString ("System Services"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		/// <summary>
 		/// On update eCommand textbox save this text to preferences.
 		/// </summary>

=== modified file 'Tomboy/Resources/Tomboy.addin.xml'
--- Tomboy/Resources/Tomboy.addin.xml	2009-06-11 07:36:57 +0000
+++ Tomboy/Resources/Tomboy.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<Extension path="/Do/ItemSource">
@@ -24,4 +25,7 @@
 		<Action type="Tomboy.NewNoteAction" />
 		<Action type="Tomboy.SearchNotesAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Tomboy.TomboyConfiguration" />
+	</Extension>
 </Addin>

=== modified file 'Tomboy/src/NewNoteAction.cs'
--- Tomboy/src/NewNoteAction.cs	2009-01-21 19:21:55 +0000
+++ Tomboy/src/NewNoteAction.cs	2009-06-20 02:49:57 +0000
@@ -30,7 +30,7 @@
 namespace Tomboy
 {	
 
-	public class NewNoteAction : Act, IConfigurable
+	public class NewNoteAction : Act
 	{
 		
 		public override string Name {
@@ -86,10 +86,5 @@
 			
 			yield break;
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new TomboyConfiguration ();
-		}
 	}
 }

=== modified file 'Tomboy/src/TomboyConfiguration.cs'
--- Tomboy/src/TomboyConfiguration.cs	2009-01-21 19:21:55 +0000
+++ Tomboy/src/TomboyConfiguration.cs	2009-06-19 08:23:32 +0000
@@ -26,7 +26,10 @@
 
 using System;
 
+using Mono.Unix;
+
 using Do.Platform;
+using Do.Platform.Linux;
 
 namespace Tomboy
 {
@@ -34,7 +37,7 @@
 	
 	[System.ComponentModel.Category("Tomboy")]
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class TomboyConfiguration : Gtk.Bin
+	public partial class TomboyConfiguration : Gtk.Bin, IConfigurable
 	{
 		private const string DeriveTitlePrefKey = "deriveTitle";
 		private const string TitleFirstPrefKey = "titleFirst";
@@ -45,6 +48,15 @@
 		{
 			prefs = Services.Preferences.Get<TomboyConfiguration> ();
 		}
+
+		public string Title {
+			get { return Catalog.GetString ("Tomboy"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}	
 		
 		public static bool DeriveTitle
 		{

=== modified file 'Translate/Resources/Translate.addin.xml'
--- Translate/Resources/Translate.addin.xml	2009-04-21 03:02:19 +0000
+++ Translate/Resources/Translate.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,9 +15,13 @@
 	
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 	
 	<Extension path="/Do/Action">
 		<Action type="Translate.TranslateAction"/>
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Translate.ConfigUI" />
+	</Extension>
 </Addin>

=== modified file 'Translate/src/TranslateAction.cs'
--- Translate/src/TranslateAction.cs	2009-04-08 15:19:19 +0000
+++ Translate/src/TranslateAction.cs	2009-06-20 02:49:57 +0000
@@ -33,7 +33,7 @@
 namespace Translate
 {
 
-	public class TranslateAction : Act, IConfigurable
+	public class TranslateAction : Act
 	{
 
 		const string UrlPattern = "^(https?://)"
@@ -126,11 +126,6 @@
 					Services.Environment.OpenUrl (url);
 			}
 			yield break;
-		}
-
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new ConfigUI ();
 		}	
 	}
-}
\ No newline at end of file
+}

=== modified file 'Translate/src/UI/ConfigUI.cs'
--- Translate/src/UI/ConfigUI.cs	2009-04-08 07:03:00 +0000
+++ Translate/src/UI/ConfigUI.cs	2009-06-20 02:26:06 +0000
@@ -22,13 +22,14 @@
 using System.Collections.Generic;
 using System.Threading;
 using Do.Platform;
+using Do.Platform.Linux;
 
 using Mono.Unix;
 
 namespace Translate
 {
 	
-	public partial class ConfigUI : Gtk.Bin
+	public partial class ConfigUI : Gtk.Bin, IConfigurable
 	{
 		static IPreferences TranslatePluginPrefs;
 		
@@ -42,7 +43,16 @@
 		{
 			TranslatePluginPrefs = Services.Preferences.Get<Translate.ConfigUI> ();
 		}
-		
+
+		public string Title {
+			get { return Catalog.GetString ("Translate"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}
+
 		public void SetupColumns ()
 		{		
 			//setup columns

=== modified file 'YouTube/Resources/Youtube.addin.xml'
--- YouTube/Resources/Youtube.addin.xml	2009-05-07 19:49:44 +0000
+++ YouTube/Resources/Youtube.addin.xml	2009-06-19 08:23:32 +0000
@@ -15,6 +15,7 @@
 
 	<Dependencies>
 		<Addin id="Universe" version="1.0" />
+		<Addin id="Platform.Linux" version="1.0" />
 	</Dependencies>
 
 	<!-- Extensions included in this assembly -->
@@ -27,4 +28,7 @@
 	<Extension path = "/Do/Action">
 		<Action type="Do.Universe.YouTubeSearchAction" />
 	</Extension>
+	<Extension path= "/Do/Config">
+		<Config type="Do.Universe.YouTubeConfig" />
+	</Extension>
 </Addin>

=== modified file 'YouTube/src/YouTubeFavoriteItemSource.cs'
--- YouTube/src/YouTubeFavoriteItemSource.cs	2009-02-06 19:23:56 +0000
+++ YouTube/src/YouTubeFavoriteItemSource.cs	2009-06-19 08:23:32 +0000
@@ -8,7 +8,7 @@
 
 namespace Do.Universe
 {
-	public class YouTubeFavoriteItemSource : ItemSource, IConfigurable
+	public class YouTubeFavoriteItemSource : ItemSource
 	{
 		public YouTubeFavoriteItemSource()
 		{
@@ -34,11 +34,5 @@
 			t.IsBackground = true;
 			t.Start();
 		}
-		
-		public Gtk.Bin GetConfiguration ()
-		{
-			return new YouTubeConfig ();
-		}
-		
 	}
 }

=== modified file 'YouTube/src/YoutubeConfig.cs'
--- YouTube/src/YoutubeConfig.cs	2009-02-01 20:19:36 +0000
+++ YouTube/src/YoutubeConfig.cs	2009-06-19 08:23:32 +0000
@@ -2,11 +2,12 @@
 using Gtk;
 using Do.Platform;
 using Do.Platform.Linux;
+using Mono.Unix;
 
 namespace Do.Universe
 {	
 	
-	public class YouTubeConfig : AbstractLoginWidget
+	public class YouTubeConfig : AbstractLoginWidget, IConfigurable
 	{
 		const string Uri = "http://www.youtube.com/signup?next_url=/index&";
         
@@ -15,8 +16,16 @@
 			Username = Youtube.Preferences.Username;
 			Password = Youtube.Preferences.Password;
 		}
-		
-		
+
+		public string Title {
+			get { return Catalog.GetString ("Youtube"); }
+		}
+
+		public Gtk.Bin GetConfiguration ()
+		{
+			return this;
+		}	
+
 		protected override void SaveAccountData(string username, string password)
 		{
 			Youtube.Preferences.Username = username;