aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bindings/vala/examples/Makefile.am2
-rw-r--r--configure.ac6
-rw-r--r--example/Makefile.am3
-rw-r--r--src/app-indicator.c1
4 files changed, 7 insertions, 5 deletions
diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am
index 484a00a..67ad932 100644
--- a/bindings/vala/examples/Makefile.am
+++ b/bindings/vala/examples/Makefile.am
@@ -23,7 +23,7 @@ indicator-example.c: $(VALAFILES) Makefile.am
nodist_indicator_example_SOURCES = indicator-example.c
indicator_example_CFLAGS = \
$(LIBRARY_CFLAGS) \
- -Wall -Werror \
+ -Wall \
-I$(top_srcdir)/src \
-include $(top_srcdir)/src/app-indicator.h
indicator_example_LDADD = \
diff --git a/configure.ac b/configure.ac
index 57eb7a1..75c5200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([libappindicator],
- [0.3.0],
+ [0.3.90],
[http://bugs.launchpad.net/libappindicator],
[libappindicator],
[http://launchpad.net/libappindicator])
@@ -57,7 +57,7 @@ AS_IF([test "x$with_gtk" = x3],
[PKG_CHECK_MODULES(LIBRARY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
glib-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GIO_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
],
@@ -65,7 +65,7 @@ AS_IF([test "x$with_gtk" = x3],
[PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION
glib-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GIO_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
],
[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
diff --git a/example/Makefile.am b/example/Makefile.am
index dbea724..ff313f6 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -18,10 +18,11 @@ check_PROGRAMS = \
simple_client_SOURCES = \
simple-client.c
+#-Werror removed for Vala
simple_client_CFLAGS = \
$(LIBRARY_CFLAGS) \
-DLOCAL_ICON="\"$(abs_srcdir)/simple-client-test-icon.png\"" \
- -Wall -Werror \
+ -Wall \
-I$(top_srcdir)/src
simple_client_LDADD = \
diff --git a/src/app-indicator.c b/src/app-indicator.c
index a828113..bc08eea 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -1235,6 +1235,7 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data)
g_object_unref(G_OBJECT(user_data));
return;
}
+ g_free(name);
/* g_object_unref(G_OBJECT(user_data)); */
/* Why is this commented out? Oh, wait, we don't want to