diff -Nru cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/changelog cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/changelog --- cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/changelog 2014-04-06 23:03:43.000000000 +0000 +++ cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/changelog 2014-04-08 22:00:22.000000000 +0000 @@ -1,3 +1,12 @@ +cairo-dock-plug-ins (3.3.99.beta1.2.really.3.3.2-0ubuntu2) trusty; urgency=medium + + * debian/patches/bzr3070_Status-Notifier_workaround_was_broken_due_to_ + DBus_API_change.patch: + - Status-Notifier was broken on Ubuntu 14.04 due to a DBus API change + in Indicator-Application (LP: #1303731) + + -- Matthieu Baerts (matttbe) Wed, 09 Apr 2014 00:00:14 +0200 + cairo-dock-plug-ins (3.3.99.beta1.2.really.3.3.2-0ubuntu1) trusty; urgency=medium * Revert back to the 3.3.2 version: (LP: #1302246) diff -Nru cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/bzr3070_Status-Notifier_workaround_was_broken_due_to_DBus_API_change.patch cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/bzr3070_Status-Notifier_workaround_was_broken_due_to_DBus_API_change.patch --- cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/bzr3070_Status-Notifier_workaround_was_broken_due_to_DBus_API_change.patch 1970-01-01 00:00:00.000000000 +0000 +++ cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/bzr3070_Status-Notifier_workaround_was_broken_due_to_DBus_API_change.patch 2014-04-08 21:57:08.000000000 +0000 @@ -0,0 +1,36 @@ +revno: 3070 +fixes bug: https://launchpad.net/bugs/1303731 +committer: Matthieu Baerts +branch nick: cairo-dock-plug-ins +timestamp: Tue 2014-04-08 23:53:07 +0200 +message: Status-Notifier: was broken on Ubuntu 14.04 due to a DBus API change +'org.ayatana.indicator.service' interface is no longer available but it seems it's not a big deal, this service is no longer needed on Ubuntu 14.04 +Was broken due to this change: https://bazaar.launchpad.net/\~indicator-applet-developers/indicator-application/trunk.14.04/revision/246 + + +=== modified file 'Status-Notifier/src/applet-host-ias.c' +Index: cairo-dock-plug-ins/Status-Notifier/src/applet-host-ias.c +=================================================================== +--- cairo-dock-plug-ins.orig/Status-Notifier/src/applet-host-ias.c 2014-04-08 23:56:20.455073598 +0200 ++++ cairo-dock-plug-ins/Status-Notifier/src/applet-host-ias.c 2014-04-08 23:56:20.447073597 +0200 +@@ -743,6 +743,20 @@ + G_TYPE_UINT, &service_api_version, + G_TYPE_UINT, &this_service_version, + G_TYPE_INVALID); ++ if (error != NULL) ++ { ++ cd_debug ("Unable to watch the service: %s", error->message); ++ g_error_free (error); ++ /* Note: Not a big deal, let start getting items: it seems that the ++ * service is no longer available and *no longer needed* on Ubuntu 14.04 ++ * https://bazaar.launchpad.net/~indicator-applet-developers/indicator-application/trunk.14.04/revision/246 ++ * https://bugs.launchpad.net/bugs/1303731 ++ * TODO: remove this ugly hack... ++ */ ++ #if (INDICATOR_OLD_NAMES == 0) ++ service_api_version = 1; ++ #endif ++ } + cd_debug ("=== got indicator service (API: %d, service: %d, broken watcher: %d)", service_api_version, this_service_version, myData.bBrokenWatcher); + + if (service_api_version > 0) /// shouldn't the 2 versions be equal ?... diff -Nru cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/series cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/series --- cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/series 2014-04-06 21:09:16.000000000 +0000 +++ cairo-dock-plug-ins-3.3.99.beta1.2.really.3.3.2/debian/patches/series 2014-04-08 21:56:20.000000000 +0000 @@ -13,3 +13,4 @@ bzr3068_Clock_fixed_a_crash_when_configuring_when_not_enabled.patch bzr3069_Indicator_Generic_no_need_to_hide_the_icon_before_removing_it.patch bzr3043_Fixed_typo_with_some_sentences.patch +bzr3070_Status-Notifier_workaround_was_broken_due_to_DBus_API_change.patch