[Bug 46470] supersede all NUM_TP_foo with TP_NUM_foo

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=46470

--- Comment #5 from Jonny Lamb <jonny.lamb at collabora.co.uk> 2012-02-29 11:06:08 PST ---
(In reply to comment #4)
> "c-constants-gen: use TP_NUM_… instead of NUM_TP_…" (which is also this bug):
> 
> The branch I prepared for this bug has both sorts of constant on master, so
> people can start porting early. I'd planned to delete the NUM_TP_ versions from
> next later.
> 
> Your patch looks fine for next. I think the ideal thing would be:
> 
> - apply my "generate both" (this bug) to master
> - split out the parts of your patch that move the uses of these constants
>   from NUM_TP_ to TP_NUM_, and apply those to master too
> - maybe deprecate NUM_TP_ too
> - merge master into next (not at all trivial - I have a branch with a
>   monstrously huge merge)
> - delete NUM_TP_ on next
> 
> but if you can't be bothered with all that, applying your version to next works
> too.

Hmm. I'm not sure what the conclusion is. I'm happy to remove my NUM_TP/TP_NUM
patch and apply my branch as is and let you fiddle with the details though? :-)

> > +   * has finished preparing the feature %TP_CHANNEL_FEATURE_CHAT_STATES.
> 
> That should say TP_TEXT_CHANNEL...

Yes, good point, updated.

> > +  tp_proxy_prepare_async (test->channel, features,
> > +      proxy_prepare_cb, test);
> > +
> > +  g_main_loop_run (test->mainloop);
> > +  g_assert_no_error (test->error);
> 
> In new code I'd prefer tp_tests_proxy_run_until_prepared(), which does all this
> in one line

Fair, done, and I updated a couple of the older tests in that file too.

I appended new commits to the end instead of amending existing commits to make
things easier for you and me. :-)

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.