From fc63d4cca2ebb095a7a66b4618732f95acb5dde4 Mon Sep 17 00:00:00 2001 From: "gijskruitbosch%gmail.com" Date: Thu, 18 Jan 2007 22:23:00 +0000 Subject: [PATCH] Backing out patch for bug 36637, too much red. Sorry. --- widget/src/build/nsWinWidgetFactory.cpp | 6 ------ widget/src/windows/Makefile.in | 1 - widget/src/windows/nsIdleServiceWin.cpp | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/widget/src/build/nsWinWidgetFactory.cpp b/widget/src/build/nsWinWidgetFactory.cpp index e50a750a11b6..bcf707c39256 100644 --- a/widget/src/build/nsWinWidgetFactory.cpp +++ b/widget/src/build/nsWinWidgetFactory.cpp @@ -50,7 +50,6 @@ #include "nsAppShellSingleton.h" #include "nsIServiceManager.h" #include "nsSound.h" -#include "nsIdleServiceWin.h" #include "nsBidiKeyboard.h" @@ -80,7 +79,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) -NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceWin) #endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit) @@ -130,10 +128,6 @@ static const nsModuleComponentInfo components[] = NS_BIDIKEYBOARD_CID, "@mozilla.org/widget/bidikeyboard;1", nsBidiKeyboardConstructor }, - { "User Idle Service", - NS_IDLE_SERVICE_CID, - "@mozilla.org/widget/idleservice;1", - nsIdleServiceWinConstructor }, #endif { "Native Theme Renderer", NS_THEMERENDERER_CID, diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in index 78ace1195825..c89a5bb50099 100644 --- a/widget/src/windows/Makefile.in +++ b/widget/src/windows/Makefile.in @@ -103,7 +103,6 @@ CPPSRCS += \ nsImageClipboard.cpp \ nsBidiKeyboard.cpp \ nsSound.cpp \ - nsIdleServiceWin.cpp \ $(NULL) endif diff --git a/widget/src/windows/nsIdleServiceWin.cpp b/widget/src/windows/nsIdleServiceWin.cpp index b6064ca744ba..2dcb2cb730f8 100644 --- a/widget/src/windows/nsIdleServiceWin.cpp +++ b/widget/src/windows/nsIdleServiceWin.cpp @@ -51,7 +51,7 @@ nsIdleServiceWin::GetIdleTime(PRUint32 *aTimeDiff) inputInfo.cbSize = sizeof(inputInfo); if (!::GetLastInputInfo(&inputInfo)) return NS_ERROR_FAILURE; - + //XXXgijs: this might break after 49.7 days, see MSDN docs for GetTickCount. *aTimeDiff = GetTickCount() - inputInfo.dwTime; return NS_OK; }