aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-07 15:13:58 -0500
committerTed Gould <ted@gould.cx>2011-07-07 15:13:58 -0500
commitfc03ef7c10bf76edc87af4cc54194fe1bf6e28c2 (patch)
tree26b7e6dce9f52651d44eb11beac34632d2844882 /src
parent010b25c0606fb47675a89ee2f75d6c93148e988f (diff)
parentbf95161bb260f193fbb8508f5f25c56080498a31 (diff)
downloadlibayatana-appindicator-fc03ef7c10bf76edc87af4cc54194fe1bf6e28c2.tar.gz
libayatana-appindicator-fc03ef7c10bf76edc87af4cc54194fe1bf6e28c2.tar.bz2
libayatana-appindicator-fc03ef7c10bf76edc87af4cc54194fe1bf6e28c2.zip
Import upstream version 0.3.90
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in7
-rw-r--r--src/app-indicator.c3
2 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 410a3c3..d420133 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,8 +83,11 @@ DIST_COMMON = $(libappindicator3include_HEADERS) \
@HAVE_INTROSPECTION_TRUE@ $(gir_DATA) $(typelib_DATA)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff --git a/src/app-indicator.c b/src/app-indicator.c
index cc785ca..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
@@ -1765,7 +1766,7 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
application icon for the program.
Wrapper function for property #AppIndicator:icon-name and
- #AppIndicator::icon-description.
+ #AppIndicator::icon-desc.
**/
void
app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc)