Merge lp:~isak-karlsson/docky/gcalendar into lp:docky

[isakkarlsson]

[isakkarlsson (isak-karlsson)]

+ This dock item shows current day events from google calendar. It allows the user to select which
  private calendars to check, and then shows the event count as a badge and the events in the menu.

- Depends on gdata-sharp-calendar and gdata-sharp-client

[isakkarlsson (isak-karlsson)]

docky.pot is not changed.

[lp:~isak-karlsson/docky/gcalendar]

1023. By isakkarlsson on 2010-01-07

reverted docky.pot

1024. By isakkarlsson on 2010-01-15

merge trunk

1025. By isakkarlsson on 2010-01-15

Forgot to add this one

1026. By isakkarlsson on 2010-01-15

Merge trunk

1027. By isakkarlsson on 2010-02-03

Merge trunk

1028. By isakkarlsson on 2010-02-03

Added prefernces. One to change in gconf, the update interval, and one in the settings window, how may days in the future to show. Enhanced the interface. Shows <label> - <date> | today | tomorrow in Separator. Hence each day is separated. Futhermore is the config window enhanced somewhat.

1029. By isakkarlsson on 2010-02-05

Fix: Separtor string, and hang issue

1030. By isakkarlsson on 2010-02-07

Purge the hang issue

1031. By isakkarlsson on 2010-02-08

Fix: - Multiplying items on multiple logins.
     - New config: Open other client. Only available in gconf.
     - More user friendly error messages.

1032. By isakkarlsson on 2010-02-08

Merge trunk

1033. By isakkarlsson on 2010-02-08

Merge trunk

1034. By isakkarlsson on 2010-02-08

remove docky.py

1035. By isakkarlsson on 2010-02-15

Fixed login bug.

1036. By isakkarlsson on 2010-02-15

Merge trunk

[Robert Dyer (psybers)]

Would it make more sense to just let users add any ICal address? This might make setting up multiple calendars a bit more cumbersome (as you have to find the private address for each one, copy it, paste it into Docky) but it would also allow you to support any calendaring site that publishes in ICal.

This would also remove your dep on the gcal libraries, which most users wont have.

[isakkarlsson (isak-karlsson)]

> Would it make more sense to just let users add any ICal address? This might
> make setting up multiple calendars a bit more cumbersome (as you have to find
> the private address for each one, copy it, paste it into Docky) but it would
> also allow you to support any calendaring site that publishes in ICal.
>
> This would also remove your dep on the gcal libraries, which most users wont
> have.

True. But I thought, as with GMail-docklet (which could have used IMAP/POP3 or so for greater flexibility) that simple is better, and a tight integration was a good thing. But as you say, the GData dep is bad..

Possibly, if I find time, I could branch this one and just parse some iCal instead and change the config dialog. As well as the name =).

Unmerged revisions

1036. By isakkarlsson on 2010-02-15

Merge trunk

1035. By isakkarlsson on 2010-02-15

Fixed login bug.

1034. By isakkarlsson on 2010-02-08

remove docky.py

1033. By isakkarlsson on 2010-02-08

Merge trunk

1032. By isakkarlsson on 2010-02-08

Merge trunk

1031. By isakkarlsson on 2010-02-08

Fix: - Multiplying items on multiple logins.
     - New config: Open other client. Only available in gconf.
     - More user friendly error messages.

1030. By isakkarlsson on 2010-02-07

Purge the hang issue

1029. By isakkarlsson on 2010-02-05

Fix: Separtor string, and hang issue

1028. By isakkarlsson on 2010-02-03

Added prefernces. One to change in gconf, the update interval, and one in the settings window, how may days in the future to show. Enhanced the interface. Shows <label> - <date> | today | tomorrow in Separator. Hence each day is separated. Futhermore is the config window enhanced somewhat.

1027. By isakkarlsson on 2010-02-03

Merge trunk

=== modified file 'Docky-2.sln'
--- Docky-2.sln	2010-01-15 11:18:28 +0000
+++ Docky-2.sln	2010-02-15 17:13:20 +0000
@@ -35,6 +35,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPR", "StandardPlugins\NPR\NPR.csproj", "{C65612E7-55E9-4B63-BB47-5DFD4ACE80E5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GCalendar", "StandardPlugins\GCalendar\GCalendar.csproj", "{D26454DC-88CD-461D-8A94-5CEFEE1554A3}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.Widgets", "Docky.Widgets\Docky.Widgets.csproj", "{9CF2F475-7848-4333-9A35-93E8224653B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.DBus", "Docky.DBus\Docky.DBus.csproj", "{487D3B93-FAAF-4734-B337-85810A60ACCF}"
@@ -125,6 +127,8 @@
 		{FF0B1BB8-6069-4074-BF42-A138D1F99D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF0B1BB8-6069-4074-BF42-A138D1F99D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF0B1BB8-6069-4074-BF42-A138D1F99D89}.Release|Any CPU.Build.0 = Release|Any CPU
+		
+		
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{4AC9784E-7AAA-467D-BF8F-D15B8FB88708} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
@@ -138,6 +142,7 @@
 		{74197632-9339-426E-B947-DE34766931E1} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{C4C77D82-2659-4F06-9AD9-08AC0BAD8C1A} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{C65612E7-55E9-4B63-BB47-5DFD4ACE80E5} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
+		{D26454DC-88CD-461D-8A94-5CEFEE1554A3} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{FE00A354-A298-4966-9E7A-0BBEAE63FC94} = {A48D9B91-890B-4377-91B5-82E1D9797482}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution

=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj	2010-02-14 18:32:48 +0000
+++ Docky/Docky.csproj	2010-02-15 17:13:20 +0000
@@ -140,7 +140,7 @@
     <Reference Include="Mono.GetOptions" />
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\build\gio-sharp.dll</HintPath>
+      <HintPath>..\..\..\.local\lib\docky\gio-sharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

=== added directory 'StandardPlugins/GCalendar'
=== added file 'StandardPlugins/GCalendar/GCalendar.csproj'
--- StandardPlugins/GCalendar/GCalendar.csproj	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/GCalendar.csproj	2010-02-15 17:13:20 +0000
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D26454DC-88CD-461D-8A94-5CEFEE1554A3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>GCalendar</RootNamespace>
+    <AssemblyName>GCalendar</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ReleaseVersion>2.0</ReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Mono.Posix" />
+    <Reference Include="Google.GData.Extensions, Version=1.4.0.2, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876">
+      <Package>gdata-sharp-core</Package>
+    </Reference>
+    <Reference Include="Google.GData.Calendar, Version=1.4.0.2, Culture=neutral, PublicKeyToken=aa6748391206b888">
+      <Package>gdata-sharp-calendar</Package>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="Google.GData.Client, Version=1.4.0.2, Culture=neutral, PublicKeyToken=04a59ca9b0273830">
+      <Package>gdata-sharp-core</Package>
+    </Reference>
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="gtk-gui\gui.stetic">
+      <LogicalName>gui.stetic</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="gtk-gui\generated.cs" />
+    <Compile Include="src\GCalendarItemProvider.cs" />
+    <Compile Include="src\GCalendarAtom.cs" />
+    <Compile Include="src\GCalendarDockItem.cs" />
+    <Compile Include="src\GCalendarMenuItem.cs" />
+    <Compile Include="src\GCalendarPreferences.cs" />
+    <Compile Include="src\GCalendarLoginConfig.cs" />
+    <Compile Include="gtk-gui\src.GCalendarCalendarConfig.cs" />
+    <Compile Include="src\GCalendarCalendarConfig.cs" />
+    <Compile Include="src\GCalendarErrorArgs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="src\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <None Include="Resources\GCalendar.addin.xml" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Deployment.LinuxDeployData generateScript="false" />
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Docky.Items\Docky.Items.csproj">
+      <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
+      <Name>Docky.Items</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Services\Docky.Services.csproj">
+      <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
+      <Name>Docky.Services</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Widgets\Docky.Widgets.csproj">
+      <Project>{9CF2F475-7848-4333-9A35-93E8224653B3}</Project>
+      <Name>Docky.Widgets</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\GMail\GMail.csproj">
+      <Project>{58A2F667-86BF-4128-B442-77C6D14C89A4}</Project>
+      <Name>GMail</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file

=== added file 'StandardPlugins/GCalendar/Makefile.am'
--- StandardPlugins/GCalendar/Makefile.am	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/Makefile.am	2010-02-15 17:13:20 +0000
@@ -0,0 +1,35 @@
+# Simple component buildsystem
+include $(top_srcdir)/build.rules.docklets.mk
+
+ASSEMBLY = GCalendar
+
+FILES = \
+	src/GCalendarAtom.cs \
+	src/GCalendarDockItem.cs \
+	src/GCalendarItemProvider.cs \
+	src/GCalendarMenuItem.cs \
+	src/GCalendarPreferences.cs \
+	src/GCalendarLoginConfig.cs \
+	src/GCalendarCalendarConfig.cs \
+	src/GCalendarErrorArgs.cs
+	
+
+RESOURCES = \
+	Resources/GCalendar.addin.xml 
+
+PROJECT_REFERENCES= \
+	Docky.CairoHelper \
+	Docky.Items \
+	Docky.Services \
+	Docky.Widgets 
+	
+REFERENCES =  \
+	System \
+	System.Core \
+	System.Xml \
+	System.Xml.Linq \
+	Mono.Posix \
+	$(MONO_CAIRO_LIBS) \
+	$(GTK_SHARP_20_LIBS) \
+	$(GDATA_SHARP_CALENDAR_LIBS) \
+	$(GDATA_SHARP_CORE_LIBS)

=== added directory 'StandardPlugins/GCalendar/Resources'
=== added file 'StandardPlugins/GCalendar/Resources/GCalendar.addin.xml.in'
--- StandardPlugins/GCalendar/Resources/GCalendar.addin.xml.in	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/Resources/GCalendar.addin.xml.in	2010-02-15 17:13:20 +0000
@@ -0,0 +1,22 @@
+<Addin 
+	id="GCalendar"
+	namespace="Docky"
+	version="1.0"
+	isroot="false"
+	defaultEnabled="false"
+	name="GCalendar"
+>
+ 
+ 	<Dependencies>
+		<Addin id="Items" version="1.0" />
+	</Dependencies>
+ 
+	<Runtime>
+		<Import assembly="GCalendar.dll"/>
+	</Runtime>
+	
+	<Extension path="/Docky/ItemProvider">
+		<ItemProvider type="GCalendar.GCalendarItemProvider" />
+	</Extension>	
+
+</Addin>

=== added file 'StandardPlugins/GCalendar/Resources/GMail.addin.xml.in'
=== added directory 'StandardPlugins/GCalendar/gtk-gui'
=== added file 'StandardPlugins/GCalendar/gtk-gui/generated.cs'
--- StandardPlugins/GCalendar/gtk-gui/generated.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/gtk-gui/generated.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,35 @@
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace Stetic {
+    
+    
+    internal class Gui {
+        
+        private static bool initialized;
+        
+        internal static void Initialize(Gtk.Widget iconRenderer) {
+            if ((Stetic.Gui.initialized == false)) {
+                Stetic.Gui.initialized = true;
+            }
+        }
+    }
+    
+    internal class ActionGroups {
+        
+        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
+            return Stetic.ActionGroups.GetActionGroup(type.FullName);
+        }
+        
+        public static Gtk.ActionGroup GetActionGroup(string name) {
+            return null;
+        }
+    }
+}

=== added file 'StandardPlugins/GCalendar/gtk-gui/gui.stetic'
--- StandardPlugins/GCalendar/gtk-gui/gui.stetic	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/gtk-gui/gui.stetic	2010-02-15 17:13:20 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<stetic-interface>
+  <configuration>
+    <images-root-path>..</images-root-path>
+    <target-gtk-version>2.12</target-gtk-version>
+  </configuration>
+  <import>
+    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <widget-library name="../../../Docky.Items/bin/Debug/Docky.Items.dll" />
+    <widget-library name="../../../Docky.Services/bin/Debug/Docky.Services.dll" />
+    <widget-library name="../../../Docky.Widgets/bin/Debug/Docky.Widgets.dll" />
+    <widget-library name="../bin/Debug/GCalendar.dll" internal="true" />
+    <widget-library name="../../GMail/bin/Debug/GMail.dll" />
+  </import>
+  <widget class="Gtk.Bin" id="src.GCalendarCalendarConfig" design-size="300 300">
+    <property name="MemberName" />
+    <property name="Visible">False</property>
+    <child>
+      <placeholder />
+    </child>
+  </widget>
+</stetic-interface>
\ No newline at end of file

=== added directory 'StandardPlugins/GCalendar/src'
=== added file 'StandardPlugins/GCalendar/src/GCalendarAtom.cs'
--- StandardPlugins/GCalendar/src/GCalendarAtom.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarAtom.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,389 @@
+//  
+//  Copyright (C) 2009 Jason Smith
+// 
+//  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 Google.GData.Calendar;
+using Google.GData.Client;
+using Google.GData.Extensions;
+
+using Gtk;
+
+using Mono.Unix;
+
+using Docky.Services;
+using Docky.Widgets;
+using System.Net;
+
+namespace GCalendar
+{
+	class CertHandler : System.Net.ICertificatePolicy
+	{
+		public bool CheckValidationResult (System.Net.ServicePoint srvPoint, System.Security.Cryptography.X509Certificates.X509Certificate certificate, System.Net.WebRequest request, int certificateProblem)
+		{
+			return true;
+		}
+	}
+
+	public class GCalendarCalendar
+	{
+		public DateTime When { get; set; }
+		public string Name { get; set; }
+		public List<GCalendarEvent> Entries { get; set; }
+
+		public GCalendarCalendar (string name)
+		{
+			Name = name;
+			Entries = new List<GCalendarEvent> ();
+		}
+	}
+
+	public struct GCalendarEvent
+	{
+		public DateTime DateFrom;
+		public DateTime DateTo;
+		public string Title;
+		public string Location;
+		public string Link;
+
+		public static GCalendarEvent FromEventEntry (EventEntry entry)
+		{
+			GCalendarEvent data = new GCalendarEvent ();
+			if (entry.Times.Count > 0) {
+				data.DateFrom = entry.Times[0].StartTime;
+				data.DateTo = entry.Times[0].EndTime;
+			} else {
+				data.DateFrom = DateTime.Now;
+				data.DateTo = DateTime.Now;
+			}
+			
+			data.Title = entry.Title.Text;
+			if (entry.Locations.Count > 0)
+				data.Location = entry.Locations[0].Label;
+			else
+				data.Location = "Unknown";
+			
+			data.Link = entry.Id.AbsoluteUri;
+			
+			return data;
+		}
+	}
+
+	public enum GCalendarState
+	{
+		Reloading = 0,
+		ManualReload,
+		Ok,
+		Error
+	}
+
+	public class GCalendarAtom
+	{
+
+		static event EventHandler SettingChanged;
+
+		public event EventHandler CalendarUpdated;
+		public event EventHandler CalendarUpdating;
+		public event EventHandler<GCalendarErrorArgs> CalendarError;
+
+		private static ConfigDialog dialog;
+		public static readonly char Separator = ((char) 7);
+		//Beep char..
+		private List<GCalendarCalendar> data = new List<GCalendarCalendar> ();
+
+		public static void Reload ()
+		{
+			if (SettingChanged != null)
+				SettingChanged (null, EventArgs.Empty);
+		}
+
+		public static void Config ()
+		{
+			if (dialog == null) {
+				dialog = new ConfigDialog (Catalog.GetString ("GCalendar Configurations"), new Widget[] {
+					new GCalendarLoginConfig (),
+					new GCalendarCalendarConfig ()
+				});
+			}
+			
+			dialog.Show ();
+		}
+
+		public static bool Validate (string username, string passwd)
+		{
+			CalendarService service = new CalendarService ("Docky_GCalendar_Docklet");
+			service.setUserCredentials (username, passwd);
+			
+			try {
+				CalendarQuery query = new CalendarQuery ("http://www.google.com/calendar/feeds/default/owncalendars/full");
+				CalendarFeed feed = service.Query (query);
+			} catch (Exception e) {
+				Log<GCalendarAtom>.Debug (e.Message);
+				return false;
+			}
+			
+			return true;
+		}
+
+		public static string[] Calendars {
+			get {
+				try {
+					CalendarService service = new CalendarService ("Docky_GCalendar_Docklet");
+					service.setUserCredentials (GCalendarPreferences.Username, GCalendarPreferences.Password);
+					
+					CalendarQuery query = new CalendarQuery ("http://www.google.com/calendar/feeds/default/owncalendars/full");
+					CalendarFeed feed = service.Query (query);
+					
+					List<String> strs = new List<String> ();
+					foreach (CalendarEntry e in feed.Entries) {
+						strs.Add (e.Title.Text + Separator + e.Id.Uri.Content.Substring (e.Id.Uri.Content.LastIndexOf ("/") + 1).Replace ("%40", "@"));
+					}
+					
+					return strs.ToArray ();
+				} catch (Exception e) {
+					return null;
+				}
+			}
+		}
+
+		public static string[] CalendarSplit (string to)
+		{
+			string[] split = to.Split (Separator);
+			if (split == null || split.Length < 1) {
+				Log<GCalendarAtom>.Error ("Calendar parse error: " + split);
+			}
+			
+			return split;
+		}
+
+		private void Updated ()
+		{
+			State = GCalendarState.Ok;
+			if (CalendarUpdated != null)
+				CalendarUpdated (this, EventArgs.Empty);
+		}
+
+		private void Updating ()
+		{
+			State = GCalendarState.Reloading;
+			if (CalendarUpdating != null)
+				CalendarUpdating (this, EventArgs.Empty);
+		}
+
+		private void Error (string e)
+		{
+			State = GCalendarState.Error;
+			if (CalendarError != null)
+				CalendarError (this, new GCalendarErrorArgs (e));
+		}
+
+		uint Interval { get; set; }
+		public GCalendarState State { get; protected set; }
+
+		public IEnumerable<GCalendarCalendar> Events {
+			get {
+				lock (data) {
+					return data;
+				}
+			}
+		}
+
+		public int TodoCount {
+			get {
+				int ret = 0;
+				foreach (GCalendarCalendar c in data) {
+					ret += c.Entries.Count;
+				}
+				return ret;
+			}
+		}
+
+		public bool HasTodo {
+			get { return TodoCount > 0; }
+		}
+
+		public GCalendarAtom ()
+		{
+			State = GCalendarState.ManualReload;
+			GCalendarPreferences.CalendarChange += GCalendarPreferencesCalendarChange;
+			GCalendarPreferences.UsernameChange += GCalendarPreferencesUsernameChange;
+			GCalendarPreferences.PasswordChange += GCalendarPreferencesPasswordChange;
+			
+			SettingChanged += HandleSettingChanged;
+			DockServices.System.ConnectionStatusChanged += HandleSettingChanged;
+		}
+		
+		public void Dispose()
+		{
+			GCalendarPreferences.CalendarChange -= GCalendarPreferencesCalendarChange;
+			GCalendarPreferences.UsernameChange -= GCalendarPreferencesUsernameChange;
+			GCalendarPreferences.PasswordChange -= GCalendarPreferencesPasswordChange;
+			
+			SettingChanged -= HandleSettingChanged;
+			DockServices.System.ConnectionStatusChanged -= HandleSettingChanged;			
+		}
+		
+
+		void GCalendarPreferencesPasswordChange (object sender, EventArgs e)
+		{
+			ResetTime (false);
+		}
+
+		void GCalendarPreferencesUsernameChange (object sender, EventArgs e)
+		{
+			ResetTime (false);
+		}
+
+		void GCalendarPreferencesCalendarChange (object sender, EventArgs e)
+		{
+			ResetTime (false);
+		}
+
+		private void HandleSettingChanged (object sender, EventArgs e)
+		{
+			Log<GCalendarAtom>.Info ("Setting changes handeled");
+			ResetTime ();
+		}
+
+		/// <summary>
+		/// Do a hard reset. I.e reload data.
+		/// </summary>
+		public void ResetTime ()
+		{
+			ResetTime (true);
+		}
+
+		private DateTime last = DateTime.Now;
+
+		/// <summary>
+		///  Do a reset. I.e reload data.
+		/// </summary>
+		/// <param name="hard">
+		/// If set do hard reload.
+		/// A <see cref="System.Boolean"/>
+		/// </param>
+		public void ResetTime (bool hard)
+		{
+			if (DateTime.Now.Millisecond - last.Millisecond > 1000 * 60 * 10 && !hard) {
+				last = DateTime.Now;
+				return;
+			}
+			if (Interval != 0)
+				GLib.Source.Remove (Interval);
+			Interval = 0;
+			
+			if (!DockServices.System.NetworkConnected)
+				return;
+			
+			LoadData ();
+			
+			// TODO: Add GCalendarPreference.Interval
+			Interval = GLib.Timeout.Add (1000 * 60 * 10, () =>
+			{
+				ResetTime ();
+				return true;
+			});
+			
+		}
+
+		private void LoadData ()
+		{
+			// On error do nothing..
+			if (ErrorCheck ())
+				return;
+			Docky.Services.DockServices.System.RunOnThread (() =>
+			{
+				lock (data) {
+					try {
+						System.Net.ServicePointManager.CertificatePolicy = new CertHandler ();
+						Gtk.Application.Invoke (delegate { Updating (); });
+						
+						CalendarService service = new CalendarService ("Docky_GCalendar_Docklet");
+						service.setUserCredentials (GCalendarPreferences.Username, GCalendarPreferences.Password);
+						
+						//Reset the old data.
+						data = new List<GCalendarCalendar> ();
+						foreach (string calendarId in GCalendarPreferences.Calendars) {
+							// 0 = name & 1 = uri
+							string[] split = CalendarSplit (calendarId);
+							Log<GCalendarAtom>.Info ("Checking calendar: " + split[0]);
+							
+							EventQuery query = new EventQuery (string.Format ("http://www.google.com/calendar/feeds/{0}/private/full", split[1]));
+							query.ExtraParameters = "orderby=starttime&sortorder=ascending";
+							query.StartTime = DateTime.Now.AddHours (-2);
+							DateTime end = DateTime.Today;
+							query.EndTime = end.AddDays (GCalendarPreferences.Days);
+							
+							EventFeed feed = service.Query (query);
+							GCalendarCalendar gcal = new GCalendarCalendar (split[0]);
+							
+							bool first = true;
+							int count = 0;
+							while (feed != null && feed.Entries.Count > 0) {
+								foreach (EventEntry entry in feed.Entries) {
+									GCalendarEvent gcdata = GCalendarEvent.FromEventEntry (entry);
+									if (first) {
+										gcal.When = gcdata.DateFrom;
+									}
+									gcal.Entries.Add (gcdata);
+									first = false;
+									count++;
+								}
+								
+								if (feed.NextChunk != null) {
+									query.Uri = new Uri (feed.NextChunk);
+									feed = service.Query (query);
+								} else {
+									feed = null;
+								}
+							}
+							
+							data.Add (gcal);
+						}
+						Gtk.Application.Invoke (delegate { Updated (); });
+						
+					} catch (IndexOutOfRangeException) {
+						Gtk.Application.Invoke (delegate { Error (Catalog.GetString ("No calendar selected")); });
+					} catch (WebException) {
+						Gtk.Application.Invoke (delegate { Error (Catalog.GetString ("Network error")); });					
+				    }catch (Exception e) {
+						Gtk.Application.Invoke (delegate { Error (Catalog.GetString ("Unknown error occured")); });
+						Log<GCalendarAtom>.Error (e.Message);
+						Log<GCalendarAtom>.Info (e.StackTrace);
+					}
+				}
+			});
+			
+		}
+
+		private bool ErrorCheck ()
+		{				
+			if (GCalendarPreferences.Username == "" || GCalendarPreferences.Password == "") {
+				Error (Catalog.GetString ("Username or password not set"));
+				return true;
+			}
+			
+			if (!Docky.Services.DockServices.System.NetworkConnected) {
+				Error (Catalog.GetString ("No network connection"));;
+				return true;
+			}
+			
+			return false;				
+		}
+
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarCalendarConfig.cs'
--- StandardPlugins/GCalendar/src/GCalendarCalendarConfig.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarCalendarConfig.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,148 @@
+//  
+//  Copyright (C) 2010 Isak Karlsson
+// 
+//  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 Gtk;
+
+using Docky.Widgets;
+
+namespace GCalendar
+{
+	// Not _so_ uglu anymore.
+	public class GCalendarCalendarConfig : Gtk.VBox
+	{
+		private Button applyBtn = new Button ();
+		private Button searchBtn = new Button ();
+		private Label infoLbl = new Label ();
+		private Entry days = new Entry (2);
+
+		private HBox north = new HBox (false, 2);
+		private VBox center = new VBox (false, 3);
+		private HBox south = new HBox (false, 2);
+
+		private List<string> calendars = new List<string> ();
+		private Dictionary<string, string> cals = new Dictionary<string, string> ();
+
+		public GCalendarCalendarConfig () : base(false, 3)
+		{
+			center.SetSizeRequest (200, 200);
+			infoLbl.Text = Catalog.GetString ("Click Search calendars to see \n" + "your presonal calendars at google calendar. \n" + "Check the ones you want, and uncheck the others. \n" + "Then click apply.");
+			
+			searchBtn.Label = Catalog.GetString ("Fetch calendar list");
+			searchBtn.Clicked += SearchBtnClicked;
+			
+			Fixed btnHolder = new Fixed ();
+			btnHolder.Add (searchBtn);
+			north.PackStart (infoLbl);
+			north.PackStart (btnHolder);
+			
+			applyBtn.Label = Catalog.GetString ("Apply");
+			applyBtn.Clicked += ApplyBtnClicked;
+			
+			Fixed applyPlaceholder = new Fixed ();
+			applyPlaceholder.Add (applyBtn);
+			
+			days.Text = GCalendarPreferences.Days.ToString ();
+			HBox daysBox = new HBox (false, 3);
+			daysBox.PackStart (new Label ("Show"), true, true, 0);
+			daysBox.PackStart (days, false, false, 0);
+			daysBox.PackStart (new Label ("days after today"), true, true, 0);
+			south.PackStart (daysBox, true, true, 0);
+			south.PackStart (applyPlaceholder, false, false, 0);
+			
+			PackStart (north);
+			PackStart (center);
+			PackStart (south);
+			
+			ShowAll ();
+			
+			Name = Catalog.GetString ("Calendars");
+
+			SearchBtnClicked (this, EventArgs.Empty);			
+		}
+
+		void SearchBtnClicked (object sender, EventArgs e)
+		{
+			Gtk.Application.Invoke (delegate
+			{
+				if (!Docky.Services.DockServices.System.NetworkConnected) {
+					infoLbl.Text = Catalog.GetString ("Not connected");
+				}
+			
+				calendars = new List<string> ();
+				calendars.AddRange (GCalendarPreferences.Calendars);
+			
+				foreach (Widget w in center.Children) {
+					center.Remove (w);
+				}
+				string[] newCals = GCalendarAtom.Calendars;
+			
+				if (newCals == null) {
+					infoLbl.Text = Catalog.GetString ("Some unknown error occured");
+					return;
+				}
+			
+				foreach (string s in newCals) {
+					string[] split = GCalendarAtom.CalendarSplit (s);
+					CheckButton b = new CheckButton (split[0]);
+					cals[split[0]] = s;
+					foreach (string ss in calendars) {
+						if (ss == s) {
+							b.Active = true;
+							break;
+						} else {
+							b.Active = false;
+						}
+					}
+					b.Show ();
+					center.PackStart (b);
+				}
+				ShowAll ();
+			});
+		}
+
+		void ApplyBtnClicked (object sender, EventArgs e)
+		{
+			List<string> strs = new List<string> ();
+			foreach (Widget w in center.Children) {
+				CheckButton b = w as CheckButton;
+				if (b.Active)
+					strs.Add (cals[b.Label]);
+			}
+			
+			GCalendarPreferences.Calendars = strs.ToArray ();
+			
+			calendars.Clear ();
+			calendars.AddRange (GCalendarPreferences.Calendars);
+			
+			try {
+				GCalendarPreferences.Days = int.Parse (days.Text);
+			} catch (Exception) {
+				MessageDialog d = new MessageDialog (null, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, "Incorrect number", "a");
+				d.Run ();
+				d.Destroy ();
+				GCalendarPreferences.Days = 0;
+				
+				days.Text = "0";
+			}
+		}
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarDockItem.cs'
--- StandardPlugins/GCalendar/src/GCalendarDockItem.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarDockItem.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,202 @@
+//  
+//  Copyright (C) 2009 Isak Karlsson
+// 
+//  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.Linq;
+using Mono.Unix;
+
+using Cairo;
+
+using Docky.CairoHelper;
+using Docky.Items;
+using Docky.Menus;
+using Docky.Services;
+using Docky.Painters;
+
+using Docky.Widgets;
+
+namespace GCalendar
+{
+
+	/// <summary>
+	/// GCalendar dock item. Uses an icon
+	/// </summary>
+	public class GCalendarDockItem : ColoredIconDockItem
+	{
+		public GCalendarAtom Atom { get; private set; }
+		public override string UniqueID ()
+		{
+			return "GCalendar";
+		}
+
+		protected override ClickAnimation OnClicked (uint button, Gdk.ModifierType mod, double xPercent, double yPercent)
+		{
+			if(button == 1) {
+				OpenClient ();
+				return ClickAnimation.Bounce;
+			}
+			
+			return ClickAnimation.None;
+		}
+
+		protected override MenuList OnGetMenuItems ()
+		{
+			MenuList lst = base.OnGetMenuItems ();
+			lst[MenuListContainer.Actions].Add (new MenuItem (Catalog.GetString ("View calendar"), FindIcon(), delegate { OpenClient (); }));
+			
+			if (Atom.HasTodo) {
+				foreach (GCalendarCalendar gcal in Atom.Events) {
+					if (gcal.Entries.Count > 0) {
+						DateTime last = gcal.Entries.First ().DateFrom;
+						foreach (GCalendarEvent gcdata in gcal.Entries) {
+							if (gcdata.DateFrom.Date.Subtract (last.Date).Days >= 1 || last == gcdata.DateFrom) {
+								string date = gcdata.DateFrom.ToString ("D");
+								
+								if (gcdata.DateFrom.Date == DateTime.Today)
+									date = "Today";
+								else if (gcdata.DateFrom.Date == DateTime.Today.AddDays (1))
+									date = "Tomorrow";
+								
+								lst[MenuListContainer.Actions].Add (new SeparatorMenuItem (date + " - " + gcal.Name));
+							}
+							last = gcdata.DateFrom;
+							lst[MenuListContainer.Actions].Add (new GCalendarMenuItem (gcdata, "gcalendar"));
+						}
+					}
+				}
+			} else {
+				lst[MenuListContainer.Actions].Add(new SeparatorMenuItem());	
+			}
+			
+			lst[MenuListContainer.Actions].Add (new SeparatorMenuItem ());
+			
+			lst[MenuListContainer.Actions].Add (new MenuItem (Catalog.GetString ("_Settings"), Gtk.Stock.Preferences, delegate { GCalendarAtom.Config (); }));
+			lst[MenuListContainer.Actions].Add (new MenuItem (Catalog.GetString ("Check _Calendar"), Gtk.Stock.Refresh, delegate { Atom.ResetTime (); }));
+			
+			return lst;
+		}
+
+		private string FindIcon ()
+		{
+			if (GCalendarPreferences.HasAltClient) {
+				return GCalendarPreferences.AltClient;
+			} else {
+				return "gcalendar";
+			}
+		}
+
+
+		protected override Gdk.Pixbuf ProcessPixbuf (Gdk.Pixbuf pbuf)
+		{
+			pbuf = base.ProcessPixbuf (pbuf);
+			
+			if (Atom.State != GCalendarState.Error)
+				return pbuf;
+			
+			
+			return DockServices.Drawing.MonochromePixbuf (pbuf);
+		}
+
+		protected override void PostProcessIconSurface (DockySurface surface)
+		{
+			if (Atom.State != GCalendarState.Error && !Atom.HasTodo) {
+				surface.Context.Color = new Cairo.Color (0, 0, 0, 0);
+				surface.Context.Operator = Operator.Source;
+				surface.Context.PaintWithAlpha (0.5);
+			}
+		}
+
+		protected override void PaintIconSurface (Docky.CairoHelper.DockySurface surface)
+		{
+			base.PaintIconSurface (surface);
+		}
+		
+		
+
+		private void OpenClient ()
+		{
+			if (GCalendarPreferences.HasAltClient) {
+				DockServices.System.Execute (GCalendarPreferences.AltClient);
+			} else {
+				DockServices.System.Open ("http://google.com/calendar");
+			}
+		}
+
+		public GCalendarDockItem ()
+		{
+			Atom = new GCalendarAtom ();
+			
+			Atom.CalendarError += AtomCalendarError;
+			Atom.CalendarUpdated += AtomCalendarUpdated;
+			Atom.CalendarUpdating += AtomCalendarUpdating;
+			
+			Icon = "gcalendar";
+		}
+		
+		public override void Dispose ()
+		{
+			Atom.CalendarError -= AtomCalendarError;
+			Atom.CalendarUpdated -= AtomCalendarUpdated;
+			Atom.CalendarUpdating -= AtomCalendarUpdating;
+			Atom.Dispose();			
+			
+			base.Dispose ();
+		}
+
+
+		void AtomCalendarUpdating (object sender, EventArgs e)
+		{
+			HoverText = Catalog.GetString ("Updating events...");
+			State |= ItemState.Wait;
+		}
+
+		void AtomCalendarUpdated (object sender, EventArgs e)
+		{
+			if (Atom.State == GCalendarState.Error)
+				return;
+			
+			string status = "";
+			if (!Atom.HasTodo)
+				status = GCalendarPreferences.Days == 0 ? 
+					Catalog.GetString ("Calendar - No events today") : 
+					string.Format (Catalog.GetPluralString ("Calendar - No events the next day", "Calendar - No events the next {0} days", 
+							GCalendarPreferences.Days), GCalendarPreferences.Days);
+			else
+				status = string.Format (Catalog.GetPluralString ("Calendar - {0} event", "Calendar - {0} events", Atom.TodoCount), Atom.TodoCount);
+			
+			HoverText = status;
+			if (Atom.HasTodo)
+				BadgeText = Atom.TodoCount.ToString ();
+			else
+				BadgeText = null;
+			
+			State &= ~ItemState.Wait;
+			QueueRedraw ();
+		}
+
+		void AtomCalendarError (object sender, GCalendarErrorArgs e)
+		{
+			if (State == ItemState.Wait)
+				State &= ~ItemState.Wait;
+			
+			HoverText = e.Error;
+			BadgeText = null;
+			
+			QueueRedraw ();
+		}
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarErrorArgs.cs'
--- StandardPlugins/GCalendar/src/GCalendarErrorArgs.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarErrorArgs.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,31 @@
+//  
+//  Copyright (C) 2010 Isak Karlsson
+// 
+//  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;
+
+namespace GCalendar
+{
+	public class GCalendarErrorArgs : EventArgs
+	{
+		public string Error { get; private set; }
+
+		public GCalendarErrorArgs (string e)
+		{
+			Error = e;
+		}
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarItemProvider.cs'
--- StandardPlugins/GCalendar/src/GCalendarItemProvider.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarItemProvider.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,65 @@
+//  
+//  Copyright (C) 2009 Isak Karlsson
+// 
+//  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 Docky.Items;
+
+namespace GCalendar
+{
+
+
+	public class GCalendarItemProvider : AbstractDockItemProvider
+	{
+
+		private GCalendarDockItem item;
+		
+		public override string Name {
+			get {
+				return "GCalendar";
+			}
+		}
+		
+		public override string Icon {
+			get {
+				return "gcalendar";
+			}
+		}
+		
+		public override void Dispose ()
+		{
+			item.Dispose();
+		}
+		
+		
+		public GCalendarItemProvider ()
+		{
+			item = new GCalendarDockItem();
+			AbstractDockItem[] items = {item};
+			Items = items;
+		}
+		
+		public override void AddedToDock ()
+		{
+			GLib.Idle.Add(delegate {
+				foreach(AbstractDockItem d in Items)
+					(d as GCalendarDockItem).Atom.ResetTime();
+				return false;
+			});
+		}
+
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarLoginConfig.cs'
--- StandardPlugins/GCalendar/src/GCalendarLoginConfig.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarLoginConfig.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,53 @@
+//  
+//  Copyright (C) 2010 Isak Karlsson
+// 
+//  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 Mono.Unix;
+
+using Docky.Widgets;
+
+namespace GCalendar
+{
+	public class GCalendarLoginConfig : AbstractLoginWidget
+	{
+		public GCalendarLoginConfig () : base("Google calendar", "http://www.google.com/calendar")
+		{
+			Password = GCalendarPreferences.Password;
+			Username = GCalendarPreferences.Username;
+			
+			Name = Catalog.GetString("Login");
+		}
+		
+		protected override void SaveAccountData (string username, string password)
+		{
+			if (GCalendarPreferences.Username != username || GCalendarPreferences.Password != password) {
+				GCalendarPreferences.Username = username;
+				GCalendarPreferences.Password = password;
+			
+				GCalendarAtom.Reload ();
+			}
+		}
+         
+		protected override bool Validate (string username, string password)
+		{
+			if (username == null || username == "" || password == null || password == "")
+				return false;
+			
+			else return GCalendarAtom.Validate(username, password);
+		}
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarMenuItem.cs'
--- StandardPlugins/GCalendar/src/GCalendarMenuItem.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarMenuItem.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,33 @@
+//  
+//  Copyright (C) 2010 Isak Karlsson
+// 
+//  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;
+
+namespace GCalendar
+{
+
+
+	public class GCalendarMenuItem : Docky.Menus.MenuItem
+	{
+
+		public GCalendarMenuItem (GCalendarEvent d, string icon) : base(d.DateFrom.ToShortTimeString () + " - " + d.Title, icon)
+		{
+				//Docky.Services.DockServices.System.Open(d.Link);
+			Clicked += delegate { };
+		}
+	}
+}

=== added file 'StandardPlugins/GCalendar/src/GCalendarPreferences.cs'
--- StandardPlugins/GCalendar/src/GCalendarPreferences.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/GCalendar/src/GCalendarPreferences.cs	2010-02-15 17:13:20 +0000
@@ -0,0 +1,144 @@
+//  
+//  Copyright (C) 2010 Isak Karlsson
+// 
+//  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 Docky.Services;
+namespace GCalendar
+{
+
+
+	public class GCalendarPreferences
+	{
+		const string UserKey = "User";
+		const string PasswdKey = "Password";
+		const string CalendarKey = "Calendars";
+		const string DaysKey = "Days";
+		const string MaxEventKey = "MaxEvents";
+		const string IntervalKey = "Interval";
+		const string HasAltClientKey = "HasAlternativClient";
+		const string AltClientKey = "AlternativClientPath";
+		
+		// Unimplemented
+		const string CustomIconKey = "CustomIcon";
+		const string IconKey = "Icon";
+
+
+		private static IPreferences pref = DockServices.Preferences.Get<GCalendarPreferences> ();
+
+
+		public static event EventHandler UsernameChange;
+
+		private static void OnUsernameChange ()
+		{
+			if (UsernameChange != null)
+				UsernameChange (null, EventArgs.Empty);
+		}
+
+		public static string Username {
+			get { return pref.Get<string> (UserKey, ""); }
+			set {
+				pref.Set<string> (UserKey, value);
+				OnUsernameChange ();
+			}
+		}
+
+		public static event EventHandler PasswordChange;
+
+		private static void OnPasswordChange ()
+		{
+			if (PasswordChange != null)
+				PasswordChange (null, EventArgs.Empty);
+		}
+
+
+		public static string Password {
+			get { return pref.GetSecure<string> (PasswdKey, ""); }
+			set {
+				pref.SetSecure<string> (PasswdKey, value);
+				OnPasswordChange ();
+			}
+		}
+
+		public static event EventHandler CalendarChange;
+
+		private static void OnCalendarChange ()
+		{
+			if (CalendarChange != null)
+				CalendarChange (null, EventArgs.Empty);
+		}
+
+		public static string[] Calendars {
+			get { return pref.Get<string[]> (CalendarKey, new string[0]); }
+			set {
+				pref.Set<string[]> (CalendarKey, value);
+				OnCalendarChange ();
+			}
+		}
+		
+		public static int Days {
+			get {
+				return pref.Get<int> (DaysKey, 0);
+			}
+			set {
+				pref.Set<int> (DaysKey, value);
+			}
+		}
+		
+		public static int MaxEvent {
+			get {
+				return pref.Get<int> (MaxEventKey, 0);
+			}
+			set {
+				pref.Set<int> (MaxEventKey, value);
+				OnUsernameChange ();
+			}
+		}
+		
+		public static uint Interval {
+			get {
+				return (uint) pref.Get<int> (IntervalKey, 10);
+			}
+			set {
+				pref.Set<int> (IntervalKey, value > 0 ? (int) value : 1);
+				OnUsernameChange ();
+			}
+		}
+		
+		public static bool HasAltClient {
+			get {
+				return pref.Get<bool> (HasAltClientKey, false);
+			}
+			set {
+				pref.Set<bool> (HasAltClientKey, value);
+			}
+		}
+		
+		public static string AltClient {
+			get {
+				return pref.Get<string> (AltClientKey, "evolution");
+			}
+			set {
+				pref.Set<string> (AltClientKey, value);
+			}
+		}
+
+		// No instances..
+		private GCalendarPreferences ()
+		{
+		}
+	}
+}

=== modified file 'StandardPlugins/Makefile.am'
--- StandardPlugins/Makefile.am	2009-12-04 07:54:33 +0000
+++ StandardPlugins/Makefile.am	2010-02-15 17:13:20 +0000
@@ -3,6 +3,7 @@
 	Bookmarks \
 	Clock \
 	CPUMonitor \
+	GCalendar \
 	GMail \
 	Mounter \
 	NetworkManager \
@@ -16,6 +17,7 @@
 	Bookmarks \
 	Clock \
 	CPUMonitor \
+	GCalendar \
 	GMail \
 	Mounter \
 	NetworkManager \

=== modified file 'StandardPlugins/Weather/gtk-gui/WeatherDocklet.WeatherConfig.cs'
--- StandardPlugins/Weather/gtk-gui/WeatherDocklet.WeatherConfig.cs	2009-12-14 20:09:49 +0000
+++ StandardPlugins/Weather/gtk-gui/WeatherDocklet.WeatherConfig.cs	2010-02-15 17:13:20 +0000
@@ -161,7 +161,7 @@
             // Container child GtkViewport.Gtk.Container+ContainerChild
             this.results_view = new Docky.Widgets.TileView();
             this.results_view.Name = "results_view";
-            this.results_view.IconSize = 24;
+            this.results_view.IconSize = 0;
             w17.Add(this.results_view);
             this.scrolledwindow1.Add(w17);
             this.vbox1.Add(this.scrolledwindow1);

=== modified file 'configure.ac'
--- configure.ac	2010-01-14 10:54:30 +0000
+++ configure.ac	2010-02-15 17:13:20 +0000
@@ -95,6 +95,8 @@
 PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
 PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
 PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
+PKG_CHECK_MODULES([GDATA_SHARP_CALENDAR], [gdata-sharp-calendar])
+PKG_CHECK_MODULES([GDATA_SHARP_CORE], [gdata-sharp-core])
 
 dnl check for native libraries (ones that are p/invoked)
 GTK_REQUIRED_VERSION=2.14.3
@@ -125,6 +127,8 @@
 AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
 AC_SUBST([NOTIFY_SHARP_LIBS])
 AC_SUBST([WNCK_SHARP_10_LIBS])
+AC_SUBST([GDATA_SHARP_CALENDAR])
+AC_SUBST([GDATA_SHARP_CORE])
 
 dnl Docky references
 DOCKY_CAIRO_LIBS="-r:$(pwd)/build/Docky.CairoHelper.dll"
@@ -204,6 +208,8 @@
 StandardPlugins/Clock/Themes/Default24/Makefile
 StandardPlugins/CPUMonitor/Makefile
 StandardPlugins/CPUMonitor/Resources/CPUMonitor.addin.xml
+StandardPlugins/GCalendar/Makefile
+StandardPlugins/GCalendar/Resources/GCalendar.addin.xml
 StandardPlugins/GMail/Makefile
 StandardPlugins/GMail/Resources/GMail.addin.xml
 StandardPlugins/Mounter/Makefile

=== modified file 'data/icons/hicolor/128x128/apps/Makefile.am'
--- data/icons/hicolor/128x128/apps/Makefile.am	2010-02-07 18:41:08 +0000
+++ data/icons/hicolor/128x128/apps/Makefile.am	2010-02-15 17:13:20 +0000
@@ -1,6 +1,6 @@
 pkgicondir=@datadir@/icons/hicolor/128x128/apps
 pkgicon_DATA=docky.svg \
-	gmail.png
+	gmail.png \
+	gcalendar.png
 
 EXTRA_DIST=$(pkgicon_DATA)
-

=== added file 'data/icons/hicolor/128x128/apps/gcalendar.png'
Binary files data/icons/hicolor/128x128/apps/gcalendar.png	1970-01-01 00:00:00 +0000 and data/icons/hicolor/128x128/apps/gcalendar.png	2010-02-15 17:13:20 +0000 differ
=== modified file 'dbus-api/mono/DockyHelper/DockyHelper.csproj'
--- dbus-api/mono/DockyHelper/DockyHelper.csproj	2010-01-15 11:18:28 +0000
+++ dbus-api/mono/DockyHelper/DockyHelper.csproj	2010-02-15 17:13:20 +0000
@@ -32,7 +32,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
       <Package>ndesk-dbus-1.0</Package>