summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-13 16:20:37 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-13 16:20:37 -0400
commitb5d3599d10f3acf84d23316c5c6ad65964c82e61 (patch)
tree796e8f442bea62de2b44e1676f0ecfcbdf6a8fee
parent7f7f658edf637f7205fb8bdcac893f5e1477e338 (diff)
downloadglibmm-b5d3599d10f3acf84d23316c5c6ad65964c82e61.tar.gz
Date: set_time(): Use g_date_set_time_t() instead of g_date_set_time().
* glib/src/date.ccg: The latter function is deprecated. This fixes the build with the master branch of glib with deprecations disabled though there's one small error related to the Threads discussion on the mailing list that will still have to be looked at.
-rw-r--r--ChangeLog9
-rw-r--r--glib/src/date.ccg2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21d1fdc3..7d7288bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2011-10-13 José Alburquerque <jaalburqu@svn.gnome.org>
+ Date: set_time(): Use g_date_set_time_t() instead of g_date_set_time().
+
+ * glib/src/date.ccg: The latter function is deprecated. This fixes
+ the build with the master branch of glib with deprecations disabled
+ though there's one small error related to the Threads discussion on
+ the mailing list that will still have to be looked at.
+
+2011-10-13 José Alburquerque <jaalburqu@svn.gnome.org>
+
DBusMethodInvocation: Add UnixFDList return_value() method overload.
* gio/src/dbusmethodinvocation.hg: Add the method overload.
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index 75ff1442..507c7037 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -87,7 +87,7 @@ _DEPRECATE_IFDEF_START
void Date::set_time(GTime time)
{
//This method, and the C function that it wraps, are deprecated.
- g_date_set_time(&gobject_, time);
+ g_date_set_time_t(&gobject_, static_cast<time_t>(time));
}
#endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32