summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-13 20:07:08 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-13 20:07:08 -0400
commitdbe9ff9c3eceb863719f785edcc6e7cc26bb2066 (patch)
tree4e1cd772e6c8f7549a54a172dd45e6302986b0de
parentb5d3599d10f3acf84d23316c5c6ad65964c82e61 (diff)
downloadglibmm-dbe9ff9c3eceb863719f785edcc6e7cc26bb2066.tar.gz
Gio::DBus::Connection: Correct UnixFDList class forward declaration.
* gio/src/dbusconnection.hg: Place the class declaration in the Gio namespace and not in the Gio::DBus namespace which is incorrect to fix the build. There was a '-Werror' option in the CXXFLAGS variable of my ~/.jhbuildrc file which was causing deprecation warnings to break the build so I did not verify the previous to last commit, sorry.
-rw-r--r--ChangeLog10
-rw-r--r--gio/src/dbusconnection.hg7
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d7288bc..fade3f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2011-10-13 José Alburquerque <jaalburqu@svn.gnome.org>
+ Gio::DBus::Connection: Correct UnixFDList class forward declaration.
+
+ * gio/src/dbusconnection.hg: Place the class declaration in the Gio
+ namespace and not in the Gio::DBus namespace which is incorrect to fix
+ the build. There was a '-Werror' option in the CXXFLAGS variable of
+ my ~/.jhbuildrc file which was causing deprecation warnings to break
+ the build so I did not verify the previous to last commit, sorry.
+
+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
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index f17eafa8..600ab69d 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -36,6 +36,9 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
+class UnixFDList;
+
+
namespace DBus
{
@@ -48,10 +51,6 @@ _WRAP_ENUM(SubtreeFlags, GDBusSubtreeFlags, s#^DBUS_##, NO_GTYPE)
_GMMPROC_EXTRA_NAMESPACE(DBus)
-
-class UnixFDList;
-
-
/** @defgroup DBus D-Bus API
*
* API to use D-Bus services as a client or to implement a D-Bus service.