I unfortunately converted the tabs to spaces in src/applet-main.c, which makes the diff kind of ugly, so I did the same with Ted's branch and posted a slightly better diff here: http://paste.ubuntu.com/725607/
It is worth noting that I took a look at Ted's branch after seeing the merge proposal, and it appears to work correctly with just the updated configure.ac, data/Makefile.am and src/tomboykeybinder.c (to silence a warning) from my branch, so that may be another way to go since I made quite a few possibly unwelcomed changes in my branch (such as using the logging functions from lightdm, since I found that the ones in indicator-applet tend to lose debug messages occasionally). -- https://code.launchpad.net/~jconti/indicator-applet/gnome3/+merge/80877 Your team ayatana-commits is subscribed to branch lp:indicator-applet. _______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
