Autogen

3 files changed, 49 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index 59b6ea8..14222a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ indicator-application (0.2.3-0ubuntu2~ppa5~order1) UNRELEASED; urgency=low
 
   * Upstream Merge
     * Add in ordering IDs
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 10 Aug 2010 15:25:45 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 10 Aug 2010 15:42:22 -0500
 
 indicator-application (0.2.3-0ubuntu2~ppa4) maverick; urgency=low
 
diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
index 8d6228d..1718e50 100644
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -44,8 +44,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.local.make
 subdir = docs/reference
 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
@@ -157,6 +160,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYGTK_CODEGEN = @PYGTK_CODEGEN@
 PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
 PYTHON = @PYTHON@
@@ -295,6 +300,7 @@ IGNORE_HFILES = \
 	dbus-properties-client.h \
 	dbus-properties-server.h \
 	dbus-shared.h \
+	generate-id.h \
 	notification-item-client.h \
 	notification-item-server.h \
 	notification-watcher-client.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index e7e06e3..5ed2a9a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -124,7 +124,8 @@ am__objects_1 =
 am_libappindicator_la_OBJECTS = $(am__objects_1) \
 	libappindicator_la-app-indicator-enum-types.lo \
 	libappindicator_la-app-indicator.lo \
-	libappindicator_la-application-service-marshal.lo
+	libappindicator_la-application-service-marshal.lo \
+	libappindicator_la-generate-id.lo
 libappindicator_la_OBJECTS = $(am_libappindicator_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -146,10 +147,10 @@ PROGRAMS = $(libexec_PROGRAMS)
 am_indicator_application_service_OBJECTS =  \
 	indicator_application_service-application-service.$(OBJEXT) \
 	indicator_application_service-application-service-appstore.$(OBJEXT) \
-	indicator_application_service-application-service-lru-file.$(OBJEXT) \
 	indicator_application_service-application-service-marshal.$(OBJEXT) \
 	indicator_application_service-application-service-watcher.$(OBJEXT) \
-	indicator_application_service-app-indicator-enum-types.$(OBJEXT)
+	indicator_application_service-app-indicator-enum-types.$(OBJEXT) \
+	indicator_application_service-generate-id.$(OBJEXT)
 indicator_application_service_OBJECTS =  \
 	$(am_indicator_application_service_OBJECTS)
 indicator_application_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -288,6 +289,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYGTK_CODEGEN = @PYGTK_CODEGEN@
 PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
 PYTHON = @PYTHON@
@@ -402,13 +405,13 @@ indicator_application_service_SOURCES = \
 	application-service.c \
 	application-service-appstore.h \
 	application-service-appstore.c \
-	application-service-lru-file.h \
-	application-service-lru-file.c \
 	application-service-marshal.c \
 	application-service-watcher.h \
 	application-service-watcher.c \
 	app-indicator-enum-types.c \
-	dbus-shared.h
+	dbus-shared.h \
+	generate-id.h \
+	generate-id.c
 
 indicator_application_service_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
@@ -445,10 +448,12 @@ libappindicator_la_SOURCES = \
 	$(libappindicator_headers) \
 	app-indicator-enum-types.c \
 	app-indicator.c \
-	application-service-marshal.c
+	application-service-marshal.c \
+	generate-id.h \
+	generate-id.c
 
 libappindicator_la_LDFLAGS = \
-	-version-info 0:0:0 \
+	-version-info 1:0:0 \
 	-no-undefined \
 	-export-symbols-regex "^[^_d].*"
 
@@ -656,13 +661,14 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-app-indicator-enum-types.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-appstore.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-lru-file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-marshal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service-watcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-application-service.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_application_service-generate-id.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator-enum-types.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-app-indicator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-application-service-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libappindicator_la-generate-id.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-application-service-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapplication_la-indicator-application.Plo@am__quote@
 
@@ -714,6 +720,14 @@ libappindicator_la-application-service-marshal.lo: application-service-marshal.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c
 
+libappindicator_la-generate-id.lo: generate-id.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -MT libappindicator_la-generate-id.lo -MD -MP -MF $(DEPDIR)/libappindicator_la-generate-id.Tpo -c -o libappindicator_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libappindicator_la-generate-id.Tpo $(DEPDIR)/libappindicator_la-generate-id.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-id.c' object='libappindicator_la-generate-id.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libappindicator_la_CFLAGS) $(CFLAGS) -c -o libappindicator_la-generate-id.lo `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c
+
 libapplication_la-application-service-marshal.lo: application-service-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapplication_la_CFLAGS) $(CFLAGS) -MT libapplication_la-application-service-marshal.lo -MD -MP -MF $(DEPDIR)/libapplication_la-application-service-marshal.Tpo -c -o libapplication_la-application-service-marshal.lo `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapplication_la-application-service-marshal.Tpo $(DEPDIR)/libapplication_la-application-service-marshal.Plo
@@ -762,22 +776,6 @@ indicator_application_service-application-service-appstore.obj: application-serv
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-appstore.obj `if test -f 'application-service-appstore.c'; then $(CYGPATH_W) 'application-service-appstore.c'; else $(CYGPATH_W) '$(srcdir)/application-service-appstore.c'; fi`
 
-indicator_application_service-application-service-lru-file.o: application-service-lru-file.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-lru-file.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo -c -o indicator_application_service-application-service-lru-file.o `test -f 'application-service-lru-file.c' || echo '$(srcdir)/'`application-service-lru-file.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo $(DEPDIR)/indicator_application_service-application-service-lru-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='application-service-lru-file.c' object='indicator_application_service-application-service-lru-file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-lru-file.o `test -f 'application-service-lru-file.c' || echo '$(srcdir)/'`application-service-lru-file.c
-
-indicator_application_service-application-service-lru-file.obj: application-service-lru-file.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-lru-file.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo -c -o indicator_application_service-application-service-lru-file.obj `if test -f 'application-service-lru-file.c'; then $(CYGPATH_W) 'application-service-lru-file.c'; else $(CYGPATH_W) '$(srcdir)/application-service-lru-file.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-lru-file.Tpo $(DEPDIR)/indicator_application_service-application-service-lru-file.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='application-service-lru-file.c' object='indicator_application_service-application-service-lru-file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-application-service-lru-file.obj `if test -f 'application-service-lru-file.c'; then $(CYGPATH_W) 'application-service-lru-file.c'; else $(CYGPATH_W) '$(srcdir)/application-service-lru-file.c'; fi`
-
 indicator_application_service-application-service-marshal.o: application-service-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-application-service-marshal.o -MD -MP -MF $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo -c -o indicator_application_service-application-service-marshal.o `test -f 'application-service-marshal.c' || echo '$(srcdir)/'`application-service-marshal.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-application-service-marshal.Tpo $(DEPDIR)/indicator_application_service-application-service-marshal.Po
@@ -826,6 +824,22 @@ indicator_application_service-app-indicator-enum-types.obj: app-indicator-enum-t
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-app-indicator-enum-types.obj `if test -f 'app-indicator-enum-types.c'; then $(CYGPATH_W) 'app-indicator-enum-types.c'; else $(CYGPATH_W) '$(srcdir)/app-indicator-enum-types.c'; fi`
 
+indicator_application_service-generate-id.o: generate-id.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.o -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-id.c' object='indicator_application_service-generate-id.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.o `test -f 'generate-id.c' || echo '$(srcdir)/'`generate-id.c
+
+indicator_application_service-generate-id.obj: generate-id.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -MT indicator_application_service-generate-id.obj -MD -MP -MF $(DEPDIR)/indicator_application_service-generate-id.Tpo -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_application_service-generate-id.Tpo $(DEPDIR)/indicator_application_service-generate-id.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='generate-id.c' object='indicator_application_service-generate-id.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_application_service_CFLAGS) $(CFLAGS) -c -o indicator_application_service-generate-id.obj `if test -f 'generate-id.c'; then $(CYGPATH_W) 'generate-id.c'; else $(CYGPATH_W) '$(srcdir)/generate-id.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo