New upstream release.

5 files changed, 44 insertions, 12 deletions

diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index 6891b1b..b22c62c 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34,6 +34,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -167,6 +184,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
 DIST_SOURCES = $(libindicator_la_SOURCES) $(libindicator3_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(pkgconfig_DATA)
 HEADERS = $(libindicator3include_HEADERS) \
 	$(libindicatorinclude_HEADERS)
@@ -433,7 +455,6 @@ indicator3-0.4.pc.in: $(top_builddir)/config.status $(srcdir)/indicator3-0.4.pc.
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -441,6 +462,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -630,8 +653,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -648,8 +674,11 @@ uninstall-pkgconfigDATA:
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-libindicator3includeHEADERS: $(libindicator3include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libindicator3includedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicator3includedir)"
 	@list='$(libindicator3include_HEADERS)'; test -n "$(libindicator3includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libindicator3includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libindicator3includedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -666,8 +695,11 @@ uninstall-libindicator3includeHEADERS:
 	dir='$(DESTDIR)$(libindicator3includedir)'; $(am__uninstall_files_from_dir)
 install-libindicatorincludeHEADERS: $(libindicatorinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libindicatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libindicatorincludedir)"
 	@list='$(libindicatorinclude_HEADERS)'; test -n "$(libindicatorincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libindicatorincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libindicatorincludedir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
diff --git a/libindicator/indicator-object-enum-types.c.template b/libindicator/indicator-object-enum-types.c.template
index dd7d595..e5b3352 100644
--- a/libindicator/indicator-object-enum-types.c.template
+++ b/libindicator/indicator-object-enum-types.c.template
@@ -3,8 +3,8 @@
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-#include "@filename@"
+/* enumerations from "@basename@" */
+#include "@basename@"
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
diff --git a/libindicator/indicator-object-enum-types.h.template b/libindicator/indicator-object-enum-types.h.template
index 07175a0..2ac8ef8 100644
--- a/libindicator/indicator-object-enum-types.h.template
+++ b/libindicator/indicator-object-enum-types.h.template
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
 /*** END file-production ***/
 
 /*** BEGIN file-tail ***/
diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c
index f58c148..a427954 100644
--- a/libindicator/indicator-service-manager.c
+++ b/libindicator/indicator-service-manager.c
@@ -636,7 +636,7 @@ start_service_again (IndicatorServiceManager * manager)
 		object.
 */
 IndicatorServiceManager *
-indicator_service_manager_new (gchar * dbus_name)
+indicator_service_manager_new (const gchar * dbus_name)
 {
 	GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE,
 	                             PROP_NAME_S, dbus_name,
@@ -660,7 +660,7 @@ indicator_service_manager_new (gchar * dbus_name)
 		object.
 */
 IndicatorServiceManager *
-indicator_service_manager_new_version (gchar * dbus_name, guint version)
+indicator_service_manager_new_version (const gchar * dbus_name, guint version)
 {
 	GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE,
 	                             PROP_NAME_S, dbus_name,
diff --git a/libindicator/indicator-service-manager.h b/libindicator/indicator-service-manager.h
index bf6d1b0..7d444c6 100644
--- a/libindicator/indicator-service-manager.h
+++ b/libindicator/indicator-service-manager.h
@@ -76,8 +76,8 @@ struct _IndicatorServiceManager {
 
 GType indicator_service_manager_get_type (void);
 
-IndicatorServiceManager *   indicator_service_manager_new         (gchar * dbus_name);
-IndicatorServiceManager *   indicator_service_manager_new_version (gchar * dbus_name,
+IndicatorServiceManager *   indicator_service_manager_new         (const gchar * dbus_name);
+IndicatorServiceManager *   indicator_service_manager_new_version (const gchar * dbus_name,
                                                                    guint version);
 gboolean                    indicator_service_manager_connected   (IndicatorServiceManager * sm);
 void                        indicator_service_manager_set_refresh (IndicatorServiceManager * sm,