[Libreoffice-commits] .: vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 30 05:55:46 PDT 2012
vcl/unx/gtk/app/gtkdata.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bb36072c92687a954a38aeca7fb9945f8e7cca13
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 30 13:54:01 2012 +0100
g_source_get_current_time has been deprecated since version 2.28
g_source_get_current_time has been deprecated since version 2.28 and should not
be used in newly-written code. ... This function ignores source and is
otherwise the same as g_get_current_time()
not using g_source_get_time seeing as our baseline isn't there yet
Change-Id: I9f389cbb8d23353c0a12eacb215d61256b28f643
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 776313b..5189174 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -770,7 +770,7 @@ extern "C" {
static void sal_gtk_timeout_defer( SalGtkTimeoutSource *pTSource )
{
- g_source_get_current_time( (GSource *) pTSource, &pTSource->aFireTime );
+ g_get_current_time( &pTSource->aFireTime );
g_time_val_add( &pTSource->aFireTime, pTSource->pInstance->m_nTimeoutMS * 1000 );
}
@@ -806,7 +806,7 @@ extern "C" {
SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
GTimeVal aTimeNow;
- g_source_get_current_time( pSource, &aTimeNow );
+ g_get_current_time( &aTimeNow );
return sal_gtk_timeout_expired( pTSource, nTimeoutMS, &aTimeNow );
}
@@ -816,7 +816,7 @@ extern "C" {
SalGtkTimeoutSource *pTSource = (SalGtkTimeoutSource *)pSource;
GTimeVal aTimeNow;
- g_source_get_current_time( pSource, &aTimeNow );
+ g_get_current_time( &aTimeNow );
return ( pTSource->aFireTime.tv_sec < aTimeNow.tv_sec ||
( pTSource->aFireTime.tv_sec == aTimeNow.tv_sec &&
More information about the Libreoffice-commits
mailing list