[evolution-data-server/openismus-work] EFlag: Suppress deprecation warning on g_cond_timed_wait().

[Tristan Van Berkom <tvb src gnome org>]

commit d1f5f95e44f724c2e243dd0129124dd98e4cf70e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Nov 28 15:18:19 2012 -0500

    EFlag: Suppress deprecation warning on g_cond_timed_wait().
    
    Conflicts:
    
        libedataserver/e-flag.c

 libedataserver/e-flag.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/libedataserver/e-flag.c b/libedataserver/e-flag.c
index ccffd88..03d272d 100644
--- a/libedataserver/e-flag.c
+++ b/libedataserver/e-flag.c
@@ -149,6 +149,7 @@ e_flag_wait (EFlag *flag)
  *
  * Since: 1.12
  **/
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 gboolean
 e_flag_timed_wait (EFlag *flag,
                    GTimeVal *abs_time)
@@ -166,6 +167,7 @@ e_flag_timed_wait (EFlag *flag,
 
        return is_set;
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 /**
  * e_flag_free: