Messaging Menu

Merge lp:~sil2100/indicator-messages/fix_ftbfs_deprecated_func into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

  1. fix_ftbfs_deprecated_func
  2. Merge into trunk.13.10
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 340
Merged at revision: 340
Proposed branch: lp:~sil2100/indicator-messages/fix_ftbfs_deprecated_func
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 12 lines (+1/-1)
1 file modified
src/app-section.c (+1/-1)
To merge this branch: bzr merge lp:~sil2100/indicator-messages/fix_ftbfs_deprecated_func
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160038@code.launchpad.net

Commit message

indicator_desktop_shortcuts_nick_exec() is deprecated, use indicator_desktop_shortcuts_nick_exec_with_context() with a NULL context instead - fixes the FTBFS

Description of the change

- Problem:

libappindicator FTBFS with new libindicator because indicator_desktop_shortcuts_nick_exec is now deprecated in favour of indicator_desktop_shortcuts_nick_exec_with_context (-Werror=deprecated-declarations).

- Fix:

Use indicator_desktop_shortcuts_nick_exec_with_context() with a NULL context instead.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-raring-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/45/rebuild

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

thanks a lot ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app-section.c'
2--- src/app-section.c 2013-04-03 15:40:56 +0000
3+++ src/app-section.c 2013-04-22 08:55:33 +0000
4@@ -303,7 +303,7 @@
5
6 g_return_if_fail(priv->ids != NULL);
7
8- if (!indicator_desktop_shortcuts_nick_exec(priv->ids, nick)) {
9+ if (!indicator_desktop_shortcuts_nick_exec_with_context(priv->ids, nick, NULL)) {
10 g_warning("Unable to execute nick '%s' for desktop file '%s'",
11 nick, g_desktop_app_info_get_filename (priv->appinfo));
12 }

Subscribers

People subscribed via source and target branches