← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/indicator-datetime/dbusmenu590 into lp:indicator-datetime

 

Ted Gould has proposed merging lp:~ted/indicator-datetime/dbusmenu590 into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/indicator-datetime/dbusmenu590/+merge/91006

Update includes to be dbusmenu 0.5.90 style
-- 
https://code.launchpad.net/~ted/indicator-datetime/dbusmenu590/+merge/91006
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'configure.ac'
--- configure.ac	2011-10-13 18:27:13 +0000
+++ configure.ac	2012-02-01 03:36:06 +0000
@@ -58,7 +58,7 @@
 
 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

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-10-23 21:54:15 +0000
+++ src/datetime-service.c	2012-02-01 03:36:06 +0000
@@ -31,7 +31,7 @@
 #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>

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-09-21 20:19:53 +0000
+++ src/indicator-datetime.c	2012-02-01 03:36:06 +0000
@@ -41,9 +41,9 @@
 #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"


Follow ups