From 0c53b3971bad7e67208d6dcf1f22dc0f37ee7d55 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 21:06:08 -0600
Subject: Fixing scroll documentation

---
 docs/reference/libappindicator-sections.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/reference')

diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt
index 41ff7fa..536e355 100644
--- a/docs/reference/libappindicator-sections.txt
+++ b/docs/reference/libappindicator-sections.txt
@@ -12,6 +12,7 @@ APP_INDICATOR_SIGNAL_NEW_STATUS
 APP_INDICATOR_SIGNAL_NEW_LABEL
 APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH
 APP_INDICATOR_SIGNAL_CONNECTION_CHANGED
+APP_INDICATOR_SIGNAL_SCROLL_EVENT
 AppIndicatorCategory
 AppIndicatorStatus
 AppIndicatorPrivate
-- 
cgit v1.2.3


From 3b78014d09a10de5932219ad0e98411f68236f23 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 21:06:28 -0600
Subject: Removing the multiple modules as we shouldn't need them

---
 docs/reference/Makefile.am | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index ae23e0b..e08f47f 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -9,12 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-if USE_GTK3
-DOC_MODULE=libappindicator3
-else
 DOC_MODULE=libappindicator
-endif
-
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
-- 
cgit v1.2.3


From f5de6c34a53a19a774ee00c4110752a04ff3f8b1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 21:06:47 -0600
Subject: gtk-doc wants a deprecated section now

---
 docs/reference/libappindicator-docs.sgml.in | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs/reference')

diff --git a/docs/reference/libappindicator-docs.sgml.in b/docs/reference/libappindicator-docs.sgml.in
index 3a8e5de..67c7cc6 100644
--- a/docs/reference/libappindicator-docs.sgml.in
+++ b/docs/reference/libappindicator-docs.sgml.in
@@ -25,6 +25,10 @@
     <title>API Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-deprecated">
+    <title>Deprecated API Index</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
-- 
cgit v1.2.3


From 2c30d6934b037d865fb835faea985845fbb2c266 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Feb 2011 22:03:01 -0600
Subject: Ensure that we're building with the right library

---
 docs/reference/Makefile.am | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'docs/reference')

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index e08f47f..8f87b34 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -3,6 +3,14 @@
 # We require automake 1.6 at least.
 AUTOMAKE_OPTIONS = 1.6
 
+if USE_GTK3
+VER=3
+APPINDICATORLIB = libappindicator3.la
+else
+VER=
+APPINDICATORLIB = libappindicator.la
+endif
+
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to
 # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
@@ -91,7 +99,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(LIBRARY_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/src/$(DOC_MODULE).la $(LIBRARY_LIBS)
+GTKDOC_LIBS=$(top_builddir)/src/$(APPINDICATORLIB) $(LIBRARY_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.local.make
-- 
cgit v1.2.3