r7323 - in dumbhippo/trunk/client/windows: . HippoCommon HippoUI cairo libddm
- From: commits mugshot org
- To: online-desktop-list gnome org
- Subject: r7323 - in dumbhippo/trunk/client/windows: . HippoCommon HippoUI cairo libddm
- Date: Wed, 20 Feb 2008 14:39:21 -0600 (CST)
Author: otaylor
Date: 2008-02-20 14:39:16 -0600 (Wed, 20 Feb 2008)
New Revision: 7323
Added:
dumbhippo/trunk/client/windows/libddm/
dumbhippo/trunk/client/windows/libddm/genmarshal.bat
dumbhippo/trunk/client/windows/libddm/libddm.vcproj
dumbhippo/trunk/client/windows/libddm/libddm.vsprops
Modified:
dumbhippo/trunk/client/windows/DumbHippo.sln
dumbhippo/trunk/client/windows/HippoCommon/
dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vcproj
dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vsprops
dumbhippo/trunk/client/windows/HippoCommon/genmarshal.bat
dumbhippo/trunk/client/windows/HippoUI/HippoAbstractIEWindow.cpp
dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp
dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h
dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.cpp
dumbhippo/trunk/client/windows/HippoUI/HippoUI.cpp
dumbhippo/trunk/client/windows/HippoUI/HippoUI.h
dumbhippo/trunk/client/windows/HippoUI/HippoUI.rc
dumbhippo/trunk/client/windows/HippoUI/HippoUI.vsprops
dumbhippo/trunk/client/windows/cairo/
Log:
Modified: dumbhippo/trunk/client/windows/DumbHippo.sln
===================================================================
--- dumbhippo/trunk/client/windows/DumbHippo.sln 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/DumbHippo.sln 2008-02-20 20:39:16 UTC (rev 7323)
@@ -2,17 +2,17 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoUI", "HippoUI\HippoUI.vcproj", "{012658BC-1460-41DC-9E2E-CDD45B75AEF5}"
ProjectSection(ProjectDependencies) = postProject
+ {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
+ {5775F5D5-F36A-4919-9329-F97A928754D4} = {5775F5D5-F36A-4919-9329-F97A928754D4}
+ {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
+ {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
+ {140C477F-49AF-4F9D-AC31-5509F03587E6} = {140C477F-49AF-4F9D-AC31-5509F03587E6}
+ {2F331475-82BE-44AC-B6DD-D430C758BC7B} = {2F331475-82BE-44AC-B6DD-D430C758BC7B}
+ {923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
+ {A657624C-DFB1-4082-8B94-3EAE90D969A5} = {A657624C-DFB1-4082-8B94-3EAE90D969A5}
+ {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
+ {0A42C81D-9B6A-4636-A0A2-E8B4ED11A805} = {0A42C81D-9B6A-4636-A0A2-E8B4ED11A805}
{44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
- {0A42C81D-9B6A-4636-A0A2-E8B4ED11A805} = {0A42C81D-9B6A-4636-A0A2-E8B4ED11A805}
- {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
- {A657624C-DFB1-4082-8B94-3EAE90D969A5} = {A657624C-DFB1-4082-8B94-3EAE90D969A5}
- {923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
- {2F331475-82BE-44AC-B6DD-D430C758BC7B} = {2F331475-82BE-44AC-B6DD-D430C758BC7B}
- {140C477F-49AF-4F9D-AC31-5509F03587E6} = {140C477F-49AF-4F9D-AC31-5509F03587E6}
- {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
- {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
- {5775F5D5-F36A-4919-9329-F97A928754D4} = {5775F5D5-F36A-4919-9329-F97A928754D4}
- {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoUtil", "HippoUtil\HippoUtil.vcproj", "{638E7547-B5E8-49AD-A70B-56E333C216FE}"
@@ -28,14 +28,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WiXInstaller", "WiXInstaller\WiXInstaller.vcproj", "{D45AA47E-F39D-45C9-93A5-5D17CF093164}"
ProjectSection(ProjectDependencies) = postProject
+ {953B4EEF-CD4D-443C-97CC-7ABEE71EAB1F} = {953B4EEF-CD4D-443C-97CC-7ABEE71EAB1F}
+ {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
+ {012658BC-1460-41DC-9E2E-CDD45B75AEF5} = {012658BC-1460-41DC-9E2E-CDD45B75AEF5}
+ {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
+ {AE309CA4-B4AA-44A8-99D9-CA840CBFF055} = {AE309CA4-B4AA-44A8-99D9-CA840CBFF055}
+ {923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
+ {638E7547-B5E8-49AD-A70B-56E333C216FE} = {638E7547-B5E8-49AD-A70B-56E333C216FE}
{5EE19538-0578-4199-93DD-E77F11A060E4} = {5EE19538-0578-4199-93DD-E77F11A060E4}
- {638E7547-B5E8-49AD-A70B-56E333C216FE} = {638E7547-B5E8-49AD-A70B-56E333C216FE}
- {923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
- {AE309CA4-B4AA-44A8-99D9-CA840CBFF055} = {AE309CA4-B4AA-44A8-99D9-CA840CBFF055}
- {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
- {012658BC-1460-41DC-9E2E-CDD45B75AEF5} = {012658BC-1460-41DC-9E2E-CDD45B75AEF5}
- {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
- {953B4EEF-CD4D-443C-97CC-7ABEE71EAB1F} = {953B4EEF-CD4D-443C-97CC-7ABEE71EAB1F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoExplorer", "HippoExplorer\HippoExplorer.vcproj", "{5EE19538-0578-4199-93DD-E77F11A060E4}"
@@ -46,10 +46,11 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoCommon", "HippoCommon\HippoCommon.vcproj", "{2F331475-82BE-44AC-B6DD-D430C758BC7B}"
ProjectSection(ProjectDependencies) = postProject
{923DC368-46A9-4977-B827-75797CC259E3} = {923DC368-46A9-4977-B827-75797CC259E3}
+ {808500B7-968D-4493-9461-D32A4F68DBEF} = {808500B7-968D-4493-9461-D32A4F68DBEF}
+ {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
+ {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
+ {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
{7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
- {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA} = {E02F6EA7-65C3-4D2A-919F-D022D6C26DFA}
- {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
- {A0F265E0-4510-4178-B365-A4581C74EA51} = {A0F265E0-4510-4178-B365-A4581C74EA51}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoIpc", "HippoIpc\HippoIpc.vcproj", "{90FE4378-3E7D-4C9D-9509-5F551B00515E}"
@@ -58,17 +59,17 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoFirefox", "HippoFirefox\HippoFirefox.vcproj", "{55F02EE8-E63D-4727-A558-C776A25DD77B}"
ProjectSection(ProjectDependencies) = postProject
+ {90FE4378-3E7D-4C9D-9509-5F551B00515E} = {90FE4378-3E7D-4C9D-9509-5F551B00515E}
{638E7547-B5E8-49AD-A70B-56E333C216FE} = {638E7547-B5E8-49AD-A70B-56E333C216FE}
- {90FE4378-3E7D-4C9D-9509-5F551B00515E} = {90FE4378-3E7D-4C9D-9509-5F551B00515E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoFirefoxStub", "HippoFirefoxStub\HippoFirefoxStub.vcproj", "{EA45CB10-EFA2-412D-BBB3-815F67327573}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippoFirefoxExtension", "HippoFirefoxExtension\HippoFirefoxExtension.vcproj", "{953B4EEF-CD4D-443C-97CC-7ABEE71EAB1F}"
ProjectSection(ProjectDependencies) = postProject
- {EA45CB10-EFA2-412D-BBB3-815F67327573} = {EA45CB10-EFA2-412D-BBB3-815F67327573}
{55F02EE8-E63D-4727-A558-C776A25DD77B} = {55F02EE8-E63D-4727-A558-C776A25DD77B}
{55F02EE8-E63D-4727-A558-C776A25DD77B} = {55F02EE8-E63D-4727-A558-C776A25DD77B}
+ {EA45CB10-EFA2-412D-BBB3-815F67327573} = {EA45CB10-EFA2-412D-BBB3-815F67327573}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "airbag", "airbag\airbag.vcproj", "{0A42C81D-9B6A-4636-A0A2-E8B4ED11A805}"
@@ -94,27 +95,29 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpango", "libpango\libpango.vcproj", "{7D54C7A0-178C-4A5D-B91E-649B7AEED42E}"
ProjectSection(ProjectDependencies) = postProject
+ {A657624C-DFB1-4082-8B94-3EAE90D969A5} = {A657624C-DFB1-4082-8B94-3EAE90D969A5}
+ {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
{44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
- {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
- {A657624C-DFB1-4082-8B94-3EAE90D969A5} = {A657624C-DFB1-4082-8B94-3EAE90D969A5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpangowin32", "libpangowin32\libpangowin32.vcproj", "{B71C2155-5DA6-465B-A4F5-C1CB451D5200}"
ProjectSection(ProjectDependencies) = postProject
+ {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
+ {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
{44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
- {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
- {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpangocairo", "libpangocairo\libpangocairo.vcproj", "{140C477F-49AF-4F9D-AC31-5509F03587E6}"
ProjectSection(ProjectDependencies) = postProject
+ {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
+ {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
+ {B71C2155-5DA6-465B-A4F5-C1CB451D5200} = {B71C2155-5DA6-465B-A4F5-C1CB451D5200}
+ {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
{44873A1B-D052-4875-ABCC-8878555D444F} = {44873A1B-D052-4875-ABCC-8878555D444F}
- {C9CE2D45-64DB-405A-B0C7-E8140ED657B1} = {C9CE2D45-64DB-405A-B0C7-E8140ED657B1}
- {B71C2155-5DA6-465B-A4F5-C1CB451D5200} = {B71C2155-5DA6-465B-A4F5-C1CB451D5200}
- {7D54C7A0-178C-4A5D-B91E-649B7AEED42E} = {7D54C7A0-178C-4A5D-B91E-649B7AEED42E}
- {57B7A7BF-F5B6-481E-886C-4EF0FA782301} = {57B7A7BF-F5B6-481E-886C-4EF0FA782301}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libddm", "libddm\libddm.vcproj", "{808500B7-968D-4493-9461-D32A4F68DBEF}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -208,6 +211,10 @@
{140C477F-49AF-4F9D-AC31-5509F03587E6}.Debug|Win32.Build.0 = Debug|Win32
{140C477F-49AF-4F9D-AC31-5509F03587E6}.Release|Win32.ActiveCfg = Release|Win32
{140C477F-49AF-4F9D-AC31-5509F03587E6}.Release|Win32.Build.0 = Release|Win32
+ {808500B7-968D-4493-9461-D32A4F68DBEF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {808500B7-968D-4493-9461-D32A4F68DBEF}.Debug|Win32.Build.0 = Debug|Win32
+ {808500B7-968D-4493-9461-D32A4F68DBEF}.Release|Win32.ActiveCfg = Release|Win32
+ {808500B7-968D-4493-9461-D32A4F68DBEF}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Property changes on: dumbhippo/trunk/client/windows/HippoCommon
___________________________________________________________________
Name: svn:ignore
- *.aps Debug
Debug
*.ncb
hippo-common-marshal.c
hippo-common-marshal.h
hippo-canvas-marshal.c
hippo-canvas-marshal.h
Release
+ *.aps Debug
Debug
*.ncb
hippo-common-marshal.c
hippo-common-marshal.h
hippo-canvas-marshal.c
hippo-canvas-marshal.h
Release
hippo-engine-marshal.c
hippo-engine-marshal.h
hippo-stacker-marshal.c
hippo-stacker-marshal.h
Modified: dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vcproj
===================================================================
--- dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vcproj 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vcproj 2008-02-20 20:39:16 UTC (rev 7323)
@@ -287,7 +287,7 @@
>
</File>
<File
- RelativePath="..\..\..\canvas\common\hippo\hippo-canvas-marshal.list"
+ RelativePath="..\..\canvas\common\hippo\hippo-canvas-marshal.list"
>
<FileConfiguration
Name="Debug|Win32"
@@ -787,19 +787,19 @@
>
</File>
<File
- RelativePath="..\..\..\desktop-data-model\engine\hippo-engine.h"
+ RelativePath="..\..\..\desktop-data-model\engine\hippo-engine-basics.h"
>
</File>
<File
- RelativePath=".\hippo-engine-marshal.h"
+ RelativePath="..\..\..\desktop-data-model\engine\hippo-engine-internal.h"
>
</File>
<File
- RelativePath="..\..\..\desktop-data-model\engine\hippo-engine-basics.h"
+ RelativePath=".\hippo-engine-marshal.h"
>
</File>
<File
- RelativePath="..\..\..\desktop-data-model\engine\hippo-engine-internal.h"
+ RelativePath="..\..\..\desktop-data-model\engine\hippo-engine.h"
>
</File>
<File
Modified: dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vsprops
===================================================================
--- dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vsprops 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoCommon/HippoCommon.vsprops 2008-02-20 20:39:16 UTC (rev 7323)
@@ -6,7 +6,8 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../HippoUtil;../cairo;../../common/cairo/src;../../common/glib;../../common/glib/glib;../../common/pango;../libglib;../dependencies/gettext/include;../dependencies/jpeg/include;../../common;../../common/loudmouth;../../common/canvas;../../common/hippo/generated"
+ AdditionalIncludeDirectories=".;../HippoUtil;../cairo;../../common/cairo/src;../../common/glib;../../common/glib/glib;../../common/pango;../libglib;../dependencies/gettext/include;../dependencies/jpeg/include;"../../../desktop-data-model";../../common;../../common/loudmouth;../../canvas/common;../../common/hippo/generated"
+ PreprocessorDefinitions="DDM_I_KNOW_THIS_IS_UNSTABLE"
DisableSpecificWarnings="4311;4244;4267"
/>
</VisualStudioPropertySheet>
Modified: dumbhippo/trunk/client/windows/HippoCommon/genmarshal.bat
===================================================================
--- dumbhippo/trunk/client/windows/HippoCommon/genmarshal.bat 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoCommon/genmarshal.bat 2008-02-20 20:39:16 UTC (rev 7323)
@@ -1,15 +1,23 @@
@echo off
PATH=%PATH%;..\dependencies
set genmarshal=..\dependencies\glib\bin\glib-genmarshal
-set source=..\..\common\hippo\hippo-common-marshal.list
-%genmarshal% --prefix=hippo_common_marshal --header %source% > hippo-common-marshal.h
+set source=..\..\..\desktop-data-model\engine\hippo-engine-marshal.list
-echo #include "hippo-common-marshal.h" > hippo-common-marshal.c
-%genmarshal% --prefix=hippo_common_marshal --body %source% >> hippo-common-marshal.c
+%genmarshal% --prefix=hippo_engine_marshal --header %source% > hippo-engine-marshal.h
-set source=..\..\common\canvas\hippo\hippo-canvas-marshal.list
+echo #include "hippo-engine-marshal.h" > hippo-engine-marshal.c
+%genmarshal% --prefix=hippo_engine_marshal --body %source% >> hippo-engine-marshal.c
+set source=..\..\common\stacker\hippo-stacker-marshal.list
+
+%genmarshal% --prefix=hippo_stacker_marshal --header %source% > hippo-stacker-marshal.h
+
+echo #include "hippo-stacker-marshal.h" > hippo-stacker-marshal.c
+%genmarshal% --prefix=hippo_stacker_marshal --body %source% >> hippo-stacker-marshal.c
+
+set source=..\..\canvas\common\hippo\hippo-canvas-marshal.list
+
%genmarshal% --prefix=hippo_canvas_marshal --header %source% > hippo-canvas-marshal.h
echo #include "hippo-canvas-marshal.h" > hippo-canvas-marshal.c
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoAbstractIEWindow.cpp
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoAbstractIEWindow.cpp 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoAbstractIEWindow.cpp 2008-02-20 20:39:16 UTC (rev 7323)
@@ -84,7 +84,7 @@
HippoPlatform *platform;
platform = abstractWindow_->ui_->getPlatform();
- hippo_platform_get_web_host_port(platform, &serverHostU, &port);
+ hippo_platform_get_web_host_port(platform, HIPPO_SERVER_STACKER, &serverHostU, &port);
HippoBSTR serverHost = HippoBSTR::fromUTF8(serverHostU);
g_free(serverHostU);
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.cpp 2008-02-20 20:39:16 UTC (rev 7323)
@@ -10,7 +10,7 @@
#include <ShlObj.h>
#include <Windows.h>
#include <mshtml.h>
-#include <hippo/hippo-engine-basics.h>
+#include <engine/hippo-engine-basics.h>
#include <stacker/hippo-stacker-platform.h>
static void hippo_platform_impl_init (HippoPlatformImpl *impl);
@@ -23,6 +23,7 @@
static void hippo_platform_impl_get_platform_info (HippoPlatform *platform,
HippoPlatformInfo *info);
static gboolean hippo_platform_impl_read_login_cookie (HippoPlatform *platform,
+ HippoServerType server_type,
HippoBrowserKind *origin_browser_p,
char **username_p,
char **password_p);
@@ -31,8 +32,10 @@
static HippoInstanceType hippo_platform_impl_get_instance_type (HippoPlatform *platform);
-static char* hippo_platform_impl_get_message_server (HippoPlatform *platform);
-static char* hippo_platform_impl_get_web_server (HippoPlatform *platform);
+static char* hippo_platform_impl_get_message_server (HippoPlatform *platform,
+ HippoServerType server_type);
+static char* hippo_platform_impl_get_web_server (HippoPlatform *platform,
+ HippoServerType server_type);
static gboolean hippo_platform_impl_get_signin (HippoPlatform *platform);
static void hippo_platform_impl_set_message_server (HippoPlatform *platform,
const char *value);
@@ -40,29 +43,30 @@
const char *value);
static void hippo_platform_impl_set_signin (HippoPlatform *platform,
gboolean value);
-static HippoWindow* hippo_platform_impl_create_window (HippoPlatform *platform);
-static void hippo_platform_impl_get_screen_info (HippoPlatform *platform,
- HippoRectangle *monitor_rect_p,
- HippoRectangle *tray_icon_rect_p,
- HippoOrientation *tray_icon_orientation_p);
-static gboolean hippo_platform_impl_get_pointer_position (HippoPlatform *platform,
- int *x_p,
- int *y_p);
+
+static HippoWindow* hippo_platform_impl_create_window (HippoStackerPlatform *platform);
+static void hippo_platform_impl_get_screen_info (HippoStackerPlatform *platform,
+ HippoRectangle *monitor_rect_p,
+ HippoRectangle *tray_icon_rect_p,
+ HippoOrientation *tray_icon_orientation_p);
+static gboolean hippo_platform_impl_get_pointer_position (HippoStackerPlatform *platform,
+ int *x_p,
+ int *y_p);
static void hippo_platform_impl_open_url (HippoPlatform *platform,
HippoBrowserKind browser,
const char *url);
-static void hippo_platform_impl_http_request (HippoPlatform *platform,
- const char *url,
- HippoHttpFunc func,
- void *data);
-static void hippo_platform_impl_show_chat_window (HippoPlatform *platform,
- const char *chat_id);
-static HippoWindowState hippo_platform_impl_get_chat_window_state(HippoPlatform *platform,
- const char *chat_id);
+static void hippo_platform_impl_http_request (HippoStackerPlatform *platform,
+ const char *url,
+ HippoHttpFunc func,
+ void *data);
+static void hippo_platform_impl_show_chat_window (HippoStackerPlatform *platform,
+ const char *chat_id);
+static HippoWindowState hippo_platform_impl_get_chat_window_state(HippoStackerPlatform *platform,
+ const char *chat_id);
-static gboolean hippo_platform_impl_can_play_song_download (HippoPlatform *platform,
- HippoSongDownload *song_download);
+static gboolean hippo_platform_impl_can_play_song_download (HippoStackerPlatform *platform,
+ HippoSongDownload *song_download);
struct _HippoPlatformImpl {
@@ -81,7 +85,7 @@
G_DEFINE_TYPE_WITH_CODE(HippoPlatformImpl, hippo_platform_impl, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE(HIPPO_TYPE_PLATFORM, hippo_platform_impl_iface_init);
- G_IMPLEMENT_INTERFACE(HIPPO_TYPE_STACKER_PLATFORM, hippo_stacker_platform_impl_iface_init));
+ G_IMPLEMENT_INTERFACE(HIPPO_TYPE_STACKER_PLATFORM, hippo_platform_impl_stacker_iface_init));
static void
hippo_platform_impl_iface_init(HippoPlatformClass *klass)
@@ -126,7 +130,7 @@
object_class->finalize = hippo_platform_impl_finalize;
}
-HippoPlatform*
+HippoPlatformImpl*
hippo_platform_impl_new(HippoInstanceType instance)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(g_object_new(HIPPO_TYPE_PLATFORM_IMPL, NULL));
@@ -134,7 +138,7 @@
impl->preferences = new HippoPreferences(instance);
- return HIPPO_PLATFORM(impl);
+ return impl;
}
static void
@@ -203,7 +207,7 @@
char *web_host;
int web_port;
- hippo_platform_get_web_host_port(platform, &web_host, &web_port);
+ hippo_platform_get_web_host_port(platform, HIPPO_SERVER_STACKER, &web_host, &web_port);
makeAuthUrl(web_host, authUrl);
g_free(web_host);
@@ -346,6 +350,7 @@
static gboolean
hippo_platform_impl_read_login_cookie(HippoPlatform *platform,
+ HippoServerType server_type,
HippoBrowserKind *origin_browser_p,
char **username_p,
char **password_p)
@@ -353,7 +358,7 @@
char *web_host;
int web_port;
- hippo_platform_get_web_host_port(platform, &web_host, &web_port);
+ hippo_platform_get_web_host_port(platform, server_type, &web_host, &web_port);
g_debug("Looking for login to %s:%d", web_host, web_port);
@@ -489,7 +494,8 @@
}
static char*
-hippo_platform_impl_get_message_server(HippoPlatform *platform)
+hippo_platform_impl_get_message_server(HippoPlatform *platform,
+ HippoServerType server_type)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
@@ -502,7 +508,8 @@
}
static char*
-hippo_platform_impl_get_web_server(HippoPlatform *platform)
+hippo_platform_impl_get_web_server(HippoPlatform *platform,
+ HippoServerType server_type)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
@@ -548,7 +555,7 @@
}
static HippoWindow*
-hippo_platform_impl_create_window(HippoPlatform *platform)
+hippo_platform_impl_create_window(HippoStackerPlatform *platform)
{
return hippo_window_win_new(HIPPO_PLATFORM_IMPL(platform)->ui);
}
@@ -618,10 +625,10 @@
}
static void
-hippo_platform_impl_get_screen_info(HippoPlatform *platform,
- HippoRectangle *monitor_rect_p,
- HippoRectangle *tray_icon_rect_p,
- HippoOrientation *tray_icon_orientation_p)
+hippo_platform_impl_get_screen_info(HippoStackerPlatform *platform,
+ HippoRectangle *monitor_rect_p,
+ HippoRectangle *tray_icon_rect_p,
+ HippoOrientation *tray_icon_orientation_p)
{
APPBARDATA abd;
abd.cbSize = sizeof(abd);
@@ -679,9 +686,9 @@
}
static gboolean
-hippo_platform_impl_get_pointer_position (HippoPlatform *platform,
- int *x_p,
- int *y_p)
+hippo_platform_impl_get_pointer_position (HippoStackerPlatform *platform,
+ int *x_p,
+ int *y_p)
{
POINT point = { 0, 0 };
@@ -768,10 +775,10 @@
};
static void
-hippo_platform_impl_http_request(HippoPlatform *platform,
- const char *url,
- HippoHttpFunc func,
- void *data)
+hippo_platform_impl_http_request(HippoStackerPlatform *platform,
+ const char *url,
+ HippoHttpFunc func,
+ void *data)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
@@ -788,8 +795,8 @@
}
static void
-hippo_platform_impl_show_chat_window(HippoPlatform *platform,
- const char *chat_id)
+hippo_platform_impl_show_chat_window(HippoStackerPlatform *platform,
+ const char *chat_id)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
if (!impl->ui) {
@@ -801,8 +808,8 @@
}
static HippoWindowState
-hippo_platform_impl_get_chat_window_state(HippoPlatform *platform,
- const char *chat_id)
+hippo_platform_impl_get_chat_window_state(HippoStackerPlatform *platform,
+ const char *chat_id)
{
HippoPlatformImpl *impl = HIPPO_PLATFORM_IMPL(platform);
if (!impl->ui) {
@@ -815,8 +822,8 @@
static gboolean
-hippo_platform_impl_can_play_song_download(HippoPlatform *platform,
- HippoSongDownload *song_download)
+hippo_platform_impl_can_play_song_download(HippoStackerPlatform *platform,
+ HippoSongDownload *song_download)
{
switch (hippo_song_download_get_source(song_download)) {
case HIPPO_SONG_DOWNLOAD_ITUNES:
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPlatformImpl.h 2008-02-20 20:39:16 UTC (rev 7323)
@@ -18,7 +18,7 @@
GType hippo_platform_impl_get_type (void) G_GNUC_CONST;
-HippoPlatform* hippo_platform_impl_new (HippoInstanceType instance);
+HippoPlatformImpl*hippo_platform_impl_new (HippoInstanceType instance);
void hippo_platform_impl_set_ui (HippoPlatformImpl *impl,
HippoUI *ui);
HippoPreferences* hippo_platform_impl_get_preferences (HippoPlatformImpl *impl);
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.cpp
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.cpp 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoPreferences.cpp 2008-02-20 20:39:16 UTC (rev 7323)
@@ -15,10 +15,10 @@
static const WCHAR HIPPO_SUBKEY_DOGFOOD[] = HIPPO_REGISTRY_KEY L"\\DogfoodClient";
static const WCHAR HIPPO_SUBKEY_DEBUG[] = HIPPO_REGISTRY_KEY L"\\DebugClient";
-static const WCHAR DEFAULT_MESSAGE_SERVER[] = HIPPO_DEFAULT_MESSAGE_SERVER_L;
-static const WCHAR DEFAULT_WEB_SERVER[] = HIPPO_DEFAULT_WEB_SERVER_L;
-static const WCHAR DEFAULT_LOCAL_MESSAGE_SERVER[] = HIPPO_DEFAULT_LOCAL_MESSAGE_SERVER_L;
-static const WCHAR DEFAULT_LOCAL_WEB_SERVER[] = HIPPO_DEFAULT_LOCAL_WEB_SERVER_L;
+static const WCHAR DEFAULT_MESSAGE_SERVER[] = HIPPO_DEFAULT_STACKER_MESSAGE_SERVER_L;
+static const WCHAR DEFAULT_WEB_SERVER[] = HIPPO_DEFAULT_STACKER_WEB_SERVER_L;
+static const WCHAR DEFAULT_LOCAL_MESSAGE_SERVER[] = HIPPO_DEFAULT_STACKER_LOCAL_MESSAGE_SERVER_L;
+static const WCHAR DEFAULT_LOCAL_WEB_SERVER[] = HIPPO_DEFAULT_STACKER_LOCAL_WEB_SERVER_L;
HippoPreferences::HippoPreferences(HippoInstanceType instanceType)
{
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUI.cpp
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUI.cpp 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUI.cpp 2008-02-20 20:39:16 UTC (rev 7323)
@@ -59,9 +59,6 @@
// How often to check if the user is idle (in ms)
static const int CHECK_IDLE_TIME = 5 * 1000;
-// Time between icon blinks (in ms)
-static const int HOTNESS_BLINK_TIME = 150;
-
static void quitAndWait(IHippoUI *ui);
HippoUI::HippoUI(HippoInstanceType instanceType, bool replaceExisting)
@@ -79,14 +76,13 @@
platform_ = hippo_platform_impl_new(instanceType);
g_object_unref(G_OBJECT(platform_)); // remove extra ref
- connection = hippo_connection_new(platform_);
+ connection = hippo_connection_new(HIPPO_PLATFORM(platform_));
dataCache_ = hippo_data_cache_new(connection);
g_object_unref(connection); // owned now by data cache
g_object_unref(G_OBJECT(dataCache_)); // remove extra ref
// Set up connections
- hotnessChanged_.connect(dataCache_, "hotness-changed", slot(this, &HippoUI::onHotnessChanged));
connectedChanged_.connect(G_OBJECT(connection), "connected-changed", slot(this, &HippoUI::onConnectedChanged));
hasAuthChanged_.connect(G_OBJECT(connection), "has-auth-changed", slot(this, &HippoUI::onHasAuthChanged));
authFailed_.connect(G_OBJECT(connection), "auth-failed", slot(this, &HippoUI::onAuthFailed));
@@ -98,9 +94,6 @@
music_.setUI(this);
hippo_image_factory_set_ui(this);
- hotnessBlinkCount_ = 0;
- idleHotnessBlinkId_ = 0;
-
chatManager_ = NULL;
preferencesDialog_ = NULL;
@@ -117,7 +110,6 @@
tooltip_ = L"Initializing General Purpose Architecture"; // thanks jboss
idle_ = FALSE;
- haveMissedBubbles_ = FALSE;
screenSaverRunning_ = FALSE;
currentShare_ = NULL;
@@ -297,42 +289,6 @@
////////////////////////////////////////////////////////////////////////////
-//HICON
-//HippoUI::loadWithOverlay(int width, int height, TCHAR *icon)
-//{
-// HICON icon;
-// HDC memcontext = CreateCompatibleDC(NULL);
-// ICONINFO iconInfo;
-// HBITMAP bitmap = CreateCompatibleBitmap(memcontext, width, height);
-// icon = (HICON)LoadImage(instance_, icon,
-// IMAGE_ICON, width, height, LR_DEFAULTCOLOR);
-// GetIconInfo(icon, &iconInfo);
-// DrawIcon(memcontext, 0, 0, icon);
-//
-// DestroyIcon(icon);
-// if (haveMissedBubbles_) {
-// // Draw a white rectangle
-// TRIVERTEX bounds[2]
-// GRADIENT_RECT rect;
-// bounds[0].x = width * .75;
-// bounds[0].y = height * .75;
-// bounds[0].Red = 0x0000;
-// bounds[0].Green = 0x0000;
-// bounds[0].Blue = 0x0000;
-// bounds[0].Alpha = 0x0000;
-// bounds[1].x = width;
-// bounds[1].y = height;
-// bounds[1].Red = 0xFF00;
-// bounds[1].Green = 0xFF00;
-// bounds[1].Blue = 0xFF00;
-// bounds[1].Alpha = 0x0000;
-// rect.UpperLeft = 0;
-// rect.LowerRight = 1;
-// GradientFill(memcontext, bounds, 2, &rect, 1, GRADIENT_FILL_RECT_H);
-// }
-//
-//}
-
void
HippoUI::setIcons(void)
{
@@ -350,9 +306,6 @@
// And always load the notification icon
if (!hippo_connection_get_connected(getConnection())) {
icon = MAKEINTRESOURCE(IDI_NOTIFICATION_DISCONNECTED);
- } else if (hotnessBlinkCount_ % 2 == 1) {
- // Currently unused
- icon = MAKEINTRESOURCE(IDI_DUMBHIPPO_BLANK); // need blank/outlined icon?
} else {
icon = MAKEINTRESOURCE(IDI_NOTIFICATION);
}
@@ -384,54 +337,6 @@
notificationIcon_.updateTip(tooltip_.m_str);
}
-// takes int and not HippoHotness to avoid any possible
-// issues with signal marshaling through GObject ...
-// (the callback connected to GObject is generated with the
-// arg type in the GConnection)
-void
-HippoUI::onHotnessChanged(int oldHotnessInt)
-{
- HippoHotness oldHotness = (HippoHotness) oldHotnessInt;
- HippoHotness hotness;
-
- hotness = hippo_data_cache_get_hotness(dataCache_);
-
- if (hotness == oldHotness)
- return; /* should never happen though */
-
- if (idleHotnessBlinkId_ > 0)
- g_source_remove(idleHotnessBlinkId_);
- idleHotnessBlinkId_ = 0;
- hotnessBlinkCount_ = 0;
-
- debugLogU("hotness changing from %d to %d", oldHotness, hotness);
-
- if (oldHotness != HIPPO_HOTNESS_UNKNOWN) {
- idleHotnessBlinkId_ = g_idle_add(HippoUI::idleHotnessBlink, this);
- } else {
- // If we're transitioning from UNKNOWN, don't do blink
- updateIcon();
- }
-}
-
-int
-HippoUI::idleHotnessBlink(gpointer data)
-{
- HippoUI *ui = (HippoUI*) data;
-
- ui->debugLogU("doing blink, count=%d", ui->hotnessBlinkCount_);
- if (ui->hotnessBlinkCount_ > 4) {
- ui->hotnessBlinkCount_ = 0;
- ui->idleHotnessBlinkId_ = 0;
- return FALSE;
- }
- ui->updateIcon();
- ui->hotnessBlinkCount_++;
- ui->idleHotnessBlinkId_ = g_timeout_add(HOTNESS_BLINK_TIME, HippoUI::idleHotnessBlink, ui);
-
- return FALSE;
-}
-
static void
testStatusCallback(HINTERNET ictx, DWORD_PTR uctx, DWORD status, LPVOID statusInfo,
DWORD statusLength)
@@ -440,22 +345,6 @@
}
bool
-HippoUI::timeoutShowDebugShare()
-{
- hippo_data_cache_add_debug_data(dataCache_);
-
- return false; // remove idle
-}
-
-void
-HippoUI::groupInvite(BSTR groupId, BSTR userId)
-{
- HippoUStr groupIdU(groupId);
- HippoUStr userIdU(userId);
- hippo_connection_do_invite_to_group(getConnection(), groupIdU.c_str(), userIdU.c_str());
-}
-
-bool
HippoUI::create(HINSTANCE instance)
{
instance_ = instance;
@@ -496,7 +385,7 @@
}
#if 1
- if (hippo_platform_get_signin(platform_)) {
+ if (hippo_platform_get_signin(HIPPO_PLATFORM(platform_))) {
if (hippo_connection_signin(getConnection()))
showSignInWindow();
}
@@ -508,7 +397,7 @@
#if 1
// and very last once we're all ready, fire up the stacker
- stack_ = hippo_stack_manager_new(hippo_data_cache_get_model(dataCache_), platform_);
+ stack_ = hippo_stack_manager_new(hippo_data_cache_get_model(dataCache_), HIPPO_STACKER_PLATFORM(platform_));
#endif
#if 0
@@ -520,10 +409,6 @@
hippo_window_set_visible(window, TRUE);
#endif
- if (initialShowDebugShare_) {
- showDebugShareTimeout_.add(3000, slot(this, &HippoUI::timeoutShowDebugShare));
- }
-
return true;
}
@@ -550,7 +435,7 @@
HippoPlatform *
HippoUI::getPlatform()
{
- return platform_;
+ return HIPPO_PLATFORM(platform_);
}
HippoConnection*
@@ -795,7 +680,7 @@
char *hostU;
int port;
- hippo_platform_get_web_host_port(platform_, &hostU, &port);
+ hippo_platform_get_web_host_port(HIPPO_PLATFORM(platform_), HIPPO_SERVER_STACKER, &hostU, &port);
HippoBSTR result = HippoBSTR::fromUTF8(hostU, -1);
result.Append(L":");
@@ -867,9 +752,7 @@
connection = hippo_data_cache_get_connection(dataCache_);
if (!hippo_connection_get_connected(connection)) {
- HippoPlatform *platform;
- platform = hippo_connection_get_platform(connection);
- hippo_platform_show_disconnected_window(platform, connection);
+ /* FIXME: show user some explanation? */
} else {
hippo_stack_manager_show_browser(stack_, TRUE);
}
@@ -903,7 +786,7 @@
{
char *host;
int port;
- hippo_platform_get_web_host_port(platform, &host, &port);
+ hippo_platform_get_web_host_port(platform, HIPPO_SERVER_STACKER, &host, &port);
HippoBSTR hostBSTR = HippoBSTR::fromUTF8(host, -1);
g_free(host);
hostBSTR.CopyTo(hostReturn);
@@ -922,7 +805,7 @@
HippoBSTR host;
unsigned int port;
- getWebHostPort(platform_, &host, &port);
+ getWebHostPort(HIPPO_PLATFORM(platform_), &host, &port);
if (components.dwHostNameLength != host.Length() ||
wcsncmp(components.lpszHostName, host.m_str, components.dwHostNameLength) != 0 ||
@@ -952,7 +835,7 @@
HippoBSTR host;
unsigned int port;
- getWebHostPort(platform_, &host, &port);
+ getWebHostPort(HIPPO_PLATFORM(platform_), &host, &port);
if (components.dwHostNameLength != host.Length() ||
wcsncmp(components.lpszHostName, host.m_str, components.dwHostNameLength) != 0 ||
@@ -982,7 +865,7 @@
HippoBSTR host;
unsigned int port;
- getWebHostPort(platform_, &host, &port);
+ getWebHostPort(HIPPO_PLATFORM(platform_), &host, &port);
if (components.dwHostNameLength != host.Length() ||
wcsncmp(components.lpszHostName, host, components.dwHostNameLength) != 0 ||
port != components.nPort)
@@ -1544,8 +1427,6 @@
InsertMenuItem(popupMenu, pos++, TRUE, &info);
}
-
- EnableMenuItem(popupMenu, IDM_MISSED, haveMissedBubbles_ ? MF_ENABLED : MF_GRAYED);
}
HippoBSTR
@@ -1634,9 +1515,6 @@
case IDM_SIGN_OUT:
hippo_connection_signout(getConnection());
return true;
- case IDM_RECENT:
- ShowRecent();
- return true;
case IDM_PREFERENCES:
showPreferences();
return true;
@@ -1702,14 +1580,14 @@
GetDlgItemText(dialog, IDC_MESSAGE_SERVER,
messageServer, sizeof(messageServer) / sizeof(messageServer[0]));
HippoUStr messageServerU(messageServer);
- hippo_platform_set_message_server(ui->platform_, messageServerU.c_str());
+ hippo_platform_set_message_server(HIPPO_PLATFORM(ui->platform_), messageServerU.c_str());
WCHAR webServer[128];
webServer[0] = '\0';
GetDlgItemText(dialog, IDC_WEB_SERVER,
webServer, sizeof(webServer) / sizeof(webServer[0]));
HippoUStr webServerU(webServer);
- hippo_platform_set_web_server(ui->platform_, webServerU.c_str());
+ hippo_platform_set_web_server(HIPPO_PLATFORM(ui->platform_), webServerU.c_str());
EndDialog(dialog, TRUE);
}
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUI.h
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUI.h 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUI.h 2008-02-20 20:39:16 UTC (rev 7323)
@@ -6,6 +6,7 @@
#include <glib.h>
#include <engine/hippo-engine.h>
+#include <stacker/hippo-stack-manager.h>
#include <HippoUtil.h>
#include <HippoArray.h>
#include <HippoMessageHook.h>
@@ -13,6 +14,7 @@
#include "HippoListenerProxy.h"
#include "HippoLogWindow.h"
#include "HippoUpgrader.h"
+#include "HippoPlatformImpl.h"
#include "HippoRemoteWindow.h"
#include "HippoMusic.h"
#include "HippoUIUtil.h"
@@ -90,8 +92,6 @@
void launchBrowser(BSTR url);
void displaySharedLink(BSTR postId, BSTR url);
- void groupInvite(BSTR groupId, BSTR userId);
-
HippoWindowState getChatWindowState(BSTR chatId);
void debugLogW(const WCHAR *format, ...); // UTF-16
@@ -146,8 +146,6 @@
void launchNewBrowserOldIE(BSTR url);
void launchNewBrowserGeneric(BSTR url);
- static int idleHotnessBlink(gpointer data);
-
bool processMessage(UINT message,
WPARAM wParam,
LPARAM lParam);
@@ -174,12 +172,10 @@
//// Idles and timeouts
- bool timeoutShowDebugShare();
bool timeoutCheckIdle();
//// Signal handlers
- void onHotnessChanged(int oldHotness);
void onConnectedChanged(gboolean connected);
void onHasAuthChanged();
void onAuthFailed();
@@ -195,7 +191,6 @@
// If true, then on startup if another instance is already running,
// tell it to exit rather than erroring out.
bool replaceExisting_;
- bool initialShowDebugShare_;
// Whether we are registered as the active HippoUI object
bool registered_;
@@ -213,17 +208,15 @@
HippoBSTR currentURL_;
- HippoGObjectPtr<HippoPlatform> platform_;
+ HippoGObjectPtr<HippoPlatformImpl> platform_;
HippoGObjectPtr<HippoDataCache> dataCache_;
HippoStackManager *stack_;
- GConnection1<void,int> hotnessChanged_;
GConnection1<void,gboolean> connectedChanged_;
GConnection0<void> authFailed_;
GConnection0<void> authSucceeded_;
GConnection0<void> hasAuthChanged_;
- GTimeout showDebugShareTimeout_;
GTimeout checkIdleTimeout_;
HippoLogWindow logWindow_;
@@ -250,10 +243,6 @@
bool rememberPassword_;
bool passwordRemembered_;
- int idleHotnessBlinkId_;
- int hotnessBlinkCount_;
-
bool idle_; // is the user idle
- bool haveMissedBubbles_; // has the user not seen bubbles
bool screenSaverRunning_; // is the screen saver running
};
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUI.rc
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUI.rc 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUI.rc 2008-02-20 20:39:16 UTC (rev 7323)
@@ -57,9 +57,6 @@
BEGIN
POPUP "Dummy"
BEGIN
- MENUITEM "Missed Links...", IDM_MISSED
- MENUITEM "&Recent links...", IDM_RECENT
- MENUITEM SEPARATOR
MENUITEM "E&xit", IDM_EXIT
END
END
Modified: dumbhippo/trunk/client/windows/HippoUI/HippoUI.vsprops
===================================================================
--- dumbhippo/trunk/client/windows/HippoUI/HippoUI.vsprops 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/HippoUI/HippoUI.vsprops 2008-02-20 20:39:16 UTC (rev 7323)
@@ -7,8 +7,8 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../HippoUtil;../../common/glib;../../common/glib/glib;../libglib;../cairo;../../common/cairo/src;../../common/pango;../../common/loudmouth;../../common;../../common/canvas;../../common/airbag/src/client/windows"
- PreprocessorDefinitions="NOMINMAX"
+ AdditionalIncludeDirectories="../HippoUtil;../../common/glib;../../common/glib/glib;../libglib;../cairo;../../common/cairo/src;../../common/pango;../../common/loudmouth;"../../../desktop-data-model";../../common;../../canvas/common;../../common/airbag/src/client/windows"
+ PreprocessorDefinitions="NOMINMAX;DDM_I_KNOW_THIS_IS_UNSTABLE"
/>
<Tool
Name="VCLinkerTool"
Property changes on: dumbhippo/trunk/client/windows/cairo
___________________________________________________________________
Name: svn:ignore
- Debug
Release
+ Debug
Release
cairo-analysis-surface.dll
cairo-analysis-surface.exp
cairo-analysis-surface.lib
Added: dumbhippo/trunk/client/windows/libddm/genmarshal.bat
===================================================================
--- dumbhippo/trunk/client/windows/libddm/genmarshal.bat 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/libddm/genmarshal.bat 2008-02-20 20:39:16 UTC (rev 7323)
@@ -0,0 +1,11 @@
+ echo off
+PATH=%PATH%;..\dependencies
+set genmarshal=..\dependencies\glib\bin\glib-genmarshal
+set source=..\..\..\desktop-data-model\ddm\ddm-marshal.list
+
+%genmarshal% --prefix=ddm_marshal --header %source% > ddm-marshal.h
+
+echo #include "ddm-marshal.h" > ddm-marshal.c
+%genmarshal% --prefix=ddm_marshal --body %source% >> ddm-marshal.c
+
+ echo on
Added: dumbhippo/trunk/client/windows/libddm/libddm.vcproj
===================================================================
--- dumbhippo/trunk/client/windows/libddm/libddm.vcproj 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/libddm/libddm.vcproj 2008-02-20 20:39:16 UTC (rev 7323)
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libddm"
+ ProjectGUID="{808500B7-968D-4493-9461-D32A4F68DBEF}"
+ RootNamespace="libddm"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="..\Sheets\HippoDebug.vsprops;.\libddm.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ UsePrecompiledHeader="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="..\Sheets\hippoRelease.vsprops;.\libddm.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ UsePrecompiledHeader="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-client-notification.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-client.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-condition-parser.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-condition.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-fetch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-model-backend.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-model.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-query.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-resource.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-feed.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-local-client.c"
+ >
+ </File>
+ <File
+ RelativePath=".\ddm-marshal.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-marshal.list"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="genmarshal.bat
"
+ Outputs="ddm-marshal.c;ddm-marshal.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="genmarshal.bat
"
+ Outputs="ddm-marshal.c;ddm-marshal.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-notification-set.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-qname.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-rule.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-work-item.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-client-notification-internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-client-notification.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-fetch.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-model-backend.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-model-internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-model.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-query-internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-query.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-resource-internal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-data-resource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-feed.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-local-client.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ddm-marshal.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-notification-set.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-qname.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-rule.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm-work-item.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\desktop-data-model\ddm\ddm.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: dumbhippo/trunk/client/windows/libddm/libddm.vsprops
===================================================================
--- dumbhippo/trunk/client/windows/libddm/libddm.vsprops 2008-02-20 16:24:18 UTC (rev 7322)
+++ dumbhippo/trunk/client/windows/libddm/libddm.vsprops 2008-02-20 20:39:16 UTC (rev 7323)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="libddm"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=".;../HippoUtil;../../common/glib;../../common/glib/glib;../libglib;../dependencies/gettext/include;../../common;"../../../desktop-data-model""
+ PreprocessorDefinitions="DDM_COMPILATION"
+ DisableSpecificWarnings="4311;4244;4267"
+ />
+</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
