diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-02-14 17:31:25 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-02-14 17:31:25 -0600 |
| commit | 6749bbb52d4ffb13c2f4f0c24745421d33fcf788 (patch) | |
| tree | 26d76238e4cd6327dd3750e19ef8312275b44c64 | |
| parent | b9836332dccd804469d8a83c535d5a0816598455 (diff) | |
| parent | 460b479a9b22cbc35bd333080d501c53bb58ccae (diff) | |
| download | ayatana-indicator-datetime-6749bbb52d4ffb13c2f4f0c24745421d33fcf788.tar.gz ayatana-indicator-datetime-6749bbb52d4ffb13c2f4f0c24745421d33fcf788.tar.bz2 ayatana-indicator-datetime-6749bbb52d4ffb13c2f4f0c24745421d33fcf788.zip | |
merge ted's indicator-datetime-trunk build fixes
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/datetime-service.c | 2 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 07f52d7..32be68e 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_ARG_WITH([gtk], INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 -DBUSMENUGTK_REQUIRED_VERSION=0.3.94 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 GIO_REQUIRED_VERSION=2.25.11 INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 diff --git a/src/datetime-service.c b/src/datetime-service.c index 73a3361..8358a80 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -31,7 +31,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <math.h> #include <gconf/gconf-client.h> -#include <libdbusmenu-gtk3/menuitem.h> +#include <libdbusmenu-gtk/menuitem.h> #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/client.h> #include <libdbusmenu-glib/menuitem.h> diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 8e5f421..f7fb130 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -41,9 +41,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service-manager.h> /* DBusMenu */ -#include <libdbusmenu-gtk3/menu.h> +#include <libdbusmenu-gtk/menu.h> #include <libido/libido.h> -#include <libdbusmenu-gtk3/menuitem.h> +#include <libdbusmenu-gtk/menuitem.h> #include "utils.h" #include "dbus-shared.h" |