Do Plugins

Merge lp://qastaging/~d6g/do-plugins/gapps-fix into lp://qastaging/do-plugins/docklets

  1. gapps-fix
  2. Merge into docklets
Proposed by Peng Deng
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~d6g/do-plugins/gapps-fix
Merge into: lp://qastaging/do-plugins/docklets
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~d6g/do-plugins/gapps-fix
Reviewer Review Type Date Requested Status
Peng Deng (community) Needs Resubmitting
Review via email: mp+9959@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Peng Deng (d6g) wrote :

Fix the "Invalid Username" error when using GMail docklet with Google Apps Domain. Using full login info (username@domain) is always safe for both GMail and GApps.

lp://qastaging/~d6g/do-plugins/gapps-fix updated
69. By Peng Deng

Add GMail docklet project to Docklets solution

70. By Peng Deng

Use a newer version of the classic GMail icon to make it have consistent shape as the black one

71. By Peng Deng

make the open url action compatible with google apps domains

Revision history for this message
Peng Deng (d6g) wrote :

Here is what this branch fixes:

- Login Credentials checking now passes without 401 error for Google
  Apps domains due to the use of full login string as username
  (i.e. including the domain)

- OpenInbox action (executes when click the docklet) now open the
  the right URL, according to the domain currently in use.

- Update the red GMail icon to the same version as the black one.

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Docklets.sln'
2--- Docklets.sln 2009-05-21 01:44:16 +0000
3+++ Docklets.sln 2009-08-10 23:57:41 +0000
4@@ -11,6 +11,8 @@
5 EndProject
6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherDocklet", "WeatherDocklet\WeatherDocklet.csproj", "{4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}"
7 EndProject
8+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMailDocklet", "GMailDocklet\GMailDocklet.csproj", "{4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}"
9+EndProject
10 Global
11 GlobalSection(SolutionConfigurationPlatforms) = preSolution
12 Debug|Any CPU = Debug|Any CPU
13@@ -26,8 +28,12 @@
14 {48A344DE-54D3-40E3-9655-E4FDE83C1F13}.Release|Any CPU.ActiveCfg = Release|Any CPU
15 {48A344DE-54D3-40E3-9655-E4FDE83C1F13}.Release|Any CPU.Build.0 = Release|Any CPU
16 {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17- {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
18- {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
21+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
24+ {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Release|Any CPU.Build.0 = Release|Any CPU
25 {4FDFFA11-F615-41D9-81BF-5A9AA5C8E2B9}.Release|Any CPU.Build.0 = Release|Any CPU
26 {E3884702-CCBA-4766-B393-E6FDA130CD15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27 {E3884702-CCBA-4766-B393-E6FDA130CD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
28
29=== modified file 'GMailDocklet/GMailDocklet.csproj'
30--- GMailDocklet/GMailDocklet.csproj 2009-07-02 08:16:56 +0000
31+++ GMailDocklet/GMailDocklet.csproj 2009-08-10 23:57:41 +0000
32@@ -54,7 +54,7 @@
33 <Reference Include="System.Web" />
34 <Reference Include="Do.Interface.Linux.Docky, Version=0.9.0.0, Culture=neutral, PublicKeyToken=null">
35 <SpecificVersion>False</SpecificVersion>
36- <HintPath>..\..\..\trunk\do\build\Do.Interface.Linux.Docky.dll</HintPath>
37+ <Package>do.interface.linux.docky</Package>
38 </Reference>
39 </ItemGroup>
40 <ItemGroup>
41@@ -90,4 +90,4 @@
42 <LogicalName>gui.stetic</LogicalName>
43 </EmbeddedResource>
44 </ItemGroup>
45-</Project>
46+</Project>
47\ No newline at end of file
48
49=== modified file 'GMailDocklet/src/GMailAtom.cs'
50--- GMailDocklet/src/GMailAtom.cs 2009-07-22 07:29:49 +0000
51+++ GMailDocklet/src/GMailAtom.cs 2009-08-10 23:49:04 +0000
52@@ -145,7 +145,6 @@
53 {
54 try {
55 String[] login = username.Split (new char[] {'@'});
56- string user = login [0];
57 string domain = login.Length > 1 ? login [1] : "gmail.com";
58 string url = "https://mail.google.com/a/" + domain;
59 if (domain.Equals ("gmail.com") || domain.Equals ("googlemail.com"))
60@@ -155,7 +154,7 @@
61 Log<GMailAtom>.Info ("Fetching Atom feed: " + url);
62 HttpWebRequest request = (HttpWebRequest)WebRequest.Create (url);
63 request.UserAgent = @"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.10) Gecko/2009042523 Ubuntu/9.04 (jaunty) Firefox/3.0.10";
64- request.Credentials = new NetworkCredential (user, password);
65+ request.Credentials = new NetworkCredential (username, password);
66 // remove when ServicePointManager.ServerCertificateValidationCallback implemented in mono
67 System.Net.ServicePointManager.CertificatePolicy = new CertHandler ();
68
69@@ -177,7 +176,6 @@
70 Services.Application.RunOnMainThread (OnGMailChecking);
71
72 String[] login = Preferences.User.Split (new char[] {'@'});
73- string user = login [0];
74 string domain = login.Length > 1 ? login [1] : "gmail.com";
75 string url = "https://mail.google.com/a/" + domain;
76 if (domain.Equals ("gmail.com") || domain.Equals ("googlemail.com"))
77@@ -187,7 +185,7 @@
78 Log<GMailAtom>.Info ("Fetching Atom feed: " + url);
79 HttpWebRequest request = (HttpWebRequest)WebRequest.Create (url);
80 request.UserAgent = @"Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.10) Gecko/2009042523 Ubuntu/9.04 (jaunty) Firefox/3.0.10";
81- request.Credentials = new NetworkCredential (user, Preferences.Password);
82+ request.Credentials = new NetworkCredential (Preferences.User, Preferences.Password);
83 // remove when ServicePointManager.ServerCertificateValidationCallback implemented in mono
84 System.Net.ServicePointManager.CertificatePolicy = new CertHandler ();
85
86
87=== modified file 'SwitcherDocklet/SwitcherDocklet.csproj'
88--- SwitcherDocklet/SwitcherDocklet.csproj 2009-05-14 18:30:35 +0000
89+++ SwitcherDocklet/SwitcherDocklet.csproj 2009-08-10 23:57:41 +0000
90@@ -33,18 +33,18 @@
91 <Reference Include="System.Core">
92 <RequiredTargetFramework>3.5</RequiredTargetFramework>
93 </Reference>
94- <Reference Include="Do.Interface.Linux.Docky, Version=1.0.3406.1016, Culture=neutral">
95- <Package>do.interface.linux.docky</Package>
96- </Reference>
97 <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
98 <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
99 <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
100 <Reference Include="Mono.Cairo" />
101- <Reference Include="Do.Interface.Wink, Version=1.0.3406.1015, Culture=neutral">
102- <Package>do.interface.wink</Package>
103- </Reference>
104- <Reference Include="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral" />
105- <Reference Include="Do.Platform, Version=0.9.0.0, Culture=neutral" />
106+ <Reference Include="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral">
107+ <Package>do.interface.linux</Package>
108+ </Reference>
109+ <Reference Include="Do.Platform, Version=0.9.0.0, Culture=neutral">
110+ <Package>do.platform</Package>
111+ </Reference>
112+ <Reference Include="Do.Interface.Linux.Docky, Version=1.0.3406.1016, Culture=neutral" />
113+ <Reference Include="Do.Interface.Wink, Version=1.0.3406.1015, Culture=neutral" />
114 </ItemGroup>
115 <ItemGroup>
116 <Compile Include="AssemblyInfo.cs" />
117
118=== modified file 'VolumeDocklet/VolumeDocklet.csproj'
119--- VolumeDocklet/VolumeDocklet.csproj 2009-05-14 18:30:35 +0000
120+++ VolumeDocklet/VolumeDocklet.csproj 2009-08-10 23:57:41 +0000
121@@ -37,11 +37,13 @@
122 <Reference Include="System.Core">
123 <RequiredTargetFramework>3.5</RequiredTargetFramework>
124 </Reference>
125- <Reference Include="Do.Interface.Linux.Docky, Version=1.0.3398.4897, Culture=neutral">
126- <Package>do.interface.linux.docky</Package>
127- </Reference>
128- <Reference Include="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral" />
129- <Reference Include="Do.Platform, Version=0.9.0.0, Culture=neutral" />
130+ <Reference Include="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral">
131+ <Package>do.interface.linux</Package>
132+ </Reference>
133+ <Reference Include="Do.Platform, Version=0.9.0.0, Culture=neutral">
134+ <Package>do.platform</Package>
135+ </Reference>
136+ <Reference Include="Do.Interface.Linux.Docky, Version=1.0.3398.4897, Culture=neutral" />
137 </ItemGroup>
138 <ItemGroup>
139 <Compile Include="AssemblyInfo.cs" />
140
141=== modified file 'WeatherDocklet/WeatherDocklet.csproj'
142--- WeatherDocklet/WeatherDocklet.csproj 2009-06-23 21:47:16 +0000
143+++ WeatherDocklet/WeatherDocklet.csproj 2009-08-10 23:57:41 +0000
144@@ -51,7 +51,9 @@
145 <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
146 <Package>mono-addins-0.2</Package>
147 </Reference>
148- <Reference Include="Do.Interface.Linux.Docky, Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" />
149+ <Reference Include="Do.Interface.Linux.Docky, Version=0.9.0.0, Culture=neutral, PublicKeyToken=null">
150+ <Package>do.interface.linux.docky</Package>
151+ </Reference>
152 <Reference Include="System.Web" />
153 </ItemGroup>
154 <ItemGroup>

Subscribers

People subscribed via source and target branches