GNOME Bugzilla – Bug 738339
Fix build on OS X
Last modified: 2014-10-12 18:13:03 UTC
There are no tabs in the rest of the file, so this matches the surrounding indentation.
Excuse the above description, git-bz did something I didn't expect. Here's two patches to get Glade building again on OS X - there was an #ifdef'd section of code that hadn't been ported to widget templates while the surrounding code had, and in addition it used the old gtk-mac-integration API.
Created attachment 288266 [details] [review] osx: Use current gtk-mac-integration API The #ifdef'd block did not compile at all because it used the old API from gtk-mac-integration, and because it used GtkBuilder when the surrounding code had been ported to use widget templates. This fixes up the use of the API and adds a few widget variables to GladeWindowPrivate which have to be bound to the template.
Created attachment 288267 [details] [review] style: Fix indentation of #ifdef block for OS X There are no tabs in the rest of the file, so this matches the surrounding indentation.
(Sorry, the patches have to be applied in reverse order from how they are posted here. I'm still trying to grok git-bz.)
Also, may I ask for this to be committed to the gnome-3-14 branch as well?
Hi Philip. Thank you for having taken the time to path Glade for OSX. In older days, I would normally take the time to test patches before applying, however I no longer carry a macbook so this is difficult. I've pushed this to master, you'll note that we don't follow the GNOME branching scheme and instead (like GTK+) have our own release numbers, so I have pushed your patch to the glade-3-18 branch (which is our latest stable) as well.
Awesome, thank you!