summaryrefslogtreecommitdiff
path: root/glib/glibmm/main.cc
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2010-11-03 08:40:12 +0100
committerMurray Cumming <murrayc@murrayc.com>2010-11-03 08:40:12 +0100
commit7d05853269c9943f357abf7002eb15946b8f65f8 (patch)
treed7091875538075fcdc5726265bcbfdde51b1f800 /glib/glibmm/main.cc
parentffadfbaa4c52f280f01a9645a8b7683a3d1078ca (diff)
downloadglibmm-7d05853269c9943f357abf7002eb15946b8f65f8.tar.gz
Fix the build with glib from git master.
* glib/glibmm/main.[h|cc]: get_time(): Now returns a gint64 instead of a GTimeSpec output parameter.
Diffstat (limited to 'glib/glibmm/main.cc')
-rw-r--r--glib/glibmm/main.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 754e642b..cf19d11c 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -62,7 +62,7 @@ void* SourceConnectionNode::notify(void* data)
// because we set self->source_ to 0 there:
if (self->source_)
{
- GSource* s = self->source_;
+ GSource* s = self->source_;
self->source_ = 0;
g_source_destroy(s);
@@ -295,7 +295,7 @@ sigc::connection SignalTimeout::connect(const sigc::slot<bool>& slot,
return connection;
}
-void SignalTimeout::connect_once(const sigc::slot<void>& slot,
+void SignalTimeout::connect_once(const sigc::slot<void>& slot,
unsigned int interval, int priority)
{
connect(sigc::bind_return(slot, false), interval, priority);
@@ -324,7 +324,7 @@ sigc::connection SignalTimeout::connect_seconds(const sigc::slot<bool>& slot,
return connection;
}
-void SignalTimeout::connect_seconds_once(const sigc::slot<void>& slot,
+void SignalTimeout::connect_seconds_once(const sigc::slot<void>& slot,
unsigned int interval, int priority)
{
connect_seconds(sigc::bind_return(slot, false), interval, priority);
@@ -435,7 +435,7 @@ sigc::connection SignalChildWatch::connect(const sigc::slot<void, GPid, int>& sl
const sigc::connection connection(*conn_node->get_slot());
GSource *const source = g_child_watch_source_new(pid);
-
+
if(priority != G_PRIORITY_DEFAULT)
g_source_set_priority(source, priority);
@@ -653,7 +653,7 @@ Glib::RefPtr<MainContext> MainLoop::get_context()
int MainLoop::depth()
{
return g_main_depth();
-}
+}
void MainLoop::reference() const
{
@@ -834,12 +834,11 @@ void Source::get_current_time(Glib::TimeVal& current_time)
}
#endif //GLIBMM_DISABLE_DEPRECATED
-void Source::get_time(TimeSpec& timespec)
+gint64 Source::get_time() const
{
- g_source_get_time(gobject_, &timespec);
+ return g_source_get_time(const_cast<GSource*>(gobject_));
}
-
inline // static
Source* Source::get_wrapper(GSource* source)
{
@@ -1088,4 +1087,3 @@ bool IOSource::dispatch(sigc::slot_base* slot)
}
} // namespace Glib
-