diff -Nru activity-log-manager-0.9.7/debian/changelog activity-log-manager-0.9.7/debian/changelog --- activity-log-manager-0.9.7/debian/changelog 2014-04-04 16:10:14.000000000 +0000 +++ activity-log-manager-0.9.7/debian/changelog 2014-04-15 01:59:53.000000000 +0000 @@ -1,3 +1,10 @@ +activity-log-manager (0.9.7-0ubuntu14) trusty; urgency=medium + + * debian/patches/16_fix_links_in_ucc.patch: + - Fix links from panel not showing in Unity Control Center (LP: #1306840) + + -- Robert Ancell Tue, 15 Apr 2014 13:47:34 +1200 + activity-log-manager (0.9.7-0ubuntu13) trusty; urgency=medium * Don't try to get properties if the interface doesn't have an owner, to diff -Nru activity-log-manager-0.9.7/debian/patches/16_fix_links_in_ucc.patch activity-log-manager-0.9.7/debian/patches/16_fix_links_in_ucc.patch --- activity-log-manager-0.9.7/debian/patches/16_fix_links_in_ucc.patch 1970-01-01 00:00:00.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/16_fix_links_in_ucc.patch 2014-04-15 01:59:53.000000000 +0000 @@ -0,0 +1,33 @@ +=== modified file 'src/security-widget.vala' +Index: activity-log-manager-0.9.7/src/security-widget.vala +=================================================================== +--- activity-log-manager-0.9.7.orig/src/security-widget.vala 2014-04-15 13:55:19.845594272 +1200 ++++ activity-log-manager-0.9.7/src/security-widget.vala 2014-04-15 13:55:19.841594272 +1200 +@@ -122,7 +122,12 @@ + var link_password = new Gtk.LinkButton (_("Password Settings")); + link_password.activate_link.connect (() => { + try { +- Process.spawn_command_line_async ("gnome-control-center user-accounts"); ++ var have_ucc = Environment.find_program_in_path ("unity-control-center") != null; ++ var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null; ++ if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity")) ++ Process.spawn_command_line_async ("unity-control-center user-accounts"); ++ else ++ Process.spawn_command_line_async ("gnome-control-center user-accounts"); + } catch (SpawnError e) { + warning ("%s", e.message); + } +@@ -135,7 +140,12 @@ + var link_power = new Gtk.LinkButton(_("Power Settings")); + link_power.activate_link.connect (() => { + try { +- Process.spawn_command_line_async ("gnome-control-center power"); ++ var have_ucc = Environment.find_program_in_path ("unity-control-center") != null; ++ var have_gcc = Environment.find_program_in_path ("gnome-control-center") != null; ++ if (have_ucc && (!have_gcc || Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity")) ++ Process.spawn_command_line_async ("unity-control-center power"); ++ else ++ Process.spawn_command_line_async ("gnome-control-center power"); + } catch (SpawnError e) { + warning ("%s", e.message); + } diff -Nru activity-log-manager-0.9.7/debian/patches/series activity-log-manager-0.9.7/debian/patches/series --- activity-log-manager-0.9.7/debian/patches/series 2014-04-04 16:09:51.000000000 +0000 +++ activity-log-manager-0.9.7/debian/patches/series 2014-04-15 01:59:53.000000000 +0000 @@ -12,3 +12,4 @@ 12_hide_lock_unlock_button.patch 13_hide_automatic_reports.patch 15_check-bus-name-owner +16_fix_links_in_ucc.patch