From: Freyensee, J. P <jam...@in...> - 2009-11-16 18:39:19
|
Andreas: I am looking at the difference between the two patches. There is a difference in how send_blocking() is getting patched. The sourceforge patch, bug 2701443, changes how the send_blocking() call is used: static void unregister_function_stub( DBusConnection*, void* ); @@ -323,7 +331,7 @@ Message ObjectProxy::_invoke_method( Cal call.path(path().c_str()); call.destination(service().c_str()); - return conn().send_blocking(call); + return conn().send_blocking(call, get_timeout()); but nowhere in the patch is the send_blocking() call modified to reflect the new parameter 'get_timeout()'. So either send_blocking()'s 2nd parameter in the gitorious branch is already there or there is another patch to add the send_blocking() second parameter. Our patch makes an adjustment to send_blocking() : @@ -360,7 +361,11 @@ Message Connection::send_blocking(Message &msg, int timeout) DBusMessage *reply; InternalError e; + if(this->_timeout != -1) + reply = dbus_connection_send_with_reply_and_block(_pvt->conn, msg._pvt->msg, this->_timeout, e); + else reply = dbus_connection_send_with_reply_and_block(_pvt->conn, msg._pvt->msg, timeout, e); + Thanks, Jay Freyensee UMG (please excuse the email syntax; broken collarbone) ________________________________________ From: Andreas Volz [li...@br...] Sent: Monday, November 16, 2009 9:45 AM To: Freyensee, James P Cc: dbu...@li...; Yokoyama, CazX; Ahmed, Suhail; Benis, Robertino Subject: Re: [dbus-cplusplus-devel] contributing a submission to the project...best way? Am Tue, 10 Nov 2009 12:28:19 -0800 schrieb Freyensee, James P: Hello James, ok, I found the ticket: https://bugs.freedesktop.org/show_bug.cgi?id=25022 There's no "dbus-c++" on fd.org because I was wrong. I moved bug handling to sourceforge some time ago. Now I've documented this in the wiki: http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B I wonder because there's a similar ticket on sf.net: http://sourceforge.net/tracker/?func=detail&aid=2701443&group_id=236997&atid=1101684 Are those two tickets connected? It seems only that libdbus-c++-0.5.2-70009.1.moblin2.patch contains many moblin specific autotools scripts. And I see changes in the code generator. This is bad as I don't like to maintain further changes in the fdo.org code generator. I did many changes in the gitorious branch. The only reason why I didn't merge them all back to fd.org is the lack of good unit test to verify the generated code. But I'll take a look into it... regards Andreas > > Andreas: > > A co-worker of mine just submitted bug 25022 that contains our > addition to the project. We verified the merge (from freedesktop) > works, at least for the product we are using with it. We did not see > a category for "dbus-c++" so we filed it under "dbus" but stuck > "dbuc-c++" in the Title. > > Thanks, > Jay > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sat, 7 Nov 2009 22:12:51 +0100 > From: Andreas Volz <li...@br...> > Subject: Re: [dbus-cplusplus-devel] contributing a submission to the > project...best way? > To: dbu...@li... > Message-ID: <20091107221251.0fa70a84@frodo.mittelerde> > Content-Type: text/plain; charset=US-ASCII > > Am Thu, 5 Nov 2009 10:51:05 -0800 schrieb Freyensee, James P: > > Hello Jay, > > Great to hear that someone likes to contribute some code. > > It happens not that often that someone contributes code. So there's > not really a process for it. > > I would prefer a patch through Bugzilla and a mail on the list > pointing to this Bugzilla entry. The prefered format is "git diff". > > And most important, don't forget to tell me if the patch is on top of > the freedesktop repository or the gitorious repository. > > regards > Andreas > > > Andreas at al: > > > > I have a co-worker who would like to make an addition to the > > project. What is the best way to do this? I read on the website we > > would submit the patch through Bugzilla. Is this still correct? Or > > should we send the patch to this email list? > > > > Second question- what would be the best way for us to create the > > patch for you? Use 'git format-patch'? Normal 'diff' command? > > > > Thanks for your time. > > > > Respectfully, > > Jay Freyensee > > UMG > > (apologize in advance on email syntax; broken collarbone) > > |