use gtk3 versions of dbusmenu and indicator; use appindicator3 0.1 rather than appindicator 3.1

4 files changed, 18 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index be9c497..42b545e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,10 +54,10 @@ AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
 
 PKG_CHECK_MODULES(INDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                              indicator >= $INDICATOR_REQUIRED_VERSION
+                              indicator3 >= $INDICATOR_REQUIRED_VERSION
                               json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
                               dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-                              dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+                              dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION)
 
 AC_SUBST(INDICATOR3_CFLAGS)
 AC_SUBST(INDICATOR3_LIBS)
@@ -201,7 +201,7 @@ AC_OUTPUT([
 Makefile
 src/Makefile
 src/appindicator-0.1.pc
-src/appindicator-3.1.pc
+src/appindicator3-0.1.pc
 bindings/Makefile
 bindings/mono/Makefile
 bindings/mono/appindicator-sharp.dll.config
diff --git a/src/Makefile.am b/src/Makefile.am
index e3abf9f..2f0a061 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = appindicator-0.1.pc.in appindicator-3.1.pc.in
+EXTRA_DIST = appindicator-0.1.pc.in appindicator3-0.1.pc.in
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -79,7 +79,7 @@ glib_marshal_prefix = _application_service_marshal
 # Library
 ##################################
 
-pkgconfig_DATA = appindicator-0.1.pc appindicator-3.1.pc
+pkgconfig_DATA = appindicator-0.1.pc appindicator3-0.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 glib_enum_h = app-indicator-enum-types.h
@@ -93,7 +93,7 @@ lib_LTLIBRARIES = \
 	libappindicator3.la
 
 libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
-libappindicator3includedir=$(includedir)/libappindicator-3.1/libappindicator
+libappindicator3includedir=$(includedir)/libappindicator3-0.1/libappindicator
 
 libappindicator_headers = \
 	app-indicator.h
@@ -191,15 +191,15 @@ AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/
 AppIndicator_0_1_gir_LIBS = libappindicator.la
 AppIndicator_0_1_gir_FILES = $(introspection_sources)
 
-AppIndicator-3.1.gir: libappindicator.la $(glib_enum_h)
-AppIndicator_3_1_gir_INCLUDES = \
+AppIndicator3-0.1.gir: libappindicator3.la $(glib_enum_h)
+AppIndicator3_0_1_gir_INCLUDES = \
     GObject-2.0 \
     Gtk-3.0
-AppIndicator_3_1_gir_CFLAGS = $(INDICATOR3_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
-AppIndicator_3_1_gir_LIBS = libappindicator3.la
-AppIndicator_3_1_gir_FILES = $(introspection_sources)
+AppIndicator3_0_1_gir_CFLAGS = $(INDICATOR3_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator3_0_1_gir_LIBS = libappindicator3.la
+AppIndicator3_0_1_gir_FILES = $(introspection_sources)
 
-INTROSPECTION_GIRS += AppIndicator-0.1.gir AppIndicator-3.1.gir
+INTROSPECTION_GIRS += AppIndicator-0.1.gir AppIndicator3-0.1.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -218,7 +218,7 @@ endif
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = AppIndicator-0.1.vapi AppIndicator-3.1.vapi
+vapi_DATA = AppIndicator-0.1.vapi AppIndicator3-0.1.vapi
 
 AppIndicator-0.1.vapi: AppIndicator-0.1.gir Makefile.am
 	$(VALA_API_GEN) --library=AppIndicator-0.1 \
@@ -226,8 +226,8 @@ AppIndicator-0.1.vapi: AppIndicator-0.1.gir Makefile.am
 		--vapidir=$(top_builddir)/src \
 		$<
 
-AppIndicator-3.1.vapi: AppIndicator-3.1.gir Makefile.am
-	$(VALA_API_GEN) --library=AppIndicator-3.1 \
+AppIndicator3-0.1.vapi: AppIndicator3-0.1.gir Makefile.am
+	$(VALA_API_GEN) --library=AppIndicator3-0.1 \
 		--pkg gtk+-3.0 \
 		--vapidir=$(top_builddir)/src \
 		$<
diff --git a/src/appindicator-3.1.pc.in b/src/appindicator3-0.1.pc.in
index 37ed687..a485910 100644
--- a/src/appindicator-3.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -4,11 +4,11 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libappindicator-3.1
+Cflags: -I${includedir}/libappindicator3-0.1
 Requires: dbusmenu-glib gtk+-3.0
 Libs: -L${libdir} -lappindicator3
 
-Name: appindicator-3.1
+Name: appindicator3-0.1
 Description: Application indicators
 Version: @VERSION@
 
diff --git a/src/dbus-properties-client.h b/src/dbus-properties-client.h
index dc9f299..6f08e78 100644
--- a/src/dbus-properties-client.h
+++ b/src/dbus-properties-client.h
@@ -39,7 +39,7 @@ org_freedesktop_DBus_Properties_get_async_callback (DBusGProxy *proxy, DBusGProx
 {
   DBusGAsyncData *data = (DBusGAsyncData*) user_data;
   GError *error = NULL;
-  GValue OUT_Value = {0};
+  GValue OUT_Value = { 0, };
   dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_VALUE, &OUT_Value, G_TYPE_INVALID);
   (*(org_freedesktop_DBus_Properties_get_reply)data->cb) (proxy, OUT_Value, error, data->userdata);
   return;