Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Side by Side Diff: src/object.cpp

Issue 6901073: dbus-c++: Revert "dbus-c++: Allow deferred object registration." (Closed) Base URL: ssh://gitrw.chromium.org:9222/dbus-cplusplus.git@master
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « include/dbus-c++/object.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * 2 *
3 * D-Bus++ - C++ bindings for D-Bus 3 * D-Bus++ - C++ bindings for D-Bus
4 * 4 *
5 * Copyright (C) 2005-2007 Paolo Durante <shackan@gmail.com> 5 * Copyright (C) 2005-2007 Paolo Durante <shackan@gmail.com>
6 * 6 *
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 ++ati; 142 ++ati;
143 } 143 }
144 144
145 ali.sort(); 145 ali.sort();
146 ali.unique(); 146 ali.unique();
147 147
148 return ali; 148 return ali;
149 } 149 }
150 150
151 ObjectAdaptor::ObjectAdaptor(Connection &conn, const Path &path, 151 ObjectAdaptor::ObjectAdaptor(Connection &conn, const Path &path)
152 registration_time reg_time)
153 : Object(conn, path, conn.unique_name()) 152 : Object(conn, path, conn.unique_name())
154 { 153 {
155 » if (reg_time == REGISTER_NOW) 154 » register_obj();
156 » » register_obj();
157 } 155 }
158 156
159 ObjectAdaptor::~ObjectAdaptor() 157 ObjectAdaptor::~ObjectAdaptor()
160 { 158 {
161 unregister_obj(); 159 unregister_obj();
162 } 160 }
163 161
164 void ObjectAdaptor::register_obj() 162 void ObjectAdaptor::register_obj()
165 { 163 {
166 debug_log("registering local object %s", path().c_str()); 164 debug_log("registering local object %s", path().c_str());
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 { 381 {
384 return false; 382 return false;
385 } 383 }
386 } 384 }
387 default: 385 default:
388 { 386 {
389 return false; 387 return false;
390 } 388 }
391 } 389 }
392 } 390 }
OLDNEW
« no previous file with comments | « include/dbus-c++/object.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698