Application Indicators

Merge lp:~ted/indicator-application/dbusmenu590 into lp:indicator-application/0.4

  1. dbusmenu590
  2. Merge into trunk
Proposed by Ted Gould
Status: Superseded
Proposed branch: lp:~ted/indicator-application/dbusmenu590
Merge into: lp:indicator-application/0.4
Diff against target: 28 lines (+1/-5)
2 files modified
configure.ac (+1/-1)
src/indicator-application.c (+0/-4)
To merge this branch: bzr merge lp:~ted/indicator-application/dbusmenu590
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+91513@code.launchpad.net

This proposal has been superseded by a proposal from 2012-02-08.

Description of the change

Apparently I forgot one... this updates to Dbusmenu 0.5.90

To post a comment you must log in.

Unmerged revisions

215. By Ted Gould

Fixing includes to match dbusmenu v0.5.90

214. By Ted Gould

Requiring dbusmenu 0.5.90

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-09-28 13:49:10 +0000
3+++ configure.ac 2012-02-03 22:51:18 +0000
4@@ -33,7 +33,7 @@
5 GTK3_REQUIRED_VERSION=2.91
6 GIO_REQUIRED_VERSION=2.26
7 INDICATOR_REQUIRED_VERSION=0.3.5
8-DBUSMENUGTK_REQUIRED_VERSION=0.3.91
9+DBUSMENUGTK_REQUIRED_VERSION=0.5.90
10 JSON_GLIB_REQUIRED_VERSION=0.7.6
11 DBUS_GLIB_REQUIRED_VERSION=0.82
12
13
14=== modified file 'src/indicator-application.c'
15--- src/indicator-application.c 2011-07-22 20:35:19 +0000
16+++ src/indicator-application.c 2012-02-03 22:51:18 +0000
17@@ -32,11 +32,7 @@
18 #include <gtk/gtk.h>
19
20 /* DBus Stuff */
21-#ifdef HAVE_GTK3
22-#include <libdbusmenu-gtk3/menu.h>
23-#else
24 #include <libdbusmenu-gtk/menu.h>
25-#endif
26
27 /* Indicator Stuff */
28 #include <libindicator/indicator.h>

Subscribers

People subscribed via source and target branches