Support application indicators for Lucid

Generating against rhythmbox git master.

This bug was fixed in the package rhythmbox - 0.12.6-1ubuntu2

---------------
rhythmbox (0.12.6-1ubuntu2) lucid; urgency=low

  * debian/control.in
    - Build-Depends on libappindicator-dev
  * debian/patches/82_rhythmbox-indicators.patch
    - Add support for application indicators (LP: #495225)
 -- Ken VanDine <email address hidden> Thu, 10 Dec 2009 11:07:56 -0500

I'm going to keep this open as a tracker bug of getting the patch finished and upstreamed. Ken, Fix Release this when the patch is sent to the upstream bug tracker, thanks!

Per bug 510778:

If I try to build 0.12.6-1ubuntu6 without libappindicator-dev the build breaks:

  CCLD libstatus-icon.la
.libs/libstatus_icon_la-rb-tray-icon-gtk.o: In function `rb_tray_icon_attach_notification':
/usr/src/rhythmbox-0.12.6/plugins/status-icon/rb-tray-icon-gtk.c:344: multiple definition of `rb_tray_icon_attach_notification'
.libs/libstatus_icon_la-rb-status-icon-plugin.o:/usr/src/rhythmbox-0.12.6/plugins/status-icon/rb-status-icon-plugin.c:513: first defined here
collect2: ld returned 1 exit status
make[5]: *** [libstatus-icon.la] Error 1
make[5]: Leaving directory `/usr/src/rhythmbox-0.12.6/plugins/status-icon'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/usr/src/rhythmbox-0.12.6/plugins/status-icon'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/usr/src/rhythmbox-0.12.6/plugins'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/usr/src/rhythmbox-0.12.6'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/usr/src/rhythmbox-0.12.6'
make: *** [debian/stamp-makefile-build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

Surely the addition of this patch should not cause a FTBS if one opts not to use libappindicator.

This patch seems to correct the build error. I don't know how well it fits in with the logic of adding the appinidicator though.

--- /tmp/old 2010-01-21 12:49:22.000000000 -0500
+++ debian/patches/82_rhythmbox-indicators.patch 2010-01-21 12:42:37.000000000 -0500
@@ -627,16 +627,18 @@
    break;

   default:
-@@ -488,6 +507,13 @@
+@@ -488,6 +507,15 @@
   return TRUE;
  }

++#if defined(HAVE_APP_INDICATOR)
 +#if defined(HAVE_NOTIFY)
 +void
 +rb_tray_icon_attach_notification (RBTrayIcon *icon, NotifyNotification *notification)
 +{
 +}
 +#endif
++#endif
 +
  static void
  notify_playing_entry (RBStatusIconPlugin *plugin, gboolean requested)

Brian, thanks.. yeah that works just fine. Let's just change one line to keep it a bit cleaner looking:

 -#if defined(HAVE_NOTIFY)
 +#if defined(HAVE_NOTIFY) && defined(HAVE_APP_INDICATOR)

closing again since the bug is fixed in lucid and sent upstream now too